diff --git a/app/app.php b/app/app.php
index 3f40c7e8ff..97ac33942f 100644
--- a/app/app.php
+++ b/app/app.php
@@ -11,13 +11,12 @@ use Utopia\Response;
 use Utopia\Validator\Range;
 use Utopia\View;
 use Utopia\Exception;
-use Auth\Auth;
-use Database\Database;
-use Database\Document;
-use Database\Validator\Authorization;
-use Event\Event;
 use Utopia\Domains\Domain;
-use Utopia\Validator\WhiteList;
+use Appwrite\Auth\Auth;
+use Appwrite\Database\Database;
+use Appwrite\Database\Document;
+use Appwrite\Database\Validator\Authorization;
+use Appwrite\Event\Event;
 
 /*
  * Configuration files
diff --git a/app/config/collections.php b/app/config/collections.php
index 52b6b143bf..1314db6894 100644
--- a/app/config/collections.php
+++ b/app/config/collections.php
@@ -2,7 +2,7 @@
 
 global $providers, $request;
 
-use Database\Database;
+use Appwrite\Database\Database;
 
 $collections = [
     'console' => [
diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php
index 4ffdd752cf..7c319d296d 100644
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@@ -14,17 +14,17 @@ use Utopia\Validator\URL;
 use Utopia\Audit\Audit;
 use Utopia\Audit\Adapters\MySQL as AuditAdapter;
 use Utopia\Locale\Locale;
-use Auth\Auth;
-use Auth\Validator\Password;
-use Database\Database;
-use Database\Document;
-use Database\Exception\Duplicate;
-use Database\Validator\UID;
-use Database\Validator\Authorization;
+use Appwrite\Auth\Auth;
+use Appwrite\Auth\Validator\Password;
+use Appwrite\Database\Database;
+use Appwrite\Database\Document;
+use Appwrite\Database\Exception\Duplicate;
+use Appwrite\Database\Validator\UID;
+use Appwrite\Database\Validator\Authorization;
+use Appwrite\Template\Template;
+use Appwrite\OpenSSL\OpenSSL;
 use DeviceDetector\DeviceDetector;
 use GeoIp2\Database\Reader;
-use Template\Template;
-use OpenSSL\OpenSSL;
 
 include_once __DIR__ . '/../shared/api.php';
 
@@ -264,7 +264,7 @@ $utopia->get('/v1/account/sessions/oauth2/:provider')
                 throw new Exception('Provider is undefined, configure provider app ID and app secret key to continue', 412);
             }
 
-            $classname = 'Auth\\OAuth2\\'.ucfirst($provider);
+            $classname = 'Appwrite\\Auth\\OAuth2\\'.ucfirst($provider);
 
             if (!class_exists($classname)) {
                 throw new Exception('Provider is not supported', 501);
@@ -319,7 +319,7 @@ $utopia->get('/v1/account/sessions/oauth2/:provider/redirect')
                 $appSecret = OpenSSL::decrypt($appSecret['data'], $appSecret['method'], $key, 0, hex2bin($appSecret['iv']), hex2bin($appSecret['tag']));
             }
 
-            $classname = 'Auth\\OAuth2\\'.ucfirst($provider);
+            $classname = 'Appwrite\\Auth\\OAuth2\\'.ucfirst($provider);
 
             if (!class_exists($classname)) {
                 throw new Exception('Provider is not supported', 501);
diff --git a/app/controllers/api/avatars.php b/app/controllers/api/avatars.php
index 675a871731..fb00725c43 100644
--- a/app/controllers/api/avatars.php
+++ b/app/controllers/api/avatars.php
@@ -9,7 +9,7 @@ use Utopia\Validator\Range;
 use Utopia\Validator\URL;
 use Utopia\Cache\Cache;
 use Utopia\Cache\Adapter\Filesystem;
-use Resize\Resize;
+use Appwrite\Resize\Resize;
 use BaconQrCode\Renderer\ImageRenderer;
 use BaconQrCode\Renderer\Image\ImagickImageBackEnd;
 use BaconQrCode\Renderer\RendererStyle\RendererStyle;
diff --git a/app/controllers/api/database.php b/app/controllers/api/database.php
index 6fb44715a3..94dec67e90 100644
--- a/app/controllers/api/database.php
+++ b/app/controllers/api/database.php
@@ -9,15 +9,15 @@ use Utopia\Validator\Range;
 use Utopia\Validator\WhiteList;
 use Utopia\Validator\Text;
 use Utopia\Validator\ArrayList;
-use Database\Database;
-use Database\Document;
-use Database\Validator\UID;
-use Database\Validator\Key;
-use Database\Validator\Structure;
-use Database\Validator\Collection;
-use Database\Validator\Authorization;
-use Database\Exception\Authorization as AuthorizationException;
-use Database\Exception\Structure as StructureException;
+use Appwrite\Database\Database;
+use Appwrite\Database\Document;
+use Appwrite\Database\Validator\UID;
+use Appwrite\Database\Validator\Key;
+use Appwrite\Database\Validator\Structure;
+use Appwrite\Database\Validator\Collection;
+use Appwrite\Database\Validator\Authorization;
+use Appwrite\Database\Exception\Authorization as AuthorizationException;
+use Appwrite\Database\Exception\Structure as StructureException;
 
 include_once __DIR__ . '/../shared/api.php';
 
diff --git a/app/controllers/api/health.php b/app/controllers/api/health.php
index b5f239046c..5ad1f5b788 100644
--- a/app/controllers/api/health.php
+++ b/app/controllers/api/health.php
@@ -3,8 +3,8 @@
 global $utopia, $request, $response, $register, $project;
 
 use Utopia\Exception;
-use Storage\Devices\Local;
-use Storage\Storage;
+use Appwrite\Storage\Devices\Local;
+use Appwrite\Storage\Storage;
 use Appwrite\ClamAV\Network;
 
 $utopia->get('/v1/health')
diff --git a/app/controllers/api/projects.php b/app/controllers/api/projects.php
index 80a2706534..43dbf5877e 100644
--- a/app/controllers/api/projects.php
+++ b/app/controllers/api/projects.php
@@ -2,7 +2,6 @@
 
 global $utopia, $request, $response, $register, $user, $consoleDB, $projectDB, $providers;
 
-use Auth\Auth;
 use Utopia\Exception;
 use Utopia\Response;
 use Utopia\Validator\ArrayList;
@@ -12,13 +11,14 @@ use Utopia\Validator\WhiteList;
 use Utopia\Validator\Range;
 use Utopia\Validator\URL;
 use Utopia\Domains\Domain;
-use Task\Validator\Cron;
-use Database\Database;
-use Database\Document;
-use Database\Validator\UID;
-use OpenSSL\OpenSSL;
+use Appwrite\Auth\Auth;
+use Appwrite\Task\Validator\Cron;
+use Appwrite\Database\Database;
+use Appwrite\Database\Document;
+use Appwrite\Database\Validator\UID;
+use Appwrite\OpenSSL\OpenSSL;
+use Appwrite\Network\Validators\CNAME;
 use Cron\CronExpression;
-use Network\Validators\CNAME;
 
 include_once __DIR__ . '/../shared/api.php';
 
diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php
index c74b9412c2..2f0000beb7 100644
--- a/app/controllers/api/storage.php
+++ b/app/controllers/api/storage.php
@@ -12,16 +12,16 @@ use Utopia\Validator\HexColor;
 use Utopia\Cache\Cache;
 use Utopia\Cache\Adapter\Filesystem;
 use Appwrite\ClamAV\Network;
-use Database\Database;
-use Database\Validator\UID;
-use Storage\Storage;
-use Storage\Devices\Local;
-use Storage\Validators\File;
-use Storage\Validators\FileSize;
-use Storage\Validators\Upload;
-use Storage\Compression\Algorithms\GZIP;
-use Resize\Resize;
-use OpenSSL\OpenSSL;
+use Appwrite\Database\Database;
+use Appwrite\Database\Validator\UID;
+use Appwrite\Storage\Storage;
+use Appwrite\Storage\Devices\Local;
+use Appwrite\Storage\Validators\File;
+use Appwrite\Storage\Validators\FileSize;
+use Appwrite\Storage\Validators\Upload;
+use Appwrite\Storage\Compression\Algorithms\GZIP;
+use Appwrite\Resize\Resize;
+use Appwrite\OpenSSL\OpenSSL;
 
 include_once __DIR__ . '/../shared/api.php';
 
diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php
index f7c4020800..a410bcc9af 100644
--- a/app/controllers/api/teams.php
+++ b/app/controllers/api/teams.php
@@ -11,13 +11,13 @@ use Utopia\Validator\Range;
 use Utopia\Validator\ArrayList;
 use Utopia\Validator\WhiteList;
 use Utopia\Locale\Locale;
-use Database\Database;
-use Database\Document;
-use Database\Validator\UID;
-use Database\Validator\Authorization;
-use Database\Exception\Duplicate;
-use Template\Template;
-use Auth\Auth;
+use Appwrite\Auth\Auth;
+use Appwrite\Database\Database;
+use Appwrite\Database\Document;
+use Appwrite\Database\Validator\UID;
+use Appwrite\Database\Validator\Authorization;
+use Appwrite\Database\Exception\Duplicate;
+use Appwrite\Template\Template;
 
 include_once __DIR__ . '/../shared/api.php';
 
diff --git a/app/controllers/api/users.php b/app/controllers/api/users.php
index a38b545f08..7563264ecf 100644
--- a/app/controllers/api/users.php
+++ b/app/controllers/api/users.php
@@ -2,8 +2,6 @@
 
 global $utopia, $response, $projectDB, $providers;
 
-use Auth\Auth;
-use Auth\Validator\Password;
 use Utopia\Exception;
 use Utopia\Response;
 use Utopia\Validator\Assoc;
@@ -14,9 +12,11 @@ use Utopia\Validator\Range;
 use Utopia\Audit\Audit;
 use Utopia\Audit\Adapters\MySQL as AuditAdapter;
 use Utopia\Locale\Locale;
-use Database\Database;
-use Database\Exception\Duplicate;
-use Database\Validator\UID;
+use Appwrite\Auth\Auth;
+use Appwrite\Auth\Validator\Password;
+use Appwrite\Database\Database;
+use Appwrite\Database\Exception\Duplicate;
+use Appwrite\Database\Validator\UID;
 use DeviceDetector\DeviceDetector;
 use GeoIp2\Database\Reader;
 
diff --git a/app/controllers/mock.php b/app/controllers/mock.php
index eb84a5b2ba..c964de1019 100644
--- a/app/controllers/mock.php
+++ b/app/controllers/mock.php
@@ -5,9 +5,9 @@ global $utopia, $request, $response;
 use Utopia\Validator\Numeric;
 use Utopia\Validator\Text;
 use Utopia\Validator\ArrayList;
-use Storage\Validators\File;
 use Utopia\Response;
 use Utopia\Validator\Host;
+use Appwrite\Storage\Validators\File;
 
 $result = [];
 
diff --git a/app/controllers/web/console.php b/app/controllers/web/console.php
index 47c19ea8ea..4a7f2c8002 100644
--- a/app/controllers/web/console.php
+++ b/app/controllers/web/console.php
@@ -6,9 +6,9 @@ global $utopia, $response, $request, $layout, $version, $providers, $projectDB;
 
 use Utopia\View;
 use Utopia\Domains\Domain;
-use Database\Database;
-use Database\Validator\UID;
-use Storage\Storage;
+use Appwrite\Database\Database;
+use Appwrite\Database\Validator\UID;
+use Appwrite\Storage\Storage;
 
 $utopia->init(function () use ($layout, $utopia) {
     $layout
diff --git a/app/init.php b/app/init.php
index 59ac3310e6..6a1a6853ce 100644
--- a/app/init.php
+++ b/app/init.php
@@ -8,14 +8,14 @@ if (file_exists(__DIR__.'/../vendor/autoload.php')) {
 use Utopia\App;
 use Utopia\Request;
 use Utopia\Response;
-use Auth\Auth;
-use Database\Database;
-use Database\Document;
-use Database\Validator\Authorization;
-use Database\Adapter\MySQL as MySQLAdapter;
-use Database\Adapter\Redis as RedisAdapter;
 use Utopia\Locale\Locale;
 use Utopia\Registry\Registry;
+use Appwrite\Auth\Auth;
+use Appwrite\Database\Database;
+use Appwrite\Database\Document;
+use Appwrite\Database\Validator\Authorization;
+use Appwrite\Database\Adapter\MySQL as MySQLAdapter;
+use Appwrite\Database\Adapter\Redis as RedisAdapter;
 use PHPMailer\PHPMailer\PHPMailer;
 
 const APP_NAME = 'Appwrite';
diff --git a/app/tasks/upgrade.php b/app/tasks/upgrade.php
index 3652ae824c..80c3b96b9b 100644
--- a/app/tasks/upgrade.php
+++ b/app/tasks/upgrade.php
@@ -5,11 +5,11 @@ require_once __DIR__.'/../init.php';
 
 global $register, $projectDB, $console, $providers, $request;
 
-use Database\Database;
-use Database\Document;
-use Database\Validator\Authorization;
 use Utopia\CLI\CLI;
 use Utopia\CLI\Console;
+use Appwrite\Database\Database;
+use Appwrite\Database\Document;
+use Appwrite\Database\Validator\Authorization;
 
 $cli = new CLI();
 $db = $register->get('db');
diff --git a/app/views/console/users/index.phtml b/app/views/console/users/index.phtml
index 62febcc212..38643da6c0 100644
--- a/app/views/console/users/index.phtml
+++ b/app/views/console/users/index.phtml
@@ -124,7 +124,7 @@ $providers = $this->getParam('providers', []);
                                             <span class="tag">Unverified</span>
                                         </span>
 
-                                        <span data-ls-if="{{user.status}} === <?php echo \Auth\Auth::USER_STATUS_BLOCKED; ?>">
+                                        <span data-ls-if="{{user.status}} === <?php echo \Appwrite\Auth\Auth::USER_STATUS_BLOCKED; ?>">
                                             <span class="tag red">Blocked</span>
                                         </span>
                                     </td>
diff --git a/app/views/console/users/view.phtml b/app/views/console/users/view.phtml
index 6bdd63b844..b428300d88 100644
--- a/app/views/console/users/view.phtml
+++ b/app/views/console/users/view.phtml
@@ -20,7 +20,7 @@
             <li data-state="/console/users/view?id={{router.params.id}}&project={{router.params.project}}">
                 <h2>General</h2>
 
-                <div data-ls-if="{{user.status}} === <?php echo \Auth\Auth::USER_STATUS_BLOCKED; ?>" style="display: none" class="box padding-small danger margin-bottom-xxl text-align-center">
+                <div data-ls-if="{{user.status}} === <?php echo \Appwrite\Auth\Auth::USER_STATUS_BLOCKED; ?>" style="display: none" class="box padding-small danger margin-bottom-xxl text-align-center">
                     This user account is blocked.
                 </div>
 
@@ -85,7 +85,7 @@
                             <input id="uid" type="text" autocomplete="off" placeholder="" data-ls-bind="{{user.$id}}" disabled data-forms-copy>
                         </div>
 
-                        <div data-ls-if="{{user.status}} !== <?php echo \Auth\Auth::USER_STATUS_BLOCKED; ?>" style="display: none">
+                        <div data-ls-if="{{user.status}} !== <?php echo \Appwrite\Auth\Auth::USER_STATUS_BLOCKED; ?>" style="display: none">
                             <form name="users.updateStatus" class="margin-bottom"
                                 data-analytics-event="submit"
                                 data-analytics-category="console"
@@ -100,11 +100,11 @@
                                 data-failure-param-alert-text="Failed to Block User"
                                 data-failure-param-alert-classname="error">
 
-                                <button name="status" type="submit" class="danger fill" value="<?php echo \Auth\Auth::USER_STATUS_BLOCKED; ?>">Block Account</button>
+                                <button name="status" type="submit" class="danger fill" value="<?php echo \Appwrite\Auth\Auth::USER_STATUS_BLOCKED; ?>">Block Account</button>
                             </form>
                         </div>
 
-                        <div data-ls-if="{{user.status}} === <?php echo \Auth\Auth::USER_STATUS_BLOCKED; ?>" style="display: none">
+                        <div data-ls-if="{{user.status}} === <?php echo \Appwrite\Auth\Auth::USER_STATUS_BLOCKED; ?>" style="display: none">
                             <form name="users.updateStatus" class="margin-bottom"
                                 data-analytics-event="submit"
                                 data-analytics-category="console"
@@ -119,7 +119,7 @@
                                 data-failure-param-alert-text="Failed to Activate User"
                                 data-failure-param-alert-classname="error">
 
-                                <button name="status" type="submit" class="fill" value="<?php echo \Auth\Auth::USER_STATUS_ACTIVATED; ?>">Activate Account</button>
+                                <button name="status" type="submit" class="fill" value="<?php echo \Appwrite\Auth\Auth::USER_STATUS_ACTIVATED; ?>">Activate Account</button>
                             </form>
                         </div>
                     </div>
diff --git a/app/workers/certificates.php b/app/workers/certificates.php
index 038b63a3d9..c087a59e34 100644
--- a/app/workers/certificates.php
+++ b/app/workers/certificates.php
@@ -1,11 +1,10 @@
 <?php
 
-use Database\Database;
-use Database\Document;
-use Database\Validator\Authorization;
-use Network\Validators\CNAME;
 use Utopia\App;
 use Utopia\Domains\Domain;
+use Appwrite\Database\Database;
+use Appwrite\Database\Validator\Authorization;
+use Appwrite\Network\Validators\CNAME;
 
 require_once __DIR__.'/../init.php';
 
diff --git a/app/workers/tasks.php b/app/workers/tasks.php
index 54a0f43eab..4797e0711d 100644
--- a/app/workers/tasks.php
+++ b/app/workers/tasks.php
@@ -2,8 +2,8 @@
 
 require_once __DIR__.'/../init.php';
 
-use Database\Database;
-use Database\Validator\Authorization;
+use Appwrite\Database\Database;
+use Appwrite\Database\Validator\Authorization;
 use Cron\CronExpression;
 
 cli_set_process_title('Tasks V1 Worker');
diff --git a/app/workers/webhooks.php b/app/workers/webhooks.php
index 62633022e3..1eb0ec7289 100644
--- a/app/workers/webhooks.php
+++ b/app/workers/webhooks.php
@@ -6,8 +6,8 @@ cli_set_process_title('Webhooks V1 Worker');
 
 echo APP_NAME.' webhooks worker v1 has started';
 
-use Database\Database;
-use Database\Validator\Authorization;
+use Appwrite\Database\Database;
+use Appwrite\Database\Validator\Authorization;
 
 class WebhooksV1
 {
diff --git a/composer.json b/composer.json
index f5a89c6963..0a1ab1be0a 100644
--- a/composer.json
+++ b/composer.json
@@ -11,16 +11,7 @@
     ],
     "autoload": {
         "psr-4": {
-            "Audit\\": "src/Audit",
-            "Auth\\": "src/Auth",
-            "Database\\": "src/Database",
-            "Event\\": "src/Event",
-            "Network\\": "src/Network",
-            "OpenSSL\\": "src/OpenSSL",
-            "Resize\\": "src/Resize",
-            "Storage\\": "src/Storage",
-            "Task\\": "src/Task",
-            "Template\\": "src/Template"
+            "Appwrite\\": "src/Appwrite"
         }
     },
     "autoload-dev": {
diff --git a/composer.lock b/composer.lock
index b195f186ac..55eb9aa6c4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -12,12 +12,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/appwrite/php-clamav.git",
-                "reference": "215460204e34d8abca25186dc41fab2116f1cd1d"
+                "reference": "4c13abddfc89d59395da0bd75c18a8eeadc2a542"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/appwrite/php-clamav/zipball/215460204e34d8abca25186dc41fab2116f1cd1d",
-                "reference": "215460204e34d8abca25186dc41fab2116f1cd1d",
+                "url": "https://api.github.com/repos/appwrite/php-clamav/zipball/4c13abddfc89d59395da0bd75c18a8eeadc2a542",
+                "reference": "4c13abddfc89d59395da0bd75c18a8eeadc2a542",
                 "shasum": ""
             },
             "require": {
@@ -49,7 +49,7 @@
                 "clamav",
                 "php"
             ],
-            "time": "2019-12-09T13:01:53+00:00"
+            "time": "2020-02-29T11:35:01+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -1111,12 +1111,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "5628725d0e4d687e29575eb41f9d5ee7de33a84c"
+                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/5628725d0e4d687e29575eb41f9d5ee7de33a84c",
-                "reference": "5628725d0e4d687e29575eb41f9d5ee7de33a84c",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc",
+                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc",
                 "shasum": ""
             },
             "require": {
@@ -1150,7 +1150,7 @@
                 "psr",
                 "psr-3"
             ],
-            "time": "2019-11-12T16:45:05+00:00"
+            "time": "2020-03-23T09:12:05+00:00"
         },
         {
             "name": "ralouphie/getallheaders",
@@ -1437,12 +1437,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/framework.git",
-                "reference": "ac1bdf5d34432620c5be97249a5e5ab0e49a69c7"
+                "reference": "e3d88b794badbd5ededcf62d708b31009111f860"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/framework/zipball/ac1bdf5d34432620c5be97249a5e5ab0e49a69c7",
-                "reference": "ac1bdf5d34432620c5be97249a5e5ab0e49a69c7",
+                "url": "https://api.github.com/repos/utopia-php/framework/zipball/e3d88b794badbd5ededcf62d708b31009111f860",
+                "reference": "e3d88b794badbd5ededcf62d708b31009111f860",
                 "shasum": ""
             },
             "require": {
@@ -1473,7 +1473,7 @@
                 "php",
                 "upf"
             ],
-            "time": "2020-02-15T05:02:58+00:00"
+            "time": "2020-03-08T15:42:21+00:00"
         },
         {
             "name": "utopia-php/locale",
@@ -1576,7 +1576,7 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/appwrite/sdk-generator",
-                "reference": "51b433031debb0aa79afe5f165c47a13038b6712"
+                "reference": "7a43413e650705843672ebe930fe6ecd77693393"
             },
             "require": {
                 "ext-curl": "*",
@@ -1606,7 +1606,7 @@
                 }
             ],
             "description": "Appwrite PHP library for generating API SDKs for multiple programming languages and platforms",
-            "time": "2020-02-16T06:24:39+00:00"
+            "time": "2020-03-01T12:19:20+00:00"
         },
         {
             "name": "doctrine/instantiator",
@@ -1779,12 +1779,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "b2c28789e80a97badd14145fda39b545d83ca3ef"
+                "reference": "a491d65139e2411c75704e871dd02bdddf5a4bdc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/b2c28789e80a97badd14145fda39b545d83ca3ef",
-                "reference": "b2c28789e80a97badd14145fda39b545d83ca3ef",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/a491d65139e2411c75704e871dd02bdddf5a4bdc",
+                "reference": "a491d65139e2411c75704e871dd02bdddf5a4bdc",
                 "shasum": ""
             },
             "require": {
@@ -1819,7 +1819,7 @@
                 "object",
                 "object graph"
             ],
-            "time": "2020-01-17T21:11:47+00:00"
+            "time": "2020-03-12T21:49:07+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -2038,12 +2038,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "7462d5f123dfc080dfdf26897032a6513644fc95"
+                "reference": "d6b5291650d058fe1162a54fee9d923de19bcda2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/7462d5f123dfc080dfdf26897032a6513644fc95",
-                "reference": "7462d5f123dfc080dfdf26897032a6513644fc95",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/d6b5291650d058fe1162a54fee9d923de19bcda2",
+                "reference": "d6b5291650d058fe1162a54fee9d923de19bcda2",
                 "shasum": ""
             },
             "require": {
@@ -2076,7 +2076,7 @@
                 }
             ],
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
-            "time": "2020-02-18T18:59:58+00:00"
+            "time": "2020-03-06T17:11:40+00:00"
         },
         {
             "name": "phpspec/prophecy",
@@ -2084,12 +2084,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "b4400efc9d206e83138e2bb97ed7f5b14b831cd9"
+                "reference": "451c3cd1418cf640de218914901e51b064abb093"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/b4400efc9d206e83138e2bb97ed7f5b14b831cd9",
-                "reference": "b4400efc9d206e83138e2bb97ed7f5b14b831cd9",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/451c3cd1418cf640de218914901e51b064abb093",
+                "reference": "451c3cd1418cf640de218914901e51b064abb093",
                 "shasum": ""
             },
             "require": {
@@ -2139,7 +2139,7 @@
                 "spy",
                 "stub"
             ],
-            "time": "2020-01-20T15:57:02+00:00"
+            "time": "2020-03-05T15:02:03+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -2206,20 +2206,20 @@
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "dev-master",
+            "version": "2.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "bc6c7c703f4ac9284b7c767f1d1ddfb114a3c0b4"
+                "reference": "050bedf145a257b1ff02746c31894800e5122946"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/bc6c7c703f4ac9284b7c767f1d1ddfb114a3c0b4",
-                "reference": "bc6c7c703f4ac9284b7c767f1d1ddfb114a3c0b4",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/050bedf145a257b1ff02746c31894800e5122946",
+                "reference": "050bedf145a257b1ff02746c31894800e5122946",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3"
+                "php": "^7.1"
             },
             "require-dev": {
                 "phpunit/phpunit": "^7.1"
@@ -2252,7 +2252,7 @@
                 "filesystem",
                 "iterator"
             ],
-            "time": "2019-12-27T07:39:30+00:00"
+            "time": "2018-09-13T20:33:42+00:00"
         },
         {
             "name": "phpunit/php-text-template",
@@ -2297,20 +2297,20 @@
         },
         {
             "name": "phpunit/php-timer",
-            "version": "dev-master",
+            "version": "2.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "0f76cad901d778be0e908160d850b5469b9dff89"
+                "reference": "1038454804406b0b5f5f520358e78c1c2f71501e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/0f76cad901d778be0e908160d850b5469b9dff89",
-                "reference": "0f76cad901d778be0e908160d850b5469b9dff89",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/1038454804406b0b5f5f520358e78c1c2f71501e",
+                "reference": "1038454804406b0b5f5f520358e78c1c2f71501e",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3"
+                "php": "^7.1"
             },
             "require-dev": {
                 "phpunit/phpunit": "^7.0"
@@ -2342,25 +2342,25 @@
             "keywords": [
                 "timer"
             ],
-            "time": "2020-01-17T12:26:29+00:00"
+            "time": "2019-06-07T04:22:29+00:00"
         },
         {
             "name": "phpunit/php-token-stream",
-            "version": "dev-master",
+            "version": "3.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "80d6b894fd17bbeb2c6432209afbda84c34e129d"
+                "reference": "995192df77f63a59e47f025390d2d1fdf8f425ff"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/80d6b894fd17bbeb2c6432209afbda84c34e129d",
-                "reference": "80d6b894fd17bbeb2c6432209afbda84c34e129d",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/995192df77f63a59e47f025390d2d1fdf8f425ff",
+                "reference": "995192df77f63a59e47f025390d2d1fdf8f425ff",
                 "shasum": ""
             },
             "require": {
                 "ext-tokenizer": "*",
-                "php": "^7.3"
+                "php": "^7.1"
             },
             "require-dev": {
                 "phpunit/phpunit": "^7.0"
@@ -2391,20 +2391,20 @@
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2020-01-17T12:30:57+00:00"
+            "time": "2019-09-17T06:23:10+00:00"
         },
         {
             "name": "phpunit/phpunit",
-            "version": "7.5.x-dev",
+            "version": "7.5.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "fc43f121f3c4ad93630bac6f9c86c23fb917b095"
+                "reference": "9467db479d1b0487c99733bb1e7944d32deded2c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fc43f121f3c4ad93630bac6f9c86c23fb917b095",
-                "reference": "fc43f121f3c4ad93630bac6f9c86c23fb917b095",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9467db479d1b0487c99733bb1e7944d32deded2c",
+                "reference": "9467db479d1b0487c99733bb1e7944d32deded2c",
                 "shasum": ""
             },
             "require": {
@@ -2475,24 +2475,24 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2020-01-23T15:43:47+00:00"
+            "time": "2020-01-08T08:45:45+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
-            "version": "dev-master",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "f48317adc82e5b3f6d2b369af78e2a721d027f5d"
+                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/f48317adc82e5b3f6d2b369af78e2a721d027f5d",
-                "reference": "f48317adc82e5b3f6d2b369af78e2a721d027f5d",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
+                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3"
+                "php": "^5.6 || ^7.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^5.7 || ^6.0"
@@ -2520,7 +2520,7 @@
             ],
             "description": "Looks up which function or method a line of code belongs to",
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
-            "time": "2020-01-17T12:04:18+00:00"
+            "time": "2017-03-04T06:30:41+00:00"
         },
         {
             "name": "sebastian/comparator",
@@ -2644,20 +2644,20 @@
         },
         {
             "name": "sebastian/environment",
-            "version": "dev-master",
+            "version": "4.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "635345ff4f2262c07379fdbb4ead0ca14efa941b"
+                "reference": "464c90d7bdf5ad4e8a6aea15c091fec0603d4368"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/635345ff4f2262c07379fdbb4ead0ca14efa941b",
-                "reference": "635345ff4f2262c07379fdbb4ead0ca14efa941b",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/464c90d7bdf5ad4e8a6aea15c091fec0603d4368",
+                "reference": "464c90d7bdf5ad4e8a6aea15c091fec0603d4368",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3"
+                "php": "^7.1"
             },
             "require-dev": {
                 "phpunit/phpunit": "^7.5"
@@ -2693,7 +2693,7 @@
                 "environment",
                 "hhvm"
             ],
-            "time": "2020-01-17T12:13:49+00:00"
+            "time": "2019-11-20T08:46:58+00:00"
         },
         {
             "name": "sebastian/exporter",
@@ -2960,20 +2960,20 @@
         },
         {
             "name": "sebastian/resource-operations",
-            "version": "dev-master",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "89893975fe3fcc2e60214471761af5e91cc7a933"
+                "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/89893975fe3fcc2e60214471761af5e91cc7a933",
-                "reference": "89893975fe3fcc2e60214471761af5e91cc7a933",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/4d7a795d35b889bf80a0cc04e08d77cedfa917a9",
+                "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3"
+                "php": "^7.1"
             },
             "type": "library",
             "extra": {
@@ -2998,7 +2998,7 @@
             ],
             "description": "Provides a list of PHP built-in functions that operate on resources",
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "time": "2019-10-23T09:09:44+00:00"
+            "time": "2018-10-04T04:07:39+00:00"
         },
         {
             "name": "sebastian/version",
@@ -3049,12 +3049,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "fbdeaec0df06cf3d51c93de80c7eb76e271f5a38"
+                "reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/fbdeaec0df06cf3d51c93de80c7eb76e271f5a38",
-                "reference": "fbdeaec0df06cf3d51c93de80c7eb76e271f5a38",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/4719fa9c18b0464d399f1a63bf624b42b6fa8d14",
+                "reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14",
                 "shasum": ""
             },
             "require": {
@@ -3066,7 +3066,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.14-dev"
+                    "dev-master": "1.15-dev"
                 }
             },
             "autoload": {
@@ -3099,7 +3099,7 @@
                 "polyfill",
                 "portable"
             ],
-            "time": "2020-01-13T11:15:53+00:00"
+            "time": "2020-02-27T09:26:54+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
@@ -3107,12 +3107,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "34094cfa9abe1f0f14f48f490772db7a775559f2"
+                "reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/34094cfa9abe1f0f14f48f490772db7a775559f2",
-                "reference": "34094cfa9abe1f0f14f48f490772db7a775559f2",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/81ffd3a9c6d707be22e3012b827de1c9775fc5ac",
+                "reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac",
                 "shasum": ""
             },
             "require": {
@@ -3124,7 +3124,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.14-dev"
+                    "dev-master": "1.15-dev"
                 }
             },
             "autoload": {
@@ -3158,7 +3158,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-01-13T11:15:53+00:00"
+            "time": "2020-03-09T19:04:49+00:00"
         },
         {
             "name": "theseer/tokenizer",
@@ -3206,12 +3206,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "8a4f8816230de7ffca3c707776007a1c9d175e55"
+                "reference": "27af7d9cd1b77fcb13b4ed452c291d9defad088b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/8a4f8816230de7ffca3c707776007a1c9d175e55",
-                "reference": "8a4f8816230de7ffca3c707776007a1c9d175e55",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/27af7d9cd1b77fcb13b4ed452c291d9defad088b",
+                "reference": "27af7d9cd1b77fcb13b4ed452c291d9defad088b",
                 "shasum": ""
             },
             "require": {
@@ -3263,7 +3263,7 @@
             "keywords": [
                 "templating"
             ],
-            "time": "2020-02-21T08:29:15+00:00"
+            "time": "2020-03-24T12:35:30+00:00"
         },
         {
             "name": "webmozart/assert",
diff --git a/docker-compose.yml b/docker-compose.yml
index 73a912f7fc..6bb22a3036 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -63,8 +63,8 @@ services:
       - telegraf
       - maildev
     environment:
-      - _APP_ENV=production
-      # - _APP_ENV=development
+      #- _APP_ENV=production
+      - _APP_ENV=development
       - _APP_OPTIONS_ABUSE=disabled
       - _APP_OPENSSL_KEY_V1=your-secret-key
       - _APP_DOMAIN=demo.appwrite.io
diff --git a/src/Auth/Auth.php b/src/Appwrite/Auth/Auth.php
similarity index 98%
rename from src/Auth/Auth.php
rename to src/Appwrite/Auth/Auth.php
index 3caf32f822..ef787b8690 100644
--- a/src/Auth/Auth.php
+++ b/src/Appwrite/Auth/Auth.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Auth;
+namespace Appwrite\Auth;
 
-use Database\Document;
+use Appwrite\Database\Document;
 
 class Auth
 {
diff --git a/src/Auth/OAuth2.php b/src/Appwrite/Auth/OAuth2.php
similarity index 99%
rename from src/Auth/OAuth2.php
rename to src/Appwrite/Auth/OAuth2.php
index 7bae79ac69..1f30d30dbf 100644
--- a/src/Auth/OAuth2.php
+++ b/src/Appwrite/Auth/OAuth2.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Auth;
+namespace Appwrite\Auth;
 
 abstract class OAuth2
 {
diff --git a/src/Auth/OAuth2/Amazon.php b/src/Appwrite/Auth/OAuth2/Amazon.php
similarity index 98%
rename from src/Auth/OAuth2/Amazon.php
rename to src/Appwrite/Auth/OAuth2/Amazon.php
index b2913fbd9c..b025c32587 100644
--- a/src/Auth/OAuth2/Amazon.php
+++ b/src/Appwrite/Auth/OAuth2/Amazon.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Auth\OAuth2;
+namespace Appwrite\Auth\OAuth2;
 
-use Auth\OAuth2;
+use Appwrite\Auth\OAuth2;
 
 // Reference Material
 // https://developer.amazon.com/docs/login-with-amazon/authorization-code-grant.html
diff --git a/src/Auth/OAuth2/Apple.php b/src/Appwrite/Auth/OAuth2/Apple.php
similarity index 98%
rename from src/Auth/OAuth2/Apple.php
rename to src/Appwrite/Auth/OAuth2/Apple.php
index 626c44cf40..427b78debb 100644
--- a/src/Auth/OAuth2/Apple.php
+++ b/src/Appwrite/Auth/OAuth2/Apple.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Auth\OAuth2;
+namespace Appwrite\Auth\OAuth2;
 
-use Auth\OAuth2;
+use Appwrite\Auth\OAuth2;
 
 // Reference Material
 // https://developer.okta.com/blog/2019/06/04/what-the-heck-is-sign-in-with-apple
diff --git a/src/Auth/OAuth2/Bitbucket.php b/src/Appwrite/Auth/OAuth2/Bitbucket.php
similarity index 98%
rename from src/Auth/OAuth2/Bitbucket.php
rename to src/Appwrite/Auth/OAuth2/Bitbucket.php
index 6f2bbc23ea..6b00cea627 100644
--- a/src/Auth/OAuth2/Bitbucket.php
+++ b/src/Appwrite/Auth/OAuth2/Bitbucket.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Auth\OAuth2;
+namespace Appwrite\Auth\OAuth2;
 
-use Auth\OAuth2;
+use Appwrite\Auth\OAuth2;
 
 // Reference Material
 // https://confluence.atlassian.com/bitbucket/oauth-on-bitbucket-cloud-238027431.html#OAuthonBitbucketCloud-Createaconsumer
diff --git a/src/Auth/OAuth2/Bitly.php b/src/Appwrite/Auth/OAuth2/Bitly.php
similarity index 98%
rename from src/Auth/OAuth2/Bitly.php
rename to src/Appwrite/Auth/OAuth2/Bitly.php
index 32adbb9217..d6f5b52629 100644
--- a/src/Auth/OAuth2/Bitly.php
+++ b/src/Appwrite/Auth/OAuth2/Bitly.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Auth\OAuth2;
+namespace Appwrite\Auth\OAuth2;
 
-use Auth\OAuth2;
+use Appwrite\Auth\OAuth2;
 
 // Reference Material
 // https://dev.bitly.com/v4_documentation.html
diff --git a/src/Auth/OAuth2/Discord.php b/src/Appwrite/Auth/OAuth2/Discord.php
similarity index 98%
rename from src/Auth/OAuth2/Discord.php
rename to src/Appwrite/Auth/OAuth2/Discord.php
index 2d25b658e8..9f0320dbfa 100644
--- a/src/Auth/OAuth2/Discord.php
+++ b/src/Appwrite/Auth/OAuth2/Discord.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Auth\OAuth2;
+namespace Appwrite\Auth\OAuth2;
 
-use Auth\OAuth2;
+use Appwrite\Auth\OAuth2;
 
 // Reference Material
 // https://discordapp.com/developers/docs/topics/oauth2
diff --git a/src/Auth/OAuth2/Dropbox.php b/src/Appwrite/Auth/OAuth2/Dropbox.php
similarity index 98%
rename from src/Auth/OAuth2/Dropbox.php
rename to src/Appwrite/Auth/OAuth2/Dropbox.php
index dbbe83de0d..9d6fac5c74 100644
--- a/src/Auth/OAuth2/Dropbox.php
+++ b/src/Appwrite/Auth/OAuth2/Dropbox.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Auth\OAuth2;
+namespace Appwrite\Auth\OAuth2;
 
-use Auth\OAuth2;
+use Appwrite\Auth\OAuth2;
 
 // Reference Material
 // https://www.dropbox.com/developers/reference/oauth-guide
diff --git a/src/Auth/OAuth2/Facebook.php b/src/Appwrite/Auth/OAuth2/Facebook.php
similarity index 97%
rename from src/Auth/OAuth2/Facebook.php
rename to src/Appwrite/Auth/OAuth2/Facebook.php
index 93fc3edc89..673ec7f4cd 100644
--- a/src/Auth/OAuth2/Facebook.php
+++ b/src/Appwrite/Auth/OAuth2/Facebook.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Auth\OAuth2;
+namespace Appwrite\Auth\OAuth2;
 
-use Auth\OAuth2;
+use Appwrite\Auth\OAuth2;
 
 class Facebook extends OAuth2
 {
diff --git a/src/Auth/OAuth2/GitHub.php b/src/Appwrite/Auth/OAuth2/GitHub.php
similarity index 97%
rename from src/Auth/OAuth2/GitHub.php
rename to src/Appwrite/Auth/OAuth2/GitHub.php
index f89fbd3255..4457409286 100644
--- a/src/Auth/OAuth2/GitHub.php
+++ b/src/Appwrite/Auth/OAuth2/GitHub.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Auth\OAuth2;
+namespace Appwrite\Auth\OAuth2;
 
-use Auth\OAuth2;
+use Appwrite\Auth\OAuth2;
 
 class Github extends OAuth2
 {
diff --git a/src/Auth/OAuth2/Gitlab.php b/src/Appwrite/Auth/OAuth2/Gitlab.php
similarity index 97%
rename from src/Auth/OAuth2/Gitlab.php
rename to src/Appwrite/Auth/OAuth2/Gitlab.php
index 9d74782145..fb5a3b9c4a 100644
--- a/src/Auth/OAuth2/Gitlab.php
+++ b/src/Appwrite/Auth/OAuth2/Gitlab.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Auth\OAuth2;
+namespace Appwrite\Auth\OAuth2;
 
-use Auth\OAuth2;
+use Appwrite\Auth\OAuth2;
 
 // Reference Material 
 // https://docs.gitlab.com/ee/api/oauth2.html
diff --git a/src/Auth/OAuth2/Google.php b/src/Appwrite/Auth/OAuth2/Google.php
similarity index 98%
rename from src/Auth/OAuth2/Google.php
rename to src/Appwrite/Auth/OAuth2/Google.php
index 9c32c938f8..ae888d554e 100644
--- a/src/Auth/OAuth2/Google.php
+++ b/src/Appwrite/Auth/OAuth2/Google.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Auth\OAuth2;
+namespace Appwrite\Auth\OAuth2;
 
-use Auth\OAuth2;
+use Appwrite\Auth\OAuth2;
 
 // Reference Material 
 // https://developers.google.com/oauthplayground/
diff --git a/src/Auth/OAuth2/LinkedIn.php b/src/Appwrite/Auth/OAuth2/LinkedIn.php
similarity index 98%
rename from src/Auth/OAuth2/LinkedIn.php
rename to src/Appwrite/Auth/OAuth2/LinkedIn.php
index 90d43541c5..46c553ffc5 100644
--- a/src/Auth/OAuth2/LinkedIn.php
+++ b/src/Appwrite/Auth/OAuth2/LinkedIn.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Auth\OAuth2;
+namespace Appwrite\Auth\OAuth2;
 
-use Auth\OAuth2;
+use Appwrite\Auth\OAuth2;
 
 class LinkedIn extends OAuth2
 {
diff --git a/src/Auth/OAuth2/Microsoft.php b/src/Appwrite/Auth/OAuth2/Microsoft.php
similarity index 98%
rename from src/Auth/OAuth2/Microsoft.php
rename to src/Appwrite/Auth/OAuth2/Microsoft.php
index b6dacbd8ce..86f435ac35 100644
--- a/src/Auth/OAuth2/Microsoft.php
+++ b/src/Appwrite/Auth/OAuth2/Microsoft.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Auth\OAuth2;
+namespace Appwrite\Auth\OAuth2;
 
-use Auth\OAuth2;
+use Appwrite\Auth\OAuth2;
 
 // Reference Material
 // https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-oauth2-auth-code-flow
diff --git a/src/Auth/OAuth2/Mock.php b/src/Appwrite/Auth/OAuth2/Mock.php
similarity index 97%
rename from src/Auth/OAuth2/Mock.php
rename to src/Appwrite/Auth/OAuth2/Mock.php
index 678e8eccb3..9f931b957f 100644
--- a/src/Auth/OAuth2/Mock.php
+++ b/src/Appwrite/Auth/OAuth2/Mock.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Auth\OAuth2;
+namespace Appwrite\Auth\OAuth2;
 
-use Auth\OAuth2;
+use Appwrite\Auth\OAuth2;
 
 class Mock extends OAuth2
 {
diff --git a/src/Auth/OAuth2/Paypal.php b/src/Appwrite/Auth/OAuth2/Paypal.php
similarity index 98%
rename from src/Auth/OAuth2/Paypal.php
rename to src/Appwrite/Auth/OAuth2/Paypal.php
index b1175cf3f5..b87973c480 100644
--- a/src/Auth/OAuth2/Paypal.php
+++ b/src/Appwrite/Auth/OAuth2/Paypal.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Auth\OAuth2;
+namespace Appwrite\Auth\OAuth2;
 
-use Auth\OAuth2;
+use Appwrite\Auth\OAuth2;
 
 // Reference Material
 // https://developer.paypal.com/docs/api/overview/
diff --git a/src/Auth/OAuth2/Salesforce.php b/src/Appwrite/Auth/OAuth2/Salesforce.php
similarity index 98%
rename from src/Auth/OAuth2/Salesforce.php
rename to src/Appwrite/Auth/OAuth2/Salesforce.php
index eed98bba70..478e055292 100644
--- a/src/Auth/OAuth2/Salesforce.php
+++ b/src/Appwrite/Auth/OAuth2/Salesforce.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Auth\OAuth2;
+namespace Appwrite\Auth\OAuth2;
 
-use Auth\OAuth2;
+use Appwrite\Auth\OAuth2;
 
 // Reference Material
 // https://help.salesforce.com/articleView?id=remoteaccess_oauth_endpoints.htm&type=5
diff --git a/src/Auth/OAuth2/Slack.php b/src/Appwrite/Auth/OAuth2/Slack.php
similarity index 98%
rename from src/Auth/OAuth2/Slack.php
rename to src/Appwrite/Auth/OAuth2/Slack.php
index 511fa78e07..87d562655e 100644
--- a/src/Auth/OAuth2/Slack.php
+++ b/src/Appwrite/Auth/OAuth2/Slack.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Auth\OAuth2;
+namespace Appwrite\Auth\OAuth2;
 
-use Auth\OAuth2;
+use Appwrite\Auth\OAuth2;
 
 class Slack extends OAuth2
 {
diff --git a/src/Auth/OAuth2/Spotify.php b/src/Appwrite/Auth/OAuth2/Spotify.php
similarity index 98%
rename from src/Auth/OAuth2/Spotify.php
rename to src/Appwrite/Auth/OAuth2/Spotify.php
index 16af27588a..bb3fafd4eb 100644
--- a/src/Auth/OAuth2/Spotify.php
+++ b/src/Appwrite/Auth/OAuth2/Spotify.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Auth\OAuth2;
+namespace Appwrite\Auth\OAuth2;
 
-use Auth\OAuth2;
+use Appwrite\Auth\OAuth2;
 
 // Reference Material
 // https://dev.twitch.tv/docs/authentication
diff --git a/src/Auth/OAuth2/Twitch.php b/src/Appwrite/Auth/OAuth2/Twitch.php
similarity index 98%
rename from src/Auth/OAuth2/Twitch.php
rename to src/Appwrite/Auth/OAuth2/Twitch.php
index 16f5847630..fa7adfcd13 100644
--- a/src/Auth/OAuth2/Twitch.php
+++ b/src/Appwrite/Auth/OAuth2/Twitch.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Auth\OAuth2;
+namespace Appwrite\Auth\OAuth2;
 
-use Auth\OAuth2;
+use Appwrite\Auth\OAuth2;
 
 // Reference Material
 // https://dev.twitch.tv/docs/authentication
diff --git a/src/Auth/OAuth2/Twitter.php b/src/Appwrite/Auth/OAuth2/Twitter.php
similarity index 100%
rename from src/Auth/OAuth2/Twitter.php
rename to src/Appwrite/Auth/OAuth2/Twitter.php
diff --git a/src/Auth/OAuth2/Vk.php b/src/Appwrite/Auth/OAuth2/Vk.php
similarity index 98%
rename from src/Auth/OAuth2/Vk.php
rename to src/Appwrite/Auth/OAuth2/Vk.php
index 213d6e2e33..6e9d6fcf7e 100644
--- a/src/Auth/OAuth2/Vk.php
+++ b/src/Appwrite/Auth/OAuth2/Vk.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Auth\OAuth2;
+namespace Appwrite\Auth\OAuth2;
 
-use Auth\OAuth2;
+use Appwrite\Auth\OAuth2;
 
 // Reference Material
 // https://vk.com/dev/first_guide
diff --git a/src/Auth/OAuth2/Yahoo.php b/src/Appwrite/Auth/OAuth2/Yahoo.php
similarity index 98%
rename from src/Auth/OAuth2/Yahoo.php
rename to src/Appwrite/Auth/OAuth2/Yahoo.php
index 39c5752f23..46d83f18c5 100644
--- a/src/Auth/OAuth2/Yahoo.php
+++ b/src/Appwrite/Auth/OAuth2/Yahoo.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Auth\OAuth2;
+namespace Appwrite\Auth\OAuth2;
 
-use Auth\OAuth2;
+use Appwrite\Auth\OAuth2;
 
 // Reference Material
 // https://developer.yahoo.com/oauth2/guide/
diff --git a/src/Auth/OAuth2/Yandex.php b/src/Appwrite/Auth/OAuth2/Yandex.php
similarity index 98%
rename from src/Auth/OAuth2/Yandex.php
rename to src/Appwrite/Auth/OAuth2/Yandex.php
index 890352195f..138862d18b 100644
--- a/src/Auth/OAuth2/Yandex.php
+++ b/src/Appwrite/Auth/OAuth2/Yandex.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Auth\OAuth2;
+namespace Appwrite\Auth\OAuth2;
 
-use Auth\OAuth2;
+use Appwrite\Auth\OAuth2;
 
 // Reference Material
 // https://tech.yandex.com/passport/doc/dg/reference/request-docpage/
diff --git a/src/Auth/Validator/Password.php b/src/Appwrite/Auth/Validator/Password.php
similarity index 94%
rename from src/Auth/Validator/Password.php
rename to src/Appwrite/Auth/Validator/Password.php
index f8441881ae..494da67fb0 100644
--- a/src/Auth/Validator/Password.php
+++ b/src/Appwrite/Auth/Validator/Password.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Auth\Validator;
+namespace Appwrite\Auth\Validator;
 
 use Utopia\Validator;
 
diff --git a/src/Database/Adapter.php b/src/Appwrite/Database/Adapter.php
similarity index 98%
rename from src/Database/Adapter.php
rename to src/Appwrite/Database/Adapter.php
index 12f649ce10..6fa79cbdcd 100644
--- a/src/Database/Adapter.php
+++ b/src/Appwrite/Database/Adapter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Database;
+namespace Appwrite\Database;
 
 use Exception;
 
diff --git a/src/Database/Adapter/MySQL.php b/src/Appwrite/Database/Adapter/MySQL.php
similarity index 99%
rename from src/Database/Adapter/MySQL.php
rename to src/Appwrite/Database/Adapter/MySQL.php
index 39f01d9cf6..4f05a02db7 100644
--- a/src/Database/Adapter/MySQL.php
+++ b/src/Appwrite/Database/Adapter/MySQL.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Database\Adapter;
+namespace Appwrite\Database\Adapter;
 
 use Utopia\Registry\Registry;
+use Appwrite\Database\Adapter;
+use Appwrite\Database\Exception\Duplicate;
+use Appwrite\Database\Validator\Authorization;
 use Exception;
 use PDO;
 use Redis as Client;
-use Database\Adapter;
-use Database\Exception\Duplicate;
-use Database\Validator\Authorization;
 
 class MySQL extends Adapter
 {
diff --git a/src/Database/Adapter/Redis.php b/src/Appwrite/Database/Adapter/Redis.php
similarity index 98%
rename from src/Database/Adapter/Redis.php
rename to src/Appwrite/Database/Adapter/Redis.php
index e22aa3cb4a..38a70b32e9 100644
--- a/src/Database/Adapter/Redis.php
+++ b/src/Appwrite/Database/Adapter/Redis.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Database\Adapter;
+namespace Appwrite\Database\Adapter;
 
 use Utopia\Registry\Registry;
+use Appwrite\Database\Adapter;
 use Exception;
 use Redis as Client;
-use Database\Adapter;
 
 class Redis extends Adapter
 {
diff --git a/src/Database/Database.php b/src/Appwrite/Database/Database.php
similarity index 97%
rename from src/Database/Database.php
rename to src/Appwrite/Database/Database.php
index 8f3e75ce30..6540c2f251 100644
--- a/src/Database/Database.php
+++ b/src/Appwrite/Database/Database.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Database;
+namespace Appwrite\Database;
 
 use Exception;
-use Database\Validator\Authorization;
-use Database\Validator\Structure;
-use Database\Exception\Authorization as AuthorizationException;
-use Database\Exception\Structure as StructureException;
+use Appwrite\Database\Validator\Authorization;
+use Appwrite\Database\Validator\Structure;
+use Appwrite\Database\Exception\Authorization as AuthorizationException;
+use Appwrite\Database\Exception\Structure as StructureException;
 
 class Database
 {
diff --git a/src/Database/Document.php b/src/Appwrite/Database/Document.php
similarity index 99%
rename from src/Database/Document.php
rename to src/Appwrite/Database/Document.php
index 8c47d45e35..ef4ee57f64 100644
--- a/src/Database/Document.php
+++ b/src/Appwrite/Database/Document.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Database;
+namespace Appwrite\Database;
 
 use ArrayObject;
 
diff --git a/src/Database/Exception/Authorization.php b/src/Appwrite/Database/Exception/Authorization.php
similarity index 56%
rename from src/Database/Exception/Authorization.php
rename to src/Appwrite/Database/Exception/Authorization.php
index 264e44d995..e87e797079 100644
--- a/src/Database/Exception/Authorization.php
+++ b/src/Appwrite/Database/Exception/Authorization.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Database\Exception;
+namespace Appwrite\Database\Exception;
 
 class Authorization extends \Exception
 {
diff --git a/src/Database/Exception/Duplicate.php b/src/Appwrite/Database/Exception/Duplicate.php
similarity index 54%
rename from src/Database/Exception/Duplicate.php
rename to src/Appwrite/Database/Exception/Duplicate.php
index b1874aecf7..b211a14969 100644
--- a/src/Database/Exception/Duplicate.php
+++ b/src/Appwrite/Database/Exception/Duplicate.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Database\Exception;
+namespace Appwrite\Database\Exception;
 
 class Duplicate extends \Exception
 {
diff --git a/src/Database/Exception/Structure.php b/src/Appwrite/Database/Exception/Structure.php
similarity index 54%
rename from src/Database/Exception/Structure.php
rename to src/Appwrite/Database/Exception/Structure.php
index e8ff72a123..0728308f0e 100644
--- a/src/Database/Exception/Structure.php
+++ b/src/Appwrite/Database/Exception/Structure.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Database\Exception;
+namespace Appwrite\Database\Exception;
 
 class Structure extends \Exception
 {
diff --git a/src/Database/Validator/Authorization.php b/src/Appwrite/Database/Validator/Authorization.php
similarity index 97%
rename from src/Database/Validator/Authorization.php
rename to src/Appwrite/Database/Validator/Authorization.php
index 4dff5b8545..3d556e0bdd 100644
--- a/src/Database/Validator/Authorization.php
+++ b/src/Appwrite/Database/Validator/Authorization.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Database\Validator;
+namespace Appwrite\Database\Validator;
 
-use Database\Document;
+use Appwrite\Database\Document;
 use Utopia\Validator;
 
 class Authorization extends Validator
diff --git a/src/Database/Validator/Collection.php b/src/Appwrite/Database/Validator/Collection.php
similarity index 91%
rename from src/Database/Validator/Collection.php
rename to src/Appwrite/Database/Validator/Collection.php
index dd08a62eba..d2a0442758 100644
--- a/src/Database/Validator/Collection.php
+++ b/src/Appwrite/Database/Validator/Collection.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Database\Validator;
+namespace Appwrite\Database\Validator;
 
-use Database\Database;
-use Database\Document;
+use Appwrite\Database\Database;
+use Appwrite\Database\Document;
 
 class Collection extends Structure
 {
diff --git a/src/Database/Validator/Key.php b/src/Appwrite/Database/Validator/Key.php
similarity index 95%
rename from src/Database/Validator/Key.php
rename to src/Appwrite/Database/Validator/Key.php
index cf266b1152..aef689fe02 100644
--- a/src/Database/Validator/Key.php
+++ b/src/Appwrite/Database/Validator/Key.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Database\Validator;
+namespace Appwrite\Database\Validator;
 
 use Utopia\Validator;
 
diff --git a/src/Database/Validator/Permissions.php b/src/Appwrite/Database/Validator/Permissions.php
similarity index 95%
rename from src/Database/Validator/Permissions.php
rename to src/Appwrite/Database/Validator/Permissions.php
index 964ba6bcf8..90144df382 100644
--- a/src/Database/Validator/Permissions.php
+++ b/src/Appwrite/Database/Validator/Permissions.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Database\Validator;
+namespace Appwrite\Database\Validator;
 
-use Database\Document;
+use Appwrite\Database\Document;
 use Utopia\Validator;
 
 class Permissions extends Validator
diff --git a/src/Database/Validator/Structure.php b/src/Appwrite/Database/Validator/Structure.php
similarity index 98%
rename from src/Database/Validator/Structure.php
rename to src/Appwrite/Database/Validator/Structure.php
index 8077b334aa..e84517979a 100644
--- a/src/Database/Validator/Structure.php
+++ b/src/Appwrite/Database/Validator/Structure.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Database\Validator;
+namespace Appwrite\Database\Validator;
 
-use Database\Database;
-use Database\Document;
+use Appwrite\Database\Database;
+use Appwrite\Database\Document;
 use Utopia\Validator;
 
 class Structure extends Validator
diff --git a/src/Database/Validator/UID.php b/src/Appwrite/Database/Validator/UID.php
similarity index 93%
rename from src/Database/Validator/UID.php
rename to src/Appwrite/Database/Validator/UID.php
index 7c132ac355..5dc1b8d694 100644
--- a/src/Database/Validator/UID.php
+++ b/src/Appwrite/Database/Validator/UID.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Database\Validator;
+namespace Appwrite\Database\Validator;
 
 use Utopia\Validator;
 
diff --git a/src/Event/Event.php b/src/Appwrite/Event/Event.php
similarity index 97%
rename from src/Event/Event.php
rename to src/Appwrite/Event/Event.php
index 42fad1edd6..45b4405b9e 100644
--- a/src/Event/Event.php
+++ b/src/Appwrite/Event/Event.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Event;
+namespace Appwrite\Event;
 
 use Resque;
 
diff --git a/src/Network/Validators/CNAME.php b/src/Appwrite/Network/Validators/CNAME.php
similarity index 96%
rename from src/Network/Validators/CNAME.php
rename to src/Appwrite/Network/Validators/CNAME.php
index 188dba2a55..23daf0392a 100644
--- a/src/Network/Validators/CNAME.php
+++ b/src/Appwrite/Network/Validators/CNAME.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Network\Validators;
+namespace Appwrite\Network\Validators;
 
 use Utopia\Validator;
 
diff --git a/src/OpenSSL/OpenSSL.php b/src/Appwrite/OpenSSL/OpenSSL.php
similarity index 98%
rename from src/OpenSSL/OpenSSL.php
rename to src/Appwrite/OpenSSL/OpenSSL.php
index 3dd2dabf37..ab535076db 100644
--- a/src/OpenSSL/OpenSSL.php
+++ b/src/Appwrite/OpenSSL/OpenSSL.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OpenSSL;
+namespace Appwrite\OpenSSL;
 
 class OpenSSL
 {
diff --git a/src/Resize/Resize.php b/src/Appwrite/Resize/Resize.php
similarity index 99%
rename from src/Resize/Resize.php
rename to src/Appwrite/Resize/Resize.php
index 30bc109f42..fed3e92c9e 100644
--- a/src/Resize/Resize.php
+++ b/src/Appwrite/Resize/Resize.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Resize;
+namespace Appwrite\Resize;
 
 use Exception;
 use Imagick;
diff --git a/src/Storage/Compression/Algorithms/GZIP.php b/src/Appwrite/Storage/Compression/Algorithms/GZIP.php
similarity index 88%
rename from src/Storage/Compression/Algorithms/GZIP.php
rename to src/Appwrite/Storage/Compression/Algorithms/GZIP.php
index 04dddfb359..61a6ccc8ff 100644
--- a/src/Storage/Compression/Algorithms/GZIP.php
+++ b/src/Appwrite/Storage/Compression/Algorithms/GZIP.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Storage\Compression\Algorithms;
+namespace Appwrite\Storage\Compression\Algorithms;
 
-use Storage\Compression\Compression;
+use Appwrite\Storage\Compression\Compression;
 
 class GZIP extends Compression
 {
diff --git a/src/Storage/Compression/Compression.php b/src/Appwrite/Storage/Compression/Compression.php
similarity index 91%
rename from src/Storage/Compression/Compression.php
rename to src/Appwrite/Storage/Compression/Compression.php
index 87a70d521a..ed78ed1c4a 100644
--- a/src/Storage/Compression/Compression.php
+++ b/src/Appwrite/Storage/Compression/Compression.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Storage\Compression;
+namespace Appwrite\Storage\Compression;
 
 abstract class Compression
 {
diff --git a/src/Storage/Device.php b/src/Appwrite/Storage/Device.php
similarity index 99%
rename from src/Storage/Device.php
rename to src/Appwrite/Storage/Device.php
index 0d3d976e07..1f9eb940e4 100644
--- a/src/Storage/Device.php
+++ b/src/Appwrite/Storage/Device.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Storage;
+namespace Appwrite\Storage;
 
 use Exception;
 
diff --git a/src/Storage/Devices/Local.php b/src/Appwrite/Storage/Devices/Local.php
similarity index 98%
rename from src/Storage/Devices/Local.php
rename to src/Appwrite/Storage/Devices/Local.php
index c3180d2130..17dbbb28ea 100644
--- a/src/Storage/Devices/Local.php
+++ b/src/Appwrite/Storage/Devices/Local.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Storage\Devices;
+namespace Appwrite\Storage\Devices;
 
-use Storage\Device;
+use Exception;
+use Appwrite\Storage\Device;
 
 class Local extends Device
 {
diff --git a/src/Storage/Devices/S3.php b/src/Appwrite/Storage/Devices/S3.php
similarity index 92%
rename from src/Storage/Devices/S3.php
rename to src/Appwrite/Storage/Devices/S3.php
index 227712b4a6..e161c3be48 100644
--- a/src/Storage/Devices/S3.php
+++ b/src/Appwrite/Storage/Devices/S3.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Storage\Devices;
+namespace Appwrite\Storage\Devices;
 
-use Storage\Device;
+use Appwrite\Storage\Device;
 
 class S3 extends Device
 {
diff --git a/src/Storage/Storage.php b/src/Appwrite/Storage/Storage.php
similarity index 98%
rename from src/Storage/Storage.php
rename to src/Appwrite/Storage/Storage.php
index bbb1f76e58..a5d38e0f53 100644
--- a/src/Storage/Storage.php
+++ b/src/Appwrite/Storage/Storage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Storage;
+namespace Appwrite\Storage;
 
 use Exception;
 
diff --git a/src/Storage/Validators/File.php b/src/Appwrite/Storage/Validators/File.php
similarity index 91%
rename from src/Storage/Validators/File.php
rename to src/Appwrite/Storage/Validators/File.php
index 248c410403..e7fe740acf 100644
--- a/src/Storage/Validators/File.php
+++ b/src/Appwrite/Storage/Validators/File.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Storage\Validators;
+namespace Appwrite\Storage\Validators;
 
 use Utopia\Validator;
 
diff --git a/src/Storage/Validators/FileName.php b/src/Appwrite/Storage/Validators/FileName.php
similarity index 93%
rename from src/Storage/Validators/FileName.php
rename to src/Appwrite/Storage/Validators/FileName.php
index 62236b1220..187b50e5d9 100644
--- a/src/Storage/Validators/FileName.php
+++ b/src/Appwrite/Storage/Validators/FileName.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Storage\Validators;
+namespace Appwrite\Storage\Validators;
 
 use Utopia\Validator;
 
diff --git a/src/Storage/Validators/FileSize.php b/src/Appwrite/Storage/Validators/FileSize.php
similarity index 94%
rename from src/Storage/Validators/FileSize.php
rename to src/Appwrite/Storage/Validators/FileSize.php
index 7cc5b776ab..c004a6b9de 100644
--- a/src/Storage/Validators/FileSize.php
+++ b/src/Appwrite/Storage/Validators/FileSize.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Storage\Validators;
+namespace Appwrite\Storage\Validators;
 
 use Utopia\Validator;
 
diff --git a/src/Storage/Validators/FileType.php b/src/Appwrite/Storage/Validators/FileType.php
similarity index 97%
rename from src/Storage/Validators/FileType.php
rename to src/Appwrite/Storage/Validators/FileType.php
index 711bdb8263..03adbd0ee1 100644
--- a/src/Storage/Validators/FileType.php
+++ b/src/Appwrite/Storage/Validators/FileType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Storage\Validators;
+namespace Appwrite\Storage\Validators;
 
 use Exception;
 use Utopia\Validator;
diff --git a/src/Storage/Validators/Upload.php b/src/Appwrite/Storage/Validators/Upload.php
similarity index 91%
rename from src/Storage/Validators/Upload.php
rename to src/Appwrite/Storage/Validators/Upload.php
index 89cd0cbea3..122b7753a9 100644
--- a/src/Storage/Validators/Upload.php
+++ b/src/Appwrite/Storage/Validators/Upload.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Storage\Validators;
+namespace Appwrite\Storage\Validators;
 
 use Utopia\Validator;
 
diff --git a/src/Task/Validator/Cron.php b/src/Appwrite/Task/Validator/Cron.php
similarity index 94%
rename from src/Task/Validator/Cron.php
rename to src/Appwrite/Task/Validator/Cron.php
index 927f46e439..2188b04ec4 100644
--- a/src/Task/Validator/Cron.php
+++ b/src/Appwrite/Task/Validator/Cron.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Task\Validator;
+namespace Appwrite\Task\Validator;
 
 use Cron\CronExpression;
 use Utopia\Validator;
diff --git a/src/Template/Template.php b/src/Appwrite/Template/Template.php
similarity index 98%
rename from src/Template/Template.php
rename to src/Appwrite/Template/Template.php
index 98ed1693fb..18dfecd514 100644
--- a/src/Template/Template.php
+++ b/src/Appwrite/Template/Template.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Template;
+namespace Appwrite\Template;
 
 use Exception;
 use Utopia\View;
diff --git a/tests/unit/Auth/AuthTest.php b/tests/unit/Auth/AuthTest.php
index 92c8d04a3f..39728bb37b 100644
--- a/tests/unit/Auth/AuthTest.php
+++ b/tests/unit/Auth/AuthTest.php
@@ -2,8 +2,8 @@
 
 namespace Appwrite\Tests;
 
-use Auth\Auth;
-use Database\Document;
+use Appwrite\Auth\Auth;
+use Appwrite\Database\Document;
 use PHPUnit\Framework\TestCase;
 
 class AuthTest extends TestCase
diff --git a/tests/unit/Auth/Validator/PasswordTest.php b/tests/unit/Auth/Validator/PasswordTest.php
index 440a194cc2..0e07e6c102 100644
--- a/tests/unit/Auth/Validator/PasswordTest.php
+++ b/tests/unit/Auth/Validator/PasswordTest.php
@@ -2,7 +2,7 @@
 
 namespace Appwrite\Tests;
 
-use Auth\Validator\Password;
+use Appwrite\Auth\Validator\Password;
 use PHPUnit\Framework\TestCase;
 
 class PasswordTestTest extends TestCase
diff --git a/tests/unit/Event/EventTest.php b/tests/unit/Event/EventTest.php
index ae17e54f41..151dab1233 100644
--- a/tests/unit/Event/EventTest.php
+++ b/tests/unit/Event/EventTest.php
@@ -3,7 +3,7 @@
 namespace Appwrite\Tests;
 
 use Utopia\Request;
-use Event\Event;
+use Appwrite\Event\Event;
 use PHPUnit\Framework\TestCase;
 
 class EventTest extends TestCase
diff --git a/tests/unit/Network/Validators/CNAMETest.php b/tests/unit/Network/Validators/CNAMETest.php
index 98a59e674e..995141c0ed 100644
--- a/tests/unit/Network/Validators/CNAMETest.php
+++ b/tests/unit/Network/Validators/CNAMETest.php
@@ -2,7 +2,7 @@
 
 namespace Appwrite\Tests;
 
-use Network\Validators\CNAME;
+use Appwrite\Network\Validators\CNAME;
 use PHPUnit\Framework\TestCase;
 
 class CNAMETest extends TestCase
diff --git a/tests/unit/OpenSSL/OpenSSLTest.php b/tests/unit/OpenSSL/OpenSSLTest.php
index e08889f989..2df341b2b2 100644
--- a/tests/unit/OpenSSL/OpenSSLTest.php
+++ b/tests/unit/OpenSSL/OpenSSLTest.php
@@ -2,7 +2,7 @@
 
 namespace Appwrite\Tests;
 
-use OpenSSL\OpenSSL;
+use Appwrite\OpenSSL\OpenSSL;
 use PHPUnit\Framework\TestCase;
 
 class OpenSSLTest extends TestCase
diff --git a/tests/unit/Resize/ResizeTest.php b/tests/unit/Resize/ResizeTest.php
index 26f961887e..b5926bfdc7 100644
--- a/tests/unit/Resize/ResizeTest.php
+++ b/tests/unit/Resize/ResizeTest.php
@@ -2,7 +2,7 @@
 
 namespace Appwrite\Tests;
 
-use Resize\Resize;
+use Appwrite\Resize\Resize;
 use PHPUnit\Framework\TestCase;
 
 class ResizeTest extends TestCase
diff --git a/tests/unit/Storage/Compression/Algorithms/GZIPTest.php b/tests/unit/Storage/Compression/Algorithms/GZIPTest.php
index 1bfd3f26a1..b041f8abd5 100644
--- a/tests/unit/Storage/Compression/Algorithms/GZIPTest.php
+++ b/tests/unit/Storage/Compression/Algorithms/GZIPTest.php
@@ -2,8 +2,7 @@
 
 namespace Appwrite\Tests;
 
-use Exception;
-use Storage\Compression\Algorithms\GZIP;
+use Appwrite\Storage\Compression\Algorithms\GZIP;
 use PHPUnit\Framework\TestCase;
 
 class GZIPTest extends TestCase
diff --git a/tests/unit/Storage/Devices/LocalTest.php b/tests/unit/Storage/Devices/LocalTest.php
index 08fd840007..faa21fb095 100644
--- a/tests/unit/Storage/Devices/LocalTest.php
+++ b/tests/unit/Storage/Devices/LocalTest.php
@@ -2,8 +2,7 @@
 
 namespace Appwrite\Tests;
 
-use Exception;
-use Storage\Devices\Local;
+use Appwrite\Storage\Devices\Local;
 use PHPUnit\Framework\TestCase;
 
 class LocalTest extends TestCase
diff --git a/tests/unit/Storage/StorageTest.php b/tests/unit/Storage/StorageTest.php
index 139638e879..66bbd48527 100644
--- a/tests/unit/Storage/StorageTest.php
+++ b/tests/unit/Storage/StorageTest.php
@@ -3,8 +3,8 @@
 namespace Appwrite\Tests;
 
 use Exception;
-use Storage\Storage;
-use Storage\Devices\Local;
+use Appwrite\Storage\Storage;
+use Appwrite\Storage\Devices\Local;
 use PHPUnit\Framework\TestCase;
 
 Storage::addDevice('disk-a', new Local(__DIR__ . '/../../resources/disk-a'));
@@ -22,8 +22,8 @@ class StorageTest extends TestCase
 
     public function testGetters()
     {
-        $this->assertEquals(get_class(Storage::getDevice('disk-a')), 'Storage\Devices\Local');
-        $this->assertEquals(get_class(Storage::getDevice('disk-b')), 'Storage\Devices\Local');
+        $this->assertEquals(get_class(Storage::getDevice('disk-a')), 'Appwrite\Storage\Devices\Local');
+        $this->assertEquals(get_class(Storage::getDevice('disk-b')), 'Appwrite\Storage\Devices\Local');
 
         try {
             get_class(Storage::getDevice('disk-c'));
diff --git a/tests/unit/Storage/Validators/FileNameTest.php b/tests/unit/Storage/Validators/FileNameTest.php
index c22182ea9f..4e021d6891 100644
--- a/tests/unit/Storage/Validators/FileNameTest.php
+++ b/tests/unit/Storage/Validators/FileNameTest.php
@@ -2,7 +2,7 @@
 
 namespace Appwrite\Tests;
 
-use Storage\Validators\FileName;
+use Appwrite\Storage\Validators\FileName;
 use PHPUnit\Framework\TestCase;
 
 class FileNameTest extends TestCase
diff --git a/tests/unit/Storage/Validators/FileSizeTest.php b/tests/unit/Storage/Validators/FileSizeTest.php
index c4acd175e9..3ce1235916 100644
--- a/tests/unit/Storage/Validators/FileSizeTest.php
+++ b/tests/unit/Storage/Validators/FileSizeTest.php
@@ -2,7 +2,7 @@
 
 namespace Appwrite\Tests;
 
-use Storage\Validators\FileSize;
+use Appwrite\Storage\Validators\FileSize;
 use PHPUnit\Framework\TestCase;
 
 class FileSizeTest extends TestCase
diff --git a/tests/unit/Storage/Validators/FileTypeTest.php b/tests/unit/Storage/Validators/FileTypeTest.php
index a6cb115aaf..c913baab08 100644
--- a/tests/unit/Storage/Validators/FileTypeTest.php
+++ b/tests/unit/Storage/Validators/FileTypeTest.php
@@ -2,7 +2,7 @@
 
 namespace Appwrite\Tests;
 
-use Storage\Validators\FileType;
+use Appwrite\Storage\Validators\FileType;
 use PHPUnit\Framework\TestCase;
 
 class FileTypeTest extends TestCase
diff --git a/tests/unit/Storage/Validators/UploadTest.php b/tests/unit/Storage/Validators/UploadTest.php
index 19c14f0d44..50644b66fe 100644
--- a/tests/unit/Storage/Validators/UploadTest.php
+++ b/tests/unit/Storage/Validators/UploadTest.php
@@ -2,7 +2,7 @@
 
 namespace Appwrite\Tests;
 
-use Storage\Validators\Upload;
+use Appwrite\Storage\Validators\Upload;
 use PHPUnit\Framework\TestCase;
 
 class UploadTest extends TestCase
diff --git a/tests/unit/Task/Validator/CronTest.php b/tests/unit/Task/Validator/CronTest.php
index eed1f9d01e..2813ebab0e 100644
--- a/tests/unit/Task/Validator/CronTest.php
+++ b/tests/unit/Task/Validator/CronTest.php
@@ -2,7 +2,7 @@
 
 namespace Appwrite\Tests;
 
-use Task\Validator\Cron;
+use Appwrite\Task\Validator\Cron;
 use PHPUnit\Framework\TestCase;
 
 class CronTest extends TestCase
diff --git a/tests/unit/Template/TemplateTest.php b/tests/unit/Template/TemplateTest.php
index 29d6cb507d..b09fe67b2e 100644
--- a/tests/unit/Template/TemplateTest.php
+++ b/tests/unit/Template/TemplateTest.php
@@ -2,7 +2,7 @@
 
 namespace Appwrite\Tests;
 
-use Template\Template;
+use Appwrite\Template\Template;
 use PHPUnit\Framework\TestCase;
 
 class TemplateTest extends TestCase