diff --git a/editor/connections_dialog.cpp b/editor/connections_dialog.cpp
index 18a85e1be..839e4fa76 100644
--- a/editor/connections_dialog.cpp
+++ b/editor/connections_dialog.cpp
@@ -75,7 +75,7 @@
 #include "modules/modules_enabled.gen.h"
 
 #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
-#include "modules/editor_code_editor/script_editor.h"
+#include "editor_code_editor/script_editor.h"
 #endif
 
 static Node *_find_first_script(Node *p_root, Node *p_node) {
diff --git a/editor/editor_data.cpp b/editor/editor_data.cpp
index cbc1b90a8..99ba1c10c 100644
--- a/editor/editor_data.cpp
+++ b/editor/editor_data.cpp
@@ -46,7 +46,7 @@
 #include "modules/modules_enabled.gen.h"
 
 #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
-#include "modules/editor_code_editor/script_editor.h"
+#include "editor_code_editor/script_editor.h"
 #endif
 
 class Resource;
diff --git a/editor/editor_data.h b/editor/editor_data.h
index 824a25705..eb428dcbd 100644
--- a/editor/editor_data.h
+++ b/editor/editor_data.h
@@ -55,7 +55,7 @@
 #include "modules/modules_enabled.gen.h"
 
 #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
-#include "modules/editor_code_editor/script_editor_plugin.h"
+#include "editor_code_editor/script_editor_plugin.h"
 #endif
 
 class ConfigFile;
diff --git a/editor/editor_export.cpp b/editor/editor_export.cpp
index 26517c258..051e5de02 100644
--- a/editor/editor_export.cpp
+++ b/editor/editor_export.cpp
@@ -60,7 +60,7 @@
 #include "modules/modules_enabled.gen.h"
 
 #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
-#include "modules/editor_code_editor/script_editor.h"
+#include "editor_code_editor/script_editor.h"
 #endif
 
 static int _get_pad(int p_alignment, int p_n) {
diff --git a/editor/editor_help.cpp b/editor/editor_help.cpp
index fd1676910..f680b3275 100644
--- a/editor/editor_help.cpp
+++ b/editor/editor_help.cpp
@@ -66,7 +66,7 @@
 #include "modules/modules_enabled.gen.h"
 
 #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
-#include "modules/editor_code_editor/script_editor.h"
+#include "editor_code_editor/script_editor.h"
 #endif
 
 #define CONTRIBUTE_URL vformat("%s/community/contributing/updating_the_class_reference.html", VERSION_DOCS_URL)
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 7fe35f3fe..40fe95fc6 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -193,9 +193,9 @@
 #include "modules/modules_enabled.gen.h"
 
 #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
-#include "modules/editor_code_editor/script_editor.h"
-#include "modules/editor_code_editor/script_text_editor.h"
-#include "modules/editor_code_editor/text_editor.h"
+#include "editor_code_editor/script_editor.h"
+#include "editor_code_editor/script_text_editor.h"
+#include "editor_code_editor/text_editor.h"
 #endif
 
 class Camera;
diff --git a/editor/editor_plugin.cpp b/editor/editor_plugin.cpp
index fa1154ea7..39205ca03 100644
--- a/editor/editor_plugin.cpp
+++ b/editor/editor_plugin.cpp
@@ -77,7 +77,7 @@
 #include "modules/modules_enabled.gen.h"
 
 #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
-#include "modules/editor_code_editor/script_editor.h"
+#include "editor_code_editor/script_editor.h"
 #endif
 
 class ConfigFile;
diff --git a/editor/editor_resource_picker.cpp b/editor/editor_resource_picker.cpp
index 95288d589..c21a52b23 100644
--- a/editor/editor_resource_picker.cpp
+++ b/editor/editor_resource_picker.cpp
@@ -72,8 +72,8 @@
 #include "modules/modules_enabled.gen.h"
 
 #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
-#include "modules/editor_code_editor/script_editor.h"
-#include "modules/editor_code_editor/script_editor_base.h"
+#include "editor_code_editor/script_editor.h"
+#include "editor_code_editor/script_editor_base.h"
 #endif
 
 HashMap<StringName, List<StringName>> EditorResourcePicker::allowed_types_cache;
diff --git a/editor/editor_run.cpp b/editor/editor_run.cpp
index ca38b1fa8..4d551a180 100644
--- a/editor/editor_run.cpp
+++ b/editor/editor_run.cpp
@@ -45,7 +45,7 @@
 #include "modules/modules_enabled.gen.h"
 
 #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
-#include "modules/editor_code_editor/script_editor.h"
+#include "editor_code_editor/script_editor.h"
 #endif
 
 EditorRun::Status EditorRun::get_status() const {
diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp
index f621eb676..b3fd1da59 100644
--- a/editor/plugins/canvas_item_editor_plugin.cpp
+++ b/editor/plugins/canvas_item_editor_plugin.cpp
@@ -103,7 +103,7 @@
 #include "modules/modules_enabled.gen.h"
 
 #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
-#include "modules/editor_code_editor/script_editor.h"
+#include "editor_code_editor/script_editor.h"
 #endif
 
 // Min and Max are power of two in order to play nicely with successive increment.
diff --git a/editor/plugins/spatial_editor_plugin.cpp b/editor/plugins/spatial_editor_plugin.cpp
index ce7d9bb8e..3cafc8801 100644
--- a/editor/plugins/spatial_editor_plugin.cpp
+++ b/editor/plugins/spatial_editor_plugin.cpp
@@ -102,7 +102,7 @@
 #include "modules/modules_enabled.gen.h"
 
 #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
-#include "modules/editor_code_editor/script_editor.h"
+#include "editor_code_editor/script_editor.h"
 #endif
 
 #define DISTANCE_DEFAULT 4
diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp
index dd02e3d96..a49024054 100644
--- a/editor/scene_tree_dock.cpp
+++ b/editor/scene_tree_dock.cpp
@@ -99,7 +99,7 @@
 #include "modules/modules_enabled.gen.h"
 
 #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
-#include "modules/editor_code_editor/script_editor.h"
+#include "editor_code_editor/script_editor.h"
 #endif
 
 void SceneTreeDock::_nodes_drag_begin() {
diff --git a/editor/scene_tree_editor.cpp b/editor/scene_tree_editor.cpp
index f49faaf7f..cac8de6c5 100644
--- a/editor/scene_tree_editor.cpp
+++ b/editor/scene_tree_editor.cpp
@@ -67,8 +67,8 @@
 #include "modules/modules_enabled.gen.h"
 
 #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
-#include "modules/editor_code_editor/script_editor.h"
-#include "modules/editor_code_editor/script_editor_base.h"
+#include "editor_code_editor/script_editor.h"
+#include "editor_code_editor/script_editor_base.h"
 #endif
 
 Node *SceneTreeEditor::get_scene_node() {
diff --git a/editor/settings_config_dialog.cpp b/editor/settings_config_dialog.cpp
index 152b9c629..f4ec6d9c4 100644
--- a/editor/settings_config_dialog.cpp
+++ b/editor/settings_config_dialog.cpp
@@ -70,7 +70,7 @@
 #include "modules/modules_enabled.gen.h"
 
 #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
-#include "modules/editor_code_editor/script_editor.h"
+#include "editor_code_editor/script_editor.h"
 #endif
 
 void EditorSettingsDialog::ok_pressed() {
diff --git a/modules/editor_code_editor/SCsub b/editor_modules/editor_code_editor/SCsub
similarity index 100%
rename from modules/editor_code_editor/SCsub
rename to editor_modules/editor_code_editor/SCsub
diff --git a/modules/editor_code_editor/code_text_editor.cpp b/editor_modules/editor_code_editor/code_text_editor.cpp
similarity index 100%
rename from modules/editor_code_editor/code_text_editor.cpp
rename to editor_modules/editor_code_editor/code_text_editor.cpp
diff --git a/modules/editor_code_editor/code_text_editor.h b/editor_modules/editor_code_editor/code_text_editor.h
similarity index 100%
rename from modules/editor_code_editor/code_text_editor.h
rename to editor_modules/editor_code_editor/code_text_editor.h
diff --git a/modules/editor_code_editor/config.py b/editor_modules/editor_code_editor/config.py
similarity index 52%
rename from modules/editor_code_editor/config.py
rename to editor_modules/editor_code_editor/config.py
index 0ae6a050a..65f055737 100644
--- a/modules/editor_code_editor/config.py
+++ b/editor_modules/editor_code_editor/config.py
@@ -1,7 +1,12 @@
 
 
 def can_build(env, platform):
-  return env["tools"]
+  if not env["tools"]:
+    return False
+      
+  env.module_add_dependencies("editor_code_editor", ["freetype"], True)
+
+  return True
 
 def configure(env):
 	pass
diff --git a/modules/editor_code_editor/connection_info_dialog.cpp b/editor_modules/editor_code_editor/connection_info_dialog.cpp
similarity index 100%
rename from modules/editor_code_editor/connection_info_dialog.cpp
rename to editor_modules/editor_code_editor/connection_info_dialog.cpp
diff --git a/modules/editor_code_editor/connection_info_dialog.h b/editor_modules/editor_code_editor/connection_info_dialog.h
similarity index 100%
rename from modules/editor_code_editor/connection_info_dialog.h
rename to editor_modules/editor_code_editor/connection_info_dialog.h
diff --git a/modules/editor_code_editor/find_replace_bar.cpp b/editor_modules/editor_code_editor/find_replace_bar.cpp
similarity index 100%
rename from modules/editor_code_editor/find_replace_bar.cpp
rename to editor_modules/editor_code_editor/find_replace_bar.cpp
diff --git a/modules/editor_code_editor/find_replace_bar.h b/editor_modules/editor_code_editor/find_replace_bar.h
similarity index 100%
rename from modules/editor_code_editor/find_replace_bar.h
rename to editor_modules/editor_code_editor/find_replace_bar.h
diff --git a/modules/editor_code_editor/goto_line_dialog.cpp b/editor_modules/editor_code_editor/goto_line_dialog.cpp
similarity index 100%
rename from modules/editor_code_editor/goto_line_dialog.cpp
rename to editor_modules/editor_code_editor/goto_line_dialog.cpp
diff --git a/modules/editor_code_editor/goto_line_dialog.h b/editor_modules/editor_code_editor/goto_line_dialog.h
similarity index 100%
rename from modules/editor_code_editor/goto_line_dialog.h
rename to editor_modules/editor_code_editor/goto_line_dialog.h
diff --git a/modules/editor_code_editor/register_types.cpp b/editor_modules/editor_code_editor/register_types.cpp
similarity index 100%
rename from modules/editor_code_editor/register_types.cpp
rename to editor_modules/editor_code_editor/register_types.cpp
diff --git a/modules/editor_code_editor/register_types.h b/editor_modules/editor_code_editor/register_types.h
similarity index 100%
rename from modules/editor_code_editor/register_types.h
rename to editor_modules/editor_code_editor/register_types.h
diff --git a/modules/editor_code_editor/script_editor.cpp b/editor_modules/editor_code_editor/script_editor.cpp
similarity index 100%
rename from modules/editor_code_editor/script_editor.cpp
rename to editor_modules/editor_code_editor/script_editor.cpp
diff --git a/modules/editor_code_editor/script_editor.h b/editor_modules/editor_code_editor/script_editor.h
similarity index 100%
rename from modules/editor_code_editor/script_editor.h
rename to editor_modules/editor_code_editor/script_editor.h
diff --git a/modules/editor_code_editor/script_editor_base.cpp b/editor_modules/editor_code_editor/script_editor_base.cpp
similarity index 100%
rename from modules/editor_code_editor/script_editor_base.cpp
rename to editor_modules/editor_code_editor/script_editor_base.cpp
diff --git a/modules/editor_code_editor/script_editor_base.h b/editor_modules/editor_code_editor/script_editor_base.h
similarity index 100%
rename from modules/editor_code_editor/script_editor_base.h
rename to editor_modules/editor_code_editor/script_editor_base.h
diff --git a/modules/editor_code_editor/script_editor_plugin.cpp b/editor_modules/editor_code_editor/script_editor_plugin.cpp
similarity index 100%
rename from modules/editor_code_editor/script_editor_plugin.cpp
rename to editor_modules/editor_code_editor/script_editor_plugin.cpp
diff --git a/modules/editor_code_editor/script_editor_plugin.h b/editor_modules/editor_code_editor/script_editor_plugin.h
similarity index 100%
rename from modules/editor_code_editor/script_editor_plugin.h
rename to editor_modules/editor_code_editor/script_editor_plugin.h
diff --git a/modules/editor_code_editor/script_editor_quick_open.cpp b/editor_modules/editor_code_editor/script_editor_quick_open.cpp
similarity index 100%
rename from modules/editor_code_editor/script_editor_quick_open.cpp
rename to editor_modules/editor_code_editor/script_editor_quick_open.cpp
diff --git a/modules/editor_code_editor/script_editor_quick_open.h b/editor_modules/editor_code_editor/script_editor_quick_open.h
similarity index 100%
rename from modules/editor_code_editor/script_editor_quick_open.h
rename to editor_modules/editor_code_editor/script_editor_quick_open.h
diff --git a/modules/editor_code_editor/script_text_editor.cpp b/editor_modules/editor_code_editor/script_text_editor.cpp
similarity index 100%
rename from modules/editor_code_editor/script_text_editor.cpp
rename to editor_modules/editor_code_editor/script_text_editor.cpp
diff --git a/modules/editor_code_editor/script_text_editor.h b/editor_modules/editor_code_editor/script_text_editor.h
similarity index 100%
rename from modules/editor_code_editor/script_text_editor.h
rename to editor_modules/editor_code_editor/script_text_editor.h
diff --git a/modules/editor_code_editor/text_editor.cpp b/editor_modules/editor_code_editor/text_editor.cpp
similarity index 100%
rename from modules/editor_code_editor/text_editor.cpp
rename to editor_modules/editor_code_editor/text_editor.cpp
diff --git a/modules/editor_code_editor/text_editor.h b/editor_modules/editor_code_editor/text_editor.h
similarity index 100%
rename from modules/editor_code_editor/text_editor.h
rename to editor_modules/editor_code_editor/text_editor.h
diff --git a/editor_modules/shader_editor/config.py b/editor_modules/shader_editor/config.py
index f6869b8f2..e2ff28a10 100644
--- a/editor_modules/shader_editor/config.py
+++ b/editor_modules/shader_editor/config.py
@@ -4,6 +4,7 @@ def can_build(env, platform):
   if not env["tools"]:
     return False
 
+  env.module_add_dependencies("text_editor", ["freetype"], True)
   env.module_add_dependencies("shader_editor", ["editor_code_editor"], False)
 
   return True
diff --git a/editor_modules/shader_editor/shader_editor_plugin.cpp b/editor_modules/shader_editor/shader_editor_plugin.cpp
index 9c178237e..98eda0902 100644
--- a/editor_modules/shader_editor/shader_editor_plugin.cpp
+++ b/editor_modules/shader_editor/shader_editor_plugin.cpp
@@ -65,8 +65,8 @@
 #include "servers/rendering/shader_types.h"
 #include "servers/rendering_server.h"
 
-#include "modules/editor_code_editor/goto_line_dialog.h"
-#include "modules/editor_code_editor/find_replace_bar.h"
+#include "editor_code_editor/goto_line_dialog.h"
+#include "editor_code_editor/find_replace_bar.h"
 
 struct ScriptCodeCompletionOption;
 
diff --git a/editor_modules/shader_editor/shader_editor_plugin.h b/editor_modules/shader_editor/shader_editor_plugin.h
index b878d941c..5bad23037 100644
--- a/editor_modules/shader_editor/shader_editor_plugin.h
+++ b/editor_modules/shader_editor/shader_editor_plugin.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "modules/editor_code_editor/code_text_editor.h"
+#include "editor_code_editor/code_text_editor.h"
 #include "editor/editor_plugin.h"
 #include "scene/gui/margin_container.h"
 
diff --git a/editor_modules/text_editor/text_editor_vanilla_editor.cpp b/editor_modules/text_editor/text_editor_vanilla_editor.cpp
index df7262402..a013f7339 100644
--- a/editor_modules/text_editor/text_editor_vanilla_editor.cpp
+++ b/editor_modules/text_editor/text_editor_vanilla_editor.cpp
@@ -14,8 +14,8 @@
 #include "scene/gui/text_edit.h"
 #include "scene/gui/texture_rect.h"
 
-#include "modules/editor_code_editor/code_text_editor.h"
-#include "modules/editor_code_editor/find_replace_bar.h"
+#include "editor_code_editor/code_text_editor.h"
+#include "editor_code_editor/find_replace_bar.h"
 
 #include "scene/resources/dynamic_font.h"
 
diff --git a/main/main.cpp b/main/main.cpp
index 6caf0c8bf..e044d5227 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -86,7 +86,7 @@
 
 #include "modules/modules_enabled.gen.h"
 #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
-#include "modules/editor_code_editor/script_editor.h"
+#include "editor_code_editor/script_editor.h"
 #endif
 
 /* Static members */
diff --git a/modules/cscript/register_types.cpp b/modules/cscript/register_types.cpp
index 44a35b77a..4e3a077a4 100644
--- a/modules/cscript/register_types.cpp
+++ b/modules/cscript/register_types.cpp
@@ -51,7 +51,7 @@ Ref<ResourceFormatSaverCScript> resource_saver_cscript;
 #include "editor/editor_settings.h"
 
 #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
-#include "modules/editor_code_editor/script_editor.h"
+#include "editor_code_editor/script_editor.h"
 #endif
 
 class EditorExportCScript : public EditorExportPlugin {
diff --git a/modules/gdscript/register_types.cpp b/modules/gdscript/register_types.cpp
index d5644f631..e470c6398 100644
--- a/modules/gdscript/register_types.cpp
+++ b/modules/gdscript/register_types.cpp
@@ -51,7 +51,7 @@ Ref<ResourceFormatSaverGDScript> resource_saver_gd;
 #include "editor/gdscript_highlighter.h"
 
 #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
-#include "modules/editor_code_editor/script_editor.h"
+#include "editor_code_editor/script_editor.h"
 #endif
 
 class EditorExportGDScript : public EditorExportPlugin {