diff --git a/app/config/services.php b/app/config/services.php
index 0e4a3385c..b3bbd1479 100644
--- a/app/config/services.php
+++ b/app/config/services.php
@@ -3,81 +3,81 @@
 return [
     '/' => [
         'name' => 'Homepage',
-        'controller' => 'controllers/home.php',
+        'controller' => 'controllers/web/home.php',
         'sdk' => false,
         'tests' => false,
     ],
     'console/' => [
         'name' => 'Console',
-        'controller' => 'controllers/console.php',
+        'controller' => 'controllers/web/console.php',
         'sdk' => false,
         'tests' => false,
     ],
     'v1/account' => [
         'name' => 'Account',
         'description' => '/docs/services/account.md',
-        'controller' => 'controllers/account.php',
+        'controller' => 'controllers/api/account.php',
         'sdk' => true,
         'tests' => false,
     ],
     'v1/auth' => [ // Add to docs later: You can also learn how to [configure support for our supported OAuth providers](/docs/oauth)
         'name' => 'Auth',
         'description' => '/docs/services/auth.md',
-        'controller' => 'controllers/auth.php',
+        'controller' => 'controllers/api/auth.php',
         'sdk' => true,
         'tests' => false,
     ],
     'v1/avatars' => [
         'name' => 'Avatars',
         'description' => '/docs/services/avatars.md',
-        'controller' => 'controllers/avatars.php',
+        'controller' => 'controllers/api/avatars.php',
         'sdk' => true,
         'tests' => false,
     ],
     'v1/database' => [
         'name' => 'Database',
         'description' => '/docs/services/database.md',
-        'controller' => 'controllers/database.php',
+        'controller' => 'controllers/api/database.php',
         'sdk' => true,
         'tests' => false,
     ],
     'v1/locale' => [
         'name' => 'Locale',
         'description' => '/docs/services/locale.md',
-        'controller' => 'controllers/locale.php',
+        'controller' => 'controllers/api/locale.php',
         'sdk' => true,
         'tests' => false,
     ],
     'v1/health' => [
         'name' => 'Health',
-        'controller' => 'controllers/health.php',
+        'controller' => 'controllers/api/health.php',
         'sdk' => false,
         'tests' => false,
     ],
     'v1/projects' => [
         'name' => 'Projects',
-        'controller' => 'controllers/projects.php',
+        'controller' => 'controllers/api/projects.php',
         'sdk' => true,
         'tests' => false,
     ],
     'v1/storage' => [
         'name' => 'Storage',
         'description' => '/docs/services/storage.md',
-        'controller' => 'controllers/storage.php',
+        'controller' => 'controllers/api/storage.php',
         'sdk' => true,
         'tests' => false,
     ],
     'v1/teams' => [
         'name' => 'Teams',
         'description' => '/docs/services/teams.md',
-        'controller' => 'controllers/teams.php',
+        'controller' => 'controllers/api/teams.php',
         'sdk' => true,
         'tests' => false,
     ],
     'v1/users' => [
         'name' => 'Users',
         'description' => '/docs/services/users.md',
-        'controller' => 'controllers/users.php',
+        'controller' => 'controllers/api/users.php',
         'sdk' => true,
         'tests' => false,
     ],
diff --git a/app/controllers/web/console.php b/app/controllers/web/console.php
index 95a15991a..a2d075314 100644
--- a/app/controllers/web/console.php
+++ b/app/controllers/web/console.php
@@ -1,6 +1,6 @@
 <?php
 
-include_once 'shared/web.php';
+include_once '../shared/web.php';
 
 global $utopia, $response, $request, $layout, $version, $providers;
 
diff --git a/app/controllers/web/home.php b/app/controllers/web/home.php
index ade2318f6..dc29fe142 100644
--- a/app/controllers/web/home.php
+++ b/app/controllers/web/home.php
@@ -1,6 +1,6 @@
 <?php
 
-include_once 'shared/web.php';
+include_once '../shared/web.php';
 
 global $utopia, $response, $request, $layout, $version, $providers, $sdks;