diff --git a/phpBB/install/app.php b/phpBB/install/app.php
index 58ca141af7..09a8faf592 100644
--- a/phpBB/install/app.php
+++ b/phpBB/install/app.php
@@ -26,9 +26,6 @@ $phpEx = substr(strrchr(__FILE__, '.'), 1);
 require($phpbb_root_path . 'includes/startup.' . $phpEx);
 require($phpbb_root_path . 'phpbb/class_loader.' . $phpEx);
 
-$phpbb_class_loader = new \phpbb\class_loader('phpbb\\install\\', "{$phpbb_root_path}install/", $phpEx);
-$phpbb_class_loader->register();
-
 $phpbb_class_loader = new \phpbb\class_loader('phpbb\\', "{$phpbb_root_path}phpbb/", $phpEx);
 $phpbb_class_loader->register();
 
diff --git a/phpBB/install/controller/helper.php b/phpBB/phpbb/install/controller/helper.php
similarity index 100%
rename from phpBB/install/controller/helper.php
rename to phpBB/phpbb/install/controller/helper.php
diff --git a/phpBB/install/controller/install.php b/phpBB/phpbb/install/controller/install.php
similarity index 100%
rename from phpBB/install/controller/install.php
rename to phpBB/phpbb/install/controller/install.php
diff --git a/phpBB/install/controller/installer_index.php b/phpBB/phpbb/install/controller/installer_index.php
similarity index 100%
rename from phpBB/install/controller/installer_index.php
rename to phpBB/phpbb/install/controller/installer_index.php
diff --git a/phpBB/install/exception/cannot_build_container_exception.php b/phpBB/phpbb/install/exception/cannot_build_container_exception.php
similarity index 100%
rename from phpBB/install/exception/cannot_build_container_exception.php
rename to phpBB/phpbb/install/exception/cannot_build_container_exception.php
diff --git a/phpBB/install/exception/installer_config_not_writable_exception.php b/phpBB/phpbb/install/exception/installer_config_not_writable_exception.php
similarity index 100%
rename from phpBB/install/exception/installer_config_not_writable_exception.php
rename to phpBB/phpbb/install/exception/installer_config_not_writable_exception.php
diff --git a/phpBB/install/exception/installer_exception.php b/phpBB/phpbb/install/exception/installer_exception.php
similarity index 100%
rename from phpBB/install/exception/installer_exception.php
rename to phpBB/phpbb/install/exception/installer_exception.php
diff --git a/phpBB/install/exception/invalid_dbms_exception.php b/phpBB/phpbb/install/exception/invalid_dbms_exception.php
similarity index 100%
rename from phpBB/install/exception/invalid_dbms_exception.php
rename to phpBB/phpbb/install/exception/invalid_dbms_exception.php
diff --git a/phpBB/install/exception/invalid_service_name_exception.php b/phpBB/phpbb/install/exception/invalid_service_name_exception.php
similarity index 100%
rename from phpBB/install/exception/invalid_service_name_exception.php
rename to phpBB/phpbb/install/exception/invalid_service_name_exception.php
diff --git a/phpBB/install/exception/module_not_found_exception.php b/phpBB/phpbb/install/exception/module_not_found_exception.php
similarity index 100%
rename from phpBB/install/exception/module_not_found_exception.php
rename to phpBB/phpbb/install/exception/module_not_found_exception.php
diff --git a/phpBB/install/exception/task_not_found_exception.php b/phpBB/phpbb/install/exception/task_not_found_exception.php
similarity index 100%
rename from phpBB/install/exception/task_not_found_exception.php
rename to phpBB/phpbb/install/exception/task_not_found_exception.php
diff --git a/phpBB/install/exception/user_interaction_required_exception.php b/phpBB/phpbb/install/exception/user_interaction_required_exception.php
similarity index 100%
rename from phpBB/install/exception/user_interaction_required_exception.php
rename to phpBB/phpbb/install/exception/user_interaction_required_exception.php
diff --git a/phpBB/install/helper/config.php b/phpBB/phpbb/install/helper/config.php
similarity index 100%
rename from phpBB/install/helper/config.php
rename to phpBB/phpbb/install/helper/config.php
diff --git a/phpBB/install/helper/container_factory.php b/phpBB/phpbb/install/helper/container_factory.php
similarity index 100%
rename from phpBB/install/helper/container_factory.php
rename to phpBB/phpbb/install/helper/container_factory.php
diff --git a/phpBB/install/helper/database.php b/phpBB/phpbb/install/helper/database.php
similarity index 100%
rename from phpBB/install/helper/database.php
rename to phpBB/phpbb/install/helper/database.php
diff --git a/phpBB/install/helper/iohandler/ajax_iohandler.php b/phpBB/phpbb/install/helper/iohandler/ajax_iohandler.php
similarity index 100%
rename from phpBB/install/helper/iohandler/ajax_iohandler.php
rename to phpBB/phpbb/install/helper/iohandler/ajax_iohandler.php
diff --git a/phpBB/install/helper/iohandler/exception/iohandler_not_implemented_exception.php b/phpBB/phpbb/install/helper/iohandler/exception/iohandler_not_implemented_exception.php
similarity index 100%
rename from phpBB/install/helper/iohandler/exception/iohandler_not_implemented_exception.php
rename to phpBB/phpbb/install/helper/iohandler/exception/iohandler_not_implemented_exception.php
diff --git a/phpBB/install/helper/iohandler/factory.php b/phpBB/phpbb/install/helper/iohandler/factory.php
similarity index 100%
rename from phpBB/install/helper/iohandler/factory.php
rename to phpBB/phpbb/install/helper/iohandler/factory.php
diff --git a/phpBB/install/helper/iohandler/iohandler_base.php b/phpBB/phpbb/install/helper/iohandler/iohandler_base.php
similarity index 100%
rename from phpBB/install/helper/iohandler/iohandler_base.php
rename to phpBB/phpbb/install/helper/iohandler/iohandler_base.php
diff --git a/phpBB/install/helper/iohandler/iohandler_interface.php b/phpBB/phpbb/install/helper/iohandler/iohandler_interface.php
similarity index 100%
rename from phpBB/install/helper/iohandler/iohandler_interface.php
rename to phpBB/phpbb/install/helper/iohandler/iohandler_interface.php
diff --git a/phpBB/install/helper/navigation/install_navigation.php b/phpBB/phpbb/install/helper/navigation/install_navigation.php
similarity index 100%
rename from phpBB/install/helper/navigation/install_navigation.php
rename to phpBB/phpbb/install/helper/navigation/install_navigation.php
diff --git a/phpBB/install/helper/navigation/main_navigation.php b/phpBB/phpbb/install/helper/navigation/main_navigation.php
similarity index 100%
rename from phpBB/install/helper/navigation/main_navigation.php
rename to phpBB/phpbb/install/helper/navigation/main_navigation.php
diff --git a/phpBB/install/helper/navigation/navigation_interface.php b/phpBB/phpbb/install/helper/navigation/navigation_interface.php
similarity index 100%
rename from phpBB/install/helper/navigation/navigation_interface.php
rename to phpBB/phpbb/install/helper/navigation/navigation_interface.php
diff --git a/phpBB/install/helper/navigation/navigation_provider.php b/phpBB/phpbb/install/helper/navigation/navigation_provider.php
similarity index 100%
rename from phpBB/install/helper/navigation/navigation_provider.php
rename to phpBB/phpbb/install/helper/navigation/navigation_provider.php
diff --git a/phpBB/install/installer.php b/phpBB/phpbb/install/installer.php
similarity index 100%
rename from phpBB/install/installer.php
rename to phpBB/phpbb/install/installer.php
diff --git a/phpBB/install/module/install_data/module.php b/phpBB/phpbb/install/module/install_data/module.php
similarity index 100%
rename from phpBB/install/module/install_data/module.php
rename to phpBB/phpbb/install/module/install_data/module.php
diff --git a/phpBB/install/module/install_data/task/add_bots.php b/phpBB/phpbb/install/module/install_data/task/add_bots.php
similarity index 100%
rename from phpBB/install/module/install_data/task/add_bots.php
rename to phpBB/phpbb/install/module/install_data/task/add_bots.php
diff --git a/phpBB/install/module/install_data/task/add_languages.php b/phpBB/phpbb/install/module/install_data/task/add_languages.php
similarity index 100%
rename from phpBB/install/module/install_data/task/add_languages.php
rename to phpBB/phpbb/install/module/install_data/task/add_languages.php
diff --git a/phpBB/install/module/install_data/task/add_modules.php b/phpBB/phpbb/install/module/install_data/task/add_modules.php
similarity index 100%
rename from phpBB/install/module/install_data/task/add_modules.php
rename to phpBB/phpbb/install/module/install_data/task/add_modules.php
diff --git a/phpBB/install/module/install_database/module.php b/phpBB/phpbb/install/module/install_database/module.php
similarity index 100%
rename from phpBB/install/module/install_database/module.php
rename to phpBB/phpbb/install/module/install_database/module.php
diff --git a/phpBB/install/module/install_database/task/add_config_settings.php b/phpBB/phpbb/install/module/install_database/task/add_config_settings.php
similarity index 100%
rename from phpBB/install/module/install_database/task/add_config_settings.php
rename to phpBB/phpbb/install/module/install_database/task/add_config_settings.php
diff --git a/phpBB/install/module/install_database/task/add_default_data.php b/phpBB/phpbb/install/module/install_database/task/add_default_data.php
similarity index 100%
rename from phpBB/install/module/install_database/task/add_default_data.php
rename to phpBB/phpbb/install/module/install_database/task/add_default_data.php
diff --git a/phpBB/install/module/install_database/task/create_schema.php b/phpBB/phpbb/install/module/install_database/task/create_schema.php
similarity index 100%
rename from phpBB/install/module/install_database/task/create_schema.php
rename to phpBB/phpbb/install/module/install_database/task/create_schema.php
diff --git a/phpBB/install/module/install_filesystem/module.php b/phpBB/phpbb/install/module/install_filesystem/module.php
similarity index 100%
rename from phpBB/install/module/install_filesystem/module.php
rename to phpBB/phpbb/install/module/install_filesystem/module.php
diff --git a/phpBB/install/module/install_filesystem/task/create_config_file.php b/phpBB/phpbb/install/module/install_filesystem/task/create_config_file.php
similarity index 100%
rename from phpBB/install/module/install_filesystem/task/create_config_file.php
rename to phpBB/phpbb/install/module/install_filesystem/task/create_config_file.php
diff --git a/phpBB/install/module/install_finish/module.php b/phpBB/phpbb/install/module/install_finish/module.php
similarity index 100%
rename from phpBB/install/module/install_finish/module.php
rename to phpBB/phpbb/install/module/install_finish/module.php
diff --git a/phpBB/install/module/install_finish/task/notify_user.php b/phpBB/phpbb/install/module/install_finish/task/notify_user.php
similarity index 100%
rename from phpBB/install/module/install_finish/task/notify_user.php
rename to phpBB/phpbb/install/module/install_finish/task/notify_user.php
diff --git a/phpBB/install/module/install_finish/task/populate_migrations.php b/phpBB/phpbb/install/module/install_finish/task/populate_migrations.php
similarity index 100%
rename from phpBB/install/module/install_finish/task/populate_migrations.php
rename to phpBB/phpbb/install/module/install_finish/task/populate_migrations.php
diff --git a/phpBB/install/module/obtain_data/module.php b/phpBB/phpbb/install/module/obtain_data/module.php
similarity index 100%
rename from phpBB/install/module/obtain_data/module.php
rename to phpBB/phpbb/install/module/obtain_data/module.php
diff --git a/phpBB/install/module/obtain_data/task/obtain_admin_data.php b/phpBB/phpbb/install/module/obtain_data/task/obtain_admin_data.php
similarity index 100%
rename from phpBB/install/module/obtain_data/task/obtain_admin_data.php
rename to phpBB/phpbb/install/module/obtain_data/task/obtain_admin_data.php
diff --git a/phpBB/install/module/obtain_data/task/obtain_board_data.php b/phpBB/phpbb/install/module/obtain_data/task/obtain_board_data.php
similarity index 100%
rename from phpBB/install/module/obtain_data/task/obtain_board_data.php
rename to phpBB/phpbb/install/module/obtain_data/task/obtain_board_data.php
diff --git a/phpBB/install/module/obtain_data/task/obtain_database_data.php b/phpBB/phpbb/install/module/obtain_data/task/obtain_database_data.php
similarity index 100%
rename from phpBB/install/module/obtain_data/task/obtain_database_data.php
rename to phpBB/phpbb/install/module/obtain_data/task/obtain_database_data.php
diff --git a/phpBB/install/module/obtain_data/task/obtain_email_data.php b/phpBB/phpbb/install/module/obtain_data/task/obtain_email_data.php
similarity index 100%
rename from phpBB/install/module/obtain_data/task/obtain_email_data.php
rename to phpBB/phpbb/install/module/obtain_data/task/obtain_email_data.php
diff --git a/phpBB/install/module/obtain_data/task/obtain_imagick_path.php b/phpBB/phpbb/install/module/obtain_data/task/obtain_imagick_path.php
similarity index 100%
rename from phpBB/install/module/obtain_data/task/obtain_imagick_path.php
rename to phpBB/phpbb/install/module/obtain_data/task/obtain_imagick_path.php
diff --git a/phpBB/install/module/obtain_data/task/obtain_server_data.php b/phpBB/phpbb/install/module/obtain_data/task/obtain_server_data.php
similarity index 100%
rename from phpBB/install/module/obtain_data/task/obtain_server_data.php
rename to phpBB/phpbb/install/module/obtain_data/task/obtain_server_data.php
diff --git a/phpBB/install/module/requirements/module.php b/phpBB/phpbb/install/module/requirements/module.php
similarity index 100%
rename from phpBB/install/module/requirements/module.php
rename to phpBB/phpbb/install/module/requirements/module.php
diff --git a/phpBB/install/module/requirements/task/check_filesystem.php b/phpBB/phpbb/install/module/requirements/task/check_filesystem.php
similarity index 100%
rename from phpBB/install/module/requirements/task/check_filesystem.php
rename to phpBB/phpbb/install/module/requirements/task/check_filesystem.php
diff --git a/phpBB/install/module/requirements/task/check_server_environment.php b/phpBB/phpbb/install/module/requirements/task/check_server_environment.php
similarity index 100%
rename from phpBB/install/module/requirements/task/check_server_environment.php
rename to phpBB/phpbb/install/module/requirements/task/check_server_environment.php
diff --git a/phpBB/install/module_base.php b/phpBB/phpbb/install/module_base.php
similarity index 100%
rename from phpBB/install/module_base.php
rename to phpBB/phpbb/install/module_base.php
diff --git a/phpBB/install/module_interface.php b/phpBB/phpbb/install/module_interface.php
similarity index 100%
rename from phpBB/install/module_interface.php
rename to phpBB/phpbb/install/module_interface.php
diff --git a/phpBB/install/schemas/index.htm b/phpBB/phpbb/install/schemas/index.htm
similarity index 100%
rename from phpBB/install/schemas/index.htm
rename to phpBB/phpbb/install/schemas/index.htm
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/phpbb/install/schemas/oracle_schema.sql
similarity index 100%
rename from phpBB/install/schemas/oracle_schema.sql
rename to phpBB/phpbb/install/schemas/oracle_schema.sql
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/phpbb/install/schemas/postgres_schema.sql
similarity index 100%
rename from phpBB/install/schemas/postgres_schema.sql
rename to phpBB/phpbb/install/schemas/postgres_schema.sql
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/phpbb/install/schemas/schema_data.sql
similarity index 100%
rename from phpBB/install/schemas/schema_data.sql
rename to phpBB/phpbb/install/schemas/schema_data.sql
diff --git a/phpBB/install/task_base.php b/phpBB/phpbb/install/task_base.php
similarity index 100%
rename from phpBB/install/task_base.php
rename to phpBB/phpbb/install/task_base.php
diff --git a/phpBB/install/task_interface.php b/phpBB/phpbb/install/task_interface.php
similarity index 100%
rename from phpBB/install/task_interface.php
rename to phpBB/phpbb/install/task_interface.php