Editor: Restructure editor code

Moving various editor files into sub folders to reduce clutter

.github/CODEOWNERS

@@ -44,18 +44,21 @@
 
 # Editor
 
-/editor/**/*2d*                               @godotengine/2d-editor
-/editor/**/*3d*                               @godotengine/3d-editor
-/editor/**/*audio*                            @godotengine/audio
-/editor/**/*code*                             @godotengine/script-editor
-/editor/**/*debugger*                         @godotengine/debugger
-/editor/**/*dock*                             @godotengine/docks
-/editor/**/*script*                           @godotengine/script-editor
-/editor/**/*shader*                           @godotengine/shaders
+/editor/script/                               @godotengine/script-editor
+/editor/shader/                               @godotengine/shaders
+/editor/animation/                            @godotengine/animation
+/editor/audio/                                @godotengine/audio
 /editor/debugger/                             @godotengine/debugger
+/editor/doc/                                  @godotengine/documentation
+/editor/docks/                                @godotengine/docks
 /editor/gui/                                  @godotengine/usability @godotengine/gui-nodes
 /editor/icons/                                @godotengine/usability
 /editor/import/                               @godotengine/import
+/editor/inspector/                            @godotengine/docks
+/editor/scene/                                @godotengine/core
+/editor/scene/2d/                             @godotengine/2d-editor
+/editor/scene/3d/                             @godotengine/3d-editor
+/editor/scene/gui/                            @godotengine/usability @godotengine/gui-nodes
 /editor/themes/                               @godotengine/usability @godotengine/gui-nodes
 
 # Main

core/extension/extension_api_dump.cpp

@@ -39,7 +39,7 @@
 #include "core/version.h"
 
 #ifdef TOOLS_ENABLED
-#include "editor/editor_help.h"
+#include "editor/doc/editor_help.h"
 
 static String get_builtin_or_variant_type_name(const Variant::Type p_type) {
 	if (p_type == Variant::NIL) {

editor/SCsub

@@ -12,12 +12,14 @@ env.editor_sources = []
 if env.editor_build:
     # Generate doc data paths
     env.CommandNoCache(
-        "doc_data_class_path.gen.h", env.Value(env.doc_class_path), env.Run(editor_builders.doc_data_class_path_builder)
+        "doc/doc_data_class_path.gen.h",
+        env.Value(env.doc_class_path),
+        env.Run(editor_builders.doc_data_class_path_builder),
     )
 
     # Register exporters
     gen_exporters = env.CommandNoCache(
-        "register_exporters.gen.cpp",
+        "export/register_exporters.gen.cpp",
         env.Value(env.platform_exporters),
         env.Run(editor_builders.register_exporters_builder),
     )
@@ -43,7 +45,7 @@ if env.editor_build:
 
     docs = sorted(docs)
     env.CommandNoCache(
-        "#editor/doc_data_compressed.gen.h",
+        "#editor/doc/doc_data_compressed.gen.h",
         docs,
         env.Run(editor_builders.make_doc_header),
     )
@@ -56,28 +58,28 @@ if env.editor_build:
 
     # Editor translations
     env.CommandNoCache(
-        "#editor/editor_translations.gen.h",
+        "#editor/translations/editor_translations.gen.h",
         Glob("#editor/translations/editor/*"),
         env.Run(editor_builders.make_translations_header),
     )
 
     # Property translations
     env.CommandNoCache(
-        "#editor/property_translations.gen.h",
+        "#editor/translations/property_translations.gen.h",
         Glob("#editor/translations/properties/*"),
         env.Run(editor_builders.make_translations_header),
     )
 
     # Documentation translations
     env.CommandNoCache(
-        "#editor/doc_translations.gen.h",
+        "#editor/translations/doc_translations.gen.h",
         Glob("#doc/translations/*"),
         env.Run(editor_builders.make_translations_header),
     )
 
     # Extractable translations
     env.CommandNoCache(
-        "#editor/extractable_translations.gen.h",
+        "#editor/translations/extractable_translations.gen.h",
         Glob("#editor/translations/extractable/*"),
         env.Run(editor_builders.make_translations_header),
     )
@@ -85,14 +87,29 @@ if env.editor_build:
     env.add_source_files(env.editor_sources, "*.cpp")
     env.add_source_files(env.editor_sources, gen_exporters)
 
+    SConscript("animation/SCsub")
+    SConscript("asset_library/SCsub")
+    SConscript("audio/SCsub")
     SConscript("debugger/SCsub")
+    SConscript("doc/SCsub")
+    SConscript("docks/SCsub")
     SConscript("export/SCsub")
+    SConscript("file_system/SCsub")
     SConscript("gui/SCsub")
     SConscript("icons/SCsub")
+    SConscript("inspector/SCsub")
     SConscript("import/SCsub")
     SConscript("plugins/SCsub")
     SConscript("project_manager/SCsub")
+    SConscript("project_upgrade/SCsub")
+    SConscript("run/SCsub")
+    SConscript("settings/SCsub")
+    SConscript("scene/SCsub")
+    SConscript("script/SCsub")
+    SConscript("shader/SCsub")
     SConscript("themes/SCsub")
+    SConscript("translations/SCsub")
+    SConscript("version_control/SCsub")
 
     lib = env.add_library("editor", env.editor_sources)
     env.Prepend(LIBS=[lib])

editor/animation_bezier_editor.cpp → editor/animation/animation_bezier_editor.cpp

@@ -30,12 +30,12 @@
 
 #include "animation_bezier_editor.h"
 
+#include "editor/animation/animation_player_editor_plugin.h"
 #include "editor/editor_node.h"
-#include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/gui/editor_spin_slider.h"
-#include "editor/plugins/animation_player_editor_plugin.h"
+#include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/option_button.h"
 #include "scene/gui/view_panner.h"

editor/plugins/animation_blend_space_1d_editor.cpp → editor/animation/animation_blend_space_1d_editor.cpp

@@ -32,10 +32,10 @@
 
 #include "core/os/keyboard.h"
 #include "editor/editor_node.h"
-#include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/gui/editor_file_dialog.h"
+#include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/animation/animation_blend_tree.h"
 #include "scene/gui/button.h"

editor/plugins/animation_blend_space_1d_editor.h → editor/animation/animation_blend_space_1d_editor.h

@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "editor/plugins/animation_tree_editor_plugin.h"
+#include "editor/animation/animation_tree_editor_plugin.h"
 #include "editor/plugins/editor_plugin.h"
 #include "scene/animation/animation_blend_space_1d.h"
 #include "scene/gui/graph_edit.h"

editor/plugins/animation_blend_space_2d_editor.cpp → editor/animation/animation_blend_space_2d_editor.cpp

@@ -34,10 +34,10 @@
 #include "core/math/geometry_2d.h"
 #include "core/os/keyboard.h"
 #include "editor/editor_node.h"
-#include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/gui/editor_file_dialog.h"
+#include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/animation/animation_blend_tree.h"
 #include "scene/animation/animation_player.h"

editor/plugins/animation_blend_space_2d_editor.h → editor/animation/animation_blend_space_2d_editor.h

@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "editor/plugins/animation_tree_editor_plugin.h"
+#include "editor/animation/animation_tree_editor_plugin.h"
 #include "editor/plugins/editor_plugin.h"
 #include "scene/animation/animation_blend_space_2d.h"
 #include "scene/gui/graph_edit.h"

editor/plugins/animation_blend_tree_editor_plugin.cpp → editor/animation/animation_blend_tree_editor_plugin.cpp

@@ -32,13 +32,13 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/resource_loader.h"
-#include "editor/editor_inspector.h"
 #include "editor/editor_node.h"
-#include "editor/editor_properties.h"
-#include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/gui/editor_file_dialog.h"
+#include "editor/inspector/editor_inspector.h"
+#include "editor/inspector/editor_properties.h"
+#include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/3d/skeleton_3d.h"
 #include "scene/gui/check_box.h"

editor/plugins/animation_blend_tree_editor_plugin.h → editor/animation/animation_blend_tree_editor_plugin.h

@@ -31,8 +31,8 @@
 #pragma once
 
 #include "core/object/script_language.h"
-#include "editor/editor_inspector.h"
-#include "editor/plugins/animation_tree_editor_plugin.h"
+#include "editor/animation/animation_tree_editor_plugin.h"
+#include "editor/inspector/editor_inspector.h"
 #include "scene/animation/animation_blend_tree.h"
 #include "scene/gui/button.h"
 #include "scene/gui/dialogs.h"

editor/plugins/animation_library_editor.cpp → editor/animation/animation_library_editor.cpp

@@ -35,11 +35,11 @@
 #include "core/templates/vector.h"
 #include "core/variant/variant.h"
 #include "editor/editor_node.h"
-#include "editor/editor_paths.h"
-#include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
+#include "editor/file_system/editor_paths.h"
 #include "editor/gui/editor_file_dialog.h"
+#include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/animation/animation_mixer.h"
 #include "scene/gui/line_edit.h"

editor/plugins/animation_player_editor_plugin.cpp → editor/animation/animation_player_editor_plugin.cpp

@@ -33,18 +33,18 @@
 #include "core/config/project_settings.h"
 #include "core/input/input.h"
 #include "core/os/keyboard.h"
-#include "editor/editor_command_palette.h"
+#include "editor/animation/animation_tree_editor_plugin.h"
+#include "editor/docks/inspector_dock.h"
+#include "editor/docks/scene_tree_dock.h"
 #include "editor/editor_node.h"
-#include "editor/editor_settings.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/gui/editor_bottom_panel.h"
 #include "editor/gui/editor_file_dialog.h"
 #include "editor/gui/editor_validation_panel.h"
-#include "editor/inspector_dock.h"
-#include "editor/plugins/animation_tree_editor_plugin.h"
-#include "editor/plugins/canvas_item_editor_plugin.h" // For onion skinning.
-#include "editor/plugins/node_3d_editor_plugin.h" // For onion skinning.
-#include "editor/scene_tree_dock.h"
+#include "editor/scene/3d/node_3d_editor_plugin.h" // For onion skinning.
+#include "editor/scene/canvas_item_editor_plugin.h" // For onion skinning.
+#include "editor/settings/editor_command_palette.h"
+#include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "editor/themes/editor_theme_manager.h"
 #include "scene/animation/animation_tree.h"

editor/plugins/animation_player_editor_plugin.h → editor/animation/animation_player_editor_plugin.h

@@ -30,8 +30,8 @@
 
 #pragma once
 
-#include "editor/animation_track_editor.h"
-#include "editor/plugins/animation_library_editor.h"
+#include "editor/animation/animation_library_editor.h"
+#include "editor/animation/animation_track_editor.h"
 #include "editor/plugins/editor_plugin.h"
 #include "scene/animation/animation_player.h"
 #include "scene/gui/dialogs.h"

editor/plugins/animation_state_machine_editor.cpp → editor/animation/animation_state_machine_editor.cpp

@@ -34,9 +34,9 @@
 #include "core/math/geometry_2d.h"
 #include "core/os/keyboard.h"
 #include "editor/editor_node.h"
-#include "editor/editor_settings.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/gui/editor_file_dialog.h"
+#include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/animation/animation_blend_tree.h"
 #include "scene/gui/line_edit.h"

editor/plugins/animation_state_machine_editor.h → editor/animation/animation_state_machine_editor.h

@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "editor/plugins/animation_tree_editor_plugin.h"
+#include "editor/animation/animation_tree_editor_plugin.h"
 #include "scene/animation/animation_node_state_machine.h"
 #include "scene/gui/graph_edit.h"
 #include "scene/gui/popup.h"

editor/animation_track_editor.cpp → editor/animation/animation_track_editor.cpp

@@ -33,18 +33,18 @@
 #include "animation_track_editor_plugins.h"
 #include "core/error/error_macros.h"
 #include "core/input/input.h"
-#include "editor/animation_bezier_editor.h"
+#include "editor/animation/animation_bezier_editor.h"
+#include "editor/animation/animation_player_editor_plugin.h"
+#include "editor/docks/inspector_dock.h"
 #include "editor/editor_node.h"
-#include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/gui/editor_spin_slider.h"
 #include "editor/gui/editor_validation_panel.h"
-#include "editor/gui/scene_tree_editor.h"
-#include "editor/inspector_dock.h"
-#include "editor/multi_node_edit.h"
-#include "editor/plugins/animation_player_editor_plugin.h"
-#include "editor/plugins/script_editor_plugin.h"
+#include "editor/inspector/multi_node_edit.h"
+#include "editor/scene/scene_tree_editor.h"
+#include "editor/script/script_editor_plugin.h"
+#include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/animation/animation_player.h"

editor/animation_track_editor.h → editor/animation/animation_track_editor.h

@@ -31,8 +31,8 @@
 #pragma once
 
 #include "editor/editor_data.h"
-#include "editor/editor_properties.h"
-#include "editor/property_selector.h"
+#include "editor/inspector/editor_properties.h"
+#include "editor/inspector/property_selector.h"
 #include "scene/3d/node_3d.h"
 #include "scene/gui/control.h"
 #include "scene/gui/menu_button.h"

editor/animation_track_editor_plugins.cpp → editor/animation/animation_track_editor_plugins.cpp

@@ -30,10 +30,10 @@
 
 #include "animation_track_editor_plugins.h"
 
-#include "editor/audio_stream_preview.h"
-#include "editor/editor_resource_preview.h"
+#include "editor/audio/audio_stream_preview.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
+#include "editor/inspector/editor_resource_preview.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/2d/animated_sprite_2d.h"
 #include "scene/2d/sprite_2d.h"

editor/animation_track_editor_plugins.h → editor/animation/animation_track_editor_plugins.h

@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "editor/animation_track_editor.h"
+#include "editor/animation/animation_track_editor.h"
 
 class AnimationTrackEditBool : public AnimationTrackEdit {
 	GDCLASS(AnimationTrackEditBool, AnimationTrackEdit);

editor/plugins/animation_tree_editor_plugin.cpp → editor/animation/animation_tree_editor_plugin.cpp

@@ -34,9 +34,9 @@
 #include "animation_blend_space_2d_editor.h"
 #include "animation_blend_tree_editor_plugin.h"
 #include "animation_state_machine_editor.h"
-#include "editor/editor_command_palette.h"
 #include "editor/editor_node.h"
 #include "editor/gui/editor_bottom_panel.h"
+#include "editor/settings/editor_command_palette.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/animation/animation_blend_tree.h"
 #include "scene/gui/button.h"

editor/plugins/asset_library_editor_plugin.cpp → editor/asset_library/asset_library_editor_plugin.cpp

@@ -36,11 +36,11 @@
 #include "core/version.h"
 #include "editor/editor_main_screen.h"
 #include "editor/editor_node.h"
-#include "editor/editor_paths.h"
-#include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
+#include "editor/file_system/editor_paths.h"
 #include "editor/gui/editor_file_dialog.h"
-#include "editor/project_settings_editor.h"
+#include "editor/settings/editor_settings.h"
+#include "editor/settings/project_settings_editor.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/menu_button.h"
 #include "scene/gui/separator.h"

editor/plugins/asset_library_editor_plugin.h → editor/asset_library/asset_library_editor_plugin.h

@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "editor/editor_asset_installer.h"
+#include "editor/asset_library/editor_asset_installer.h"
 #include "editor/plugins/editor_plugin.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/grid_container.h"

editor/editor_asset_installer.cpp → editor/asset_library/editor_asset_installer.cpp

@@ -33,12 +33,12 @@
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
 #include "core/io/zip_io.h"
-#include "editor/editor_file_system.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
+#include "editor/file_system/editor_file_system.h"
 #include "editor/gui/editor_file_dialog.h"
 #include "editor/gui/editor_toaster.h"
-#include "editor/progress_dialog.h"
+#include "editor/gui/progress_dialog.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/label.h"

editor/audio/SCsub

@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+from misc.utility.scons_hints import *
+
+Import("env")
+
+env.add_source_files(env.editor_sources, "*.cpp")

editor/plugins/audio_stream_editor_plugin.cpp → editor/audio/audio_stream_editor_plugin.cpp

@@ -30,9 +30,9 @@
 
 #include "audio_stream_editor_plugin.h"
 
-#include "editor/audio_stream_preview.h"
-#include "editor/editor_settings.h"
+#include "editor/audio/audio_stream_preview.h"
 #include "editor/editor_string_names.h"
+#include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/resources/audio_stream_wav.h"
 

editor/plugins/audio_stream_editor_plugin.h → editor/audio/audio_stream_editor_plugin.h

@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "editor/editor_inspector.h"
+#include "editor/inspector/editor_inspector.h"
 #include "editor/plugins/editor_plugin.h"
 #include "scene/audio/audio_stream_player.h"
 #include "scene/gui/button.h"

editor/editor_audio_buses.cpp → editor/audio/editor_audio_buses.cpp

@@ -34,14 +34,14 @@
 #include "core/input/input.h"
 #include "core/io/resource_saver.h"
 #include "core/os/keyboard.h"
-#include "editor/editor_command_palette.h"
+#include "editor/docks/filesystem_dock.h"
 #include "editor/editor_node.h"
-#include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
-#include "editor/filesystem_dock.h"
 #include "editor/gui/editor_bottom_panel.h"
 #include "editor/gui/editor_file_dialog.h"
+#include "editor/settings/editor_command_palette.h"
+#include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "editor/themes/editor_theme_manager.h"
 #include "scene/gui/separator.h"

editor/debugger/debug_adapter/debug_adapter_parser.cpp

@@ -34,8 +34,8 @@
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/debugger/script_editor_debugger.h"
 #include "editor/export/editor_export_platform.h"
-#include "editor/gui/editor_run_bar.h"
-#include "editor/plugins/script_editor_plugin.h"
+#include "editor/run/editor_run_bar.h"
+#include "editor/script/script_editor_plugin.h"
 
 void DebugAdapterParser::_bind_methods() {
 	// Requests

editor/debugger/debug_adapter/debug_adapter_protocol.cpp

@@ -37,8 +37,8 @@
 #include "editor/debugger/script_editor_debugger.h"
 #include "editor/editor_log.h"
 #include "editor/editor_node.h"
-#include "editor/editor_settings.h"
-#include "editor/gui/editor_run_bar.h"
+#include "editor/run/editor_run_bar.h"
+#include "editor/settings/editor_settings.h"
 
 DebugAdapterProtocol *DebugAdapterProtocol::singleton = nullptr;
 

editor/debugger/debug_adapter/debug_adapter_server.cpp

@@ -32,7 +32,7 @@
 
 #include "editor/editor_log.h"
 #include "editor/editor_node.h"
-#include "editor/editor_settings.h"
+#include "editor/settings/editor_settings.h"
 
 int DebugAdapterServer::port_override = -1;
 

editor/plugins/debugger_editor_plugin.cpp → editor/debugger/debugger_editor_plugin.cpp

@@ -34,12 +34,12 @@
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/debugger/editor_debugger_server.h"
 #include "editor/debugger/editor_file_server.h"
-#include "editor/editor_command_palette.h"
 #include "editor/editor_node.h"
-#include "editor/editor_settings.h"
 #include "editor/gui/editor_bottom_panel.h"
-#include "editor/plugins/script_editor_plugin.h"
-#include "editor/run_instances_dialog.h"
+#include "editor/run/run_instances_dialog.h"
+#include "editor/script/script_editor_plugin.h"
+#include "editor/settings/editor_command_palette.h"
+#include "editor/settings/editor_settings.h"
 #include "scene/gui/popup_menu.h"
 
 DebuggerEditorPlugin::DebuggerEditorPlugin(PopupMenu *p_debug_menu) {

editor/debugger/editor_debugger_inspector.cpp

@@ -32,9 +32,9 @@
 
 #include "core/debugger/debugger_marshalls.h"
 #include "core/io/marshalls.h"
+#include "editor/docks/inspector_dock.h"
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
-#include "editor/inspector_dock.h"
 #include "scene/debugger/scene_debugger.h"
 
 bool EditorDebuggerRemoteObjects::_set(const StringName &p_name, const Variant &p_value) {

editor/debugger/editor_debugger_inspector.h

@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/variant/typed_dictionary.h"
-#include "editor/editor_inspector.h"
+#include "editor/inspector/editor_inspector.h"
 
 class SceneDebuggerObject;
 

editor/debugger/editor_debugger_node.cpp

@@ -31,19 +31,19 @@
 #include "editor_debugger_node.h"
 
 #include "core/object/undo_redo.h"
+#include "editor/debugger/editor_debugger_plugin.h"
 #include "editor/debugger/editor_debugger_tree.h"
 #include "editor/debugger/script_editor_debugger.h"
+#include "editor/docks/inspector_dock.h"
+#include "editor/docks/scene_tree_dock.h"
 #include "editor/editor_log.h"
 #include "editor/editor_node.h"
-#include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/gui/editor_bottom_panel.h"
-#include "editor/gui/editor_run_bar.h"
-#include "editor/inspector_dock.h"
-#include "editor/plugins/editor_debugger_plugin.h"
-#include "editor/plugins/script_editor_plugin.h"
-#include "editor/scene_tree_dock.h"
+#include "editor/run/editor_run_bar.h"
+#include "editor/script/script_editor_plugin.h"
+#include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_theme_manager.h"
 #include "scene/gui/menu_button.h"
 #include "scene/gui/tab_container.h"

editor/debugger/editor_debugger_server.cpp

@@ -34,7 +34,7 @@
 #include "core/os/thread.h"
 #include "editor/editor_log.h"
 #include "editor/editor_node.h"
-#include "editor/editor_settings.h"
+#include "editor/settings/editor_settings.h"
 
 class EditorDebuggerServerTCP : public EditorDebuggerServer {
 private:

editor/debugger/editor_debugger_tree.cpp

@@ -31,12 +31,12 @@
 #include "editor_debugger_tree.h"
 
 #include "editor/debugger/editor_debugger_node.h"
+#include "editor/docks/scene_tree_dock.h"
 #include "editor/editor_node.h"
-#include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
 #include "editor/gui/editor_file_dialog.h"
 #include "editor/gui/editor_toaster.h"
-#include "editor/scene_tree_dock.h"
+#include "editor/settings/editor_settings.h"
 #include "scene/debugger/scene_debugger.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/resources/packed_scene.h"

editor/debugger/editor_file_server.cpp

@@ -30,9 +30,9 @@
 
 #include "editor_file_server.h"
 
-#include "../editor_settings.h"
 #include "editor/editor_node.h"
 #include "editor/export/editor_export_platform.h"
+#include "editor/settings/editor_settings.h"
 
 #define FILESYSTEM_PROTOCOL_VERSION 1
 #define PASSWORD_LENGTH 32

editor/debugger/editor_file_server.h

@@ -32,7 +32,7 @@
 
 #include "core/io/tcp_server.h"
 #include "core/os/thread.h"
-#include "editor/editor_file_system.h"
+#include "editor/file_system/editor_file_system.h"
 
 class EditorFileServer : public Object {
 	GDCLASS(EditorFileServer, Object);

editor/debugger/editor_performance_profiler.cpp

@@ -30,9 +30,9 @@
 
 #include "editor_performance_profiler.h"
 
-#include "editor/editor_property_name_processor.h"
-#include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
+#include "editor/inspector/editor_property_name_processor.h"
+#include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "editor/themes/editor_theme_manager.h"
 #include "main/performance.h"

editor/debugger/editor_profiler.cpp

@@ -31,9 +31,9 @@
 #include "editor_profiler.h"
 
 #include "core/io/image.h"
-#include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
-#include "editor/gui/editor_run_bar.h"
+#include "editor/run/editor_run_bar.h"
+#include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/flow_container.h"

editor/debugger/editor_visual_profiler.cpp

@@ -31,9 +31,9 @@
 #include "editor_visual_profiler.h"
 
 #include "core/io/image.h"
-#include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
-#include "editor/gui/editor_run_bar.h"
+#include "editor/run/editor_run_bar.h"
+#include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/flow_container.h"
 #include "scene/resources/image_texture.h"

editor/debugger/script_editor_debugger.cpp

@@ -34,23 +34,23 @@
 #include "core/debugger/remote_debugger.h"
 #include "core/string/ustring.h"
 #include "core/version.h"
+#include "editor/debugger/editor_debugger_plugin.h"
 #include "editor/debugger/editor_expression_evaluator.h"
 #include "editor/debugger/editor_performance_profiler.h"
 #include "editor/debugger/editor_profiler.h"
 #include "editor/debugger/editor_visual_profiler.h"
-#include "editor/editor_file_system.h"
+#include "editor/docks/filesystem_dock.h"
+#include "editor/docks/inspector_dock.h"
 #include "editor/editor_log.h"
 #include "editor/editor_node.h"
-#include "editor/editor_property_name_processor.h"
-#include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
-#include "editor/filesystem_dock.h"
+#include "editor/file_system/editor_file_system.h"
 #include "editor/gui/editor_file_dialog.h"
 #include "editor/gui/editor_toaster.h"
-#include "editor/inspector_dock.h"
-#include "editor/plugins/canvas_item_editor_plugin.h"
-#include "editor/plugins/editor_debugger_plugin.h"
-#include "editor/plugins/node_3d_editor_plugin.h"
+#include "editor/inspector/editor_property_name_processor.h"
+#include "editor/scene/3d/node_3d_editor_plugin.h"
+#include "editor/scene/canvas_item_editor_plugin.h"
+#include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "main/performance.h"
 #include "scene/3d/camera_3d.h"

editor/doc/SCsub

@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+from misc.utility.scons_hints import *
+
+Import("env")
+
+env.add_source_files(env.editor_sources, "*.cpp")

editor/doc_tools.cpp → editor/doc/doc_tools.cpp

@@ -39,8 +39,8 @@
 #include "core/io/resource_importer.h"
 #include "core/object/script_language.h"
 #include "core/string/translation_server.h"
-#include "editor/editor_settings.h"
 #include "editor/export/editor_export_platform.h"
+#include "editor/settings/editor_settings.h"
 #include "scene/resources/theme.h"
 #include "scene/theme/theme_db.h"
 

editor/editor_help.cpp → editor/doc/editor_help.cpp

@@ -39,17 +39,17 @@
 #include "core/os/keyboard.h"
 #include "core/string/string_builder.h"
 #include "core/version.h"
-#include "editor/doc_data_compressed.gen.h"
-#include "editor/editor_file_system.h"
+#include "editor/doc/doc_data_compressed.gen.h"
+#include "editor/docks/filesystem_dock.h"
 #include "editor/editor_main_screen.h"
 #include "editor/editor_node.h"
-#include "editor/editor_paths.h"
-#include "editor/editor_property_name_processor.h"
-#include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
-#include "editor/filesystem_dock.h"
+#include "editor/file_system/editor_file_system.h"
+#include "editor/file_system/editor_paths.h"
 #include "editor/gui/editor_toaster.h"
-#include "editor/plugins/script_editor_plugin.h"
+#include "editor/inspector/editor_property_name_processor.h"
+#include "editor/script/script_editor_plugin.h"
+#include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/line_edit.h"
 
@@ -63,7 +63,6 @@
 
 // For syntax highlighting.
 #ifdef MODULE_MONO_ENABLED
-#include "editor/plugins/script_editor_plugin.h"
 #include "modules/mono/csharp_script.h"
 #endif
 

editor/editor_help.h → editor/doc/editor_help.h

@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/os/thread.h"
-#include "editor/doc_tools.h"
+#include "editor/doc/doc_tools.h"
 #include "editor/plugins/editor_plugin.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/popup.h"

editor/editor_help_search.cpp → editor/doc/editor_help_search.cpp

@@ -30,11 +30,11 @@
 
 #include "editor_help_search.h"
 
-#include "editor/editor_feature_profile.h"
 #include "editor/editor_main_screen.h"
 #include "editor/editor_node.h"
-#include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
+#include "editor/settings/editor_feature_profile.h"
+#include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "editor/themes/editor_theme_manager.h"
 #include "scene/gui/line_edit.h"

editor/docks/SCsub

@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+from misc.utility.scons_hints import *
+
+Import("env")
+
+env.add_source_files(env.editor_sources, "*.cpp")

editor/editor_dock_manager.cpp → editor/docks/editor_dock_manager.cpp

@@ -38,11 +38,11 @@
 #include "scene/main/window.h"
 
 #include "editor/editor_node.h"
-#include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
 #include "editor/gui/editor_bottom_panel.h"
+#include "editor/gui/window_wrapper.h"
+#include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
-#include "editor/window_wrapper.h"
 #include "scene/resources/style_box_flat.h"
 
 enum class TabStyle {

editor/filesystem_dock.cpp → editor/docks/filesystem_dock.cpp

@@ -37,25 +37,25 @@
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
 #include "core/templates/list.h"
-#include "editor/create_dialog.h"
-#include "editor/directory_create_dialog.h"
-#include "editor/editor_dock_manager.h"
-#include "editor/editor_feature_profile.h"
+#include "editor/docks/editor_dock_manager.h"
+#include "editor/docks/import_dock.h"
+#include "editor/docks/scene_tree_dock.h"
 #include "editor/editor_node.h"
-#include "editor/editor_resource_preview.h"
-#include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
+#include "editor/gui/create_dialog.h"
+#include "editor/gui/directory_create_dialog.h"
 #include "editor/gui/editor_dir_dialog.h"
-#include "editor/gui/editor_scene_tabs.h"
 #include "editor/import/3d/scene_import_settings.h"
-#include "editor/import_dock.h"
-#include "editor/plugins/editor_context_menu_plugin.h"
+#include "editor/inspector/editor_context_menu_plugin.h"
+#include "editor/inspector/editor_resource_preview.h"
+#include "editor/inspector/editor_resource_tooltip_plugins.h"
 #include "editor/plugins/editor_resource_conversion_plugin.h"
-#include "editor/plugins/editor_resource_tooltip_plugins.h"
-#include "editor/scene_create_dialog.h"
-#include "editor/scene_tree_dock.h"
-#include "editor/shader_create_dialog.h"
+#include "editor/scene/editor_scene_tabs.h"
+#include "editor/scene/scene_create_dialog.h"
+#include "editor/settings/editor_feature_profile.h"
+#include "editor/settings/editor_settings.h"
+#include "editor/shader/shader_create_dialog.h"
 #include "editor/themes/editor_scale.h"
 #include "editor/themes/editor_theme_manager.h"
 #include "scene/gui/item_list.h"

editor/filesystem_dock.h → editor/docks/filesystem_dock.h

@@ -30,11 +30,11 @@
 
 #pragma once
 
-#include "editor/dependency_editor.h"
-#include "editor/editor_file_system.h"
-#include "editor/file_info.h"
-#include "editor/plugins/script_editor_plugin.h"
-#include "editor/script_create_dialog.h"
+#include "editor/file_system/dependency_editor.h"
+#include "editor/file_system/editor_file_system.h"
+#include "editor/file_system/file_info.h"
+#include "editor/script/script_create_dialog.h"
+#include "editor/script/script_editor_plugin.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/control.h"
 #include "scene/gui/dialogs.h"

editor/groups_editor.cpp → editor/docks/groups_editor.cpp

@@ -30,13 +30,13 @@
 
 #include "groups_editor.h"
 
+#include "editor/docks/scene_tree_dock.h"
 #include "editor/editor_node.h"
-#include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/gui/editor_validation_panel.h"
-#include "editor/project_settings_editor.h"
-#include "editor/scene_tree_dock.h"
+#include "editor/settings/editor_settings.h"
+#include "editor/settings/project_settings_editor.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/check_button.h"

editor/history_dock.cpp → editor/docks/history_dock.cpp

@@ -32,9 +32,9 @@
 
 #include "core/io/config_file.h"
 #include "editor/editor_node.h"
-#include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
+#include "editor/settings/editor_settings.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/item_list.h"
 

editor/import_dock.cpp → editor/docks/import_dock.cpp

@@ -32,10 +32,10 @@
 
 #include "core/config/project_settings.h"
 #include "editor/editor_node.h"
-#include "editor/editor_resource_preview.h"
-#include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
+#include "editor/inspector/editor_resource_preview.h"
+#include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "editor/themes/editor_theme_manager.h"
 

editor/import_dock.h → editor/docks/import_dock.h

@@ -32,8 +32,8 @@
 
 #include "core/io/config_file.h"
 #include "core/io/resource_importer.h"
-#include "editor/editor_file_system.h"
-#include "editor/editor_inspector.h"
+#include "editor/file_system/editor_file_system.h"
+#include "editor/inspector/editor_inspector.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/menu_button.h"

editor/inspector_dock.cpp → editor/docks/inspector_dock.cpp

@@ -32,15 +32,15 @@
 
 #include "editor/debugger/editor_debugger_inspector.h"
 #include "editor/debugger/editor_debugger_node.h"
+#include "editor/docks/filesystem_dock.h"
 #include "editor/editor_main_screen.h"
 #include "editor/editor_node.h"
-#include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
-#include "editor/filesystem_dock.h"
 #include "editor/gui/editor_file_dialog.h"
 #include "editor/gui/editor_object_selector.h"
-#include "editor/plugins/script_editor_plugin.h"
+#include "editor/script/script_editor_plugin.h"
+#include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 
 InspectorDock *InspectorDock::singleton = nullptr;

editor/inspector_dock.h → editor/docks/inspector_dock.h

@@ -30,9 +30,9 @@
 
 #pragma once
 
-#include "editor/create_dialog.h"
 #include "editor/editor_data.h"
-#include "editor/editor_inspector.h"
+#include "editor/gui/create_dialog.h"
+#include "editor/inspector/editor_inspector.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/dialogs.h"

editor/node_dock.cpp → editor/docks/node_dock.cpp

@@ -31,7 +31,7 @@
 #include "node_dock.h"
 
 #include "core/io/config_file.h"
-#include "editor/connections_dialog.h"
+#include "editor/scene/connections_dialog.h"
 #include "editor/themes/editor_scale.h"
 
 void NodeDock::show_groups() {

editor/scene_tree_dock.cpp → editor/docks/scene_tree_dock.cpp

@@ -35,29 +35,29 @@
 #include "core/io/resource_saver.h"
 #include "core/object/class_db.h"
 #include "core/os/keyboard.h"
+#include "editor/animation/animation_player_editor_plugin.h"
 #include "editor/debugger/editor_debugger_node.h"
-#include "editor/editor_feature_profile.h"
-#include "editor/editor_file_system.h"
+#include "editor/docks/filesystem_dock.h"
+#include "editor/docks/inspector_dock.h"
+#include "editor/docks/node_dock.h"
 #include "editor/editor_main_screen.h"
 #include "editor/editor_node.h"
-#include "editor/editor_paths.h"
-#include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
-#include "editor/filesystem_dock.h"
+#include "editor/file_system/editor_file_system.h"
+#include "editor/file_system/editor_paths.h"
 #include "editor/gui/editor_file_dialog.h"
 #include "editor/gui/editor_quick_open_dialog.h"
-#include "editor/inspector_dock.h"
-#include "editor/multi_node_edit.h"
-#include "editor/node_dock.h"
-#include "editor/plugins/animation_player_editor_plugin.h"
-#include "editor/plugins/canvas_item_editor_plugin.h"
-#include "editor/plugins/editor_context_menu_plugin.h"
-#include "editor/plugins/node_3d_editor_plugin.h"
-#include "editor/plugins/script_editor_plugin.h"
-#include "editor/rename_dialog.h"
-#include "editor/reparent_dialog.h"
-#include "editor/shader_create_dialog.h"
+#include "editor/inspector/editor_context_menu_plugin.h"
+#include "editor/inspector/multi_node_edit.h"
+#include "editor/scene/3d/node_3d_editor_plugin.h"
+#include "editor/scene/canvas_item_editor_plugin.h"
+#include "editor/scene/rename_dialog.h"
+#include "editor/scene/reparent_dialog.h"
+#include "editor/script/script_editor_plugin.h"
+#include "editor/settings/editor_feature_profile.h"
+#include "editor/settings/editor_settings.h"
+#include "editor/shader/shader_create_dialog.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/2d/node_2d.h"
 #include "scene/animation/animation_tree.h"

editor/scene_tree_dock.h → editor/docks/scene_tree_dock.h

@@ -30,8 +30,8 @@
 
 #pragma once
 
-#include "editor/gui/scene_tree_editor.h"
-#include "editor/script_create_dialog.h"
+#include "editor/scene/scene_tree_editor.h"
+#include "editor/script/script_create_dialog.h"
 #include "scene/gui/box_container.h"
 #include "scene/resources/animation.h"
 

editor/editor_data.cpp

@@ -36,8 +36,8 @@
 #include "core/io/resource_loader.h"
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
-#include "editor/multi_node_edit.h"
-#include "editor/plugins/editor_context_menu_plugin.h"
+#include "editor/inspector/editor_context_menu_plugin.h"
+#include "editor/inspector/multi_node_edit.h"
 #include "editor/plugins/editor_plugin.h"
 #include "scene/property_utils.h"
 #include "scene/resources/packed_scene.h"

editor/editor_interface.cpp

@@ -32,27 +32,27 @@
 #include "editor_interface.compat.inc"
 
 #include "core/config/project_settings.h"
-#include "editor/create_dialog.h"
-#include "editor/editor_command_palette.h"
-#include "editor/editor_feature_profile.h"
+#include "editor/docks/filesystem_dock.h"
+#include "editor/docks/inspector_dock.h"
 #include "editor/editor_main_screen.h"
 #include "editor/editor_node.h"
-#include "editor/editor_paths.h"
-#include "editor/editor_resource_preview.h"
-#include "editor/editor_settings.h"
 #include "editor/editor_undo_redo_manager.h"
-#include "editor/filesystem_dock.h"
+#include "editor/file_system/editor_paths.h"
+#include "editor/gui/create_dialog.h"
 #include "editor/gui/editor_quick_open_dialog.h"
-#include "editor/gui/editor_run_bar.h"
-#include "editor/gui/editor_scene_tabs.h"
 #include "editor/gui/editor_toaster.h"
-#include "editor/gui/scene_tree_editor.h"
-#include "editor/inspector_dock.h"
-#include "editor/plugins/node_3d_editor_plugin.h"
-#include "editor/property_selector.h"
+#include "editor/inspector/editor_preview_plugins.h"
+#include "editor/inspector/editor_resource_preview.h"
+#include "editor/inspector/property_selector.h"
+#include "editor/run/editor_run_bar.h"
+#include "editor/scene/3d/node_3d_editor_plugin.h"
+#include "editor/scene/editor_scene_tabs.h"
+#include "editor/scene/scene_tree_editor.h"
+#include "editor/settings/editor_command_palette.h"
+#include "editor/settings/editor_feature_profile.h"
+#include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "main/main.h"
-#include "plugins/editor_preview_plugins.h"
 #include "scene/3d/light_3d.h"
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/gui/box_container.h"

editor/editor_log.cpp

@@ -34,9 +34,9 @@
 #include "core/os/keyboard.h"
 #include "core/version.h"
 #include "editor/editor_node.h"
-#include "editor/editor_paths.h"
-#include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
+#include "editor/file_system/editor_paths.h"
+#include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/separator.h"
 #include "scene/resources/font.h"

editor/editor_main_screen.cpp

@@ -32,9 +32,9 @@
 
 #include "core/io/config_file.h"
 #include "editor/editor_node.h"
-#include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
 #include "editor/plugins/editor_plugin.h"
+#include "editor/settings/editor_settings.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 

editor/editor_node.cpp

@@ -46,7 +46,7 @@
 #include "core/string/translation_server.h"
 #include "core/version.h"
 #include "editor/editor_string_names.h"
-#include "editor/plugins/editor_context_menu_plugin.h"
+#include "editor/inspector/editor_context_menu_plugin.h"
 #include "main/main.h"
 #include "scene/2d/node_2d.h"
 #include "scene/3d/bone_attachment_3d.h"
@@ -72,56 +72,51 @@
 #include "servers/navigation_server_3d.h"
 #include "servers/rendering_server.h"
 
-#include "editor/audio_stream_preview.h"
+#include "editor/animation/animation_player_editor_plugin.h"
+#include "editor/asset_library/asset_library_editor_plugin.h"
+#include "editor/audio/audio_stream_preview.h"
+#include "editor/audio/editor_audio_buses.h"
+#include "editor/debugger/debugger_editor_plugin.h"
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/debugger/script_editor_debugger.h"
-#include "editor/dependency_editor.h"
-#include "editor/editor_about.h"
-#include "editor/editor_audio_buses.h"
-#include "editor/editor_build_profile.h"
-#include "editor/editor_command_palette.h"
+#include "editor/doc/editor_help.h"
+#include "editor/docks/editor_dock_manager.h"
+#include "editor/docks/filesystem_dock.h"
+#include "editor/docks/history_dock.h"
+#include "editor/docks/import_dock.h"
+#include "editor/docks/inspector_dock.h"
+#include "editor/docks/node_dock.h"
+#include "editor/docks/scene_tree_dock.h"
 #include "editor/editor_data.h"
-#include "editor/editor_dock_manager.h"
-#include "editor/editor_feature_profile.h"
-#include "editor/editor_folding.h"
-#include "editor/editor_help.h"
-#include "editor/editor_inspector.h"
 #include "editor/editor_interface.h"
-#include "editor/editor_layouts_dialog.h"
 #include "editor/editor_log.h"
 #include "editor/editor_main_screen.h"
-#include "editor/editor_native_shader_source_visualizer.h"
-#include "editor/editor_paths.h"
-#include "editor/editor_properties.h"
-#include "editor/editor_property_name_processor.h"
-#include "editor/editor_resource_picker.h"
-#include "editor/editor_resource_preview.h"
-#include "editor/editor_run.h"
-#include "editor/editor_script.h"
-#include "editor/editor_settings.h"
-#include "editor/editor_settings_dialog.h"
-#include "editor/editor_translation_parser.h"
 #include "editor/editor_undo_redo_manager.h"
+#include "editor/export/dedicated_server_export_plugin.h"
 #include "editor/export/editor_export.h"
 #include "editor/export/export_template_manager.h"
+#include "editor/export/gdextension_export_plugin.h"
 #include "editor/export/project_export.h"
 #include "editor/export/project_zip_packer.h"
-#include "editor/fbx_importer_manager.h"
-#include "editor/filesystem_dock.h"
+#include "editor/export/register_exporters.h"
+#include "editor/export/shader_baker_export_plugin.h"
+#include "editor/file_system/dependency_editor.h"
+#include "editor/file_system/editor_paths.h"
+#include "editor/gui/editor_about.h"
 #include "editor/gui/editor_bottom_panel.h"
 #include "editor/gui/editor_file_dialog.h"
 #include "editor/gui/editor_quick_open_dialog.h"
-#include "editor/gui/editor_run_bar.h"
-#include "editor/gui/editor_scene_tabs.h"
 #include "editor/gui/editor_title_bar.h"
 #include "editor/gui/editor_toaster.h"
-#include "editor/history_dock.h"
+#include "editor/gui/progress_dialog.h"
+#include "editor/gui/window_wrapper.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/fbx_importer_manager.h"
 #include "editor/import/resource_importer_bitmask.h"
 #include "editor/import/resource_importer_bmfont.h"
 #include "editor/import/resource_importer_csv_translation.h"
@@ -134,51 +129,55 @@
 #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_dock.h"
-#include "editor/inspector_dock.h"
-#include "editor/multi_node_edit.h"
-#include "editor/node_dock.h"
-#include "editor/plugins/animation_player_editor_plugin.h"
-#include "editor/plugins/asset_library_editor_plugin.h"
-#include "editor/plugins/canvas_item_editor_plugin.h"
-#include "editor/plugins/debugger_editor_plugin.h"
-#include "editor/plugins/dedicated_server_export_plugin.h"
+#include "editor/inspector/editor_inspector.h"
+#include "editor/inspector/editor_preview_plugins.h"
+#include "editor/inspector/editor_properties.h"
+#include "editor/inspector/editor_property_name_processor.h"
+#include "editor/inspector/editor_resource_picker.h"
+#include "editor/inspector/editor_resource_preview.h"
+#include "editor/inspector/multi_node_edit.h"
 #include "editor/plugins/editor_plugin.h"
-#include "editor/plugins/editor_preview_plugins.h"
 #include "editor/plugins/editor_resource_conversion_plugin.h"
-#include "editor/plugins/game_view_plugin.h"
-#include "editor/plugins/gdextension_export_plugin.h"
-#include "editor/plugins/material_editor_plugin.h"
-#include "editor/plugins/mesh_library_editor_plugin.h"
-#include "editor/plugins/node_3d_editor_plugin.h"
-#include "editor/plugins/packed_scene_translation_parser_plugin.h"
-#include "editor/plugins/particle_process_material_editor_plugin.h"
 #include "editor/plugins/plugin_config_dialog.h"
-#include "editor/plugins/root_motion_editor_plugin.h"
-#include "editor/plugins/script_text_editor.h"
-#include "editor/plugins/shader_baker_export_plugin.h"
-#include "editor/plugins/text_editor.h"
-#include "editor/plugins/version_control_editor_plugin.h"
-#include "editor/plugins/visual_shader_editor_plugin.h"
-#include "editor/progress_dialog.h"
-#include "editor/project_settings_editor.h"
-#include "editor/project_upgrade_tool.h"
-#include "editor/register_exporters.h"
-#include "editor/scene_tree_dock.h"
+#include "editor/project_upgrade/project_upgrade_tool.h"
+#include "editor/run/editor_run.h"
+#include "editor/run/editor_run_bar.h"
+#include "editor/run/game_view_plugin.h"
+#include "editor/scene/3d/mesh_library_editor_plugin.h"
+#include "editor/scene/3d/node_3d_editor_plugin.h"
+#include "editor/scene/3d/root_motion_editor_plugin.h"
+#include "editor/scene/canvas_item_editor_plugin.h"
+#include "editor/scene/editor_scene_tabs.h"
+#include "editor/scene/material_editor_plugin.h"
+#include "editor/scene/particle_process_material_editor_plugin.h"
+#include "editor/script/editor_script.h"
+#include "editor/script/script_text_editor.h"
+#include "editor/script/text_editor.h"
+#include "editor/settings/editor_build_profile.h"
+#include "editor/settings/editor_command_palette.h"
+#include "editor/settings/editor_feature_profile.h"
+#include "editor/settings/editor_layouts_dialog.h"
+#include "editor/settings/editor_settings.h"
+#include "editor/settings/editor_settings_dialog.h"
+#include "editor/settings/project_settings_editor.h"
+#include "editor/shader/editor_native_shader_source_visualizer.h"
+#include "editor/shader/visual_shader_editor_plugin.h"
 #include "editor/themes/editor_scale.h"
 #include "editor/themes/editor_theme_manager.h"
-#include "editor/window_wrapper.h"
+#include "editor/translations/editor_translation_parser.h"
+#include "editor/translations/packed_scene_translation_parser_plugin.h"
+#include "editor/version_control/version_control_editor_plugin.h"
 
 #ifdef VULKAN_ENABLED
-#include "editor/plugins/shader_baker/shader_baker_export_plugin_platform_vulkan.h"
+#include "editor/shader/shader_baker/shader_baker_export_plugin_platform_vulkan.h"
 #endif
 
 #ifdef D3D12_ENABLED
-#include "editor/plugins/shader_baker/shader_baker_export_plugin_platform_d3d12.h"
+#include "editor/shader/shader_baker/shader_baker_export_plugin_platform_d3d12.h"
 #endif
 
 #ifdef METAL_ENABLED
-#include "editor/plugins/shader_baker/shader_baker_export_plugin_platform_metal.h"
+#include "editor/shader/shader_baker/shader_baker_export_plugin_platform_metal.h"
 #endif
 
 #include "modules/modules_enabled.gen.h" // For gdscript, mono.

editor/editor_node.h

@@ -33,8 +33,8 @@
 #include "core/object/script_language.h"
 #include "core/templates/safe_refcount.h"
 #include "editor/editor_data.h"
-#include "editor/editor_folding.h"
 #include "editor/plugins/editor_plugin.h"
+#include "editor/settings/editor_folding.h"
 
 typedef void (*EditorNodeInitCallback)();
 typedef void (*EditorPluginInitializeCallback)();

editor/export/codesign.cpp

@@ -33,7 +33,7 @@
 #include "core/crypto/crypto_core.h"
 #include "core/io/dir_access.h"
 #include "core/io/plist.h"
-#include "editor/editor_paths.h"
+#include "editor/file_system/editor_paths.h"
 #include "lipo.h"
 #include "macho.h"
 

editor/export/editor_export.cpp

@@ -32,7 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/config_file.h"
-#include "editor/editor_settings.h"
+#include "editor/settings/editor_settings.h"
 
 EditorExport *EditorExport::singleton = nullptr;
 

editor/export/editor_export_platform.cpp

@@ -42,13 +42,13 @@
 #include "core/io/zip_io.h"
 #include "core/math/random_pcg.h"
 #include "core/version.h"
-#include "editor/editor_file_system.h"
 #include "editor/editor_node.h"
-#include "editor/editor_paths.h"
-#include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
 #include "editor/export/editor_export.h"
-#include "editor/plugins/script_editor_plugin.h"
+#include "editor/file_system/editor_file_system.h"
+#include "editor/file_system/editor_paths.h"
+#include "editor/script/script_editor_plugin.h"
+#include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "editor_export_plugin.h"
 #include "scene/resources/image_texture.h"

editor/export/editor_export_platform_apple_embedded.cpp

@@ -34,13 +34,13 @@
 #include "core/io/plist.h"
 #include "core/string/translation.h"
 #include "editor/editor_node.h"
-#include "editor/editor_paths.h"
 #include "editor/editor_string_names.h"
 #include "editor/export/editor_export.h"
 #include "editor/export/lipo.h"
 #include "editor/export/macho.h"
+#include "editor/file_system/editor_paths.h"
 #include "editor/import/resource_importer_texture_settings.h"
-#include "editor/plugins/script_editor_plugin.h"
+#include "editor/script/script_editor_plugin.h"
 #include "editor/themes/editor_scale.h"
 #include "main/main.h"
 

editor/export/editor_export_platform_apple_embedded.h

@@ -40,8 +40,8 @@
 #include "core/io/zip_io.h"
 #include "core/os/os.h"
 #include "core/templates/safe_refcount.h"
-#include "editor/editor_settings.h"
 #include "editor/export/editor_export_platform.h"
+#include "editor/settings/editor_settings.h"
 #include "main/splash.gen.h"
 #include "scene/resources/image_texture.h"
 

editor/export/export_template_manager.cpp

@@ -34,13 +34,13 @@
 #include "core/io/json.h"
 #include "core/io/zip_io.h"
 #include "core/version.h"
-#include "editor/editor_file_system.h"
 #include "editor/editor_node.h"
-#include "editor/editor_paths.h"
-#include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
 #include "editor/export/editor_export_preset.h"
-#include "editor/progress_dialog.h"
+#include "editor/file_system/editor_file_system.h"
+#include "editor/file_system/editor_paths.h"
+#include "editor/gui/progress_dialog.h"
+#include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/file_dialog.h"
 #include "scene/gui/line_edit.h"

editor/export/project_export.cpp

@@ -32,15 +32,15 @@
 
 #include "core/config/project_settings.h"
 #include "core/version.h"
-#include "editor/editor_file_system.h"
 #include "editor/editor_node.h"
-#include "editor/editor_properties.h"
-#include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
 #include "editor/export/editor_export.h"
+#include "editor/file_system/editor_file_system.h"
 #include "editor/gui/editor_file_dialog.h"
 #include "editor/import/resource_importer_texture_settings.h"
-#include "editor/project_settings_editor.h"
+#include "editor/inspector/editor_properties.h"
+#include "editor/settings/editor_settings.h"
+#include "editor/settings/project_settings_editor.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/check_button.h"
 #include "scene/gui/item_list.h"

editor/file_system/SCsub

@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+from misc.utility.scons_hints import *
+
+Import("env")
+
+env.add_source_files(env.editor_sources, "*.cpp")