diff --git a/main/inc/lib/.htaccess b/public/main/inc/lib/.htaccess
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/.htaccess
rename to public/main/inc/lib/.htaccess
diff --git a/main/inc/lib/AnnouncementEmail.php b/public/main/inc/lib/AnnouncementEmail.php
similarity index 100%
rename from main/inc/lib/AnnouncementEmail.php
rename to public/main/inc/lib/AnnouncementEmail.php
diff --git a/main/inc/lib/AnnouncementManager.php b/public/main/inc/lib/AnnouncementManager.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/AnnouncementManager.php
rename to public/main/inc/lib/AnnouncementManager.php
diff --git a/main/inc/lib/Compilatio.php b/public/main/inc/lib/Compilatio.php
similarity index 100%
rename from main/inc/lib/Compilatio.php
rename to public/main/inc/lib/Compilatio.php
diff --git a/main/inc/lib/CourseChatUtils.php b/public/main/inc/lib/CourseChatUtils.php
similarity index 100%
rename from main/inc/lib/CourseChatUtils.php
rename to public/main/inc/lib/CourseChatUtils.php
diff --git a/main/inc/lib/CoursesAndSessionsCatalog.class.php b/public/main/inc/lib/CoursesAndSessionsCatalog.class.php
similarity index 100%
rename from main/inc/lib/CoursesAndSessionsCatalog.class.php
rename to public/main/inc/lib/CoursesAndSessionsCatalog.class.php
diff --git a/main/inc/lib/ExerciseCategoryManager.php b/public/main/inc/lib/ExerciseCategoryManager.php
similarity index 100%
rename from main/inc/lib/ExerciseCategoryManager.php
rename to public/main/inc/lib/ExerciseCategoryManager.php
diff --git a/main/inc/lib/GamificationUtils.php b/public/main/inc/lib/GamificationUtils.php
similarity index 100%
rename from main/inc/lib/GamificationUtils.php
rename to public/main/inc/lib/GamificationUtils.php
diff --git a/main/inc/lib/MailTemplateManager.php b/public/main/inc/lib/MailTemplateManager.php
similarity index 100%
rename from main/inc/lib/MailTemplateManager.php
rename to public/main/inc/lib/MailTemplateManager.php
diff --git a/main/inc/lib/MoodleImport.php b/public/main/inc/lib/MoodleImport.php
similarity index 100%
rename from main/inc/lib/MoodleImport.php
rename to public/main/inc/lib/MoodleImport.php
diff --git a/main/inc/lib/ScheduledAnnouncement.php b/public/main/inc/lib/ScheduledAnnouncement.php
similarity index 100%
rename from main/inc/lib/ScheduledAnnouncement.php
rename to public/main/inc/lib/ScheduledAnnouncement.php
diff --git a/main/inc/lib/SequenceManager.php b/public/main/inc/lib/SequenceManager.php
similarity index 100%
rename from main/inc/lib/SequenceManager.php
rename to public/main/inc/lib/SequenceManager.php
diff --git a/main/inc/lib/SequenceResourceManager.php b/public/main/inc/lib/SequenceResourceManager.php
similarity index 100%
rename from main/inc/lib/SequenceResourceManager.php
rename to public/main/inc/lib/SequenceResourceManager.php
diff --git a/main/inc/lib/SmsPlugin.php b/public/main/inc/lib/SmsPlugin.php
similarity index 100%
rename from main/inc/lib/SmsPlugin.php
rename to public/main/inc/lib/SmsPlugin.php
diff --git a/main/inc/lib/SmsPluginLibraryInterface.php b/public/main/inc/lib/SmsPluginLibraryInterface.php
similarity index 100%
rename from main/inc/lib/SmsPluginLibraryInterface.php
rename to public/main/inc/lib/SmsPluginLibraryInterface.php
diff --git a/main/inc/lib/SortableTableFromArray.php b/public/main/inc/lib/SortableTableFromArray.php
similarity index 100%
rename from main/inc/lib/SortableTableFromArray.php
rename to public/main/inc/lib/SortableTableFromArray.php
diff --git a/main/inc/lib/SortableTableFromArrayConfig.php b/public/main/inc/lib/SortableTableFromArrayConfig.php
similarity index 100%
rename from main/inc/lib/SortableTableFromArrayConfig.php
rename to public/main/inc/lib/SortableTableFromArrayConfig.php
diff --git a/main/inc/lib/SurveyTree .php b/public/main/inc/lib/SurveyTree .php
similarity index 100%
rename from main/inc/lib/SurveyTree .php
rename to public/main/inc/lib/SurveyTree .php
diff --git a/main/inc/lib/TeacherTimeReport.php b/public/main/inc/lib/TeacherTimeReport.php
similarity index 100%
rename from main/inc/lib/TeacherTimeReport.php
rename to public/main/inc/lib/TeacherTimeReport.php
diff --git a/main/inc/lib/TicketManager.php b/public/main/inc/lib/TicketManager.php
similarity index 100%
rename from main/inc/lib/TicketManager.php
rename to public/main/inc/lib/TicketManager.php
diff --git a/main/inc/lib/UnserializeApi.php b/public/main/inc/lib/UnserializeApi.php
similarity index 100%
rename from main/inc/lib/UnserializeApi.php
rename to public/main/inc/lib/UnserializeApi.php
diff --git a/main/inc/lib/VideoChat.php b/public/main/inc/lib/VideoChat.php
similarity index 100%
rename from main/inc/lib/VideoChat.php
rename to public/main/inc/lib/VideoChat.php
diff --git a/main/inc/lib/access_url_edit_courses_to_url_functions.lib.php b/public/main/inc/lib/access_url_edit_courses_to_url_functions.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/access_url_edit_courses_to_url_functions.lib.php
rename to public/main/inc/lib/access_url_edit_courses_to_url_functions.lib.php
diff --git a/main/inc/lib/access_url_edit_sessions_to_url_functions.lib.php b/public/main/inc/lib/access_url_edit_sessions_to_url_functions.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/access_url_edit_sessions_to_url_functions.lib.php
rename to public/main/inc/lib/access_url_edit_sessions_to_url_functions.lib.php
diff --git a/main/inc/lib/access_url_edit_users_to_url_functions.lib.php b/public/main/inc/lib/access_url_edit_users_to_url_functions.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/access_url_edit_users_to_url_functions.lib.php
rename to public/main/inc/lib/access_url_edit_users_to_url_functions.lib.php
diff --git a/main/inc/lib/add_course.lib.inc.php b/public/main/inc/lib/add_course.lib.inc.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/add_course.lib.inc.php
rename to public/main/inc/lib/add_course.lib.inc.php
diff --git a/main/inc/lib/add_courses_to_session_functions.lib.php b/public/main/inc/lib/add_courses_to_session_functions.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/add_courses_to_session_functions.lib.php
rename to public/main/inc/lib/add_courses_to_session_functions.lib.php
diff --git a/main/inc/lib/agenda.lib.php b/public/main/inc/lib/agenda.lib.php
similarity index 100%
rename from main/inc/lib/agenda.lib.php
rename to public/main/inc/lib/agenda.lib.php
diff --git a/main/inc/lib/api.lib.php b/public/main/inc/lib/api.lib.php
similarity index 99%
rename from main/inc/lib/api.lib.php
rename to public/main/inc/lib/api.lib.php
index 608d37b331..cf702fd83c 100644
--- a/main/inc/lib/api.lib.php
+++ b/public/main/inc/lib/api.lib.php
@@ -731,7 +731,7 @@ function api_get_path($path = '', $configuration = [])
     }
 
     $course_folder = 'courses/';
-    $code_folder = 'main/';
+    $code_folder = 'public/main/';
     $root_sys = Container::getRootDir();
     $root_web = '';
     // If no $root_web has been set so far *and* no custom config has been passed to the function
@@ -812,13 +812,13 @@ function api_get_path($path = '', $configuration = [])
     if (!array_key_exists($root_web, $paths)) {
         $paths[$root_web] = [
             WEB_PATH => '',
-            SYS_PATH => '',
+            SYS_PATH => 'public/',
             REL_PATH => '',
             WEB_COURSE_PATH => '',
             SYS_COURSE_PATH => '',
             REL_COURSE_PATH => '',
             WEB_CODE_PATH => 'main/',
-            SYS_CODE_PATH => 'main/',
+            SYS_CODE_PATH => 'public/main/',
             REL_CODE_PATH => '/main/',
             SYS_LANG_PATH => 'lang/',
             WEB_IMG_PATH => 'public/img/',
@@ -871,7 +871,6 @@ function api_get_path($path = '', $configuration = [])
 
         // Initialization of a table that contains common-purpose paths.
         $paths[$root_web][REL_PATH] = $root_rel;
-        $paths[$root_web][REL_COURSE_PATH] = $root_rel.$course_folder;
         $paths[$root_web][REL_CODE_PATH] = $root_rel.$code_folder;
         $paths[$root_web][WEB_PATH] = $rootWebWithSlash;
         $paths[$root_web][WEB_CODE_PATH] = $rootWebWithSlash.$code_folder;
@@ -900,7 +899,6 @@ function api_get_path($path = '', $configuration = [])
         $paths[$root_web][SYS_FONTS_PATH] = $paths[$root_web][SYS_CODE_PATH].$paths[$root_web][SYS_FONTS_PATH];
         $paths[$root_web][SYS_ARCHIVE_PATH] = $paths[$root_web][SYS_PATH].$paths[$root_web][SYS_ARCHIVE_PATH];
         $paths[$root_web][SYS_APP_PATH] = $paths[$root_web][SYS_PATH].$paths[$root_web][SYS_APP_PATH];
-        $paths[$root_web][SYS_COURSE_PATH] = $paths[$root_web][SYS_APP_PATH].$course_folder;
         $paths[$root_web][SYS_UPLOAD_PATH] = $paths[$root_web][SYS_PATH].$paths[$root_web][SYS_UPLOAD_PATH];
         $paths[$root_web][SYS_LANG_PATH] = $paths[$root_web][SYS_CODE_PATH].$paths[$root_web][SYS_LANG_PATH];
         $paths[$root_web][SYS_HOME_PATH] = $paths[$root_web][SYS_PATH].$paths[$root_web][SYS_HOME_PATH];
diff --git a/main/inc/lib/app_view.php b/public/main/inc/lib/app_view.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/app_view.php
rename to public/main/inc/lib/app_view.php
diff --git a/main/inc/lib/array.lib.php b/public/main/inc/lib/array.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/array.lib.php
rename to public/main/inc/lib/array.lib.php
diff --git a/main/inc/lib/attendance.lib.php b/public/main/inc/lib/attendance.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/attendance.lib.php
rename to public/main/inc/lib/attendance.lib.php
diff --git a/main/inc/lib/auth.lib.php b/public/main/inc/lib/auth.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/auth.lib.php
rename to public/main/inc/lib/auth.lib.php
diff --git a/main/inc/lib/baker.lib.php b/public/main/inc/lib/baker.lib.php
similarity index 100%
rename from main/inc/lib/baker.lib.php
rename to public/main/inc/lib/baker.lib.php
diff --git a/main/inc/lib/banner.lib.php b/public/main/inc/lib/banner.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/banner.lib.php
rename to public/main/inc/lib/banner.lib.php
diff --git a/main/inc/lib/blog.lib.php b/public/main/inc/lib/blog.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/blog.lib.php
rename to public/main/inc/lib/blog.lib.php
diff --git a/main/inc/lib/career.lib.php b/public/main/inc/lib/career.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/career.lib.php
rename to public/main/inc/lib/career.lib.php
diff --git a/main/inc/lib/certificate.lib.php b/public/main/inc/lib/certificate.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/certificate.lib.php
rename to public/main/inc/lib/certificate.lib.php
diff --git a/main/inc/lib/chamilo_session.class.php b/public/main/inc/lib/chamilo_session.class.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/chamilo_session.class.php
rename to public/main/inc/lib/chamilo_session.class.php
diff --git a/main/inc/lib/chat.lib.php b/public/main/inc/lib/chat.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/chat.lib.php
rename to public/main/inc/lib/chat.lib.php
diff --git a/main/inc/lib/conditional_login.class.php b/public/main/inc/lib/conditional_login.class.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/conditional_login.class.php
rename to public/main/inc/lib/conditional_login.class.php
diff --git a/main/inc/lib/course.lib.php b/public/main/inc/lib/course.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/course.lib.php
rename to public/main/inc/lib/course.lib.php
diff --git a/main/inc/lib/course_category.lib.php b/public/main/inc/lib/course_category.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/course_category.lib.php
rename to public/main/inc/lib/course_category.lib.php
diff --git a/main/inc/lib/course_description.lib.php b/public/main/inc/lib/course_description.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/course_description.lib.php
rename to public/main/inc/lib/course_description.lib.php
diff --git a/main/inc/lib/course_home.lib.php b/public/main/inc/lib/course_home.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/course_home.lib.php
rename to public/main/inc/lib/course_home.lib.php
diff --git a/main/inc/lib/course_request.lib.php b/public/main/inc/lib/course_request.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/course_request.lib.php
rename to public/main/inc/lib/course_request.lib.php
diff --git a/main/inc/lib/custom_pages.class.php b/public/main/inc/lib/custom_pages.class.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/custom_pages.class.php
rename to public/main/inc/lib/custom_pages.class.php
diff --git a/main/inc/lib/dashboard.lib.php b/public/main/inc/lib/dashboard.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/dashboard.lib.php
rename to public/main/inc/lib/dashboard.lib.php
diff --git a/main/inc/lib/database.constants.inc.php b/public/main/inc/lib/database.constants.inc.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/database.constants.inc.php
rename to public/main/inc/lib/database.constants.inc.php
diff --git a/main/inc/lib/database.lib.php b/public/main/inc/lib/database.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/database.lib.php
rename to public/main/inc/lib/database.lib.php
diff --git a/main/inc/lib/database.mysqli.lib.php b/public/main/inc/lib/database.mysqli.lib.php
similarity index 100%
rename from main/inc/lib/database.mysqli.lib.php
rename to public/main/inc/lib/database.mysqli.lib.php
diff --git a/main/inc/lib/diagnoser.lib.php b/public/main/inc/lib/diagnoser.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/diagnoser.lib.php
rename to public/main/inc/lib/diagnoser.lib.php
diff --git a/main/inc/lib/display.lib.php b/public/main/inc/lib/display.lib.php
old mode 100755
new mode 100644
similarity index 99%
rename from main/inc/lib/display.lib.php
rename to public/main/inc/lib/display.lib.php
index 8157170218..549eb790ce
--- a/main/inc/lib/display.lib.php
+++ b/public/main/inc/lib/display.lib.php
@@ -208,7 +208,7 @@ class Display
         $moduleId = $tool;
         if (api_get_setting('enable_tool_introduction') == 'true' || $tool == TOOL_COURSE_HOMEPAGE) {
             $introduction_section = null;
-            require api_get_path(SYS_INC_PATH).'introductionSection.inc.php';
+            require api_get_path(SYS_CODE_PATH).'inc/introductionSection.inc.php';
 
             return $introduction_section;
         }
diff --git a/main/inc/lib/document.lib.php b/public/main/inc/lib/document.lib.php
similarity index 100%
rename from main/inc/lib/document.lib.php
rename to public/main/inc/lib/document.lib.php
diff --git a/main/inc/lib/events.lib.php b/public/main/inc/lib/events.lib.php
similarity index 100%
rename from main/inc/lib/events.lib.php
rename to public/main/inc/lib/events.lib.php
diff --git a/main/inc/lib/exercise.lib.php b/public/main/inc/lib/exercise.lib.php
similarity index 100%
rename from main/inc/lib/exercise.lib.php
rename to public/main/inc/lib/exercise.lib.php
diff --git a/main/inc/lib/exercise_show_functions.lib.php b/public/main/inc/lib/exercise_show_functions.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/exercise_show_functions.lib.php
rename to public/main/inc/lib/exercise_show_functions.lib.php
diff --git a/main/inc/lib/export.lib.inc.php b/public/main/inc/lib/export.lib.inc.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/export.lib.inc.php
rename to public/main/inc/lib/export.lib.inc.php
diff --git a/main/inc/lib/extra_field.lib.php b/public/main/inc/lib/extra_field.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/extra_field.lib.php
rename to public/main/inc/lib/extra_field.lib.php
diff --git a/main/inc/lib/extra_field_option.lib.php b/public/main/inc/lib/extra_field_option.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/extra_field_option.lib.php
rename to public/main/inc/lib/extra_field_option.lib.php
diff --git a/main/inc/lib/extra_field_value.lib.php b/public/main/inc/lib/extra_field_value.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/extra_field_value.lib.php
rename to public/main/inc/lib/extra_field_value.lib.php
diff --git a/main/inc/lib/fileDisplay.lib.php b/public/main/inc/lib/fileDisplay.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/fileDisplay.lib.php
rename to public/main/inc/lib/fileDisplay.lib.php
diff --git a/main/inc/lib/fileManage.lib.php b/public/main/inc/lib/fileManage.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/fileManage.lib.php
rename to public/main/inc/lib/fileManage.lib.php
diff --git a/main/inc/lib/fileUpload.lib.php b/public/main/inc/lib/fileUpload.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/fileUpload.lib.php
rename to public/main/inc/lib/fileUpload.lib.php
diff --git a/main/inc/lib/fixlinks.js b/public/main/inc/lib/fixlinks.js
similarity index 100%
rename from main/inc/lib/fixlinks.js
rename to public/main/inc/lib/fixlinks.js
diff --git a/main/inc/lib/geometry.lib.php b/public/main/inc/lib/geometry.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/geometry.lib.php
rename to public/main/inc/lib/geometry.lib.php
diff --git a/main/inc/lib/glossary.lib.php b/public/main/inc/lib/glossary.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/glossary.lib.php
rename to public/main/inc/lib/glossary.lib.php
diff --git a/main/inc/lib/grade_model.lib.php b/public/main/inc/lib/grade_model.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/grade_model.lib.php
rename to public/main/inc/lib/grade_model.lib.php
diff --git a/main/inc/lib/gradebook.lib.php b/public/main/inc/lib/gradebook.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/gradebook.lib.php
rename to public/main/inc/lib/gradebook.lib.php
diff --git a/main/inc/lib/groupmanager.lib.php b/public/main/inc/lib/groupmanager.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/groupmanager.lib.php
rename to public/main/inc/lib/groupmanager.lib.php
diff --git a/main/inc/lib/image.lib.php b/public/main/inc/lib/image.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/image.lib.php
rename to public/main/inc/lib/image.lib.php
diff --git a/main/inc/lib/import.lib.php b/public/main/inc/lib/import.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/import.lib.php
rename to public/main/inc/lib/import.lib.php
diff --git a/main/inc/lib/index.html b/public/main/inc/lib/index.html
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/index.html
rename to public/main/inc/lib/index.html
diff --git a/main/inc/lib/internationalization.lib.php b/public/main/inc/lib/internationalization.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/internationalization.lib.php
rename to public/main/inc/lib/internationalization.lib.php
diff --git a/main/inc/lib/kses-0.2.2/AUTHORS b/public/main/inc/lib/kses-0.2.2/AUTHORS
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/kses-0.2.2/AUTHORS
rename to public/main/inc/lib/kses-0.2.2/AUTHORS
diff --git a/main/inc/lib/kses-0.2.2/COPYING b/public/main/inc/lib/kses-0.2.2/COPYING
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/kses-0.2.2/COPYING
rename to public/main/inc/lib/kses-0.2.2/COPYING
diff --git a/main/inc/lib/kses-0.2.2/ChangeLog b/public/main/inc/lib/kses-0.2.2/ChangeLog
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/kses-0.2.2/ChangeLog
rename to public/main/inc/lib/kses-0.2.2/ChangeLog
diff --git a/main/inc/lib/kses-0.2.2/README b/public/main/inc/lib/kses-0.2.2/README
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/kses-0.2.2/README
rename to public/main/inc/lib/kses-0.2.2/README
diff --git a/main/inc/lib/kses-0.2.2/TODO b/public/main/inc/lib/kses-0.2.2/TODO
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/kses-0.2.2/TODO
rename to public/main/inc/lib/kses-0.2.2/TODO
diff --git a/main/inc/lib/kses-0.2.2/docs/attribute-value-checks b/public/main/inc/lib/kses-0.2.2/docs/attribute-value-checks
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/kses-0.2.2/docs/attribute-value-checks
rename to public/main/inc/lib/kses-0.2.2/docs/attribute-value-checks
diff --git a/main/inc/lib/kses-0.2.2/docs/hooks b/public/main/inc/lib/kses-0.2.2/docs/hooks
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/kses-0.2.2/docs/hooks
rename to public/main/inc/lib/kses-0.2.2/docs/hooks
diff --git a/main/inc/lib/kses-0.2.2/docs/index.html b/public/main/inc/lib/kses-0.2.2/docs/index.html
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/kses-0.2.2/docs/index.html
rename to public/main/inc/lib/kses-0.2.2/docs/index.html
diff --git a/main/inc/lib/kses-0.2.2/docs/stripping-everything b/public/main/inc/lib/kses-0.2.2/docs/stripping-everything
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/kses-0.2.2/docs/stripping-everything
rename to public/main/inc/lib/kses-0.2.2/docs/stripping-everything
diff --git a/main/inc/lib/kses-0.2.2/docs/supported-formats b/public/main/inc/lib/kses-0.2.2/docs/supported-formats
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/kses-0.2.2/docs/supported-formats
rename to public/main/inc/lib/kses-0.2.2/docs/supported-formats
diff --git a/main/inc/lib/kses-0.2.2/docs/whitelisted-url-protocols b/public/main/inc/lib/kses-0.2.2/docs/whitelisted-url-protocols
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/kses-0.2.2/docs/whitelisted-url-protocols
rename to public/main/inc/lib/kses-0.2.2/docs/whitelisted-url-protocols
diff --git a/main/inc/lib/kses-0.2.2/examples/filter.php b/public/main/inc/lib/kses-0.2.2/examples/filter.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/kses-0.2.2/examples/filter.php
rename to public/main/inc/lib/kses-0.2.2/examples/filter.php
diff --git a/main/inc/lib/kses-0.2.2/examples/index.html b/public/main/inc/lib/kses-0.2.2/examples/index.html
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/kses-0.2.2/examples/index.html
rename to public/main/inc/lib/kses-0.2.2/examples/index.html
diff --git a/main/inc/lib/kses-0.2.2/examples/test.php b/public/main/inc/lib/kses-0.2.2/examples/test.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/kses-0.2.2/examples/test.php
rename to public/main/inc/lib/kses-0.2.2/examples/test.php
diff --git a/main/inc/lib/kses-0.2.2/index.html b/public/main/inc/lib/kses-0.2.2/index.html
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/kses-0.2.2/index.html
rename to public/main/inc/lib/kses-0.2.2/index.html
diff --git a/main/inc/lib/kses-0.2.2/kses.php b/public/main/inc/lib/kses-0.2.2/kses.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/kses-0.2.2/kses.php
rename to public/main/inc/lib/kses-0.2.2/kses.php
diff --git a/main/inc/lib/kses-0.2.2/kses_original.php b/public/main/inc/lib/kses-0.2.2/kses_original.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/kses-0.2.2/kses_original.php
rename to public/main/inc/lib/kses-0.2.2/kses_original.php
diff --git a/main/inc/lib/kses-0.2.2/oop/index.html b/public/main/inc/lib/kses-0.2.2/oop/index.html
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/kses-0.2.2/oop/index.html
rename to public/main/inc/lib/kses-0.2.2/oop/index.html
diff --git a/main/inc/lib/kses-0.2.2/oop/oop.kses.changelog.txt b/public/main/inc/lib/kses-0.2.2/oop/oop.kses.changelog.txt
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/kses-0.2.2/oop/oop.kses.changelog.txt
rename to public/main/inc/lib/kses-0.2.2/oop/oop.kses.changelog.txt
diff --git a/main/inc/lib/kses-0.2.2/oop/oop.simple.api.txt b/public/main/inc/lib/kses-0.2.2/oop/oop.simple.api.txt
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/kses-0.2.2/oop/oop.simple.api.txt
rename to public/main/inc/lib/kses-0.2.2/oop/oop.simple.api.txt
diff --git a/main/inc/lib/kses-0.2.2/oop/php4.class.kses.php b/public/main/inc/lib/kses-0.2.2/oop/php4.class.kses.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/kses-0.2.2/oop/php4.class.kses.php
rename to public/main/inc/lib/kses-0.2.2/oop/php4.class.kses.php
diff --git a/main/inc/lib/kses-0.2.2/oop/php5.class.kses.php b/public/main/inc/lib/kses-0.2.2/oop/php5.class.kses.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/kses-0.2.2/oop/php5.class.kses.php
rename to public/main/inc/lib/kses-0.2.2/oop/php5.class.kses.php
diff --git a/main/inc/lib/kses-0.2.2/oop/test.oop.kses.php b/public/main/inc/lib/kses-0.2.2/oop/test.oop.kses.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/kses-0.2.2/oop/test.oop.kses.php
rename to public/main/inc/lib/kses-0.2.2/oop/test.oop.kses.php
diff --git a/main/inc/lib/legal.lib.php b/public/main/inc/lib/legal.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/legal.lib.php
rename to public/main/inc/lib/legal.lib.php
diff --git a/main/inc/lib/link.lib.php b/public/main/inc/lib/link.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/link.lib.php
rename to public/main/inc/lib/link.lib.php
diff --git a/main/inc/lib/login.lib.php b/public/main/inc/lib/login.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/login.lib.php
rename to public/main/inc/lib/login.lib.php
diff --git a/main/inc/lib/login_redirection.class.php b/public/main/inc/lib/login_redirection.class.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/login_redirection.class.php
rename to public/main/inc/lib/login_redirection.class.php
diff --git a/main/inc/lib/lp_item.lib.php b/public/main/inc/lib/lp_item.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/lp_item.lib.php
rename to public/main/inc/lib/lp_item.lib.php
diff --git a/main/inc/lib/mediaplayer/index.html b/public/main/inc/lib/mediaplayer/index.html
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/mediaplayer/index.html
rename to public/main/inc/lib/mediaplayer/index.html
diff --git a/main/inc/lib/mediaplayer/player.swf b/public/main/inc/lib/mediaplayer/player.swf
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/mediaplayer/player.swf
rename to public/main/inc/lib/mediaplayer/player.swf
diff --git a/main/inc/lib/mediaplayer/player_readme.txt b/public/main/inc/lib/mediaplayer/player_readme.txt
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/mediaplayer/player_readme.txt
rename to public/main/inc/lib/mediaplayer/player_readme.txt
diff --git a/main/inc/lib/mediaplayer/source/flvplayer.README.txt b/public/main/inc/lib/mediaplayer/source/flvplayer.README.txt
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/mediaplayer/source/flvplayer.README.txt
rename to public/main/inc/lib/mediaplayer/source/flvplayer.README.txt
diff --git a/main/inc/lib/mediaplayer/source/flvplayer.fla.zip b/public/main/inc/lib/mediaplayer/source/flvplayer.fla.zip
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/mediaplayer/source/flvplayer.fla.zip
rename to public/main/inc/lib/mediaplayer/source/flvplayer.fla.zip
diff --git a/main/inc/lib/mediaplayer/source/flvplayer.swf b/public/main/inc/lib/mediaplayer/source/flvplayer.swf
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/mediaplayer/source/flvplayer.swf
rename to public/main/inc/lib/mediaplayer/source/flvplayer.swf
diff --git a/main/inc/lib/mediaplayer/source/index.html b/public/main/inc/lib/mediaplayer/source/index.html
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/mediaplayer/source/index.html
rename to public/main/inc/lib/mediaplayer/source/index.html
diff --git a/main/inc/lib/mediaplayer/swfobject.js b/public/main/inc/lib/mediaplayer/swfobject.js
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/mediaplayer/swfobject.js
rename to public/main/inc/lib/mediaplayer/swfobject.js
diff --git a/main/inc/lib/mediaplayer/swfobject_readme.txt b/public/main/inc/lib/mediaplayer/swfobject_readme.txt
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/mediaplayer/swfobject_readme.txt
rename to public/main/inc/lib/mediaplayer/swfobject_readme.txt
diff --git a/main/inc/lib/message.lib.php b/public/main/inc/lib/message.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/message.lib.php
rename to public/main/inc/lib/message.lib.php
diff --git a/main/inc/lib/mimetex/COPYING b/public/main/inc/lib/mimetex/COPYING
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/mimetex/COPYING
rename to public/main/inc/lib/mimetex/COPYING
diff --git a/main/inc/lib/mimetex/README b/public/main/inc/lib/mimetex/README
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/mimetex/README
rename to public/main/inc/lib/mimetex/README
diff --git a/main/inc/lib/mimetex/index.html b/public/main/inc/lib/mimetex/index.html
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/mimetex/index.html
rename to public/main/inc/lib/mimetex/index.html
diff --git a/main/inc/lib/mimetex/mimetex.cgi b/public/main/inc/lib/mimetex/mimetex.cgi
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/mimetex/mimetex.cgi
rename to public/main/inc/lib/mimetex/mimetex.cgi
diff --git a/main/inc/lib/mimetex/mimetex.exe b/public/main/inc/lib/mimetex/mimetex.exe
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/mimetex/mimetex.exe
rename to public/main/inc/lib/mimetex/mimetex.exe
diff --git a/main/inc/lib/model.lib.php b/public/main/inc/lib/model.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/model.lib.php
rename to public/main/inc/lib/model.lib.php
diff --git a/main/inc/lib/myspace.lib.php b/public/main/inc/lib/myspace.lib.php
similarity index 100%
rename from main/inc/lib/myspace.lib.php
rename to public/main/inc/lib/myspace.lib.php
diff --git a/main/inc/lib/notebook.lib.php b/public/main/inc/lib/notebook.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/notebook.lib.php
rename to public/main/inc/lib/notebook.lib.php
diff --git a/main/inc/lib/notification.lib.php b/public/main/inc/lib/notification.lib.php
similarity index 100%
rename from main/inc/lib/notification.lib.php
rename to public/main/inc/lib/notification.lib.php
diff --git a/main/inc/lib/nusoap/changelog b/public/main/inc/lib/nusoap/changelog
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/nusoap/changelog
rename to public/main/inc/lib/nusoap/changelog
diff --git a/main/inc/lib/nusoap/class.nusoap_base.php b/public/main/inc/lib/nusoap/class.nusoap_base.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/nusoap/class.nusoap_base.php
rename to public/main/inc/lib/nusoap/class.nusoap_base.php
diff --git a/main/inc/lib/nusoap/class.soap_fault.php b/public/main/inc/lib/nusoap/class.soap_fault.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/nusoap/class.soap_fault.php
rename to public/main/inc/lib/nusoap/class.soap_fault.php
diff --git a/main/inc/lib/nusoap/class.soap_parser.php b/public/main/inc/lib/nusoap/class.soap_parser.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/nusoap/class.soap_parser.php
rename to public/main/inc/lib/nusoap/class.soap_parser.php
diff --git a/main/inc/lib/nusoap/class.soap_server.php b/public/main/inc/lib/nusoap/class.soap_server.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/nusoap/class.soap_server.php
rename to public/main/inc/lib/nusoap/class.soap_server.php
diff --git a/main/inc/lib/nusoap/class.soap_transport_http.php b/public/main/inc/lib/nusoap/class.soap_transport_http.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/nusoap/class.soap_transport_http.php
rename to public/main/inc/lib/nusoap/class.soap_transport_http.php
diff --git a/main/inc/lib/nusoap/class.soap_val.php b/public/main/inc/lib/nusoap/class.soap_val.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/nusoap/class.soap_val.php
rename to public/main/inc/lib/nusoap/class.soap_val.php
diff --git a/main/inc/lib/nusoap/class.soapclient.php b/public/main/inc/lib/nusoap/class.soapclient.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/nusoap/class.soapclient.php
rename to public/main/inc/lib/nusoap/class.soapclient.php
diff --git a/main/inc/lib/nusoap/class.wsdl.php b/public/main/inc/lib/nusoap/class.wsdl.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/nusoap/class.wsdl.php
rename to public/main/inc/lib/nusoap/class.wsdl.php
diff --git a/main/inc/lib/nusoap/class.wsdlcache.php b/public/main/inc/lib/nusoap/class.wsdlcache.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/nusoap/class.wsdlcache.php
rename to public/main/inc/lib/nusoap/class.wsdlcache.php
diff --git a/main/inc/lib/nusoap/class.xmlschema.php b/public/main/inc/lib/nusoap/class.xmlschema.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/nusoap/class.xmlschema.php
rename to public/main/inc/lib/nusoap/class.xmlschema.php
diff --git a/main/inc/lib/nusoap/index.html b/public/main/inc/lib/nusoap/index.html
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/nusoap/index.html
rename to public/main/inc/lib/nusoap/index.html
diff --git a/main/inc/lib/nusoap/nusoapmime.php b/public/main/inc/lib/nusoap/nusoapmime.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/nusoap/nusoapmime.php
rename to public/main/inc/lib/nusoap/nusoapmime.php
diff --git a/main/inc/lib/online.inc.php b/public/main/inc/lib/online.inc.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/online.inc.php
rename to public/main/inc/lib/online.inc.php
diff --git a/main/inc/lib/pdf.lib.php b/public/main/inc/lib/pdf.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pdf.lib.php
rename to public/main/inc/lib/pdf.lib.php
diff --git a/main/inc/lib/pear/HTML/Common.php b/public/main/inc/lib/pear/HTML/Common.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/Common.php
rename to public/main/inc/lib/pear/HTML/Common.php
diff --git a/main/inc/lib/pear/HTML/QuickForm.php b/public/main/inc/lib/pear/HTML/QuickForm.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/QuickForm.php
rename to public/main/inc/lib/pear/HTML/QuickForm.php
diff --git a/main/inc/lib/pear/HTML/QuickForm/Action.php b/public/main/inc/lib/pear/HTML/QuickForm/Action.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/QuickForm/Action.php
rename to public/main/inc/lib/pear/HTML/QuickForm/Action.php
diff --git a/main/inc/lib/pear/HTML/QuickForm/CAPTCHA.php b/public/main/inc/lib/pear/HTML/QuickForm/CAPTCHA.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/QuickForm/CAPTCHA.php
rename to public/main/inc/lib/pear/HTML/QuickForm/CAPTCHA.php
diff --git a/main/inc/lib/pear/HTML/QuickForm/Controller.php b/public/main/inc/lib/pear/HTML/QuickForm/Controller.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/QuickForm/Controller.php
rename to public/main/inc/lib/pear/HTML/QuickForm/Controller.php
diff --git a/main/inc/lib/pear/HTML/QuickForm/Page.php b/public/main/inc/lib/pear/HTML/QuickForm/Page.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/QuickForm/Page.php
rename to public/main/inc/lib/pear/HTML/QuickForm/Page.php
diff --git a/main/inc/lib/pear/HTML/QuickForm/Renderer.php b/public/main/inc/lib/pear/HTML/QuickForm/Renderer.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/QuickForm/Renderer.php
rename to public/main/inc/lib/pear/HTML/QuickForm/Renderer.php
diff --git a/main/inc/lib/pear/HTML/QuickForm/Rule.php b/public/main/inc/lib/pear/HTML/QuickForm/Rule.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/QuickForm/Rule.php
rename to public/main/inc/lib/pear/HTML/QuickForm/Rule.php
diff --git a/main/inc/lib/pear/HTML/QuickForm/RuleRegistry.php b/public/main/inc/lib/pear/HTML/QuickForm/RuleRegistry.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/QuickForm/RuleRegistry.php
rename to public/main/inc/lib/pear/HTML/QuickForm/RuleRegistry.php
diff --git a/main/inc/lib/pear/HTML/QuickForm/advanced_settings.php b/public/main/inc/lib/pear/HTML/QuickForm/advanced_settings.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/QuickForm/advanced_settings.php
rename to public/main/inc/lib/pear/HTML/QuickForm/advanced_settings.php
diff --git a/main/inc/lib/pear/HTML/QuickForm/advcheckbox.php b/public/main/inc/lib/pear/HTML/QuickForm/advcheckbox.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/QuickForm/advcheckbox.php
rename to public/main/inc/lib/pear/HTML/QuickForm/advcheckbox.php
diff --git a/main/inc/lib/pear/HTML/QuickForm/advmultiselect.php b/public/main/inc/lib/pear/HTML/QuickForm/advmultiselect.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/QuickForm/advmultiselect.php
rename to public/main/inc/lib/pear/HTML/QuickForm/advmultiselect.php
diff --git a/main/inc/lib/pear/HTML/QuickForm/autocomplete.php b/public/main/inc/lib/pear/HTML/QuickForm/autocomplete.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/QuickForm/autocomplete.php
rename to public/main/inc/lib/pear/HTML/QuickForm/autocomplete.php
diff --git a/main/inc/lib/pear/HTML/QuickForm/button.php b/public/main/inc/lib/pear/HTML/QuickForm/button.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/QuickForm/button.php
rename to public/main/inc/lib/pear/HTML/QuickForm/button.php
diff --git a/main/inc/lib/pear/HTML/QuickForm/checkbox.php b/public/main/inc/lib/pear/HTML/QuickForm/checkbox.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/QuickForm/checkbox.php
rename to public/main/inc/lib/pear/HTML/QuickForm/checkbox.php
diff --git a/main/inc/lib/pear/HTML/QuickForm/date.php b/public/main/inc/lib/pear/HTML/QuickForm/date.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/QuickForm/date.php
rename to public/main/inc/lib/pear/HTML/QuickForm/date.php
diff --git a/main/inc/lib/pear/HTML/QuickForm/element.php b/public/main/inc/lib/pear/HTML/QuickForm/element.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/QuickForm/element.php
rename to public/main/inc/lib/pear/HTML/QuickForm/element.php
diff --git a/main/inc/lib/pear/HTML/QuickForm/email.php b/public/main/inc/lib/pear/HTML/QuickForm/email.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/QuickForm/email.php
rename to public/main/inc/lib/pear/HTML/QuickForm/email.php
diff --git a/main/inc/lib/pear/HTML/QuickForm/file.php b/public/main/inc/lib/pear/HTML/QuickForm/file.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/QuickForm/file.php
rename to public/main/inc/lib/pear/HTML/QuickForm/file.php
diff --git a/main/inc/lib/pear/HTML/QuickForm/group.php b/public/main/inc/lib/pear/HTML/QuickForm/group.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/QuickForm/group.php
rename to public/main/inc/lib/pear/HTML/QuickForm/group.php
diff --git a/main/inc/lib/pear/HTML/QuickForm/header.php b/public/main/inc/lib/pear/HTML/QuickForm/header.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/QuickForm/header.php
rename to public/main/inc/lib/pear/HTML/QuickForm/header.php
diff --git a/main/inc/lib/pear/HTML/QuickForm/hidden.php b/public/main/inc/lib/pear/HTML/QuickForm/hidden.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/QuickForm/hidden.php
rename to public/main/inc/lib/pear/HTML/QuickForm/hidden.php
diff --git a/main/inc/lib/pear/HTML/QuickForm/hiddenselect.php b/public/main/inc/lib/pear/HTML/QuickForm/hiddenselect.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/QuickForm/hiddenselect.php
rename to public/main/inc/lib/pear/HTML/QuickForm/hiddenselect.php
diff --git a/main/inc/lib/pear/HTML/QuickForm/html.php b/public/main/inc/lib/pear/HTML/QuickForm/html.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/QuickForm/html.php
rename to public/main/inc/lib/pear/HTML/QuickForm/html.php
diff --git a/main/inc/lib/pear/HTML/QuickForm/image.php b/public/main/inc/lib/pear/HTML/QuickForm/image.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/QuickForm/image.php
rename to public/main/inc/lib/pear/HTML/QuickForm/image.php
diff --git a/main/inc/lib/pear/HTML/QuickForm/index.html b/public/main/inc/lib/pear/HTML/QuickForm/index.html
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/QuickForm/index.html
rename to public/main/inc/lib/pear/HTML/QuickForm/index.html
diff --git a/main/inc/lib/pear/HTML/QuickForm/input.php b/public/main/inc/lib/pear/HTML/QuickForm/input.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/QuickForm/input.php
rename to public/main/inc/lib/pear/HTML/QuickForm/input.php
diff --git a/main/inc/lib/pear/HTML/QuickForm/label.php b/public/main/inc/lib/pear/HTML/QuickForm/label.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/QuickForm/label.php
rename to public/main/inc/lib/pear/HTML/QuickForm/label.php
diff --git a/main/inc/lib/pear/HTML/QuickForm/link.php b/public/main/inc/lib/pear/HTML/QuickForm/link.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/QuickForm/link.php
rename to public/main/inc/lib/pear/HTML/QuickForm/link.php
diff --git a/main/inc/lib/pear/HTML/QuickForm/password.php b/public/main/inc/lib/pear/HTML/QuickForm/password.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/QuickForm/password.php
rename to public/main/inc/lib/pear/HTML/QuickForm/password.php
diff --git a/main/inc/lib/pear/HTML/QuickForm/radio.php b/public/main/inc/lib/pear/HTML/QuickForm/radio.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/QuickForm/radio.php
rename to public/main/inc/lib/pear/HTML/QuickForm/radio.php
diff --git a/main/inc/lib/pear/HTML/QuickForm/reset.php b/public/main/inc/lib/pear/HTML/QuickForm/reset.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/QuickForm/reset.php
rename to public/main/inc/lib/pear/HTML/QuickForm/reset.php
diff --git a/main/inc/lib/pear/HTML/QuickForm/select.php b/public/main/inc/lib/pear/HTML/QuickForm/select.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/QuickForm/select.php
rename to public/main/inc/lib/pear/HTML/QuickForm/select.php
diff --git a/main/inc/lib/pear/HTML/QuickForm/static.php b/public/main/inc/lib/pear/HTML/QuickForm/static.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/QuickForm/static.php
rename to public/main/inc/lib/pear/HTML/QuickForm/static.php
diff --git a/main/inc/lib/pear/HTML/QuickForm/submit.php b/public/main/inc/lib/pear/HTML/QuickForm/submit.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/QuickForm/submit.php
rename to public/main/inc/lib/pear/HTML/QuickForm/submit.php
diff --git a/main/inc/lib/pear/HTML/QuickForm/text.php b/public/main/inc/lib/pear/HTML/QuickForm/text.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/QuickForm/text.php
rename to public/main/inc/lib/pear/HTML/QuickForm/text.php
diff --git a/main/inc/lib/pear/HTML/QuickForm/textarea.php b/public/main/inc/lib/pear/HTML/QuickForm/textarea.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/QuickForm/textarea.php
rename to public/main/inc/lib/pear/HTML/QuickForm/textarea.php
diff --git a/main/inc/lib/pear/HTML/Table.php b/public/main/inc/lib/pear/HTML/Table.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/Table.php
rename to public/main/inc/lib/pear/HTML/Table.php
diff --git a/main/inc/lib/pear/HTML/Table/Storage.php b/public/main/inc/lib/pear/HTML/Table/Storage.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/Table/Storage.php
rename to public/main/inc/lib/pear/HTML/Table/Storage.php
diff --git a/main/inc/lib/pear/HTML/Table/index.html b/public/main/inc/lib/pear/HTML/Table/index.html
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/Table/index.html
rename to public/main/inc/lib/pear/HTML/Table/index.html
diff --git a/main/inc/lib/pear/HTML/index.html b/public/main/inc/lib/pear/HTML/index.html
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/pear/HTML/index.html
rename to public/main/inc/lib/pear/HTML/index.html
diff --git a/main/inc/lib/plugin.class.php b/public/main/inc/lib/plugin.class.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/plugin.class.php
rename to public/main/inc/lib/plugin.class.php
diff --git a/main/inc/lib/plugin.lib.php b/public/main/inc/lib/plugin.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/plugin.lib.php
rename to public/main/inc/lib/plugin.lib.php
diff --git a/main/inc/lib/promotion.lib.php b/public/main/inc/lib/promotion.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/promotion.lib.php
rename to public/main/inc/lib/promotion.lib.php
diff --git a/main/inc/lib/redirect.class.php b/public/main/inc/lib/redirect.class.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/redirect.class.php
rename to public/main/inc/lib/redirect.class.php
diff --git a/main/inc/lib/security.lib.php b/public/main/inc/lib/security.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/security.lib.php
rename to public/main/inc/lib/security.lib.php
diff --git a/main/inc/lib/sessionmanager.lib.php b/public/main/inc/lib/sessionmanager.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/sessionmanager.lib.php
rename to public/main/inc/lib/sessionmanager.lib.php
diff --git a/main/inc/lib/skill.lib.php b/public/main/inc/lib/skill.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/skill.lib.php
rename to public/main/inc/lib/skill.lib.php
diff --git a/main/inc/lib/skill.visualizer.lib.php b/public/main/inc/lib/skill.visualizer.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/skill.visualizer.lib.php
rename to public/main/inc/lib/skill.visualizer.lib.php
diff --git a/main/inc/lib/social.lib.php b/public/main/inc/lib/social.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/social.lib.php
rename to public/main/inc/lib/social.lib.php
diff --git a/main/inc/lib/sortable_table.class.php b/public/main/inc/lib/sortable_table.class.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/sortable_table.class.php
rename to public/main/inc/lib/sortable_table.class.php
diff --git a/main/inc/lib/specific_fields_manager.lib.php b/public/main/inc/lib/specific_fields_manager.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/specific_fields_manager.lib.php
rename to public/main/inc/lib/specific_fields_manager.lib.php
diff --git a/main/inc/lib/statistics.lib.php b/public/main/inc/lib/statistics.lib.php
similarity index 100%
rename from main/inc/lib/statistics.lib.php
rename to public/main/inc/lib/statistics.lib.php
diff --git a/main/inc/lib/sub_language.class.php b/public/main/inc/lib/sub_language.class.php
similarity index 100%
rename from main/inc/lib/sub_language.class.php
rename to public/main/inc/lib/sub_language.class.php
diff --git a/main/inc/lib/surveymanager.lib.php b/public/main/inc/lib/surveymanager.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/surveymanager.lib.php
rename to public/main/inc/lib/surveymanager.lib.php
diff --git a/main/inc/lib/system_announcements.lib.php b/public/main/inc/lib/system_announcements.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/system_announcements.lib.php
rename to public/main/inc/lib/system_announcements.lib.php
diff --git a/main/inc/lib/table_sort.class.php b/public/main/inc/lib/table_sort.class.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/table_sort.class.php
rename to public/main/inc/lib/table_sort.class.php
diff --git a/main/inc/lib/tablesort.lib.php b/public/main/inc/lib/tablesort.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/tablesort.lib.php
rename to public/main/inc/lib/tablesort.lib.php
diff --git a/main/inc/lib/template.lib.php b/public/main/inc/lib/template.lib.php
old mode 100755
new mode 100644
similarity index 99%
rename from main/inc/lib/template.lib.php
rename to public/main/inc/lib/template.lib.php
index 0fb97fd232..05058f5a15
--- a/main/inc/lib/template.lib.php
+++ b/public/main/inc/lib/template.lib.php
@@ -206,7 +206,7 @@ class Template
     public function display($template)
     {
         $template = str_replace('tpl', 'html.twig', $template);
-        $templateFile = api_get_path(SYS_PATH).'main/template/'.$template;
+        $templateFile = api_get_path(SYS_CODE_PATH).'template/'.$template;
 
         $this->loadLegacyParams();
 
diff --git a/main/inc/lib/text.lib.php b/public/main/inc/lib/text.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/text.lib.php
rename to public/main/inc/lib/text.lib.php
diff --git a/main/inc/lib/thematic.lib.php b/public/main/inc/lib/thematic.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/thematic.lib.php
rename to public/main/inc/lib/thematic.lib.php
diff --git a/main/inc/lib/timeline.lib.php b/public/main/inc/lib/timeline.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/timeline.lib.php
rename to public/main/inc/lib/timeline.lib.php
diff --git a/main/inc/lib/tracking.lib.php b/public/main/inc/lib/tracking.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/tracking.lib.php
rename to public/main/inc/lib/tracking.lib.php
diff --git a/main/inc/lib/urlmanager.lib.php b/public/main/inc/lib/urlmanager.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/urlmanager.lib.php
rename to public/main/inc/lib/urlmanager.lib.php
diff --git a/main/inc/lib/user_api_key_manager.class.php b/public/main/inc/lib/user_api_key_manager.class.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/user_api_key_manager.class.php
rename to public/main/inc/lib/user_api_key_manager.class.php
diff --git a/main/inc/lib/usergroup.lib.php b/public/main/inc/lib/usergroup.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/usergroup.lib.php
rename to public/main/inc/lib/usergroup.lib.php
diff --git a/main/inc/lib/usermanager.lib.php b/public/main/inc/lib/usermanager.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/usermanager.lib.php
rename to public/main/inc/lib/usermanager.lib.php
diff --git a/main/inc/lib/userportal.lib.php b/public/main/inc/lib/userportal.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/userportal.lib.php
rename to public/main/inc/lib/userportal.lib.php