diff --git a/src/Entities/Interfaces/AccessTokenEntityInterface.php b/src/Entities/AccessTokenEntityInterface.php
similarity index 85%
rename from src/Entities/Interfaces/AccessTokenEntityInterface.php
rename to src/Entities/AccessTokenEntityInterface.php
index 2b4c38a8..82ce640c 100644
--- a/src/Entities/Interfaces/AccessTokenEntityInterface.php
+++ b/src/Entities/AccessTokenEntityInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace League\OAuth2\Server\Entities\Interfaces;
+namespace League\OAuth2\Server\Entities;
 
 use League\OAuth2\Server\CryptKey;
 
diff --git a/src/Entities/Interfaces/AuthCodeEntityInterface.php b/src/Entities/AuthCodeEntityInterface.php
similarity index 81%
rename from src/Entities/Interfaces/AuthCodeEntityInterface.php
rename to src/Entities/AuthCodeEntityInterface.php
index c78f82c7..9f290fa8 100644
--- a/src/Entities/Interfaces/AuthCodeEntityInterface.php
+++ b/src/Entities/AuthCodeEntityInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace League\OAuth2\Server\Entities\Interfaces;
+namespace League\OAuth2\Server\Entities;
 
 interface AuthCodeEntityInterface extends TokenInterface
 {
diff --git a/src/Entities/Interfaces/ClientEntityInterface.php b/src/Entities/ClientEntityInterface.php
similarity index 90%
rename from src/Entities/Interfaces/ClientEntityInterface.php
rename to src/Entities/ClientEntityInterface.php
index 67ff7e42..413d1498 100644
--- a/src/Entities/Interfaces/ClientEntityInterface.php
+++ b/src/Entities/ClientEntityInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace League\OAuth2\Server\Entities\Interfaces;
+namespace League\OAuth2\Server\Entities;
 
 interface ClientEntityInterface
 {
diff --git a/src/Entities/Interfaces/RefreshTokenEntityInterface.php b/src/Entities/RefreshTokenEntityInterface.php
similarity index 81%
rename from src/Entities/Interfaces/RefreshTokenEntityInterface.php
rename to src/Entities/RefreshTokenEntityInterface.php
index 6ee10015..7b9d3433 100644
--- a/src/Entities/Interfaces/RefreshTokenEntityInterface.php
+++ b/src/Entities/RefreshTokenEntityInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace League\OAuth2\Server\Entities\Interfaces;
+namespace League\OAuth2\Server\Entities;
 
 interface RefreshTokenEntityInterface
 {
@@ -35,14 +35,14 @@ interface RefreshTokenEntityInterface
     /**
      * Set the access token that the refresh token was associated with.
      *
-     * @param \League\OAuth2\Server\Entities\Interfaces\AccessTokenEntityInterface $accessToken
+     * @param \League\OAuth2\Server\Entities\AccessTokenEntityInterface $accessToken
      */
     public function setAccessToken(AccessTokenEntityInterface $accessToken);
 
     /**
      * Get the access token that the refresh token was originally associated with.
      *
-     * @return \League\OAuth2\Server\Entities\Interfaces\AccessTokenEntityInterface
+     * @return \League\OAuth2\Server\Entities\AccessTokenEntityInterface
      */
     public function getAccessToken();
 
diff --git a/src/Entities/Interfaces/ScopeEntityInterface.php b/src/Entities/ScopeEntityInterface.php
similarity index 78%
rename from src/Entities/Interfaces/ScopeEntityInterface.php
rename to src/Entities/ScopeEntityInterface.php
index 099b66e5..1c8c6d17 100644
--- a/src/Entities/Interfaces/ScopeEntityInterface.php
+++ b/src/Entities/ScopeEntityInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace League\OAuth2\Server\Entities\Interfaces;
+namespace League\OAuth2\Server\Entities;
 
 interface ScopeEntityInterface extends \JsonSerializable
 {
diff --git a/src/Entities/Interfaces/TokenInterface.php b/src/Entities/TokenInterface.php
similarity index 87%
rename from src/Entities/Interfaces/TokenInterface.php
rename to src/Entities/TokenInterface.php
index a78db090..b25d3912 100644
--- a/src/Entities/Interfaces/TokenInterface.php
+++ b/src/Entities/TokenInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace League\OAuth2\Server\Entities\Interfaces;
+namespace League\OAuth2\Server\Entities;
 
 interface TokenInterface
 {
@@ -56,14 +56,14 @@ interface TokenInterface
     /**
      * Set the client that the token was issued to.
      *
-     * @param \League\OAuth2\Server\Entities\Interfaces\ClientEntityInterface $client
+     * @param \League\OAuth2\Server\Entities\ClientEntityInterface $client
      */
     public function setClient(ClientEntityInterface $client);
 
     /**
      * Associate a scope with the token.
      *
-     * @param \League\OAuth2\Server\Entities\Interfaces\ScopeEntityInterface $scope
+     * @param \League\OAuth2\Server\Entities\ScopeEntityInterface $scope
      */
     public function addScope(ScopeEntityInterface $scope);
 
diff --git a/src/Entities/Interfaces/UserEntityInterface.php b/src/Entities/UserEntityInterface.php
similarity index 75%
rename from src/Entities/Interfaces/UserEntityInterface.php
rename to src/Entities/UserEntityInterface.php
index 30949701..52cd277a 100644
--- a/src/Entities/Interfaces/UserEntityInterface.php
+++ b/src/Entities/UserEntityInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace League\OAuth2\Server\Entities\Interfaces;
+namespace League\OAuth2\Server\Entities;
 
 interface UserEntityInterface
 {