diff --git a/core/debugger/remote_debugger.cpp b/core/debugger/remote_debugger.cpp
index 039028fa09b..40073b21490 100644
--- a/core/debugger/remote_debugger.cpp
+++ b/core/debugger/remote_debugger.cpp
@@ -40,7 +40,7 @@
 #include "core/math/expression.h"
 #include "core/object/script_language.h"
 #include "core/os/os.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 class RemoteDebugger::PerformanceProfiler : public EngineProfiler {
 	Object *performance = nullptr;
diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp
index a03049ce82d..fc7ebd35451 100644
--- a/core/io/resource_loader.cpp
+++ b/core/io/resource_loader.cpp
@@ -43,7 +43,7 @@
 #include "core/string/translation_server.h"
 #include "core/templates/rb_set.h"
 #include "core/variant/variant_parser.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 #ifdef DEBUG_LOAD_THREADED
 #define print_lt(m_text) print_line(m_text)
diff --git a/drivers/accesskit/accessibility_driver_accesskit.cpp b/drivers/accesskit/accessibility_driver_accesskit.cpp
index bccb0cf656d..a85e0b83912 100644
--- a/drivers/accesskit/accessibility_driver_accesskit.cpp
+++ b/drivers/accesskit/accessibility_driver_accesskit.cpp
@@ -35,7 +35,7 @@
 #include "core/config/project_settings.h"
 #include "core/version.h"
 
-#include "servers/text_server.h"
+#include "servers/text/text_server.h"
 
 AccessibilityDriverAccessKit *AccessibilityDriverAccessKit::singleton = nullptr;
 
diff --git a/drivers/accesskit/accessibility_driver_accesskit.h b/drivers/accesskit/accessibility_driver_accesskit.h
index 5676ebe8406..7ba14d8f98e 100644
--- a/drivers/accesskit/accessibility_driver_accesskit.h
+++ b/drivers/accesskit/accessibility_driver_accesskit.h
@@ -33,7 +33,7 @@
 #ifdef ACCESSKIT_ENABLED
 
 #include "core/templates/rid_owner.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 #ifdef ACCESSKIT_DYNAMIC
 #ifdef LINUXBSD_ENABLED
diff --git a/drivers/alsa/audio_driver_alsa.h b/drivers/alsa/audio_driver_alsa.h
index 7ddc82f0163..7f59f7454f8 100644
--- a/drivers/alsa/audio_driver_alsa.h
+++ b/drivers/alsa/audio_driver_alsa.h
@@ -35,7 +35,7 @@
 #include "core/os/mutex.h"
 #include "core/os/thread.h"
 #include "core/templates/safe_refcount.h"
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 #ifdef SOWRAP_ENABLED
 #include "asound-so_wrap.h"
diff --git a/drivers/apple_embedded/display_server_apple_embedded.h b/drivers/apple_embedded/display_server_apple_embedded.h
index df7bcd9b345..08568621b94 100644
--- a/drivers/apple_embedded/display_server_apple_embedded.h
+++ b/drivers/apple_embedded/display_server_apple_embedded.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/input/input.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 #if defined(RD_ENABLED)
 #include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
diff --git a/drivers/apple_embedded/godot_view_renderer.mm b/drivers/apple_embedded/godot_view_renderer.mm
index 95a41e7bd4f..95789c873bd 100644
--- a/drivers/apple_embedded/godot_view_renderer.mm
+++ b/drivers/apple_embedded/godot_view_renderer.mm
@@ -36,7 +36,7 @@
 #include "core/config/project_settings.h"
 #include "core/os/keyboard.h"
 #include "main/main.h"
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 #import <AudioToolbox/AudioServices.h>
 #import <CoreMotion/CoreMotion.h>
diff --git a/drivers/apple_embedded/os_apple_embedded.h b/drivers/apple_embedded/os_apple_embedded.h
index e799c0a71a7..d5eb990f1e4 100644
--- a/drivers/apple_embedded/os_apple_embedded.h
+++ b/drivers/apple_embedded/os_apple_embedded.h
@@ -37,7 +37,7 @@
 #import "drivers/apple/joypad_apple.h"
 #import "drivers/coreaudio/audio_driver_coreaudio.h"
 #include "drivers/unix/os_unix.h"
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 #include "servers/rendering/renderer_compositor.h"
 
 #if defined(RD_ENABLED)
diff --git a/drivers/apple_embedded/tts_apple_embedded.h b/drivers/apple_embedded/tts_apple_embedded.h
index 33103b2578c..571a28a1d74 100644
--- a/drivers/apple_embedded/tts_apple_embedded.h
+++ b/drivers/apple_embedded/tts_apple_embedded.h
@@ -34,7 +34,7 @@
 #include "core/templates/hash_map.h"
 #include "core/templates/list.h"
 #include "core/variant/array.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 #if __has_include(<AVFAudio/AVSpeechSynthesis.h>)
 #import <AVFAudio/AVSpeechSynthesis.h>
diff --git a/drivers/coreaudio/audio_driver_coreaudio.h b/drivers/coreaudio/audio_driver_coreaudio.h
index 36f5eee73b7..08c4ec475f9 100644
--- a/drivers/coreaudio/audio_driver_coreaudio.h
+++ b/drivers/coreaudio/audio_driver_coreaudio.h
@@ -32,7 +32,7 @@
 
 #ifdef COREAUDIO_ENABLED
 
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 #import <AudioUnit/AudioUnit.h>
 #ifdef MACOS_ENABLED
diff --git a/drivers/d3d12/rendering_context_driver_d3d12.h b/drivers/d3d12/rendering_context_driver_d3d12.h
index 20d4c7b135b..68ccc73b8e5 100644
--- a/drivers/d3d12/rendering_context_driver_d3d12.h
+++ b/drivers/d3d12/rendering_context_driver_d3d12.h
@@ -34,7 +34,7 @@
 #include "core/string/ustring.h"
 #include "core/templates/rid_owner.h"
 #include "rendering_device_driver_d3d12.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 #include "servers/rendering/rendering_context_driver.h"
 
 #if defined(AS)
diff --git a/drivers/egl/egl_manager.h b/drivers/egl/egl_manager.h
index bd18e182189..7fe5f916cca 100644
--- a/drivers/egl/egl_manager.h
+++ b/drivers/egl/egl_manager.h
@@ -36,7 +36,7 @@
 #include "platform_gl.h"
 
 #include "core/templates/local_vector.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 class EGLManager {
 private:
diff --git a/drivers/gles3/rasterizer_scene_gles3.cpp b/drivers/gles3/rasterizer_scene_gles3.cpp
index 55033c4135f..31eacc991ca 100644
--- a/drivers/gles3/rasterizer_scene_gles3.cpp
+++ b/drivers/gles3/rasterizer_scene_gles3.cpp
@@ -42,7 +42,7 @@
 #include "core/config/project_settings.h"
 #include "core/templates/sort_array.h"
 #include "servers/camera/camera_feed.h"
-#include "servers/camera_server.h"
+#include "servers/camera/camera_server.h"
 #include "servers/rendering/rendering_server_default.h"
 #include "servers/rendering/rendering_server_globals.h"
 
diff --git a/drivers/gles3/rasterizer_scene_gles3.h b/drivers/gles3/rasterizer_scene_gles3.h
index 3a70501037a..3d69f4b28a7 100644
--- a/drivers/gles3/rasterizer_scene_gles3.h
+++ b/drivers/gles3/rasterizer_scene_gles3.h
@@ -42,7 +42,7 @@
 #include "scene/resources/mesh.h"
 #include "servers/rendering/renderer_compositor.h"
 #include "servers/rendering/renderer_scene_render.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 #include "shader_gles3.h"
 #include "storage/light_storage.h"
 #include "storage/material_storage.h"
diff --git a/drivers/gles3/shader_gles3.h b/drivers/gles3/shader_gles3.h
index fcee94bc444..7589e828cf2 100644
--- a/drivers/gles3/shader_gles3.h
+++ b/drivers/gles3/shader_gles3.h
@@ -36,7 +36,7 @@
 #include "core/templates/hash_map.h"
 #include "core/templates/local_vector.h"
 #include "core/templates/rid_owner.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 #ifdef GLES3_ENABLED
 
diff --git a/drivers/pulseaudio/audio_driver_pulseaudio.h b/drivers/pulseaudio/audio_driver_pulseaudio.h
index ce29a55cdee..3186ebf12b5 100644
--- a/drivers/pulseaudio/audio_driver_pulseaudio.h
+++ b/drivers/pulseaudio/audio_driver_pulseaudio.h
@@ -35,7 +35,7 @@
 #include "core/os/mutex.h"
 #include "core/os/thread.h"
 #include "core/templates/safe_refcount.h"
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 #ifdef SOWRAP_ENABLED
 #include "pulse-so_wrap.h"
diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp
index 75cc5d3c82a..df9efcd53a9 100644
--- a/drivers/unix/os_unix.cpp
+++ b/drivers/unix/os_unix.cpp
@@ -40,7 +40,7 @@
 #include "drivers/unix/file_access_unix_pipe.h"
 #include "drivers/unix/net_socket_unix.h"
 #include "drivers/unix/thread_posix.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 #if defined(__APPLE__)
 #include <mach-o/dyld.h>
diff --git a/drivers/wasapi/audio_driver_wasapi.h b/drivers/wasapi/audio_driver_wasapi.h
index 8a820e8f4e7..409dafe0354 100644
--- a/drivers/wasapi/audio_driver_wasapi.h
+++ b/drivers/wasapi/audio_driver_wasapi.h
@@ -35,7 +35,7 @@
 #include "core/os/mutex.h"
 #include "core/os/thread.h"
 #include "core/templates/safe_refcount.h"
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 #include <audioclient.h>
 #include <mmdeviceapi.h>
diff --git a/drivers/xaudio2/audio_driver_xaudio2.h b/drivers/xaudio2/audio_driver_xaudio2.h
index 1946cdb5420..393836b5a29 100644
--- a/drivers/xaudio2/audio_driver_xaudio2.h
+++ b/drivers/xaudio2/audio_driver_xaudio2.h
@@ -33,7 +33,7 @@
 #include "core/os/mutex.h"
 #include "core/os/thread.h"
 #include "core/templates/safe_refcount.h"
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 #include <mmsystem.h>
 #define WIN32_LEAN_AND_MEAN
diff --git a/editor/animation/animation_player_editor_plugin.cpp b/editor/animation/animation_player_editor_plugin.cpp
index 2509674ab3c..bdbea4499a4 100644
--- a/editor/animation/animation_player_editor_plugin.cpp
+++ b/editor/animation/animation_player_editor_plugin.cpp
@@ -52,7 +52,7 @@
 #include "scene/main/window.h"
 #include "scene/resources/animation.h"
 #include "scene/resources/image_texture.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 ///////////////////////////////////
 
diff --git a/editor/audio/editor_audio_buses.cpp b/editor/audio/editor_audio_buses.cpp
index da1d34141c3..8ea7e6d0429 100644
--- a/editor/audio/editor_audio_buses.cpp
+++ b/editor/audio/editor_audio_buses.cpp
@@ -46,7 +46,7 @@
 #include "editor/themes/editor_theme_manager.h"
 #include "scene/gui/separator.h"
 #include "scene/resources/font.h"
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 void EditorAudioBus::_update_visible_channels() {
 	int i = 0;
diff --git a/editor/debugger/editor_debugger_tree.cpp b/editor/debugger/editor_debugger_tree.cpp
index 85656a4eef1..f2f7f16d2be 100644
--- a/editor/debugger/editor_debugger_tree.cpp
+++ b/editor/debugger/editor_debugger_tree.cpp
@@ -40,7 +40,7 @@
 #include "scene/debugger/scene_debugger.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/resources/packed_scene.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 EditorDebuggerTree::EditorDebuggerTree() {
 	set_v_size_flags(SIZE_EXPAND_FILL);
diff --git a/editor/debugger/script_editor_debugger.cpp b/editor/debugger/script_editor_debugger.cpp
index 007adb49ace..5fee8c344be 100644
--- a/editor/debugger/script_editor_debugger.cpp
+++ b/editor/debugger/script_editor_debugger.cpp
@@ -66,7 +66,7 @@
 #include "scene/gui/tab_container.h"
 #include "scene/gui/tree.h"
 #include "servers/debugger/servers_debugger.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 using CameraOverride = EditorDebuggerNode::CameraOverride;
 
diff --git a/editor/docks/filesystem_dock.cpp b/editor/docks/filesystem_dock.cpp
index d9edf904d63..d85e72fa090 100644
--- a/editor/docks/filesystem_dock.cpp
+++ b/editor/docks/filesystem_dock.cpp
@@ -65,7 +65,7 @@
 #include "scene/gui/line_edit.h"
 #include "scene/gui/progress_bar.h"
 #include "scene/resources/packed_scene.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 Control *FileSystemTree::make_custom_tooltip(const String &p_text) const {
 	TreeItem *item = get_item_at_position(get_local_mouse_position());
diff --git a/editor/docks/scene_tree_dock.cpp b/editor/docks/scene_tree_dock.cpp
index a2c821ff97a..66fc27704e2 100644
--- a/editor/docks/scene_tree_dock.cpp
+++ b/editor/docks/scene_tree_dock.cpp
@@ -67,7 +67,7 @@
 #include "scene/gui/check_box.h"
 #include "scene/property_utils.h"
 #include "scene/resources/packed_scene.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 void SceneTreeDock::_nodes_drag_begin() {
 	pending_click_select = nullptr;
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 3db0b50d06c..cea0d7b43a7 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -67,10 +67,10 @@
 #include "scene/resources/packed_scene.h"
 #include "scene/resources/portable_compressed_texture.h"
 #include "scene/theme/theme_db.h"
-#include "servers/display_server.h"
-#include "servers/navigation_server_2d.h"
-#include "servers/navigation_server_3d.h"
-#include "servers/rendering_server.h"
+#include "servers/display/display_server.h"
+#include "servers/navigation_2d/navigation_server_2d.h"
+#include "servers/navigation_3d/navigation_server_3d.h"
+#include "servers/rendering/rendering_server.h"
 
 #include "editor/animation/animation_player_editor_plugin.h"
 #include "editor/asset_library/asset_library_editor_plugin.h"
@@ -184,11 +184,11 @@
 #include "modules/modules_enabled.gen.h" // For gdscript, mono.
 
 #ifndef PHYSICS_2D_DISABLED
-#include "servers/physics_server_2d.h"
+#include "servers/physics_2d/physics_server_2d.h"
 #endif // PHYSICS_2D_DISABLED
 
 #ifndef PHYSICS_3D_DISABLED
-#include "servers/physics_server_3d.h"
+#include "servers/physics_3d/physics_server_3d.h"
 #endif // PHYSICS_3D_DISABLED
 
 #ifdef ANDROID_ENABLED
diff --git a/editor/gui/editor_dir_dialog.cpp b/editor/gui/editor_dir_dialog.cpp
index b17d64fbef8..d07a81e9cc0 100644
--- a/editor/gui/editor_dir_dialog.cpp
+++ b/editor/gui/editor_dir_dialog.cpp
@@ -36,7 +36,7 @@
 #include "editor/themes/editor_theme_manager.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/tree.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 void EditorDirDialog::_update_dir(const Color &p_default_folder_color, const Dictionary &p_assigned_folder_colors, const HashMap<String, Color> &p_folder_colors, bool p_is_dark_theme, TreeItem *p_item, EditorFileSystemDirectory *p_dir, const String &p_select_path) {
 	updating = true;
diff --git a/editor/gui/editor_file_dialog.cpp b/editor/gui/editor_file_dialog.cpp
index 7bbe1a7b700..bc2e91d09b6 100644
--- a/editor/gui/editor_file_dialog.cpp
+++ b/editor/gui/editor_file_dialog.cpp
@@ -50,7 +50,7 @@
 #include "scene/gui/separator.h"
 #include "scene/gui/split_container.h"
 #include "scene/gui/texture_rect.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 void EditorFileDialog::_native_popup() {
 	// Show native dialog directly.
diff --git a/editor/gui/progress_dialog.cpp b/editor/gui/progress_dialog.cpp
index 5353faf9929..b82b3549fce 100644
--- a/editor/gui/progress_dialog.cpp
+++ b/editor/gui/progress_dialog.cpp
@@ -37,7 +37,7 @@
 #include "main/main.h"
 #include "scene/gui/panel_container.h"
 #include "scene/main/window.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 void BackgroundProgress::_add_task(const String &p_task, const String &p_label, int p_steps) {
 	_THREAD_SAFE_METHOD_
diff --git a/editor/import/resource_importer_bmfont.h b/editor/import/resource_importer_bmfont.h
index 49c89b67f6e..871d893d6ef 100644
--- a/editor/import/resource_importer_bmfont.h
+++ b/editor/import/resource_importer_bmfont.h
@@ -32,7 +32,7 @@
 
 #include "core/io/resource_importer.h"
 #include "scene/resources/font.h"
-#include "servers/text_server.h"
+#include "servers/text/text_server.h"
 
 class ResourceImporterBMFont : public ResourceImporter {
 	GDCLASS(ResourceImporterBMFont, ResourceImporter);
diff --git a/editor/import/resource_importer_dynamic_font.cpp b/editor/import/resource_importer_dynamic_font.cpp
index b5b1427ac95..40691b74449 100644
--- a/editor/import/resource_importer_dynamic_font.cpp
+++ b/editor/import/resource_importer_dynamic_font.cpp
@@ -34,7 +34,7 @@
 #include "core/io/resource_saver.h"
 #include "editor/import/dynamic_font_import_settings.h"
 #include "scene/resources/font.h"
-#include "servers/text_server.h"
+#include "servers/text/text_server.h"
 
 String ResourceImporterDynamicFont::get_importer_name() const {
 	return "font_data_dynamic";
diff --git a/editor/import/resource_importer_imagefont.h b/editor/import/resource_importer_imagefont.h
index 7bca0c6987d..3ef86c17647 100644
--- a/editor/import/resource_importer_imagefont.h
+++ b/editor/import/resource_importer_imagefont.h
@@ -32,7 +32,7 @@
 
 #include "core/io/resource_importer.h"
 #include "scene/resources/font.h"
-#include "servers/text_server.h"
+#include "servers/text/text_server.h"
 
 class ResourceImporterImageFont : public ResourceImporter {
 	GDCLASS(ResourceImporterImageFont, ResourceImporter);
diff --git a/editor/import/resource_importer_texture.h b/editor/import/resource_importer_texture.h
index 2627c60dd82..bca73dbb280 100644
--- a/editor/import/resource_importer_texture.h
+++ b/editor/import/resource_importer_texture.h
@@ -33,7 +33,7 @@
 #include "core/io/file_access.h"
 #include "core/io/image.h"
 #include "core/io/resource_importer.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 class CompressedTexture2D;
 
diff --git a/editor/project_manager/project_manager.cpp b/editor/project_manager/project_manager.cpp
index dd49e2a23e4..08309e7d844 100644
--- a/editor/project_manager/project_manager.cpp
+++ b/editor/project_manager/project_manager.cpp
@@ -62,17 +62,17 @@
 #include "scene/gui/separator.h"
 #include "scene/main/window.h"
 #include "scene/theme/theme_db.h"
-#include "servers/display_server.h"
-#include "servers/navigation_server_3d.h"
-
-#ifndef PHYSICS_3D_DISABLED
-#include "servers/physics_server_3d.h"
-#endif // PHYSICS_3D_DISABLED
+#include "servers/display/display_server.h"
+#include "servers/navigation_3d/navigation_server_3d.h"
 
 #ifndef PHYSICS_2D_DISABLED
-#include "servers/physics_server_2d.h"
+#include "servers/physics_2d/physics_server_2d.h"
 #endif // PHYSICS_2D_DISABLED
 
+#ifndef PHYSICS_3D_DISABLED
+#include "servers/physics_3d/physics_server_3d.h"
+#endif // PHYSICS_3D_DISABLED
+
 constexpr int GODOT4_CONFIG_VERSION = 5;
 
 ProjectManager *ProjectManager::singleton = nullptr;
diff --git a/editor/run/editor_run.cpp b/editor/run/editor_run.cpp
index 059032cf74a..cc05bbda2ff 100644
--- a/editor/run/editor_run.cpp
+++ b/editor/run/editor_run.cpp
@@ -36,7 +36,7 @@
 #include "editor/run/run_instances_dialog.h"
 #include "editor/settings/editor_settings.h"
 #include "main/main.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 EditorRun::Status EditorRun::get_status() const {
 	return status;
diff --git a/editor/run/editor_run_bar.cpp b/editor/run/editor_run_bar.cpp
index 1fad3e51036..797fd593f73 100644
--- a/editor/run/editor_run_bar.cpp
+++ b/editor/run/editor_run_bar.cpp
@@ -49,7 +49,7 @@
 #include "scene/gui/panel_container.h"
 
 #ifndef XR_DISABLED
-#include "servers/xr_server.h"
+#include "servers/xr/xr_server.h"
 #endif // XR_DISABLED
 
 EditorRunBar *EditorRunBar::singleton = nullptr;
diff --git a/editor/scene/2d/tiles/tile_data_editors.cpp b/editor/scene/2d/tiles/tile_data_editors.cpp
index e7ec6b496d2..479188bee4f 100644
--- a/editor/scene/2d/tiles/tile_data_editors.cpp
+++ b/editor/scene/2d/tiles/tile_data_editors.cpp
@@ -50,7 +50,7 @@
 #include "scene/gui/separator.h"
 #include "scene/gui/spin_box.h"
 
-#include "servers/navigation_server_2d.h"
+#include "servers/navigation_2d/navigation_server_2d.h"
 
 void TileDataEditor::_tile_set_changed_plan_update() {
 	_tile_set_changed_update_needed = true;
diff --git a/editor/scene/2d/tiles/tile_set_atlas_source_editor.cpp b/editor/scene/2d/tiles/tile_set_atlas_source_editor.cpp
index 869c20c092e..4cb9be3134d 100644
--- a/editor/scene/2d/tiles/tile_set_atlas_source_editor.cpp
+++ b/editor/scene/2d/tiles/tile_set_atlas_source_editor.cpp
@@ -48,7 +48,7 @@
 #include "core/math/geometry_2d.h"
 #include "core/os/keyboard.h"
 
-#include "servers/navigation_server_2d.h"
+#include "servers/navigation_2d/navigation_server_2d.h"
 
 void TileSetAtlasSourceEditor::TileSetAtlasSourceProxyObject::set_id(int p_id) {
 	ERR_FAIL_COND(p_id < 0);
diff --git a/editor/script/script_editor_plugin.cpp b/editor/script/script_editor_plugin.cpp
index 5f8a26ecc65..fc68eab34fc 100644
--- a/editor/script/script_editor_plugin.cpp
+++ b/editor/script/script_editor_plugin.cpp
@@ -72,7 +72,7 @@
 #include "scene/main/node.h"
 #include "scene/main/window.h"
 #include "script_text_editor.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 #include "text_editor.h"
 
 /*** SYNTAX HIGHLIGHTER ****/
diff --git a/editor/shader/shader_file_editor_plugin.cpp b/editor/shader/shader_file_editor_plugin.cpp
index 24e22ce3650..a42d0af0f40 100644
--- a/editor/shader/shader_file_editor_plugin.cpp
+++ b/editor/shader/shader_file_editor_plugin.cpp
@@ -37,7 +37,7 @@
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/item_list.h"
 #include "scene/gui/split_container.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 /*** SHADER SCRIPT EDITOR ****/
 
diff --git a/editor/shader/visual_shader_editor_plugin.cpp b/editor/shader/visual_shader_editor_plugin.cpp
index 1b17d2672d4..f6aba13552b 100644
--- a/editor/shader/visual_shader_editor_plugin.cpp
+++ b/editor/shader/visual_shader_editor_plugin.cpp
@@ -71,7 +71,7 @@
 #include "scene/resources/style_box_flat.h"
 #include "scene/resources/visual_shader_nodes.h"
 #include "scene/resources/visual_shader_particle_nodes.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 #include "servers/rendering/shader_preprocessor.h"
 #include "servers/rendering/shader_types.h"
 
diff --git a/main/main.cpp b/main/main.cpp
index 36db3281952..e1733ca3bf0 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -67,39 +67,39 @@
 #include "scene/resources/packed_scene.h"
 #include "scene/theme/theme_db.h"
 #include "servers/audio/audio_driver_dummy.h"
-#include "servers/audio_server.h"
-#include "servers/camera_server.h"
-#include "servers/display_server.h"
+#include "servers/audio/audio_server.h"
+#include "servers/camera/camera_server.h"
+#include "servers/display/display_server.h"
 #include "servers/movie_writer/movie_writer.h"
 #include "servers/register_server_types.h"
 #include "servers/rendering/rendering_server_default.h"
+#include "servers/text/text_server.h"
 #include "servers/text/text_server_dummy.h"
-#include "servers/text_server.h"
 
 // 2D
 #ifndef NAVIGATION_2D_DISABLED
-#include "servers/navigation_server_2d.h"
-#include "servers/navigation_server_2d_dummy.h"
+#include "servers/navigation_2d/navigation_server_2d.h"
+#include "servers/navigation_2d/navigation_server_2d_dummy.h"
 #endif // NAVIGATION_2D_DISABLED
 
 #ifndef PHYSICS_2D_DISABLED
-#include "servers/physics_server_2d.h"
-#include "servers/physics_server_2d_dummy.h"
+#include "servers/physics_2d/physics_server_2d.h"
+#include "servers/physics_2d/physics_server_2d_dummy.h"
 #endif // PHYSICS_2D_DISABLED
 
 // 3D
 #ifndef NAVIGATION_3D_DISABLED
-#include "servers/navigation_server_3d.h"
-#include "servers/navigation_server_3d_dummy.h"
+#include "servers/navigation_3d/navigation_server_3d.h"
+#include "servers/navigation_3d/navigation_server_3d_dummy.h"
 #endif // NAVIGATION_3D_DISABLED
 
 #ifndef PHYSICS_3D_DISABLED
-#include "servers/physics_server_3d.h"
-#include "servers/physics_server_3d_dummy.h"
+#include "servers/physics_3d/physics_server_3d.h"
+#include "servers/physics_3d/physics_server_3d_dummy.h"
 #endif // PHYSICS_3D_DISABLED
 
 #ifndef XR_DISABLED
-#include "servers/xr_server.h"
+#include "servers/xr/xr_server.h"
 #endif // XR_DISABLED
 
 #ifdef TESTS_ENABLED
diff --git a/main/main_timer_sync.cpp b/main/main_timer_sync.cpp
index 08b861b8820..ed6786cd528 100644
--- a/main/main_timer_sync.cpp
+++ b/main/main_timer_sync.cpp
@@ -31,7 +31,7 @@
 #include "main_timer_sync.h"
 
 #include "core/os/os.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 void MainFrameTime::clamp_process_step(double min_process_step, double max_process_step) {
 	if (process_step < min_process_step) {
diff --git a/main/performance.cpp b/main/performance.cpp
index 3c355d01e17..ff19cfc29df 100644
--- a/main/performance.cpp
+++ b/main/performance.cpp
@@ -34,21 +34,23 @@
 #include "core/variant/typed_array.h"
 #include "scene/main/node.h"
 #include "scene/main/scene_tree.h"
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
+#include "servers/rendering/rendering_server.h"
+
 #ifndef NAVIGATION_2D_DISABLED
-#include "servers/navigation_server_2d.h"
+#include "servers/navigation_2d/navigation_server_2d.h"
 #endif // NAVIGATION_2D_DISABLED
+
 #ifndef NAVIGATION_3D_DISABLED
-#include "servers/navigation_server_3d.h"
+#include "servers/navigation_3d/navigation_server_3d.h"
 #endif // NAVIGATION_3D_DISABLED
-#include "servers/rendering_server.h"
 
 #ifndef PHYSICS_2D_DISABLED
-#include "servers/physics_server_2d.h"
+#include "servers/physics_2d/physics_server_2d.h"
 #endif // PHYSICS_2D_DISABLED
 
 #ifndef PHYSICS_3D_DISABLED
-#include "servers/physics_server_3d.h"
+#include "servers/physics_3d/physics_server_3d.h"
 #endif // PHYSICS_3D_DISABLED
 
 Performance *Performance::singleton = nullptr;
@@ -307,6 +309,7 @@ double Performance::get_monitor(Monitor p_monitor) const {
 		case AUDIO_OUTPUT_LATENCY:
 			return AudioServer::get_singleton()->get_output_latency();
 
+			// Deprecated, use the 2D/3D specific ones instead.
 		case NAVIGATION_ACTIVE_MAPS:
 #ifndef NAVIGATION_2D_DISABLED
 			info = NavigationServer2D::get_singleton()->get_process_info(NavigationServer2D::INFO_ACTIVE_MAPS);
@@ -503,6 +506,7 @@ Performance::MonitorType Performance::get_monitor_type(Monitor p_monitor) const
 		MONITOR_TYPE_QUANTITY,
 		MONITOR_TYPE_QUANTITY,
 		MONITOR_TYPE_QUANTITY,
+#ifndef _3D_DISABLED
 		MONITOR_TYPE_QUANTITY,
 		MONITOR_TYPE_QUANTITY,
 		MONITOR_TYPE_QUANTITY,
@@ -513,6 +517,7 @@ Performance::MonitorType Performance::get_monitor_type(Monitor p_monitor) const
 		MONITOR_TYPE_QUANTITY,
 		MONITOR_TYPE_QUANTITY,
 		MONITOR_TYPE_QUANTITY,
+#endif // _3D_DISABLED
 
 	};
 	static_assert((sizeof(types) / sizeof(MonitorType)) == MONITOR_MAX);
diff --git a/main/performance.h b/main/performance.h
index cf822bbb706..b71ec1af234 100644
--- a/main/performance.h
+++ b/main/performance.h
@@ -91,6 +91,7 @@ public:
 		PHYSICS_3D_COLLISION_PAIRS,
 		PHYSICS_3D_ISLAND_COUNT,
 		AUDIO_OUTPUT_LATENCY,
+		// Deprecated, use the 2D/3D specific ones instead.
 		NAVIGATION_ACTIVE_MAPS,
 		NAVIGATION_REGION_COUNT,
 		NAVIGATION_AGENT_COUNT,
@@ -116,6 +117,7 @@ public:
 		NAVIGATION_2D_EDGE_CONNECTION_COUNT,
 		NAVIGATION_2D_EDGE_FREE_COUNT,
 		NAVIGATION_2D_OBSTACLE_COUNT,
+#ifndef _3D_DISABLED
 		NAVIGATION_3D_ACTIVE_MAPS,
 		NAVIGATION_3D_REGION_COUNT,
 		NAVIGATION_3D_AGENT_COUNT,
@@ -126,6 +128,7 @@ public:
 		NAVIGATION_3D_EDGE_CONNECTION_COUNT,
 		NAVIGATION_3D_EDGE_FREE_COUNT,
 		NAVIGATION_3D_OBSTACLE_COUNT,
+#endif // _3D_DISABLED
 		MONITOR_MAX
 	};
 
diff --git a/modules/basis_universal/image_compress_basisu.cpp b/modules/basis_universal/image_compress_basisu.cpp
index 7468e0e33a7..afd10a0db5f 100644
--- a/modules/basis_universal/image_compress_basisu.cpp
+++ b/modules/basis_universal/image_compress_basisu.cpp
@@ -34,7 +34,7 @@
 #include "core/io/image.h"
 #include "core/os/os.h"
 #include "core/string/print_string.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 #include <transcoder/basisu_transcoder.h>
 #ifdef TOOLS_ENABLED
diff --git a/modules/betsy/image_compress_betsy.cpp b/modules/betsy/image_compress_betsy.cpp
index 25bcc63e2b1..062ff1e7645 100644
--- a/modules/betsy/image_compress_betsy.cpp
+++ b/modules/betsy/image_compress_betsy.cpp
@@ -38,7 +38,7 @@
 #include "bc1.glsl.gen.h"
 #include "bc4.glsl.gen.h"
 #include "bc6h.glsl.gen.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 static Mutex betsy_mutex;
 static BetsyCompressor *betsy = nullptr;
diff --git a/modules/camera/camera_android.h b/modules/camera/camera_android.h
index 0840b7179d6..9417fd0701e 100644
--- a/modules/camera/camera_android.h
+++ b/modules/camera/camera_android.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "servers/camera/camera_feed.h"
-#include "servers/camera_server.h"
+#include "servers/camera/camera_server.h"
 
 #include <camera/NdkCameraDevice.h>
 #include <camera/NdkCameraError.h>
diff --git a/modules/camera/camera_feed_linux.cpp b/modules/camera/camera_feed_linux.cpp
index 1636893ef4e..8c3f717f8e5 100644
--- a/modules/camera/camera_feed_linux.cpp
+++ b/modules/camera/camera_feed_linux.cpp
@@ -30,7 +30,7 @@
 
 #include "camera_feed_linux.h"
 
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 #include <fcntl.h>
 #include <sys/ioctl.h>
diff --git a/modules/camera/camera_linux.h b/modules/camera/camera_linux.h
index 10710943900..ca1eeb0a21c 100644
--- a/modules/camera/camera_linux.h
+++ b/modules/camera/camera_linux.h
@@ -32,7 +32,7 @@
 
 #include "core/os/mutex.h"
 #include "core/os/thread.h"
-#include "servers/camera_server.h"
+#include "servers/camera/camera_server.h"
 
 class CameraLinux : public CameraServer {
 private:
diff --git a/modules/camera/camera_macos.h b/modules/camera/camera_macos.h
index 38a822e6359..9713b66df0d 100644
--- a/modules/camera/camera_macos.h
+++ b/modules/camera/camera_macos.h
@@ -33,7 +33,7 @@
 ///@TODO this is a near duplicate of CameraIOS, we should find a way to combine those to minimize code duplication!!!!
 // If you fix something here, make sure you fix it there as well!
 
-#include "servers/camera_server.h"
+#include "servers/camera/camera_server.h"
 
 class CameraMacOS : public CameraServer {
 	GDSOFTCLASS(CameraMacOS, CameraServer);
diff --git a/modules/camera/camera_win.h b/modules/camera/camera_win.h
index 044dfbe2cb5..60b4858a0d6 100644
--- a/modules/camera/camera_win.h
+++ b/modules/camera/camera_win.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "servers/camera/camera_feed.h"
-#include "servers/camera_server.h"
+#include "servers/camera/camera_server.h"
 
 class CameraWindows : public CameraServer {
 private:
diff --git a/modules/csg/csg_shape.cpp b/modules/csg/csg_shape.cpp
index 4b073c5d023..13226a8395e 100644
--- a/modules/csg/csg_shape.cpp
+++ b/modules/csg/csg_shape.cpp
@@ -37,7 +37,7 @@
 #include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
 #include "scene/resources/navigation_mesh.h"
 #ifndef NAVIGATION_3D_DISABLED
-#include "servers/navigation_server_3d.h"
+#include "servers/navigation_3d/navigation_server_3d.h"
 #endif // NAVIGATION_3D_DISABLED
 
 #include <manifold/manifold.h>
diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp
index 0c45d9218f0..0f9ad82d295 100644
--- a/modules/gdscript/gdscript_parser.cpp
+++ b/modules/gdscript/gdscript_parser.cpp
@@ -40,7 +40,7 @@
 
 #ifdef DEBUG_ENABLED
 #include "core/string/string_builder.h"
-#include "servers/text_server.h"
+#include "servers/text/text_server.h"
 #endif
 
 #ifdef TOOLS_ENABLED
diff --git a/modules/gdscript/gdscript_tokenizer.cpp b/modules/gdscript/gdscript_tokenizer.cpp
index 04e9da8c132..4f5b9cc24f1 100644
--- a/modules/gdscript/gdscript_tokenizer.cpp
+++ b/modules/gdscript/gdscript_tokenizer.cpp
@@ -34,7 +34,7 @@
 #include "core/string/char_utils.h"
 
 #ifdef DEBUG_ENABLED
-#include "servers/text_server.h"
+#include "servers/text/text_server.h"
 #endif
 
 #ifdef TOOLS_ENABLED
diff --git a/modules/gdscript/language_server/gdscript_text_document.cpp b/modules/gdscript/language_server/gdscript_text_document.cpp
index 51315074faf..3cecb4a4ccc 100644
--- a/modules/gdscript/language_server/gdscript_text_document.cpp
+++ b/modules/gdscript/language_server/gdscript_text_document.cpp
@@ -36,7 +36,7 @@
 
 #include "editor/script/script_text_editor.h"
 #include "editor/settings/editor_settings.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 void GDScriptTextDocument::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("didOpen"), &GDScriptTextDocument::didOpen);
diff --git a/modules/godot_physics_2d/godot_area_2d.h b/modules/godot_physics_2d/godot_area_2d.h
index 17c6e0daf75..b5040c58691 100644
--- a/modules/godot_physics_2d/godot_area_2d.h
+++ b/modules/godot_physics_2d/godot_area_2d.h
@@ -33,7 +33,7 @@
 #include "godot_collision_object_2d.h"
 
 #include "core/templates/self_list.h"
-#include "servers/physics_server_2d.h"
+#include "servers/physics_2d/physics_server_2d.h"
 
 class GodotSpace2D;
 class GodotBody2D;
diff --git a/modules/godot_physics_2d/godot_body_direct_state_2d.h b/modules/godot_physics_2d/godot_body_direct_state_2d.h
index cc4710c0ce9..a39cee853d9 100644
--- a/modules/godot_physics_2d/godot_body_direct_state_2d.h
+++ b/modules/godot_physics_2d/godot_body_direct_state_2d.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "servers/physics_server_2d.h"
+#include "servers/physics_2d/physics_server_2d.h"
 
 class GodotBody2D;
 
diff --git a/modules/godot_physics_2d/godot_collision_object_2d.h b/modules/godot_physics_2d/godot_collision_object_2d.h
index e9ad969d4e9..71d3f37cc9a 100644
--- a/modules/godot_physics_2d/godot_collision_object_2d.h
+++ b/modules/godot_physics_2d/godot_collision_object_2d.h
@@ -34,7 +34,7 @@
 #include "godot_shape_2d.h"
 
 #include "core/templates/self_list.h"
-#include "servers/physics_server_2d.h"
+#include "servers/physics_2d/physics_server_2d.h"
 
 class GodotSpace2D;
 
diff --git a/modules/godot_physics_2d/godot_physics_server_2d.h b/modules/godot_physics_2d/godot_physics_server_2d.h
index f45a4b945c0..2826718e54d 100644
--- a/modules/godot_physics_2d/godot_physics_server_2d.h
+++ b/modules/godot_physics_2d/godot_physics_server_2d.h
@@ -36,7 +36,7 @@
 #include "godot_step_2d.h"
 
 #include "core/templates/rid_owner.h"
-#include "servers/physics_server_2d.h"
+#include "servers/physics_2d/physics_server_2d.h"
 
 class GodotPhysicsServer2D : public PhysicsServer2D {
 	GDCLASS(GodotPhysicsServer2D, PhysicsServer2D);
diff --git a/modules/godot_physics_2d/godot_shape_2d.h b/modules/godot_physics_2d/godot_shape_2d.h
index 20d56b96dd4..1403589a03b 100644
--- a/modules/godot_physics_2d/godot_shape_2d.h
+++ b/modules/godot_physics_2d/godot_shape_2d.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "servers/physics_server_2d.h"
+#include "servers/physics_2d/physics_server_2d.h"
 
 class GodotShape2D;
 
diff --git a/modules/godot_physics_2d/register_types.cpp b/modules/godot_physics_2d/register_types.cpp
index 356d14b307b..9c79b8bab2d 100644
--- a/modules/godot_physics_2d/register_types.cpp
+++ b/modules/godot_physics_2d/register_types.cpp
@@ -32,8 +32,8 @@
 
 #include "core/config/project_settings.h"
 #include "godot_physics_server_2d.h"
-#include "servers/physics_server_2d.h"
-#include "servers/physics_server_2d_wrap_mt.h"
+#include "servers/physics_2d/physics_server_2d.h"
+#include "servers/physics_2d/physics_server_2d_wrap_mt.h"
 
 static PhysicsServer2D *_createGodotPhysics2DCallback() {
 #ifdef THREADS_ENABLED
diff --git a/modules/godot_physics_3d/godot_area_3d.h b/modules/godot_physics_3d/godot_area_3d.h
index 419ecc79cd3..3b6f091351b 100644
--- a/modules/godot_physics_3d/godot_area_3d.h
+++ b/modules/godot_physics_3d/godot_area_3d.h
@@ -33,7 +33,7 @@
 #include "godot_collision_object_3d.h"
 
 #include "core/templates/self_list.h"
-#include "servers/physics_server_3d.h"
+#include "servers/physics_3d/physics_server_3d.h"
 
 class GodotSpace3D;
 class GodotBody3D;
diff --git a/modules/godot_physics_3d/godot_body_direct_state_3d.h b/modules/godot_physics_3d/godot_body_direct_state_3d.h
index efd8df009df..b3b64f9049e 100644
--- a/modules/godot_physics_3d/godot_body_direct_state_3d.h
+++ b/modules/godot_physics_3d/godot_body_direct_state_3d.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "servers/physics_server_3d.h"
+#include "servers/physics_3d/physics_server_3d.h"
 
 class GodotBody3D;
 
diff --git a/modules/godot_physics_3d/godot_collision_object_3d.h b/modules/godot_physics_3d/godot_collision_object_3d.h
index 506cf06ef92..d20f941e223 100644
--- a/modules/godot_physics_3d/godot_collision_object_3d.h
+++ b/modules/godot_physics_3d/godot_collision_object_3d.h
@@ -34,7 +34,7 @@
 #include "godot_shape_3d.h"
 
 #include "core/templates/self_list.h"
-#include "servers/physics_server_3d.h"
+#include "servers/physics_3d/physics_server_3d.h"
 
 #ifdef DEBUG_ENABLED
 #define MAX_OBJECT_DISTANCE 3.1622776601683791e+18
diff --git a/modules/godot_physics_3d/godot_physics_server_3d.h b/modules/godot_physics_3d/godot_physics_server_3d.h
index 308427330e8..5f0c8ddcd07 100644
--- a/modules/godot_physics_3d/godot_physics_server_3d.h
+++ b/modules/godot_physics_3d/godot_physics_server_3d.h
@@ -36,7 +36,7 @@
 #include "godot_step_3d.h"
 
 #include "core/templates/rid_owner.h"
-#include "servers/physics_server_3d.h"
+#include "servers/physics_3d/physics_server_3d.h"
 
 class GodotPhysicsServer3D : public PhysicsServer3D {
 	GDCLASS(GodotPhysicsServer3D, PhysicsServer3D);
diff --git a/modules/godot_physics_3d/godot_shape_3d.h b/modules/godot_physics_3d/godot_shape_3d.h
index 05e41aaf315..9a7b78e3e6a 100644
--- a/modules/godot_physics_3d/godot_shape_3d.h
+++ b/modules/godot_physics_3d/godot_shape_3d.h
@@ -32,7 +32,7 @@
 
 #include "core/math/geometry_3d.h"
 #include "core/templates/local_vector.h"
-#include "servers/physics_server_3d.h"
+#include "servers/physics_3d/physics_server_3d.h"
 
 class GodotShape3D;
 
diff --git a/modules/godot_physics_3d/godot_soft_body_3d.cpp b/modules/godot_physics_3d/godot_soft_body_3d.cpp
index 3f1da45b1c9..fc8dff5102f 100644
--- a/modules/godot_physics_3d/godot_soft_body_3d.cpp
+++ b/modules/godot_physics_3d/godot_soft_body_3d.cpp
@@ -33,7 +33,7 @@
 #include "godot_space_3d.h"
 
 #include "core/math/geometry_3d.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 // Based on Bullet soft body.
 
diff --git a/modules/godot_physics_3d/register_types.cpp b/modules/godot_physics_3d/register_types.cpp
index 1b1690cf59f..0aae731ea11 100644
--- a/modules/godot_physics_3d/register_types.cpp
+++ b/modules/godot_physics_3d/register_types.cpp
@@ -31,8 +31,8 @@
 #include "register_types.h"
 
 #include "godot_physics_server_3d.h"
-#include "servers/physics_server_3d.h"
-#include "servers/physics_server_3d_wrap_mt.h"
+#include "servers/physics_3d/physics_server_3d.h"
+#include "servers/physics_3d/physics_server_3d_wrap_mt.h"
 
 static PhysicsServer3D *_createGodotPhysics3DCallback() {
 #ifdef THREADS_ENABLED
diff --git a/modules/gridmap/grid_map.cpp b/modules/gridmap/grid_map.cpp
index c11cfaeb0a3..9e71ac8ec76 100644
--- a/modules/gridmap/grid_map.cpp
+++ b/modules/gridmap/grid_map.cpp
@@ -35,7 +35,7 @@
 #include "scene/resources/3d/mesh_library.h"
 #include "scene/resources/3d/primitive_meshes.h"
 #include "scene/resources/surface_tool.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 #ifndef PHYSICS_3D_DISABLED
 #include "core/math/convex_hull.h"
@@ -52,7 +52,7 @@
 
 #ifndef NAVIGATION_3D_DISABLED
 #include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
-#include "servers/navigation_server_3d.h"
+#include "servers/navigation_3d/navigation_server_3d.h"
 
 Callable GridMap::_navmesh_source_geometry_parsing_callback;
 RID GridMap::_navmesh_source_geometry_parser;
diff --git a/modules/jolt_physics/joints/jolt_joint_3d.h b/modules/jolt_physics/joints/jolt_joint_3d.h
index 17456827032..859d906f09d 100644
--- a/modules/jolt_physics/joints/jolt_joint_3d.h
+++ b/modules/jolt_physics/joints/jolt_joint_3d.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "servers/physics_server_3d.h"
+#include "servers/physics_3d/physics_server_3d.h"
 
 #include "Jolt/Jolt.h"
 
diff --git a/modules/jolt_physics/jolt_physics_server_3d.cpp b/modules/jolt_physics/jolt_physics_server_3d.cpp
index 4a6e96e662a..03aae01df05 100644
--- a/modules/jolt_physics/jolt_physics_server_3d.cpp
+++ b/modules/jolt_physics/jolt_physics_server_3d.cpp
@@ -39,7 +39,7 @@
 #include "objects/jolt_area_3d.h"
 #include "objects/jolt_body_3d.h"
 #include "objects/jolt_soft_body_3d.h"
-#include "servers/physics_server_3d_wrap_mt.h"
+#include "servers/physics_3d/physics_server_3d_wrap_mt.h"
 #include "shapes/jolt_box_shape_3d.h"
 #include "shapes/jolt_capsule_shape_3d.h"
 #include "shapes/jolt_concave_polygon_shape_3d.h"
diff --git a/modules/jolt_physics/jolt_physics_server_3d.h b/modules/jolt_physics/jolt_physics_server_3d.h
index aff8284dba1..c8d78a227d3 100644
--- a/modules/jolt_physics/jolt_physics_server_3d.h
+++ b/modules/jolt_physics/jolt_physics_server_3d.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/templates/rid_owner.h"
-#include "servers/physics_server_3d.h"
+#include "servers/physics_3d/physics_server_3d.h"
 
 class JoltArea3D;
 class JoltBody3D;
diff --git a/modules/jolt_physics/objects/jolt_area_3d.h b/modules/jolt_physics/objects/jolt_area_3d.h
index d014105f114..5fa7430122c 100644
--- a/modules/jolt_physics/objects/jolt_area_3d.h
+++ b/modules/jolt_physics/objects/jolt_area_3d.h
@@ -32,7 +32,7 @@
 
 #include "jolt_shaped_object_3d.h"
 
-#include "servers/physics_server_3d.h"
+#include "servers/physics_3d/physics_server_3d.h"
 
 class JoltBody3D;
 class JoltSoftBody3D;
diff --git a/modules/jolt_physics/objects/jolt_physics_direct_body_state_3d.h b/modules/jolt_physics/objects/jolt_physics_direct_body_state_3d.h
index 1b924ae5568..7a32494ce07 100644
--- a/modules/jolt_physics/objects/jolt_physics_direct_body_state_3d.h
+++ b/modules/jolt_physics/objects/jolt_physics_direct_body_state_3d.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "servers/physics_server_3d.h"
+#include "servers/physics_3d/physics_server_3d.h"
 
 class JoltBody3D;
 
diff --git a/modules/jolt_physics/objects/jolt_soft_body_3d.cpp b/modules/jolt_physics/objects/jolt_soft_body_3d.cpp
index 5184e6a3040..5aadfb6e11b 100644
--- a/modules/jolt_physics/objects/jolt_soft_body_3d.cpp
+++ b/modules/jolt_physics/objects/jolt_soft_body_3d.cpp
@@ -38,7 +38,7 @@
 #include "jolt_body_3d.h"
 #include "jolt_group_filter.h"
 
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 #include "Jolt/Physics/SoftBody/SoftBodyMotionProperties.h"
 
diff --git a/modules/jolt_physics/objects/jolt_soft_body_3d.h b/modules/jolt_physics/objects/jolt_soft_body_3d.h
index 860eb75b725..9defc2125e9 100644
--- a/modules/jolt_physics/objects/jolt_soft_body_3d.h
+++ b/modules/jolt_physics/objects/jolt_soft_body_3d.h
@@ -32,7 +32,7 @@
 
 #include "jolt_object_3d.h"
 
-#include "servers/physics_server_3d.h"
+#include "servers/physics_3d/physics_server_3d.h"
 
 #include "Jolt/Jolt.h"
 
diff --git a/modules/jolt_physics/register_types.cpp b/modules/jolt_physics/register_types.cpp
index 4feb77e96d6..f24033dff9c 100644
--- a/modules/jolt_physics/register_types.cpp
+++ b/modules/jolt_physics/register_types.cpp
@@ -34,7 +34,7 @@
 #include "jolt_physics_server_3d.h"
 #include "jolt_project_settings.h"
 
-#include "servers/physics_server_3d_wrap_mt.h"
+#include "servers/physics_3d/physics_server_3d_wrap_mt.h"
 
 PhysicsServer3D *create_jolt_physics_server() {
 #ifdef THREADS_ENABLED
diff --git a/modules/jolt_physics/shapes/jolt_shape_3d.h b/modules/jolt_physics/shapes/jolt_shape_3d.h
index fc101dc7080..e60a220f5ed 100644
--- a/modules/jolt_physics/shapes/jolt_shape_3d.h
+++ b/modules/jolt_physics/shapes/jolt_shape_3d.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "servers/physics_server_3d.h"
+#include "servers/physics_3d/physics_server_3d.h"
 
 #include "Jolt/Jolt.h"
 
diff --git a/modules/jolt_physics/spaces/jolt_physics_direct_space_state_3d.h b/modules/jolt_physics/spaces/jolt_physics_direct_space_state_3d.h
index 2b3395599b8..3dd9eda011d 100644
--- a/modules/jolt_physics/spaces/jolt_physics_direct_space_state_3d.h
+++ b/modules/jolt_physics/spaces/jolt_physics_direct_space_state_3d.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "servers/physics_server_3d.h"
+#include "servers/physics_3d/physics_server_3d.h"
 
 #include "Jolt/Jolt.h"
 
diff --git a/modules/jolt_physics/spaces/jolt_space_3d.h b/modules/jolt_physics/spaces/jolt_space_3d.h
index fdbdef2286d..58ec8ed91ca 100644
--- a/modules/jolt_physics/spaces/jolt_space_3d.h
+++ b/modules/jolt_physics/spaces/jolt_space_3d.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "servers/physics_server_3d.h"
+#include "servers/physics_3d/physics_server_3d.h"
 
 #include "Jolt/Jolt.h"
 
diff --git a/modules/mobile_vr/mobile_vr_interface.cpp b/modules/mobile_vr/mobile_vr_interface.cpp
index 5a9ea8dae29..9a64df21a91 100644
--- a/modules/mobile_vr/mobile_vr_interface.cpp
+++ b/modules/mobile_vr/mobile_vr_interface.cpp
@@ -32,7 +32,7 @@
 
 #include "core/input/input.h"
 #include "core/os/os.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 #include "servers/rendering/renderer_compositor.h"
 
 StringName MobileVRInterface::get_name() const {
diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp
index 1ef2a0e5de0..91b173e40ba 100644
--- a/modules/mono/csharp_script.cpp
+++ b/modules/mono/csharp_script.cpp
@@ -55,7 +55,7 @@
 #include "core/os/mutex.h"
 #include "core/os/os.h"
 #include "core/os/thread.h"
-#include "servers/text_server.h"
+#include "servers/text/text_server.h"
 
 #ifdef TOOLS_ENABLED
 #include "core/os/keyboard.h"
diff --git a/modules/navigation_2d/2d/godot_navigation_server_2d.h b/modules/navigation_2d/2d/godot_navigation_server_2d.h
index 0eec1b80b9d..1dd521b0be0 100644
--- a/modules/navigation_2d/2d/godot_navigation_server_2d.h
+++ b/modules/navigation_2d/2d/godot_navigation_server_2d.h
@@ -39,9 +39,9 @@
 #include "core/templates/local_vector.h"
 #include "core/templates/rid.h"
 #include "core/templates/rid_owner.h"
-#include "servers/navigation/navigation_path_query_parameters_2d.h"
-#include "servers/navigation/navigation_path_query_result_2d.h"
-#include "servers/navigation_server_2d.h"
+#include "servers/navigation_2d/navigation_path_query_parameters_2d.h"
+#include "servers/navigation_2d/navigation_path_query_result_2d.h"
+#include "servers/navigation_2d/navigation_server_2d.h"
 
 /// The commands are functions executed during the `sync` phase.
 
diff --git a/modules/navigation_2d/2d/nav_base_iteration_2d.h b/modules/navigation_2d/2d/nav_base_iteration_2d.h
index 262bef21b71..2061ad37ee8 100644
--- a/modules/navigation_2d/2d/nav_base_iteration_2d.h
+++ b/modules/navigation_2d/2d/nav_base_iteration_2d.h
@@ -33,7 +33,7 @@
 #include "../nav_utils_2d.h"
 
 #include "core/object/ref_counted.h"
-#include "servers/navigation/navigation_utilities.h"
+#include "servers/navigation_2d/navigation_constants_2d.h"
 
 class NavBaseIteration2D : public RefCounted {
 	GDCLASS(NavBaseIteration2D, RefCounted);
@@ -43,7 +43,7 @@ public:
 	uint32_t navigation_layers = 1;
 	real_t enter_cost = 0.0;
 	real_t travel_cost = 1.0;
-	NavigationUtilities::PathSegmentType owner_type;
+	NavigationEnums2D::PathSegmentType owner_type;
 	ObjectID owner_object_id;
 	RID owner_rid;
 	bool owner_use_edge_connections = false;
@@ -51,7 +51,7 @@ public:
 	LocalVector<LocalVector<Nav2D::Connection>> internal_connections;
 
 	bool get_enabled() const { return enabled; }
-	NavigationUtilities::PathSegmentType get_type() const { return owner_type; }
+	NavigationEnums2D::PathSegmentType get_type() const { return owner_type; }
 	RID get_self() const { return owner_rid; }
 	ObjectID get_owner_id() const { return owner_object_id; }
 	uint32_t get_navigation_layers() const { return navigation_layers; }
diff --git a/modules/navigation_2d/2d/nav_mesh_generator_2d.h b/modules/navigation_2d/2d/nav_mesh_generator_2d.h
index 68b26c16187..f2bd2f89121 100644
--- a/modules/navigation_2d/2d/nav_mesh_generator_2d.h
+++ b/modules/navigation_2d/2d/nav_mesh_generator_2d.h
@@ -35,7 +35,7 @@
 #include "core/object/class_db.h"
 #include "core/object/worker_thread_pool.h"
 #include "core/templates/rid_owner.h"
-#include "servers/navigation_server_2d.h"
+#include "servers/navigation_2d/navigation_server_2d.h"
 
 class Node;
 class NavigationPolygon;
diff --git a/modules/navigation_2d/2d/nav_mesh_queries_2d.cpp b/modules/navigation_2d/2d/nav_mesh_queries_2d.cpp
index cda57b604e6..8252ba9cfbc 100644
--- a/modules/navigation_2d/2d/nav_mesh_queries_2d.cpp
+++ b/modules/navigation_2d/2d/nav_mesh_queries_2d.cpp
@@ -36,7 +36,6 @@
 #include "nav_region_iteration_2d.h"
 
 #include "core/math/geometry_2d.h"
-#include "servers/navigation/navigation_utilities.h"
 
 using namespace Nav2D;
 
@@ -151,7 +150,7 @@ void NavMeshQueries2D::map_query_path(NavMap2D *p_map, const Ref<NavigationPathQ
 	ERR_FAIL_COND(p_query_parameters.is_null());
 	ERR_FAIL_COND(p_query_result.is_null());
 
-	using namespace NavigationUtilities;
+	using namespace NavigationDefaults2D;
 
 	NavMeshQueries2D::NavMeshPathQueryTask2D query_task;
 	query_task.start_position = p_query_parameters->get_start_position();
@@ -1156,7 +1155,7 @@ bool NavMeshQueries2D::_query_task_is_connection_owner_usable(const NavMeshPathQ
 
 	if (p_query_task.exclude_regions || p_query_task.include_regions) {
 		switch (p_owner->get_type()) {
-			case NavigationUtilities::PathSegmentType::PATH_SEGMENT_TYPE_REGION: {
+			case NavigationEnums2D::PathSegmentType::PATH_SEGMENT_TYPE_REGION: {
 				if (p_query_task.exclude_regions && p_query_task.excluded_regions.has(p_owner->get_self())) {
 					// Not usable. Exclude region filter is active and this region is excluded.
 					owner_usable = false;
@@ -1165,7 +1164,7 @@ bool NavMeshQueries2D::_query_task_is_connection_owner_usable(const NavMeshPathQ
 					owner_usable = false;
 				}
 			} break;
-			case NavigationUtilities::PathSegmentType::PATH_SEGMENT_TYPE_LINK: {
+			case NavigationEnums2D::PathSegmentType::PATH_SEGMENT_TYPE_LINK: {
 				const LocalVector<Polygon> &link_polygons = p_owner->get_navmesh_polygons();
 				if (link_polygons.size() != 2) {
 					// Not usable. Whatever this is, it is not a valid connected link.
diff --git a/modules/navigation_2d/2d/nav_mesh_queries_2d.h b/modules/navigation_2d/2d/nav_mesh_queries_2d.h
index 14ebac1c2cb..22fc6e9baec 100644
--- a/modules/navigation_2d/2d/nav_mesh_queries_2d.h
+++ b/modules/navigation_2d/2d/nav_mesh_queries_2d.h
@@ -34,12 +34,13 @@
 
 #include "core/templates/a_hash_map.h"
 
-#include "servers/navigation/navigation_globals.h"
-#include "servers/navigation/navigation_path_query_parameters_2d.h"
-#include "servers/navigation/navigation_path_query_result_2d.h"
-#include "servers/navigation/navigation_utilities.h"
+#include "servers/nav_heap.h"
+#include "servers/navigation_2d/navigation_constants_2d.h"
+#include "servers/navigation_2d/navigation_path_query_parameters_2d.h"
+#include "servers/navigation_2d/navigation_path_query_result_2d.h"
 
-using namespace NavigationUtilities;
+using namespace NavigationDefaults2D;
+using namespace NavigationEnums2D;
 
 class NavMap2D;
 struct NavMapIteration2D;
diff --git a/modules/navigation_2d/nav_agent_2d.h b/modules/navigation_2d/nav_agent_2d.h
index c9be0516df3..a8bee213a3b 100644
--- a/modules/navigation_2d/nav_agent_2d.h
+++ b/modules/navigation_2d/nav_agent_2d.h
@@ -34,7 +34,7 @@
 
 #include "core/object/class_db.h"
 #include "core/templates/self_list.h"
-#include "servers/navigation/navigation_globals.h"
+#include "servers/navigation_2d/navigation_constants_2d.h"
 
 #include <Agent2d.h>
 
diff --git a/modules/navigation_2d/nav_base_2d.h b/modules/navigation_2d/nav_base_2d.h
index ef0e19079f0..1380a49b55e 100644
--- a/modules/navigation_2d/nav_base_2d.h
+++ b/modules/navigation_2d/nav_base_2d.h
@@ -33,7 +33,7 @@
 #include "nav_rid_2d.h"
 #include "nav_utils_2d.h"
 
-#include "servers/navigation/navigation_utilities.h"
+#include "servers/navigation_2d/navigation_constants_2d.h"
 
 class NavMap2D;
 
@@ -43,10 +43,10 @@ protected:
 	real_t enter_cost = 0.0;
 	real_t travel_cost = 1.0;
 	ObjectID owner_id;
-	NavigationUtilities::PathSegmentType type;
+	NavigationEnums2D::PathSegmentType type;
 
 public:
-	NavigationUtilities::PathSegmentType get_type() const { return type; }
+	NavigationEnums2D::PathSegmentType get_type() const { return type; }
 
 	virtual void set_use_edge_connections(bool p_enabled) {}
 	virtual bool get_use_edge_connections() const { return false; }
diff --git a/modules/navigation_2d/nav_link_2d.cpp b/modules/navigation_2d/nav_link_2d.cpp
index d4baa339b40..c86a7fb6b2e 100644
--- a/modules/navigation_2d/nav_link_2d.cpp
+++ b/modules/navigation_2d/nav_link_2d.cpp
@@ -203,7 +203,7 @@ Ref<NavLinkIteration2D> NavLink2D::get_iteration() {
 
 NavLink2D::NavLink2D() :
 		sync_dirty_request_list_element(this) {
-	type = NavigationUtilities::PathSegmentType::PATH_SEGMENT_TYPE_LINK;
+	type = NavigationEnums2D::PathSegmentType::PATH_SEGMENT_TYPE_LINK;
 	iteration.instantiate();
 }
 
diff --git a/modules/navigation_2d/nav_map_2d.cpp b/modules/navigation_2d/nav_map_2d.cpp
index 02cf6a7e303..e0419200829 100644
--- a/modules/navigation_2d/nav_map_2d.cpp
+++ b/modules/navigation_2d/nav_map_2d.cpp
@@ -40,7 +40,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/object/worker_thread_pool.h"
-#include "servers/navigation_server_2d.h"
+#include "servers/navigation_2d/navigation_server_2d.h"
 
 #include <Obstacle2d.h>
 
diff --git a/modules/navigation_2d/nav_map_2d.h b/modules/navigation_2d/nav_map_2d.h
index 40a70136484..d1a52372716 100644
--- a/modules/navigation_2d/nav_map_2d.h
+++ b/modules/navigation_2d/nav_map_2d.h
@@ -37,7 +37,7 @@
 
 #include "core/math/math_defs.h"
 #include "core/object/worker_thread_pool.h"
-#include "servers/navigation/navigation_globals.h"
+#include "servers/navigation_2d/navigation_constants_2d.h"
 
 #include <KdTree2d.h>
 #include <RVOSimulator2d.h>
diff --git a/modules/navigation_2d/nav_region_2d.cpp b/modules/navigation_2d/nav_region_2d.cpp
index 7da49f6113c..e5c61426934 100644
--- a/modules/navigation_2d/nav_region_2d.cpp
+++ b/modules/navigation_2d/nav_region_2d.cpp
@@ -338,7 +338,7 @@ bool NavRegion2D::get_use_async_iterations() const {
 
 NavRegion2D::NavRegion2D() :
 		sync_dirty_request_list_element(this), async_list_element(this) {
-	type = NavigationUtilities::PathSegmentType::PATH_SEGMENT_TYPE_REGION;
+	type = NavigationEnums2D::PathSegmentType::PATH_SEGMENT_TYPE_REGION;
 	iteration_build.region = this;
 	iteration.instantiate();
 
diff --git a/modules/navigation_2d/nav_utils_2d.h b/modules/navigation_2d/nav_utils_2d.h
index 93cdd00ce41..4c33c166693 100644
--- a/modules/navigation_2d/nav_utils_2d.h
+++ b/modules/navigation_2d/nav_utils_2d.h
@@ -34,8 +34,8 @@
 #include "core/object/ref_counted.h"
 #include "core/templates/hash_map.h"
 #include "core/templates/hashfuncs.h"
-#include "servers/navigation/nav_heap.h"
-#include "servers/navigation/navigation_utilities.h"
+#include "core/templates/local_vector.h"
+#include "servers/navigation_2d/navigation_constants_2d.h"
 
 class NavBaseIteration2D;
 
diff --git a/modules/navigation_2d/register_types.cpp b/modules/navigation_2d/register_types.cpp
index 67f7cdfe8ff..bffd79b3dab 100644
--- a/modules/navigation_2d/register_types.cpp
+++ b/modules/navigation_2d/register_types.cpp
@@ -33,7 +33,7 @@
 #include "2d/godot_navigation_server_2d.h"
 
 #include "core/config/engine.h"
-#include "servers/navigation_server_2d.h"
+#include "servers/navigation_2d/navigation_server_2d.h"
 
 #ifdef TOOLS_ENABLED
 #include "editor/navigation_link_2d_editor_plugin.h"
diff --git a/modules/navigation_3d/3d/godot_navigation_server_3d.cpp b/modules/navigation_3d/3d/godot_navigation_server_3d.cpp
index bffcfe4e064..35b076c874c 100644
--- a/modules/navigation_3d/3d/godot_navigation_server_3d.cpp
+++ b/modules/navigation_3d/3d/godot_navigation_server_3d.cpp
@@ -35,7 +35,7 @@
 
 #include "nav_mesh_generator_3d.h"
 
-using namespace NavigationUtilities;
+using namespace NavigationDefaults3D;
 
 /// Creates a struct for each function and a function that once called creates
 /// an instance of that struct with the submitted parameters.
diff --git a/modules/navigation_3d/3d/godot_navigation_server_3d.h b/modules/navigation_3d/3d/godot_navigation_server_3d.h
index a59b74fa622..58ec19931e9 100644
--- a/modules/navigation_3d/3d/godot_navigation_server_3d.h
+++ b/modules/navigation_3d/3d/godot_navigation_server_3d.h
@@ -39,9 +39,9 @@
 #include "core/templates/local_vector.h"
 #include "core/templates/rid.h"
 #include "core/templates/rid_owner.h"
-#include "servers/navigation/navigation_path_query_parameters_3d.h"
-#include "servers/navigation/navigation_path_query_result_3d.h"
-#include "servers/navigation_server_3d.h"
+#include "servers/navigation_3d/navigation_path_query_parameters_3d.h"
+#include "servers/navigation_3d/navigation_path_query_result_3d.h"
+#include "servers/navigation_3d/navigation_server_3d.h"
 
 /// The commands are functions executed during the `sync` phase.
 
diff --git a/modules/navigation_3d/3d/nav_base_iteration_3d.h b/modules/navigation_3d/3d/nav_base_iteration_3d.h
index 5e5eb990a91..3f29e916b25 100644
--- a/modules/navigation_3d/3d/nav_base_iteration_3d.h
+++ b/modules/navigation_3d/3d/nav_base_iteration_3d.h
@@ -33,7 +33,7 @@
 #include "../nav_utils_3d.h"
 
 #include "core/object/ref_counted.h"
-#include "servers/navigation/navigation_utilities.h"
+#include "servers/navigation_3d/navigation_constants_3d.h"
 
 class NavBaseIteration3D : public RefCounted {
 	GDCLASS(NavBaseIteration3D, RefCounted);
@@ -43,7 +43,7 @@ public:
 	uint32_t navigation_layers = 1;
 	real_t enter_cost = 0.0;
 	real_t travel_cost = 1.0;
-	NavigationUtilities::PathSegmentType owner_type;
+	NavigationEnums3D::PathSegmentType owner_type;
 	ObjectID owner_object_id;
 	RID owner_rid;
 	bool owner_use_edge_connections = false;
@@ -51,7 +51,7 @@ public:
 	LocalVector<LocalVector<Nav3D::Connection>> internal_connections;
 
 	bool get_enabled() const { return enabled; }
-	NavigationUtilities::PathSegmentType get_type() const { return owner_type; }
+	NavigationEnums3D::PathSegmentType get_type() const { return owner_type; }
 	RID get_self() const { return owner_rid; }
 	ObjectID get_owner_id() const { return owner_object_id; }
 	uint32_t get_navigation_layers() const { return navigation_layers; }
diff --git a/modules/navigation_3d/3d/nav_mesh_generator_3d.h b/modules/navigation_3d/3d/nav_mesh_generator_3d.h
index bfc07a69959..2ca18163aaa 100644
--- a/modules/navigation_3d/3d/nav_mesh_generator_3d.h
+++ b/modules/navigation_3d/3d/nav_mesh_generator_3d.h
@@ -33,7 +33,7 @@
 #include "core/object/class_db.h"
 #include "core/object/worker_thread_pool.h"
 #include "core/templates/rid_owner.h"
-#include "servers/navigation_server_3d.h"
+#include "servers/navigation_3d/navigation_server_3d.h"
 
 class Node;
 class NavigationMesh;
diff --git a/modules/navigation_3d/3d/nav_mesh_queries_3d.cpp b/modules/navigation_3d/3d/nav_mesh_queries_3d.cpp
index a0020b3f69d..5e636e97973 100644
--- a/modules/navigation_3d/3d/nav_mesh_queries_3d.cpp
+++ b/modules/navigation_3d/3d/nav_mesh_queries_3d.cpp
@@ -36,7 +36,6 @@
 
 #include "core/math/geometry_2d.h"
 #include "core/math/geometry_3d.h"
-#include "servers/navigation/navigation_utilities.h"
 
 using namespace Nav3D;
 
@@ -151,7 +150,7 @@ void NavMeshQueries3D::map_query_path(NavMap3D *map, const Ref<NavigationPathQue
 	ERR_FAIL_COND(p_query_parameters.is_null());
 	ERR_FAIL_COND(p_query_result.is_null());
 
-	using namespace NavigationUtilities;
+	using namespace NavigationDefaults3D;
 
 	NavMeshQueries3D::NavMeshPathQueryTask3D query_task;
 	query_task.start_position = p_query_parameters->get_start_position();
@@ -1297,7 +1296,7 @@ bool NavMeshQueries3D::_query_task_is_connection_owner_usable(const NavMeshPathQ
 
 	if (p_query_task.exclude_regions || p_query_task.include_regions) {
 		switch (p_owner->get_type()) {
-			case NavigationUtilities::PathSegmentType::PATH_SEGMENT_TYPE_REGION: {
+			case NavigationEnums3D::PathSegmentType::PATH_SEGMENT_TYPE_REGION: {
 				if (p_query_task.exclude_regions && p_query_task.excluded_regions.has(p_owner->get_self())) {
 					// Not usable. Exclude region filter is active and this region is excluded.
 					owner_usable = false;
@@ -1306,7 +1305,7 @@ bool NavMeshQueries3D::_query_task_is_connection_owner_usable(const NavMeshPathQ
 					owner_usable = false;
 				}
 			} break;
-			case NavigationUtilities::PathSegmentType::PATH_SEGMENT_TYPE_LINK: {
+			case NavigationEnums3D::PathSegmentType::PATH_SEGMENT_TYPE_LINK: {
 				const LocalVector<Polygon> &link_polygons = p_owner->get_navmesh_polygons();
 				if (link_polygons.size() != 2) {
 					// Not usable. Whatever this is, it is not a valid connected link.
diff --git a/modules/navigation_3d/3d/nav_mesh_queries_3d.h b/modules/navigation_3d/3d/nav_mesh_queries_3d.h
index 31889e3613d..af18db86a80 100644
--- a/modules/navigation_3d/3d/nav_mesh_queries_3d.h
+++ b/modules/navigation_3d/3d/nav_mesh_queries_3d.h
@@ -34,12 +34,13 @@
 
 #include "core/templates/a_hash_map.h"
 
-#include "servers/navigation/navigation_globals.h"
-#include "servers/navigation/navigation_path_query_parameters_3d.h"
-#include "servers/navigation/navigation_path_query_result_3d.h"
-#include "servers/navigation/navigation_utilities.h"
+#include "servers/nav_heap.h"
+#include "servers/navigation_3d/navigation_constants_3d.h"
+#include "servers/navigation_3d/navigation_path_query_parameters_3d.h"
+#include "servers/navigation_3d/navigation_path_query_result_3d.h"
 
-using namespace NavigationUtilities;
+using namespace NavigationDefaults3D;
+using namespace NavigationEnums3D;
 
 class NavMap3D;
 struct NavMapIteration3D;
diff --git a/modules/navigation_3d/3d/navigation_mesh_generator.cpp b/modules/navigation_3d/3d/navigation_mesh_generator.cpp
index 496bded0c35..23d5e65422b 100644
--- a/modules/navigation_3d/3d/navigation_mesh_generator.cpp
+++ b/modules/navigation_3d/3d/navigation_mesh_generator.cpp
@@ -31,7 +31,7 @@
 #include "navigation_mesh_generator.h"
 
 #include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
-#include "servers/navigation_server_3d.h"
+#include "servers/navigation_3d/navigation_server_3d.h"
 
 NavigationMeshGenerator *NavigationMeshGenerator::singleton = nullptr;
 
diff --git a/modules/navigation_3d/editor/navigation_link_3d_gizmo_plugin.cpp b/modules/navigation_3d/editor/navigation_link_3d_gizmo_plugin.cpp
index 375b31b6642..7259ea14e1d 100644
--- a/modules/navigation_3d/editor/navigation_link_3d_gizmo_plugin.cpp
+++ b/modules/navigation_3d/editor/navigation_link_3d_gizmo_plugin.cpp
@@ -33,7 +33,7 @@
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/scene/3d/node_3d_editor_plugin.h"
 #include "scene/3d/navigation/navigation_link_3d.h"
-#include "servers/navigation_server_3d.h"
+#include "servers/navigation_3d/navigation_server_3d.h"
 
 NavigationLink3DGizmoPlugin::NavigationLink3DGizmoPlugin() {
 	create_material("navigation_link_material", NavigationServer3D::get_singleton()->get_debug_navigation_link_connection_color());
diff --git a/modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.cpp b/modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.cpp
index fdbd17871ee..1800c4df0e0 100644
--- a/modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.cpp
+++ b/modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.cpp
@@ -39,7 +39,7 @@
 #include "scene/3d/navigation/navigation_obstacle_3d.h"
 #include "scene/gui/button.h"
 #include "scene/gui/dialogs.h"
-#include "servers/navigation_server_3d.h"
+#include "servers/navigation_3d/navigation_server_3d.h"
 
 bool NavigationObstacle3DGizmoPlugin::has_gizmo(Node3D *p_spatial) {
 	return Object::cast_to<NavigationObstacle3D>(p_spatial) != nullptr;
diff --git a/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.cpp b/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.cpp
index 704c8908994..27f134146d9 100644
--- a/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.cpp
+++ b/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.cpp
@@ -39,7 +39,7 @@
 #include "scene/gui/button.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/label.h"
-#include "servers/navigation_server_3d.h"
+#include "servers/navigation_3d/navigation_server_3d.h"
 
 void NavigationRegion3DEditor::_node_removed(Node *p_node) {
 	if (selected_regions.is_empty()) {
diff --git a/modules/navigation_3d/editor/navigation_region_3d_gizmo_plugin.cpp b/modules/navigation_3d/editor/navigation_region_3d_gizmo_plugin.cpp
index 0a323a50876..52b92199f77 100644
--- a/modules/navigation_3d/editor/navigation_region_3d_gizmo_plugin.cpp
+++ b/modules/navigation_3d/editor/navigation_region_3d_gizmo_plugin.cpp
@@ -32,7 +32,7 @@
 
 #include "core/math/random_pcg.h"
 #include "scene/3d/navigation/navigation_region_3d.h"
-#include "servers/navigation_server_3d.h"
+#include "servers/navigation_3d/navigation_server_3d.h"
 
 NavigationRegion3DGizmoPlugin::NavigationRegion3DGizmoPlugin() {
 	create_material("face_material", NavigationServer3D::get_singleton()->get_debug_navigation_geometry_face_color(), false, false, true);
diff --git a/modules/navigation_3d/nav_agent_3d.h b/modules/navigation_3d/nav_agent_3d.h
index 696b1ae2e35..fc3be0c2e29 100644
--- a/modules/navigation_3d/nav_agent_3d.h
+++ b/modules/navigation_3d/nav_agent_3d.h
@@ -34,7 +34,7 @@
 
 #include "core/object/class_db.h"
 #include "core/templates/self_list.h"
-#include "servers/navigation/navigation_globals.h"
+#include "servers/navigation_3d/navigation_constants_3d.h"
 
 #include <Agent2d.h>
 #include <Agent3d.h>
diff --git a/modules/navigation_3d/nav_base_3d.h b/modules/navigation_3d/nav_base_3d.h
index 3fd18f11aba..08934362623 100644
--- a/modules/navigation_3d/nav_base_3d.h
+++ b/modules/navigation_3d/nav_base_3d.h
@@ -33,7 +33,7 @@
 #include "nav_rid_3d.h"
 #include "nav_utils_3d.h"
 
-#include "servers/navigation/navigation_utilities.h"
+#include "servers/navigation_3d/navigation_constants_3d.h"
 
 class NavMap3D;
 
@@ -43,10 +43,10 @@ protected:
 	real_t enter_cost = 0.0;
 	real_t travel_cost = 1.0;
 	ObjectID owner_id;
-	NavigationUtilities::PathSegmentType type;
+	NavigationEnums3D::PathSegmentType type;
 
 public:
-	NavigationUtilities::PathSegmentType get_type() const { return type; }
+	NavigationEnums3D::PathSegmentType get_type() const { return type; }
 
 	virtual void set_use_edge_connections(bool p_enabled) {}
 	virtual bool get_use_edge_connections() const { return false; }
diff --git a/modules/navigation_3d/nav_link_3d.cpp b/modules/navigation_3d/nav_link_3d.cpp
index dbe212b44fe..29682d1e2e0 100644
--- a/modules/navigation_3d/nav_link_3d.cpp
+++ b/modules/navigation_3d/nav_link_3d.cpp
@@ -203,7 +203,7 @@ Ref<NavLinkIteration3D> NavLink3D::get_iteration() {
 
 NavLink3D::NavLink3D() :
 		sync_dirty_request_list_element(this) {
-	type = NavigationUtilities::PathSegmentType::PATH_SEGMENT_TYPE_LINK;
+	type = NavigationEnums3D::PathSegmentType::PATH_SEGMENT_TYPE_LINK;
 	iteration.instantiate();
 }
 
diff --git a/modules/navigation_3d/nav_map_3d.cpp b/modules/navigation_3d/nav_map_3d.cpp
index dceb46c01ea..010bd8fa360 100644
--- a/modules/navigation_3d/nav_map_3d.cpp
+++ b/modules/navigation_3d/nav_map_3d.cpp
@@ -40,7 +40,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/object/worker_thread_pool.h"
-#include "servers/navigation_server_3d.h"
+#include "servers/navigation_3d/navigation_server_3d.h"
 
 #include <Obstacle2d.h>
 
diff --git a/modules/navigation_3d/nav_map_3d.h b/modules/navigation_3d/nav_map_3d.h
index d4c992de525..0f18dd3454d 100644
--- a/modules/navigation_3d/nav_map_3d.h
+++ b/modules/navigation_3d/nav_map_3d.h
@@ -37,7 +37,7 @@
 
 #include "core/math/math_defs.h"
 #include "core/object/worker_thread_pool.h"
-#include "servers/navigation/navigation_globals.h"
+#include "servers/navigation_3d/navigation_constants_3d.h"
 
 #include <KdTree2d.h>
 #include <KdTree3d.h>
diff --git a/modules/navigation_3d/nav_region_3d.cpp b/modules/navigation_3d/nav_region_3d.cpp
index e34246c4aae..f4c2a46eb9b 100644
--- a/modules/navigation_3d/nav_region_3d.cpp
+++ b/modules/navigation_3d/nav_region_3d.cpp
@@ -356,7 +356,7 @@ bool NavRegion3D::get_use_async_iterations() const {
 
 NavRegion3D::NavRegion3D() :
 		sync_dirty_request_list_element(this), async_list_element(this) {
-	type = NavigationUtilities::PathSegmentType::PATH_SEGMENT_TYPE_REGION;
+	type = NavigationEnums3D::PathSegmentType::PATH_SEGMENT_TYPE_REGION;
 	iteration_build.region = this;
 	iteration.instantiate();
 
diff --git a/modules/navigation_3d/nav_utils_3d.h b/modules/navigation_3d/nav_utils_3d.h
index 72cba469c4c..d18fb92c584 100644
--- a/modules/navigation_3d/nav_utils_3d.h
+++ b/modules/navigation_3d/nav_utils_3d.h
@@ -34,8 +34,8 @@
 #include "core/object/ref_counted.h"
 #include "core/templates/hash_map.h"
 #include "core/templates/hashfuncs.h"
-#include "servers/navigation/nav_heap.h"
-#include "servers/navigation/navigation_utilities.h"
+#include "core/templates/local_vector.h"
+#include "servers/navigation_3d/navigation_constants_3d.h"
 
 class NavBaseIteration3D;
 
diff --git a/modules/navigation_3d/register_types.cpp b/modules/navigation_3d/register_types.cpp
index 6238aee150c..644e6f3e6fa 100644
--- a/modules/navigation_3d/register_types.cpp
+++ b/modules/navigation_3d/register_types.cpp
@@ -43,7 +43,7 @@
 #endif
 
 #include "core/config/engine.h"
-#include "servers/navigation_server_3d.h"
+#include "servers/navigation_3d/navigation_server_3d.h"
 
 #ifndef DISABLE_DEPRECATED
 NavigationMeshGenerator *_nav_mesh_generator = nullptr;
diff --git a/modules/openxr/extensions/openxr_hand_tracking_extension.cpp b/modules/openxr/extensions/openxr_hand_tracking_extension.cpp
index 775d49f4d34..6f4e3ede592 100644
--- a/modules/openxr/extensions/openxr_hand_tracking_extension.cpp
+++ b/modules/openxr/extensions/openxr_hand_tracking_extension.cpp
@@ -34,7 +34,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/string/print_string.h"
-#include "servers/xr_server.h"
+#include "servers/xr/xr_server.h"
 
 #include <openxr/openxr.h>
 
diff --git a/modules/openxr/extensions/openxr_render_model_extension.cpp b/modules/openxr/extensions/openxr_render_model_extension.cpp
index 69d2797a837..9029a4c2417 100644
--- a/modules/openxr/extensions/openxr_render_model_extension.cpp
+++ b/modules/openxr/extensions/openxr_render_model_extension.cpp
@@ -35,7 +35,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/string/print_string.h"
-#include "servers/xr_server.h"
+#include "servers/xr/xr_server.h"
 
 OpenXRRenderModelExtension *OpenXRRenderModelExtension::singleton = nullptr;
 
diff --git a/modules/openxr/extensions/openxr_visibility_mask_extension.cpp b/modules/openxr/extensions/openxr_visibility_mask_extension.cpp
index 00445bd7681..145d03cbe56 100644
--- a/modules/openxr/extensions/openxr_visibility_mask_extension.cpp
+++ b/modules/openxr/extensions/openxr_visibility_mask_extension.cpp
@@ -34,7 +34,7 @@
 #include "core/string/print_string.h"
 #include "core/variant/array.h"
 #include "core/variant/variant.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 static const char *VISIBILITY_MASK_SHADER_CODE =
 		"shader_type spatial;\n"
diff --git a/modules/openxr/extensions/platform/openxr_d3d12_extension.cpp b/modules/openxr/extensions/platform/openxr_d3d12_extension.cpp
index 12c7d36397e..7e5e45d0cb6 100644
--- a/modules/openxr/extensions/platform/openxr_d3d12_extension.cpp
+++ b/modules/openxr/extensions/platform/openxr_d3d12_extension.cpp
@@ -34,8 +34,8 @@
 
 #include "../../openxr_util.h"
 
+#include "servers/rendering/rendering_server.h"
 #include "servers/rendering/rendering_server_globals.h"
-#include "servers/rendering_server.h"
 
 HashMap<String, bool *> OpenXRD3D12Extension::get_requested_extensions() {
 	HashMap<String, bool *> request_extensions;
diff --git a/modules/openxr/extensions/platform/openxr_opengl_extension.cpp b/modules/openxr/extensions/platform/openxr_opengl_extension.cpp
index 28c3e17708a..d20817c407d 100644
--- a/modules/openxr/extensions/platform/openxr_opengl_extension.cpp
+++ b/modules/openxr/extensions/platform/openxr_opengl_extension.cpp
@@ -36,8 +36,8 @@
 
 #include "drivers/gles3/effects/copy_effects.h"
 #include "drivers/gles3/storage/texture_storage.h"
+#include "servers/rendering/rendering_server.h"
 #include "servers/rendering/rendering_server_globals.h"
-#include "servers/rendering_server.h"
 
 // OpenXR requires us to submit sRGB textures so that it recognizes the content
 // as being in sRGB color space. We do fall back on "normal" textures but this
diff --git a/modules/openxr/extensions/platform/openxr_vulkan_extension.cpp b/modules/openxr/extensions/platform/openxr_vulkan_extension.cpp
index cd6f83a5244..1255ea35fea 100644
--- a/modules/openxr/extensions/platform/openxr_vulkan_extension.cpp
+++ b/modules/openxr/extensions/platform/openxr_vulkan_extension.cpp
@@ -36,8 +36,8 @@
 #include "core/string/print_string.h"
 #include "servers/rendering/renderer_rd/effects/copy_effects.h"
 #include "servers/rendering/renderer_rd/storage_rd/texture_storage.h"
+#include "servers/rendering/rendering_server.h"
 #include "servers/rendering/rendering_server_globals.h"
-#include "servers/rendering_server.h"
 
 HashMap<String, bool *> OpenXRVulkanExtension::get_requested_extensions() {
 	HashMap<String, bool *> request_extensions;
diff --git a/modules/openxr/extensions/spatial_entities/openxr_spatial_anchor.cpp b/modules/openxr/extensions/spatial_entities/openxr_spatial_anchor.cpp
index 18055e197ed..47ec6bde31d 100644
--- a/modules/openxr/extensions/spatial_entities/openxr_spatial_anchor.cpp
+++ b/modules/openxr/extensions/spatial_entities/openxr_spatial_anchor.cpp
@@ -34,7 +34,7 @@
 #include "../../openxr_util.h"
 #include "../openxr_future_extension.h"
 #include "core/config/project_settings.h"
-#include "servers/xr_server.h"
+#include "servers/xr/xr_server.h"
 
 ////////////////////////////////////////////////////////////////////////////
 // OpenXRSpatialCapabilityConfigurationAnchor
diff --git a/modules/openxr/extensions/spatial_entities/openxr_spatial_entity_extension.cpp b/modules/openxr/extensions/spatial_entities/openxr_spatial_entity_extension.cpp
index 83b4a089624..6cc60042332 100644
--- a/modules/openxr/extensions/spatial_entities/openxr_spatial_entity_extension.cpp
+++ b/modules/openxr/extensions/spatial_entities/openxr_spatial_entity_extension.cpp
@@ -32,7 +32,7 @@
 
 #include "../../openxr_api.h"
 #include "core/config/project_settings.h"
-#include "servers/xr_server.h"
+#include "servers/xr/xr_server.h"
 
 ////////////////////////////////////////////////////////////////////////////
 // OpenXRSpatialEntityExtension
diff --git a/modules/openxr/extensions/spatial_entities/openxr_spatial_marker_tracking.cpp b/modules/openxr/extensions/spatial_entities/openxr_spatial_marker_tracking.cpp
index ae2a096c9e4..1d9e832c4dc 100644
--- a/modules/openxr/extensions/spatial_entities/openxr_spatial_marker_tracking.cpp
+++ b/modules/openxr/extensions/spatial_entities/openxr_spatial_marker_tracking.cpp
@@ -33,7 +33,7 @@
 #include "../../openxr_api.h"
 #include "core/config/project_settings.h"
 #include "openxr_spatial_entity_extension.h"
-#include "servers/xr_server.h"
+#include "servers/xr/xr_server.h"
 
 ////////////////////////////////////////////////////////////////////////////
 // OpenXRSpatialCapabilityConfigurationQrCode
diff --git a/modules/openxr/extensions/spatial_entities/openxr_spatial_plane_tracking.cpp b/modules/openxr/extensions/spatial_entities/openxr_spatial_plane_tracking.cpp
index 24db12c789e..504905e69ee 100644
--- a/modules/openxr/extensions/spatial_entities/openxr_spatial_plane_tracking.cpp
+++ b/modules/openxr/extensions/spatial_entities/openxr_spatial_plane_tracking.cpp
@@ -35,7 +35,7 @@
 #include "scene/resources/3d/box_shape_3d.h"
 #include "scene/resources/3d/concave_polygon_shape_3d.h"
 #include "scene/resources/3d/primitive_meshes.h"
-#include "servers/xr_server.h"
+#include "servers/xr/xr_server.h"
 
 ////////////////////////////////////////////////////////////////////////////
 // OpenXRSpatialCapabilityConfigurationPlaneTracking
diff --git a/modules/openxr/openxr_api.h b/modules/openxr/openxr_api.h
index 20b2ce8f921..050236faa44 100644
--- a/modules/openxr/openxr_api.h
+++ b/modules/openxr/openxr_api.h
@@ -41,7 +41,7 @@
 #include "core/string/ustring.h"
 #include "core/templates/rid_owner.h"
 #include "core/templates/vector.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 #include "servers/xr/xr_pose.h"
 
 #include <openxr/openxr.h>
diff --git a/modules/openxr/scene/openxr_hand.cpp b/modules/openxr/scene/openxr_hand.cpp
index bf21be1281d..76775899da2 100644
--- a/modules/openxr/scene/openxr_hand.cpp
+++ b/modules/openxr/scene/openxr_hand.cpp
@@ -34,7 +34,7 @@
 #include "../openxr_api.h"
 
 #include "scene/3d/skeleton_3d.h"
-#include "servers/xr_server.h"
+#include "servers/xr/xr_server.h"
 
 void OpenXRHand::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_hand", "hand"), &OpenXRHand::set_hand);
diff --git a/modules/openxr/scene/openxr_render_model_manager.cpp b/modules/openxr/scene/openxr_render_model_manager.cpp
index 0595d453a8e..b139b1cd064 100644
--- a/modules/openxr/scene/openxr_render_model_manager.cpp
+++ b/modules/openxr/scene/openxr_render_model_manager.cpp
@@ -34,7 +34,7 @@
 #include "../openxr_api.h"
 #include "core/config/project_settings.h"
 #include "scene/3d/xr/xr_nodes.h"
-#include "servers/xr_server.h"
+#include "servers/xr/xr_server.h"
 
 void OpenXRRenderModelManager::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_tracker"), &OpenXRRenderModelManager::get_tracker);
diff --git a/modules/theora/editor/movie_writer_ogv.h b/modules/theora/editor/movie_writer_ogv.h
index 34f8db28f85..55b6b4a7165 100644
--- a/modules/theora/editor/movie_writer_ogv.h
+++ b/modules/theora/editor/movie_writer_ogv.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 #include "servers/movie_writer/movie_writer.h"
 
 #include <theora/theoraenc.h>
diff --git a/platform/android/audio_driver_opensl.h b/platform/android/audio_driver_opensl.h
index c9f3fc3ab26..5f4fa3a150c 100644
--- a/platform/android/audio_driver_opensl.h
+++ b/platform/android/audio_driver_opensl.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/os/mutex.h"
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 #include <SLES/OpenSLES.h>
 #include <SLES/OpenSLES_Android.h>
diff --git a/platform/android/display_server_android.h b/platform/android/display_server_android.h
index ad332f7eff9..d831a40dd52 100644
--- a/platform/android/display_server_android.h
+++ b/platform/android/display_server_android.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 #if defined(RD_ENABLED)
 class RenderingContextDriver;
diff --git a/platform/android/java/lib/src/org/godotengine/godot/tts/GodotTTS.java b/platform/android/java/lib/src/org/godotengine/godot/tts/GodotTTS.java
index db37d0308f7..7ba297d54a3 100644
--- a/platform/android/java/lib/src/org/godotengine/godot/tts/GodotTTS.java
+++ b/platform/android/java/lib/src/org/godotengine/godot/tts/GodotTTS.java
@@ -57,7 +57,7 @@ import java.util.Set;
  */
 @Keep
 public class GodotTTS extends UtteranceProgressListener implements TextToSpeech.OnInitListener {
-	// Note: These constants must be in sync with DisplayServer::TTSUtteranceEvent enum from "servers/display_server.h".
+	// Note: These constants must be in sync with DisplayServer::TTSUtteranceEvent enum from "servers/display/display_server.h".
 	final private static int EVENT_START = 0;
 	final private static int EVENT_END = 1;
 	final private static int EVENT_CANCEL = 2;
diff --git a/platform/android/java_godot_lib_jni.cpp b/platform/android/java_godot_lib_jni.cpp
index 1643c9b329d..bd2a3b0a035 100644
--- a/platform/android/java_godot_lib_jni.cpp
+++ b/platform/android/java_godot_lib_jni.cpp
@@ -49,10 +49,10 @@
 #include "core/config/project_settings.h"
 #include "core/input/input.h"
 #include "main/main.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 #ifndef XR_DISABLED
-#include "servers/xr_server.h"
+#include "servers/xr/xr_server.h"
 #endif // XR_DISABLED
 
 #ifdef TOOLS_ENABLED
diff --git a/platform/android/os_android.cpp b/platform/android/os_android.cpp
index e7b5f4c2dc0..098febdd6d1 100644
--- a/platform/android/os_android.cpp
+++ b/platform/android/os_android.cpp
@@ -49,7 +49,7 @@
 #endif
 #include "main/main.h"
 #include "scene/main/scene_tree.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 #include <dlfcn.h>
 #include <sys/system_properties.h>
diff --git a/platform/android/os_android.h b/platform/android/os_android.h
index c4a8c8f02b2..b05069b8521 100644
--- a/platform/android/os_android.h
+++ b/platform/android/os_android.h
@@ -34,7 +34,7 @@
 
 #include "core/os/main_loop.h"
 #include "drivers/unix/os_unix.h"
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 class GodotJavaWrapper;
 class GodotIOJavaWrapper;
diff --git a/platform/android/tts_android.h b/platform/android/tts_android.h
index 162ccf99fa5..b778333a7ae 100644
--- a/platform/android/tts_android.h
+++ b/platform/android/tts_android.h
@@ -34,7 +34,7 @@
 #include "core/string/ustring.h"
 #include "core/templates/hash_map.h"
 #include "core/variant/array.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 #include <jni.h>
 
diff --git a/platform/ios/display_layer_ios.mm b/platform/ios/display_layer_ios.mm
index 1c7e27c1f6c..c1f6d758a33 100644
--- a/platform/ios/display_layer_ios.mm
+++ b/platform/ios/display_layer_ios.mm
@@ -36,7 +36,7 @@
 #include "core/config/project_settings.h"
 #include "core/os/keyboard.h"
 #include "main/main.h"
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 #import <AudioToolbox/AudioServices.h>
 #import <GameController/GameController.h>
diff --git a/platform/linuxbsd/freedesktop_portal_desktop.h b/platform/linuxbsd/freedesktop_portal_desktop.h
index ad4f04f8957..d65d1cd00f1 100644
--- a/platform/linuxbsd/freedesktop_portal_desktop.h
+++ b/platform/linuxbsd/freedesktop_portal_desktop.h
@@ -34,7 +34,7 @@
 
 #include "core/os/thread.h"
 #include "core/os/thread_safe.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 struct DBusMessage;
 struct DBusConnection;
diff --git a/platform/linuxbsd/os_linuxbsd.cpp b/platform/linuxbsd/os_linuxbsd.cpp
index 3c73cf3d03c..0c307690fdd 100644
--- a/platform/linuxbsd/os_linuxbsd.cpp
+++ b/platform/linuxbsd/os_linuxbsd.cpp
@@ -36,8 +36,8 @@
 #include "drivers/sdl/joypad_sdl.h"
 #endif
 #include "main/main.h"
-#include "servers/display_server.h"
-#include "servers/rendering_server.h"
+#include "servers/display/display_server.h"
+#include "servers/rendering/rendering_server.h"
 
 #ifdef X11_ENABLED
 #include "x11/detect_prime_x11.h"
diff --git a/platform/linuxbsd/os_linuxbsd.h b/platform/linuxbsd/os_linuxbsd.h
index fc309607c42..7bd4918e657 100644
--- a/platform/linuxbsd/os_linuxbsd.h
+++ b/platform/linuxbsd/os_linuxbsd.h
@@ -37,7 +37,7 @@
 #include "drivers/alsamidi/midi_driver_alsamidi.h"
 #include "drivers/pulseaudio/audio_driver_pulseaudio.h"
 #include "drivers/unix/os_unix.h"
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 #ifdef FONTCONFIG_ENABLED
 #ifdef SOWRAP_ENABLED
diff --git a/platform/linuxbsd/tts_linux.cpp b/platform/linuxbsd/tts_linux.cpp
index 1b0a83b3891..87eefed85e6 100644
--- a/platform/linuxbsd/tts_linux.cpp
+++ b/platform/linuxbsd/tts_linux.cpp
@@ -31,7 +31,7 @@
 #include "tts_linux.h"
 
 #include "core/config/project_settings.h"
-#include "servers/text_server.h"
+#include "servers/text/text_server.h"
 
 TTS_Linux *TTS_Linux::singleton = nullptr;
 
diff --git a/platform/linuxbsd/tts_linux.h b/platform/linuxbsd/tts_linux.h
index 3a63b9a026b..8dab45fc5ff 100644
--- a/platform/linuxbsd/tts_linux.h
+++ b/platform/linuxbsd/tts_linux.h
@@ -36,7 +36,7 @@
 #include "core/templates/hash_map.h"
 #include "core/templates/list.h"
 #include "core/variant/array.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 #ifdef SOWRAP_ENABLED
 #include "speechd-so_wrap.h"
diff --git a/platform/linuxbsd/wayland/display_server_wayland.h b/platform/linuxbsd/wayland/display_server_wayland.h
index 95dd66a7878..daa436008e8 100644
--- a/platform/linuxbsd/wayland/display_server_wayland.h
+++ b/platform/linuxbsd/wayland/display_server_wayland.h
@@ -59,7 +59,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/input/input.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 #include <climits>
 #include <cstdio>
diff --git a/platform/linuxbsd/wayland/wayland_thread.h b/platform/linuxbsd/wayland/wayland_thread.h
index 4f9e15f222c..37ae4a27e78 100644
--- a/platform/linuxbsd/wayland/wayland_thread.h
+++ b/platform/linuxbsd/wayland/wayland_thread.h
@@ -84,7 +84,7 @@
 #endif // LIBDECOR_ENABLED
 
 #include "core/os/thread.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 class WaylandThread {
 public:
diff --git a/platform/linuxbsd/x11/display_server_x11.h b/platform/linuxbsd/x11/display_server_x11.h
index e155248a3da..d5484b27df5 100644
--- a/platform/linuxbsd/x11/display_server_x11.h
+++ b/platform/linuxbsd/x11/display_server_x11.h
@@ -40,10 +40,10 @@
 #include "drivers/alsamidi/midi_driver_alsamidi.h"
 #include "drivers/pulseaudio/audio_driver_pulseaudio.h"
 #include "drivers/unix/os_unix.h"
-#include "servers/audio_server.h"
-#include "servers/display_server.h"
+#include "servers/audio/audio_server.h"
+#include "servers/display/display_server.h"
 #include "servers/rendering/renderer_compositor.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 #if defined(SPEECHD_ENABLED)
 #include "tts_linux.h"
diff --git a/platform/linuxbsd/x11/gl_manager_x11.h b/platform/linuxbsd/x11/gl_manager_x11.h
index bac0320ba40..3bd956b2323 100644
--- a/platform/linuxbsd/x11/gl_manager_x11.h
+++ b/platform/linuxbsd/x11/gl_manager_x11.h
@@ -34,7 +34,7 @@
 
 #include "core/os/os.h"
 #include "core/templates/local_vector.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 #ifdef SOWRAP_ENABLED
 #include "dynwrappers/xlib-so_wrap.h"
diff --git a/platform/linuxbsd/x11/gl_manager_x11_egl.h b/platform/linuxbsd/x11/gl_manager_x11_egl.h
index 653707ea740..43d89ab1acb 100644
--- a/platform/linuxbsd/x11/gl_manager_x11_egl.h
+++ b/platform/linuxbsd/x11/gl_manager_x11_egl.h
@@ -35,7 +35,7 @@
 #include "core/os/os.h"
 #include "core/templates/local_vector.h"
 #include "drivers/egl/egl_manager.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 #include <X11/Xlib.h>
 
diff --git a/platform/macos/display_server_macos_base.h b/platform/macos/display_server_macos_base.h
index 4a532e9647f..07ebe517e8e 100644
--- a/platform/macos/display_server_macos_base.h
+++ b/platform/macos/display_server_macos_base.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/input/input.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 #define FontVariation __FontVariation
 
diff --git a/platform/macos/embedded_gl_manager.h b/platform/macos/embedded_gl_manager.h
index c6fae224844..4097aadaf46 100644
--- a/platform/macos/embedded_gl_manager.h
+++ b/platform/macos/embedded_gl_manager.h
@@ -34,7 +34,7 @@
 
 #include "core/os/os.h"
 #include "core/templates/local_vector.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 #import <AppKit/AppKit.h>
 #import <ApplicationServices/ApplicationServices.h>
diff --git a/platform/macos/gl_manager_macos_angle.h b/platform/macos/gl_manager_macos_angle.h
index 4498ef02a6e..626c8ff1020 100644
--- a/platform/macos/gl_manager_macos_angle.h
+++ b/platform/macos/gl_manager_macos_angle.h
@@ -35,7 +35,7 @@
 #include "core/os/os.h"
 #include "core/templates/local_vector.h"
 #include "drivers/egl/egl_manager.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 // Suppress redefinition conflicts
 #define FontVariation __FontVariation
diff --git a/platform/macos/gl_manager_macos_legacy.h b/platform/macos/gl_manager_macos_legacy.h
index 0f19901da79..c8eceb20cfe 100644
--- a/platform/macos/gl_manager_macos_legacy.h
+++ b/platform/macos/gl_manager_macos_legacy.h
@@ -34,7 +34,7 @@
 
 #include "core/os/os.h"
 #include "core/templates/local_vector.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 #import <AppKit/AppKit.h>
 #import <ApplicationServices/ApplicationServices.h>
diff --git a/platform/macos/godot_button_view.h b/platform/macos/godot_button_view.h
index 9c018e914cd..36e55bd7f87 100644
--- a/platform/macos/godot_button_view.h
+++ b/platform/macos/godot_button_view.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 #import <AppKit/AppKit.h>
 #import <Foundation/Foundation.h>
diff --git a/platform/macos/godot_content_view.h b/platform/macos/godot_content_view.h
index 65f21f42b7a..8462431e33e 100644
--- a/platform/macos/godot_content_view.h
+++ b/platform/macos/godot_content_view.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 #import <AppKit/AppKit.h>
 #import <Foundation/Foundation.h>
diff --git a/platform/macos/godot_menu_item.h b/platform/macos/godot_menu_item.h
index 95cc91f3114..33215063c76 100644
--- a/platform/macos/godot_menu_item.h
+++ b/platform/macos/godot_menu_item.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 #import <AppKit/AppKit.h>
 #import <Foundation/Foundation.h>
diff --git a/platform/macos/godot_window.h b/platform/macos/godot_window.h
index f4df9627e68..b5b72089f92 100644
--- a/platform/macos/godot_window.h
+++ b/platform/macos/godot_window.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 #import <AppKit/AppKit.h>
 #import <Foundation/Foundation.h>
diff --git a/platform/macos/godot_window_delegate.h b/platform/macos/godot_window_delegate.h
index f46127672cd..6237838bcf9 100644
--- a/platform/macos/godot_window_delegate.h
+++ b/platform/macos/godot_window_delegate.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 #import <AppKit/AppKit.h>
 #import <Foundation/Foundation.h>
diff --git a/platform/macos/os_macos.h b/platform/macos/os_macos.h
index f1c12c8df42..c9a450c26b2 100644
--- a/platform/macos/os_macos.h
+++ b/platform/macos/os_macos.h
@@ -36,7 +36,7 @@
 #import "drivers/coreaudio/audio_driver_coreaudio.h"
 #import "drivers/coremidi/midi_driver_coremidi.h"
 #include "drivers/unix/os_unix.h"
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 class JoypadSDL;
 
diff --git a/platform/macos/tts_macos.h b/platform/macos/tts_macos.h
index ec10f44eef9..6fad4166832 100644
--- a/platform/macos/tts_macos.h
+++ b/platform/macos/tts_macos.h
@@ -34,7 +34,7 @@
 #include "core/templates/hash_map.h"
 #include "core/templates/list.h"
 #include "core/variant/array.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 #import <AppKit/AppKit.h>
 
diff --git a/platform/web/audio_driver_web.h b/platform/web/audio_driver_web.h
index f29c04e1980..8255823743d 100644
--- a/platform/web/audio_driver_web.h
+++ b/platform/web/audio_driver_web.h
@@ -35,7 +35,7 @@
 
 #include "core/os/mutex.h"
 #include "core/os/thread.h"
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 class AudioDriverWeb : public AudioDriver {
 private:
diff --git a/platform/web/display_server_web.h b/platform/web/display_server_web.h
index ed0342a79b7..4107ccf5704 100644
--- a/platform/web/display_server_web.h
+++ b/platform/web/display_server_web.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 #include "godot_js.h"
 
diff --git a/platform/web/os_web.h b/platform/web/os_web.h
index 3f64b5a195d..43bcfa6cab8 100644
--- a/platform/web/os_web.h
+++ b/platform/web/os_web.h
@@ -37,7 +37,7 @@
 
 #include "core/input/input.h"
 #include "drivers/unix/os_unix.h"
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 #include <emscripten/html5.h>
 
diff --git a/platform/windows/display_server_windows.h b/platform/windows/display_server_windows.h
index 4c920e66f35..6c2d0c5f642 100644
--- a/platform/windows/display_server_windows.h
+++ b/platform/windows/display_server_windows.h
@@ -40,11 +40,11 @@
 #include "core/os/os.h"
 #include "drivers/wasapi/audio_driver_wasapi.h"
 #include "drivers/winmidi/midi_driver_winmidi.h"
-#include "servers/audio_server.h"
-#include "servers/display_server.h"
+#include "servers/audio/audio_server.h"
+#include "servers/display/display_server.h"
 #include "servers/rendering/renderer_compositor.h"
 #include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 #ifdef XAUDIO2_ENABLED
 #include "drivers/xaudio2/audio_driver_xaudio2.h"
diff --git a/platform/windows/gl_manager_windows_angle.h b/platform/windows/gl_manager_windows_angle.h
index 1ae6e8c1973..c83cce4a93f 100644
--- a/platform/windows/gl_manager_windows_angle.h
+++ b/platform/windows/gl_manager_windows_angle.h
@@ -35,7 +35,7 @@
 #include "core/os/os.h"
 #include "core/templates/local_vector.h"
 #include "drivers/egl/egl_manager.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 #include <windows.h>
 
diff --git a/platform/windows/gl_manager_windows_native.h b/platform/windows/gl_manager_windows_native.h
index c4d66bfabf4..7d70b10df49 100644
--- a/platform/windows/gl_manager_windows_native.h
+++ b/platform/windows/gl_manager_windows_native.h
@@ -34,7 +34,7 @@
 
 #include "core/os/os.h"
 #include "core/templates/local_vector.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 #include <windows.h>
 
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
index 6c76e538ded..6097b3d21f9 100644
--- a/platform/windows/os_windows.cpp
+++ b/platform/windows/os_windows.cpp
@@ -46,9 +46,9 @@
 #include "drivers/windows/net_socket_winsock.h"
 #include "drivers/windows/thread_windows.h"
 #include "main/main.h"
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 #include "servers/rendering/rendering_server_default.h"
-#include "servers/text_server.h"
+#include "servers/text/text_server.h"
 
 #include <avrt.h>
 #include <bcrypt.h>
diff --git a/platform/windows/os_windows.h b/platform/windows/os_windows.h
index 6c670c51042..4742e7fb01a 100644
--- a/platform/windows/os_windows.h
+++ b/platform/windows/os_windows.h
@@ -38,7 +38,7 @@
 #include "core/os/os.h"
 #include "drivers/wasapi/audio_driver_wasapi.h"
 #include "drivers/winmidi/midi_driver_winmidi.h"
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 #ifdef XAUDIO2_ENABLED
 #include "drivers/xaudio2/audio_driver_xaudio2.h"
diff --git a/platform/windows/tts_windows.h b/platform/windows/tts_windows.h
index 377c18f2b9e..a7976506982 100644
--- a/platform/windows/tts_windows.h
+++ b/platform/windows/tts_windows.h
@@ -34,7 +34,7 @@
 #include "core/templates/hash_map.h"
 #include "core/templates/list.h"
 #include "core/variant/array.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 #include <objbase.h>
 #include <sapi.h>
diff --git a/scene/2d/audio_stream_player_2d.cpp b/scene/2d/audio_stream_player_2d.cpp
index 15b6bee3b20..e1fa6d5547f 100644
--- a/scene/2d/audio_stream_player_2d.cpp
+++ b/scene/2d/audio_stream_player_2d.cpp
@@ -36,8 +36,8 @@
 #include "scene/audio/audio_stream_player_internal.h"
 #include "scene/main/viewport.h"
 #include "scene/resources/world_2d.h"
+#include "servers/audio/audio_server.h"
 #include "servers/audio/audio_stream.h"
-#include "servers/audio_server.h"
 
 #ifndef PHYSICS_2D_DISABLED
 #include "scene/2d/physics/area_2d.h"
diff --git a/scene/2d/audio_stream_player_2d.h b/scene/2d/audio_stream_player_2d.h
index 2d021190e43..c3fb2c6a5af 100644
--- a/scene/2d/audio_stream_player_2d.h
+++ b/scene/2d/audio_stream_player_2d.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "scene/2d/node_2d.h"
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 struct AudioFrame;
 class AudioStream;
diff --git a/scene/2d/mesh_instance_2d.cpp b/scene/2d/mesh_instance_2d.cpp
index 76e73b691dd..82767ca10cf 100644
--- a/scene/2d/mesh_instance_2d.cpp
+++ b/scene/2d/mesh_instance_2d.cpp
@@ -33,7 +33,7 @@
 #ifndef NAVIGATION_2D_DISABLED
 #include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
 #include "scene/resources/2d/navigation_polygon.h"
-#include "servers/navigation_server_2d.h"
+#include "servers/navigation_2d/navigation_server_2d.h"
 
 #include "thirdparty/clipper2/include/clipper2/clipper.h"
 #include "thirdparty/misc/polypartition.h"
diff --git a/scene/2d/multimesh_instance_2d.cpp b/scene/2d/multimesh_instance_2d.cpp
index 479265225fc..93b52bf78d4 100644
--- a/scene/2d/multimesh_instance_2d.cpp
+++ b/scene/2d/multimesh_instance_2d.cpp
@@ -33,7 +33,7 @@
 #ifndef NAVIGATION_2D_DISABLED
 #include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
 #include "scene/resources/2d/navigation_polygon.h"
-#include "servers/navigation_server_2d.h"
+#include "servers/navigation_2d/navigation_server_2d.h"
 
 #include "thirdparty/clipper2/include/clipper2/clipper.h"
 #include "thirdparty/misc/polypartition.h"
diff --git a/scene/2d/navigation/navigation_agent_2d.cpp b/scene/2d/navigation/navigation_agent_2d.cpp
index 84ba5381007..32f1d373d18 100644
--- a/scene/2d/navigation/navigation_agent_2d.cpp
+++ b/scene/2d/navigation/navigation_agent_2d.cpp
@@ -33,7 +33,7 @@
 #include "core/math/geometry_2d.h"
 #include "scene/2d/navigation/navigation_link_2d.h"
 #include "scene/resources/world_2d.h"
-#include "servers/navigation_server_2d.h"
+#include "servers/navigation_2d/navigation_server_2d.h"
 
 void NavigationAgent2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_rid"), &NavigationAgent2D::get_rid);
diff --git a/scene/2d/navigation/navigation_agent_2d.h b/scene/2d/navigation/navigation_agent_2d.h
index 2e35c29c05b..b178d70bbba 100644
--- a/scene/2d/navigation/navigation_agent_2d.h
+++ b/scene/2d/navigation/navigation_agent_2d.h
@@ -31,9 +31,9 @@
 #pragma once
 
 #include "scene/main/node.h"
-#include "servers/navigation/navigation_globals.h"
-#include "servers/navigation/navigation_path_query_parameters_2d.h"
-#include "servers/navigation/navigation_path_query_result_2d.h"
+#include "servers/navigation_2d/navigation_constants_2d.h"
+#include "servers/navigation_2d/navigation_path_query_parameters_2d.h"
+#include "servers/navigation_2d/navigation_path_query_result_2d.h"
 
 class Node2D;
 
diff --git a/scene/2d/navigation/navigation_link_2d.cpp b/scene/2d/navigation/navigation_link_2d.cpp
index 7d94ff3cf15..afe4dd1b37a 100644
--- a/scene/2d/navigation/navigation_link_2d.cpp
+++ b/scene/2d/navigation/navigation_link_2d.cpp
@@ -32,7 +32,7 @@
 
 #include "core/math/geometry_2d.h"
 #include "scene/resources/world_2d.h"
-#include "servers/navigation_server_2d.h"
+#include "servers/navigation_2d/navigation_server_2d.h"
 
 void NavigationLink2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_rid"), &NavigationLink2D::get_rid);
diff --git a/scene/2d/navigation/navigation_obstacle_2d.cpp b/scene/2d/navigation/navigation_obstacle_2d.cpp
index 83d203fc811..e58ed9df856 100644
--- a/scene/2d/navigation/navigation_obstacle_2d.cpp
+++ b/scene/2d/navigation/navigation_obstacle_2d.cpp
@@ -34,7 +34,7 @@
 #include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
 #include "scene/resources/2d/navigation_polygon.h"
 #include "scene/resources/world_2d.h"
-#include "servers/navigation_server_2d.h"
+#include "servers/navigation_2d/navigation_server_2d.h"
 
 Callable NavigationObstacle2D::_navmesh_source_geometry_parsing_callback;
 RID NavigationObstacle2D::_navmesh_source_geometry_parser;
@@ -71,7 +71,7 @@ void NavigationObstacle2D::_bind_methods() {
 
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "radius", PROPERTY_HINT_RANGE, "0.0,500,0.01,suffix:px"), "set_radius", "get_radius");
 	ADD_PROPERTY(PropertyInfo(Variant::PACKED_VECTOR2_ARRAY, "vertices"), "set_vertices", "get_vertices");
-	ADD_GROUP("NavigationMesh", "");
+	ADD_GROUP("NavigationPolygon", "");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "affect_navigation_mesh"), "set_affect_navigation_mesh", "get_affect_navigation_mesh");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "carve_navigation_mesh"), "set_carve_navigation_mesh", "get_carve_navigation_mesh");
 	ADD_GROUP("Avoidance", "");
diff --git a/scene/2d/navigation/navigation_region_2d.cpp b/scene/2d/navigation/navigation_region_2d.cpp
index a7d9deff32a..f0b0803a0e0 100644
--- a/scene/2d/navigation/navigation_region_2d.cpp
+++ b/scene/2d/navigation/navigation_region_2d.cpp
@@ -32,7 +32,7 @@
 
 #include "core/math/random_pcg.h"
 #include "scene/resources/world_2d.h"
-#include "servers/navigation_server_2d.h"
+#include "servers/navigation_2d/navigation_server_2d.h"
 
 RID NavigationRegion2D::get_rid() const {
 	return region;
diff --git a/scene/2d/physics/area_2d.cpp b/scene/2d/physics/area_2d.cpp
index 1e56fc56df9..3779078b9fa 100644
--- a/scene/2d/physics/area_2d.cpp
+++ b/scene/2d/physics/area_2d.cpp
@@ -30,7 +30,7 @@
 
 #include "area_2d.h"
 
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 void Area2D::set_gravity_space_override_mode(SpaceOverride p_mode) {
 	gravity_space_override = p_mode;
diff --git a/scene/2d/physics/character_body_2d.cpp b/scene/2d/physics/character_body_2d.cpp
index c1804c6483e..2138a1aec5e 100644
--- a/scene/2d/physics/character_body_2d.cpp
+++ b/scene/2d/physics/character_body_2d.cpp
@@ -31,7 +31,7 @@
 #include "character_body_2d.h"
 
 #ifndef DISABLE_DEPRECATED
-#include "servers/extensions/physics_server_2d_extension.h"
+#include "servers/physics_2d/physics_server_2d_extension.h"
 #endif
 
 // So, if you pass 45 as limit, avoid numerical precision errors when angle is 45.
diff --git a/scene/2d/physics/collision_object_2d.h b/scene/2d/physics/collision_object_2d.h
index a46e9d2daf3..9264f421bf5 100644
--- a/scene/2d/physics/collision_object_2d.h
+++ b/scene/2d/physics/collision_object_2d.h
@@ -33,7 +33,7 @@
 #include "scene/2d/node_2d.h"
 #include "scene/main/viewport.h"
 #include "scene/resources/2d/shape_2d.h"
-#include "servers/physics_server_2d.h"
+#include "servers/physics_2d/physics_server_2d.h"
 
 class CollisionObject2D : public Node2D {
 	GDCLASS(CollisionObject2D, Node2D);
diff --git a/scene/2d/physics/kinematic_collision_2d.h b/scene/2d/physics/kinematic_collision_2d.h
index ba2088c1e9a..610834052c7 100644
--- a/scene/2d/physics/kinematic_collision_2d.h
+++ b/scene/2d/physics/kinematic_collision_2d.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/object/ref_counted.h"
-#include "servers/physics_server_2d.h"
+#include "servers/physics_2d/physics_server_2d.h"
 
 class CharacterBody2D;
 class PhysicsBody2D;
diff --git a/scene/2d/physics/physics_body_2d.h b/scene/2d/physics/physics_body_2d.h
index 6646bfd8084..c7929ba1a3d 100644
--- a/scene/2d/physics/physics_body_2d.h
+++ b/scene/2d/physics/physics_body_2d.h
@@ -33,7 +33,7 @@
 #include "scene/2d/physics/collision_object_2d.h"
 #include "scene/2d/physics/kinematic_collision_2d.h"
 #include "scene/resources/physics_material.h"
-#include "servers/physics_server_2d.h"
+#include "servers/physics_2d/physics_server_2d.h"
 
 class PhysicsBody2D : public CollisionObject2D {
 	GDCLASS(PhysicsBody2D, CollisionObject2D);
diff --git a/scene/2d/physics/shape_cast_2d.cpp b/scene/2d/physics/shape_cast_2d.cpp
index 7b212b17ac9..fedac014a53 100644
--- a/scene/2d/physics/shape_cast_2d.cpp
+++ b/scene/2d/physics/shape_cast_2d.cpp
@@ -33,7 +33,7 @@
 #include "core/config/engine.h"
 #include "scene/2d/physics/collision_object_2d.h"
 #include "scene/resources/world_2d.h"
-#include "servers/physics_server_2d.h"
+#include "servers/physics_2d/physics_server_2d.h"
 
 void ShapeCast2D::set_target_position(const Vector2 &p_point) {
 	target_position = p_point;
diff --git a/scene/2d/physics/shape_cast_2d.h b/scene/2d/physics/shape_cast_2d.h
index 0ea57d21456..0d23677888b 100644
--- a/scene/2d/physics/shape_cast_2d.h
+++ b/scene/2d/physics/shape_cast_2d.h
@@ -32,7 +32,7 @@
 
 #include "scene/2d/node_2d.h"
 #include "scene/resources/2d/shape_2d.h"
-#include "servers/physics_server_2d.h"
+#include "servers/physics_2d/physics_server_2d.h"
 
 class CollisionObject2D;
 
diff --git a/scene/2d/physics/static_body_2d.cpp b/scene/2d/physics/static_body_2d.cpp
index de15ee8b76d..07c64cb579d 100644
--- a/scene/2d/physics/static_body_2d.cpp
+++ b/scene/2d/physics/static_body_2d.cpp
@@ -38,7 +38,7 @@
 #include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
 #include "scene/resources/2d/navigation_polygon.h"
 #include "scene/resources/2d/rectangle_shape_2d.h"
-#include "servers/navigation_server_2d.h"
+#include "servers/navigation_2d/navigation_server_2d.h"
 #endif // NAVIGATION_2D_DISABLED
 
 Callable StaticBody2D::_navmesh_source_geometry_parsing_callback;
diff --git a/scene/2d/polygon_2d.cpp b/scene/2d/polygon_2d.cpp
index cd162f7c3b6..a5f39f6ef14 100644
--- a/scene/2d/polygon_2d.cpp
+++ b/scene/2d/polygon_2d.cpp
@@ -31,14 +31,13 @@
 #include "polygon_2d.h"
 
 #include "core/math/geometry_2d.h"
-#ifndef NAVIGATION_2D_DISABLED
-#include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
-#include "scene/resources/2d/navigation_polygon.h"
-#include "servers/navigation_server_2d.h"
-#endif // NAVIGATION_2D_DISABLED
 #include "skeleton_2d.h"
 
 #ifndef NAVIGATION_2D_DISABLED
+#include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
+#include "scene/resources/2d/navigation_polygon.h"
+#include "servers/navigation_2d/navigation_server_2d.h"
+
 Callable Polygon2D::_navmesh_source_geometry_parsing_callback;
 RID Polygon2D::_navmesh_source_geometry_parser;
 #endif // NAVIGATION_2D_DISABLED
diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp
index 2bad4508cf1..f7b3eb1f138 100644
--- a/scene/2d/tile_map.cpp
+++ b/scene/2d/tile_map.cpp
@@ -34,7 +34,7 @@
 #include "core/io/marshalls.h"
 #ifndef NAVIGATION_2D_DISABLED
 #include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
-#include "servers/navigation_server_2d.h"
+#include "servers/navigation_2d/navigation_server_2d.h"
 #endif // NAVIGATION_2D_DISABLED
 
 #define TILEMAP_CALL_FOR_LAYER(layer, function, ...) \
diff --git a/scene/2d/tile_map_layer.cpp b/scene/2d/tile_map_layer.cpp
index 016aadb1ad9..8d06e05a11e 100644
--- a/scene/2d/tile_map_layer.cpp
+++ b/scene/2d/tile_map_layer.cpp
@@ -40,11 +40,11 @@
 #include "scene/resources/world_2d.h"
 
 #ifndef PHYSICS_2D_DISABLED
-#include "servers/physics_server_2d.h"
+#include "servers/physics_2d/physics_server_2d.h"
 #endif // PHYSICS_3D_DISABLED
 
 #ifndef NAVIGATION_2D_DISABLED
-#include "servers/navigation_server_2d.h"
+#include "servers/navigation_2d/navigation_server_2d.h"
 Callable TileMapLayer::_navmesh_source_geometry_parsing_callback;
 RID TileMapLayer::_navmesh_source_geometry_parser;
 #endif // NAVIGATION_2D_DISABLED
diff --git a/scene/3d/audio_stream_player_3d.h b/scene/3d/audio_stream_player_3d.h
index 70108f8422c..69d41c44fcd 100644
--- a/scene/3d/audio_stream_player_3d.h
+++ b/scene/3d/audio_stream_player_3d.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "scene/3d/node_3d.h"
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 #ifndef PHYSICS_3D_DISABLED
 class Area3D;
diff --git a/scene/3d/label_3d.h b/scene/3d/label_3d.h
index ab6cc358677..0f14b1b7c41 100644
--- a/scene/3d/label_3d.h
+++ b/scene/3d/label_3d.h
@@ -33,7 +33,7 @@
 #include "scene/3d/visual_instance_3d.h"
 #include "scene/resources/font.h"
 
-#include "servers/text_server.h"
+#include "servers/text/text_server.h"
 
 class Label3D : public GeometryInstance3D {
 	GDCLASS(Label3D, GeometryInstance3D);
diff --git a/scene/3d/mesh_instance_3d.cpp b/scene/3d/mesh_instance_3d.cpp
index e2e07bb2a2b..3c6f60f290a 100644
--- a/scene/3d/mesh_instance_3d.cpp
+++ b/scene/3d/mesh_instance_3d.cpp
@@ -42,7 +42,7 @@
 #ifndef NAVIGATION_3D_DISABLED
 #include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
 #include "scene/resources/navigation_mesh.h"
-#include "servers/navigation_server_3d.h"
+#include "servers/navigation_3d/navigation_server_3d.h"
 
 Callable MeshInstance3D::_navmesh_source_geometry_parsing_callback;
 RID MeshInstance3D::_navmesh_source_geometry_parser;
diff --git a/scene/3d/multimesh_instance_3d.cpp b/scene/3d/multimesh_instance_3d.cpp
index abb548febfc..d5589d33cf1 100644
--- a/scene/3d/multimesh_instance_3d.cpp
+++ b/scene/3d/multimesh_instance_3d.cpp
@@ -33,7 +33,7 @@
 #ifndef NAVIGATION_3D_DISABLED
 #include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
 #include "scene/resources/navigation_mesh.h"
-#include "servers/navigation_server_3d.h"
+#include "servers/navigation_3d/navigation_server_3d.h"
 
 Callable MultiMeshInstance3D::_navmesh_source_geometry_parsing_callback;
 RID MultiMeshInstance3D::_navmesh_source_geometry_parser;
diff --git a/scene/3d/navigation/navigation_agent_3d.cpp b/scene/3d/navigation/navigation_agent_3d.cpp
index ed9c0a4baa9..f44c377fd3f 100644
--- a/scene/3d/navigation/navigation_agent_3d.cpp
+++ b/scene/3d/navigation/navigation_agent_3d.cpp
@@ -31,7 +31,7 @@
 #include "navigation_agent_3d.h"
 
 #include "scene/3d/navigation/navigation_link_3d.h"
-#include "servers/navigation_server_3d.h"
+#include "servers/navigation_3d/navigation_server_3d.h"
 
 void NavigationAgent3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_rid"), &NavigationAgent3D::get_rid);
diff --git a/scene/3d/navigation/navigation_agent_3d.h b/scene/3d/navigation/navigation_agent_3d.h
index a21fa84ef3b..9b747538a39 100644
--- a/scene/3d/navigation/navigation_agent_3d.h
+++ b/scene/3d/navigation/navigation_agent_3d.h
@@ -31,9 +31,9 @@
 #pragma once
 
 #include "scene/main/node.h"
-#include "servers/navigation/navigation_globals.h"
-#include "servers/navigation/navigation_path_query_parameters_3d.h"
-#include "servers/navigation/navigation_path_query_result_3d.h"
+#include "servers/navigation_3d/navigation_constants_3d.h"
+#include "servers/navigation_3d/navigation_path_query_parameters_3d.h"
+#include "servers/navigation_3d/navigation_path_query_result_3d.h"
 
 class Node3D;
 
diff --git a/scene/3d/navigation/navigation_link_3d.cpp b/scene/3d/navigation/navigation_link_3d.cpp
index 3dbab0e1dc0..eb454c9f3a0 100644
--- a/scene/3d/navigation/navigation_link_3d.cpp
+++ b/scene/3d/navigation/navigation_link_3d.cpp
@@ -30,7 +30,7 @@
 
 #include "navigation_link_3d.h"
 
-#include "servers/navigation_server_3d.h"
+#include "servers/navigation_3d/navigation_server_3d.h"
 
 #ifdef DEBUG_ENABLED
 void NavigationLink3D::_update_debug_mesh() {
diff --git a/scene/3d/navigation/navigation_obstacle_3d.cpp b/scene/3d/navigation/navigation_obstacle_3d.cpp
index b63fd19e773..f6a967d48ba 100644
--- a/scene/3d/navigation/navigation_obstacle_3d.cpp
+++ b/scene/3d/navigation/navigation_obstacle_3d.cpp
@@ -33,7 +33,7 @@
 #include "core/math/geometry_2d.h"
 #include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
 #include "scene/resources/navigation_mesh.h"
-#include "servers/navigation_server_3d.h"
+#include "servers/navigation_3d/navigation_server_3d.h"
 
 Callable NavigationObstacle3D::_navmesh_source_geometry_parsing_callback;
 RID NavigationObstacle3D::_navmesh_source_geometry_parser;
diff --git a/scene/3d/navigation/navigation_region_3d.cpp b/scene/3d/navigation/navigation_region_3d.cpp
index 0bdfdad318b..11869bd253d 100644
--- a/scene/3d/navigation/navigation_region_3d.cpp
+++ b/scene/3d/navigation/navigation_region_3d.cpp
@@ -32,7 +32,7 @@
 
 #include "core/math/random_pcg.h"
 #include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
-#include "servers/navigation_server_3d.h"
+#include "servers/navigation_3d/navigation_server_3d.h"
 
 RID NavigationRegion3D::get_rid() const {
 	return region;
diff --git a/scene/3d/physics/area_3d.cpp b/scene/3d/physics/area_3d.cpp
index 45d40ebdf37..eee27d396f7 100644
--- a/scene/3d/physics/area_3d.cpp
+++ b/scene/3d/physics/area_3d.cpp
@@ -30,7 +30,7 @@
 
 #include "area_3d.h"
 
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 void Area3D::set_gravity_space_override_mode(SpaceOverride p_mode) {
 	gravity_space_override = p_mode;
diff --git a/scene/3d/physics/character_body_3d.cpp b/scene/3d/physics/character_body_3d.cpp
index a1869a2965f..aa4ed20bb44 100644
--- a/scene/3d/physics/character_body_3d.cpp
+++ b/scene/3d/physics/character_body_3d.cpp
@@ -31,7 +31,7 @@
 #include "character_body_3d.h"
 
 #ifndef DISABLE_DEPRECATED
-#include "servers/extensions/physics_server_3d_extension.h"
+#include "servers/physics_3d/physics_server_3d_extension.h"
 #endif
 
 //so, if you pass 45 as limit, avoid numerical precision errors when angle is 45.
diff --git a/scene/3d/physics/kinematic_collision_3d.h b/scene/3d/physics/kinematic_collision_3d.h
index 9aec0c65162..1216f42a12e 100644
--- a/scene/3d/physics/kinematic_collision_3d.h
+++ b/scene/3d/physics/kinematic_collision_3d.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/object/ref_counted.h"
-#include "servers/physics_server_3d.h"
+#include "servers/physics_3d/physics_server_3d.h"
 
 class KinematicCollision3D : public RefCounted {
 	GDCLASS(KinematicCollision3D, RefCounted);
diff --git a/scene/3d/physics/physics_body_3d.h b/scene/3d/physics/physics_body_3d.h
index f8bba8e674a..a492ecd1adb 100644
--- a/scene/3d/physics/physics_body_3d.h
+++ b/scene/3d/physics/physics_body_3d.h
@@ -33,7 +33,7 @@
 #include "scene/3d/physics/collision_object_3d.h"
 #include "scene/3d/physics/kinematic_collision_3d.h"
 #include "scene/resources/physics_material.h"
-#include "servers/physics_server_3d.h"
+#include "servers/physics_3d/physics_server_3d.h"
 
 class PhysicsBody3D : public CollisionObject3D {
 	GDCLASS(PhysicsBody3D, CollisionObject3D);
diff --git a/scene/3d/physics/soft_body_3d.h b/scene/3d/physics/soft_body_3d.h
index 3672010391c..3dacb2fcb32 100644
--- a/scene/3d/physics/soft_body_3d.h
+++ b/scene/3d/physics/soft_body_3d.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "scene/3d/mesh_instance_3d.h"
-#include "servers/physics_server_3d.h"
+#include "servers/physics_3d/physics_server_3d.h"
 
 class PhysicsBody3D;
 
diff --git a/scene/3d/physics/static_body_3d.cpp b/scene/3d/physics/static_body_3d.cpp
index 37bd275c46a..a632af469a2 100644
--- a/scene/3d/physics/static_body_3d.cpp
+++ b/scene/3d/physics/static_body_3d.cpp
@@ -44,7 +44,7 @@
 #include "scene/resources/3d/sphere_shape_3d.h"
 #include "scene/resources/3d/world_boundary_shape_3d.h"
 #include "scene/resources/navigation_mesh.h"
-#include "servers/navigation_server_3d.h"
+#include "servers/navigation_3d/navigation_server_3d.h"
 
 Callable StaticBody3D::_navmesh_source_geometry_parsing_callback;
 RID StaticBody3D::_navmesh_source_geometry_parser;
diff --git a/scene/3d/xr/xr_body_modifier_3d.cpp b/scene/3d/xr/xr_body_modifier_3d.cpp
index 942af82c7a9..4d05f40a9d6 100644
--- a/scene/3d/xr/xr_body_modifier_3d.cpp
+++ b/scene/3d/xr/xr_body_modifier_3d.cpp
@@ -31,7 +31,7 @@
 #include "xr_body_modifier_3d.h"
 
 #include "scene/3d/skeleton_3d.h"
-#include "servers/xr_server.h"
+#include "servers/xr/xr_server.h"
 
 void XRBodyModifier3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_body_tracker", "tracker_name"), &XRBodyModifier3D::set_body_tracker);
diff --git a/scene/3d/xr/xr_face_modifier_3d.cpp b/scene/3d/xr/xr_face_modifier_3d.cpp
index 6b8580aaecc..df7c6b530dc 100644
--- a/scene/3d/xr/xr_face_modifier_3d.cpp
+++ b/scene/3d/xr/xr_face_modifier_3d.cpp
@@ -31,7 +31,7 @@
 #include "xr_face_modifier_3d.h"
 
 #include "servers/xr/xr_face_tracker.h"
-#include "servers/xr_server.h"
+#include "servers/xr/xr_server.h"
 
 // This method takes the name of a mesh blend shape and returns the
 // corresponding XRFaceTracker blend shape. If no match is
diff --git a/scene/3d/xr/xr_hand_modifier_3d.cpp b/scene/3d/xr/xr_hand_modifier_3d.cpp
index 5b59f3a0519..ac106373f50 100644
--- a/scene/3d/xr/xr_hand_modifier_3d.cpp
+++ b/scene/3d/xr/xr_hand_modifier_3d.cpp
@@ -31,7 +31,7 @@
 #include "xr_hand_modifier_3d.h"
 
 #include "core/config/project_settings.h"
-#include "servers/xr_server.h"
+#include "servers/xr/xr_server.h"
 
 void XRHandModifier3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_hand_tracker", "tracker_name"), &XRHandModifier3D::set_hand_tracker);
diff --git a/scene/animation/animation_mixer.cpp b/scene/animation/animation_mixer.cpp
index 06b3b800413..9185ceed872 100644
--- a/scene/animation/animation_mixer.cpp
+++ b/scene/animation/animation_mixer.cpp
@@ -38,8 +38,8 @@
 #include "scene/animation/animation_player.h"
 #include "scene/audio/audio_stream_player.h"
 #include "scene/resources/animation.h"
+#include "servers/audio/audio_server.h"
 #include "servers/audio/audio_stream.h"
-#include "servers/audio_server.h"
 
 #ifndef _3D_DISABLED
 #include "scene/3d/audio_stream_player_3d.h"
diff --git a/scene/audio/audio_stream_player.h b/scene/audio/audio_stream_player.h
index 8b19f903264..abaed688d1e 100644
--- a/scene/audio/audio_stream_player.h
+++ b/scene/audio/audio_stream_player.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "scene/main/node.h"
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 struct AudioFrame;
 class AudioStream;
diff --git a/scene/audio/audio_stream_player_internal.h b/scene/audio/audio_stream_player_internal.h
index 40f05959382..bd7075d8514 100644
--- a/scene/audio/audio_stream_player_internal.h
+++ b/scene/audio/audio_stream_player_internal.h
@@ -32,7 +32,7 @@
 
 #include "core/object/ref_counted.h"
 #include "core/templates/safe_refcount.h"
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 class AudioStream;
 class AudioStreamPlayback;
diff --git a/scene/debugger/scene_debugger.cpp b/scene/debugger/scene_debugger.cpp
index bb9d1d44d95..d921007dd33 100644
--- a/scene/debugger/scene_debugger.cpp
+++ b/scene/debugger/scene_debugger.cpp
@@ -45,7 +45,7 @@
 #include "scene/main/window.h"
 #include "scene/resources/packed_scene.h"
 #include "scene/theme/theme_db.h"
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 #ifndef PHYSICS_2D_DISABLED
 #include "scene/2d/physics/collision_object_2d.h"
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp
index 90c7581c9de..34cce502a7c 100644
--- a/scene/gui/control.cpp
+++ b/scene/gui/control.cpp
@@ -42,8 +42,8 @@
 #include "scene/main/window.h"
 #include "scene/theme/theme_db.h"
 #include "scene/theme/theme_owner.h"
-#include "servers/rendering_server.h"
-#include "servers/text_server.h"
+#include "servers/rendering/rendering_server.h"
+#include "servers/text/text_server.h"
 
 #ifdef TOOLS_ENABLED
 #include "editor/scene/gui/control_editor_plugin.h"
diff --git a/scene/gui/label.cpp b/scene/gui/label.cpp
index 420e0b26da5..d508e6d57df 100644
--- a/scene/gui/label.cpp
+++ b/scene/gui/label.cpp
@@ -32,7 +32,7 @@
 
 #include "scene/gui/container.h"
 #include "scene/theme/theme_db.h"
-#include "servers/text_server.h"
+#include "servers/text/text_server.h"
 
 void Label::set_autowrap_mode(TextServer::AutowrapMode p_mode) {
 	if (autowrap_mode == p_mode) {
diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp
index 818ac26ab3d..1f02092561e 100644
--- a/scene/gui/line_edit.cpp
+++ b/scene/gui/line_edit.cpp
@@ -38,8 +38,8 @@
 #include "scene/gui/label.h"
 #include "scene/main/window.h"
 #include "scene/theme/theme_db.h"
-#include "servers/display_server.h"
-#include "servers/text_server.h"
+#include "servers/display/display_server.h"
+#include "servers/text/text_server.h"
 
 #ifdef TOOLS_ENABLED
 #include "editor/settings/editor_settings.h"
diff --git a/scene/gui/nine_patch_rect.cpp b/scene/gui/nine_patch_rect.cpp
index 12addb4b2af..64e8c740747 100644
--- a/scene/gui/nine_patch_rect.cpp
+++ b/scene/gui/nine_patch_rect.cpp
@@ -30,7 +30,7 @@
 
 #include "nine_patch_rect.h"
 
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 void NinePatchRect::_notification(int p_what) {
 	switch (p_what) {
diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp
index c9fcae73914..120eba3ee5e 100644
--- a/scene/gui/rich_text_label.cpp
+++ b/scene/gui/rich_text_label.cpp
@@ -39,7 +39,7 @@
 #include "scene/gui/rich_text_effect.h"
 #include "scene/resources/atlas_texture.h"
 #include "scene/theme/theme_db.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 #include "modules/modules_enabled.gen.h" // For regex.
 #ifdef MODULE_REGEX_ENABLED
diff --git a/scene/gui/video_stream_player.cpp b/scene/gui/video_stream_player.cpp
index 92755577753..b08ee8cab59 100644
--- a/scene/gui/video_stream_player.cpp
+++ b/scene/gui/video_stream_player.cpp
@@ -31,7 +31,7 @@
 #include "video_stream_player.h"
 
 #include "core/os/os.h"
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 int VideoStreamPlayer::sp_get_channel_count() const {
 	if (playback.is_null()) {
diff --git a/scene/main/scene_tree.cpp b/scene/main/scene_tree.cpp
index 4c137004ecb..5f4044cf6b6 100644
--- a/scene/main/scene_tree.cpp
+++ b/scene/main/scene_tree.cpp
@@ -57,11 +57,11 @@
 #endif // _3D_DISABLED
 
 #ifndef PHYSICS_2D_DISABLED
-#include "servers/physics_server_2d.h"
+#include "servers/physics_2d/physics_server_2d.h"
 #endif // PHYSICS_2D_DISABLED
 
 #ifndef PHYSICS_3D_DISABLED
-#include "servers/physics_server_3d.h"
+#include "servers/physics_3d/physics_server_3d.h"
 #endif // PHYSICS_3D_DISABLED
 
 void SceneTreeTimer::_bind_methods() {
diff --git a/scene/main/status_indicator.h b/scene/main/status_indicator.h
index 80975f8da8d..bffb3997121 100644
--- a/scene/main/status_indicator.h
+++ b/scene/main/status_indicator.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "scene/main/node.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 class StatusIndicator : public Node {
 	GDCLASS(StatusIndicator, Node);
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index 0a05c055ac0..1dd6d570570 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -45,7 +45,7 @@
 #include "scene/resources/mesh.h"
 #include "scene/resources/text_line.h"
 #include "scene/resources/world_2d.h"
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 #include "servers/rendering/rendering_server_globals.h"
 
 // 2D.
diff --git a/scene/main/window.h b/scene/main/window.h
index 64d99a4ff82..25ce600e140 100644
--- a/scene/main/window.h
+++ b/scene/main/window.h
@@ -32,7 +32,7 @@
 
 #include "scene/main/viewport.h"
 #include "scene/resources/theme.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 class Font;
 class Shortcut;
diff --git a/scene/resources/2d/capsule_shape_2d.cpp b/scene/resources/2d/capsule_shape_2d.cpp
index 917cd86f195..fc621790c35 100644
--- a/scene/resources/2d/capsule_shape_2d.cpp
+++ b/scene/resources/2d/capsule_shape_2d.cpp
@@ -31,8 +31,8 @@
 #include "capsule_shape_2d.h"
 
 #include "core/math/geometry_2d.h"
-#include "servers/physics_server_2d.h"
-#include "servers/rendering_server.h"
+#include "servers/physics_2d/physics_server_2d.h"
+#include "servers/rendering/rendering_server.h"
 
 Vector<Vector2> CapsuleShape2D::_get_points() const {
 	Vector<Vector2> points;
diff --git a/scene/resources/2d/circle_shape_2d.cpp b/scene/resources/2d/circle_shape_2d.cpp
index 7fd3d118a10..8e86ae1f765 100644
--- a/scene/resources/2d/circle_shape_2d.cpp
+++ b/scene/resources/2d/circle_shape_2d.cpp
@@ -30,8 +30,8 @@
 
 #include "circle_shape_2d.h"
 
-#include "servers/physics_server_2d.h"
-#include "servers/rendering_server.h"
+#include "servers/physics_2d/physics_server_2d.h"
+#include "servers/rendering/rendering_server.h"
 
 bool CircleShape2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const {
 	return p_point.length() < get_radius() + p_tolerance;
diff --git a/scene/resources/2d/concave_polygon_shape_2d.cpp b/scene/resources/2d/concave_polygon_shape_2d.cpp
index c1673e79174..d551ed45438 100644
--- a/scene/resources/2d/concave_polygon_shape_2d.cpp
+++ b/scene/resources/2d/concave_polygon_shape_2d.cpp
@@ -31,8 +31,8 @@
 #include "concave_polygon_shape_2d.h"
 
 #include "core/math/geometry_2d.h"
-#include "servers/physics_server_2d.h"
-#include "servers/rendering_server.h"
+#include "servers/physics_2d/physics_server_2d.h"
+#include "servers/rendering/rendering_server.h"
 
 bool ConcavePolygonShape2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const {
 	Vector<Vector2> s = get_segments();
diff --git a/scene/resources/2d/convex_polygon_shape_2d.cpp b/scene/resources/2d/convex_polygon_shape_2d.cpp
index 0d9e570149d..a6b89de4a86 100644
--- a/scene/resources/2d/convex_polygon_shape_2d.cpp
+++ b/scene/resources/2d/convex_polygon_shape_2d.cpp
@@ -31,8 +31,8 @@
 #include "convex_polygon_shape_2d.h"
 
 #include "core/math/geometry_2d.h"
-#include "servers/physics_server_2d.h"
-#include "servers/rendering_server.h"
+#include "servers/physics_2d/physics_server_2d.h"
+#include "servers/rendering/rendering_server.h"
 
 bool ConvexPolygonShape2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const {
 	return Geometry2D::is_point_in_polygon(p_point, points);
diff --git a/scene/resources/2d/navigation_polygon.h b/scene/resources/2d/navigation_polygon.h
index 7c09e44f915..4b2532e6b37 100644
--- a/scene/resources/2d/navigation_polygon.h
+++ b/scene/resources/2d/navigation_polygon.h
@@ -32,7 +32,7 @@
 
 #include "scene/2d/node_2d.h"
 #include "scene/resources/navigation_mesh.h"
-#include "servers/navigation/navigation_globals.h"
+#include "servers/navigation_2d/navigation_constants_2d.h"
 
 class NavigationPolygon : public Resource {
 	GDCLASS(NavigationPolygon, Resource);
diff --git a/scene/resources/2d/rectangle_shape_2d.cpp b/scene/resources/2d/rectangle_shape_2d.cpp
index 624d3534616..1e6b339130e 100644
--- a/scene/resources/2d/rectangle_shape_2d.cpp
+++ b/scene/resources/2d/rectangle_shape_2d.cpp
@@ -30,8 +30,8 @@
 
 #include "rectangle_shape_2d.h"
 
-#include "servers/physics_server_2d.h"
-#include "servers/rendering_server.h"
+#include "servers/physics_2d/physics_server_2d.h"
+#include "servers/rendering/rendering_server.h"
 void RectangleShape2D::_update_shape() {
 	PhysicsServer2D::get_singleton()->shape_set_data(get_rid(), size * 0.5);
 	emit_changed();
diff --git a/scene/resources/2d/segment_shape_2d.cpp b/scene/resources/2d/segment_shape_2d.cpp
index 9b58306d95e..b8e9850ed87 100644
--- a/scene/resources/2d/segment_shape_2d.cpp
+++ b/scene/resources/2d/segment_shape_2d.cpp
@@ -31,8 +31,8 @@
 #include "segment_shape_2d.h"
 
 #include "core/math/geometry_2d.h"
-#include "servers/physics_server_2d.h"
-#include "servers/rendering_server.h"
+#include "servers/physics_2d/physics_server_2d.h"
+#include "servers/rendering/rendering_server.h"
 
 bool SegmentShape2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const {
 	Vector2 closest = Geometry2D::get_closest_point_to_segment(p_point, a, b);
diff --git a/scene/resources/2d/separation_ray_shape_2d.cpp b/scene/resources/2d/separation_ray_shape_2d.cpp
index 9a0ec9db559..801282003cf 100644
--- a/scene/resources/2d/separation_ray_shape_2d.cpp
+++ b/scene/resources/2d/separation_ray_shape_2d.cpp
@@ -30,8 +30,8 @@
 
 #include "separation_ray_shape_2d.h"
 
-#include "servers/physics_server_2d.h"
-#include "servers/rendering_server.h"
+#include "servers/physics_2d/physics_server_2d.h"
+#include "servers/rendering/rendering_server.h"
 
 void SeparationRayShape2D::_update_shape() {
 	Dictionary d;
diff --git a/scene/resources/2d/shape_2d.cpp b/scene/resources/2d/shape_2d.cpp
index fcadb9573e9..518556831a2 100644
--- a/scene/resources/2d/shape_2d.cpp
+++ b/scene/resources/2d/shape_2d.cpp
@@ -31,7 +31,7 @@
 #include "shape_2d.h"
 
 #include "core/config/project_settings.h"
-#include "servers/physics_server_2d.h"
+#include "servers/physics_2d/physics_server_2d.h"
 
 RID Shape2D::get_rid() const {
 	return shape;
diff --git a/scene/resources/2d/tile_set.cpp b/scene/resources/2d/tile_set.cpp
index c40a60afd89..58d5d8d7bb8 100644
--- a/scene/resources/2d/tile_set.cpp
+++ b/scene/resources/2d/tile_set.cpp
@@ -39,7 +39,7 @@
 #include "scene/resources/image_texture.h"
 
 #ifndef NAVIGATION_2D_DISABLED
-#include "servers/navigation_server_2d.h"
+#include "servers/navigation_2d/navigation_server_2d.h"
 #endif // NAVIGATION_2D_DISABLED
 
 /////////////////////////////// TileMapPattern //////////////////////////////////////
diff --git a/scene/resources/2d/world_boundary_shape_2d.cpp b/scene/resources/2d/world_boundary_shape_2d.cpp
index 276935da138..d229677df68 100644
--- a/scene/resources/2d/world_boundary_shape_2d.cpp
+++ b/scene/resources/2d/world_boundary_shape_2d.cpp
@@ -31,8 +31,8 @@
 #include "world_boundary_shape_2d.h"
 
 #include "core/math/geometry_2d.h"
-#include "servers/physics_server_2d.h"
-#include "servers/rendering_server.h"
+#include "servers/physics_2d/physics_server_2d.h"
+#include "servers/rendering/rendering_server.h"
 
 bool WorldBoundaryShape2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const {
 	const Vector2 shape_center = distance * normal;
diff --git a/scene/resources/3d/box_shape_3d.cpp b/scene/resources/3d/box_shape_3d.cpp
index afb03a8ba1d..7306b8133b7 100644
--- a/scene/resources/3d/box_shape_3d.cpp
+++ b/scene/resources/3d/box_shape_3d.cpp
@@ -31,7 +31,7 @@
 #include "box_shape_3d.h"
 
 #include "scene/resources/3d/primitive_meshes.h"
-#include "servers/physics_server_3d.h"
+#include "servers/physics_3d/physics_server_3d.h"
 
 Vector<Vector3> BoxShape3D::get_debug_mesh_lines() const {
 	Vector<Vector3> lines;
diff --git a/scene/resources/3d/capsule_shape_3d.cpp b/scene/resources/3d/capsule_shape_3d.cpp
index 2a7e36cf0fc..166848f5b2d 100644
--- a/scene/resources/3d/capsule_shape_3d.cpp
+++ b/scene/resources/3d/capsule_shape_3d.cpp
@@ -31,7 +31,7 @@
 #include "capsule_shape_3d.h"
 
 #include "scene/resources/3d/primitive_meshes.h"
-#include "servers/physics_server_3d.h"
+#include "servers/physics_3d/physics_server_3d.h"
 
 Vector<Vector3> CapsuleShape3D::get_debug_mesh_lines() const {
 	float c_radius = get_radius();
diff --git a/scene/resources/3d/concave_polygon_shape_3d.cpp b/scene/resources/3d/concave_polygon_shape_3d.cpp
index 1254cc43062..336a3a811dd 100644
--- a/scene/resources/3d/concave_polygon_shape_3d.cpp
+++ b/scene/resources/3d/concave_polygon_shape_3d.cpp
@@ -31,7 +31,7 @@
 #include "concave_polygon_shape_3d.h"
 
 #include "scene/resources/mesh.h"
-#include "servers/physics_server_3d.h"
+#include "servers/physics_3d/physics_server_3d.h"
 
 Vector<Vector3> ConcavePolygonShape3D::get_debug_mesh_lines() const {
 	HashSet<DrawEdge, DrawEdge> edges;
diff --git a/scene/resources/3d/convex_polygon_shape_3d.cpp b/scene/resources/3d/convex_polygon_shape_3d.cpp
index 302b8d37dfe..b9d807e710f 100644
--- a/scene/resources/3d/convex_polygon_shape_3d.cpp
+++ b/scene/resources/3d/convex_polygon_shape_3d.cpp
@@ -31,7 +31,7 @@
 #include "convex_polygon_shape_3d.h"
 #include "core/math/convex_hull.h"
 #include "scene/resources/mesh.h"
-#include "servers/physics_server_3d.h"
+#include "servers/physics_3d/physics_server_3d.h"
 
 Vector<Vector3> ConvexPolygonShape3D::get_debug_mesh_lines() const {
 	Vector<Vector3> poly_points = get_points();
diff --git a/scene/resources/3d/cylinder_shape_3d.cpp b/scene/resources/3d/cylinder_shape_3d.cpp
index 700ff5884dc..da2bf8aaf81 100644
--- a/scene/resources/3d/cylinder_shape_3d.cpp
+++ b/scene/resources/3d/cylinder_shape_3d.cpp
@@ -31,7 +31,7 @@
 #include "cylinder_shape_3d.h"
 
 #include "scene/resources/3d/primitive_meshes.h"
-#include "servers/physics_server_3d.h"
+#include "servers/physics_3d/physics_server_3d.h"
 
 Vector<Vector3> CylinderShape3D::get_debug_mesh_lines() const {
 	float c_radius = get_radius();
diff --git a/scene/resources/3d/height_map_shape_3d.cpp b/scene/resources/3d/height_map_shape_3d.cpp
index d396189d94c..5a643d1f1ce 100644
--- a/scene/resources/3d/height_map_shape_3d.cpp
+++ b/scene/resources/3d/height_map_shape_3d.cpp
@@ -32,7 +32,7 @@
 
 #include "core/io/image.h"
 #include "scene/resources/mesh.h"
-#include "servers/physics_server_3d.h"
+#include "servers/physics_3d/physics_server_3d.h"
 
 Vector<Vector3> HeightMapShape3D::get_debug_mesh_lines() const {
 	Vector<Vector3> points;
diff --git a/scene/resources/3d/mesh_library.h b/scene/resources/3d/mesh_library.h
index a3c86c59eb2..941000f9866 100644
--- a/scene/resources/3d/mesh_library.h
+++ b/scene/resources/3d/mesh_library.h
@@ -34,7 +34,7 @@
 #include "core/templates/rb_map.h"
 #include "scene/resources/mesh.h"
 #include "scene/resources/navigation_mesh.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 #ifndef PHYSICS_3D_DISABLED
 #include "shape_3d.h"
diff --git a/scene/resources/3d/primitive_meshes.cpp b/scene/resources/3d/primitive_meshes.cpp
index b49e3ba5430..f11175ef5a5 100644
--- a/scene/resources/3d/primitive_meshes.cpp
+++ b/scene/resources/3d/primitive_meshes.cpp
@@ -34,7 +34,7 @@
 #include "core/math/math_funcs.h"
 #include "scene/resources/theme.h"
 #include "scene/theme/theme_db.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 #include "thirdparty/misc/polypartition.h"
 
 #define PADDING_REF_SIZE 1024.0
diff --git a/scene/resources/3d/primitive_meshes.h b/scene/resources/3d/primitive_meshes.h
index 43699865e8d..94af2f4bab5 100644
--- a/scene/resources/3d/primitive_meshes.h
+++ b/scene/resources/3d/primitive_meshes.h
@@ -32,7 +32,7 @@
 
 #include "scene/resources/font.h"
 #include "scene/resources/mesh.h"
-#include "servers/text_server.h"
+#include "servers/text/text_server.h"
 
 ///@TODO probably should change a few integers to unsigned integers...
 
diff --git a/scene/resources/3d/separation_ray_shape_3d.cpp b/scene/resources/3d/separation_ray_shape_3d.cpp
index 55529be6245..4d3a3cc8955 100644
--- a/scene/resources/3d/separation_ray_shape_3d.cpp
+++ b/scene/resources/3d/separation_ray_shape_3d.cpp
@@ -31,7 +31,7 @@
 #include "separation_ray_shape_3d.h"
 
 #include "scene/resources/mesh.h"
-#include "servers/physics_server_3d.h"
+#include "servers/physics_3d/physics_server_3d.h"
 
 Vector<Vector3> SeparationRayShape3D::get_debug_mesh_lines() const {
 	Vector<Vector3> points = {
diff --git a/scene/resources/3d/shape_3d.cpp b/scene/resources/3d/shape_3d.cpp
index 64e27c40a26..0c8744b79dc 100644
--- a/scene/resources/3d/shape_3d.cpp
+++ b/scene/resources/3d/shape_3d.cpp
@@ -32,7 +32,7 @@
 
 #include "scene/main/scene_tree.h"
 #include "scene/resources/mesh.h"
-#include "servers/physics_server_3d.h"
+#include "servers/physics_3d/physics_server_3d.h"
 
 void Shape3D::add_vertices_to_array(Vector<Vector3> &array, const Transform3D &p_xform) {
 	Vector<Vector3> toadd = get_debug_mesh_lines();
diff --git a/scene/resources/3d/sphere_shape_3d.cpp b/scene/resources/3d/sphere_shape_3d.cpp
index 9ab2f1b0d8b..ba8a87d7027 100644
--- a/scene/resources/3d/sphere_shape_3d.cpp
+++ b/scene/resources/3d/sphere_shape_3d.cpp
@@ -31,7 +31,7 @@
 #include "sphere_shape_3d.h"
 
 #include "scene/resources/3d/primitive_meshes.h"
-#include "servers/physics_server_3d.h"
+#include "servers/physics_3d/physics_server_3d.h"
 
 Vector<Vector3> SphereShape3D::get_debug_mesh_lines() const {
 	float r = get_radius();
diff --git a/scene/resources/3d/world_3d.cpp b/scene/resources/3d/world_3d.cpp
index 42f200f838e..6c14ae334c6 100644
--- a/scene/resources/3d/world_3d.cpp
+++ b/scene/resources/3d/world_3d.cpp
@@ -35,7 +35,7 @@
 #include "scene/resources/camera_attributes.h"
 #include "scene/resources/environment.h"
 #ifndef NAVIGATION_3D_DISABLED
-#include "servers/navigation_server_3d.h"
+#include "servers/navigation_3d/navigation_server_3d.h"
 #endif // NAVIGATION_3D_DISABLED
 
 void World3D::_register_camera(Camera3D *p_camera) {
diff --git a/scene/resources/3d/world_3d.h b/scene/resources/3d/world_3d.h
index 71417cf4258..266f3ee9097 100644
--- a/scene/resources/3d/world_3d.h
+++ b/scene/resources/3d/world_3d.h
@@ -33,8 +33,9 @@
 #include "core/io/resource.h"
 #include "scene/resources/compositor.h"
 #include "scene/resources/environment.h"
+
 #ifndef PHYSICS_3D_DISABLED
-#include "servers/physics_server_3d.h"
+#include "servers/physics_3d/physics_server_3d.h"
 #endif // PHYSICS_3D_DISABLED
 
 class CameraAttributes;
diff --git a/scene/resources/3d/world_boundary_shape_3d.cpp b/scene/resources/3d/world_boundary_shape_3d.cpp
index 25f060aa973..9e951596007 100644
--- a/scene/resources/3d/world_boundary_shape_3d.cpp
+++ b/scene/resources/3d/world_boundary_shape_3d.cpp
@@ -31,7 +31,7 @@
 #include "world_boundary_shape_3d.h"
 
 #include "scene/resources/mesh.h"
-#include "servers/physics_server_3d.h"
+#include "servers/physics_3d/physics_server_3d.h"
 
 Vector<Vector3> WorldBoundaryShape3D::get_debug_mesh_lines() const {
 	Plane p = get_plane();
diff --git a/scene/resources/audio_stream_polyphonic.cpp b/scene/resources/audio_stream_polyphonic.cpp
index da9de3a5fdf..99005bb38c4 100644
--- a/scene/resources/audio_stream_polyphonic.cpp
+++ b/scene/resources/audio_stream_polyphonic.cpp
@@ -31,7 +31,7 @@
 #include "audio_stream_polyphonic.h"
 #include "audio_stream_polyphonic.compat.inc"
 
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 constexpr uint64_t ID_MASK = 0xFFFFFFFF;
 constexpr uint64_t INDEX_SHIFT = 32;
diff --git a/scene/resources/audio_stream_polyphonic.h b/scene/resources/audio_stream_polyphonic.h
index 78ddf9e0bfc..f720cb406bc 100644
--- a/scene/resources/audio_stream_polyphonic.h
+++ b/scene/resources/audio_stream_polyphonic.h
@@ -32,8 +32,8 @@
 
 #include "core/templates/local_vector.h"
 #include "scene/scene_string_names.h"
+#include "servers/audio/audio_server.h"
 #include "servers/audio/audio_stream.h"
-#include "servers/audio_server.h"
 
 class AudioStreamPolyphonic : public AudioStream {
 	GDCLASS(AudioStreamPolyphonic, AudioStream)
diff --git a/scene/resources/camera_attributes.cpp b/scene/resources/camera_attributes.cpp
index 9a48544a979..33e9cdaacec 100644
--- a/scene/resources/camera_attributes.cpp
+++ b/scene/resources/camera_attributes.cpp
@@ -31,7 +31,7 @@
 #include "camera_attributes.h"
 
 #include "core/config/project_settings.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 void CameraAttributes::set_exposure_multiplier(float p_multiplier) {
 	exposure_multiplier = p_multiplier;
diff --git a/scene/resources/compositor.cpp b/scene/resources/compositor.cpp
index e02bae08363..1f6ea53a2d1 100644
--- a/scene/resources/compositor.cpp
+++ b/scene/resources/compositor.cpp
@@ -30,7 +30,7 @@
 
 #include "compositor.h"
 
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 /* Compositor Effect */
 
diff --git a/scene/resources/environment.cpp b/scene/resources/environment.cpp
index 6a457c65807..979adca4a93 100644
--- a/scene/resources/environment.cpp
+++ b/scene/resources/environment.cpp
@@ -32,7 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "scene/resources/gradient_texture.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 RID Environment::get_rid() const {
 	return environment;
diff --git a/scene/resources/font.h b/scene/resources/font.h
index 52cf8036e68..843ba2d9f80 100644
--- a/scene/resources/font.h
+++ b/scene/resources/font.h
@@ -33,7 +33,7 @@
 #include "core/io/resource.h"
 #include "core/templates/lru.h"
 #include "scene/resources/texture.h"
-#include "servers/text_server.h"
+#include "servers/text/text_server.h"
 
 class TextLine;
 class TextParagraph;
diff --git a/scene/resources/material.h b/scene/resources/material.h
index 0e99015c41c..c355dc2c0b8 100644
--- a/scene/resources/material.h
+++ b/scene/resources/material.h
@@ -34,7 +34,7 @@
 #include "core/templates/self_list.h"
 #include "scene/resources/shader.h"
 #include "scene/resources/texture.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 class Material : public Resource {
 	GDCLASS(Material, Resource);
diff --git a/scene/resources/mesh.h b/scene/resources/mesh.h
index f0915aa0524..23818244795 100644
--- a/scene/resources/mesh.h
+++ b/scene/resources/mesh.h
@@ -34,7 +34,7 @@
 #include "core/math/face3.h"
 #include "core/math/triangle_mesh.h"
 #include "scene/resources/material.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 #ifndef PHYSICS_3D_DISABLED
 #include "scene/resources/3d/shape_3d.h"
diff --git a/scene/resources/multimesh.cpp b/scene/resources/multimesh.cpp
index 2c65307a577..8cf68c1e61d 100644
--- a/scene/resources/multimesh.cpp
+++ b/scene/resources/multimesh.cpp
@@ -30,7 +30,7 @@
 
 #include "multimesh.h"
 
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 #ifndef DISABLE_DEPRECATED
 // Kept for compatibility from 3.x to 4.0.
diff --git a/scene/resources/multimesh.h b/scene/resources/multimesh.h
index 8083390cf1e..1545b454e63 100644
--- a/scene/resources/multimesh.h
+++ b/scene/resources/multimesh.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "scene/resources/mesh.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 class MultiMesh : public Resource {
 	GDCLASS(MultiMesh, Resource);
diff --git a/scene/resources/navigation_mesh.cpp b/scene/resources/navigation_mesh.cpp
index 43be579f891..77fef549d31 100644
--- a/scene/resources/navigation_mesh.cpp
+++ b/scene/resources/navigation_mesh.cpp
@@ -31,7 +31,7 @@
 #include "navigation_mesh.h"
 
 #ifdef DEBUG_ENABLED
-#include "servers/navigation_server_3d.h"
+#include "servers/navigation_3d/navigation_server_3d.h"
 #endif // DEBUG_ENABLED
 
 void NavigationMesh::create_from_mesh(const Ref<Mesh> &p_mesh) {
diff --git a/scene/resources/navigation_mesh.h b/scene/resources/navigation_mesh.h
index 75ccdc5a804..c559aeca5b6 100644
--- a/scene/resources/navigation_mesh.h
+++ b/scene/resources/navigation_mesh.h
@@ -32,7 +32,7 @@
 
 #include "core/os/rw_lock.h"
 #include "scene/resources/mesh.h"
-#include "servers/navigation/navigation_globals.h"
+#include "servers/navigation_3d/navigation_constants_3d.h"
 
 class NavigationMesh : public Resource {
 	GDCLASS(NavigationMesh, Resource);
diff --git a/scene/resources/shader.cpp b/scene/resources/shader.cpp
index 5521661eff6..dc07ce7bb5e 100644
--- a/scene/resources/shader.cpp
+++ b/scene/resources/shader.cpp
@@ -33,9 +33,9 @@
 
 #include "core/io/file_access.h"
 #include "scene/main/scene_tree.h"
+#include "servers/rendering/rendering_server.h"
 #include "servers/rendering/shader_language.h"
 #include "servers/rendering/shader_preprocessor.h"
-#include "servers/rendering_server.h"
 #include "texture.h"
 
 #ifdef TOOLS_ENABLED
diff --git a/scene/resources/style_box_flat.cpp b/scene/resources/style_box_flat.cpp
index 3562f6641f7..32bdc24df7a 100644
--- a/scene/resources/style_box_flat.cpp
+++ b/scene/resources/style_box_flat.cpp
@@ -32,7 +32,7 @@
 
 #include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 float StyleBoxFlat::get_style_margin(Side p_side) const {
 	ERR_FAIL_INDEX_V((int)p_side, 4, 0.0);
diff --git a/scene/resources/style_box_line.cpp b/scene/resources/style_box_line.cpp
index 3016502bba1..77726d62ebd 100644
--- a/scene/resources/style_box_line.cpp
+++ b/scene/resources/style_box_line.cpp
@@ -30,7 +30,7 @@
 
 #include "style_box_line.h"
 
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 float StyleBoxLine::get_style_margin(Side p_side) const {
 	ERR_FAIL_INDEX_V((int)p_side, 4, 0);
diff --git a/scene/resources/text_line.h b/scene/resources/text_line.h
index cfc86892d75..23b0fe2633d 100644
--- a/scene/resources/text_line.h
+++ b/scene/resources/text_line.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "scene/resources/font.h"
-#include "servers/text_server.h"
+#include "servers/text/text_server.h"
 
 /*************************************************************************/
 
diff --git a/scene/resources/text_paragraph.h b/scene/resources/text_paragraph.h
index 5e1e6a7353f..2a262ae0e5b 100644
--- a/scene/resources/text_paragraph.h
+++ b/scene/resources/text_paragraph.h
@@ -32,7 +32,7 @@
 
 #include "core/templates/local_vector.h"
 #include "scene/resources/font.h"
-#include "servers/text_server.h"
+#include "servers/text/text_server.h"
 
 /*************************************************************************/
 
diff --git a/scene/resources/texture.h b/scene/resources/texture.h
index 915e3ca2007..33bdf9e4c5e 100644
--- a/scene/resources/texture.h
+++ b/scene/resources/texture.h
@@ -34,8 +34,8 @@
 #include "core/math/rect2.h"
 #include "scene/resources/curve.h"
 #include "scene/resources/gradient.h"
-#include "servers/camera_server.h"
-#include "servers/rendering_server.h"
+#include "servers/camera/camera_server.h"
+#include "servers/rendering/rendering_server.h"
 
 class Texture : public Resource {
 	GDCLASS(Texture, Resource);
diff --git a/scene/resources/world_2d.cpp b/scene/resources/world_2d.cpp
index 6cad1b9b407..1906e06074b 100644
--- a/scene/resources/world_2d.cpp
+++ b/scene/resources/world_2d.cpp
@@ -32,10 +32,10 @@
 
 #include "core/config/project_settings.h"
 #include "scene/2d/visible_on_screen_notifier_2d.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 #ifndef NAVIGATION_2D_DISABLED
-#include "servers/navigation_server_2d.h"
+#include "servers/navigation_2d/navigation_server_2d.h"
 #endif // NAVIGATION_2D_DISABLED
 
 RID World2D::get_canvas() const {
diff --git a/scene/resources/world_2d.h b/scene/resources/world_2d.h
index fd93c884a2e..c95d3dbde8c 100644
--- a/scene/resources/world_2d.h
+++ b/scene/resources/world_2d.h
@@ -33,7 +33,7 @@
 #include "core/io/resource.h"
 
 #ifndef PHYSICS_2D_DISABLED
-#include "servers/physics_server_2d.h"
+#include "servers/physics_2d/physics_server_2d.h"
 #endif // PHYSICS_2D_DISABLED
 
 class VisibleOnScreenNotifier2D;
diff --git a/scene/theme/default_theme.cpp b/scene/theme/default_theme.cpp
index e77e33cf02f..6d9a06b7139 100644
--- a/scene/theme/default_theme.cpp
+++ b/scene/theme/default_theme.cpp
@@ -41,7 +41,7 @@
 #include "scene/scene_string_names.h"
 #include "scene/theme/default_theme_icons.gen.h"
 #include "scene/theme/theme_db.h"
-#include "servers/text_server.h"
+#include "servers/text/text_server.h"
 
 #ifdef BROTLI_ENABLED
 #include "scene/theme/default_font.gen.h"
diff --git a/scene/theme/theme_db.cpp b/scene/theme/theme_db.cpp
index 7ceb89aa59c..f0cf9393ddf 100644
--- a/scene/theme/theme_db.cpp
+++ b/scene/theme/theme_db.cpp
@@ -39,7 +39,7 @@
 #include "scene/resources/style_box.h"
 #include "scene/resources/texture.h"
 #include "scene/theme/default_theme.h"
-#include "servers/text_server.h"
+#include "servers/text/text_server.h"
 
 // Default engine theme creation and configuration.
 
diff --git a/scu_builders.py b/scu_builders.py
index 0a98d85ded0..3efb8bf3438 100644
--- a/scu_builders.py
+++ b/scu_builders.py
@@ -386,7 +386,8 @@ def generate_scu_files(max_includes_per_scu):
     process_folder(["servers/rendering/renderer_rd/forward_mobile"])
     process_folder(["servers/audio"])
     process_folder(["servers/audio/effects"])
-    process_folder(["servers/navigation"])
+    process_folder(["servers/navigation_2d"])
+    process_folder(["servers/navigation_3d"])
     process_folder(["servers/xr"])
 
     # Finally change back the path to the calling folder
diff --git a/servers/SCsub b/servers/SCsub
index 88fddce580a..a2ee659f35f 100644
--- a/servers/SCsub
+++ b/servers/SCsub
@@ -5,35 +5,26 @@ Import("env")
 
 env.servers_sources = []
 
-env.add_source_files(env.servers_sources, "audio_server.cpp")
-env.add_source_files(env.servers_sources, "camera_server.cpp")
-env.add_source_files(env.servers_sources, "display_server.cpp")
-env.add_source_files(env.servers_sources, "navigation_server_2d.cpp")
-env.add_source_files(env.servers_sources, "navigation_server_3d.cpp")
 env.add_source_files(env.servers_sources, "register_server_types.cpp")
-env.add_source_files(env.servers_sources, "rendering_server.cpp")
-env.add_source_files(env.servers_sources, "text_server.cpp")
 
 SConscript("audio/SCsub")
 SConscript("camera/SCsub")
 SConscript("debugger/SCsub")
 SConscript("display/SCsub")
-SConscript("extensions/SCsub")
 SConscript("movie_writer/SCsub")
-SConscript("navigation/SCsub")
 SConscript("rendering/SCsub")
 SConscript("text/SCsub")
 
+if not env["disable_navigation_2d"]:
+    SConscript("navigation_2d/SCsub")
 if not env["disable_physics_2d"]:
-    env.add_source_files(env.servers_sources, "physics_server_2d.cpp")
-    env.add_source_files(env.servers_sources, "physics_server_2d_wrap_mt.cpp")
+    SConscript("physics_2d/SCsub")
 
+if not env["disable_navigation_3d"]:
+    SConscript("navigation_3d/SCsub")
 if not env["disable_physics_3d"]:
-    env.add_source_files(env.servers_sources, "physics_server_3d.cpp")
-    env.add_source_files(env.servers_sources, "physics_server_3d_wrap_mt.cpp")
-
+    SConscript("physics_3d/SCsub")
 if not env["disable_xr"]:
-    env.add_source_files(env.servers_sources, "xr_server.cpp")
     SConscript("xr/SCsub")
 
 lib = env.add_library("servers", env.servers_sources)
diff --git a/servers/audio/audio_driver_dummy.h b/servers/audio/audio_driver_dummy.h
index af60aa10a43..a3fdbe7d425 100644
--- a/servers/audio/audio_driver_dummy.h
+++ b/servers/audio/audio_driver_dummy.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 #include "core/os/mutex.h"
 #include "core/os/thread.h"
diff --git a/servers/audio_server.cpp b/servers/audio/audio_server.cpp
similarity index 100%
rename from servers/audio_server.cpp
rename to servers/audio/audio_server.cpp
diff --git a/servers/audio_server.h b/servers/audio/audio_server.h
similarity index 100%
rename from servers/audio_server.h
rename to servers/audio/audio_server.h
diff --git a/servers/audio/audio_stream.h b/servers/audio/audio_stream.h
index aa7edbb0da4..0d6cf076c1a 100644
--- a/servers/audio/audio_stream.h
+++ b/servers/audio/audio_stream.h
@@ -32,7 +32,7 @@
 
 #include "core/io/resource.h"
 #include "scene/property_list_helper.h"
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 #include "core/object/gdvirtual.gen.inc"
 #include "core/variant/native_ptr.h"
diff --git a/servers/audio/effects/audio_effect_capture.cpp b/servers/audio/effects/audio_effect_capture.cpp
index 3663aa04134..ecc0bd9383b 100644
--- a/servers/audio/effects/audio_effect_capture.cpp
+++ b/servers/audio/effects/audio_effect_capture.cpp
@@ -30,7 +30,7 @@
 
 #include "audio_effect_capture.h"
 
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 bool AudioEffectCapture::can_get_buffer(int p_frames) const {
 	return buffer.data_left() >= p_frames;
diff --git a/servers/audio/effects/audio_effect_chorus.cpp b/servers/audio/effects/audio_effect_chorus.cpp
index 7f19dfab3e7..99f40c0f6b5 100644
--- a/servers/audio/effects/audio_effect_chorus.cpp
+++ b/servers/audio/effects/audio_effect_chorus.cpp
@@ -30,7 +30,7 @@
 
 #include "audio_effect_chorus.h"
 #include "core/math/math_funcs.h"
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 void AudioEffectChorusInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
 	int todo = p_frame_count;
diff --git a/servers/audio/effects/audio_effect_compressor.cpp b/servers/audio/effects/audio_effect_compressor.cpp
index 7f7330e14ee..694b423a018 100644
--- a/servers/audio/effects/audio_effect_compressor.cpp
+++ b/servers/audio/effects/audio_effect_compressor.cpp
@@ -29,7 +29,7 @@
 /**************************************************************************/
 
 #include "audio_effect_compressor.h"
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 void AudioEffectCompressorInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
 	float threshold = Math::db_to_linear(base->threshold);
diff --git a/servers/audio/effects/audio_effect_delay.cpp b/servers/audio/effects/audio_effect_delay.cpp
index 6ab30b06828..7f4848ce890 100644
--- a/servers/audio/effects/audio_effect_delay.cpp
+++ b/servers/audio/effects/audio_effect_delay.cpp
@@ -31,7 +31,7 @@
 #include "audio_effect_delay.h"
 
 #include "core/math/math_funcs.h"
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 void AudioEffectDelayInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
 	int todo = p_frame_count;
diff --git a/servers/audio/effects/audio_effect_distortion.cpp b/servers/audio/effects/audio_effect_distortion.cpp
index 8a3e8bdadb4..8cd99abacbd 100644
--- a/servers/audio/effects/audio_effect_distortion.cpp
+++ b/servers/audio/effects/audio_effect_distortion.cpp
@@ -30,7 +30,7 @@
 
 #include "audio_effect_distortion.h"
 #include "core/math/math_funcs.h"
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 void AudioEffectDistortionInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
 	const float *src = (const float *)p_src_frames;
diff --git a/servers/audio/effects/audio_effect_eq.cpp b/servers/audio/effects/audio_effect_eq.cpp
index 59032f99d80..dfa463feb66 100644
--- a/servers/audio/effects/audio_effect_eq.cpp
+++ b/servers/audio/effects/audio_effect_eq.cpp
@@ -30,7 +30,7 @@
 
 #include "audio_effect_eq.h"
 
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 void AudioEffectEQInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
 	int band_count = bands[0].size();
diff --git a/servers/audio/effects/audio_effect_filter.cpp b/servers/audio/effects/audio_effect_filter.cpp
index cd2839044f4..cd393d65534 100644
--- a/servers/audio/effects/audio_effect_filter.cpp
+++ b/servers/audio/effects/audio_effect_filter.cpp
@@ -29,7 +29,7 @@
 /**************************************************************************/
 
 #include "audio_effect_filter.h"
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 template <int S>
 void AudioEffectFilterInstance::_process_filter(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
diff --git a/servers/audio/effects/audio_effect_hard_limiter.cpp b/servers/audio/effects/audio_effect_hard_limiter.cpp
index 5be496c3d95..213dbf08819 100644
--- a/servers/audio/effects/audio_effect_hard_limiter.cpp
+++ b/servers/audio/effects/audio_effect_hard_limiter.cpp
@@ -30,7 +30,7 @@
 
 #include "audio_effect_hard_limiter.h"
 
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 void AudioEffectHardLimiterInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
 	float sample_rate = AudioServer::get_singleton()->get_mix_rate();
diff --git a/servers/audio/effects/audio_effect_phaser.cpp b/servers/audio/effects/audio_effect_phaser.cpp
index 8edf1c774c6..699d772b075 100644
--- a/servers/audio/effects/audio_effect_phaser.cpp
+++ b/servers/audio/effects/audio_effect_phaser.cpp
@@ -29,7 +29,7 @@
 /**************************************************************************/
 
 #include "audio_effect_phaser.h"
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 void AudioEffectPhaserInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
 	float sampling_rate = AudioServer::get_singleton()->get_mix_rate();
diff --git a/servers/audio/effects/audio_effect_pitch_shift.cpp b/servers/audio/effects/audio_effect_pitch_shift.cpp
index 9220be7a527..6b7c406e416 100644
--- a/servers/audio/effects/audio_effect_pitch_shift.cpp
+++ b/servers/audio/effects/audio_effect_pitch_shift.cpp
@@ -31,7 +31,7 @@
 #include "audio_effect_pitch_shift.h"
 
 #include "core/math/math_funcs.h"
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 /* Thirdparty code, so disable clang-format with Godot style */
 /* clang-format off */
diff --git a/servers/audio/effects/audio_effect_record.h b/servers/audio/effects/audio_effect_record.h
index 50c105e8932..088c03bce6a 100644
--- a/servers/audio/effects/audio_effect_record.h
+++ b/servers/audio/effects/audio_effect_record.h
@@ -33,7 +33,7 @@
 #include "core/os/thread.h"
 #include "scene/resources/audio_stream_wav.h"
 #include "servers/audio/audio_effect.h"
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 class AudioEffectRecord;
 
diff --git a/servers/audio/effects/audio_effect_reverb.cpp b/servers/audio/effects/audio_effect_reverb.cpp
index 06d890fb58f..d77b8bbeb7d 100644
--- a/servers/audio/effects/audio_effect_reverb.cpp
+++ b/servers/audio/effects/audio_effect_reverb.cpp
@@ -29,7 +29,9 @@
 /**************************************************************************/
 
 #include "audio_effect_reverb.h"
-#include "servers/audio_server.h"
+
+#include "servers/audio/audio_server.h"
+
 void AudioEffectReverbInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
 	for (int i = 0; i < 2; i++) {
 		Reverb &r = reverb[i];
diff --git a/servers/audio/effects/audio_effect_spectrum_analyzer.cpp b/servers/audio/effects/audio_effect_spectrum_analyzer.cpp
index 208a7b8e759..2bc3cbc43d9 100644
--- a/servers/audio/effects/audio_effect_spectrum_analyzer.cpp
+++ b/servers/audio/effects/audio_effect_spectrum_analyzer.cpp
@@ -29,7 +29,7 @@
 /**************************************************************************/
 
 #include "audio_effect_spectrum_analyzer.h"
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 static void smbFft(float *fftBuffer, long fftFrameSize, long sign)
 /*
diff --git a/servers/audio/effects/audio_effect_stereo_enhance.cpp b/servers/audio/effects/audio_effect_stereo_enhance.cpp
index f32904036b8..93559d25566 100644
--- a/servers/audio/effects/audio_effect_stereo_enhance.cpp
+++ b/servers/audio/effects/audio_effect_stereo_enhance.cpp
@@ -30,7 +30,7 @@
 
 #include "audio_effect_stereo_enhance.h"
 
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 void AudioEffectStereoEnhanceInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
 	float intensity = base->pan_pullout;
diff --git a/servers/camera/camera_feed.cpp b/servers/camera/camera_feed.cpp
index 4cb6062371e..1b6bd6da748 100644
--- a/servers/camera/camera_feed.cpp
+++ b/servers/camera/camera_feed.cpp
@@ -30,7 +30,7 @@
 
 #include "camera_feed.h"
 
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 void CameraFeed::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_id"), &CameraFeed::get_id);
diff --git a/servers/camera/camera_feed.h b/servers/camera/camera_feed.h
index 33bc3a6c323..73725f233a1 100644
--- a/servers/camera/camera_feed.h
+++ b/servers/camera/camera_feed.h
@@ -32,7 +32,7 @@
 
 #include "core/io/image.h"
 #include "core/math/transform_2d.h"
-#include "servers/camera_server.h"
+#include "servers/camera/camera_server.h"
 
 /**
 	The camera server is a singleton object that gives access to the various
diff --git a/servers/camera_server.cpp b/servers/camera/camera_server.cpp
similarity index 99%
rename from servers/camera_server.cpp
rename to servers/camera/camera_server.cpp
index c23f2020d03..a44929c0c7c 100644
--- a/servers/camera_server.cpp
+++ b/servers/camera/camera_server.cpp
@@ -29,9 +29,10 @@
 /**************************************************************************/
 
 #include "camera_server.h"
+
 #include "core/variant/typed_array.h"
-#include "rendering_server.h"
 #include "servers/camera/camera_feed.h"
+#include "servers/rendering/rendering_server.h"
 
 ////////////////////////////////////////////////////////
 // CameraServer
diff --git a/servers/camera_server.h b/servers/camera/camera_server.h
similarity index 100%
rename from servers/camera_server.h
rename to servers/camera/camera_server.h
diff --git a/servers/debugger/servers_debugger.cpp b/servers/debugger/servers_debugger.cpp
index f8dbde0eddc..2ea19ca5282 100644
--- a/servers/debugger/servers_debugger.cpp
+++ b/servers/debugger/servers_debugger.cpp
@@ -35,7 +35,7 @@
 #include "core/debugger/engine_profiler.h"
 #include "core/io/resource_loader.h"
 #include "core/object/script_language.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 #define CHECK_SIZE(arr, expected, what) ERR_FAIL_COND_V_MSG((uint32_t)arr.size() < (uint32_t)(expected), false, String("Malformed ") + what + " message from script debugger, message too short. Expected size: " + itos(expected) + ", actual size: " + itos(arr.size()))
 #define CHECK_END(arr, expected, what) ERR_FAIL_COND_V_MSG((uint32_t)arr.size() > (uint32_t)expected, false, String("Malformed ") + what + " message from script debugger, message too long. Expected size: " + itos(expected) + ", actual size: " + itos(arr.size()))
diff --git a/servers/debugger/servers_debugger.h b/servers/debugger/servers_debugger.h
index 0eb4a279582..5803dc09f82 100644
--- a/servers/debugger/servers_debugger.h
+++ b/servers/debugger/servers_debugger.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 class ServersDebugger {
 public:
diff --git a/servers/display_server.compat.inc b/servers/display/display_server.compat.inc
similarity index 100%
rename from servers/display_server.compat.inc
rename to servers/display/display_server.compat.inc
diff --git a/servers/display_server.cpp b/servers/display/display_server.cpp
similarity index 99%
rename from servers/display_server.cpp
rename to servers/display/display_server.cpp
index 8cc87889b63..66048a2e171 100644
--- a/servers/display_server.cpp
+++ b/servers/display/display_server.cpp
@@ -33,7 +33,7 @@
 
 #include "core/input/input.h"
 #include "scene/resources/texture.h"
-#include "servers/display_server_headless.h"
+#include "servers/display/display_server_headless.h"
 
 #if defined(VULKAN_ENABLED)
 #include "drivers/vulkan/rendering_context_driver_vulkan.h"
diff --git a/servers/display_server.h b/servers/display/display_server.h
similarity index 99%
rename from servers/display_server.h
rename to servers/display/display_server.h
index 3b3fab91ccc..db86daa803c 100644
--- a/servers/display_server.h
+++ b/servers/display/display_server.h
@@ -35,8 +35,7 @@
 #include "core/io/resource.h"
 #include "core/os/os.h"
 #include "core/variant/callable.h"
-
-#include "display/native_menu.h"
+#include "servers/display/native_menu.h"
 
 class Texture2D;
 class AccessibilityDriver;
diff --git a/servers/display_server_headless.h b/servers/display/display_server_headless.h
similarity index 99%
rename from servers/display_server_headless.h
rename to servers/display/display_server_headless.h
index aae4602b38d..eb06dff0e9f 100644
--- a/servers/display_server_headless.h
+++ b/servers/display/display_server_headless.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 #include "servers/rendering/dummy/rasterizer_dummy.h"
 
diff --git a/servers/extensions/SCsub b/servers/extensions/SCsub
deleted file mode 100644
index e7bb57e9f3f..00000000000
--- a/servers/extensions/SCsub
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env python
-from misc.utility.scons_hints import *
-
-Import("env")
-
-env_object = env.Clone()
-
-env_object.add_source_files(env.servers_sources, "physics_server_2d_extension.cpp")
-
-if not env["disable_3d"]:
-    env_object.add_source_files(env.servers_sources, "physics_server_3d_extension.cpp")
diff --git a/servers/movie_writer/movie_writer.cpp b/servers/movie_writer/movie_writer.cpp
index bba7c56c9f9..83ac15fc40e 100644
--- a/servers/movie_writer/movie_writer.cpp
+++ b/servers/movie_writer/movie_writer.cpp
@@ -34,8 +34,8 @@
 #include "core/os/time.h"
 #include "scene/main/window.h"
 #include "servers/audio/audio_driver_dummy.h"
-#include "servers/display_server.h"
-#include "servers/rendering_server.h"
+#include "servers/display/display_server.h"
+#include "servers/rendering/rendering_server.h"
 
 MovieWriter *MovieWriter::writers[MovieWriter::MAX_WRITERS];
 uint32_t MovieWriter::writer_count = 0;
diff --git a/servers/movie_writer/movie_writer.h b/servers/movie_writer/movie_writer.h
index 29d5a82c621..f218221f9d8 100644
--- a/servers/movie_writer/movie_writer.h
+++ b/servers/movie_writer/movie_writer.h
@@ -32,7 +32,7 @@
 
 #include "core/io/image.h"
 #include "core/templates/local_vector.h"
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server.h"
 
 class MovieWriter : public Object {
 	GDCLASS(MovieWriter, Object);
diff --git a/servers/navigation/nav_heap.h b/servers/nav_heap.h
similarity index 98%
rename from servers/navigation/nav_heap.h
rename to servers/nav_heap.h
index 483c7058721..e2917a8aee6 100644
--- a/servers/navigation/nav_heap.h
+++ b/servers/nav_heap.h
@@ -32,6 +32,8 @@
 
 #include "core/templates/local_vector.h"
 
+// This file contains Heap which is used by both 2D and 3D navigation.
+
 template <typename T>
 struct NoopIndexer {
 	void operator()(const T &p_value, uint32_t p_index) {}
diff --git a/servers/navigation/SCsub b/servers/navigation/SCsub
deleted file mode 100644
index 57335c928fa..00000000000
--- a/servers/navigation/SCsub
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env python
-from misc.utility.scons_hints import *
-
-Import("env")
-
-if not env["disable_navigation_2d"]:
-    env.add_source_files(env.servers_sources, "navigation_path_query_parameters_2d.cpp")
-    env.add_source_files(env.servers_sources, "navigation_path_query_result_2d.cpp")
-
-if not env["disable_navigation_3d"]:
-    env.add_source_files(env.servers_sources, "navigation_path_query_parameters_3d.cpp")
-    env.add_source_files(env.servers_sources, "navigation_path_query_result_3d.cpp")
diff --git a/servers/navigation_2d/SCsub b/servers/navigation_2d/SCsub
new file mode 100644
index 00000000000..98f918b2458
--- /dev/null
+++ b/servers/navigation_2d/SCsub
@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+from misc.utility.scons_hints import *
+
+Import("env")
+
+env.add_source_files(env.servers_sources, "*.cpp")
diff --git a/servers/navigation/navigation_utilities.h b/servers/navigation_2d/navigation_constants_2d.h
similarity index 73%
rename from servers/navigation/navigation_utilities.h
rename to servers/navigation_2d/navigation_constants_2d.h
index c13dcc0f250..37663932ab5 100644
--- a/servers/navigation/navigation_utilities.h
+++ b/servers/navigation_2d/navigation_constants_2d.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  navigation_utilities.h                                                */
+/*  navigation_constants_2d.h                                             */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -30,10 +30,7 @@
 
 #pragma once
 
-#include "core/math/vector3.h"
-#include "core/variant/typed_array.h"
-
-namespace NavigationUtilities {
+namespace NavigationEnums2D {
 
 enum PathfindingAlgorithm {
 	PATHFINDING_ALGORITHM_ASTAR = 0,
@@ -58,4 +55,30 @@ enum PathMetadataFlags {
 	PATH_INCLUDE_ALL = PATH_INCLUDE_TYPES | PATH_INCLUDE_RIDS | PATH_INCLUDE_OWNERS
 };
 
-} //namespace NavigationUtilities
+} //namespace NavigationEnums2D
+
+namespace NavigationDefaults2D {
+
+// Rasterization.
+
+// Same as in 3D but larger since 1px is treated as 1m.
+constexpr float NAV_MESH_CELL_SIZE = 1.0f; // Must match ProjectSettings default 2D cell_size.
+constexpr float NAV_MESH_CELL_SIZE_MIN = 0.01f;
+constexpr const char *const NAV_MESH_CELL_SIZE_HINT = "0.001,100,0.001,or_greater";
+
+// Map.
+
+constexpr float EDGE_CONNECTION_MARGIN = 1.0f;
+constexpr float LINK_CONNECTION_RADIUS = 4.0f;
+constexpr int path_search_max_polygons = 4096;
+
+// Agent.
+
+constexpr float AVOIDANCE_AGENT_RADIUS = 10.0;
+constexpr float AVOIDANCE_AGENT_MAX_SPEED = 100.0;
+constexpr float AVOIDANCE_AGENT_TIME_HORIZON_AGENTS = 1.0;
+constexpr float AVOIDANCE_AGENT_TIME_HORIZON_OBSTACLES = 0.0;
+constexpr int AVOIDANCE_AGENT_MAX_NEIGHBORS = 10;
+constexpr float AVOIDANCE_AGENT_NEIGHBOR_DISTANCE = 500.0;
+
+} //namespace NavigationDefaults2D
diff --git a/servers/navigation/navigation_path_query_parameters_2d.cpp b/servers/navigation_2d/navigation_path_query_parameters_2d.cpp
similarity index 99%
rename from servers/navigation/navigation_path_query_parameters_2d.cpp
rename to servers/navigation_2d/navigation_path_query_parameters_2d.cpp
index 943a0912634..f82890b0c22 100644
--- a/servers/navigation/navigation_path_query_parameters_2d.cpp
+++ b/servers/navigation_2d/navigation_path_query_parameters_2d.cpp
@@ -30,6 +30,8 @@
 
 #include "navigation_path_query_parameters_2d.h"
 
+#include "core/variant/typed_array.h"
+
 void NavigationPathQueryParameters2D::set_pathfinding_algorithm(const NavigationPathQueryParameters2D::PathfindingAlgorithm p_pathfinding_algorithm) {
 	pathfinding_algorithm = p_pathfinding_algorithm;
 }
diff --git a/servers/navigation/navigation_path_query_parameters_2d.h b/servers/navigation_2d/navigation_path_query_parameters_2d.h
similarity index 84%
rename from servers/navigation/navigation_path_query_parameters_2d.h
rename to servers/navigation_2d/navigation_path_query_parameters_2d.h
index d794e819eb9..11fa44abd5b 100644
--- a/servers/navigation/navigation_path_query_parameters_2d.h
+++ b/servers/navigation_2d/navigation_path_query_parameters_2d.h
@@ -31,8 +31,7 @@
 #pragma once
 
 #include "core/object/ref_counted.h"
-#include "servers/navigation/navigation_globals.h"
-#include "servers/navigation/navigation_utilities.h"
+#include "servers/navigation_2d/navigation_constants_2d.h"
 
 class NavigationPathQueryParameters2D : public RefCounted {
 	GDCLASS(NavigationPathQueryParameters2D, RefCounted);
@@ -42,21 +41,21 @@ protected:
 
 public:
 	enum PathfindingAlgorithm {
-		PATHFINDING_ALGORITHM_ASTAR = NavigationUtilities::PATHFINDING_ALGORITHM_ASTAR,
+		PATHFINDING_ALGORITHM_ASTAR = NavigationEnums2D::PATHFINDING_ALGORITHM_ASTAR,
 	};
 
 	enum PathPostProcessing {
-		PATH_POSTPROCESSING_CORRIDORFUNNEL = NavigationUtilities::PATH_POSTPROCESSING_CORRIDORFUNNEL,
-		PATH_POSTPROCESSING_EDGECENTERED = NavigationUtilities::PATH_POSTPROCESSING_EDGECENTERED,
-		PATH_POSTPROCESSING_NONE = NavigationUtilities::PATH_POSTPROCESSING_NONE,
+		PATH_POSTPROCESSING_CORRIDORFUNNEL = NavigationEnums2D::PATH_POSTPROCESSING_CORRIDORFUNNEL,
+		PATH_POSTPROCESSING_EDGECENTERED = NavigationEnums2D::PATH_POSTPROCESSING_EDGECENTERED,
+		PATH_POSTPROCESSING_NONE = NavigationEnums2D::PATH_POSTPROCESSING_NONE,
 	};
 
 	enum PathMetadataFlags {
-		PATH_METADATA_INCLUDE_NONE = NavigationUtilities::PathMetadataFlags::PATH_INCLUDE_NONE,
-		PATH_METADATA_INCLUDE_TYPES = NavigationUtilities::PathMetadataFlags::PATH_INCLUDE_TYPES,
-		PATH_METADATA_INCLUDE_RIDS = NavigationUtilities::PathMetadataFlags::PATH_INCLUDE_RIDS,
-		PATH_METADATA_INCLUDE_OWNERS = NavigationUtilities::PathMetadataFlags::PATH_INCLUDE_OWNERS,
-		PATH_METADATA_INCLUDE_ALL = NavigationUtilities::PathMetadataFlags::PATH_INCLUDE_ALL
+		PATH_METADATA_INCLUDE_NONE = NavigationEnums2D::PathMetadataFlags::PATH_INCLUDE_NONE,
+		PATH_METADATA_INCLUDE_TYPES = NavigationEnums2D::PathMetadataFlags::PATH_INCLUDE_TYPES,
+		PATH_METADATA_INCLUDE_RIDS = NavigationEnums2D::PathMetadataFlags::PATH_INCLUDE_RIDS,
+		PATH_METADATA_INCLUDE_OWNERS = NavigationEnums2D::PathMetadataFlags::PATH_INCLUDE_OWNERS,
+		PATH_METADATA_INCLUDE_ALL = NavigationEnums2D::PathMetadataFlags::PATH_INCLUDE_ALL
 	};
 
 private:
diff --git a/servers/navigation/navigation_path_query_result_2d.cpp b/servers/navigation_2d/navigation_path_query_result_2d.cpp
similarity index 100%
rename from servers/navigation/navigation_path_query_result_2d.cpp
rename to servers/navigation_2d/navigation_path_query_result_2d.cpp
diff --git a/servers/navigation/navigation_path_query_result_2d.h b/servers/navigation_2d/navigation_path_query_result_2d.h
similarity index 92%
rename from servers/navigation/navigation_path_query_result_2d.h
rename to servers/navigation_2d/navigation_path_query_result_2d.h
index 52b534cb69e..71118f4733f 100644
--- a/servers/navigation/navigation_path_query_result_2d.h
+++ b/servers/navigation_2d/navigation_path_query_result_2d.h
@@ -31,7 +31,8 @@
 #pragma once
 
 #include "core/object/ref_counted.h"
-#include "servers/navigation/navigation_utilities.h"
+#include "core/variant/typed_array.h"
+#include "servers/navigation_2d/navigation_constants_2d.h"
 
 class NavigationPathQueryResult2D : public RefCounted {
 	GDCLASS(NavigationPathQueryResult2D, RefCounted);
@@ -47,8 +48,8 @@ protected:
 
 public:
 	enum PathSegmentType {
-		PATH_SEGMENT_TYPE_REGION = NavigationUtilities::PathSegmentType::PATH_SEGMENT_TYPE_REGION,
-		PATH_SEGMENT_TYPE_LINK = NavigationUtilities::PathSegmentType::PATH_SEGMENT_TYPE_LINK,
+		PATH_SEGMENT_TYPE_REGION = NavigationEnums2D::PathSegmentType::PATH_SEGMENT_TYPE_REGION,
+		PATH_SEGMENT_TYPE_LINK = NavigationEnums2D::PathSegmentType::PATH_SEGMENT_TYPE_LINK,
 	};
 
 	void set_path(const Vector<Vector2> &p_path);
diff --git a/servers/navigation_server_2d.compat.inc b/servers/navigation_2d/navigation_server_2d.compat.inc
similarity index 100%
rename from servers/navigation_server_2d.compat.inc
rename to servers/navigation_2d/navigation_server_2d.compat.inc
diff --git a/servers/navigation_server_2d.cpp b/servers/navigation_2d/navigation_server_2d.cpp
similarity index 99%
rename from servers/navigation_server_2d.cpp
rename to servers/navigation_2d/navigation_server_2d.cpp
index c8b6aab86bd..6f7f735440f 100644
--- a/servers/navigation_server_2d.cpp
+++ b/servers/navigation_2d/navigation_server_2d.cpp
@@ -33,8 +33,7 @@
 
 #include "core/config/project_settings.h"
 #include "scene/main/node.h"
-#include "servers/navigation/navigation_globals.h"
-#include "servers/navigation_server_2d_dummy.h"
+#include "servers/navigation_2d/navigation_server_2d_dummy.h"
 
 NavigationServer2D *NavigationServer2D::singleton = nullptr;
 
diff --git a/servers/navigation_server_2d.h b/servers/navigation_2d/navigation_server_2d.h
similarity index 99%
rename from servers/navigation_server_2d.h
rename to servers/navigation_2d/navigation_server_2d.h
index 5e9c3470881..5c6c43af704 100644
--- a/servers/navigation_server_2d.h
+++ b/servers/navigation_2d/navigation_server_2d.h
@@ -35,8 +35,8 @@
 
 #include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
 #include "scene/resources/2d/navigation_polygon.h"
-#include "servers/navigation/navigation_path_query_parameters_2d.h"
-#include "servers/navigation/navigation_path_query_result_2d.h"
+#include "servers/navigation_2d/navigation_path_query_parameters_2d.h"
+#include "servers/navigation_2d/navigation_path_query_result_2d.h"
 
 #ifdef CLIPPER2_ENABLED
 class NavMeshGenerator2D;
diff --git a/servers/navigation_server_2d_dummy.h b/servers/navigation_2d/navigation_server_2d_dummy.h
similarity index 99%
rename from servers/navigation_server_2d_dummy.h
rename to servers/navigation_2d/navigation_server_2d_dummy.h
index 65c855afabe..fb8c2d8b62c 100644
--- a/servers/navigation_server_2d_dummy.h
+++ b/servers/navigation_2d/navigation_server_2d_dummy.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "servers/navigation_server_2d.h"
+#include "servers/navigation_2d/navigation_server_2d.h"
 
 class NavigationServer2DDummy : public NavigationServer2D {
 	GDCLASS(NavigationServer2DDummy, NavigationServer2D);
diff --git a/servers/navigation_3d/SCsub b/servers/navigation_3d/SCsub
new file mode 100644
index 00000000000..98f918b2458
--- /dev/null
+++ b/servers/navigation_3d/SCsub
@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+from misc.utility.scons_hints import *
+
+Import("env")
+
+env.add_source_files(env.servers_sources, "*.cpp")
diff --git a/servers/navigation/navigation_globals.h b/servers/navigation_3d/navigation_constants_3d.h
similarity index 78%
rename from servers/navigation/navigation_globals.h
rename to servers/navigation_3d/navigation_constants_3d.h
index ea4240f34fe..0d0375c69a1 100644
--- a/servers/navigation/navigation_globals.h
+++ b/servers/navigation_3d/navigation_constants_3d.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  navigation_globals.h                                                  */
+/*  navigation_constants_3d.h                                             */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -30,6 +30,33 @@
 
 #pragma once
 
+namespace NavigationEnums3D {
+
+enum PathfindingAlgorithm {
+	PATHFINDING_ALGORITHM_ASTAR = 0,
+};
+
+enum PathPostProcessing {
+	PATH_POSTPROCESSING_CORRIDORFUNNEL = 0,
+	PATH_POSTPROCESSING_EDGECENTERED,
+	PATH_POSTPROCESSING_NONE,
+};
+
+enum PathSegmentType {
+	PATH_SEGMENT_TYPE_REGION = 0,
+	PATH_SEGMENT_TYPE_LINK
+};
+
+enum PathMetadataFlags {
+	PATH_INCLUDE_NONE = 0,
+	PATH_INCLUDE_TYPES = 1,
+	PATH_INCLUDE_RIDS = 2,
+	PATH_INCLUDE_OWNERS = 4,
+	PATH_INCLUDE_ALL = PATH_INCLUDE_TYPES | PATH_INCLUDE_RIDS | PATH_INCLUDE_OWNERS
+};
+
+} //namespace NavigationEnums3D
+
 namespace NavigationDefaults3D {
 
 // Rasterization.
@@ -58,29 +85,3 @@ constexpr int AVOIDANCE_AGENT_MAX_NEIGHBORS = 10;
 constexpr float AVOIDANCE_AGENT_NEIGHBOR_DISTANCE = 50.0;
 
 } //namespace NavigationDefaults3D
-
-namespace NavigationDefaults2D {
-
-// Rasterization.
-
-// Same as in 3D but larger since 1px is treated as 1m.
-constexpr float NAV_MESH_CELL_SIZE = 1.0f; // Must match ProjectSettings default 2D cell_size.
-constexpr float NAV_MESH_CELL_SIZE_MIN = 0.01f;
-constexpr const char *const NAV_MESH_CELL_SIZE_HINT = "0.001,100,0.001,or_greater";
-
-// Map.
-
-constexpr float EDGE_CONNECTION_MARGIN = 1.0f;
-constexpr float LINK_CONNECTION_RADIUS = 4.0f;
-constexpr int path_search_max_polygons = 4096;
-
-// Agent.
-
-constexpr float AVOIDANCE_AGENT_RADIUS = 10.0;
-constexpr float AVOIDANCE_AGENT_MAX_SPEED = 100.0;
-constexpr float AVOIDANCE_AGENT_TIME_HORIZON_AGENTS = 1.0;
-constexpr float AVOIDANCE_AGENT_TIME_HORIZON_OBSTACLES = 0.0;
-constexpr int AVOIDANCE_AGENT_MAX_NEIGHBORS = 10;
-constexpr float AVOIDANCE_AGENT_NEIGHBOR_DISTANCE = 500.0;
-
-} //namespace NavigationDefaults2D
diff --git a/servers/navigation/navigation_path_query_parameters_3d.cpp b/servers/navigation_3d/navigation_path_query_parameters_3d.cpp
similarity index 99%
rename from servers/navigation/navigation_path_query_parameters_3d.cpp
rename to servers/navigation_3d/navigation_path_query_parameters_3d.cpp
index 756407ff4f7..1e6947b4840 100644
--- a/servers/navigation/navigation_path_query_parameters_3d.cpp
+++ b/servers/navigation_3d/navigation_path_query_parameters_3d.cpp
@@ -30,6 +30,8 @@
 
 #include "navigation_path_query_parameters_3d.h"
 
+#include "core/variant/typed_array.h"
+
 void NavigationPathQueryParameters3D::set_pathfinding_algorithm(const NavigationPathQueryParameters3D::PathfindingAlgorithm p_pathfinding_algorithm) {
 	pathfinding_algorithm = p_pathfinding_algorithm;
 }
diff --git a/servers/navigation/navigation_path_query_parameters_3d.h b/servers/navigation_3d/navigation_path_query_parameters_3d.h
similarity index 84%
rename from servers/navigation/navigation_path_query_parameters_3d.h
rename to servers/navigation_3d/navigation_path_query_parameters_3d.h
index 94d551c366f..760553b557c 100644
--- a/servers/navigation/navigation_path_query_parameters_3d.h
+++ b/servers/navigation_3d/navigation_path_query_parameters_3d.h
@@ -31,8 +31,7 @@
 #pragma once
 
 #include "core/object/ref_counted.h"
-#include "servers/navigation/navigation_globals.h"
-#include "servers/navigation/navigation_utilities.h"
+#include "servers/navigation_3d/navigation_constants_3d.h"
 
 class NavigationPathQueryParameters3D : public RefCounted {
 	GDCLASS(NavigationPathQueryParameters3D, RefCounted);
@@ -42,21 +41,21 @@ protected:
 
 public:
 	enum PathfindingAlgorithm {
-		PATHFINDING_ALGORITHM_ASTAR = NavigationUtilities::PATHFINDING_ALGORITHM_ASTAR,
+		PATHFINDING_ALGORITHM_ASTAR = NavigationEnums3D::PATHFINDING_ALGORITHM_ASTAR,
 	};
 
 	enum PathPostProcessing {
-		PATH_POSTPROCESSING_CORRIDORFUNNEL = NavigationUtilities::PATH_POSTPROCESSING_CORRIDORFUNNEL,
-		PATH_POSTPROCESSING_EDGECENTERED = NavigationUtilities::PATH_POSTPROCESSING_EDGECENTERED,
-		PATH_POSTPROCESSING_NONE = NavigationUtilities::PATH_POSTPROCESSING_NONE,
+		PATH_POSTPROCESSING_CORRIDORFUNNEL = NavigationEnums3D::PATH_POSTPROCESSING_CORRIDORFUNNEL,
+		PATH_POSTPROCESSING_EDGECENTERED = NavigationEnums3D::PATH_POSTPROCESSING_EDGECENTERED,
+		PATH_POSTPROCESSING_NONE = NavigationEnums3D::PATH_POSTPROCESSING_NONE,
 	};
 
 	enum PathMetadataFlags {
-		PATH_METADATA_INCLUDE_NONE = NavigationUtilities::PathMetadataFlags::PATH_INCLUDE_NONE,
-		PATH_METADATA_INCLUDE_TYPES = NavigationUtilities::PathMetadataFlags::PATH_INCLUDE_TYPES,
-		PATH_METADATA_INCLUDE_RIDS = NavigationUtilities::PathMetadataFlags::PATH_INCLUDE_RIDS,
-		PATH_METADATA_INCLUDE_OWNERS = NavigationUtilities::PathMetadataFlags::PATH_INCLUDE_OWNERS,
-		PATH_METADATA_INCLUDE_ALL = NavigationUtilities::PathMetadataFlags::PATH_INCLUDE_ALL
+		PATH_METADATA_INCLUDE_NONE = NavigationEnums3D::PathMetadataFlags::PATH_INCLUDE_NONE,
+		PATH_METADATA_INCLUDE_TYPES = NavigationEnums3D::PathMetadataFlags::PATH_INCLUDE_TYPES,
+		PATH_METADATA_INCLUDE_RIDS = NavigationEnums3D::PathMetadataFlags::PATH_INCLUDE_RIDS,
+		PATH_METADATA_INCLUDE_OWNERS = NavigationEnums3D::PathMetadataFlags::PATH_INCLUDE_OWNERS,
+		PATH_METADATA_INCLUDE_ALL = NavigationEnums3D::PathMetadataFlags::PATH_INCLUDE_ALL
 	};
 
 private:
diff --git a/servers/navigation/navigation_path_query_result_3d.cpp b/servers/navigation_3d/navigation_path_query_result_3d.cpp
similarity index 100%
rename from servers/navigation/navigation_path_query_result_3d.cpp
rename to servers/navigation_3d/navigation_path_query_result_3d.cpp
diff --git a/servers/navigation/navigation_path_query_result_3d.h b/servers/navigation_3d/navigation_path_query_result_3d.h
similarity index 93%
rename from servers/navigation/navigation_path_query_result_3d.h
rename to servers/navigation_3d/navigation_path_query_result_3d.h
index 5c5b310abb4..b73a16f3e9e 100644
--- a/servers/navigation/navigation_path_query_result_3d.h
+++ b/servers/navigation_3d/navigation_path_query_result_3d.h
@@ -32,7 +32,7 @@
 
 #include "core/object/ref_counted.h"
 #include "core/variant/typed_array.h"
-#include "servers/navigation/navigation_utilities.h"
+#include "servers/navigation_3d/navigation_constants_3d.h"
 
 class NavigationPathQueryResult3D : public RefCounted {
 	GDCLASS(NavigationPathQueryResult3D, RefCounted);
@@ -48,8 +48,8 @@ protected:
 
 public:
 	enum PathSegmentType {
-		PATH_SEGMENT_TYPE_REGION = NavigationUtilities::PathSegmentType::PATH_SEGMENT_TYPE_REGION,
-		PATH_SEGMENT_TYPE_LINK = NavigationUtilities::PathSegmentType::PATH_SEGMENT_TYPE_LINK,
+		PATH_SEGMENT_TYPE_REGION = NavigationEnums3D::PathSegmentType::PATH_SEGMENT_TYPE_REGION,
+		PATH_SEGMENT_TYPE_LINK = NavigationEnums3D::PathSegmentType::PATH_SEGMENT_TYPE_LINK,
 	};
 
 	void set_path(const Vector<Vector3> &p_path);
diff --git a/servers/navigation_server_3d.compat.inc b/servers/navigation_3d/navigation_server_3d.compat.inc
similarity index 100%
rename from servers/navigation_server_3d.compat.inc
rename to servers/navigation_3d/navigation_server_3d.compat.inc
diff --git a/servers/navigation_server_3d.cpp b/servers/navigation_3d/navigation_server_3d.cpp
similarity index 99%
rename from servers/navigation_server_3d.cpp
rename to servers/navigation_3d/navigation_server_3d.cpp
index bf72ee288b7..3ef551e017a 100644
--- a/servers/navigation_server_3d.cpp
+++ b/servers/navigation_3d/navigation_server_3d.cpp
@@ -33,8 +33,7 @@
 
 #include "core/config/project_settings.h"
 #include "scene/main/node.h"
-#include "servers/navigation/navigation_globals.h"
-#include "servers/navigation_server_3d_dummy.h"
+#include "servers/navigation_3d/navigation_server_3d_dummy.h"
 
 NavigationServer3D *NavigationServer3D::singleton = nullptr;
 
diff --git a/servers/navigation_server_3d.h b/servers/navigation_3d/navigation_server_3d.h
similarity index 99%
rename from servers/navigation_server_3d.h
rename to servers/navigation_3d/navigation_server_3d.h
index 6632ec53e11..0fba3665e3a 100644
--- a/servers/navigation_server_3d.h
+++ b/servers/navigation_3d/navigation_server_3d.h
@@ -35,8 +35,8 @@
 
 #include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
 #include "scene/resources/navigation_mesh.h"
-#include "servers/navigation/navigation_path_query_parameters_3d.h"
-#include "servers/navigation/navigation_path_query_result_3d.h"
+#include "servers/navigation_3d/navigation_path_query_parameters_3d.h"
+#include "servers/navigation_3d/navigation_path_query_result_3d.h"
 
 struct NavMeshGeometryParser3D {
 	RID self;
diff --git a/servers/navigation_server_3d_dummy.h b/servers/navigation_3d/navigation_server_3d_dummy.h
similarity index 99%
rename from servers/navigation_server_3d_dummy.h
rename to servers/navigation_3d/navigation_server_3d_dummy.h
index 1be7f68fa1d..686d91c8ebd 100644
--- a/servers/navigation_server_3d_dummy.h
+++ b/servers/navigation_3d/navigation_server_3d_dummy.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "servers/navigation_server_3d.h"
+#include "servers/navigation_3d/navigation_server_3d.h"
 
 class NavigationServer3DDummy : public NavigationServer3D {
 	GDCLASS(NavigationServer3DDummy, NavigationServer3D);
diff --git a/servers/physics_2d/SCsub b/servers/physics_2d/SCsub
new file mode 100644
index 00000000000..98f918b2458
--- /dev/null
+++ b/servers/physics_2d/SCsub
@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+from misc.utility.scons_hints import *
+
+Import("env")
+
+env.add_source_files(env.servers_sources, "*.cpp")
diff --git a/servers/physics_server_2d.cpp b/servers/physics_2d/physics_server_2d.cpp
similarity index 100%
rename from servers/physics_server_2d.cpp
rename to servers/physics_2d/physics_server_2d.cpp
diff --git a/servers/physics_server_2d.h b/servers/physics_2d/physics_server_2d.h
similarity index 100%
rename from servers/physics_server_2d.h
rename to servers/physics_2d/physics_server_2d.h
diff --git a/servers/physics_server_2d_dummy.h b/servers/physics_2d/physics_server_2d_dummy.h
similarity index 100%
rename from servers/physics_server_2d_dummy.h
rename to servers/physics_2d/physics_server_2d_dummy.h
diff --git a/servers/extensions/physics_server_2d_extension.cpp b/servers/physics_2d/physics_server_2d_extension.cpp
similarity index 100%
rename from servers/extensions/physics_server_2d_extension.cpp
rename to servers/physics_2d/physics_server_2d_extension.cpp
diff --git a/servers/extensions/physics_server_2d_extension.h b/servers/physics_2d/physics_server_2d_extension.h
similarity index 99%
rename from servers/extensions/physics_server_2d_extension.h
rename to servers/physics_2d/physics_server_2d_extension.h
index 7ece8d4c5de..f1631150566 100644
--- a/servers/extensions/physics_server_2d_extension.h
+++ b/servers/physics_2d/physics_server_2d_extension.h
@@ -34,7 +34,7 @@
 #include "core/object/gdvirtual.gen.inc"
 #include "core/variant/native_ptr.h"
 #include "core/variant/typed_array.h"
-#include "servers/physics_server_2d.h"
+#include "servers/physics_2d/physics_server_2d.h"
 
 class PhysicsDirectBodyState2DExtension : public PhysicsDirectBodyState2D {
 	GDCLASS(PhysicsDirectBodyState2DExtension, PhysicsDirectBodyState2D);
diff --git a/servers/physics_server_2d_wrap_mt.cpp b/servers/physics_2d/physics_server_2d_wrap_mt.cpp
similarity index 100%
rename from servers/physics_server_2d_wrap_mt.cpp
rename to servers/physics_2d/physics_server_2d_wrap_mt.cpp
diff --git a/servers/physics_server_2d_wrap_mt.h b/servers/physics_2d/physics_server_2d_wrap_mt.h
similarity index 99%
rename from servers/physics_server_2d_wrap_mt.h
rename to servers/physics_2d/physics_server_2d_wrap_mt.h
index 991c2797e36..194d548cb89 100644
--- a/servers/physics_server_2d_wrap_mt.h
+++ b/servers/physics_2d/physics_server_2d_wrap_mt.h
@@ -33,7 +33,7 @@
 #include "core/object/worker_thread_pool.h"
 #include "core/os/thread.h"
 #include "core/templates/command_queue_mt.h"
-#include "servers/physics_server_2d.h"
+#include "servers/physics_2d/physics_server_2d.h"
 
 #define ASYNC_COND_PUSH (Thread::get_caller_id() != server_thread)
 #define ASYNC_COND_PUSH_AND_RET (Thread::get_caller_id() != server_thread && !(doing_sync.is_set() && Thread::is_main_thread()))
diff --git a/servers/physics_3d/SCsub b/servers/physics_3d/SCsub
new file mode 100644
index 00000000000..98f918b2458
--- /dev/null
+++ b/servers/physics_3d/SCsub
@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+from misc.utility.scons_hints import *
+
+Import("env")
+
+env.add_source_files(env.servers_sources, "*.cpp")
diff --git a/servers/physics_server_3d.cpp b/servers/physics_3d/physics_server_3d.cpp
similarity index 99%
rename from servers/physics_server_3d.cpp
rename to servers/physics_3d/physics_server_3d.cpp
index fd57c0e1bec..498e7f0e736 100644
--- a/servers/physics_server_3d.cpp
+++ b/servers/physics_3d/physics_server_3d.cpp
@@ -28,8 +28,6 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef _3D_DISABLED
-
 #include "physics_server_3d.h"
 
 #include "core/config/project_settings.h"
@@ -1247,5 +1245,3 @@ PhysicsServer3DManager::PhysicsServer3DManager() {
 PhysicsServer3DManager::~PhysicsServer3DManager() {
 	singleton = nullptr;
 }
-
-#endif // _3D_DISABLED
diff --git a/servers/physics_server_3d.h b/servers/physics_3d/physics_server_3d.h
similarity index 99%
rename from servers/physics_server_3d.h
rename to servers/physics_3d/physics_server_3d.h
index 79a05e2f8c2..17bccba2902 100644
--- a/servers/physics_server_3d.h
+++ b/servers/physics_3d/physics_server_3d.h
@@ -30,8 +30,6 @@
 
 #pragma once
 
-#ifndef _3D_DISABLED
-
 #include "core/io/resource.h"
 #include "core/object/gdvirtual.gen.inc"
 
@@ -1074,5 +1072,3 @@ VARIANT_ENUM_CAST(PhysicsServer3D::G6DOFJointAxisParam);
 VARIANT_ENUM_CAST(PhysicsServer3D::G6DOFJointAxisFlag);
 VARIANT_ENUM_CAST(PhysicsServer3D::AreaBodyStatus);
 VARIANT_ENUM_CAST(PhysicsServer3D::ProcessInfo);
-
-#endif // _3D_DISABLED
diff --git a/servers/physics_server_3d_dummy.h b/servers/physics_3d/physics_server_3d_dummy.h
similarity index 99%
rename from servers/physics_server_3d_dummy.h
rename to servers/physics_3d/physics_server_3d_dummy.h
index 2e01b7b9092..023c97101bc 100644
--- a/servers/physics_server_3d_dummy.h
+++ b/servers/physics_3d/physics_server_3d_dummy.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "servers/physics_server_3d.h"
+#include "servers/physics_3d/physics_server_3d.h"
 
 class PhysicsDirectBodyState3DDummy : public PhysicsDirectBodyState3D {
 	GDCLASS(PhysicsDirectBodyState3DDummy, PhysicsDirectBodyState3D);
diff --git a/servers/extensions/physics_server_3d_extension.cpp b/servers/physics_3d/physics_server_3d_extension.cpp
similarity index 100%
rename from servers/extensions/physics_server_3d_extension.cpp
rename to servers/physics_3d/physics_server_3d_extension.cpp
diff --git a/servers/extensions/physics_server_3d_extension.h b/servers/physics_3d/physics_server_3d_extension.h
similarity index 99%
rename from servers/extensions/physics_server_3d_extension.h
rename to servers/physics_3d/physics_server_3d_extension.h
index d4ac7a54181..c96456a01b1 100644
--- a/servers/extensions/physics_server_3d_extension.h
+++ b/servers/physics_3d/physics_server_3d_extension.h
@@ -34,7 +34,7 @@
 #include "core/object/script_language.h"
 #include "core/variant/native_ptr.h"
 #include "core/variant/typed_array.h"
-#include "servers/physics_server_3d.h"
+#include "servers/physics_3d/physics_server_3d.h"
 
 class PhysicsDirectBodyState3DExtension : public PhysicsDirectBodyState3D {
 	GDCLASS(PhysicsDirectBodyState3DExtension, PhysicsDirectBodyState3D);
diff --git a/servers/physics_server_3d_wrap_mt.cpp b/servers/physics_3d/physics_server_3d_wrap_mt.cpp
similarity index 100%
rename from servers/physics_server_3d_wrap_mt.cpp
rename to servers/physics_3d/physics_server_3d_wrap_mt.cpp
diff --git a/servers/physics_server_3d_wrap_mt.h b/servers/physics_3d/physics_server_3d_wrap_mt.h
similarity index 99%
rename from servers/physics_server_3d_wrap_mt.h
rename to servers/physics_3d/physics_server_3d_wrap_mt.h
index 8e914eaf9e0..e8db53ed0c4 100644
--- a/servers/physics_server_3d_wrap_mt.h
+++ b/servers/physics_3d/physics_server_3d_wrap_mt.h
@@ -34,7 +34,7 @@
 #include "core/object/worker_thread_pool.h"
 #include "core/os/thread.h"
 #include "core/templates/command_queue_mt.h"
-#include "servers/physics_server_3d.h"
+#include "servers/physics_3d/physics_server_3d.h"
 
 #define ASYNC_COND_PUSH (Thread::get_caller_id() != server_thread)
 #define ASYNC_COND_PUSH_AND_RET (Thread::get_caller_id() != server_thread && !(doing_sync.is_set() && Thread::is_main_thread()))
diff --git a/servers/register_server_types.cpp b/servers/register_server_types.cpp
index 0029ef5fe62..7fe016e8540 100644
--- a/servers/register_server_types.cpp
+++ b/servers/register_server_types.cpp
@@ -34,6 +34,7 @@
 #include "core/config/project_settings.h"
 
 #include "audio/audio_effect.h"
+#include "audio/audio_server.h"
 #include "audio/audio_stream.h"
 #include "audio/effects/audio_effect_amplify.h"
 #include "audio/effects/audio_effect_capture.h"
@@ -52,12 +53,11 @@
 #include "audio/effects/audio_effect_spectrum_analyzer.h"
 #include "audio/effects/audio_effect_stereo_enhance.h"
 #include "audio/effects/audio_stream_generator.h"
-#include "audio_server.h"
 #include "camera/camera_feed.h"
-#include "camera_server.h"
+#include "camera/camera_server.h"
 #include "debugger/servers_debugger.h"
+#include "display/display_server.h"
 #include "display/native_menu.h"
-#include "display_server.h"
 #include "movie_writer/movie_writer.h"
 #include "movie_writer/movie_writer_pngwav.h"
 #include "rendering/renderer_rd/framebuffer_cache_rd.h"
@@ -67,37 +67,37 @@
 #include "rendering/renderer_rd/uniform_set_cache_rd.h"
 #include "rendering/rendering_device.h"
 #include "rendering/rendering_device_binds.h"
+#include "rendering/rendering_server.h"
 #include "rendering/shader_include_db.h"
 #include "rendering/storage/render_data.h"
 #include "rendering/storage/render_scene_buffers.h"
 #include "rendering/storage/render_scene_data.h"
-#include "rendering_server.h"
 #include "servers/rendering/shader_types.h"
+#include "text/text_server.h"
 #include "text/text_server_dummy.h"
 #include "text/text_server_extension.h"
-#include "text_server.h"
 #ifndef DISABLE_DEPRECATED
 #include "audio/effects/audio_effect_limiter.h"
 #endif
 
 // 2D physics and navigation.
 #ifndef NAVIGATION_2D_DISABLED
-#include "navigation_server_2d.h"
+#include "servers/navigation_2d/navigation_server_2d.h"
 #endif // NAVIGATION_2D_DISABLED
 #ifndef PHYSICS_2D_DISABLED
-#include "physics_server_2d.h"
-#include "physics_server_2d_dummy.h"
-#include "servers/extensions/physics_server_2d_extension.h"
+#include "servers/physics_2d/physics_server_2d.h"
+#include "servers/physics_2d/physics_server_2d_dummy.h"
+#include "servers/physics_2d/physics_server_2d_extension.h"
 #endif // PHYSICS_2D_DISABLED
 
 // 3D physics and navigation.
 #ifndef NAVIGATION_3D_DISABLED
-#include "navigation_server_3d.h"
+#include "servers/navigation_3d/navigation_server_3d.h"
 #endif // NAVIGATION_3D_DISABLED
 #ifndef PHYSICS_3D_DISABLED
-#include "physics_server_3d.h"
-#include "physics_server_3d_dummy.h"
-#include "servers/extensions/physics_server_3d_extension.h"
+#include "servers/physics_3d/physics_server_3d.h"
+#include "servers/physics_3d/physics_server_3d_dummy.h"
+#include "servers/physics_3d/physics_server_3d_extension.h"
 #endif // PHYSICS_3D_DISABLED
 #ifndef XR_DISABLED
 #include "xr/xr_body_tracker.h"
@@ -107,7 +107,7 @@
 #include "xr/xr_interface.h"
 #include "xr/xr_interface_extension.h"
 #include "xr/xr_positional_tracker.h"
-#include "xr_server.h"
+#include "xr/xr_server.h"
 #endif // XR_DISABLED
 
 ShaderTypes *shader_types = nullptr;
diff --git a/servers/rendering/dummy/rasterizer_dummy.h b/servers/rendering/dummy/rasterizer_dummy.h
index 93f0b7313d2..fdbc6af8a91 100644
--- a/servers/rendering/dummy/rasterizer_dummy.h
+++ b/servers/rendering/dummy/rasterizer_dummy.h
@@ -44,7 +44,7 @@
 #include "servers/rendering/dummy/storage/texture_storage.h"
 #include "servers/rendering/dummy/storage/utilities.h"
 #include "servers/rendering/renderer_compositor.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 class RasterizerDummy : public RendererCompositor {
 private:
diff --git a/servers/rendering/environment/renderer_fog.h b/servers/rendering/environment/renderer_fog.h
index 753bd615870..be50e5bc341 100644
--- a/servers/rendering/environment/renderer_fog.h
+++ b/servers/rendering/environment/renderer_fog.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 class RendererFog {
 public:
diff --git a/servers/rendering/environment/renderer_gi.h b/servers/rendering/environment/renderer_gi.h
index 5dfef0c6a6a..7f2c21cb1e5 100644
--- a/servers/rendering/environment/renderer_gi.h
+++ b/servers/rendering/environment/renderer_gi.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 class RendererGI {
 public:
diff --git a/servers/rendering/renderer_canvas_render.h b/servers/rendering/renderer_canvas_render.h
index 24c5bd45488..ea0a1749608 100644
--- a/servers/rendering/renderer_canvas_render.h
+++ b/servers/rendering/renderer_canvas_render.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "servers/rendering/rendering_method.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 class RendererCanvasRender {
 public:
diff --git a/servers/rendering/renderer_compositor.cpp b/servers/rendering/renderer_compositor.cpp
index b9922009778..e026f47e12c 100644
--- a/servers/rendering/renderer_compositor.cpp
+++ b/servers/rendering/renderer_compositor.cpp
@@ -33,7 +33,7 @@
 #include "core/config/project_settings.h"
 
 #ifndef XR_DISABLED
-#include "servers/xr_server.h"
+#include "servers/xr/xr_server.h"
 #endif // XR_DISABLED
 
 RendererCompositor *RendererCompositor::singleton = nullptr;
diff --git a/servers/rendering/renderer_rd/effects/copy_effects.h b/servers/rendering/renderer_rd/effects/copy_effects.h
index caf0e8466ae..0f220b28936 100644
--- a/servers/rendering/renderer_rd/effects/copy_effects.h
+++ b/servers/rendering/renderer_rd/effects/copy_effects.h
@@ -44,7 +44,7 @@
 #include "servers/rendering/renderer_rd/shaders/effects/specular_merge.glsl.gen.h"
 #include "servers/rendering/renderer_scene_render.h"
 
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 namespace RendererRD {
 
diff --git a/servers/rendering/renderer_rd/effects/motion_vectors_store.h b/servers/rendering/renderer_rd/effects/motion_vectors_store.h
index dd0075f2000..51e39edea59 100644
--- a/servers/rendering/renderer_rd/effects/motion_vectors_store.h
+++ b/servers/rendering/renderer_rd/effects/motion_vectors_store.h
@@ -34,7 +34,7 @@
 #include "servers/rendering/renderer_rd/shaders/effects/motion_vectors_store.glsl.gen.h"
 #include "servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h"
 #include "servers/rendering/renderer_scene_render.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 namespace RendererRD {
 class MotionVectorsStore {
diff --git a/servers/rendering/renderer_rd/effects/smaa.h b/servers/rendering/renderer_rd/effects/smaa.h
index 13ef28da7ba..64bd4901005 100644
--- a/servers/rendering/renderer_rd/effects/smaa.h
+++ b/servers/rendering/renderer_rd/effects/smaa.h
@@ -37,7 +37,7 @@
 #include "servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h"
 #include "servers/rendering/renderer_scene_render.h"
 
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 #define RB_SCOPE_SMAA SNAME("rb_smaa")
 
diff --git a/servers/rendering/renderer_rd/effects/ss_effects.h b/servers/rendering/renderer_rd/effects/ss_effects.h
index 9843683b895..74247325f81 100644
--- a/servers/rendering/renderer_rd/effects/ss_effects.h
+++ b/servers/rendering/renderer_rd/effects/ss_effects.h
@@ -43,7 +43,7 @@
 #include "servers/rendering/renderer_rd/shaders/effects/ssil_importance_map.glsl.gen.h"
 #include "servers/rendering/renderer_rd/shaders/effects/ssil_interleave.glsl.gen.h"
 #include "servers/rendering/renderer_rd/shaders/effects/subsurface_scattering.glsl.gen.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 #define RB_SCOPE_SSDS SNAME("rb_ssds")
 #define RB_SCOPE_SSIL SNAME("rb_ssil")
diff --git a/servers/rendering/renderer_rd/effects/tone_mapper.h b/servers/rendering/renderer_rd/effects/tone_mapper.h
index cd76749418c..25048035062 100644
--- a/servers/rendering/renderer_rd/effects/tone_mapper.h
+++ b/servers/rendering/renderer_rd/effects/tone_mapper.h
@@ -33,7 +33,7 @@
 #include "servers/rendering/renderer_rd/pipeline_cache_rd.h"
 #include "servers/rendering/renderer_rd/shaders/effects/tonemap.glsl.gen.h"
 
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 namespace RendererRD {
 
diff --git a/servers/rendering/renderer_rd/effects/vrs.cpp b/servers/rendering/renderer_rd/effects/vrs.cpp
index 5c64841b5de..98ff01cd37b 100644
--- a/servers/rendering/renderer_rd/effects/vrs.cpp
+++ b/servers/rendering/renderer_rd/effects/vrs.cpp
@@ -34,7 +34,7 @@
 #include "../uniform_set_cache_rd.h"
 
 #ifndef XR_DISABLED
-#include "servers/xr_server.h"
+#include "servers/xr/xr_server.h"
 #endif // XR_DISABLED
 
 using namespace RendererRD;
diff --git a/servers/rendering/renderer_rd/pipeline_hash_map_rd.h b/servers/rendering/renderer_rd/pipeline_hash_map_rd.h
index ed3ff2925e6..2b98e5beca5 100644
--- a/servers/rendering/renderer_rd/pipeline_hash_map_rd.h
+++ b/servers/rendering/renderer_rd/pipeline_hash_map_rd.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "servers/rendering/rendering_device.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 #define PRINT_PIPELINE_COMPILATION_KEYS 0
 
diff --git a/servers/rendering/renderer_rd/shader_rd.h b/servers/rendering/renderer_rd/shader_rd.h
index ae2b0eb8afd..38bca63684c 100644
--- a/servers/rendering/renderer_rd/shader_rd.h
+++ b/servers/rendering/renderer_rd/shader_rd.h
@@ -36,7 +36,7 @@
 #include "core/templates/local_vector.h"
 #include "core/templates/rid_owner.h"
 #include "core/templates/self_list.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 class ShaderRD {
 public:
diff --git a/servers/rendering/renderer_scene_occlusion_cull.h b/servers/rendering/renderer_scene_occlusion_cull.h
index d4f4ed672f5..48965446f43 100644
--- a/servers/rendering/renderer_scene_occlusion_cull.h
+++ b/servers/rendering/renderer_scene_occlusion_cull.h
@@ -32,7 +32,7 @@
 
 #include "core/math/projection.h"
 #include "core/templates/local_vector.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 class RendererSceneOcclusionCull {
 protected:
diff --git a/servers/rendering/renderer_viewport.h b/servers/rendering/renderer_viewport.h
index 2aec2542802..31fecd59ccb 100644
--- a/servers/rendering/renderer_viewport.h
+++ b/servers/rendering/renderer_viewport.h
@@ -33,7 +33,7 @@
 #include "core/templates/rid_owner.h"
 #include "servers/rendering/renderer_scene_render.h"
 #include "servers/rendering/rendering_method.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 #include "storage/render_scene_buffers.h"
 
 class RendererViewport {
diff --git a/servers/rendering/rendering_context_driver.h b/servers/rendering/rendering_context_driver.h
index 95cbabc8a79..f30880b0402 100644
--- a/servers/rendering/rendering_context_driver.h
+++ b/servers/rendering/rendering_context_driver.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 
 class RenderingDeviceDriver;
 
diff --git a/servers/rendering/rendering_device.h b/servers/rendering/rendering_device.h
index 023ef623003..5cf76b2e758 100644
--- a/servers/rendering/rendering_device.h
+++ b/servers/rendering/rendering_device.h
@@ -36,7 +36,7 @@
 #include "core/templates/local_vector.h"
 #include "core/templates/rid_owner.h"
 #include "core/variant/typed_array.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 #include "servers/rendering/rendering_device_commons.h"
 #include "servers/rendering/rendering_device_driver.h"
 #include "servers/rendering/rendering_device_graph.h"
diff --git a/servers/rendering/rendering_method.h b/servers/rendering/rendering_method.h
index 38e173bf48f..31ff4fc88d8 100644
--- a/servers/rendering/rendering_method.h
+++ b/servers/rendering/rendering_method.h
@@ -30,8 +30,8 @@
 
 #pragma once
 
+#include "servers/rendering/rendering_server.h"
 #include "servers/rendering/storage/render_scene_buffers.h"
-#include "servers/rendering_server.h"
 
 #ifdef XR_DISABLED
 // RendererSceneCull::render_camera is empty when 3D is disabled, but
diff --git a/servers/rendering_server.compat.inc b/servers/rendering/rendering_server.compat.inc
similarity index 100%
rename from servers/rendering_server.compat.inc
rename to servers/rendering/rendering_server.compat.inc
diff --git a/servers/rendering_server.cpp b/servers/rendering/rendering_server.cpp
similarity index 100%
rename from servers/rendering_server.cpp
rename to servers/rendering/rendering_server.cpp
diff --git a/servers/rendering_server.h b/servers/rendering/rendering_server.h
similarity index 99%
rename from servers/rendering_server.h
rename to servers/rendering/rendering_server.h
index 699334c37c8..40ad775e21e 100644
--- a/servers/rendering_server.h
+++ b/servers/rendering/rendering_server.h
@@ -36,7 +36,7 @@
 #include "core/templates/rid.h"
 #include "core/variant/typed_array.h"
 #include "core/variant/variant.h"
-#include "servers/display_server.h"
+#include "servers/display/display_server.h"
 #include "servers/rendering/rendering_device.h"
 
 // Helper macros for code outside of the rendering server, but that is
diff --git a/servers/rendering/rendering_server_default.h b/servers/rendering/rendering_server_default.h
index 410171d2703..e7cf3cecc3e 100644
--- a/servers/rendering/rendering_server_default.h
+++ b/servers/rendering/rendering_server_default.h
@@ -38,7 +38,7 @@
 #include "renderer_viewport.h"
 #include "rendering_server_globals.h"
 #include "servers/rendering/renderer_compositor.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 #include "servers/server_wrap_mt_common.h"
 
 class RenderingServerDefault : public RenderingServer {
@@ -125,8 +125,6 @@ public:
 #define MAIN_THREAD_SYNC_WARN WARN_PRINT("Call to " + String(__FUNCTION__) + " causing RenderingServer synchronizations on every frame. This significantly affects performance.");
 #endif
 
-#include "servers/server_wrap_mt_common.h"
-
 	/* TEXTURE API */
 
 #define ServerName RendererTextureStorage
diff --git a/servers/rendering/shader_compiler.h b/servers/rendering/shader_compiler.h
index 16c1a034bfe..433f8fa28f0 100644
--- a/servers/rendering/shader_compiler.h
+++ b/servers/rendering/shader_compiler.h
@@ -31,8 +31,8 @@
 #pragma once
 
 #include "core/templates/pair.h"
+#include "servers/rendering/rendering_server.h"
 #include "servers/rendering/shader_language.h"
-#include "servers/rendering_server.h"
 
 class ShaderCompiler {
 public:
diff --git a/servers/rendering/shader_language.cpp b/servers/rendering/shader_language.cpp
index 8ddb3ec20b0..092ebff79d1 100644
--- a/servers/rendering/shader_language.cpp
+++ b/servers/rendering/shader_language.cpp
@@ -33,8 +33,8 @@
 #include "core/os/os.h"
 #include "core/templates/local_vector.h"
 #include "servers/rendering/renderer_compositor.h"
+#include "servers/rendering/rendering_server.h"
 #include "servers/rendering/rendering_server_globals.h"
-#include "servers/rendering_server.h"
 #include "shader_types.h"
 
 #define HAS_WARNING(flag) (warning_flags & flag)
diff --git a/servers/rendering/shader_types.h b/servers/rendering/shader_types.h
index cf42549d014..b9dc5b6e315 100644
--- a/servers/rendering/shader_types.h
+++ b/servers/rendering/shader_types.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 #include "shader_language.h"
 
 class ShaderTypes {
diff --git a/servers/rendering/storage/camera_attributes_storage.h b/servers/rendering/storage/camera_attributes_storage.h
index b8bbf18bf3b..d2de4af549c 100644
--- a/servers/rendering/storage/camera_attributes_storage.h
+++ b/servers/rendering/storage/camera_attributes_storage.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/templates/rid_owner.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 class RendererCameraAttributes {
 private:
diff --git a/servers/rendering/storage/compositor_storage.h b/servers/rendering/storage/compositor_storage.h
index c11fee97710..001b482d8e7 100644
--- a/servers/rendering/storage/compositor_storage.h
+++ b/servers/rendering/storage/compositor_storage.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/templates/rid_owner.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 class RendererCompositorStorage {
 private:
diff --git a/servers/rendering/storage/environment_storage.h b/servers/rendering/storage/environment_storage.h
index 6060b0040e2..69cbdc6adce 100644
--- a/servers/rendering/storage/environment_storage.h
+++ b/servers/rendering/storage/environment_storage.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/templates/rid_owner.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 class RendererEnvironmentStorage {
 private:
diff --git a/servers/rendering/storage/light_storage.h b/servers/rendering/storage/light_storage.h
index f9c69267272..89936b74054 100644
--- a/servers/rendering/storage/light_storage.h
+++ b/servers/rendering/storage/light_storage.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "render_scene_buffers.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 class RendererLightStorage {
 public:
diff --git a/servers/rendering/storage/material_storage.h b/servers/rendering/storage/material_storage.h
index 0b56a05f89e..c38b6d681a5 100644
--- a/servers/rendering/storage/material_storage.h
+++ b/servers/rendering/storage/material_storage.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 #include "utilities.h"
 
 class RendererMaterialStorage {
diff --git a/servers/rendering/storage/mesh_storage.h b/servers/rendering/storage/mesh_storage.h
index ec3de58fdea..353d4cc9fc8 100644
--- a/servers/rendering/storage/mesh_storage.h
+++ b/servers/rendering/storage/mesh_storage.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 #include "utilities.h"
 
 class RendererMeshStorage {
diff --git a/servers/rendering/storage/particles_storage.h b/servers/rendering/storage/particles_storage.h
index 5f96868d514..4570f69d703 100644
--- a/servers/rendering/storage/particles_storage.h
+++ b/servers/rendering/storage/particles_storage.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 class RendererParticlesStorage {
 public:
diff --git a/servers/rendering/storage/render_scene_buffers.h b/servers/rendering/storage/render_scene_buffers.h
index 4880e23cdec..fead81c6256 100644
--- a/servers/rendering/storage/render_scene_buffers.h
+++ b/servers/rendering/storage/render_scene_buffers.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/object/ref_counted.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 class RenderSceneBuffersConfiguration : public RefCounted {
 	GDCLASS(RenderSceneBuffersConfiguration, RefCounted);
diff --git a/servers/rendering/storage/texture_storage.h b/servers/rendering/storage/texture_storage.h
index 135bcc39fc5..cef1ae2b1a6 100644
--- a/servers/rendering/storage/texture_storage.h
+++ b/servers/rendering/storage/texture_storage.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 class RendererTextureStorage {
 private:
diff --git a/servers/rendering/storage/utilities.h b/servers/rendering/storage/utilities.h
index 74d1cb66da4..9191cfaf365 100644
--- a/servers/rendering/storage/utilities.h
+++ b/servers/rendering/storage/utilities.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 class DependencyTracker;
 
diff --git a/servers/text_server.compat.inc b/servers/text/text_server.compat.inc
similarity index 100%
rename from servers/text_server.compat.inc
rename to servers/text/text_server.compat.inc
diff --git a/servers/text_server.cpp b/servers/text/text_server.cpp
similarity index 99%
rename from servers/text_server.cpp
rename to servers/text/text_server.cpp
index cb0b08c0b53..0c84fffd3d5 100644
--- a/servers/text_server.cpp
+++ b/servers/text/text_server.cpp
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "servers/text_server.h"
+#include "text_server.h"
 #include "text_server.compat.inc"
 
 #include "core/config/project_settings.h"
 #include "core/variant/typed_array.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 TextServerManager *TextServerManager::singleton = nullptr;
 
diff --git a/servers/text_server.h b/servers/text/text_server.h
similarity index 100%
rename from servers/text_server.h
rename to servers/text/text_server.h
diff --git a/servers/text/text_server_extension.h b/servers/text/text_server_extension.h
index a5c0a06e962..34a8081cce7 100644
--- a/servers/text/text_server_extension.h
+++ b/servers/text/text_server_extension.h
@@ -34,7 +34,7 @@
 #include "core/os/thread_safe.h"
 #include "core/variant/native_ptr.h"
 #include "core/variant/typed_array.h"
-#include "servers/text_server.h"
+#include "servers/text/text_server.h"
 
 class TextServerExtension : public TextServer {
 	GDCLASS(TextServerExtension, TextServer);
diff --git a/servers/xr/xr_interface.h b/servers/xr/xr_interface.h
index 53d6e9567ba..5af4f947aae 100644
--- a/servers/xr/xr_interface.h
+++ b/servers/xr/xr_interface.h
@@ -32,7 +32,7 @@
 
 #include "core/math/projection.h"
 #include "core/os/thread_safe.h"
-#include "servers/xr_server.h"
+#include "servers/xr/xr_server.h"
 #include "xr_vrs.h"
 
 // forward declaration
diff --git a/servers/xr/xr_pose.cpp b/servers/xr/xr_pose.cpp
index c07a5db7165..32628dce44b 100644
--- a/servers/xr/xr_pose.cpp
+++ b/servers/xr/xr_pose.cpp
@@ -30,7 +30,7 @@
 
 #include "xr_pose.h"
 
-#include "servers/xr_server.h"
+#include "servers/xr/xr_server.h"
 
 void XRPose::_bind_methods() {
 	BIND_ENUM_CONSTANT(XR_TRACKING_CONFIDENCE_NONE);
diff --git a/servers/xr/xr_positional_tracker.h b/servers/xr/xr_positional_tracker.h
index 8a9272738b2..ea82a42c6a2 100644
--- a/servers/xr/xr_positional_tracker.h
+++ b/servers/xr/xr_positional_tracker.h
@@ -32,8 +32,8 @@
 
 #include "core/os/thread_safe.h"
 #include "servers/xr/xr_pose.h"
+#include "servers/xr/xr_server.h"
 #include "servers/xr/xr_tracker.h"
-#include "servers/xr_server.h"
 
 /**
 	The positional tracker object as an object that represents the position and orientation of a tracked object like a controller or headset.
diff --git a/servers/xr_server.compat.inc b/servers/xr/xr_server.compat.inc
similarity index 100%
rename from servers/xr_server.compat.inc
rename to servers/xr/xr_server.compat.inc
diff --git a/servers/xr_server.cpp b/servers/xr/xr_server.cpp
similarity index 99%
rename from servers/xr_server.cpp
rename to servers/xr/xr_server.cpp
index 2b741164a40..a42ee886f6f 100644
--- a/servers/xr_server.cpp
+++ b/servers/xr/xr_server.cpp
@@ -29,11 +29,12 @@
 /**************************************************************************/
 
 #include "xr_server.h"
-#include "core/config/project_settings.h"
-#include "xr/xr_interface.h"
-#include "xr/xr_positional_tracker.h"
 #include "xr_server.compat.inc"
 
+#include "core/config/project_settings.h"
+#include "servers/xr/xr_interface.h"
+#include "servers/xr/xr_positional_tracker.h"
+
 XRServer::XRMode XRServer::xr_mode = XRMODE_DEFAULT;
 
 XRServer::XRMode XRServer::get_xr_mode() {
diff --git a/servers/xr_server.h b/servers/xr/xr_server.h
similarity index 99%
rename from servers/xr_server.h
rename to servers/xr/xr_server.h
index 98fc751a276..e76c5672e8f 100644
--- a/servers/xr_server.h
+++ b/servers/xr/xr_server.h
@@ -33,7 +33,7 @@
 #include "core/object/ref_counted.h"
 #include "core/os/thread_safe.h"
 #include "core/variant/variant.h"
-#include "rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 class XRInterface;
 class XRTracker;
diff --git a/servers/xr/xr_tracker.h b/servers/xr/xr_tracker.h
index ae7ed6d4e61..81bc863e66f 100644
--- a/servers/xr/xr_tracker.h
+++ b/servers/xr/xr_tracker.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/os/thread_safe.h"
-#include "servers/xr_server.h"
+#include "servers/xr/xr_server.h"
 
 /**
 	The XR tracker object is a common base for all different types of XR trackers.
diff --git a/servers/xr/xr_vrs.cpp b/servers/xr/xr_vrs.cpp
index c25644fa0c2..0fdadfdbf93 100644
--- a/servers/xr/xr_vrs.cpp
+++ b/servers/xr/xr_vrs.cpp
@@ -31,7 +31,7 @@
 #include "xr_vrs.h"
 
 #include "servers/rendering/renderer_scene_render.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 void XRVRS::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_vrs_min_radius"), &XRVRS::get_vrs_min_radius);
diff --git a/tests/display_server_mock.h b/tests/display_server_mock.h
index 0cc643bd03f..631f4f5784d 100644
--- a/tests/display_server_mock.h
+++ b/tests/display_server_mock.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "servers/display_server_headless.h"
+#include "servers/display/display_server_headless.h"
 
 #include "servers/rendering/dummy/rasterizer_dummy.h"
 
diff --git a/tests/scene/test_viewport.h b/tests/scene/test_viewport.h
index 4154440d457..43f03699ce2 100644
--- a/tests/scene/test_viewport.h
+++ b/tests/scene/test_viewport.h
@@ -40,7 +40,7 @@
 #include "scene/2d/physics/area_2d.h"
 #include "scene/2d/physics/collision_shape_2d.h"
 #include "scene/resources/2d/rectangle_shape_2d.h"
-#include "servers/physics_server_2d_dummy.h"
+#include "servers/physics_2d/physics_server_2d_dummy.h"
 #endif // PHYSICS_2D_DISABLED
 
 #include "tests/test_macros.h"
diff --git a/tests/servers/test_nav_heap.h b/tests/servers/test_nav_heap.h
index 2e21706dcce..919049e7ad2 100644
--- a/tests/servers/test_nav_heap.h
+++ b/tests/servers/test_nav_heap.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "servers/navigation/nav_heap.h"
+#include "servers/nav_heap.h"
 
 #include "tests/test_macros.h"
 
diff --git a/tests/servers/test_navigation_server_2d.h b/tests/servers/test_navigation_server_2d.h
index 67b2ed01a71..f8b0587b28f 100644
--- a/tests/servers/test_navigation_server_2d.h
+++ b/tests/servers/test_navigation_server_2d.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "modules/navigation_2d/nav_utils_2d.h"
-#include "servers/navigation_server_2d.h"
+#include "servers/navigation_2d/navigation_server_2d.h"
 
 #include "scene/2d/polygon_2d.h"
 
diff --git a/tests/servers/test_navigation_server_3d.h b/tests/servers/test_navigation_server_3d.h
index 1dd26c3faf9..f16ed014dd7 100644
--- a/tests/servers/test_navigation_server_3d.h
+++ b/tests/servers/test_navigation_server_3d.h
@@ -32,7 +32,7 @@
 
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/resources/3d/primitive_meshes.h"
-#include "servers/navigation_server_3d.h"
+#include "servers/navigation_3d/navigation_server_3d.h"
 
 namespace TestNavigationServer3D {
 
diff --git a/tests/servers/test_text_server.h b/tests/servers/test_text_server.h
index e28c28c3ed5..c1228d4c6a5 100644
--- a/tests/servers/test_text_server.h
+++ b/tests/servers/test_text_server.h
@@ -33,7 +33,7 @@
 #ifdef TOOLS_ENABLED
 
 #include "editor/themes/builtin_fonts.gen.h"
-#include "servers/text_server.h"
+#include "servers/text/text_server.h"
 #include "tests/test_macros.h"
 
 namespace TestTextServer {
diff --git a/tests/test_main.cpp b/tests/test_main.cpp
index 322a714fd3b..725e8197c24 100644
--- a/tests/test_main.cpp
+++ b/tests/test_main.cpp
@@ -209,19 +209,19 @@
 #include "scene/theme/theme_db.h"
 
 #ifndef NAVIGATION_2D_DISABLED
-#include "servers/navigation_server_2d.h"
+#include "servers/navigation_2d/navigation_server_2d.h"
 #endif // NAVIGATION_2D_DISABLED
 #ifndef NAVIGATION_3D_DISABLED
-#include "servers/navigation_server_3d.h"
+#include "servers/navigation_3d/navigation_server_3d.h"
 #endif // NAVIGATION_3D_DISABLED
 
 #ifndef PHYSICS_2D_DISABLED
-#include "servers/physics_server_2d.h"
-#include "servers/physics_server_2d_dummy.h"
+#include "servers/physics_2d/physics_server_2d.h"
+#include "servers/physics_2d/physics_server_2d_dummy.h"
 #endif // PHYSICS_2D_DISABLED
 #ifndef PHYSICS_3D_DISABLED
-#include "servers/physics_server_3d.h"
-#include "servers/physics_server_3d_dummy.h"
+#include "servers/physics_3d/physics_server_3d.h"
+#include "servers/physics_3d/physics_server_3d_dummy.h"
 #endif // PHYSICS_3D_DISABLED
 
 #include "servers/rendering/rendering_server_default.h"