diff --git a/editor/import/resource_importer_scene.cpp b/editor/import/resource_importer_scene.cpp
index 8f7997a9d..4ae53821b 100644
--- a/editor/import/resource_importer_scene.cpp
+++ b/editor/import/resource_importer_scene.cpp
@@ -43,7 +43,7 @@
 #include "scene/animation/animation.h"
 #include "scene/resources/shapes/box_shape.h"
 #include "scene/resources/mesh.h"
-#include "scene/resources/navigation_mesh.h"
+#include "scene/resources/navigation/navigation_mesh.h"
 #include "scene/resources/packed_scene.h"
 #include "scene/resources/shapes/plane_shape.h"
 #include "scene/resources/shapes/ray_shape.h"
diff --git a/editor/plugins/mesh_instance_editor_plugin.cpp b/editor/plugins/mesh_instance_editor_plugin.cpp
index 05b77a68c..fc2cf434b 100644
--- a/editor/plugins/mesh_instance_editor_plugin.cpp
+++ b/editor/plugins/mesh_instance_editor_plugin.cpp
@@ -60,7 +60,7 @@
 #include "scene/main/node.h"
 #include "scene/main/scene_tree.h"
 #include "scene/resources/mesh.h"
-#include "scene/resources/navigation_mesh.h"
+#include "scene/resources/navigation/navigation_mesh.h"
 #include "scene/resources/shapes/shape.h"
 #include "spatial_editor_plugin.h"
 
diff --git a/editor/spatial_editor_gizmos.cpp b/editor/spatial_editor_gizmos.cpp
index fcc3bf473..78afa658e 100644
--- a/editor/spatial_editor_gizmos.cpp
+++ b/editor/spatial_editor_gizmos.cpp
@@ -93,7 +93,7 @@
 #include "scene/resources/shapes/cylinder_shape.h"
 #include "scene/resources/shapes/height_map_shape.h"
 #include "scene/resources/material.h"
-#include "scene/resources/navigation_mesh.h"
+#include "scene/resources/navigation/navigation_mesh.h"
 #include "scene/resources/occluder_shape.h"
 #include "scene/resources/occluder_shape_polygon.h"
 #include "scene/resources/shapes/plane_shape.h"
diff --git a/modules/csg/geometry_parser/csgshape3d_navigation_geometry_parser_3d.cpp b/modules/csg/geometry_parser/csgshape3d_navigation_geometry_parser_3d.cpp
index 1a953e73d..537ef4e67 100644
--- a/modules/csg/geometry_parser/csgshape3d_navigation_geometry_parser_3d.cpp
+++ b/modules/csg/geometry_parser/csgshape3d_navigation_geometry_parser_3d.cpp
@@ -30,8 +30,8 @@
 
 #include "csgshape3d_navigation_geometry_parser_3d.h"
 
-#include "scene/resources/navigation_mesh.h"
-#include "scene/resources/navigation_mesh_source_geometry_data_3d.h"
+#include "scene/resources/navigation/navigation_mesh.h"
+#include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h"
 #include "scene/resources/mesh.h"
 
 #include "modules/csg/csg_shape.h"
diff --git a/modules/gridmap/geometry_parser/gridmap_navigation_geometry_parser_3d.cpp b/modules/gridmap/geometry_parser/gridmap_navigation_geometry_parser_3d.cpp
index 890a42564..11b1b9133 100644
--- a/modules/gridmap/geometry_parser/gridmap_navigation_geometry_parser_3d.cpp
+++ b/modules/gridmap/geometry_parser/gridmap_navigation_geometry_parser_3d.cpp
@@ -41,8 +41,8 @@
 #include "scene/resources/shapes/convex_polygon_shape.h"
 #include "scene/resources/shapes/cylinder_shape.h"
 #include "scene/resources/shapes/height_map_shape.h"
-#include "scene/resources/navigation_mesh.h"
-#include "scene/resources/navigation_mesh_source_geometry_data_3d.h"
+#include "scene/resources/navigation/navigation_mesh.h"
+#include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h"
 #include "scene/resources/shapes/plane_shape.h"
 #include "scene/resources/primitive_meshes.h"
 #include "scene/resources/shapes/shape.h"
diff --git a/modules/gridmap/grid_map.cpp b/modules/gridmap/grid_map.cpp
index 11f0c223f..281a77ba6 100644
--- a/modules/gridmap/grid_map.cpp
+++ b/modules/gridmap/grid_map.cpp
@@ -41,7 +41,7 @@
 #include "servers/navigation_server.h"
 #include "servers/rendering_server.h"
 
-#include "scene/resources/navigation_mesh.h"
+#include "scene/resources/navigation/navigation_mesh.h"
 #include "scene/resources/world_3d.h"
 
 bool GridMap::_set(const StringName &p_name, const Variant &p_value) {
diff --git a/modules/gridmap/mesh_library.cpp b/modules/gridmap/mesh_library.cpp
index bbe245080..b97685fd2 100644
--- a/modules/gridmap/mesh_library.cpp
+++ b/modules/gridmap/mesh_library.cpp
@@ -31,7 +31,7 @@
 #include "mesh_library.h"
 
 #include "scene/resources/shapes/box_shape.h"
-#include "scene/resources/navigation_mesh.h"
+#include "scene/resources/navigation/navigation_mesh.h"
 
 MeshLibrary::Item::Item() {
 	navigation_layers = 1;
diff --git a/modules/gridmap/mesh_library_editor_plugin.cpp b/modules/gridmap/mesh_library_editor_plugin.cpp
index 300b2d318..ca89c8545 100644
--- a/modules/gridmap/mesh_library_editor_plugin.cpp
+++ b/modules/gridmap/mesh_library_editor_plugin.cpp
@@ -49,7 +49,7 @@
 
 #include "mesh_library.h"
 
-#include "scene/resources/navigation_mesh.h"
+#include "scene/resources/navigation/navigation_mesh.h"
 
 void MeshLibraryEditor::edit(const Ref<MeshLibrary> &p_mesh_library) {
 	mesh_library = p_mesh_library;
diff --git a/modules/navigation/nav_map.cpp b/modules/navigation/nav_map.cpp
index 6c7ffa1b2..e38cc8039 100644
--- a/modules/navigation/nav_map.cpp
+++ b/modules/navigation/nav_map.cpp
@@ -37,7 +37,7 @@
 #include "nav_obstacle.h"
 #include "nav_region.h"
 #include "scene/resources/mesh.h"
-#include "scene/resources/navigation_mesh.h"
+#include "scene/resources/navigation/navigation_mesh.h"
 
 #include <Obstacle2d.h>
 
diff --git a/modules/navigation/nav_region.h b/modules/navigation/nav_region.h
index a66004d71..20c519d82 100644
--- a/modules/navigation/nav_region.h
+++ b/modules/navigation/nav_region.h
@@ -35,7 +35,7 @@
 
 #include "nav_utils.h"
 #include "scene/3d/navigation.h"
-#include "scene/resources/navigation_mesh.h"
+#include "scene/resources/navigation/navigation_mesh.h"
 
 class NavRegion : public NavBase {
 	NavMap *map;
diff --git a/modules/navigation/pandemonium_navigation_2d_server.cpp b/modules/navigation/pandemonium_navigation_2d_server.cpp
index 5ca977640..17cc95d2c 100644
--- a/modules/navigation/pandemonium_navigation_2d_server.cpp
+++ b/modules/navigation/pandemonium_navigation_2d_server.cpp
@@ -32,7 +32,7 @@
 
 #include "core/math/transform.h"
 #include "core/math/transform_2d.h"
-#include "scene/resources/navigation_mesh.h"
+#include "scene/resources/navigation/navigation_mesh.h"
 #include "servers/navigation_server.h"
 
 #define FORWARD_0(FUNC_NAME)                                   \
diff --git a/modules/navigation/pandemonium_navigation_2d_server.h b/modules/navigation/pandemonium_navigation_2d_server.h
index 18289fd39..cb675f841 100644
--- a/modules/navigation/pandemonium_navigation_2d_server.h
+++ b/modules/navigation/pandemonium_navigation_2d_server.h
@@ -33,7 +33,7 @@
 
 #include "core/containers/rid.h"
 #include "core/object/object.h"
-#include "scene/resources/navigation_polygon.h"
+#include "scene/resources/navigation_2d/navigation_polygon.h"
 #include "servers/navigation_2d_server.h"
 
 // This server exposes the 3D `NavigationServer` features in the 2D world.
diff --git a/modules/navigation/pandemonium_navigation_server.cpp b/modules/navigation/pandemonium_navigation_server.cpp
index 0814fb342..2dda2502b 100644
--- a/modules/navigation/pandemonium_navigation_server.cpp
+++ b/modules/navigation/pandemonium_navigation_server.cpp
@@ -35,7 +35,7 @@
 #ifndef _3D_DISABLED
 //#include "navigation_mesh_generator.h"
 #include "scene/resources/mesh.h"
-#include "scene/resources/navigation_mesh.h"
+#include "scene/resources/navigation/navigation_mesh.h"
 #endif
 
 using namespace NavigationUtilities;
diff --git a/modules/navigation_dummy/dummy_navigation_2d_server.cpp b/modules/navigation_dummy/dummy_navigation_2d_server.cpp
index 0fc9bc586..1cb18a353 100644
--- a/modules/navigation_dummy/dummy_navigation_2d_server.cpp
+++ b/modules/navigation_dummy/dummy_navigation_2d_server.cpp
@@ -30,7 +30,7 @@
 
 #include "dummy_navigation_2d_server.h"
 
-#include "scene/resources/navigation_polygon.h"
+#include "scene/resources/navigation_2d/navigation_polygon.h"
 
 void DummyNavigation2DServer::region_set_navigation_polygon(RID p_region, Ref<NavigationPolygon> p_navigation_mesh) {
 }
diff --git a/modules/navigation_dummy/dummy_navigation_server.cpp b/modules/navigation_dummy/dummy_navigation_server.cpp
index dc57d7f6a..2fc0b42ce 100644
--- a/modules/navigation_dummy/dummy_navigation_server.cpp
+++ b/modules/navigation_dummy/dummy_navigation_server.cpp
@@ -1,7 +1,7 @@
 
 #include "dummy_navigation_server.h"
 
-#include "scene/resources/navigation_mesh.h"
+#include "scene/resources/navigation/navigation_mesh.h"
 
 void DummyNavigationServer::region_set_navigation_mesh(RID p_region, Ref<NavigationMesh> p_navigation_mesh) {
 }
diff --git a/modules/navigation_geometry_parsers/geometry_parser_2d/meshinstance2d_navigation_geometry_parser_2d.cpp b/modules/navigation_geometry_parsers/geometry_parser_2d/meshinstance2d_navigation_geometry_parser_2d.cpp
index e7e9bf27a..b3599fabc 100644
--- a/modules/navigation_geometry_parsers/geometry_parser_2d/meshinstance2d_navigation_geometry_parser_2d.cpp
+++ b/modules/navigation_geometry_parsers/geometry_parser_2d/meshinstance2d_navigation_geometry_parser_2d.cpp
@@ -33,8 +33,8 @@
 #include "scene/2d/mesh_instance_2d.h"
 #include "scene/resources/mesh.h"
 
-#include "scene/resources/navigation_mesh_source_geometry_data_2d.h"
-#include "scene/resources/navigation_polygon.h"
+#include "scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.h"
+#include "scene/resources/navigation_2d/navigation_polygon.h"
 
 bool MeshInstance2DNavigationGeometryParser2D::parses_node(Node *p_node) {
 	return (Object::cast_to<MeshInstance2D>(p_node) != nullptr);
diff --git a/modules/navigation_geometry_parsers/geometry_parser_2d/multimeshinstance2d_navigation_geometry_parser_2d.cpp b/modules/navigation_geometry_parsers/geometry_parser_2d/multimeshinstance2d_navigation_geometry_parser_2d.cpp
index 6feb4715b..5d786c04e 100644
--- a/modules/navigation_geometry_parsers/geometry_parser_2d/multimeshinstance2d_navigation_geometry_parser_2d.cpp
+++ b/modules/navigation_geometry_parsers/geometry_parser_2d/multimeshinstance2d_navigation_geometry_parser_2d.cpp
@@ -34,8 +34,8 @@
 #include "scene/2d/multimesh_instance_2d.h"
 #include "scene/resources/multimesh.h"
 
-#include "scene/resources/navigation_mesh_source_geometry_data_2d.h"
-#include "scene/resources/navigation_polygon.h"
+#include "scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.h"
+#include "scene/resources/navigation_2d/navigation_polygon.h"
 
 bool MultiMeshInstance2DNavigationGeometryParser2D::parses_node(Node *p_node) {
 	return (Object::cast_to<MultiMeshInstance2D>(p_node) != nullptr);
diff --git a/modules/navigation_geometry_parsers/geometry_parser_2d/polygon2d_navigation_geometry_parser_2d.cpp b/modules/navigation_geometry_parsers/geometry_parser_2d/polygon2d_navigation_geometry_parser_2d.cpp
index 475195a64..b1df0b76b 100644
--- a/modules/navigation_geometry_parsers/geometry_parser_2d/polygon2d_navigation_geometry_parser_2d.cpp
+++ b/modules/navigation_geometry_parsers/geometry_parser_2d/polygon2d_navigation_geometry_parser_2d.cpp
@@ -32,8 +32,8 @@
 
 #include "scene/2d/polygon_2d.h"
 
-#include "scene/resources/navigation_mesh_source_geometry_data_2d.h"
-#include "scene/resources/navigation_polygon.h"
+#include "scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.h"
+#include "scene/resources/navigation_2d/navigation_polygon.h"
 
 bool Polygon2DNavigationGeometryParser2D::parses_node(Node *p_node) {
 	return (Object::cast_to<Polygon2D>(p_node) != nullptr);
diff --git a/modules/navigation_geometry_parsers/geometry_parser_2d/staticbody2d_navigation_geometry_parser_2d.cpp b/modules/navigation_geometry_parsers/geometry_parser_2d/staticbody2d_navigation_geometry_parser_2d.cpp
index 374a77420..68331a743 100644
--- a/modules/navigation_geometry_parsers/geometry_parser_2d/staticbody2d_navigation_geometry_parser_2d.cpp
+++ b/modules/navigation_geometry_parsers/geometry_parser_2d/staticbody2d_navigation_geometry_parser_2d.cpp
@@ -40,8 +40,8 @@
 #include "scene/resources/shapes_2d/rectangle_shape_2d.h"
 #include "scene/resources/shapes_2d/shape_2d.h"
 
-#include "scene/resources/navigation_mesh_source_geometry_data_2d.h"
-#include "scene/resources/navigation_polygon.h"
+#include "scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.h"
+#include "scene/resources/navigation_2d/navigation_polygon.h"
 
 bool StaticBody2DNavigationGeometryParser2D::parses_node(Node *p_node) {
 	return (Object::cast_to<StaticBody2D>(p_node) != nullptr);
diff --git a/modules/navigation_geometry_parsers/geometry_parser_3d/meshinstance3d_navigation_geometry_parser_3d.cpp b/modules/navigation_geometry_parsers/geometry_parser_3d/meshinstance3d_navigation_geometry_parser_3d.cpp
index ac6851397..697005f6c 100644
--- a/modules/navigation_geometry_parsers/geometry_parser_3d/meshinstance3d_navigation_geometry_parser_3d.cpp
+++ b/modules/navigation_geometry_parsers/geometry_parser_3d/meshinstance3d_navigation_geometry_parser_3d.cpp
@@ -32,8 +32,8 @@
 
 #include "scene/3d/mesh_instance.h"
 #include "scene/resources/mesh.h"
-#include "scene/resources/navigation_mesh.h"
-#include "scene/resources/navigation_mesh_source_geometry_data_3d.h"
+#include "scene/resources/navigation/navigation_mesh.h"
+#include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h"
 
 bool MeshInstance3DNavigationGeometryParser3D::parses_node(Node *p_node) {
 	return (Object::cast_to<MeshInstance>(p_node) != nullptr);
diff --git a/modules/navigation_geometry_parsers/geometry_parser_3d/multimeshinstance3d_navigation_geometry_parser_3d.cpp b/modules/navigation_geometry_parsers/geometry_parser_3d/multimeshinstance3d_navigation_geometry_parser_3d.cpp
index 34f426b5f..bb1362697 100644
--- a/modules/navigation_geometry_parsers/geometry_parser_3d/multimeshinstance3d_navigation_geometry_parser_3d.cpp
+++ b/modules/navigation_geometry_parsers/geometry_parser_3d/multimeshinstance3d_navigation_geometry_parser_3d.cpp
@@ -33,8 +33,8 @@
 #include "scene/3d/multimesh_instance.h"
 #include "scene/resources/mesh.h"
 #include "scene/resources/multimesh.h"
-#include "scene/resources/navigation_mesh.h"
-#include "scene/resources/navigation_mesh_source_geometry_data_3d.h"
+#include "scene/resources/navigation/navigation_mesh.h"
+#include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h"
 
 bool MultiMeshInstance3DNavigationGeometryParser3D::parses_node(Node *p_node) {
 	return (Object::cast_to<MultiMeshInstance>(p_node) != nullptr);
diff --git a/modules/navigation_geometry_parsers/geometry_parser_3d/staticbody3d_navigation_geometry_parser_3d.cpp b/modules/navigation_geometry_parsers/geometry_parser_3d/staticbody3d_navigation_geometry_parser_3d.cpp
index 4e52fca3a..8b41413eb 100644
--- a/modules/navigation_geometry_parsers/geometry_parser_3d/staticbody3d_navigation_geometry_parser_3d.cpp
+++ b/modules/navigation_geometry_parsers/geometry_parser_3d/staticbody3d_navigation_geometry_parser_3d.cpp
@@ -44,8 +44,8 @@
 #include "scene/resources/shapes/shape.h"
 #include "scene/resources/shapes/sphere_shape.h"
 
-#include "scene/resources/navigation_mesh.h"
-#include "scene/resources/navigation_mesh_source_geometry_data_3d.h"
+#include "scene/resources/navigation/navigation_mesh.h"
+#include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h"
 
 bool StaticBody3DNavigationGeometryParser3D::parses_node(Node *p_node) {
 	return (Object::cast_to<StaticBody>(p_node) != nullptr);
diff --git a/modules/navigation_mesh_generator/editor/navigation_mesh_editor_plugin.cpp b/modules/navigation_mesh_generator/editor/navigation_mesh_editor_plugin.cpp
index d168c1212..eaafb94f0 100644
--- a/modules/navigation_mesh_generator/editor/navigation_mesh_editor_plugin.cpp
+++ b/modules/navigation_mesh_generator/editor/navigation_mesh_editor_plugin.cpp
@@ -41,8 +41,8 @@
 #include "scene/gui/button.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/label.h"
-#include "scene/resources/navigation_mesh.h"
-#include "scene/resources/navigation_mesh_source_geometry_data_3d.h"
+#include "scene/resources/navigation/navigation_mesh.h"
+#include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h"
 #include "servers/navigation/navigation_mesh_generator.h"
 #include "scene/gui/separator.h"
 
diff --git a/modules/navigation_mesh_generator/editor/navigation_polygon_editor_plugin.cpp b/modules/navigation_mesh_generator/editor/navigation_polygon_editor_plugin.cpp
index 6f02e50fd..0bbdd2ffe 100644
--- a/modules/navigation_mesh_generator/editor/navigation_polygon_editor_plugin.cpp
+++ b/modules/navigation_mesh_generator/editor/navigation_polygon_editor_plugin.cpp
@@ -40,8 +40,8 @@
 #include "scene/gui/dialogs.h"
 #include "scene/gui/label.h"
 #include "scene/gui/option_button.h"
-#include "scene/resources/navigation_mesh_source_geometry_data_2d.h"
-#include "scene/resources/navigation_polygon.h"
+#include "scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.h"
+#include "scene/resources/navigation_2d/navigation_polygon.h"
 #include "servers/navigation/navigation_mesh_generator.h"
 #include "scene/gui/separator.h"
 
diff --git a/modules/navigation_mesh_generator/pandemonium_navigation_mesh_generator.cpp b/modules/navigation_mesh_generator/pandemonium_navigation_mesh_generator.cpp
index 48a5f86a6..f9adaca39 100644
--- a/modules/navigation_mesh_generator/pandemonium_navigation_mesh_generator.cpp
+++ b/modules/navigation_mesh_generator/pandemonium_navigation_mesh_generator.cpp
@@ -36,9 +36,9 @@
 
 #include "scene/2d/navigation_geometry_parser_2d.h"
 #include "scene/3d/navigation_geometry_parser_3d.h"
-#include "scene/resources/navigation_mesh.h"
-#include "scene/resources/navigation_mesh_source_geometry_data_2d.h"
-#include "scene/resources/navigation_mesh_source_geometry_data_3d.h"
+#include "scene/resources/navigation/navigation_mesh.h"
+#include "scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.h"
+#include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h"
 
 #ifndef _3D_DISABLED
 #include "scene/3d/mesh_instance.h"
diff --git a/modules/tile_map/geometry_parser/tilemap_navigation_geometry_parser_2d.cpp b/modules/tile_map/geometry_parser/tilemap_navigation_geometry_parser_2d.cpp
index b41d5e83b..ab40ab955 100644
--- a/modules/tile_map/geometry_parser/tilemap_navigation_geometry_parser_2d.cpp
+++ b/modules/tile_map/geometry_parser/tilemap_navigation_geometry_parser_2d.cpp
@@ -34,8 +34,8 @@
 
 #include "modules/tile_map/tile_map.h"
 #include "modules/tile_map/tile_set.h"
-#include "scene/resources/navigation_mesh_source_geometry_data_2d.h"
-#include "scene/resources/navigation_polygon.h"
+#include "scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.h"
+#include "scene/resources/navigation_2d/navigation_polygon.h"
 
 #include "modules/modules_enabled.gen.h"
 
diff --git a/modules/tile_map/tile_set.h b/modules/tile_map/tile_set.h
index 89df13003..7b7e73afc 100644
--- a/modules/tile_map/tile_set.h
+++ b/modules/tile_map/tile_set.h
@@ -37,7 +37,7 @@
 #include "scene/2d/light_occluder_2d.h"
 #include "scene/2d/navigation_polygon_instance.h"
 #include "scene/resources/shapes_2d/convex_polygon_shape_2d.h"
-#include "scene/resources/navigation_polygon.h"
+#include "scene/resources/navigation_2d/navigation_polygon.h"
 #include "scene/resources/shapes_2d/shape_2d.h"
 #include "scene/resources/texture.h"
 
diff --git a/modules/tile_map/tile_set_editor_plugin.cpp b/modules/tile_map/tile_set_editor_plugin.cpp
index 006787008..b89969c79 100644
--- a/modules/tile_map/tile_set_editor_plugin.cpp
+++ b/modules/tile_map/tile_set_editor_plugin.cpp
@@ -47,7 +47,7 @@
 #include "scene/gui/scroll_container.h"
 #include "scene/gui/separator.h"
 #include "scene/gui/spin_box.h"
-#include "scene/resources/navigation_mesh_source_geometry_data_2d.h"
+#include "scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.h"
 #include "servers/navigation/navigation_mesh_generator.h"
 
 #include "scene/gui/check_box.h"
diff --git a/scene/2d/navigation_2d.cpp b/scene/2d/navigation_2d.cpp
index 1fdff7850..f9f46e8f0 100644
--- a/scene/2d/navigation_2d.cpp
+++ b/scene/2d/navigation_2d.cpp
@@ -31,7 +31,7 @@
 #include "navigation_2d.h"
 
 #include "scene/2d/navigation_polygon_instance.h"
-#include "scene/resources/navigation_polygon.h"
+#include "scene/resources/navigation_2d/navigation_polygon.h"
 #include "servers/navigation_2d_server.h"
 
 void Navigation2D::_bind_methods() {
diff --git a/scene/2d/navigation_geometry_parser_2d.cpp b/scene/2d/navigation_geometry_parser_2d.cpp
index 822d6269a..78df5afe7 100644
--- a/scene/2d/navigation_geometry_parser_2d.cpp
+++ b/scene/2d/navigation_geometry_parser_2d.cpp
@@ -32,8 +32,8 @@
 
 #include "scene/2d/node_2d.h"
 
-#include "scene/resources/navigation_mesh_source_geometry_data_2d.h"
-#include "scene/resources/navigation_polygon.h"
+#include "scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.h"
+#include "scene/resources/navigation_2d/navigation_polygon.h"
 
 bool NavigationGeometryParser2D::parses_node(Node *p_node) {
 	if (Object::cast_to<Node2D>(p_node)) {
diff --git a/scene/2d/navigation_polygon_instance.cpp b/scene/2d/navigation_polygon_instance.cpp
index 3f86360c7..857d29369 100644
--- a/scene/2d/navigation_polygon_instance.cpp
+++ b/scene/2d/navigation_polygon_instance.cpp
@@ -38,9 +38,9 @@
 #include "core/os/os.h"
 #include "navigation_2d.h"
 #include "scene/2d/navigation_obstacle_2d.h"
-#include "scene/resources/navigation_mesh.h"
-#include "scene/resources/navigation_mesh_source_geometry_data_2d.h"
-#include "scene/resources/navigation_polygon.h"
+#include "scene/resources/navigation/navigation_mesh.h"
+#include "scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.h"
+#include "scene/resources/navigation_2d/navigation_polygon.h"
 #include "scene/resources/world_2d.h"
 #include "servers/navigation/navigation_mesh_generator.h"
 #include "servers/navigation_2d_server.h"
diff --git a/scene/3d/navigation_geometry_parser_3d.cpp b/scene/3d/navigation_geometry_parser_3d.cpp
index 622693d07..996630384 100644
--- a/scene/3d/navigation_geometry_parser_3d.cpp
+++ b/scene/3d/navigation_geometry_parser_3d.cpp
@@ -32,8 +32,8 @@
 
 #include "spatial.h"
 
-#include "scene/resources/navigation_mesh.h"
-#include "scene/resources/navigation_mesh_source_geometry_data_3d.h"
+#include "scene/resources/navigation/navigation_mesh.h"
+#include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h"
 
 #ifndef _3D_DISABLED
 bool NavigationGeometryParser3D::parses_node(Node *p_node) {
diff --git a/scene/3d/navigation_mesh_instance.cpp b/scene/3d/navigation_mesh_instance.cpp
index 239ca8649..8c71a7b30 100644
--- a/scene/3d/navigation_mesh_instance.cpp
+++ b/scene/3d/navigation_mesh_instance.cpp
@@ -35,8 +35,8 @@
 #include "mesh_instance.h"
 #include "navigation.h"
 #include "scene/resources/mesh.h"
-#include "scene/resources/navigation_mesh.h"
-#include "scene/resources/navigation_mesh_source_geometry_data_3d.h"
+#include "scene/resources/navigation/navigation_mesh.h"
+#include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h"
 #include "scene/resources/world_3d.h"
 #include "servers/navigation/navigation_mesh_generator.h"
 #include "servers/navigation_server.h"
diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp
index e9756ba04..58dab1a3a 100644
--- a/scene/register_scene_types.cpp
+++ b/scene/register_scene_types.cpp
@@ -159,10 +159,10 @@
 #include "scene/resources/mesh.h"
 #include "scene/resources/mesh_data_tool.h"
 #include "scene/resources/multimesh.h"
-#include "scene/resources/navigation_mesh.h"
-#include "scene/resources/navigation_mesh_source_geometry_data_2d.h"
-#include "scene/resources/navigation_mesh_source_geometry_data_3d.h"
-#include "scene/resources/navigation_polygon.h"
+#include "scene/resources/navigation/navigation_mesh.h"
+#include "scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.h"
+#include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h"
+#include "scene/resources/navigation_2d/navigation_polygon.h"
 #include "scene/resources/packed_scene.h"
 #include "scene/resources/particles_material.h"
 #include "scene/resources/physics_material.h"
diff --git a/scene/resources/SCsub b/scene/resources/SCsub
index 50745d679..af5d46cff 100644
--- a/scene/resources/SCsub
+++ b/scene/resources/SCsub
@@ -32,6 +32,20 @@ env.add_source_files(shapes_3d_obj, "shapes/*.cpp")
 for o in shapes_3d_obj:
     scene_obj.append(o)
 
+# 2d navigation
+navigation_2d_obj = []
+env.add_source_files(navigation_2d_obj, "navigation_2d/*.cpp")
+
+for o in navigation_2d_obj:
+    scene_obj.append(o)
+
+# 3d navigation
+navigation_obj = []
+env.add_source_files(navigation_obj, "navigation/*.cpp")
+
+for o in navigation_obj:
+    scene_obj.append(o)
+
 env.scene_sources += scene_obj
 
 # Needed to force rebuilding the scene files when the thirdparty code is updated.
diff --git a/scene/resources/importer_mesh.h b/scene/resources/importer_mesh.h
index d6f974318..95961e465 100644
--- a/scene/resources/importer_mesh.h
+++ b/scene/resources/importer_mesh.h
@@ -36,7 +36,7 @@
 #include "scene/resources/shapes/concave_polygon_shape.h"
 #include "scene/resources/shapes/convex_polygon_shape.h"
 #include "scene/resources/mesh.h"
-#include "scene/resources/navigation_mesh.h"
+#include "scene/resources/navigation/navigation_mesh.h"
 
 #include <cstdint>
 
diff --git a/scene/resources/navigation_mesh.cpp b/scene/resources/navigation/navigation_mesh.cpp
similarity index 100%
rename from scene/resources/navigation_mesh.cpp
rename to scene/resources/navigation/navigation_mesh.cpp
diff --git a/scene/resources/navigation_mesh.h b/scene/resources/navigation/navigation_mesh.h
similarity index 100%
rename from scene/resources/navigation_mesh.h
rename to scene/resources/navigation/navigation_mesh.h
diff --git a/scene/resources/navigation_mesh_source_geometry_data_3d.cpp b/scene/resources/navigation/navigation_mesh_source_geometry_data_3d.cpp
similarity index 100%
rename from scene/resources/navigation_mesh_source_geometry_data_3d.cpp
rename to scene/resources/navigation/navigation_mesh_source_geometry_data_3d.cpp
diff --git a/scene/resources/navigation_mesh_source_geometry_data_3d.h b/scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h
similarity index 99%
rename from scene/resources/navigation_mesh_source_geometry_data_3d.h
rename to scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h
index 11ae82a3f..99accd6f5 100644
--- a/scene/resources/navigation_mesh_source_geometry_data_3d.h
+++ b/scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h
@@ -35,7 +35,7 @@
 
 #include "core/math/transform.h"
 
-#include "mesh.h"
+#include "scene/resources/mesh.h"
 
 class NavigationMeshSourceGeometryData3D : public Resource {
 	GDCLASS(NavigationMeshSourceGeometryData3D, Resource);
diff --git a/scene/resources/navigation_mesh_source_geometry_data_2d.cpp b/scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.cpp
similarity index 100%
rename from scene/resources/navigation_mesh_source_geometry_data_2d.cpp
rename to scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.cpp
diff --git a/scene/resources/navigation_mesh_source_geometry_data_2d.h b/scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.h
similarity index 98%
rename from scene/resources/navigation_mesh_source_geometry_data_2d.h
rename to scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.h
index fb60e81d5..0692af047 100644
--- a/scene/resources/navigation_mesh_source_geometry_data_2d.h
+++ b/scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.h
@@ -32,7 +32,7 @@
 /**************************************************************************/
 
 #include "scene/2d/node_2d.h"
-#include "scene/resources/navigation_polygon.h"
+#include "scene/resources/navigation_2d/navigation_polygon.h"
 
 class NavigationMeshSourceGeometryData2D : public Resource {
 	GDCLASS(NavigationMeshSourceGeometryData2D, Resource);
diff --git a/scene/resources/navigation_polygon.cpp b/scene/resources/navigation_2d/navigation_polygon.cpp
similarity index 99%
rename from scene/resources/navigation_polygon.cpp
rename to scene/resources/navigation_2d/navigation_polygon.cpp
index 172b60ae9..ddd1253af 100644
--- a/scene/resources/navigation_polygon.cpp
+++ b/scene/resources/navigation_2d/navigation_polygon.cpp
@@ -34,7 +34,7 @@
 #include "core/core_string_names.h"
 #include "core/os/mutex.h"
 #include "scene/2d/navigation_2d.h"
-#include "scene/resources/navigation_mesh.h"
+#include "scene/resources/navigation/navigation_mesh.h"
 #include "scene/resources/world_2d.h"
 #include "servers/navigation/navigation_mesh_generator.h"
 #include "servers/navigation_2d_server.h"
diff --git a/scene/resources/navigation_polygon.h b/scene/resources/navigation_2d/navigation_polygon.h
similarity index 100%
rename from scene/resources/navigation_polygon.h
rename to scene/resources/navigation_2d/navigation_polygon.h
diff --git a/servers/navigation/navigation_mesh_generator.cpp b/servers/navigation/navigation_mesh_generator.cpp
index 8dcef1955..7d0533633 100644
--- a/servers/navigation/navigation_mesh_generator.cpp
+++ b/servers/navigation/navigation_mesh_generator.cpp
@@ -37,10 +37,10 @@
 #include "scene/3d/navigation_geometry_parser_3d.h"
 #endif // _3D_DISABLED
 #include "scene/main/node.h"
-#include "scene/resources/navigation_mesh.h"
-#include "scene/resources/navigation_mesh_source_geometry_data_2d.h"
+#include "scene/resources/navigation/navigation_mesh.h"
+#include "scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.h"
 #ifndef _3D_DISABLED
-#include "scene/resources/navigation_mesh_source_geometry_data_3d.h"
+#include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h"
 #endif // _3D_DISABLED
 
 NavigationMeshGenerator *NavigationMeshGenerator::singleton = nullptr;
diff --git a/servers/navigation/navigation_mesh_generator_dummy.cpp b/servers/navigation/navigation_mesh_generator_dummy.cpp
index f8aa43324..4b58a6c59 100644
--- a/servers/navigation/navigation_mesh_generator_dummy.cpp
+++ b/servers/navigation/navigation_mesh_generator_dummy.cpp
@@ -8,10 +8,10 @@
 #include "scene/3d/navigation_geometry_parser_3d.h"
 #endif // _3D_DISABLED
 #include "scene/main/node.h"
-#include "scene/resources/navigation_mesh.h"
-#include "scene/resources/navigation_mesh_source_geometry_data_2d.h"
+#include "scene/resources/navigation/navigation_mesh.h"
+#include "scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.h"
 #ifndef _3D_DISABLED
-#include "scene/resources/navigation_mesh_source_geometry_data_3d.h"
+#include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h"
 #endif // _3D_DISABLED
 
 void NavigationMeshGeneratorDummy::cleanup() {}
diff --git a/servers/navigation_2d_server.h b/servers/navigation_2d_server.h
index ce1bd50f8..539306829 100644
--- a/servers/navigation_2d_server.h
+++ b/servers/navigation_2d_server.h
@@ -36,7 +36,7 @@
 
 #include "navigation/navigation_utilities.h"
 #include "scene/2d/navigation_polygon_instance.h"
-#include "scene/resources/navigation_polygon.h"
+#include "scene/resources/navigation_2d/navigation_polygon.h"
 
 class NavigationPathQueryParameters2D;
 class NavigationPathQueryResult2D;
diff --git a/servers/navigation_server.cpp b/servers/navigation_server.cpp
index 6d6d82e1c..dd8eac8c8 100644
--- a/servers/navigation_server.cpp
+++ b/servers/navigation_server.cpp
@@ -34,7 +34,7 @@
 #include "navigation/navigation_path_query_parameters_3d.h"
 #include "navigation/navigation_path_query_result_3d.h"
 #include "scene/3d/navigation_mesh_instance.h"
-#include "scene/resources/navigation_mesh.h"
+#include "scene/resources/navigation/navigation_mesh.h"
 
 #ifdef DEBUG_ENABLED
 #include "core/config/engine.h"