diff --git a/Source/Simba.lpi b/Source/Simba.lpi
index c695720a6..e7aa1d004 100644
--- a/Source/Simba.lpi
+++ b/Source/Simba.lpi
@@ -48,7 +48,7 @@
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir);$(LazarusDir)/components/synedit;../Third-Party/lape;editor"/>
             <Libraries Value="../Third-Party/lape/extensions/ffi/bin/win32"/>
-            <OtherUnitFiles Value="$(ProjPath);script;forms;codetools;targets;matchtemplate;algorithms;editor;finders;script/imports/lcl;script/imports/simba;script/imports/simbaclasses;package;../Third-Party;../Third-Party/lape;../Third-Party/lape/extensions/ffi;imagebox;colormath;components;image"/>
+            <OtherUnitFiles Value="$(ProjPath);../Third-Party;../Third-Party/lape;../Third-Party/lape/extensions/ffi;script/imports;script/imports/lcl;script;forms;codetools;targets;matchtemplate;algorithms;editor;finders;package;imagebox;colormath;components;image"/>
             <UnitOutputDirectory Value="$(ProjPath)../build/$(BuildMode)/$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
           <Parsing>
@@ -93,7 +93,7 @@
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir);$(LazarusDir)/components/synedit;../Third-Party/lape;editor"/>
             <Libraries Value="../Third-Party/lape/extensions/ffi/bin/win64"/>
-            <OtherUnitFiles Value="$(ProjPath);script;forms;codetools;targets;matchtemplate;algorithms;editor;finders;script/imports/lcl;script/imports/simba;script/imports/simbaclasses;package;../Third-Party;../Third-Party/lape;../Third-Party/lape/extensions/ffi;imagebox;colormath;components;image"/>
+            <OtherUnitFiles Value="$(ProjPath);../Third-Party;../Third-Party/lape;../Third-Party/lape/extensions/ffi;script/imports;script/imports/lcl;script;forms;codetools;targets;matchtemplate;algorithms;editor;finders;package;imagebox;colormath;components;image"/>
             <UnitOutputDirectory Value="$(ProjPath)../build/$(BuildMode)/$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
           <Parsing>
@@ -141,7 +141,7 @@
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir);$(LazarusDir)/components/synedit;../Third-Party/lape;editor"/>
-            <OtherUnitFiles Value="$(ProjPath);script;forms;codetools;targets;matchtemplate;algorithms;editor;finders;script/imports/lcl;script/imports/simba;script/imports/simbaclasses;package;../Third-Party;../Third-Party/lape;../Third-Party/lape/extensions/ffi;imagebox;colormath;components;image"/>
+            <OtherUnitFiles Value="$(ProjPath);../Third-Party;../Third-Party/lape;../Third-Party/lape/extensions/ffi;script/imports;script/imports/lcl;script;forms;codetools;targets;matchtemplate;algorithms;editor;finders;package;imagebox;colormath;components;image"/>
             <UnitOutputDirectory Value="$(ProjPath)../build/$(BuildMode)/$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
           <Parsing>
@@ -184,7 +184,7 @@
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir);$(LazarusDir)/components/synedit;../Third-Party/lape;editor"/>
-            <OtherUnitFiles Value="$(ProjPath);script;forms;codetools;targets;matchtemplate;algorithms;editor;finders;script/imports/lcl;script/imports/simba;script/imports/simbaclasses;package;../Third-Party;../Third-Party/lape;../Third-Party/lape/extensions/ffi;imagebox;colormath;components;image"/>
+            <OtherUnitFiles Value="$(ProjPath);../Third-Party;../Third-Party/lape;../Third-Party/lape/extensions/ffi;script/imports;script/imports/lcl;script;forms;codetools;targets;matchtemplate;algorithms;editor;finders;package;imagebox;colormath;components;image"/>
             <UnitOutputDirectory Value="$(ProjPath)../build/$(BuildMode)/$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
           <Parsing>
@@ -226,7 +226,7 @@
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir);$(LazarusDir)/components/synedit;../Third-Party/lape;editor"/>
-            <OtherUnitFiles Value="$(ProjPath);script;forms;codetools;targets;matchtemplate;algorithms;editor;finders;script/imports/lcl;script/imports/simba;script/imports/simbaclasses;package;../Third-Party;../Third-Party/lape;../Third-Party/lape/extensions/ffi;imagebox;colormath;components;image"/>
+            <OtherUnitFiles Value="$(ProjPath);../Third-Party;../Third-Party/lape;../Third-Party/lape/extensions/ffi;script/imports;script/imports/lcl;script;forms;codetools;targets;matchtemplate;algorithms;editor;finders;package;imagebox;colormath;components;image"/>
             <UnitOutputDirectory Value="$(ProjPath)../build/$(BuildMode)/$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
           <Parsing>
@@ -274,7 +274,7 @@
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir);$(LazarusDir)/components/synedit;../Third-Party/lape;editor"/>
-            <OtherUnitFiles Value="$(ProjPath);script;forms;codetools;targets;matchtemplate;algorithms;editor;finders;script/imports/lcl;script/imports/simba;script/imports/simbaclasses;package;../Third-Party;../Third-Party/lape;../Third-Party/lape/extensions/ffi;imagebox;colormath;components;image"/>
+            <OtherUnitFiles Value="$(ProjPath);../Third-Party;../Third-Party/lape;../Third-Party/lape/extensions/ffi;script/imports;script/imports/lcl;script;forms;codetools;targets;matchtemplate;algorithms;editor;finders;package;imagebox;colormath;components;image"/>
             <UnitOutputDirectory Value="$(ProjPath)../build/$(BuildMode)/$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
           <Parsing>
@@ -1108,7 +1108,7 @@
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir);$(LazarusDir)/components/synedit;../Third-Party/lape;editor"/>
       <Libraries Value="../Third-Party/lape/extensions/ffi/bin/win64"/>
-      <OtherUnitFiles Value="$(ProjPath);script;forms;codetools;targets;matchtemplate;algorithms;editor;finders;script/imports/lcl;script/imports/simba;script/imports/simbaclasses;package;../Third-Party;../Third-Party/lape;../Third-Party/lape/extensions/ffi;imagebox;colormath;components;image"/>
+      <OtherUnitFiles Value="$(ProjPath);../Third-Party;../Third-Party/lape;../Third-Party/lape/extensions/ffi;script/imports;script/imports/lcl;script;forms;codetools;targets;matchtemplate;algorithms;editor;finders;package;imagebox;colormath;components;image"/>
       <UnitOutputDirectory Value="$(ProjPath)../build/$(BuildMode)/$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
diff --git a/Source/Simba.lpr b/Source/Simba.lpr
index 90e6ee80b..7a343c766 100644
--- a/Source/Simba.lpr
+++ b/Source/Simba.lpr
@@ -17,8 +17,7 @@
   simba.notesform, simba.settingsform, simba.associate, simba.openexampleform,
   simba.package_form, simba.shapeboxform, simba.backupsform, simba.findinfilesform,
   simba.downloadsimbaform,
-  simba.compiler_dump, simba.plugin_dump,
-  simba.scriptthread,
+  simba.compiler_dump, simba.plugin_dump, simba.script_runner,
   simba.ide_initialization, simba.ide_analytics, simba.ide_codetools_setup,
   simba.openssl;
 
diff --git a/Source/script/imports/simba/simba.import_atpa.pas b/Source/script/imports/simba.import_atpa.pas
similarity index 100%
rename from Source/script/imports/simba/simba.import_atpa.pas
rename to Source/script/imports/simba.import_atpa.pas
diff --git a/Source/script/imports/simba/simba.import_box.pas b/Source/script/imports/simba.import_box.pas
similarity index 100%
rename from Source/script/imports/simba/simba.import_box.pas
rename to Source/script/imports/simba.import_box.pas
diff --git a/Source/script/imports/simba/simba.import_boxarray.pas b/Source/script/imports/simba.import_boxarray.pas
similarity index 100%
rename from Source/script/imports/simba/simba.import_boxarray.pas
rename to Source/script/imports/simba.import_boxarray.pas
diff --git a/Source/script/imports/simba/simba.import_circle.pas b/Source/script/imports/simba.import_circle.pas
similarity index 100%
rename from Source/script/imports/simba/simba.import_circle.pas
rename to Source/script/imports/simba.import_circle.pas
diff --git a/Source/script/imports/simba/simba.import_colormath.pas b/Source/script/imports/simba.import_colormath.pas
similarity index 100%
rename from Source/script/imports/simba/simba.import_colormath.pas
rename to Source/script/imports/simba.import_colormath.pas
diff --git a/Source/script/imports/simba/simba.import_debugimage.pas b/Source/script/imports/simba.import_debugimage.pas
similarity index 100%
rename from Source/script/imports/simba/simba.import_debugimage.pas
rename to Source/script/imports/simba.import_debugimage.pas
diff --git a/Source/script/imports/simba/simba.import_dialogs.pas b/Source/script/imports/simba.import_dialogs.pas
similarity index 100%
rename from Source/script/imports/simba/simba.import_dialogs.pas
rename to Source/script/imports/simba.import_dialogs.pas
diff --git a/Source/script/imports/simbaclasses/simba.import_class_dtm.pas b/Source/script/imports/simba.import_dtm.pas
similarity index 99%
rename from Source/script/imports/simbaclasses/simba.import_class_dtm.pas
rename to Source/script/imports/simba.import_dtm.pas
index 37370c6ce..bcbd9333d 100644
--- a/Source/script/imports/simbaclasses/simba.import_class_dtm.pas
+++ b/Source/script/imports/simba.import_dtm.pas
@@ -1,4 +1,4 @@
-unit simba.import_class_dtm;
+unit simba.import_dtm;
 
 {$i simba.inc}
 
diff --git a/Source/script/imports/simba/simba.import_encoding.pas b/Source/script/imports/simba.import_encoding.pas
similarity index 100%
rename from Source/script/imports/simba/simba.import_encoding.pas
rename to Source/script/imports/simba.import_encoding.pas
diff --git a/Source/script/imports/simbaclasses/simba.import_externalimage.pas b/Source/script/imports/simba.import_externalimage.pas
similarity index 100%
rename from Source/script/imports/simbaclasses/simba.import_externalimage.pas
rename to Source/script/imports/simba.import_externalimage.pas
diff --git a/Source/script/imports/simba/simba.import_file.pas b/Source/script/imports/simba.import_file.pas
similarity index 100%
rename from Source/script/imports/simba/simba.import_file.pas
rename to Source/script/imports/simba.import_file.pas
diff --git a/Source/script/imports/simba/simba.import_finder.pas b/Source/script/imports/simba.import_finder.pas
similarity index 100%
rename from Source/script/imports/simba/simba.import_finder.pas
rename to Source/script/imports/simba.import_finder.pas
diff --git a/Source/script/imports/simbaclasses/simba.import_class_image.pas b/Source/script/imports/simba.import_image.pas
similarity index 99%
rename from Source/script/imports/simbaclasses/simba.import_class_image.pas
rename to Source/script/imports/simba.import_image.pas
index a1ee5a3bb..68fad2d39 100644
--- a/Source/script/imports/simbaclasses/simba.import_class_image.pas
+++ b/Source/script/imports/simba.import_image.pas
@@ -1,4 +1,4 @@
-unit simba.import_class_image;
+unit simba.import_image;
 
 {$i simba.inc}
 
diff --git a/Source/script/imports/simbaclasses/simba.import_class_imagebox.pas b/Source/script/imports/simba.import_imagebox.pas
similarity index 99%
rename from Source/script/imports/simbaclasses/simba.import_class_imagebox.pas
rename to Source/script/imports/simba.import_imagebox.pas
index 6e858e3dc..ddc003dfd 100644
--- a/Source/script/imports/simbaclasses/simba.import_class_imagebox.pas
+++ b/Source/script/imports/simba.import_imagebox.pas
@@ -1,4 +1,4 @@
-unit simba.import_class_imagebox;
+unit simba.import_imagebox;
 
 {$i simba.inc}
 
diff --git a/Source/script/imports/simba/simba.import_input.pas b/Source/script/imports/simba.import_input.pas
similarity index 100%
rename from Source/script/imports/simba/simba.import_input.pas
rename to Source/script/imports/simba.import_input.pas
diff --git a/Source/script/imports/simba/simba.import_internal.pas b/Source/script/imports/simba.import_internal.pas
similarity index 100%
rename from Source/script/imports/simba/simba.import_internal.pas
rename to Source/script/imports/simba.import_internal.pas
diff --git a/Source/script/imports/simbaclasses/simba.import_class_json.pas b/Source/script/imports/simba.import_json.pas
similarity index 99%
rename from Source/script/imports/simbaclasses/simba.import_class_json.pas
rename to Source/script/imports/simba.import_json.pas
index 164fd754f..f9dd8a019 100644
--- a/Source/script/imports/simbaclasses/simba.import_class_json.pas
+++ b/Source/script/imports/simba.import_json.pas
@@ -1,4 +1,4 @@
-unit simba.import_class_json;
+unit simba.import_json;
 
 {$i simba.inc}
 
diff --git a/Source/script/imports/simba/simba.import_matchtemplate.pas b/Source/script/imports/simba.import_matchtemplate.pas
similarity index 100%
rename from Source/script/imports/simba/simba.import_matchtemplate.pas
rename to Source/script/imports/simba.import_matchtemplate.pas
diff --git a/Source/script/imports/simba/simba.import_math.pas b/Source/script/imports/simba.import_math.pas
similarity index 100%
rename from Source/script/imports/simba/simba.import_math.pas
rename to Source/script/imports/simba.import_math.pas
diff --git a/Source/script/imports/simba/simba.import_matrix.pas b/Source/script/imports/simba.import_matrix.pas
similarity index 100%
rename from Source/script/imports/simba/simba.import_matrix.pas
rename to Source/script/imports/simba.import_matrix.pas
diff --git a/Source/script/imports/simba/simba.import_misc.pas b/Source/script/imports/simba.import_misc.pas
similarity index 100%
rename from Source/script/imports/simba/simba.import_misc.pas
rename to Source/script/imports/simba.import_misc.pas
diff --git a/Source/script/imports/simba/simba.import_point.pas b/Source/script/imports/simba.import_point.pas
similarity index 100%
rename from Source/script/imports/simba/simba.import_point.pas
rename to Source/script/imports/simba.import_point.pas
diff --git a/Source/script/imports/simba/simba.import_pointbuffer.pas b/Source/script/imports/simba.import_pointbuffer.pas
similarity index 100%
rename from Source/script/imports/simba/simba.import_pointbuffer.pas
rename to Source/script/imports/simba.import_pointbuffer.pas
diff --git a/Source/script/imports/simba/simba.import_process.pas b/Source/script/imports/simba.import_process.pas
similarity index 100%
rename from Source/script/imports/simba/simba.import_process.pas
rename to Source/script/imports/simba.import_process.pas
diff --git a/Source/script/imports/simba/simba.import_quad.pas b/Source/script/imports/simba.import_quad.pas
similarity index 100%
rename from Source/script/imports/simba/simba.import_quad.pas
rename to Source/script/imports/simba.import_quad.pas
diff --git a/Source/script/imports/simba/simba.import_random.pas b/Source/script/imports/simba.import_random.pas
similarity index 100%
rename from Source/script/imports/simba/simba.import_random.pas
rename to Source/script/imports/simba.import_random.pas
diff --git a/Source/script/imports/simba/simba.import_script.pas b/Source/script/imports/simba.import_script.pas
similarity index 100%
rename from Source/script/imports/simba/simba.import_script.pas
rename to Source/script/imports/simba.import_script.pas
diff --git a/Source/script/imports/simbaclasses/simba.import_class_shapebox.pas b/Source/script/imports/simba.import_shapebox.pas
similarity index 99%
rename from Source/script/imports/simbaclasses/simba.import_class_shapebox.pas
rename to Source/script/imports/simba.import_shapebox.pas
index 73367e231..2ce944cdc 100644
--- a/Source/script/imports/simbaclasses/simba.import_class_shapebox.pas
+++ b/Source/script/imports/simba.import_shapebox.pas
@@ -1,4 +1,4 @@
-unit simba.import_class_shapebox;
+unit simba.import_shapebox;
 
 {$i simba.inc}
 
diff --git a/Source/script/imports/simba/simba.import_slacktree.pas b/Source/script/imports/simba.import_slacktree.pas
similarity index 100%
rename from Source/script/imports/simba/simba.import_slacktree.pas
rename to Source/script/imports/simba.import_slacktree.pas
diff --git a/Source/script/imports/simba/simba.import_string.pas b/Source/script/imports/simba.import_string.pas
similarity index 100%
rename from Source/script/imports/simba/simba.import_string.pas
rename to Source/script/imports/simba.import_string.pas
diff --git a/Source/script/imports/simba/simba.import_system.pas b/Source/script/imports/simba.import_system.pas
similarity index 100%
rename from Source/script/imports/simba/simba.import_system.pas
rename to Source/script/imports/simba.import_system.pas
diff --git a/Source/script/imports/simba/simba.import_target.pas b/Source/script/imports/simba.import_target.pas
similarity index 100%
rename from Source/script/imports/simba/simba.import_target.pas
rename to Source/script/imports/simba.import_target.pas
diff --git a/Source/script/imports/simba/simba.import_threading.pas b/Source/script/imports/simba.import_threading.pas
similarity index 100%
rename from Source/script/imports/simba/simba.import_threading.pas
rename to Source/script/imports/simba.import_threading.pas
diff --git a/Source/script/imports/simba/simba.import_timing.pas b/Source/script/imports/simba.import_timing.pas
similarity index 100%
rename from Source/script/imports/simba/simba.import_timing.pas
rename to Source/script/imports/simba.import_timing.pas
diff --git a/Source/script/imports/simba/simba.import_tpa.pas b/Source/script/imports/simba.import_tpa.pas
similarity index 100%
rename from Source/script/imports/simba/simba.import_tpa.pas
rename to Source/script/imports/simba.import_tpa.pas
diff --git a/Source/script/imports/simba/simba.import_variant.pas b/Source/script/imports/simba.import_variant.pas
similarity index 100%
rename from Source/script/imports/simba/simba.import_variant.pas
rename to Source/script/imports/simba.import_variant.pas
diff --git a/Source/script/imports/simba/simba.import_web.pas b/Source/script/imports/simba.import_web.pas
similarity index 100%
rename from Source/script/imports/simba/simba.import_web.pas
rename to Source/script/imports/simba.import_web.pas
diff --git a/Source/script/imports/simba/simba.import_windowhandle.pas b/Source/script/imports/simba.import_windowhandle.pas
similarity index 100%
rename from Source/script/imports/simba/simba.import_windowhandle.pas
rename to Source/script/imports/simba.import_windowhandle.pas
diff --git a/Source/script/simba.script.pas b/Source/script/simba.script.pas
index 718550672..fd2b2e330 100644
--- a/Source/script/simba.script.pas
+++ b/Source/script/simba.script.pas
@@ -285,6 +285,8 @@ constructor TSimbaScript.Create(FileName: String; Communication: TSimbaScriptCom
 
   FState := bTrue;
 
+  FSimbaCommunication := Communication;
+
   FScriptFileName := FileName;
   FScript := TSimbaFile.FileRead(FileName);
 end;
diff --git a/Source/script/simba.script_imports.pas b/Source/script/simba.script_imports.pas
index e48aaafb0..9767e5d49 100644
--- a/Source/script/simba.script_imports.pas
+++ b/Source/script/simba.script_imports.pas
@@ -29,8 +29,8 @@ implementation
   simba.import_lcl_comctrls, simba.import_lcl_misc,
 
   // Simba classes
-  simba.import_class_image, simba.import_externalimage, simba.import_class_dtm, simba.import_matchtemplate,
-  simba.import_class_json, simba.import_class_imagebox, simba.import_class_shapebox,
+  simba.import_image, simba.import_externalimage, simba.import_dtm, simba.import_matchtemplate,
+  simba.import_json, simba.import_imagebox, simba.import_shapebox,
 
   // Simba
   simba.import_timing, simba.import_tpa, simba.import_atpa, simba.import_encoding,
diff --git a/Source/script/simba.scriptthread.pas b/Source/script/simba.script_runner.pas
similarity index 99%
rename from Source/script/simba.scriptthread.pas
rename to Source/script/simba.script_runner.pas
index f7030421a..6b153a326 100644
--- a/Source/script/simba.scriptthread.pas
+++ b/Source/script/simba.script_runner.pas
@@ -3,7 +3,7 @@
   Project: Simba (https://github.com/MerlijnWajer/Simba)
   License: GNU General Public License (https://www.gnu.org/licenses/gpl-3.0)
 }
-unit simba.scriptthread;
+unit simba.script_runner;
 
 {$i simba.inc}