27 files changed, 25 insertions, 22 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 183acbba12..91e27efeee 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -113,9 +113,12 @@
 #include "editor/gui/editor_title_bar.h"
 #include "editor/gui/editor_toaster.h"
 #include "editor/history_dock.h"
+#include "editor/import/3d/editor_import_collada.h"
+#include "editor/import/3d/resource_importer_obj.h"
+#include "editor/import/3d/resource_importer_scene.h"
+#include "editor/import/3d/scene_import_settings.h"
 #include "editor/import/audio_stream_import_settings.h"
 #include "editor/import/dynamic_font_import_settings.h"
-#include "editor/import/editor_import_collada.h"
 #include "editor/import/resource_importer_bitmask.h"
 #include "editor/import/resource_importer_bmfont.h"
 #include "editor/import/resource_importer_csv_translation.h"
@@ -123,12 +126,10 @@
 #include "editor/import/resource_importer_image.h"
 #include "editor/import/resource_importer_imagefont.h"
 #include "editor/import/resource_importer_layered_texture.h"
-#include "editor/import/resource_importer_obj.h"
 #include "editor/import/resource_importer_shader_file.h"
 #include "editor/import/resource_importer_texture.h"
 #include "editor/import/resource_importer_texture_atlas.h"
 #include "editor/import/resource_importer_wav.h"
-#include "editor/import/scene_import_settings.h"
 #include "editor/import_dock.h"
 #include "editor/inspector_dock.h"
 #include "editor/multi_node_edit.h"
diff --git a/editor/editor_plugin.cpp b/editor/editor_plugin.cpp
index 94a49166b8..e79f662cc9 100644
--- a/editor/editor_plugin.cpp
+++ b/editor/editor_plugin.cpp
@@ -39,8 +39,8 @@
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/export/editor_export.h"
 #include "editor/gui/editor_title_bar.h"
+#include "editor/import/3d/resource_importer_scene.h"
 #include "editor/import/editor_import_plugin.h"
-#include "editor/import/resource_importer_scene.h"
 #include "editor/inspector_dock.h"
 #include "editor/plugins/canvas_item_editor_plugin.h"
 #include "editor/plugins/editor_debugger_plugin.h"
diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp
index 91528d90aa..12a3478e44 100644
--- a/editor/filesystem_dock.cpp
+++ b/editor/filesystem_dock.cpp
@@ -47,7 +47,7 @@
 #include "editor/editor_string_names.h"
 #include "editor/gui/editor_dir_dialog.h"
 #include "editor/gui/editor_scene_tabs.h"
-#include "editor/import/scene_import_settings.h"
+#include "editor/import/3d/scene_import_settings.h"
 #include "editor/import_dock.h"
 #include "editor/plugins/editor_resource_tooltip_plugins.h"
 #include "editor/scene_create_dialog.h"
diff --git a/editor/import/collada.cpp b/editor/import/3d/collada.cpp
index ae8041d6fe..ae8041d6fe 100644
--- a/editor/import/collada.cpp
+++ b/editor/import/3d/collada.cpp
diff --git a/editor/import/collada.h b/editor/import/3d/collada.h
index 7877b1e86d..7877b1e86d 100644
--- a/editor/import/collada.h
+++ b/editor/import/3d/collada.h
diff --git a/editor/import/editor_import_collada.cpp b/editor/import/3d/editor_import_collada.cpp
index fb61412cf4..49fec679bf 100644
--- a/editor/import/editor_import_collada.cpp
+++ b/editor/import/3d/editor_import_collada.cpp
@@ -32,7 +32,7 @@
 
 #include "core/os/os.h"
 #include "editor/editor_node.h"
-#include "editor/import/collada.h"
+#include "editor/import/3d/collada.h"
 #include "scene/3d/camera_3d.h"
 #include "scene/3d/importer_mesh_instance_3d.h"
 #include "scene/3d/light_3d.h"
diff --git a/editor/import/editor_import_collada.h b/editor/import/3d/editor_import_collada.h
index 2950f499cb..e0214c2fd0 100644
--- a/editor/import/editor_import_collada.h
+++ b/editor/import/3d/editor_import_collada.h
@@ -31,7 +31,7 @@
 #ifndef EDITOR_IMPORT_COLLADA_H
 #define EDITOR_IMPORT_COLLADA_H
 
-#include "editor/import/resource_importer_scene.h"
+#include "editor/import/3d/resource_importer_scene.h"
 
 class EditorSceneFormatImporterCollada : public EditorSceneFormatImporter {
 	GDCLASS(EditorSceneFormatImporterCollada, EditorSceneFormatImporter);
diff --git a/editor/import/post_import_plugin_skeleton_renamer.cpp b/editor/import/3d/post_import_plugin_skeleton_renamer.cpp
index adeea51dae..6ce6aca896 100644
--- a/editor/import/post_import_plugin_skeleton_renamer.cpp
+++ b/editor/import/3d/post_import_plugin_skeleton_renamer.cpp
@@ -30,7 +30,7 @@
 
 #include "post_import_plugin_skeleton_renamer.h"
 
-#include "editor/import/scene_import_settings.h"
+#include "editor/import/3d/scene_import_settings.h"
 #include "scene/3d/bone_attachment_3d.h"
 #include "scene/3d/importer_mesh_instance_3d.h"
 #include "scene/3d/skeleton_3d.h"
diff --git a/editor/import/post_import_plugin_skeleton_renamer.h b/editor/import/3d/post_import_plugin_skeleton_renamer.h
index 98f778f6c2..98f778f6c2 100644
--- a/editor/import/post_import_plugin_skeleton_renamer.h
+++ b/editor/import/3d/post_import_plugin_skeleton_renamer.h
diff --git a/editor/import/post_import_plugin_skeleton_rest_fixer.cpp b/editor/import/3d/post_import_plugin_skeleton_rest_fixer.cpp
index 3390bf4ed4..53bf24fb7e 100644
--- a/editor/import/post_import_plugin_skeleton_rest_fixer.cpp
+++ b/editor/import/3d/post_import_plugin_skeleton_rest_fixer.cpp
@@ -30,7 +30,7 @@
 
 #include "post_import_plugin_skeleton_rest_fixer.h"
 
-#include "editor/import/scene_import_settings.h"
+#include "editor/import/3d/scene_import_settings.h"
 #include "scene/3d/bone_attachment_3d.h"
 #include "scene/3d/importer_mesh_instance_3d.h"
 #include "scene/3d/skeleton_3d.h"
diff --git a/editor/import/post_import_plugin_skeleton_rest_fixer.h b/editor/import/3d/post_import_plugin_skeleton_rest_fixer.h
index c765169fd0..c765169fd0 100644
--- a/editor/import/post_import_plugin_skeleton_rest_fixer.h
+++ b/editor/import/3d/post_import_plugin_skeleton_rest_fixer.h
diff --git a/editor/import/post_import_plugin_skeleton_track_organizer.cpp b/editor/import/3d/post_import_plugin_skeleton_track_organizer.cpp
index e5a8e879fc..53bcc59fcb 100644
--- a/editor/import/post_import_plugin_skeleton_track_organizer.cpp
+++ b/editor/import/3d/post_import_plugin_skeleton_track_organizer.cpp
@@ -30,7 +30,7 @@
 
 #include "post_import_plugin_skeleton_track_organizer.h"
 
-#include "editor/import/scene_import_settings.h"
+#include "editor/import/3d/scene_import_settings.h"
 #include "scene/3d/skeleton_3d.h"
 #include "scene/animation/animation_player.h"
 #include "scene/resources/bone_map.h"
diff --git a/editor/import/post_import_plugin_skeleton_track_organizer.h b/editor/import/3d/post_import_plugin_skeleton_track_organizer.h
index 24a4f70aa9..24a4f70aa9 100644
--- a/editor/import/post_import_plugin_skeleton_track_organizer.h
+++ b/editor/import/3d/post_import_plugin_skeleton_track_organizer.h
diff --git a/editor/import/resource_importer_obj.cpp b/editor/import/3d/resource_importer_obj.cpp
index 082e78fdbe..082e78fdbe 100644
--- a/editor/import/resource_importer_obj.cpp
+++ b/editor/import/3d/resource_importer_obj.cpp
diff --git a/editor/import/resource_importer_obj.h b/editor/import/3d/resource_importer_obj.h
index faf0f336c0..faf0f336c0 100644
--- a/editor/import/resource_importer_obj.h
+++ b/editor/import/3d/resource_importer_obj.h
diff --git a/editor/import/resource_importer_scene.cpp b/editor/import/3d/resource_importer_scene.cpp
index 46c62b1125..dfb14c6741 100644
--- a/editor/import/resource_importer_scene.cpp
+++ b/editor/import/3d/resource_importer_scene.cpp
@@ -35,7 +35,7 @@
 #include "core/object/script_language.h"
 #include "editor/editor_node.h"
 #include "editor/editor_settings.h"
-#include "editor/import/scene_import_settings.h"
+#include "editor/import/3d/scene_import_settings.h"
 #include "scene/3d/area_3d.h"
 #include "scene/3d/collision_shape_3d.h"
 #include "scene/3d/importer_mesh_instance_3d.h"
diff --git a/editor/import/resource_importer_scene.h b/editor/import/3d/resource_importer_scene.h
index 6ea4d1af7d..6ea4d1af7d 100644
--- a/editor/import/resource_importer_scene.h
+++ b/editor/import/3d/resource_importer_scene.h
diff --git a/editor/import/scene_import_settings.cpp b/editor/import/3d/scene_import_settings.cpp
index 4ecc6dedbd..4ecc6dedbd 100644
--- a/editor/import/scene_import_settings.cpp
+++ b/editor/import/3d/scene_import_settings.cpp
diff --git a/editor/import/scene_import_settings.h b/editor/import/3d/scene_import_settings.h
index 3e71d5da17..c6c416daba 100644
--- a/editor/import/scene_import_settings.h
+++ b/editor/import/3d/scene_import_settings.h
@@ -31,7 +31,7 @@
 #ifndef SCENE_IMPORT_SETTINGS_H
 #define SCENE_IMPORT_SETTINGS_H
 
-#include "editor/import/resource_importer_scene.h"
+#include "editor/import/3d/resource_importer_scene.h"
 #include "scene/3d/camera_3d.h"
 #include "scene/3d/light_3d.h"
 #include "scene/3d/mesh_instance_3d.h"
diff --git a/editor/import/SCsub b/editor/import/SCsub
index 359d04e5df..a8c06cc406 100644
--- a/editor/import/SCsub
+++ b/editor/import/SCsub
@@ -3,3 +3,4 @@
 Import("env")
 
 env.add_source_files(env.editor_sources, "*.cpp")
+env.add_source_files(env.editor_sources, "3d/*.cpp")
diff --git a/editor/plugins/bone_map_editor_plugin.cpp b/editor/plugins/bone_map_editor_plugin.cpp
index db61c95474..72a53088dc 100644
--- a/editor/plugins/bone_map_editor_plugin.cpp
+++ b/editor/plugins/bone_map_editor_plugin.cpp
@@ -32,10 +32,10 @@
 
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
-#include "editor/import/post_import_plugin_skeleton_renamer.h"
-#include "editor/import/post_import_plugin_skeleton_rest_fixer.h"
-#include "editor/import/post_import_plugin_skeleton_track_organizer.h"
-#include "editor/import/scene_import_settings.h"
+#include "editor/import/3d/post_import_plugin_skeleton_renamer.h"
+#include "editor/import/3d/post_import_plugin_skeleton_rest_fixer.h"
+#include "editor/import/3d/post_import_plugin_skeleton_track_organizer.h"
+#include "editor/import/3d/scene_import_settings.h"
 #include "scene/gui/aspect_ratio_container.h"
 #include "scene/gui/separator.h"
 #include "scene/gui/texture_rect.h"
diff --git a/editor/register_editor_types.cpp b/editor/register_editor_types.cpp
index 075c856c1c..04a06ff732 100644
--- a/editor/register_editor_types.cpp
+++ b/editor/register_editor_types.cpp
@@ -50,6 +50,8 @@
 #include "editor/filesystem_dock.h"
 #include "editor/gui/editor_file_dialog.h"
 #include "editor/gui/editor_spin_slider.h"
+#include "editor/import/3d/resource_importer_obj.h"
+#include "editor/import/3d/resource_importer_scene.h"
 #include "editor/import/editor_import_plugin.h"
 #include "editor/import/resource_importer_bitmask.h"
 #include "editor/import/resource_importer_bmfont.h"
@@ -58,8 +60,6 @@
 #include "editor/import/resource_importer_image.h"
 #include "editor/import/resource_importer_imagefont.h"
 #include "editor/import/resource_importer_layered_texture.h"
-#include "editor/import/resource_importer_obj.h"
-#include "editor/import/resource_importer_scene.h"
 #include "editor/import/resource_importer_shader_file.h"
 #include "editor/import/resource_importer_texture.h"
 #include "editor/import/resource_importer_texture_atlas.h"
diff --git a/modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp b/modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp
index 6975bc1228..56e4bfbb32 100644
--- a/modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp
+++ b/modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp
@@ -39,7 +39,7 @@
 #include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 #include "editor/gui/editor_file_dialog.h"
-#include "editor/import/scene_import_settings.h"
+#include "editor/import/3d/scene_import_settings.h"
 
 String SceneExporterGLTFPlugin::get_name() const {
 	return "ConvertGLTF2";
diff --git a/modules/gltf/editor/editor_scene_importer_blend.h b/modules/gltf/editor/editor_scene_importer_blend.h
index ec467db457..c1f4280170 100644
--- a/modules/gltf/editor/editor_scene_importer_blend.h
+++ b/modules/gltf/editor/editor_scene_importer_blend.h
@@ -34,7 +34,7 @@
 #ifdef TOOLS_ENABLED
 
 #include "editor/editor_file_system.h"
-#include "editor/import/resource_importer_scene.h"
+#include "editor/import/3d/resource_importer_scene.h"
 
 class Animation;
 class Node;
diff --git a/modules/gltf/editor/editor_scene_importer_fbx.h b/modules/gltf/editor/editor_scene_importer_fbx.h
index cc60830eac..86ee6568c9 100644
--- a/modules/gltf/editor/editor_scene_importer_fbx.h
+++ b/modules/gltf/editor/editor_scene_importer_fbx.h
@@ -35,7 +35,7 @@
 
 #include "editor/editor_file_system.h"
 #include "editor/fbx_importer_manager.h"
-#include "editor/import/resource_importer_scene.h"
+#include "editor/import/3d/resource_importer_scene.h"
 
 class Animation;
 class Node;
diff --git a/modules/gltf/editor/editor_scene_importer_gltf.h b/modules/gltf/editor/editor_scene_importer_gltf.h
index 7726c845bf..ec563bf525 100644
--- a/modules/gltf/editor/editor_scene_importer_gltf.h
+++ b/modules/gltf/editor/editor_scene_importer_gltf.h
@@ -33,7 +33,7 @@
 
 #ifdef TOOLS_ENABLED
 
-#include "editor/import/resource_importer_scene.h"
+#include "editor/import/3d/resource_importer_scene.h"
 
 class Animation;
 class Node;
diff --git a/scu_builders.py b/scu_builders.py
index 71427eb717..56effb393c 100644
--- a/scu_builders.py
+++ b/scu_builders.py
@@ -277,6 +277,7 @@ def generate_scu_files(max_includes_per_scu):
     process_folder(["editor/export"])
     process_folder(["editor/gui"])
     process_folder(["editor/import"])
+    process_folder(["editor/import/3d"])
     process_folder(["editor/plugins"])
     process_folder(["editor/plugins/gizmos"])
     process_folder(["editor/plugins/tiles"])