diff --git a/composer.json b/composer.json
index fb70618a4c..5d6590ada3 100755
--- a/composer.json
+++ b/composer.json
@@ -19,18 +19,18 @@
             "public/legacy.php"
         ],
         "classmap": [
-            "main/auth",
-            "main/admin",
-            "main/cron/lang",
-            "main/course_description",
-            "main/dropbox",
-            "main/exercise",
-            "main/gradebook/lib",
-            "main/lp",
-            "main/inc/lib",
+            "public/main/auth",
+            "public/main/admin",
+            "public/main/cron/lang",
+            "public/main/course_description",
+            "public/main/dropbox",
+            "public/main/exercise",
+            "public/main/gradebook/lib",
+            "public/main/lp",
+            "public/main/inc/lib",
             "plugin",
-            "main/install",
-            "main/survey"
+            "public/main/install",
+            "public/main/survey"
         ]
     },
     "require": {
diff --git a/config/packages/twig.yaml b/config/packages/twig.yaml
index a7b679c396..9ac663e96a 100644
--- a/config/packages/twig.yaml
+++ b/config/packages/twig.yaml
@@ -1,6 +1,6 @@
 twig:
     debug: '%kernel.debug%'
-    paths: ['%kernel.project_dir%/templates', '%kernel.project_dir%/main/template/', '%kernel.project_dir%/plugin/']
+    paths: ['%kernel.project_dir%/templates', '%kernel.project_dir%/public/main/template/', '%kernel.project_dir%/plugin/']
     form_themes:
         - 'bootstrap_4_layout.html.twig'
         - '@SonataFormatter/Form/formatter.html.twig'
diff --git a/main/inc/email_editor.php b/public/main/inc/email_editor.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/email_editor.php
rename to public/main/inc/email_editor.php
diff --git a/main/inc/global.inc.php b/public/main/inc/global.inc.php
old mode 100755
new mode 100644
similarity index 97%
rename from main/inc/global.inc.php
rename to public/main/inc/global.inc.php
index 99d7a13562..2b50628728
--- a/main/inc/global.inc.php
+++ b/public/main/inc/global.inc.php
@@ -15,14 +15,14 @@ use Symfony\Component\Dotenv\Dotenv;
 // 3. Checking the login_is_email portal setting in order to accept 100 chars maximum
 define('USERNAME_MAX_LENGTH', 100);
 
-require_once __DIR__.'/../../vendor/autoload.php';
+require_once __DIR__.'/../../../vendor/autoload.php';
 
 try {
     // Check the PHP version
     api_check_php_version();
 
     // Get settings from .env.local file created.
-    $envFile = __DIR__.'/../../.env.local';
+    $envFile = __DIR__.'/../../../.env.local';
     if (file_exists($envFile)) {
         (new Dotenv())->load($envFile);
     } else {
diff --git a/main/inc/global_error_message.inc.php b/public/main/inc/global_error_message.inc.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/global_error_message.inc.php
rename to public/main/inc/global_error_message.inc.php
diff --git a/main/inc/index.html b/public/main/inc/index.html
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/index.html
rename to public/main/inc/index.html
diff --git a/main/inc/introductionSection.inc.php b/public/main/inc/introductionSection.inc.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/introductionSection.inc.php
rename to public/main/inc/introductionSection.inc.php
diff --git a/src/CoreBundle/Resources/config/routing.yml b/src/CoreBundle/Resources/config/routing.yml
index 38d3e3edb9..78d0d7c690 100644
--- a/src/CoreBundle/Resources/config/routing.yml
+++ b/src/CoreBundle/Resources/config/routing.yml
@@ -1,12 +1,12 @@
 # Legacy routes
 legacy_public:
-    path: ../public/
+    path: ./
 
 legacy_index:
-    path: ../
+    path: ./
 
 legacy_main:
-    path: ../main/{name}
+    path: /main/{name}
     defaults: {_controller: 'ChamiloCoreBundle:Legacy:classic'}
     requirements:
         name: .+