diff --git a/app/controllers/users.php b/app/controllers/admin/users.php
similarity index 99%
rename from app/controllers/users.php
rename to app/controllers/admin/users.php
index 716aa2db68..f13ca28a70 100644
--- a/app/controllers/users.php
+++ b/app/controllers/admin/users.php
@@ -16,7 +16,7 @@ use Database\Validator\UID;
 use DeviceDetector\DeviceDetector;
 use GeoIp2\Database\Reader;
 
-include_once 'shared/api.php';
+include_once '../shared/api.php';
 
 $utopia->get('/v1/users')
     ->desc('List Users')
diff --git a/app/controllers/account.php b/app/controllers/client/account.php
similarity index 99%
rename from app/controllers/account.php
rename to app/controllers/client/account.php
index 37c67c156f..1bf8a68e38 100644
--- a/app/controllers/account.php
+++ b/app/controllers/client/account.php
@@ -13,7 +13,7 @@ use Database\Validator\Authorization;
 use DeviceDetector\DeviceDetector;
 use GeoIp2\Database\Reader;
 
-include_once 'shared/api.php';
+include_once '../shared/api.php';
 
 $utopia->get('/v1/account')
     ->desc('Get Account')
diff --git a/app/controllers/auth.php b/app/controllers/client/auth.php
similarity index 99%
rename from app/controllers/auth.php
rename to app/controllers/client/auth.php
index 4b9e4a409d..0ebe403548 100644
--- a/app/controllers/auth.php
+++ b/app/controllers/client/auth.php
@@ -18,7 +18,7 @@ use Database\Validator\UID;
 use Template\Template;
 use OpenSSL\OpenSSL;
 
-include_once 'shared/api.php';
+include_once '../shared/api.php';
 
 $utopia->post('/v1/auth/register')
     ->desc('Register')
diff --git a/app/controllers/avatars.php b/app/controllers/client/avatars.php
similarity index 99%
rename from app/controllers/avatars.php
rename to app/controllers/client/avatars.php
index 88d9aab0f2..3c5b99c75d 100644
--- a/app/controllers/avatars.php
+++ b/app/controllers/client/avatars.php
@@ -15,7 +15,7 @@ use BaconQrCode\Renderer\Image\ImagickImageBackEnd;
 use BaconQrCode\Renderer\RendererStyle\RendererStyle;
 use BaconQrCode\Writer;
 
-include_once 'shared/api.php';
+include_once '../shared/api.php';
 
 $types = [
     'browsers' => include __DIR__.'/../config/avatars/browsers.php',
diff --git a/app/controllers/database.php b/app/controllers/client/database.php
similarity index 99%
rename from app/controllers/database.php
rename to app/controllers/client/database.php
index 2cf404cd7b..955026425d 100644
--- a/app/controllers/database.php
+++ b/app/controllers/client/database.php
@@ -19,7 +19,7 @@ use Database\Validator\Authorization;
 use Database\Exception\Authorization as AuthorizationException;
 use Database\Exception\Structure as StructureException;
 
-include_once 'shared/api.php';
+include_once '../shared/api.php';
 
 $isDev = (App::ENV_TYPE_PRODUCTION !== $utopia->getEnv());
 
diff --git a/app/controllers/locale.php b/app/controllers/client/locale.php
similarity index 99%
rename from app/controllers/locale.php
rename to app/controllers/client/locale.php
index 9e67a7404c..0d6826569f 100644
--- a/app/controllers/locale.php
+++ b/app/controllers/client/locale.php
@@ -6,7 +6,7 @@ use Utopia\App;
 use Utopia\Locale\Locale;
 use GeoIp2\Database\Reader;
 
-include_once 'shared/api.php';
+include_once '../shared/api.php';
 
 $utopia->get('/v1/locale')
     ->desc('Get User Locale')
diff --git a/app/controllers/storage.php b/app/controllers/client/storage.php
similarity index 99%
rename from app/controllers/storage.php
rename to app/controllers/client/storage.php
index b918e59b1f..cc88d07514 100644
--- a/app/controllers/storage.php
+++ b/app/controllers/client/storage.php
@@ -22,7 +22,7 @@ use Storage\Compression\Algorithms\GZIP;
 use Resize\Resize;
 use OpenSSL\OpenSSL;
 
-include_once 'shared/api.php';
+include_once '../shared/api.php';
 
 Storage::addDevice('local', new Local('app-'.$project->getUid()));
 
diff --git a/app/controllers/teams.php b/app/controllers/client/teams.php
similarity index 99%
rename from app/controllers/teams.php
rename to app/controllers/client/teams.php
index 21f6942dea..0b6ad0cb66 100644
--- a/app/controllers/teams.php
+++ b/app/controllers/client/teams.php
@@ -18,7 +18,7 @@ use Database\Validator\Authorization;
 use Template\Template;
 use Auth\Auth;
 
-include_once 'shared/api.php';
+include_once '../shared/api.php';
 
 $utopia->get('/v1/teams')
     ->desc('List Teams')