diff --git a/core/register_core_types.cpp b/core/register_core_types.cpp
index d1e920262..1b27dd51c 100644
--- a/core/register_core_types.cpp
+++ b/core/register_core_types.cpp
@@ -82,6 +82,7 @@
 
 #include "core/servers/rendering/rendering_server.h"
 #include "core/servers/physics/physics_server.h"
+#include "core/servers/physics_2d/physics_2d_server.h"
 
 static Ref<ResourceFormatSaverBinary> resource_saver_binary;
 static Ref<ResourceFormatLoaderBinary> resource_loader_binary;
@@ -302,6 +303,7 @@ void register_core_singletons() {
 	ClassDB::register_class<_ScriptServer>();
 	ClassDB::register_virtual_class<RenderingServer>();
 	ClassDB::register_virtual_class<PhysicsServer>();
+	ClassDB::register_virtual_class<Physics2DServer>();
 
 	Engine::get_singleton()->add_singleton(Engine::Singleton("ProjectSettings", ProjectSettings::get_singleton()));
 	Engine::get_singleton()->add_singleton(Engine::Singleton("IP", IP::get_singleton()));
@@ -322,6 +324,7 @@ void register_core_singletons() {
 	Engine::get_singleton()->add_singleton(Engine::Singleton("ScriptServer", _ScriptServer::get_singleton()));
 	Engine::get_singleton()->add_singleton(Engine::Singleton("RenderingServer", RenderingServer::get_singleton()));
 	Engine::get_singleton()->add_singleton(Engine::Singleton("PhysicsServer", PhysicsServer::get_singleton()));
+	Engine::get_singleton()->add_singleton(Engine::Singleton("Physics2DServer", Physics2DServer::get_singleton()));
 }
 
 void unregister_core_types() {
diff --git a/core/servers/SCsub b/core/servers/SCsub
index 5e783795e..8656cfb9b 100644
--- a/core/servers/SCsub
+++ b/core/servers/SCsub
@@ -4,4 +4,5 @@ Import("env")
 
 env.add_source_files(env.core_sources, "rendering/*.cpp")
 env.add_source_files(env.core_sources, "physics/*.cpp")
+env.add_source_files(env.core_sources, "physics_2d/*.cpp")
 #env.add_source_files(env.core_sources, "*.cpp")
diff --git a/servers/physics_2d_server.cpp b/core/servers/physics_2d/physics_2d_server.cpp
similarity index 100%
rename from servers/physics_2d_server.cpp
rename to core/servers/physics_2d/physics_2d_server.cpp
diff --git a/servers/physics_2d_server.h b/core/servers/physics_2d/physics_2d_server.h
similarity index 100%
rename from servers/physics_2d_server.h
rename to core/servers/physics_2d/physics_2d_server.h
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index e67c7a6e5..c4c1fe31f 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -188,7 +188,7 @@
 #include "scene/resources/packed_scene.h"
 #include "scene/resources/world_3d.h"
 #include "servers/navigation_server.h"
-#include "servers/physics_2d_server.h"
+#include "core/servers/physics_2d/physics_2d_server.h"
 #include "core/servers/physics/physics_server.h"
 #include "core/servers/rendering/rendering_server.h"
 
diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp
index d7f76ef0c..dbf08a348 100644
--- a/editor/project_manager.cpp
+++ b/editor/project_manager.cpp
@@ -85,7 +85,7 @@
 #include "scene/main/scene_tree.h"
 #include "scene/resources/texture.h"
 #include "servers/navigation_server.h"
-#include "servers/physics_2d_server.h"
+#include "core/servers/physics_2d/physics_2d_server.h"
 #include "core/servers/physics/physics_server.h"
 #include "thirdparty/minizip/ioapi.h"
 #include "thirdparty/minizip/unzip.h"
diff --git a/main/main.cpp b/main/main.cpp
index 43c7233ce..dae21c10a 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -67,7 +67,7 @@
 #include "servers/navigation/navigation_mesh_generator_dummy.h"
 #include "servers/navigation_2d_server.h"
 #include "servers/navigation_server.h"
-#include "servers/physics_2d_server.h"
+#include "core/servers/physics_2d/physics_2d_server.h"
 #include "core/servers/physics/physics_server.h"
 #include "servers/register_server_types.h"
 #include "core/servers/rendering/rendering_server_callbacks.h"
diff --git a/main/performance.cpp b/main/performance.cpp
index 22f9558f7..1074274f0 100644
--- a/main/performance.cpp
+++ b/main/performance.cpp
@@ -36,7 +36,7 @@
 #include "scene/main/scene_tree.h"
 #include "servers/audio_server.h"
 #include "servers/navigation_server.h"
-#include "servers/physics_2d_server.h"
+#include "core/servers/physics_2d/physics_2d_server.h"
 #include "core/servers/physics/physics_server.h"
 #include "core/servers/rendering/rendering_server.h"
 
diff --git a/main/tests/test_physics_2d.cpp b/main/tests/test_physics_2d.cpp
index 1b66800fd..1db1baaad 100644
--- a/main/tests/test_physics_2d.cpp
+++ b/main/tests/test_physics_2d.cpp
@@ -35,7 +35,7 @@
 #include "core/os/os.h"
 #include "core/string/print_string.h"
 #include "scene/resources/texture.h"
-#include "servers/physics_2d_server.h"
+#include "core/servers/physics_2d/physics_2d_server.h"
 #include "core/servers/rendering/rendering_server.h"
 
 static const unsigned char convex_png[] = {
diff --git a/modules/terraman_2d/meshers/default/terrain_2d_mesher_default.cpp b/modules/terraman_2d/meshers/default/terrain_2d_mesher_default.cpp
index 929ff6922..ba8260e5d 100644
--- a/modules/terraman_2d/meshers/default/terrain_2d_mesher_default.cpp
+++ b/modules/terraman_2d/meshers/default/terrain_2d_mesher_default.cpp
@@ -31,7 +31,7 @@ SOFTWARE.
 #include "core/servers/rendering/rendering_server.h"
 
 #include "scene/resources/world_2d.h"
-#include "servers/physics_2d_server.h"
+#include "core/servers/physics_2d/physics_2d_server.h"
 
 _FORCE_INLINE_ int Terrain2DMesherDefault::get_build_flags() const {
 	return _build_flags;
diff --git a/modules/terraman_2d/meshers/terrain_2d_mesher.cpp b/modules/terraman_2d/meshers/terrain_2d_mesher.cpp
index d8f826d20..773ea2e97 100644
--- a/modules/terraman_2d/meshers/terrain_2d_mesher.cpp
+++ b/modules/terraman_2d/meshers/terrain_2d_mesher.cpp
@@ -29,7 +29,7 @@ SOFTWARE.
 #include "../world/default/terrain_2d_chunk_default.h"
 #include "../world/terrain_2d_chunk.h"
 #include "scene/resources/shapes_2d/rectangle_shape_2d.h"
-#include "servers/physics_2d_server.h"
+#include "core/servers/physics_2d/physics_2d_server.h"
 
 #include "modules/modules_enabled.gen.h"
 
diff --git a/modules/terraman_2d/world/default/terrain_2d_chunk_default.cpp b/modules/terraman_2d/world/default/terrain_2d_chunk_default.cpp
index 4368f82b1..eca18c776 100644
--- a/modules/terraman_2d/world/default/terrain_2d_chunk_default.cpp
+++ b/modules/terraman_2d/world/default/terrain_2d_chunk_default.cpp
@@ -40,7 +40,7 @@ SOFTWARE.
 #include "../jobs/terrain_2d_terrain_job.h"
 #include "scene/resources/world_3d.h"
 #include "scene/resources/world_2d.h"
-#include "servers/physics_2d_server.h"
+#include "core/servers/physics_2d/physics_2d_server.h"
 
 const String Terrain2DChunkDefault::BINDING_STRING_BUILD_FLAGS = "Use Lighting,Use AO,Use RAO,Generate AO,Generate RAO,Bake Lights,Create Collider";
 
diff --git a/modules/terraman_2d/world/jobs/terrain_2d_terrain_job.cpp b/modules/terraman_2d/world/jobs/terrain_2d_terrain_job.cpp
index f6324dc4e..585392177 100644
--- a/modules/terraman_2d/world/jobs/terrain_2d_terrain_job.cpp
+++ b/modules/terraman_2d/world/jobs/terrain_2d_terrain_job.cpp
@@ -30,7 +30,7 @@ SOFTWARE.
 #include "../../meshers/terrain_2d_mesher.h"
 
 #include "../default/terrain_2d_chunk_default.h"
-#include "servers/physics_2d_server.h"
+#include "core/servers/physics_2d/physics_2d_server.h"
 
 #include "modules/modules_enabled.gen.h"
 
diff --git a/modules/tile_map/tile_map.cpp b/modules/tile_map/tile_map.cpp
index deba5620b..d3d21265e 100644
--- a/modules/tile_map/tile_map.cpp
+++ b/modules/tile_map/tile_map.cpp
@@ -37,7 +37,7 @@
 #include "scene/2d/collision_object_2d.h"
 #include "scene/resources/world_2d.h"
 #include "servers/navigation_2d_server.h"
-#include "servers/physics_2d_server.h"
+#include "core/servers/physics_2d/physics_2d_server.h"
 #include "servers/rendering/rendering_server_canvas_helper.h"
 
 #ifdef DEBUG_ENABLED
diff --git a/scene/2d/area_2d.cpp b/scene/2d/area_2d.cpp
index 76d521b42..5849fdb7c 100644
--- a/scene/2d/area_2d.cpp
+++ b/scene/2d/area_2d.cpp
@@ -32,7 +32,7 @@
 #include "scene/resources/world_3d.h"
 #include "scene/main/scene_string_names.h"
 #include "servers/audio_server.h"
-#include "servers/physics_2d_server.h"
+#include "core/servers/physics_2d/physics_2d_server.h"
 
 void Area2D::set_space_override_mode(SpaceOverride p_mode) {
 	space_override = p_mode;
diff --git a/scene/2d/audio_stream_player_2d.cpp b/scene/2d/audio_stream_player_2d.cpp
index d2c45b239..c74491b3b 100644
--- a/scene/2d/audio_stream_player_2d.cpp
+++ b/scene/2d/audio_stream_player_2d.cpp
@@ -38,7 +38,7 @@
 #include "scene/resources/world_2d.h"
 #include "servers/audio/audio_stream.h"
 #include "servers/audio_server.h"
-#include "servers/physics_2d_server.h"
+#include "core/servers/physics_2d/physics_2d_server.h"
 
 void AudioStreamPlayer2D::_mix_audio() {
 	if (!stream_playback.is_valid() || !active.is_set() ||
diff --git a/scene/2d/collision_object_2d.cpp b/scene/2d/collision_object_2d.cpp
index 1784d4e65..22ebf45c3 100644
--- a/scene/2d/collision_object_2d.cpp
+++ b/scene/2d/collision_object_2d.cpp
@@ -32,7 +32,7 @@
 
 #include "scene/resources/world_2d.h"
 #include "scene/main/scene_string_names.h"
-#include "servers/physics_2d_server.h"
+#include "core/servers/physics_2d/physics_2d_server.h"
 
 void CollisionObject2D::_notification(int p_what) {
 	switch (p_what) {
diff --git a/scene/2d/joints_2d.cpp b/scene/2d/joints_2d.cpp
index d32238c92..58ca1ac18 100644
--- a/scene/2d/joints_2d.cpp
+++ b/scene/2d/joints_2d.cpp
@@ -33,7 +33,7 @@
 #include "core/config/engine.h"
 #include "physics_body_2d.h"
 #include "scene/main/scene_string_names.h"
-#include "servers/physics_2d_server.h"
+#include "core/servers/physics_2d/physics_2d_server.h"
 
 void Joint2D::_disconnect_signals() {
 	Node *node_a = get_node_or_null(a);
diff --git a/scene/2d/physics_body_2d.cpp b/scene/2d/physics_body_2d.cpp
index 6086aae11..68d2472b1 100644
--- a/scene/2d/physics_body_2d.cpp
+++ b/scene/2d/physics_body_2d.cpp
@@ -40,7 +40,7 @@
 #include "core/containers/rid.h"
 #include "scene/resources/physics_material.h"
 #include "scene/main/scene_string_names.h"
-#include "servers/physics_2d_server.h"
+#include "core/servers/physics_2d/physics_2d_server.h"
 
 void PhysicsBody2D::_notification(int p_what) {
 }
diff --git a/scene/2d/physics_body_2d.h b/scene/2d/physics_body_2d.h
index de6dda178..d4d9a9dce 100644
--- a/scene/2d/physics_body_2d.h
+++ b/scene/2d/physics_body_2d.h
@@ -32,7 +32,7 @@
 
 #include "core/containers/vset.h"
 #include "scene/2d/collision_object_2d.h"
-#include "servers/physics_2d_server.h"
+#include "core/servers/physics_2d/physics_2d_server.h"
 
 class PhysicsMaterial;
 class KinematicCollision2D;
diff --git a/scene/2d/ray_cast_2d.cpp b/scene/2d/ray_cast_2d.cpp
index 22904690d..bc6af15b2 100644
--- a/scene/2d/ray_cast_2d.cpp
+++ b/scene/2d/ray_cast_2d.cpp
@@ -34,7 +34,7 @@
 #include "core/config/engine.h"
 #include "physics_body_2d.h"
 #include "scene/resources/world_2d.h"
-#include "servers/physics_2d_server.h"
+#include "core/servers/physics_2d/physics_2d_server.h"
 
 void RayCast2D::set_cast_to(const Vector2 &p_point) {
 	cast_to = p_point;
diff --git a/scene/2d/shape_cast_2d.cpp b/scene/2d/shape_cast_2d.cpp
index c75462323..8c3b26420 100644
--- a/scene/2d/shape_cast_2d.cpp
+++ b/scene/2d/shape_cast_2d.cpp
@@ -35,7 +35,7 @@
 #include "scene/2d/collision_object_2d.h"
 #include "scene/2d/physics_body_2d.h"
 #include "scene/resources/shapes_2d/circle_shape_2d.h"
-#include "servers/physics_2d_server.h"
+#include "core/servers/physics_2d/physics_2d_server.h"
 
 void ShapeCast2D::set_target_position(const Vector2 &p_point) {
 	target_position = p_point;
diff --git a/scene/main/scene_tree.cpp b/scene/main/scene_tree.cpp
index cd3124602..d0b4ec8e4 100644
--- a/scene/main/scene_tree.cpp
+++ b/scene/main/scene_tree.cpp
@@ -53,7 +53,7 @@
 #include "scene/main/scene_string_names.h"
 #include "servers/audio_server.h"
 #include "servers/navigation_server.h"
-#include "servers/physics_2d_server.h"
+#include "core/servers/physics_2d/physics_2d_server.h"
 #include "core/servers/physics/physics_server.h"
 #include "viewport.h"
 
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index f846844d1..134b577ef 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -56,7 +56,7 @@
 #include "scene/resources/world_2d.h"
 #include "scene/resources/world_3d.h"
 #include "scene/main/scene_string_names.h"
-#include "servers/physics_2d_server.h"
+#include "core/servers/physics_2d/physics_2d_server.h"
 
 void ViewportTexture::setup_local_to_scene() {
 	Node *local_scene = get_local_scene();
diff --git a/scene/resources/shapes_2d/capsule_shape_2d.cpp b/scene/resources/shapes_2d/capsule_shape_2d.cpp
index a6cb96f7c..a7d88a988 100644
--- a/scene/resources/shapes_2d/capsule_shape_2d.cpp
+++ b/scene/resources/shapes_2d/capsule_shape_2d.cpp
@@ -30,7 +30,7 @@
 
 #include "capsule_shape_2d.h"
 
-#include "servers/physics_2d_server.h"
+#include "core/servers/physics_2d/physics_2d_server.h"
 #include "core/servers/rendering/rendering_server.h"
 
 Vector<Vector2> CapsuleShape2D::get_points() const {
diff --git a/scene/resources/shapes_2d/circle_shape_2d.cpp b/scene/resources/shapes_2d/circle_shape_2d.cpp
index 491f527fb..1f2c6a0e2 100644
--- a/scene/resources/shapes_2d/circle_shape_2d.cpp
+++ b/scene/resources/shapes_2d/circle_shape_2d.cpp
@@ -30,7 +30,7 @@
 
 #include "circle_shape_2d.h"
 
-#include "servers/physics_2d_server.h"
+#include "core/servers/physics_2d/physics_2d_server.h"
 #include "core/servers/rendering/rendering_server.h"
 
 bool CircleShape2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const {
diff --git a/scene/resources/shapes_2d/concave_polygon_shape_2d.cpp b/scene/resources/shapes_2d/concave_polygon_shape_2d.cpp
index 0abe736d4..7395fe463 100644
--- a/scene/resources/shapes_2d/concave_polygon_shape_2d.cpp
+++ b/scene/resources/shapes_2d/concave_polygon_shape_2d.cpp
@@ -30,7 +30,7 @@
 
 #include "concave_polygon_shape_2d.h"
 
-#include "servers/physics_2d_server.h"
+#include "core/servers/physics_2d/physics_2d_server.h"
 #include "core/servers/rendering/rendering_server.h"
 
 bool ConcavePolygonShape2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const {
diff --git a/scene/resources/shapes_2d/convex_polygon_shape_2d.cpp b/scene/resources/shapes_2d/convex_polygon_shape_2d.cpp
index e1abafcd3..99dcbf2ef 100644
--- a/scene/resources/shapes_2d/convex_polygon_shape_2d.cpp
+++ b/scene/resources/shapes_2d/convex_polygon_shape_2d.cpp
@@ -31,7 +31,7 @@
 #include "convex_polygon_shape_2d.h"
 
 #include "core/math/geometry.h"
-#include "servers/physics_2d_server.h"
+#include "core/servers/physics_2d/physics_2d_server.h"
 #include "core/servers/rendering/rendering_server.h"
 
 bool ConvexPolygonShape2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const {
diff --git a/scene/resources/shapes_2d/line_shape_2d.cpp b/scene/resources/shapes_2d/line_shape_2d.cpp
index 971d36acf..fddb1a39b 100644
--- a/scene/resources/shapes_2d/line_shape_2d.cpp
+++ b/scene/resources/shapes_2d/line_shape_2d.cpp
@@ -30,7 +30,7 @@
 
 #include "line_shape_2d.h"
 
-#include "servers/physics_2d_server.h"
+#include "core/servers/physics_2d/physics_2d_server.h"
 #include "core/servers/rendering/rendering_server.h"
 
 bool LineShape2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const {
diff --git a/scene/resources/shapes_2d/rectangle_shape_2d.cpp b/scene/resources/shapes_2d/rectangle_shape_2d.cpp
index a755b4c21..9f80dae8f 100644
--- a/scene/resources/shapes_2d/rectangle_shape_2d.cpp
+++ b/scene/resources/shapes_2d/rectangle_shape_2d.cpp
@@ -30,7 +30,7 @@
 
 #include "rectangle_shape_2d.h"
 
-#include "servers/physics_2d_server.h"
+#include "core/servers/physics_2d/physics_2d_server.h"
 #include "core/servers/rendering/rendering_server.h"
 void RectangleShape2D::_update_shape() {
 	Physics2DServer::get_singleton()->shape_set_data(get_rid(), extents);
diff --git a/scene/resources/shapes_2d/segment_shape_2d.cpp b/scene/resources/shapes_2d/segment_shape_2d.cpp
index 41941d19d..716add6f4 100644
--- a/scene/resources/shapes_2d/segment_shape_2d.cpp
+++ b/scene/resources/shapes_2d/segment_shape_2d.cpp
@@ -30,7 +30,7 @@
 
 #include "segment_shape_2d.h"
 
-#include "servers/physics_2d_server.h"
+#include "core/servers/physics_2d/physics_2d_server.h"
 #include "core/servers/rendering/rendering_server.h"
 
 bool SegmentShape2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const {
diff --git a/scene/resources/shapes_2d/shape_2d.cpp b/scene/resources/shapes_2d/shape_2d.cpp
index 806c62ed6..21a795ec8 100644
--- a/scene/resources/shapes_2d/shape_2d.cpp
+++ b/scene/resources/shapes_2d/shape_2d.cpp
@@ -32,7 +32,7 @@
 
 #include "core/config/engine.h"
 #include "core/config/project_settings.h"
-#include "servers/physics_2d_server.h"
+#include "core/servers/physics_2d/physics_2d_server.h"
 
 RID Shape2D::get_rid() const {
 	return shape;
diff --git a/scene/resources/world_2d.cpp b/scene/resources/world_2d.cpp
index 9a54bd0c0..01a7c428c 100644
--- a/scene/resources/world_2d.cpp
+++ b/scene/resources/world_2d.cpp
@@ -36,7 +36,7 @@
 #include "scene/main/viewport.h"
 #include "scene/main/world.h"
 #include "servers/navigation_2d_server.h"
-#include "servers/physics_2d_server.h"
+#include "core/servers/physics_2d/physics_2d_server.h"
 #include "core/servers/rendering/rendering_server.h"
 
 struct SpatialIndexer2D {
diff --git a/scene/resources/world_2d.h b/scene/resources/world_2d.h
index ad740b219..e85069e15 100644
--- a/scene/resources/world_2d.h
+++ b/scene/resources/world_2d.h
@@ -32,7 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/object/resource.h"
-#include "servers/physics_2d_server.h"
+#include "core/servers/physics_2d/physics_2d_server.h"
 
 class VisibilityNotifier2D;
 class Viewport;
diff --git a/servers/physics_2d/area_2d_sw.h b/servers/physics_2d/area_2d_sw.h
index 9c39890df..32f381e50 100644
--- a/servers/physics_2d/area_2d_sw.h
+++ b/servers/physics_2d/area_2d_sw.h
@@ -32,7 +32,7 @@
 
 #include "collision_object_2d_sw.h"
 #include "core/containers/self_list.h"
-#include "servers/physics_2d_server.h"
+#include "core/servers/physics_2d/physics_2d_server.h"
 //#include "servers/physics/query_sw.h"
 
 class Space2DSW;
diff --git a/servers/physics_2d/collision_object_2d_sw.h b/servers/physics_2d/collision_object_2d_sw.h
index 88c7e6cbe..d244e0fe5 100644
--- a/servers/physics_2d/collision_object_2d_sw.h
+++ b/servers/physics_2d/collision_object_2d_sw.h
@@ -32,7 +32,7 @@
 
 #include "broad_phase_2d_sw.h"
 #include "core/containers/self_list.h"
-#include "servers/physics_2d_server.h"
+#include "core/servers/physics_2d/physics_2d_server.h"
 #include "shape_2d_sw.h"
 
 class Space2DSW;
diff --git a/servers/physics_2d/physics_2d_server_sw.h b/servers/physics_2d/physics_2d_server_sw.h
index 3d68b3edc..e62d54bcd 100644
--- a/servers/physics_2d/physics_2d_server_sw.h
+++ b/servers/physics_2d/physics_2d_server_sw.h
@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "joints_2d_sw.h"
-#include "servers/physics_2d_server.h"
+#include "core/servers/physics_2d/physics_2d_server.h"
 #include "shape_2d_sw.h"
 #include "space_2d_sw.h"
 #include "step_2d_sw.h"
diff --git a/servers/physics_2d/physics_2d_server_wrap_mt.h b/servers/physics_2d/physics_2d_server_wrap_mt.h
index c1b445de6..b9b887b35 100644
--- a/servers/physics_2d/physics_2d_server_wrap_mt.h
+++ b/servers/physics_2d/physics_2d_server_wrap_mt.h
@@ -34,7 +34,7 @@
 #include "core/os/thread.h"
 #include "core/config/project_settings.h"
 #include "core/os/safe_refcount.h"
-#include "servers/physics_2d_server.h"
+#include "core/servers/physics_2d/physics_2d_server.h"
 
 #ifdef DEBUG_SYNC
 #define SYNC_DEBUG print_line("sync on: " + String(__FUNCTION__));
diff --git a/servers/physics_2d/shape_2d_sw.h b/servers/physics_2d/shape_2d_sw.h
index 18b0b92f0..c3e666445 100644
--- a/servers/physics_2d/shape_2d_sw.h
+++ b/servers/physics_2d/shape_2d_sw.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "servers/physics_2d_server.h"
+#include "core/servers/physics_2d/physics_2d_server.h"
 #define _SEGMENT_IS_VALID_SUPPORT_THRESHOLD 0.99998
 
 /*
diff --git a/servers/register_server_types.cpp b/servers/register_server_types.cpp
index 5a3dbd882..e4161e559 100644
--- a/servers/register_server_types.cpp
+++ b/servers/register_server_types.cpp
@@ -62,7 +62,7 @@
 #include "physics/physics_server_sw.h"
 #include "physics_2d/physics_2d_server_sw.h"
 #include "physics_2d/physics_2d_server_wrap_mt.h"
-#include "physics_2d_server.h"
+#include "core/servers/physics_2d/physics_2d_server.h"
 #include "core/servers/physics/physics_server.h"
 #include "rendering/shader_types.h"
 #include "scene/debugger/script_debugger_remote.h"
@@ -100,7 +100,6 @@ Physics2DServer *_createPandemoniumPhysics2DCallback() {
 void register_server_types() {
 	ClassDB::register_class<AudioServer>();
 	
-	ClassDB::register_virtual_class<Physics2DServer>();
 	ClassDB::register_virtual_class<NavigationServer>();
 	ClassDB::register_virtual_class<Navigation2DServer>();
 	//ClassDB::register_class<NavigationMeshGeneratorManager>();
@@ -209,7 +208,6 @@ void unregister_server_types() {
 
 void register_server_singletons() {
 	Engine::get_singleton()->add_singleton(Engine::Singleton("AudioServer", AudioServer::get_singleton()));
-	Engine::get_singleton()->add_singleton(Engine::Singleton("Physics2DServer", Physics2DServer::get_singleton()));
 	Engine::get_singleton()->add_singleton(Engine::Singleton("NavigationServer", NavigationServer::get_singleton()));
 	Engine::get_singleton()->add_singleton(Engine::Singleton("Navigation2DServer", Navigation2DServer::get_singleton()));
 }