diff --git a/wadsrc/static/zscript.txt b/wadsrc/static/zscript.txt
index 10246e647..da000f758 100644
--- a/wadsrc/static/zscript.txt
+++ b/wadsrc/static/zscript.txt
@@ -1,34 +1,33 @@
 version "4.3"
-#include "zscript/base.zs"
-#include "zscript/dynarrays.zs"
-#include "zscript/constants.zs"
-#include "zscript/events.zs"
-#include "zscript/dictionary.zs"
-#include "zscript/gamescreen.zs"
+#include "zscript/engine/base.zs"
+#include "zscript/engine/dynarrays.zs"
+#include "zscript/engine/inputevents.zs"
+#include "zscript/engine/dictionary.zs"
+
+#include "zscript/engine/ui/menu/colorpickermenu.zs"
+#include "zscript/engine/ui/menu/joystickmenu.zs"
+#include "zscript/engine/ui/menu/listmenu.zs"
+#include "zscript/engine/ui/menu/listmenuitems.zs"
+#include "zscript/engine/ui/menu/loadsavemenu.zs"
+#include "zscript/engine/ui/menu/menu.zs"
+#include "zscript/engine/ui/menu/menuitembase.zs"
+#include "zscript/engine/ui/menu/messagebox.zs"
+#include "zscript/engine/ui/menu/optionmenu.zs"
+#include "zscript/engine/ui/menu/optionmenuitems.zs"
+#include "zscript/engine/ui/menu/reverbedit.zs"
+#include "zscript/engine/ui/menu/textentermenu.zs"
+#include "zscript/engine/ui/menu/menucustomize.zs"
+#include "zscript/engine/ui/menu/imagescroller.zs"
+#include "zscript/engine/ui/menu/search/menu.zs"
+#include "zscript/engine/ui/menu/search/searchfield.zs"
+#include "zscript/engine/ui/menu/search/query.zs"
+#include "zscript/engine/ui/menu/search/anyoralloption.zs"
 
 #include "zscript/engine/ui/statusbar/statusbarcore.zs"
 
+
+#include "zscript/constants.zs"
 #include "zscript/razebase.zs"
-
-#include "zscript/ui/menu/colorpickermenu.zs"
-#include "zscript/ui/menu/joystickmenu.zs"
-#include "zscript/ui/menu/listmenu.zs"
-#include "zscript/ui/menu/listmenuitems.zs"
-#include "zscript/ui/menu/loadsavemenu.zs"
-#include "zscript/ui/menu/menu.zs"
-#include "zscript/ui/menu/menuitembase.zs"
-#include "zscript/ui/menu/messagebox.zs"
-#include "zscript/ui/menu/optionmenu.zs"
-#include "zscript/ui/menu/optionmenuitems.zs"
-#include "zscript/ui/menu/reverbedit.zs"
-#include "zscript/ui/menu/textentermenu.zs"
-#include "zscript/ui/menu/menucustomize.zs"
-#include "zscript/ui/menu/imagescroller.zs"
-#include "zscript/ui/menu/search/menu.zs"
-#include "zscript/ui/menu/search/searchfield.zs"
-#include "zscript/ui/menu/search/query.zs"
-#include "zscript/ui/menu/search/anyoralloption.zs"
-
 #include "zscript/games/duke/ui/menu.zs"
 #include "zscript/games/blood/ui/menu.zs"
 #include "zscript/games/sw/ui/menu.zs"
diff --git a/wadsrc/static/zscript/base.zs b/wadsrc/static/zscript/engine/base.zs
similarity index 100%
rename from wadsrc/static/zscript/base.zs
rename to wadsrc/static/zscript/engine/base.zs
diff --git a/wadsrc/static/zscript/dictionary.zs b/wadsrc/static/zscript/engine/dictionary.zs
similarity index 100%
rename from wadsrc/static/zscript/dictionary.zs
rename to wadsrc/static/zscript/engine/dictionary.zs
diff --git a/wadsrc/static/zscript/dynarrays.zs b/wadsrc/static/zscript/engine/dynarrays.zs
similarity index 100%
rename from wadsrc/static/zscript/dynarrays.zs
rename to wadsrc/static/zscript/engine/dynarrays.zs
diff --git a/wadsrc/static/zscript/events.zs b/wadsrc/static/zscript/engine/inputevents.zs
similarity index 100%
rename from wadsrc/static/zscript/events.zs
rename to wadsrc/static/zscript/engine/inputevents.zs
diff --git a/wadsrc/static/zscript/ui/menu/colorpickermenu.zs b/wadsrc/static/zscript/engine/ui/menu/colorpickermenu.zs
similarity index 100%
rename from wadsrc/static/zscript/ui/menu/colorpickermenu.zs
rename to wadsrc/static/zscript/engine/ui/menu/colorpickermenu.zs
diff --git a/wadsrc/static/zscript/ui/menu/imagescroller.zs b/wadsrc/static/zscript/engine/ui/menu/imagescroller.zs
similarity index 100%
rename from wadsrc/static/zscript/ui/menu/imagescroller.zs
rename to wadsrc/static/zscript/engine/ui/menu/imagescroller.zs
diff --git a/wadsrc/static/zscript/ui/menu/joystickmenu.zs b/wadsrc/static/zscript/engine/ui/menu/joystickmenu.zs
similarity index 100%
rename from wadsrc/static/zscript/ui/menu/joystickmenu.zs
rename to wadsrc/static/zscript/engine/ui/menu/joystickmenu.zs
diff --git a/wadsrc/static/zscript/ui/menu/listmenu.zs b/wadsrc/static/zscript/engine/ui/menu/listmenu.zs
similarity index 100%
rename from wadsrc/static/zscript/ui/menu/listmenu.zs
rename to wadsrc/static/zscript/engine/ui/menu/listmenu.zs
diff --git a/wadsrc/static/zscript/ui/menu/listmenuitems.zs b/wadsrc/static/zscript/engine/ui/menu/listmenuitems.zs
similarity index 100%
rename from wadsrc/static/zscript/ui/menu/listmenuitems.zs
rename to wadsrc/static/zscript/engine/ui/menu/listmenuitems.zs
diff --git a/wadsrc/static/zscript/ui/menu/loadsavemenu.zs b/wadsrc/static/zscript/engine/ui/menu/loadsavemenu.zs
similarity index 100%
rename from wadsrc/static/zscript/ui/menu/loadsavemenu.zs
rename to wadsrc/static/zscript/engine/ui/menu/loadsavemenu.zs
diff --git a/wadsrc/static/zscript/ui/menu/menu.zs b/wadsrc/static/zscript/engine/ui/menu/menu.zs
similarity index 100%
rename from wadsrc/static/zscript/ui/menu/menu.zs
rename to wadsrc/static/zscript/engine/ui/menu/menu.zs
diff --git a/wadsrc/static/zscript/ui/menu/menucustomize.zs b/wadsrc/static/zscript/engine/ui/menu/menucustomize.zs
similarity index 100%
rename from wadsrc/static/zscript/ui/menu/menucustomize.zs
rename to wadsrc/static/zscript/engine/ui/menu/menucustomize.zs
diff --git a/wadsrc/static/zscript/ui/menu/menuitembase.zs b/wadsrc/static/zscript/engine/ui/menu/menuitembase.zs
similarity index 100%
rename from wadsrc/static/zscript/ui/menu/menuitembase.zs
rename to wadsrc/static/zscript/engine/ui/menu/menuitembase.zs
diff --git a/wadsrc/static/zscript/ui/menu/messagebox.zs b/wadsrc/static/zscript/engine/ui/menu/messagebox.zs
similarity index 100%
rename from wadsrc/static/zscript/ui/menu/messagebox.zs
rename to wadsrc/static/zscript/engine/ui/menu/messagebox.zs
diff --git a/wadsrc/static/zscript/ui/menu/optionmenu.zs b/wadsrc/static/zscript/engine/ui/menu/optionmenu.zs
similarity index 100%
rename from wadsrc/static/zscript/ui/menu/optionmenu.zs
rename to wadsrc/static/zscript/engine/ui/menu/optionmenu.zs
diff --git a/wadsrc/static/zscript/ui/menu/optionmenuitems.zs b/wadsrc/static/zscript/engine/ui/menu/optionmenuitems.zs
similarity index 100%
rename from wadsrc/static/zscript/ui/menu/optionmenuitems.zs
rename to wadsrc/static/zscript/engine/ui/menu/optionmenuitems.zs
diff --git a/wadsrc/static/zscript/ui/menu/reverbedit.zs b/wadsrc/static/zscript/engine/ui/menu/reverbedit.zs
similarity index 100%
rename from wadsrc/static/zscript/ui/menu/reverbedit.zs
rename to wadsrc/static/zscript/engine/ui/menu/reverbedit.zs
diff --git a/wadsrc/static/zscript/ui/menu/search/anyoralloption.zs b/wadsrc/static/zscript/engine/ui/menu/search/anyoralloption.zs
similarity index 100%
rename from wadsrc/static/zscript/ui/menu/search/anyoralloption.zs
rename to wadsrc/static/zscript/engine/ui/menu/search/anyoralloption.zs
diff --git a/wadsrc/static/zscript/ui/menu/search/menu.zs b/wadsrc/static/zscript/engine/ui/menu/search/menu.zs
similarity index 100%
rename from wadsrc/static/zscript/ui/menu/search/menu.zs
rename to wadsrc/static/zscript/engine/ui/menu/search/menu.zs
diff --git a/wadsrc/static/zscript/ui/menu/search/query.zs b/wadsrc/static/zscript/engine/ui/menu/search/query.zs
similarity index 100%
rename from wadsrc/static/zscript/ui/menu/search/query.zs
rename to wadsrc/static/zscript/engine/ui/menu/search/query.zs
diff --git a/wadsrc/static/zscript/ui/menu/search/searchfield.zs b/wadsrc/static/zscript/engine/ui/menu/search/searchfield.zs
similarity index 100%
rename from wadsrc/static/zscript/ui/menu/search/searchfield.zs
rename to wadsrc/static/zscript/engine/ui/menu/search/searchfield.zs
diff --git a/wadsrc/static/zscript/ui/menu/textentermenu.zs b/wadsrc/static/zscript/engine/ui/menu/textentermenu.zs
similarity index 100%
rename from wadsrc/static/zscript/ui/menu/textentermenu.zs
rename to wadsrc/static/zscript/engine/ui/menu/textentermenu.zs