diff --git a/.gitignore b/.gitignore
index 8ab969c9a47..cdf277dd713 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,12 +16,12 @@ core/method_bind_ext.inc
 core/script_encryption_key.cpp
 core/global_defaults.cpp
 drivers/unix/os_unix_global_settings_path.cpp
-tools/editor/register_exporters.cpp
-tools/editor/doc_data_compressed.h
-tools/editor/certs_compressed.h
-tools/editor/editor_icons.cpp
-tools/editor/translations.h
-tools/editor/builtin_fonts.h
+editor/register_exporters.cpp
+editor/doc_data_compressed.h
+editor/certs_compressed.h
+editor/editor_icons.cpp
+editor/translations.h
+editor/builtin_fonts.h
 .fscache
 make.bat
 log.txt
diff --git a/SConstruct b/SConstruct
index 4c79304ef2d..2e7683d17ab 100644
--- a/SConstruct
+++ b/SConstruct
@@ -179,7 +179,7 @@ Help(opts.GenerateHelpText(env_base))  # generate help
 
 # add default include paths
 
-env_base.Append(CPPPATH=['#core', '#core/math', '#tools', '#drivers', '#'])
+env_base.Append(CPPPATH=['#core', '#core/math', '#editor', '#drivers', '#'])
 
 # configure ENV for platform
 env_base.platform_exporters = platform_exporters
@@ -358,7 +358,7 @@ if selected_platform in platform_list:
     SConscript("core/SCsub")
     SConscript("servers/SCsub")
     SConscript("scene/SCsub")
-    SConscript("tools/editor/SCsub")
+    SConscript("editor/SCsub")
     SConscript("drivers/SCsub")
 
     SConscript("modules/SCsub")
diff --git a/tools/editor/SCsub b/editor/SCsub
similarity index 88%
rename from tools/editor/SCsub
rename to editor/SCsub
index c9b2392eb2a..d7392f82493 100644
--- a/tools/editor/SCsub
+++ b/editor/SCsub
@@ -159,18 +159,18 @@ if (env["tools"] == "yes"):
 
     # API documentation
     docs = ["#doc/base/classes.xml"]
-    moduledir = os.path.join(os.getcwd(), "..", "..", "modules")
+    moduledir = os.path.join(os.getcwd(), "..", "modules")
     for m in os.listdir(moduledir):
         curmodle = os.path.join(moduledir, m)
         docfile = os.path.join(curmodle, "classes.xml")
         if os.path.isdir(curmodle) and os.path.isfile(docfile):
             docs.append(docfile)
-    env.Depends("#tools/editor/doc_data_compressed.h", docs)
-    env.Command("#tools/editor/doc_data_compressed.h", docs, make_doc_header)
+    env.Depends("#editor/doc_data_compressed.h", docs)
+    env.Command("#editor/doc_data_compressed.h", docs, make_doc_header)
 
     # Certificates
-    env.Depends("#tools/editor/certs_compressed.h", "#thirdparty/certs/ca-certificates.crt")
-    env.Command("#tools/editor/certs_compressed.h", "#thirdparty/certs/ca-certificates.crt", make_certs_header)
+    env.Depends("#editor/certs_compressed.h", "#thirdparty/certs/ca-certificates.crt")
+    env.Command("#editor/certs_compressed.h", "#thirdparty/certs/ca-certificates.crt", make_certs_header)
 
     import glob
     path = env.Dir('.').abspath
@@ -178,15 +178,15 @@ if (env["tools"] == "yes"):
     # Translations
     tlist = glob.glob(path + "/translations/*.po")
     print("translations: ", tlist)
-    env.Depends('#tools/editor/translations.h', tlist)
-    env.Command('#tools/editor/translations.h', tlist, make_translations_header)
+    env.Depends('#editor/translations.h', tlist)
+    env.Command('#editor/translations.h', tlist, make_translations_header)
 
     # Fonts
-    flist = glob.glob(path + "/../../thirdparty/fonts/*.ttf")
-    flist.append(glob.glob(path + "/../../thirdparty/fonts/*.otf"))
+    flist = glob.glob(path + "/../thirdparty/fonts/*.ttf")
+    flist.append(glob.glob(path + "/../thirdparty/fonts/*.otf"))
     print("fonts: ", flist)
-    env.Depends('#tools/editor/builtin_fonts.h', flist)
-    env.Command('#tools/editor/builtin_fonts.h', flist, make_fonts_header)
+    env.Depends('#editor/builtin_fonts.h', flist)
+    env.Command('#editor/builtin_fonts.h', flist, make_fonts_header)
 
 
     env.add_source_files(env.editor_sources, "*.cpp")
diff --git a/tools/editor/animation_editor.cpp b/editor/animation_editor.cpp
similarity index 99%
rename from tools/editor/animation_editor.cpp
rename to editor/animation_editor.cpp
index d675c6a6bb6..d65f229fcaf 100644
--- a/tools/editor/animation_editor.cpp
+++ b/editor/animation_editor.cpp
@@ -35,7 +35,7 @@
 #include "pair.h"
 #include "scene/gui/separator.h"
 #include "editor_node.h"
-#include "tools/editor/plugins/animation_player_editor_plugin.h"
+#include "editor/plugins/animation_player_editor_plugin.h"
 #include "scene/main/viewport.h"
 /* Missing to fix:
 
diff --git a/tools/editor/animation_editor.h b/editor/animation_editor.h
similarity index 100%
rename from tools/editor/animation_editor.h
rename to editor/animation_editor.h
diff --git a/tools/editor/array_property_edit.cpp b/editor/array_property_edit.cpp
similarity index 100%
rename from tools/editor/array_property_edit.cpp
rename to editor/array_property_edit.cpp
diff --git a/tools/editor/array_property_edit.h b/editor/array_property_edit.h
similarity index 100%
rename from tools/editor/array_property_edit.h
rename to editor/array_property_edit.h
diff --git a/tools/editor/asset_library_editor_plugin.cpp b/editor/asset_library_editor_plugin.cpp
similarity index 100%
rename from tools/editor/asset_library_editor_plugin.cpp
rename to editor/asset_library_editor_plugin.cpp
diff --git a/tools/editor/asset_library_editor_plugin.h b/editor/asset_library_editor_plugin.h
similarity index 100%
rename from tools/editor/asset_library_editor_plugin.h
rename to editor/asset_library_editor_plugin.h
diff --git a/tools/editor/call_dialog.cpp b/editor/call_dialog.cpp
similarity index 100%
rename from tools/editor/call_dialog.cpp
rename to editor/call_dialog.cpp
diff --git a/tools/editor/call_dialog.h b/editor/call_dialog.h
similarity index 98%
rename from tools/editor/call_dialog.h
rename to editor/call_dialog.h
index b0ebe68d860..56fc07c3df0 100644
--- a/tools/editor/call_dialog.h
+++ b/editor/call_dialog.h
@@ -34,7 +34,7 @@
 #include "scene/gui/tree.h"
 #include "scene/gui/label.h"
 #include "scene/gui/line_edit.h"
-#include "tools/editor/property_editor.h"
+#include "editor/property_editor.h"
 /**
 	@author Juan Linietsky <reduzio@gmail.com>
 */
diff --git a/tools/editor/code_editor.cpp b/editor/code_editor.cpp
similarity index 99%
rename from tools/editor/code_editor.cpp
rename to editor/code_editor.cpp
index 0a25b43716d..8e9925a0d3b 100644
--- a/tools/editor/code_editor.cpp
+++ b/editor/code_editor.cpp
@@ -33,7 +33,7 @@
 #include "scene/gui/separator.h"
 #include "scene/resources/dynamic_font.h"
 #include "os/keyboard.h"
-#include "tools/editor/editor_scale.h"
+#include "editor/editor_scale.h"
 
 void GotoLineDialog::popup_find_line(TextEdit *p_edit) {
 
diff --git a/tools/editor/code_editor.h b/editor/code_editor.h
similarity index 99%
rename from tools/editor/code_editor.h
rename to editor/code_editor.h
index a000f020101..7582985d4cb 100644
--- a/tools/editor/code_editor.h
+++ b/editor/code_editor.h
@@ -29,7 +29,7 @@
 #ifndef CODE_EDITOR_H
 #define CODE_EDITOR_H
 
-#include "tools/editor/editor_plugin.h"
+#include "editor/editor_plugin.h"
 #include "scene/gui/text_edit.h"
 #include "scene/gui/dialogs.h"
 #include "scene/main/timer.h"
diff --git a/tools/editor/collada/SCsub b/editor/collada/SCsub
similarity index 100%
rename from tools/editor/collada/SCsub
rename to editor/collada/SCsub
diff --git a/tools/editor/collada/collada.cpp b/editor/collada/collada.cpp
similarity index 100%
rename from tools/editor/collada/collada.cpp
rename to editor/collada/collada.cpp
diff --git a/tools/editor/collada/collada.h b/editor/collada/collada.h
similarity index 100%
rename from tools/editor/collada/collada.h
rename to editor/collada/collada.h
diff --git a/tools/editor/connections_dialog.cpp b/editor/connections_dialog.cpp
similarity index 100%
rename from tools/editor/connections_dialog.cpp
rename to editor/connections_dialog.cpp
diff --git a/tools/editor/connections_dialog.h b/editor/connections_dialog.h
similarity index 98%
rename from tools/editor/connections_dialog.h
rename to editor/connections_dialog.h
index 64b292bc346..6407b83f6e9 100644
--- a/tools/editor/connections_dialog.h
+++ b/editor/connections_dialog.h
@@ -36,8 +36,8 @@
 #include "scene/gui/dialogs.h"
 #include "scene/gui/menu_button.h"
 #include "scene/gui/line_edit.h"
-#include "tools/editor/scene_tree_editor.h"
-#include "tools/editor/property_editor.h"
+#include "editor/scene_tree_editor.h"
+#include "editor/property_editor.h"
 #include "undo_redo.h"
 
 /**
diff --git a/tools/editor/create_dialog.cpp b/editor/create_dialog.cpp
similarity index 100%
rename from tools/editor/create_dialog.cpp
rename to editor/create_dialog.cpp
diff --git a/tools/editor/create_dialog.h b/editor/create_dialog.h
similarity index 100%
rename from tools/editor/create_dialog.h
rename to editor/create_dialog.h
diff --git a/tools/editor/dependency_editor.cpp b/editor/dependency_editor.cpp
similarity index 100%
rename from tools/editor/dependency_editor.cpp
rename to editor/dependency_editor.cpp
diff --git a/tools/editor/dependency_editor.h b/editor/dependency_editor.h
similarity index 100%
rename from tools/editor/dependency_editor.h
rename to editor/dependency_editor.h
diff --git a/tools/editor/doc/SCsub b/editor/doc/SCsub
similarity index 100%
rename from tools/editor/doc/SCsub
rename to editor/doc/SCsub
diff --git a/tools/editor/doc/doc_data.cpp b/editor/doc/doc_data.cpp
similarity index 100%
rename from tools/editor/doc/doc_data.cpp
rename to editor/doc/doc_data.cpp
diff --git a/tools/editor/doc/doc_data.h b/editor/doc/doc_data.h
similarity index 100%
rename from tools/editor/doc/doc_data.h
rename to editor/doc/doc_data.h
diff --git a/tools/editor/doc/doc_dump.cpp b/editor/doc/doc_dump.cpp
similarity index 100%
rename from tools/editor/doc/doc_dump.cpp
rename to editor/doc/doc_dump.cpp
diff --git a/tools/editor/doc/doc_dump.h b/editor/doc/doc_dump.h
similarity index 100%
rename from tools/editor/doc/doc_dump.h
rename to editor/doc/doc_dump.h
diff --git a/tools/editor/doc_code_font.h b/editor/doc_code_font.h
similarity index 100%
rename from tools/editor/doc_code_font.h
rename to editor/doc_code_font.h
diff --git a/tools/editor/doc_font.h b/editor/doc_font.h
similarity index 100%
rename from tools/editor/doc_font.h
rename to editor/doc_font.h
diff --git a/tools/editor/doc_title_font.h b/editor/doc_title_font.h
similarity index 100%
rename from tools/editor/doc_title_font.h
rename to editor/doc_title_font.h
diff --git a/tools/editor/editor_asset_installer.cpp b/editor/editor_asset_installer.cpp
similarity index 100%
rename from tools/editor/editor_asset_installer.cpp
rename to editor/editor_asset_installer.cpp
diff --git a/tools/editor/editor_asset_installer.h b/editor/editor_asset_installer.h
similarity index 100%
rename from tools/editor/editor_asset_installer.h
rename to editor/editor_asset_installer.h
diff --git a/tools/editor/editor_audio_buses.cpp b/editor/editor_audio_buses.cpp
similarity index 100%
rename from tools/editor/editor_audio_buses.cpp
rename to editor/editor_audio_buses.cpp
diff --git a/tools/editor/editor_audio_buses.h b/editor/editor_audio_buses.h
similarity index 98%
rename from tools/editor/editor_audio_buses.h
rename to editor/editor_audio_buses.h
index e44f8cd579b..4ac8b27004a 100644
--- a/tools/editor/editor_audio_buses.h
+++ b/editor/editor_audio_buses.h
@@ -14,7 +14,7 @@
 #include "scene/gui/tree.h"
 #include "scene/gui/option_button.h"
 #include "scene/gui/panel.h"
-#include "tools/editor/editor_file_dialog.h"
+#include "editor/editor_file_dialog.h"
 #include "editor_plugin.h"
 
 class EditorAudioBuses;
diff --git a/tools/editor/editor_autoload_settings.cpp b/editor/editor_autoload_settings.cpp
similarity index 100%
rename from tools/editor/editor_autoload_settings.cpp
rename to editor/editor_autoload_settings.cpp
diff --git a/tools/editor/editor_autoload_settings.h b/editor/editor_autoload_settings.h
similarity index 100%
rename from tools/editor/editor_autoload_settings.h
rename to editor/editor_autoload_settings.h
diff --git a/tools/editor/editor_data.cpp b/editor/editor_data.cpp
similarity index 100%
rename from tools/editor/editor_data.cpp
rename to editor/editor_data.cpp
diff --git a/tools/editor/editor_data.h b/editor/editor_data.h
similarity index 99%
rename from tools/editor/editor_data.h
rename to editor/editor_data.h
index fce606f7226..46227916532 100644
--- a/tools/editor/editor_data.h
+++ b/editor/editor_data.h
@@ -29,7 +29,7 @@
 #ifndef EDITOR_DATA_H
 #define EDITOR_DATA_H
 
-#include "tools/editor/editor_plugin.h"
+#include "editor/editor_plugin.h"
 #include "scene/resources/texture.h"
 #include "list.h"
 #include "undo_redo.h"
diff --git a/tools/editor/editor_dir_dialog.cpp b/editor/editor_dir_dialog.cpp
similarity index 98%
rename from tools/editor/editor_dir_dialog.cpp
rename to editor/editor_dir_dialog.cpp
index c353e430700..235d1f06baf 100644
--- a/tools/editor/editor_dir_dialog.cpp
+++ b/editor/editor_dir_dialog.cpp
@@ -30,8 +30,8 @@
 
 #include "os/os.h"
 #include "os/keyboard.h"
-#include "tools/editor/editor_settings.h"
-#include "tools/editor/editor_file_system.h"
+#include "editor/editor_settings.h"
+#include "editor/editor_file_system.h"
 
 
 void EditorDirDialog::_update_dir(TreeItem* p_item) {
diff --git a/tools/editor/editor_dir_dialog.h b/editor/editor_dir_dialog.h
similarity index 100%
rename from tools/editor/editor_dir_dialog.h
rename to editor/editor_dir_dialog.h
diff --git a/tools/editor/editor_export.cpp b/editor/editor_export.cpp
similarity index 99%
rename from tools/editor/editor_export.cpp
rename to editor/editor_export.cpp
index a67b5838687..f5840d00fb9 100644
--- a/tools/editor/editor_export.cpp
+++ b/editor/editor_export.cpp
@@ -32,14 +32,14 @@
 #include "global_config.h"
 #include "os/file_access.h"
 #include "os/dir_access.h"
-#include "tools/editor/editor_file_system.h"
+#include "editor/editor_file_system.h"
 #include "io/resource_loader.h"
 #include "editor_node.h"
 #include "editor_settings.h"
 #include "io/config_file.h"
 #include "io/resource_saver.h"
 #include "io/md5.h"
-#include "tools/editor/plugins/script_editor_plugin.h"
+#include "editor/plugins/script_editor_plugin.h"
 #include "io/zip_io.h"
 
 static int _get_pad(int p_alignment, int p_n) {
@@ -959,7 +959,7 @@ EditorExportPlatformPC::EditorExportPlatformPC() {
 #include "global_config.h"
 #include "os/file_access.h"
 #include "os/dir_access.h"
-#include "tools/editor/editor_file_system.h"
+#include "editor/editor_file_system.h"
 #include "io/resource_loader.h"
 #include "editor_node.h"
 #include "editor_settings.h"
@@ -967,7 +967,7 @@ EditorExportPlatformPC::EditorExportPlatformPC() {
 #include "io/resource_saver.h"
 #include "io/md5.h"
 #include "io_plugins/editor_texture_import_plugin.h"
-#include "tools/editor/plugins/script_editor_plugin.h"
+#include "editor/plugins/script_editor_plugin.h"
 #include "io/zip_io.h"
 
 
diff --git a/tools/editor/editor_export.h b/editor/editor_export.h
similarity index 100%
rename from tools/editor/editor_export.h
rename to editor/editor_export.h
diff --git a/tools/editor/editor_file_dialog.cpp b/editor/editor_file_dialog.cpp
similarity index 100%
rename from tools/editor/editor_file_dialog.cpp
rename to editor/editor_file_dialog.cpp
diff --git a/tools/editor/editor_file_dialog.h b/editor/editor_file_dialog.h
similarity index 100%
rename from tools/editor/editor_file_dialog.h
rename to editor/editor_file_dialog.h
diff --git a/tools/editor/editor_file_system.cpp b/editor/editor_file_system.cpp
similarity index 100%
rename from tools/editor/editor_file_system.cpp
rename to editor/editor_file_system.cpp
diff --git a/tools/editor/editor_file_system.h b/editor/editor_file_system.h
similarity index 100%
rename from tools/editor/editor_file_system.h
rename to editor/editor_file_system.h
diff --git a/tools/editor/editor_fonts.cpp b/editor/editor_fonts.cpp
similarity index 100%
rename from tools/editor/editor_fonts.cpp
rename to editor/editor_fonts.cpp
diff --git a/tools/editor/editor_fonts.h b/editor/editor_fonts.h
similarity index 100%
rename from tools/editor/editor_fonts.h
rename to editor/editor_fonts.h
diff --git a/tools/editor/editor_help.cpp b/editor/editor_help.cpp
similarity index 99%
rename from tools/editor/editor_help.cpp
rename to editor/editor_help.cpp
index 5b629b25905..7ef7658132b 100644
--- a/tools/editor/editor_help.cpp
+++ b/editor/editor_help.cpp
@@ -32,7 +32,7 @@
 #include "editor_settings.h"
 #include "os/keyboard.h"
 #include "doc_data_compressed.h"
-#include "tools/editor/plugins/script_editor_plugin.h"
+#include "editor/plugins/script_editor_plugin.h"
 
 void EditorHelpSearch::popup() {
 	popup_centered_ratio(0.6);
diff --git a/tools/editor/editor_help.h b/editor/editor_help.h
similarity index 97%
rename from tools/editor/editor_help.h
rename to editor/editor_help.h
index 3c4ba1f43e8..909226f403a 100644
--- a/tools/editor/editor_help.h
+++ b/editor/editor_help.h
@@ -29,7 +29,7 @@
 #ifndef EDITOR_HELP_H
 #define EDITOR_HELP_H
 
-#include "tools/editor/editor_plugin.h"
+#include "editor/editor_plugin.h"
 #include "scene/gui/tab_container.h"
 #include "scene/gui/text_edit.h"
 #include "scene/gui/split_container.h"
@@ -39,8 +39,8 @@
 #include "scene/gui/tree.h"
 
 #include "scene/main/timer.h"
-#include "tools/editor/code_editor.h"
-#include "tools/editor/doc/doc_data.h"
+#include "editor/code_editor.h"
+#include "editor/doc/doc_data.h"
 
 
 class EditorNode;
diff --git a/tools/editor/editor_icons.h b/editor/editor_icons.h
similarity index 100%
rename from tools/editor/editor_icons.h
rename to editor/editor_icons.h
diff --git a/tools/editor/editor_initialize_ssl.cpp b/editor/editor_initialize_ssl.cpp
similarity index 100%
rename from tools/editor/editor_initialize_ssl.cpp
rename to editor/editor_initialize_ssl.cpp
diff --git a/tools/editor/editor_initialize_ssl.h b/editor/editor_initialize_ssl.h
similarity index 100%
rename from tools/editor/editor_initialize_ssl.h
rename to editor/editor_initialize_ssl.h
diff --git a/tools/editor/editor_log.cpp b/editor/editor_log.cpp
similarity index 100%
rename from tools/editor/editor_log.cpp
rename to editor/editor_log.cpp
diff --git a/tools/editor/editor_log.h b/editor/editor_log.h
similarity index 100%
rename from tools/editor/editor_log.h
rename to editor/editor_log.h
diff --git a/tools/editor/editor_name_dialog.cpp b/editor/editor_name_dialog.cpp
similarity index 100%
rename from tools/editor/editor_name_dialog.cpp
rename to editor/editor_name_dialog.cpp
diff --git a/tools/editor/editor_name_dialog.h b/editor/editor_name_dialog.h
similarity index 100%
rename from tools/editor/editor_name_dialog.h
rename to editor/editor_name_dialog.h
diff --git a/tools/editor/editor_node.cpp b/editor/editor_node.cpp
similarity index 100%
rename from tools/editor/editor_node.cpp
rename to editor/editor_node.cpp
diff --git a/tools/editor/editor_node.h b/editor/editor_node.h
similarity index 95%
rename from tools/editor/editor_node.h
rename to editor/editor_node.h
index 41c1012ff07..fb0b5c4c25f 100644
--- a/tools/editor/editor_node.h
+++ b/editor/editor_node.h
@@ -42,41 +42,41 @@
 #include "scene/gui/split_container.h"
 #include "scene/gui/center_container.h"
 #include "scene/gui/texture_progress.h"
-#include "tools/editor/filesystem_dock.h"
-#include "tools/editor/scene_tree_editor.h"
-#include "tools/editor/property_editor.h"
-#include "tools/editor/create_dialog.h"
-#include "tools/editor/call_dialog.h"
-#include "tools/editor/reparent_dialog.h"
-#include "tools/editor/connections_dialog.h"
-#include "tools/editor/node_dock.h"
-#include "tools/editor/import_dock.h"
-#include "tools/editor/settings_config_dialog.h"
-#include "tools/editor/groups_editor.h"
-#include "tools/editor/editor_data.h"
-#include "tools/editor/editor_path.h"
-#include "tools/editor/editor_run.h"
+#include "editor/filesystem_dock.h"
+#include "editor/scene_tree_editor.h"
+#include "editor/property_editor.h"
+#include "editor/create_dialog.h"
+#include "editor/call_dialog.h"
+#include "editor/reparent_dialog.h"
+#include "editor/connections_dialog.h"
+#include "editor/node_dock.h"
+#include "editor/import_dock.h"
+#include "editor/settings_config_dialog.h"
+#include "editor/groups_editor.h"
+#include "editor/editor_data.h"
+#include "editor/editor_path.h"
+#include "editor/editor_run.h"
 
-#include "tools/editor/pane_drag.h"
+#include "editor/pane_drag.h"
 
-#include "tools/editor/script_create_dialog.h"
-#include "tools/editor/run_settings_dialog.h"
-#include "tools/editor/project_settings.h"
-#include "tools/editor/project_export.h"
-#include "tools/editor/editor_log.h"
-#include "tools/editor/scene_tree_dock.h"
-#include "tools/editor/resources_dock.h"
-#include "tools/editor/editor_run_script.h"
+#include "editor/script_create_dialog.h"
+#include "editor/run_settings_dialog.h"
+#include "editor/project_settings.h"
+#include "editor/project_export.h"
+#include "editor/editor_log.h"
+#include "editor/scene_tree_dock.h"
+#include "editor/resources_dock.h"
+#include "editor/editor_run_script.h"
 
-#include "tools/editor/editor_run_native.h"
+#include "editor/editor_run_native.h"
 #include "scene/gui/tabs.h"
-#include "tools/editor/quick_open.h"
-#include "tools/editor/project_export.h"
-#include "tools/editor/editor_sub_scene.h"
+#include "editor/quick_open.h"
+#include "editor/project_export.h"
+#include "editor/editor_sub_scene.h"
 #include "editor_export.h"
 #include "editor_reimport_dialog.h"
-#include "tools/editor/editor_plugin.h"
-#include "tools/editor/editor_name_dialog.h"
+#include "editor/editor_plugin.h"
+#include "editor/editor_name_dialog.h"
 
 #include "fileserver/editor_file_server.h"
 #include "editor_resource_preview.h"
diff --git a/tools/editor/editor_path.cpp b/editor/editor_path.cpp
similarity index 100%
rename from tools/editor/editor_path.cpp
rename to editor/editor_path.cpp
diff --git a/tools/editor/editor_path.h b/editor/editor_path.h
similarity index 100%
rename from tools/editor/editor_path.h
rename to editor/editor_path.h
diff --git a/tools/editor/editor_plugin.cpp b/editor/editor_plugin.cpp
similarity index 99%
rename from tools/editor/editor_plugin.cpp
rename to editor/editor_plugin.cpp
index 2a0efa5be9b..85ef96fcc3f 100644
--- a/tools/editor/editor_plugin.cpp
+++ b/editor/editor_plugin.cpp
@@ -32,8 +32,8 @@
 #include "scene/3d/camera.h"
 #include "plugins/canvas_item_editor_plugin.h"
 #include "plugins/spatial_editor_plugin.h"
-#include "tools/editor/editor_node.h"
-#include "tools/editor/editor_settings.h"
+#include "editor/editor_node.h"
+#include "editor/editor_settings.h"
 #include "editor_resource_preview.h"
 
 void EditorPlugin::add_custom_type(const String& p_type, const String& p_base,const Ref<Script>& p_script, const Ref<Texture>& p_icon) {
diff --git a/tools/editor/editor_plugin.h b/editor/editor_plugin.h
similarity index 100%
rename from tools/editor/editor_plugin.h
rename to editor/editor_plugin.h
diff --git a/tools/editor/editor_plugin_settings.cpp b/editor/editor_plugin_settings.cpp
similarity index 100%
rename from tools/editor/editor_plugin_settings.cpp
rename to editor/editor_plugin_settings.cpp
diff --git a/tools/editor/editor_plugin_settings.h b/editor/editor_plugin_settings.h
similarity index 100%
rename from tools/editor/editor_plugin_settings.h
rename to editor/editor_plugin_settings.h
diff --git a/tools/editor/editor_profiler.cpp b/editor/editor_profiler.cpp
similarity index 100%
rename from tools/editor/editor_profiler.cpp
rename to editor/editor_profiler.cpp
diff --git a/tools/editor/editor_profiler.h b/editor/editor_profiler.h
similarity index 100%
rename from tools/editor/editor_profiler.h
rename to editor/editor_profiler.h
diff --git a/tools/editor/editor_reimport_dialog.cpp b/editor/editor_reimport_dialog.cpp
similarity index 100%
rename from tools/editor/editor_reimport_dialog.cpp
rename to editor/editor_reimport_dialog.cpp
diff --git a/tools/editor/editor_reimport_dialog.h b/editor/editor_reimport_dialog.h
similarity index 100%
rename from tools/editor/editor_reimport_dialog.h
rename to editor/editor_reimport_dialog.h
diff --git a/tools/editor/editor_resource_preview.cpp b/editor/editor_resource_preview.cpp
similarity index 100%
rename from tools/editor/editor_resource_preview.cpp
rename to editor/editor_resource_preview.cpp
diff --git a/tools/editor/editor_resource_preview.h b/editor/editor_resource_preview.h
similarity index 100%
rename from tools/editor/editor_resource_preview.h
rename to editor/editor_resource_preview.h
diff --git a/tools/editor/editor_run.cpp b/editor/editor_run.cpp
similarity index 100%
rename from tools/editor/editor_run.cpp
rename to editor/editor_run.cpp
diff --git a/tools/editor/editor_run.h b/editor/editor_run.h
similarity index 100%
rename from tools/editor/editor_run.h
rename to editor/editor_run.h
diff --git a/tools/editor/editor_run_native.cpp b/editor/editor_run_native.cpp
similarity index 100%
rename from tools/editor/editor_run_native.cpp
rename to editor/editor_run_native.cpp
diff --git a/tools/editor/editor_run_native.h b/editor/editor_run_native.h
similarity index 100%
rename from tools/editor/editor_run_native.h
rename to editor/editor_run_native.h
diff --git a/tools/editor/editor_run_script.cpp b/editor/editor_run_script.cpp
similarity index 100%
rename from tools/editor/editor_run_script.cpp
rename to editor/editor_run_script.cpp
diff --git a/tools/editor/editor_run_script.h b/editor/editor_run_script.h
similarity index 100%
rename from tools/editor/editor_run_script.h
rename to editor/editor_run_script.h
diff --git a/tools/editor/editor_scale.cpp b/editor/editor_scale.cpp
similarity index 100%
rename from tools/editor/editor_scale.cpp
rename to editor/editor_scale.cpp
diff --git a/tools/editor/editor_scale.h b/editor/editor_scale.h
similarity index 100%
rename from tools/editor/editor_scale.h
rename to editor/editor_scale.h
diff --git a/tools/editor/editor_settings.cpp b/editor/editor_settings.cpp
similarity index 100%
rename from tools/editor/editor_settings.cpp
rename to editor/editor_settings.cpp
diff --git a/tools/editor/editor_settings.h b/editor/editor_settings.h
similarity index 100%
rename from tools/editor/editor_settings.h
rename to editor/editor_settings.h
diff --git a/tools/editor/editor_sub_scene.cpp b/editor/editor_sub_scene.cpp
similarity index 100%
rename from tools/editor/editor_sub_scene.cpp
rename to editor/editor_sub_scene.cpp
diff --git a/tools/editor/editor_sub_scene.h b/editor/editor_sub_scene.h
similarity index 98%
rename from tools/editor/editor_sub_scene.h
rename to editor/editor_sub_scene.h
index cc9faffc77a..46cdceafa5e 100644
--- a/tools/editor/editor_sub_scene.h
+++ b/editor/editor_sub_scene.h
@@ -31,7 +31,7 @@
 
 #include "scene/gui/dialogs.h"
 #include "scene/gui/tree.h"
-#include "tools/editor/editor_file_dialog.h"
+#include "editor/editor_file_dialog.h"
 
 class EditorSubScene : public ConfirmationDialog {
 
diff --git a/tools/editor/editor_themes.cpp b/editor/editor_themes.cpp
similarity index 100%
rename from tools/editor/editor_themes.cpp
rename to editor/editor_themes.cpp
diff --git a/tools/editor/editor_themes.h b/editor/editor_themes.h
similarity index 100%
rename from tools/editor/editor_themes.h
rename to editor/editor_themes.h
diff --git a/tools/editor/file_type_cache.cpp b/editor/file_type_cache.cpp
similarity index 100%
rename from tools/editor/file_type_cache.cpp
rename to editor/file_type_cache.cpp
diff --git a/tools/editor/file_type_cache.h b/editor/file_type_cache.h
similarity index 100%
rename from tools/editor/file_type_cache.h
rename to editor/file_type_cache.h
diff --git a/tools/editor/fileserver/SCsub b/editor/fileserver/SCsub
similarity index 100%
rename from tools/editor/fileserver/SCsub
rename to editor/fileserver/SCsub
diff --git a/tools/editor/fileserver/editor_file_server.cpp b/editor/fileserver/editor_file_server.cpp
similarity index 100%
rename from tools/editor/fileserver/editor_file_server.cpp
rename to editor/fileserver/editor_file_server.cpp
diff --git a/tools/editor/fileserver/editor_file_server.h b/editor/fileserver/editor_file_server.h
similarity index 100%
rename from tools/editor/fileserver/editor_file_server.h
rename to editor/fileserver/editor_file_server.h
diff --git a/tools/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp
similarity index 100%
rename from tools/editor/filesystem_dock.cpp
rename to editor/filesystem_dock.cpp
diff --git a/tools/editor/filesystem_dock.h b/editor/filesystem_dock.h
similarity index 100%
rename from tools/editor/filesystem_dock.h
rename to editor/filesystem_dock.h
diff --git a/tools/editor/groups_editor.cpp b/editor/groups_editor.cpp
similarity index 100%
rename from tools/editor/groups_editor.cpp
rename to editor/groups_editor.cpp
diff --git a/tools/editor/groups_editor.h b/editor/groups_editor.h
similarity index 100%
rename from tools/editor/groups_editor.h
rename to editor/groups_editor.h
diff --git a/tools/editor/icons/2x/icon_accept_dialog.png b/editor/icons/2x/icon_accept_dialog.png
similarity index 100%
rename from tools/editor/icons/2x/icon_accept_dialog.png
rename to editor/icons/2x/icon_accept_dialog.png
diff --git a/tools/editor/icons/2x/icon_add.png b/editor/icons/2x/icon_add.png
similarity index 100%
rename from tools/editor/icons/2x/icon_add.png
rename to editor/icons/2x/icon_add.png
diff --git a/tools/editor/icons/2x/icon_add_track.png b/editor/icons/2x/icon_add_track.png
similarity index 100%
rename from tools/editor/icons/2x/icon_add_track.png
rename to editor/icons/2x/icon_add_track.png
diff --git a/tools/editor/icons/2x/icon_anchor.png b/editor/icons/2x/icon_anchor.png
similarity index 100%
rename from tools/editor/icons/2x/icon_anchor.png
rename to editor/icons/2x/icon_anchor.png
diff --git a/tools/editor/icons/2x/icon_animated_sprite.png b/editor/icons/2x/icon_animated_sprite.png
similarity index 100%
rename from tools/editor/icons/2x/icon_animated_sprite.png
rename to editor/icons/2x/icon_animated_sprite.png
diff --git a/tools/editor/icons/2x/icon_animated_sprite_3d.png b/editor/icons/2x/icon_animated_sprite_3d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_animated_sprite_3d.png
rename to editor/icons/2x/icon_animated_sprite_3d.png
diff --git a/tools/editor/icons/2x/icon_animation.png b/editor/icons/2x/icon_animation.png
similarity index 100%
rename from tools/editor/icons/2x/icon_animation.png
rename to editor/icons/2x/icon_animation.png
diff --git a/tools/editor/icons/2x/icon_animation_player.png b/editor/icons/2x/icon_animation_player.png
similarity index 100%
rename from tools/editor/icons/2x/icon_animation_player.png
rename to editor/icons/2x/icon_animation_player.png
diff --git a/tools/editor/icons/2x/icon_animation_tree.png b/editor/icons/2x/icon_animation_tree.png
similarity index 100%
rename from tools/editor/icons/2x/icon_animation_tree.png
rename to editor/icons/2x/icon_animation_tree.png
diff --git a/tools/editor/icons/2x/icon_animation_tree_player.png b/editor/icons/2x/icon_animation_tree_player.png
similarity index 100%
rename from tools/editor/icons/2x/icon_animation_tree_player.png
rename to editor/icons/2x/icon_animation_tree_player.png
diff --git a/tools/editor/icons/2x/icon_area.png b/editor/icons/2x/icon_area.png
similarity index 100%
rename from tools/editor/icons/2x/icon_area.png
rename to editor/icons/2x/icon_area.png
diff --git a/tools/editor/icons/2x/icon_area_2d.png b/editor/icons/2x/icon_area_2d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_area_2d.png
rename to editor/icons/2x/icon_area_2d.png
diff --git a/tools/editor/icons/2x/icon_arrow_left.png b/editor/icons/2x/icon_arrow_left.png
similarity index 100%
rename from tools/editor/icons/2x/icon_arrow_left.png
rename to editor/icons/2x/icon_arrow_left.png
diff --git a/tools/editor/icons/2x/icon_arrow_right.png b/editor/icons/2x/icon_arrow_right.png
similarity index 100%
rename from tools/editor/icons/2x/icon_arrow_right.png
rename to editor/icons/2x/icon_arrow_right.png
diff --git a/tools/editor/icons/2x/icon_arrow_up.png b/editor/icons/2x/icon_arrow_up.png
similarity index 100%
rename from tools/editor/icons/2x/icon_arrow_up.png
rename to editor/icons/2x/icon_arrow_up.png
diff --git a/tools/editor/icons/2x/icon_atlas_texture.png b/editor/icons/2x/icon_atlas_texture.png
similarity index 100%
rename from tools/editor/icons/2x/icon_atlas_texture.png
rename to editor/icons/2x/icon_atlas_texture.png
diff --git a/tools/editor/icons/2x/icon_audio_stream_gibberish.png b/editor/icons/2x/icon_audio_stream_gibberish.png
similarity index 100%
rename from tools/editor/icons/2x/icon_audio_stream_gibberish.png
rename to editor/icons/2x/icon_audio_stream_gibberish.png
diff --git a/tools/editor/icons/2x/icon_auto_play.png b/editor/icons/2x/icon_auto_play.png
similarity index 100%
rename from tools/editor/icons/2x/icon_auto_play.png
rename to editor/icons/2x/icon_auto_play.png
diff --git a/tools/editor/icons/2x/icon_back.png b/editor/icons/2x/icon_back.png
similarity index 100%
rename from tools/editor/icons/2x/icon_back.png
rename to editor/icons/2x/icon_back.png
diff --git a/tools/editor/icons/2x/icon_back_buffer_copy.png b/editor/icons/2x/icon_back_buffer_copy.png
similarity index 100%
rename from tools/editor/icons/2x/icon_back_buffer_copy.png
rename to editor/icons/2x/icon_back_buffer_copy.png
diff --git a/tools/editor/icons/2x/icon_bake.png b/editor/icons/2x/icon_bake.png
similarity index 100%
rename from tools/editor/icons/2x/icon_bake.png
rename to editor/icons/2x/icon_bake.png
diff --git a/tools/editor/icons/2x/icon_baked_light.png b/editor/icons/2x/icon_baked_light.png
similarity index 100%
rename from tools/editor/icons/2x/icon_baked_light.png
rename to editor/icons/2x/icon_baked_light.png
diff --git a/tools/editor/icons/2x/icon_baked_light_instance.png b/editor/icons/2x/icon_baked_light_instance.png
similarity index 100%
rename from tools/editor/icons/2x/icon_baked_light_instance.png
rename to editor/icons/2x/icon_baked_light_instance.png
diff --git a/tools/editor/icons/2x/icon_baked_light_sampler.png b/editor/icons/2x/icon_baked_light_sampler.png
similarity index 100%
rename from tools/editor/icons/2x/icon_baked_light_sampler.png
rename to editor/icons/2x/icon_baked_light_sampler.png
diff --git a/tools/editor/icons/2x/icon_bit_map.png b/editor/icons/2x/icon_bit_map.png
similarity index 100%
rename from tools/editor/icons/2x/icon_bit_map.png
rename to editor/icons/2x/icon_bit_map.png
diff --git a/tools/editor/icons/2x/icon_bitmap_font.png b/editor/icons/2x/icon_bitmap_font.png
similarity index 100%
rename from tools/editor/icons/2x/icon_bitmap_font.png
rename to editor/icons/2x/icon_bitmap_font.png
diff --git a/tools/editor/icons/2x/icon_blend.png b/editor/icons/2x/icon_blend.png
similarity index 100%
rename from tools/editor/icons/2x/icon_blend.png
rename to editor/icons/2x/icon_blend.png
diff --git a/tools/editor/icons/2x/icon_bone.png b/editor/icons/2x/icon_bone.png
similarity index 100%
rename from tools/editor/icons/2x/icon_bone.png
rename to editor/icons/2x/icon_bone.png
diff --git a/tools/editor/icons/2x/icon_bone_attachment.png b/editor/icons/2x/icon_bone_attachment.png
similarity index 100%
rename from tools/editor/icons/2x/icon_bone_attachment.png
rename to editor/icons/2x/icon_bone_attachment.png
diff --git a/tools/editor/icons/2x/icon_bone_track.png b/editor/icons/2x/icon_bone_track.png
similarity index 100%
rename from tools/editor/icons/2x/icon_bone_track.png
rename to editor/icons/2x/icon_bone_track.png
diff --git a/tools/editor/icons/2x/icon_bool.png b/editor/icons/2x/icon_bool.png
similarity index 100%
rename from tools/editor/icons/2x/icon_bool.png
rename to editor/icons/2x/icon_bool.png
diff --git a/tools/editor/icons/2x/icon_box_shape.png b/editor/icons/2x/icon_box_shape.png
similarity index 100%
rename from tools/editor/icons/2x/icon_box_shape.png
rename to editor/icons/2x/icon_box_shape.png
diff --git a/tools/editor/icons/2x/icon_button.png b/editor/icons/2x/icon_button.png
similarity index 100%
rename from tools/editor/icons/2x/icon_button.png
rename to editor/icons/2x/icon_button.png
diff --git a/tools/editor/icons/2x/icon_button_group.png b/editor/icons/2x/icon_button_group.png
similarity index 100%
rename from tools/editor/icons/2x/icon_button_group.png
rename to editor/icons/2x/icon_button_group.png
diff --git a/tools/editor/icons/2x/icon_camera.png b/editor/icons/2x/icon_camera.png
similarity index 100%
rename from tools/editor/icons/2x/icon_camera.png
rename to editor/icons/2x/icon_camera.png
diff --git a/tools/editor/icons/2x/icon_camera_2d.png b/editor/icons/2x/icon_camera_2d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_camera_2d.png
rename to editor/icons/2x/icon_camera_2d.png
diff --git a/tools/editor/icons/2x/icon_canvas_item.png b/editor/icons/2x/icon_canvas_item.png
similarity index 100%
rename from tools/editor/icons/2x/icon_canvas_item.png
rename to editor/icons/2x/icon_canvas_item.png
diff --git a/tools/editor/icons/2x/icon_canvas_item_material.png b/editor/icons/2x/icon_canvas_item_material.png
similarity index 100%
rename from tools/editor/icons/2x/icon_canvas_item_material.png
rename to editor/icons/2x/icon_canvas_item_material.png
diff --git a/tools/editor/icons/2x/icon_canvas_item_shader.png b/editor/icons/2x/icon_canvas_item_shader.png
similarity index 100%
rename from tools/editor/icons/2x/icon_canvas_item_shader.png
rename to editor/icons/2x/icon_canvas_item_shader.png
diff --git a/tools/editor/icons/2x/icon_canvas_item_shader_graph.png b/editor/icons/2x/icon_canvas_item_shader_graph.png
similarity index 100%
rename from tools/editor/icons/2x/icon_canvas_item_shader_graph.png
rename to editor/icons/2x/icon_canvas_item_shader_graph.png
diff --git a/tools/editor/icons/2x/icon_canvas_layer.png b/editor/icons/2x/icon_canvas_layer.png
similarity index 100%
rename from tools/editor/icons/2x/icon_canvas_layer.png
rename to editor/icons/2x/icon_canvas_layer.png
diff --git a/tools/editor/icons/2x/icon_canvas_modulate.png b/editor/icons/2x/icon_canvas_modulate.png
similarity index 100%
rename from tools/editor/icons/2x/icon_canvas_modulate.png
rename to editor/icons/2x/icon_canvas_modulate.png
diff --git a/tools/editor/icons/2x/icon_capsule_shape.png b/editor/icons/2x/icon_capsule_shape.png
similarity index 100%
rename from tools/editor/icons/2x/icon_capsule_shape.png
rename to editor/icons/2x/icon_capsule_shape.png
diff --git a/tools/editor/icons/2x/icon_capsule_shape_2d.png b/editor/icons/2x/icon_capsule_shape_2d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_capsule_shape_2d.png
rename to editor/icons/2x/icon_capsule_shape_2d.png
diff --git a/tools/editor/icons/2x/icon_center_container.png b/editor/icons/2x/icon_center_container.png
similarity index 100%
rename from tools/editor/icons/2x/icon_center_container.png
rename to editor/icons/2x/icon_center_container.png
diff --git a/tools/editor/icons/2x/icon_check_box.png b/editor/icons/2x/icon_check_box.png
similarity index 100%
rename from tools/editor/icons/2x/icon_check_box.png
rename to editor/icons/2x/icon_check_box.png
diff --git a/tools/editor/icons/2x/icon_check_button.png b/editor/icons/2x/icon_check_button.png
similarity index 100%
rename from tools/editor/icons/2x/icon_check_button.png
rename to editor/icons/2x/icon_check_button.png
diff --git a/tools/editor/icons/2x/icon_circle_shape_2d.png b/editor/icons/2x/icon_circle_shape_2d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_circle_shape_2d.png
rename to editor/icons/2x/icon_circle_shape_2d.png
diff --git a/tools/editor/icons/2x/icon_class_list.png b/editor/icons/2x/icon_class_list.png
similarity index 100%
rename from tools/editor/icons/2x/icon_class_list.png
rename to editor/icons/2x/icon_class_list.png
diff --git a/tools/editor/icons/2x/icon_close.png b/editor/icons/2x/icon_close.png
similarity index 100%
rename from tools/editor/icons/2x/icon_close.png
rename to editor/icons/2x/icon_close.png
diff --git a/tools/editor/icons/2x/icon_collapse.png b/editor/icons/2x/icon_collapse.png
similarity index 100%
rename from tools/editor/icons/2x/icon_collapse.png
rename to editor/icons/2x/icon_collapse.png
diff --git a/tools/editor/icons/2x/icon_collision_2d.png b/editor/icons/2x/icon_collision_2d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_collision_2d.png
rename to editor/icons/2x/icon_collision_2d.png
diff --git a/tools/editor/icons/2x/icon_collision_polygon.png b/editor/icons/2x/icon_collision_polygon.png
similarity index 100%
rename from tools/editor/icons/2x/icon_collision_polygon.png
rename to editor/icons/2x/icon_collision_polygon.png
diff --git a/tools/editor/icons/2x/icon_collision_polygon_2d.png b/editor/icons/2x/icon_collision_polygon_2d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_collision_polygon_2d.png
rename to editor/icons/2x/icon_collision_polygon_2d.png
diff --git a/tools/editor/icons/2x/icon_collision_shape.png b/editor/icons/2x/icon_collision_shape.png
similarity index 100%
rename from tools/editor/icons/2x/icon_collision_shape.png
rename to editor/icons/2x/icon_collision_shape.png
diff --git a/tools/editor/icons/2x/icon_collision_shape_2d.png b/editor/icons/2x/icon_collision_shape_2d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_collision_shape_2d.png
rename to editor/icons/2x/icon_collision_shape_2d.png
diff --git a/tools/editor/icons/2x/icon_color.png b/editor/icons/2x/icon_color.png
similarity index 100%
rename from tools/editor/icons/2x/icon_color.png
rename to editor/icons/2x/icon_color.png
diff --git a/tools/editor/icons/2x/icon_color_pick.png b/editor/icons/2x/icon_color_pick.png
similarity index 100%
rename from tools/editor/icons/2x/icon_color_pick.png
rename to editor/icons/2x/icon_color_pick.png
diff --git a/tools/editor/icons/2x/icon_color_picker.png b/editor/icons/2x/icon_color_picker.png
similarity index 100%
rename from tools/editor/icons/2x/icon_color_picker.png
rename to editor/icons/2x/icon_color_picker.png
diff --git a/tools/editor/icons/2x/icon_color_picker_button.png b/editor/icons/2x/icon_color_picker_button.png
similarity index 100%
rename from tools/editor/icons/2x/icon_color_picker_button.png
rename to editor/icons/2x/icon_color_picker_button.png
diff --git a/tools/editor/icons/2x/icon_color_ramp.png b/editor/icons/2x/icon_color_ramp.png
similarity index 100%
rename from tools/editor/icons/2x/icon_color_ramp.png
rename to editor/icons/2x/icon_color_ramp.png
diff --git a/tools/editor/icons/2x/icon_color_rect.png b/editor/icons/2x/icon_color_rect.png
similarity index 100%
rename from tools/editor/icons/2x/icon_color_rect.png
rename to editor/icons/2x/icon_color_rect.png
diff --git a/tools/editor/icons/2x/icon_concave_polygon_shape.png b/editor/icons/2x/icon_concave_polygon_shape.png
similarity index 100%
rename from tools/editor/icons/2x/icon_concave_polygon_shape.png
rename to editor/icons/2x/icon_concave_polygon_shape.png
diff --git a/tools/editor/icons/2x/icon_concave_polygon_shape_2d.png b/editor/icons/2x/icon_concave_polygon_shape_2d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_concave_polygon_shape_2d.png
rename to editor/icons/2x/icon_concave_polygon_shape_2d.png
diff --git a/tools/editor/icons/2x/icon_cone_twist_joint.png b/editor/icons/2x/icon_cone_twist_joint.png
similarity index 100%
rename from tools/editor/icons/2x/icon_cone_twist_joint.png
rename to editor/icons/2x/icon_cone_twist_joint.png
diff --git a/tools/editor/icons/2x/icon_confirmation_dialog.png b/editor/icons/2x/icon_confirmation_dialog.png
similarity index 100%
rename from tools/editor/icons/2x/icon_confirmation_dialog.png
rename to editor/icons/2x/icon_confirmation_dialog.png
diff --git a/tools/editor/icons/2x/icon_connect.png b/editor/icons/2x/icon_connect.png
similarity index 100%
rename from tools/editor/icons/2x/icon_connect.png
rename to editor/icons/2x/icon_connect.png
diff --git a/tools/editor/icons/2x/icon_connection_and_groups.png b/editor/icons/2x/icon_connection_and_groups.png
similarity index 100%
rename from tools/editor/icons/2x/icon_connection_and_groups.png
rename to editor/icons/2x/icon_connection_and_groups.png
diff --git a/tools/editor/icons/2x/icon_container.png b/editor/icons/2x/icon_container.png
similarity index 100%
rename from tools/editor/icons/2x/icon_container.png
rename to editor/icons/2x/icon_container.png
diff --git a/tools/editor/icons/2x/icon_control.png b/editor/icons/2x/icon_control.png
similarity index 100%
rename from tools/editor/icons/2x/icon_control.png
rename to editor/icons/2x/icon_control.png
diff --git a/tools/editor/icons/2x/icon_control_align_bottom_center.png b/editor/icons/2x/icon_control_align_bottom_center.png
similarity index 100%
rename from tools/editor/icons/2x/icon_control_align_bottom_center.png
rename to editor/icons/2x/icon_control_align_bottom_center.png
diff --git a/tools/editor/icons/2x/icon_control_align_bottom_left.png b/editor/icons/2x/icon_control_align_bottom_left.png
similarity index 100%
rename from tools/editor/icons/2x/icon_control_align_bottom_left.png
rename to editor/icons/2x/icon_control_align_bottom_left.png
diff --git a/tools/editor/icons/2x/icon_control_align_bottom_right.png b/editor/icons/2x/icon_control_align_bottom_right.png
similarity index 100%
rename from tools/editor/icons/2x/icon_control_align_bottom_right.png
rename to editor/icons/2x/icon_control_align_bottom_right.png
diff --git a/tools/editor/icons/2x/icon_control_align_bottom_wide.png b/editor/icons/2x/icon_control_align_bottom_wide.png
similarity index 100%
rename from tools/editor/icons/2x/icon_control_align_bottom_wide.png
rename to editor/icons/2x/icon_control_align_bottom_wide.png
diff --git a/tools/editor/icons/2x/icon_control_align_center.png b/editor/icons/2x/icon_control_align_center.png
similarity index 100%
rename from tools/editor/icons/2x/icon_control_align_center.png
rename to editor/icons/2x/icon_control_align_center.png
diff --git a/tools/editor/icons/2x/icon_control_align_center_left.png b/editor/icons/2x/icon_control_align_center_left.png
similarity index 100%
rename from tools/editor/icons/2x/icon_control_align_center_left.png
rename to editor/icons/2x/icon_control_align_center_left.png
diff --git a/tools/editor/icons/2x/icon_control_align_center_right.png b/editor/icons/2x/icon_control_align_center_right.png
similarity index 100%
rename from tools/editor/icons/2x/icon_control_align_center_right.png
rename to editor/icons/2x/icon_control_align_center_right.png
diff --git a/tools/editor/icons/2x/icon_control_align_left_center.png b/editor/icons/2x/icon_control_align_left_center.png
similarity index 100%
rename from tools/editor/icons/2x/icon_control_align_left_center.png
rename to editor/icons/2x/icon_control_align_left_center.png
diff --git a/tools/editor/icons/2x/icon_control_align_left_wide.png b/editor/icons/2x/icon_control_align_left_wide.png
similarity index 100%
rename from tools/editor/icons/2x/icon_control_align_left_wide.png
rename to editor/icons/2x/icon_control_align_left_wide.png
diff --git a/tools/editor/icons/2x/icon_control_align_right_center.png b/editor/icons/2x/icon_control_align_right_center.png
similarity index 100%
rename from tools/editor/icons/2x/icon_control_align_right_center.png
rename to editor/icons/2x/icon_control_align_right_center.png
diff --git a/tools/editor/icons/2x/icon_control_align_right_wide.png b/editor/icons/2x/icon_control_align_right_wide.png
similarity index 100%
rename from tools/editor/icons/2x/icon_control_align_right_wide.png
rename to editor/icons/2x/icon_control_align_right_wide.png
diff --git a/tools/editor/icons/2x/icon_control_align_top_center.png b/editor/icons/2x/icon_control_align_top_center.png
similarity index 100%
rename from tools/editor/icons/2x/icon_control_align_top_center.png
rename to editor/icons/2x/icon_control_align_top_center.png
diff --git a/tools/editor/icons/2x/icon_control_align_top_left.png b/editor/icons/2x/icon_control_align_top_left.png
similarity index 100%
rename from tools/editor/icons/2x/icon_control_align_top_left.png
rename to editor/icons/2x/icon_control_align_top_left.png
diff --git a/tools/editor/icons/2x/icon_control_align_top_right.png b/editor/icons/2x/icon_control_align_top_right.png
similarity index 100%
rename from tools/editor/icons/2x/icon_control_align_top_right.png
rename to editor/icons/2x/icon_control_align_top_right.png
diff --git a/tools/editor/icons/2x/icon_control_align_top_wide.png b/editor/icons/2x/icon_control_align_top_wide.png
similarity index 100%
rename from tools/editor/icons/2x/icon_control_align_top_wide.png
rename to editor/icons/2x/icon_control_align_top_wide.png
diff --git a/tools/editor/icons/2x/icon_control_align_wide.png b/editor/icons/2x/icon_control_align_wide.png
similarity index 100%
rename from tools/editor/icons/2x/icon_control_align_wide.png
rename to editor/icons/2x/icon_control_align_wide.png
diff --git a/tools/editor/icons/2x/icon_control_hcenter_wide.png b/editor/icons/2x/icon_control_hcenter_wide.png
similarity index 100%
rename from tools/editor/icons/2x/icon_control_hcenter_wide.png
rename to editor/icons/2x/icon_control_hcenter_wide.png
diff --git a/tools/editor/icons/2x/icon_control_vcenter_wide.png b/editor/icons/2x/icon_control_vcenter_wide.png
similarity index 100%
rename from tools/editor/icons/2x/icon_control_vcenter_wide.png
rename to editor/icons/2x/icon_control_vcenter_wide.png
diff --git a/tools/editor/icons/2x/icon_convex_polygon_shape.png b/editor/icons/2x/icon_convex_polygon_shape.png
similarity index 100%
rename from tools/editor/icons/2x/icon_convex_polygon_shape.png
rename to editor/icons/2x/icon_convex_polygon_shape.png
diff --git a/tools/editor/icons/2x/icon_convex_polygon_shape_2d.png b/editor/icons/2x/icon_convex_polygon_shape_2d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_convex_polygon_shape_2d.png
rename to editor/icons/2x/icon_convex_polygon_shape_2d.png
diff --git a/tools/editor/icons/2x/icon_copy_node_path.png b/editor/icons/2x/icon_copy_node_path.png
similarity index 100%
rename from tools/editor/icons/2x/icon_copy_node_path.png
rename to editor/icons/2x/icon_copy_node_path.png
diff --git a/tools/editor/icons/2x/icon_create_new_scene_from.png b/editor/icons/2x/icon_create_new_scene_from.png
similarity index 100%
rename from tools/editor/icons/2x/icon_create_new_scene_from.png
rename to editor/icons/2x/icon_create_new_scene_from.png
diff --git a/tools/editor/icons/2x/icon_cube_map.png b/editor/icons/2x/icon_cube_map.png
similarity index 100%
rename from tools/editor/icons/2x/icon_cube_map.png
rename to editor/icons/2x/icon_cube_map.png
diff --git a/tools/editor/icons/2x/icon_curve_2d.png b/editor/icons/2x/icon_curve_2d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_curve_2d.png
rename to editor/icons/2x/icon_curve_2d.png
diff --git a/tools/editor/icons/2x/icon_curve_3d.png b/editor/icons/2x/icon_curve_3d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_curve_3d.png
rename to editor/icons/2x/icon_curve_3d.png
diff --git a/tools/editor/icons/2x/icon_curve_close.png b/editor/icons/2x/icon_curve_close.png
similarity index 100%
rename from tools/editor/icons/2x/icon_curve_close.png
rename to editor/icons/2x/icon_curve_close.png
diff --git a/tools/editor/icons/2x/icon_curve_constant.png b/editor/icons/2x/icon_curve_constant.png
similarity index 100%
rename from tools/editor/icons/2x/icon_curve_constant.png
rename to editor/icons/2x/icon_curve_constant.png
diff --git a/tools/editor/icons/2x/icon_curve_create.png b/editor/icons/2x/icon_curve_create.png
similarity index 100%
rename from tools/editor/icons/2x/icon_curve_create.png
rename to editor/icons/2x/icon_curve_create.png
diff --git a/tools/editor/icons/2x/icon_curve_curve.png b/editor/icons/2x/icon_curve_curve.png
similarity index 100%
rename from tools/editor/icons/2x/icon_curve_curve.png
rename to editor/icons/2x/icon_curve_curve.png
diff --git a/tools/editor/icons/2x/icon_curve_delete.png b/editor/icons/2x/icon_curve_delete.png
similarity index 100%
rename from tools/editor/icons/2x/icon_curve_delete.png
rename to editor/icons/2x/icon_curve_delete.png
diff --git a/tools/editor/icons/2x/icon_curve_edit.png b/editor/icons/2x/icon_curve_edit.png
similarity index 100%
rename from tools/editor/icons/2x/icon_curve_edit.png
rename to editor/icons/2x/icon_curve_edit.png
diff --git a/tools/editor/icons/2x/icon_curve_in.png b/editor/icons/2x/icon_curve_in.png
similarity index 100%
rename from tools/editor/icons/2x/icon_curve_in.png
rename to editor/icons/2x/icon_curve_in.png
diff --git a/tools/editor/icons/2x/icon_curve_in_out.png b/editor/icons/2x/icon_curve_in_out.png
similarity index 100%
rename from tools/editor/icons/2x/icon_curve_in_out.png
rename to editor/icons/2x/icon_curve_in_out.png
diff --git a/tools/editor/icons/2x/icon_curve_linear.png b/editor/icons/2x/icon_curve_linear.png
similarity index 100%
rename from tools/editor/icons/2x/icon_curve_linear.png
rename to editor/icons/2x/icon_curve_linear.png
diff --git a/tools/editor/icons/2x/icon_curve_out.png b/editor/icons/2x/icon_curve_out.png
similarity index 100%
rename from tools/editor/icons/2x/icon_curve_out.png
rename to editor/icons/2x/icon_curve_out.png
diff --git a/tools/editor/icons/2x/icon_curve_out_in.png b/editor/icons/2x/icon_curve_out_in.png
similarity index 100%
rename from tools/editor/icons/2x/icon_curve_out_in.png
rename to editor/icons/2x/icon_curve_out_in.png
diff --git a/tools/editor/icons/2x/icon_damped_spring_joint_2d.png b/editor/icons/2x/icon_damped_spring_joint_2d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_damped_spring_joint_2d.png
rename to editor/icons/2x/icon_damped_spring_joint_2d.png
diff --git a/tools/editor/icons/2x/icon_debug_continue.png b/editor/icons/2x/icon_debug_continue.png
similarity index 100%
rename from tools/editor/icons/2x/icon_debug_continue.png
rename to editor/icons/2x/icon_debug_continue.png
diff --git a/tools/editor/icons/2x/icon_debug_next.png b/editor/icons/2x/icon_debug_next.png
similarity index 100%
rename from tools/editor/icons/2x/icon_debug_next.png
rename to editor/icons/2x/icon_debug_next.png
diff --git a/tools/editor/icons/2x/icon_debug_step.png b/editor/icons/2x/icon_debug_step.png
similarity index 100%
rename from tools/editor/icons/2x/icon_debug_step.png
rename to editor/icons/2x/icon_debug_step.png
diff --git a/tools/editor/icons/2x/icon_dependency_changed.png b/editor/icons/2x/icon_dependency_changed.png
similarity index 100%
rename from tools/editor/icons/2x/icon_dependency_changed.png
rename to editor/icons/2x/icon_dependency_changed.png
diff --git a/tools/editor/icons/2x/icon_dependency_changed_hl.png b/editor/icons/2x/icon_dependency_changed_hl.png
similarity index 100%
rename from tools/editor/icons/2x/icon_dependency_changed_hl.png
rename to editor/icons/2x/icon_dependency_changed_hl.png
diff --git a/tools/editor/icons/2x/icon_dependency_local_changed.png b/editor/icons/2x/icon_dependency_local_changed.png
similarity index 100%
rename from tools/editor/icons/2x/icon_dependency_local_changed.png
rename to editor/icons/2x/icon_dependency_local_changed.png
diff --git a/tools/editor/icons/2x/icon_dependency_local_changed_hl.png b/editor/icons/2x/icon_dependency_local_changed_hl.png
similarity index 100%
rename from tools/editor/icons/2x/icon_dependency_local_changed_hl.png
rename to editor/icons/2x/icon_dependency_local_changed_hl.png
diff --git a/tools/editor/icons/2x/icon_dependency_ok.png b/editor/icons/2x/icon_dependency_ok.png
similarity index 100%
rename from tools/editor/icons/2x/icon_dependency_ok.png
rename to editor/icons/2x/icon_dependency_ok.png
diff --git a/tools/editor/icons/2x/icon_dependency_ok_hl.png b/editor/icons/2x/icon_dependency_ok_hl.png
similarity index 100%
rename from tools/editor/icons/2x/icon_dependency_ok_hl.png
rename to editor/icons/2x/icon_dependency_ok_hl.png
diff --git a/tools/editor/icons/2x/icon_directional_light.png b/editor/icons/2x/icon_directional_light.png
similarity index 100%
rename from tools/editor/icons/2x/icon_directional_light.png
rename to editor/icons/2x/icon_directional_light.png
diff --git a/tools/editor/icons/2x/icon_distraction_free.png b/editor/icons/2x/icon_distraction_free.png
similarity index 100%
rename from tools/editor/icons/2x/icon_distraction_free.png
rename to editor/icons/2x/icon_distraction_free.png
diff --git a/tools/editor/icons/2x/icon_duplicate.png b/editor/icons/2x/icon_duplicate.png
similarity index 100%
rename from tools/editor/icons/2x/icon_duplicate.png
rename to editor/icons/2x/icon_duplicate.png
diff --git a/tools/editor/icons/2x/icon_dynamic_font.png b/editor/icons/2x/icon_dynamic_font.png
similarity index 100%
rename from tools/editor/icons/2x/icon_dynamic_font.png
rename to editor/icons/2x/icon_dynamic_font.png
diff --git a/tools/editor/icons/2x/icon_dynamic_font_data.png b/editor/icons/2x/icon_dynamic_font_data.png
similarity index 100%
rename from tools/editor/icons/2x/icon_dynamic_font_data.png
rename to editor/icons/2x/icon_dynamic_font_data.png
diff --git a/tools/editor/icons/2x/icon_edit.png b/editor/icons/2x/icon_edit.png
similarity index 100%
rename from tools/editor/icons/2x/icon_edit.png
rename to editor/icons/2x/icon_edit.png
diff --git a/tools/editor/icons/2x/icon_edit_key.png b/editor/icons/2x/icon_edit_key.png
similarity index 100%
rename from tools/editor/icons/2x/icon_edit_key.png
rename to editor/icons/2x/icon_edit_key.png
diff --git a/tools/editor/icons/2x/icon_edit_pivot.png b/editor/icons/2x/icon_edit_pivot.png
similarity index 100%
rename from tools/editor/icons/2x/icon_edit_pivot.png
rename to editor/icons/2x/icon_edit_pivot.png
diff --git a/tools/editor/icons/2x/icon_edit_resource.png b/editor/icons/2x/icon_edit_resource.png
similarity index 100%
rename from tools/editor/icons/2x/icon_edit_resource.png
rename to editor/icons/2x/icon_edit_resource.png
diff --git a/tools/editor/icons/2x/icon_editor_3d_handle.png b/editor/icons/2x/icon_editor_3d_handle.png
similarity index 100%
rename from tools/editor/icons/2x/icon_editor_3d_handle.png
rename to editor/icons/2x/icon_editor_3d_handle.png
diff --git a/tools/editor/icons/2x/icon_editor_handle.png b/editor/icons/2x/icon_editor_handle.png
similarity index 100%
rename from tools/editor/icons/2x/icon_editor_handle.png
rename to editor/icons/2x/icon_editor_handle.png
diff --git a/tools/editor/icons/2x/icon_editor_pivot.png b/editor/icons/2x/icon_editor_pivot.png
similarity index 100%
rename from tools/editor/icons/2x/icon_editor_pivot.png
rename to editor/icons/2x/icon_editor_pivot.png
diff --git a/tools/editor/icons/2x/icon_editor_plugin.png b/editor/icons/2x/icon_editor_plugin.png
similarity index 100%
rename from tools/editor/icons/2x/icon_editor_plugin.png
rename to editor/icons/2x/icon_editor_plugin.png
diff --git a/tools/editor/icons/2x/icon_enum.png b/editor/icons/2x/icon_enum.png
similarity index 100%
rename from tools/editor/icons/2x/icon_enum.png
rename to editor/icons/2x/icon_enum.png
diff --git a/tools/editor/icons/2x/icon_environment.png b/editor/icons/2x/icon_environment.png
similarity index 100%
rename from tools/editor/icons/2x/icon_environment.png
rename to editor/icons/2x/icon_environment.png
diff --git a/tools/editor/icons/2x/icon_error.png b/editor/icons/2x/icon_error.png
similarity index 100%
rename from tools/editor/icons/2x/icon_error.png
rename to editor/icons/2x/icon_error.png
diff --git a/tools/editor/icons/2x/icon_error_sign.png b/editor/icons/2x/icon_error_sign.png
similarity index 100%
rename from tools/editor/icons/2x/icon_error_sign.png
rename to editor/icons/2x/icon_error_sign.png
diff --git a/tools/editor/icons/2x/icon_event_player.png b/editor/icons/2x/icon_event_player.png
similarity index 100%
rename from tools/editor/icons/2x/icon_event_player.png
rename to editor/icons/2x/icon_event_player.png
diff --git a/tools/editor/icons/2x/icon_favorites.png b/editor/icons/2x/icon_favorites.png
similarity index 100%
rename from tools/editor/icons/2x/icon_favorites.png
rename to editor/icons/2x/icon_favorites.png
diff --git a/tools/editor/icons/2x/icon_file.png b/editor/icons/2x/icon_file.png
similarity index 100%
rename from tools/editor/icons/2x/icon_file.png
rename to editor/icons/2x/icon_file.png
diff --git a/tools/editor/icons/2x/icon_file_big.png b/editor/icons/2x/icon_file_big.png
similarity index 100%
rename from tools/editor/icons/2x/icon_file_big.png
rename to editor/icons/2x/icon_file_big.png
diff --git a/tools/editor/icons/2x/icon_file_dialog.png b/editor/icons/2x/icon_file_dialog.png
similarity index 100%
rename from tools/editor/icons/2x/icon_file_dialog.png
rename to editor/icons/2x/icon_file_dialog.png
diff --git a/tools/editor/icons/2x/icon_file_list.png b/editor/icons/2x/icon_file_list.png
similarity index 100%
rename from tools/editor/icons/2x/icon_file_list.png
rename to editor/icons/2x/icon_file_list.png
diff --git a/tools/editor/icons/2x/icon_file_server.png b/editor/icons/2x/icon_file_server.png
similarity index 100%
rename from tools/editor/icons/2x/icon_file_server.png
rename to editor/icons/2x/icon_file_server.png
diff --git a/tools/editor/icons/2x/icon_file_server_active.png b/editor/icons/2x/icon_file_server_active.png
similarity index 100%
rename from tools/editor/icons/2x/icon_file_server_active.png
rename to editor/icons/2x/icon_file_server_active.png
diff --git a/tools/editor/icons/2x/icon_file_thumbnail.png b/editor/icons/2x/icon_file_thumbnail.png
similarity index 100%
rename from tools/editor/icons/2x/icon_file_thumbnail.png
rename to editor/icons/2x/icon_file_thumbnail.png
diff --git a/tools/editor/icons/2x/icon_filesystem.png b/editor/icons/2x/icon_filesystem.png
similarity index 100%
rename from tools/editor/icons/2x/icon_filesystem.png
rename to editor/icons/2x/icon_filesystem.png
diff --git a/tools/editor/icons/2x/icon_fixed_material.png b/editor/icons/2x/icon_fixed_material.png
similarity index 100%
rename from tools/editor/icons/2x/icon_fixed_material.png
rename to editor/icons/2x/icon_fixed_material.png
diff --git a/tools/editor/icons/2x/icon_fixed_spatial_material.png b/editor/icons/2x/icon_fixed_spatial_material.png
similarity index 100%
rename from tools/editor/icons/2x/icon_fixed_spatial_material.png
rename to editor/icons/2x/icon_fixed_spatial_material.png
diff --git a/tools/editor/icons/2x/icon_folder.png b/editor/icons/2x/icon_folder.png
similarity index 100%
rename from tools/editor/icons/2x/icon_folder.png
rename to editor/icons/2x/icon_folder.png
diff --git a/tools/editor/icons/2x/icon_folder_big.png b/editor/icons/2x/icon_folder_big.png
similarity index 100%
rename from tools/editor/icons/2x/icon_folder_big.png
rename to editor/icons/2x/icon_folder_big.png
diff --git a/tools/editor/icons/2x/icon_font.png b/editor/icons/2x/icon_font.png
similarity index 100%
rename from tools/editor/icons/2x/icon_font.png
rename to editor/icons/2x/icon_font.png
diff --git a/tools/editor/icons/2x/icon_forward.png b/editor/icons/2x/icon_forward.png
similarity index 100%
rename from tools/editor/icons/2x/icon_forward.png
rename to editor/icons/2x/icon_forward.png
diff --git a/tools/editor/icons/2x/icon_g_d_script.png b/editor/icons/2x/icon_g_d_script.png
similarity index 100%
rename from tools/editor/icons/2x/icon_g_d_script.png
rename to editor/icons/2x/icon_g_d_script.png
diff --git a/tools/editor/icons/2x/icon_g_i_probe.png b/editor/icons/2x/icon_g_i_probe.png
similarity index 100%
rename from tools/editor/icons/2x/icon_g_i_probe.png
rename to editor/icons/2x/icon_g_i_probe.png
diff --git a/tools/editor/icons/2x/icon_g_i_probe_data.png b/editor/icons/2x/icon_g_i_probe_data.png
similarity index 100%
rename from tools/editor/icons/2x/icon_g_i_probe_data.png
rename to editor/icons/2x/icon_g_i_probe_data.png
diff --git a/tools/editor/icons/2x/icon_generic_6_d_o_f_joint.png b/editor/icons/2x/icon_generic_6_d_o_f_joint.png
similarity index 100%
rename from tools/editor/icons/2x/icon_generic_6_d_o_f_joint.png
rename to editor/icons/2x/icon_generic_6_d_o_f_joint.png
diff --git a/tools/editor/icons/2x/icon_gizmo_directional_light.png b/editor/icons/2x/icon_gizmo_directional_light.png
similarity index 100%
rename from tools/editor/icons/2x/icon_gizmo_directional_light.png
rename to editor/icons/2x/icon_gizmo_directional_light.png
diff --git a/tools/editor/icons/2x/icon_gizmo_light.png b/editor/icons/2x/icon_gizmo_light.png
similarity index 100%
rename from tools/editor/icons/2x/icon_gizmo_light.png
rename to editor/icons/2x/icon_gizmo_light.png
diff --git a/tools/editor/icons/2x/icon_gizmo_listener.png b/editor/icons/2x/icon_gizmo_listener.png
similarity index 100%
rename from tools/editor/icons/2x/icon_gizmo_listener.png
rename to editor/icons/2x/icon_gizmo_listener.png
diff --git a/tools/editor/icons/2x/icon_gizmo_spatial_sample_player.png b/editor/icons/2x/icon_gizmo_spatial_sample_player.png
similarity index 100%
rename from tools/editor/icons/2x/icon_gizmo_spatial_sample_player.png
rename to editor/icons/2x/icon_gizmo_spatial_sample_player.png
diff --git a/tools/editor/icons/2x/icon_gizmo_spatial_stream_player.png b/editor/icons/2x/icon_gizmo_spatial_stream_player.png
similarity index 100%
rename from tools/editor/icons/2x/icon_gizmo_spatial_stream_player.png
rename to editor/icons/2x/icon_gizmo_spatial_stream_player.png
diff --git a/tools/editor/icons/2x/icon_godot.png b/editor/icons/2x/icon_godot.png
similarity index 100%
rename from tools/editor/icons/2x/icon_godot.png
rename to editor/icons/2x/icon_godot.png
diff --git a/tools/editor/icons/2x/icon_graph_color_ramp.png b/editor/icons/2x/icon_graph_color_ramp.png
similarity index 100%
rename from tools/editor/icons/2x/icon_graph_color_ramp.png
rename to editor/icons/2x/icon_graph_color_ramp.png
diff --git a/tools/editor/icons/2x/icon_graph_comment.png b/editor/icons/2x/icon_graph_comment.png
similarity index 100%
rename from tools/editor/icons/2x/icon_graph_comment.png
rename to editor/icons/2x/icon_graph_comment.png
diff --git a/tools/editor/icons/2x/icon_graph_cube_uniform.png b/editor/icons/2x/icon_graph_cube_uniform.png
similarity index 100%
rename from tools/editor/icons/2x/icon_graph_cube_uniform.png
rename to editor/icons/2x/icon_graph_cube_uniform.png
diff --git a/tools/editor/icons/2x/icon_graph_curve_map.png b/editor/icons/2x/icon_graph_curve_map.png
similarity index 100%
rename from tools/editor/icons/2x/icon_graph_curve_map.png
rename to editor/icons/2x/icon_graph_curve_map.png
diff --git a/tools/editor/icons/2x/icon_graph_default_texture.png b/editor/icons/2x/icon_graph_default_texture.png
similarity index 100%
rename from tools/editor/icons/2x/icon_graph_default_texture.png
rename to editor/icons/2x/icon_graph_default_texture.png
diff --git a/tools/editor/icons/2x/icon_graph_edit.png b/editor/icons/2x/icon_graph_edit.png
similarity index 100%
rename from tools/editor/icons/2x/icon_graph_edit.png
rename to editor/icons/2x/icon_graph_edit.png
diff --git a/tools/editor/icons/2x/icon_graph_input.png b/editor/icons/2x/icon_graph_input.png
similarity index 100%
rename from tools/editor/icons/2x/icon_graph_input.png
rename to editor/icons/2x/icon_graph_input.png
diff --git a/tools/editor/icons/2x/icon_graph_node.png b/editor/icons/2x/icon_graph_node.png
similarity index 100%
rename from tools/editor/icons/2x/icon_graph_node.png
rename to editor/icons/2x/icon_graph_node.png
diff --git a/tools/editor/icons/2x/icon_graph_rgb.png b/editor/icons/2x/icon_graph_rgb.png
similarity index 100%
rename from tools/editor/icons/2x/icon_graph_rgb.png
rename to editor/icons/2x/icon_graph_rgb.png
diff --git a/tools/editor/icons/2x/icon_graph_rgb_op.png b/editor/icons/2x/icon_graph_rgb_op.png
similarity index 100%
rename from tools/editor/icons/2x/icon_graph_rgb_op.png
rename to editor/icons/2x/icon_graph_rgb_op.png
diff --git a/tools/editor/icons/2x/icon_graph_rgb_uniform.png b/editor/icons/2x/icon_graph_rgb_uniform.png
similarity index 100%
rename from tools/editor/icons/2x/icon_graph_rgb_uniform.png
rename to editor/icons/2x/icon_graph_rgb_uniform.png
diff --git a/tools/editor/icons/2x/icon_graph_scalar.png b/editor/icons/2x/icon_graph_scalar.png
similarity index 100%
rename from tools/editor/icons/2x/icon_graph_scalar.png
rename to editor/icons/2x/icon_graph_scalar.png
diff --git a/tools/editor/icons/2x/icon_graph_scalar_interp.png b/editor/icons/2x/icon_graph_scalar_interp.png
similarity index 100%
rename from tools/editor/icons/2x/icon_graph_scalar_interp.png
rename to editor/icons/2x/icon_graph_scalar_interp.png
diff --git a/tools/editor/icons/2x/icon_graph_scalar_op.png b/editor/icons/2x/icon_graph_scalar_op.png
similarity index 100%
rename from tools/editor/icons/2x/icon_graph_scalar_op.png
rename to editor/icons/2x/icon_graph_scalar_op.png
diff --git a/tools/editor/icons/2x/icon_graph_scalar_uniform.png b/editor/icons/2x/icon_graph_scalar_uniform.png
similarity index 100%
rename from tools/editor/icons/2x/icon_graph_scalar_uniform.png
rename to editor/icons/2x/icon_graph_scalar_uniform.png
diff --git a/tools/editor/icons/2x/icon_graph_scalars_to_vec.png b/editor/icons/2x/icon_graph_scalars_to_vec.png
similarity index 100%
rename from tools/editor/icons/2x/icon_graph_scalars_to_vec.png
rename to editor/icons/2x/icon_graph_scalars_to_vec.png
diff --git a/tools/editor/icons/2x/icon_graph_texscreen.png b/editor/icons/2x/icon_graph_texscreen.png
similarity index 100%
rename from tools/editor/icons/2x/icon_graph_texscreen.png
rename to editor/icons/2x/icon_graph_texscreen.png
diff --git a/tools/editor/icons/2x/icon_graph_texture_uniform.png b/editor/icons/2x/icon_graph_texture_uniform.png
similarity index 100%
rename from tools/editor/icons/2x/icon_graph_texture_uniform.png
rename to editor/icons/2x/icon_graph_texture_uniform.png
diff --git a/tools/editor/icons/2x/icon_graph_time.png b/editor/icons/2x/icon_graph_time.png
similarity index 100%
rename from tools/editor/icons/2x/icon_graph_time.png
rename to editor/icons/2x/icon_graph_time.png
diff --git a/tools/editor/icons/2x/icon_graph_vec_dp.png b/editor/icons/2x/icon_graph_vec_dp.png
similarity index 100%
rename from tools/editor/icons/2x/icon_graph_vec_dp.png
rename to editor/icons/2x/icon_graph_vec_dp.png
diff --git a/tools/editor/icons/2x/icon_graph_vec_interp.png b/editor/icons/2x/icon_graph_vec_interp.png
similarity index 100%
rename from tools/editor/icons/2x/icon_graph_vec_interp.png
rename to editor/icons/2x/icon_graph_vec_interp.png
diff --git a/tools/editor/icons/2x/icon_graph_vec_length.png b/editor/icons/2x/icon_graph_vec_length.png
similarity index 100%
rename from tools/editor/icons/2x/icon_graph_vec_length.png
rename to editor/icons/2x/icon_graph_vec_length.png
diff --git a/tools/editor/icons/2x/icon_graph_vec_op.png b/editor/icons/2x/icon_graph_vec_op.png
similarity index 100%
rename from tools/editor/icons/2x/icon_graph_vec_op.png
rename to editor/icons/2x/icon_graph_vec_op.png
diff --git a/tools/editor/icons/2x/icon_graph_vec_scalar_op.png b/editor/icons/2x/icon_graph_vec_scalar_op.png
similarity index 100%
rename from tools/editor/icons/2x/icon_graph_vec_scalar_op.png
rename to editor/icons/2x/icon_graph_vec_scalar_op.png
diff --git a/tools/editor/icons/2x/icon_graph_vec_to_scalars.png b/editor/icons/2x/icon_graph_vec_to_scalars.png
similarity index 100%
rename from tools/editor/icons/2x/icon_graph_vec_to_scalars.png
rename to editor/icons/2x/icon_graph_vec_to_scalars.png
diff --git a/tools/editor/icons/2x/icon_graph_vecs_to_xform.png b/editor/icons/2x/icon_graph_vecs_to_xform.png
similarity index 100%
rename from tools/editor/icons/2x/icon_graph_vecs_to_xform.png
rename to editor/icons/2x/icon_graph_vecs_to_xform.png
diff --git a/tools/editor/icons/2x/icon_graph_vector.png b/editor/icons/2x/icon_graph_vector.png
similarity index 100%
rename from tools/editor/icons/2x/icon_graph_vector.png
rename to editor/icons/2x/icon_graph_vector.png
diff --git a/tools/editor/icons/2x/icon_graph_vector_uniform.png b/editor/icons/2x/icon_graph_vector_uniform.png
similarity index 100%
rename from tools/editor/icons/2x/icon_graph_vector_uniform.png
rename to editor/icons/2x/icon_graph_vector_uniform.png
diff --git a/tools/editor/icons/2x/icon_graph_xform.png b/editor/icons/2x/icon_graph_xform.png
similarity index 100%
rename from tools/editor/icons/2x/icon_graph_xform.png
rename to editor/icons/2x/icon_graph_xform.png
diff --git a/tools/editor/icons/2x/icon_graph_xform_mult.png b/editor/icons/2x/icon_graph_xform_mult.png
similarity index 100%
rename from tools/editor/icons/2x/icon_graph_xform_mult.png
rename to editor/icons/2x/icon_graph_xform_mult.png
diff --git a/tools/editor/icons/2x/icon_graph_xform_scalar_func.png b/editor/icons/2x/icon_graph_xform_scalar_func.png
similarity index 100%
rename from tools/editor/icons/2x/icon_graph_xform_scalar_func.png
rename to editor/icons/2x/icon_graph_xform_scalar_func.png
diff --git a/tools/editor/icons/2x/icon_graph_xform_to_vecs.png b/editor/icons/2x/icon_graph_xform_to_vecs.png
similarity index 100%
rename from tools/editor/icons/2x/icon_graph_xform_to_vecs.png
rename to editor/icons/2x/icon_graph_xform_to_vecs.png
diff --git a/tools/editor/icons/2x/icon_graph_xform_uniform.png b/editor/icons/2x/icon_graph_xform_uniform.png
similarity index 100%
rename from tools/editor/icons/2x/icon_graph_xform_uniform.png
rename to editor/icons/2x/icon_graph_xform_uniform.png
diff --git a/tools/editor/icons/2x/icon_graph_xform_vec_func.png b/editor/icons/2x/icon_graph_xform_vec_func.png
similarity index 100%
rename from tools/editor/icons/2x/icon_graph_xform_vec_func.png
rename to editor/icons/2x/icon_graph_xform_vec_func.png
diff --git a/tools/editor/icons/2x/icon_graph_xform_vec_imult.png b/editor/icons/2x/icon_graph_xform_vec_imult.png
similarity index 100%
rename from tools/editor/icons/2x/icon_graph_xform_vec_imult.png
rename to editor/icons/2x/icon_graph_xform_vec_imult.png
diff --git a/tools/editor/icons/2x/icon_graph_xform_vec_mult.png b/editor/icons/2x/icon_graph_xform_vec_mult.png
similarity index 100%
rename from tools/editor/icons/2x/icon_graph_xform_vec_mult.png
rename to editor/icons/2x/icon_graph_xform_vec_mult.png
diff --git a/tools/editor/icons/2x/icon_grid.png b/editor/icons/2x/icon_grid.png
similarity index 100%
rename from tools/editor/icons/2x/icon_grid.png
rename to editor/icons/2x/icon_grid.png
diff --git a/tools/editor/icons/2x/icon_grid_container.png b/editor/icons/2x/icon_grid_container.png
similarity index 100%
rename from tools/editor/icons/2x/icon_grid_container.png
rename to editor/icons/2x/icon_grid_container.png
diff --git a/tools/editor/icons/2x/icon_grid_map.png b/editor/icons/2x/icon_grid_map.png
similarity index 100%
rename from tools/editor/icons/2x/icon_grid_map.png
rename to editor/icons/2x/icon_grid_map.png
diff --git a/tools/editor/icons/2x/icon_groove_joint_2d.png b/editor/icons/2x/icon_groove_joint_2d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_groove_joint_2d.png
rename to editor/icons/2x/icon_groove_joint_2d.png
diff --git a/tools/editor/icons/2x/icon_group.png b/editor/icons/2x/icon_group.png
similarity index 100%
rename from tools/editor/icons/2x/icon_group.png
rename to editor/icons/2x/icon_group.png
diff --git a/tools/editor/icons/2x/icon_groups.png b/editor/icons/2x/icon_groups.png
similarity index 100%
rename from tools/editor/icons/2x/icon_groups.png
rename to editor/icons/2x/icon_groups.png
diff --git a/tools/editor/icons/2x/icon_h_box_container.png b/editor/icons/2x/icon_h_box_container.png
similarity index 100%
rename from tools/editor/icons/2x/icon_h_box_container.png
rename to editor/icons/2x/icon_h_box_container.png
diff --git a/tools/editor/icons/2x/icon_h_button_array.png b/editor/icons/2x/icon_h_button_array.png
similarity index 100%
rename from tools/editor/icons/2x/icon_h_button_array.png
rename to editor/icons/2x/icon_h_button_array.png
diff --git a/tools/editor/icons/2x/icon_h_scroll_bar.png b/editor/icons/2x/icon_h_scroll_bar.png
similarity index 100%
rename from tools/editor/icons/2x/icon_h_scroll_bar.png
rename to editor/icons/2x/icon_h_scroll_bar.png
diff --git a/tools/editor/icons/2x/icon_h_separator.png b/editor/icons/2x/icon_h_separator.png
similarity index 100%
rename from tools/editor/icons/2x/icon_h_separator.png
rename to editor/icons/2x/icon_h_separator.png
diff --git a/tools/editor/icons/2x/icon_h_slider.png b/editor/icons/2x/icon_h_slider.png
similarity index 100%
rename from tools/editor/icons/2x/icon_h_slider.png
rename to editor/icons/2x/icon_h_slider.png
diff --git a/tools/editor/icons/2x/icon_h_split_container.png b/editor/icons/2x/icon_h_split_container.png
similarity index 100%
rename from tools/editor/icons/2x/icon_h_split_container.png
rename to editor/icons/2x/icon_h_split_container.png
diff --git a/tools/editor/icons/2x/icon_h_t_t_p_request.png b/editor/icons/2x/icon_h_t_t_p_request.png
similarity index 100%
rename from tools/editor/icons/2x/icon_h_t_t_p_request.png
rename to editor/icons/2x/icon_h_t_t_p_request.png
diff --git a/tools/editor/icons/2x/icon_headphones.png b/editor/icons/2x/icon_headphones.png
similarity index 100%
rename from tools/editor/icons/2x/icon_headphones.png
rename to editor/icons/2x/icon_headphones.png
diff --git a/tools/editor/icons/2x/icon_help.png b/editor/icons/2x/icon_help.png
similarity index 100%
rename from tools/editor/icons/2x/icon_help.png
rename to editor/icons/2x/icon_help.png
diff --git a/tools/editor/icons/2x/icon_hidden.png b/editor/icons/2x/icon_hidden.png
similarity index 100%
rename from tools/editor/icons/2x/icon_hidden.png
rename to editor/icons/2x/icon_hidden.png
diff --git a/tools/editor/icons/2x/icon_hinge_joint.png b/editor/icons/2x/icon_hinge_joint.png
similarity index 100%
rename from tools/editor/icons/2x/icon_hinge_joint.png
rename to editor/icons/2x/icon_hinge_joint.png
diff --git a/tools/editor/icons/2x/icon_history.png b/editor/icons/2x/icon_history.png
similarity index 100%
rename from tools/editor/icons/2x/icon_history.png
rename to editor/icons/2x/icon_history.png
diff --git a/tools/editor/icons/2x/icon_hsize.png b/editor/icons/2x/icon_hsize.png
similarity index 100%
rename from tools/editor/icons/2x/icon_hsize.png
rename to editor/icons/2x/icon_hsize.png
diff --git a/tools/editor/icons/2x/icon_image.png b/editor/icons/2x/icon_image.png
similarity index 100%
rename from tools/editor/icons/2x/icon_image.png
rename to editor/icons/2x/icon_image.png
diff --git a/tools/editor/icons/2x/icon_image_sky_box.png b/editor/icons/2x/icon_image_sky_box.png
similarity index 100%
rename from tools/editor/icons/2x/icon_image_sky_box.png
rename to editor/icons/2x/icon_image_sky_box.png
diff --git a/tools/editor/icons/2x/icon_image_texture.png b/editor/icons/2x/icon_image_texture.png
similarity index 100%
rename from tools/editor/icons/2x/icon_image_texture.png
rename to editor/icons/2x/icon_image_texture.png
diff --git a/tools/editor/icons/2x/icon_immediate_geometry.png b/editor/icons/2x/icon_immediate_geometry.png
similarity index 100%
rename from tools/editor/icons/2x/icon_immediate_geometry.png
rename to editor/icons/2x/icon_immediate_geometry.png
diff --git a/tools/editor/icons/2x/icon_import_check.png b/editor/icons/2x/icon_import_check.png
similarity index 100%
rename from tools/editor/icons/2x/icon_import_check.png
rename to editor/icons/2x/icon_import_check.png
diff --git a/tools/editor/icons/2x/icon_import_fail.png b/editor/icons/2x/icon_import_fail.png
similarity index 100%
rename from tools/editor/icons/2x/icon_import_fail.png
rename to editor/icons/2x/icon_import_fail.png
diff --git a/tools/editor/icons/2x/icon_instance.png b/editor/icons/2x/icon_instance.png
similarity index 100%
rename from tools/editor/icons/2x/icon_instance.png
rename to editor/icons/2x/icon_instance.png
diff --git a/tools/editor/icons/2x/icon_instance_options.png b/editor/icons/2x/icon_instance_options.png
similarity index 100%
rename from tools/editor/icons/2x/icon_instance_options.png
rename to editor/icons/2x/icon_instance_options.png
diff --git a/tools/editor/icons/2x/icon_integer.png b/editor/icons/2x/icon_integer.png
similarity index 100%
rename from tools/editor/icons/2x/icon_integer.png
rename to editor/icons/2x/icon_integer.png
diff --git a/tools/editor/icons/2x/icon_interp_cubic.png b/editor/icons/2x/icon_interp_cubic.png
similarity index 100%
rename from tools/editor/icons/2x/icon_interp_cubic.png
rename to editor/icons/2x/icon_interp_cubic.png
diff --git a/tools/editor/icons/2x/icon_interp_linear.png b/editor/icons/2x/icon_interp_linear.png
similarity index 100%
rename from tools/editor/icons/2x/icon_interp_linear.png
rename to editor/icons/2x/icon_interp_linear.png
diff --git a/tools/editor/icons/2x/icon_interp_raw.png b/editor/icons/2x/icon_interp_raw.png
similarity index 100%
rename from tools/editor/icons/2x/icon_interp_raw.png
rename to editor/icons/2x/icon_interp_raw.png
diff --git a/tools/editor/icons/2x/icon_interp_wrap_clamp.png b/editor/icons/2x/icon_interp_wrap_clamp.png
similarity index 100%
rename from tools/editor/icons/2x/icon_interp_wrap_clamp.png
rename to editor/icons/2x/icon_interp_wrap_clamp.png
diff --git a/tools/editor/icons/2x/icon_interp_wrap_loop.png b/editor/icons/2x/icon_interp_wrap_loop.png
similarity index 100%
rename from tools/editor/icons/2x/icon_interp_wrap_loop.png
rename to editor/icons/2x/icon_interp_wrap_loop.png
diff --git a/tools/editor/icons/2x/icon_interpolated_camera.png b/editor/icons/2x/icon_interpolated_camera.png
similarity index 100%
rename from tools/editor/icons/2x/icon_interpolated_camera.png
rename to editor/icons/2x/icon_interpolated_camera.png
diff --git a/tools/editor/icons/2x/icon_invalid_key.png b/editor/icons/2x/icon_invalid_key.png
similarity index 100%
rename from tools/editor/icons/2x/icon_invalid_key.png
rename to editor/icons/2x/icon_invalid_key.png
diff --git a/tools/editor/icons/2x/icon_inverse_kinematics.png b/editor/icons/2x/icon_inverse_kinematics.png
similarity index 100%
rename from tools/editor/icons/2x/icon_inverse_kinematics.png
rename to editor/icons/2x/icon_inverse_kinematics.png
diff --git a/tools/editor/icons/2x/icon_item_list.png b/editor/icons/2x/icon_item_list.png
similarity index 100%
rename from tools/editor/icons/2x/icon_item_list.png
rename to editor/icons/2x/icon_item_list.png
diff --git a/tools/editor/icons/2x/icon_joy_axis.png b/editor/icons/2x/icon_joy_axis.png
similarity index 100%
rename from tools/editor/icons/2x/icon_joy_axis.png
rename to editor/icons/2x/icon_joy_axis.png
diff --git a/tools/editor/icons/2x/icon_joy_button.png b/editor/icons/2x/icon_joy_button.png
similarity index 100%
rename from tools/editor/icons/2x/icon_joy_button.png
rename to editor/icons/2x/icon_joy_button.png
diff --git a/tools/editor/icons/2x/icon_joypad.png b/editor/icons/2x/icon_joypad.png
similarity index 100%
rename from tools/editor/icons/2x/icon_joypad.png
rename to editor/icons/2x/icon_joypad.png
diff --git a/tools/editor/icons/2x/icon_key.png b/editor/icons/2x/icon_key.png
similarity index 100%
rename from tools/editor/icons/2x/icon_key.png
rename to editor/icons/2x/icon_key.png
diff --git a/tools/editor/icons/2x/icon_key_hover.png b/editor/icons/2x/icon_key_hover.png
similarity index 100%
rename from tools/editor/icons/2x/icon_key_hover.png
rename to editor/icons/2x/icon_key_hover.png
diff --git a/tools/editor/icons/2x/icon_key_invalid.png b/editor/icons/2x/icon_key_invalid.png
similarity index 100%
rename from tools/editor/icons/2x/icon_key_invalid.png
rename to editor/icons/2x/icon_key_invalid.png
diff --git a/tools/editor/icons/2x/icon_key_next.png b/editor/icons/2x/icon_key_next.png
similarity index 100%
rename from tools/editor/icons/2x/icon_key_next.png
rename to editor/icons/2x/icon_key_next.png
diff --git a/tools/editor/icons/2x/icon_key_selected.png b/editor/icons/2x/icon_key_selected.png
similarity index 100%
rename from tools/editor/icons/2x/icon_key_selected.png
rename to editor/icons/2x/icon_key_selected.png
diff --git a/tools/editor/icons/2x/icon_key_value.png b/editor/icons/2x/icon_key_value.png
similarity index 100%
rename from tools/editor/icons/2x/icon_key_value.png
rename to editor/icons/2x/icon_key_value.png
diff --git a/tools/editor/icons/2x/icon_key_xform.png b/editor/icons/2x/icon_key_xform.png
similarity index 100%
rename from tools/editor/icons/2x/icon_key_xform.png
rename to editor/icons/2x/icon_key_xform.png
diff --git a/tools/editor/icons/2x/icon_keyboard.png b/editor/icons/2x/icon_keyboard.png
similarity index 100%
rename from tools/editor/icons/2x/icon_keyboard.png
rename to editor/icons/2x/icon_keyboard.png
diff --git a/tools/editor/icons/2x/icon_kinematic_body.png b/editor/icons/2x/icon_kinematic_body.png
similarity index 100%
rename from tools/editor/icons/2x/icon_kinematic_body.png
rename to editor/icons/2x/icon_kinematic_body.png
diff --git a/tools/editor/icons/2x/icon_kinematic_body_2d.png b/editor/icons/2x/icon_kinematic_body_2d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_kinematic_body_2d.png
rename to editor/icons/2x/icon_kinematic_body_2d.png
diff --git a/tools/editor/icons/2x/icon_label.png b/editor/icons/2x/icon_label.png
similarity index 100%
rename from tools/editor/icons/2x/icon_label.png
rename to editor/icons/2x/icon_label.png
diff --git a/tools/editor/icons/2x/icon_large_texture.png b/editor/icons/2x/icon_large_texture.png
similarity index 100%
rename from tools/editor/icons/2x/icon_large_texture.png
rename to editor/icons/2x/icon_large_texture.png
diff --git a/tools/editor/icons/2x/icon_light_2d.png b/editor/icons/2x/icon_light_2d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_light_2d.png
rename to editor/icons/2x/icon_light_2d.png
diff --git a/tools/editor/icons/2x/icon_light_occluder_2d.png b/editor/icons/2x/icon_light_occluder_2d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_light_occluder_2d.png
rename to editor/icons/2x/icon_light_occluder_2d.png
diff --git a/tools/editor/icons/2x/icon_line_2d.png b/editor/icons/2x/icon_line_2d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_line_2d.png
rename to editor/icons/2x/icon_line_2d.png
diff --git a/tools/editor/icons/2x/icon_line_edit.png b/editor/icons/2x/icon_line_edit.png
similarity index 100%
rename from tools/editor/icons/2x/icon_line_edit.png
rename to editor/icons/2x/icon_line_edit.png
diff --git a/tools/editor/icons/2x/icon_line_shape_2d.png b/editor/icons/2x/icon_line_shape_2d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_line_shape_2d.png
rename to editor/icons/2x/icon_line_shape_2d.png
diff --git a/tools/editor/icons/2x/icon_link_button.png b/editor/icons/2x/icon_link_button.png
similarity index 100%
rename from tools/editor/icons/2x/icon_link_button.png
rename to editor/icons/2x/icon_link_button.png
diff --git a/tools/editor/icons/2x/icon_list_select.png b/editor/icons/2x/icon_list_select.png
similarity index 100%
rename from tools/editor/icons/2x/icon_list_select.png
rename to editor/icons/2x/icon_list_select.png
diff --git a/tools/editor/icons/2x/icon_listener.png b/editor/icons/2x/icon_listener.png
similarity index 100%
rename from tools/editor/icons/2x/icon_listener.png
rename to editor/icons/2x/icon_listener.png
diff --git a/tools/editor/icons/2x/icon_load.png b/editor/icons/2x/icon_load.png
similarity index 100%
rename from tools/editor/icons/2x/icon_load.png
rename to editor/icons/2x/icon_load.png
diff --git a/tools/editor/icons/2x/icon_lock.png b/editor/icons/2x/icon_lock.png
similarity index 100%
rename from tools/editor/icons/2x/icon_lock.png
rename to editor/icons/2x/icon_lock.png
diff --git a/tools/editor/icons/2x/icon_loop.png b/editor/icons/2x/icon_loop.png
similarity index 100%
rename from tools/editor/icons/2x/icon_loop.png
rename to editor/icons/2x/icon_loop.png
diff --git a/tools/editor/icons/2x/icon_loop_interpolation.png b/editor/icons/2x/icon_loop_interpolation.png
similarity index 100%
rename from tools/editor/icons/2x/icon_loop_interpolation.png
rename to editor/icons/2x/icon_loop_interpolation.png
diff --git a/tools/editor/icons/2x/icon_main_play.png b/editor/icons/2x/icon_main_play.png
similarity index 100%
rename from tools/editor/icons/2x/icon_main_play.png
rename to editor/icons/2x/icon_main_play.png
diff --git a/tools/editor/icons/2x/icon_main_stop.png b/editor/icons/2x/icon_main_stop.png
similarity index 100%
rename from tools/editor/icons/2x/icon_main_stop.png
rename to editor/icons/2x/icon_main_stop.png
diff --git a/tools/editor/icons/2x/icon_margin_container.png b/editor/icons/2x/icon_margin_container.png
similarity index 100%
rename from tools/editor/icons/2x/icon_margin_container.png
rename to editor/icons/2x/icon_margin_container.png
diff --git a/tools/editor/icons/2x/icon_material_preview_cube.png b/editor/icons/2x/icon_material_preview_cube.png
similarity index 100%
rename from tools/editor/icons/2x/icon_material_preview_cube.png
rename to editor/icons/2x/icon_material_preview_cube.png
diff --git a/tools/editor/icons/2x/icon_material_preview_cube_off.png b/editor/icons/2x/icon_material_preview_cube_off.png
similarity index 100%
rename from tools/editor/icons/2x/icon_material_preview_cube_off.png
rename to editor/icons/2x/icon_material_preview_cube_off.png
diff --git a/tools/editor/icons/2x/icon_material_preview_light_1.png b/editor/icons/2x/icon_material_preview_light_1.png
similarity index 100%
rename from tools/editor/icons/2x/icon_material_preview_light_1.png
rename to editor/icons/2x/icon_material_preview_light_1.png
diff --git a/tools/editor/icons/2x/icon_material_preview_light_1_off.png b/editor/icons/2x/icon_material_preview_light_1_off.png
similarity index 100%
rename from tools/editor/icons/2x/icon_material_preview_light_1_off.png
rename to editor/icons/2x/icon_material_preview_light_1_off.png
diff --git a/tools/editor/icons/2x/icon_material_preview_light_2.png b/editor/icons/2x/icon_material_preview_light_2.png
similarity index 100%
rename from tools/editor/icons/2x/icon_material_preview_light_2.png
rename to editor/icons/2x/icon_material_preview_light_2.png
diff --git a/tools/editor/icons/2x/icon_material_preview_light_2_off.png b/editor/icons/2x/icon_material_preview_light_2_off.png
similarity index 100%
rename from tools/editor/icons/2x/icon_material_preview_light_2_off.png
rename to editor/icons/2x/icon_material_preview_light_2_off.png
diff --git a/tools/editor/icons/2x/icon_material_preview_sphere.png b/editor/icons/2x/icon_material_preview_sphere.png
similarity index 100%
rename from tools/editor/icons/2x/icon_material_preview_sphere.png
rename to editor/icons/2x/icon_material_preview_sphere.png
diff --git a/tools/editor/icons/2x/icon_material_preview_sphere_off.png b/editor/icons/2x/icon_material_preview_sphere_off.png
similarity index 100%
rename from tools/editor/icons/2x/icon_material_preview_sphere_off.png
rename to editor/icons/2x/icon_material_preview_sphere_off.png
diff --git a/tools/editor/icons/2x/icon_material_shader.png b/editor/icons/2x/icon_material_shader.png
similarity index 100%
rename from tools/editor/icons/2x/icon_material_shader.png
rename to editor/icons/2x/icon_material_shader.png
diff --git a/tools/editor/icons/2x/icon_material_shader_graph.png b/editor/icons/2x/icon_material_shader_graph.png
similarity index 100%
rename from tools/editor/icons/2x/icon_material_shader_graph.png
rename to editor/icons/2x/icon_material_shader_graph.png
diff --git a/tools/editor/icons/2x/icon_matrix.png b/editor/icons/2x/icon_matrix.png
similarity index 100%
rename from tools/editor/icons/2x/icon_matrix.png
rename to editor/icons/2x/icon_matrix.png
diff --git a/tools/editor/icons/2x/icon_menu_button.png b/editor/icons/2x/icon_menu_button.png
similarity index 100%
rename from tools/editor/icons/2x/icon_menu_button.png
rename to editor/icons/2x/icon_menu_button.png
diff --git a/tools/editor/icons/2x/icon_mesh.png b/editor/icons/2x/icon_mesh.png
similarity index 100%
rename from tools/editor/icons/2x/icon_mesh.png
rename to editor/icons/2x/icon_mesh.png
diff --git a/tools/editor/icons/2x/icon_mesh_instance.png b/editor/icons/2x/icon_mesh_instance.png
similarity index 100%
rename from tools/editor/icons/2x/icon_mesh_instance.png
rename to editor/icons/2x/icon_mesh_instance.png
diff --git a/tools/editor/icons/2x/icon_mesh_library.png b/editor/icons/2x/icon_mesh_library.png
similarity index 100%
rename from tools/editor/icons/2x/icon_mesh_library.png
rename to editor/icons/2x/icon_mesh_library.png
diff --git a/tools/editor/icons/2x/icon_mini_aabb.png b/editor/icons/2x/icon_mini_aabb.png
similarity index 100%
rename from tools/editor/icons/2x/icon_mini_aabb.png
rename to editor/icons/2x/icon_mini_aabb.png
diff --git a/tools/editor/icons/2x/icon_mini_array.png b/editor/icons/2x/icon_mini_array.png
similarity index 100%
rename from tools/editor/icons/2x/icon_mini_array.png
rename to editor/icons/2x/icon_mini_array.png
diff --git a/tools/editor/icons/2x/icon_mini_boolean.png b/editor/icons/2x/icon_mini_boolean.png
similarity index 100%
rename from tools/editor/icons/2x/icon_mini_boolean.png
rename to editor/icons/2x/icon_mini_boolean.png
diff --git a/tools/editor/icons/2x/icon_mini_color.png b/editor/icons/2x/icon_mini_color.png
similarity index 100%
rename from tools/editor/icons/2x/icon_mini_color.png
rename to editor/icons/2x/icon_mini_color.png
diff --git a/tools/editor/icons/2x/icon_mini_color_array.png b/editor/icons/2x/icon_mini_color_array.png
similarity index 100%
rename from tools/editor/icons/2x/icon_mini_color_array.png
rename to editor/icons/2x/icon_mini_color_array.png
diff --git a/tools/editor/icons/2x/icon_mini_dictionary.png b/editor/icons/2x/icon_mini_dictionary.png
similarity index 100%
rename from tools/editor/icons/2x/icon_mini_dictionary.png
rename to editor/icons/2x/icon_mini_dictionary.png
diff --git a/tools/editor/icons/2x/icon_mini_float.png b/editor/icons/2x/icon_mini_float.png
similarity index 100%
rename from tools/editor/icons/2x/icon_mini_float.png
rename to editor/icons/2x/icon_mini_float.png
diff --git a/tools/editor/icons/2x/icon_mini_float_array.png b/editor/icons/2x/icon_mini_float_array.png
similarity index 100%
rename from tools/editor/icons/2x/icon_mini_float_array.png
rename to editor/icons/2x/icon_mini_float_array.png
diff --git a/tools/editor/icons/2x/icon_mini_image.png b/editor/icons/2x/icon_mini_image.png
similarity index 100%
rename from tools/editor/icons/2x/icon_mini_image.png
rename to editor/icons/2x/icon_mini_image.png
diff --git a/tools/editor/icons/2x/icon_mini_input.png b/editor/icons/2x/icon_mini_input.png
similarity index 100%
rename from tools/editor/icons/2x/icon_mini_input.png
rename to editor/icons/2x/icon_mini_input.png
diff --git a/tools/editor/icons/2x/icon_mini_int_array.png b/editor/icons/2x/icon_mini_int_array.png
similarity index 100%
rename from tools/editor/icons/2x/icon_mini_int_array.png
rename to editor/icons/2x/icon_mini_int_array.png
diff --git a/tools/editor/icons/2x/icon_mini_integer.png b/editor/icons/2x/icon_mini_integer.png
similarity index 100%
rename from tools/editor/icons/2x/icon_mini_integer.png
rename to editor/icons/2x/icon_mini_integer.png
diff --git a/tools/editor/icons/2x/icon_mini_matrix3.png b/editor/icons/2x/icon_mini_matrix3.png
similarity index 100%
rename from tools/editor/icons/2x/icon_mini_matrix3.png
rename to editor/icons/2x/icon_mini_matrix3.png
diff --git a/tools/editor/icons/2x/icon_mini_matrix32.png b/editor/icons/2x/icon_mini_matrix32.png
similarity index 100%
rename from tools/editor/icons/2x/icon_mini_matrix32.png
rename to editor/icons/2x/icon_mini_matrix32.png
diff --git a/tools/editor/icons/2x/icon_mini_object.png b/editor/icons/2x/icon_mini_object.png
similarity index 100%
rename from tools/editor/icons/2x/icon_mini_object.png
rename to editor/icons/2x/icon_mini_object.png
diff --git a/tools/editor/icons/2x/icon_mini_path.png b/editor/icons/2x/icon_mini_path.png
similarity index 100%
rename from tools/editor/icons/2x/icon_mini_path.png
rename to editor/icons/2x/icon_mini_path.png
diff --git a/tools/editor/icons/2x/icon_mini_plane.png b/editor/icons/2x/icon_mini_plane.png
similarity index 100%
rename from tools/editor/icons/2x/icon_mini_plane.png
rename to editor/icons/2x/icon_mini_plane.png
diff --git a/tools/editor/icons/2x/icon_mini_quat.png b/editor/icons/2x/icon_mini_quat.png
similarity index 100%
rename from tools/editor/icons/2x/icon_mini_quat.png
rename to editor/icons/2x/icon_mini_quat.png
diff --git a/tools/editor/icons/2x/icon_mini_raw_array.png b/editor/icons/2x/icon_mini_raw_array.png
similarity index 100%
rename from tools/editor/icons/2x/icon_mini_raw_array.png
rename to editor/icons/2x/icon_mini_raw_array.png
diff --git a/tools/editor/icons/2x/icon_mini_rect2.png b/editor/icons/2x/icon_mini_rect2.png
similarity index 100%
rename from tools/editor/icons/2x/icon_mini_rect2.png
rename to editor/icons/2x/icon_mini_rect2.png
diff --git a/tools/editor/icons/2x/icon_mini_rid.png b/editor/icons/2x/icon_mini_rid.png
similarity index 100%
rename from tools/editor/icons/2x/icon_mini_rid.png
rename to editor/icons/2x/icon_mini_rid.png
diff --git a/tools/editor/icons/2x/icon_mini_string.png b/editor/icons/2x/icon_mini_string.png
similarity index 100%
rename from tools/editor/icons/2x/icon_mini_string.png
rename to editor/icons/2x/icon_mini_string.png
diff --git a/tools/editor/icons/2x/icon_mini_string_array.png b/editor/icons/2x/icon_mini_string_array.png
similarity index 100%
rename from tools/editor/icons/2x/icon_mini_string_array.png
rename to editor/icons/2x/icon_mini_string_array.png
diff --git a/tools/editor/icons/2x/icon_mini_transform.png b/editor/icons/2x/icon_mini_transform.png
similarity index 100%
rename from tools/editor/icons/2x/icon_mini_transform.png
rename to editor/icons/2x/icon_mini_transform.png
diff --git a/tools/editor/icons/2x/icon_mini_variant.png b/editor/icons/2x/icon_mini_variant.png
similarity index 100%
rename from tools/editor/icons/2x/icon_mini_variant.png
rename to editor/icons/2x/icon_mini_variant.png
diff --git a/tools/editor/icons/2x/icon_mini_vector2.png b/editor/icons/2x/icon_mini_vector2.png
similarity index 100%
rename from tools/editor/icons/2x/icon_mini_vector2.png
rename to editor/icons/2x/icon_mini_vector2.png
diff --git a/tools/editor/icons/2x/icon_mini_vector2_array.png b/editor/icons/2x/icon_mini_vector2_array.png
similarity index 100%
rename from tools/editor/icons/2x/icon_mini_vector2_array.png
rename to editor/icons/2x/icon_mini_vector2_array.png
diff --git a/tools/editor/icons/2x/icon_mini_vector3.png b/editor/icons/2x/icon_mini_vector3.png
similarity index 100%
rename from tools/editor/icons/2x/icon_mini_vector3.png
rename to editor/icons/2x/icon_mini_vector3.png
diff --git a/tools/editor/icons/2x/icon_mini_vector3_array.png b/editor/icons/2x/icon_mini_vector3_array.png
similarity index 100%
rename from tools/editor/icons/2x/icon_mini_vector3_array.png
rename to editor/icons/2x/icon_mini_vector3_array.png
diff --git a/tools/editor/icons/2x/icon_mirror_x.png b/editor/icons/2x/icon_mirror_x.png
similarity index 100%
rename from tools/editor/icons/2x/icon_mirror_x.png
rename to editor/icons/2x/icon_mirror_x.png
diff --git a/tools/editor/icons/2x/icon_mirror_y.png b/editor/icons/2x/icon_mirror_y.png
similarity index 100%
rename from tools/editor/icons/2x/icon_mirror_y.png
rename to editor/icons/2x/icon_mirror_y.png
diff --git a/tools/editor/icons/2x/icon_mouse.png b/editor/icons/2x/icon_mouse.png
similarity index 100%
rename from tools/editor/icons/2x/icon_mouse.png
rename to editor/icons/2x/icon_mouse.png
diff --git a/tools/editor/icons/2x/icon_move_down.png b/editor/icons/2x/icon_move_down.png
similarity index 100%
rename from tools/editor/icons/2x/icon_move_down.png
rename to editor/icons/2x/icon_move_down.png
diff --git a/tools/editor/icons/2x/icon_move_point.png b/editor/icons/2x/icon_move_point.png
similarity index 100%
rename from tools/editor/icons/2x/icon_move_point.png
rename to editor/icons/2x/icon_move_point.png
diff --git a/tools/editor/icons/2x/icon_move_up.png b/editor/icons/2x/icon_move_up.png
similarity index 100%
rename from tools/editor/icons/2x/icon_move_up.png
rename to editor/icons/2x/icon_move_up.png
diff --git a/tools/editor/icons/2x/icon_multi_edit.png b/editor/icons/2x/icon_multi_edit.png
similarity index 100%
rename from tools/editor/icons/2x/icon_multi_edit.png
rename to editor/icons/2x/icon_multi_edit.png
diff --git a/tools/editor/icons/2x/icon_multi_line.png b/editor/icons/2x/icon_multi_line.png
similarity index 100%
rename from tools/editor/icons/2x/icon_multi_line.png
rename to editor/icons/2x/icon_multi_line.png
diff --git a/tools/editor/icons/2x/icon_multi_mesh.png b/editor/icons/2x/icon_multi_mesh.png
similarity index 100%
rename from tools/editor/icons/2x/icon_multi_mesh.png
rename to editor/icons/2x/icon_multi_mesh.png
diff --git a/tools/editor/icons/2x/icon_multi_mesh_instance.png b/editor/icons/2x/icon_multi_mesh_instance.png
similarity index 100%
rename from tools/editor/icons/2x/icon_multi_mesh_instance.png
rename to editor/icons/2x/icon_multi_mesh_instance.png
diff --git a/tools/editor/icons/2x/icon_multi_node_edit.png b/editor/icons/2x/icon_multi_node_edit.png
similarity index 100%
rename from tools/editor/icons/2x/icon_multi_node_edit.png
rename to editor/icons/2x/icon_multi_node_edit.png
diff --git a/tools/editor/icons/2x/icon_navigation.png b/editor/icons/2x/icon_navigation.png
similarity index 100%
rename from tools/editor/icons/2x/icon_navigation.png
rename to editor/icons/2x/icon_navigation.png
diff --git a/tools/editor/icons/2x/icon_navigation_2d.png b/editor/icons/2x/icon_navigation_2d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_navigation_2d.png
rename to editor/icons/2x/icon_navigation_2d.png
diff --git a/tools/editor/icons/2x/icon_navigation_mesh.png b/editor/icons/2x/icon_navigation_mesh.png
similarity index 100%
rename from tools/editor/icons/2x/icon_navigation_mesh.png
rename to editor/icons/2x/icon_navigation_mesh.png
diff --git a/tools/editor/icons/2x/icon_navigation_mesh_instance.png b/editor/icons/2x/icon_navigation_mesh_instance.png
similarity index 100%
rename from tools/editor/icons/2x/icon_navigation_mesh_instance.png
rename to editor/icons/2x/icon_navigation_mesh_instance.png
diff --git a/tools/editor/icons/2x/icon_navigation_polygon.png b/editor/icons/2x/icon_navigation_polygon.png
similarity index 100%
rename from tools/editor/icons/2x/icon_navigation_polygon.png
rename to editor/icons/2x/icon_navigation_polygon.png
diff --git a/tools/editor/icons/2x/icon_navigation_polygon_instance.png b/editor/icons/2x/icon_navigation_polygon_instance.png
similarity index 100%
rename from tools/editor/icons/2x/icon_navigation_polygon_instance.png
rename to editor/icons/2x/icon_navigation_polygon_instance.png
diff --git a/tools/editor/icons/2x/icon_new.png b/editor/icons/2x/icon_new.png
similarity index 100%
rename from tools/editor/icons/2x/icon_new.png
rename to editor/icons/2x/icon_new.png
diff --git a/tools/editor/icons/2x/icon_nine_patch_rect.png b/editor/icons/2x/icon_nine_patch_rect.png
similarity index 100%
rename from tools/editor/icons/2x/icon_nine_patch_rect.png
rename to editor/icons/2x/icon_nine_patch_rect.png
diff --git a/tools/editor/icons/2x/icon_node.png b/editor/icons/2x/icon_node.png
similarity index 100%
rename from tools/editor/icons/2x/icon_node.png
rename to editor/icons/2x/icon_node.png
diff --git a/tools/editor/icons/2x/icon_node_2d.png b/editor/icons/2x/icon_node_2d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_node_2d.png
rename to editor/icons/2x/icon_node_2d.png
diff --git a/tools/editor/icons/2x/icon_node_warning.png b/editor/icons/2x/icon_node_warning.png
similarity index 100%
rename from tools/editor/icons/2x/icon_node_warning.png
rename to editor/icons/2x/icon_node_warning.png
diff --git a/tools/editor/icons/2x/icon_non_favorite.png b/editor/icons/2x/icon_non_favorite.png
similarity index 100%
rename from tools/editor/icons/2x/icon_non_favorite.png
rename to editor/icons/2x/icon_non_favorite.png
diff --git a/tools/editor/icons/2x/icon_object.png b/editor/icons/2x/icon_object.png
similarity index 100%
rename from tools/editor/icons/2x/icon_object.png
rename to editor/icons/2x/icon_object.png
diff --git a/tools/editor/icons/2x/icon_occluder_polygon_2d.png b/editor/icons/2x/icon_occluder_polygon_2d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_occluder_polygon_2d.png
rename to editor/icons/2x/icon_occluder_polygon_2d.png
diff --git a/tools/editor/icons/2x/icon_omni_light.png b/editor/icons/2x/icon_omni_light.png
similarity index 100%
rename from tools/editor/icons/2x/icon_omni_light.png
rename to editor/icons/2x/icon_omni_light.png
diff --git a/tools/editor/icons/2x/icon_open.png b/editor/icons/2x/icon_open.png
similarity index 100%
rename from tools/editor/icons/2x/icon_open.png
rename to editor/icons/2x/icon_open.png
diff --git a/tools/editor/icons/2x/icon_option_button.png b/editor/icons/2x/icon_option_button.png
similarity index 100%
rename from tools/editor/icons/2x/icon_option_button.png
rename to editor/icons/2x/icon_option_button.png
diff --git a/tools/editor/icons/2x/icon_override.png b/editor/icons/2x/icon_override.png
similarity index 100%
rename from tools/editor/icons/2x/icon_override.png
rename to editor/icons/2x/icon_override.png
diff --git a/tools/editor/icons/2x/icon_p_hash_translation.png b/editor/icons/2x/icon_p_hash_translation.png
similarity index 100%
rename from tools/editor/icons/2x/icon_p_hash_translation.png
rename to editor/icons/2x/icon_p_hash_translation.png
diff --git a/tools/editor/icons/2x/icon_packed_data_container.png b/editor/icons/2x/icon_packed_data_container.png
similarity index 100%
rename from tools/editor/icons/2x/icon_packed_data_container.png
rename to editor/icons/2x/icon_packed_data_container.png
diff --git a/tools/editor/icons/2x/icon_packed_scene.png b/editor/icons/2x/icon_packed_scene.png
similarity index 100%
rename from tools/editor/icons/2x/icon_packed_scene.png
rename to editor/icons/2x/icon_packed_scene.png
diff --git a/tools/editor/icons/2x/icon_panel.png b/editor/icons/2x/icon_panel.png
similarity index 100%
rename from tools/editor/icons/2x/icon_panel.png
rename to editor/icons/2x/icon_panel.png
diff --git a/tools/editor/icons/2x/icon_panel_container.png b/editor/icons/2x/icon_panel_container.png
similarity index 100%
rename from tools/editor/icons/2x/icon_panel_container.png
rename to editor/icons/2x/icon_panel_container.png
diff --git a/tools/editor/icons/2x/icon_panels_1.png b/editor/icons/2x/icon_panels_1.png
similarity index 100%
rename from tools/editor/icons/2x/icon_panels_1.png
rename to editor/icons/2x/icon_panels_1.png
diff --git a/tools/editor/icons/2x/icon_panels_2.png b/editor/icons/2x/icon_panels_2.png
similarity index 100%
rename from tools/editor/icons/2x/icon_panels_2.png
rename to editor/icons/2x/icon_panels_2.png
diff --git a/tools/editor/icons/2x/icon_panels_2_alt.png b/editor/icons/2x/icon_panels_2_alt.png
similarity index 100%
rename from tools/editor/icons/2x/icon_panels_2_alt.png
rename to editor/icons/2x/icon_panels_2_alt.png
diff --git a/tools/editor/icons/2x/icon_panels_3.png b/editor/icons/2x/icon_panels_3.png
similarity index 100%
rename from tools/editor/icons/2x/icon_panels_3.png
rename to editor/icons/2x/icon_panels_3.png
diff --git a/tools/editor/icons/2x/icon_panels_3_alt.png b/editor/icons/2x/icon_panels_3_alt.png
similarity index 100%
rename from tools/editor/icons/2x/icon_panels_3_alt.png
rename to editor/icons/2x/icon_panels_3_alt.png
diff --git a/tools/editor/icons/2x/icon_panels_4.png b/editor/icons/2x/icon_panels_4.png
similarity index 100%
rename from tools/editor/icons/2x/icon_panels_4.png
rename to editor/icons/2x/icon_panels_4.png
diff --git a/tools/editor/icons/2x/icon_parallax_background.png b/editor/icons/2x/icon_parallax_background.png
similarity index 100%
rename from tools/editor/icons/2x/icon_parallax_background.png
rename to editor/icons/2x/icon_parallax_background.png
diff --git a/tools/editor/icons/2x/icon_parallax_layer.png b/editor/icons/2x/icon_parallax_layer.png
similarity index 100%
rename from tools/editor/icons/2x/icon_parallax_layer.png
rename to editor/icons/2x/icon_parallax_layer.png
diff --git a/tools/editor/icons/2x/icon_particle_attractor_2d.png b/editor/icons/2x/icon_particle_attractor_2d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_particle_attractor_2d.png
rename to editor/icons/2x/icon_particle_attractor_2d.png
diff --git a/tools/editor/icons/2x/icon_particles.png b/editor/icons/2x/icon_particles.png
similarity index 100%
rename from tools/editor/icons/2x/icon_particles.png
rename to editor/icons/2x/icon_particles.png
diff --git a/tools/editor/icons/2x/icon_particles_2d.png b/editor/icons/2x/icon_particles_2d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_particles_2d.png
rename to editor/icons/2x/icon_particles_2d.png
diff --git a/tools/editor/icons/2x/icon_particles_shader.png b/editor/icons/2x/icon_particles_shader.png
similarity index 100%
rename from tools/editor/icons/2x/icon_particles_shader.png
rename to editor/icons/2x/icon_particles_shader.png
diff --git a/tools/editor/icons/2x/icon_patch_9_rect.png b/editor/icons/2x/icon_patch_9_rect.png
similarity index 100%
rename from tools/editor/icons/2x/icon_patch_9_rect.png
rename to editor/icons/2x/icon_patch_9_rect.png
diff --git a/tools/editor/icons/2x/icon_path.png b/editor/icons/2x/icon_path.png
similarity index 100%
rename from tools/editor/icons/2x/icon_path.png
rename to editor/icons/2x/icon_path.png
diff --git a/tools/editor/icons/2x/icon_path_2d.png b/editor/icons/2x/icon_path_2d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_path_2d.png
rename to editor/icons/2x/icon_path_2d.png
diff --git a/tools/editor/icons/2x/icon_path_follow.png b/editor/icons/2x/icon_path_follow.png
similarity index 100%
rename from tools/editor/icons/2x/icon_path_follow.png
rename to editor/icons/2x/icon_path_follow.png
diff --git a/tools/editor/icons/2x/icon_path_follow_2d.png b/editor/icons/2x/icon_path_follow_2d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_path_follow_2d.png
rename to editor/icons/2x/icon_path_follow_2d.png
diff --git a/tools/editor/icons/2x/icon_pause.png b/editor/icons/2x/icon_pause.png
similarity index 100%
rename from tools/editor/icons/2x/icon_pause.png
rename to editor/icons/2x/icon_pause.png
diff --git a/tools/editor/icons/2x/icon_pin.png b/editor/icons/2x/icon_pin.png
similarity index 100%
rename from tools/editor/icons/2x/icon_pin.png
rename to editor/icons/2x/icon_pin.png
diff --git a/tools/editor/icons/2x/icon_pin_joint.png b/editor/icons/2x/icon_pin_joint.png
similarity index 100%
rename from tools/editor/icons/2x/icon_pin_joint.png
rename to editor/icons/2x/icon_pin_joint.png
diff --git a/tools/editor/icons/2x/icon_pin_joint_2d.png b/editor/icons/2x/icon_pin_joint_2d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_pin_joint_2d.png
rename to editor/icons/2x/icon_pin_joint_2d.png
diff --git a/tools/editor/icons/2x/icon_pin_pressed.png b/editor/icons/2x/icon_pin_pressed.png
similarity index 100%
rename from tools/editor/icons/2x/icon_pin_pressed.png
rename to editor/icons/2x/icon_pin_pressed.png
diff --git a/tools/editor/icons/2x/icon_plane.png b/editor/icons/2x/icon_plane.png
similarity index 100%
rename from tools/editor/icons/2x/icon_plane.png
rename to editor/icons/2x/icon_plane.png
diff --git a/tools/editor/icons/2x/icon_plane_shape.png b/editor/icons/2x/icon_plane_shape.png
similarity index 100%
rename from tools/editor/icons/2x/icon_plane_shape.png
rename to editor/icons/2x/icon_plane_shape.png
diff --git a/tools/editor/icons/2x/icon_play.png b/editor/icons/2x/icon_play.png
similarity index 100%
rename from tools/editor/icons/2x/icon_play.png
rename to editor/icons/2x/icon_play.png
diff --git a/tools/editor/icons/2x/icon_play_backwards.png b/editor/icons/2x/icon_play_backwards.png
similarity index 100%
rename from tools/editor/icons/2x/icon_play_backwards.png
rename to editor/icons/2x/icon_play_backwards.png
diff --git a/tools/editor/icons/2x/icon_play_custom.png b/editor/icons/2x/icon_play_custom.png
similarity index 100%
rename from tools/editor/icons/2x/icon_play_custom.png
rename to editor/icons/2x/icon_play_custom.png
diff --git a/tools/editor/icons/2x/icon_play_scene.png b/editor/icons/2x/icon_play_scene.png
similarity index 100%
rename from tools/editor/icons/2x/icon_play_scene.png
rename to editor/icons/2x/icon_play_scene.png
diff --git a/tools/editor/icons/2x/icon_play_start.png b/editor/icons/2x/icon_play_start.png
similarity index 100%
rename from tools/editor/icons/2x/icon_play_start.png
rename to editor/icons/2x/icon_play_start.png
diff --git a/tools/editor/icons/2x/icon_play_start_backwards.png b/editor/icons/2x/icon_play_start_backwards.png
similarity index 100%
rename from tools/editor/icons/2x/icon_play_start_backwards.png
rename to editor/icons/2x/icon_play_start_backwards.png
diff --git a/tools/editor/icons/2x/icon_polygon_2d.png b/editor/icons/2x/icon_polygon_2d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_polygon_2d.png
rename to editor/icons/2x/icon_polygon_2d.png
diff --git a/tools/editor/icons/2x/icon_polygon_path_finder.png b/editor/icons/2x/icon_polygon_path_finder.png
similarity index 100%
rename from tools/editor/icons/2x/icon_polygon_path_finder.png
rename to editor/icons/2x/icon_polygon_path_finder.png
diff --git a/tools/editor/icons/2x/icon_popup.png b/editor/icons/2x/icon_popup.png
similarity index 100%
rename from tools/editor/icons/2x/icon_popup.png
rename to editor/icons/2x/icon_popup.png
diff --git a/tools/editor/icons/2x/icon_popup_dialog.png b/editor/icons/2x/icon_popup_dialog.png
similarity index 100%
rename from tools/editor/icons/2x/icon_popup_dialog.png
rename to editor/icons/2x/icon_popup_dialog.png
diff --git a/tools/editor/icons/2x/icon_popup_menu.png b/editor/icons/2x/icon_popup_menu.png
similarity index 100%
rename from tools/editor/icons/2x/icon_popup_menu.png
rename to editor/icons/2x/icon_popup_menu.png
diff --git a/tools/editor/icons/2x/icon_popup_panel.png b/editor/icons/2x/icon_popup_panel.png
similarity index 100%
rename from tools/editor/icons/2x/icon_popup_panel.png
rename to editor/icons/2x/icon_popup_panel.png
diff --git a/tools/editor/icons/2x/icon_portal.png b/editor/icons/2x/icon_portal.png
similarity index 100%
rename from tools/editor/icons/2x/icon_portal.png
rename to editor/icons/2x/icon_portal.png
diff --git a/tools/editor/icons/2x/icon_position_2d.png b/editor/icons/2x/icon_position_2d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_position_2d.png
rename to editor/icons/2x/icon_position_2d.png
diff --git a/tools/editor/icons/2x/icon_position_3d.png b/editor/icons/2x/icon_position_3d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_position_3d.png
rename to editor/icons/2x/icon_position_3d.png
diff --git a/tools/editor/icons/2x/icon_progress_1.png b/editor/icons/2x/icon_progress_1.png
similarity index 100%
rename from tools/editor/icons/2x/icon_progress_1.png
rename to editor/icons/2x/icon_progress_1.png
diff --git a/tools/editor/icons/2x/icon_progress_2.png b/editor/icons/2x/icon_progress_2.png
similarity index 100%
rename from tools/editor/icons/2x/icon_progress_2.png
rename to editor/icons/2x/icon_progress_2.png
diff --git a/tools/editor/icons/2x/icon_progress_3.png b/editor/icons/2x/icon_progress_3.png
similarity index 100%
rename from tools/editor/icons/2x/icon_progress_3.png
rename to editor/icons/2x/icon_progress_3.png
diff --git a/tools/editor/icons/2x/icon_progress_4.png b/editor/icons/2x/icon_progress_4.png
similarity index 100%
rename from tools/editor/icons/2x/icon_progress_4.png
rename to editor/icons/2x/icon_progress_4.png
diff --git a/tools/editor/icons/2x/icon_progress_5.png b/editor/icons/2x/icon_progress_5.png
similarity index 100%
rename from tools/editor/icons/2x/icon_progress_5.png
rename to editor/icons/2x/icon_progress_5.png
diff --git a/tools/editor/icons/2x/icon_progress_6.png b/editor/icons/2x/icon_progress_6.png
similarity index 100%
rename from tools/editor/icons/2x/icon_progress_6.png
rename to editor/icons/2x/icon_progress_6.png
diff --git a/tools/editor/icons/2x/icon_progress_7.png b/editor/icons/2x/icon_progress_7.png
similarity index 100%
rename from tools/editor/icons/2x/icon_progress_7.png
rename to editor/icons/2x/icon_progress_7.png
diff --git a/tools/editor/icons/2x/icon_progress_8.png b/editor/icons/2x/icon_progress_8.png
similarity index 100%
rename from tools/editor/icons/2x/icon_progress_8.png
rename to editor/icons/2x/icon_progress_8.png
diff --git a/tools/editor/icons/2x/icon_progress_bar.png b/editor/icons/2x/icon_progress_bar.png
similarity index 100%
rename from tools/editor/icons/2x/icon_progress_bar.png
rename to editor/icons/2x/icon_progress_bar.png
diff --git a/tools/editor/icons/2x/icon_proximity_group.png b/editor/icons/2x/icon_proximity_group.png
similarity index 100%
rename from tools/editor/icons/2x/icon_proximity_group.png
rename to editor/icons/2x/icon_proximity_group.png
diff --git a/tools/editor/icons/2x/icon_quad.png b/editor/icons/2x/icon_quad.png
similarity index 100%
rename from tools/editor/icons/2x/icon_quad.png
rename to editor/icons/2x/icon_quad.png
diff --git a/tools/editor/icons/2x/icon_quat.png b/editor/icons/2x/icon_quat.png
similarity index 100%
rename from tools/editor/icons/2x/icon_quat.png
rename to editor/icons/2x/icon_quat.png
diff --git a/tools/editor/icons/2x/icon_range.png b/editor/icons/2x/icon_range.png
similarity index 100%
rename from tools/editor/icons/2x/icon_range.png
rename to editor/icons/2x/icon_range.png
diff --git a/tools/editor/icons/2x/icon_rating_no_star.png b/editor/icons/2x/icon_rating_no_star.png
similarity index 100%
rename from tools/editor/icons/2x/icon_rating_no_star.png
rename to editor/icons/2x/icon_rating_no_star.png
diff --git a/tools/editor/icons/2x/icon_rating_star.png b/editor/icons/2x/icon_rating_star.png
similarity index 100%
rename from tools/editor/icons/2x/icon_rating_star.png
rename to editor/icons/2x/icon_rating_star.png
diff --git a/tools/editor/icons/2x/icon_ray_cast.png b/editor/icons/2x/icon_ray_cast.png
similarity index 100%
rename from tools/editor/icons/2x/icon_ray_cast.png
rename to editor/icons/2x/icon_ray_cast.png
diff --git a/tools/editor/icons/2x/icon_ray_cast_2d.png b/editor/icons/2x/icon_ray_cast_2d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_ray_cast_2d.png
rename to editor/icons/2x/icon_ray_cast_2d.png
diff --git a/tools/editor/icons/2x/icon_ray_shape.png b/editor/icons/2x/icon_ray_shape.png
similarity index 100%
rename from tools/editor/icons/2x/icon_ray_shape.png
rename to editor/icons/2x/icon_ray_shape.png
diff --git a/tools/editor/icons/2x/icon_ray_shape_2d.png b/editor/icons/2x/icon_ray_shape_2d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_ray_shape_2d.png
rename to editor/icons/2x/icon_ray_shape_2d.png
diff --git a/tools/editor/icons/2x/icon_rayito.png b/editor/icons/2x/icon_rayito.png
similarity index 100%
rename from tools/editor/icons/2x/icon_rayito.png
rename to editor/icons/2x/icon_rayito.png
diff --git a/tools/editor/icons/2x/icon_real.png b/editor/icons/2x/icon_real.png
similarity index 100%
rename from tools/editor/icons/2x/icon_real.png
rename to editor/icons/2x/icon_real.png
diff --git a/tools/editor/icons/2x/icon_rectangle_shape_2d.png b/editor/icons/2x/icon_rectangle_shape_2d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_rectangle_shape_2d.png
rename to editor/icons/2x/icon_rectangle_shape_2d.png
diff --git a/tools/editor/icons/2x/icon_reference_rect.png b/editor/icons/2x/icon_reference_rect.png
similarity index 100%
rename from tools/editor/icons/2x/icon_reference_rect.png
rename to editor/icons/2x/icon_reference_rect.png
diff --git a/tools/editor/icons/2x/icon_reflection_probe.png b/editor/icons/2x/icon_reflection_probe.png
similarity index 100%
rename from tools/editor/icons/2x/icon_reflection_probe.png
rename to editor/icons/2x/icon_reflection_probe.png
diff --git a/tools/editor/icons/2x/icon_region_edit.png b/editor/icons/2x/icon_region_edit.png
similarity index 100%
rename from tools/editor/icons/2x/icon_region_edit.png
rename to editor/icons/2x/icon_region_edit.png
diff --git a/tools/editor/icons/2x/icon_reload.png b/editor/icons/2x/icon_reload.png
similarity index 100%
rename from tools/editor/icons/2x/icon_reload.png
rename to editor/icons/2x/icon_reload.png
diff --git a/tools/editor/icons/2x/icon_reload_small.png b/editor/icons/2x/icon_reload_small.png
similarity index 100%
rename from tools/editor/icons/2x/icon_reload_small.png
rename to editor/icons/2x/icon_reload_small.png
diff --git a/tools/editor/icons/2x/icon_remote.png b/editor/icons/2x/icon_remote.png
similarity index 100%
rename from tools/editor/icons/2x/icon_remote.png
rename to editor/icons/2x/icon_remote.png
diff --git a/tools/editor/icons/2x/icon_remote_transform.png b/editor/icons/2x/icon_remote_transform.png
similarity index 100%
rename from tools/editor/icons/2x/icon_remote_transform.png
rename to editor/icons/2x/icon_remote_transform.png
diff --git a/tools/editor/icons/2x/icon_remote_transform_2d.png b/editor/icons/2x/icon_remote_transform_2d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_remote_transform_2d.png
rename to editor/icons/2x/icon_remote_transform_2d.png
diff --git a/tools/editor/icons/2x/icon_remove.png b/editor/icons/2x/icon_remove.png
similarity index 100%
rename from tools/editor/icons/2x/icon_remove.png
rename to editor/icons/2x/icon_remove.png
diff --git a/tools/editor/icons/2x/icon_rename.png b/editor/icons/2x/icon_rename.png
similarity index 100%
rename from tools/editor/icons/2x/icon_rename.png
rename to editor/icons/2x/icon_rename.png
diff --git a/tools/editor/icons/2x/icon_reparent.png b/editor/icons/2x/icon_reparent.png
similarity index 100%
rename from tools/editor/icons/2x/icon_reparent.png
rename to editor/icons/2x/icon_reparent.png
diff --git a/tools/editor/icons/2x/icon_resource_preloader.png b/editor/icons/2x/icon_resource_preloader.png
similarity index 100%
rename from tools/editor/icons/2x/icon_resource_preloader.png
rename to editor/icons/2x/icon_resource_preloader.png
diff --git a/tools/editor/icons/2x/icon_rich_text_label.png b/editor/icons/2x/icon_rich_text_label.png
similarity index 100%
rename from tools/editor/icons/2x/icon_rich_text_label.png
rename to editor/icons/2x/icon_rich_text_label.png
diff --git a/tools/editor/icons/2x/icon_rigid_body.png b/editor/icons/2x/icon_rigid_body.png
similarity index 100%
rename from tools/editor/icons/2x/icon_rigid_body.png
rename to editor/icons/2x/icon_rigid_body.png
diff --git a/tools/editor/icons/2x/icon_rigid_body_2d.png b/editor/icons/2x/icon_rigid_body_2d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_rigid_body_2d.png
rename to editor/icons/2x/icon_rigid_body_2d.png
diff --git a/tools/editor/icons/2x/icon_room.png b/editor/icons/2x/icon_room.png
similarity index 100%
rename from tools/editor/icons/2x/icon_room.png
rename to editor/icons/2x/icon_room.png
diff --git a/tools/editor/icons/2x/icon_room_bounds.png b/editor/icons/2x/icon_room_bounds.png
similarity index 100%
rename from tools/editor/icons/2x/icon_room_bounds.png
rename to editor/icons/2x/icon_room_bounds.png
diff --git a/tools/editor/icons/2x/icon_rotate_0.png b/editor/icons/2x/icon_rotate_0.png
similarity index 100%
rename from tools/editor/icons/2x/icon_rotate_0.png
rename to editor/icons/2x/icon_rotate_0.png
diff --git a/tools/editor/icons/2x/icon_rotate_180.png b/editor/icons/2x/icon_rotate_180.png
similarity index 100%
rename from tools/editor/icons/2x/icon_rotate_180.png
rename to editor/icons/2x/icon_rotate_180.png
diff --git a/tools/editor/icons/2x/icon_rotate_270.png b/editor/icons/2x/icon_rotate_270.png
similarity index 100%
rename from tools/editor/icons/2x/icon_rotate_270.png
rename to editor/icons/2x/icon_rotate_270.png
diff --git a/tools/editor/icons/2x/icon_rotate_90.png b/editor/icons/2x/icon_rotate_90.png
similarity index 100%
rename from tools/editor/icons/2x/icon_rotate_90.png
rename to editor/icons/2x/icon_rotate_90.png
diff --git a/tools/editor/icons/2x/icon_sample.png b/editor/icons/2x/icon_sample.png
similarity index 100%
rename from tools/editor/icons/2x/icon_sample.png
rename to editor/icons/2x/icon_sample.png
diff --git a/tools/editor/icons/2x/icon_sample_library.png b/editor/icons/2x/icon_sample_library.png
similarity index 100%
rename from tools/editor/icons/2x/icon_sample_library.png
rename to editor/icons/2x/icon_sample_library.png
diff --git a/tools/editor/icons/2x/icon_sample_player.png b/editor/icons/2x/icon_sample_player.png
similarity index 100%
rename from tools/editor/icons/2x/icon_sample_player.png
rename to editor/icons/2x/icon_sample_player.png
diff --git a/tools/editor/icons/2x/icon_sample_player_2d.png b/editor/icons/2x/icon_sample_player_2d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_sample_player_2d.png
rename to editor/icons/2x/icon_sample_player_2d.png
diff --git a/tools/editor/icons/2x/icon_save.png b/editor/icons/2x/icon_save.png
similarity index 100%
rename from tools/editor/icons/2x/icon_save.png
rename to editor/icons/2x/icon_save.png
diff --git a/tools/editor/icons/2x/icon_script.png b/editor/icons/2x/icon_script.png
similarity index 100%
rename from tools/editor/icons/2x/icon_script.png
rename to editor/icons/2x/icon_script.png
diff --git a/tools/editor/icons/2x/icon_script_create.png b/editor/icons/2x/icon_script_create.png
similarity index 100%
rename from tools/editor/icons/2x/icon_script_create.png
rename to editor/icons/2x/icon_script_create.png
diff --git a/tools/editor/icons/2x/icon_script_remove.png b/editor/icons/2x/icon_script_remove.png
similarity index 100%
rename from tools/editor/icons/2x/icon_script_remove.png
rename to editor/icons/2x/icon_script_remove.png
diff --git a/tools/editor/icons/2x/icon_scroll_bar.png b/editor/icons/2x/icon_scroll_bar.png
similarity index 100%
rename from tools/editor/icons/2x/icon_scroll_bar.png
rename to editor/icons/2x/icon_scroll_bar.png
diff --git a/tools/editor/icons/2x/icon_scroll_container.png b/editor/icons/2x/icon_scroll_container.png
similarity index 100%
rename from tools/editor/icons/2x/icon_scroll_container.png
rename to editor/icons/2x/icon_scroll_container.png
diff --git a/tools/editor/icons/2x/icon_segment_shape_2d.png b/editor/icons/2x/icon_segment_shape_2d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_segment_shape_2d.png
rename to editor/icons/2x/icon_segment_shape_2d.png
diff --git a/tools/editor/icons/2x/icon_shader.png b/editor/icons/2x/icon_shader.png
similarity index 100%
rename from tools/editor/icons/2x/icon_shader.png
rename to editor/icons/2x/icon_shader.png
diff --git a/tools/editor/icons/2x/icon_shader_material.png b/editor/icons/2x/icon_shader_material.png
similarity index 100%
rename from tools/editor/icons/2x/icon_shader_material.png
rename to editor/icons/2x/icon_shader_material.png
diff --git a/tools/editor/icons/2x/icon_short_cut.png b/editor/icons/2x/icon_short_cut.png
similarity index 100%
rename from tools/editor/icons/2x/icon_short_cut.png
rename to editor/icons/2x/icon_short_cut.png
diff --git a/tools/editor/icons/2x/icon_signal.png b/editor/icons/2x/icon_signal.png
similarity index 100%
rename from tools/editor/icons/2x/icon_signal.png
rename to editor/icons/2x/icon_signal.png
diff --git a/tools/editor/icons/2x/icon_skeleton.png b/editor/icons/2x/icon_skeleton.png
similarity index 100%
rename from tools/editor/icons/2x/icon_skeleton.png
rename to editor/icons/2x/icon_skeleton.png
diff --git a/tools/editor/icons/2x/icon_slider_joint.png b/editor/icons/2x/icon_slider_joint.png
similarity index 100%
rename from tools/editor/icons/2x/icon_slider_joint.png
rename to editor/icons/2x/icon_slider_joint.png
diff --git a/tools/editor/icons/2x/icon_slot.png b/editor/icons/2x/icon_slot.png
similarity index 100%
rename from tools/editor/icons/2x/icon_slot.png
rename to editor/icons/2x/icon_slot.png
diff --git a/tools/editor/icons/2x/icon_snap.png b/editor/icons/2x/icon_snap.png
similarity index 100%
rename from tools/editor/icons/2x/icon_snap.png
rename to editor/icons/2x/icon_snap.png
diff --git a/tools/editor/icons/2x/icon_sound_room_params.png b/editor/icons/2x/icon_sound_room_params.png
similarity index 100%
rename from tools/editor/icons/2x/icon_sound_room_params.png
rename to editor/icons/2x/icon_sound_room_params.png
diff --git a/tools/editor/icons/2x/icon_spatial.png b/editor/icons/2x/icon_spatial.png
similarity index 100%
rename from tools/editor/icons/2x/icon_spatial.png
rename to editor/icons/2x/icon_spatial.png
diff --git a/tools/editor/icons/2x/icon_spatial_sample_player.png b/editor/icons/2x/icon_spatial_sample_player.png
similarity index 100%
rename from tools/editor/icons/2x/icon_spatial_sample_player.png
rename to editor/icons/2x/icon_spatial_sample_player.png
diff --git a/tools/editor/icons/2x/icon_spatial_shader.png b/editor/icons/2x/icon_spatial_shader.png
similarity index 100%
rename from tools/editor/icons/2x/icon_spatial_shader.png
rename to editor/icons/2x/icon_spatial_shader.png
diff --git a/tools/editor/icons/2x/icon_spatial_stream_player.png b/editor/icons/2x/icon_spatial_stream_player.png
similarity index 100%
rename from tools/editor/icons/2x/icon_spatial_stream_player.png
rename to editor/icons/2x/icon_spatial_stream_player.png
diff --git a/tools/editor/icons/2x/icon_sphere_shape.png b/editor/icons/2x/icon_sphere_shape.png
similarity index 100%
rename from tools/editor/icons/2x/icon_sphere_shape.png
rename to editor/icons/2x/icon_sphere_shape.png
diff --git a/tools/editor/icons/2x/icon_spin_box.png b/editor/icons/2x/icon_spin_box.png
similarity index 100%
rename from tools/editor/icons/2x/icon_spin_box.png
rename to editor/icons/2x/icon_spin_box.png
diff --git a/tools/editor/icons/2x/icon_spot_light.png b/editor/icons/2x/icon_spot_light.png
similarity index 100%
rename from tools/editor/icons/2x/icon_spot_light.png
rename to editor/icons/2x/icon_spot_light.png
diff --git a/tools/editor/icons/2x/icon_sprite.png b/editor/icons/2x/icon_sprite.png
similarity index 100%
rename from tools/editor/icons/2x/icon_sprite.png
rename to editor/icons/2x/icon_sprite.png
diff --git a/tools/editor/icons/2x/icon_sprite_3d.png b/editor/icons/2x/icon_sprite_3d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_sprite_3d.png
rename to editor/icons/2x/icon_sprite_3d.png
diff --git a/tools/editor/icons/2x/icon_sprite_frames.png b/editor/icons/2x/icon_sprite_frames.png
similarity index 100%
rename from tools/editor/icons/2x/icon_sprite_frames.png
rename to editor/icons/2x/icon_sprite_frames.png
diff --git a/tools/editor/icons/2x/icon_static_body.png b/editor/icons/2x/icon_static_body.png
similarity index 100%
rename from tools/editor/icons/2x/icon_static_body.png
rename to editor/icons/2x/icon_static_body.png
diff --git a/tools/editor/icons/2x/icon_static_body_2d.png b/editor/icons/2x/icon_static_body_2d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_static_body_2d.png
rename to editor/icons/2x/icon_static_body_2d.png
diff --git a/tools/editor/icons/2x/icon_stream_player.png b/editor/icons/2x/icon_stream_player.png
similarity index 100%
rename from tools/editor/icons/2x/icon_stream_player.png
rename to editor/icons/2x/icon_stream_player.png
diff --git a/tools/editor/icons/2x/icon_string.png b/editor/icons/2x/icon_string.png
similarity index 100%
rename from tools/editor/icons/2x/icon_string.png
rename to editor/icons/2x/icon_string.png
diff --git a/tools/editor/icons/2x/icon_style_box_empty.png b/editor/icons/2x/icon_style_box_empty.png
similarity index 100%
rename from tools/editor/icons/2x/icon_style_box_empty.png
rename to editor/icons/2x/icon_style_box_empty.png
diff --git a/tools/editor/icons/2x/icon_style_box_flat.png b/editor/icons/2x/icon_style_box_flat.png
similarity index 100%
rename from tools/editor/icons/2x/icon_style_box_flat.png
rename to editor/icons/2x/icon_style_box_flat.png
diff --git a/tools/editor/icons/2x/icon_style_box_texture.png b/editor/icons/2x/icon_style_box_texture.png
similarity index 100%
rename from tools/editor/icons/2x/icon_style_box_texture.png
rename to editor/icons/2x/icon_style_box_texture.png
diff --git a/tools/editor/icons/2x/icon_tab_container.png b/editor/icons/2x/icon_tab_container.png
similarity index 100%
rename from tools/editor/icons/2x/icon_tab_container.png
rename to editor/icons/2x/icon_tab_container.png
diff --git a/tools/editor/icons/2x/icon_tabs.png b/editor/icons/2x/icon_tabs.png
similarity index 100%
rename from tools/editor/icons/2x/icon_tabs.png
rename to editor/icons/2x/icon_tabs.png
diff --git a/tools/editor/icons/2x/icon_test_cube.png b/editor/icons/2x/icon_test_cube.png
similarity index 100%
rename from tools/editor/icons/2x/icon_test_cube.png
rename to editor/icons/2x/icon_test_cube.png
diff --git a/tools/editor/icons/2x/icon_text_edit.png b/editor/icons/2x/icon_text_edit.png
similarity index 100%
rename from tools/editor/icons/2x/icon_text_edit.png
rename to editor/icons/2x/icon_text_edit.png
diff --git a/tools/editor/icons/2x/icon_texture.png b/editor/icons/2x/icon_texture.png
similarity index 100%
rename from tools/editor/icons/2x/icon_texture.png
rename to editor/icons/2x/icon_texture.png
diff --git a/tools/editor/icons/2x/icon_texture_button.png b/editor/icons/2x/icon_texture_button.png
similarity index 100%
rename from tools/editor/icons/2x/icon_texture_button.png
rename to editor/icons/2x/icon_texture_button.png
diff --git a/tools/editor/icons/2x/icon_texture_progress.png b/editor/icons/2x/icon_texture_progress.png
similarity index 100%
rename from tools/editor/icons/2x/icon_texture_progress.png
rename to editor/icons/2x/icon_texture_progress.png
diff --git a/tools/editor/icons/2x/icon_texture_rect.png b/editor/icons/2x/icon_texture_rect.png
similarity index 100%
rename from tools/editor/icons/2x/icon_texture_rect.png
rename to editor/icons/2x/icon_texture_rect.png
diff --git a/tools/editor/icons/2x/icon_theme.png b/editor/icons/2x/icon_theme.png
similarity index 100%
rename from tools/editor/icons/2x/icon_theme.png
rename to editor/icons/2x/icon_theme.png
diff --git a/tools/editor/icons/2x/icon_tile_map.png b/editor/icons/2x/icon_tile_map.png
similarity index 100%
rename from tools/editor/icons/2x/icon_tile_map.png
rename to editor/icons/2x/icon_tile_map.png
diff --git a/tools/editor/icons/2x/icon_tile_set.png b/editor/icons/2x/icon_tile_set.png
similarity index 100%
rename from tools/editor/icons/2x/icon_tile_set.png
rename to editor/icons/2x/icon_tile_set.png
diff --git a/tools/editor/icons/2x/icon_timer.png b/editor/icons/2x/icon_timer.png
similarity index 100%
rename from tools/editor/icons/2x/icon_timer.png
rename to editor/icons/2x/icon_timer.png
diff --git a/tools/editor/icons/2x/icon_tool_button.png b/editor/icons/2x/icon_tool_button.png
similarity index 100%
rename from tools/editor/icons/2x/icon_tool_button.png
rename to editor/icons/2x/icon_tool_button.png
diff --git a/tools/editor/icons/2x/icon_tool_move.png b/editor/icons/2x/icon_tool_move.png
similarity index 100%
rename from tools/editor/icons/2x/icon_tool_move.png
rename to editor/icons/2x/icon_tool_move.png
diff --git a/tools/editor/icons/2x/icon_tool_pan.png b/editor/icons/2x/icon_tool_pan.png
similarity index 100%
rename from tools/editor/icons/2x/icon_tool_pan.png
rename to editor/icons/2x/icon_tool_pan.png
diff --git a/tools/editor/icons/2x/icon_tool_rotate.png b/editor/icons/2x/icon_tool_rotate.png
similarity index 100%
rename from tools/editor/icons/2x/icon_tool_rotate.png
rename to editor/icons/2x/icon_tool_rotate.png
diff --git a/tools/editor/icons/2x/icon_tool_scale.png b/editor/icons/2x/icon_tool_scale.png
similarity index 100%
rename from tools/editor/icons/2x/icon_tool_scale.png
rename to editor/icons/2x/icon_tool_scale.png
diff --git a/tools/editor/icons/2x/icon_tool_select.png b/editor/icons/2x/icon_tool_select.png
similarity index 100%
rename from tools/editor/icons/2x/icon_tool_select.png
rename to editor/icons/2x/icon_tool_select.png
diff --git a/tools/editor/icons/2x/icon_tools.png b/editor/icons/2x/icon_tools.png
similarity index 100%
rename from tools/editor/icons/2x/icon_tools.png
rename to editor/icons/2x/icon_tools.png
diff --git a/tools/editor/icons/2x/icon_touch_screen_button.png b/editor/icons/2x/icon_touch_screen_button.png
similarity index 100%
rename from tools/editor/icons/2x/icon_touch_screen_button.png
rename to editor/icons/2x/icon_touch_screen_button.png
diff --git a/tools/editor/icons/2x/icon_track_add_key.png b/editor/icons/2x/icon_track_add_key.png
similarity index 100%
rename from tools/editor/icons/2x/icon_track_add_key.png
rename to editor/icons/2x/icon_track_add_key.png
diff --git a/tools/editor/icons/2x/icon_track_add_key_hl.png b/editor/icons/2x/icon_track_add_key_hl.png
similarity index 100%
rename from tools/editor/icons/2x/icon_track_add_key_hl.png
rename to editor/icons/2x/icon_track_add_key_hl.png
diff --git a/tools/editor/icons/2x/icon_track_continuous.png b/editor/icons/2x/icon_track_continuous.png
similarity index 100%
rename from tools/editor/icons/2x/icon_track_continuous.png
rename to editor/icons/2x/icon_track_continuous.png
diff --git a/tools/editor/icons/2x/icon_track_discrete.png b/editor/icons/2x/icon_track_discrete.png
similarity index 100%
rename from tools/editor/icons/2x/icon_track_discrete.png
rename to editor/icons/2x/icon_track_discrete.png
diff --git a/tools/editor/icons/2x/icon_track_trigger.png b/editor/icons/2x/icon_track_trigger.png
similarity index 100%
rename from tools/editor/icons/2x/icon_track_trigger.png
rename to editor/icons/2x/icon_track_trigger.png
diff --git a/tools/editor/icons/2x/icon_translation.png b/editor/icons/2x/icon_translation.png
similarity index 100%
rename from tools/editor/icons/2x/icon_translation.png
rename to editor/icons/2x/icon_translation.png
diff --git a/tools/editor/icons/2x/icon_transparent.png b/editor/icons/2x/icon_transparent.png
similarity index 100%
rename from tools/editor/icons/2x/icon_transparent.png
rename to editor/icons/2x/icon_transparent.png
diff --git a/tools/editor/icons/2x/icon_transpose.png b/editor/icons/2x/icon_transpose.png
similarity index 100%
rename from tools/editor/icons/2x/icon_transpose.png
rename to editor/icons/2x/icon_transpose.png
diff --git a/tools/editor/icons/2x/icon_tree.png b/editor/icons/2x/icon_tree.png
similarity index 100%
rename from tools/editor/icons/2x/icon_tree.png
rename to editor/icons/2x/icon_tree.png
diff --git a/tools/editor/icons/2x/icon_tween.png b/editor/icons/2x/icon_tween.png
similarity index 100%
rename from tools/editor/icons/2x/icon_tween.png
rename to editor/icons/2x/icon_tween.png
diff --git a/tools/editor/icons/2x/icon_unbone.png b/editor/icons/2x/icon_unbone.png
similarity index 100%
rename from tools/editor/icons/2x/icon_unbone.png
rename to editor/icons/2x/icon_unbone.png
diff --git a/tools/editor/icons/2x/icon_ungroup.png b/editor/icons/2x/icon_ungroup.png
similarity index 100%
rename from tools/editor/icons/2x/icon_ungroup.png
rename to editor/icons/2x/icon_ungroup.png
diff --git a/tools/editor/icons/2x/icon_uninstance.png b/editor/icons/2x/icon_uninstance.png
similarity index 100%
rename from tools/editor/icons/2x/icon_uninstance.png
rename to editor/icons/2x/icon_uninstance.png
diff --git a/tools/editor/icons/2x/icon_unlock.png b/editor/icons/2x/icon_unlock.png
similarity index 100%
rename from tools/editor/icons/2x/icon_unlock.png
rename to editor/icons/2x/icon_unlock.png
diff --git a/tools/editor/icons/2x/icon_uv.png b/editor/icons/2x/icon_uv.png
similarity index 100%
rename from tools/editor/icons/2x/icon_uv.png
rename to editor/icons/2x/icon_uv.png
diff --git a/tools/editor/icons/2x/icon_v_box_container.png b/editor/icons/2x/icon_v_box_container.png
similarity index 100%
rename from tools/editor/icons/2x/icon_v_box_container.png
rename to editor/icons/2x/icon_v_box_container.png
diff --git a/tools/editor/icons/2x/icon_v_button_array.png b/editor/icons/2x/icon_v_button_array.png
similarity index 100%
rename from tools/editor/icons/2x/icon_v_button_array.png
rename to editor/icons/2x/icon_v_button_array.png
diff --git a/tools/editor/icons/2x/icon_v_scroll_bar.png b/editor/icons/2x/icon_v_scroll_bar.png
similarity index 100%
rename from tools/editor/icons/2x/icon_v_scroll_bar.png
rename to editor/icons/2x/icon_v_scroll_bar.png
diff --git a/tools/editor/icons/2x/icon_v_separator.png b/editor/icons/2x/icon_v_separator.png
similarity index 100%
rename from tools/editor/icons/2x/icon_v_separator.png
rename to editor/icons/2x/icon_v_separator.png
diff --git a/tools/editor/icons/2x/icon_v_slider.png b/editor/icons/2x/icon_v_slider.png
similarity index 100%
rename from tools/editor/icons/2x/icon_v_slider.png
rename to editor/icons/2x/icon_v_slider.png
diff --git a/tools/editor/icons/2x/icon_v_split_container.png b/editor/icons/2x/icon_v_split_container.png
similarity index 100%
rename from tools/editor/icons/2x/icon_v_split_container.png
rename to editor/icons/2x/icon_v_split_container.png
diff --git a/tools/editor/icons/2x/icon_vector.png b/editor/icons/2x/icon_vector.png
similarity index 100%
rename from tools/editor/icons/2x/icon_vector.png
rename to editor/icons/2x/icon_vector.png
diff --git a/tools/editor/icons/2x/icon_vector2.png b/editor/icons/2x/icon_vector2.png
similarity index 100%
rename from tools/editor/icons/2x/icon_vector2.png
rename to editor/icons/2x/icon_vector2.png
diff --git a/tools/editor/icons/2x/icon_vehicle_body.png b/editor/icons/2x/icon_vehicle_body.png
similarity index 100%
rename from tools/editor/icons/2x/icon_vehicle_body.png
rename to editor/icons/2x/icon_vehicle_body.png
diff --git a/tools/editor/icons/2x/icon_vehicle_wheel.png b/editor/icons/2x/icon_vehicle_wheel.png
similarity index 100%
rename from tools/editor/icons/2x/icon_vehicle_wheel.png
rename to editor/icons/2x/icon_vehicle_wheel.png
diff --git a/tools/editor/icons/2x/icon_video_player.png b/editor/icons/2x/icon_video_player.png
similarity index 100%
rename from tools/editor/icons/2x/icon_video_player.png
rename to editor/icons/2x/icon_video_player.png
diff --git a/tools/editor/icons/2x/icon_viewport.png b/editor/icons/2x/icon_viewport.png
similarity index 100%
rename from tools/editor/icons/2x/icon_viewport.png
rename to editor/icons/2x/icon_viewport.png
diff --git a/tools/editor/icons/2x/icon_viewport_container.png b/editor/icons/2x/icon_viewport_container.png
similarity index 100%
rename from tools/editor/icons/2x/icon_viewport_container.png
rename to editor/icons/2x/icon_viewport_container.png
diff --git a/tools/editor/icons/2x/icon_viewport_sprite.png b/editor/icons/2x/icon_viewport_sprite.png
similarity index 100%
rename from tools/editor/icons/2x/icon_viewport_sprite.png
rename to editor/icons/2x/icon_viewport_sprite.png
diff --git a/tools/editor/icons/2x/icon_viewport_texture.png b/editor/icons/2x/icon_viewport_texture.png
similarity index 100%
rename from tools/editor/icons/2x/icon_viewport_texture.png
rename to editor/icons/2x/icon_viewport_texture.png
diff --git a/tools/editor/icons/2x/icon_visibility_enabler.png b/editor/icons/2x/icon_visibility_enabler.png
similarity index 100%
rename from tools/editor/icons/2x/icon_visibility_enabler.png
rename to editor/icons/2x/icon_visibility_enabler.png
diff --git a/tools/editor/icons/2x/icon_visibility_enabler_2d.png b/editor/icons/2x/icon_visibility_enabler_2d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_visibility_enabler_2d.png
rename to editor/icons/2x/icon_visibility_enabler_2d.png
diff --git a/tools/editor/icons/2x/icon_visibility_notifier.png b/editor/icons/2x/icon_visibility_notifier.png
similarity index 100%
rename from tools/editor/icons/2x/icon_visibility_notifier.png
rename to editor/icons/2x/icon_visibility_notifier.png
diff --git a/tools/editor/icons/2x/icon_visibility_notifier_2d.png b/editor/icons/2x/icon_visibility_notifier_2d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_visibility_notifier_2d.png
rename to editor/icons/2x/icon_visibility_notifier_2d.png
diff --git a/tools/editor/icons/2x/icon_visible.png b/editor/icons/2x/icon_visible.png
similarity index 100%
rename from tools/editor/icons/2x/icon_visible.png
rename to editor/icons/2x/icon_visible.png
diff --git a/tools/editor/icons/2x/icon_visual_script.png b/editor/icons/2x/icon_visual_script.png
similarity index 100%
rename from tools/editor/icons/2x/icon_visual_script.png
rename to editor/icons/2x/icon_visual_script.png
diff --git a/tools/editor/icons/2x/icon_visual_shader_port.png b/editor/icons/2x/icon_visual_shader_port.png
similarity index 100%
rename from tools/editor/icons/2x/icon_visual_shader_port.png
rename to editor/icons/2x/icon_visual_shader_port.png
diff --git a/tools/editor/icons/2x/icon_vu_empty.png b/editor/icons/2x/icon_vu_empty.png
similarity index 100%
rename from tools/editor/icons/2x/icon_vu_empty.png
rename to editor/icons/2x/icon_vu_empty.png
diff --git a/tools/editor/icons/2x/icon_vu_full.png b/editor/icons/2x/icon_vu_full.png
similarity index 100%
rename from tools/editor/icons/2x/icon_vu_full.png
rename to editor/icons/2x/icon_vu_full.png
diff --git a/tools/editor/icons/2x/icon_warning.png b/editor/icons/2x/icon_warning.png
similarity index 100%
rename from tools/editor/icons/2x/icon_warning.png
rename to editor/icons/2x/icon_warning.png
diff --git a/tools/editor/icons/2x/icon_window_dialog.png b/editor/icons/2x/icon_window_dialog.png
similarity index 100%
rename from tools/editor/icons/2x/icon_window_dialog.png
rename to editor/icons/2x/icon_window_dialog.png
diff --git a/tools/editor/icons/2x/icon_world.png b/editor/icons/2x/icon_world.png
similarity index 100%
rename from tools/editor/icons/2x/icon_world.png
rename to editor/icons/2x/icon_world.png
diff --git a/tools/editor/icons/2x/icon_world_2d.png b/editor/icons/2x/icon_world_2d.png
similarity index 100%
rename from tools/editor/icons/2x/icon_world_2d.png
rename to editor/icons/2x/icon_world_2d.png
diff --git a/tools/editor/icons/2x/icon_world_environment.png b/editor/icons/2x/icon_world_environment.png
similarity index 100%
rename from tools/editor/icons/2x/icon_world_environment.png
rename to editor/icons/2x/icon_world_environment.png
diff --git a/tools/editor/icons/2x/icon_y_sort.png b/editor/icons/2x/icon_y_sort.png
similarity index 100%
rename from tools/editor/icons/2x/icon_y_sort.png
rename to editor/icons/2x/icon_y_sort.png
diff --git a/tools/editor/icons/2x/icon_zoom.png b/editor/icons/2x/icon_zoom.png
similarity index 100%
rename from tools/editor/icons/2x/icon_zoom.png
rename to editor/icons/2x/icon_zoom.png
diff --git a/tools/editor/icons/2x/icon_zoom_less.png b/editor/icons/2x/icon_zoom_less.png
similarity index 100%
rename from tools/editor/icons/2x/icon_zoom_less.png
rename to editor/icons/2x/icon_zoom_less.png
diff --git a/tools/editor/icons/2x/icon_zoom_more.png b/editor/icons/2x/icon_zoom_more.png
similarity index 100%
rename from tools/editor/icons/2x/icon_zoom_more.png
rename to editor/icons/2x/icon_zoom_more.png
diff --git a/tools/editor/icons/2x/icon_zoom_reset.png b/editor/icons/2x/icon_zoom_reset.png
similarity index 100%
rename from tools/editor/icons/2x/icon_zoom_reset.png
rename to editor/icons/2x/icon_zoom_reset.png
diff --git a/tools/editor/icons/SCsub b/editor/icons/SCsub
similarity index 94%
rename from tools/editor/icons/SCsub
rename to editor/icons/SCsub
index 4af481d1f62..3fc8e5461f2 100644
--- a/tools/editor/icons/SCsub
+++ b/editor/icons/SCsub
@@ -90,7 +90,7 @@ make_editor_icons_builder = Builder(action=make_editor_icons_action,
                                     suffix='.cpp',
                                     src_suffix='.png')
 env['BUILDERS']['MakeEditorIconsBuilder'] = make_editor_icons_builder
-env.Alias('editor_icons', [env.MakeEditorIconsBuilder('#tools/editor/editor_icons.cpp', Glob("*.png"))])
+env.Alias('editor_icons', [env.MakeEditorIconsBuilder('#editor/editor_icons.cpp', Glob("*.png"))])
 
-env.editor_sources.append("#tools/editor/editor_icons.cpp")
+env.editor_sources.append("#editor/editor_icons.cpp")
 Export('env')
diff --git a/tools/editor/icons/icon_accept_dialog.png b/editor/icons/icon_accept_dialog.png
similarity index 100%
rename from tools/editor/icons/icon_accept_dialog.png
rename to editor/icons/icon_accept_dialog.png
diff --git a/tools/editor/icons/icon_add.png b/editor/icons/icon_add.png
similarity index 100%
rename from tools/editor/icons/icon_add.png
rename to editor/icons/icon_add.png
diff --git a/tools/editor/icons/icon_add_track.png b/editor/icons/icon_add_track.png
similarity index 100%
rename from tools/editor/icons/icon_add_track.png
rename to editor/icons/icon_add_track.png
diff --git a/tools/editor/icons/icon_anchor.png b/editor/icons/icon_anchor.png
similarity index 100%
rename from tools/editor/icons/icon_anchor.png
rename to editor/icons/icon_anchor.png
diff --git a/tools/editor/icons/icon_anim_export.png b/editor/icons/icon_anim_export.png
similarity index 100%
rename from tools/editor/icons/icon_anim_export.png
rename to editor/icons/icon_anim_export.png
diff --git a/tools/editor/icons/icon_anim_export_all.png b/editor/icons/icon_anim_export_all.png
similarity index 100%
rename from tools/editor/icons/icon_anim_export_all.png
rename to editor/icons/icon_anim_export_all.png
diff --git a/tools/editor/icons/icon_anim_get.png b/editor/icons/icon_anim_get.png
similarity index 100%
rename from tools/editor/icons/icon_anim_get.png
rename to editor/icons/icon_anim_get.png
diff --git a/tools/editor/icons/icon_anim_get_hl.png b/editor/icons/icon_anim_get_hl.png
similarity index 100%
rename from tools/editor/icons/icon_anim_get_hl.png
rename to editor/icons/icon_anim_get_hl.png
diff --git a/tools/editor/icons/icon_anim_import.png b/editor/icons/icon_anim_import.png
similarity index 100%
rename from tools/editor/icons/icon_anim_import.png
rename to editor/icons/icon_anim_import.png
diff --git a/tools/editor/icons/icon_anim_import_all.png b/editor/icons/icon_anim_import_all.png
similarity index 100%
rename from tools/editor/icons/icon_anim_import_all.png
rename to editor/icons/icon_anim_import_all.png
diff --git a/tools/editor/icons/icon_anim_set.png b/editor/icons/icon_anim_set.png
similarity index 100%
rename from tools/editor/icons/icon_anim_set.png
rename to editor/icons/icon_anim_set.png
diff --git a/tools/editor/icons/icon_anim_set_hl.png b/editor/icons/icon_anim_set_hl.png
similarity index 100%
rename from tools/editor/icons/icon_anim_set_hl.png
rename to editor/icons/icon_anim_set_hl.png
diff --git a/tools/editor/icons/icon_animated_sprite.png b/editor/icons/icon_animated_sprite.png
similarity index 100%
rename from tools/editor/icons/icon_animated_sprite.png
rename to editor/icons/icon_animated_sprite.png
diff --git a/tools/editor/icons/icon_animated_sprite_3d.png b/editor/icons/icon_animated_sprite_3d.png
similarity index 100%
rename from tools/editor/icons/icon_animated_sprite_3d.png
rename to editor/icons/icon_animated_sprite_3d.png
diff --git a/tools/editor/icons/icon_animation.png b/editor/icons/icon_animation.png
similarity index 100%
rename from tools/editor/icons/icon_animation.png
rename to editor/icons/icon_animation.png
diff --git a/tools/editor/icons/icon_animation_node.png b/editor/icons/icon_animation_node.png
similarity index 100%
rename from tools/editor/icons/icon_animation_node.png
rename to editor/icons/icon_animation_node.png
diff --git a/tools/editor/icons/icon_animation_play.png b/editor/icons/icon_animation_play.png
similarity index 100%
rename from tools/editor/icons/icon_animation_play.png
rename to editor/icons/icon_animation_play.png
diff --git a/tools/editor/icons/icon_animation_player.png b/editor/icons/icon_animation_player.png
similarity index 100%
rename from tools/editor/icons/icon_animation_player.png
rename to editor/icons/icon_animation_player.png
diff --git a/tools/editor/icons/icon_animation_set.png b/editor/icons/icon_animation_set.png
similarity index 100%
rename from tools/editor/icons/icon_animation_set.png
rename to editor/icons/icon_animation_set.png
diff --git a/tools/editor/icons/icon_animation_tree.png b/editor/icons/icon_animation_tree.png
similarity index 100%
rename from tools/editor/icons/icon_animation_tree.png
rename to editor/icons/icon_animation_tree.png
diff --git a/tools/editor/icons/icon_animation_tree_player.png b/editor/icons/icon_animation_tree_player.png
similarity index 100%
rename from tools/editor/icons/icon_animation_tree_player.png
rename to editor/icons/icon_animation_tree_player.png
diff --git a/tools/editor/icons/icon_area.png b/editor/icons/icon_area.png
similarity index 100%
rename from tools/editor/icons/icon_area.png
rename to editor/icons/icon_area.png
diff --git a/tools/editor/icons/icon_area_2d.png b/editor/icons/icon_area_2d.png
similarity index 100%
rename from tools/editor/icons/icon_area_2d.png
rename to editor/icons/icon_area_2d.png
diff --git a/tools/editor/icons/icon_array_data.png b/editor/icons/icon_array_data.png
similarity index 100%
rename from tools/editor/icons/icon_array_data.png
rename to editor/icons/icon_array_data.png
diff --git a/tools/editor/icons/icon_array_float.png b/editor/icons/icon_array_float.png
similarity index 100%
rename from tools/editor/icons/icon_array_float.png
rename to editor/icons/icon_array_float.png
diff --git a/tools/editor/icons/icon_array_int.png b/editor/icons/icon_array_int.png
similarity index 100%
rename from tools/editor/icons/icon_array_int.png
rename to editor/icons/icon_array_int.png
diff --git a/tools/editor/icons/icon_array_string.png b/editor/icons/icon_array_string.png
similarity index 100%
rename from tools/editor/icons/icon_array_string.png
rename to editor/icons/icon_array_string.png
diff --git a/tools/editor/icons/icon_array_variant.png b/editor/icons/icon_array_variant.png
similarity index 100%
rename from tools/editor/icons/icon_array_variant.png
rename to editor/icons/icon_array_variant.png
diff --git a/tools/editor/icons/icon_arrow_left.png b/editor/icons/icon_arrow_left.png
similarity index 100%
rename from tools/editor/icons/icon_arrow_left.png
rename to editor/icons/icon_arrow_left.png
diff --git a/tools/editor/icons/icon_arrow_left_disabled.png b/editor/icons/icon_arrow_left_disabled.png
similarity index 100%
rename from tools/editor/icons/icon_arrow_left_disabled.png
rename to editor/icons/icon_arrow_left_disabled.png
diff --git a/tools/editor/icons/icon_arrow_right.png b/editor/icons/icon_arrow_right.png
similarity index 100%
rename from tools/editor/icons/icon_arrow_right.png
rename to editor/icons/icon_arrow_right.png
diff --git a/tools/editor/icons/icon_arrow_right_disabled.png b/editor/icons/icon_arrow_right_disabled.png
similarity index 100%
rename from tools/editor/icons/icon_arrow_right_disabled.png
rename to editor/icons/icon_arrow_right_disabled.png
diff --git a/tools/editor/icons/icon_arrow_up.png b/editor/icons/icon_arrow_up.png
similarity index 100%
rename from tools/editor/icons/icon_arrow_up.png
rename to editor/icons/icon_arrow_up.png
diff --git a/tools/editor/icons/icon_arrow_up_disabled.png b/editor/icons/icon_arrow_up_disabled.png
similarity index 100%
rename from tools/editor/icons/icon_arrow_up_disabled.png
rename to editor/icons/icon_arrow_up_disabled.png
diff --git a/tools/editor/icons/icon_atlas_texture.png b/editor/icons/icon_atlas_texture.png
similarity index 100%
rename from tools/editor/icons/icon_atlas_texture.png
rename to editor/icons/icon_atlas_texture.png
diff --git a/tools/editor/icons/icon_audio_effect_amplify.png b/editor/icons/icon_audio_effect_amplify.png
similarity index 100%
rename from tools/editor/icons/icon_audio_effect_amplify.png
rename to editor/icons/icon_audio_effect_amplify.png
diff --git a/tools/editor/icons/icon_audio_stream_gibberish.png b/editor/icons/icon_audio_stream_gibberish.png
similarity index 100%
rename from tools/editor/icons/icon_audio_stream_gibberish.png
rename to editor/icons/icon_audio_stream_gibberish.png
diff --git a/tools/editor/icons/icon_audio_stream_m_p_c.png b/editor/icons/icon_audio_stream_m_p_c.png
similarity index 100%
rename from tools/editor/icons/icon_audio_stream_m_p_c.png
rename to editor/icons/icon_audio_stream_m_p_c.png
diff --git a/tools/editor/icons/icon_audio_stream_o_g_g_vorbis.png b/editor/icons/icon_audio_stream_o_g_g_vorbis.png
similarity index 100%
rename from tools/editor/icons/icon_audio_stream_o_g_g_vorbis.png
rename to editor/icons/icon_audio_stream_o_g_g_vorbis.png
diff --git a/tools/editor/icons/icon_audio_stream_opus.png b/editor/icons/icon_audio_stream_opus.png
similarity index 100%
rename from tools/editor/icons/icon_audio_stream_opus.png
rename to editor/icons/icon_audio_stream_opus.png
diff --git a/tools/editor/icons/icon_audio_stream_speex.png b/editor/icons/icon_audio_stream_speex.png
similarity index 100%
rename from tools/editor/icons/icon_audio_stream_speex.png
rename to editor/icons/icon_audio_stream_speex.png
diff --git a/tools/editor/icons/icon_auto_play.png b/editor/icons/icon_auto_play.png
similarity index 100%
rename from tools/editor/icons/icon_auto_play.png
rename to editor/icons/icon_auto_play.png
diff --git a/tools/editor/icons/icon_b_c_s_f_x.png b/editor/icons/icon_b_c_s_f_x.png
similarity index 100%
rename from tools/editor/icons/icon_b_c_s_f_x.png
rename to editor/icons/icon_b_c_s_f_x.png
diff --git a/tools/editor/icons/icon_b_g_color_f_x.png b/editor/icons/icon_b_g_color_f_x.png
similarity index 100%
rename from tools/editor/icons/icon_b_g_color_f_x.png
rename to editor/icons/icon_b_g_color_f_x.png
diff --git a/tools/editor/icons/icon_b_g_image_f_x.png b/editor/icons/icon_b_g_image_f_x.png
similarity index 100%
rename from tools/editor/icons/icon_b_g_image_f_x.png
rename to editor/icons/icon_b_g_image_f_x.png
diff --git a/tools/editor/icons/icon_back.png b/editor/icons/icon_back.png
similarity index 100%
rename from tools/editor/icons/icon_back.png
rename to editor/icons/icon_back.png
diff --git a/tools/editor/icons/icon_back_buffer_copy.png b/editor/icons/icon_back_buffer_copy.png
similarity index 100%
rename from tools/editor/icons/icon_back_buffer_copy.png
rename to editor/icons/icon_back_buffer_copy.png
diff --git a/tools/editor/icons/icon_back_disabled.png b/editor/icons/icon_back_disabled.png
similarity index 100%
rename from tools/editor/icons/icon_back_disabled.png
rename to editor/icons/icon_back_disabled.png
diff --git a/tools/editor/icons/icon_back_no.png b/editor/icons/icon_back_no.png
similarity index 100%
rename from tools/editor/icons/icon_back_no.png
rename to editor/icons/icon_back_no.png
diff --git a/tools/editor/icons/icon_bake.png b/editor/icons/icon_bake.png
similarity index 100%
rename from tools/editor/icons/icon_bake.png
rename to editor/icons/icon_bake.png
diff --git a/tools/editor/icons/icon_baked_light.png b/editor/icons/icon_baked_light.png
similarity index 100%
rename from tools/editor/icons/icon_baked_light.png
rename to editor/icons/icon_baked_light.png
diff --git a/tools/editor/icons/icon_baked_light_instance.png b/editor/icons/icon_baked_light_instance.png
similarity index 100%
rename from tools/editor/icons/icon_baked_light_instance.png
rename to editor/icons/icon_baked_light_instance.png
diff --git a/tools/editor/icons/icon_baked_light_sampler.png b/editor/icons/icon_baked_light_sampler.png
similarity index 100%
rename from tools/editor/icons/icon_baked_light_sampler.png
rename to editor/icons/icon_baked_light_sampler.png
diff --git a/tools/editor/icons/icon_bit_map.png b/editor/icons/icon_bit_map.png
similarity index 100%
rename from tools/editor/icons/icon_bit_map.png
rename to editor/icons/icon_bit_map.png
diff --git a/tools/editor/icons/icon_bitmap_font.png b/editor/icons/icon_bitmap_font.png
similarity index 100%
rename from tools/editor/icons/icon_bitmap_font.png
rename to editor/icons/icon_bitmap_font.png
diff --git a/tools/editor/icons/icon_blend.png b/editor/icons/icon_blend.png
similarity index 100%
rename from tools/editor/icons/icon_blend.png
rename to editor/icons/icon_blend.png
diff --git a/tools/editor/icons/icon_bone.png b/editor/icons/icon_bone.png
similarity index 100%
rename from tools/editor/icons/icon_bone.png
rename to editor/icons/icon_bone.png
diff --git a/tools/editor/icons/icon_bone_attachment.png b/editor/icons/icon_bone_attachment.png
similarity index 100%
rename from tools/editor/icons/icon_bone_attachment.png
rename to editor/icons/icon_bone_attachment.png
diff --git a/tools/editor/icons/icon_bone_track.png b/editor/icons/icon_bone_track.png
similarity index 100%
rename from tools/editor/icons/icon_bone_track.png
rename to editor/icons/icon_bone_track.png
diff --git a/tools/editor/icons/icon_bool.png b/editor/icons/icon_bool.png
similarity index 100%
rename from tools/editor/icons/icon_bool.png
rename to editor/icons/icon_bool.png
diff --git a/tools/editor/icons/icon_box_shape.png b/editor/icons/icon_box_shape.png
similarity index 100%
rename from tools/editor/icons/icon_box_shape.png
rename to editor/icons/icon_box_shape.png
diff --git a/tools/editor/icons/icon_bus_vu_db.png b/editor/icons/icon_bus_vu_db.png
similarity index 100%
rename from tools/editor/icons/icon_bus_vu_db.png
rename to editor/icons/icon_bus_vu_db.png
diff --git a/tools/editor/icons/icon_bus_vu_empty.png b/editor/icons/icon_bus_vu_empty.png
similarity index 100%
rename from tools/editor/icons/icon_bus_vu_empty.png
rename to editor/icons/icon_bus_vu_empty.png
diff --git a/tools/editor/icons/icon_bus_vu_frozen.png b/editor/icons/icon_bus_vu_frozen.png
similarity index 100%
rename from tools/editor/icons/icon_bus_vu_frozen.png
rename to editor/icons/icon_bus_vu_frozen.png
diff --git a/tools/editor/icons/icon_bus_vu_full.png b/editor/icons/icon_bus_vu_full.png
similarity index 100%
rename from tools/editor/icons/icon_bus_vu_full.png
rename to editor/icons/icon_bus_vu_full.png
diff --git a/tools/editor/icons/icon_button.png b/editor/icons/icon_button.png
similarity index 100%
rename from tools/editor/icons/icon_button.png
rename to editor/icons/icon_button.png
diff --git a/tools/editor/icons/icon_button_group.png b/editor/icons/icon_button_group.png
similarity index 100%
rename from tools/editor/icons/icon_button_group.png
rename to editor/icons/icon_button_group.png
diff --git a/tools/editor/icons/icon_camera.png b/editor/icons/icon_camera.png
similarity index 100%
rename from tools/editor/icons/icon_camera.png
rename to editor/icons/icon_camera.png
diff --git a/tools/editor/icons/icon_camera_2d.png b/editor/icons/icon_camera_2d.png
similarity index 100%
rename from tools/editor/icons/icon_camera_2d.png
rename to editor/icons/icon_camera_2d.png
diff --git a/tools/editor/icons/icon_canvas_item.png b/editor/icons/icon_canvas_item.png
similarity index 100%
rename from tools/editor/icons/icon_canvas_item.png
rename to editor/icons/icon_canvas_item.png
diff --git a/tools/editor/icons/icon_canvas_item_material.png b/editor/icons/icon_canvas_item_material.png
similarity index 100%
rename from tools/editor/icons/icon_canvas_item_material.png
rename to editor/icons/icon_canvas_item_material.png
diff --git a/tools/editor/icons/icon_canvas_item_shader.png b/editor/icons/icon_canvas_item_shader.png
similarity index 100%
rename from tools/editor/icons/icon_canvas_item_shader.png
rename to editor/icons/icon_canvas_item_shader.png
diff --git a/tools/editor/icons/icon_canvas_item_shader_graph.png b/editor/icons/icon_canvas_item_shader_graph.png
similarity index 100%
rename from tools/editor/icons/icon_canvas_item_shader_graph.png
rename to editor/icons/icon_canvas_item_shader_graph.png
diff --git a/tools/editor/icons/icon_canvas_layer.png b/editor/icons/icon_canvas_layer.png
similarity index 100%
rename from tools/editor/icons/icon_canvas_layer.png
rename to editor/icons/icon_canvas_layer.png
diff --git a/tools/editor/icons/icon_canvas_modulate.png b/editor/icons/icon_canvas_modulate.png
similarity index 100%
rename from tools/editor/icons/icon_canvas_modulate.png
rename to editor/icons/icon_canvas_modulate.png
diff --git a/tools/editor/icons/icon_capsule_shape.png b/editor/icons/icon_capsule_shape.png
similarity index 100%
rename from tools/editor/icons/icon_capsule_shape.png
rename to editor/icons/icon_capsule_shape.png
diff --git a/tools/editor/icons/icon_capsule_shape_2d.png b/editor/icons/icon_capsule_shape_2d.png
similarity index 100%
rename from tools/editor/icons/icon_capsule_shape_2d.png
rename to editor/icons/icon_capsule_shape_2d.png
diff --git a/tools/editor/icons/icon_center_container.png b/editor/icons/icon_center_container.png
similarity index 100%
rename from tools/editor/icons/icon_center_container.png
rename to editor/icons/icon_center_container.png
diff --git a/tools/editor/icons/icon_character_body.png b/editor/icons/icon_character_body.png
similarity index 100%
rename from tools/editor/icons/icon_character_body.png
rename to editor/icons/icon_character_body.png
diff --git a/tools/editor/icons/icon_character_camera.png b/editor/icons/icon_character_camera.png
similarity index 100%
rename from tools/editor/icons/icon_character_camera.png
rename to editor/icons/icon_character_camera.png
diff --git a/tools/editor/icons/icon_check_box.png b/editor/icons/icon_check_box.png
similarity index 100%
rename from tools/editor/icons/icon_check_box.png
rename to editor/icons/icon_check_box.png
diff --git a/tools/editor/icons/icon_check_button.png b/editor/icons/icon_check_button.png
similarity index 100%
rename from tools/editor/icons/icon_check_button.png
rename to editor/icons/icon_check_button.png
diff --git a/tools/editor/icons/icon_checkerboard.png b/editor/icons/icon_checkerboard.png
similarity index 100%
rename from tools/editor/icons/icon_checkerboard.png
rename to editor/icons/icon_checkerboard.png
diff --git a/tools/editor/icons/icon_circle_shape_2d.png b/editor/icons/icon_circle_shape_2d.png
similarity index 100%
rename from tools/editor/icons/icon_circle_shape_2d.png
rename to editor/icons/icon_circle_shape_2d.png
diff --git a/tools/editor/icons/icon_class_list.png b/editor/icons/icon_class_list.png
similarity index 100%
rename from tools/editor/icons/icon_class_list.png
rename to editor/icons/icon_class_list.png
diff --git a/tools/editor/icons/icon_click2edit.png b/editor/icons/icon_click2edit.png
similarity index 100%
rename from tools/editor/icons/icon_click2edit.png
rename to editor/icons/icon_click2edit.png
diff --git a/tools/editor/icons/icon_close.png b/editor/icons/icon_close.png
similarity index 100%
rename from tools/editor/icons/icon_close.png
rename to editor/icons/icon_close.png
diff --git a/tools/editor/icons/icon_close_hover.png b/editor/icons/icon_close_hover.png
similarity index 100%
rename from tools/editor/icons/icon_close_hover.png
rename to editor/icons/icon_close_hover.png
diff --git a/tools/editor/icons/icon_collapse.png b/editor/icons/icon_collapse.png
similarity index 100%
rename from tools/editor/icons/icon_collapse.png
rename to editor/icons/icon_collapse.png
diff --git a/tools/editor/icons/icon_collapse_hl.png b/editor/icons/icon_collapse_hl.png
similarity index 100%
rename from tools/editor/icons/icon_collapse_hl.png
rename to editor/icons/icon_collapse_hl.png
diff --git a/tools/editor/icons/icon_collision.png b/editor/icons/icon_collision.png
similarity index 100%
rename from tools/editor/icons/icon_collision.png
rename to editor/icons/icon_collision.png
diff --git a/tools/editor/icons/icon_collision_2d.png b/editor/icons/icon_collision_2d.png
similarity index 100%
rename from tools/editor/icons/icon_collision_2d.png
rename to editor/icons/icon_collision_2d.png
diff --git a/tools/editor/icons/icon_collision_polygon.png b/editor/icons/icon_collision_polygon.png
similarity index 100%
rename from tools/editor/icons/icon_collision_polygon.png
rename to editor/icons/icon_collision_polygon.png
diff --git a/tools/editor/icons/icon_collision_polygon_2d.png b/editor/icons/icon_collision_polygon_2d.png
similarity index 100%
rename from tools/editor/icons/icon_collision_polygon_2d.png
rename to editor/icons/icon_collision_polygon_2d.png
diff --git a/tools/editor/icons/icon_collision_shape.png b/editor/icons/icon_collision_shape.png
similarity index 100%
rename from tools/editor/icons/icon_collision_shape.png
rename to editor/icons/icon_collision_shape.png
diff --git a/tools/editor/icons/icon_collision_shape_2d.png b/editor/icons/icon_collision_shape_2d.png
similarity index 100%
rename from tools/editor/icons/icon_collision_shape_2d.png
rename to editor/icons/icon_collision_shape_2d.png
diff --git a/tools/editor/icons/icon_color.png b/editor/icons/icon_color.png
similarity index 100%
rename from tools/editor/icons/icon_color.png
rename to editor/icons/icon_color.png
diff --git a/tools/editor/icons/icon_color_pick.png b/editor/icons/icon_color_pick.png
similarity index 100%
rename from tools/editor/icons/icon_color_pick.png
rename to editor/icons/icon_color_pick.png
diff --git a/tools/editor/icons/icon_color_picker.png b/editor/icons/icon_color_picker.png
similarity index 100%
rename from tools/editor/icons/icon_color_picker.png
rename to editor/icons/icon_color_picker.png
diff --git a/tools/editor/icons/icon_color_picker_button.png b/editor/icons/icon_color_picker_button.png
similarity index 100%
rename from tools/editor/icons/icon_color_picker_button.png
rename to editor/icons/icon_color_picker_button.png
diff --git a/tools/editor/icons/icon_color_ramp.png b/editor/icons/icon_color_ramp.png
similarity index 100%
rename from tools/editor/icons/icon_color_ramp.png
rename to editor/icons/icon_color_ramp.png
diff --git a/tools/editor/icons/icon_color_rect.png b/editor/icons/icon_color_rect.png
similarity index 100%
rename from tools/editor/icons/icon_color_rect.png
rename to editor/icons/icon_color_rect.png
diff --git a/tools/editor/icons/icon_concave_polygon_shape.png b/editor/icons/icon_concave_polygon_shape.png
similarity index 100%
rename from tools/editor/icons/icon_concave_polygon_shape.png
rename to editor/icons/icon_concave_polygon_shape.png
diff --git a/tools/editor/icons/icon_concave_polygon_shape_2d.png b/editor/icons/icon_concave_polygon_shape_2d.png
similarity index 100%
rename from tools/editor/icons/icon_concave_polygon_shape_2d.png
rename to editor/icons/icon_concave_polygon_shape_2d.png
diff --git a/tools/editor/icons/icon_cone_twist_joint.png b/editor/icons/icon_cone_twist_joint.png
similarity index 100%
rename from tools/editor/icons/icon_cone_twist_joint.png
rename to editor/icons/icon_cone_twist_joint.png
diff --git a/tools/editor/icons/icon_confirmation_dialog.png b/editor/icons/icon_confirmation_dialog.png
similarity index 100%
rename from tools/editor/icons/icon_confirmation_dialog.png
rename to editor/icons/icon_confirmation_dialog.png
diff --git a/tools/editor/icons/icon_connect.png b/editor/icons/icon_connect.png
similarity index 100%
rename from tools/editor/icons/icon_connect.png
rename to editor/icons/icon_connect.png
diff --git a/tools/editor/icons/icon_connection_and_groups.png b/editor/icons/icon_connection_and_groups.png
similarity index 100%
rename from tools/editor/icons/icon_connection_and_groups.png
rename to editor/icons/icon_connection_and_groups.png
diff --git a/tools/editor/icons/icon_console.png b/editor/icons/icon_console.png
similarity index 100%
rename from tools/editor/icons/icon_console.png
rename to editor/icons/icon_console.png
diff --git a/tools/editor/icons/icon_container.png b/editor/icons/icon_container.png
similarity index 100%
rename from tools/editor/icons/icon_container.png
rename to editor/icons/icon_container.png
diff --git a/tools/editor/icons/icon_control.png b/editor/icons/icon_control.png
similarity index 100%
rename from tools/editor/icons/icon_control.png
rename to editor/icons/icon_control.png
diff --git a/tools/editor/icons/icon_control_align_bottom_center.png b/editor/icons/icon_control_align_bottom_center.png
similarity index 100%
rename from tools/editor/icons/icon_control_align_bottom_center.png
rename to editor/icons/icon_control_align_bottom_center.png
diff --git a/tools/editor/icons/icon_control_align_bottom_left.png b/editor/icons/icon_control_align_bottom_left.png
similarity index 100%
rename from tools/editor/icons/icon_control_align_bottom_left.png
rename to editor/icons/icon_control_align_bottom_left.png
diff --git a/tools/editor/icons/icon_control_align_bottom_right.png b/editor/icons/icon_control_align_bottom_right.png
similarity index 100%
rename from tools/editor/icons/icon_control_align_bottom_right.png
rename to editor/icons/icon_control_align_bottom_right.png
diff --git a/tools/editor/icons/icon_control_align_bottom_wide.png b/editor/icons/icon_control_align_bottom_wide.png
similarity index 100%
rename from tools/editor/icons/icon_control_align_bottom_wide.png
rename to editor/icons/icon_control_align_bottom_wide.png
diff --git a/tools/editor/icons/icon_control_align_center.png b/editor/icons/icon_control_align_center.png
similarity index 100%
rename from tools/editor/icons/icon_control_align_center.png
rename to editor/icons/icon_control_align_center.png
diff --git a/tools/editor/icons/icon_control_align_center_left.png b/editor/icons/icon_control_align_center_left.png
similarity index 100%
rename from tools/editor/icons/icon_control_align_center_left.png
rename to editor/icons/icon_control_align_center_left.png
diff --git a/tools/editor/icons/icon_control_align_center_right.png b/editor/icons/icon_control_align_center_right.png
similarity index 100%
rename from tools/editor/icons/icon_control_align_center_right.png
rename to editor/icons/icon_control_align_center_right.png
diff --git a/tools/editor/icons/icon_control_align_left_center.png b/editor/icons/icon_control_align_left_center.png
similarity index 100%
rename from tools/editor/icons/icon_control_align_left_center.png
rename to editor/icons/icon_control_align_left_center.png
diff --git a/tools/editor/icons/icon_control_align_left_wide.png b/editor/icons/icon_control_align_left_wide.png
similarity index 100%
rename from tools/editor/icons/icon_control_align_left_wide.png
rename to editor/icons/icon_control_align_left_wide.png
diff --git a/tools/editor/icons/icon_control_align_right_center.png b/editor/icons/icon_control_align_right_center.png
similarity index 100%
rename from tools/editor/icons/icon_control_align_right_center.png
rename to editor/icons/icon_control_align_right_center.png
diff --git a/tools/editor/icons/icon_control_align_right_wide.png b/editor/icons/icon_control_align_right_wide.png
similarity index 100%
rename from tools/editor/icons/icon_control_align_right_wide.png
rename to editor/icons/icon_control_align_right_wide.png
diff --git a/tools/editor/icons/icon_control_align_top_center.png b/editor/icons/icon_control_align_top_center.png
similarity index 100%
rename from tools/editor/icons/icon_control_align_top_center.png
rename to editor/icons/icon_control_align_top_center.png
diff --git a/tools/editor/icons/icon_control_align_top_left.png b/editor/icons/icon_control_align_top_left.png
similarity index 100%
rename from tools/editor/icons/icon_control_align_top_left.png
rename to editor/icons/icon_control_align_top_left.png
diff --git a/tools/editor/icons/icon_control_align_top_right.png b/editor/icons/icon_control_align_top_right.png
similarity index 100%
rename from tools/editor/icons/icon_control_align_top_right.png
rename to editor/icons/icon_control_align_top_right.png
diff --git a/tools/editor/icons/icon_control_align_top_wide.png b/editor/icons/icon_control_align_top_wide.png
similarity index 100%
rename from tools/editor/icons/icon_control_align_top_wide.png
rename to editor/icons/icon_control_align_top_wide.png
diff --git a/tools/editor/icons/icon_control_align_wide.png b/editor/icons/icon_control_align_wide.png
similarity index 100%
rename from tools/editor/icons/icon_control_align_wide.png
rename to editor/icons/icon_control_align_wide.png
diff --git a/tools/editor/icons/icon_control_hcenter_wide.png b/editor/icons/icon_control_hcenter_wide.png
similarity index 100%
rename from tools/editor/icons/icon_control_hcenter_wide.png
rename to editor/icons/icon_control_hcenter_wide.png
diff --git a/tools/editor/icons/icon_control_vcenter_wide.png b/editor/icons/icon_control_vcenter_wide.png
similarity index 100%
rename from tools/editor/icons/icon_control_vcenter_wide.png
rename to editor/icons/icon_control_vcenter_wide.png
diff --git a/tools/editor/icons/icon_convex_polygon_shape.png b/editor/icons/icon_convex_polygon_shape.png
similarity index 100%
rename from tools/editor/icons/icon_convex_polygon_shape.png
rename to editor/icons/icon_convex_polygon_shape.png
diff --git a/tools/editor/icons/icon_convex_polygon_shape_2d.png b/editor/icons/icon_convex_polygon_shape_2d.png
similarity index 100%
rename from tools/editor/icons/icon_convex_polygon_shape_2d.png
rename to editor/icons/icon_convex_polygon_shape_2d.png
diff --git a/tools/editor/icons/icon_copy_node_path.png b/editor/icons/icon_copy_node_path.png
similarity index 100%
rename from tools/editor/icons/icon_copy_node_path.png
rename to editor/icons/icon_copy_node_path.png
diff --git a/tools/editor/icons/icon_create_new_scene_from.png b/editor/icons/icon_create_new_scene_from.png
similarity index 100%
rename from tools/editor/icons/icon_create_new_scene_from.png
rename to editor/icons/icon_create_new_scene_from.png
diff --git a/tools/editor/icons/icon_cube_grid_map.png b/editor/icons/icon_cube_grid_map.png
similarity index 100%
rename from tools/editor/icons/icon_cube_grid_map.png
rename to editor/icons/icon_cube_grid_map.png
diff --git a/tools/editor/icons/icon_cube_map.png b/editor/icons/icon_cube_map.png
similarity index 100%
rename from tools/editor/icons/icon_cube_map.png
rename to editor/icons/icon_cube_map.png
diff --git a/tools/editor/icons/icon_curve.png b/editor/icons/icon_curve.png
similarity index 100%
rename from tools/editor/icons/icon_curve.png
rename to editor/icons/icon_curve.png
diff --git a/tools/editor/icons/icon_curve_2d.png b/editor/icons/icon_curve_2d.png
similarity index 100%
rename from tools/editor/icons/icon_curve_2d.png
rename to editor/icons/icon_curve_2d.png
diff --git a/tools/editor/icons/icon_curve_3d.png b/editor/icons/icon_curve_3d.png
similarity index 100%
rename from tools/editor/icons/icon_curve_3d.png
rename to editor/icons/icon_curve_3d.png
diff --git a/tools/editor/icons/icon_curve_close.png b/editor/icons/icon_curve_close.png
similarity index 100%
rename from tools/editor/icons/icon_curve_close.png
rename to editor/icons/icon_curve_close.png
diff --git a/tools/editor/icons/icon_curve_constant.png b/editor/icons/icon_curve_constant.png
similarity index 100%
rename from tools/editor/icons/icon_curve_constant.png
rename to editor/icons/icon_curve_constant.png
diff --git a/tools/editor/icons/icon_curve_create.png b/editor/icons/icon_curve_create.png
similarity index 100%
rename from tools/editor/icons/icon_curve_create.png
rename to editor/icons/icon_curve_create.png
diff --git a/tools/editor/icons/icon_curve_curve.png b/editor/icons/icon_curve_curve.png
similarity index 100%
rename from tools/editor/icons/icon_curve_curve.png
rename to editor/icons/icon_curve_curve.png
diff --git a/tools/editor/icons/icon_curve_delete.png b/editor/icons/icon_curve_delete.png
similarity index 100%
rename from tools/editor/icons/icon_curve_delete.png
rename to editor/icons/icon_curve_delete.png
diff --git a/tools/editor/icons/icon_curve_edit.png b/editor/icons/icon_curve_edit.png
similarity index 100%
rename from tools/editor/icons/icon_curve_edit.png
rename to editor/icons/icon_curve_edit.png
diff --git a/tools/editor/icons/icon_curve_in.png b/editor/icons/icon_curve_in.png
similarity index 100%
rename from tools/editor/icons/icon_curve_in.png
rename to editor/icons/icon_curve_in.png
diff --git a/tools/editor/icons/icon_curve_in_out.png b/editor/icons/icon_curve_in_out.png
similarity index 100%
rename from tools/editor/icons/icon_curve_in_out.png
rename to editor/icons/icon_curve_in_out.png
diff --git a/tools/editor/icons/icon_curve_linear.png b/editor/icons/icon_curve_linear.png
similarity index 100%
rename from tools/editor/icons/icon_curve_linear.png
rename to editor/icons/icon_curve_linear.png
diff --git a/tools/editor/icons/icon_curve_out.png b/editor/icons/icon_curve_out.png
similarity index 100%
rename from tools/editor/icons/icon_curve_out.png
rename to editor/icons/icon_curve_out.png
diff --git a/tools/editor/icons/icon_curve_out_in.png b/editor/icons/icon_curve_out_in.png
similarity index 100%
rename from tools/editor/icons/icon_curve_out_in.png
rename to editor/icons/icon_curve_out_in.png
diff --git a/tools/editor/icons/icon_cylinder_shape.png b/editor/icons/icon_cylinder_shape.png
similarity index 100%
rename from tools/editor/icons/icon_cylinder_shape.png
rename to editor/icons/icon_cylinder_shape.png
diff --git a/tools/editor/icons/icon_d_o_f_blur_f_x.png b/editor/icons/icon_d_o_f_blur_f_x.png
similarity index 100%
rename from tools/editor/icons/icon_d_o_f_blur_f_x.png
rename to editor/icons/icon_d_o_f_blur_f_x.png
diff --git a/tools/editor/icons/icon_damped_spring_joint_2d.png b/editor/icons/icon_damped_spring_joint_2d.png
similarity index 100%
rename from tools/editor/icons/icon_damped_spring_joint_2d.png
rename to editor/icons/icon_damped_spring_joint_2d.png
diff --git a/tools/editor/icons/icon_debug.png b/editor/icons/icon_debug.png
similarity index 100%
rename from tools/editor/icons/icon_debug.png
rename to editor/icons/icon_debug.png
diff --git a/tools/editor/icons/icon_debug_continue.png b/editor/icons/icon_debug_continue.png
similarity index 100%
rename from tools/editor/icons/icon_debug_continue.png
rename to editor/icons/icon_debug_continue.png
diff --git a/tools/editor/icons/icon_debug_next.png b/editor/icons/icon_debug_next.png
similarity index 100%
rename from tools/editor/icons/icon_debug_next.png
rename to editor/icons/icon_debug_next.png
diff --git a/tools/editor/icons/icon_debug_step.png b/editor/icons/icon_debug_step.png
similarity index 100%
rename from tools/editor/icons/icon_debug_step.png
rename to editor/icons/icon_debug_step.png
diff --git a/tools/editor/icons/icon_default_project_icon.png b/editor/icons/icon_default_project_icon.png
similarity index 100%
rename from tools/editor/icons/icon_default_project_icon.png
rename to editor/icons/icon_default_project_icon.png
diff --git a/tools/editor/icons/icon_del.png b/editor/icons/icon_del.png
similarity index 100%
rename from tools/editor/icons/icon_del.png
rename to editor/icons/icon_del.png
diff --git a/tools/editor/icons/icon_dependency_changed.png b/editor/icons/icon_dependency_changed.png
similarity index 100%
rename from tools/editor/icons/icon_dependency_changed.png
rename to editor/icons/icon_dependency_changed.png
diff --git a/tools/editor/icons/icon_dependency_changed_hl.png b/editor/icons/icon_dependency_changed_hl.png
similarity index 100%
rename from tools/editor/icons/icon_dependency_changed_hl.png
rename to editor/icons/icon_dependency_changed_hl.png
diff --git a/tools/editor/icons/icon_dependency_local_changed.png b/editor/icons/icon_dependency_local_changed.png
similarity index 100%
rename from tools/editor/icons/icon_dependency_local_changed.png
rename to editor/icons/icon_dependency_local_changed.png
diff --git a/tools/editor/icons/icon_dependency_local_changed_hl.png b/editor/icons/icon_dependency_local_changed_hl.png
similarity index 100%
rename from tools/editor/icons/icon_dependency_local_changed_hl.png
rename to editor/icons/icon_dependency_local_changed_hl.png
diff --git a/tools/editor/icons/icon_dependency_ok.png b/editor/icons/icon_dependency_ok.png
similarity index 100%
rename from tools/editor/icons/icon_dependency_ok.png
rename to editor/icons/icon_dependency_ok.png
diff --git a/tools/editor/icons/icon_dependency_ok_hl.png b/editor/icons/icon_dependency_ok_hl.png
similarity index 100%
rename from tools/editor/icons/icon_dependency_ok_hl.png
rename to editor/icons/icon_dependency_ok_hl.png
diff --git a/tools/editor/icons/icon_directional_light.png b/editor/icons/icon_directional_light.png
similarity index 100%
rename from tools/editor/icons/icon_directional_light.png
rename to editor/icons/icon_directional_light.png
diff --git a/tools/editor/icons/icon_distraction_free.png b/editor/icons/icon_distraction_free.png
similarity index 100%
rename from tools/editor/icons/icon_distraction_free.png
rename to editor/icons/icon_distraction_free.png
diff --git a/tools/editor/icons/icon_doc_code_font.png b/editor/icons/icon_doc_code_font.png
similarity index 100%
rename from tools/editor/icons/icon_doc_code_font.png
rename to editor/icons/icon_doc_code_font.png
diff --git a/tools/editor/icons/icon_doc_font.png b/editor/icons/icon_doc_font.png
similarity index 100%
rename from tools/editor/icons/icon_doc_font.png
rename to editor/icons/icon_doc_font.png
diff --git a/tools/editor/icons/icon_doc_title_font.png b/editor/icons/icon_doc_title_font.png
similarity index 100%
rename from tools/editor/icons/icon_doc_title_font.png
rename to editor/icons/icon_doc_title_font.png
diff --git a/tools/editor/icons/icon_down.png b/editor/icons/icon_down.png
similarity index 100%
rename from tools/editor/icons/icon_down.png
rename to editor/icons/icon_down.png
diff --git a/tools/editor/icons/icon_dummy.png b/editor/icons/icon_dummy.png
similarity index 100%
rename from tools/editor/icons/icon_dummy.png
rename to editor/icons/icon_dummy.png
diff --git a/tools/editor/icons/icon_duplicate.png b/editor/icons/icon_duplicate.png
similarity index 100%
rename from tools/editor/icons/icon_duplicate.png
rename to editor/icons/icon_duplicate.png
diff --git a/tools/editor/icons/icon_dynamic_character_body.png b/editor/icons/icon_dynamic_character_body.png
similarity index 100%
rename from tools/editor/icons/icon_dynamic_character_body.png
rename to editor/icons/icon_dynamic_character_body.png
diff --git a/tools/editor/icons/icon_dynamic_custom_body.png b/editor/icons/icon_dynamic_custom_body.png
similarity index 100%
rename from tools/editor/icons/icon_dynamic_custom_body.png
rename to editor/icons/icon_dynamic_custom_body.png
diff --git a/tools/editor/icons/icon_dynamic_font.png b/editor/icons/icon_dynamic_font.png
similarity index 100%
rename from tools/editor/icons/icon_dynamic_font.png
rename to editor/icons/icon_dynamic_font.png
diff --git a/tools/editor/icons/icon_dynamic_font_data.png b/editor/icons/icon_dynamic_font_data.png
similarity index 100%
rename from tools/editor/icons/icon_dynamic_font_data.png
rename to editor/icons/icon_dynamic_font_data.png
diff --git a/tools/editor/icons/icon_dynamic_rigid_body.png b/editor/icons/icon_dynamic_rigid_body.png
similarity index 100%
rename from tools/editor/icons/icon_dynamic_rigid_body.png
rename to editor/icons/icon_dynamic_rigid_body.png
diff --git a/tools/editor/icons/icon_edit.png b/editor/icons/icon_edit.png
similarity index 100%
rename from tools/editor/icons/icon_edit.png
rename to editor/icons/icon_edit.png
diff --git a/tools/editor/icons/icon_edit_key.png b/editor/icons/icon_edit_key.png
similarity index 100%
rename from tools/editor/icons/icon_edit_key.png
rename to editor/icons/icon_edit_key.png
diff --git a/tools/editor/icons/icon_edit_pivot.png b/editor/icons/icon_edit_pivot.png
similarity index 100%
rename from tools/editor/icons/icon_edit_pivot.png
rename to editor/icons/icon_edit_pivot.png
diff --git a/tools/editor/icons/icon_edit_resource.png b/editor/icons/icon_edit_resource.png
similarity index 100%
rename from tools/editor/icons/icon_edit_resource.png
rename to editor/icons/icon_edit_resource.png
diff --git a/tools/editor/icons/icon_edit_small.png b/editor/icons/icon_edit_small.png
similarity index 100%
rename from tools/editor/icons/icon_edit_small.png
rename to editor/icons/icon_edit_small.png
diff --git a/tools/editor/icons/icon_editor_2d.png b/editor/icons/icon_editor_2d.png
similarity index 100%
rename from tools/editor/icons/icon_editor_2d.png
rename to editor/icons/icon_editor_2d.png
diff --git a/tools/editor/icons/icon_editor_3d_handle.png b/editor/icons/icon_editor_3d_handle.png
similarity index 100%
rename from tools/editor/icons/icon_editor_3d_handle.png
rename to editor/icons/icon_editor_3d_handle.png
diff --git a/tools/editor/icons/icon_editor_focus.png b/editor/icons/icon_editor_focus.png
similarity index 100%
rename from tools/editor/icons/icon_editor_focus.png
rename to editor/icons/icon_editor_focus.png
diff --git a/tools/editor/icons/icon_editor_handle.png b/editor/icons/icon_editor_handle.png
similarity index 100%
rename from tools/editor/icons/icon_editor_handle.png
rename to editor/icons/icon_editor_handle.png
diff --git a/tools/editor/icons/icon_editor_node.png b/editor/icons/icon_editor_node.png
similarity index 100%
rename from tools/editor/icons/icon_editor_node.png
rename to editor/icons/icon_editor_node.png
diff --git a/tools/editor/icons/icon_editor_pivot.png b/editor/icons/icon_editor_pivot.png
similarity index 100%
rename from tools/editor/icons/icon_editor_pivot.png
rename to editor/icons/icon_editor_pivot.png
diff --git a/tools/editor/icons/icon_editor_plugin.png b/editor/icons/icon_editor_plugin.png
similarity index 100%
rename from tools/editor/icons/icon_editor_plugin.png
rename to editor/icons/icon_editor_plugin.png
diff --git a/tools/editor/icons/icon_editor_rect_2d.png b/editor/icons/icon_editor_rect_2d.png
similarity index 100%
rename from tools/editor/icons/icon_editor_rect_2d.png
rename to editor/icons/icon_editor_rect_2d.png
diff --git a/tools/editor/icons/icon_empty_control.png b/editor/icons/icon_empty_control.png
similarity index 100%
rename from tools/editor/icons/icon_empty_control.png
rename to editor/icons/icon_empty_control.png
diff --git a/tools/editor/icons/icon_enum.png b/editor/icons/icon_enum.png
similarity index 100%
rename from tools/editor/icons/icon_enum.png
rename to editor/icons/icon_enum.png
diff --git a/tools/editor/icons/icon_environment.png b/editor/icons/icon_environment.png
similarity index 100%
rename from tools/editor/icons/icon_environment.png
rename to editor/icons/icon_environment.png
diff --git a/tools/editor/icons/icon_error.png b/editor/icons/icon_error.png
similarity index 100%
rename from tools/editor/icons/icon_error.png
rename to editor/icons/icon_error.png
diff --git a/tools/editor/icons/icon_error_sign.png b/editor/icons/icon_error_sign.png
similarity index 100%
rename from tools/editor/icons/icon_error_sign.png
rename to editor/icons/icon_error_sign.png
diff --git a/tools/editor/icons/icon_event_player.png b/editor/icons/icon_event_player.png
similarity index 100%
rename from tools/editor/icons/icon_event_player.png
rename to editor/icons/icon_event_player.png
diff --git a/tools/editor/icons/icon_expand.png b/editor/icons/icon_expand.png
similarity index 100%
rename from tools/editor/icons/icon_expand.png
rename to editor/icons/icon_expand.png
diff --git a/tools/editor/icons/icon_expand_hl.png b/editor/icons/icon_expand_hl.png
similarity index 100%
rename from tools/editor/icons/icon_expand_hl.png
rename to editor/icons/icon_expand_hl.png
diff --git a/tools/editor/icons/icon_favorites.png b/editor/icons/icon_favorites.png
similarity index 100%
rename from tools/editor/icons/icon_favorites.png
rename to editor/icons/icon_favorites.png
diff --git a/tools/editor/icons/icon_file.png b/editor/icons/icon_file.png
similarity index 100%
rename from tools/editor/icons/icon_file.png
rename to editor/icons/icon_file.png
diff --git a/tools/editor/icons/icon_file_big.png b/editor/icons/icon_file_big.png
similarity index 100%
rename from tools/editor/icons/icon_file_big.png
rename to editor/icons/icon_file_big.png
diff --git a/tools/editor/icons/icon_file_dialog.png b/editor/icons/icon_file_dialog.png
similarity index 100%
rename from tools/editor/icons/icon_file_dialog.png
rename to editor/icons/icon_file_dialog.png
diff --git a/tools/editor/icons/icon_file_list.png b/editor/icons/icon_file_list.png
similarity index 100%
rename from tools/editor/icons/icon_file_list.png
rename to editor/icons/icon_file_list.png
diff --git a/tools/editor/icons/icon_file_server.png b/editor/icons/icon_file_server.png
similarity index 100%
rename from tools/editor/icons/icon_file_server.png
rename to editor/icons/icon_file_server.png
diff --git a/tools/editor/icons/icon_file_server_active.png b/editor/icons/icon_file_server_active.png
similarity index 100%
rename from tools/editor/icons/icon_file_server_active.png
rename to editor/icons/icon_file_server_active.png
diff --git a/tools/editor/icons/icon_file_thumbnail.png b/editor/icons/icon_file_thumbnail.png
similarity index 100%
rename from tools/editor/icons/icon_file_thumbnail.png
rename to editor/icons/icon_file_thumbnail.png
diff --git a/tools/editor/icons/icon_filesystem.png b/editor/icons/icon_filesystem.png
similarity index 100%
rename from tools/editor/icons/icon_filesystem.png
rename to editor/icons/icon_filesystem.png
diff --git a/tools/editor/icons/icon_fixed_material.png b/editor/icons/icon_fixed_material.png
similarity index 100%
rename from tools/editor/icons/icon_fixed_material.png
rename to editor/icons/icon_fixed_material.png
diff --git a/tools/editor/icons/icon_fixed_spatial_material.png b/editor/icons/icon_fixed_spatial_material.png
similarity index 100%
rename from tools/editor/icons/icon_fixed_spatial_material.png
rename to editor/icons/icon_fixed_spatial_material.png
diff --git a/tools/editor/icons/icon_fog_f_x.png b/editor/icons/icon_fog_f_x.png
similarity index 100%
rename from tools/editor/icons/icon_fog_f_x.png
rename to editor/icons/icon_fog_f_x.png
diff --git a/tools/editor/icons/icon_folder.png b/editor/icons/icon_folder.png
similarity index 100%
rename from tools/editor/icons/icon_folder.png
rename to editor/icons/icon_folder.png
diff --git a/tools/editor/icons/icon_folder_big.png b/editor/icons/icon_folder_big.png
similarity index 100%
rename from tools/editor/icons/icon_folder_big.png
rename to editor/icons/icon_folder_big.png
diff --git a/tools/editor/icons/icon_folder_scene.png b/editor/icons/icon_folder_scene.png
similarity index 100%
rename from tools/editor/icons/icon_folder_scene.png
rename to editor/icons/icon_folder_scene.png
diff --git a/tools/editor/icons/icon_font.png b/editor/icons/icon_font.png
similarity index 100%
rename from tools/editor/icons/icon_font.png
rename to editor/icons/icon_font.png
diff --git a/tools/editor/icons/icon_forward.png b/editor/icons/icon_forward.png
similarity index 100%
rename from tools/editor/icons/icon_forward.png
rename to editor/icons/icon_forward.png
diff --git a/tools/editor/icons/icon_forward_no.png b/editor/icons/icon_forward_no.png
similarity index 100%
rename from tools/editor/icons/icon_forward_no.png
rename to editor/icons/icon_forward_no.png
diff --git a/tools/editor/icons/icon_func.png b/editor/icons/icon_func.png
similarity index 100%
rename from tools/editor/icons/icon_func.png
rename to editor/icons/icon_func.png
diff --git a/tools/editor/icons/icon_g_d_script.png b/editor/icons/icon_g_d_script.png
similarity index 100%
rename from tools/editor/icons/icon_g_d_script.png
rename to editor/icons/icon_g_d_script.png
diff --git a/tools/editor/icons/icon_g_i_probe.png b/editor/icons/icon_g_i_probe.png
similarity index 100%
rename from tools/editor/icons/icon_g_i_probe.png
rename to editor/icons/icon_g_i_probe.png
diff --git a/tools/editor/icons/icon_g_i_probe_data.png b/editor/icons/icon_g_i_probe_data.png
similarity index 100%
rename from tools/editor/icons/icon_g_i_probe_data.png
rename to editor/icons/icon_g_i_probe_data.png
diff --git a/tools/editor/icons/icon_gamma_f_x.png b/editor/icons/icon_gamma_f_x.png
similarity index 100%
rename from tools/editor/icons/icon_gamma_f_x.png
rename to editor/icons/icon_gamma_f_x.png
diff --git a/tools/editor/icons/icon_generic_6_d_o_f_joint.png b/editor/icons/icon_generic_6_d_o_f_joint.png
similarity index 100%
rename from tools/editor/icons/icon_generic_6_d_o_f_joint.png
rename to editor/icons/icon_generic_6_d_o_f_joint.png
diff --git a/tools/editor/icons/icon_gizmo_directional_light.png b/editor/icons/icon_gizmo_directional_light.png
similarity index 100%
rename from tools/editor/icons/icon_gizmo_directional_light.png
rename to editor/icons/icon_gizmo_directional_light.png
diff --git a/tools/editor/icons/icon_gizmo_light.png b/editor/icons/icon_gizmo_light.png
similarity index 100%
rename from tools/editor/icons/icon_gizmo_light.png
rename to editor/icons/icon_gizmo_light.png
diff --git a/tools/editor/icons/icon_gizmo_listener.png b/editor/icons/icon_gizmo_listener.png
similarity index 100%
rename from tools/editor/icons/icon_gizmo_listener.png
rename to editor/icons/icon_gizmo_listener.png
diff --git a/tools/editor/icons/icon_gizmo_spatial_sample_player.png b/editor/icons/icon_gizmo_spatial_sample_player.png
similarity index 100%
rename from tools/editor/icons/icon_gizmo_spatial_sample_player.png
rename to editor/icons/icon_gizmo_spatial_sample_player.png
diff --git a/tools/editor/icons/icon_gizmo_spatial_stream_player.png b/editor/icons/icon_gizmo_spatial_stream_player.png
similarity index 100%
rename from tools/editor/icons/icon_gizmo_spatial_stream_player.png
rename to editor/icons/icon_gizmo_spatial_stream_player.png
diff --git a/tools/editor/icons/icon_glow_f_x.png b/editor/icons/icon_glow_f_x.png
similarity index 100%
rename from tools/editor/icons/icon_glow_f_x.png
rename to editor/icons/icon_glow_f_x.png
diff --git a/tools/editor/icons/icon_godot.png b/editor/icons/icon_godot.png
similarity index 100%
rename from tools/editor/icons/icon_godot.png
rename to editor/icons/icon_godot.png
diff --git a/tools/editor/icons/icon_godot_asset_default.png b/editor/icons/icon_godot_asset_default.png
similarity index 100%
rename from tools/editor/icons/icon_godot_asset_default.png
rename to editor/icons/icon_godot_asset_default.png
diff --git a/tools/editor/icons/icon_graph_color_ramp.png b/editor/icons/icon_graph_color_ramp.png
similarity index 100%
rename from tools/editor/icons/icon_graph_color_ramp.png
rename to editor/icons/icon_graph_color_ramp.png
diff --git a/tools/editor/icons/icon_graph_comment.png b/editor/icons/icon_graph_comment.png
similarity index 100%
rename from tools/editor/icons/icon_graph_comment.png
rename to editor/icons/icon_graph_comment.png
diff --git a/tools/editor/icons/icon_graph_cube_uniform.png b/editor/icons/icon_graph_cube_uniform.png
similarity index 100%
rename from tools/editor/icons/icon_graph_cube_uniform.png
rename to editor/icons/icon_graph_cube_uniform.png
diff --git a/tools/editor/icons/icon_graph_curve_map.png b/editor/icons/icon_graph_curve_map.png
similarity index 100%
rename from tools/editor/icons/icon_graph_curve_map.png
rename to editor/icons/icon_graph_curve_map.png
diff --git a/tools/editor/icons/icon_graph_default_texture.png b/editor/icons/icon_graph_default_texture.png
similarity index 100%
rename from tools/editor/icons/icon_graph_default_texture.png
rename to editor/icons/icon_graph_default_texture.png
diff --git a/tools/editor/icons/icon_graph_edit.png b/editor/icons/icon_graph_edit.png
similarity index 100%
rename from tools/editor/icons/icon_graph_edit.png
rename to editor/icons/icon_graph_edit.png
diff --git a/tools/editor/icons/icon_graph_input.png b/editor/icons/icon_graph_input.png
similarity index 100%
rename from tools/editor/icons/icon_graph_input.png
rename to editor/icons/icon_graph_input.png
diff --git a/tools/editor/icons/icon_graph_node.png b/editor/icons/icon_graph_node.png
similarity index 100%
rename from tools/editor/icons/icon_graph_node.png
rename to editor/icons/icon_graph_node.png
diff --git a/tools/editor/icons/icon_graph_rgb.png b/editor/icons/icon_graph_rgb.png
similarity index 100%
rename from tools/editor/icons/icon_graph_rgb.png
rename to editor/icons/icon_graph_rgb.png
diff --git a/tools/editor/icons/icon_graph_rgb_op.png b/editor/icons/icon_graph_rgb_op.png
similarity index 100%
rename from tools/editor/icons/icon_graph_rgb_op.png
rename to editor/icons/icon_graph_rgb_op.png
diff --git a/tools/editor/icons/icon_graph_rgb_uniform.png b/editor/icons/icon_graph_rgb_uniform.png
similarity index 100%
rename from tools/editor/icons/icon_graph_rgb_uniform.png
rename to editor/icons/icon_graph_rgb_uniform.png
diff --git a/tools/editor/icons/icon_graph_scalar.png b/editor/icons/icon_graph_scalar.png
similarity index 100%
rename from tools/editor/icons/icon_graph_scalar.png
rename to editor/icons/icon_graph_scalar.png
diff --git a/tools/editor/icons/icon_graph_scalar_interp.png b/editor/icons/icon_graph_scalar_interp.png
similarity index 100%
rename from tools/editor/icons/icon_graph_scalar_interp.png
rename to editor/icons/icon_graph_scalar_interp.png
diff --git a/tools/editor/icons/icon_graph_scalar_op.png b/editor/icons/icon_graph_scalar_op.png
similarity index 100%
rename from tools/editor/icons/icon_graph_scalar_op.png
rename to editor/icons/icon_graph_scalar_op.png
diff --git a/tools/editor/icons/icon_graph_scalar_uniform.png b/editor/icons/icon_graph_scalar_uniform.png
similarity index 100%
rename from tools/editor/icons/icon_graph_scalar_uniform.png
rename to editor/icons/icon_graph_scalar_uniform.png
diff --git a/tools/editor/icons/icon_graph_scalars_to_vec.png b/editor/icons/icon_graph_scalars_to_vec.png
similarity index 100%
rename from tools/editor/icons/icon_graph_scalars_to_vec.png
rename to editor/icons/icon_graph_scalars_to_vec.png
diff --git a/tools/editor/icons/icon_graph_texscreen.png b/editor/icons/icon_graph_texscreen.png
similarity index 100%
rename from tools/editor/icons/icon_graph_texscreen.png
rename to editor/icons/icon_graph_texscreen.png
diff --git a/tools/editor/icons/icon_graph_texture_uniform.png b/editor/icons/icon_graph_texture_uniform.png
similarity index 100%
rename from tools/editor/icons/icon_graph_texture_uniform.png
rename to editor/icons/icon_graph_texture_uniform.png
diff --git a/tools/editor/icons/icon_graph_time.png b/editor/icons/icon_graph_time.png
similarity index 100%
rename from tools/editor/icons/icon_graph_time.png
rename to editor/icons/icon_graph_time.png
diff --git a/tools/editor/icons/icon_graph_vec_dp.png b/editor/icons/icon_graph_vec_dp.png
similarity index 100%
rename from tools/editor/icons/icon_graph_vec_dp.png
rename to editor/icons/icon_graph_vec_dp.png
diff --git a/tools/editor/icons/icon_graph_vec_interp.png b/editor/icons/icon_graph_vec_interp.png
similarity index 100%
rename from tools/editor/icons/icon_graph_vec_interp.png
rename to editor/icons/icon_graph_vec_interp.png
diff --git a/tools/editor/icons/icon_graph_vec_length.png b/editor/icons/icon_graph_vec_length.png
similarity index 100%
rename from tools/editor/icons/icon_graph_vec_length.png
rename to editor/icons/icon_graph_vec_length.png
diff --git a/tools/editor/icons/icon_graph_vec_op.png b/editor/icons/icon_graph_vec_op.png
similarity index 100%
rename from tools/editor/icons/icon_graph_vec_op.png
rename to editor/icons/icon_graph_vec_op.png
diff --git a/tools/editor/icons/icon_graph_vec_scalar_op.png b/editor/icons/icon_graph_vec_scalar_op.png
similarity index 100%
rename from tools/editor/icons/icon_graph_vec_scalar_op.png
rename to editor/icons/icon_graph_vec_scalar_op.png
diff --git a/tools/editor/icons/icon_graph_vec_to_scalars.png b/editor/icons/icon_graph_vec_to_scalars.png
similarity index 100%
rename from tools/editor/icons/icon_graph_vec_to_scalars.png
rename to editor/icons/icon_graph_vec_to_scalars.png
diff --git a/tools/editor/icons/icon_graph_vecs_to_xform.png b/editor/icons/icon_graph_vecs_to_xform.png
similarity index 100%
rename from tools/editor/icons/icon_graph_vecs_to_xform.png
rename to editor/icons/icon_graph_vecs_to_xform.png
diff --git a/tools/editor/icons/icon_graph_vector.png b/editor/icons/icon_graph_vector.png
similarity index 100%
rename from tools/editor/icons/icon_graph_vector.png
rename to editor/icons/icon_graph_vector.png
diff --git a/tools/editor/icons/icon_graph_vector_uniform.png b/editor/icons/icon_graph_vector_uniform.png
similarity index 100%
rename from tools/editor/icons/icon_graph_vector_uniform.png
rename to editor/icons/icon_graph_vector_uniform.png
diff --git a/tools/editor/icons/icon_graph_xform.png b/editor/icons/icon_graph_xform.png
similarity index 100%
rename from tools/editor/icons/icon_graph_xform.png
rename to editor/icons/icon_graph_xform.png
diff --git a/tools/editor/icons/icon_graph_xform_mult.png b/editor/icons/icon_graph_xform_mult.png
similarity index 100%
rename from tools/editor/icons/icon_graph_xform_mult.png
rename to editor/icons/icon_graph_xform_mult.png
diff --git a/tools/editor/icons/icon_graph_xform_scalar_func.png b/editor/icons/icon_graph_xform_scalar_func.png
similarity index 100%
rename from tools/editor/icons/icon_graph_xform_scalar_func.png
rename to editor/icons/icon_graph_xform_scalar_func.png
diff --git a/tools/editor/icons/icon_graph_xform_to_vecs.png b/editor/icons/icon_graph_xform_to_vecs.png
similarity index 100%
rename from tools/editor/icons/icon_graph_xform_to_vecs.png
rename to editor/icons/icon_graph_xform_to_vecs.png
diff --git a/tools/editor/icons/icon_graph_xform_uniform.png b/editor/icons/icon_graph_xform_uniform.png
similarity index 100%
rename from tools/editor/icons/icon_graph_xform_uniform.png
rename to editor/icons/icon_graph_xform_uniform.png
diff --git a/tools/editor/icons/icon_graph_xform_vec_func.png b/editor/icons/icon_graph_xform_vec_func.png
similarity index 100%
rename from tools/editor/icons/icon_graph_xform_vec_func.png
rename to editor/icons/icon_graph_xform_vec_func.png
diff --git a/tools/editor/icons/icon_graph_xform_vec_imult.png b/editor/icons/icon_graph_xform_vec_imult.png
similarity index 100%
rename from tools/editor/icons/icon_graph_xform_vec_imult.png
rename to editor/icons/icon_graph_xform_vec_imult.png
diff --git a/tools/editor/icons/icon_graph_xform_vec_mult.png b/editor/icons/icon_graph_xform_vec_mult.png
similarity index 100%
rename from tools/editor/icons/icon_graph_xform_vec_mult.png
rename to editor/icons/icon_graph_xform_vec_mult.png
diff --git a/tools/editor/icons/icon_grid.png b/editor/icons/icon_grid.png
similarity index 100%
rename from tools/editor/icons/icon_grid.png
rename to editor/icons/icon_grid.png
diff --git a/tools/editor/icons/icon_grid_container.png b/editor/icons/icon_grid_container.png
similarity index 100%
rename from tools/editor/icons/icon_grid_container.png
rename to editor/icons/icon_grid_container.png
diff --git a/tools/editor/icons/icon_grid_map.png b/editor/icons/icon_grid_map.png
similarity index 100%
rename from tools/editor/icons/icon_grid_map.png
rename to editor/icons/icon_grid_map.png
diff --git a/tools/editor/icons/icon_grid_map_floor.png b/editor/icons/icon_grid_map_floor.png
similarity index 100%
rename from tools/editor/icons/icon_grid_map_floor.png
rename to editor/icons/icon_grid_map_floor.png
diff --git a/tools/editor/icons/icon_groove_joint_2d.png b/editor/icons/icon_groove_joint_2d.png
similarity index 100%
rename from tools/editor/icons/icon_groove_joint_2d.png
rename to editor/icons/icon_groove_joint_2d.png
diff --git a/tools/editor/icons/icon_group.png b/editor/icons/icon_group.png
similarity index 100%
rename from tools/editor/icons/icon_group.png
rename to editor/icons/icon_group.png
diff --git a/tools/editor/icons/icon_groups.png b/editor/icons/icon_groups.png
similarity index 100%
rename from tools/editor/icons/icon_groups.png
rename to editor/icons/icon_groups.png
diff --git a/tools/editor/icons/icon_h_box_container.png b/editor/icons/icon_h_box_container.png
similarity index 100%
rename from tools/editor/icons/icon_h_box_container.png
rename to editor/icons/icon_h_box_container.png
diff --git a/tools/editor/icons/icon_h_button_array.png b/editor/icons/icon_h_button_array.png
similarity index 100%
rename from tools/editor/icons/icon_h_button_array.png
rename to editor/icons/icon_h_button_array.png
diff --git a/tools/editor/icons/icon_h_scroll_bar.png b/editor/icons/icon_h_scroll_bar.png
similarity index 100%
rename from tools/editor/icons/icon_h_scroll_bar.png
rename to editor/icons/icon_h_scroll_bar.png
diff --git a/tools/editor/icons/icon_h_separator.png b/editor/icons/icon_h_separator.png
similarity index 100%
rename from tools/editor/icons/icon_h_separator.png
rename to editor/icons/icon_h_separator.png
diff --git a/tools/editor/icons/icon_h_slider.png b/editor/icons/icon_h_slider.png
similarity index 100%
rename from tools/editor/icons/icon_h_slider.png
rename to editor/icons/icon_h_slider.png
diff --git a/tools/editor/icons/icon_h_split_container.png b/editor/icons/icon_h_split_container.png
similarity index 100%
rename from tools/editor/icons/icon_h_split_container.png
rename to editor/icons/icon_h_split_container.png
diff --git a/tools/editor/icons/icon_h_t_t_p_request.png b/editor/icons/icon_h_t_t_p_request.png
similarity index 100%
rename from tools/editor/icons/icon_h_t_t_p_request.png
rename to editor/icons/icon_h_t_t_p_request.png
diff --git a/tools/editor/icons/icon_headphones.png b/editor/icons/icon_headphones.png
similarity index 100%
rename from tools/editor/icons/icon_headphones.png
rename to editor/icons/icon_headphones.png
diff --git a/tools/editor/icons/icon_help.png b/editor/icons/icon_help.png
similarity index 100%
rename from tools/editor/icons/icon_help.png
rename to editor/icons/icon_help.png
diff --git a/tools/editor/icons/icon_hidden.png b/editor/icons/icon_hidden.png
similarity index 100%
rename from tools/editor/icons/icon_hidden.png
rename to editor/icons/icon_hidden.png
diff --git a/tools/editor/icons/icon_hinge_joint.png b/editor/icons/icon_hinge_joint.png
similarity index 100%
rename from tools/editor/icons/icon_hinge_joint.png
rename to editor/icons/icon_hinge_joint.png
diff --git a/tools/editor/icons/icon_history.png b/editor/icons/icon_history.png
similarity index 100%
rename from tools/editor/icons/icon_history.png
rename to editor/icons/icon_history.png
diff --git a/tools/editor/icons/icon_hsize.png b/editor/icons/icon_hsize.png
similarity index 100%
rename from tools/editor/icons/icon_hsize.png
rename to editor/icons/icon_hsize.png
diff --git a/tools/editor/icons/icon_iapi.png b/editor/icons/icon_iapi.png
similarity index 100%
rename from tools/editor/icons/icon_iapi.png
rename to editor/icons/icon_iapi.png
diff --git a/tools/editor/icons/icon_image.png b/editor/icons/icon_image.png
similarity index 100%
rename from tools/editor/icons/icon_image.png
rename to editor/icons/icon_image.png
diff --git a/tools/editor/icons/icon_image_sky_box.png b/editor/icons/icon_image_sky_box.png
similarity index 100%
rename from tools/editor/icons/icon_image_sky_box.png
rename to editor/icons/icon_image_sky_box.png
diff --git a/tools/editor/icons/icon_image_texture.png b/editor/icons/icon_image_texture.png
similarity index 100%
rename from tools/editor/icons/icon_image_texture.png
rename to editor/icons/icon_image_texture.png
diff --git a/tools/editor/icons/icon_immediate_geometry.png b/editor/icons/icon_immediate_geometry.png
similarity index 100%
rename from tools/editor/icons/icon_immediate_geometry.png
rename to editor/icons/icon_immediate_geometry.png
diff --git a/tools/editor/icons/icon_import_check.png b/editor/icons/icon_import_check.png
similarity index 100%
rename from tools/editor/icons/icon_import_check.png
rename to editor/icons/icon_import_check.png
diff --git a/tools/editor/icons/icon_import_fail.png b/editor/icons/icon_import_fail.png
similarity index 100%
rename from tools/editor/icons/icon_import_fail.png
rename to editor/icons/icon_import_fail.png
diff --git a/tools/editor/icons/icon_influence_zone.png b/editor/icons/icon_influence_zone.png
similarity index 100%
rename from tools/editor/icons/icon_influence_zone.png
rename to editor/icons/icon_influence_zone.png
diff --git a/tools/editor/icons/icon_instance.png b/editor/icons/icon_instance.png
similarity index 100%
rename from tools/editor/icons/icon_instance.png
rename to editor/icons/icon_instance.png
diff --git a/tools/editor/icons/icon_instance_options.png b/editor/icons/icon_instance_options.png
similarity index 100%
rename from tools/editor/icons/icon_instance_options.png
rename to editor/icons/icon_instance_options.png
diff --git a/tools/editor/icons/icon_integer.png b/editor/icons/icon_integer.png
similarity index 100%
rename from tools/editor/icons/icon_integer.png
rename to editor/icons/icon_integer.png
diff --git a/tools/editor/icons/icon_interp_cubic.png b/editor/icons/icon_interp_cubic.png
similarity index 100%
rename from tools/editor/icons/icon_interp_cubic.png
rename to editor/icons/icon_interp_cubic.png
diff --git a/tools/editor/icons/icon_interp_linear.png b/editor/icons/icon_interp_linear.png
similarity index 100%
rename from tools/editor/icons/icon_interp_linear.png
rename to editor/icons/icon_interp_linear.png
diff --git a/tools/editor/icons/icon_interp_raw.png b/editor/icons/icon_interp_raw.png
similarity index 100%
rename from tools/editor/icons/icon_interp_raw.png
rename to editor/icons/icon_interp_raw.png
diff --git a/tools/editor/icons/icon_interp_wrap_clamp.png b/editor/icons/icon_interp_wrap_clamp.png
similarity index 100%
rename from tools/editor/icons/icon_interp_wrap_clamp.png
rename to editor/icons/icon_interp_wrap_clamp.png
diff --git a/tools/editor/icons/icon_interp_wrap_loop.png b/editor/icons/icon_interp_wrap_loop.png
similarity index 100%
rename from tools/editor/icons/icon_interp_wrap_loop.png
rename to editor/icons/icon_interp_wrap_loop.png
diff --git a/tools/editor/icons/icon_interpolated_camera.png b/editor/icons/icon_interpolated_camera.png
similarity index 100%
rename from tools/editor/icons/icon_interpolated_camera.png
rename to editor/icons/icon_interpolated_camera.png
diff --git a/tools/editor/icons/icon_invalid_key.png b/editor/icons/icon_invalid_key.png
similarity index 100%
rename from tools/editor/icons/icon_invalid_key.png
rename to editor/icons/icon_invalid_key.png
diff --git a/tools/editor/icons/icon_inverse_kinematics.png b/editor/icons/icon_inverse_kinematics.png
similarity index 100%
rename from tools/editor/icons/icon_inverse_kinematics.png
rename to editor/icons/icon_inverse_kinematics.png
diff --git a/tools/editor/icons/icon_item_list.png b/editor/icons/icon_item_list.png
similarity index 100%
rename from tools/editor/icons/icon_item_list.png
rename to editor/icons/icon_item_list.png
diff --git a/tools/editor/icons/icon_joy_axis.png b/editor/icons/icon_joy_axis.png
similarity index 100%
rename from tools/editor/icons/icon_joy_axis.png
rename to editor/icons/icon_joy_axis.png
diff --git a/tools/editor/icons/icon_joy_button.png b/editor/icons/icon_joy_button.png
similarity index 100%
rename from tools/editor/icons/icon_joy_button.png
rename to editor/icons/icon_joy_button.png
diff --git a/tools/editor/icons/icon_joypad.png b/editor/icons/icon_joypad.png
similarity index 100%
rename from tools/editor/icons/icon_joypad.png
rename to editor/icons/icon_joypad.png
diff --git a/tools/editor/icons/icon_key.png b/editor/icons/icon_key.png
similarity index 100%
rename from tools/editor/icons/icon_key.png
rename to editor/icons/icon_key.png
diff --git a/tools/editor/icons/icon_key_call.png b/editor/icons/icon_key_call.png
similarity index 100%
rename from tools/editor/icons/icon_key_call.png
rename to editor/icons/icon_key_call.png
diff --git a/tools/editor/icons/icon_key_hover.png b/editor/icons/icon_key_hover.png
similarity index 100%
rename from tools/editor/icons/icon_key_hover.png
rename to editor/icons/icon_key_hover.png
diff --git a/tools/editor/icons/icon_key_invalid.png b/editor/icons/icon_key_invalid.png
similarity index 100%
rename from tools/editor/icons/icon_key_invalid.png
rename to editor/icons/icon_key_invalid.png
diff --git a/tools/editor/icons/icon_key_invalid_hover.png b/editor/icons/icon_key_invalid_hover.png
similarity index 100%
rename from tools/editor/icons/icon_key_invalid_hover.png
rename to editor/icons/icon_key_invalid_hover.png
diff --git a/tools/editor/icons/icon_key_next.png b/editor/icons/icon_key_next.png
similarity index 100%
rename from tools/editor/icons/icon_key_next.png
rename to editor/icons/icon_key_next.png
diff --git a/tools/editor/icons/icon_key_selected.png b/editor/icons/icon_key_selected.png
similarity index 100%
rename from tools/editor/icons/icon_key_selected.png
rename to editor/icons/icon_key_selected.png
diff --git a/tools/editor/icons/icon_key_value.png b/editor/icons/icon_key_value.png
similarity index 100%
rename from tools/editor/icons/icon_key_value.png
rename to editor/icons/icon_key_value.png
diff --git a/tools/editor/icons/icon_key_xform.png b/editor/icons/icon_key_xform.png
similarity index 100%
rename from tools/editor/icons/icon_key_xform.png
rename to editor/icons/icon_key_xform.png
diff --git a/tools/editor/icons/icon_keyboard.png b/editor/icons/icon_keyboard.png
similarity index 100%
rename from tools/editor/icons/icon_keyboard.png
rename to editor/icons/icon_keyboard.png
diff --git a/tools/editor/icons/icon_keying.png b/editor/icons/icon_keying.png
similarity index 100%
rename from tools/editor/icons/icon_keying.png
rename to editor/icons/icon_keying.png
diff --git a/tools/editor/icons/icon_kinematic_body.png b/editor/icons/icon_kinematic_body.png
similarity index 100%
rename from tools/editor/icons/icon_kinematic_body.png
rename to editor/icons/icon_kinematic_body.png
diff --git a/tools/editor/icons/icon_kinematic_body_2d.png b/editor/icons/icon_kinematic_body_2d.png
similarity index 100%
rename from tools/editor/icons/icon_kinematic_body_2d.png
rename to editor/icons/icon_kinematic_body_2d.png
diff --git a/tools/editor/icons/icon_label.png b/editor/icons/icon_label.png
similarity index 100%
rename from tools/editor/icons/icon_label.png
rename to editor/icons/icon_label.png
diff --git a/tools/editor/icons/icon_large_texture.png b/editor/icons/icon_large_texture.png
similarity index 100%
rename from tools/editor/icons/icon_large_texture.png
rename to editor/icons/icon_large_texture.png
diff --git a/tools/editor/icons/icon_light_2d.png b/editor/icons/icon_light_2d.png
similarity index 100%
rename from tools/editor/icons/icon_light_2d.png
rename to editor/icons/icon_light_2d.png
diff --git a/tools/editor/icons/icon_light_map.png b/editor/icons/icon_light_map.png
similarity index 100%
rename from tools/editor/icons/icon_light_map.png
rename to editor/icons/icon_light_map.png
diff --git a/tools/editor/icons/icon_light_occluder_2d.png b/editor/icons/icon_light_occluder_2d.png
similarity index 100%
rename from tools/editor/icons/icon_light_occluder_2d.png
rename to editor/icons/icon_light_occluder_2d.png
diff --git a/tools/editor/icons/icon_lightr.png b/editor/icons/icon_lightr.png
similarity index 100%
rename from tools/editor/icons/icon_lightr.png
rename to editor/icons/icon_lightr.png
diff --git a/tools/editor/icons/icon_line_2d.png b/editor/icons/icon_line_2d.png
similarity index 100%
rename from tools/editor/icons/icon_line_2d.png
rename to editor/icons/icon_line_2d.png
diff --git a/tools/editor/icons/icon_line_edit.png b/editor/icons/icon_line_edit.png
similarity index 100%
rename from tools/editor/icons/icon_line_edit.png
rename to editor/icons/icon_line_edit.png
diff --git a/tools/editor/icons/icon_line_shape_2d.png b/editor/icons/icon_line_shape_2d.png
similarity index 100%
rename from tools/editor/icons/icon_line_shape_2d.png
rename to editor/icons/icon_line_shape_2d.png
diff --git a/tools/editor/icons/icon_link_button.png b/editor/icons/icon_link_button.png
similarity index 100%
rename from tools/editor/icons/icon_link_button.png
rename to editor/icons/icon_link_button.png
diff --git a/tools/editor/icons/icon_list_select.png b/editor/icons/icon_list_select.png
similarity index 100%
rename from tools/editor/icons/icon_list_select.png
rename to editor/icons/icon_list_select.png
diff --git a/tools/editor/icons/icon_listener.png b/editor/icons/icon_listener.png
similarity index 100%
rename from tools/editor/icons/icon_listener.png
rename to editor/icons/icon_listener.png
diff --git a/tools/editor/icons/icon_live_debug.png b/editor/icons/icon_live_debug.png
similarity index 100%
rename from tools/editor/icons/icon_live_debug.png
rename to editor/icons/icon_live_debug.png
diff --git a/tools/editor/icons/icon_load.png b/editor/icons/icon_load.png
similarity index 100%
rename from tools/editor/icons/icon_load.png
rename to editor/icons/icon_load.png
diff --git a/tools/editor/icons/icon_lock.png b/editor/icons/icon_lock.png
similarity index 100%
rename from tools/editor/icons/icon_lock.png
rename to editor/icons/icon_lock.png
diff --git a/tools/editor/icons/icon_logo.png b/editor/icons/icon_logo.png
similarity index 100%
rename from tools/editor/icons/icon_logo.png
rename to editor/icons/icon_logo.png
diff --git a/tools/editor/icons/icon_logo_small.png b/editor/icons/icon_logo_small.png
similarity index 100%
rename from tools/editor/icons/icon_logo_small.png
rename to editor/icons/icon_logo_small.png
diff --git a/tools/editor/icons/icon_loop.png b/editor/icons/icon_loop.png
similarity index 100%
rename from tools/editor/icons/icon_loop.png
rename to editor/icons/icon_loop.png
diff --git a/tools/editor/icons/icon_loop_interpolation.png b/editor/icons/icon_loop_interpolation.png
similarity index 100%
rename from tools/editor/icons/icon_loop_interpolation.png
rename to editor/icons/icon_loop_interpolation.png
diff --git a/tools/editor/icons/icon_main_play.png b/editor/icons/icon_main_play.png
similarity index 100%
rename from tools/editor/icons/icon_main_play.png
rename to editor/icons/icon_main_play.png
diff --git a/tools/editor/icons/icon_main_stop.png b/editor/icons/icon_main_stop.png
similarity index 100%
rename from tools/editor/icons/icon_main_stop.png
rename to editor/icons/icon_main_stop.png
diff --git a/tools/editor/icons/icon_margin_container.png b/editor/icons/icon_margin_container.png
similarity index 100%
rename from tools/editor/icons/icon_margin_container.png
rename to editor/icons/icon_margin_container.png
diff --git a/tools/editor/icons/icon_material_preview_cube.png b/editor/icons/icon_material_preview_cube.png
similarity index 100%
rename from tools/editor/icons/icon_material_preview_cube.png
rename to editor/icons/icon_material_preview_cube.png
diff --git a/tools/editor/icons/icon_material_preview_cube_off.png b/editor/icons/icon_material_preview_cube_off.png
similarity index 100%
rename from tools/editor/icons/icon_material_preview_cube_off.png
rename to editor/icons/icon_material_preview_cube_off.png
diff --git a/tools/editor/icons/icon_material_preview_light_1.png b/editor/icons/icon_material_preview_light_1.png
similarity index 100%
rename from tools/editor/icons/icon_material_preview_light_1.png
rename to editor/icons/icon_material_preview_light_1.png
diff --git a/tools/editor/icons/icon_material_preview_light_1_off.png b/editor/icons/icon_material_preview_light_1_off.png
similarity index 100%
rename from tools/editor/icons/icon_material_preview_light_1_off.png
rename to editor/icons/icon_material_preview_light_1_off.png
diff --git a/tools/editor/icons/icon_material_preview_light_2.png b/editor/icons/icon_material_preview_light_2.png
similarity index 100%
rename from tools/editor/icons/icon_material_preview_light_2.png
rename to editor/icons/icon_material_preview_light_2.png
diff --git a/tools/editor/icons/icon_material_preview_light_2_off.png b/editor/icons/icon_material_preview_light_2_off.png
similarity index 100%
rename from tools/editor/icons/icon_material_preview_light_2_off.png
rename to editor/icons/icon_material_preview_light_2_off.png
diff --git a/tools/editor/icons/icon_material_preview_sphere.png b/editor/icons/icon_material_preview_sphere.png
similarity index 100%
rename from tools/editor/icons/icon_material_preview_sphere.png
rename to editor/icons/icon_material_preview_sphere.png
diff --git a/tools/editor/icons/icon_material_preview_sphere_off.png b/editor/icons/icon_material_preview_sphere_off.png
similarity index 100%
rename from tools/editor/icons/icon_material_preview_sphere_off.png
rename to editor/icons/icon_material_preview_sphere_off.png
diff --git a/tools/editor/icons/icon_material_shader.png b/editor/icons/icon_material_shader.png
similarity index 100%
rename from tools/editor/icons/icon_material_shader.png
rename to editor/icons/icon_material_shader.png
diff --git a/tools/editor/icons/icon_material_shader_graph.png b/editor/icons/icon_material_shader_graph.png
similarity index 100%
rename from tools/editor/icons/icon_material_shader_graph.png
rename to editor/icons/icon_material_shader_graph.png
diff --git a/tools/editor/icons/icon_matrix.png b/editor/icons/icon_matrix.png
similarity index 100%
rename from tools/editor/icons/icon_matrix.png
rename to editor/icons/icon_matrix.png
diff --git a/tools/editor/icons/icon_menu_button.png b/editor/icons/icon_menu_button.png
similarity index 100%
rename from tools/editor/icons/icon_menu_button.png
rename to editor/icons/icon_menu_button.png
diff --git a/tools/editor/icons/icon_mesh.png b/editor/icons/icon_mesh.png
similarity index 100%
rename from tools/editor/icons/icon_mesh.png
rename to editor/icons/icon_mesh.png
diff --git a/tools/editor/icons/icon_mesh_instance.png b/editor/icons/icon_mesh_instance.png
similarity index 100%
rename from tools/editor/icons/icon_mesh_instance.png
rename to editor/icons/icon_mesh_instance.png
diff --git a/tools/editor/icons/icon_mesh_library.png b/editor/icons/icon_mesh_library.png
similarity index 100%
rename from tools/editor/icons/icon_mesh_library.png
rename to editor/icons/icon_mesh_library.png
diff --git a/tools/editor/icons/icon_mesh_old.png b/editor/icons/icon_mesh_old.png
similarity index 100%
rename from tools/editor/icons/icon_mesh_old.png
rename to editor/icons/icon_mesh_old.png
diff --git a/tools/editor/icons/icon_meshr.png b/editor/icons/icon_meshr.png
similarity index 100%
rename from tools/editor/icons/icon_meshr.png
rename to editor/icons/icon_meshr.png
diff --git a/tools/editor/icons/icon_mini_aabb.png b/editor/icons/icon_mini_aabb.png
similarity index 100%
rename from tools/editor/icons/icon_mini_aabb.png
rename to editor/icons/icon_mini_aabb.png
diff --git a/tools/editor/icons/icon_mini_array.png b/editor/icons/icon_mini_array.png
similarity index 100%
rename from tools/editor/icons/icon_mini_array.png
rename to editor/icons/icon_mini_array.png
diff --git a/tools/editor/icons/icon_mini_boolean.png b/editor/icons/icon_mini_boolean.png
similarity index 100%
rename from tools/editor/icons/icon_mini_boolean.png
rename to editor/icons/icon_mini_boolean.png
diff --git a/tools/editor/icons/icon_mini_color.png b/editor/icons/icon_mini_color.png
similarity index 100%
rename from tools/editor/icons/icon_mini_color.png
rename to editor/icons/icon_mini_color.png
diff --git a/tools/editor/icons/icon_mini_color_array.png b/editor/icons/icon_mini_color_array.png
similarity index 100%
rename from tools/editor/icons/icon_mini_color_array.png
rename to editor/icons/icon_mini_color_array.png
diff --git a/tools/editor/icons/icon_mini_dictionary.png b/editor/icons/icon_mini_dictionary.png
similarity index 100%
rename from tools/editor/icons/icon_mini_dictionary.png
rename to editor/icons/icon_mini_dictionary.png
diff --git a/tools/editor/icons/icon_mini_float.png b/editor/icons/icon_mini_float.png
similarity index 100%
rename from tools/editor/icons/icon_mini_float.png
rename to editor/icons/icon_mini_float.png
diff --git a/tools/editor/icons/icon_mini_float_array.png b/editor/icons/icon_mini_float_array.png
similarity index 100%
rename from tools/editor/icons/icon_mini_float_array.png
rename to editor/icons/icon_mini_float_array.png
diff --git a/tools/editor/icons/icon_mini_image.png b/editor/icons/icon_mini_image.png
similarity index 100%
rename from tools/editor/icons/icon_mini_image.png
rename to editor/icons/icon_mini_image.png
diff --git a/tools/editor/icons/icon_mini_input.png b/editor/icons/icon_mini_input.png
similarity index 100%
rename from tools/editor/icons/icon_mini_input.png
rename to editor/icons/icon_mini_input.png
diff --git a/tools/editor/icons/icon_mini_int_array.png b/editor/icons/icon_mini_int_array.png
similarity index 100%
rename from tools/editor/icons/icon_mini_int_array.png
rename to editor/icons/icon_mini_int_array.png
diff --git a/tools/editor/icons/icon_mini_integer.png b/editor/icons/icon_mini_integer.png
similarity index 100%
rename from tools/editor/icons/icon_mini_integer.png
rename to editor/icons/icon_mini_integer.png
diff --git a/tools/editor/icons/icon_mini_matrix3.png b/editor/icons/icon_mini_matrix3.png
similarity index 100%
rename from tools/editor/icons/icon_mini_matrix3.png
rename to editor/icons/icon_mini_matrix3.png
diff --git a/tools/editor/icons/icon_mini_matrix32.png b/editor/icons/icon_mini_matrix32.png
similarity index 100%
rename from tools/editor/icons/icon_mini_matrix32.png
rename to editor/icons/icon_mini_matrix32.png
diff --git a/tools/editor/icons/icon_mini_object.png b/editor/icons/icon_mini_object.png
similarity index 100%
rename from tools/editor/icons/icon_mini_object.png
rename to editor/icons/icon_mini_object.png
diff --git a/tools/editor/icons/icon_mini_path.png b/editor/icons/icon_mini_path.png
similarity index 100%
rename from tools/editor/icons/icon_mini_path.png
rename to editor/icons/icon_mini_path.png
diff --git a/tools/editor/icons/icon_mini_plane.png b/editor/icons/icon_mini_plane.png
similarity index 100%
rename from tools/editor/icons/icon_mini_plane.png
rename to editor/icons/icon_mini_plane.png
diff --git a/tools/editor/icons/icon_mini_quat.png b/editor/icons/icon_mini_quat.png
similarity index 100%
rename from tools/editor/icons/icon_mini_quat.png
rename to editor/icons/icon_mini_quat.png
diff --git a/tools/editor/icons/icon_mini_raw_array.png b/editor/icons/icon_mini_raw_array.png
similarity index 100%
rename from tools/editor/icons/icon_mini_raw_array.png
rename to editor/icons/icon_mini_raw_array.png
diff --git a/tools/editor/icons/icon_mini_rect2.png b/editor/icons/icon_mini_rect2.png
similarity index 100%
rename from tools/editor/icons/icon_mini_rect2.png
rename to editor/icons/icon_mini_rect2.png
diff --git a/tools/editor/icons/icon_mini_rid.png b/editor/icons/icon_mini_rid.png
similarity index 100%
rename from tools/editor/icons/icon_mini_rid.png
rename to editor/icons/icon_mini_rid.png
diff --git a/tools/editor/icons/icon_mini_string.png b/editor/icons/icon_mini_string.png
similarity index 100%
rename from tools/editor/icons/icon_mini_string.png
rename to editor/icons/icon_mini_string.png
diff --git a/tools/editor/icons/icon_mini_string_array.png b/editor/icons/icon_mini_string_array.png
similarity index 100%
rename from tools/editor/icons/icon_mini_string_array.png
rename to editor/icons/icon_mini_string_array.png
diff --git a/tools/editor/icons/icon_mini_transform.png b/editor/icons/icon_mini_transform.png
similarity index 100%
rename from tools/editor/icons/icon_mini_transform.png
rename to editor/icons/icon_mini_transform.png
diff --git a/tools/editor/icons/icon_mini_variant.png b/editor/icons/icon_mini_variant.png
similarity index 100%
rename from tools/editor/icons/icon_mini_variant.png
rename to editor/icons/icon_mini_variant.png
diff --git a/tools/editor/icons/icon_mini_vector2.png b/editor/icons/icon_mini_vector2.png
similarity index 100%
rename from tools/editor/icons/icon_mini_vector2.png
rename to editor/icons/icon_mini_vector2.png
diff --git a/tools/editor/icons/icon_mini_vector2_array.png b/editor/icons/icon_mini_vector2_array.png
similarity index 100%
rename from tools/editor/icons/icon_mini_vector2_array.png
rename to editor/icons/icon_mini_vector2_array.png
diff --git a/tools/editor/icons/icon_mini_vector3.png b/editor/icons/icon_mini_vector3.png
similarity index 100%
rename from tools/editor/icons/icon_mini_vector3.png
rename to editor/icons/icon_mini_vector3.png
diff --git a/tools/editor/icons/icon_mini_vector3_array.png b/editor/icons/icon_mini_vector3_array.png
similarity index 100%
rename from tools/editor/icons/icon_mini_vector3_array.png
rename to editor/icons/icon_mini_vector3_array.png
diff --git a/tools/editor/icons/icon_mirror_x.png b/editor/icons/icon_mirror_x.png
similarity index 100%
rename from tools/editor/icons/icon_mirror_x.png
rename to editor/icons/icon_mirror_x.png
diff --git a/tools/editor/icons/icon_mirror_y.png b/editor/icons/icon_mirror_y.png
similarity index 100%
rename from tools/editor/icons/icon_mirror_y.png
rename to editor/icons/icon_mirror_y.png
diff --git a/tools/editor/icons/icon_mouse.png b/editor/icons/icon_mouse.png
similarity index 100%
rename from tools/editor/icons/icon_mouse.png
rename to editor/icons/icon_mouse.png
diff --git a/tools/editor/icons/icon_move_down.png b/editor/icons/icon_move_down.png
similarity index 100%
rename from tools/editor/icons/icon_move_down.png
rename to editor/icons/icon_move_down.png
diff --git a/tools/editor/icons/icon_move_down_hl.png b/editor/icons/icon_move_down_hl.png
similarity index 100%
rename from tools/editor/icons/icon_move_down_hl.png
rename to editor/icons/icon_move_down_hl.png
diff --git a/tools/editor/icons/icon_move_point.png b/editor/icons/icon_move_point.png
similarity index 100%
rename from tools/editor/icons/icon_move_point.png
rename to editor/icons/icon_move_point.png
diff --git a/tools/editor/icons/icon_move_up.png b/editor/icons/icon_move_up.png
similarity index 100%
rename from tools/editor/icons/icon_move_up.png
rename to editor/icons/icon_move_up.png
diff --git a/tools/editor/icons/icon_move_up_hl.png b/editor/icons/icon_move_up_hl.png
similarity index 100%
rename from tools/editor/icons/icon_move_up_hl.png
rename to editor/icons/icon_move_up_hl.png
diff --git a/tools/editor/icons/icon_multi_edit.png b/editor/icons/icon_multi_edit.png
similarity index 100%
rename from tools/editor/icons/icon_multi_edit.png
rename to editor/icons/icon_multi_edit.png
diff --git a/tools/editor/icons/icon_multi_line.png b/editor/icons/icon_multi_line.png
similarity index 100%
rename from tools/editor/icons/icon_multi_line.png
rename to editor/icons/icon_multi_line.png
diff --git a/tools/editor/icons/icon_multi_mesh.png b/editor/icons/icon_multi_mesh.png
similarity index 100%
rename from tools/editor/icons/icon_multi_mesh.png
rename to editor/icons/icon_multi_mesh.png
diff --git a/tools/editor/icons/icon_multi_mesh_instance.png b/editor/icons/icon_multi_mesh_instance.png
similarity index 100%
rename from tools/editor/icons/icon_multi_mesh_instance.png
rename to editor/icons/icon_multi_mesh_instance.png
diff --git a/tools/editor/icons/icon_multi_node_edit.png b/editor/icons/icon_multi_node_edit.png
similarity index 100%
rename from tools/editor/icons/icon_multi_node_edit.png
rename to editor/icons/icon_multi_node_edit.png
diff --git a/tools/editor/icons/icon_navigation.png b/editor/icons/icon_navigation.png
similarity index 100%
rename from tools/editor/icons/icon_navigation.png
rename to editor/icons/icon_navigation.png
diff --git a/tools/editor/icons/icon_navigation_2d.png b/editor/icons/icon_navigation_2d.png
similarity index 100%
rename from tools/editor/icons/icon_navigation_2d.png
rename to editor/icons/icon_navigation_2d.png
diff --git a/tools/editor/icons/icon_navigation_mesh.png b/editor/icons/icon_navigation_mesh.png
similarity index 100%
rename from tools/editor/icons/icon_navigation_mesh.png
rename to editor/icons/icon_navigation_mesh.png
diff --git a/tools/editor/icons/icon_navigation_mesh_instance.png b/editor/icons/icon_navigation_mesh_instance.png
similarity index 100%
rename from tools/editor/icons/icon_navigation_mesh_instance.png
rename to editor/icons/icon_navigation_mesh_instance.png
diff --git a/tools/editor/icons/icon_navigation_polygon.png b/editor/icons/icon_navigation_polygon.png
similarity index 100%
rename from tools/editor/icons/icon_navigation_polygon.png
rename to editor/icons/icon_navigation_polygon.png
diff --git a/tools/editor/icons/icon_navigation_polygon_instance.png b/editor/icons/icon_navigation_polygon_instance.png
similarity index 100%
rename from tools/editor/icons/icon_navigation_polygon_instance.png
rename to editor/icons/icon_navigation_polygon_instance.png
diff --git a/tools/editor/icons/icon_new.png b/editor/icons/icon_new.png
similarity index 100%
rename from tools/editor/icons/icon_new.png
rename to editor/icons/icon_new.png
diff --git a/tools/editor/icons/icon_nine_patch_rect.png b/editor/icons/icon_nine_patch_rect.png
similarity index 100%
rename from tools/editor/icons/icon_nine_patch_rect.png
rename to editor/icons/icon_nine_patch_rect.png
diff --git a/tools/editor/icons/icon_node.png b/editor/icons/icon_node.png
similarity index 100%
rename from tools/editor/icons/icon_node.png
rename to editor/icons/icon_node.png
diff --git a/tools/editor/icons/icon_node_2d.png b/editor/icons/icon_node_2d.png
similarity index 100%
rename from tools/editor/icons/icon_node_2d.png
rename to editor/icons/icon_node_2d.png
diff --git a/tools/editor/icons/icon_node_real_slot.png b/editor/icons/icon_node_real_slot.png
similarity index 100%
rename from tools/editor/icons/icon_node_real_slot.png
rename to editor/icons/icon_node_real_slot.png
diff --git a/tools/editor/icons/icon_node_vec_slot.png b/editor/icons/icon_node_vec_slot.png
similarity index 100%
rename from tools/editor/icons/icon_node_vec_slot.png
rename to editor/icons/icon_node_vec_slot.png
diff --git a/tools/editor/icons/icon_node_warning.png b/editor/icons/icon_node_warning.png
similarity index 100%
rename from tools/editor/icons/icon_node_warning.png
rename to editor/icons/icon_node_warning.png
diff --git a/tools/editor/icons/icon_non_favorite.png b/editor/icons/icon_non_favorite.png
similarity index 100%
rename from tools/editor/icons/icon_non_favorite.png
rename to editor/icons/icon_non_favorite.png
diff --git a/tools/editor/icons/icon_object.png b/editor/icons/icon_object.png
similarity index 100%
rename from tools/editor/icons/icon_object.png
rename to editor/icons/icon_object.png
diff --git a/tools/editor/icons/icon_occluder_polygon_2d.png b/editor/icons/icon_occluder_polygon_2d.png
similarity index 100%
rename from tools/editor/icons/icon_occluder_polygon_2d.png
rename to editor/icons/icon_occluder_polygon_2d.png
diff --git a/tools/editor/icons/icon_omni_light.png b/editor/icons/icon_omni_light.png
similarity index 100%
rename from tools/editor/icons/icon_omni_light.png
rename to editor/icons/icon_omni_light.png
diff --git a/tools/editor/icons/icon_open.png b/editor/icons/icon_open.png
similarity index 100%
rename from tools/editor/icons/icon_open.png
rename to editor/icons/icon_open.png
diff --git a/tools/editor/icons/icon_option_button.png b/editor/icons/icon_option_button.png
similarity index 100%
rename from tools/editor/icons/icon_option_button.png
rename to editor/icons/icon_option_button.png
diff --git a/tools/editor/icons/icon_override.png b/editor/icons/icon_override.png
similarity index 100%
rename from tools/editor/icons/icon_override.png
rename to editor/icons/icon_override.png
diff --git a/tools/editor/icons/icon_p_hash_translation.png b/editor/icons/icon_p_hash_translation.png
similarity index 100%
rename from tools/editor/icons/icon_p_hash_translation.png
rename to editor/icons/icon_p_hash_translation.png
diff --git a/tools/editor/icons/icon_packed_data_container.png b/editor/icons/icon_packed_data_container.png
similarity index 100%
rename from tools/editor/icons/icon_packed_data_container.png
rename to editor/icons/icon_packed_data_container.png
diff --git a/tools/editor/icons/icon_packed_scene.png b/editor/icons/icon_packed_scene.png
similarity index 100%
rename from tools/editor/icons/icon_packed_scene.png
rename to editor/icons/icon_packed_scene.png
diff --git a/tools/editor/icons/icon_pane_drag.png b/editor/icons/icon_pane_drag.png
similarity index 100%
rename from tools/editor/icons/icon_pane_drag.png
rename to editor/icons/icon_pane_drag.png
diff --git a/tools/editor/icons/icon_pane_drag_hover.png b/editor/icons/icon_pane_drag_hover.png
similarity index 100%
rename from tools/editor/icons/icon_pane_drag_hover.png
rename to editor/icons/icon_pane_drag_hover.png
diff --git a/tools/editor/icons/icon_panel.png b/editor/icons/icon_panel.png
similarity index 100%
rename from tools/editor/icons/icon_panel.png
rename to editor/icons/icon_panel.png
diff --git a/tools/editor/icons/icon_panel_container.png b/editor/icons/icon_panel_container.png
similarity index 100%
rename from tools/editor/icons/icon_panel_container.png
rename to editor/icons/icon_panel_container.png
diff --git a/tools/editor/icons/icon_panel_top.png b/editor/icons/icon_panel_top.png
similarity index 100%
rename from tools/editor/icons/icon_panel_top.png
rename to editor/icons/icon_panel_top.png
diff --git a/tools/editor/icons/icon_panels_1.png b/editor/icons/icon_panels_1.png
similarity index 100%
rename from tools/editor/icons/icon_panels_1.png
rename to editor/icons/icon_panels_1.png
diff --git a/tools/editor/icons/icon_panels_2.png b/editor/icons/icon_panels_2.png
similarity index 100%
rename from tools/editor/icons/icon_panels_2.png
rename to editor/icons/icon_panels_2.png
diff --git a/tools/editor/icons/icon_panels_2_alt.png b/editor/icons/icon_panels_2_alt.png
similarity index 100%
rename from tools/editor/icons/icon_panels_2_alt.png
rename to editor/icons/icon_panels_2_alt.png
diff --git a/tools/editor/icons/icon_panels_3.png b/editor/icons/icon_panels_3.png
similarity index 100%
rename from tools/editor/icons/icon_panels_3.png
rename to editor/icons/icon_panels_3.png
diff --git a/tools/editor/icons/icon_panels_3_alt.png b/editor/icons/icon_panels_3_alt.png
similarity index 100%
rename from tools/editor/icons/icon_panels_3_alt.png
rename to editor/icons/icon_panels_3_alt.png
diff --git a/tools/editor/icons/icon_panels_4.png b/editor/icons/icon_panels_4.png
similarity index 100%
rename from tools/editor/icons/icon_panels_4.png
rename to editor/icons/icon_panels_4.png
diff --git a/tools/editor/icons/icon_parallax_background.png b/editor/icons/icon_parallax_background.png
similarity index 100%
rename from tools/editor/icons/icon_parallax_background.png
rename to editor/icons/icon_parallax_background.png
diff --git a/tools/editor/icons/icon_parallax_layer.png b/editor/icons/icon_parallax_layer.png
similarity index 100%
rename from tools/editor/icons/icon_parallax_layer.png
rename to editor/icons/icon_parallax_layer.png
diff --git a/tools/editor/icons/icon_particle_attractor_2d.png b/editor/icons/icon_particle_attractor_2d.png
similarity index 100%
rename from tools/editor/icons/icon_particle_attractor_2d.png
rename to editor/icons/icon_particle_attractor_2d.png
diff --git a/tools/editor/icons/icon_particles.png b/editor/icons/icon_particles.png
similarity index 100%
rename from tools/editor/icons/icon_particles.png
rename to editor/icons/icon_particles.png
diff --git a/tools/editor/icons/icon_particles_2d.png b/editor/icons/icon_particles_2d.png
similarity index 100%
rename from tools/editor/icons/icon_particles_2d.png
rename to editor/icons/icon_particles_2d.png
diff --git a/tools/editor/icons/icon_particles_frame.png b/editor/icons/icon_particles_frame.png
similarity index 100%
rename from tools/editor/icons/icon_particles_frame.png
rename to editor/icons/icon_particles_frame.png
diff --git a/tools/editor/icons/icon_particles_shader.png b/editor/icons/icon_particles_shader.png
similarity index 100%
rename from tools/editor/icons/icon_particles_shader.png
rename to editor/icons/icon_particles_shader.png
diff --git a/tools/editor/icons/icon_patch_9_rect.png b/editor/icons/icon_patch_9_rect.png
similarity index 100%
rename from tools/editor/icons/icon_patch_9_rect.png
rename to editor/icons/icon_patch_9_rect.png
diff --git a/tools/editor/icons/icon_path.png b/editor/icons/icon_path.png
similarity index 100%
rename from tools/editor/icons/icon_path.png
rename to editor/icons/icon_path.png
diff --git a/tools/editor/icons/icon_path_2d.png b/editor/icons/icon_path_2d.png
similarity index 100%
rename from tools/editor/icons/icon_path_2d.png
rename to editor/icons/icon_path_2d.png
diff --git a/tools/editor/icons/icon_path_follow.png b/editor/icons/icon_path_follow.png
similarity index 100%
rename from tools/editor/icons/icon_path_follow.png
rename to editor/icons/icon_path_follow.png
diff --git a/tools/editor/icons/icon_path_follow_2d.png b/editor/icons/icon_path_follow_2d.png
similarity index 100%
rename from tools/editor/icons/icon_path_follow_2d.png
rename to editor/icons/icon_path_follow_2d.png
diff --git a/tools/editor/icons/icon_pause.png b/editor/icons/icon_pause.png
similarity index 100%
rename from tools/editor/icons/icon_pause.png
rename to editor/icons/icon_pause.png
diff --git a/tools/editor/icons/icon_pe_edit.png b/editor/icons/icon_pe_edit.png
similarity index 100%
rename from tools/editor/icons/icon_pe_edit.png
rename to editor/icons/icon_pe_edit.png
diff --git a/tools/editor/icons/icon_physics_joint_pin.png b/editor/icons/icon_physics_joint_pin.png
similarity index 100%
rename from tools/editor/icons/icon_physics_joint_pin.png
rename to editor/icons/icon_physics_joint_pin.png
diff --git a/tools/editor/icons/icon_pin.png b/editor/icons/icon_pin.png
similarity index 100%
rename from tools/editor/icons/icon_pin.png
rename to editor/icons/icon_pin.png
diff --git a/tools/editor/icons/icon_pin_joint.png b/editor/icons/icon_pin_joint.png
similarity index 100%
rename from tools/editor/icons/icon_pin_joint.png
rename to editor/icons/icon_pin_joint.png
diff --git a/tools/editor/icons/icon_pin_joint_2d.png b/editor/icons/icon_pin_joint_2d.png
similarity index 100%
rename from tools/editor/icons/icon_pin_joint_2d.png
rename to editor/icons/icon_pin_joint_2d.png
diff --git a/tools/editor/icons/icon_pin_pressed.png b/editor/icons/icon_pin_pressed.png
similarity index 100%
rename from tools/editor/icons/icon_pin_pressed.png
rename to editor/icons/icon_pin_pressed.png
diff --git a/tools/editor/icons/icon_plane.png b/editor/icons/icon_plane.png
similarity index 100%
rename from tools/editor/icons/icon_plane.png
rename to editor/icons/icon_plane.png
diff --git a/tools/editor/icons/icon_plane_shape.png b/editor/icons/icon_plane_shape.png
similarity index 100%
rename from tools/editor/icons/icon_plane_shape.png
rename to editor/icons/icon_plane_shape.png
diff --git a/tools/editor/icons/icon_play.png b/editor/icons/icon_play.png
similarity index 100%
rename from tools/editor/icons/icon_play.png
rename to editor/icons/icon_play.png
diff --git a/tools/editor/icons/icon_play_backwards.png b/editor/icons/icon_play_backwards.png
similarity index 100%
rename from tools/editor/icons/icon_play_backwards.png
rename to editor/icons/icon_play_backwards.png
diff --git a/tools/editor/icons/icon_play_custom.png b/editor/icons/icon_play_custom.png
similarity index 100%
rename from tools/editor/icons/icon_play_custom.png
rename to editor/icons/icon_play_custom.png
diff --git a/tools/editor/icons/icon_play_scene.png b/editor/icons/icon_play_scene.png
similarity index 100%
rename from tools/editor/icons/icon_play_scene.png
rename to editor/icons/icon_play_scene.png
diff --git a/tools/editor/icons/icon_play_start.png b/editor/icons/icon_play_start.png
similarity index 100%
rename from tools/editor/icons/icon_play_start.png
rename to editor/icons/icon_play_start.png
diff --git a/tools/editor/icons/icon_play_start_backwards.png b/editor/icons/icon_play_start_backwards.png
similarity index 100%
rename from tools/editor/icons/icon_play_start_backwards.png
rename to editor/icons/icon_play_start_backwards.png
diff --git a/tools/editor/icons/icon_polygon_2d.png b/editor/icons/icon_polygon_2d.png
similarity index 100%
rename from tools/editor/icons/icon_polygon_2d.png
rename to editor/icons/icon_polygon_2d.png
diff --git a/tools/editor/icons/icon_polygon_path_finder.png b/editor/icons/icon_polygon_path_finder.png
similarity index 100%
rename from tools/editor/icons/icon_polygon_path_finder.png
rename to editor/icons/icon_polygon_path_finder.png
diff --git a/tools/editor/icons/icon_popup.png b/editor/icons/icon_popup.png
similarity index 100%
rename from tools/editor/icons/icon_popup.png
rename to editor/icons/icon_popup.png
diff --git a/tools/editor/icons/icon_popup_dialog.png b/editor/icons/icon_popup_dialog.png
similarity index 100%
rename from tools/editor/icons/icon_popup_dialog.png
rename to editor/icons/icon_popup_dialog.png
diff --git a/tools/editor/icons/icon_popup_menu.png b/editor/icons/icon_popup_menu.png
similarity index 100%
rename from tools/editor/icons/icon_popup_menu.png
rename to editor/icons/icon_popup_menu.png
diff --git a/tools/editor/icons/icon_popup_panel.png b/editor/icons/icon_popup_panel.png
similarity index 100%
rename from tools/editor/icons/icon_popup_panel.png
rename to editor/icons/icon_popup_panel.png
diff --git a/tools/editor/icons/icon_portal.png b/editor/icons/icon_portal.png
similarity index 100%
rename from tools/editor/icons/icon_portal.png
rename to editor/icons/icon_portal.png
diff --git a/tools/editor/icons/icon_position_2d.png b/editor/icons/icon_position_2d.png
similarity index 100%
rename from tools/editor/icons/icon_position_2d.png
rename to editor/icons/icon_position_2d.png
diff --git a/tools/editor/icons/icon_position_3d.png b/editor/icons/icon_position_3d.png
similarity index 100%
rename from tools/editor/icons/icon_position_3d.png
rename to editor/icons/icon_position_3d.png
diff --git a/tools/editor/icons/icon_prev_scene.png b/editor/icons/icon_prev_scene.png
similarity index 100%
rename from tools/editor/icons/icon_prev_scene.png
rename to editor/icons/icon_prev_scene.png
diff --git a/tools/editor/icons/icon_progress_1.png b/editor/icons/icon_progress_1.png
similarity index 100%
rename from tools/editor/icons/icon_progress_1.png
rename to editor/icons/icon_progress_1.png
diff --git a/tools/editor/icons/icon_progress_2.png b/editor/icons/icon_progress_2.png
similarity index 100%
rename from tools/editor/icons/icon_progress_2.png
rename to editor/icons/icon_progress_2.png
diff --git a/tools/editor/icons/icon_progress_3.png b/editor/icons/icon_progress_3.png
similarity index 100%
rename from tools/editor/icons/icon_progress_3.png
rename to editor/icons/icon_progress_3.png
diff --git a/tools/editor/icons/icon_progress_4.png b/editor/icons/icon_progress_4.png
similarity index 100%
rename from tools/editor/icons/icon_progress_4.png
rename to editor/icons/icon_progress_4.png
diff --git a/tools/editor/icons/icon_progress_5.png b/editor/icons/icon_progress_5.png
similarity index 100%
rename from tools/editor/icons/icon_progress_5.png
rename to editor/icons/icon_progress_5.png
diff --git a/tools/editor/icons/icon_progress_6.png b/editor/icons/icon_progress_6.png
similarity index 100%
rename from tools/editor/icons/icon_progress_6.png
rename to editor/icons/icon_progress_6.png
diff --git a/tools/editor/icons/icon_progress_7.png b/editor/icons/icon_progress_7.png
similarity index 100%
rename from tools/editor/icons/icon_progress_7.png
rename to editor/icons/icon_progress_7.png
diff --git a/tools/editor/icons/icon_progress_8.png b/editor/icons/icon_progress_8.png
similarity index 100%
rename from tools/editor/icons/icon_progress_8.png
rename to editor/icons/icon_progress_8.png
diff --git a/tools/editor/icons/icon_progress_bar.png b/editor/icons/icon_progress_bar.png
similarity index 100%
rename from tools/editor/icons/icon_progress_bar.png
rename to editor/icons/icon_progress_bar.png
diff --git a/tools/editor/icons/icon_property_editor.png b/editor/icons/icon_property_editor.png
similarity index 100%
rename from tools/editor/icons/icon_property_editor.png
rename to editor/icons/icon_property_editor.png
diff --git a/tools/editor/icons/icon_proximity_group.png b/editor/icons/icon_proximity_group.png
similarity index 100%
rename from tools/editor/icons/icon_proximity_group.png
rename to editor/icons/icon_proximity_group.png
diff --git a/tools/editor/icons/icon_quad.png b/editor/icons/icon_quad.png
similarity index 100%
rename from tools/editor/icons/icon_quad.png
rename to editor/icons/icon_quad.png
diff --git a/tools/editor/icons/icon_quat.png b/editor/icons/icon_quat.png
similarity index 100%
rename from tools/editor/icons/icon_quat.png
rename to editor/icons/icon_quat.png
diff --git a/tools/editor/icons/icon_range.png b/editor/icons/icon_range.png
similarity index 100%
rename from tools/editor/icons/icon_range.png
rename to editor/icons/icon_range.png
diff --git a/tools/editor/icons/icon_rating_no_star.png b/editor/icons/icon_rating_no_star.png
similarity index 100%
rename from tools/editor/icons/icon_rating_no_star.png
rename to editor/icons/icon_rating_no_star.png
diff --git a/tools/editor/icons/icon_rating_star.png b/editor/icons/icon_rating_star.png
similarity index 100%
rename from tools/editor/icons/icon_rating_star.png
rename to editor/icons/icon_rating_star.png
diff --git a/tools/editor/icons/icon_ray_cast.png b/editor/icons/icon_ray_cast.png
similarity index 100%
rename from tools/editor/icons/icon_ray_cast.png
rename to editor/icons/icon_ray_cast.png
diff --git a/tools/editor/icons/icon_ray_cast_2d.png b/editor/icons/icon_ray_cast_2d.png
similarity index 100%
rename from tools/editor/icons/icon_ray_cast_2d.png
rename to editor/icons/icon_ray_cast_2d.png
diff --git a/tools/editor/icons/icon_ray_shape.png b/editor/icons/icon_ray_shape.png
similarity index 100%
rename from tools/editor/icons/icon_ray_shape.png
rename to editor/icons/icon_ray_shape.png
diff --git a/tools/editor/icons/icon_ray_shape_2d.png b/editor/icons/icon_ray_shape_2d.png
similarity index 100%
rename from tools/editor/icons/icon_ray_shape_2d.png
rename to editor/icons/icon_ray_shape_2d.png
diff --git a/tools/editor/icons/icon_rayito.png b/editor/icons/icon_rayito.png
similarity index 100%
rename from tools/editor/icons/icon_rayito.png
rename to editor/icons/icon_rayito.png
diff --git a/tools/editor/icons/icon_real.png b/editor/icons/icon_real.png
similarity index 100%
rename from tools/editor/icons/icon_real.png
rename to editor/icons/icon_real.png
diff --git a/tools/editor/icons/icon_rect2.png b/editor/icons/icon_rect2.png
similarity index 100%
rename from tools/editor/icons/icon_rect2.png
rename to editor/icons/icon_rect2.png
diff --git a/tools/editor/icons/icon_rect3.png b/editor/icons/icon_rect3.png
similarity index 100%
rename from tools/editor/icons/icon_rect3.png
rename to editor/icons/icon_rect3.png
diff --git a/tools/editor/icons/icon_rectangle_shape_2d.png b/editor/icons/icon_rectangle_shape_2d.png
similarity index 100%
rename from tools/editor/icons/icon_rectangle_shape_2d.png
rename to editor/icons/icon_rectangle_shape_2d.png
diff --git a/tools/editor/icons/icon_reference_rect.png b/editor/icons/icon_reference_rect.png
similarity index 100%
rename from tools/editor/icons/icon_reference_rect.png
rename to editor/icons/icon_reference_rect.png
diff --git a/tools/editor/icons/icon_reflection_probe.png b/editor/icons/icon_reflection_probe.png
similarity index 100%
rename from tools/editor/icons/icon_reflection_probe.png
rename to editor/icons/icon_reflection_probe.png
diff --git a/tools/editor/icons/icon_region_edit.png b/editor/icons/icon_region_edit.png
similarity index 100%
rename from tools/editor/icons/icon_region_edit.png
rename to editor/icons/icon_region_edit.png
diff --git a/tools/editor/icons/icon_reload.png b/editor/icons/icon_reload.png
similarity index 100%
rename from tools/editor/icons/icon_reload.png
rename to editor/icons/icon_reload.png
diff --git a/tools/editor/icons/icon_reload_empty.png b/editor/icons/icon_reload_empty.png
similarity index 100%
rename from tools/editor/icons/icon_reload_empty.png
rename to editor/icons/icon_reload_empty.png
diff --git a/tools/editor/icons/icon_reload_small.png b/editor/icons/icon_reload_small.png
similarity index 100%
rename from tools/editor/icons/icon_reload_small.png
rename to editor/icons/icon_reload_small.png
diff --git a/tools/editor/icons/icon_remote.png b/editor/icons/icon_remote.png
similarity index 100%
rename from tools/editor/icons/icon_remote.png
rename to editor/icons/icon_remote.png
diff --git a/tools/editor/icons/icon_remote_transform.png b/editor/icons/icon_remote_transform.png
similarity index 100%
rename from tools/editor/icons/icon_remote_transform.png
rename to editor/icons/icon_remote_transform.png
diff --git a/tools/editor/icons/icon_remote_transform_2d.png b/editor/icons/icon_remote_transform_2d.png
similarity index 100%
rename from tools/editor/icons/icon_remote_transform_2d.png
rename to editor/icons/icon_remote_transform_2d.png
diff --git a/tools/editor/icons/icon_remove.png b/editor/icons/icon_remove.png
similarity index 100%
rename from tools/editor/icons/icon_remove.png
rename to editor/icons/icon_remove.png
diff --git a/tools/editor/icons/icon_remove_hl.png b/editor/icons/icon_remove_hl.png
similarity index 100%
rename from tools/editor/icons/icon_remove_hl.png
rename to editor/icons/icon_remove_hl.png
diff --git a/tools/editor/icons/icon_remove_small.png b/editor/icons/icon_remove_small.png
similarity index 100%
rename from tools/editor/icons/icon_remove_small.png
rename to editor/icons/icon_remove_small.png
diff --git a/tools/editor/icons/icon_rename.png b/editor/icons/icon_rename.png
similarity index 100%
rename from tools/editor/icons/icon_rename.png
rename to editor/icons/icon_rename.png
diff --git a/tools/editor/icons/icon_reparent.png b/editor/icons/icon_reparent.png
similarity index 100%
rename from tools/editor/icons/icon_reparent.png
rename to editor/icons/icon_reparent.png
diff --git a/tools/editor/icons/icon_replace.png b/editor/icons/icon_replace.png
similarity index 100%
rename from tools/editor/icons/icon_replace.png
rename to editor/icons/icon_replace.png
diff --git a/tools/editor/icons/icon_resource_preloader.png b/editor/icons/icon_resource_preloader.png
similarity index 100%
rename from tools/editor/icons/icon_resource_preloader.png
rename to editor/icons/icon_resource_preloader.png
diff --git a/tools/editor/icons/icon_rich_text_label.png b/editor/icons/icon_rich_text_label.png
similarity index 100%
rename from tools/editor/icons/icon_rich_text_label.png
rename to editor/icons/icon_rich_text_label.png
diff --git a/tools/editor/icons/icon_rid.png b/editor/icons/icon_rid.png
similarity index 100%
rename from tools/editor/icons/icon_rid.png
rename to editor/icons/icon_rid.png
diff --git a/tools/editor/icons/icon_rigid_body.png b/editor/icons/icon_rigid_body.png
similarity index 100%
rename from tools/editor/icons/icon_rigid_body.png
rename to editor/icons/icon_rigid_body.png
diff --git a/tools/editor/icons/icon_rigid_body_2_d.png b/editor/icons/icon_rigid_body_2_d.png
similarity index 100%
rename from tools/editor/icons/icon_rigid_body_2_d.png
rename to editor/icons/icon_rigid_body_2_d.png
diff --git a/tools/editor/icons/icon_rigid_body_2d.png b/editor/icons/icon_rigid_body_2d.png
similarity index 100%
rename from tools/editor/icons/icon_rigid_body_2d.png
rename to editor/icons/icon_rigid_body_2d.png
diff --git a/tools/editor/icons/icon_room.png b/editor/icons/icon_room.png
similarity index 100%
rename from tools/editor/icons/icon_room.png
rename to editor/icons/icon_room.png
diff --git a/tools/editor/icons/icon_room_bounds.png b/editor/icons/icon_room_bounds.png
similarity index 100%
rename from tools/editor/icons/icon_room_bounds.png
rename to editor/icons/icon_room_bounds.png
diff --git a/tools/editor/icons/icon_room_instance.png b/editor/icons/icon_room_instance.png
similarity index 100%
rename from tools/editor/icons/icon_room_instance.png
rename to editor/icons/icon_room_instance.png
diff --git a/tools/editor/icons/icon_rotate_0.png b/editor/icons/icon_rotate_0.png
similarity index 100%
rename from tools/editor/icons/icon_rotate_0.png
rename to editor/icons/icon_rotate_0.png
diff --git a/tools/editor/icons/icon_rotate_180.png b/editor/icons/icon_rotate_180.png
similarity index 100%
rename from tools/editor/icons/icon_rotate_180.png
rename to editor/icons/icon_rotate_180.png
diff --git a/tools/editor/icons/icon_rotate_270.png b/editor/icons/icon_rotate_270.png
similarity index 100%
rename from tools/editor/icons/icon_rotate_270.png
rename to editor/icons/icon_rotate_270.png
diff --git a/tools/editor/icons/icon_rotate_90.png b/editor/icons/icon_rotate_90.png
similarity index 100%
rename from tools/editor/icons/icon_rotate_90.png
rename to editor/icons/icon_rotate_90.png
diff --git a/tools/editor/icons/icon_run.png b/editor/icons/icon_run.png
similarity index 100%
rename from tools/editor/icons/icon_run.png
rename to editor/icons/icon_run.png
diff --git a/tools/editor/icons/icon_s_s_a_o_f_x.png b/editor/icons/icon_s_s_a_o_f_x.png
similarity index 100%
rename from tools/editor/icons/icon_s_s_a_o_f_x.png
rename to editor/icons/icon_s_s_a_o_f_x.png
diff --git a/tools/editor/icons/icon_sample.png b/editor/icons/icon_sample.png
similarity index 100%
rename from tools/editor/icons/icon_sample.png
rename to editor/icons/icon_sample.png
diff --git a/tools/editor/icons/icon_sample_library.png b/editor/icons/icon_sample_library.png
similarity index 100%
rename from tools/editor/icons/icon_sample_library.png
rename to editor/icons/icon_sample_library.png
diff --git a/tools/editor/icons/icon_sample_player.png b/editor/icons/icon_sample_player.png
similarity index 100%
rename from tools/editor/icons/icon_sample_player.png
rename to editor/icons/icon_sample_player.png
diff --git a/tools/editor/icons/icon_sample_player_2d.png b/editor/icons/icon_sample_player_2d.png
similarity index 100%
rename from tools/editor/icons/icon_sample_player_2d.png
rename to editor/icons/icon_sample_player_2d.png
diff --git a/tools/editor/icons/icon_save.png b/editor/icons/icon_save.png
similarity index 100%
rename from tools/editor/icons/icon_save.png
rename to editor/icons/icon_save.png
diff --git a/tools/editor/icons/icon_scene.png b/editor/icons/icon_scene.png
similarity index 100%
rename from tools/editor/icons/icon_scene.png
rename to editor/icons/icon_scene.png
diff --git a/tools/editor/icons/icon_scene_instance.png b/editor/icons/icon_scene_instance.png
similarity index 100%
rename from tools/editor/icons/icon_scene_instance.png
rename to editor/icons/icon_scene_instance.png
diff --git a/tools/editor/icons/icon_scene_tree_editor.png b/editor/icons/icon_scene_tree_editor.png
similarity index 100%
rename from tools/editor/icons/icon_scene_tree_editor.png
rename to editor/icons/icon_scene_tree_editor.png
diff --git a/tools/editor/icons/icon_script.png b/editor/icons/icon_script.png
similarity index 100%
rename from tools/editor/icons/icon_script.png
rename to editor/icons/icon_script.png
diff --git a/tools/editor/icons/icon_script_control.png b/editor/icons/icon_script_control.png
similarity index 100%
rename from tools/editor/icons/icon_script_control.png
rename to editor/icons/icon_script_control.png
diff --git a/tools/editor/icons/icon_script_create.png b/editor/icons/icon_script_create.png
similarity index 100%
rename from tools/editor/icons/icon_script_create.png
rename to editor/icons/icon_script_create.png
diff --git a/tools/editor/icons/icon_script_error.png b/editor/icons/icon_script_error.png
similarity index 100%
rename from tools/editor/icons/icon_script_error.png
rename to editor/icons/icon_script_error.png
diff --git a/tools/editor/icons/icon_script_list.png b/editor/icons/icon_script_list.png
similarity index 100%
rename from tools/editor/icons/icon_script_list.png
rename to editor/icons/icon_script_list.png
diff --git a/tools/editor/icons/icon_script_node.png b/editor/icons/icon_script_node.png
similarity index 100%
rename from tools/editor/icons/icon_script_node.png
rename to editor/icons/icon_script_node.png
diff --git a/tools/editor/icons/icon_script_remove.png b/editor/icons/icon_script_remove.png
similarity index 100%
rename from tools/editor/icons/icon_script_remove.png
rename to editor/icons/icon_script_remove.png
diff --git a/tools/editor/icons/icon_scroll_bar.png b/editor/icons/icon_scroll_bar.png
similarity index 100%
rename from tools/editor/icons/icon_scroll_bar.png
rename to editor/icons/icon_scroll_bar.png
diff --git a/tools/editor/icons/icon_scroll_container.png b/editor/icons/icon_scroll_container.png
similarity index 100%
rename from tools/editor/icons/icon_scroll_container.png
rename to editor/icons/icon_scroll_container.png
diff --git a/tools/editor/icons/icon_segment_shape_2d.png b/editor/icons/icon_segment_shape_2d.png
similarity index 100%
rename from tools/editor/icons/icon_segment_shape_2d.png
rename to editor/icons/icon_segment_shape_2d.png
diff --git a/tools/editor/icons/icon_shader.png b/editor/icons/icon_shader.png
similarity index 100%
rename from tools/editor/icons/icon_shader.png
rename to editor/icons/icon_shader.png
diff --git a/tools/editor/icons/icon_shader_material.png b/editor/icons/icon_shader_material.png
similarity index 100%
rename from tools/editor/icons/icon_shader_material.png
rename to editor/icons/icon_shader_material.png
diff --git a/tools/editor/icons/icon_short_cut.png b/editor/icons/icon_short_cut.png
similarity index 100%
rename from tools/editor/icons/icon_short_cut.png
rename to editor/icons/icon_short_cut.png
diff --git a/tools/editor/icons/icon_signal.png b/editor/icons/icon_signal.png
similarity index 100%
rename from tools/editor/icons/icon_signal.png
rename to editor/icons/icon_signal.png
diff --git a/tools/editor/icons/icon_skeleton.png b/editor/icons/icon_skeleton.png
similarity index 100%
rename from tools/editor/icons/icon_skeleton.png
rename to editor/icons/icon_skeleton.png
diff --git a/tools/editor/icons/icon_skeletonr.png b/editor/icons/icon_skeletonr.png
similarity index 100%
rename from tools/editor/icons/icon_skeletonr.png
rename to editor/icons/icon_skeletonr.png
diff --git a/tools/editor/icons/icon_sky_box_f_x.png b/editor/icons/icon_sky_box_f_x.png
similarity index 100%
rename from tools/editor/icons/icon_sky_box_f_x.png
rename to editor/icons/icon_sky_box_f_x.png
diff --git a/tools/editor/icons/icon_slider_joint.png b/editor/icons/icon_slider_joint.png
similarity index 100%
rename from tools/editor/icons/icon_slider_joint.png
rename to editor/icons/icon_slider_joint.png
diff --git a/tools/editor/icons/icon_slot.png b/editor/icons/icon_slot.png
similarity index 100%
rename from tools/editor/icons/icon_slot.png
rename to editor/icons/icon_slot.png
diff --git a/tools/editor/icons/icon_small_next.png b/editor/icons/icon_small_next.png
similarity index 100%
rename from tools/editor/icons/icon_small_next.png
rename to editor/icons/icon_small_next.png
diff --git a/tools/editor/icons/icon_snap.png b/editor/icons/icon_snap.png
similarity index 100%
rename from tools/editor/icons/icon_snap.png
rename to editor/icons/icon_snap.png
diff --git a/tools/editor/icons/icon_sound_room_params.png b/editor/icons/icon_sound_room_params.png
similarity index 100%
rename from tools/editor/icons/icon_sound_room_params.png
rename to editor/icons/icon_sound_room_params.png
diff --git a/tools/editor/icons/icon_spatial.png b/editor/icons/icon_spatial.png
similarity index 100%
rename from tools/editor/icons/icon_spatial.png
rename to editor/icons/icon_spatial.png
diff --git a/tools/editor/icons/icon_spatial_add.png b/editor/icons/icon_spatial_add.png
similarity index 100%
rename from tools/editor/icons/icon_spatial_add.png
rename to editor/icons/icon_spatial_add.png
diff --git a/tools/editor/icons/icon_spatial_sample_player.png b/editor/icons/icon_spatial_sample_player.png
similarity index 100%
rename from tools/editor/icons/icon_spatial_sample_player.png
rename to editor/icons/icon_spatial_sample_player.png
diff --git a/tools/editor/icons/icon_spatial_shader.png b/editor/icons/icon_spatial_shader.png
similarity index 100%
rename from tools/editor/icons/icon_spatial_shader.png
rename to editor/icons/icon_spatial_shader.png
diff --git a/tools/editor/icons/icon_spatial_stream_player.png b/editor/icons/icon_spatial_stream_player.png
similarity index 100%
rename from tools/editor/icons/icon_spatial_stream_player.png
rename to editor/icons/icon_spatial_stream_player.png
diff --git a/tools/editor/icons/icon_sphere_shape.png b/editor/icons/icon_sphere_shape.png
similarity index 100%
rename from tools/editor/icons/icon_sphere_shape.png
rename to editor/icons/icon_sphere_shape.png
diff --git a/tools/editor/icons/icon_spin_box.png b/editor/icons/icon_spin_box.png
similarity index 100%
rename from tools/editor/icons/icon_spin_box.png
rename to editor/icons/icon_spin_box.png
diff --git a/tools/editor/icons/icon_spline.png b/editor/icons/icon_spline.png
similarity index 100%
rename from tools/editor/icons/icon_spline.png
rename to editor/icons/icon_spline.png
diff --git a/tools/editor/icons/icon_spot_light.png b/editor/icons/icon_spot_light.png
similarity index 100%
rename from tools/editor/icons/icon_spot_light.png
rename to editor/icons/icon_spot_light.png
diff --git a/tools/editor/icons/icon_sprite.png b/editor/icons/icon_sprite.png
similarity index 100%
rename from tools/editor/icons/icon_sprite.png
rename to editor/icons/icon_sprite.png
diff --git a/tools/editor/icons/icon_sprite_3d.png b/editor/icons/icon_sprite_3d.png
similarity index 100%
rename from tools/editor/icons/icon_sprite_3d.png
rename to editor/icons/icon_sprite_3d.png
diff --git a/tools/editor/icons/icon_sprite_frames.png b/editor/icons/icon_sprite_frames.png
similarity index 100%
rename from tools/editor/icons/icon_sprite_frames.png
rename to editor/icons/icon_sprite_frames.png
diff --git a/tools/editor/icons/icon_squirrel_script.png b/editor/icons/icon_squirrel_script.png
similarity index 100%
rename from tools/editor/icons/icon_squirrel_script.png
rename to editor/icons/icon_squirrel_script.png
diff --git a/tools/editor/icons/icon_static_body.png b/editor/icons/icon_static_body.png
similarity index 100%
rename from tools/editor/icons/icon_static_body.png
rename to editor/icons/icon_static_body.png
diff --git a/tools/editor/icons/icon_static_body_2_d.png b/editor/icons/icon_static_body_2_d.png
similarity index 100%
rename from tools/editor/icons/icon_static_body_2_d.png
rename to editor/icons/icon_static_body_2_d.png
diff --git a/tools/editor/icons/icon_static_body_2d.png b/editor/icons/icon_static_body_2d.png
similarity index 100%
rename from tools/editor/icons/icon_static_body_2d.png
rename to editor/icons/icon_static_body_2d.png
diff --git a/tools/editor/icons/icon_stop.png b/editor/icons/icon_stop.png
similarity index 100%
rename from tools/editor/icons/icon_stop.png
rename to editor/icons/icon_stop.png
diff --git a/tools/editor/icons/icon_stream_player.png b/editor/icons/icon_stream_player.png
similarity index 100%
rename from tools/editor/icons/icon_stream_player.png
rename to editor/icons/icon_stream_player.png
diff --git a/tools/editor/icons/icon_string.png b/editor/icons/icon_string.png
similarity index 100%
rename from tools/editor/icons/icon_string.png
rename to editor/icons/icon_string.png
diff --git a/tools/editor/icons/icon_style_box_empty.png b/editor/icons/icon_style_box_empty.png
similarity index 100%
rename from tools/editor/icons/icon_style_box_empty.png
rename to editor/icons/icon_style_box_empty.png
diff --git a/tools/editor/icons/icon_style_box_flat.png b/editor/icons/icon_style_box_flat.png
similarity index 100%
rename from tools/editor/icons/icon_style_box_flat.png
rename to editor/icons/icon_style_box_flat.png
diff --git a/tools/editor/icons/icon_style_box_texture.png b/editor/icons/icon_style_box_texture.png
similarity index 100%
rename from tools/editor/icons/icon_style_box_texture.png
rename to editor/icons/icon_style_box_texture.png
diff --git a/tools/editor/icons/icon_surface.png b/editor/icons/icon_surface.png
similarity index 100%
rename from tools/editor/icons/icon_surface.png
rename to editor/icons/icon_surface.png
diff --git a/tools/editor/icons/icon_tab_container.png b/editor/icons/icon_tab_container.png
similarity index 100%
rename from tools/editor/icons/icon_tab_container.png
rename to editor/icons/icon_tab_container.png
diff --git a/tools/editor/icons/icon_tab_menu.png b/editor/icons/icon_tab_menu.png
similarity index 100%
rename from tools/editor/icons/icon_tab_menu.png
rename to editor/icons/icon_tab_menu.png
diff --git a/tools/editor/icons/icon_tabs.png b/editor/icons/icon_tabs.png
similarity index 100%
rename from tools/editor/icons/icon_tabs.png
rename to editor/icons/icon_tabs.png
diff --git a/tools/editor/icons/icon_test_cube.png b/editor/icons/icon_test_cube.png
similarity index 100%
rename from tools/editor/icons/icon_test_cube.png
rename to editor/icons/icon_test_cube.png
diff --git a/tools/editor/icons/icon_text_edit.png b/editor/icons/icon_text_edit.png
similarity index 100%
rename from tools/editor/icons/icon_text_edit.png
rename to editor/icons/icon_text_edit.png
diff --git a/tools/editor/icons/icon_texture.png b/editor/icons/icon_texture.png
similarity index 100%
rename from tools/editor/icons/icon_texture.png
rename to editor/icons/icon_texture.png
diff --git a/tools/editor/icons/icon_texture_button.png b/editor/icons/icon_texture_button.png
similarity index 100%
rename from tools/editor/icons/icon_texture_button.png
rename to editor/icons/icon_texture_button.png
diff --git a/tools/editor/icons/icon_texture_progress.png b/editor/icons/icon_texture_progress.png
similarity index 100%
rename from tools/editor/icons/icon_texture_progress.png
rename to editor/icons/icon_texture_progress.png
diff --git a/tools/editor/icons/icon_texture_rect.png b/editor/icons/icon_texture_rect.png
similarity index 100%
rename from tools/editor/icons/icon_texture_rect.png
rename to editor/icons/icon_texture_rect.png
diff --git a/tools/editor/icons/icon_theme.png b/editor/icons/icon_theme.png
similarity index 100%
rename from tools/editor/icons/icon_theme.png
rename to editor/icons/icon_theme.png
diff --git a/tools/editor/icons/icon_thumbnail_wait.png b/editor/icons/icon_thumbnail_wait.png
similarity index 100%
rename from tools/editor/icons/icon_thumbnail_wait.png
rename to editor/icons/icon_thumbnail_wait.png
diff --git a/tools/editor/icons/icon_tile_map.png b/editor/icons/icon_tile_map.png
similarity index 100%
rename from tools/editor/icons/icon_tile_map.png
rename to editor/icons/icon_tile_map.png
diff --git a/tools/editor/icons/icon_tile_set.png b/editor/icons/icon_tile_set.png
similarity index 100%
rename from tools/editor/icons/icon_tile_set.png
rename to editor/icons/icon_tile_set.png
diff --git a/tools/editor/icons/icon_time.png b/editor/icons/icon_time.png
similarity index 100%
rename from tools/editor/icons/icon_time.png
rename to editor/icons/icon_time.png
diff --git a/tools/editor/icons/icon_timer.png b/editor/icons/icon_timer.png
similarity index 100%
rename from tools/editor/icons/icon_timer.png
rename to editor/icons/icon_timer.png
diff --git a/tools/editor/icons/icon_tool_button.png b/editor/icons/icon_tool_button.png
similarity index 100%
rename from tools/editor/icons/icon_tool_button.png
rename to editor/icons/icon_tool_button.png
diff --git a/tools/editor/icons/icon_tool_move.png b/editor/icons/icon_tool_move.png
similarity index 100%
rename from tools/editor/icons/icon_tool_move.png
rename to editor/icons/icon_tool_move.png
diff --git a/tools/editor/icons/icon_tool_pan.png b/editor/icons/icon_tool_pan.png
similarity index 100%
rename from tools/editor/icons/icon_tool_pan.png
rename to editor/icons/icon_tool_pan.png
diff --git a/tools/editor/icons/icon_tool_rotate.png b/editor/icons/icon_tool_rotate.png
similarity index 100%
rename from tools/editor/icons/icon_tool_rotate.png
rename to editor/icons/icon_tool_rotate.png
diff --git a/tools/editor/icons/icon_tool_scale.png b/editor/icons/icon_tool_scale.png
similarity index 100%
rename from tools/editor/icons/icon_tool_scale.png
rename to editor/icons/icon_tool_scale.png
diff --git a/tools/editor/icons/icon_tool_select.png b/editor/icons/icon_tool_select.png
similarity index 100%
rename from tools/editor/icons/icon_tool_select.png
rename to editor/icons/icon_tool_select.png
diff --git a/tools/editor/icons/icon_tools.png b/editor/icons/icon_tools.png
similarity index 100%
rename from tools/editor/icons/icon_tools.png
rename to editor/icons/icon_tools.png
diff --git a/tools/editor/icons/icon_touch_screen_button.png b/editor/icons/icon_touch_screen_button.png
similarity index 100%
rename from tools/editor/icons/icon_touch_screen_button.png
rename to editor/icons/icon_touch_screen_button.png
diff --git a/tools/editor/icons/icon_track_add_key.png b/editor/icons/icon_track_add_key.png
similarity index 100%
rename from tools/editor/icons/icon_track_add_key.png
rename to editor/icons/icon_track_add_key.png
diff --git a/tools/editor/icons/icon_track_add_key_hl.png b/editor/icons/icon_track_add_key_hl.png
similarity index 100%
rename from tools/editor/icons/icon_track_add_key_hl.png
rename to editor/icons/icon_track_add_key_hl.png
diff --git a/tools/editor/icons/icon_track_continuous.png b/editor/icons/icon_track_continuous.png
similarity index 100%
rename from tools/editor/icons/icon_track_continuous.png
rename to editor/icons/icon_track_continuous.png
diff --git a/tools/editor/icons/icon_track_discrete.png b/editor/icons/icon_track_discrete.png
similarity index 100%
rename from tools/editor/icons/icon_track_discrete.png
rename to editor/icons/icon_track_discrete.png
diff --git a/tools/editor/icons/icon_track_method.png b/editor/icons/icon_track_method.png
similarity index 100%
rename from tools/editor/icons/icon_track_method.png
rename to editor/icons/icon_track_method.png
diff --git a/tools/editor/icons/icon_track_prop.png b/editor/icons/icon_track_prop.png
similarity index 100%
rename from tools/editor/icons/icon_track_prop.png
rename to editor/icons/icon_track_prop.png
diff --git a/tools/editor/icons/icon_track_trigger.png b/editor/icons/icon_track_trigger.png
similarity index 100%
rename from tools/editor/icons/icon_track_trigger.png
rename to editor/icons/icon_track_trigger.png
diff --git a/tools/editor/icons/icon_track_value.png b/editor/icons/icon_track_value.png
similarity index 100%
rename from tools/editor/icons/icon_track_value.png
rename to editor/icons/icon_track_value.png
diff --git a/tools/editor/icons/icon_translation.png b/editor/icons/icon_translation.png
similarity index 100%
rename from tools/editor/icons/icon_translation.png
rename to editor/icons/icon_translation.png
diff --git a/tools/editor/icons/icon_transparent.png b/editor/icons/icon_transparent.png
similarity index 100%
rename from tools/editor/icons/icon_transparent.png
rename to editor/icons/icon_transparent.png
diff --git a/tools/editor/icons/icon_transpose.png b/editor/icons/icon_transpose.png
similarity index 100%
rename from tools/editor/icons/icon_transpose.png
rename to editor/icons/icon_transpose.png
diff --git a/tools/editor/icons/icon_tree.png b/editor/icons/icon_tree.png
similarity index 100%
rename from tools/editor/icons/icon_tree.png
rename to editor/icons/icon_tree.png
diff --git a/tools/editor/icons/icon_tween.png b/editor/icons/icon_tween.png
similarity index 100%
rename from tools/editor/icons/icon_tween.png
rename to editor/icons/icon_tween.png
diff --git a/tools/editor/icons/icon_unbone.png b/editor/icons/icon_unbone.png
similarity index 100%
rename from tools/editor/icons/icon_unbone.png
rename to editor/icons/icon_unbone.png
diff --git a/tools/editor/icons/icon_ungroup.png b/editor/icons/icon_ungroup.png
similarity index 100%
rename from tools/editor/icons/icon_ungroup.png
rename to editor/icons/icon_ungroup.png
diff --git a/tools/editor/icons/icon_uninstance.png b/editor/icons/icon_uninstance.png
similarity index 100%
rename from tools/editor/icons/icon_uninstance.png
rename to editor/icons/icon_uninstance.png
diff --git a/tools/editor/icons/icon_unlock.png b/editor/icons/icon_unlock.png
similarity index 100%
rename from tools/editor/icons/icon_unlock.png
rename to editor/icons/icon_unlock.png
diff --git a/tools/editor/icons/icon_up.png b/editor/icons/icon_up.png
similarity index 100%
rename from tools/editor/icons/icon_up.png
rename to editor/icons/icon_up.png
diff --git a/tools/editor/icons/icon_updown.png b/editor/icons/icon_updown.png
similarity index 100%
rename from tools/editor/icons/icon_updown.png
rename to editor/icons/icon_updown.png
diff --git a/tools/editor/icons/icon_uv.png b/editor/icons/icon_uv.png
similarity index 100%
rename from tools/editor/icons/icon_uv.png
rename to editor/icons/icon_uv.png
diff --git a/tools/editor/icons/icon_v_box_container.png b/editor/icons/icon_v_box_container.png
similarity index 100%
rename from tools/editor/icons/icon_v_box_container.png
rename to editor/icons/icon_v_box_container.png
diff --git a/tools/editor/icons/icon_v_button_array.png b/editor/icons/icon_v_button_array.png
similarity index 100%
rename from tools/editor/icons/icon_v_button_array.png
rename to editor/icons/icon_v_button_array.png
diff --git a/tools/editor/icons/icon_v_scroll_bar.png b/editor/icons/icon_v_scroll_bar.png
similarity index 100%
rename from tools/editor/icons/icon_v_scroll_bar.png
rename to editor/icons/icon_v_scroll_bar.png
diff --git a/tools/editor/icons/icon_v_separator.png b/editor/icons/icon_v_separator.png
similarity index 100%
rename from tools/editor/icons/icon_v_separator.png
rename to editor/icons/icon_v_separator.png
diff --git a/tools/editor/icons/icon_v_slider.png b/editor/icons/icon_v_slider.png
similarity index 100%
rename from tools/editor/icons/icon_v_slider.png
rename to editor/icons/icon_v_slider.png
diff --git a/tools/editor/icons/icon_v_split_container.png b/editor/icons/icon_v_split_container.png
similarity index 100%
rename from tools/editor/icons/icon_v_split_container.png
rename to editor/icons/icon_v_split_container.png
diff --git a/tools/editor/icons/icon_variant.png b/editor/icons/icon_variant.png
similarity index 100%
rename from tools/editor/icons/icon_variant.png
rename to editor/icons/icon_variant.png
diff --git a/tools/editor/icons/icon_vector.png b/editor/icons/icon_vector.png
similarity index 100%
rename from tools/editor/icons/icon_vector.png
rename to editor/icons/icon_vector.png
diff --git a/tools/editor/icons/icon_vector2.png b/editor/icons/icon_vector2.png
similarity index 100%
rename from tools/editor/icons/icon_vector2.png
rename to editor/icons/icon_vector2.png
diff --git a/tools/editor/icons/icon_vehicle_body.png b/editor/icons/icon_vehicle_body.png
similarity index 100%
rename from tools/editor/icons/icon_vehicle_body.png
rename to editor/icons/icon_vehicle_body.png
diff --git a/tools/editor/icons/icon_vehicle_wheel.png b/editor/icons/icon_vehicle_wheel.png
similarity index 100%
rename from tools/editor/icons/icon_vehicle_wheel.png
rename to editor/icons/icon_vehicle_wheel.png
diff --git a/tools/editor/icons/icon_video_player.png b/editor/icons/icon_video_player.png
similarity index 100%
rename from tools/editor/icons/icon_video_player.png
rename to editor/icons/icon_video_player.png
diff --git a/tools/editor/icons/icon_video_stream_theora.png b/editor/icons/icon_video_stream_theora.png
similarity index 100%
rename from tools/editor/icons/icon_video_stream_theora.png
rename to editor/icons/icon_video_stream_theora.png
diff --git a/tools/editor/icons/icon_view.png b/editor/icons/icon_view.png
similarity index 100%
rename from tools/editor/icons/icon_view.png
rename to editor/icons/icon_view.png
diff --git a/tools/editor/icons/icon_viewport.png b/editor/icons/icon_viewport.png
similarity index 100%
rename from tools/editor/icons/icon_viewport.png
rename to editor/icons/icon_viewport.png
diff --git a/tools/editor/icons/icon_viewport_container.png b/editor/icons/icon_viewport_container.png
similarity index 100%
rename from tools/editor/icons/icon_viewport_container.png
rename to editor/icons/icon_viewport_container.png
diff --git a/tools/editor/icons/icon_viewport_sprite.png b/editor/icons/icon_viewport_sprite.png
similarity index 100%
rename from tools/editor/icons/icon_viewport_sprite.png
rename to editor/icons/icon_viewport_sprite.png
diff --git a/tools/editor/icons/icon_viewport_texture.png b/editor/icons/icon_viewport_texture.png
similarity index 100%
rename from tools/editor/icons/icon_viewport_texture.png
rename to editor/icons/icon_viewport_texture.png
diff --git a/tools/editor/icons/icon_visibility_area.png b/editor/icons/icon_visibility_area.png
similarity index 100%
rename from tools/editor/icons/icon_visibility_area.png
rename to editor/icons/icon_visibility_area.png
diff --git a/tools/editor/icons/icon_visibility_enabler.png b/editor/icons/icon_visibility_enabler.png
similarity index 100%
rename from tools/editor/icons/icon_visibility_enabler.png
rename to editor/icons/icon_visibility_enabler.png
diff --git a/tools/editor/icons/icon_visibility_enabler_2d.png b/editor/icons/icon_visibility_enabler_2d.png
similarity index 100%
rename from tools/editor/icons/icon_visibility_enabler_2d.png
rename to editor/icons/icon_visibility_enabler_2d.png
diff --git a/tools/editor/icons/icon_visibility_notifier.png b/editor/icons/icon_visibility_notifier.png
similarity index 100%
rename from tools/editor/icons/icon_visibility_notifier.png
rename to editor/icons/icon_visibility_notifier.png
diff --git a/tools/editor/icons/icon_visibility_notifier_2d.png b/editor/icons/icon_visibility_notifier_2d.png
similarity index 100%
rename from tools/editor/icons/icon_visibility_notifier_2d.png
rename to editor/icons/icon_visibility_notifier_2d.png
diff --git a/tools/editor/icons/icon_visible.png b/editor/icons/icon_visible.png
similarity index 100%
rename from tools/editor/icons/icon_visible.png
rename to editor/icons/icon_visible.png
diff --git a/tools/editor/icons/icon_visual_script.png b/editor/icons/icon_visual_script.png
similarity index 100%
rename from tools/editor/icons/icon_visual_script.png
rename to editor/icons/icon_visual_script.png
diff --git a/tools/editor/icons/icon_visual_shader_port.png b/editor/icons/icon_visual_shader_port.png
similarity index 100%
rename from tools/editor/icons/icon_visual_shader_port.png
rename to editor/icons/icon_visual_shader_port.png
diff --git a/tools/editor/icons/icon_volume.png b/editor/icons/icon_volume.png
similarity index 100%
rename from tools/editor/icons/icon_volume.png
rename to editor/icons/icon_volume.png
diff --git a/tools/editor/icons/icon_vu_db.png b/editor/icons/icon_vu_db.png
similarity index 100%
rename from tools/editor/icons/icon_vu_db.png
rename to editor/icons/icon_vu_db.png
diff --git a/tools/editor/icons/icon_vu_empty.png b/editor/icons/icon_vu_empty.png
similarity index 100%
rename from tools/editor/icons/icon_vu_empty.png
rename to editor/icons/icon_vu_empty.png
diff --git a/tools/editor/icons/icon_vu_full.png b/editor/icons/icon_vu_full.png
similarity index 100%
rename from tools/editor/icons/icon_vu_full.png
rename to editor/icons/icon_vu_full.png
diff --git a/tools/editor/icons/icon_wait_no_preview.png b/editor/icons/icon_wait_no_preview.png
similarity index 100%
rename from tools/editor/icons/icon_wait_no_preview.png
rename to editor/icons/icon_wait_no_preview.png
diff --git a/tools/editor/icons/icon_wait_preview_1.png b/editor/icons/icon_wait_preview_1.png
similarity index 100%
rename from tools/editor/icons/icon_wait_preview_1.png
rename to editor/icons/icon_wait_preview_1.png
diff --git a/tools/editor/icons/icon_wait_preview_2.png b/editor/icons/icon_wait_preview_2.png
similarity index 100%
rename from tools/editor/icons/icon_wait_preview_2.png
rename to editor/icons/icon_wait_preview_2.png
diff --git a/tools/editor/icons/icon_wait_preview_3.png b/editor/icons/icon_wait_preview_3.png
similarity index 100%
rename from tools/editor/icons/icon_wait_preview_3.png
rename to editor/icons/icon_wait_preview_3.png
diff --git a/tools/editor/icons/icon_wait_preview_4.png b/editor/icons/icon_wait_preview_4.png
similarity index 100%
rename from tools/editor/icons/icon_wait_preview_4.png
rename to editor/icons/icon_wait_preview_4.png
diff --git a/tools/editor/icons/icon_wait_preview_5.png b/editor/icons/icon_wait_preview_5.png
similarity index 100%
rename from tools/editor/icons/icon_wait_preview_5.png
rename to editor/icons/icon_wait_preview_5.png
diff --git a/tools/editor/icons/icon_wait_preview_6.png b/editor/icons/icon_wait_preview_6.png
similarity index 100%
rename from tools/editor/icons/icon_wait_preview_6.png
rename to editor/icons/icon_wait_preview_6.png
diff --git a/tools/editor/icons/icon_wait_preview_7.png b/editor/icons/icon_wait_preview_7.png
similarity index 100%
rename from tools/editor/icons/icon_wait_preview_7.png
rename to editor/icons/icon_wait_preview_7.png
diff --git a/tools/editor/icons/icon_wait_preview_8.png b/editor/icons/icon_wait_preview_8.png
similarity index 100%
rename from tools/editor/icons/icon_wait_preview_8.png
rename to editor/icons/icon_wait_preview_8.png
diff --git a/tools/editor/icons/icon_warning.png b/editor/icons/icon_warning.png
similarity index 100%
rename from tools/editor/icons/icon_warning.png
rename to editor/icons/icon_warning.png
diff --git a/tools/editor/icons/icon_window_dialog.png b/editor/icons/icon_window_dialog.png
similarity index 100%
rename from tools/editor/icons/icon_window_dialog.png
rename to editor/icons/icon_window_dialog.png
diff --git a/tools/editor/icons/icon_world.png b/editor/icons/icon_world.png
similarity index 100%
rename from tools/editor/icons/icon_world.png
rename to editor/icons/icon_world.png
diff --git a/tools/editor/icons/icon_world_2d.png b/editor/icons/icon_world_2d.png
similarity index 100%
rename from tools/editor/icons/icon_world_2d.png
rename to editor/icons/icon_world_2d.png
diff --git a/tools/editor/icons/icon_world_environment.png b/editor/icons/icon_world_environment.png
similarity index 100%
rename from tools/editor/icons/icon_world_environment.png
rename to editor/icons/icon_world_environment.png
diff --git a/tools/editor/icons/icon_y_sort.png b/editor/icons/icon_y_sort.png
similarity index 100%
rename from tools/editor/icons/icon_y_sort.png
rename to editor/icons/icon_y_sort.png
diff --git a/tools/editor/icons/icon_zoom.png b/editor/icons/icon_zoom.png
similarity index 100%
rename from tools/editor/icons/icon_zoom.png
rename to editor/icons/icon_zoom.png
diff --git a/tools/editor/icons/icon_zoom_less.png b/editor/icons/icon_zoom_less.png
similarity index 100%
rename from tools/editor/icons/icon_zoom_less.png
rename to editor/icons/icon_zoom_less.png
diff --git a/tools/editor/icons/icon_zoom_more.png b/editor/icons/icon_zoom_more.png
similarity index 100%
rename from tools/editor/icons/icon_zoom_more.png
rename to editor/icons/icon_zoom_more.png
diff --git a/tools/editor/icons/icon_zoom_reset.png b/editor/icons/icon_zoom_reset.png
similarity index 100%
rename from tools/editor/icons/icon_zoom_reset.png
rename to editor/icons/icon_zoom_reset.png
diff --git a/tools/editor/icons/source/icon_accept_dialog.svg b/editor/icons/source/icon_accept_dialog.svg
similarity index 100%
rename from tools/editor/icons/source/icon_accept_dialog.svg
rename to editor/icons/source/icon_accept_dialog.svg
diff --git a/tools/editor/icons/source/icon_add_track.svg b/editor/icons/source/icon_add_track.svg
similarity index 100%
rename from tools/editor/icons/source/icon_add_track.svg
rename to editor/icons/source/icon_add_track.svg
diff --git a/tools/editor/icons/source/icon_anchor.svg b/editor/icons/source/icon_anchor.svg
similarity index 100%
rename from tools/editor/icons/source/icon_anchor.svg
rename to editor/icons/source/icon_anchor.svg
diff --git a/tools/editor/icons/source/icon_animated_sprite.svg b/editor/icons/source/icon_animated_sprite.svg
similarity index 100%
rename from tools/editor/icons/source/icon_animated_sprite.svg
rename to editor/icons/source/icon_animated_sprite.svg
diff --git a/tools/editor/icons/source/icon_animated_sprite_3d.svg b/editor/icons/source/icon_animated_sprite_3d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_animated_sprite_3d.svg
rename to editor/icons/source/icon_animated_sprite_3d.svg
diff --git a/tools/editor/icons/source/icon_animation.svg b/editor/icons/source/icon_animation.svg
similarity index 100%
rename from tools/editor/icons/source/icon_animation.svg
rename to editor/icons/source/icon_animation.svg
diff --git a/tools/editor/icons/source/icon_animation_player.svg b/editor/icons/source/icon_animation_player.svg
similarity index 100%
rename from tools/editor/icons/source/icon_animation_player.svg
rename to editor/icons/source/icon_animation_player.svg
diff --git a/tools/editor/icons/source/icon_animation_tree_player.svg b/editor/icons/source/icon_animation_tree_player.svg
similarity index 100%
rename from tools/editor/icons/source/icon_animation_tree_player.svg
rename to editor/icons/source/icon_animation_tree_player.svg
diff --git a/tools/editor/icons/source/icon_area.svg b/editor/icons/source/icon_area.svg
similarity index 100%
rename from tools/editor/icons/source/icon_area.svg
rename to editor/icons/source/icon_area.svg
diff --git a/tools/editor/icons/source/icon_area_2d.svg b/editor/icons/source/icon_area_2d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_area_2d.svg
rename to editor/icons/source/icon_area_2d.svg
diff --git a/tools/editor/icons/source/icon_arrow_left.svg b/editor/icons/source/icon_arrow_left.svg
similarity index 100%
rename from tools/editor/icons/source/icon_arrow_left.svg
rename to editor/icons/source/icon_arrow_left.svg
diff --git a/tools/editor/icons/source/icon_arrow_right.svg b/editor/icons/source/icon_arrow_right.svg
similarity index 100%
rename from tools/editor/icons/source/icon_arrow_right.svg
rename to editor/icons/source/icon_arrow_right.svg
diff --git a/tools/editor/icons/source/icon_arrow_up.svg b/editor/icons/source/icon_arrow_up.svg
similarity index 100%
rename from tools/editor/icons/source/icon_arrow_up.svg
rename to editor/icons/source/icon_arrow_up.svg
diff --git a/tools/editor/icons/source/icon_atlas_texture.svg b/editor/icons/source/icon_atlas_texture.svg
similarity index 100%
rename from tools/editor/icons/source/icon_atlas_texture.svg
rename to editor/icons/source/icon_atlas_texture.svg
diff --git a/tools/editor/icons/source/icon_audio_stream_gibberish.svg b/editor/icons/source/icon_audio_stream_gibberish.svg
similarity index 100%
rename from tools/editor/icons/source/icon_audio_stream_gibberish.svg
rename to editor/icons/source/icon_audio_stream_gibberish.svg
diff --git a/tools/editor/icons/source/icon_auto_play.svg b/editor/icons/source/icon_auto_play.svg
similarity index 100%
rename from tools/editor/icons/source/icon_auto_play.svg
rename to editor/icons/source/icon_auto_play.svg
diff --git a/tools/editor/icons/source/icon_back.svg b/editor/icons/source/icon_back.svg
similarity index 100%
rename from tools/editor/icons/source/icon_back.svg
rename to editor/icons/source/icon_back.svg
diff --git a/tools/editor/icons/source/icon_back_buffer_copy.svg b/editor/icons/source/icon_back_buffer_copy.svg
similarity index 100%
rename from tools/editor/icons/source/icon_back_buffer_copy.svg
rename to editor/icons/source/icon_back_buffer_copy.svg
diff --git a/tools/editor/icons/source/icon_bake.svg b/editor/icons/source/icon_bake.svg
similarity index 100%
rename from tools/editor/icons/source/icon_bake.svg
rename to editor/icons/source/icon_bake.svg
diff --git a/tools/editor/icons/source/icon_baked_light.svg b/editor/icons/source/icon_baked_light.svg
similarity index 100%
rename from tools/editor/icons/source/icon_baked_light.svg
rename to editor/icons/source/icon_baked_light.svg
diff --git a/tools/editor/icons/source/icon_baked_light_instance.svg b/editor/icons/source/icon_baked_light_instance.svg
similarity index 100%
rename from tools/editor/icons/source/icon_baked_light_instance.svg
rename to editor/icons/source/icon_baked_light_instance.svg
diff --git a/tools/editor/icons/source/icon_baked_light_sampler.svg b/editor/icons/source/icon_baked_light_sampler.svg
similarity index 100%
rename from tools/editor/icons/source/icon_baked_light_sampler.svg
rename to editor/icons/source/icon_baked_light_sampler.svg
diff --git a/tools/editor/icons/source/icon_bit_map.svg b/editor/icons/source/icon_bit_map.svg
similarity index 100%
rename from tools/editor/icons/source/icon_bit_map.svg
rename to editor/icons/source/icon_bit_map.svg
diff --git a/tools/editor/icons/source/icon_bitmap_font.svg b/editor/icons/source/icon_bitmap_font.svg
similarity index 100%
rename from tools/editor/icons/source/icon_bitmap_font.svg
rename to editor/icons/source/icon_bitmap_font.svg
diff --git a/tools/editor/icons/source/icon_blend.svg b/editor/icons/source/icon_blend.svg
similarity index 100%
rename from tools/editor/icons/source/icon_blend.svg
rename to editor/icons/source/icon_blend.svg
diff --git a/tools/editor/icons/source/icon_bone.svg b/editor/icons/source/icon_bone.svg
similarity index 100%
rename from tools/editor/icons/source/icon_bone.svg
rename to editor/icons/source/icon_bone.svg
diff --git a/tools/editor/icons/source/icon_bone_attachment.svg b/editor/icons/source/icon_bone_attachment.svg
similarity index 100%
rename from tools/editor/icons/source/icon_bone_attachment.svg
rename to editor/icons/source/icon_bone_attachment.svg
diff --git a/tools/editor/icons/source/icon_bone_track.svg b/editor/icons/source/icon_bone_track.svg
similarity index 100%
rename from tools/editor/icons/source/icon_bone_track.svg
rename to editor/icons/source/icon_bone_track.svg
diff --git a/tools/editor/icons/source/icon_bool.svg b/editor/icons/source/icon_bool.svg
similarity index 100%
rename from tools/editor/icons/source/icon_bool.svg
rename to editor/icons/source/icon_bool.svg
diff --git a/tools/editor/icons/source/icon_box_shape.svg b/editor/icons/source/icon_box_shape.svg
similarity index 100%
rename from tools/editor/icons/source/icon_box_shape.svg
rename to editor/icons/source/icon_box_shape.svg
diff --git a/tools/editor/icons/source/icon_button.svg b/editor/icons/source/icon_button.svg
similarity index 100%
rename from tools/editor/icons/source/icon_button.svg
rename to editor/icons/source/icon_button.svg
diff --git a/tools/editor/icons/source/icon_button_group.svg b/editor/icons/source/icon_button_group.svg
similarity index 100%
rename from tools/editor/icons/source/icon_button_group.svg
rename to editor/icons/source/icon_button_group.svg
diff --git a/tools/editor/icons/source/icon_camera.svg b/editor/icons/source/icon_camera.svg
similarity index 100%
rename from tools/editor/icons/source/icon_camera.svg
rename to editor/icons/source/icon_camera.svg
diff --git a/tools/editor/icons/source/icon_camera_2d.svg b/editor/icons/source/icon_camera_2d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_camera_2d.svg
rename to editor/icons/source/icon_camera_2d.svg
diff --git a/tools/editor/icons/source/icon_canvas_item.svg b/editor/icons/source/icon_canvas_item.svg
similarity index 100%
rename from tools/editor/icons/source/icon_canvas_item.svg
rename to editor/icons/source/icon_canvas_item.svg
diff --git a/tools/editor/icons/source/icon_canvas_item_material.svg b/editor/icons/source/icon_canvas_item_material.svg
similarity index 100%
rename from tools/editor/icons/source/icon_canvas_item_material.svg
rename to editor/icons/source/icon_canvas_item_material.svg
diff --git a/tools/editor/icons/source/icon_canvas_item_shader.svg b/editor/icons/source/icon_canvas_item_shader.svg
similarity index 100%
rename from tools/editor/icons/source/icon_canvas_item_shader.svg
rename to editor/icons/source/icon_canvas_item_shader.svg
diff --git a/tools/editor/icons/source/icon_canvas_item_shader_graph.svg b/editor/icons/source/icon_canvas_item_shader_graph.svg
similarity index 100%
rename from tools/editor/icons/source/icon_canvas_item_shader_graph.svg
rename to editor/icons/source/icon_canvas_item_shader_graph.svg
diff --git a/tools/editor/icons/source/icon_canvas_layer.svg b/editor/icons/source/icon_canvas_layer.svg
similarity index 100%
rename from tools/editor/icons/source/icon_canvas_layer.svg
rename to editor/icons/source/icon_canvas_layer.svg
diff --git a/tools/editor/icons/source/icon_canvas_modulate.svg b/editor/icons/source/icon_canvas_modulate.svg
similarity index 100%
rename from tools/editor/icons/source/icon_canvas_modulate.svg
rename to editor/icons/source/icon_canvas_modulate.svg
diff --git a/tools/editor/icons/source/icon_capsule_shape.svg b/editor/icons/source/icon_capsule_shape.svg
similarity index 100%
rename from tools/editor/icons/source/icon_capsule_shape.svg
rename to editor/icons/source/icon_capsule_shape.svg
diff --git a/tools/editor/icons/source/icon_capsule_shape_2d.svg b/editor/icons/source/icon_capsule_shape_2d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_capsule_shape_2d.svg
rename to editor/icons/source/icon_capsule_shape_2d.svg
diff --git a/tools/editor/icons/source/icon_center_container.svg b/editor/icons/source/icon_center_container.svg
similarity index 100%
rename from tools/editor/icons/source/icon_center_container.svg
rename to editor/icons/source/icon_center_container.svg
diff --git a/tools/editor/icons/source/icon_check_box.svg b/editor/icons/source/icon_check_box.svg
similarity index 100%
rename from tools/editor/icons/source/icon_check_box.svg
rename to editor/icons/source/icon_check_box.svg
diff --git a/tools/editor/icons/source/icon_check_button.svg b/editor/icons/source/icon_check_button.svg
similarity index 100%
rename from tools/editor/icons/source/icon_check_button.svg
rename to editor/icons/source/icon_check_button.svg
diff --git a/tools/editor/icons/source/icon_circle_shape_2d.svg b/editor/icons/source/icon_circle_shape_2d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_circle_shape_2d.svg
rename to editor/icons/source/icon_circle_shape_2d.svg
diff --git a/tools/editor/icons/source/icon_class_list.svg b/editor/icons/source/icon_class_list.svg
similarity index 100%
rename from tools/editor/icons/source/icon_class_list.svg
rename to editor/icons/source/icon_class_list.svg
diff --git a/tools/editor/icons/source/icon_close.svg b/editor/icons/source/icon_close.svg
similarity index 100%
rename from tools/editor/icons/source/icon_close.svg
rename to editor/icons/source/icon_close.svg
diff --git a/tools/editor/icons/source/icon_collapse.svg b/editor/icons/source/icon_collapse.svg
similarity index 100%
rename from tools/editor/icons/source/icon_collapse.svg
rename to editor/icons/source/icon_collapse.svg
diff --git a/tools/editor/icons/source/icon_collision_2d.svg b/editor/icons/source/icon_collision_2d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_collision_2d.svg
rename to editor/icons/source/icon_collision_2d.svg
diff --git a/tools/editor/icons/source/icon_collision_polygon.svg b/editor/icons/source/icon_collision_polygon.svg
similarity index 100%
rename from tools/editor/icons/source/icon_collision_polygon.svg
rename to editor/icons/source/icon_collision_polygon.svg
diff --git a/tools/editor/icons/source/icon_collision_shape.svg b/editor/icons/source/icon_collision_shape.svg
similarity index 100%
rename from tools/editor/icons/source/icon_collision_shape.svg
rename to editor/icons/source/icon_collision_shape.svg
diff --git a/tools/editor/icons/source/icon_collision_shape_2d.svg b/editor/icons/source/icon_collision_shape_2d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_collision_shape_2d.svg
rename to editor/icons/source/icon_collision_shape_2d.svg
diff --git a/tools/editor/icons/source/icon_color.svg b/editor/icons/source/icon_color.svg
similarity index 100%
rename from tools/editor/icons/source/icon_color.svg
rename to editor/icons/source/icon_color.svg
diff --git a/tools/editor/icons/source/icon_color_pick.svg b/editor/icons/source/icon_color_pick.svg
similarity index 100%
rename from tools/editor/icons/source/icon_color_pick.svg
rename to editor/icons/source/icon_color_pick.svg
diff --git a/tools/editor/icons/source/icon_color_picker.svg b/editor/icons/source/icon_color_picker.svg
similarity index 100%
rename from tools/editor/icons/source/icon_color_picker.svg
rename to editor/icons/source/icon_color_picker.svg
diff --git a/tools/editor/icons/source/icon_color_picker_button.svg b/editor/icons/source/icon_color_picker_button.svg
similarity index 100%
rename from tools/editor/icons/source/icon_color_picker_button.svg
rename to editor/icons/source/icon_color_picker_button.svg
diff --git a/tools/editor/icons/source/icon_color_ramp.svg b/editor/icons/source/icon_color_ramp.svg
similarity index 100%
rename from tools/editor/icons/source/icon_color_ramp.svg
rename to editor/icons/source/icon_color_ramp.svg
diff --git a/tools/editor/icons/source/icon_color_rect.svg b/editor/icons/source/icon_color_rect.svg
similarity index 100%
rename from tools/editor/icons/source/icon_color_rect.svg
rename to editor/icons/source/icon_color_rect.svg
diff --git a/tools/editor/icons/source/icon_concave_polygon_shape.svg b/editor/icons/source/icon_concave_polygon_shape.svg
similarity index 100%
rename from tools/editor/icons/source/icon_concave_polygon_shape.svg
rename to editor/icons/source/icon_concave_polygon_shape.svg
diff --git a/tools/editor/icons/source/icon_concave_polygon_shape_2d.svg b/editor/icons/source/icon_concave_polygon_shape_2d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_concave_polygon_shape_2d.svg
rename to editor/icons/source/icon_concave_polygon_shape_2d.svg
diff --git a/tools/editor/icons/source/icon_cone_twist_joint.svg b/editor/icons/source/icon_cone_twist_joint.svg
similarity index 100%
rename from tools/editor/icons/source/icon_cone_twist_joint.svg
rename to editor/icons/source/icon_cone_twist_joint.svg
diff --git a/tools/editor/icons/source/icon_confirmation_dialog.svg b/editor/icons/source/icon_confirmation_dialog.svg
similarity index 100%
rename from tools/editor/icons/source/icon_confirmation_dialog.svg
rename to editor/icons/source/icon_confirmation_dialog.svg
diff --git a/tools/editor/icons/source/icon_connect.svg b/editor/icons/source/icon_connect.svg
similarity index 100%
rename from tools/editor/icons/source/icon_connect.svg
rename to editor/icons/source/icon_connect.svg
diff --git a/tools/editor/icons/source/icon_connection_and_groups.svg b/editor/icons/source/icon_connection_and_groups.svg
similarity index 100%
rename from tools/editor/icons/source/icon_connection_and_groups.svg
rename to editor/icons/source/icon_connection_and_groups.svg
diff --git a/tools/editor/icons/source/icon_container.svg b/editor/icons/source/icon_container.svg
similarity index 100%
rename from tools/editor/icons/source/icon_container.svg
rename to editor/icons/source/icon_container.svg
diff --git a/tools/editor/icons/source/icon_control.svg b/editor/icons/source/icon_control.svg
similarity index 100%
rename from tools/editor/icons/source/icon_control.svg
rename to editor/icons/source/icon_control.svg
diff --git a/tools/editor/icons/source/icon_control_align_bottom_center.svg b/editor/icons/source/icon_control_align_bottom_center.svg
similarity index 100%
rename from tools/editor/icons/source/icon_control_align_bottom_center.svg
rename to editor/icons/source/icon_control_align_bottom_center.svg
diff --git a/tools/editor/icons/source/icon_control_align_bottom_left.svg b/editor/icons/source/icon_control_align_bottom_left.svg
similarity index 100%
rename from tools/editor/icons/source/icon_control_align_bottom_left.svg
rename to editor/icons/source/icon_control_align_bottom_left.svg
diff --git a/tools/editor/icons/source/icon_control_align_bottom_right.svg b/editor/icons/source/icon_control_align_bottom_right.svg
similarity index 100%
rename from tools/editor/icons/source/icon_control_align_bottom_right.svg
rename to editor/icons/source/icon_control_align_bottom_right.svg
diff --git a/tools/editor/icons/source/icon_control_align_bottom_wide.svg b/editor/icons/source/icon_control_align_bottom_wide.svg
similarity index 100%
rename from tools/editor/icons/source/icon_control_align_bottom_wide.svg
rename to editor/icons/source/icon_control_align_bottom_wide.svg
diff --git a/tools/editor/icons/source/icon_control_align_center.svg b/editor/icons/source/icon_control_align_center.svg
similarity index 100%
rename from tools/editor/icons/source/icon_control_align_center.svg
rename to editor/icons/source/icon_control_align_center.svg
diff --git a/tools/editor/icons/source/icon_control_align_center_left.svg b/editor/icons/source/icon_control_align_center_left.svg
similarity index 100%
rename from tools/editor/icons/source/icon_control_align_center_left.svg
rename to editor/icons/source/icon_control_align_center_left.svg
diff --git a/tools/editor/icons/source/icon_control_align_center_right.svg b/editor/icons/source/icon_control_align_center_right.svg
similarity index 100%
rename from tools/editor/icons/source/icon_control_align_center_right.svg
rename to editor/icons/source/icon_control_align_center_right.svg
diff --git a/tools/editor/icons/source/icon_control_align_left_center.svg b/editor/icons/source/icon_control_align_left_center.svg
similarity index 100%
rename from tools/editor/icons/source/icon_control_align_left_center.svg
rename to editor/icons/source/icon_control_align_left_center.svg
diff --git a/tools/editor/icons/source/icon_control_align_left_wide.svg b/editor/icons/source/icon_control_align_left_wide.svg
similarity index 100%
rename from tools/editor/icons/source/icon_control_align_left_wide.svg
rename to editor/icons/source/icon_control_align_left_wide.svg
diff --git a/tools/editor/icons/source/icon_control_align_right_center.svg b/editor/icons/source/icon_control_align_right_center.svg
similarity index 100%
rename from tools/editor/icons/source/icon_control_align_right_center.svg
rename to editor/icons/source/icon_control_align_right_center.svg
diff --git a/tools/editor/icons/source/icon_control_align_right_wide.svg b/editor/icons/source/icon_control_align_right_wide.svg
similarity index 100%
rename from tools/editor/icons/source/icon_control_align_right_wide.svg
rename to editor/icons/source/icon_control_align_right_wide.svg
diff --git a/tools/editor/icons/source/icon_control_align_top_center.svg b/editor/icons/source/icon_control_align_top_center.svg
similarity index 100%
rename from tools/editor/icons/source/icon_control_align_top_center.svg
rename to editor/icons/source/icon_control_align_top_center.svg
diff --git a/tools/editor/icons/source/icon_control_align_top_left.svg b/editor/icons/source/icon_control_align_top_left.svg
similarity index 100%
rename from tools/editor/icons/source/icon_control_align_top_left.svg
rename to editor/icons/source/icon_control_align_top_left.svg
diff --git a/tools/editor/icons/source/icon_control_align_top_right.svg b/editor/icons/source/icon_control_align_top_right.svg
similarity index 100%
rename from tools/editor/icons/source/icon_control_align_top_right.svg
rename to editor/icons/source/icon_control_align_top_right.svg
diff --git a/tools/editor/icons/source/icon_control_align_top_wide.svg b/editor/icons/source/icon_control_align_top_wide.svg
similarity index 100%
rename from tools/editor/icons/source/icon_control_align_top_wide.svg
rename to editor/icons/source/icon_control_align_top_wide.svg
diff --git a/tools/editor/icons/source/icon_control_align_wide.svg b/editor/icons/source/icon_control_align_wide.svg
similarity index 100%
rename from tools/editor/icons/source/icon_control_align_wide.svg
rename to editor/icons/source/icon_control_align_wide.svg
diff --git a/tools/editor/icons/source/icon_control_hcenter_wide.svg b/editor/icons/source/icon_control_hcenter_wide.svg
similarity index 100%
rename from tools/editor/icons/source/icon_control_hcenter_wide.svg
rename to editor/icons/source/icon_control_hcenter_wide.svg
diff --git a/tools/editor/icons/source/icon_control_vcenter_wide.svg b/editor/icons/source/icon_control_vcenter_wide.svg
similarity index 100%
rename from tools/editor/icons/source/icon_control_vcenter_wide.svg
rename to editor/icons/source/icon_control_vcenter_wide.svg
diff --git a/tools/editor/icons/source/icon_convex_polygon_shape.svg b/editor/icons/source/icon_convex_polygon_shape.svg
similarity index 100%
rename from tools/editor/icons/source/icon_convex_polygon_shape.svg
rename to editor/icons/source/icon_convex_polygon_shape.svg
diff --git a/tools/editor/icons/source/icon_convex_polygon_shape_2d.svg b/editor/icons/source/icon_convex_polygon_shape_2d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_convex_polygon_shape_2d.svg
rename to editor/icons/source/icon_convex_polygon_shape_2d.svg
diff --git a/tools/editor/icons/source/icon_copy_node_path.svg b/editor/icons/source/icon_copy_node_path.svg
similarity index 100%
rename from tools/editor/icons/source/icon_copy_node_path.svg
rename to editor/icons/source/icon_copy_node_path.svg
diff --git a/tools/editor/icons/source/icon_create_new_scene_from.svg b/editor/icons/source/icon_create_new_scene_from.svg
similarity index 100%
rename from tools/editor/icons/source/icon_create_new_scene_from.svg
rename to editor/icons/source/icon_create_new_scene_from.svg
diff --git a/tools/editor/icons/source/icon_cube_map.svg b/editor/icons/source/icon_cube_map.svg
similarity index 100%
rename from tools/editor/icons/source/icon_cube_map.svg
rename to editor/icons/source/icon_cube_map.svg
diff --git a/tools/editor/icons/source/icon_curve_2d.svg b/editor/icons/source/icon_curve_2d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_curve_2d.svg
rename to editor/icons/source/icon_curve_2d.svg
diff --git a/tools/editor/icons/source/icon_curve_3d.svg b/editor/icons/source/icon_curve_3d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_curve_3d.svg
rename to editor/icons/source/icon_curve_3d.svg
diff --git a/tools/editor/icons/source/icon_curve_close.svg b/editor/icons/source/icon_curve_close.svg
similarity index 100%
rename from tools/editor/icons/source/icon_curve_close.svg
rename to editor/icons/source/icon_curve_close.svg
diff --git a/tools/editor/icons/source/icon_curve_constant.svg b/editor/icons/source/icon_curve_constant.svg
similarity index 100%
rename from tools/editor/icons/source/icon_curve_constant.svg
rename to editor/icons/source/icon_curve_constant.svg
diff --git a/tools/editor/icons/source/icon_curve_create.svg b/editor/icons/source/icon_curve_create.svg
similarity index 100%
rename from tools/editor/icons/source/icon_curve_create.svg
rename to editor/icons/source/icon_curve_create.svg
diff --git a/tools/editor/icons/source/icon_curve_curve.svg b/editor/icons/source/icon_curve_curve.svg
similarity index 100%
rename from tools/editor/icons/source/icon_curve_curve.svg
rename to editor/icons/source/icon_curve_curve.svg
diff --git a/tools/editor/icons/source/icon_curve_delete.svg b/editor/icons/source/icon_curve_delete.svg
similarity index 100%
rename from tools/editor/icons/source/icon_curve_delete.svg
rename to editor/icons/source/icon_curve_delete.svg
diff --git a/tools/editor/icons/source/icon_curve_edit.svg b/editor/icons/source/icon_curve_edit.svg
similarity index 100%
rename from tools/editor/icons/source/icon_curve_edit.svg
rename to editor/icons/source/icon_curve_edit.svg
diff --git a/tools/editor/icons/source/icon_curve_in.svg b/editor/icons/source/icon_curve_in.svg
similarity index 100%
rename from tools/editor/icons/source/icon_curve_in.svg
rename to editor/icons/source/icon_curve_in.svg
diff --git a/tools/editor/icons/source/icon_curve_in_out.svg b/editor/icons/source/icon_curve_in_out.svg
similarity index 100%
rename from tools/editor/icons/source/icon_curve_in_out.svg
rename to editor/icons/source/icon_curve_in_out.svg
diff --git a/tools/editor/icons/source/icon_curve_linear.svg b/editor/icons/source/icon_curve_linear.svg
similarity index 100%
rename from tools/editor/icons/source/icon_curve_linear.svg
rename to editor/icons/source/icon_curve_linear.svg
diff --git a/tools/editor/icons/source/icon_curve_out.svg b/editor/icons/source/icon_curve_out.svg
similarity index 100%
rename from tools/editor/icons/source/icon_curve_out.svg
rename to editor/icons/source/icon_curve_out.svg
diff --git a/tools/editor/icons/source/icon_curve_out_in.svg b/editor/icons/source/icon_curve_out_in.svg
similarity index 100%
rename from tools/editor/icons/source/icon_curve_out_in.svg
rename to editor/icons/source/icon_curve_out_in.svg
diff --git a/tools/editor/icons/source/icon_damped_spring_joint_2d.svg b/editor/icons/source/icon_damped_spring_joint_2d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_damped_spring_joint_2d.svg
rename to editor/icons/source/icon_damped_spring_joint_2d.svg
diff --git a/tools/editor/icons/source/icon_debug_continue.svg b/editor/icons/source/icon_debug_continue.svg
similarity index 100%
rename from tools/editor/icons/source/icon_debug_continue.svg
rename to editor/icons/source/icon_debug_continue.svg
diff --git a/tools/editor/icons/source/icon_debug_next.svg b/editor/icons/source/icon_debug_next.svg
similarity index 100%
rename from tools/editor/icons/source/icon_debug_next.svg
rename to editor/icons/source/icon_debug_next.svg
diff --git a/tools/editor/icons/source/icon_debug_step.svg b/editor/icons/source/icon_debug_step.svg
similarity index 100%
rename from tools/editor/icons/source/icon_debug_step.svg
rename to editor/icons/source/icon_debug_step.svg
diff --git a/tools/editor/icons/source/icon_dependency_changed.svg b/editor/icons/source/icon_dependency_changed.svg
similarity index 100%
rename from tools/editor/icons/source/icon_dependency_changed.svg
rename to editor/icons/source/icon_dependency_changed.svg
diff --git a/tools/editor/icons/source/icon_dependency_changed_hl.svg b/editor/icons/source/icon_dependency_changed_hl.svg
similarity index 100%
rename from tools/editor/icons/source/icon_dependency_changed_hl.svg
rename to editor/icons/source/icon_dependency_changed_hl.svg
diff --git a/tools/editor/icons/source/icon_dependency_local_changed.svg b/editor/icons/source/icon_dependency_local_changed.svg
similarity index 100%
rename from tools/editor/icons/source/icon_dependency_local_changed.svg
rename to editor/icons/source/icon_dependency_local_changed.svg
diff --git a/tools/editor/icons/source/icon_dependency_local_changed_hl.svg b/editor/icons/source/icon_dependency_local_changed_hl.svg
similarity index 100%
rename from tools/editor/icons/source/icon_dependency_local_changed_hl.svg
rename to editor/icons/source/icon_dependency_local_changed_hl.svg
diff --git a/tools/editor/icons/source/icon_dependency_ok.svg b/editor/icons/source/icon_dependency_ok.svg
similarity index 100%
rename from tools/editor/icons/source/icon_dependency_ok.svg
rename to editor/icons/source/icon_dependency_ok.svg
diff --git a/tools/editor/icons/source/icon_dependency_ok_hl.svg b/editor/icons/source/icon_dependency_ok_hl.svg
similarity index 100%
rename from tools/editor/icons/source/icon_dependency_ok_hl.svg
rename to editor/icons/source/icon_dependency_ok_hl.svg
diff --git a/tools/editor/icons/source/icon_directional_light.svg b/editor/icons/source/icon_directional_light.svg
similarity index 100%
rename from tools/editor/icons/source/icon_directional_light.svg
rename to editor/icons/source/icon_directional_light.svg
diff --git a/tools/editor/icons/source/icon_distraction_free.svg b/editor/icons/source/icon_distraction_free.svg
similarity index 100%
rename from tools/editor/icons/source/icon_distraction_free.svg
rename to editor/icons/source/icon_distraction_free.svg
diff --git a/tools/editor/icons/source/icon_duplicate.svg b/editor/icons/source/icon_duplicate.svg
similarity index 100%
rename from tools/editor/icons/source/icon_duplicate.svg
rename to editor/icons/source/icon_duplicate.svg
diff --git a/tools/editor/icons/source/icon_dynamic_font.svg b/editor/icons/source/icon_dynamic_font.svg
similarity index 100%
rename from tools/editor/icons/source/icon_dynamic_font.svg
rename to editor/icons/source/icon_dynamic_font.svg
diff --git a/tools/editor/icons/source/icon_dynamic_font_data.svg b/editor/icons/source/icon_dynamic_font_data.svg
similarity index 100%
rename from tools/editor/icons/source/icon_dynamic_font_data.svg
rename to editor/icons/source/icon_dynamic_font_data.svg
diff --git a/tools/editor/icons/source/icon_edit.svg b/editor/icons/source/icon_edit.svg
similarity index 100%
rename from tools/editor/icons/source/icon_edit.svg
rename to editor/icons/source/icon_edit.svg
diff --git a/tools/editor/icons/source/icon_edit_key.svg b/editor/icons/source/icon_edit_key.svg
similarity index 100%
rename from tools/editor/icons/source/icon_edit_key.svg
rename to editor/icons/source/icon_edit_key.svg
diff --git a/tools/editor/icons/source/icon_edit_pivot.svg b/editor/icons/source/icon_edit_pivot.svg
similarity index 100%
rename from tools/editor/icons/source/icon_edit_pivot.svg
rename to editor/icons/source/icon_edit_pivot.svg
diff --git a/tools/editor/icons/source/icon_edit_resource.svg b/editor/icons/source/icon_edit_resource.svg
similarity index 100%
rename from tools/editor/icons/source/icon_edit_resource.svg
rename to editor/icons/source/icon_edit_resource.svg
diff --git a/tools/editor/icons/source/icon_editor_3d_handle.svg b/editor/icons/source/icon_editor_3d_handle.svg
similarity index 100%
rename from tools/editor/icons/source/icon_editor_3d_handle.svg
rename to editor/icons/source/icon_editor_3d_handle.svg
diff --git a/tools/editor/icons/source/icon_editor_handle.svg b/editor/icons/source/icon_editor_handle.svg
similarity index 100%
rename from tools/editor/icons/source/icon_editor_handle.svg
rename to editor/icons/source/icon_editor_handle.svg
diff --git a/tools/editor/icons/source/icon_editor_pivot.svg b/editor/icons/source/icon_editor_pivot.svg
similarity index 100%
rename from tools/editor/icons/source/icon_editor_pivot.svg
rename to editor/icons/source/icon_editor_pivot.svg
diff --git a/tools/editor/icons/source/icon_editor_plugin.svg b/editor/icons/source/icon_editor_plugin.svg
similarity index 100%
rename from tools/editor/icons/source/icon_editor_plugin.svg
rename to editor/icons/source/icon_editor_plugin.svg
diff --git a/tools/editor/icons/source/icon_environment.svg b/editor/icons/source/icon_environment.svg
similarity index 100%
rename from tools/editor/icons/source/icon_environment.svg
rename to editor/icons/source/icon_environment.svg
diff --git a/tools/editor/icons/source/icon_error.svg b/editor/icons/source/icon_error.svg
similarity index 100%
rename from tools/editor/icons/source/icon_error.svg
rename to editor/icons/source/icon_error.svg
diff --git a/tools/editor/icons/source/icon_error_sign.svg b/editor/icons/source/icon_error_sign.svg
similarity index 100%
rename from tools/editor/icons/source/icon_error_sign.svg
rename to editor/icons/source/icon_error_sign.svg
diff --git a/tools/editor/icons/source/icon_event_player.svg b/editor/icons/source/icon_event_player.svg
similarity index 100%
rename from tools/editor/icons/source/icon_event_player.svg
rename to editor/icons/source/icon_event_player.svg
diff --git a/tools/editor/icons/source/icon_favorites.svg b/editor/icons/source/icon_favorites.svg
similarity index 100%
rename from tools/editor/icons/source/icon_favorites.svg
rename to editor/icons/source/icon_favorites.svg
diff --git a/tools/editor/icons/source/icon_file_big.svg b/editor/icons/source/icon_file_big.svg
similarity index 100%
rename from tools/editor/icons/source/icon_file_big.svg
rename to editor/icons/source/icon_file_big.svg
diff --git a/tools/editor/icons/source/icon_file_dialog.svg b/editor/icons/source/icon_file_dialog.svg
similarity index 100%
rename from tools/editor/icons/source/icon_file_dialog.svg
rename to editor/icons/source/icon_file_dialog.svg
diff --git a/tools/editor/icons/source/icon_file_list.svg b/editor/icons/source/icon_file_list.svg
similarity index 100%
rename from tools/editor/icons/source/icon_file_list.svg
rename to editor/icons/source/icon_file_list.svg
diff --git a/tools/editor/icons/source/icon_file_server.svg b/editor/icons/source/icon_file_server.svg
similarity index 100%
rename from tools/editor/icons/source/icon_file_server.svg
rename to editor/icons/source/icon_file_server.svg
diff --git a/tools/editor/icons/source/icon_file_server_active.svg b/editor/icons/source/icon_file_server_active.svg
similarity index 100%
rename from tools/editor/icons/source/icon_file_server_active.svg
rename to editor/icons/source/icon_file_server_active.svg
diff --git a/tools/editor/icons/source/icon_file_thumbnail.svg b/editor/icons/source/icon_file_thumbnail.svg
similarity index 100%
rename from tools/editor/icons/source/icon_file_thumbnail.svg
rename to editor/icons/source/icon_file_thumbnail.svg
diff --git a/tools/editor/icons/source/icon_fixed_material.svg b/editor/icons/source/icon_fixed_material.svg
similarity index 100%
rename from tools/editor/icons/source/icon_fixed_material.svg
rename to editor/icons/source/icon_fixed_material.svg
diff --git a/tools/editor/icons/source/icon_fixed_spatial_material.svg b/editor/icons/source/icon_fixed_spatial_material.svg
similarity index 100%
rename from tools/editor/icons/source/icon_fixed_spatial_material.svg
rename to editor/icons/source/icon_fixed_spatial_material.svg
diff --git a/tools/editor/icons/source/icon_folder.svg b/editor/icons/source/icon_folder.svg
similarity index 100%
rename from tools/editor/icons/source/icon_folder.svg
rename to editor/icons/source/icon_folder.svg
diff --git a/tools/editor/icons/source/icon_folder_big.svg b/editor/icons/source/icon_folder_big.svg
similarity index 100%
rename from tools/editor/icons/source/icon_folder_big.svg
rename to editor/icons/source/icon_folder_big.svg
diff --git a/tools/editor/icons/source/icon_font.svg b/editor/icons/source/icon_font.svg
similarity index 100%
rename from tools/editor/icons/source/icon_font.svg
rename to editor/icons/source/icon_font.svg
diff --git a/tools/editor/icons/source/icon_forward.svg b/editor/icons/source/icon_forward.svg
similarity index 100%
rename from tools/editor/icons/source/icon_forward.svg
rename to editor/icons/source/icon_forward.svg
diff --git a/tools/editor/icons/source/icon_g_d_script.svg b/editor/icons/source/icon_g_d_script.svg
similarity index 100%
rename from tools/editor/icons/source/icon_g_d_script.svg
rename to editor/icons/source/icon_g_d_script.svg
diff --git a/tools/editor/icons/source/icon_g_i_probe.svg b/editor/icons/source/icon_g_i_probe.svg
similarity index 100%
rename from tools/editor/icons/source/icon_g_i_probe.svg
rename to editor/icons/source/icon_g_i_probe.svg
diff --git a/tools/editor/icons/source/icon_g_i_probe_data.svg b/editor/icons/source/icon_g_i_probe_data.svg
similarity index 100%
rename from tools/editor/icons/source/icon_g_i_probe_data.svg
rename to editor/icons/source/icon_g_i_probe_data.svg
diff --git a/tools/editor/icons/source/icon_generic_6_d_o_f_joint.svg b/editor/icons/source/icon_generic_6_d_o_f_joint.svg
similarity index 100%
rename from tools/editor/icons/source/icon_generic_6_d_o_f_joint.svg
rename to editor/icons/source/icon_generic_6_d_o_f_joint.svg
diff --git a/tools/editor/icons/source/icon_gizmo_directional_light.svg b/editor/icons/source/icon_gizmo_directional_light.svg
similarity index 100%
rename from tools/editor/icons/source/icon_gizmo_directional_light.svg
rename to editor/icons/source/icon_gizmo_directional_light.svg
diff --git a/tools/editor/icons/source/icon_gizmo_light.svg b/editor/icons/source/icon_gizmo_light.svg
similarity index 100%
rename from tools/editor/icons/source/icon_gizmo_light.svg
rename to editor/icons/source/icon_gizmo_light.svg
diff --git a/tools/editor/icons/source/icon_gizmo_listener.svg b/editor/icons/source/icon_gizmo_listener.svg
similarity index 100%
rename from tools/editor/icons/source/icon_gizmo_listener.svg
rename to editor/icons/source/icon_gizmo_listener.svg
diff --git a/tools/editor/icons/source/icon_gizmo_spatial_sample_player.svg b/editor/icons/source/icon_gizmo_spatial_sample_player.svg
similarity index 100%
rename from tools/editor/icons/source/icon_gizmo_spatial_sample_player.svg
rename to editor/icons/source/icon_gizmo_spatial_sample_player.svg
diff --git a/tools/editor/icons/source/icon_gizmo_spatial_stream_player.svg b/editor/icons/source/icon_gizmo_spatial_stream_player.svg
similarity index 100%
rename from tools/editor/icons/source/icon_gizmo_spatial_stream_player.svg
rename to editor/icons/source/icon_gizmo_spatial_stream_player.svg
diff --git a/tools/editor/icons/source/icon_godot.svg b/editor/icons/source/icon_godot.svg
similarity index 100%
rename from tools/editor/icons/source/icon_godot.svg
rename to editor/icons/source/icon_godot.svg
diff --git a/tools/editor/icons/source/icon_graph_comment.svg b/editor/icons/source/icon_graph_comment.svg
similarity index 100%
rename from tools/editor/icons/source/icon_graph_comment.svg
rename to editor/icons/source/icon_graph_comment.svg
diff --git a/tools/editor/icons/source/icon_graph_cube_uniform.svg b/editor/icons/source/icon_graph_cube_uniform.svg
similarity index 100%
rename from tools/editor/icons/source/icon_graph_cube_uniform.svg
rename to editor/icons/source/icon_graph_cube_uniform.svg
diff --git a/tools/editor/icons/source/icon_graph_curve_map.svg b/editor/icons/source/icon_graph_curve_map.svg
similarity index 100%
rename from tools/editor/icons/source/icon_graph_curve_map.svg
rename to editor/icons/source/icon_graph_curve_map.svg
diff --git a/tools/editor/icons/source/icon_graph_default_texture.svg b/editor/icons/source/icon_graph_default_texture.svg
similarity index 100%
rename from tools/editor/icons/source/icon_graph_default_texture.svg
rename to editor/icons/source/icon_graph_default_texture.svg
diff --git a/tools/editor/icons/source/icon_graph_edit.svg b/editor/icons/source/icon_graph_edit.svg
similarity index 100%
rename from tools/editor/icons/source/icon_graph_edit.svg
rename to editor/icons/source/icon_graph_edit.svg
diff --git a/tools/editor/icons/source/icon_graph_input.svg b/editor/icons/source/icon_graph_input.svg
similarity index 100%
rename from tools/editor/icons/source/icon_graph_input.svg
rename to editor/icons/source/icon_graph_input.svg
diff --git a/tools/editor/icons/source/icon_graph_node.svg b/editor/icons/source/icon_graph_node.svg
similarity index 100%
rename from tools/editor/icons/source/icon_graph_node.svg
rename to editor/icons/source/icon_graph_node.svg
diff --git a/tools/editor/icons/source/icon_graph_rgb.svg b/editor/icons/source/icon_graph_rgb.svg
similarity index 100%
rename from tools/editor/icons/source/icon_graph_rgb.svg
rename to editor/icons/source/icon_graph_rgb.svg
diff --git a/tools/editor/icons/source/icon_graph_rgb_op.svg b/editor/icons/source/icon_graph_rgb_op.svg
similarity index 100%
rename from tools/editor/icons/source/icon_graph_rgb_op.svg
rename to editor/icons/source/icon_graph_rgb_op.svg
diff --git a/tools/editor/icons/source/icon_graph_rgb_uniform.svg b/editor/icons/source/icon_graph_rgb_uniform.svg
similarity index 100%
rename from tools/editor/icons/source/icon_graph_rgb_uniform.svg
rename to editor/icons/source/icon_graph_rgb_uniform.svg
diff --git a/tools/editor/icons/source/icon_graph_scalar.svg b/editor/icons/source/icon_graph_scalar.svg
similarity index 100%
rename from tools/editor/icons/source/icon_graph_scalar.svg
rename to editor/icons/source/icon_graph_scalar.svg
diff --git a/tools/editor/icons/source/icon_graph_scalar_interp.svg b/editor/icons/source/icon_graph_scalar_interp.svg
similarity index 100%
rename from tools/editor/icons/source/icon_graph_scalar_interp.svg
rename to editor/icons/source/icon_graph_scalar_interp.svg
diff --git a/tools/editor/icons/source/icon_graph_scalar_op.svg b/editor/icons/source/icon_graph_scalar_op.svg
similarity index 100%
rename from tools/editor/icons/source/icon_graph_scalar_op.svg
rename to editor/icons/source/icon_graph_scalar_op.svg
diff --git a/tools/editor/icons/source/icon_graph_scalar_uniform.svg b/editor/icons/source/icon_graph_scalar_uniform.svg
similarity index 100%
rename from tools/editor/icons/source/icon_graph_scalar_uniform.svg
rename to editor/icons/source/icon_graph_scalar_uniform.svg
diff --git a/tools/editor/icons/source/icon_graph_scalars_to_vec.svg b/editor/icons/source/icon_graph_scalars_to_vec.svg
similarity index 100%
rename from tools/editor/icons/source/icon_graph_scalars_to_vec.svg
rename to editor/icons/source/icon_graph_scalars_to_vec.svg
diff --git a/tools/editor/icons/source/icon_graph_texscreen.svg b/editor/icons/source/icon_graph_texscreen.svg
similarity index 100%
rename from tools/editor/icons/source/icon_graph_texscreen.svg
rename to editor/icons/source/icon_graph_texscreen.svg
diff --git a/tools/editor/icons/source/icon_graph_texture_uniform.svg b/editor/icons/source/icon_graph_texture_uniform.svg
similarity index 100%
rename from tools/editor/icons/source/icon_graph_texture_uniform.svg
rename to editor/icons/source/icon_graph_texture_uniform.svg
diff --git a/tools/editor/icons/source/icon_graph_time.svg b/editor/icons/source/icon_graph_time.svg
similarity index 100%
rename from tools/editor/icons/source/icon_graph_time.svg
rename to editor/icons/source/icon_graph_time.svg
diff --git a/tools/editor/icons/source/icon_graph_vec_dp.svg b/editor/icons/source/icon_graph_vec_dp.svg
similarity index 100%
rename from tools/editor/icons/source/icon_graph_vec_dp.svg
rename to editor/icons/source/icon_graph_vec_dp.svg
diff --git a/tools/editor/icons/source/icon_graph_vec_interp.svg b/editor/icons/source/icon_graph_vec_interp.svg
similarity index 100%
rename from tools/editor/icons/source/icon_graph_vec_interp.svg
rename to editor/icons/source/icon_graph_vec_interp.svg
diff --git a/tools/editor/icons/source/icon_graph_vec_length.svg b/editor/icons/source/icon_graph_vec_length.svg
similarity index 100%
rename from tools/editor/icons/source/icon_graph_vec_length.svg
rename to editor/icons/source/icon_graph_vec_length.svg
diff --git a/tools/editor/icons/source/icon_graph_vec_op.svg b/editor/icons/source/icon_graph_vec_op.svg
similarity index 100%
rename from tools/editor/icons/source/icon_graph_vec_op.svg
rename to editor/icons/source/icon_graph_vec_op.svg
diff --git a/tools/editor/icons/source/icon_graph_vec_scalar_op.svg b/editor/icons/source/icon_graph_vec_scalar_op.svg
similarity index 100%
rename from tools/editor/icons/source/icon_graph_vec_scalar_op.svg
rename to editor/icons/source/icon_graph_vec_scalar_op.svg
diff --git a/tools/editor/icons/source/icon_graph_vec_to_scalars.svg b/editor/icons/source/icon_graph_vec_to_scalars.svg
similarity index 100%
rename from tools/editor/icons/source/icon_graph_vec_to_scalars.svg
rename to editor/icons/source/icon_graph_vec_to_scalars.svg
diff --git a/tools/editor/icons/source/icon_graph_vecs_to_xform.svg b/editor/icons/source/icon_graph_vecs_to_xform.svg
similarity index 100%
rename from tools/editor/icons/source/icon_graph_vecs_to_xform.svg
rename to editor/icons/source/icon_graph_vecs_to_xform.svg
diff --git a/tools/editor/icons/source/icon_graph_vector.svg b/editor/icons/source/icon_graph_vector.svg
similarity index 100%
rename from tools/editor/icons/source/icon_graph_vector.svg
rename to editor/icons/source/icon_graph_vector.svg
diff --git a/tools/editor/icons/source/icon_graph_vector_uniform.svg b/editor/icons/source/icon_graph_vector_uniform.svg
similarity index 100%
rename from tools/editor/icons/source/icon_graph_vector_uniform.svg
rename to editor/icons/source/icon_graph_vector_uniform.svg
diff --git a/tools/editor/icons/source/icon_graph_xform.svg b/editor/icons/source/icon_graph_xform.svg
similarity index 100%
rename from tools/editor/icons/source/icon_graph_xform.svg
rename to editor/icons/source/icon_graph_xform.svg
diff --git a/tools/editor/icons/source/icon_graph_xform_mult.svg b/editor/icons/source/icon_graph_xform_mult.svg
similarity index 100%
rename from tools/editor/icons/source/icon_graph_xform_mult.svg
rename to editor/icons/source/icon_graph_xform_mult.svg
diff --git a/tools/editor/icons/source/icon_graph_xform_scalar_func.svg b/editor/icons/source/icon_graph_xform_scalar_func.svg
similarity index 100%
rename from tools/editor/icons/source/icon_graph_xform_scalar_func.svg
rename to editor/icons/source/icon_graph_xform_scalar_func.svg
diff --git a/tools/editor/icons/source/icon_graph_xform_to_vecs.svg b/editor/icons/source/icon_graph_xform_to_vecs.svg
similarity index 100%
rename from tools/editor/icons/source/icon_graph_xform_to_vecs.svg
rename to editor/icons/source/icon_graph_xform_to_vecs.svg
diff --git a/tools/editor/icons/source/icon_graph_xform_uniform.svg b/editor/icons/source/icon_graph_xform_uniform.svg
similarity index 100%
rename from tools/editor/icons/source/icon_graph_xform_uniform.svg
rename to editor/icons/source/icon_graph_xform_uniform.svg
diff --git a/tools/editor/icons/source/icon_graph_xform_vec_func.svg b/editor/icons/source/icon_graph_xform_vec_func.svg
similarity index 100%
rename from tools/editor/icons/source/icon_graph_xform_vec_func.svg
rename to editor/icons/source/icon_graph_xform_vec_func.svg
diff --git a/tools/editor/icons/source/icon_graph_xform_vec_imult.svg b/editor/icons/source/icon_graph_xform_vec_imult.svg
similarity index 100%
rename from tools/editor/icons/source/icon_graph_xform_vec_imult.svg
rename to editor/icons/source/icon_graph_xform_vec_imult.svg
diff --git a/tools/editor/icons/source/icon_graph_xform_vec_mult.svg b/editor/icons/source/icon_graph_xform_vec_mult.svg
similarity index 100%
rename from tools/editor/icons/source/icon_graph_xform_vec_mult.svg
rename to editor/icons/source/icon_graph_xform_vec_mult.svg
diff --git a/tools/editor/icons/source/icon_grid.svg b/editor/icons/source/icon_grid.svg
similarity index 100%
rename from tools/editor/icons/source/icon_grid.svg
rename to editor/icons/source/icon_grid.svg
diff --git a/tools/editor/icons/source/icon_grid_container.svg b/editor/icons/source/icon_grid_container.svg
similarity index 100%
rename from tools/editor/icons/source/icon_grid_container.svg
rename to editor/icons/source/icon_grid_container.svg
diff --git a/tools/editor/icons/source/icon_grid_map.svg b/editor/icons/source/icon_grid_map.svg
similarity index 100%
rename from tools/editor/icons/source/icon_grid_map.svg
rename to editor/icons/source/icon_grid_map.svg
diff --git a/tools/editor/icons/source/icon_groove_joint_2d.svg b/editor/icons/source/icon_groove_joint_2d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_groove_joint_2d.svg
rename to editor/icons/source/icon_groove_joint_2d.svg
diff --git a/tools/editor/icons/source/icon_group.svg b/editor/icons/source/icon_group.svg
similarity index 100%
rename from tools/editor/icons/source/icon_group.svg
rename to editor/icons/source/icon_group.svg
diff --git a/tools/editor/icons/source/icon_groups.svg b/editor/icons/source/icon_groups.svg
similarity index 100%
rename from tools/editor/icons/source/icon_groups.svg
rename to editor/icons/source/icon_groups.svg
diff --git a/tools/editor/icons/source/icon_h_box_container.svg b/editor/icons/source/icon_h_box_container.svg
similarity index 100%
rename from tools/editor/icons/source/icon_h_box_container.svg
rename to editor/icons/source/icon_h_box_container.svg
diff --git a/tools/editor/icons/source/icon_h_button_array.svg b/editor/icons/source/icon_h_button_array.svg
similarity index 100%
rename from tools/editor/icons/source/icon_h_button_array.svg
rename to editor/icons/source/icon_h_button_array.svg
diff --git a/tools/editor/icons/source/icon_h_scroll_bar.svg b/editor/icons/source/icon_h_scroll_bar.svg
similarity index 100%
rename from tools/editor/icons/source/icon_h_scroll_bar.svg
rename to editor/icons/source/icon_h_scroll_bar.svg
diff --git a/tools/editor/icons/source/icon_h_separator.svg b/editor/icons/source/icon_h_separator.svg
similarity index 100%
rename from tools/editor/icons/source/icon_h_separator.svg
rename to editor/icons/source/icon_h_separator.svg
diff --git a/tools/editor/icons/source/icon_h_slider.svg b/editor/icons/source/icon_h_slider.svg
similarity index 100%
rename from tools/editor/icons/source/icon_h_slider.svg
rename to editor/icons/source/icon_h_slider.svg
diff --git a/tools/editor/icons/source/icon_h_split_container.svg b/editor/icons/source/icon_h_split_container.svg
similarity index 100%
rename from tools/editor/icons/source/icon_h_split_container.svg
rename to editor/icons/source/icon_h_split_container.svg
diff --git a/tools/editor/icons/source/icon_h_t_t_p_request.svg b/editor/icons/source/icon_h_t_t_p_request.svg
similarity index 100%
rename from tools/editor/icons/source/icon_h_t_t_p_request.svg
rename to editor/icons/source/icon_h_t_t_p_request.svg
diff --git a/tools/editor/icons/source/icon_headphones.svg b/editor/icons/source/icon_headphones.svg
similarity index 100%
rename from tools/editor/icons/source/icon_headphones.svg
rename to editor/icons/source/icon_headphones.svg
diff --git a/tools/editor/icons/source/icon_help.svg b/editor/icons/source/icon_help.svg
similarity index 100%
rename from tools/editor/icons/source/icon_help.svg
rename to editor/icons/source/icon_help.svg
diff --git a/tools/editor/icons/source/icon_hidden.svg b/editor/icons/source/icon_hidden.svg
similarity index 100%
rename from tools/editor/icons/source/icon_hidden.svg
rename to editor/icons/source/icon_hidden.svg
diff --git a/tools/editor/icons/source/icon_hinge_joint.svg b/editor/icons/source/icon_hinge_joint.svg
similarity index 100%
rename from tools/editor/icons/source/icon_hinge_joint.svg
rename to editor/icons/source/icon_hinge_joint.svg
diff --git a/tools/editor/icons/source/icon_history.svg b/editor/icons/source/icon_history.svg
similarity index 100%
rename from tools/editor/icons/source/icon_history.svg
rename to editor/icons/source/icon_history.svg
diff --git a/tools/editor/icons/source/icon_hsize.svg b/editor/icons/source/icon_hsize.svg
similarity index 100%
rename from tools/editor/icons/source/icon_hsize.svg
rename to editor/icons/source/icon_hsize.svg
diff --git a/tools/editor/icons/source/icon_image.svg b/editor/icons/source/icon_image.svg
similarity index 100%
rename from tools/editor/icons/source/icon_image.svg
rename to editor/icons/source/icon_image.svg
diff --git a/tools/editor/icons/source/icon_image_sky_box.svg b/editor/icons/source/icon_image_sky_box.svg
similarity index 100%
rename from tools/editor/icons/source/icon_image_sky_box.svg
rename to editor/icons/source/icon_image_sky_box.svg
diff --git a/tools/editor/icons/source/icon_image_texture.svg b/editor/icons/source/icon_image_texture.svg
similarity index 100%
rename from tools/editor/icons/source/icon_image_texture.svg
rename to editor/icons/source/icon_image_texture.svg
diff --git a/tools/editor/icons/source/icon_immediate_geometry.svg b/editor/icons/source/icon_immediate_geometry.svg
similarity index 100%
rename from tools/editor/icons/source/icon_immediate_geometry.svg
rename to editor/icons/source/icon_immediate_geometry.svg
diff --git a/tools/editor/icons/source/icon_import_check.svg b/editor/icons/source/icon_import_check.svg
similarity index 100%
rename from tools/editor/icons/source/icon_import_check.svg
rename to editor/icons/source/icon_import_check.svg
diff --git a/tools/editor/icons/source/icon_import_fail.svg b/editor/icons/source/icon_import_fail.svg
similarity index 100%
rename from tools/editor/icons/source/icon_import_fail.svg
rename to editor/icons/source/icon_import_fail.svg
diff --git a/tools/editor/icons/source/icon_instance.svg b/editor/icons/source/icon_instance.svg
similarity index 100%
rename from tools/editor/icons/source/icon_instance.svg
rename to editor/icons/source/icon_instance.svg
diff --git a/tools/editor/icons/source/icon_instance_options.svg b/editor/icons/source/icon_instance_options.svg
similarity index 100%
rename from tools/editor/icons/source/icon_instance_options.svg
rename to editor/icons/source/icon_instance_options.svg
diff --git a/tools/editor/icons/source/icon_integer.svg b/editor/icons/source/icon_integer.svg
similarity index 100%
rename from tools/editor/icons/source/icon_integer.svg
rename to editor/icons/source/icon_integer.svg
diff --git a/tools/editor/icons/source/icon_interp_cubic.svg b/editor/icons/source/icon_interp_cubic.svg
similarity index 100%
rename from tools/editor/icons/source/icon_interp_cubic.svg
rename to editor/icons/source/icon_interp_cubic.svg
diff --git a/tools/editor/icons/source/icon_interp_linear.svg b/editor/icons/source/icon_interp_linear.svg
similarity index 100%
rename from tools/editor/icons/source/icon_interp_linear.svg
rename to editor/icons/source/icon_interp_linear.svg
diff --git a/tools/editor/icons/source/icon_interp_raw.svg b/editor/icons/source/icon_interp_raw.svg
similarity index 100%
rename from tools/editor/icons/source/icon_interp_raw.svg
rename to editor/icons/source/icon_interp_raw.svg
diff --git a/tools/editor/icons/source/icon_interp_wrap_clamp.svg b/editor/icons/source/icon_interp_wrap_clamp.svg
similarity index 100%
rename from tools/editor/icons/source/icon_interp_wrap_clamp.svg
rename to editor/icons/source/icon_interp_wrap_clamp.svg
diff --git a/tools/editor/icons/source/icon_interp_wrap_loop.svg b/editor/icons/source/icon_interp_wrap_loop.svg
similarity index 100%
rename from tools/editor/icons/source/icon_interp_wrap_loop.svg
rename to editor/icons/source/icon_interp_wrap_loop.svg
diff --git a/tools/editor/icons/source/icon_interpolated_camera.svg b/editor/icons/source/icon_interpolated_camera.svg
similarity index 100%
rename from tools/editor/icons/source/icon_interpolated_camera.svg
rename to editor/icons/source/icon_interpolated_camera.svg
diff --git a/tools/editor/icons/source/icon_invalid_key.svg b/editor/icons/source/icon_invalid_key.svg
similarity index 100%
rename from tools/editor/icons/source/icon_invalid_key.svg
rename to editor/icons/source/icon_invalid_key.svg
diff --git a/tools/editor/icons/source/icon_inverse_kinematics.svg b/editor/icons/source/icon_inverse_kinematics.svg
similarity index 100%
rename from tools/editor/icons/source/icon_inverse_kinematics.svg
rename to editor/icons/source/icon_inverse_kinematics.svg
diff --git a/tools/editor/icons/source/icon_item_list.svg b/editor/icons/source/icon_item_list.svg
similarity index 100%
rename from tools/editor/icons/source/icon_item_list.svg
rename to editor/icons/source/icon_item_list.svg
diff --git a/tools/editor/icons/source/icon_joy_axis.svg b/editor/icons/source/icon_joy_axis.svg
similarity index 100%
rename from tools/editor/icons/source/icon_joy_axis.svg
rename to editor/icons/source/icon_joy_axis.svg
diff --git a/tools/editor/icons/source/icon_joy_button.svg b/editor/icons/source/icon_joy_button.svg
similarity index 100%
rename from tools/editor/icons/source/icon_joy_button.svg
rename to editor/icons/source/icon_joy_button.svg
diff --git a/tools/editor/icons/source/icon_joypad.svg b/editor/icons/source/icon_joypad.svg
similarity index 100%
rename from tools/editor/icons/source/icon_joypad.svg
rename to editor/icons/source/icon_joypad.svg
diff --git a/tools/editor/icons/source/icon_key.svg b/editor/icons/source/icon_key.svg
similarity index 100%
rename from tools/editor/icons/source/icon_key.svg
rename to editor/icons/source/icon_key.svg
diff --git a/tools/editor/icons/source/icon_key_hover.svg b/editor/icons/source/icon_key_hover.svg
similarity index 100%
rename from tools/editor/icons/source/icon_key_hover.svg
rename to editor/icons/source/icon_key_hover.svg
diff --git a/tools/editor/icons/source/icon_key_invalid.svg b/editor/icons/source/icon_key_invalid.svg
similarity index 100%
rename from tools/editor/icons/source/icon_key_invalid.svg
rename to editor/icons/source/icon_key_invalid.svg
diff --git a/tools/editor/icons/source/icon_key_next.svg b/editor/icons/source/icon_key_next.svg
similarity index 100%
rename from tools/editor/icons/source/icon_key_next.svg
rename to editor/icons/source/icon_key_next.svg
diff --git a/tools/editor/icons/source/icon_key_selected.svg b/editor/icons/source/icon_key_selected.svg
similarity index 100%
rename from tools/editor/icons/source/icon_key_selected.svg
rename to editor/icons/source/icon_key_selected.svg
diff --git a/tools/editor/icons/source/icon_key_value.svg b/editor/icons/source/icon_key_value.svg
similarity index 100%
rename from tools/editor/icons/source/icon_key_value.svg
rename to editor/icons/source/icon_key_value.svg
diff --git a/tools/editor/icons/source/icon_key_xform.svg b/editor/icons/source/icon_key_xform.svg
similarity index 100%
rename from tools/editor/icons/source/icon_key_xform.svg
rename to editor/icons/source/icon_key_xform.svg
diff --git a/tools/editor/icons/source/icon_keyboard.svg b/editor/icons/source/icon_keyboard.svg
similarity index 100%
rename from tools/editor/icons/source/icon_keyboard.svg
rename to editor/icons/source/icon_keyboard.svg
diff --git a/tools/editor/icons/source/icon_kinematic_body.svg b/editor/icons/source/icon_kinematic_body.svg
similarity index 100%
rename from tools/editor/icons/source/icon_kinematic_body.svg
rename to editor/icons/source/icon_kinematic_body.svg
diff --git a/tools/editor/icons/source/icon_kinematic_body_2d.svg b/editor/icons/source/icon_kinematic_body_2d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_kinematic_body_2d.svg
rename to editor/icons/source/icon_kinematic_body_2d.svg
diff --git a/tools/editor/icons/source/icon_label.svg b/editor/icons/source/icon_label.svg
similarity index 100%
rename from tools/editor/icons/source/icon_label.svg
rename to editor/icons/source/icon_label.svg
diff --git a/tools/editor/icons/source/icon_large_texture.svg b/editor/icons/source/icon_large_texture.svg
similarity index 100%
rename from tools/editor/icons/source/icon_large_texture.svg
rename to editor/icons/source/icon_large_texture.svg
diff --git a/tools/editor/icons/source/icon_light_2d.svg b/editor/icons/source/icon_light_2d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_light_2d.svg
rename to editor/icons/source/icon_light_2d.svg
diff --git a/tools/editor/icons/source/icon_light_occluder_2d.svg b/editor/icons/source/icon_light_occluder_2d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_light_occluder_2d.svg
rename to editor/icons/source/icon_light_occluder_2d.svg
diff --git a/tools/editor/icons/source/icon_line_2d.svg b/editor/icons/source/icon_line_2d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_line_2d.svg
rename to editor/icons/source/icon_line_2d.svg
diff --git a/tools/editor/icons/source/icon_line_edit.svg b/editor/icons/source/icon_line_edit.svg
similarity index 100%
rename from tools/editor/icons/source/icon_line_edit.svg
rename to editor/icons/source/icon_line_edit.svg
diff --git a/tools/editor/icons/source/icon_line_shape_2d.svg b/editor/icons/source/icon_line_shape_2d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_line_shape_2d.svg
rename to editor/icons/source/icon_line_shape_2d.svg
diff --git a/tools/editor/icons/source/icon_link_button.svg b/editor/icons/source/icon_link_button.svg
similarity index 100%
rename from tools/editor/icons/source/icon_link_button.svg
rename to editor/icons/source/icon_link_button.svg
diff --git a/tools/editor/icons/source/icon_list_select.svg b/editor/icons/source/icon_list_select.svg
similarity index 100%
rename from tools/editor/icons/source/icon_list_select.svg
rename to editor/icons/source/icon_list_select.svg
diff --git a/tools/editor/icons/source/icon_listener.svg b/editor/icons/source/icon_listener.svg
similarity index 100%
rename from tools/editor/icons/source/icon_listener.svg
rename to editor/icons/source/icon_listener.svg
diff --git a/tools/editor/icons/source/icon_load.svg b/editor/icons/source/icon_load.svg
similarity index 100%
rename from tools/editor/icons/source/icon_load.svg
rename to editor/icons/source/icon_load.svg
diff --git a/tools/editor/icons/source/icon_lock.svg b/editor/icons/source/icon_lock.svg
similarity index 100%
rename from tools/editor/icons/source/icon_lock.svg
rename to editor/icons/source/icon_lock.svg
diff --git a/tools/editor/icons/source/icon_loop.svg b/editor/icons/source/icon_loop.svg
similarity index 100%
rename from tools/editor/icons/source/icon_loop.svg
rename to editor/icons/source/icon_loop.svg
diff --git a/tools/editor/icons/source/icon_loop_interpolation.svg b/editor/icons/source/icon_loop_interpolation.svg
similarity index 100%
rename from tools/editor/icons/source/icon_loop_interpolation.svg
rename to editor/icons/source/icon_loop_interpolation.svg
diff --git a/tools/editor/icons/source/icon_main_play.svg b/editor/icons/source/icon_main_play.svg
similarity index 100%
rename from tools/editor/icons/source/icon_main_play.svg
rename to editor/icons/source/icon_main_play.svg
diff --git a/tools/editor/icons/source/icon_main_stop.svg b/editor/icons/source/icon_main_stop.svg
similarity index 100%
rename from tools/editor/icons/source/icon_main_stop.svg
rename to editor/icons/source/icon_main_stop.svg
diff --git a/tools/editor/icons/source/icon_margin_container.svg b/editor/icons/source/icon_margin_container.svg
similarity index 100%
rename from tools/editor/icons/source/icon_margin_container.svg
rename to editor/icons/source/icon_margin_container.svg
diff --git a/tools/editor/icons/source/icon_material_preview_cube.svg b/editor/icons/source/icon_material_preview_cube.svg
similarity index 100%
rename from tools/editor/icons/source/icon_material_preview_cube.svg
rename to editor/icons/source/icon_material_preview_cube.svg
diff --git a/tools/editor/icons/source/icon_material_preview_cube_off.svg b/editor/icons/source/icon_material_preview_cube_off.svg
similarity index 100%
rename from tools/editor/icons/source/icon_material_preview_cube_off.svg
rename to editor/icons/source/icon_material_preview_cube_off.svg
diff --git a/tools/editor/icons/source/icon_material_preview_light_1.svg b/editor/icons/source/icon_material_preview_light_1.svg
similarity index 100%
rename from tools/editor/icons/source/icon_material_preview_light_1.svg
rename to editor/icons/source/icon_material_preview_light_1.svg
diff --git a/tools/editor/icons/source/icon_material_preview_light_1_off.svg b/editor/icons/source/icon_material_preview_light_1_off.svg
similarity index 100%
rename from tools/editor/icons/source/icon_material_preview_light_1_off.svg
rename to editor/icons/source/icon_material_preview_light_1_off.svg
diff --git a/tools/editor/icons/source/icon_material_preview_light_2.svg b/editor/icons/source/icon_material_preview_light_2.svg
similarity index 100%
rename from tools/editor/icons/source/icon_material_preview_light_2.svg
rename to editor/icons/source/icon_material_preview_light_2.svg
diff --git a/tools/editor/icons/source/icon_material_preview_light_2_off.svg b/editor/icons/source/icon_material_preview_light_2_off.svg
similarity index 100%
rename from tools/editor/icons/source/icon_material_preview_light_2_off.svg
rename to editor/icons/source/icon_material_preview_light_2_off.svg
diff --git a/tools/editor/icons/source/icon_material_preview_sphere.svg b/editor/icons/source/icon_material_preview_sphere.svg
similarity index 100%
rename from tools/editor/icons/source/icon_material_preview_sphere.svg
rename to editor/icons/source/icon_material_preview_sphere.svg
diff --git a/tools/editor/icons/source/icon_material_preview_sphere_off.svg b/editor/icons/source/icon_material_preview_sphere_off.svg
similarity index 100%
rename from tools/editor/icons/source/icon_material_preview_sphere_off.svg
rename to editor/icons/source/icon_material_preview_sphere_off.svg
diff --git a/tools/editor/icons/source/icon_matrix.svg b/editor/icons/source/icon_matrix.svg
similarity index 100%
rename from tools/editor/icons/source/icon_matrix.svg
rename to editor/icons/source/icon_matrix.svg
diff --git a/tools/editor/icons/source/icon_menu_button.svg b/editor/icons/source/icon_menu_button.svg
similarity index 100%
rename from tools/editor/icons/source/icon_menu_button.svg
rename to editor/icons/source/icon_menu_button.svg
diff --git a/tools/editor/icons/source/icon_mesh.svg b/editor/icons/source/icon_mesh.svg
similarity index 100%
rename from tools/editor/icons/source/icon_mesh.svg
rename to editor/icons/source/icon_mesh.svg
diff --git a/tools/editor/icons/source/icon_mesh_instance.svg b/editor/icons/source/icon_mesh_instance.svg
similarity index 100%
rename from tools/editor/icons/source/icon_mesh_instance.svg
rename to editor/icons/source/icon_mesh_instance.svg
diff --git a/tools/editor/icons/source/icon_mesh_library.svg b/editor/icons/source/icon_mesh_library.svg
similarity index 100%
rename from tools/editor/icons/source/icon_mesh_library.svg
rename to editor/icons/source/icon_mesh_library.svg
diff --git a/tools/editor/icons/source/icon_mini_aabb.svg b/editor/icons/source/icon_mini_aabb.svg
similarity index 100%
rename from tools/editor/icons/source/icon_mini_aabb.svg
rename to editor/icons/source/icon_mini_aabb.svg
diff --git a/tools/editor/icons/source/icon_mini_array.svg b/editor/icons/source/icon_mini_array.svg
similarity index 100%
rename from tools/editor/icons/source/icon_mini_array.svg
rename to editor/icons/source/icon_mini_array.svg
diff --git a/tools/editor/icons/source/icon_mini_boolean.svg b/editor/icons/source/icon_mini_boolean.svg
similarity index 100%
rename from tools/editor/icons/source/icon_mini_boolean.svg
rename to editor/icons/source/icon_mini_boolean.svg
diff --git a/tools/editor/icons/source/icon_mini_color.svg b/editor/icons/source/icon_mini_color.svg
similarity index 100%
rename from tools/editor/icons/source/icon_mini_color.svg
rename to editor/icons/source/icon_mini_color.svg
diff --git a/tools/editor/icons/source/icon_mini_color_array.svg b/editor/icons/source/icon_mini_color_array.svg
similarity index 100%
rename from tools/editor/icons/source/icon_mini_color_array.svg
rename to editor/icons/source/icon_mini_color_array.svg
diff --git a/tools/editor/icons/source/icon_mini_dictionary.svg b/editor/icons/source/icon_mini_dictionary.svg
similarity index 100%
rename from tools/editor/icons/source/icon_mini_dictionary.svg
rename to editor/icons/source/icon_mini_dictionary.svg
diff --git a/tools/editor/icons/source/icon_mini_float.svg b/editor/icons/source/icon_mini_float.svg
similarity index 100%
rename from tools/editor/icons/source/icon_mini_float.svg
rename to editor/icons/source/icon_mini_float.svg
diff --git a/tools/editor/icons/source/icon_mini_float_array.svg b/editor/icons/source/icon_mini_float_array.svg
similarity index 100%
rename from tools/editor/icons/source/icon_mini_float_array.svg
rename to editor/icons/source/icon_mini_float_array.svg
diff --git a/tools/editor/icons/source/icon_mini_image.svg b/editor/icons/source/icon_mini_image.svg
similarity index 100%
rename from tools/editor/icons/source/icon_mini_image.svg
rename to editor/icons/source/icon_mini_image.svg
diff --git a/tools/editor/icons/source/icon_mini_input.svg b/editor/icons/source/icon_mini_input.svg
similarity index 100%
rename from tools/editor/icons/source/icon_mini_input.svg
rename to editor/icons/source/icon_mini_input.svg
diff --git a/tools/editor/icons/source/icon_mini_int_array.svg b/editor/icons/source/icon_mini_int_array.svg
similarity index 100%
rename from tools/editor/icons/source/icon_mini_int_array.svg
rename to editor/icons/source/icon_mini_int_array.svg
diff --git a/tools/editor/icons/source/icon_mini_integer.svg b/editor/icons/source/icon_mini_integer.svg
similarity index 100%
rename from tools/editor/icons/source/icon_mini_integer.svg
rename to editor/icons/source/icon_mini_integer.svg
diff --git a/tools/editor/icons/source/icon_mini_matrix3.svg b/editor/icons/source/icon_mini_matrix3.svg
similarity index 100%
rename from tools/editor/icons/source/icon_mini_matrix3.svg
rename to editor/icons/source/icon_mini_matrix3.svg
diff --git a/tools/editor/icons/source/icon_mini_matrix32.svg b/editor/icons/source/icon_mini_matrix32.svg
similarity index 100%
rename from tools/editor/icons/source/icon_mini_matrix32.svg
rename to editor/icons/source/icon_mini_matrix32.svg
diff --git a/tools/editor/icons/source/icon_mini_object.svg b/editor/icons/source/icon_mini_object.svg
similarity index 100%
rename from tools/editor/icons/source/icon_mini_object.svg
rename to editor/icons/source/icon_mini_object.svg
diff --git a/tools/editor/icons/source/icon_mini_path.svg b/editor/icons/source/icon_mini_path.svg
similarity index 100%
rename from tools/editor/icons/source/icon_mini_path.svg
rename to editor/icons/source/icon_mini_path.svg
diff --git a/tools/editor/icons/source/icon_mini_plane.svg b/editor/icons/source/icon_mini_plane.svg
similarity index 100%
rename from tools/editor/icons/source/icon_mini_plane.svg
rename to editor/icons/source/icon_mini_plane.svg
diff --git a/tools/editor/icons/source/icon_mini_quat.svg b/editor/icons/source/icon_mini_quat.svg
similarity index 100%
rename from tools/editor/icons/source/icon_mini_quat.svg
rename to editor/icons/source/icon_mini_quat.svg
diff --git a/tools/editor/icons/source/icon_mini_raw_array.svg b/editor/icons/source/icon_mini_raw_array.svg
similarity index 100%
rename from tools/editor/icons/source/icon_mini_raw_array.svg
rename to editor/icons/source/icon_mini_raw_array.svg
diff --git a/tools/editor/icons/source/icon_mini_rect2.svg b/editor/icons/source/icon_mini_rect2.svg
similarity index 100%
rename from tools/editor/icons/source/icon_mini_rect2.svg
rename to editor/icons/source/icon_mini_rect2.svg
diff --git a/tools/editor/icons/source/icon_mini_rid.svg b/editor/icons/source/icon_mini_rid.svg
similarity index 100%
rename from tools/editor/icons/source/icon_mini_rid.svg
rename to editor/icons/source/icon_mini_rid.svg
diff --git a/tools/editor/icons/source/icon_mini_string.svg b/editor/icons/source/icon_mini_string.svg
similarity index 100%
rename from tools/editor/icons/source/icon_mini_string.svg
rename to editor/icons/source/icon_mini_string.svg
diff --git a/tools/editor/icons/source/icon_mini_string_array.svg b/editor/icons/source/icon_mini_string_array.svg
similarity index 100%
rename from tools/editor/icons/source/icon_mini_string_array.svg
rename to editor/icons/source/icon_mini_string_array.svg
diff --git a/tools/editor/icons/source/icon_mini_transform.svg b/editor/icons/source/icon_mini_transform.svg
similarity index 100%
rename from tools/editor/icons/source/icon_mini_transform.svg
rename to editor/icons/source/icon_mini_transform.svg
diff --git a/tools/editor/icons/source/icon_mini_variant.svg b/editor/icons/source/icon_mini_variant.svg
similarity index 100%
rename from tools/editor/icons/source/icon_mini_variant.svg
rename to editor/icons/source/icon_mini_variant.svg
diff --git a/tools/editor/icons/source/icon_mini_vector2.svg b/editor/icons/source/icon_mini_vector2.svg
similarity index 100%
rename from tools/editor/icons/source/icon_mini_vector2.svg
rename to editor/icons/source/icon_mini_vector2.svg
diff --git a/tools/editor/icons/source/icon_mini_vector2_array.svg b/editor/icons/source/icon_mini_vector2_array.svg
similarity index 100%
rename from tools/editor/icons/source/icon_mini_vector2_array.svg
rename to editor/icons/source/icon_mini_vector2_array.svg
diff --git a/tools/editor/icons/source/icon_mini_vector3.svg b/editor/icons/source/icon_mini_vector3.svg
similarity index 100%
rename from tools/editor/icons/source/icon_mini_vector3.svg
rename to editor/icons/source/icon_mini_vector3.svg
diff --git a/tools/editor/icons/source/icon_mini_vector3_array.svg b/editor/icons/source/icon_mini_vector3_array.svg
similarity index 100%
rename from tools/editor/icons/source/icon_mini_vector3_array.svg
rename to editor/icons/source/icon_mini_vector3_array.svg
diff --git a/tools/editor/icons/source/icon_mirror_x.svg b/editor/icons/source/icon_mirror_x.svg
similarity index 100%
rename from tools/editor/icons/source/icon_mirror_x.svg
rename to editor/icons/source/icon_mirror_x.svg
diff --git a/tools/editor/icons/source/icon_mirror_y.svg b/editor/icons/source/icon_mirror_y.svg
similarity index 100%
rename from tools/editor/icons/source/icon_mirror_y.svg
rename to editor/icons/source/icon_mirror_y.svg
diff --git a/tools/editor/icons/source/icon_mouse.svg b/editor/icons/source/icon_mouse.svg
similarity index 100%
rename from tools/editor/icons/source/icon_mouse.svg
rename to editor/icons/source/icon_mouse.svg
diff --git a/tools/editor/icons/source/icon_move_down.svg b/editor/icons/source/icon_move_down.svg
similarity index 100%
rename from tools/editor/icons/source/icon_move_down.svg
rename to editor/icons/source/icon_move_down.svg
diff --git a/tools/editor/icons/source/icon_move_point.svg b/editor/icons/source/icon_move_point.svg
similarity index 100%
rename from tools/editor/icons/source/icon_move_point.svg
rename to editor/icons/source/icon_move_point.svg
diff --git a/tools/editor/icons/source/icon_move_up.svg b/editor/icons/source/icon_move_up.svg
similarity index 100%
rename from tools/editor/icons/source/icon_move_up.svg
rename to editor/icons/source/icon_move_up.svg
diff --git a/tools/editor/icons/source/icon_multi_edit.svg b/editor/icons/source/icon_multi_edit.svg
similarity index 100%
rename from tools/editor/icons/source/icon_multi_edit.svg
rename to editor/icons/source/icon_multi_edit.svg
diff --git a/tools/editor/icons/source/icon_multi_line.svg b/editor/icons/source/icon_multi_line.svg
similarity index 100%
rename from tools/editor/icons/source/icon_multi_line.svg
rename to editor/icons/source/icon_multi_line.svg
diff --git a/tools/editor/icons/source/icon_multi_mesh.svg b/editor/icons/source/icon_multi_mesh.svg
similarity index 100%
rename from tools/editor/icons/source/icon_multi_mesh.svg
rename to editor/icons/source/icon_multi_mesh.svg
diff --git a/tools/editor/icons/source/icon_multi_mesh_instance.svg b/editor/icons/source/icon_multi_mesh_instance.svg
similarity index 100%
rename from tools/editor/icons/source/icon_multi_mesh_instance.svg
rename to editor/icons/source/icon_multi_mesh_instance.svg
diff --git a/tools/editor/icons/source/icon_navigation.svg b/editor/icons/source/icon_navigation.svg
similarity index 100%
rename from tools/editor/icons/source/icon_navigation.svg
rename to editor/icons/source/icon_navigation.svg
diff --git a/tools/editor/icons/source/icon_navigation_2d.svg b/editor/icons/source/icon_navigation_2d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_navigation_2d.svg
rename to editor/icons/source/icon_navigation_2d.svg
diff --git a/tools/editor/icons/source/icon_navigation_mesh.svg b/editor/icons/source/icon_navigation_mesh.svg
similarity index 100%
rename from tools/editor/icons/source/icon_navigation_mesh.svg
rename to editor/icons/source/icon_navigation_mesh.svg
diff --git a/tools/editor/icons/source/icon_navigation_mesh_instance.svg b/editor/icons/source/icon_navigation_mesh_instance.svg
similarity index 100%
rename from tools/editor/icons/source/icon_navigation_mesh_instance.svg
rename to editor/icons/source/icon_navigation_mesh_instance.svg
diff --git a/tools/editor/icons/source/icon_navigation_polygon.svg b/editor/icons/source/icon_navigation_polygon.svg
similarity index 100%
rename from tools/editor/icons/source/icon_navigation_polygon.svg
rename to editor/icons/source/icon_navigation_polygon.svg
diff --git a/tools/editor/icons/source/icon_navigation_polygon_instance.svg b/editor/icons/source/icon_navigation_polygon_instance.svg
similarity index 100%
rename from tools/editor/icons/source/icon_navigation_polygon_instance.svg
rename to editor/icons/source/icon_navigation_polygon_instance.svg
diff --git a/tools/editor/icons/source/icon_new.svg b/editor/icons/source/icon_new.svg
similarity index 100%
rename from tools/editor/icons/source/icon_new.svg
rename to editor/icons/source/icon_new.svg
diff --git a/tools/editor/icons/source/icon_nine_patch_rect.svg b/editor/icons/source/icon_nine_patch_rect.svg
similarity index 100%
rename from tools/editor/icons/source/icon_nine_patch_rect.svg
rename to editor/icons/source/icon_nine_patch_rect.svg
diff --git a/tools/editor/icons/source/icon_node.svg b/editor/icons/source/icon_node.svg
similarity index 100%
rename from tools/editor/icons/source/icon_node.svg
rename to editor/icons/source/icon_node.svg
diff --git a/tools/editor/icons/source/icon_node_2d.svg b/editor/icons/source/icon_node_2d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_node_2d.svg
rename to editor/icons/source/icon_node_2d.svg
diff --git a/tools/editor/icons/source/icon_node_warning.svg b/editor/icons/source/icon_node_warning.svg
similarity index 100%
rename from tools/editor/icons/source/icon_node_warning.svg
rename to editor/icons/source/icon_node_warning.svg
diff --git a/tools/editor/icons/source/icon_non_favorite.svg b/editor/icons/source/icon_non_favorite.svg
similarity index 100%
rename from tools/editor/icons/source/icon_non_favorite.svg
rename to editor/icons/source/icon_non_favorite.svg
diff --git a/tools/editor/icons/source/icon_object.svg b/editor/icons/source/icon_object.svg
similarity index 100%
rename from tools/editor/icons/source/icon_object.svg
rename to editor/icons/source/icon_object.svg
diff --git a/tools/editor/icons/source/icon_occluder_polygon_2d.svg b/editor/icons/source/icon_occluder_polygon_2d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_occluder_polygon_2d.svg
rename to editor/icons/source/icon_occluder_polygon_2d.svg
diff --git a/tools/editor/icons/source/icon_omni_light.svg b/editor/icons/source/icon_omni_light.svg
similarity index 100%
rename from tools/editor/icons/source/icon_omni_light.svg
rename to editor/icons/source/icon_omni_light.svg
diff --git a/tools/editor/icons/source/icon_option_button.svg b/editor/icons/source/icon_option_button.svg
similarity index 100%
rename from tools/editor/icons/source/icon_option_button.svg
rename to editor/icons/source/icon_option_button.svg
diff --git a/tools/editor/icons/source/icon_override.svg b/editor/icons/source/icon_override.svg
similarity index 100%
rename from tools/editor/icons/source/icon_override.svg
rename to editor/icons/source/icon_override.svg
diff --git a/tools/editor/icons/source/icon_packed_data_container.svg b/editor/icons/source/icon_packed_data_container.svg
similarity index 100%
rename from tools/editor/icons/source/icon_packed_data_container.svg
rename to editor/icons/source/icon_packed_data_container.svg
diff --git a/tools/editor/icons/source/icon_packed_scene.svg b/editor/icons/source/icon_packed_scene.svg
similarity index 100%
rename from tools/editor/icons/source/icon_packed_scene.svg
rename to editor/icons/source/icon_packed_scene.svg
diff --git a/tools/editor/icons/source/icon_panel.svg b/editor/icons/source/icon_panel.svg
similarity index 100%
rename from tools/editor/icons/source/icon_panel.svg
rename to editor/icons/source/icon_panel.svg
diff --git a/tools/editor/icons/source/icon_panel_container.svg b/editor/icons/source/icon_panel_container.svg
similarity index 100%
rename from tools/editor/icons/source/icon_panel_container.svg
rename to editor/icons/source/icon_panel_container.svg
diff --git a/tools/editor/icons/source/icon_panels_1.svg b/editor/icons/source/icon_panels_1.svg
similarity index 100%
rename from tools/editor/icons/source/icon_panels_1.svg
rename to editor/icons/source/icon_panels_1.svg
diff --git a/tools/editor/icons/source/icon_panels_2.svg b/editor/icons/source/icon_panels_2.svg
similarity index 100%
rename from tools/editor/icons/source/icon_panels_2.svg
rename to editor/icons/source/icon_panels_2.svg
diff --git a/tools/editor/icons/source/icon_panels_2_alt.svg b/editor/icons/source/icon_panels_2_alt.svg
similarity index 100%
rename from tools/editor/icons/source/icon_panels_2_alt.svg
rename to editor/icons/source/icon_panels_2_alt.svg
diff --git a/tools/editor/icons/source/icon_panels_3.svg b/editor/icons/source/icon_panels_3.svg
similarity index 100%
rename from tools/editor/icons/source/icon_panels_3.svg
rename to editor/icons/source/icon_panels_3.svg
diff --git a/tools/editor/icons/source/icon_panels_3_alt.svg b/editor/icons/source/icon_panels_3_alt.svg
similarity index 100%
rename from tools/editor/icons/source/icon_panels_3_alt.svg
rename to editor/icons/source/icon_panels_3_alt.svg
diff --git a/tools/editor/icons/source/icon_panels_4.svg b/editor/icons/source/icon_panels_4.svg
similarity index 100%
rename from tools/editor/icons/source/icon_panels_4.svg
rename to editor/icons/source/icon_panels_4.svg
diff --git a/tools/editor/icons/source/icon_parallax_background.svg b/editor/icons/source/icon_parallax_background.svg
similarity index 100%
rename from tools/editor/icons/source/icon_parallax_background.svg
rename to editor/icons/source/icon_parallax_background.svg
diff --git a/tools/editor/icons/source/icon_parallax_layer.svg b/editor/icons/source/icon_parallax_layer.svg
similarity index 100%
rename from tools/editor/icons/source/icon_parallax_layer.svg
rename to editor/icons/source/icon_parallax_layer.svg
diff --git a/tools/editor/icons/source/icon_particle_attractor_2d.svg b/editor/icons/source/icon_particle_attractor_2d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_particle_attractor_2d.svg
rename to editor/icons/source/icon_particle_attractor_2d.svg
diff --git a/tools/editor/icons/source/icon_particles.svg b/editor/icons/source/icon_particles.svg
similarity index 100%
rename from tools/editor/icons/source/icon_particles.svg
rename to editor/icons/source/icon_particles.svg
diff --git a/tools/editor/icons/source/icon_particles_2d.svg b/editor/icons/source/icon_particles_2d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_particles_2d.svg
rename to editor/icons/source/icon_particles_2d.svg
diff --git a/tools/editor/icons/source/icon_particles_shader.svg b/editor/icons/source/icon_particles_shader.svg
similarity index 100%
rename from tools/editor/icons/source/icon_particles_shader.svg
rename to editor/icons/source/icon_particles_shader.svg
diff --git a/tools/editor/icons/source/icon_patch_9_rect.svg b/editor/icons/source/icon_patch_9_rect.svg
similarity index 100%
rename from tools/editor/icons/source/icon_patch_9_rect.svg
rename to editor/icons/source/icon_patch_9_rect.svg
diff --git a/tools/editor/icons/source/icon_path.svg b/editor/icons/source/icon_path.svg
similarity index 100%
rename from tools/editor/icons/source/icon_path.svg
rename to editor/icons/source/icon_path.svg
diff --git a/tools/editor/icons/source/icon_path_2d.svg b/editor/icons/source/icon_path_2d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_path_2d.svg
rename to editor/icons/source/icon_path_2d.svg
diff --git a/tools/editor/icons/source/icon_path_follow.svg b/editor/icons/source/icon_path_follow.svg
similarity index 100%
rename from tools/editor/icons/source/icon_path_follow.svg
rename to editor/icons/source/icon_path_follow.svg
diff --git a/tools/editor/icons/source/icon_path_follow_2d.svg b/editor/icons/source/icon_path_follow_2d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_path_follow_2d.svg
rename to editor/icons/source/icon_path_follow_2d.svg
diff --git a/tools/editor/icons/source/icon_pause.svg b/editor/icons/source/icon_pause.svg
similarity index 100%
rename from tools/editor/icons/source/icon_pause.svg
rename to editor/icons/source/icon_pause.svg
diff --git a/tools/editor/icons/source/icon_pin.svg b/editor/icons/source/icon_pin.svg
similarity index 100%
rename from tools/editor/icons/source/icon_pin.svg
rename to editor/icons/source/icon_pin.svg
diff --git a/tools/editor/icons/source/icon_pin_joint.svg b/editor/icons/source/icon_pin_joint.svg
similarity index 100%
rename from tools/editor/icons/source/icon_pin_joint.svg
rename to editor/icons/source/icon_pin_joint.svg
diff --git a/tools/editor/icons/source/icon_pin_joint_2d.svg b/editor/icons/source/icon_pin_joint_2d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_pin_joint_2d.svg
rename to editor/icons/source/icon_pin_joint_2d.svg
diff --git a/tools/editor/icons/source/icon_pin_pressed.svg b/editor/icons/source/icon_pin_pressed.svg
similarity index 100%
rename from tools/editor/icons/source/icon_pin_pressed.svg
rename to editor/icons/source/icon_pin_pressed.svg
diff --git a/tools/editor/icons/source/icon_plane.svg b/editor/icons/source/icon_plane.svg
similarity index 100%
rename from tools/editor/icons/source/icon_plane.svg
rename to editor/icons/source/icon_plane.svg
diff --git a/tools/editor/icons/source/icon_plane_shape.svg b/editor/icons/source/icon_plane_shape.svg
similarity index 100%
rename from tools/editor/icons/source/icon_plane_shape.svg
rename to editor/icons/source/icon_plane_shape.svg
diff --git a/tools/editor/icons/source/icon_play.svg b/editor/icons/source/icon_play.svg
similarity index 100%
rename from tools/editor/icons/source/icon_play.svg
rename to editor/icons/source/icon_play.svg
diff --git a/tools/editor/icons/source/icon_play_backwards.svg b/editor/icons/source/icon_play_backwards.svg
similarity index 100%
rename from tools/editor/icons/source/icon_play_backwards.svg
rename to editor/icons/source/icon_play_backwards.svg
diff --git a/tools/editor/icons/source/icon_play_custom.svg b/editor/icons/source/icon_play_custom.svg
similarity index 100%
rename from tools/editor/icons/source/icon_play_custom.svg
rename to editor/icons/source/icon_play_custom.svg
diff --git a/tools/editor/icons/source/icon_play_scene.svg b/editor/icons/source/icon_play_scene.svg
similarity index 100%
rename from tools/editor/icons/source/icon_play_scene.svg
rename to editor/icons/source/icon_play_scene.svg
diff --git a/tools/editor/icons/source/icon_play_start.svg b/editor/icons/source/icon_play_start.svg
similarity index 100%
rename from tools/editor/icons/source/icon_play_start.svg
rename to editor/icons/source/icon_play_start.svg
diff --git a/tools/editor/icons/source/icon_play_start_backwards.svg b/editor/icons/source/icon_play_start_backwards.svg
similarity index 100%
rename from tools/editor/icons/source/icon_play_start_backwards.svg
rename to editor/icons/source/icon_play_start_backwards.svg
diff --git a/tools/editor/icons/source/icon_polygon_path_finder.svg b/editor/icons/source/icon_polygon_path_finder.svg
similarity index 100%
rename from tools/editor/icons/source/icon_polygon_path_finder.svg
rename to editor/icons/source/icon_polygon_path_finder.svg
diff --git a/tools/editor/icons/source/icon_popup.svg b/editor/icons/source/icon_popup.svg
similarity index 100%
rename from tools/editor/icons/source/icon_popup.svg
rename to editor/icons/source/icon_popup.svg
diff --git a/tools/editor/icons/source/icon_popup_dialog.svg b/editor/icons/source/icon_popup_dialog.svg
similarity index 100%
rename from tools/editor/icons/source/icon_popup_dialog.svg
rename to editor/icons/source/icon_popup_dialog.svg
diff --git a/tools/editor/icons/source/icon_popup_menu.svg b/editor/icons/source/icon_popup_menu.svg
similarity index 100%
rename from tools/editor/icons/source/icon_popup_menu.svg
rename to editor/icons/source/icon_popup_menu.svg
diff --git a/tools/editor/icons/source/icon_popup_panel.svg b/editor/icons/source/icon_popup_panel.svg
similarity index 100%
rename from tools/editor/icons/source/icon_popup_panel.svg
rename to editor/icons/source/icon_popup_panel.svg
diff --git a/tools/editor/icons/source/icon_portal.svg b/editor/icons/source/icon_portal.svg
similarity index 100%
rename from tools/editor/icons/source/icon_portal.svg
rename to editor/icons/source/icon_portal.svg
diff --git a/tools/editor/icons/source/icon_position_2d.svg b/editor/icons/source/icon_position_2d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_position_2d.svg
rename to editor/icons/source/icon_position_2d.svg
diff --git a/tools/editor/icons/source/icon_position_3d.svg b/editor/icons/source/icon_position_3d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_position_3d.svg
rename to editor/icons/source/icon_position_3d.svg
diff --git a/tools/editor/icons/source/icon_progress_1.svg b/editor/icons/source/icon_progress_1.svg
similarity index 100%
rename from tools/editor/icons/source/icon_progress_1.svg
rename to editor/icons/source/icon_progress_1.svg
diff --git a/tools/editor/icons/source/icon_progress_2.svg b/editor/icons/source/icon_progress_2.svg
similarity index 100%
rename from tools/editor/icons/source/icon_progress_2.svg
rename to editor/icons/source/icon_progress_2.svg
diff --git a/tools/editor/icons/source/icon_progress_3.svg b/editor/icons/source/icon_progress_3.svg
similarity index 100%
rename from tools/editor/icons/source/icon_progress_3.svg
rename to editor/icons/source/icon_progress_3.svg
diff --git a/tools/editor/icons/source/icon_progress_4.svg b/editor/icons/source/icon_progress_4.svg
similarity index 100%
rename from tools/editor/icons/source/icon_progress_4.svg
rename to editor/icons/source/icon_progress_4.svg
diff --git a/tools/editor/icons/source/icon_progress_5.svg b/editor/icons/source/icon_progress_5.svg
similarity index 100%
rename from tools/editor/icons/source/icon_progress_5.svg
rename to editor/icons/source/icon_progress_5.svg
diff --git a/tools/editor/icons/source/icon_progress_6.svg b/editor/icons/source/icon_progress_6.svg
similarity index 100%
rename from tools/editor/icons/source/icon_progress_6.svg
rename to editor/icons/source/icon_progress_6.svg
diff --git a/tools/editor/icons/source/icon_progress_7.svg b/editor/icons/source/icon_progress_7.svg
similarity index 100%
rename from tools/editor/icons/source/icon_progress_7.svg
rename to editor/icons/source/icon_progress_7.svg
diff --git a/tools/editor/icons/source/icon_progress_8.svg b/editor/icons/source/icon_progress_8.svg
similarity index 100%
rename from tools/editor/icons/source/icon_progress_8.svg
rename to editor/icons/source/icon_progress_8.svg
diff --git a/tools/editor/icons/source/icon_progress_bar.svg b/editor/icons/source/icon_progress_bar.svg
similarity index 100%
rename from tools/editor/icons/source/icon_progress_bar.svg
rename to editor/icons/source/icon_progress_bar.svg
diff --git a/tools/editor/icons/source/icon_proximity_group.svg b/editor/icons/source/icon_proximity_group.svg
similarity index 100%
rename from tools/editor/icons/source/icon_proximity_group.svg
rename to editor/icons/source/icon_proximity_group.svg
diff --git a/tools/editor/icons/source/icon_quad.svg b/editor/icons/source/icon_quad.svg
similarity index 100%
rename from tools/editor/icons/source/icon_quad.svg
rename to editor/icons/source/icon_quad.svg
diff --git a/tools/editor/icons/source/icon_quat.svg b/editor/icons/source/icon_quat.svg
similarity index 100%
rename from tools/editor/icons/source/icon_quat.svg
rename to editor/icons/source/icon_quat.svg
diff --git a/tools/editor/icons/source/icon_range.svg b/editor/icons/source/icon_range.svg
similarity index 100%
rename from tools/editor/icons/source/icon_range.svg
rename to editor/icons/source/icon_range.svg
diff --git a/tools/editor/icons/source/icon_rating_no_star.svg b/editor/icons/source/icon_rating_no_star.svg
similarity index 100%
rename from tools/editor/icons/source/icon_rating_no_star.svg
rename to editor/icons/source/icon_rating_no_star.svg
diff --git a/tools/editor/icons/source/icon_rating_star.svg b/editor/icons/source/icon_rating_star.svg
similarity index 100%
rename from tools/editor/icons/source/icon_rating_star.svg
rename to editor/icons/source/icon_rating_star.svg
diff --git a/tools/editor/icons/source/icon_ray_cast.svg b/editor/icons/source/icon_ray_cast.svg
similarity index 100%
rename from tools/editor/icons/source/icon_ray_cast.svg
rename to editor/icons/source/icon_ray_cast.svg
diff --git a/tools/editor/icons/source/icon_ray_cast_2d.svg b/editor/icons/source/icon_ray_cast_2d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_ray_cast_2d.svg
rename to editor/icons/source/icon_ray_cast_2d.svg
diff --git a/tools/editor/icons/source/icon_ray_shape.svg b/editor/icons/source/icon_ray_shape.svg
similarity index 100%
rename from tools/editor/icons/source/icon_ray_shape.svg
rename to editor/icons/source/icon_ray_shape.svg
diff --git a/tools/editor/icons/source/icon_ray_shape_2d.svg b/editor/icons/source/icon_ray_shape_2d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_ray_shape_2d.svg
rename to editor/icons/source/icon_ray_shape_2d.svg
diff --git a/tools/editor/icons/source/icon_rayito.svg b/editor/icons/source/icon_rayito.svg
similarity index 100%
rename from tools/editor/icons/source/icon_rayito.svg
rename to editor/icons/source/icon_rayito.svg
diff --git a/tools/editor/icons/source/icon_real.svg b/editor/icons/source/icon_real.svg
similarity index 100%
rename from tools/editor/icons/source/icon_real.svg
rename to editor/icons/source/icon_real.svg
diff --git a/tools/editor/icons/source/icon_rectangle_shape_2d.svg b/editor/icons/source/icon_rectangle_shape_2d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_rectangle_shape_2d.svg
rename to editor/icons/source/icon_rectangle_shape_2d.svg
diff --git a/tools/editor/icons/source/icon_reference_rect.svg b/editor/icons/source/icon_reference_rect.svg
similarity index 100%
rename from tools/editor/icons/source/icon_reference_rect.svg
rename to editor/icons/source/icon_reference_rect.svg
diff --git a/tools/editor/icons/source/icon_reflection_probe.svg b/editor/icons/source/icon_reflection_probe.svg
similarity index 100%
rename from tools/editor/icons/source/icon_reflection_probe.svg
rename to editor/icons/source/icon_reflection_probe.svg
diff --git a/tools/editor/icons/source/icon_region_edit.svg b/editor/icons/source/icon_region_edit.svg
similarity index 100%
rename from tools/editor/icons/source/icon_region_edit.svg
rename to editor/icons/source/icon_region_edit.svg
diff --git a/tools/editor/icons/source/icon_reload_small.svg b/editor/icons/source/icon_reload_small.svg
similarity index 100%
rename from tools/editor/icons/source/icon_reload_small.svg
rename to editor/icons/source/icon_reload_small.svg
diff --git a/tools/editor/icons/source/icon_remote.svg b/editor/icons/source/icon_remote.svg
similarity index 100%
rename from tools/editor/icons/source/icon_remote.svg
rename to editor/icons/source/icon_remote.svg
diff --git a/tools/editor/icons/source/icon_remote_transform.svg b/editor/icons/source/icon_remote_transform.svg
similarity index 100%
rename from tools/editor/icons/source/icon_remote_transform.svg
rename to editor/icons/source/icon_remote_transform.svg
diff --git a/tools/editor/icons/source/icon_remote_transform_2d.svg b/editor/icons/source/icon_remote_transform_2d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_remote_transform_2d.svg
rename to editor/icons/source/icon_remote_transform_2d.svg
diff --git a/tools/editor/icons/source/icon_remove.svg b/editor/icons/source/icon_remove.svg
similarity index 100%
rename from tools/editor/icons/source/icon_remove.svg
rename to editor/icons/source/icon_remove.svg
diff --git a/tools/editor/icons/source/icon_rename.svg b/editor/icons/source/icon_rename.svg
similarity index 100%
rename from tools/editor/icons/source/icon_rename.svg
rename to editor/icons/source/icon_rename.svg
diff --git a/tools/editor/icons/source/icon_reparent.svg b/editor/icons/source/icon_reparent.svg
similarity index 100%
rename from tools/editor/icons/source/icon_reparent.svg
rename to editor/icons/source/icon_reparent.svg
diff --git a/tools/editor/icons/source/icon_resource_preloader.svg b/editor/icons/source/icon_resource_preloader.svg
similarity index 100%
rename from tools/editor/icons/source/icon_resource_preloader.svg
rename to editor/icons/source/icon_resource_preloader.svg
diff --git a/tools/editor/icons/source/icon_rich_text_label.svg b/editor/icons/source/icon_rich_text_label.svg
similarity index 100%
rename from tools/editor/icons/source/icon_rich_text_label.svg
rename to editor/icons/source/icon_rich_text_label.svg
diff --git a/tools/editor/icons/source/icon_rigid_body.svg b/editor/icons/source/icon_rigid_body.svg
similarity index 100%
rename from tools/editor/icons/source/icon_rigid_body.svg
rename to editor/icons/source/icon_rigid_body.svg
diff --git a/tools/editor/icons/source/icon_rigid_body_2d.svg b/editor/icons/source/icon_rigid_body_2d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_rigid_body_2d.svg
rename to editor/icons/source/icon_rigid_body_2d.svg
diff --git a/tools/editor/icons/source/icon_room.svg b/editor/icons/source/icon_room.svg
similarity index 100%
rename from tools/editor/icons/source/icon_room.svg
rename to editor/icons/source/icon_room.svg
diff --git a/tools/editor/icons/source/icon_room_bounds.svg b/editor/icons/source/icon_room_bounds.svg
similarity index 100%
rename from tools/editor/icons/source/icon_room_bounds.svg
rename to editor/icons/source/icon_room_bounds.svg
diff --git a/tools/editor/icons/source/icon_rotate_0.svg b/editor/icons/source/icon_rotate_0.svg
similarity index 100%
rename from tools/editor/icons/source/icon_rotate_0.svg
rename to editor/icons/source/icon_rotate_0.svg
diff --git a/tools/editor/icons/source/icon_rotate_180.svg b/editor/icons/source/icon_rotate_180.svg
similarity index 100%
rename from tools/editor/icons/source/icon_rotate_180.svg
rename to editor/icons/source/icon_rotate_180.svg
diff --git a/tools/editor/icons/source/icon_rotate_270.svg b/editor/icons/source/icon_rotate_270.svg
similarity index 100%
rename from tools/editor/icons/source/icon_rotate_270.svg
rename to editor/icons/source/icon_rotate_270.svg
diff --git a/tools/editor/icons/source/icon_rotate_90.svg b/editor/icons/source/icon_rotate_90.svg
similarity index 100%
rename from tools/editor/icons/source/icon_rotate_90.svg
rename to editor/icons/source/icon_rotate_90.svg
diff --git a/tools/editor/icons/source/icon_sample.svg b/editor/icons/source/icon_sample.svg
similarity index 100%
rename from tools/editor/icons/source/icon_sample.svg
rename to editor/icons/source/icon_sample.svg
diff --git a/tools/editor/icons/source/icon_sample_library.svg b/editor/icons/source/icon_sample_library.svg
similarity index 100%
rename from tools/editor/icons/source/icon_sample_library.svg
rename to editor/icons/source/icon_sample_library.svg
diff --git a/tools/editor/icons/source/icon_sample_player.svg b/editor/icons/source/icon_sample_player.svg
similarity index 100%
rename from tools/editor/icons/source/icon_sample_player.svg
rename to editor/icons/source/icon_sample_player.svg
diff --git a/tools/editor/icons/source/icon_sample_player_2d.svg b/editor/icons/source/icon_sample_player_2d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_sample_player_2d.svg
rename to editor/icons/source/icon_sample_player_2d.svg
diff --git a/tools/editor/icons/source/icon_save.svg b/editor/icons/source/icon_save.svg
similarity index 100%
rename from tools/editor/icons/source/icon_save.svg
rename to editor/icons/source/icon_save.svg
diff --git a/tools/editor/icons/source/icon_script.svg b/editor/icons/source/icon_script.svg
similarity index 100%
rename from tools/editor/icons/source/icon_script.svg
rename to editor/icons/source/icon_script.svg
diff --git a/tools/editor/icons/source/icon_script_create.svg b/editor/icons/source/icon_script_create.svg
similarity index 100%
rename from tools/editor/icons/source/icon_script_create.svg
rename to editor/icons/source/icon_script_create.svg
diff --git a/tools/editor/icons/source/icon_script_remove.svg b/editor/icons/source/icon_script_remove.svg
similarity index 100%
rename from tools/editor/icons/source/icon_script_remove.svg
rename to editor/icons/source/icon_script_remove.svg
diff --git a/tools/editor/icons/source/icon_scroll_bar.svg b/editor/icons/source/icon_scroll_bar.svg
similarity index 100%
rename from tools/editor/icons/source/icon_scroll_bar.svg
rename to editor/icons/source/icon_scroll_bar.svg
diff --git a/tools/editor/icons/source/icon_scroll_container.svg b/editor/icons/source/icon_scroll_container.svg
similarity index 100%
rename from tools/editor/icons/source/icon_scroll_container.svg
rename to editor/icons/source/icon_scroll_container.svg
diff --git a/tools/editor/icons/source/icon_segment_shape_2d.svg b/editor/icons/source/icon_segment_shape_2d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_segment_shape_2d.svg
rename to editor/icons/source/icon_segment_shape_2d.svg
diff --git a/tools/editor/icons/source/icon_shader.svg b/editor/icons/source/icon_shader.svg
similarity index 100%
rename from tools/editor/icons/source/icon_shader.svg
rename to editor/icons/source/icon_shader.svg
diff --git a/tools/editor/icons/source/icon_short_cut.svg b/editor/icons/source/icon_short_cut.svg
similarity index 100%
rename from tools/editor/icons/source/icon_short_cut.svg
rename to editor/icons/source/icon_short_cut.svg
diff --git a/tools/editor/icons/source/icon_signal.svg b/editor/icons/source/icon_signal.svg
similarity index 100%
rename from tools/editor/icons/source/icon_signal.svg
rename to editor/icons/source/icon_signal.svg
diff --git a/tools/editor/icons/source/icon_skeleton.svg b/editor/icons/source/icon_skeleton.svg
similarity index 100%
rename from tools/editor/icons/source/icon_skeleton.svg
rename to editor/icons/source/icon_skeleton.svg
diff --git a/tools/editor/icons/source/icon_slider_joint.svg b/editor/icons/source/icon_slider_joint.svg
similarity index 100%
rename from tools/editor/icons/source/icon_slider_joint.svg
rename to editor/icons/source/icon_slider_joint.svg
diff --git a/tools/editor/icons/source/icon_slot.svg b/editor/icons/source/icon_slot.svg
similarity index 100%
rename from tools/editor/icons/source/icon_slot.svg
rename to editor/icons/source/icon_slot.svg
diff --git a/tools/editor/icons/source/icon_snap.svg b/editor/icons/source/icon_snap.svg
similarity index 100%
rename from tools/editor/icons/source/icon_snap.svg
rename to editor/icons/source/icon_snap.svg
diff --git a/tools/editor/icons/source/icon_sound_room_params.svg b/editor/icons/source/icon_sound_room_params.svg
similarity index 100%
rename from tools/editor/icons/source/icon_sound_room_params.svg
rename to editor/icons/source/icon_sound_room_params.svg
diff --git a/tools/editor/icons/source/icon_spatial.svg b/editor/icons/source/icon_spatial.svg
similarity index 100%
rename from tools/editor/icons/source/icon_spatial.svg
rename to editor/icons/source/icon_spatial.svg
diff --git a/tools/editor/icons/source/icon_spatial_sample_player.svg b/editor/icons/source/icon_spatial_sample_player.svg
similarity index 100%
rename from tools/editor/icons/source/icon_spatial_sample_player.svg
rename to editor/icons/source/icon_spatial_sample_player.svg
diff --git a/tools/editor/icons/source/icon_spatial_shader.svg b/editor/icons/source/icon_spatial_shader.svg
similarity index 100%
rename from tools/editor/icons/source/icon_spatial_shader.svg
rename to editor/icons/source/icon_spatial_shader.svg
diff --git a/tools/editor/icons/source/icon_spatial_stream_player.svg b/editor/icons/source/icon_spatial_stream_player.svg
similarity index 100%
rename from tools/editor/icons/source/icon_spatial_stream_player.svg
rename to editor/icons/source/icon_spatial_stream_player.svg
diff --git a/tools/editor/icons/source/icon_sphere_shape.svg b/editor/icons/source/icon_sphere_shape.svg
similarity index 100%
rename from tools/editor/icons/source/icon_sphere_shape.svg
rename to editor/icons/source/icon_sphere_shape.svg
diff --git a/tools/editor/icons/source/icon_spin_box.svg b/editor/icons/source/icon_spin_box.svg
similarity index 100%
rename from tools/editor/icons/source/icon_spin_box.svg
rename to editor/icons/source/icon_spin_box.svg
diff --git a/tools/editor/icons/source/icon_spot_light.svg b/editor/icons/source/icon_spot_light.svg
similarity index 100%
rename from tools/editor/icons/source/icon_spot_light.svg
rename to editor/icons/source/icon_spot_light.svg
diff --git a/tools/editor/icons/source/icon_sprite.svg b/editor/icons/source/icon_sprite.svg
similarity index 100%
rename from tools/editor/icons/source/icon_sprite.svg
rename to editor/icons/source/icon_sprite.svg
diff --git a/tools/editor/icons/source/icon_sprite_3d.svg b/editor/icons/source/icon_sprite_3d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_sprite_3d.svg
rename to editor/icons/source/icon_sprite_3d.svg
diff --git a/tools/editor/icons/source/icon_sprite_frames.svg b/editor/icons/source/icon_sprite_frames.svg
similarity index 100%
rename from tools/editor/icons/source/icon_sprite_frames.svg
rename to editor/icons/source/icon_sprite_frames.svg
diff --git a/tools/editor/icons/source/icon_static_body.svg b/editor/icons/source/icon_static_body.svg
similarity index 100%
rename from tools/editor/icons/source/icon_static_body.svg
rename to editor/icons/source/icon_static_body.svg
diff --git a/tools/editor/icons/source/icon_static_body_2d.svg b/editor/icons/source/icon_static_body_2d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_static_body_2d.svg
rename to editor/icons/source/icon_static_body_2d.svg
diff --git a/tools/editor/icons/source/icon_stream_player.svg b/editor/icons/source/icon_stream_player.svg
similarity index 100%
rename from tools/editor/icons/source/icon_stream_player.svg
rename to editor/icons/source/icon_stream_player.svg
diff --git a/tools/editor/icons/source/icon_string.svg b/editor/icons/source/icon_string.svg
similarity index 100%
rename from tools/editor/icons/source/icon_string.svg
rename to editor/icons/source/icon_string.svg
diff --git a/tools/editor/icons/source/icon_style_box_empty.svg b/editor/icons/source/icon_style_box_empty.svg
similarity index 100%
rename from tools/editor/icons/source/icon_style_box_empty.svg
rename to editor/icons/source/icon_style_box_empty.svg
diff --git a/tools/editor/icons/source/icon_style_box_flat.svg b/editor/icons/source/icon_style_box_flat.svg
similarity index 100%
rename from tools/editor/icons/source/icon_style_box_flat.svg
rename to editor/icons/source/icon_style_box_flat.svg
diff --git a/tools/editor/icons/source/icon_style_box_texture.svg b/editor/icons/source/icon_style_box_texture.svg
similarity index 100%
rename from tools/editor/icons/source/icon_style_box_texture.svg
rename to editor/icons/source/icon_style_box_texture.svg
diff --git a/tools/editor/icons/source/icon_tab_container.svg b/editor/icons/source/icon_tab_container.svg
similarity index 100%
rename from tools/editor/icons/source/icon_tab_container.svg
rename to editor/icons/source/icon_tab_container.svg
diff --git a/tools/editor/icons/source/icon_tabs.svg b/editor/icons/source/icon_tabs.svg
similarity index 100%
rename from tools/editor/icons/source/icon_tabs.svg
rename to editor/icons/source/icon_tabs.svg
diff --git a/tools/editor/icons/source/icon_test_cube.svg b/editor/icons/source/icon_test_cube.svg
similarity index 100%
rename from tools/editor/icons/source/icon_test_cube.svg
rename to editor/icons/source/icon_test_cube.svg
diff --git a/tools/editor/icons/source/icon_text_edit.svg b/editor/icons/source/icon_text_edit.svg
similarity index 100%
rename from tools/editor/icons/source/icon_text_edit.svg
rename to editor/icons/source/icon_text_edit.svg
diff --git a/tools/editor/icons/source/icon_texture.svg b/editor/icons/source/icon_texture.svg
similarity index 100%
rename from tools/editor/icons/source/icon_texture.svg
rename to editor/icons/source/icon_texture.svg
diff --git a/tools/editor/icons/source/icon_texture_button.svg b/editor/icons/source/icon_texture_button.svg
similarity index 100%
rename from tools/editor/icons/source/icon_texture_button.svg
rename to editor/icons/source/icon_texture_button.svg
diff --git a/tools/editor/icons/source/icon_texture_progress.svg b/editor/icons/source/icon_texture_progress.svg
similarity index 100%
rename from tools/editor/icons/source/icon_texture_progress.svg
rename to editor/icons/source/icon_texture_progress.svg
diff --git a/tools/editor/icons/source/icon_texture_rect.svg b/editor/icons/source/icon_texture_rect.svg
similarity index 100%
rename from tools/editor/icons/source/icon_texture_rect.svg
rename to editor/icons/source/icon_texture_rect.svg
diff --git a/tools/editor/icons/source/icon_theme.svg b/editor/icons/source/icon_theme.svg
similarity index 100%
rename from tools/editor/icons/source/icon_theme.svg
rename to editor/icons/source/icon_theme.svg
diff --git a/tools/editor/icons/source/icon_tile_map.svg b/editor/icons/source/icon_tile_map.svg
similarity index 100%
rename from tools/editor/icons/source/icon_tile_map.svg
rename to editor/icons/source/icon_tile_map.svg
diff --git a/tools/editor/icons/source/icon_tile_set.svg b/editor/icons/source/icon_tile_set.svg
similarity index 100%
rename from tools/editor/icons/source/icon_tile_set.svg
rename to editor/icons/source/icon_tile_set.svg
diff --git a/tools/editor/icons/source/icon_timer.svg b/editor/icons/source/icon_timer.svg
similarity index 100%
rename from tools/editor/icons/source/icon_timer.svg
rename to editor/icons/source/icon_timer.svg
diff --git a/tools/editor/icons/source/icon_tool_button.svg b/editor/icons/source/icon_tool_button.svg
similarity index 100%
rename from tools/editor/icons/source/icon_tool_button.svg
rename to editor/icons/source/icon_tool_button.svg
diff --git a/tools/editor/icons/source/icon_tool_move.svg b/editor/icons/source/icon_tool_move.svg
similarity index 100%
rename from tools/editor/icons/source/icon_tool_move.svg
rename to editor/icons/source/icon_tool_move.svg
diff --git a/tools/editor/icons/source/icon_tool_pan.svg b/editor/icons/source/icon_tool_pan.svg
similarity index 100%
rename from tools/editor/icons/source/icon_tool_pan.svg
rename to editor/icons/source/icon_tool_pan.svg
diff --git a/tools/editor/icons/source/icon_tool_rotate.svg b/editor/icons/source/icon_tool_rotate.svg
similarity index 100%
rename from tools/editor/icons/source/icon_tool_rotate.svg
rename to editor/icons/source/icon_tool_rotate.svg
diff --git a/tools/editor/icons/source/icon_tool_scale.svg b/editor/icons/source/icon_tool_scale.svg
similarity index 100%
rename from tools/editor/icons/source/icon_tool_scale.svg
rename to editor/icons/source/icon_tool_scale.svg
diff --git a/tools/editor/icons/source/icon_tool_select.svg b/editor/icons/source/icon_tool_select.svg
similarity index 100%
rename from tools/editor/icons/source/icon_tool_select.svg
rename to editor/icons/source/icon_tool_select.svg
diff --git a/tools/editor/icons/source/icon_tools.svg b/editor/icons/source/icon_tools.svg
similarity index 100%
rename from tools/editor/icons/source/icon_tools.svg
rename to editor/icons/source/icon_tools.svg
diff --git a/tools/editor/icons/source/icon_touch_screen_button.svg b/editor/icons/source/icon_touch_screen_button.svg
similarity index 100%
rename from tools/editor/icons/source/icon_touch_screen_button.svg
rename to editor/icons/source/icon_touch_screen_button.svg
diff --git a/tools/editor/icons/source/icon_track_add_key.svg b/editor/icons/source/icon_track_add_key.svg
similarity index 100%
rename from tools/editor/icons/source/icon_track_add_key.svg
rename to editor/icons/source/icon_track_add_key.svg
diff --git a/tools/editor/icons/source/icon_track_add_key_hl.svg b/editor/icons/source/icon_track_add_key_hl.svg
similarity index 100%
rename from tools/editor/icons/source/icon_track_add_key_hl.svg
rename to editor/icons/source/icon_track_add_key_hl.svg
diff --git a/tools/editor/icons/source/icon_track_continuous.svg b/editor/icons/source/icon_track_continuous.svg
similarity index 100%
rename from tools/editor/icons/source/icon_track_continuous.svg
rename to editor/icons/source/icon_track_continuous.svg
diff --git a/tools/editor/icons/source/icon_track_discrete.svg b/editor/icons/source/icon_track_discrete.svg
similarity index 100%
rename from tools/editor/icons/source/icon_track_discrete.svg
rename to editor/icons/source/icon_track_discrete.svg
diff --git a/tools/editor/icons/source/icon_track_trigger.svg b/editor/icons/source/icon_track_trigger.svg
similarity index 100%
rename from tools/editor/icons/source/icon_track_trigger.svg
rename to editor/icons/source/icon_track_trigger.svg
diff --git a/tools/editor/icons/source/icon_translation.svg b/editor/icons/source/icon_translation.svg
similarity index 100%
rename from tools/editor/icons/source/icon_translation.svg
rename to editor/icons/source/icon_translation.svg
diff --git a/tools/editor/icons/source/icon_transpose.svg b/editor/icons/source/icon_transpose.svg
similarity index 100%
rename from tools/editor/icons/source/icon_transpose.svg
rename to editor/icons/source/icon_transpose.svg
diff --git a/tools/editor/icons/source/icon_tree.svg b/editor/icons/source/icon_tree.svg
similarity index 100%
rename from tools/editor/icons/source/icon_tree.svg
rename to editor/icons/source/icon_tree.svg
diff --git a/tools/editor/icons/source/icon_tween.svg b/editor/icons/source/icon_tween.svg
similarity index 100%
rename from tools/editor/icons/source/icon_tween.svg
rename to editor/icons/source/icon_tween.svg
diff --git a/tools/editor/icons/source/icon_unbone.svg b/editor/icons/source/icon_unbone.svg
similarity index 100%
rename from tools/editor/icons/source/icon_unbone.svg
rename to editor/icons/source/icon_unbone.svg
diff --git a/tools/editor/icons/source/icon_ungroup.svg b/editor/icons/source/icon_ungroup.svg
similarity index 100%
rename from tools/editor/icons/source/icon_ungroup.svg
rename to editor/icons/source/icon_ungroup.svg
diff --git a/tools/editor/icons/source/icon_unlock.svg b/editor/icons/source/icon_unlock.svg
similarity index 100%
rename from tools/editor/icons/source/icon_unlock.svg
rename to editor/icons/source/icon_unlock.svg
diff --git a/tools/editor/icons/source/icon_uv.svg b/editor/icons/source/icon_uv.svg
similarity index 100%
rename from tools/editor/icons/source/icon_uv.svg
rename to editor/icons/source/icon_uv.svg
diff --git a/tools/editor/icons/source/icon_v_box_container.svg b/editor/icons/source/icon_v_box_container.svg
similarity index 100%
rename from tools/editor/icons/source/icon_v_box_container.svg
rename to editor/icons/source/icon_v_box_container.svg
diff --git a/tools/editor/icons/source/icon_v_button_array.svg b/editor/icons/source/icon_v_button_array.svg
similarity index 100%
rename from tools/editor/icons/source/icon_v_button_array.svg
rename to editor/icons/source/icon_v_button_array.svg
diff --git a/tools/editor/icons/source/icon_v_scroll_bar.svg b/editor/icons/source/icon_v_scroll_bar.svg
similarity index 100%
rename from tools/editor/icons/source/icon_v_scroll_bar.svg
rename to editor/icons/source/icon_v_scroll_bar.svg
diff --git a/tools/editor/icons/source/icon_v_separator.svg b/editor/icons/source/icon_v_separator.svg
similarity index 100%
rename from tools/editor/icons/source/icon_v_separator.svg
rename to editor/icons/source/icon_v_separator.svg
diff --git a/tools/editor/icons/source/icon_v_slider.svg b/editor/icons/source/icon_v_slider.svg
similarity index 100%
rename from tools/editor/icons/source/icon_v_slider.svg
rename to editor/icons/source/icon_v_slider.svg
diff --git a/tools/editor/icons/source/icon_v_split_container.svg b/editor/icons/source/icon_v_split_container.svg
similarity index 100%
rename from tools/editor/icons/source/icon_v_split_container.svg
rename to editor/icons/source/icon_v_split_container.svg
diff --git a/tools/editor/icons/source/icon_vector.svg b/editor/icons/source/icon_vector.svg
similarity index 100%
rename from tools/editor/icons/source/icon_vector.svg
rename to editor/icons/source/icon_vector.svg
diff --git a/tools/editor/icons/source/icon_vector2.svg b/editor/icons/source/icon_vector2.svg
similarity index 100%
rename from tools/editor/icons/source/icon_vector2.svg
rename to editor/icons/source/icon_vector2.svg
diff --git a/tools/editor/icons/source/icon_vehicle_body.svg b/editor/icons/source/icon_vehicle_body.svg
similarity index 100%
rename from tools/editor/icons/source/icon_vehicle_body.svg
rename to editor/icons/source/icon_vehicle_body.svg
diff --git a/tools/editor/icons/source/icon_vehicle_wheel.svg b/editor/icons/source/icon_vehicle_wheel.svg
similarity index 100%
rename from tools/editor/icons/source/icon_vehicle_wheel.svg
rename to editor/icons/source/icon_vehicle_wheel.svg
diff --git a/tools/editor/icons/source/icon_video_player.svg b/editor/icons/source/icon_video_player.svg
similarity index 100%
rename from tools/editor/icons/source/icon_video_player.svg
rename to editor/icons/source/icon_video_player.svg
diff --git a/tools/editor/icons/source/icon_viewport.svg b/editor/icons/source/icon_viewport.svg
similarity index 100%
rename from tools/editor/icons/source/icon_viewport.svg
rename to editor/icons/source/icon_viewport.svg
diff --git a/tools/editor/icons/source/icon_viewport_container.svg b/editor/icons/source/icon_viewport_container.svg
similarity index 100%
rename from tools/editor/icons/source/icon_viewport_container.svg
rename to editor/icons/source/icon_viewport_container.svg
diff --git a/tools/editor/icons/source/icon_viewport_sprite.svg b/editor/icons/source/icon_viewport_sprite.svg
similarity index 100%
rename from tools/editor/icons/source/icon_viewport_sprite.svg
rename to editor/icons/source/icon_viewport_sprite.svg
diff --git a/tools/editor/icons/source/icon_viewport_texture.svg b/editor/icons/source/icon_viewport_texture.svg
similarity index 100%
rename from tools/editor/icons/source/icon_viewport_texture.svg
rename to editor/icons/source/icon_viewport_texture.svg
diff --git a/tools/editor/icons/source/icon_visibility_enabler.svg b/editor/icons/source/icon_visibility_enabler.svg
similarity index 100%
rename from tools/editor/icons/source/icon_visibility_enabler.svg
rename to editor/icons/source/icon_visibility_enabler.svg
diff --git a/tools/editor/icons/source/icon_visibility_enabler_2d.svg b/editor/icons/source/icon_visibility_enabler_2d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_visibility_enabler_2d.svg
rename to editor/icons/source/icon_visibility_enabler_2d.svg
diff --git a/tools/editor/icons/source/icon_visibility_notifier.svg b/editor/icons/source/icon_visibility_notifier.svg
similarity index 100%
rename from tools/editor/icons/source/icon_visibility_notifier.svg
rename to editor/icons/source/icon_visibility_notifier.svg
diff --git a/tools/editor/icons/source/icon_visibility_notifier_2d.svg b/editor/icons/source/icon_visibility_notifier_2d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_visibility_notifier_2d.svg
rename to editor/icons/source/icon_visibility_notifier_2d.svg
diff --git a/tools/editor/icons/source/icon_visible.svg b/editor/icons/source/icon_visible.svg
similarity index 100%
rename from tools/editor/icons/source/icon_visible.svg
rename to editor/icons/source/icon_visible.svg
diff --git a/tools/editor/icons/source/icon_visual_script.svg b/editor/icons/source/icon_visual_script.svg
similarity index 100%
rename from tools/editor/icons/source/icon_visual_script.svg
rename to editor/icons/source/icon_visual_script.svg
diff --git a/tools/editor/icons/source/icon_visual_shader_port.svg b/editor/icons/source/icon_visual_shader_port.svg
similarity index 100%
rename from tools/editor/icons/source/icon_visual_shader_port.svg
rename to editor/icons/source/icon_visual_shader_port.svg
diff --git a/tools/editor/icons/source/icon_vu_empty.svg b/editor/icons/source/icon_vu_empty.svg
similarity index 100%
rename from tools/editor/icons/source/icon_vu_empty.svg
rename to editor/icons/source/icon_vu_empty.svg
diff --git a/tools/editor/icons/source/icon_vu_full.svg b/editor/icons/source/icon_vu_full.svg
similarity index 100%
rename from tools/editor/icons/source/icon_vu_full.svg
rename to editor/icons/source/icon_vu_full.svg
diff --git a/tools/editor/icons/source/icon_warning.svg b/editor/icons/source/icon_warning.svg
similarity index 100%
rename from tools/editor/icons/source/icon_warning.svg
rename to editor/icons/source/icon_warning.svg
diff --git a/tools/editor/icons/source/icon_window_dialog.svg b/editor/icons/source/icon_window_dialog.svg
similarity index 100%
rename from tools/editor/icons/source/icon_window_dialog.svg
rename to editor/icons/source/icon_window_dialog.svg
diff --git a/tools/editor/icons/source/icon_world.svg b/editor/icons/source/icon_world.svg
similarity index 100%
rename from tools/editor/icons/source/icon_world.svg
rename to editor/icons/source/icon_world.svg
diff --git a/tools/editor/icons/source/icon_world_2d.svg b/editor/icons/source/icon_world_2d.svg
similarity index 100%
rename from tools/editor/icons/source/icon_world_2d.svg
rename to editor/icons/source/icon_world_2d.svg
diff --git a/tools/editor/icons/source/icon_world_environment.svg b/editor/icons/source/icon_world_environment.svg
similarity index 100%
rename from tools/editor/icons/source/icon_world_environment.svg
rename to editor/icons/source/icon_world_environment.svg
diff --git a/tools/editor/icons/source/icon_y_sort.svg b/editor/icons/source/icon_y_sort.svg
similarity index 100%
rename from tools/editor/icons/source/icon_y_sort.svg
rename to editor/icons/source/icon_y_sort.svg
diff --git a/tools/editor/icons/source/icon_zoom.svg b/editor/icons/source/icon_zoom.svg
similarity index 100%
rename from tools/editor/icons/source/icon_zoom.svg
rename to editor/icons/source/icon_zoom.svg
diff --git a/tools/editor/icons/source/icon_zoom_less.svg b/editor/icons/source/icon_zoom_less.svg
similarity index 100%
rename from tools/editor/icons/source/icon_zoom_less.svg
rename to editor/icons/source/icon_zoom_less.svg
diff --git a/tools/editor/icons/source/icon_zoom_more.svg b/editor/icons/source/icon_zoom_more.svg
similarity index 100%
rename from tools/editor/icons/source/icon_zoom_more.svg
rename to editor/icons/source/icon_zoom_more.svg
diff --git a/tools/editor/icons/source/icon_zoom_reset.svg b/editor/icons/source/icon_zoom_reset.svg
similarity index 100%
rename from tools/editor/icons/source/icon_zoom_reset.svg
rename to editor/icons/source/icon_zoom_reset.svg
diff --git a/tools/editor/icons/xpmfix.sh b/editor/icons/xpmfix.sh
similarity index 100%
rename from tools/editor/icons/xpmfix.sh
rename to editor/icons/xpmfix.sh
diff --git a/tools/editor/import/SCsub b/editor/import/SCsub
similarity index 100%
rename from tools/editor/import/SCsub
rename to editor/import/SCsub
diff --git a/tools/editor/import/editor_import_collada.cpp b/editor/import/editor_import_collada.cpp
similarity index 99%
rename from tools/editor/import/editor_import_collada.cpp
rename to editor/import/editor_import_collada.cpp
index a901de1faf3..7098e8812b0 100644
--- a/tools/editor/import/editor_import_collada.cpp
+++ b/editor/import/editor_import_collada.cpp
@@ -39,8 +39,8 @@
 #include "scene/resources/animation.h"
 #include "scene/resources/packed_scene.h"
 #include "os/os.h"
-#include "tools/editor/collada/collada.h"
-#include "tools/editor/editor_node.h"
+#include "editor/collada/collada.h"
+#include "editor/editor_node.h"
 #include <iostream>
 
 
diff --git a/tools/editor/import/editor_import_collada.h b/editor/import/editor_import_collada.h
similarity index 97%
rename from tools/editor/import/editor_import_collada.h
rename to editor/import/editor_import_collada.h
index cd3614bb401..5c7624bd336 100644
--- a/tools/editor/import/editor_import_collada.h
+++ b/editor/import/editor_import_collada.h
@@ -29,7 +29,7 @@
 #ifndef EDITOR_IMPORT_COLLADA_H
 #define EDITOR_IMPORT_COLLADA_H
 
-#include "tools/editor/import/resource_importer_scene.h"
+#include "editor/import/resource_importer_scene.h"
 
 
 
diff --git a/tools/editor/import/resource_importer_csv_translation.cpp b/editor/import/resource_importer_csv_translation.cpp
similarity index 100%
rename from tools/editor/import/resource_importer_csv_translation.cpp
rename to editor/import/resource_importer_csv_translation.cpp
diff --git a/tools/editor/import/resource_importer_csv_translation.h b/editor/import/resource_importer_csv_translation.h
similarity index 100%
rename from tools/editor/import/resource_importer_csv_translation.h
rename to editor/import/resource_importer_csv_translation.h
diff --git a/tools/editor/import/resource_importer_obj.cpp b/editor/import/resource_importer_obj.cpp
similarity index 100%
rename from tools/editor/import/resource_importer_obj.cpp
rename to editor/import/resource_importer_obj.cpp
diff --git a/tools/editor/import/resource_importer_obj.h b/editor/import/resource_importer_obj.h
similarity index 100%
rename from tools/editor/import/resource_importer_obj.h
rename to editor/import/resource_importer_obj.h
diff --git a/tools/editor/import/resource_importer_scene.cpp b/editor/import/resource_importer_scene.cpp
similarity index 99%
rename from tools/editor/import/resource_importer_scene.cpp
rename to editor/import/resource_importer_scene.cpp
index 406058c59ea..cdaf40798ba 100644
--- a/tools/editor/import/resource_importer_scene.cpp
+++ b/editor/import/resource_importer_scene.cpp
@@ -2,7 +2,7 @@
 
 #include "scene/resources/packed_scene.h"
 #include "io/resource_saver.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_node.h"
 
 #include "scene/3d/mesh_instance.h"
 #include "scene/3d/navigation.h"
diff --git a/tools/editor/import/resource_importer_scene.h b/editor/import/resource_importer_scene.h
similarity index 100%
rename from tools/editor/import/resource_importer_scene.h
rename to editor/import/resource_importer_scene.h
diff --git a/tools/editor/import/resource_importer_texture.cpp b/editor/import/resource_importer_texture.cpp
similarity index 99%
rename from tools/editor/import/resource_importer_texture.cpp
rename to editor/import/resource_importer_texture.cpp
index 21e434fa115..43c7ff79c6f 100644
--- a/tools/editor/import/resource_importer_texture.cpp
+++ b/editor/import/resource_importer_texture.cpp
@@ -1,7 +1,7 @@
 #include "resource_importer_texture.h"
 #include "io/image_loader.h"
 #include "scene/resources/texture.h"
-#include "tools/editor/editor_file_system.h"
+#include "editor/editor_file_system.h"
 #include "io/config_file.h"
 
 
diff --git a/tools/editor/import/resource_importer_texture.h b/editor/import/resource_importer_texture.h
similarity index 100%
rename from tools/editor/import/resource_importer_texture.h
rename to editor/import/resource_importer_texture.h
diff --git a/tools/editor/import/resource_importer_wav.cpp b/editor/import/resource_importer_wav.cpp
similarity index 100%
rename from tools/editor/import/resource_importer_wav.cpp
rename to editor/import/resource_importer_wav.cpp
diff --git a/tools/editor/import/resource_importer_wav.h b/editor/import/resource_importer_wav.h
similarity index 100%
rename from tools/editor/import/resource_importer_wav.h
rename to editor/import/resource_importer_wav.h
diff --git a/tools/editor/import_dock.cpp b/editor/import_dock.cpp
similarity index 100%
rename from tools/editor/import_dock.cpp
rename to editor/import_dock.cpp
diff --git a/tools/editor/import_dock.h b/editor/import_dock.h
similarity index 100%
rename from tools/editor/import_dock.h
rename to editor/import_dock.h
diff --git a/tools/editor/inspector_dock.cpp b/editor/inspector_dock.cpp
similarity index 100%
rename from tools/editor/inspector_dock.cpp
rename to editor/inspector_dock.cpp
diff --git a/tools/editor/inspector_dock.h b/editor/inspector_dock.h
similarity index 100%
rename from tools/editor/inspector_dock.h
rename to editor/inspector_dock.h
diff --git a/tools/editor/io_plugins/SCsub b/editor/io_plugins/SCsub
similarity index 100%
rename from tools/editor/io_plugins/SCsub
rename to editor/io_plugins/SCsub
diff --git a/tools/editor/io_plugins/editor_atlas.cpp b/editor/io_plugins/editor_atlas.cpp
similarity index 100%
rename from tools/editor/io_plugins/editor_atlas.cpp
rename to editor/io_plugins/editor_atlas.cpp
diff --git a/tools/editor/io_plugins/editor_atlas.h b/editor/io_plugins/editor_atlas.h
similarity index 100%
rename from tools/editor/io_plugins/editor_atlas.h
rename to editor/io_plugins/editor_atlas.h
diff --git a/tools/editor/io_plugins/editor_bitmask_import_plugin.cpp b/editor/io_plugins/editor_bitmask_import_plugin.cpp
similarity index 98%
rename from tools/editor/io_plugins/editor_bitmask_import_plugin.cpp
rename to editor/io_plugins/editor_bitmask_import_plugin.cpp
index 587353fef8f..7282cbe4e72 100644
--- a/tools/editor/io_plugins/editor_bitmask_import_plugin.cpp
+++ b/editor/io_plugins/editor_bitmask_import_plugin.cpp
@@ -29,14 +29,14 @@
 #include "editor_bitmask_import_plugin.h"
 #if 0
 #include "io/image_loader.h"
-#include "tools/editor/editor_file_dialog.h"
-#include "tools/editor/editor_dir_dialog.h"
-#include "tools/editor/editor_node.h"
-#include "tools/editor/property_editor.h"
+#include "editor/editor_file_dialog.h"
+#include "editor/editor_dir_dialog.h"
+#include "editor/editor_node.h"
+#include "editor/property_editor.h"
 #include "io/resource_saver.h"
 #include "os/file_access.h"
 #include "io/marshalls.h"
-#include "tools/editor/editor_settings.h"
+#include "editor/editor_settings.h"
 
 class _EditorBitMaskImportOptions : public Object {
 
diff --git a/tools/editor/io_plugins/editor_bitmask_import_plugin.h b/editor/io_plugins/editor_bitmask_import_plugin.h
similarity index 98%
rename from tools/editor/io_plugins/editor_bitmask_import_plugin.h
rename to editor/io_plugins/editor_bitmask_import_plugin.h
index 89ff58ec937..d1618d78439 100644
--- a/tools/editor/io_plugins/editor_bitmask_import_plugin.h
+++ b/editor/io_plugins/editor_bitmask_import_plugin.h
@@ -29,7 +29,7 @@
 #ifndef EDITOR_BITMASK_IMPORT_PLUGIN_H
 #define EDITOR_BITMASK_IMPORT_PLUGIN_H
 #if 0
-#include "tools/editor/editor_import_export.h"
+#include "editor/editor_import_export.h"
 #include "scene/resources/font.h"
 
 class EditorNode;
diff --git a/tools/editor/io_plugins/editor_export_scene.cpp b/editor/io_plugins/editor_export_scene.cpp
similarity index 99%
rename from tools/editor/io_plugins/editor_export_scene.cpp
rename to editor/io_plugins/editor_export_scene.cpp
index 265526aacee..a593b870f96 100644
--- a/tools/editor/io_plugins/editor_export_scene.cpp
+++ b/editor/io_plugins/editor_export_scene.cpp
@@ -32,7 +32,7 @@
 #include "io/resource_saver.h"
 #include "os/dir_access.h"
 #include "os/file_access.h"
-#include "tools/editor/editor_settings.h"
+#include "editor/editor_settings.h"
 #include "scene/resources/packed_scene.h"
 #include "global_config.h"
 
diff --git a/tools/editor/io_plugins/editor_export_scene.h b/editor/io_plugins/editor_export_scene.h
similarity index 98%
rename from tools/editor/io_plugins/editor_export_scene.h
rename to editor/io_plugins/editor_export_scene.h
index c067e835a30..ac425fbedd4 100644
--- a/tools/editor/io_plugins/editor_export_scene.h
+++ b/editor/io_plugins/editor_export_scene.h
@@ -29,7 +29,7 @@
 #ifndef EDITOR_EXPORT_SCENE_H
 #define EDITOR_EXPORT_SCENE_H
 
-#include "tools/editor/editor_export.h"
+#include "editor/editor_export.h"
 
 #if 0
 class EditorSceneExportPlugin : public EditorExportPlugin {
diff --git a/tools/editor/io_plugins/editor_font_import_plugin.cpp b/editor/io_plugins/editor_font_import_plugin.cpp
similarity index 99%
rename from tools/editor/io_plugins/editor_font_import_plugin.cpp
rename to editor/io_plugins/editor_font_import_plugin.cpp
index 417aad0db81..c792ad717ac 100644
--- a/tools/editor/io_plugins/editor_font_import_plugin.cpp
+++ b/editor/io_plugins/editor_font_import_plugin.cpp
@@ -29,8 +29,8 @@
 #include "editor_font_import_plugin.h"
 #if 0
 #include "scene/gui/dialogs.h"
-#include "tools/editor/editor_file_dialog.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_file_dialog.h"
+#include "editor/editor_node.h"
 #include "os/file_access.h"
 #include "editor_atlas.h"
 #include "io/image_loader.h"
diff --git a/tools/editor/io_plugins/editor_font_import_plugin.h b/editor/io_plugins/editor_font_import_plugin.h
similarity index 98%
rename from tools/editor/io_plugins/editor_font_import_plugin.h
rename to editor/io_plugins/editor_font_import_plugin.h
index bed1463aebd..315a80e8cd0 100644
--- a/tools/editor/io_plugins/editor_font_import_plugin.h
+++ b/editor/io_plugins/editor_font_import_plugin.h
@@ -29,7 +29,7 @@
 #ifndef EDITOR_FONT_IMPORT_PLUGIN_H
 #define EDITOR_FONT_IMPORT_PLUGIN_H
 
-#include "tools/editor/editor_export.h"
+#include "editor/editor_export.h"
 #include "scene/resources/font.h"
 #if 0
 class EditorNode;
diff --git a/tools/editor/io_plugins/editor_mesh_import_plugin.cpp b/editor/io_plugins/editor_mesh_import_plugin.cpp
similarity index 98%
rename from tools/editor/io_plugins/editor_mesh_import_plugin.cpp
rename to editor/io_plugins/editor_mesh_import_plugin.cpp
index fc3f8fd8c97..df9d0a62e66 100644
--- a/tools/editor/io_plugins/editor_mesh_import_plugin.cpp
+++ b/editor/io_plugins/editor_mesh_import_plugin.cpp
@@ -30,10 +30,10 @@
 
 #if 0
 
-#include "tools/editor/editor_file_dialog.h"
-#include "tools/editor/editor_dir_dialog.h"
-#include "tools/editor/editor_node.h"
-#include "tools/editor/property_editor.h"
+#include "editor/editor_file_dialog.h"
+#include "editor/editor_dir_dialog.h"
+#include "editor/editor_node.h"
+#include "editor/property_editor.h"
 //#include "scene/resources/sample.h"
 #include "io/resource_saver.h"
 #include "os/file_access.h"
diff --git a/tools/editor/io_plugins/editor_mesh_import_plugin.h b/editor/io_plugins/editor_mesh_import_plugin.h
similarity index 98%
rename from tools/editor/io_plugins/editor_mesh_import_plugin.h
rename to editor/io_plugins/editor_mesh_import_plugin.h
index ba8ec581911..df374549d49 100644
--- a/tools/editor/io_plugins/editor_mesh_import_plugin.h
+++ b/editor/io_plugins/editor_mesh_import_plugin.h
@@ -30,7 +30,7 @@
 #define EDITOR_MESH_IMPORT_PLUGIN_H
 
 #if 0
-#include "tools/editor/editor_import_export.h"
+#include "editor/editor_import_export.h"
 #include "scene/resources/font.h"
 
 class EditorNode;
diff --git a/tools/editor/io_plugins/editor_sample_import_plugin.cpp b/editor/io_plugins/editor_sample_import_plugin.cpp
similarity index 99%
rename from tools/editor/io_plugins/editor_sample_import_plugin.cpp
rename to editor/io_plugins/editor_sample_import_plugin.cpp
index 631291ec1b1..d446d390277 100644
--- a/tools/editor/io_plugins/editor_sample_import_plugin.cpp
+++ b/editor/io_plugins/editor_sample_import_plugin.cpp
@@ -28,14 +28,14 @@
 /*************************************************************************/
 #include "editor_sample_import_plugin.h"
 
-#include "tools/editor/editor_file_dialog.h"
-#include "tools/editor/editor_dir_dialog.h"
-#include "tools/editor/editor_node.h"
-#include "tools/editor/property_editor.h"
+#include "editor/editor_file_dialog.h"
+#include "editor/editor_dir_dialog.h"
+#include "editor/editor_node.h"
+#include "editor/property_editor.h"
 #include "io/resource_saver.h"
 #include "os/file_access.h"
 #include "io/marshalls.h"
-#include "tools/editor/editor_settings.h"
+#include "editor/editor_settings.h"
 
 #if 0
 
diff --git a/tools/editor/io_plugins/editor_sample_import_plugin.h b/editor/io_plugins/editor_sample_import_plugin.h
similarity index 98%
rename from tools/editor/io_plugins/editor_sample_import_plugin.h
rename to editor/io_plugins/editor_sample_import_plugin.h
index 8e02d0e11db..6085043a83e 100644
--- a/tools/editor/io_plugins/editor_sample_import_plugin.h
+++ b/editor/io_plugins/editor_sample_import_plugin.h
@@ -30,7 +30,7 @@
 #define EDITOR_SAMPLE_IMPORT_PLUGIN_H
 
 #if 0
-#include "tools/editor/editor_import_export.h"
+#include "editor/editor_import_export.h"
 #include "scene/resources/font.h"
 
 class EditorNode;
diff --git a/tools/editor/io_plugins/editor_scene_import_plugin.cpp b/editor/io_plugins/editor_scene_import_plugin.cpp
similarity index 99%
rename from tools/editor/io_plugins/editor_scene_import_plugin.cpp
rename to editor/io_plugins/editor_scene_import_plugin.cpp
index 957072c20a3..963968ce474 100644
--- a/tools/editor/io_plugins/editor_scene_import_plugin.cpp
+++ b/editor/io_plugins/editor_scene_import_plugin.cpp
@@ -29,7 +29,7 @@
 #include "editor_scene_import_plugin.h"
 #if 0
 #include "global_config.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_node.h"
 #include "scene/resources/packed_scene.h"
 #include "scene/resources/box_shape.h"
 #include "os/file_access.h"
@@ -47,7 +47,7 @@
 #include <scene/resources/box_shape.h>
 #include <scene/resources/ray_shape.h>
 #include <scene/resources/plane_shape.h>
-#include "tools/editor/create_dialog.h"
+#include "editor/create_dialog.h"
 #include "os/os.h"
 
 
diff --git a/tools/editor/io_plugins/editor_scene_import_plugin.h b/editor/io_plugins/editor_scene_import_plugin.h
similarity index 97%
rename from tools/editor/io_plugins/editor_scene_import_plugin.h
rename to editor/io_plugins/editor_scene_import_plugin.h
index bbafc126bb6..2ae06936001 100644
--- a/tools/editor/io_plugins/editor_scene_import_plugin.h
+++ b/editor/io_plugins/editor_scene_import_plugin.h
@@ -39,10 +39,10 @@
 #include "scene/gui/slider.h"
 #include "scene/gui/spin_box.h"
 #include "scene/resources/mesh.h"
-#include "tools/editor/editor_file_system.h"
-#include "tools/editor/editor_dir_dialog.h"
-#include "tools/editor/editor_import_export.h"
-#include "tools/editor/io_plugins/editor_texture_import_plugin.h"
+#include "editor/editor_file_system.h"
+#include "editor/editor_dir_dialog.h"
+#include "editor/editor_import_export.h"
+#include "editor/io_plugins/editor_texture_import_plugin.h"
 #include "scene/resources/animation.h"
 
 
diff --git a/tools/editor/io_plugins/editor_scene_importer_fbxconv.cpp b/editor/io_plugins/editor_scene_importer_fbxconv.cpp
similarity index 99%
rename from tools/editor/io_plugins/editor_scene_importer_fbxconv.cpp
rename to editor/io_plugins/editor_scene_importer_fbxconv.cpp
index af12d85650e..d75a26a948c 100644
--- a/tools/editor/io_plugins/editor_scene_importer_fbxconv.cpp
+++ b/editor/io_plugins/editor_scene_importer_fbxconv.cpp
@@ -30,7 +30,7 @@
 
 #include "os/file_access.h"
 #include "os/os.h"
-#include "tools/editor/editor_settings.h"
+#include "editor/editor_settings.h"
 #include "scene/3d/mesh_instance.h"
 #include "scene/animation/animation_player.h"
 
diff --git a/tools/editor/io_plugins/editor_scene_importer_fbxconv.h b/editor/io_plugins/editor_scene_importer_fbxconv.h
similarity index 98%
rename from tools/editor/io_plugins/editor_scene_importer_fbxconv.h
rename to editor/io_plugins/editor_scene_importer_fbxconv.h
index 1bf96ba0e56..da7058ad889 100644
--- a/tools/editor/io_plugins/editor_scene_importer_fbxconv.h
+++ b/editor/io_plugins/editor_scene_importer_fbxconv.h
@@ -29,7 +29,7 @@
 #ifndef EDITOR_SCENE_IMPORTER_FBXCONV_H
 #define EDITOR_SCENE_IMPORTER_FBXCONV_H
 
-#include "tools/editor/io_plugins/editor_scene_import_plugin.h"
+#include "editor/io_plugins/editor_scene_import_plugin.h"
 #include "scene/3d/skeleton.h"
 
 #if 0
diff --git a/tools/editor/io_plugins/editor_texture_import_plugin.cpp b/editor/io_plugins/editor_texture_import_plugin.cpp
similarity index 99%
rename from tools/editor/io_plugins/editor_texture_import_plugin.cpp
rename to editor/io_plugins/editor_texture_import_plugin.cpp
index cc8d47c6a9e..8bafe806739 100644
--- a/tools/editor/io_plugins/editor_texture_import_plugin.cpp
+++ b/editor/io_plugins/editor_texture_import_plugin.cpp
@@ -29,10 +29,10 @@
 #include "editor_texture_import_plugin.h"
 #if 0
 #include "io/image_loader.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_node.h"
 #include "io/resource_saver.h"
 #include "editor_atlas.h"
-#include "tools/editor/editor_settings.h"
+#include "editor/editor_settings.h"
 #include "io/md5.h"
 #include "io/marshalls.h"
 #include "global_config.h"
diff --git a/tools/editor/io_plugins/editor_texture_import_plugin.h b/editor/io_plugins/editor_texture_import_plugin.h
similarity index 97%
rename from tools/editor/io_plugins/editor_texture_import_plugin.h
rename to editor/io_plugins/editor_texture_import_plugin.h
index ce15df0f18c..f63bc57ecd7 100644
--- a/tools/editor/io_plugins/editor_texture_import_plugin.h
+++ b/editor/io_plugins/editor_texture_import_plugin.h
@@ -35,7 +35,7 @@
 
 
 #if 0
-#include "tools/editor/editor_import_export.h"
+#include "editor/editor_import_export.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/tree.h"
 #include "scene/gui/label.h"
@@ -45,8 +45,8 @@
 #include "scene/gui/progress_bar.h"
 #include "scene/gui/slider.h"
 #include "scene/gui/spin_box.h"
-#include "tools/editor/editor_file_system.h"
-#include "tools/editor/editor_dir_dialog.h"
+#include "editor/editor_file_system.h"
+#include "editor/editor_dir_dialog.h"
 
 
 
diff --git a/tools/editor/io_plugins/editor_translation_import_plugin.cpp b/editor/io_plugins/editor_translation_import_plugin.cpp
similarity index 98%
rename from tools/editor/io_plugins/editor_translation_import_plugin.cpp
rename to editor/io_plugins/editor_translation_import_plugin.cpp
index 5ecb0b1abf6..0fd298d6d3d 100644
--- a/tools/editor/io_plugins/editor_translation_import_plugin.cpp
+++ b/editor/io_plugins/editor_translation_import_plugin.cpp
@@ -30,15 +30,15 @@
 
 #if 0
 #include "scene/gui/file_dialog.h"
-#include "tools/editor/editor_dir_dialog.h"
-#include "tools/editor/editor_node.h"
-#include "tools/editor/property_editor.h"
+#include "editor/editor_dir_dialog.h"
+#include "editor/editor_node.h"
+#include "editor/property_editor.h"
 //#include "scene/resources/sample.h"
 #include "io/resource_saver.h"
 #include "os/file_access.h"
 #include "translation.h"
 #include "compressed_translation.h"
-#include "tools/editor/project_settings.h"
+#include "editor/project_settings.h"
 
 
 class EditorTranslationImportDialog : public ConfirmationDialog {
diff --git a/tools/editor/io_plugins/editor_translation_import_plugin.h b/editor/io_plugins/editor_translation_import_plugin.h
similarity index 98%
rename from tools/editor/io_plugins/editor_translation_import_plugin.h
rename to editor/io_plugins/editor_translation_import_plugin.h
index 22065599b91..030c5bbf6f8 100644
--- a/tools/editor/io_plugins/editor_translation_import_plugin.h
+++ b/editor/io_plugins/editor_translation_import_plugin.h
@@ -29,7 +29,7 @@
 #ifndef EDITOR_TRANSLATION_IMPORT_PLUGIN_H
 #define EDITOR_TRANSLATION_IMPORT_PLUGIN_H
 
-#include "tools/editor/editor_export.h"
+#include "editor/editor_export.h"
 #include "scene/resources/font.h"
 #if 0
 class EditorNode;
diff --git a/tools/editor/multi_node_edit.cpp b/editor/multi_node_edit.cpp
similarity index 100%
rename from tools/editor/multi_node_edit.cpp
rename to editor/multi_node_edit.cpp
diff --git a/tools/editor/multi_node_edit.h b/editor/multi_node_edit.h
similarity index 100%
rename from tools/editor/multi_node_edit.h
rename to editor/multi_node_edit.h
diff --git a/tools/editor/node_dock.cpp b/editor/node_dock.cpp
similarity index 100%
rename from tools/editor/node_dock.cpp
rename to editor/node_dock.cpp
diff --git a/tools/editor/node_dock.h b/editor/node_dock.h
similarity index 100%
rename from tools/editor/node_dock.h
rename to editor/node_dock.h
diff --git a/tools/editor/output_strings.cpp b/editor/output_strings.cpp
similarity index 100%
rename from tools/editor/output_strings.cpp
rename to editor/output_strings.cpp
diff --git a/tools/editor/output_strings.h b/editor/output_strings.h
similarity index 100%
rename from tools/editor/output_strings.h
rename to editor/output_strings.h
diff --git a/tools/editor/pane_drag.cpp b/editor/pane_drag.cpp
similarity index 100%
rename from tools/editor/pane_drag.cpp
rename to editor/pane_drag.cpp
diff --git a/tools/editor/pane_drag.h b/editor/pane_drag.h
similarity index 100%
rename from tools/editor/pane_drag.h
rename to editor/pane_drag.h
diff --git a/tools/editor/plugins/SCsub b/editor/plugins/SCsub
similarity index 100%
rename from tools/editor/plugins/SCsub
rename to editor/plugins/SCsub
diff --git a/tools/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp
similarity index 99%
rename from tools/editor/plugins/animation_player_editor_plugin.cpp
rename to editor/plugins/animation_player_editor_plugin.cpp
index 71173038e96..2e6792bbaa6 100644
--- a/tools/editor/plugins/animation_player_editor_plugin.cpp
+++ b/editor/plugins/animation_player_editor_plugin.cpp
@@ -32,8 +32,8 @@
 #include "io/resource_loader.h"
 #include "io/resource_saver.h"
 #include "os/keyboard.h"
-#include "tools/editor/editor_settings.h"
-#include "tools/editor/animation_editor.h"
+#include "editor/editor_settings.h"
+#include "editor/animation_editor.h"
 
 void AnimationPlayerEditor::_node_removed(Node *p_node) {
 
diff --git a/tools/editor/plugins/animation_player_editor_plugin.h b/editor/plugins/animation_player_editor_plugin.h
similarity index 98%
rename from tools/editor/plugins/animation_player_editor_plugin.h
rename to editor/plugins/animation_player_editor_plugin.h
index e28600a7abb..d9b6ad52ff2 100644
--- a/tools/editor/plugins/animation_player_editor_plugin.h
+++ b/editor/plugins/animation_player_editor_plugin.h
@@ -29,8 +29,8 @@
 #ifndef ANIMATION_PLAYER_EDITOR_PLUGIN_H
 #define ANIMATION_PLAYER_EDITOR_PLUGIN_H
 
-#include "tools/editor/editor_plugin.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_plugin.h"
+#include "editor/editor_node.h"
 #include "scene/animation/animation_player.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/texture_button.h"
diff --git a/tools/editor/plugins/animation_tree_editor_plugin.cpp b/editor/plugins/animation_tree_editor_plugin.cpp
similarity index 100%
rename from tools/editor/plugins/animation_tree_editor_plugin.cpp
rename to editor/plugins/animation_tree_editor_plugin.cpp
diff --git a/tools/editor/plugins/animation_tree_editor_plugin.h b/editor/plugins/animation_tree_editor_plugin.h
similarity index 97%
rename from tools/editor/plugins/animation_tree_editor_plugin.h
rename to editor/plugins/animation_tree_editor_plugin.h
index 253ad1878d1..4e5fb871f19 100644
--- a/tools/editor/plugins/animation_tree_editor_plugin.h
+++ b/editor/plugins/animation_tree_editor_plugin.h
@@ -29,13 +29,13 @@
 #ifndef ANIMATION_TREE_EDITOR_PLUGIN_H
 #define ANIMATION_TREE_EDITOR_PLUGIN_H
 
-#include "tools/editor/editor_plugin.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_plugin.h"
+#include "editor/editor_node.h"
 #include "scene/animation/animation_tree_player.h"
 #include "scene/gui/tree.h"
 #include "scene/gui/button.h"
 #include "scene/gui/popup.h"
-#include "tools/editor/property_editor.h"
+#include "editor/property_editor.h"
 /**
 	@author Juan Linietsky <reduzio@gmail.com>
 */
diff --git a/tools/editor/plugins/baked_light_baker.cpp b/editor/plugins/baked_light_baker.cpp
similarity index 99%
rename from tools/editor/plugins/baked_light_baker.cpp
rename to editor/plugins/baked_light_baker.cpp
index 4219e791d18..e491fe012e5 100644
--- a/tools/editor/plugins/baked_light_baker.cpp
+++ b/editor/plugins/baked_light_baker.cpp
@@ -31,8 +31,8 @@
 #include <stdlib.h>
 #include <cmath>
 #include "io/marshalls.h"
-#include "tools/editor/editor_node.h"
-#include "tools/editor/editor_settings.h"
+#include "editor/editor_node.h"
+#include "editor/editor_settings.h"
 
 #if 0
 void baked_light_baker_add_64f(double *dst,double value);
diff --git a/tools/editor/plugins/baked_light_baker.h b/editor/plugins/baked_light_baker.h
similarity index 100%
rename from tools/editor/plugins/baked_light_baker.h
rename to editor/plugins/baked_light_baker.h
diff --git a/tools/editor/plugins/baked_light_baker_cmpxchg.cpp b/editor/plugins/baked_light_baker_cmpxchg.cpp
similarity index 100%
rename from tools/editor/plugins/baked_light_baker_cmpxchg.cpp
rename to editor/plugins/baked_light_baker_cmpxchg.cpp
diff --git a/tools/editor/plugins/baked_light_editor_plugin.cpp b/editor/plugins/baked_light_editor_plugin.cpp
similarity index 100%
rename from tools/editor/plugins/baked_light_editor_plugin.cpp
rename to editor/plugins/baked_light_editor_plugin.cpp
diff --git a/tools/editor/plugins/baked_light_editor_plugin.h b/editor/plugins/baked_light_editor_plugin.h
similarity index 96%
rename from tools/editor/plugins/baked_light_editor_plugin.h
rename to editor/plugins/baked_light_editor_plugin.h
index e311fe9f17e..a71de12bcc3 100644
--- a/tools/editor/plugins/baked_light_editor_plugin.h
+++ b/editor/plugins/baked_light_editor_plugin.h
@@ -29,9 +29,9 @@
 #ifndef BAKED_LIGHT_EDITOR_PLUGIN_H
 #define BAKED_LIGHT_EDITOR_PLUGIN_H
 
-#include "tools/editor/editor_plugin.h"
-#include "tools/editor/editor_node.h"
-#include "tools/editor/plugins/baked_light_baker.h"
+#include "editor/editor_plugin.h"
+#include "editor/editor_node.h"
+#include "editor/plugins/baked_light_baker.h"
 #include "scene/gui/spin_box.h"
 
 
diff --git a/tools/editor/plugins/camera_editor_plugin.cpp b/editor/plugins/camera_editor_plugin.cpp
similarity index 100%
rename from tools/editor/plugins/camera_editor_plugin.cpp
rename to editor/plugins/camera_editor_plugin.cpp
diff --git a/tools/editor/plugins/camera_editor_plugin.h b/editor/plugins/camera_editor_plugin.h
similarity index 97%
rename from tools/editor/plugins/camera_editor_plugin.h
rename to editor/plugins/camera_editor_plugin.h
index 7e79d0ec74a..b5817b99605 100644
--- a/tools/editor/plugins/camera_editor_plugin.h
+++ b/editor/plugins/camera_editor_plugin.h
@@ -29,8 +29,8 @@
 #ifndef CAMERA_EDITOR_PLUGIN_H
 #define CAMERA_EDITOR_PLUGIN_H
 
-#include "tools/editor/editor_plugin.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_plugin.h"
+#include "editor/editor_node.h"
 #include "scene/3d/camera.h"
 
 /**
diff --git a/tools/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp
similarity index 99%
rename from tools/editor/plugins/canvas_item_editor_plugin.cpp
rename to editor/plugins/canvas_item_editor_plugin.cpp
index 8af925db7ae..1a0791d864a 100644
--- a/tools/editor/plugins/canvas_item_editor_plugin.cpp
+++ b/editor/plugins/canvas_item_editor_plugin.cpp
@@ -29,7 +29,7 @@
 #include "canvas_item_editor_plugin.h"
 
 #include "print_string.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_node.h"
 #include "os/keyboard.h"
 #include "scene/main/viewport.h"
 #include "scene/main/canvas_layer.h"
@@ -40,13 +40,13 @@
 #include "scene/2d/screen_button.h"
 #include "global_config.h"
 #include "os/input.h"
-#include "tools/editor/editor_settings.h"
+#include "editor/editor_settings.h"
 #include "scene/gui/grid_container.h"
 #include "scene/gui/patch_9_rect.h"
-#include "tools/editor/animation_editor.h"
-#include "tools/editor/plugins/animation_player_editor_plugin.h"
-#include "tools/editor/script_editor_debugger.h"
-#include "tools/editor/plugins/script_editor_plugin.h"
+#include "editor/animation_editor.h"
+#include "editor/plugins/animation_player_editor_plugin.h"
+#include "editor/script_editor_debugger.h"
+#include "editor/plugins/script_editor_plugin.h"
 #include "scene/resources/packed_scene.h"
 
 
diff --git a/tools/editor/plugins/canvas_item_editor_plugin.h b/editor/plugins/canvas_item_editor_plugin.h
similarity index 99%
rename from tools/editor/plugins/canvas_item_editor_plugin.h
rename to editor/plugins/canvas_item_editor_plugin.h
index dac8af5ae9b..0c2dcdff3d0 100644
--- a/tools/editor/plugins/canvas_item_editor_plugin.h
+++ b/editor/plugins/canvas_item_editor_plugin.h
@@ -29,8 +29,8 @@
 #ifndef CONTROL_EDITOR_PLUGIN_H
 #define CONTROL_EDITOR_PLUGIN_H
 
-#include "tools/editor/editor_plugin.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_plugin.h"
+#include "editor/editor_node.h"
 #include "scene/gui/button_group.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/label.h"
diff --git a/tools/editor/plugins/collision_polygon_2d_editor_plugin.cpp b/editor/plugins/collision_polygon_2d_editor_plugin.cpp
similarity index 99%
rename from tools/editor/plugins/collision_polygon_2d_editor_plugin.cpp
rename to editor/plugins/collision_polygon_2d_editor_plugin.cpp
index 1149cdcfe1f..5a45267c85a 100644
--- a/tools/editor/plugins/collision_polygon_2d_editor_plugin.cpp
+++ b/editor/plugins/collision_polygon_2d_editor_plugin.cpp
@@ -30,7 +30,7 @@
 
 #include "canvas_item_editor_plugin.h"
 #include "os/file_access.h"
-#include "tools/editor/editor_settings.h"
+#include "editor/editor_settings.h"
 
 
 void CollisionPolygon2DEditor::_notification(int p_what) {
diff --git a/tools/editor/plugins/collision_polygon_2d_editor_plugin.h b/editor/plugins/collision_polygon_2d_editor_plugin.h
similarity index 98%
rename from tools/editor/plugins/collision_polygon_2d_editor_plugin.h
rename to editor/plugins/collision_polygon_2d_editor_plugin.h
index 2c573c1dcf7..796328753d5 100644
--- a/tools/editor/plugins/collision_polygon_2d_editor_plugin.h
+++ b/editor/plugins/collision_polygon_2d_editor_plugin.h
@@ -30,8 +30,8 @@
 #define COLLISION_POLYGON_2D_EDITOR_PLUGIN_H
 
 
-#include "tools/editor/editor_plugin.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_plugin.h"
+#include "editor/editor_node.h"
 #include "scene/2d/collision_polygon_2d.h"
 #include "scene/gui/tool_button.h"
 #include "scene/gui/button_group.h"
diff --git a/tools/editor/plugins/collision_polygon_editor_plugin.cpp b/editor/plugins/collision_polygon_editor_plugin.cpp
similarity index 99%
rename from tools/editor/plugins/collision_polygon_editor_plugin.cpp
rename to editor/plugins/collision_polygon_editor_plugin.cpp
index 406c12b00a6..3aad53b4208 100644
--- a/tools/editor/plugins/collision_polygon_editor_plugin.cpp
+++ b/editor/plugins/collision_polygon_editor_plugin.cpp
@@ -30,7 +30,7 @@
 
 #include "spatial_editor_plugin.h"
 #include "os/file_access.h"
-#include "tools/editor/editor_settings.h"
+#include "editor/editor_settings.h"
 #include "scene/3d/camera.h"
 #include "canvas_item_editor_plugin.h"
 
diff --git a/tools/editor/plugins/collision_polygon_editor_plugin.h b/editor/plugins/collision_polygon_editor_plugin.h
similarity index 98%
rename from tools/editor/plugins/collision_polygon_editor_plugin.h
rename to editor/plugins/collision_polygon_editor_plugin.h
index cd722048dbb..aaad2174fed 100644
--- a/tools/editor/plugins/collision_polygon_editor_plugin.h
+++ b/editor/plugins/collision_polygon_editor_plugin.h
@@ -29,8 +29,8 @@
 #ifndef COLLISION_POLYGON_EDITOR_PLUGIN_H
 #define COLLISION_POLYGON_EDITOR_PLUGIN_H
 
-#include "tools/editor/editor_plugin.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_plugin.h"
+#include "editor/editor_node.h"
 #include "scene/3d/collision_polygon.h"
 #include "scene/3d/immediate_geometry.h"
 #include "scene/3d/mesh_instance.h"
diff --git a/tools/editor/plugins/collision_shape_2d_editor_plugin.cpp b/editor/plugins/collision_shape_2d_editor_plugin.cpp
similarity index 100%
rename from tools/editor/plugins/collision_shape_2d_editor_plugin.cpp
rename to editor/plugins/collision_shape_2d_editor_plugin.cpp
diff --git a/tools/editor/plugins/collision_shape_2d_editor_plugin.h b/editor/plugins/collision_shape_2d_editor_plugin.h
similarity index 98%
rename from tools/editor/plugins/collision_shape_2d_editor_plugin.h
rename to editor/plugins/collision_shape_2d_editor_plugin.h
index 37708db5e0c..f7e6da8b4ef 100644
--- a/tools/editor/plugins/collision_shape_2d_editor_plugin.h
+++ b/editor/plugins/collision_shape_2d_editor_plugin.h
@@ -29,8 +29,8 @@
 #ifndef COLLISION_SHAPE_2D_EDITOR_PLUGIN_H
 #define COLLISION_SHAPE_2D_EDITOR_PLUGIN_H
 
-#include "tools/editor/editor_plugin.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_plugin.h"
+#include "editor/editor_node.h"
 
 #include "scene/2d/collision_shape_2d.h"
 
diff --git a/tools/editor/plugins/color_ramp_editor_plugin.cpp b/editor/plugins/color_ramp_editor_plugin.cpp
similarity index 100%
rename from tools/editor/plugins/color_ramp_editor_plugin.cpp
rename to editor/plugins/color_ramp_editor_plugin.cpp
diff --git a/tools/editor/plugins/color_ramp_editor_plugin.h b/editor/plugins/color_ramp_editor_plugin.h
similarity index 97%
rename from tools/editor/plugins/color_ramp_editor_plugin.h
rename to editor/plugins/color_ramp_editor_plugin.h
index 2f55ad65f13..0323bd7a46c 100644
--- a/tools/editor/plugins/color_ramp_editor_plugin.h
+++ b/editor/plugins/color_ramp_editor_plugin.h
@@ -29,8 +29,8 @@
 #ifndef TOOLS_EDITOR_PLUGINS_COLOR_RAMP_EDITOR_PLUGIN_H_
 #define TOOLS_EDITOR_PLUGINS_COLOR_RAMP_EDITOR_PLUGIN_H_
 
-#include "tools/editor/editor_plugin.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_plugin.h"
+#include "editor/editor_node.h"
 #include "scene/gui/color_ramp_edit.h"
 
 class ColorRampEditorPlugin : public EditorPlugin {
diff --git a/tools/editor/plugins/cube_grid_theme_editor_plugin.cpp b/editor/plugins/cube_grid_theme_editor_plugin.cpp
similarity index 99%
rename from tools/editor/plugins/cube_grid_theme_editor_plugin.cpp
rename to editor/plugins/cube_grid_theme_editor_plugin.cpp
index 563b8298eba..b8abd2e9cc8 100644
--- a/tools/editor/plugins/cube_grid_theme_editor_plugin.cpp
+++ b/editor/plugins/cube_grid_theme_editor_plugin.cpp
@@ -33,9 +33,9 @@
 #include "scene/3d/physics_body.h"
 #include "scene/main/viewport.h"
 #include "scene/resources/packed_scene.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_node.h"
 #include "main/main.h"
-#include "tools/editor/editor_settings.h"
+#include "editor/editor_settings.h"
 #include "scene/3d/navigation_mesh.h"
 
 void MeshLibraryEditor::edit(const Ref<MeshLibrary>& p_theme) {
diff --git a/tools/editor/plugins/cube_grid_theme_editor_plugin.h b/editor/plugins/cube_grid_theme_editor_plugin.h
similarity index 98%
rename from tools/editor/plugins/cube_grid_theme_editor_plugin.h
rename to editor/plugins/cube_grid_theme_editor_plugin.h
index f32f601023f..07e7c7caddc 100644
--- a/tools/editor/plugins/cube_grid_theme_editor_plugin.h
+++ b/editor/plugins/cube_grid_theme_editor_plugin.h
@@ -30,7 +30,7 @@
 #define CUBE_GRID_THEME_EDITOR_PLUGIN_H
 
 #include "scene/resources/mesh_library.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_node.h"
 
 #if 0
 class MeshLibraryEditor : public Control {
diff --git a/tools/editor/plugins/editor_preview_plugins.cpp b/editor/plugins/editor_preview_plugins.cpp
similarity index 99%
rename from tools/editor/plugins/editor_preview_plugins.cpp
rename to editor/plugins/editor_preview_plugins.cpp
index 5d9b2818742..3f31f1e0f17 100644
--- a/tools/editor/plugins/editor_preview_plugins.cpp
+++ b/editor/plugins/editor_preview_plugins.cpp
@@ -29,14 +29,14 @@
 #include "editor_preview_plugins.h"
 
 #include "io/resource_loader.h"
-#include "tools/editor/editor_settings.h"
+#include "editor/editor_settings.h"
 #include "io/file_access_memory.h"
 #include "os/os.h"
 #include "scene/resources/material.h"
 //#include "scene/resources/sample.h"
 #include "scene/resources/mesh.h"
 #include "scene/resources/bit_mask.h"
-#include "tools/editor/editor_scale.h"
+#include "editor/editor_scale.h"
 
 #if 0
 bool EditorTexturePreviewPlugin::handles(const String& p_type) const {
diff --git a/tools/editor/plugins/editor_preview_plugins.h b/editor/plugins/editor_preview_plugins.h
similarity index 98%
rename from tools/editor/plugins/editor_preview_plugins.h
rename to editor/plugins/editor_preview_plugins.h
index 078e4cf8b5d..b1d4fa0b386 100644
--- a/tools/editor/plugins/editor_preview_plugins.h
+++ b/editor/plugins/editor_preview_plugins.h
@@ -29,7 +29,7 @@
 #ifndef EDITORPREVIEWPLUGINS_H
 #define EDITORPREVIEWPLUGINS_H
 
-#include "tools/editor/editor_resource_preview.h"
+#include "editor/editor_resource_preview.h"
 
 #if 0
 class EditorTexturePreviewPlugin : public EditorResourcePreviewGenerator {
diff --git a/tools/editor/plugins/gi_probe_editor_plugin.cpp b/editor/plugins/gi_probe_editor_plugin.cpp
similarity index 100%
rename from tools/editor/plugins/gi_probe_editor_plugin.cpp
rename to editor/plugins/gi_probe_editor_plugin.cpp
diff --git a/tools/editor/plugins/gi_probe_editor_plugin.h b/editor/plugins/gi_probe_editor_plugin.h
similarity index 97%
rename from tools/editor/plugins/gi_probe_editor_plugin.h
rename to editor/plugins/gi_probe_editor_plugin.h
index 35e0b93aaed..982a549368c 100644
--- a/tools/editor/plugins/gi_probe_editor_plugin.h
+++ b/editor/plugins/gi_probe_editor_plugin.h
@@ -29,8 +29,8 @@
 #ifndef GIPROBEEDITORPLUGIN_H
 #define GIPROBEEDITORPLUGIN_H
 
-#include "tools/editor/editor_plugin.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_plugin.h"
+#include "editor/editor_node.h"
 #include "scene/resources/material.h"
 #include "scene/3d/gi_probe.h"
 
diff --git a/tools/editor/plugins/item_list_editor_plugin.cpp b/editor/plugins/item_list_editor_plugin.cpp
similarity index 100%
rename from tools/editor/plugins/item_list_editor_plugin.cpp
rename to editor/plugins/item_list_editor_plugin.cpp
diff --git a/tools/editor/plugins/item_list_editor_plugin.h b/editor/plugins/item_list_editor_plugin.h
similarity index 99%
rename from tools/editor/plugins/item_list_editor_plugin.h
rename to editor/plugins/item_list_editor_plugin.h
index 74700d615e5..25d6ed6757d 100644
--- a/tools/editor/plugins/item_list_editor_plugin.h
+++ b/editor/plugins/item_list_editor_plugin.h
@@ -29,8 +29,8 @@
 #ifndef ITEM_LIST_EDITOR_PLUGIN_H
 #define ITEM_LIST_EDITOR_PLUGIN_H
 
-#include "tools/editor/editor_plugin.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_plugin.h"
+#include "editor/editor_node.h"
 #include "canvas_item_editor_plugin.h"
 
 #include "scene/gui/option_button.h"
diff --git a/tools/editor/plugins/light_occluder_2d_editor_plugin.cpp b/editor/plugins/light_occluder_2d_editor_plugin.cpp
similarity index 99%
rename from tools/editor/plugins/light_occluder_2d_editor_plugin.cpp
rename to editor/plugins/light_occluder_2d_editor_plugin.cpp
index cc8bb63d780..be9e52e2410 100644
--- a/tools/editor/plugins/light_occluder_2d_editor_plugin.cpp
+++ b/editor/plugins/light_occluder_2d_editor_plugin.cpp
@@ -30,7 +30,7 @@
 
 #include "canvas_item_editor_plugin.h"
 #include "os/file_access.h"
-#include "tools/editor/editor_settings.h"
+#include "editor/editor_settings.h"
 
 void LightOccluder2DEditor::_notification(int p_what) {
 
diff --git a/tools/editor/plugins/light_occluder_2d_editor_plugin.h b/editor/plugins/light_occluder_2d_editor_plugin.h
similarity index 98%
rename from tools/editor/plugins/light_occluder_2d_editor_plugin.h
rename to editor/plugins/light_occluder_2d_editor_plugin.h
index 431c01fe754..1f1c6e86eb1 100644
--- a/tools/editor/plugins/light_occluder_2d_editor_plugin.h
+++ b/editor/plugins/light_occluder_2d_editor_plugin.h
@@ -31,8 +31,8 @@
 
 
 
-#include "tools/editor/editor_plugin.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_plugin.h"
+#include "editor/editor_node.h"
 #include "scene/2d/light_occluder_2d.h"
 #include "scene/gui/tool_button.h"
 #include "scene/gui/button_group.h"
diff --git a/tools/editor/plugins/line_2d_editor_plugin.cpp b/editor/plugins/line_2d_editor_plugin.cpp
similarity index 99%
rename from tools/editor/plugins/line_2d_editor_plugin.cpp
rename to editor/plugins/line_2d_editor_plugin.cpp
index c90d1c47544..d00165d3fff 100644
--- a/tools/editor/plugins/line_2d_editor_plugin.cpp
+++ b/editor/plugins/line_2d_editor_plugin.cpp
@@ -2,7 +2,7 @@
 
 #include "canvas_item_editor_plugin.h"
 #include "os/file_access.h"
-#include "tools/editor/editor_settings.h"
+#include "editor/editor_settings.h"
 #include "os/keyboard.h"
 
 
diff --git a/tools/editor/plugins/line_2d_editor_plugin.h b/editor/plugins/line_2d_editor_plugin.h
similarity index 95%
rename from tools/editor/plugins/line_2d_editor_plugin.h
rename to editor/plugins/line_2d_editor_plugin.h
index 231f4c6ca7c..8c6aed1d2d6 100644
--- a/tools/editor/plugins/line_2d_editor_plugin.h
+++ b/editor/plugins/line_2d_editor_plugin.h
@@ -1,8 +1,8 @@
 #ifndef LINE_2D_EDITOR_PLUGIN_H
 #define LINE_2D_EDITOR_PLUGIN_H
 
-#include "tools/editor/editor_plugin.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_plugin.h"
+#include "editor/editor_node.h"
 #include "scene/2d/path_2d.h"
 #include "scene/gui/tool_button.h"
 #include "scene/gui/button_group.h"
diff --git a/tools/editor/plugins/material_editor_plugin.cpp b/editor/plugins/material_editor_plugin.cpp
similarity index 100%
rename from tools/editor/plugins/material_editor_plugin.cpp
rename to editor/plugins/material_editor_plugin.cpp
diff --git a/tools/editor/plugins/material_editor_plugin.h b/editor/plugins/material_editor_plugin.h
similarity index 97%
rename from tools/editor/plugins/material_editor_plugin.h
rename to editor/plugins/material_editor_plugin.h
index 5daae124e00..604e7e61bdb 100644
--- a/tools/editor/plugins/material_editor_plugin.h
+++ b/editor/plugins/material_editor_plugin.h
@@ -29,8 +29,8 @@
 #ifndef MATERIAL_EDITOR_PLUGIN_H
 #define MATERIAL_EDITOR_PLUGIN_H
 
-#include "tools/editor/editor_plugin.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_plugin.h"
+#include "editor/editor_node.h"
 #include "scene/resources/material.h"
 #include "scene/3d/light.h"
 #include "scene/3d/mesh_instance.h"
diff --git a/tools/editor/plugins/mesh_editor_plugin.cpp b/editor/plugins/mesh_editor_plugin.cpp
similarity index 100%
rename from tools/editor/plugins/mesh_editor_plugin.cpp
rename to editor/plugins/mesh_editor_plugin.cpp
diff --git a/tools/editor/plugins/mesh_editor_plugin.h b/editor/plugins/mesh_editor_plugin.h
similarity index 97%
rename from tools/editor/plugins/mesh_editor_plugin.h
rename to editor/plugins/mesh_editor_plugin.h
index 136290ffd48..80504ae445b 100644
--- a/tools/editor/plugins/mesh_editor_plugin.h
+++ b/editor/plugins/mesh_editor_plugin.h
@@ -31,8 +31,8 @@
 
 #if 0
 
-#include "tools/editor/editor_plugin.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_plugin.h"
+#include "editor/editor_node.h"
 #include "scene/resources/material.h"
 #include "scene/3d/light.h"
 #include "scene/3d/mesh_instance.h"
diff --git a/tools/editor/plugins/mesh_instance_editor_plugin.cpp b/editor/plugins/mesh_instance_editor_plugin.cpp
similarity index 100%
rename from tools/editor/plugins/mesh_instance_editor_plugin.cpp
rename to editor/plugins/mesh_instance_editor_plugin.cpp
diff --git a/tools/editor/plugins/mesh_instance_editor_plugin.h b/editor/plugins/mesh_instance_editor_plugin.h
similarity index 97%
rename from tools/editor/plugins/mesh_instance_editor_plugin.h
rename to editor/plugins/mesh_instance_editor_plugin.h
index 441d4d1d3f8..de5be2fbbba 100644
--- a/tools/editor/plugins/mesh_instance_editor_plugin.h
+++ b/editor/plugins/mesh_instance_editor_plugin.h
@@ -30,8 +30,8 @@
 #define MESH_INSTANCE_EDITOR_PLUGIN_H
 
 
-#include "tools/editor/editor_plugin.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_plugin.h"
+#include "editor/editor_node.h"
 #include "scene/3d/mesh_instance.h"
 #include "scene/gui/spin_box.h"
 
diff --git a/tools/editor/plugins/multimesh_editor_plugin.cpp b/editor/plugins/multimesh_editor_plugin.cpp
similarity index 100%
rename from tools/editor/plugins/multimesh_editor_plugin.cpp
rename to editor/plugins/multimesh_editor_plugin.cpp
diff --git a/tools/editor/plugins/multimesh_editor_plugin.h b/editor/plugins/multimesh_editor_plugin.h
similarity index 97%
rename from tools/editor/plugins/multimesh_editor_plugin.h
rename to editor/plugins/multimesh_editor_plugin.h
index e3228502388..a97b3758a15 100644
--- a/tools/editor/plugins/multimesh_editor_plugin.h
+++ b/editor/plugins/multimesh_editor_plugin.h
@@ -29,8 +29,8 @@
 #ifndef MULTIMESH_EDITOR_PLUGIN_H
 #define MULTIMESH_EDITOR_PLUGIN_H
 
-#include "tools/editor/editor_plugin.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_plugin.h"
+#include "editor/editor_node.h"
 #include "scene/3d/multimesh_instance.h"
 #include "scene/gui/spin_box.h"
 
diff --git a/tools/editor/plugins/navigation_polygon_editor_plugin.cpp b/editor/plugins/navigation_polygon_editor_plugin.cpp
similarity index 99%
rename from tools/editor/plugins/navigation_polygon_editor_plugin.cpp
rename to editor/plugins/navigation_polygon_editor_plugin.cpp
index dfc9b2d6e23..654afb754e1 100644
--- a/tools/editor/plugins/navigation_polygon_editor_plugin.cpp
+++ b/editor/plugins/navigation_polygon_editor_plugin.cpp
@@ -30,7 +30,7 @@
 
 #include "canvas_item_editor_plugin.h"
 #include "os/file_access.h"
-#include "tools/editor/editor_settings.h"
+#include "editor/editor_settings.h"
 
 void NavigationPolygonEditor::_notification(int p_what) {
 
diff --git a/tools/editor/plugins/navigation_polygon_editor_plugin.h b/editor/plugins/navigation_polygon_editor_plugin.h
similarity index 98%
rename from tools/editor/plugins/navigation_polygon_editor_plugin.h
rename to editor/plugins/navigation_polygon_editor_plugin.h
index 50df4df7441..0d5e67e3524 100644
--- a/tools/editor/plugins/navigation_polygon_editor_plugin.h
+++ b/editor/plugins/navigation_polygon_editor_plugin.h
@@ -31,8 +31,8 @@
 
 
 
-#include "tools/editor/editor_plugin.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_plugin.h"
+#include "editor/editor_node.h"
 #include "scene/2d/navigation_polygon.h"
 #include "scene/gui/tool_button.h"
 #include "scene/gui/button_group.h"
diff --git a/tools/editor/plugins/particles_2d_editor_plugin.cpp b/editor/plugins/particles_2d_editor_plugin.cpp
similarity index 100%
rename from tools/editor/plugins/particles_2d_editor_plugin.cpp
rename to editor/plugins/particles_2d_editor_plugin.cpp
diff --git a/tools/editor/plugins/particles_2d_editor_plugin.h b/editor/plugins/particles_2d_editor_plugin.h
similarity index 97%
rename from tools/editor/plugins/particles_2d_editor_plugin.h
rename to editor/plugins/particles_2d_editor_plugin.h
index c532a5fe734..ea71c739f38 100644
--- a/tools/editor/plugins/particles_2d_editor_plugin.h
+++ b/editor/plugins/particles_2d_editor_plugin.h
@@ -29,8 +29,8 @@
 #ifndef PARTICLES_2D_EDITOR_PLUGIN_H
 #define PARTICLES_2D_EDITOR_PLUGIN_H
 
-#include "tools/editor/editor_plugin.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_plugin.h"
+#include "editor/editor_node.h"
 #include "scene/2d/collision_polygon_2d.h"
 
 #include "scene/gui/box_container.h"
diff --git a/tools/editor/plugins/particles_editor_plugin.cpp b/editor/plugins/particles_editor_plugin.cpp
similarity index 99%
rename from tools/editor/plugins/particles_editor_plugin.cpp
rename to editor/plugins/particles_editor_plugin.cpp
index fd5ec5b5b9d..4ce1f5eb546 100644
--- a/tools/editor/plugins/particles_editor_plugin.cpp
+++ b/editor/plugins/particles_editor_plugin.cpp
@@ -31,7 +31,7 @@
 #include "particles_editor_plugin.h"
 #include "io/resource_loader.h"
 #include "servers/visual/particle_system_sw.h"
-#include "tools/editor/plugins/spatial_editor_plugin.h"
+#include "editor/plugins/spatial_editor_plugin.h"
 
 
 void ParticlesEditor::_node_removed(Node *p_node) {
diff --git a/tools/editor/plugins/particles_editor_plugin.h b/editor/plugins/particles_editor_plugin.h
similarity index 98%
rename from tools/editor/plugins/particles_editor_plugin.h
rename to editor/plugins/particles_editor_plugin.h
index c32fbe5ada6..06134ddef25 100644
--- a/tools/editor/plugins/particles_editor_plugin.h
+++ b/editor/plugins/particles_editor_plugin.h
@@ -29,8 +29,8 @@
 #ifndef PARTICLES_EDITOR_PLUGIN_H
 #define PARTICLES_EDITOR_PLUGIN_H
 
-#include "tools/editor/editor_plugin.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_plugin.h"
+#include "editor/editor_node.h"
 #include "scene/3d/particles.h"
 #include "scene/gui/spin_box.h"
 
diff --git a/tools/editor/plugins/path_2d_editor_plugin.cpp b/editor/plugins/path_2d_editor_plugin.cpp
similarity index 99%
rename from tools/editor/plugins/path_2d_editor_plugin.cpp
rename to editor/plugins/path_2d_editor_plugin.cpp
index 88dded72ae2..00b026e25bc 100644
--- a/tools/editor/plugins/path_2d_editor_plugin.cpp
+++ b/editor/plugins/path_2d_editor_plugin.cpp
@@ -30,7 +30,7 @@
 
 #include "canvas_item_editor_plugin.h"
 #include "os/file_access.h"
-#include "tools/editor/editor_settings.h"
+#include "editor/editor_settings.h"
 #include "os/keyboard.h"
 void Path2DEditor::_notification(int p_what) {
 
diff --git a/tools/editor/plugins/path_2d_editor_plugin.h b/editor/plugins/path_2d_editor_plugin.h
similarity index 98%
rename from tools/editor/plugins/path_2d_editor_plugin.h
rename to editor/plugins/path_2d_editor_plugin.h
index aa940e4edfc..89f42d94ccb 100644
--- a/tools/editor/plugins/path_2d_editor_plugin.h
+++ b/editor/plugins/path_2d_editor_plugin.h
@@ -29,8 +29,8 @@
 #ifndef PATH_2D_EDITOR_PLUGIN_H
 #define PATH_2D_EDITOR_PLUGIN_H
 
-#include "tools/editor/editor_plugin.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_plugin.h"
+#include "editor/editor_node.h"
 #include "scene/2d/path_2d.h"
 #include "scene/gui/tool_button.h"
 #include "scene/gui/button_group.h"
diff --git a/tools/editor/plugins/path_editor_plugin.cpp b/editor/plugins/path_editor_plugin.cpp
similarity index 100%
rename from tools/editor/plugins/path_editor_plugin.cpp
rename to editor/plugins/path_editor_plugin.cpp
diff --git a/tools/editor/plugins/path_editor_plugin.h b/editor/plugins/path_editor_plugin.h
similarity index 98%
rename from tools/editor/plugins/path_editor_plugin.h
rename to editor/plugins/path_editor_plugin.h
index 79e978dc1dd..fe1c5ad1597 100644
--- a/tools/editor/plugins/path_editor_plugin.h
+++ b/editor/plugins/path_editor_plugin.h
@@ -30,7 +30,7 @@
 #define PATH_EDITOR_PLUGIN_H
 
 
-#include "tools/editor/spatial_editor_gizmos.h"
+#include "editor/spatial_editor_gizmos.h"
 #include "scene/3d/path.h"
 # if 0
 class PathSpatialGizmo  : public EditorSpatialGizmo {
diff --git a/tools/editor/plugins/polygon_2d_editor_plugin.cpp b/editor/plugins/polygon_2d_editor_plugin.cpp
similarity index 99%
rename from tools/editor/plugins/polygon_2d_editor_plugin.cpp
rename to editor/plugins/polygon_2d_editor_plugin.cpp
index efb3e6c4bca..3a41b2cb6b3 100644
--- a/tools/editor/plugins/polygon_2d_editor_plugin.cpp
+++ b/editor/plugins/polygon_2d_editor_plugin.cpp
@@ -30,7 +30,7 @@
 
 #include "canvas_item_editor_plugin.h"
 #include "os/file_access.h"
-#include "tools/editor/editor_settings.h"
+#include "editor/editor_settings.h"
 #include "os/keyboard.h"
 #include "os/input.h"
 
diff --git a/tools/editor/plugins/polygon_2d_editor_plugin.h b/editor/plugins/polygon_2d_editor_plugin.h
similarity index 98%
rename from tools/editor/plugins/polygon_2d_editor_plugin.h
rename to editor/plugins/polygon_2d_editor_plugin.h
index 6011ee1f874..c994867705b 100644
--- a/tools/editor/plugins/polygon_2d_editor_plugin.h
+++ b/editor/plugins/polygon_2d_editor_plugin.h
@@ -29,8 +29,8 @@
 #ifndef POLYGON_2D_EDITOR_PLUGIN_H
 #define POLYGON_2D_EDITOR_PLUGIN_H
 
-#include "tools/editor/editor_plugin.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_plugin.h"
+#include "editor/editor_node.h"
 #include "scene/2d/polygon_2d.h"
 #include "scene/gui/tool_button.h"
 #include "scene/gui/button_group.h"
diff --git a/tools/editor/plugins/resource_preloader_editor_plugin.cpp b/editor/plugins/resource_preloader_editor_plugin.cpp
similarity index 99%
rename from tools/editor/plugins/resource_preloader_editor_plugin.cpp
rename to editor/plugins/resource_preloader_editor_plugin.cpp
index de2245d98fd..e876fa55c68 100644
--- a/tools/editor/plugins/resource_preloader_editor_plugin.cpp
+++ b/editor/plugins/resource_preloader_editor_plugin.cpp
@@ -30,7 +30,7 @@
 
 #include "io/resource_loader.h"
 #include "global_config.h"
-#include "tools/editor/editor_settings.h"
+#include "editor/editor_settings.h"
 
 
 void ResourcePreloaderEditor::_gui_input(InputEvent p_event) {
diff --git a/tools/editor/plugins/resource_preloader_editor_plugin.h b/editor/plugins/resource_preloader_editor_plugin.h
similarity index 98%
rename from tools/editor/plugins/resource_preloader_editor_plugin.h
rename to editor/plugins/resource_preloader_editor_plugin.h
index 6990301ded7..54ccad4341c 100644
--- a/tools/editor/plugins/resource_preloader_editor_plugin.h
+++ b/editor/plugins/resource_preloader_editor_plugin.h
@@ -30,8 +30,8 @@
 #define RESOURCE_PRELOADER_EDITOR_PLUGIN_H
 
 
-#include "tools/editor/editor_plugin.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_plugin.h"
+#include "editor/editor_node.h"
 #include "scene/gui/tree.h"
 #include "scene/main/resource_preloader.h"
 #include "scene/gui/file_dialog.h"
diff --git a/tools/editor/plugins/rich_text_editor_plugin.cpp b/editor/plugins/rich_text_editor_plugin.cpp
similarity index 100%
rename from tools/editor/plugins/rich_text_editor_plugin.cpp
rename to editor/plugins/rich_text_editor_plugin.cpp
diff --git a/tools/editor/plugins/rich_text_editor_plugin.h b/editor/plugins/rich_text_editor_plugin.h
similarity index 97%
rename from tools/editor/plugins/rich_text_editor_plugin.h
rename to editor/plugins/rich_text_editor_plugin.h
index cf97d7517cc..c7f95fb479a 100644
--- a/tools/editor/plugins/rich_text_editor_plugin.h
+++ b/editor/plugins/rich_text_editor_plugin.h
@@ -29,8 +29,8 @@
 #ifndef RICH_TEXT_EDITOR_PLUGIN_H
 #define RICH_TEXT_EDITOR_PLUGIN_H
 
-#include "tools/editor/editor_plugin.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_plugin.h"
+#include "editor/editor_node.h"
 #include "scene/gui/rich_text_label.h"
 #include "scene/gui/file_dialog.h"
 
diff --git a/tools/editor/plugins/sample_editor_plugin.cpp b/editor/plugins/sample_editor_plugin.cpp
similarity index 99%
rename from tools/editor/plugins/sample_editor_plugin.cpp
rename to editor/plugins/sample_editor_plugin.cpp
index 94450957716..b6b96c946ef 100644
--- a/tools/editor/plugins/sample_editor_plugin.cpp
+++ b/editor/plugins/sample_editor_plugin.cpp
@@ -31,7 +31,7 @@
 #if 0
 #include "io/resource_loader.h"
 #include "global_config.h"
-#include "tools/editor/editor_settings.h"
+#include "editor/editor_settings.h"
 
 
 
diff --git a/tools/editor/plugins/sample_editor_plugin.h b/editor/plugins/sample_editor_plugin.h
similarity index 97%
rename from tools/editor/plugins/sample_editor_plugin.h
rename to editor/plugins/sample_editor_plugin.h
index 651cd14a843..dae9cef9f48 100644
--- a/tools/editor/plugins/sample_editor_plugin.h
+++ b/editor/plugins/sample_editor_plugin.h
@@ -30,8 +30,8 @@
 #define SAMPLE_EDITOR_PLUGIN_H
 
 #if 0
-#include "tools/editor/editor_plugin.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_plugin.h"
+#include "editor/editor_node.h"
 #include "scene/audio/sample_player.h"
 #include "scene/resources/sample.h"
 #include "scene/resources/sample_library.h"
diff --git a/tools/editor/plugins/sample_library_editor_plugin.cpp b/editor/plugins/sample_library_editor_plugin.cpp
similarity index 99%
rename from tools/editor/plugins/sample_library_editor_plugin.cpp
rename to editor/plugins/sample_library_editor_plugin.cpp
index b996cafd1f8..4ead1d2709e 100644
--- a/tools/editor/plugins/sample_library_editor_plugin.cpp
+++ b/editor/plugins/sample_library_editor_plugin.cpp
@@ -32,7 +32,7 @@
 
 #include "io/resource_loader.h"
 #include "global_config.h"
-#include "tools/editor/editor_settings.h"
+#include "editor/editor_settings.h"
 #include "scene/main/viewport.h"
 #include "sample_editor_plugin.h"
 
diff --git a/tools/editor/plugins/sample_library_editor_plugin.h b/editor/plugins/sample_library_editor_plugin.h
similarity index 98%
rename from tools/editor/plugins/sample_library_editor_plugin.h
rename to editor/plugins/sample_library_editor_plugin.h
index 35028df8592..4bbc29b1479 100644
--- a/tools/editor/plugins/sample_library_editor_plugin.h
+++ b/editor/plugins/sample_library_editor_plugin.h
@@ -31,8 +31,8 @@
 
 
 #if 0
-#include "tools/editor/editor_plugin.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_plugin.h"
+#include "editor/editor_node.h"
 #include "scene/audio/sample_player.h"
 #include "scene/resources/sample.h"
 #include "scene/gui/tree.h"
diff --git a/tools/editor/plugins/sample_player_editor_plugin.cpp b/editor/plugins/sample_player_editor_plugin.cpp
similarity index 100%
rename from tools/editor/plugins/sample_player_editor_plugin.cpp
rename to editor/plugins/sample_player_editor_plugin.cpp
diff --git a/tools/editor/plugins/sample_player_editor_plugin.h b/editor/plugins/sample_player_editor_plugin.h
similarity index 97%
rename from tools/editor/plugins/sample_player_editor_plugin.h
rename to editor/plugins/sample_player_editor_plugin.h
index ba1684497cf..c1d599540a4 100644
--- a/tools/editor/plugins/sample_player_editor_plugin.h
+++ b/editor/plugins/sample_player_editor_plugin.h
@@ -31,8 +31,8 @@
 
 #if 0
 
-#include "tools/editor/editor_plugin.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_plugin.h"
+#include "editor/editor_node.h"
 #include "scene/3d/spatial_sample_player.h"
 #include "scene/gui/option_button.h"
 #include "scene/audio/sample_player.h"
diff --git a/tools/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp
similarity index 99%
rename from tools/editor/plugins/script_editor_plugin.cpp
rename to editor/plugins/script_editor_plugin.cpp
index c7639dd4d35..3631d39f9ad 100644
--- a/tools/editor/plugins/script_editor_plugin.cpp
+++ b/editor/plugins/script_editor_plugin.cpp
@@ -28,13 +28,13 @@
 /*************************************************************************/
 #include "script_editor_plugin.h"
 
-#include "tools/editor/editor_settings.h"
+#include "editor/editor_settings.h"
 #include "io/resource_loader.h"
 #include "io/resource_saver.h"
 #include "os/keyboard.h"
 #include "os/os.h"
-#include "tools/editor/editor_node.h"
-#include "tools/editor/script_editor_debugger.h"
+#include "editor/editor_node.h"
+#include "editor/script_editor_debugger.h"
 #include "global_config.h"
 #include "os/file_access.h"
 #include "scene/main/viewport.h"
diff --git a/tools/editor/plugins/script_editor_plugin.h b/editor/plugins/script_editor_plugin.h
similarity index 98%
rename from tools/editor/plugins/script_editor_plugin.h
rename to editor/plugins/script_editor_plugin.h
index 75099fc5ec6..bf5316363c1 100644
--- a/tools/editor/plugins/script_editor_plugin.h
+++ b/editor/plugins/script_editor_plugin.h
@@ -29,8 +29,8 @@
 #ifndef SCRIPT_EDITOR_PLUGIN_H
 #define SCRIPT_EDITOR_PLUGIN_H
 
-#include "tools/editor/editor_plugin.h"
-#include "tools/editor/script_create_dialog.h"
+#include "editor/editor_plugin.h"
+#include "editor/script_create_dialog.h"
 #include "scene/gui/tab_container.h"
 #include "scene/gui/text_edit.h"
 #include "scene/gui/menu_button.h"
@@ -38,10 +38,10 @@
 #include "scene/gui/tree.h"
 #include "scene/main/timer.h"
 #include "script_language.h"
-#include "tools/editor/code_editor.h"
+#include "editor/code_editor.h"
 #include "scene/gui/split_container.h"
 #include "scene/gui/item_list.h"
-#include "tools/editor/editor_help.h"
+#include "editor/editor_help.h"
 
 class ScriptEditorQuickOpen : public ConfirmationDialog {
 
diff --git a/tools/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp
similarity index 99%
rename from tools/editor/plugins/script_text_editor.cpp
rename to editor/plugins/script_text_editor.cpp
index 9ec6266419d..8723a863f06 100644
--- a/tools/editor/plugins/script_text_editor.cpp
+++ b/editor/plugins/script_text_editor.cpp
@@ -28,10 +28,10 @@
 /*************************************************************************/
 #include "script_text_editor.h"
 
-#include "tools/editor/editor_settings.h"
+#include "editor/editor_settings.h"
 #include "os/keyboard.h"
-#include "tools/editor/script_editor_debugger.h"
-#include "tools/editor/editor_node.h"
+#include "editor/script_editor_debugger.h"
+#include "editor/editor_node.h"
 
 Vector<String> ScriptTextEditor::get_functions()  {
 
diff --git a/tools/editor/plugins/script_text_editor.h b/editor/plugins/script_text_editor.h
similarity index 100%
rename from tools/editor/plugins/script_text_editor.h
rename to editor/plugins/script_text_editor.h
diff --git a/tools/editor/plugins/shader_editor_plugin.cpp b/editor/plugins/shader_editor_plugin.cpp
similarity index 99%
rename from tools/editor/plugins/shader_editor_plugin.cpp
rename to editor/plugins/shader_editor_plugin.cpp
index 56a8fccb9ce..c14d1650fd7 100644
--- a/tools/editor/plugins/shader_editor_plugin.cpp
+++ b/editor/plugins/shader_editor_plugin.cpp
@@ -28,14 +28,14 @@
 /*************************************************************************/
 #include "shader_editor_plugin.h"
 
-#include "tools/editor/editor_settings.h"
+#include "editor/editor_settings.h"
 #include "spatial_editor_plugin.h"
 #include "scene/resources/shader_graph.h"
 #include "io/resource_loader.h"
 #include "io/resource_saver.h"
 #include "os/keyboard.h"
-#include "tools/editor/editor_node.h"
-#include "tools/editor/property_editor.h"
+#include "editor/editor_node.h"
+#include "editor/property_editor.h"
 #include "os/os.h"
 #include "servers/visual/shader_types.h"
 
diff --git a/tools/editor/plugins/shader_editor_plugin.h b/editor/plugins/shader_editor_plugin.h
similarity index 98%
rename from tools/editor/plugins/shader_editor_plugin.h
rename to editor/plugins/shader_editor_plugin.h
index e94b4d9c256..703913e4316 100644
--- a/tools/editor/plugins/shader_editor_plugin.h
+++ b/editor/plugins/shader_editor_plugin.h
@@ -29,8 +29,8 @@
 #ifndef SHADER_EDITOR_PLUGIN_H
 #define SHADER_EDITOR_PLUGIN_H
 
-#include "tools/editor/code_editor.h"
-#include "tools/editor/editor_plugin.h"
+#include "editor/code_editor.h"
+#include "editor/editor_plugin.h"
 #include "scene/gui/tab_container.h"
 #include "scene/gui/text_edit.h"
 #include "scene/gui/menu_button.h"
diff --git a/tools/editor/plugins/shader_graph_editor_plugin.cpp b/editor/plugins/shader_graph_editor_plugin.cpp
similarity index 100%
rename from tools/editor/plugins/shader_graph_editor_plugin.cpp
rename to editor/plugins/shader_graph_editor_plugin.cpp
diff --git a/tools/editor/plugins/shader_graph_editor_plugin.h b/editor/plugins/shader_graph_editor_plugin.h
similarity index 98%
rename from tools/editor/plugins/shader_graph_editor_plugin.h
rename to editor/plugins/shader_graph_editor_plugin.h
index 477a45bd1fb..51437222424 100644
--- a/tools/editor/plugins/shader_graph_editor_plugin.h
+++ b/editor/plugins/shader_graph_editor_plugin.h
@@ -30,14 +30,14 @@
 #define SHADER_GRAPH_EDITOR_PLUGIN_H
 
 
-#include "tools/editor/editor_plugin.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_plugin.h"
+#include "editor/editor_node.h"
 #include "scene/resources/shader.h"
 #include "scene/gui/tree.h"
 #include "scene/gui/button.h"
 #include "scene/gui/graph_edit.h"
 #include "scene/gui/popup.h"
-#include "tools/editor/property_editor.h"
+#include "editor/property_editor.h"
 #include "scene/resources/shader_graph.h"
 /**
 	@author Juan Linietsky <reduzio@gmail.com>
diff --git a/tools/editor/plugins/spatial_editor_plugin.cpp b/editor/plugins/spatial_editor_plugin.cpp
similarity index 99%
rename from tools/editor/plugins/spatial_editor_plugin.cpp
rename to editor/plugins/spatial_editor_plugin.cpp
index ef971034cd2..8a7969c71b4 100644
--- a/tools/editor/plugins/spatial_editor_plugin.cpp
+++ b/editor/plugins/spatial_editor_plugin.cpp
@@ -34,13 +34,13 @@
 #include "scene/3d/camera.h"
 #include "camera_matrix.h"
 #include "sort.h"
-#include "tools/editor/editor_node.h"
-#include "tools/editor/editor_settings.h"
+#include "editor/editor_node.h"
+#include "editor/editor_settings.h"
 #include "scene/resources/surface_tool.h"
-#include "tools/editor/spatial_editor_gizmos.h"
+#include "editor/spatial_editor_gizmos.h"
 #include "global_config.h"
-#include "tools/editor/plugins/animation_player_editor_plugin.h"
-#include "tools/editor/animation_editor.h"
+#include "editor/plugins/animation_player_editor_plugin.h"
+#include "editor/animation_editor.h"
 
 #define DISTANCE_DEFAULT 4
 
diff --git a/tools/editor/plugins/spatial_editor_plugin.h b/editor/plugins/spatial_editor_plugin.h
similarity index 99%
rename from tools/editor/plugins/spatial_editor_plugin.h
rename to editor/plugins/spatial_editor_plugin.h
index 36f807c11fe..44ce4a0281b 100644
--- a/tools/editor/plugins/spatial_editor_plugin.h
+++ b/editor/plugins/spatial_editor_plugin.h
@@ -29,8 +29,8 @@
 #ifndef SPATIAL_EDITOR_PLUGIN_H
 #define SPATIAL_EDITOR_PLUGIN_H
 
-#include "tools/editor/editor_plugin.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_plugin.h"
+#include "editor/editor_node.h"
 #include "scene/3d/visual_instance.h"
 #include "scene/3d/immediate_geometry.h"
 #include "scene/3d/light.h"
diff --git a/tools/editor/plugins/sprite_frames_editor_plugin.cpp b/editor/plugins/sprite_frames_editor_plugin.cpp
similarity index 99%
rename from tools/editor/plugins/sprite_frames_editor_plugin.cpp
rename to editor/plugins/sprite_frames_editor_plugin.cpp
index c3c68e471ef..44d6d3c6e1a 100644
--- a/tools/editor/plugins/sprite_frames_editor_plugin.cpp
+++ b/editor/plugins/sprite_frames_editor_plugin.cpp
@@ -30,7 +30,7 @@
 
 #include "io/resource_loader.h"
 #include "global_config.h"
-#include "tools/editor/editor_settings.h"
+#include "editor/editor_settings.h"
 #include "scene/3d/sprite_3d.h"
 
 
diff --git a/tools/editor/plugins/sprite_frames_editor_plugin.h b/editor/plugins/sprite_frames_editor_plugin.h
similarity index 98%
rename from tools/editor/plugins/sprite_frames_editor_plugin.h
rename to editor/plugins/sprite_frames_editor_plugin.h
index 36a022b7e43..11f545b4439 100644
--- a/tools/editor/plugins/sprite_frames_editor_plugin.h
+++ b/editor/plugins/sprite_frames_editor_plugin.h
@@ -30,8 +30,8 @@
 #define SPRITE_FRAMES_EDITOR_PLUGIN_H
 
 
-#include "tools/editor/editor_plugin.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_plugin.h"
+#include "editor/editor_node.h"
 #include "scene/gui/tree.h"
 #include "scene/2d/animated_sprite.h"
 #include "scene/gui/file_dialog.h"
diff --git a/tools/editor/plugins/stream_editor_plugin.cpp b/editor/plugins/stream_editor_plugin.cpp
similarity index 100%
rename from tools/editor/plugins/stream_editor_plugin.cpp
rename to editor/plugins/stream_editor_plugin.cpp
diff --git a/tools/editor/plugins/stream_editor_plugin.h b/editor/plugins/stream_editor_plugin.h
similarity index 97%
rename from tools/editor/plugins/stream_editor_plugin.h
rename to editor/plugins/stream_editor_plugin.h
index cc853d46617..2ae3b7100e3 100644
--- a/tools/editor/plugins/stream_editor_plugin.h
+++ b/editor/plugins/stream_editor_plugin.h
@@ -30,8 +30,8 @@
 #define STREAM_EDITOR_PLUGIN_H
 
 #if 0
-#include "tools/editor/editor_plugin.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_plugin.h"
+#include "editor/editor_node.h"
 #include "scene/audio/stream_player.h"
 
 /**
diff --git a/tools/editor/plugins/style_box_editor_plugin.cpp b/editor/plugins/style_box_editor_plugin.cpp
similarity index 100%
rename from tools/editor/plugins/style_box_editor_plugin.cpp
rename to editor/plugins/style_box_editor_plugin.cpp
diff --git a/tools/editor/plugins/style_box_editor_plugin.h b/editor/plugins/style_box_editor_plugin.h
similarity index 98%
rename from tools/editor/plugins/style_box_editor_plugin.h
rename to editor/plugins/style_box_editor_plugin.h
index 29e98efd8b8..01e636472be 100644
--- a/tools/editor/plugins/style_box_editor_plugin.h
+++ b/editor/plugins/style_box_editor_plugin.h
@@ -32,7 +32,7 @@
 #include "scene/resources/style_box.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/gui/option_button.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_node.h"
 
 
 class StyleBoxEditor : public Control {
diff --git a/tools/editor/plugins/texture_editor_plugin.cpp b/editor/plugins/texture_editor_plugin.cpp
similarity index 99%
rename from tools/editor/plugins/texture_editor_plugin.cpp
rename to editor/plugins/texture_editor_plugin.cpp
index 90a798667f0..af05094e5e7 100644
--- a/tools/editor/plugins/texture_editor_plugin.cpp
+++ b/editor/plugins/texture_editor_plugin.cpp
@@ -30,7 +30,7 @@
 
 #include "io/resource_loader.h"
 #include "global_config.h"
-#include "tools/editor/editor_settings.h"
+#include "editor/editor_settings.h"
 
 void TextureEditor::_gui_input(InputEvent p_event) {
 
diff --git a/tools/editor/plugins/texture_editor_plugin.h b/editor/plugins/texture_editor_plugin.h
similarity index 97%
rename from tools/editor/plugins/texture_editor_plugin.h
rename to editor/plugins/texture_editor_plugin.h
index 456a5249de1..7ad0e918cf5 100644
--- a/tools/editor/plugins/texture_editor_plugin.h
+++ b/editor/plugins/texture_editor_plugin.h
@@ -31,8 +31,8 @@
 
 
 
-#include "tools/editor/editor_plugin.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_plugin.h"
+#include "editor/editor_node.h"
 #include "scene/resources/texture.h"
 
 
diff --git a/tools/editor/plugins/texture_region_editor_plugin.cpp b/editor/plugins/texture_region_editor_plugin.cpp
similarity index 100%
rename from tools/editor/plugins/texture_region_editor_plugin.cpp
rename to editor/plugins/texture_region_editor_plugin.cpp
diff --git a/tools/editor/plugins/texture_region_editor_plugin.h b/editor/plugins/texture_region_editor_plugin.h
similarity index 98%
rename from tools/editor/plugins/texture_region_editor_plugin.h
rename to editor/plugins/texture_region_editor_plugin.h
index da713a53d30..8e88f0b7078 100644
--- a/tools/editor/plugins/texture_region_editor_plugin.h
+++ b/editor/plugins/texture_region_editor_plugin.h
@@ -33,8 +33,8 @@
 #define TEXTURE_REGION_EDITOR_PLUGIN_H
 
 #include "canvas_item_editor_plugin.h"
-#include "tools/editor/editor_plugin.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_plugin.h"
+#include "editor/editor_node.h"
 #include "scene/2d/sprite.h"
 #include "scene/gui/patch_9_rect.h"
 #include "scene/resources/style_box.h"
diff --git a/tools/editor/plugins/theme_editor_plugin.cpp b/editor/plugins/theme_editor_plugin.cpp
similarity index 100%
rename from tools/editor/plugins/theme_editor_plugin.cpp
rename to editor/plugins/theme_editor_plugin.cpp
diff --git a/tools/editor/plugins/theme_editor_plugin.h b/editor/plugins/theme_editor_plugin.h
similarity index 99%
rename from tools/editor/plugins/theme_editor_plugin.h
rename to editor/plugins/theme_editor_plugin.h
index 9251da8e070..f661da4cd57 100644
--- a/tools/editor/plugins/theme_editor_plugin.h
+++ b/editor/plugins/theme_editor_plugin.h
@@ -37,7 +37,7 @@
 #include "scene/gui/button_group.h"
 #include "scene/gui/scroll_container.h"
 
-#include "tools/editor/editor_node.h"
+#include "editor/editor_node.h"
 
 
 
diff --git a/tools/editor/plugins/tile_map_editor_plugin.cpp b/editor/plugins/tile_map_editor_plugin.cpp
similarity index 99%
rename from tools/editor/plugins/tile_map_editor_plugin.cpp
rename to editor/plugins/tile_map_editor_plugin.cpp
index 16b354c8b17..fb6d5a786a6 100644
--- a/tools/editor/plugins/tile_map_editor_plugin.cpp
+++ b/editor/plugins/tile_map_editor_plugin.cpp
@@ -31,8 +31,8 @@
 #include "os/keyboard.h"
 #include "os/input.h"
 #include "canvas_item_editor_plugin.h"
-#include "tools/editor/editor_settings.h"
-#include "tools/editor/editor_scale.h"
+#include "editor/editor_settings.h"
+#include "editor/editor_scale.h"
 
 void TileMapEditor::_notification(int p_what) {
 
diff --git a/tools/editor/plugins/tile_map_editor_plugin.h b/editor/plugins/tile_map_editor_plugin.h
similarity index 98%
rename from tools/editor/plugins/tile_map_editor_plugin.h
rename to editor/plugins/tile_map_editor_plugin.h
index 08032d9afdf..82e2a396d12 100644
--- a/tools/editor/plugins/tile_map_editor_plugin.h
+++ b/editor/plugins/tile_map_editor_plugin.h
@@ -29,8 +29,8 @@
 #ifndef TILE_MAP_EDITOR_PLUGIN_H
 #define TILE_MAP_EDITOR_PLUGIN_H
 
-#include "tools/editor/editor_plugin.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_plugin.h"
+#include "editor/editor_node.h"
 
 #include "scene/2d/tile_map.h"
 #include "scene/gui/line_edit.h"
diff --git a/tools/editor/plugins/tile_set_editor_plugin.cpp b/editor/plugins/tile_set_editor_plugin.cpp
similarity index 100%
rename from tools/editor/plugins/tile_set_editor_plugin.cpp
rename to editor/plugins/tile_set_editor_plugin.cpp
diff --git a/tools/editor/plugins/tile_set_editor_plugin.h b/editor/plugins/tile_set_editor_plugin.h
similarity index 97%
rename from tools/editor/plugins/tile_set_editor_plugin.h
rename to editor/plugins/tile_set_editor_plugin.h
index 7fec7fa1627..02a82ebd6b3 100644
--- a/tools/editor/plugins/tile_set_editor_plugin.h
+++ b/editor/plugins/tile_set_editor_plugin.h
@@ -32,8 +32,8 @@
 
 
 #include "scene/resources/tile_set.h"
-#include "tools/editor/editor_node.h"
-#include "tools/editor/editor_name_dialog.h"
+#include "editor/editor_node.h"
+#include "editor/editor_name_dialog.h"
 
 
 class TileSetEditor : public Control {
diff --git a/tools/editor/progress_dialog.cpp b/editor/progress_dialog.cpp
similarity index 100%
rename from tools/editor/progress_dialog.cpp
rename to editor/progress_dialog.cpp
diff --git a/tools/editor/progress_dialog.h b/editor/progress_dialog.h
similarity index 100%
rename from tools/editor/progress_dialog.h
rename to editor/progress_dialog.h
diff --git a/tools/editor/project_export.cpp b/editor/project_export.cpp
similarity index 100%
rename from tools/editor/project_export.cpp
rename to editor/project_export.cpp
diff --git a/tools/editor/project_export.h b/editor/project_export.h
similarity index 98%
rename from tools/editor/project_export.h
rename to editor/project_export.h
index c977e90e56f..b58ce2dc9dd 100644
--- a/tools/editor/project_export.h
+++ b/editor/project_export.h
@@ -33,7 +33,7 @@
 #include "scene/gui/control.h"
 #include "scene/gui/tree.h"
 #include "scene/gui/label.h"
-#include "tools/editor/editor_file_dialog.h"
+#include "editor/editor_file_dialog.h"
 #include "scene/gui/button.h"
 #include "scene/gui/file_dialog.h"
 #include "scene/gui/dialogs.h"
@@ -43,7 +43,7 @@
 #include "scene/gui/option_button.h"
 
 #include "scene/gui/slider.h"
-#include "tools/editor/editor_file_system.h"
+#include "editor/editor_file_system.h"
 #include "property_editor.h"
 #include "editor_export.h"
 
diff --git a/tools/editor/project_manager.cpp b/editor/project_manager.cpp
similarity index 100%
rename from tools/editor/project_manager.cpp
rename to editor/project_manager.cpp
diff --git a/tools/editor/project_manager.h b/editor/project_manager.h
similarity index 98%
rename from tools/editor/project_manager.h
rename to editor/project_manager.h
index 1fd8a301ea5..cb6c0b7f269 100644
--- a/tools/editor/project_manager.h
+++ b/editor/project_manager.h
@@ -34,7 +34,7 @@
 #include "scene/gui/scroll_container.h"
 #include "scene/gui/file_dialog.h"
 #include "scene/gui/tool_button.h"
-#include "tools/editor/asset_library_editor_plugin.h"
+#include "editor/asset_library_editor_plugin.h"
 
 class NewProjectDialog;
 class ProjectListFilter;
diff --git a/tools/editor/project_settings.cpp b/editor/project_settings.cpp
similarity index 100%
rename from tools/editor/project_settings.cpp
rename to editor/project_settings.cpp
diff --git a/tools/editor/project_settings.h b/editor/project_settings.h
similarity index 100%
rename from tools/editor/project_settings.h
rename to editor/project_settings.h
diff --git a/tools/editor/property_editor.cpp b/editor/property_editor.cpp
similarity index 100%
rename from tools/editor/property_editor.cpp
rename to editor/property_editor.cpp
diff --git a/tools/editor/property_editor.h b/editor/property_editor.h
similarity index 99%
rename from tools/editor/property_editor.h
rename to editor/property_editor.h
index e31a3313c1d..c9ae9a85cc0 100644
--- a/tools/editor/property_editor.h
+++ b/editor/property_editor.h
@@ -33,7 +33,7 @@
 #include "scene/gui/button.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/label.h"
-#include "tools/editor/editor_file_dialog.h"
+#include "editor/editor_file_dialog.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/color_picker.h"
 #include "scene/gui/menu_button.h"
diff --git a/tools/editor/property_selector.cpp b/editor/property_selector.cpp
similarity index 100%
rename from tools/editor/property_selector.cpp
rename to editor/property_selector.cpp
diff --git a/tools/editor/property_selector.h b/editor/property_selector.h
similarity index 98%
rename from tools/editor/property_selector.h
rename to editor/property_selector.h
index d29183f85e0..c2ce996be21 100644
--- a/tools/editor/property_selector.h
+++ b/editor/property_selector.h
@@ -29,7 +29,7 @@
 #ifndef PROPERTYSELECTOR_H
 #define PROPERTYSELECTOR_H
 
-#include "tools/editor/property_editor.h"
+#include "editor/property_editor.h"
 #include "scene/gui/rich_text_label.h"
 #include "editor_help.h"
 
diff --git a/tools/editor/pvrtc_compress.cpp b/editor/pvrtc_compress.cpp
similarity index 100%
rename from tools/editor/pvrtc_compress.cpp
rename to editor/pvrtc_compress.cpp
diff --git a/tools/editor/pvrtc_compress.h b/editor/pvrtc_compress.h
similarity index 100%
rename from tools/editor/pvrtc_compress.h
rename to editor/pvrtc_compress.h
diff --git a/tools/editor/quick_open.cpp b/editor/quick_open.cpp
similarity index 100%
rename from tools/editor/quick_open.cpp
rename to editor/quick_open.cpp
diff --git a/tools/editor/quick_open.h b/editor/quick_open.h
similarity index 100%
rename from tools/editor/quick_open.h
rename to editor/quick_open.h
diff --git a/tools/editor/register_exporters.h b/editor/register_exporters.h
similarity index 100%
rename from tools/editor/register_exporters.h
rename to editor/register_exporters.h
diff --git a/tools/editor/reparent_dialog.cpp b/editor/reparent_dialog.cpp
similarity index 100%
rename from tools/editor/reparent_dialog.cpp
rename to editor/reparent_dialog.cpp
diff --git a/tools/editor/reparent_dialog.h b/editor/reparent_dialog.h
similarity index 98%
rename from tools/editor/reparent_dialog.h
rename to editor/reparent_dialog.h
index 5e21f845817..200760314c0 100644
--- a/tools/editor/reparent_dialog.h
+++ b/editor/reparent_dialog.h
@@ -33,7 +33,7 @@
 #include "scene/gui/button.h"
 #include "scene/gui/check_button.h"
 #include "scene/gui/check_box.h"
-#include "tools/editor/scene_tree_editor.h"
+#include "editor/scene_tree_editor.h"
 #include "scene/gui/line_edit.h"
 /**
 @author Juan Linietsky <reduzio@gmail.com>
diff --git a/tools/editor/resources_dock.cpp b/editor/resources_dock.cpp
similarity index 100%
rename from tools/editor/resources_dock.cpp
rename to editor/resources_dock.cpp
diff --git a/tools/editor/resources_dock.h b/editor/resources_dock.h
similarity index 100%
rename from tools/editor/resources_dock.h
rename to editor/resources_dock.h
diff --git a/tools/editor/run_settings_dialog.cpp b/editor/run_settings_dialog.cpp
similarity index 100%
rename from tools/editor/run_settings_dialog.cpp
rename to editor/run_settings_dialog.cpp
diff --git a/tools/editor/run_settings_dialog.h b/editor/run_settings_dialog.h
similarity index 100%
rename from tools/editor/run_settings_dialog.h
rename to editor/run_settings_dialog.h
diff --git a/tools/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp
similarity index 99%
rename from tools/editor/scene_tree_dock.cpp
rename to editor/scene_tree_dock.cpp
index 4f3700adb5b..47eb84ab798 100644
--- a/tools/editor/scene_tree_dock.cpp
+++ b/editor/scene_tree_dock.cpp
@@ -33,13 +33,13 @@
 #include "os/keyboard.h"
 #include "scene/resources/packed_scene.h"
 #include "editor_settings.h"
-#include "tools/editor/plugins/canvas_item_editor_plugin.h"
-#include "tools/editor/plugins/spatial_editor_plugin.h"
+#include "editor/plugins/canvas_item_editor_plugin.h"
+#include "editor/plugins/spatial_editor_plugin.h"
 #include "script_editor_debugger.h"
-#include "tools/editor/plugins/script_editor_plugin.h"
+#include "editor/plugins/script_editor_plugin.h"
 #include "core/io/resource_saver.h"
 #include "multi_node_edit.h"
-#include "tools/editor/plugins/animation_player_editor_plugin.h"
+#include "editor/plugins/animation_player_editor_plugin.h"
 #include "animation_editor.h"
 #include "scene/main/viewport.h"
 
diff --git a/tools/editor/scene_tree_dock.h b/editor/scene_tree_dock.h
similarity index 100%
rename from tools/editor/scene_tree_dock.h
rename to editor/scene_tree_dock.h
diff --git a/tools/editor/scene_tree_editor.cpp b/editor/scene_tree_editor.cpp
similarity index 99%
rename from tools/editor/scene_tree_editor.cpp
rename to editor/scene_tree_editor.cpp
index 0e15040a352..fb21747ebb7 100644
--- a/tools/editor/scene_tree_editor.cpp
+++ b/editor/scene_tree_editor.cpp
@@ -33,7 +33,7 @@
 #include "print_string.h"
 #include "message_queue.h"
 #include "scene/main/viewport.h"
-#include "tools/editor/plugins/canvas_item_editor_plugin.h"
+#include "editor/plugins/canvas_item_editor_plugin.h"
 #include "scene/resources/packed_scene.h"
 
 Node *SceneTreeEditor::get_scene_node() {
diff --git a/tools/editor/scene_tree_editor.h b/editor/scene_tree_editor.h
similarity index 100%
rename from tools/editor/scene_tree_editor.h
rename to editor/scene_tree_editor.h
diff --git a/tools/editor/script_create_dialog.cpp b/editor/script_create_dialog.cpp
similarity index 100%
rename from tools/editor/script_create_dialog.cpp
rename to editor/script_create_dialog.cpp
diff --git a/tools/editor/script_create_dialog.h b/editor/script_create_dialog.h
similarity index 97%
rename from tools/editor/script_create_dialog.h
rename to editor/script_create_dialog.h
index df16efc73c3..ad9616c071f 100644
--- a/tools/editor/script_create_dialog.h
+++ b/editor/script_create_dialog.h
@@ -32,8 +32,8 @@
 #include "scene/gui/dialogs.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/option_button.h"
-#include "tools/editor/editor_file_dialog.h"
-#include "tools/editor/editor_settings.h"
+#include "editor/editor_file_dialog.h"
+#include "editor/editor_settings.h"
 #include "scene/gui/check_button.h"
 
 class ScriptCreateDialog : public ConfirmationDialog {
diff --git a/tools/editor/script_editor_debugger.cpp b/editor/script_editor_debugger.cpp
similarity index 100%
rename from tools/editor/script_editor_debugger.cpp
rename to editor/script_editor_debugger.cpp
diff --git a/tools/editor/script_editor_debugger.h b/editor/script_editor_debugger.h
similarity index 100%
rename from tools/editor/script_editor_debugger.h
rename to editor/script_editor_debugger.h
diff --git a/tools/editor/settings_config_dialog.cpp b/editor/settings_config_dialog.cpp
similarity index 100%
rename from tools/editor/settings_config_dialog.cpp
rename to editor/settings_config_dialog.cpp
diff --git a/tools/editor/settings_config_dialog.h b/editor/settings_config_dialog.h
similarity index 100%
rename from tools/editor/settings_config_dialog.h
rename to editor/settings_config_dialog.h
diff --git a/tools/editor/spatial_editor_gizmos.cpp b/editor/spatial_editor_gizmos.cpp
similarity index 100%
rename from tools/editor/spatial_editor_gizmos.cpp
rename to editor/spatial_editor_gizmos.cpp
diff --git a/tools/editor/spatial_editor_gizmos.h b/editor/spatial_editor_gizmos.h
similarity index 99%
rename from tools/editor/spatial_editor_gizmos.h
rename to editor/spatial_editor_gizmos.h
index 8a63d4f81ee..c44a9871443 100644
--- a/tools/editor/spatial_editor_gizmos.h
+++ b/editor/spatial_editor_gizmos.h
@@ -30,7 +30,7 @@
 #define SPATIAL_EDITOR_GIZMOS_H
 
 
-#include "tools/editor/plugins/spatial_editor_plugin.h"
+#include "editor/plugins/spatial_editor_plugin.h"
 #include "scene/3d/light.h"
 #include "scene/3d/listener.h"
 #include "scene/3d/camera.h"
diff --git a/tools/editor/translations/Makefile b/editor/translations/Makefile
similarity index 83%
rename from tools/editor/translations/Makefile
rename to editor/translations/Makefile
index bea20e877de..4f5d9f165fd 100644
--- a/tools/editor/translations/Makefile
+++ b/editor/translations/Makefile
@@ -1,13 +1,13 @@
 # Makefile providing various facilities to manage translations
 
-TEMPLATE = tools.pot
+TEMPLATE = editor.pot
 POFILES = $(wildcard *.po)
 LANGS = $(POFILES:%.po=%)
 
 all: update merge
 
 update:
-	@cd ../..; python2 tools/translations/extract.py
+	@cd ../..; python2 editor/translations/extract.py
 
 merge:
 	@for po in $(POFILES); do \
diff --git a/tools/editor/translations/README.md b/editor/translations/README.md
similarity index 100%
rename from tools/editor/translations/README.md
rename to editor/translations/README.md
diff --git a/tools/editor/translations/ar.po b/editor/translations/ar.po
similarity index 100%
rename from tools/editor/translations/ar.po
rename to editor/translations/ar.po
diff --git a/tools/editor/translations/bg.po b/editor/translations/bg.po
similarity index 100%
rename from tools/editor/translations/bg.po
rename to editor/translations/bg.po
diff --git a/tools/editor/translations/bn.po b/editor/translations/bn.po
similarity index 100%
rename from tools/editor/translations/bn.po
rename to editor/translations/bn.po
diff --git a/tools/editor/translations/ca.po b/editor/translations/ca.po
similarity index 100%
rename from tools/editor/translations/ca.po
rename to editor/translations/ca.po
diff --git a/tools/editor/translations/cs.po b/editor/translations/cs.po
similarity index 100%
rename from tools/editor/translations/cs.po
rename to editor/translations/cs.po
diff --git a/tools/editor/translations/da.po b/editor/translations/da.po
similarity index 100%
rename from tools/editor/translations/da.po
rename to editor/translations/da.po
diff --git a/tools/editor/translations/de.po b/editor/translations/de.po
similarity index 100%
rename from tools/editor/translations/de.po
rename to editor/translations/de.po
diff --git a/tools/editor/translations/de_CH.po b/editor/translations/de_CH.po
similarity index 100%
rename from tools/editor/translations/de_CH.po
rename to editor/translations/de_CH.po
diff --git a/tools/editor/translations/tools.pot b/editor/translations/editor.pot
similarity index 100%
rename from tools/editor/translations/tools.pot
rename to editor/translations/editor.pot
diff --git a/tools/editor/translations/es.po b/editor/translations/es.po
similarity index 100%
rename from tools/editor/translations/es.po
rename to editor/translations/es.po
diff --git a/tools/editor/translations/es_AR.po b/editor/translations/es_AR.po
similarity index 100%
rename from tools/editor/translations/es_AR.po
rename to editor/translations/es_AR.po
diff --git a/tools/editor/translations/extract.py b/editor/translations/extract.py
similarity index 85%
rename from tools/editor/translations/extract.py
rename to editor/translations/extract.py
index 1192c190113..616fec17a0e 100755
--- a/tools/editor/translations/extract.py
+++ b/editor/translations/extract.py
@@ -17,7 +17,7 @@ for arg in sys.argv[1:]:
         os.sys.exit("Non supported argument '" + arg + "'. Aborting.")
 
 
-if (not os.path.exists("tools")):
+if (not os.path.exists("editor")):
     os.sys.exit("ERROR: This script should be started from the root of the git repo.")
 
 
@@ -51,7 +51,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\\n"
 """
 
-print("Updating the tools.pot template...")
+print("Updating the editor.pot template...")
 
 for fname in matches:
 
@@ -102,20 +102,20 @@ for fname in matches:
     f.close()
 
 
-f = open("tools.pot", "wb")
+f = open("editor.pot", "wb")
 f.write(main_po)
 f.close()
 
 if (os.name == "posix"):
     print("Wrapping template at 79 characters for compatibility with Weblate.")
-    os.system("msgmerge -w79 tools.pot tools.pot > tools.pot.wrap")
-    shutil.move("tools.pot.wrap", "tools.pot")
+    os.system("msgmerge -w79 editor.pot editor.pot > editor.pot.wrap")
+    shutil.move("editor.pot.wrap", "editor.pot")
 
-shutil.move("tools.pot", "tools/translations/tools.pot")
+shutil.move("editor.pot", "editor/translations/editor.pot")
 
 # TODO: Make that in a portable way, if we care; if not, kudos to Unix users
 if (os.name == "posix"):
-    added = subprocess.check_output("git diff tools/translations/tools.pot | grep \+msgid | wc -l", shell=True)
-    removed = subprocess.check_output("git diff tools/translations/tools.pot | grep \\\-msgid | wc -l", shell=True)
+    added = subprocess.check_output("git diff editor/translations/editor.pot | grep \+msgid | wc -l", shell=True)
+    removed = subprocess.check_output("git diff editor/translations/editor.pot | grep \\\-msgid | wc -l", shell=True)
     print("\n# Template changes compared to the staged status:")
     print("#   Additions: %s msgids.\n#   Deletions: %s msgids." % (int(added), int(removed)))
diff --git a/tools/editor/translations/fa.po b/editor/translations/fa.po
similarity index 100%
rename from tools/editor/translations/fa.po
rename to editor/translations/fa.po
diff --git a/tools/editor/translations/fr.po b/editor/translations/fr.po
similarity index 100%
rename from tools/editor/translations/fr.po
rename to editor/translations/fr.po
diff --git a/tools/editor/translations/hu.po b/editor/translations/hu.po
similarity index 100%
rename from tools/editor/translations/hu.po
rename to editor/translations/hu.po
diff --git a/tools/editor/translations/id.po b/editor/translations/id.po
similarity index 100%
rename from tools/editor/translations/id.po
rename to editor/translations/id.po
diff --git a/tools/editor/translations/it.po b/editor/translations/it.po
similarity index 100%
rename from tools/editor/translations/it.po
rename to editor/translations/it.po
diff --git a/tools/editor/translations/ja.po b/editor/translations/ja.po
similarity index 100%
rename from tools/editor/translations/ja.po
rename to editor/translations/ja.po
diff --git a/tools/editor/translations/ko.po b/editor/translations/ko.po
similarity index 100%
rename from tools/editor/translations/ko.po
rename to editor/translations/ko.po
diff --git a/tools/editor/translations/nb.po b/editor/translations/nb.po
similarity index 100%
rename from tools/editor/translations/nb.po
rename to editor/translations/nb.po
diff --git a/tools/editor/translations/pl.po b/editor/translations/pl.po
similarity index 100%
rename from tools/editor/translations/pl.po
rename to editor/translations/pl.po
diff --git a/tools/editor/translations/pr.po b/editor/translations/pr.po
similarity index 100%
rename from tools/editor/translations/pr.po
rename to editor/translations/pr.po
diff --git a/tools/editor/translations/pt_BR.po b/editor/translations/pt_BR.po
similarity index 100%
rename from tools/editor/translations/pt_BR.po
rename to editor/translations/pt_BR.po
diff --git a/tools/editor/translations/pt_PT.po b/editor/translations/pt_PT.po
similarity index 100%
rename from tools/editor/translations/pt_PT.po
rename to editor/translations/pt_PT.po
diff --git a/tools/editor/translations/ru.po b/editor/translations/ru.po
similarity index 100%
rename from tools/editor/translations/ru.po
rename to editor/translations/ru.po
diff --git a/tools/editor/translations/sk.po b/editor/translations/sk.po
similarity index 100%
rename from tools/editor/translations/sk.po
rename to editor/translations/sk.po
diff --git a/tools/editor/translations/sl.po b/editor/translations/sl.po
similarity index 100%
rename from tools/editor/translations/sl.po
rename to editor/translations/sl.po
diff --git a/tools/editor/translations/tr.po b/editor/translations/tr.po
similarity index 100%
rename from tools/editor/translations/tr.po
rename to editor/translations/tr.po
diff --git a/tools/editor/translations/ur_PK.po b/editor/translations/ur_PK.po
similarity index 100%
rename from tools/editor/translations/ur_PK.po
rename to editor/translations/ur_PK.po
diff --git a/tools/editor/translations/zh_CN.po b/editor/translations/zh_CN.po
similarity index 100%
rename from tools/editor/translations/zh_CN.po
rename to editor/translations/zh_CN.po
diff --git a/tools/editor/translations/zh_HK.po b/editor/translations/zh_HK.po
similarity index 100%
rename from tools/editor/translations/zh_HK.po
rename to editor/translations/zh_HK.po
diff --git a/tools/editor/translations/zh_TW.po b/editor/translations/zh_TW.po
similarity index 100%
rename from tools/editor/translations/zh_TW.po
rename to editor/translations/zh_TW.po
diff --git a/main/main.cpp b/main/main.cpp
index fb7f2ebceb9..32aea6a4a59 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -54,9 +54,9 @@
 #include "scene/main/viewport.h"
 
 #ifdef TOOLS_ENABLED
-#include "tools/editor/doc/doc_data.h"
-#include "tools/editor/editor_node.h"
-#include "tools/editor/project_manager.h"
+#include "editor/doc/doc_data.h"
+#include "editor/editor_node.h"
+#include "editor/project_manager.h"
 #endif
 
 #include "io/file_access_network.h"
diff --git a/modules/gdscript/register_types.cpp b/modules/gdscript/register_types.cpp
index db47ee43ce6..d1d69c67096 100644
--- a/modules/gdscript/register_types.cpp
+++ b/modules/gdscript/register_types.cpp
@@ -41,10 +41,10 @@ ResourceFormatSaverGDScript *resource_saver_gd=NULL;
 #if 0
 #ifdef TOOLS_ENABLED
 
-#include "tools/editor/editor_import_export.h"
+#include "editor/editor_import_export.h"
 #include "gd_tokenizer.h"
-#include "tools/editor/editor_node.h"
-#include "tools/editor/editor_settings.h"
+#include "editor/editor_node.h"
+#include "editor/editor_settings.h"
 
 class EditorExportGDScript : public EditorExportPlugin {
 
diff --git a/modules/gridmap/grid_map_editor_plugin.cpp b/modules/gridmap/grid_map_editor_plugin.cpp
index 2630360058a..a5d2f84c686 100644
--- a/modules/gridmap/grid_map_editor_plugin.cpp
+++ b/modules/gridmap/grid_map_editor_plugin.cpp
@@ -27,9 +27,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "grid_map_editor_plugin.h"
-#include "tools/editor/plugins/spatial_editor_plugin.h"
+#include "editor/plugins/spatial_editor_plugin.h"
 #include "scene/3d/camera.h"
-#include "tools/editor/editor_settings.h"
+#include "editor/editor_settings.h"
 
 #include "os/keyboard.h"
 #include "geometry.h"
diff --git a/modules/gridmap/grid_map_editor_plugin.h b/modules/gridmap/grid_map_editor_plugin.h
index 66ec5dc4bcd..07ac34cd4e1 100644
--- a/modules/gridmap/grid_map_editor_plugin.h
+++ b/modules/gridmap/grid_map_editor_plugin.h
@@ -29,10 +29,10 @@
 #ifndef GRID_MAP_EDITOR_PLUGIN_H
 #define GRID_MAP_EDITOR_PLUGIN_H
 
-#include "tools/editor/editor_plugin.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_plugin.h"
+#include "editor/editor_node.h"
 #include "grid_map.h"
-#include "tools/editor/pane_drag.h"
+#include "editor/pane_drag.h"
 /**
 	@author Juan Linietsky <reduzio@gmail.com>
 */
diff --git a/modules/visual_script/visual_script_editor.cpp b/modules/visual_script/visual_script_editor.cpp
index eadc9a88921..3f5ba63b98a 100644
--- a/modules/visual_script/visual_script_editor.cpp
+++ b/modules/visual_script/visual_script_editor.cpp
@@ -1,11 +1,11 @@
 #include "visual_script_editor.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_node.h"
 #include "visual_script_nodes.h"
 #include "visual_script_flow_control.h"
 #include "visual_script_func_nodes.h"
 #include "visual_script_expression.h"
 #include "os/input.h"
-#include "tools/editor/editor_resource_preview.h"
+#include "editor/editor_resource_preview.h"
 #include "os/keyboard.h"
 
 #ifdef TOOLS_ENABLED
diff --git a/modules/visual_script/visual_script_editor.h b/modules/visual_script/visual_script_editor.h
index 1dc62b3e69f..df3aa20d396 100644
--- a/modules/visual_script/visual_script_editor.h
+++ b/modules/visual_script/visual_script_editor.h
@@ -1,12 +1,12 @@
 #ifndef VisualSCRIPT_EDITOR_H
 #define VisualSCRIPT_EDITOR_H
 
-#include "tools/editor/plugins/script_editor_plugin.h"
+#include "editor/plugins/script_editor_plugin.h"
 #include "visual_script.h"
-#include "tools/editor/property_editor.h"
+#include "editor/property_editor.h"
 #include "scene/gui/graph_edit.h"
-#include "tools/editor/create_dialog.h"
-#include "tools/editor/property_selector.h"
+#include "editor/create_dialog.h"
+#include "editor/property_selector.h"
 class VisualScriptEditorSignalEdit;
 class VisualScriptEditorVariableEdit;
 
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp
index 1d1ee25622e..3fc822860d3 100644
--- a/platform/android/export/export.cpp
+++ b/platform/android/export/export.cpp
@@ -28,9 +28,9 @@
 /*************************************************************************/
 #include "version.h"
 #include "export.h"
-#include "tools/editor/editor_settings.h"
-#include "tools/editor/editor_export.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_settings.h"
+#include "editor/editor_export.h"
+#include "editor/editor_node.h"
 #include "io/zip_io.h"
 #include "io/marshalls.h"
 #include "global_config.h"
diff --git a/platform/bb10/export/export.cpp b/platform/bb10/export/export.cpp
index 2643c96576b..cf8e2fcc0ae 100644
--- a/platform/bb10/export/export.cpp
+++ b/platform/bb10/export/export.cpp
@@ -28,9 +28,9 @@
 /*************************************************************************/
 #include "version.h"
 #include "export.h"
-#include "tools/editor/editor_settings.h"
-#include "tools/editor/editor_export.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_settings.h"
+#include "editor/editor_export.h"
+#include "editor/editor_node.h"
 #include "io/zip_io.h"
 #include "io/marshalls.h"
 #include "global_config.h"
diff --git a/platform/javascript/export/export.cpp b/platform/javascript/export/export.cpp
index 2657eaddb56..b9ef63fe2f7 100644
--- a/platform/javascript/export/export.cpp
+++ b/platform/javascript/export/export.cpp
@@ -28,9 +28,9 @@
 /*************************************************************************/
 #include "version.h"
 #include "export.h"
-#include "tools/editor/editor_settings.h"
-#include "tools/editor/editor_export.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_settings.h"
+#include "editor/editor_export.h"
+#include "editor/editor_node.h"
 #include "io/zip_io.h"
 #include "io/marshalls.h"
 #include "global_config.h"
diff --git a/platform/osx/export/export.cpp b/platform/osx/export/export.cpp
index 69973dc95d9..4af2aaca63b 100644
--- a/platform/osx/export/export.cpp
+++ b/platform/osx/export/export.cpp
@@ -28,9 +28,9 @@
 /*************************************************************************/
 #include "version.h"
 #include "export.h"
-#include "tools/editor/editor_settings.h"
-#include "tools/editor/editor_export.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_settings.h"
+#include "editor/editor_export.h"
+#include "editor/editor_node.h"
 #include "io/zip_io.h"
 #include "io/marshalls.h"
 #include "io/resource_saver.h"
diff --git a/platform/uwp/export/export.cpp b/platform/uwp/export/export.cpp
index 4966489188c..52a22a1942b 100644
--- a/platform/uwp/export/export.cpp
+++ b/platform/uwp/export/export.cpp
@@ -69,8 +69,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "version.h"
 #include "export.h"
 #include "object.h"
-#include "tools/editor/editor_import_export.h"
-#include "tools/editor/editor_node.h"
+#include "editor/editor_import_export.h"
+#include "editor/editor_node.h"
 #include "platform/uwp/logo.h"
 #include "os/file_access.h"
 #include "io/zip.h"
diff --git a/platform/windows/export/export.cpp b/platform/windows/export/export.cpp
index 1c827a93b0c..44c0acdb2ec 100644
--- a/platform/windows/export/export.cpp
+++ b/platform/windows/export/export.cpp
@@ -28,7 +28,7 @@
 /*************************************************************************/
 #include "export.h"
 #include "platform/windows/logo.h"
-#include "tools/editor/editor_export.h"
+#include "editor/editor_export.h"
 
 void register_windows_exporter() {
 
diff --git a/platform/x11/export/export.cpp b/platform/x11/export/export.cpp
index 5c7f98c1f30..c40b8f3c1ff 100644
--- a/platform/x11/export/export.cpp
+++ b/platform/x11/export/export.cpp
@@ -28,7 +28,7 @@
 /*************************************************************************/
 #include "export.h"
 #include "platform/x11/logo.h"
-#include "tools/editor/editor_export.h"
+#include "editor/editor_export.h"
 #include "scene/resources/texture.h"
 
 
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp
index 4161725ad57..496b1e03cfa 100644
--- a/scene/gui/control.cpp
+++ b/scene/gui/control.cpp
@@ -40,7 +40,7 @@
 #include "scene/gui/panel.h"
 #include "scene/gui/label.h"
 #ifdef TOOLS_ENABLED
-#include "tools/editor/editor_settings.h"
+#include "editor/editor_settings.h"
 #endif
 #include <stdio.h>
 
diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp
index 893670efead..7f61cf80ec0 100644
--- a/scene/gui/line_edit.cpp
+++ b/scene/gui/line_edit.cpp
@@ -33,7 +33,7 @@
 #include "label.h"
 #include "translation.h"
 #ifdef TOOLS_ENABLED
-#include "tools/editor/editor_settings.h"
+#include "editor/editor_settings.h"
 #endif
 
 static bool _is_text_char(CharType c) {