diff --git a/SCsub b/SCsub
index 16faea0..b91ccea 100644
--- a/SCsub
+++ b/SCsub
@@ -6,3 +6,6 @@ Import("env_modules")
 env_vs = env_modules.Clone()
 
 env_vs.add_source_files(env.modules_sources, "*.cpp")
+
+if env["tools"]:
+    env_vs.add_source_files(env.modules_sources, "editor/*.cpp")
diff --git a/visual_script_editor.cpp b/editor/visual_script_editor.cpp
similarity index 99%
rename from visual_script_editor.cpp
rename to editor/visual_script_editor.cpp
index c74d6f9..6fa4363 100644
--- a/visual_script_editor.cpp
+++ b/editor/visual_script_editor.cpp
@@ -30,6 +30,10 @@
 
 #include "visual_script_editor.h"
 
+#include "../visual_script_expression.h"
+#include "../visual_script_flow_control.h"
+#include "../visual_script_func_nodes.h"
+#include "../visual_script_nodes.h"
 #include "core/input/input.h"
 #include "core/object/class_db.h"
 #include "core/object/script_language.h"
@@ -39,10 +43,6 @@
 #include "editor/editor_resource_preview.h"
 #include "editor/editor_scale.h"
 #include "scene/main/window.h"
-#include "visual_script_expression.h"
-#include "visual_script_flow_control.h"
-#include "visual_script_func_nodes.h"
-#include "visual_script_nodes.h"
 
 #ifdef TOOLS_ENABLED
 class VisualScriptEditorSignalEdit : public Object {
diff --git a/visual_script_editor.h b/editor/visual_script_editor.h
similarity index 99%
rename from visual_script_editor.h
rename to editor/visual_script_editor.h
index 9467c2d..fd1db2b 100644
--- a/visual_script_editor.h
+++ b/editor/visual_script_editor.h
@@ -31,11 +31,11 @@
 #ifndef VISUALSCRIPT_EDITOR_H
 #define VISUALSCRIPT_EDITOR_H
 
+#include "../visual_script.h"
 #include "editor/create_dialog.h"
 #include "editor/plugins/script_editor_plugin.h"
 #include "editor/property_editor.h"
 #include "scene/gui/graph_edit.h"
-#include "visual_script.h"
 #include "visual_script_property_selector.h"
 
 class VisualScriptEditorSignalEdit;
diff --git a/visual_script_property_selector.cpp b/editor/visual_script_property_selector.cpp
similarity index 98%
rename from visual_script_property_selector.cpp
rename to editor/visual_script_property_selector.cpp
index d8b88d6..ace26bc 100644
--- a/visual_script_property_selector.cpp
+++ b/editor/visual_script_property_selector.cpp
@@ -30,15 +30,15 @@
 
 #include "visual_script_property_selector.h"
 
+#include "../visual_script.h"
+#include "../visual_script_builtin_funcs.h"
+#include "../visual_script_flow_control.h"
+#include "../visual_script_func_nodes.h"
+#include "../visual_script_nodes.h"
 #include "core/os/keyboard.h"
 #include "editor/doc_tools.h"
 #include "editor/editor_node.h"
 #include "editor/editor_scale.h"
-#include "modules/visual_script/visual_script.h"
-#include "modules/visual_script/visual_script_builtin_funcs.h"
-#include "modules/visual_script/visual_script_flow_control.h"
-#include "modules/visual_script/visual_script_func_nodes.h"
-#include "modules/visual_script/visual_script_nodes.h"
 #include "scene/main/node.h"
 #include "scene/main/window.h"
 
diff --git a/visual_script_property_selector.h b/editor/visual_script_property_selector.h
similarity index 100%
rename from visual_script_property_selector.h
rename to editor/visual_script_property_selector.h
diff --git a/register_types.cpp b/register_types.cpp
index 890861c..6f56fbb 100644
--- a/register_types.cpp
+++ b/register_types.cpp
@@ -34,7 +34,6 @@
 #include "core/io/resource_loader.h"
 #include "visual_script.h"
 #include "visual_script_builtin_funcs.h"
-#include "visual_script_editor.h"
 #include "visual_script_expression.h"
 #include "visual_script_flow_control.h"
 #include "visual_script_func_nodes.h"
@@ -42,7 +41,9 @@
 #include "visual_script_yield_nodes.h"
 
 VisualScriptLanguage *visual_script_language = nullptr;
+
 #ifdef TOOLS_ENABLED
+#include "editor/visual_script_editor.h"
 static VisualScriptCustomNodes *vs_custom_nodes_singleton = nullptr;
 #endif