diff --git a/index.php b/index.php
index 1ee8e5fb4f..cf0e844231 100644
--- a/index.php
+++ b/index.php
@@ -26,20 +26,20 @@ if (isset($_GET['route']) || isset($_POST['route'])) {
         });
         $routes->addGroup('/server', function (RouteCollector $routes) {
             $routes->addRoute('GET', '/collations', function () {
-                require_once ROOT_PATH . 'libraries/entry_points/server_collations.php';
+                require_once ROOT_PATH . 'libraries/entry_points/server/collations.php';
             });
             $routes->addRoute(['GET', 'POST'], '/databases', function () {
-                require_once ROOT_PATH . 'libraries/entry_points/server_databases.php';
+                require_once ROOT_PATH . 'libraries/entry_points/server/databases.php';
             });
             $routes->addRoute('GET', '/engines', function () {
-                require_once ROOT_PATH . 'libraries/entry_points/server_engines.php';
+                require_once ROOT_PATH . 'libraries/entry_points/server/engines.php';
             });
             $routes->addRoute('GET', '/plugins', function () {
-                require_once ROOT_PATH . 'libraries/entry_points/server_plugins.php';
+                require_once ROOT_PATH . 'libraries/entry_points/server/plugins.php';
             });
             $routes->addGroup('/status', function (RouteCollector $routes) {
                 $routes->addRoute('GET', '/queries', function () {
-                    require_once ROOT_PATH . 'libraries/entry_points/server_status_queries.php';
+                    require_once ROOT_PATH . 'libraries/entry_points/server/status/queries.php';
                 });
             });
         });
diff --git a/libraries/entry_points/server_collations.php b/libraries/entry_points/server/collations.php
similarity index 100%
rename from libraries/entry_points/server_collations.php
rename to libraries/entry_points/server/collations.php
diff --git a/libraries/entry_points/server_databases.php b/libraries/entry_points/server/databases.php
similarity index 100%
rename from libraries/entry_points/server_databases.php
rename to libraries/entry_points/server/databases.php
diff --git a/libraries/entry_points/server_engines.php b/libraries/entry_points/server/engines.php
similarity index 100%
rename from libraries/entry_points/server_engines.php
rename to libraries/entry_points/server/engines.php
diff --git a/libraries/entry_points/server_plugins.php b/libraries/entry_points/server/plugins.php
similarity index 100%
rename from libraries/entry_points/server_plugins.php
rename to libraries/entry_points/server/plugins.php
diff --git a/libraries/entry_points/server_status_queries.php b/libraries/entry_points/server/status/queries.php
similarity index 100%
rename from libraries/entry_points/server_status_queries.php
rename to libraries/entry_points/server/status/queries.php