Simplify use statements in the routes definition file

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

1 files changed, 140 insertions, 221 deletions

diff --git a/libraries/routes.php b/libraries/routes.php
index 18899a2750..191d19c7f8 100644
--- a/libraries/routes.php
+++ b/libraries/routes.php
@@ -8,39 +8,11 @@ use PhpMyAdmin\Controllers\ChangeLogController;
 use PhpMyAdmin\Controllers\CheckRelationsController;
 use PhpMyAdmin\Controllers\CollationConnectionController;
 use PhpMyAdmin\Controllers\ColumnController;
-use PhpMyAdmin\Controllers\Config\GetConfigController;
-use PhpMyAdmin\Controllers\Config\SetConfigController;
-use PhpMyAdmin\Controllers\Database\CentralColumns\PopulateColumnsController;
-use PhpMyAdmin\Controllers\Database\CentralColumnsController;
-use PhpMyAdmin\Controllers\Database\DataDictionaryController;
-use PhpMyAdmin\Controllers\Database\DesignerController;
-use PhpMyAdmin\Controllers\Database\EventsController;
-use PhpMyAdmin\Controllers\Database\ExportController as DatabaseExportController;
-use PhpMyAdmin\Controllers\Database\ImportController as DatabaseImportController;
-use PhpMyAdmin\Controllers\Database\MultiTableQuery\QueryController;
-use PhpMyAdmin\Controllers\Database\MultiTableQuery\TablesController as MultiTableQueryTablesController;
-use PhpMyAdmin\Controllers\Database\MultiTableQueryController;
-use PhpMyAdmin\Controllers\Database\Operations\CollationController;
-use PhpMyAdmin\Controllers\Database\OperationsController;
-use PhpMyAdmin\Controllers\Database\QueryByExampleController;
-use PhpMyAdmin\Controllers\Database\RoutinesController;
-use PhpMyAdmin\Controllers\Database\SearchController;
-use PhpMyAdmin\Controllers\Database\SqlAutoCompleteController;
-use PhpMyAdmin\Controllers\Database\SqlController as DatabaseSqlController;
-use PhpMyAdmin\Controllers\Database\SqlFormatController;
-use PhpMyAdmin\Controllers\Database\Structure;
-use PhpMyAdmin\Controllers\Database\StructureController;
-use PhpMyAdmin\Controllers\Database\TrackingController;
-use PhpMyAdmin\Controllers\Database\TriggersController;
+use PhpMyAdmin\Controllers\Config;
+use PhpMyAdmin\Controllers\Database;
 use PhpMyAdmin\Controllers\DatabaseController;
 use PhpMyAdmin\Controllers\ErrorReportController;
-use PhpMyAdmin\Controllers\Export\CheckTimeOutController;
-use PhpMyAdmin\Controllers\Export\ExportController;
-use PhpMyAdmin\Controllers\Export\TablesController;
-use PhpMyAdmin\Controllers\Export\Template\CreateController as TemplateCreateController;
-use PhpMyAdmin\Controllers\Export\Template\DeleteController as TemplateDeleteController;
-use PhpMyAdmin\Controllers\Export\Template\LoadController as TemplateLoadController;
-use PhpMyAdmin\Controllers\Export\Template\UpdateController as TemplateUpdateController;
+use PhpMyAdmin\Controllers\Export;
 use PhpMyAdmin\Controllers\GisDataEditorController;
 use PhpMyAdmin\Controllers\GitInfoController;
 use PhpMyAdmin\Controllers\HomeController;
@@ -52,73 +24,18 @@ use PhpMyAdmin\Controllers\LogoutController;
 use PhpMyAdmin\Controllers\NavigationController;
 use PhpMyAdmin\Controllers\NormalizationController;
 use PhpMyAdmin\Controllers\PhpInfoController;
-use PhpMyAdmin\Controllers\Preferences\ExportController as PreferencesExportController;
-use PhpMyAdmin\Controllers\Preferences\FeaturesController;
-use PhpMyAdmin\Controllers\Preferences\ImportController as PreferencesImportController;
-use PhpMyAdmin\Controllers\Preferences\MainPanelController;
-use PhpMyAdmin\Controllers\Preferences\ManageController;
-use PhpMyAdmin\Controllers\Preferences\NavigationController as PreferencesNavigationController;
-use PhpMyAdmin\Controllers\Preferences\SqlController as PreferencesSqlController;
-use PhpMyAdmin\Controllers\Preferences\TwoFactorController;
+use PhpMyAdmin\Controllers\Preferences;
 use PhpMyAdmin\Controllers\RecentTablesListController;
 use PhpMyAdmin\Controllers\SchemaExportController;
-use PhpMyAdmin\Controllers\Server\BinlogController;
-use PhpMyAdmin\Controllers\Server\CollationsController;
-use PhpMyAdmin\Controllers\Server\Databases\CreateController as DatabasesCreateController;
-use PhpMyAdmin\Controllers\Server\Databases\DestroyController;
-use PhpMyAdmin\Controllers\Server\DatabasesController;
-use PhpMyAdmin\Controllers\Server\EnginesController;
-use PhpMyAdmin\Controllers\Server\ExportController as ServerExportController;
-use PhpMyAdmin\Controllers\Server\ImportController as ServerImportController;
-use PhpMyAdmin\Controllers\Server\PluginsController;
-use PhpMyAdmin\Controllers\Server\Privileges\AccountLockController;
-use PhpMyAdmin\Controllers\Server\Privileges\AccountUnlockController;
-use PhpMyAdmin\Controllers\Server\PrivilegesController;
-use PhpMyAdmin\Controllers\Server\ReplicationController;
-use PhpMyAdmin\Controllers\Server\SqlController as ServerSqlController;
-use PhpMyAdmin\Controllers\Server\Status\AdvisorController;
-use PhpMyAdmin\Controllers\Server\Status\MonitorController;
-use PhpMyAdmin\Controllers\Server\Status\ProcessesController;
-use PhpMyAdmin\Controllers\Server\Status\QueriesController;
-use PhpMyAdmin\Controllers\Server\Status\StatusController;
-use PhpMyAdmin\Controllers\Server\Status\VariablesController as StatusVariables;
-use PhpMyAdmin\Controllers\Server\UserGroupsController;
-use PhpMyAdmin\Controllers\Server\VariablesController;
+use PhpMyAdmin\Controllers\Server;
 use PhpMyAdmin\Controllers\SqlController;
 use PhpMyAdmin\Controllers\Table;
-use PhpMyAdmin\Controllers\Table\AddFieldController;
-use PhpMyAdmin\Controllers\Table\ChangeController;
-use PhpMyAdmin\Controllers\Table\ChartController;
-use PhpMyAdmin\Controllers\Table\CreateController;
-use PhpMyAdmin\Controllers\Table\DeleteController;
-use PhpMyAdmin\Controllers\Table\DropColumnConfirmationController;
-use PhpMyAdmin\Controllers\Table\DropColumnController;
-use PhpMyAdmin\Controllers\Table\ExportController as TableExportController;
-use PhpMyAdmin\Controllers\Table\FindReplaceController;
-use PhpMyAdmin\Controllers\Table\GetFieldController;
-use PhpMyAdmin\Controllers\Table\GisVisualizationController;
-use PhpMyAdmin\Controllers\Table\ImportController as TableImportController;
-use PhpMyAdmin\Controllers\Table\IndexesController;
-use PhpMyAdmin\Controllers\Table\MaintenanceController;
-use PhpMyAdmin\Controllers\Table\OperationsController as TableOperationsController;
-use PhpMyAdmin\Controllers\Table\PartitionController;
-use PhpMyAdmin\Controllers\Table\RecentFavoriteController;
-use PhpMyAdmin\Controllers\Table\RelationController;
-use PhpMyAdmin\Controllers\Table\ReplaceController;
-use PhpMyAdmin\Controllers\Table\SearchController as TableSearchController;
-use PhpMyAdmin\Controllers\Table\SqlController as TableSqlController;
-use PhpMyAdmin\Controllers\Table\StructureController as TableStructureController;
-use PhpMyAdmin\Controllers\Table\TrackingController as TableTrackingController;
-use PhpMyAdmin\Controllers\Table\TriggersController as TableTriggersController;
-use PhpMyAdmin\Controllers\Table\ZoomSearchController;
 use PhpMyAdmin\Controllers\TableController;
 use PhpMyAdmin\Controllers\ThemesController;
-use PhpMyAdmin\Controllers\Transformation\OverviewController;
-use PhpMyAdmin\Controllers\Transformation\WrapperController;
+use PhpMyAdmin\Controllers\Transformation;
 use PhpMyAdmin\Controllers\UserPasswordController;
 use PhpMyAdmin\Controllers\VersionCheckController;
-use PhpMyAdmin\Controllers\View\CreateController as ViewCreateController;
-use PhpMyAdmin\Controllers\View\OperationsController as ViewOperationsController;
+use PhpMyAdmin\Controllers\View;
 
 if (! defined('PHPMYADMIN')) {
     exit;
@@ -132,70 +49,72 @@ return static function (RouteCollector $routes): void {
     $routes->post('/collation-connection', CollationConnectionController::class);
     $routes->post('/columns', ColumnController::class);
     $routes->addGroup('/config', static function (RouteCollector $routes): void {
-        $routes->post('/get', GetConfigController::class);
-        $routes->post('/set', SetConfigController::class);
+        $routes->post('/get', Config\GetConfigController::class);
+        $routes->post('/set', Config\SetConfigController::class);
     });
     $routes->addGroup('/database', static function (RouteCollector $routes): void {
         $routes->addGroup('/central-columns', static function (RouteCollector $routes): void {
-            $routes->addRoute(['GET', 'POST'], '', CentralColumnsController::class);
-            $routes->post('/populate', PopulateColumnsController::class);
+            $routes->addRoute(['GET', 'POST'], '', Database\CentralColumnsController::class);
+            $routes->post('/populate', Database\CentralColumns\PopulateColumnsController::class);
         });
-        $routes->get('/data-dictionary', DataDictionaryController::class);
-        $routes->addRoute(['GET', 'POST'], '/designer', DesignerController::class);
-        $routes->addRoute(['GET', 'POST'], '/events', EventsController::class);
-        $routes->addRoute(['GET', 'POST'], '/export', DatabaseExportController::class);
-        $routes->addRoute(['GET', 'POST'], '/import', DatabaseImportController::class);
+        $routes->get('/data-dictionary', Database\DataDictionaryController::class);
+        $routes->addRoute(['GET', 'POST'], '/designer', Database\DesignerController::class);
+        $routes->addRoute(['GET', 'POST'], '/events', Database\EventsController::class);
+        $routes->addRoute(['GET', 'POST'], '/export', Database\ExportController::class);
+        $routes->addRoute(['GET', 'POST'], '/import', Database\ImportController::class);
         $routes->addGroup('/multi-table-query', static function (RouteCollector $routes): void {
-            $routes->get('', MultiTableQueryController::class);
-            $routes->get('/tables', MultiTableQueryTablesController::class);
-            $routes->post('/query', QueryController::class);
+            $routes->get('', Database\MultiTableQueryController::class);
+            $routes->get('/tables', Database\MultiTableQuery\TablesController::class);
+            $routes->post('/query', Database\MultiTableQuery\QueryController::class);
         });
         $routes->addGroup('/operations', static function (RouteCollector $routes): void {
-            $routes->addRoute(['GET', 'POST'], '', OperationsController::class);
-            $routes->post('/collation', CollationController::class);
+            $routes->addRoute(['GET', 'POST'], '', Database\OperationsController::class);
+            $routes->post('/collation', Database\Operations\CollationController::class);
         });
-        $routes->addRoute(['GET', 'POST'], '/qbe', QueryByExampleController::class);
-        $routes->addRoute(['GET', 'POST'], '/routines', RoutinesController::class);
-        $routes->addRoute(['GET', 'POST'], '/search', SearchController::class);
+        $routes->addRoute(['GET', 'POST'], '/qbe', Database\QueryByExampleController::class);
+        $routes->addRoute(['GET', 'POST'], '/routines', Database\RoutinesController::class);
+        $routes->addRoute(['GET', 'POST'], '/search', Database\SearchController::class);
         $routes->addGroup('/sql', static function (RouteCollector $routes): void {
-            $routes->addRoute(['GET', 'POST'], '', DatabaseSqlController::class);
-            $routes->post('/autocomplete', SqlAutoCompleteController::class);
-            $routes->post('/format', SqlFormatController::class);
+            $routes->addRoute(['GET', 'POST'], '', Database\SqlController::class);
+            $routes->post('/autocomplete', Database\SqlAutoCompleteController::class);
+            $routes->post('/format', Database\SqlFormatController::class);
         });
         $routes->addGroup('/structure', static function (RouteCollector $routes): void {
-            $routes->addRoute(['GET', 'POST'], '', StructureController::class);
-            $routes->post('/add-prefix', Structure\AddPrefixController::class);
-            $routes->post('/add-prefix-table', Structure\AddPrefixTableController::class);
-            $routes->post('/central-columns-add', Structure\CentralColumns\AddController::class);
-            $routes->post('/central-columns-make-consistent', Structure\CentralColumns\MakeConsistentController::class);
-            $routes->post('/central-columns-remove', Structure\CentralColumns\RemoveController::class);
-            $routes->post('/change-prefix-form', Structure\ChangePrefixFormController::class);
-            $routes->post('/copy-form', Structure\CopyFormController::class);
-            $routes->post('/copy-table', Structure\CopyTableController::class);
-            $routes->post('/copy-table-with-prefix', Structure\CopyTableWithPrefixController::class);
-            $routes->post('/drop-form', Structure\DropFormController::class);
-            $routes->post('/drop-table', Structure\DropTableController::class);
-            $routes->post('/empty-form', Structure\EmptyFormController::class);
-            $routes->post('/empty-table', Structure\EmptyTableController::class);
-            $routes->addRoute(['GET', 'POST'], '/favorite-table', Structure\FavoriteTableController::class);
-            $routes->addRoute(['GET', 'POST'], '/real-row-count', Structure\RealRowCountController::class);
-            $routes->post('/replace-prefix', Structure\ReplacePrefixController::class);
-            $routes->post('/show-create', Structure\ShowCreateController::class);
+            $routes->addRoute(['GET', 'POST'], '', Database\StructureController::class);
+            $routes->post('/add-prefix', Database\Structure\AddPrefixController::class);
+            $routes->post('/add-prefix-table', Database\Structure\AddPrefixTableController::class);
+            $routes->addGroup('/central-columns', static function (RouteCollector $routes): void {
+                $routes->post('/add', Database\Structure\CentralColumns\AddController::class);
+                $routes->post('/make-consistent', Database\Structure\CentralColumns\MakeConsistentController::class);
+                $routes->post('/remove', Database\Structure\CentralColumns\RemoveController::class);
+            });
+            $routes->post('/change-prefix-form', Database\Structure\ChangePrefixFormController::class);
+            $routes->post('/copy-form', Database\Structure\CopyFormController::class);
+            $routes->post('/copy-table', Database\Structure\CopyTableController::class);
+            $routes->post('/copy-table-with-prefix', Database\Structure\CopyTableWithPrefixController::class);
+            $routes->post('/drop-form', Database\Structure\DropFormController::class);
+            $routes->post('/drop-table', Database\Structure\DropTableController::class);
+            $routes->post('/empty-form', Database\Structure\EmptyFormController::class);
+            $routes->post('/empty-table', Database\Structure\EmptyTableController::class);
+            $routes->addRoute(['GET', 'POST'], '/favorite-table', Database\Structure\FavoriteTableController::class);
+            $routes->addRoute(['GET', 'POST'], '/real-row-count', Database\Structure\RealRowCountController::class);
+            $routes->post('/replace-prefix', Database\Structure\ReplacePrefixController::class);
+            $routes->post('/show-create', Database\Structure\ShowCreateController::class);
         });
-        $routes->addRoute(['GET', 'POST'], '/tracking', TrackingController::class);
-        $routes->addRoute(['GET', 'POST'], '/triggers', TriggersController::class);
+        $routes->addRoute(['GET', 'POST'], '/tracking', Database\TrackingController::class);
+        $routes->addRoute(['GET', 'POST'], '/triggers', Database\TriggersController::class);
     });
     $routes->post('/databases', DatabaseController::class);
     $routes->addRoute(['GET', 'POST'], '/error-report', ErrorReportController::class);
     $routes->addGroup('/export', static function (RouteCollector $routes): void {
-        $routes->addRoute(['GET', 'POST'], '', ExportController::class);
-        $routes->get('/check-time-out', CheckTimeOutController::class);
-        $routes->post('/tables', TablesController::class);
+        $routes->addRoute(['GET', 'POST'], '', Export\ExportController::class);
+        $routes->get('/check-time-out', Export\CheckTimeOutController::class);
+        $routes->post('/tables', Export\TablesController::class);
         $routes->addGroup('/template', static function (RouteCollector $routes): void {
-            $routes->post('/create', TemplateCreateController::class);
-            $routes->post('/delete', TemplateDeleteController::class);
-            $routes->post('/load', TemplateLoadController::class);
-            $routes->post('/update', TemplateUpdateController::class);
+            $routes->post('/create', Export\Template\CreateController::class);
+            $routes->post('/delete', Export\Template\DeleteController::class);
+            $routes->post('/load', Export\Template\LoadController::class);
+            $routes->post('/update', Export\Template\UpdateController::class);
         });
     });
     $routes->addRoute(['GET', 'POST'], '/gis-data-editor', GisDataEditorController::class);
@@ -209,66 +128,66 @@ return static function (RouteCollector $routes): void {
     $routes->addRoute(['GET', 'POST'], '/normalization', NormalizationController::class);
     $routes->get('/phpinfo', PhpInfoController::class);
     $routes->addGroup('/preferences', static function (RouteCollector $routes): void {
-        $routes->addRoute(['GET', 'POST'], '/export', PreferencesExportController::class);
-        $routes->addRoute(['GET', 'POST'], '/features', FeaturesController::class);
-        $routes->addRoute(['GET', 'POST'], '/import', PreferencesImportController::class);
-        $routes->addRoute(['GET', 'POST'], '/main-panel', MainPanelController::class);
-        $routes->addRoute(['GET', 'POST'], '/manage', ManageController::class);
-        $routes->addRoute(['GET', 'POST'], '/navigation', PreferencesNavigationController::class);
-        $routes->addRoute(['GET', 'POST'], '/sql', PreferencesSqlController::class);
-        $routes->addRoute(['GET', 'POST'], '/two-factor', TwoFactorController::class);
+        $routes->addRoute(['GET', 'POST'], '/export', Preferences\ExportController::class);
+        $routes->addRoute(['GET', 'POST'], '/features', Preferences\FeaturesController::class);
+        $routes->addRoute(['GET', 'POST'], '/import', Preferences\ImportController::class);
+        $routes->addRoute(['GET', 'POST'], '/main-panel', Preferences\MainPanelController::class);
+        $routes->addRoute(['GET', 'POST'], '/manage', Preferences\ManageController::class);
+        $routes->addRoute(['GET', 'POST'], '/navigation', Preferences\NavigationController::class);
+        $routes->addRoute(['GET', 'POST'], '/sql', Preferences\SqlController::class);
+        $routes->addRoute(['GET', 'POST'], '/two-factor', Preferences\TwoFactorController::class);
     });
     $routes->addRoute(['GET', 'POST'], '/recent-table', RecentTablesListController::class);
     $routes->addRoute(['GET', 'POST'], '/schema-export', SchemaExportController::class);
     $routes->addGroup('/server', static function (RouteCollector $routes): void {
-        $routes->addRoute(['GET', 'POST'], '/binlog', BinlogController::class);
-        $routes->get('/collations', CollationsController::class);
+        $routes->addRoute(['GET', 'POST'], '/binlog', Server\BinlogController::class);
+        $routes->get('/collations', Server\CollationsController::class);
         $routes->addGroup('/databases', static function (RouteCollector $routes): void {
-            $routes->addRoute(['GET', 'POST'], '', DatabasesController::class);
-            $routes->post('/create', DatabasesCreateController::class);
-            $routes->post('/destroy', DestroyController::class);
+            $routes->addRoute(['GET', 'POST'], '', Server\DatabasesController::class);
+            $routes->post('/create', Server\Databases\CreateController::class);
+            $routes->post('/destroy', Server\Databases\DestroyController::class);
         });
         $routes->addGroup('/engines', static function (RouteCollector $routes): void {
-            $routes->get('', [EnginesController::class, 'index']);
-            $routes->get('/{engine}[/{page}]', [EnginesController::class, 'show']);
+            $routes->get('', [Server\EnginesController::class, 'index']);
+            $routes->get('/{engine}[/{page}]', [Server\EnginesController::class, 'show']);
         });
-        $routes->addRoute(['GET', 'POST'], '/export', ServerExportController::class);
-        $routes->addRoute(['GET', 'POST'], '/import', ServerImportController::class);
-        $routes->get('/plugins', PluginsController::class);
+        $routes->addRoute(['GET', 'POST'], '/export', Server\ExportController::class);
+        $routes->addRoute(['GET', 'POST'], '/import', Server\ImportController::class);
+        $routes->get('/plugins', Server\PluginsController::class);
         $routes->addGroup('/privileges', static function (RouteCollector $routes): void {
-            $routes->addRoute(['GET', 'POST'], '', PrivilegesController::class);
-            $routes->post('/account-lock', AccountLockController::class);
-            $routes->post('/account-unlock', AccountUnlockController::class);
+            $routes->addRoute(['GET', 'POST'], '', Server\PrivilegesController::class);
+            $routes->post('/account-lock', Server\Privileges\AccountLockController::class);
+            $routes->post('/account-unlock', Server\Privileges\AccountUnlockController::class);
         });
-        $routes->addRoute(['GET', 'POST'], '/replication', ReplicationController::class);
-        $routes->addRoute(['GET', 'POST'], '/sql', ServerSqlController::class);
+        $routes->addRoute(['GET', 'POST'], '/replication', Server\ReplicationController::class);
+        $routes->addRoute(['GET', 'POST'], '/sql', Server\SqlController::class);
         $routes->addGroup('/status', static function (RouteCollector $routes): void {
-            $routes->get('', StatusController::class);
-            $routes->get('/advisor', AdvisorController::class);
+            $routes->get('', Server\Status\StatusController::class);
+            $routes->get('/advisor', Server\Status\AdvisorController::class);
             $routes->addGroup('/monitor', static function (RouteCollector $routes): void {
-                $routes->get('', [MonitorController::class, 'index']);
-                $routes->post('/chart', [MonitorController::class, 'chartingData']);
-                $routes->post('/slow-log', [MonitorController::class, 'logDataTypeSlow']);
-                $routes->post('/general-log', [MonitorController::class, 'logDataTypeGeneral']);
-                $routes->post('/log-vars', [MonitorController::class, 'loggingVars']);
-                $routes->post('/query', [MonitorController::class, 'queryAnalyzer']);
+                $routes->get('', [Server\Status\MonitorController::class, 'index']);
+                $routes->post('/chart', [Server\Status\MonitorController::class, 'chartingData']);
+                $routes->post('/slow-log', [Server\Status\MonitorController::class, 'logDataTypeSlow']);
+                $routes->post('/general-log', [Server\Status\MonitorController::class, 'logDataTypeGeneral']);
+                $routes->post('/log-vars', [Server\Status\MonitorController::class, 'loggingVars']);
+                $routes->post('/query', [Server\Status\MonitorController::class, 'queryAnalyzer']);
             });
             $routes->addGroup('/processes', static function (RouteCollector $routes): void {
-                $routes->addRoute(['GET', 'POST'], '', [ProcessesController::class, 'index']);
-                $routes->post('/refresh', [ProcessesController::class, 'refresh']);
-                $routes->post('/kill/{id:\d+}', [ProcessesController::class, 'kill']);
+                $routes->addRoute(['GET', 'POST'], '', [Server\Status\ProcessesController::class, 'index']);
+                $routes->post('/refresh', [Server\Status\ProcessesController::class, 'refresh']);
+                $routes->post('/kill/{id:\d+}', [Server\Status\ProcessesController::class, 'kill']);
             });
-            $routes->get('/queries', QueriesController::class);
-            $routes->addRoute(['GET', 'POST'], '/variables', StatusVariables::class);
+            $routes->get('/queries', Server\Status\QueriesController::class);
+            $routes->addRoute(['GET', 'POST'], '/variables', Server\Status\VariablesController::class);
         });
         $routes->addGroup('/user-groups', static function (RouteCollector $routes): void {
-            $routes->addRoute(['GET', 'POST'], '', [UserGroupsController::class, 'index']);
-            $routes->get('/edit-form', [UserGroupsController::class, 'editUserGroupModalForm']);
+            $routes->addRoute(['GET', 'POST'], '', [Server\UserGroupsController::class, 'index']);
+            $routes->get('/edit-form', [Server\UserGroupsController::class, 'editUserGroupModalForm']);
         });
         $routes->addGroup('/variables', static function (RouteCollector $routes): void {
-            $routes->get('', [VariablesController::class, 'index']);
-            $routes->get('/get/{name}', [VariablesController::class, 'getValue']);
-            $routes->post('/set/{name}', [VariablesController::class, 'setValue']);
+            $routes->get('', [Server\VariablesController::class, 'index']);
+            $routes->get('/get/{name}', [Server\VariablesController::class, 'getValue']);
+            $routes->post('/set/{name}', [Server\VariablesController::class, 'setValue']);
         });
     });
     $routes->addGroup('/sql', static function (RouteCollector $routes): void {
@@ -280,58 +199,58 @@ return static function (RouteCollector $routes): void {
         $routes->post('/set-column-preferences', [SqlController::class, 'setColumnOrderOrVisibility']);
     });
     $routes->addGroup('/table', static function (RouteCollector $routes): void {
-        $routes->addRoute(['GET', 'POST'], '/add-field', AddFieldController::class);
+        $routes->addRoute(['GET', 'POST'], '/add-field', Table\AddFieldController::class);
         $routes->addGroup('/change', static function (RouteCollector $routes): void {
-            $routes->addRoute(['GET', 'POST'], '', [ChangeController::class, 'index']);
-            $routes->post('/rows', [ChangeController::class, 'rows']);
+            $routes->addRoute(['GET', 'POST'], '', [Table\ChangeController::class, 'index']);
+            $routes->post('/rows', [Table\ChangeController::class, 'rows']);
         });
-        $routes->addRoute(['GET', 'POST'], '/chart', ChartController::class);
-        $routes->addRoute(['GET', 'POST'], '/create', CreateController::class);
+        $routes->addRoute(['GET', 'POST'], '/chart', Table\ChartController::class);
+        $routes->addRoute(['GET', 'POST'], '/create', Table\CreateController::class);
         $routes->addGroup('/delete', static function (RouteCollector $routes): void {
-            $routes->post('/confirm', [DeleteController::class, 'confirm']);
-            $routes->post('/rows', [DeleteController::class, 'rows']);
+            $routes->post('/confirm', [Table\DeleteController::class, 'confirm']);
+            $routes->post('/rows', [Table\DeleteController::class, 'rows']);
         });
         $routes->addGroup('/export', static function (RouteCollector $routes): void {
-            $routes->addRoute(['GET', 'POST'], '', [TableExportController::class, 'index']);
-            $routes->post('/rows', [TableExportController::class, 'rows']);
+            $routes->addRoute(['GET', 'POST'], '', [Table\ExportController::class, 'index']);
+            $routes->post('/rows', [Table\ExportController::class, 'rows']);
         });
-        $routes->addRoute(['GET', 'POST'], '/find-replace', FindReplaceController::class);
-        $routes->addRoute(['GET', 'POST'], '/get-field', GetFieldController::class);
-        $routes->addRoute(['GET', 'POST'], '/gis-visualization', GisVisualizationController::class);
-        $routes->addRoute(['GET', 'POST'], '/import', TableImportController::class);
-        $routes->addRoute(['GET', 'POST'], '/indexes', [IndexesController::class, 'index']);
-        $routes->addRoute(['GET', 'POST'], '/indexes/rename', [IndexesController::class, 'indexRename']);
+        $routes->addRoute(['GET', 'POST'], '/find-replace', Table\FindReplaceController::class);
+        $routes->addRoute(['GET', 'POST'], '/get-field', Table\GetFieldController::class);
+        $routes->addRoute(['GET', 'POST'], '/gis-visualization', Table\GisVisualizationController::class);
+        $routes->addRoute(['GET', 'POST'], '/import', Table\ImportController::class);
+        $routes->addRoute(['GET', 'POST'], '/indexes', [Table\IndexesController::class, 'index']);
+        $routes->addRoute(['GET', 'POST'], '/indexes/rename', [Table\IndexesController::class, 'indexRename']);
         $routes->addGroup('/maintenance', static function (RouteCollector $routes): void {
-            $routes->post('/analyze', [MaintenanceController::class, 'analyze']);
-            $routes->post('/check', [MaintenanceController::class, 'check']);
-            $routes->post('/checksum', [MaintenanceController::class, 'checksum']);
-            $routes->post('/optimize', [MaintenanceController::class, 'optimize']);
-            $routes->post('/repair', [MaintenanceController::class, 'repair']);
+            $routes->post('/analyze', [Table\MaintenanceController::class, 'analyze']);
+            $routes->post('/check', [Table\MaintenanceController::class, 'check']);
+            $routes->post('/checksum', [Table\MaintenanceController::class, 'checksum']);
+            $routes->post('/optimize', [Table\MaintenanceController::class, 'optimize']);
+            $routes->post('/repair', [Table\MaintenanceController::class, 'repair']);
         });
         $routes->addGroup('/partition', static function (RouteCollector $routes): void {
-            $routes->post('/analyze', [PartitionController::class, 'analyze']);
-            $routes->post('/check', [PartitionController::class, 'check']);
-            $routes->post('/drop', [PartitionController::class, 'drop']);
-            $routes->post('/optimize', [PartitionController::class, 'optimize']);
-            $routes->post('/rebuild', [PartitionController::class, 'rebuild']);
-            $routes->post('/repair', [PartitionController::class, 'repair']);
-            $routes->post('/truncate', [PartitionController::class, 'truncate']);
+            $routes->post('/analyze', [Table\PartitionController::class, 'analyze']);
+            $routes->post('/check', [Table\PartitionController::class, 'check']);
+            $routes->post('/drop', [Table\PartitionController::class, 'drop']);
+            $routes->post('/optimize', [Table\PartitionController::class, 'optimize']);
+            $routes->post('/rebuild', [Table\PartitionController::class, 'rebuild']);
+            $routes->post('/repair', [Table\PartitionController::class, 'repair']);
+            $routes->post('/truncate', [Table\PartitionController::class, 'truncate']);
         });
-        $routes->addRoute(['GET', 'POST'], '/operations', TableOperationsController::class);
-        $routes->addRoute(['GET', 'POST'], '/recent-favorite', RecentFavoriteController::class);
-        $routes->addRoute(['GET', 'POST'], '/relation', RelationController::class);
-        $routes->addRoute(['GET', 'POST'], '/replace', ReplaceController::class);
-        $routes->addRoute(['GET', 'POST'], '/search', TableSearchController::class);
-        $routes->addRoute(['GET', 'POST'], '/sql', TableSqlController::class);
+        $routes->addRoute(['GET', 'POST'], '/operations', Table\OperationsController::class);
+        $routes->addRoute(['GET', 'POST'], '/recent-favorite', Table\RecentFavoriteController::class);
+        $routes->addRoute(['GET', 'POST'], '/relation', Table\RelationController::class);
+        $routes->addRoute(['GET', 'POST'], '/replace', Table\ReplaceController::class);
+        $routes->addRoute(['GET', 'POST'], '/search', Table\SearchController::class);
+        $routes->addRoute(['GET', 'POST'], '/sql', Table\SqlController::class);
         $routes->addGroup('/structure', static function (RouteCollector $routes): void {
-            $routes->addRoute(['GET', 'POST'], '', TableStructureController::class);
+            $routes->addRoute(['GET', 'POST'], '', Table\StructureController::class);
             $routes->post('/add-key', Table\Structure\AddKeyController::class);
             $routes->post('/browse', Table\Structure\BrowseController::class);
             $routes->post('/central-columns-add', Table\Structure\CentralColumnsAddController::class);
             $routes->post('/central-columns-remove', Table\Structure\CentralColumnsRemoveController::class);
             $routes->addRoute(['GET', 'POST'], '/change', Table\Structure\ChangeController::class);
-            $routes->post('/drop', DropColumnController::class);
-            $routes->post('/drop-confirm', DropColumnConfirmationController::class);
+            $routes->post('/drop', Table\DropColumnController::class);
+            $routes->post('/drop-confirm', Table\DropColumnConfirmationController::class);
             $routes->post('/fulltext', Table\Structure\FulltextController::class);
             $routes->post('/index', Table\Structure\AddIndexController::class);
             $routes->post('/move-columns', Table\Structure\MoveColumnsController::class);
@@ -342,9 +261,9 @@ return static function (RouteCollector $routes): void {
             $routes->post('/spatial', Table\Structure\SpatialController::class);
             $routes->post('/unique', Table\Structure\UniqueController::class);
         });
-        $routes->addRoute(['GET', 'POST'], '/tracking', TableTrackingController::class);
-        $routes->addRoute(['GET', 'POST'], '/triggers', TableTriggersController::class);
-        $routes->addRoute(['GET', 'POST'], '/zoom-search', ZoomSearchController::class);
+        $routes->addRoute(['GET', 'POST'], '/tracking', Table\TrackingController::class);
+        $routes->addRoute(['GET', 'POST'], '/triggers', Table\TriggersController::class);
+        $routes->addRoute(['GET', 'POST'], '/zoom-search', Table\ZoomSearchController::class);
     });
     $routes->post('/tables', TableController::class);
     $routes->addGroup('/themes', static function (RouteCollector $routes): void {
@@ -352,13 +271,13 @@ return static function (RouteCollector $routes): void {
         $routes->post('/set', [ThemesController::class, 'setTheme']);
     });
     $routes->addGroup('/transformation', static function (RouteCollector $routes): void {
-        $routes->addRoute(['GET', 'POST'], '/overview', OverviewController::class);
-        $routes->addRoute(['GET', 'POST'], '/wrapper', WrapperController::class);
+        $routes->addRoute(['GET', 'POST'], '/overview', Transformation\OverviewController::class);
+        $routes->addRoute(['GET', 'POST'], '/wrapper', Transformation\WrapperController::class);
     });
     $routes->addRoute(['GET', 'POST'], '/user-password', UserPasswordController::class);
     $routes->addRoute(['GET', 'POST'], '/version-check', VersionCheckController::class);
     $routes->addGroup('/view', static function (RouteCollector $routes): void {
-        $routes->addRoute(['GET', 'POST'], '/create', ViewCreateController::class);
-        $routes->addRoute(['GET', 'POST'], '/operations', ViewOperationsController::class);
+        $routes->addRoute(['GET', 'POST'], '/create', View\CreateController::class);
+        $routes->addRoute(['GET', 'POST'], '/operations', View\OperationsController::class);
     });
 };