Moved CanvasItem, Control, Node2D and Spatial under scene/main.

core/variant/variant.cpp

@@ -37,7 +37,7 @@
 #include "core/string/print_string.h"
 #include "core/object/resource.h"
 #include "core/variant/variant_parser.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/main/node.h"
 
 String Variant::get_type_name(Variant::Type p_type) {

editor/animation_bezier_editor.cpp

@@ -49,7 +49,7 @@
 #include "core/object/undo_redo.h"
 #include "editor/animation_track_editor.h"
 #include "editor/editor_settings.h"
-#include "scene/2d/canvas_item.h"
+#include "scene/main/canvas_item.h"
 #include "scene/gui/option_button.h"
 #include "scene/gui/popup_menu.h"
 #include "scene/gui/range.h"

editor/animation_bezier_editor.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 
 #include "core/containers/rb_map.h"
 #include "core/math/rect2.h"

editor/animation_track_editor.cpp

@@ -63,8 +63,8 @@
 #include "editor/scene_tree_editor.h"
 #include "editor_node.h"
 #include "editor_scale.h"
-#include "scene/2d/canvas_item.h"
-#include "scene/3d/spatial.h"
+#include "scene/main/canvas_item.h"
+#include "scene/main/spatial.h"
 #include "scene/animation/animation_player.h"
 #include "scene/gui/button.h"
 #include "scene/gui/check_box.h"

editor/animation_track_editor.h

@@ -32,7 +32,7 @@
 
 #include "core/object/reference.h"
 #include "scene/gui/box_container.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/range.h"
 
 #include "scene/gui/slider.h"

editor/connections_dialog.cpp

@@ -61,7 +61,7 @@
 #include "scene/gui/button.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/check_button.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/label.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/margin_container.h"

editor/create_dialog.cpp

@@ -47,10 +47,10 @@
 #include "editor_node.h"
 #include "editor_scale.h"
 #include "editor_settings.h"
-#include "scene/2d/canvas_item.h"
+#include "scene/main/canvas_item.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/popup.h"
 #include "scene/gui/rich_text_label.h"

editor/dependency_editor.cpp

@@ -55,7 +55,7 @@
 #include "editor/editor_settings.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/item_list.h"
 #include "scene/gui/label.h"
 #include "scene/gui/popup_menu.h"

editor/editor_about.cpp

@@ -43,7 +43,7 @@
 #include "core/variant/variant.h"
 #include "editor/editor_scale.h"
 #include "scene/gui/box_container.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/item_list.h"
 #include "scene/gui/label.h"
 #include "scene/gui/link_button.h"

editor/editor_audio_buses.cpp

@@ -51,7 +51,7 @@
 #include "editor_node.h"
 #include "editor_scale.h"
 #include "filesystem_dock.h"
-#include "scene/2d/canvas_item.h"
+#include "scene/main/canvas_item.h"
 #include "scene/gui/button.h"
 #include "scene/gui/label.h"
 #include "scene/gui/menu_button.h"

editor/editor_audio_buses.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "editor_plugin.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/panel_container.h"
 #include "scene/gui/box_container.h"
 

editor/editor_autoload_settings.cpp

@@ -56,7 +56,7 @@
 #include "core/containers/vector.h"
 #include "editor/editor_file_dialog.h"
 #include "scene/gui/button.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/label.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/tree.h"

editor/editor_dir_dialog.cpp

@@ -44,7 +44,7 @@
 #include "core/os/dir_access.h"
 #include "core/os/memory.h"
 #include "core/variant/variant.h"
-#include "scene/2d/canvas_item.h"
+#include "scene/main/canvas_item.h"
 #include "scene/gui/tree.h"
 #include "scene/main/node.h"
 

editor/editor_file_dialog.cpp

@@ -55,7 +55,7 @@
 #include "scene/gui/base_button.h"
 #include "scene/gui/button.h"
 #include "scene/gui/center_container.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/item_list.h"
 #include "scene/gui/label.h"
 #include "scene/gui/line_edit.h"

editor/editor_help.cpp

@@ -51,8 +51,8 @@
 #include "editor_node.h"
 #include "editor_scale.h"
 #include "editor_settings.h"
-#include "scene/2d/canvas_item.h"
-#include "scene/gui/control.h"
+#include "scene/main/canvas_item.h"
+#include "scene/main/control.h"
 #include "scene/gui/label.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/scroll_bar.h"

editor/editor_help_search.cpp

@@ -46,7 +46,7 @@
 #include "editor/editor_settings.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/option_button.h"
 #include "scene/gui/popup.h"

editor/editor_inspector.cpp

@@ -53,7 +53,7 @@
 #include "editor_scale.h"
 #include "editor_settings.h"
 #include "multi_node_edit.h"
-#include "scene/2d/canvas_item.h"
+#include "scene/main/canvas_item.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/label.h"
 #include "scene/gui/line_edit.h"

editor/editor_inspector.h

@@ -32,7 +32,7 @@
 
 #include "core/object/reference.h"
 #include "scene/gui/container.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/scroll_container.h"
 
 #include "core/containers/list.h"

editor/editor_layouts_dialog.cpp

@@ -45,7 +45,7 @@
 #include "core/string/ustring.h"
 #include "core/variant/variant.h"
 #include "core/containers/vector.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 
 void EditorLayoutsDialog::_line_gui_input(const Ref<InputEvent> &p_event) {
 	Ref<InputEventKey> k = p_event;

editor/editor_log.cpp

@@ -43,7 +43,7 @@
 #include "editor_node.h"
 #include "editor_scale.h"
 #include "scene/gui/button.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/label.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/rich_text_label.h"

editor/editor_network_profiler.cpp

@@ -41,7 +41,7 @@
 #include "core/string/ustring.h"
 #include "core/variant/variant.h"
 #include "scene/gui/button.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/label.h"
 #include "scene/gui/tree.h"
 #include "scene/main/node.h"

editor/editor_node.cpp

@@ -162,7 +162,7 @@
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/check_box.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/file_dialog.h"
 #include "scene/gui/label.h"

editor/editor_node.h

@@ -63,7 +63,7 @@
 #include "core/variant/dictionary.h"
 #include "core/variant/variant.h"
 #include "editor/editor_data.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 
 #include "scene/resources/texture.h"
 #include "scene/resources/theme.h"

editor/editor_path.cpp

@@ -45,7 +45,7 @@
 #include "core/variant/variant.h"
 #include "editor/editor_data.h"
 #include "scene/gui/box_container.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/label.h"
 #include "scene/gui/margin_container.h"
 #include "scene/gui/popup_menu.h"

editor/editor_plugin.cpp

@@ -66,7 +66,7 @@
 #include "scene/3d/camera.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/container.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/popup_menu.h"
 #include "scene/gui/split_container.h"
 #include "scene/gui/tab_container.h"

editor/editor_plugin_settings.cpp

@@ -44,7 +44,7 @@
 #include "editor_node.h"
 #include "editor_scale.h"
 #include "scene/gui/button.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/label.h"
 #include "scene/gui/tree.h"
 #include "scene/main/node.h"

editor/editor_profiler.cpp

@@ -42,7 +42,7 @@
 #include "core/os/memory.h"
 #include "core/variant/variant.h"
 #include "scene/gui/button.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/label.h"
 #include "scene/gui/option_button.h"
 #include "scene/gui/spin_box.h"

editor/editor_properties.cpp

@@ -65,12 +65,12 @@
 #include "editor_node.h"
 #include "editor_properties_array_dict.h"
 #include "editor_scale.h"
-#include "scene/2d/canvas_item.h"
+#include "scene/main/canvas_item.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/color_picker.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/grid_container.h"
 #include "scene/gui/label.h"

editor/editor_properties_array_dict.cpp

@@ -51,7 +51,7 @@
 #include "editor_properties.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/label.h"
 #include "scene/gui/panel_container.h"
 #include "scene/gui/popup_menu.h"

editor/editor_resource_picker.cpp

@@ -56,9 +56,9 @@
 #include "editor_scale.h"
 #include "editor_settings.h"
 #include "filesystem_dock.h"
-#include "scene/2d/canvas_item.h"
+#include "scene/main/canvas_item.h"
 #include "scene/gui/button.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/popup_menu.h"
 #include "scene/gui/tab_container.h"
 #include "scene/gui/texture_rect.h"

editor/editor_resource_preview.cpp

@@ -48,7 +48,7 @@
 #include "core/os/os.h"
 #include "core/object/script_language.h"
 #include "core/typedefs.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "servers/rendering_server.h"
 
 bool EditorResourcePreviewGenerator::handles(const String &p_type) const {

editor/editor_sectioned_inspector.cpp

@@ -42,7 +42,7 @@
 #include "core/containers/vector.h"
 #include "editor/editor_inspector.h"
 #include "scene/gui/box_container.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/tree.h"
 

editor/editor_spin_slider.cpp

@@ -47,8 +47,8 @@
 #include "core/os/memory.h"
 #include "core/typedefs.h"
 #include "core/variant/variant.h"
-#include "scene/2d/canvas_item.h"
-#include "scene/gui/control.h"
+#include "scene/main/canvas_item.h"
+#include "scene/main/control.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/popup_menu.h"
 #include "scene/gui/texture_rect.h"

editor/editor_sub_scene.cpp

@@ -40,10 +40,10 @@
 #include "core/string/string_name.h"
 #include "core/variant/variant.h"
 #include "editor/editor_file_dialog.h"
-#include "scene/2d/canvas_item.h"
+#include "scene/main/canvas_item.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/tree.h"
 #include "scene/main/node.h"

editor/export_template_manager.cpp

@@ -51,10 +51,10 @@
 #include "editor_node.h"
 #include "editor_scale.h"
 #include "progress_dialog.h"
-#include "scene/2d/canvas_item.h"
+#include "scene/main/canvas_item.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/file_dialog.h"
 #include "scene/gui/label.h"
 #include "scene/gui/line_edit.h"

editor/filesystem_dock.cpp

@@ -64,7 +64,7 @@
 #include "editor_settings.h"
 #include "import_dock.h"
 #include "scene/gui/button.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/item_list.h"
 #include "scene/gui/label.h"

editor/find_in_files.cpp

@@ -58,7 +58,7 @@
 #include "core/string/print_string.h"
 #include "core/object/reference.h"
 #include "core/typedefs.h"
-#include "scene/2d/canvas_item.h"
+#include "scene/main/canvas_item.h"
 #include "scene/resources/font/font.h"
 
 const char *FindInFiles::SIGNAL_RESULT_FOUND = "result_found";

editor/find_in_files.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "scene/gui/dialogs.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/main/node.h"
 
 #include "core/containers/hash_map.h"

editor/groups_editor.cpp

@@ -48,7 +48,7 @@
 #include "core/variant/variant.h"
 #include "editor/scene_tree_dock.h"
 #include "scene/gui/button.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/tool_button.h"
 #include "scene/gui/tree.h"

editor/import_defaults_editor.cpp

@@ -46,7 +46,7 @@
 #include "editor/editor_inspector.h"
 #include "scene/gui/button.h"
 #include "scene/gui/center_container.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/label.h"
 #include "scene/gui/option_button.h"
 

editor/import_dock.cpp

@@ -49,7 +49,7 @@
 #include "editor/editor_inspector.h"
 #include "editor/editor_settings.h"
 #include "scene/gui/button.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/label.h"
 #include "scene/gui/menu_button.h"

editor/inspector_dock.cpp

@@ -51,9 +51,9 @@
 #include "editor/editor_path.h"
 #include "editor/editor_settings.h"
 #include "editor/plugins/animation_player_editor_plugin.h"
-#include "scene/3d/spatial.h"
+#include "scene/main/spatial.h"
 #include "scene/gui/button.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/menu_button.h"

editor/node_dock.cpp

@@ -38,7 +38,7 @@
 #include "core/string/ustring.h"
 #include "editor/connections_dialog.h"
 #include "editor/groups_editor.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/label.h"
 #include "scene/gui/tool_button.h"
 #include "scene/main/node.h"

editor/pane_drag.cpp

@@ -33,7 +33,7 @@
 #include "core/object/class_db.h"
 #include "core/input/input_event.h"
 #include "core/variant/variant.h"
-#include "scene/2d/canvas_item.h"
+#include "scene/main/canvas_item.h"
 #include "scene/resources/texture.h"
 
 void PaneDrag::_gui_input(const Ref<InputEvent> &p_input) {

editor/pane_drag.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 
 #include "core/math/vector2.h"
 #include "core/object/object.h"

editor/plugins/abstract_polygon_2d_editor.cpp

@@ -47,9 +47,9 @@
 #include "core/object/undo_redo.h"
 #include "editor/editor_node.h"
 #include "editor/editor_settings.h"
-#include "scene/2d/node_2d.h"
+#include "scene/main/node_2d.h"
 #include "scene/gui/button.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/separator.h"
 #include "scene/gui/tool_button.h"

editor/plugins/animation_blend_space_1d_editor.cpp

@@ -48,12 +48,12 @@
 #include "editor/editor_file_dialog.h"
 #include "editor/editor_node.h"
 #include "editor/editor_settings.h"
-#include "scene/2d/canvas_item.h"
+#include "scene/main/canvas_item.h"
 #include "scene/animation/animation_player.h"
 #include "scene/gui/base_button.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/label.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/panel_container.h"

editor/plugins/animation_blend_space_2d_editor.cpp

@@ -52,11 +52,11 @@
 #include "editor/editor_file_dialog.h"
 #include "editor/editor_node.h"
 #include "editor/editor_settings.h"
-#include "scene/2d/canvas_item.h"
+#include "scene/main/canvas_item.h"
 #include "scene/gui/base_button.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/grid_container.h"
 #include "scene/gui/label.h"
 #include "scene/gui/line_edit.h"

editor/plugins/animation_blend_tree_editor_plugin.cpp

@@ -47,13 +47,13 @@
 #include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
-#include "scene/2d/canvas_item.h"
+#include "scene/main/canvas_item.h"
 #include "scene/animation/animation_blend_tree.h"
 #include "scene/animation/animation_player.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/check_box.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/graph_edit.h"
 #include "scene/gui/graph_node.h"

editor/plugins/animation_player_editor_plugin.cpp

@@ -66,7 +66,7 @@
 #include "editor/scene_tree_editor.h"
 #include "scene/animation/animation_player.h"
 #include "scene/gui/button.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/label.h"
 #include "scene/gui/line_edit.h"

editor/plugins/animation_state_machine_editor.cpp

@@ -50,7 +50,7 @@
 #include "editor/editor_file_dialog.h"
 #include "editor/editor_node.h"
 #include "editor/editor_settings.h"
-#include "scene/2d/canvas_item.h"
+#include "scene/main/canvas_item.h"
 #include "scene/gui/base_button.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/label.h"

editor/plugins/animation_tree_editor_plugin.cpp

@@ -49,7 +49,7 @@
 #include "scene/animation/animation_tree.h"
 #include "scene/gui/base_button.h"
 #include "scene/gui/button.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/label.h"
 #include "scene/gui/margin_container.h"
 #include "scene/gui/scroll_container.h"

editor/plugins/audio_stream_editor_plugin.cpp

@@ -44,10 +44,10 @@
 #include "core/typedefs.h"
 #include "core/containers/vector.h"
 #include "editor/editor_node.h"
-#include "scene/2d/canvas_item.h"
+#include "scene/main/canvas_item.h"
 #include "scene/audio/audio_stream_player.h"
 #include "scene/gui/box_container.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/label.h"
 #include "scene/gui/tool_button.h"
 #include "scene/main/node.h"

editor/plugins/camera_editor_plugin.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "editor/editor_plugin.h"
 
 #include "core/object/object.h"

editor/plugins/canvas_item_editor_plugin.cpp

@@ -65,7 +65,7 @@
 #include "editor/scene_tree_dock.h"
 #include "editor/script_editor_debugger.h"
 #include "scene/2d/light_2d.h"
-#include "scene/2d/node_2d.h"
+#include "scene/main/node_2d.h"
 #include "scene/2d/polygon_2d.h"
 
 #include "scene/2d/sprite.h"

editor/plugins/canvas_item_editor_plugin.h

@@ -32,7 +32,7 @@
 
 #include "editor/editor_plugin.h"
 #include "scene/gui/box_container.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 
 #include "core/containers/list.h"
 #include "core/containers/rb_map.h"

editor/plugins/collision_polygon_editor_plugin.cpp

@@ -55,8 +55,8 @@
 #include "editor/editor_node.h"
 #include "scene/3d/immediate_geometry.h"
 #include "scene/3d/mesh_instance.h"
-#include "scene/3d/spatial.h"
-#include "scene/gui/control.h"
+#include "scene/main/spatial.h"
+#include "scene/main/control.h"
 #include "scene/gui/separator.h"
 #include "scene/gui/tool_button.h"
 #include "scene/main/node.h"

editor/plugins/collision_shape_2d_editor_plugin.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "editor/editor_plugin.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 
 #include "core/math/transform_2d.h"
 #include "core/math/vector2.h"

editor/plugins/cpu_particles_editor_plugin.cpp

@@ -40,7 +40,7 @@
 #include "editor/scene_tree_editor.h"
 #include "scene/3d/cpu_particles.h"
 #include "scene/gui/box_container.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/menu_button.h"
 #include "scene/gui/popup_menu.h"
 #include "scene/main/node.h"

editor/plugins/curve_editor_plugin.cpp

@@ -50,7 +50,7 @@
 #include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
-#include "scene/2d/canvas_item.h"
+#include "scene/main/canvas_item.h"
 #include "scene/gui/popup_menu.h"
 #include "scene/resources/font/font.h"
 #include "scene/resources/texture.h"

editor/plugins/curve_editor_plugin.h

@@ -40,7 +40,7 @@
 #include "core/object/reference.h"
 #include "core/string/ustring.h"
 #include "editor/editor_inspector.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 
 class EditorNode;
 class InputEvent;

editor/plugins/gradient_texture_2d_editor_plugin.h

@@ -33,7 +33,7 @@
 
 #include "editor/editor_plugin.h"
 #include "scene/gui/box_container.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "editor/editor_inspector.h"
 
 #include "core/object/reference.h"

editor/plugins/item_list_editor_plugin.cpp

@@ -38,7 +38,7 @@
 #include "editor/editor_node.h"
 #include "editor/plugins/canvas_item_editor_plugin.h"
 #include "scene/gui/button.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/menu_button.h"
 #include "scene/gui/tool_button.h"

editor/plugins/line_2d_editor_plugin.cpp

@@ -34,7 +34,7 @@
 #include "core/object/undo_redo.h"
 #include "core/string/ustring.h"
 #include "scene/2d/line_2d.h"
-#include "scene/2d/node_2d.h"
+#include "scene/main/node_2d.h"
 #include "scene/main/node.h"
 
 class EditorNode;

editor/plugins/material_editor_plugin.cpp

@@ -52,7 +52,7 @@
 #include "core/object/resource.h"
 #include "core/variant/variant.h"
 #include "editor/editor_settings.h"
-#include "scene/2d/canvas_item.h"
+#include "scene/main/canvas_item.h"
 #include "scene/3d/camera.h"
 #include "scene/3d/light.h"
 #include "scene/3d/mesh_instance.h"

editor/plugins/material_editor_plugin.h

@@ -32,7 +32,7 @@
 
 #include "editor/editor_inspector.h"
 #include "editor/editor_plugin.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "editor/property_editor.h"
 
 #include "scene/resources/mesh/primitive_meshes.h"

editor/plugins/mesh_editor_plugin.cpp

@@ -50,9 +50,9 @@
 #include "scene/3d/camera.h"
 #include "scene/3d/light.h"
 #include "scene/3d/mesh_instance.h"
-#include "scene/3d/spatial.h"
+#include "scene/main/spatial.h"
 #include "scene/gui/box_container.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/main/node.h"
 
 class EditorNode;

editor/plugins/mesh_instance_editor_plugin.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "editor/editor_plugin.h"
 
 #include "core/math/vector2.h"

editor/plugins/multimesh_editor_plugin.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "editor/editor_plugin.h"
 
 #include "core/string/node_path.h"

editor/plugins/particles_editor_plugin.cpp

@@ -49,7 +49,7 @@
 #include "editor/editor_file_dialog.h"
 #include "editor/editor_node.h"
 #include "editor/scene_tree_editor.h"
-#include "scene/3d/spatial.h"
+#include "scene/main/spatial.h"
 #include "scene/3d/visual_instance.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"

editor/plugins/particles_editor_plugin.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "editor/editor_plugin.h"
 
 #include "core/math/face3.h"

editor/plugins/path_2d_editor_plugin.cpp

@@ -46,7 +46,7 @@
 #include "core/variant/variant.h"
 #include "editor/editor_node.h"
 #include "scene/2d/path_2d.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/menu_button.h"
 #include "scene/gui/popup_menu.h"
 #include "scene/gui/separator.h"

editor/plugins/path_editor_plugin.cpp

@@ -47,8 +47,8 @@
 #include "editor/editor_settings.h"
 #include "scene/3d/camera.h"
 #include "scene/3d/path.h"
-#include "scene/3d/spatial.h"
-#include "scene/gui/control.h"
+#include "scene/main/spatial.h"
+#include "scene/main/control.h"
 #include "scene/gui/menu_button.h"
 #include "scene/gui/popup_menu.h"
 #include "scene/gui/separator.h"

editor/plugins/polygon_2d_editor_plugin.cpp

@@ -55,12 +55,12 @@
 #include "core/variant/variant.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
-#include "scene/2d/canvas_item.h"
+#include "scene/main/canvas_item.h"
 #include "scene/2d/polygon_2d.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/check_box.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/label.h"
 #include "scene/gui/menu_button.h"

editor/plugins/resource_preloader_editor_plugin.cpp

@@ -44,10 +44,10 @@
 #include "core/containers/vector.h"
 #include "editor/editor_file_dialog.h"
 #include "editor/editor_node.h"
-#include "scene/2d/canvas_item.h"
+#include "scene/main/canvas_item.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/tool_button.h"
 #include "scene/gui/tree.h"

editor/plugins/room_manager_editor_plugin.cpp

@@ -48,9 +48,9 @@
 #include "scene/3d/portal.h"
 #include "scene/3d/room.h"
 #include "scene/3d/room_manager.h"
-#include "scene/3d/spatial.h"
+#include "scene/main/spatial.h"
 #include "scene/gui/box_container.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/separator.h"
 #include "scene/gui/tool_button.h"
 #include "scene/main/node.h"

editor/plugins/root_motion_editor_plugin.cpp

@@ -44,7 +44,7 @@
 #include "scene/animation/animation_tree.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/tree.h"
 #include "scene/main/node.h"

editor/plugins/spatial_editor_plugin.cpp

@@ -66,7 +66,7 @@
 #include "editor/scene_tree_editor.h"
 #include "editor/script_editor_debugger.h"
 #include "editor/spatial_editor_gizmos.h"
-#include "scene/2d/canvas_item.h"
+#include "scene/main/canvas_item.h"
 #include "scene/3d/camera.h"
 #include "scene/3d/collision_shape.h"
 #include "scene/3d/mesh_instance.h"

editor/plugins/spatial_editor_plugin.h

@@ -31,10 +31,10 @@
 /*************************************************************************/
 
 #include "editor/editor_plugin.h"
-#include "scene/3d/spatial.h"
+#include "scene/main/spatial.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/container.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 
 #include "scene/gui/spin_box.h"
 

editor/plugins/sprite_editor_plugin.cpp

@@ -54,7 +54,7 @@
 #include "core/variant/variant.h"
 #include "editor/editor_node.h"
 #include "editor/scene_tree_dock.h"
-#include "scene/2d/node_2d.h"
+#include "scene/main/node_2d.h"
 #include "scene/2d/sprite.h"
 #include "scene/gui/button.h"
 #include "scene/gui/dialogs.h"

editor/plugins/sprite_editor_plugin.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "editor/editor_plugin.h"
 
 #include "core/math/vector2.h"

editor/plugins/sprite_frames_editor_plugin.cpp

@@ -60,7 +60,7 @@
 #include "scene/gui/button.h"
 #include "scene/gui/center_container.h"
 #include "scene/gui/check_button.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/item_list.h"
 #include "scene/gui/label.h"

editor/plugins/style_box_editor_plugin.cpp

@@ -35,7 +35,7 @@
 #include "core/math/rect2.h"
 #include "core/math/vector2.h"
 #include "core/os/memory.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 
 class EditorNode;
 

editor/plugins/texture_editor_plugin.cpp

@@ -37,7 +37,7 @@
 #include "core/io/image.h"
 #include "core/math/vector2.h"
 #include "core/os/memory.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/label.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/main/node.h"

editor/plugins/texture_region_editor_plugin.cpp

@@ -49,11 +49,11 @@
 #include "core/object/undo_redo.h"
 #include "core/variant/variant.h"
 #include "editor/editor_node.h"
-#include "scene/2d/canvas_item.h"
+#include "scene/main/canvas_item.h"
 #include "scene/2d/sprite.h"
 #include "scene/3d/sprite_3d.h"
 #include "scene/gui/button.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/label.h"
 #include "scene/gui/nine_patch_rect.h"
 #include "scene/gui/option_button.h"

editor/plugins/theme_editor_plugin.cpp

@@ -47,11 +47,11 @@
 #include "editor/editor_scale.h"
 #include "editor/plugins/theme_editor_preview.h"
 #include "editor/progress_dialog.h"
-#include "scene/2d/canvas_item.h"
+#include "scene/main/canvas_item.h"
 #include "scene/gui/button.h"
 #include "scene/gui/check_button.h"
 #include "scene/gui/color_picker.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/item_list.h"
 #include "scene/gui/label.h"
 #include "scene/gui/line_edit.h"

editor/plugins/theme_editor_preview.cpp

@@ -50,7 +50,7 @@
 #include "scene/gui/check_button.h"
 #include "scene/gui/color_picker.h"
 #include "scene/gui/color_rect.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/label.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/margin_container.h"

editor/progress_dialog.cpp

@@ -42,9 +42,9 @@
 #include "core/typedefs.h"
 #include "editor_scale.h"
 #include "main/main.h"
-#include "scene/2d/canvas_item.h"
+#include "scene/main/canvas_item.h"
 #include "scene/gui/button.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/label.h"
 #include "scene/gui/progress_bar.h"
 #include "scene/resources/style_box.h"

editor/project_export.cpp

@@ -53,7 +53,7 @@
 #include "scene/gui/button.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/check_button.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/item_list.h"
 #include "scene/gui/label.h"
 #include "scene/gui/line_edit.h"

editor/project_manager.cpp

@@ -63,7 +63,7 @@
 #include "editor_scale.h"
 #include "editor_settings.h"
 #include "editor_themes.h"
-#include "scene/2d/canvas_item.h"
+#include "scene/main/canvas_item.h"
 #include "scene/gui/base_button.h"
 #include "scene/gui/button.h"
 #include "scene/gui/check_box.h"

editor/project_manager.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "scene/gui/box_container.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 
 #include "core/containers/list.h"
 #include "core/object/object.h"

editor/project_settings_editor.cpp

@@ -64,7 +64,7 @@
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/check_button.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/label.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/menu_button.h"

editor/property_editor.cpp

@@ -74,11 +74,11 @@
 #include "editor/property_selector.h"
 #include "editor/scene_tree_dock.h"
 #include "editor/scene_tree_editor.h"
-#include "scene/2d/canvas_item.h"
+#include "scene/main/canvas_item.h"
 #include "scene/gui/button.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/color_picker.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/grid_container.h"
 #include "scene/gui/label.h"

editor/property_selector.cpp

@@ -47,7 +47,7 @@
 #include "editor/editor_node.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/rich_text_label.h"
 #include "scene/gui/tree.h"

editor/quick_open.cpp

@@ -41,7 +41,7 @@
 #include "editor/editor_node.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/tree.h"
 #include "scene/main/node.h"

editor/rename_dialog.cpp

@@ -56,7 +56,7 @@
 
 #include "editor_node.h"
 #include "modules/regex/regex.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/label.h"
 #include "scene/gui/tab_container.h"
 #include "scene/gui/check_button.h"

editor/reparent_dialog.cpp

@@ -36,7 +36,7 @@
 #include "core/string/ustring.h"
 #include "core/variant/variant.h"
 #include "editor/scene_tree_editor.h"
-#include "scene/2d/canvas_item.h"
+#include "scene/main/canvas_item.h"
 #include "scene/gui/button.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/tree.h"

editor/scene_tree_dock.cpp

@@ -74,13 +74,13 @@
 #include "editor/script_create_dialog.h"
 #include "editor/script_editor_debugger.h"
 #include "modules/modules_enabled.gen.h" // For regex.
-#include "scene/2d/canvas_item.h"
-#include "scene/2d/node_2d.h"
-#include "scene/3d/spatial.h"
+#include "scene/main/canvas_item.h"
+#include "scene/main/node_2d.h"
+#include "scene/main/spatial.h"
 #include "scene/animation/animation_player.h"
 #include "scene/gui/base_button.h"
 #include "scene/gui/button.h"
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/label.h"
 #include "scene/gui/line_edit.h"

editor/scene_tree_editor.cpp

@@ -51,7 +51,7 @@
 #include "editor/node_dock.h"
 #include "editor/plugins/animation_player_editor_plugin.h"
 #include "editor/plugins/canvas_item_editor_plugin.h"
-#include "scene/2d/canvas_item.h"
+#include "scene/main/canvas_item.h"
 #include "scene/animation/animation_player.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/label.h"

editor/scene_tree_editor.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "scene/gui/control.h"
+#include "scene/main/control.h"
 #include "scene/gui/dialogs.h"
 
 #include "core/containers/list.h"