diff --git a/src/Appwrite/Platform/Appwrite.php b/src/Appwrite/Platform/Appwrite.php
index ae3d4d6646..d5e3f74f45 100644
--- a/src/Appwrite/Platform/Appwrite.php
+++ b/src/Appwrite/Platform/Appwrite.php
@@ -8,7 +8,6 @@ use Appwrite\Platform\Modules\Functions;
 use Appwrite\Platform\Modules\Projects;
 use Appwrite\Platform\Modules\Proxy;
 use Appwrite\Platform\Modules\Sites;
-use Appwrite\Platform\Modules\Storage;
 use Utopia\Platform\Platform;
 
 class Appwrite extends Platform
diff --git a/src/Appwrite/Platform/Modules/Storage/Http/Tokens/Buckets/Files/Action.php b/src/Appwrite/Platform/Modules/Tokens/Http/Tokens/Buckets/Files/Action.php
similarity index 95%
rename from src/Appwrite/Platform/Modules/Storage/Http/Tokens/Buckets/Files/Action.php
rename to src/Appwrite/Platform/Modules/Tokens/Http/Tokens/Buckets/Files/Action.php
index aec665f406..565ab7bab7 100644
--- a/src/Appwrite/Platform/Modules/Storage/Http/Tokens/Buckets/Files/Action.php
+++ b/src/Appwrite/Platform/Modules/Tokens/Http/Tokens/Buckets/Files/Action.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Storage\Http\Tokens\Buckets\Files;
+namespace Appwrite\Platform\Modules\Tokens\Http\Tokens\Buckets\Files;
 
 use Appwrite\Auth\Auth;
 use Appwrite\Extend\Exception;
diff --git a/src/Appwrite/Platform/Modules/Storage/Http/Tokens/Buckets/Files/Create.php b/src/Appwrite/Platform/Modules/Tokens/Http/Tokens/Buckets/Files/Create.php
similarity index 98%
rename from src/Appwrite/Platform/Modules/Storage/Http/Tokens/Buckets/Files/Create.php
rename to src/Appwrite/Platform/Modules/Tokens/Http/Tokens/Buckets/Files/Create.php
index 4529de7928..4f63256ec8 100644
--- a/src/Appwrite/Platform/Modules/Storage/Http/Tokens/Buckets/Files/Create.php
+++ b/src/Appwrite/Platform/Modules/Tokens/Http/Tokens/Buckets/Files/Create.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Storage\Http\Tokens\Buckets\Files;
+namespace Appwrite\Platform\Modules\Tokens\Http\Tokens\Buckets\Files;
 
 use Appwrite\Auth\Auth;
 use Appwrite\Event\Event;
diff --git a/src/Appwrite/Platform/Modules/Storage/Http/Tokens/Buckets/Files/XList.php b/src/Appwrite/Platform/Modules/Tokens/Http/Tokens/Buckets/Files/XList.php
similarity index 98%
rename from src/Appwrite/Platform/Modules/Storage/Http/Tokens/Buckets/Files/XList.php
rename to src/Appwrite/Platform/Modules/Tokens/Http/Tokens/Buckets/Files/XList.php
index b9da122ef0..dbc6575e6f 100644
--- a/src/Appwrite/Platform/Modules/Storage/Http/Tokens/Buckets/Files/XList.php
+++ b/src/Appwrite/Platform/Modules/Tokens/Http/Tokens/Buckets/Files/XList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Storage\Http\Tokens\Buckets\Files;
+namespace Appwrite\Platform\Modules\Tokens\Http\Tokens\Buckets\Files;
 
 use Appwrite\Extend\Exception as ExtendException;
 use Appwrite\SDK\AuthType;
diff --git a/src/Appwrite/Platform/Modules/Storage/Http/Tokens/Delete.php b/src/Appwrite/Platform/Modules/Tokens/Http/Tokens/Delete.php
similarity index 97%
rename from src/Appwrite/Platform/Modules/Storage/Http/Tokens/Delete.php
rename to src/Appwrite/Platform/Modules/Tokens/Http/Tokens/Delete.php
index 0e413b5e4d..31bcd7f580 100644
--- a/src/Appwrite/Platform/Modules/Storage/Http/Tokens/Delete.php
+++ b/src/Appwrite/Platform/Modules/Tokens/Http/Tokens/Delete.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Storage\Http\Tokens;
+namespace Appwrite\Platform\Modules\Tokens\Http\Tokens;
 
 use Appwrite\Event\Event;
 use Appwrite\Extend\Exception;
diff --git a/src/Appwrite/Platform/Modules/Storage/Http/Tokens/Get.php b/src/Appwrite/Platform/Modules/Tokens/Http/Tokens/Get.php
similarity index 97%
rename from src/Appwrite/Platform/Modules/Storage/Http/Tokens/Get.php
rename to src/Appwrite/Platform/Modules/Tokens/Http/Tokens/Get.php
index 605ea13960..3eb16793a5 100644
--- a/src/Appwrite/Platform/Modules/Storage/Http/Tokens/Get.php
+++ b/src/Appwrite/Platform/Modules/Tokens/Http/Tokens/Get.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Storage\Http\Tokens;
+namespace Appwrite\Platform\Modules\Tokens\Http\Tokens;
 
 use Appwrite\Extend\Exception;
 use Appwrite\SDK\AuthType;
diff --git a/src/Appwrite/Platform/Modules/Storage/Http/Tokens/JWT/Get.php b/src/Appwrite/Platform/Modules/Tokens/Http/Tokens/JWT/Get.php
similarity index 98%
rename from src/Appwrite/Platform/Modules/Storage/Http/Tokens/JWT/Get.php
rename to src/Appwrite/Platform/Modules/Tokens/Http/Tokens/JWT/Get.php
index 143be08e96..02c00b74bb 100644
--- a/src/Appwrite/Platform/Modules/Storage/Http/Tokens/JWT/Get.php
+++ b/src/Appwrite/Platform/Modules/Tokens/Http/Tokens/JWT/Get.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Storage\Http\Tokens\JWT;
+namespace Appwrite\Platform\Modules\Tokens\Http\Tokens\JWT;
 
 use Ahc\Jwt\JWT;
 use Appwrite\Extend\Exception;
diff --git a/src/Appwrite/Platform/Modules/Storage/Http/Tokens/Update.php b/src/Appwrite/Platform/Modules/Tokens/Http/Tokens/Update.php
similarity index 98%
rename from src/Appwrite/Platform/Modules/Storage/Http/Tokens/Update.php
rename to src/Appwrite/Platform/Modules/Tokens/Http/Tokens/Update.php
index 742f059470..5e7a2df533 100644
--- a/src/Appwrite/Platform/Modules/Storage/Http/Tokens/Update.php
+++ b/src/Appwrite/Platform/Modules/Tokens/Http/Tokens/Update.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Storage\Http\Tokens;
+namespace Appwrite\Platform\Modules\Tokens\Http\Tokens;
 
 use Appwrite\Auth\Auth;
 use Appwrite\Event\Event;
diff --git a/src/Appwrite/Platform/Modules/Storage/Module.php b/src/Appwrite/Platform/Modules/Tokens/Module.php
similarity index 62%
rename from src/Appwrite/Platform/Modules/Storage/Module.php
rename to src/Appwrite/Platform/Modules/Tokens/Module.php
index 59eb9e87a6..9f49ef0111 100644
--- a/src/Appwrite/Platform/Modules/Storage/Module.php
+++ b/src/Appwrite/Platform/Modules/Tokens/Module.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Storage;
+namespace Appwrite\Platform\Modules\Tokens;
 
-use Appwrite\Platform\Modules\Storage\Services\Http;
+use Appwrite\Platform\Modules\Tokens\Services\Http;
 use Utopia\Platform;
 
 class Module extends Platform\Module
diff --git a/src/Appwrite/Platform/Modules/Storage/Services/Http.php b/src/Appwrite/Platform/Modules/Tokens/Services/Http.php
similarity index 53%
rename from src/Appwrite/Platform/Modules/Storage/Services/Http.php
rename to src/Appwrite/Platform/Modules/Tokens/Services/Http.php
index 5fe4d096b3..bbb85e85fd 100644
--- a/src/Appwrite/Platform/Modules/Storage/Services/Http.php
+++ b/src/Appwrite/Platform/Modules/Tokens/Services/Http.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Storage\Services;
+namespace Appwrite\Platform\Modules\Tokens\Services;
 
-use Appwrite\Platform\Modules\Storage\Http\Tokens\Buckets\Files\Create as CreateFileToken;
-use Appwrite\Platform\Modules\Storage\Http\Tokens\Buckets\Files\XList as ListFileTokens;
-use Appwrite\Platform\Modules\Storage\Http\Tokens\Delete as DeleteToken;
-use Appwrite\Platform\Modules\Storage\Http\Tokens\Get as GetToken;
-use Appwrite\Platform\Modules\Storage\Http\Tokens\JWT\Get as GetTokenJWT;
-use Appwrite\Platform\Modules\Storage\Http\Tokens\Update as UpdateToken;
+use Appwrite\Platform\Modules\Tokens\Http\Tokens\Buckets\Files\Create as CreateFileToken;
+use Appwrite\Platform\Modules\Tokens\Http\Tokens\Buckets\Files\XList as ListFileTokens;
+use Appwrite\Platform\Modules\Tokens\Http\Tokens\Delete as DeleteToken;
+use Appwrite\Platform\Modules\Tokens\Http\Tokens\Get as GetToken;
+use Appwrite\Platform\Modules\Tokens\Http\Tokens\JWT\Get as GetTokenJWT;
+use Appwrite\Platform\Modules\Tokens\Http\Tokens\Update as UpdateToken;
 use Utopia\Platform\Service;
 
 class Http extends Service