diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Collections/Action.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Action.php
similarity index 97%
rename from src/Appwrite/Platform/Modules/Databases/Http/Collections/Action.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Action.php
index 83500fa964..eaaa08d237 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Collections/Action.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Action.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Collections;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections;
 
 use Appwrite\Extend\Exception;
 use Utopia\Platform\Action as UtopiaAction;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/Action.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Action.php
similarity index 99%
rename from src/Appwrite/Platform/Modules/Databases/Http/Attributes/Action.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Action.php
index 0ac013fc4f..1c779f4d3b 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/Action.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Action.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Attributes;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes;
 
 use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/Boolean/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Boolean/Create.php
similarity index 95%
rename from src/Appwrite/Platform/Modules/Databases/Http/Attributes/Boolean/Create.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Boolean/Create.php
index 8fdbbefbcd..d70188e621 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/Boolean/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Boolean/Create.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Attributes\Boolean;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Boolean;
 
 use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\Action;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/Boolean/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Boolean/Update.php
similarity index 95%
rename from src/Appwrite/Platform/Modules/Databases/Http/Attributes/Boolean/Update.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Boolean/Update.php
index b2fdc527b3..73739e1d91 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/Boolean/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Boolean/Update.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Attributes\Boolean;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Boolean;
 
 use Appwrite\Event\Event;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\Action;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/Datetime/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Datetime/Create.php
similarity index 95%
rename from src/Appwrite/Platform/Modules/Databases/Http/Attributes/Datetime/Create.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Datetime/Create.php
index 07f7158475..50e20a5c56 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/Datetime/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Datetime/Create.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Attributes\Datetime;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Datetime;
 
 use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\Action;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/Datetime/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Datetime/Update.php
similarity index 95%
rename from src/Appwrite/Platform/Modules/Databases/Http/Attributes/Datetime/Update.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Datetime/Update.php
index 0709415d81..afac2904ff 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/Datetime/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Datetime/Update.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Attributes\Datetime;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Datetime;
 
 use Appwrite\Event\Event;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\Action;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/Delete.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Delete.php
similarity index 98%
rename from src/Appwrite/Platform/Modules/Databases/Http/Attributes/Delete.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Delete.php
index bcb4d1d406..9597070be6 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/Delete.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Delete.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Attributes;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes;
 
 use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/Email/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Email/Create.php
similarity index 95%
rename from src/Appwrite/Platform/Modules/Databases/Http/Attributes/Email/Create.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Email/Create.php
index bd8512a271..2d64c00393 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/Email/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Email/Create.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Attributes\Email;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Email;
 
 use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
 use Appwrite\Network\Validator\Email;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\Action;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/Email/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Email/Update.php
similarity index 95%
rename from src/Appwrite/Platform/Modules/Databases/Http/Attributes/Email/Update.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Email/Update.php
index 2c39e37b19..fcf5ab7fca 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/Email/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Email/Update.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Attributes\Email;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Email;
 
 use Appwrite\Event\Event;
 use Appwrite\Network\Validator\Email;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\Action;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/Enum/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Enum/Create.php
similarity index 95%
rename from src/Appwrite/Platform/Modules/Databases/Http/Attributes/Enum/Create.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Enum/Create.php
index fa30639bd1..ea7370e493 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/Enum/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Enum/Create.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Attributes\Enum;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Enum;
 
 use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
 use Appwrite\Extend\Exception;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\Action;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/Enum/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Enum/Update.php
similarity index 95%
rename from src/Appwrite/Platform/Modules/Databases/Http/Attributes/Enum/Update.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Enum/Update.php
index 089407ad01..b8e855de99 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/Enum/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Enum/Update.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Attributes\Enum;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Enum;
 
 use Appwrite\Event\Event;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\Action;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/Float/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Float/Create.php
similarity index 96%
rename from src/Appwrite/Platform/Modules/Databases/Http/Attributes/Float/Create.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Float/Create.php
index e1f22ffdd8..821f3134ab 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/Float/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Float/Create.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Attributes\Float;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Float;
 
 use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
 use Appwrite\Extend\Exception;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\Action;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/Float/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Float/Update.php
similarity index 95%
rename from src/Appwrite/Platform/Modules/Databases/Http/Attributes/Float/Update.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Float/Update.php
index 42cc5444d5..3ef7f5cae4 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/Float/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Float/Update.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Attributes\Float;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Float;
 
 use Appwrite\Event\Event;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\Action;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/Get.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Get.php
similarity index 97%
rename from src/Appwrite/Platform/Modules/Databases/Http/Attributes/Get.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Get.php
index 95612b45ca..226dcefa2b 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/Get.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Get.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Attributes;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes;
 
 use Appwrite\Extend\Exception;
 use Appwrite\SDK\AuthType;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/IP/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/IP/Create.php
similarity index 95%
rename from src/Appwrite/Platform/Modules/Databases/Http/Attributes/IP/Create.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/IP/Create.php
index 927d55c9c0..cb472fc2c8 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/IP/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/IP/Create.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Attributes\IP;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\IP;
 
 use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\Action;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/IP/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/IP/Update.php
similarity index 95%
rename from src/Appwrite/Platform/Modules/Databases/Http/Attributes/IP/Update.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/IP/Update.php
index a489675bd2..233672be03 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/IP/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/IP/Update.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Attributes\IP;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\IP;
 
 use Appwrite\Event\Event;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\Action;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/Integer/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Integer/Create.php
similarity index 96%
rename from src/Appwrite/Platform/Modules/Databases/Http/Attributes/Integer/Create.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Integer/Create.php
index 9dd013362c..4bd45adf48 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/Integer/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Integer/Create.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Attributes\Integer;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Integer;
 
 use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
 use Appwrite\Extend\Exception;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\Action;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/Integer/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Integer/Update.php
similarity index 95%
rename from src/Appwrite/Platform/Modules/Databases/Http/Attributes/Integer/Update.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Integer/Update.php
index 6e1379daff..e8197ba0d9 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/Integer/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Integer/Update.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Attributes\Integer;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Integer;
 
 use Appwrite\Event\Event;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\Action;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/Relationship/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Relationship/Create.php
similarity index 97%
rename from src/Appwrite/Platform/Modules/Databases/Http/Attributes/Relationship/Create.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Relationship/Create.php
index 49d853bed6..5d799c11c9 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/Relationship/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Relationship/Create.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Attributes\Relationship;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Relationship;
 
 use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
 use Appwrite\Extend\Exception;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\Action;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/Relationship/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Relationship/Update.php
similarity index 95%
rename from src/Appwrite/Platform/Modules/Databases/Http/Attributes/Relationship/Update.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Relationship/Update.php
index 9c95bd2a65..5375135c28 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/Relationship/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Relationship/Update.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Attributes\Relationship;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Relationship;
 
 use Appwrite\Event\Event;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\Action;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/String/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/String/Create.php
similarity index 96%
rename from src/Appwrite/Platform/Modules/Databases/Http/Attributes/String/Create.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/String/Create.php
index 47386f7530..6c8ec7e9e1 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/String/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/String/Create.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Attributes\String;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\String;
 
 use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
 use Appwrite\Extend\Exception;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\Action;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/String/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/String/Update.php
similarity index 95%
rename from src/Appwrite/Platform/Modules/Databases/Http/Attributes/String/Update.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/String/Update.php
index 08c55e6021..059ad1e28c 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/String/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/String/Update.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Attributes\String;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\String;
 
 use Appwrite\Event\Event;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\Action;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/URL/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/URL/Create.php
similarity index 95%
rename from src/Appwrite/Platform/Modules/Databases/Http/Attributes/URL/Create.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/URL/Create.php
index 38f5a4773a..f7c948d43e 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/URL/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/URL/Create.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Attributes\URL;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\URL;
 
 use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\Action;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/URL/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/URL/Update.php
similarity index 95%
rename from src/Appwrite/Platform/Modules/Databases/Http/Attributes/URL/Update.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/URL/Update.php
index 45309326aa..8fa53d79b4 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/URL/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/URL/Update.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Attributes\URL;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\URL;
 
 use Appwrite\Event\Event;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\Action;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/XList.php
similarity index 98%
rename from src/Appwrite/Platform/Modules/Databases/Http/Attributes/XList.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/XList.php
index 5a190bd671..c89ad043f3 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Attributes/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/XList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Attributes;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes;
 
 use Appwrite\Extend\Exception;
 use Appwrite\SDK\AuthType;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Collections/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Create.php
similarity index 98%
rename from src/Appwrite/Platform/Modules/Databases/Http/Collections/Create.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Create.php
index 063ce75720..a65bf9c311 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Collections/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Create.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Collections;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections;
 
 use Appwrite\Event\Event;
 use Appwrite\Extend\Exception;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Collections/Delete.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Delete.php
similarity index 98%
rename from src/Appwrite/Platform/Modules/Databases/Http/Collections/Delete.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Delete.php
index 7cec4addea..d838d16b94 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Collections/Delete.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Delete.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Collections;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections;
 
 use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Documents/Action.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Action.php
similarity index 97%
rename from src/Appwrite/Platform/Modules/Databases/Http/Documents/Action.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Action.php
index d12a9bb8a7..2eabd376cf 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Documents/Action.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Action.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Documents;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Documents;
 
 use Appwrite\Extend\Exception;
 use Utopia\Platform\Action as UtopiaAction;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Documents/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Create.php
similarity index 99%
rename from src/Appwrite/Platform/Modules/Databases/Http/Documents/Create.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Create.php
index a6e938bc18..6522ff377c 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Documents/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Create.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Documents;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Documents;
 
 use Appwrite\Auth\Auth;
 use Appwrite\Event\Event;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Documents/Delete.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Delete.php
similarity index 98%
rename from src/Appwrite/Platform/Modules/Databases/Http/Documents/Delete.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Delete.php
index 93a4fdb57e..dcca07eed4 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Documents/Delete.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Delete.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Documents;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Documents;
 
 use Appwrite\Auth\Auth;
 use Appwrite\Event\Event;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Documents/Get.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Get.php
similarity index 98%
rename from src/Appwrite/Platform/Modules/Databases/Http/Documents/Get.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Get.php
index ddc08f4783..29cfb19013 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Documents/Get.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Get.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Documents;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Documents;
 
 use Appwrite\Auth\Auth;
 use Appwrite\Event\StatsUsage;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Documents/Logs/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Logs/XList.php
similarity index 97%
rename from src/Appwrite/Platform/Modules/Databases/Http/Documents/Logs/XList.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Logs/XList.php
index 991c43ca1c..6c37d3e238 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Documents/Logs/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Logs/XList.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Documents\Logs;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Documents\Logs;
 
 use Appwrite\Detector\Detector;
 use Appwrite\Extend\Exception;
-use Appwrite\Platform\Modules\Databases\Http\Documents\Action;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Documents\Action;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Documents/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Update.php
similarity index 99%
rename from src/Appwrite/Platform/Modules/Databases/Http/Documents/Update.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Update.php
index e55b9bda39..5f6935abcb 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Documents/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Update.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Documents;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Documents;
 
 use Appwrite\Auth\Auth;
 use Appwrite\Event\Event;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Documents/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/XList.php
similarity index 99%
rename from src/Appwrite/Platform/Modules/Databases/Http/Documents/XList.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/XList.php
index 48779ae71d..3ddbf8df7f 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Documents/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/XList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Documents;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Documents;
 
 use Appwrite\Auth\Auth;
 use Appwrite\Event\StatsUsage;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Collections/Get.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Get.php
similarity index 97%
rename from src/Appwrite/Platform/Modules/Databases/Http/Collections/Get.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Get.php
index e7f02b8930..bf06e29e26 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Collections/Get.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Get.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Collections;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections;
 
 use Appwrite\Extend\Exception;
 use Appwrite\SDK\AuthType;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Indexes/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Indexes/Create.php
similarity index 100%
rename from src/Appwrite/Platform/Modules/Databases/Http/Indexes/Create.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Indexes/Create.php
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Indexes/Delete.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Indexes/Delete.php
similarity index 100%
rename from src/Appwrite/Platform/Modules/Databases/Http/Indexes/Delete.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Indexes/Delete.php
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Indexes/Get.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Indexes/Get.php
similarity index 100%
rename from src/Appwrite/Platform/Modules/Databases/Http/Indexes/Get.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Indexes/Get.php
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Indexes/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Indexes/XList.php
similarity index 100%
rename from src/Appwrite/Platform/Modules/Databases/Http/Indexes/XList.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Indexes/XList.php
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Collections/Logs/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Logs/XList.php
similarity index 97%
rename from src/Appwrite/Platform/Modules/Databases/Http/Collections/Logs/XList.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Logs/XList.php
index bd31ad2fe1..7785ec2890 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Collections/Logs/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Logs/XList.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Collections\Logs;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Logs;
 
 use Appwrite\Extend\Exception;
-use Appwrite\Platform\Modules\Databases\Http\Collections\Action;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Action;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Collections/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Update.php
similarity index 98%
rename from src/Appwrite/Platform/Modules/Databases/Http/Collections/Update.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Update.php
index 8c8dfb58b5..d7a2751166 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Collections/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Update.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Collections;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections;
 
 use Appwrite\Event\Event;
 use Appwrite\Extend\Exception;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Collections/Usage/Get.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Usage/Get.php
similarity index 97%
rename from src/Appwrite/Platform/Modules/Databases/Http/Collections/Usage/Get.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Usage/Get.php
index 60c7af4420..995200fcc7 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Collections/Usage/Get.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Usage/Get.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Collections\Usage;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Usage;
 
 use Appwrite\Extend\Exception;
-use Appwrite\Platform\Modules\Databases\Http\Collections\Action;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Action;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Collections/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/XList.php
similarity index 98%
rename from src/Appwrite/Platform/Modules/Databases/Http/Collections/XList.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/XList.php
index b6d002a59b..1b50c3f090 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Collections/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/XList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Collections;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections;
 
 use Appwrite\Extend\Exception;
 use Appwrite\SDK\AuthType;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Columns/Boolean/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Boolean/Create.php
similarity index 94%
rename from src/Appwrite/Platform/Modules/Databases/Http/Columns/Boolean/Create.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Boolean/Create.php
index fafed3bf8d..740bd89c0b 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Columns/Boolean/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Boolean/Create.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Columns\Boolean;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Tables\Columns\Boolean;
 
 use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\Boolean\Create as BooleanCreate;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Boolean\Create as BooleanCreate;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Columns/Boolean/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Boolean/Update.php
similarity index 94%
rename from src/Appwrite/Platform/Modules/Databases/Http/Columns/Boolean/Update.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Boolean/Update.php
index 7bb9e640ad..a2254a5734 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Columns/Boolean/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Boolean/Update.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Columns\Boolean;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Tables\Columns\Boolean;
 
 use Appwrite\Event\Event;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\Boolean\Update as BooleanUpdate;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Boolean\Update as BooleanUpdate;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Columns/Datetime/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Datetime/Create.php
similarity index 94%
rename from src/Appwrite/Platform/Modules/Databases/Http/Columns/Datetime/Create.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Datetime/Create.php
index 7d9dc8dcce..ef0c61e1f4 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Columns/Datetime/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Datetime/Create.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Columns\Datetime;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Tables\Columns\Datetime;
 
 use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\Datetime\Create as DatetimeCreate;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Datetime\Create as DatetimeCreate;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Columns/Datetime/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Datetime/Update.php
similarity index 94%
rename from src/Appwrite/Platform/Modules/Databases/Http/Columns/Datetime/Update.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Datetime/Update.php
index 7e1b1e196d..14e57d6a70 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Columns/Datetime/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Datetime/Update.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Columns\Datetime;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Tables\Columns\Datetime;
 
 use Appwrite\Event\Event;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\Datetime\Update as DatetimeUpdate;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Datetime\Update as DatetimeUpdate;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Columns/Delete.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Delete.php
similarity index 93%
rename from src/Appwrite/Platform/Modules/Databases/Http/Columns/Delete.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Delete.php
index e712f7cdde..064e277942 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Columns/Delete.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Delete.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Columns;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Tables\Columns;
 
 use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\Delete as AttributesDelete;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Delete as AttributesDelete;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Columns/Email/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Email/Create.php
similarity index 94%
rename from src/Appwrite/Platform/Modules/Databases/Http/Columns/Email/Create.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Email/Create.php
index a3dfc0d6a2..635b673e03 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Columns/Email/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Email/Create.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Columns\Email;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Tables\Columns\Email;
 
 use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
 use Appwrite\Network\Validator\Email;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\Email\Create as EmailCreate;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Email\Create as EmailCreate;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Columns/Email/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Email/Update.php
similarity index 94%
rename from src/Appwrite/Platform/Modules/Databases/Http/Columns/Email/Update.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Email/Update.php
index 2f8494250e..0162633ed9 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Columns/Email/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Email/Update.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Columns\Email;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Tables\Columns\Email;
 
 use Appwrite\Event\Event;
 use Appwrite\Network\Validator\Email;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\Email\Update as EmailUpdate;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Email\Update as EmailUpdate;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Columns/Enum/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Enum/Create.php
similarity index 94%
rename from src/Appwrite/Platform/Modules/Databases/Http/Columns/Enum/Create.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Enum/Create.php
index 06fc55891e..942d49d86a 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Columns/Enum/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Enum/Create.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Columns\Enum;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Tables\Columns\Enum;
 
 use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\Enum\Create as EnumCreate;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Enum\Create as EnumCreate;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Columns/Enum/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Enum/Update.php
similarity index 94%
rename from src/Appwrite/Platform/Modules/Databases/Http/Columns/Enum/Update.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Enum/Update.php
index 28a4538b66..2018170105 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Columns/Enum/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Enum/Update.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Columns\Enum;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Tables\Columns\Enum;
 
 use Appwrite\Event\Event;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\Enum\Update as EnumUpdate;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Enum\Update as EnumUpdate;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Columns/Float/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Float/Create.php
similarity index 94%
rename from src/Appwrite/Platform/Modules/Databases/Http/Columns/Float/Create.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Float/Create.php
index 4f5db64d57..13d26d0331 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Columns/Float/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Float/Create.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Columns\Float;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Tables\Columns\Float;
 
 use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\Float\Create as FloatCreate;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Float\Create as FloatCreate;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Columns/Float/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Float/Update.php
similarity index 94%
rename from src/Appwrite/Platform/Modules/Databases/Http/Columns/Float/Update.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Float/Update.php
index c7ab1795db..55c4c13505 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Columns/Float/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Float/Update.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Columns\Float;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Tables\Columns\Float;
 
 use Appwrite\Event\Event;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\Float\Update as FloatUpdate;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Float\Update as FloatUpdate;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Columns/Get.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Get.php
similarity index 93%
rename from src/Appwrite/Platform/Modules/Databases/Http/Columns/Get.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Get.php
index ff69757b6d..db83c3ecbc 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Columns/Get.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Get.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Columns;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Tables\Columns;
 
-use Appwrite\Platform\Modules\Databases\Http\Attributes\Get as AttributesGet;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Get as AttributesGet;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Columns/IP/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/IP/Create.php
similarity index 94%
rename from src/Appwrite/Platform/Modules/Databases/Http/Columns/IP/Create.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/IP/Create.php
index b42f9aaf6b..c0d671183c 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Columns/IP/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/IP/Create.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Columns\IP;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Tables\Columns\IP;
 
 use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\IP\Create as IPCreate;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\IP\Create as IPCreate;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Columns/IP/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/IP/Update.php
similarity index 94%
rename from src/Appwrite/Platform/Modules/Databases/Http/Columns/IP/Update.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/IP/Update.php
index 101041a790..e9092c38c5 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Columns/IP/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/IP/Update.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Columns\IP;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Tables\Columns\IP;
 
 use Appwrite\Event\Event;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\IP\Update as IPUpdate;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\IP\Update as IPUpdate;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Columns/Integer/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Integer/Create.php
similarity index 94%
rename from src/Appwrite/Platform/Modules/Databases/Http/Columns/Integer/Create.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Integer/Create.php
index b0b5eb59bb..26868fa667 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Columns/Integer/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Integer/Create.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Columns\Integer;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Tables\Columns\Integer;
 
 use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\Integer\Create as IntegerCreate;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Integer\Create as IntegerCreate;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Columns/Integer/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Integer/Update.php
similarity index 94%
rename from src/Appwrite/Platform/Modules/Databases/Http/Columns/Integer/Update.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Integer/Update.php
index faa42aa3ca..fa50515a10 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Columns/Integer/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Integer/Update.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Columns\Integer;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Tables\Columns\Integer;
 
 use Appwrite\Event\Event;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\Integer\Update as IntegerUpdate;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Integer\Update as IntegerUpdate;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Columns/Relationship/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Relationship/Create.php
similarity index 94%
rename from src/Appwrite/Platform/Modules/Databases/Http/Columns/Relationship/Create.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Relationship/Create.php
index 2807041377..4693d494c6 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Columns/Relationship/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Relationship/Create.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Columns\Relationship;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Tables\Columns\Relationship;
 
 use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\Relationship\Create as RelationshipCreate;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Relationship\Create as RelationshipCreate;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Columns/Relationship/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Relationship/Update.php
similarity index 93%
rename from src/Appwrite/Platform/Modules/Databases/Http/Columns/Relationship/Update.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Relationship/Update.php
index 81040584b3..e110eafc56 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Columns/Relationship/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/Relationship/Update.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Columns\Relationship;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Tables\Columns\Relationship;
 
 use Appwrite\Event\Event;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\Relationship\Update as RelationshipUpdate;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Relationship\Update as RelationshipUpdate;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Columns/String/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/String/Create.php
similarity index 94%
rename from src/Appwrite/Platform/Modules/Databases/Http/Columns/String/Create.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/String/Create.php
index a75563a271..354aef6ff9 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Columns/String/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/String/Create.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Columns\String;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Tables\Columns\String;
 
 use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\String\Create as StringCreate;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\String\Create as StringCreate;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Columns/String/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/String/Update.php
similarity index 94%
rename from src/Appwrite/Platform/Modules/Databases/Http/Columns/String/Update.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/String/Update.php
index 0b1f370696..649d481794 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Columns/String/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/String/Update.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Columns\String;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Tables\Columns\String;
 
 use Appwrite\Event\Event;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\String\Update as StringUpdate;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\String\Update as StringUpdate;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Columns/URL/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/URL/Create.php
similarity index 94%
rename from src/Appwrite/Platform/Modules/Databases/Http/Columns/URL/Create.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/URL/Create.php
index 5c575acb56..ce7c5dfe9f 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Columns/URL/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/URL/Create.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Columns\URL;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Tables\Columns\URL;
 
 use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\URL\Create as URLCreate;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\URL\Create as URLCreate;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Columns/URL/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/URL/Update.php
similarity index 94%
rename from src/Appwrite/Platform/Modules/Databases/Http/Columns/URL/Update.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/URL/Update.php
index c37a74198a..298165b2cf 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Columns/URL/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/URL/Update.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Columns\URL;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Tables\Columns\URL;
 
 use Appwrite\Event\Event;
-use Appwrite\Platform\Modules\Databases\Http\Attributes\URL\Update as URLUpdate;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\URL\Update as URLUpdate;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Columns/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/XList.php
similarity index 93%
rename from src/Appwrite/Platform/Modules/Databases/Http/Columns/XList.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/XList.php
index 280e56fa48..2e41fe86eb 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Columns/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Columns/XList.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Columns;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Tables\Columns;
 
-use Appwrite\Platform\Modules\Databases\Http\Attributes\XList as AttributesXList;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\XList as AttributesXList;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Tables/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Create.php
similarity index 95%
rename from src/Appwrite/Platform/Modules/Databases/Http/Tables/Create.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Create.php
index 860c32ee4b..1f349b95ed 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Tables/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Create.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Tables;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Tables;
 
 use Appwrite\Event\Event;
-use Appwrite\Platform\Modules\Databases\Http\Collections\Create as CollectionCreate;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Create as CollectionCreate;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Tables/Delete.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Delete.php
similarity index 93%
rename from src/Appwrite/Platform/Modules/Databases/Http/Tables/Delete.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Delete.php
index 1c70401a40..338d344660 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Tables/Delete.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Delete.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Tables;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Tables;
 
 use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
-use Appwrite\Platform\Modules\Databases\Http\Collections\Delete as CollectionDelete;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Delete as CollectionDelete;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Tables/Get.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Get.php
similarity index 92%
rename from src/Appwrite/Platform/Modules/Databases/Http/Tables/Get.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Get.php
index f7f850a0fe..ffa1da443e 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Tables/Get.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Get.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Tables;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Tables;
 
-use Appwrite\Platform\Modules\Databases\Http\Collections\Get as CollectionGet;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Get as CollectionGet;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Tables/Logs/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Logs/XList.php
similarity index 93%
rename from src/Appwrite/Platform/Modules/Databases/Http/Tables/Logs/XList.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Logs/XList.php
index 90983dc84b..9a6d4c4e8e 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Tables/Logs/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Logs/XList.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Tables\Logs;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Tables\Logs;
 
-use Appwrite\Platform\Modules\Databases\Http\Collections\Logs\XList as CollectionLogXList;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Logs\XList as CollectionLogXList;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Rows/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Rows/Create.php
similarity index 95%
rename from src/Appwrite/Platform/Modules/Databases/Http/Rows/Create.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Rows/Create.php
index fa0fca4101..26e14b9ca5 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Rows/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Rows/Create.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Rows;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Tables\Rows;
 
 use Appwrite\Event\Event;
 use Appwrite\Event\StatsUsage;
-use Appwrite\Platform\Modules\Databases\Http\Documents\Create as DocumentCreate;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Documents\Create as DocumentCreate;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Rows/Delete.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Rows/Delete.php
similarity index 94%
rename from src/Appwrite/Platform/Modules/Databases/Http/Rows/Delete.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Rows/Delete.php
index 476e4b83f2..c0cc4b0dd1 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Rows/Delete.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Rows/Delete.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Rows;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Tables\Rows;
 
 use Appwrite\Event\Event;
 use Appwrite\Event\StatsUsage;
-use Appwrite\Platform\Modules\Databases\Http\Documents\Delete as DocumentDelete;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Documents\Delete as DocumentDelete;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Rows/Get.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Rows/Get.php
similarity index 94%
rename from src/Appwrite/Platform/Modules/Databases/Http/Rows/Get.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Rows/Get.php
index 3ec0ea6213..0b74f19f41 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Rows/Get.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Rows/Get.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Rows;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Tables\Rows;
 
 use Appwrite\Event\StatsUsage;
-use Appwrite\Platform\Modules\Databases\Http\Documents\Get as DocumentGet;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Documents\Get as DocumentGet;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Rows/Logs/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Rows/Logs/XList.php
similarity index 93%
rename from src/Appwrite/Platform/Modules/Databases/Http/Rows/Logs/XList.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Rows/Logs/XList.php
index ebf5bcca1b..66ac69323c 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Rows/Logs/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Rows/Logs/XList.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Rows\Logs;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Tables\Rows\Logs;
 
-use Appwrite\Platform\Modules\Databases\Http\Documents\Logs\XList as DocumentLogXList;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Documents\Logs\XList as DocumentLogXList;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Rows/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Rows/Update.php
similarity index 95%
rename from src/Appwrite/Platform/Modules/Databases/Http/Rows/Update.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Rows/Update.php
index 34d947796e..7148452c74 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Rows/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Rows/Update.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Rows;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Tables\Rows;
 
 use Appwrite\Event\Event;
 use Appwrite\Event\StatsUsage;
-use Appwrite\Platform\Modules\Databases\Http\Documents\Update as DocumentUpdate;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Documents\Update as DocumentUpdate;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Rows/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Rows/XList.php
similarity index 94%
rename from src/Appwrite/Platform/Modules/Databases/Http/Rows/XList.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Rows/XList.php
index 041f532840..62fe6b52b0 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Rows/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Rows/XList.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Rows;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Tables\Rows;
 
 use Appwrite\Event\StatsUsage;
-use Appwrite\Platform\Modules\Databases\Http\Documents\XList as DocumentXList;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Documents\XList as DocumentXList;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Tables/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Update.php
similarity index 95%
rename from src/Appwrite/Platform/Modules/Databases/Http/Tables/Update.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Update.php
index 4a20770cbd..e60fbb4ac8 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Tables/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Update.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Tables;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Tables;
 
 use Appwrite\Event\Event;
-use Appwrite\Platform\Modules\Databases\Http\Collections\Update as CollectionUpdate;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Update as CollectionUpdate;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Tables/Usage/Get.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Usage/Get.php
similarity index 92%
rename from src/Appwrite/Platform/Modules/Databases/Http/Tables/Usage/Get.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Usage/Get.php
index 0371eaa3f9..304884cece 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Tables/Usage/Get.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/Usage/Get.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Tables\Usage;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Tables\Usage;
 
-use Appwrite\Platform\Modules\Databases\Http\Collections\Usage\Get as CollectionUsageGet;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Usage\Get as CollectionUsageGet;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Tables/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/XList.php
similarity index 94%
rename from src/Appwrite/Platform/Modules/Databases/Http/Tables/XList.php
rename to src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/XList.php
index 4381597ec6..10913cd491 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Tables/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Tables/XList.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Tables;
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Tables;
 
-use Appwrite\Platform\Modules\Databases\Http\Collections\XList as CollectionXList;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\XList as CollectionXList;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;