Move server files into their subfolders

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;

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);

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;

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;

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);

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;
 

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() {

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;

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;

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;

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.

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);

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);

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;
 

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;

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);

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

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);