diff --git a/modules/navigation/godot_navigation_server_2d.cpp b/modules/navigation/2d/godot_navigation_server_2d.cpp
similarity index 100%
rename from modules/navigation/godot_navigation_server_2d.cpp
rename to modules/navigation/2d/godot_navigation_server_2d.cpp
diff --git a/modules/navigation/godot_navigation_server_2d.h b/modules/navigation/2d/godot_navigation_server_2d.h
similarity index 99%
rename from modules/navigation/godot_navigation_server_2d.h
rename to modules/navigation/2d/godot_navigation_server_2d.h
index 225fd8f3a632..a148887a6536 100644
--- a/modules/navigation/godot_navigation_server_2d.h
+++ b/modules/navigation/2d/godot_navigation_server_2d.h
@@ -31,11 +31,11 @@
 #ifndef GODOT_NAVIGATION_SERVER_2D_H
 #define GODOT_NAVIGATION_SERVER_2D_H
 
-#include "nav_agent.h"
-#include "nav_link.h"
-#include "nav_map.h"
-#include "nav_obstacle.h"
-#include "nav_region.h"
+#include "../nav_agent.h"
+#include "../nav_link.h"
+#include "../nav_map.h"
+#include "../nav_obstacle.h"
+#include "../nav_region.h"
 
 #include "servers/navigation_server_2d.h"
 
diff --git a/modules/navigation/nav_mesh_generator_2d.cpp b/modules/navigation/2d/nav_mesh_generator_2d.cpp
similarity index 100%
rename from modules/navigation/nav_mesh_generator_2d.cpp
rename to modules/navigation/2d/nav_mesh_generator_2d.cpp
diff --git a/modules/navigation/nav_mesh_generator_2d.h b/modules/navigation/2d/nav_mesh_generator_2d.h
similarity index 100%
rename from modules/navigation/nav_mesh_generator_2d.h
rename to modules/navigation/2d/nav_mesh_generator_2d.h
diff --git a/modules/navigation/SCsub b/modules/navigation/SCsub
index 46bcb0fba4c4..7d6de7f79468 100644
--- a/modules/navigation/SCsub
+++ b/modules/navigation/SCsub
@@ -74,6 +74,7 @@ env.modules_sources += thirdparty_obj
 module_obj = []
 
 env_navigation.add_source_files(module_obj, "*.cpp")
+env_navigation.add_source_files(module_obj, "2d/*.cpp")
 if env.editor_build:
     env_navigation.add_source_files(module_obj, "editor/*.cpp")
 env.modules_sources += module_obj
diff --git a/modules/navigation/register_types.cpp b/modules/navigation/register_types.cpp
index 525fe71134f6..5139a30afc5c 100644
--- a/modules/navigation/register_types.cpp
+++ b/modules/navigation/register_types.cpp
@@ -30,8 +30,8 @@
 
 #include "register_types.h"
 
+#include "2d/godot_navigation_server_2d.h"
 #include "godot_navigation_server.h"
-#include "godot_navigation_server_2d.h"
 
 #ifndef DISABLE_DEPRECATED
 #ifndef _3D_DISABLED