diff --git a/language.version b/language.version
index 142cfb769..5271b256b 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r694 \cu(Thu 15 Dec 17:12:53 CET 2022)\c-";
-SWWM_SHORTVER="\cw1.3pre r694 \cu(2022-12-15 17:12:53)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r695 \cu(Thu 15 Dec 17:15:42 CET 2022)\c-";
+SWWM_SHORTVER="\cw1.3pre r695 \cu(2022-12-15 17:15:42)\c-";
diff --git a/zscript.txt b/zscript.txt
index 8d70ac544..bbabc8018 100644
--- a/zscript.txt
+++ b/zscript.txt
@@ -21,16 +21,15 @@ version "4.10"
 #include "zscript/utility/swwm_utility_map.zsc"
 #include "zscript/utility/swwm_utility_math.zsc"
 #include "zscript/utility/swwm_utility_string.zsc"
-// base code
+// general code
 #include "zscript/swwm_common.zsc"
 #include "zscript/swwm_common_fx.zsc"
-#include "zscript/swwm_handler.zsc"
-#include "zscript/swwm_statichandler.zsc"
 #include "zscript/swwm_thinkers.zsc"
 #include "zscript/swwm_thinkers_player.zsc"
 #include "zscript/swwm_gesture.zsc"
 #include "zscript/swwm_gesture_fx.zsc"
 #include "zscript/swwm_blod.zsc"
+#include "zscript/swwm_monsters.zsc"
 // player code
 #include "zscript/player/swwm_player.zsc"
 #include "zscript/player/swwm_player_anim.zsc"
@@ -44,6 +43,7 @@ version "4.10"
 #include "zscript/player/swwm_player_think.zsc"
 #include "zscript/player/swwm_player_tick.zsc"
 // handler code
+#include "zscript/handler/swwm_handler.zsc"
 #include "zscript/handler/swwm_handler_cheats.zsc"
 #include "zscript/handler/swwm_handler_crosshair.zsc"
 #include "zscript/handler/swwm_handler_damage.zsc"
@@ -60,6 +60,7 @@ version "4.10"
 #include "zscript/handler/swwm_handler_worldload.zsc"
 #include "zscript/handler/swwm_handler_worldthings.zsc"
 #include "zscript/handler/swwm_handler_worldtick.zsc"
+#include "zscript/handler/swwm_statichandler.zsc"
 #include "zscript/handler/swwm_statichandler_achievements.zsc"
 // menu code
 #include "zscript/menu/swwm_menus.zsc"
@@ -153,8 +154,6 @@ version "4.10"
 #include "zscript/weapons/swwm_deathlydeathcannon_altfx.zsc"	// split due to size
 #include "zscript/weapons/swwm_weapons_hud.zsc"
 #include "zscript/weapons/swwm_weapons_canvas.zsc"
-// monsters
-#include "zscript/swwm_monsters.zsc"
 // DLC1 - Weapon Set
 #include "zscript/dlc1/swwm_ammoitems_dlc.zsc"
 #include "zscript/dlc1/swwm_hammertime.zsc"
diff --git a/zscript/swwm_handler.zsc b/zscript/handler/swwm_handler.zsc
similarity index 100%
rename from zscript/swwm_handler.zsc
rename to zscript/handler/swwm_handler.zsc
diff --git a/zscript/swwm_statichandler.zsc b/zscript/handler/swwm_statichandler.zsc
similarity index 100%
rename from zscript/swwm_statichandler.zsc
rename to zscript/handler/swwm_statichandler.zsc