diff --git a/achievements.lst b/achievements.lst
index bfade071a..443867740 100644
--- a/achievements.lst
+++ b/achievements.lst
@@ -1,12 +1,12 @@
 # achievements listed here
-# format: "basename,maxval,hasformat"
+# format: "basename,maxval,hasformat,gametype"
 #  basename: the base name used to construct cvars and localization strings
 #  maxval: limit progress value (if any), a value of -1 means it needs special
 #          handling in zscript (usually for cases where this is dynamic, like
 #          the "all collectibles" achievement), and a value below -1 indicates
 #          this is a bitfield, where abs(maxval) bits must be set
-#  hasformat: the TXT string has a %d in it to substitute for maxval
-#  gametype: the game this belongs to (any, doom, heretic, hexen, raven, etc.)
+#  hasformat: TXT string has a %s in it to substitute for a formatted maxval
+#  gametype: game this belongs to (any, doom, heretic, hexen, raven, nothexen)
 allcoll,-1,no,any
 allitems,100,yes,nothexen
 allkills,100,yes,nothexen
diff --git a/gldefs.txt b/gldefs.txt
new file mode 100644
index 000000000..352441709
--- /dev/null
+++ b/gldefs.txt
@@ -0,0 +1,28 @@
+// base stuff
+#include "gldefs/pp.txt"
+#include "gldefs/envmaps.txt"
+#include "gldefs/misc.txt"
+#include "gldefs/demolitionist.txt"
+// items
+#include "gldefs/items/ammo.txt"
+#include "gldefs/items/pickups.txt"
+#include "gldefs/items/keys.txt"
+#include "gldefs/items/funstuff.txt"
+// weapons
+#include "gldefs/weapons/deepimpact.txt"
+#include "gldefs/weapons/explodiumgun.txt"
+#include "gldefs/weapons/spreadgun.txt"
+#include "gldefs/weapons/wallbuster.txt"
+#include "gldefs/weapons/eviscerator.txt"
+#include "gldefs/weapons/hellblazer.txt"
+#include "gldefs/weapons/sparkster.txt"
+#include "gldefs/weapons/silverbullet.txt"
+#include "gldefs/weapons/candygun.txt"
+#include "gldefs/weapons/ynykron.txt"
+// dlc weaponset
+#include "gldefs/dlc1/dlcammo.txt"
+#include "gldefs/dlc1/hammer.txt"
+#include "gldefs/dlc1/plasmablast.txt"
+#include "gldefs/dlc1/sheenhmg.txt"
+#include "gldefs/dlc1/quadravol.txt"
+#include "gldefs/dlc1/mortalrifle.txt"
diff --git a/gldefs.demolitionist b/gldefs/demolitionist.txt
similarity index 99%
rename from gldefs.demolitionist
rename to gldefs/demolitionist.txt
index 1b3234cc2..7b70e9c46 100644
--- a/gldefs.demolitionist
+++ b/gldefs/demolitionist.txt
@@ -1,3 +1,5 @@
+// player
+
 Brightmap Texture "models/DemoFace_Blank.png"
 {
 	Map "models/DemoFace_bright.png"
diff --git a/gldefs.dlcammo b/gldefs/dlc1/dlcammo.txt
similarity index 99%
rename from gldefs.dlcammo
rename to gldefs/dlc1/dlcammo.txt
index f6760c036..1df76c085 100644
--- a/gldefs.dlcammo
+++ b/gldefs/dlc1/dlcammo.txt
@@ -1,3 +1,5 @@
+// dlc ammunition
+
 HardwareShader Texture "models/SheenBullet.png"
 {
 	Shader "shaders/glsl/Envmask.fp"
diff --git a/gldefs.hammer b/gldefs/dlc1/hammer.txt
similarity index 94%
rename from gldefs.hammer
rename to gldefs/dlc1/hammer.txt
index 3b73ae605..516e34b53 100644
--- a/gldefs.hammer
+++ b/gldefs/dlc1/hammer.txt
@@ -1,3 +1,5 @@
+// itamex hammer
+
 HardwareShader Texture "models/CombatHammer.png"
 {
 	Shader "shaders/glsl/Envmask.fp"
diff --git a/gldefs.mortalrifle b/gldefs/dlc1/mortalrifle.txt
similarity index 99%
rename from gldefs.mortalrifle
rename to gldefs/dlc1/mortalrifle.txt
index c005d9e73..25659d5fe 100644
--- a/gldefs.mortalrifle
+++ b/gldefs/dlc1/mortalrifle.txt
@@ -1,3 +1,5 @@
+// mortal rifle
+
 Brightmap Texture "models/MortalSight.png"
 {
 	Map "brightmaps/fullbright.png"
diff --git a/gldefs.plasmablast b/gldefs/dlc1/plasmablast.txt
similarity index 98%
rename from gldefs.plasmablast
rename to gldefs/dlc1/plasmablast.txt
index 1a78dc461..9475bb953 100644
--- a/gldefs.plasmablast
+++ b/gldefs/dlc1/plasmablast.txt
@@ -1,3 +1,5 @@
+// plasma blaster
+
 HardwareShader Texture "models/PlasmaBlast.png"
 {
 	Shader "shaders/glsl/Envmask.fp"
diff --git a/gldefs.quadravol b/gldefs/dlc1/quadravol.txt
similarity index 98%
rename from gldefs.quadravol
rename to gldefs/dlc1/quadravol.txt
index 6bde3b43d..b1cf74392 100644
--- a/gldefs.quadravol
+++ b/gldefs/dlc1/quadravol.txt
@@ -1,3 +1,5 @@
+// quadravol
+
 HardwareShader Texture "models/Quadravol.png"
 {
 	Shader "shaders/glsl/Envmask.fp"
diff --git a/gldefs.sheenhmg b/gldefs/dlc1/sheenhmg.txt
similarity index 98%
rename from gldefs.sheenhmg
rename to gldefs/dlc1/sheenhmg.txt
index 81b90c013..11a5f26b6 100644
--- a/gldefs.sheenhmg
+++ b/gldefs/dlc1/sheenhmg.txt
@@ -1,3 +1,5 @@
+// sheen hmg
+
 HardwareShader Texture "models/SheenHMG.png"
 {
 	Shader "shaders/glsl/Envmask.fp"
diff --git a/gldefs.envmaps b/gldefs/envmaps.txt
similarity index 99%
rename from gldefs.envmaps
rename to gldefs/envmaps.txt
index 11803955c..3012061bc 100644
--- a/gldefs.envmaps
+++ b/gldefs/envmaps.txt
@@ -1,3 +1,5 @@
+// base envmaps
+
 HardwareShader Texture "models/envmap/blodenv.png"
 {
 	Shader "shaders/glsl/Envmap.fp"
diff --git a/gldefs.ammo b/gldefs/items/ammo.txt
similarity index 99%
rename from gldefs.ammo
rename to gldefs/items/ammo.txt
index 1f858b9b5..9251b1321 100644
--- a/gldefs.ammo
+++ b/gldefs/items/ammo.txt
@@ -1,3 +1,5 @@
+// ammunition
+
 HardwareShader Texture "models/ExplodiumBullet.png"
 {
 	Shader "shaders/glsl/Envmask.fp"
diff --git a/gldefs.funstuff b/gldefs/items/funstuff.txt
similarity index 98%
rename from gldefs.funstuff
rename to gldefs/items/funstuff.txt
index c7eeb07e1..3fb9d1dbb 100644
--- a/gldefs.funstuff
+++ b/gldefs/items/funstuff.txt
@@ -1,3 +1,5 @@
+// collectibles and more
+
 Brightmap Texture "models/SayaBean.png"
 {
 	Map "models/SayaBean_bright.png"
diff --git a/gldefs.keys b/gldefs/items/keys.txt
similarity index 99%
rename from gldefs.keys
rename to gldefs/items/keys.txt
index 0e20eff49..d759743ac 100644
--- a/gldefs.keys
+++ b/gldefs/items/keys.txt
@@ -1,3 +1,5 @@
+// keys
+
 Brightmap Texture "models/DoomRedKey.png"
 {
 	map "models/DoomKey_bright.png"
diff --git a/gldefs.pickups b/gldefs/items/pickups.txt
similarity index 99%
rename from gldefs.pickups
rename to gldefs/items/pickups.txt
index c7ca7a3a1..136d62442 100644
--- a/gldefs.pickups
+++ b/gldefs/items/pickups.txt
@@ -1,3 +1,5 @@
+// various pickups
+
 Brightmap Texture "models/Nugget_Armor.png"
 {
 	map "models/Nugget_mask.png"
diff --git a/gldefs.misc b/gldefs/misc.txt
similarity index 99%
rename from gldefs.misc
rename to gldefs/misc.txt
index 22dce6365..ad8e2f9c7 100644
--- a/gldefs.misc
+++ b/gldefs/misc.txt
@@ -1,3 +1,5 @@
+// placeholders
+
 HardwareShader Texture "chiptilb"
 {
 	Shader "shaders/glsl/Envmask.fp"
@@ -62,6 +64,9 @@ HardwareShader Texture "chiptily"
 	Texture "rimtex" "models/envmap/goldrim.png"
 	Define "RIM_LIGHTING"
 }
+
+// interface
+
 HardwareShader Texture "graphics/HUD/EnemyBarS.png"
 {
 	Shader "shaders/glsl/Fuzz.fp"
diff --git a/gldefs.pp b/gldefs/pp.txt
similarity index 99%
rename from gldefs.pp
rename to gldefs/pp.txt
index 868b1b28c..90a1e96d0 100644
--- a/gldefs.pp
+++ b/gldefs/pp.txt
@@ -1,3 +1,5 @@
+// postprocess shaders
+
 HardwareShader PostProcess beforebloom
 {
 	Name "WaterWarp"
diff --git a/gldefs.candygun b/gldefs/weapons/candygun.txt
similarity index 98%
rename from gldefs.candygun
rename to gldefs/weapons/candygun.txt
index 01fde6025..e789de9a7 100644
--- a/gldefs.candygun
+++ b/gldefs/weapons/candygun.txt
@@ -1,3 +1,5 @@
+// candy gun
+
 HardwareShader Texture "models/CandyGun.png"
 {
 	Shader "shaders/glsl/Envmask.fp"
diff --git a/gldefs.deepimpact b/gldefs/weapons/deepimpact.txt
similarity index 93%
rename from gldefs.deepimpact
rename to gldefs/weapons/deepimpact.txt
index 86e24e23e..9775e4744 100644
--- a/gldefs.deepimpact
+++ b/gldefs/weapons/deepimpact.txt
@@ -1,3 +1,5 @@
+// deep impact
+
 HardwareShader Texture "models/DeepImpact.png"
 {
 	Shader "shaders/glsl/Envmask.fp"
diff --git a/gldefs.eviscerator b/gldefs/weapons/eviscerator.txt
similarity index 93%
rename from gldefs.eviscerator
rename to gldefs/weapons/eviscerator.txt
index d3950c402..c16d8a829 100644
--- a/gldefs.eviscerator
+++ b/gldefs/weapons/eviscerator.txt
@@ -1,3 +1,5 @@
+// eviscerator
+
 HardwareShader Texture "models/Eviscerator.png"
 {
 	Shader "shaders/glsl/Envmask.fp"
diff --git a/gldefs.explodiumgun b/gldefs/weapons/explodiumgun.txt
similarity index 98%
rename from gldefs.explodiumgun
rename to gldefs/weapons/explodiumgun.txt
index 1ada5bf88..ca34fe4dc 100644
--- a/gldefs.explodiumgun
+++ b/gldefs/weapons/explodiumgun.txt
@@ -1,3 +1,5 @@
+// explodium gun
+
 HardwareShader Texture "models/ExplodiumGun.png"
 {
 	Shader "shaders/glsl/Envmask.fp"
diff --git a/gldefs.hellblazer b/gldefs/weapons/hellblazer.txt
similarity index 98%
rename from gldefs.hellblazer
rename to gldefs/weapons/hellblazer.txt
index bcbdcf77f..d98fd6e3a 100644
--- a/gldefs.hellblazer
+++ b/gldefs/weapons/hellblazer.txt
@@ -1,3 +1,5 @@
+// hellblazer
+
 HardwareShader Texture "models/Hellblazer.png"
 {
 	Shader "shaders/glsl/Envmask.fp"
diff --git a/gldefs.silverbullet b/gldefs/weapons/silverbullet.txt
similarity index 97%
rename from gldefs.silverbullet
rename to gldefs/weapons/silverbullet.txt
index f5f248b79..bfca665fb 100644
--- a/gldefs.silverbullet
+++ b/gldefs/weapons/silverbullet.txt
@@ -1,3 +1,5 @@
+// silver bullet jet
+
 HardwareShader Texture "models/SilverBullet.png"
 {
 	Shader "shaders/glsl/Envmask.fp"
diff --git a/gldefs.sparkster b/gldefs/weapons/sparkster.txt
similarity index 97%
rename from gldefs.sparkster
rename to gldefs/weapons/sparkster.txt
index e2b00a998..25b9e845b 100644
--- a/gldefs.sparkster
+++ b/gldefs/weapons/sparkster.txt
@@ -1,3 +1,5 @@
+// biospark carbine
+
 HardwareShader Texture "models/Sparkster.png"
 {
 	Shader "shaders/glsl/Envmask.fp"
diff --git a/gldefs.spreadgun b/gldefs/weapons/spreadgun.txt
similarity index 94%
rename from gldefs.spreadgun
rename to gldefs/weapons/spreadgun.txt
index 81a7b9faf..e2bc52fdf 100644
--- a/gldefs.spreadgun
+++ b/gldefs/weapons/spreadgun.txt
@@ -1,3 +1,5 @@
+// spreadgun
+
 HardwareShader Texture "models/Spreadgun.png"
 {
 	Shader "shaders/glsl/Envmask.fp"
diff --git a/gldefs.wallbuster b/gldefs/weapons/wallbuster.txt
similarity index 93%
rename from gldefs.wallbuster
rename to gldefs/weapons/wallbuster.txt
index 611fe354a..1d949c0fc 100644
--- a/gldefs.wallbuster
+++ b/gldefs/weapons/wallbuster.txt
@@ -1,3 +1,5 @@
+// wallbuster
+
 HardwareShader Texture "models/Wallbuster.png"
 {
 	Shader "shaders/glsl/Envmask.fp"
diff --git a/gldefs.ynykron b/gldefs/weapons/ynykron.txt
similarity index 97%
rename from gldefs.ynykron
rename to gldefs/weapons/ynykron.txt
index ac8b6bd52..70f789b0f 100644
--- a/gldefs.ynykron
+++ b/gldefs/weapons/ynykron.txt
@@ -1,3 +1,5 @@
+// ynykron artifact
+
 HardwareShader Texture "models/Ynykron.png"
 {
 	Shader "shaders/glsl/Envmask.fp"
diff --git a/language.version b/language.version
index 85fd0fdc8..ed32eb8f2 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r671 \cu(Tue  6 Dec 21:34:42 CET 2022)\c-";
-SWWM_SHORTVER="\cw1.3pre r671 \cu(2022-12-06 21:34:42)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r672 \cu(Wed  7 Dec 23:22:10 CET 2022)\c-";
+SWWM_SHORTVER="\cw1.3pre r672 \cu(2022-12-07 23:22:10)\c-";
diff --git a/modeldef.explodiumgun b/modeldef.explodiumgun
deleted file mode 100644
index 1dd171a6e..000000000
--- a/modeldef.explodiumgun
+++ /dev/null
@@ -1,452 +0,0 @@
-Model "ExplodiumCasing"
-{
-	Path "models"
-
-	Model 0 "ExplodiumCasing.iqm"
-	Skin 0 "ExplodiumCasing_Used.png"
-	Scale 5 5 5
-	USEACTORPITCH
-	USEACTORROLL
-	CORRECTPIXELSTRETCH
-
-	FrameIndex XZW1 A 0 0
-	ZOffset 0.5
-	FrameIndex XZW1 B 0 0
-}
-
-Model "ExplodiumMag"
-{
-	Path "models"
-
-	Model 0 "ExplodiumMag.iqm"
-	Scale 8 8 8
-	USEACTORPITCH
-	USEACTORROLL
-	CORRECTPIXELSTRETCH
-
-	Skin 0 "ExplodiumGun_EmptyMag.png"
-	FrameIndex XZW1 A 0 0
-	RollOffset 90
-	ZOffset 0.5
-	FrameIndex XZW1 B 0 0
-	RollOffset -90
-	FrameIndex XZW1 C 0 0
-}
-
-Model "ExplodiumMagProj"
-{
-	Path "models"
-
-	Model 0 "ExplodiumMagPrimed.iqm"
-	Skin 0 "ExplodiumGun.png"
-	Scale 8 8 8
-	USEACTORPITCH
-	USEACTORROLL
-	CORRECTPIXELSTRETCH
-
-	FrameIndex XZW1 A 0 0
-}
-Model "ExplodiumMagAttach"
-{
-	Path "models"
-
-	Model 0 "ExplodiumMagPrimed.iqm"
-	Skin 0 "ExplodiumGun.png"
-	Scale 8 8 8
-	USEACTORPITCH
-	USEACTORROLL
-	CORRECTPIXELSTRETCH
-	AngleOffset 90
-
-	FrameIndex XZW1 A 0 0
-	RollOffset 90
-	FrameIndex XZW1 B 0 0
-	RollOffset -90
-	FrameIndex XZW1 C 0 0
-}
-
-Model "ExplodiumGun"
-{
-	Path "models"
-
-	Model 0 "ExplodiumGunPickup.iqm"
-	Skin 0 "ExplodiumGun.png"
-	Scale 12 12 12
-	ZOffset 16
-	ROTATING
-
-	FrameIndex XZW1 A 0 0
-}
-
-Model "ExplodiumGun"
-{
-	Path "models/extra"
-
-	Model 2 "Flat.obj"
-	Scale -20 20 20
-	Offset 16 -60 -12
-	PitchOffset 90
-
-	Skin 2 "ExploMuz0.png"
-	FrameIndex XZWZ A 2 0
-	Skin 2 "ExploMuz1.png"
-	FrameIndex XZWZ B 2 0
-	Skin 2 "ExploMuz2.png"
-	FrameIndex XZWZ C 2 0
-	Skin 2 "ExploMuz3.png"
-	FrameIndex XZWZ D 2 0
-	Skin 2 "ExploMuz4.png"
-	FrameIndex XZWZ E 2 0
-	Skin 2 "ExploMuz5.png"
-	FrameIndex XZWZ F 2 0
-	Skin 2 "ExploMuz6.png"
-	FrameIndex XZWZ G 2 0
-	Skin 2 "ExploMuz7.png"
-	FrameIndex XZWZ H 2 0
-	Skin 2 "ExploMuz8.png"
-	FrameIndex XZWZ I 2 0
-	Skin 2 "ExploMuz9.png"
-	FrameIndex XZWZ J 2 0
-}
-
-Model "ExplodiumGun"
-{
-	Path "models"
-
-	Model 3 "ExplodiumGun1st_d.3d"
-	SurfaceSkin 3 4 "ExplodiumCasing_Used.png"
-
-	Scale -0.005 0.0025 0.005
-	AngleOffset -90
-	Offset 0 0 -2
-
-	// Casing
-	FrameIndex XZWA A 3 14
-	FrameIndex XZWA B 3 15
-	FrameIndex XZWA C 3 16
-	FrameIndex XZWA D 3 17
-	FrameIndex XZWA E 3 18
-	FrameIndex XZWA F 3 19
-	FrameIndex XZWA G 3 20
-	FrameIndex XZWA H 3 21
-	FrameIndex XZWA I 3 22
-	FrameIndex XZWA J 3 23
-}
-
-Model "ExplodiumGun"
-{
-	Path "models"
-
-	Model 1 "ExplodiumGun1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags.png"
-	SurfaceSkin 1 1 "DemoArms.png"
-	SurfaceSkin 1 2 "DemoSoft.png"
-	SurfaceSkin 1 3 "ExplodiumGun.png"
-	SurfaceSkin 1 5 "ExplodiumGun.png"
-
-	Scale -0.005 0.0025 0.005
-	AngleOffset -90
-	Offset 0 0 -2
-
-	// Still
-	FrameIndex XZW2 A 1 0
-	// Deselect
-	FrameIndex XZWA T 1 1
-	FrameIndex XZWA U 1 2
-	FrameIndex XZWA V 1 3
-	FrameIndex XZWA W 1 4
-	// Select
-	FrameIndex XZW2 B 1 5
-	FrameIndex XZW2 C 1 6
-	FrameIndex XZW2 D 1 7
-	FrameIndex XZW2 E 1 8
-	FrameIndex XZW2 F 1 9
-	FrameIndex XZW2 G 1 10
-	FrameIndex XZW2 H 1 11
-	// Fire
-	FrameIndex XZW2 I 1 13
-	FrameIndex XZW2 J 1 14
-	FrameIndex XZW2 K 1 15
-	FrameIndex XZW2 L 1 16
-	FrameIndex XZW2 M 1 17
-	FrameIndex XZW2 N 1 18
-	FrameIndex XZW2 O 1 19
-	FrameIndex XZW2 P 1 20
-	FrameIndex XZW2 Q 1 21
-	// unused
-	FrameIndex XZW2 R 1 22
-	FrameIndex XZW2 S 1 23
-	// Reload (Part 1)
-	FrameIndex XZW2 T 1 25
-	FrameIndex XZW2 U 1 26
-	FrameIndex XZW2 V 1 27
-	FrameIndex XZW2 W 1 28
-	FrameIndex XZW2 X 1 29
-	FrameIndex XZW2 Y 1 30
-	FrameIndex XZW2 Z 1 31
-	FrameIndex XZW3 A 1 32
-	FrameIndex XZW3 B 1 33
-	FrameIndex XZW3 C 1 34
-	FrameIndex XZW3 D 1 35
-	FrameIndex XZW3 E 1 36
-	FrameIndex XZW3 F 1 37
-	FrameIndex XZW3 G 1 38
-	FrameIndex XZW3 H 1 39
-	FrameIndex XZW3 I 1 40
-	// Reload (Part 1 w/ Empty Mag)
-	SurfaceSkin 1 5 "ExplodiumGun_EmptyMag.png"	// empty mag
-	FrameIndex XZW3 J 1 25
-	FrameIndex XZW3 K 1 26
-	FrameIndex XZW3 L 1 27
-	FrameIndex XZW3 M 1 28
-	FrameIndex XZW3 N 1 29
-	FrameIndex XZW3 O 1 30
-	FrameIndex XZW3 P 1 31
-	FrameIndex XZW3 Q 1 32
-	FrameIndex XZW3 R 1 33
-	FrameIndex XZW3 S 1 34
-	FrameIndex XZW3 T 1 35
-	FrameIndex XZW3 U 1 36
-	FrameIndex XZW3 V 1 37
-	FrameIndex XZW3 W 1 38
-	FrameIndex XZW3 X 1 39
-	FrameIndex XZW3 Y 1 40
-	// Reload (Part 2)
-	SurfaceSkin 1 5 ""	// hide mag
-	SurfaceSkin 1 6 "ExplodiumGun.png"	// show new mag
-	FrameIndex XZW3 Z 1 41
-	FrameIndex XZW4 A 1 42
-	FrameIndex XZW4 B 1 43
-	FrameIndex XZW4 C 1 44
-	FrameIndex XZW4 D 1 45
-	FrameIndex XZW4 E 1 46
-	FrameIndex XZW4 F 1 47
-	FrameIndex XZW4 G 1 48
-	SurfaceSkin 1 6 ""	// hide new mag
-	FrameIndex XZW4 H 1 49
-	FrameIndex XZW4 I 1 50
-	FrameIndex XZW4 J 1 51
-	SurfaceSkin 1 5 "ExplodiumGun.png"	// show mag
-	FrameIndex XZW4 K 1 52
-	FrameIndex XZW4 L 1 53
-	FrameIndex XZW4 M 1 54
-	FrameIndex XZW4 N 1 55
-	FrameIndex XZW4 O 1 56
-	FrameIndex XZW4 P 1 57
-	FrameIndex XZW4 Q 1 58
-	FrameIndex XZW4 R 1 59
-	FrameIndex XZW4 S 1 60
-	FrameIndex XZW4 T 1 61
-	FrameIndex XZW4 U 1 62
-	FrameIndex XZW4 V 1 63
-	// Slide
-	FrameIndex XZW4 W 1 65
-	FrameIndex XZW4 X 1 66
-	FrameIndex XZW4 Y 1 67
-	FrameIndex XZW4 Z 1 68
-	FrameIndex XZW5 A 1 69
-	FrameIndex XZW5 B 1 70
-	FrameIndex XZW5 C 1 71
-	FrameIndex XZW5 D 1 72
-	FrameIndex XZW5 E 1 73
-	FrameIndex XZW5 F 1 74
-	FrameIndex XZW5 G 1 75
-	FrameIndex XZW5 H 1 76
-	FrameIndex XZW5 I 1 77
-	FrameIndex XZW5 J 1 78
-	FrameIndex XZW5 K 1 79
-	FrameIndex XZW5 L 1 80
-	FrameIndex XZW5 M 1 81
-	// "Explosive" Reload
-	FrameIndex XZW5 N 1 83
-	FrameIndex XZW5 O 1 84
-	FrameIndex XZW5 P 1 85
-	FrameIndex XZW5 Q 1 86
-	FrameIndex XZW5 R 1 87
-	FrameIndex XZW5 S 1 88
-	FrameIndex XZW5 T 1 89
-	FrameIndex XZW5 U 1 90
-	FrameIndex XZW5 V 1 91
-	FrameIndex XZW5 W 1 92
-	FrameIndex XZW5 X 1 93
-	FrameIndex XZW5 Y 1 94
-	FrameIndex XZW5 Z 1 95
-	FrameIndex XZW6 A 1 96
-	FrameIndex XZW6 B 1 97
-	FrameIndex XZW6 C 1 98
-	FrameIndex XZW6 D 1 99
-	FrameIndex XZW6 E 1 100
-	FrameIndex XZW6 F 1 101
-	FrameIndex XZW6 G 1 102
-	FrameIndex XZW6 H 1 103
-	FrameIndex XZW6 I 1 104
-	SurfaceSkin 1 5 ""	// hide mag
-	SurfaceSkin 1 6 "ExplodiumGun.png"	// show new mag
-	FrameIndex XZW6 J 1 105
-	FrameIndex XZW6 K 1 106
-	FrameIndex XZW6 L 1 107
-	FrameIndex XZW6 M 1 108
-	FrameIndex XZW6 N 1 109
-	FrameIndex XZW6 O 1 110
-	FrameIndex XZW6 P 1 111
-	FrameIndex XZW6 Q 1 112
-	FrameIndex XZW6 R 1 113
-	FrameIndex XZW6 S 1 114
-	SurfaceSkin 1 6 ""	// hide new mag
-	FrameIndex XZW6 T 1 115
-	FrameIndex XZW6 U 1 116
-	FrameIndex XZW6 V 1 117
-	FrameIndex XZW6 W 1 118
-	FrameIndex XZW6 X 1 119
-	FrameIndex XZW6 Y 1 120
-	FrameIndex XZW6 Z 1 121
-	SurfaceSkin 1 5 "ExplodiumGun.png"	// show mag
-	// Check Bullet
-	SurfaceSkin 1 4 "ExplodiumCasing.png"	// show casing
-	FrameIndex XZW7 A 1 157
-	FrameIndex XZW7 B 1 158
-	FrameIndex XZW7 C 1 159
-	FrameIndex XZW7 D 1 160
-	FrameIndex XZW7 E 1 161
-	FrameIndex XZW7 F 1 162
-	FrameIndex XZW7 G 1 163
-	FrameIndex XZW7 H 1 164
-	FrameIndex XZW7 I 1 165
-	FrameIndex XZW7 J 1 166
-	FrameIndex XZW7 K 1 167
-	FrameIndex XZW7 L 1 168
-	FrameIndex XZW7 M 1 169
-	FrameIndex XZW7 N 1 170
-	FrameIndex XZW7 O 1 171
-	FrameIndex XZW7 P 1 172
-	FrameIndex XZW7 Q 1 173
-	FrameIndex XZW7 R 1 174
-	FrameIndex XZW7 S 1 175
-	SurfaceSkin 1 4 ""	// hide casing
-	// Melee
-	FrameIndex XZW7 T 1 177
-	FrameIndex XZW7 U 1 178
-	FrameIndex XZW7 V 1 179
-	FrameIndex XZW7 W 1 180
-	FrameIndex XZW7 X 1 181
-	FrameIndex XZW7 Y 1 182
-	FrameIndex XZW7 Z 1 183
-	FrameIndex XZW8 A 1 184
-	FrameIndex XZW8 B 1 185
-	FrameIndex XZW8 C 1 186
-	FrameIndex XZW8 D 1 187
-	FrameIndex XZW8 E 1 188
-	FrameIndex XZW8 F 1 189
-	// Check Gun
-	FrameIndex XZW8 G 1 192
-	FrameIndex XZW8 H 1 193
-	FrameIndex XZW8 I 1 194
-	FrameIndex XZW8 J 1 195
-	FrameIndex XZW8 K 1 196
-	FrameIndex XZW8 L 1 197
-	FrameIndex XZW8 M 1 198
-	FrameIndex XZW8 N 1 199
-	FrameIndex XZW8 O 1 200
-	FrameIndex XZW8 P 1 201
-	FrameIndex XZW8 Q 1 202
-	FrameIndex XZW8 R 1 203
-	FrameIndex XZW8 S 1 204
-	FrameIndex XZW8 T 1 205
-	FrameIndex XZW8 U 1 206
-	FrameIndex XZW8 V 1 207
-	FrameIndex XZW8 W 1 208
-	FrameIndex XZW8 X 1 209
-	FrameIndex XZW8 Y 1 210
-	FrameIndex XZW8 Z 1 211
-	// Spin Gun
-	FrameIndex XZW9 A 1 213
-	FrameIndex XZW9 B 1 214
-	FrameIndex XZW9 C 1 215
-	FrameIndex XZW9 D 1 216
-	FrameIndex XZW9 E 1 217
-	FrameIndex XZW9 F 1 218
-	FrameIndex XZW9 G 1 219
-	FrameIndex XZW9 H 1 220
-	FrameIndex XZW9 I 1 221
-	FrameIndex XZW9 J 1 222
-	FrameIndex XZW9 K 1 223
-	FrameIndex XZW9 L 1 224
-	FrameIndex XZW9 M 1 225
-	FrameIndex XZW9 N 1 226
-	FrameIndex XZW9 O 1 227
-	FrameIndex XZW9 P 1 228
-	FrameIndex XZW9 Q 1 229
-	FrameIndex XZW9 R 1 230
-	FrameIndex XZW9 S 1 231
-	FrameIndex XZW9 T 1 232
-	FrameIndex XZW9 U 1 233
-	FrameIndex XZW9 V 1 234
-	FrameIndex XZW9 W 1 235
-	/// LAST ROUND
-	// Fire
-	FrameIndex XZWA K 1 237
-	FrameIndex XZWA L 1 238
-	FrameIndex XZWA M 1 239
-	FrameIndex XZWA N 1 240
-	FrameIndex XZWA O 1 241
-	FrameIndex XZWA P 1 242
-	FrameIndex XZWA Q 1 243
-	FrameIndex XZWA R 1 244
-	FrameIndex XZWA S 1 245
-	// Still
-	FrameIndex XZW9 X 1 248
-	// Reload (Part 1)
-	SurfaceSkin 1 5 "ExplodiumGun_EmptyMag.png"	// empty mag
-	FrameIndex XZW9 Z 1 249
-	FrameIndex XZWA X 1 250
-	FrameIndex XZWA Y 1 251
-	FrameIndex XZWA Z 1 252
-	FrameIndex XZWB A 1 253
-	FrameIndex XZWB B 1 254
-	FrameIndex XZWB C 1 255
-	FrameIndex XZWB D 1 256
-	FrameIndex XZWB E 1 257
-	FrameIndex XZWB F 1 258
-	FrameIndex XZWB G 1 259
-	FrameIndex XZWB H 1 260
-	FrameIndex XZWB I 1 261
-	FrameIndex XZWB J 1 262
-	FrameIndex XZWB K 1 263
-	FrameIndex XZWB L 1 264
-	// Reload (Part 2)
-	SurfaceSkin 1 5 ""	// hide mag
-	SurfaceSkin 1 6 "ExplodiumGun.png"	// show new mag
-	FrameIndex XZWB M 1 265
-	FrameIndex XZWB N 1 266
-	FrameIndex XZWB O 1 267
-	FrameIndex XZWB P 1 268
-	FrameIndex XZWB Q 1 269
-	FrameIndex XZWB R 1 270
-	FrameIndex XZWB S 1 271
-	FrameIndex XZWB T 1 272
-	SurfaceSkin 1 6 ""	// hide new mag
-	FrameIndex XZWB U 1 273
-	FrameIndex XZWB V 1 274
-	FrameIndex XZWB W 1 275
-	SurfaceSkin 1 5 "ExplodiumGun.png"	// show mag
-	FrameIndex XZWB X 1 276
-	FrameIndex XZWB Y 1 277
-	FrameIndex XZWB Z 1 278
-	FrameIndex XZWC A 1 279
-	FrameIndex XZWC B 1 280
-	FrameIndex XZWC C 1 281
-	FrameIndex XZWC D 1 282
-	FrameIndex XZWC E 1 283
-	FrameIndex XZWC F 1 284
-	FrameIndex XZWC G 1 285
-	FrameIndex XZWC H 1 286
-	FrameIndex XZWC I 1 287
-	FrameIndex XZWC J 1 288
-	FrameIndex XZWC K 1 289
-	FrameIndex XZWC L 1 290
-	FrameIndex XZWC M 1 291
-	FrameIndex XZWC N 1 292
-	FrameIndex XZWC O 1 293
-	FrameIndex XZWC P 1 294
-}
-
diff --git a/modeldef.txt b/modeldef.txt
new file mode 100644
index 000000000..4e6ce7b3a
--- /dev/null
+++ b/modeldef.txt
@@ -0,0 +1,34 @@
+// base stuff
+#include "modeldef/misc.txt"
+#include "modeldef/demolitionist.txt"
+#include "modeldef/gesture.txt"
+// items
+#include "modeldef/items/ammo.txt"
+#include "modeldef/items/pickups.txt"
+#include "modeldef/items/keys.txt"
+#include "modeldef/items/funstuff.txt"
+#include "modeldef/items/collectibles.txt"
+#include "modeldef/items/itemgesture.txt"
+// weapons
+#include "modeldef/weapons/deepimpact.txt"
+#include "modeldef/weapons/explodiumgun.txt"
+#include "modeldef/weapons/spreadgun.txt"
+#include "modeldef/weapons/wallbuster.txt"
+#include "modeldef/weapons/eviscerator.txt"
+#include "modeldef/weapons/hellblazer.txt"
+#include "modeldef/weapons/sparkster.txt"
+#include "modeldef/weapons/silverbullet.txt"
+#include "modeldef/weapons/candygun.txt"
+#include "modeldef/weapons/ynykron.txt"
+// dlc weaponset
+#include "modeldef/dlc1/dlcammo.txt"
+#include "modeldef/dlc1/hammer.txt"
+#include "modeldef/dlc1/plasmablast.txt"
+#include "modeldef/dlc1/puntzerbeta.txt"
+#include "modeldef/dlc1/puntzergamma.txt"
+#include "modeldef/dlc1/sheenhmg.txt"
+#include "modeldef/dlc1/quadravol.txt"
+#include "modeldef/dlc1/newsparkster.txt"
+#include "modeldef/dlc1/raykhom.txt"
+#include "modeldef/dlc1/mortalrifle.txt"
+#include "modeldef/dlc1/rafankos.txt"
diff --git a/modeldef.demolitionist b/modeldef/demolitionist.txt
similarity index 99%
rename from modeldef.demolitionist
rename to modeldef/demolitionist.txt
index 8e3e1d3d1..b2ca6dea2 100644
--- a/modeldef.demolitionist
+++ b/modeldef/demolitionist.txt
@@ -1,3 +1,4 @@
+// The Demolitionist
 Model "Demolitionist"
 {
 	Path "models"
diff --git a/modeldef.dlcammo b/modeldef/dlc1/dlcammo.txt
similarity index 99%
rename from modeldef.dlcammo
rename to modeldef/dlc1/dlcammo.txt
index f3557f98d..6dff9e4a6 100644
--- a/modeldef.dlcammo
+++ b/modeldef/dlc1/dlcammo.txt
@@ -1,3 +1,5 @@
+// dlc ammunition
+
 Model "SMW05Ammo"
 {
 	Path "models/extra"
diff --git a/modeldef.hammer b/modeldef/dlc1/hammer.txt
similarity index 99%
rename from modeldef.hammer
rename to modeldef/dlc1/hammer.txt
index 0b845f8be..5c7a2e594 100644
--- a/modeldef.hammer
+++ b/modeldef/dlc1/hammer.txt
@@ -1,3 +1,5 @@
+// itamex hammer
+
 Model "HammerRadiusShockwave"
 {
 	Path "models/extra"
diff --git a/modeldef.mortalrifle b/modeldef/dlc1/mortalrifle.txt
similarity index 99%
rename from modeldef.mortalrifle
rename to modeldef/dlc1/mortalrifle.txt
index 891e27b18..78e7b9f26 100644
--- a/modeldef.mortalrifle
+++ b/modeldef/dlc1/mortalrifle.txt
@@ -1,3 +1,5 @@
+// mortal rifle
+
 Model "MisterCasing"
 {
 	Path "models"
diff --git a/modeldef.newsparkster b/modeldef/dlc1/newsparkster.txt
similarity index 90%
rename from modeldef.newsparkster
rename to modeldef/dlc1/newsparkster.txt
index 4294f9c31..031fe4db5 100644
--- a/modeldef.newsparkster
+++ b/modeldef/dlc1/newsparkster.txt
@@ -1,3 +1,5 @@
+// sparkster rifle
+
 Model "ModernSparkster"
 {
 	Path "models"
diff --git a/modeldef.plasmablast b/modeldef/dlc1/plasmablast.txt
similarity index 91%
rename from modeldef.plasmablast
rename to modeldef/dlc1/plasmablast.txt
index 59b3066df..b90c39a79 100644
--- a/modeldef.plasmablast
+++ b/modeldef/dlc1/plasmablast.txt
@@ -1,3 +1,5 @@
+// plasma blaster
+
 Model "PlasmaBlast"
 {
 	Path "models"
diff --git a/modeldef.puntzerbeta b/modeldef/dlc1/puntzerbeta.txt
similarity index 91%
rename from modeldef.puntzerbeta
rename to modeldef/dlc1/puntzerbeta.txt
index 2d9da7b0c..9bb3ad19e 100644
--- a/modeldef.puntzerbeta
+++ b/modeldef/dlc1/puntzerbeta.txt
@@ -1,3 +1,5 @@
+// puntzer beta
+
 Model "PuntzerBeta"
 {
 	Path "models/extra"
diff --git a/modeldef.puntzergamma b/modeldef/dlc1/puntzergamma.txt
similarity index 91%
rename from modeldef.puntzergamma
rename to modeldef/dlc1/puntzergamma.txt
index fbecac53c..f7574bc80 100644
--- a/modeldef.puntzergamma
+++ b/modeldef/dlc1/puntzergamma.txt
@@ -1,3 +1,5 @@
+// puntzer gamma
+
 Model "PuntzerGamma"
 {
 	Path "models/extra"
diff --git a/modeldef.quadravol b/modeldef/dlc1/quadravol.txt
similarity index 99%
rename from modeldef.quadravol
rename to modeldef/dlc1/quadravol.txt
index 5872eb247..7b69d9f2b 100644
--- a/modeldef.quadravol
+++ b/modeldef/dlc1/quadravol.txt
@@ -1,3 +1,5 @@
+// quadravol
+
 Model "QuadravolCasing"
 {
 	Path "models"
diff --git a/modeldef.rafankos b/modeldef/dlc1/rafankos.txt
similarity index 92%
rename from modeldef.rafankos
rename to modeldef/dlc1/rafankos.txt
index 137e1d68b..f1ad061be 100644
--- a/modeldef.rafankos
+++ b/modeldef/dlc1/rafankos.txt
@@ -1,3 +1,5 @@
+// rafan-kos
+
 Model "RafanKos"
 {
 	Path "models/extra"
diff --git a/modeldef.raykhom b/modeldef/dlc1/raykhom.txt
similarity index 93%
rename from modeldef.raykhom
rename to modeldef/dlc1/raykhom.txt
index ede70f529..4a751408f 100644
--- a/modeldef.raykhom
+++ b/modeldef/dlc1/raykhom.txt
@@ -1,3 +1,5 @@
+// ray-khom
+
 Model "RayKhom"
 {
 	Path "models/extra"
diff --git a/modeldef.sheenhmg b/modeldef/dlc1/sheenhmg.txt
similarity index 99%
rename from modeldef.sheenhmg
rename to modeldef/dlc1/sheenhmg.txt
index 24dcafa9f..269d17d99 100644
--- a/modeldef.sheenhmg
+++ b/modeldef/dlc1/sheenhmg.txt
@@ -1,3 +1,5 @@
+// sheen hmg
+
 Model "SheenTrail"
 {
 	Path "models/extra"
diff --git a/modeldef.gesture b/modeldef/gesture.txt
similarity index 98%
rename from modeldef.gesture
rename to modeldef/gesture.txt
index 6a9d8269a..5830bf5e2 100644
--- a/modeldef.gesture
+++ b/modeldef/gesture.txt
@@ -1,3 +1,4 @@
+// base gestures
 Model "SWWMGesture"
 {
 	Path "models"
@@ -109,6 +110,7 @@ Model "SWWMGesture"
 	FrameIndex XZW4 O 0 96
 	FrameIndex XZW4 P 0 97
 }
+// quick grenade
 Model "SWWMGesture"
 {
 	Path "models"
@@ -161,6 +163,7 @@ Model "SWWMGesture"
 	FrameIndex XZW5 X 0 42
 	FrameIndex XZW5 Y 0 43
 }
+// quick punch
 Model "SWWMGesture"
 {
 	Path "models"
diff --git a/modeldef.ammo b/modeldef/items/ammo.txt
similarity index 100%
rename from modeldef.ammo
rename to modeldef/items/ammo.txt
diff --git a/modeldef.collectibles b/modeldef/items/collectibles.txt
similarity index 100%
rename from modeldef.collectibles
rename to modeldef/items/collectibles.txt
diff --git a/modeldef.funstuff b/modeldef/items/funstuff.txt
similarity index 100%
rename from modeldef.funstuff
rename to modeldef/items/funstuff.txt
diff --git a/modeldef.itemgesture b/modeldef/items/itemgesture.txt
similarity index 100%
rename from modeldef.itemgesture
rename to modeldef/items/itemgesture.txt
diff --git a/modeldef.keys b/modeldef/items/keys.txt
similarity index 100%
rename from modeldef.keys
rename to modeldef/items/keys.txt
diff --git a/modeldef.pickups b/modeldef/items/pickups.txt
similarity index 100%
rename from modeldef.pickups
rename to modeldef/items/pickups.txt
diff --git a/modeldef.misc b/modeldef/misc.txt
similarity index 99%
rename from modeldef.misc
rename to modeldef/misc.txt
index fc5086f58..4f06d94e1 100644
--- a/modeldef.misc
+++ b/modeldef/misc.txt
@@ -1,3 +1,5 @@
+// misc. models
+
 Model "Unknown"
 {
 	Path "models"
diff --git a/modeldef.candygun b/modeldef/weapons/candygun.txt
similarity index 100%
rename from modeldef.candygun
rename to modeldef/weapons/candygun.txt
diff --git a/modeldef.deepimpact b/modeldef/weapons/deepimpact.txt
similarity index 100%
rename from modeldef.deepimpact
rename to modeldef/weapons/deepimpact.txt
diff --git a/modeldef.eviscerator b/modeldef/weapons/eviscerator.txt
similarity index 100%
rename from modeldef.eviscerator
rename to modeldef/weapons/eviscerator.txt
diff --git a/modeldef.explodiumgun2 b/modeldef/weapons/explodiumgun.txt
similarity index 54%
rename from modeldef.explodiumgun2
rename to modeldef/weapons/explodiumgun.txt
index a92a2a428..bf95ed6b5 100644
--- a/modeldef.explodiumgun2
+++ b/modeldef/weapons/explodiumgun.txt
@@ -1,3 +1,455 @@
+Model "ExplodiumCasing"
+{
+	Path "models"
+
+	Model 0 "ExplodiumCasing.iqm"
+	Skin 0 "ExplodiumCasing_Used.png"
+	Scale 5 5 5
+	USEACTORPITCH
+	USEACTORROLL
+	CORRECTPIXELSTRETCH
+
+	FrameIndex XZW1 A 0 0
+	ZOffset 0.5
+	FrameIndex XZW1 B 0 0
+}
+
+Model "ExplodiumMag"
+{
+	Path "models"
+
+	Model 0 "ExplodiumMag.iqm"
+	Scale 8 8 8
+	USEACTORPITCH
+	USEACTORROLL
+	CORRECTPIXELSTRETCH
+
+	Skin 0 "ExplodiumGun_EmptyMag.png"
+	FrameIndex XZW1 A 0 0
+	RollOffset 90
+	ZOffset 0.5
+	FrameIndex XZW1 B 0 0
+	RollOffset -90
+	FrameIndex XZW1 C 0 0
+}
+
+Model "ExplodiumMagProj"
+{
+	Path "models"
+
+	Model 0 "ExplodiumMagPrimed.iqm"
+	Skin 0 "ExplodiumGun.png"
+	Scale 8 8 8
+	USEACTORPITCH
+	USEACTORROLL
+	CORRECTPIXELSTRETCH
+
+	FrameIndex XZW1 A 0 0
+}
+Model "ExplodiumMagAttach"
+{
+	Path "models"
+
+	Model 0 "ExplodiumMagPrimed.iqm"
+	Skin 0 "ExplodiumGun.png"
+	Scale 8 8 8
+	USEACTORPITCH
+	USEACTORROLL
+	CORRECTPIXELSTRETCH
+	AngleOffset 90
+
+	FrameIndex XZW1 A 0 0
+	RollOffset 90
+	FrameIndex XZW1 B 0 0
+	RollOffset -90
+	FrameIndex XZW1 C 0 0
+}
+
+Model "ExplodiumGun"
+{
+	Path "models"
+
+	Model 0 "ExplodiumGunPickup.iqm"
+	Skin 0 "ExplodiumGun.png"
+	Scale 12 12 12
+	ZOffset 16
+	ROTATING
+
+	FrameIndex XZW1 A 0 0
+}
+
+Model "ExplodiumGun"
+{
+	Path "models/extra"
+
+	Model 2 "Flat.obj"
+	Scale -20 20 20
+	Offset 16 -60 -12
+	PitchOffset 90
+
+	Skin 2 "ExploMuz0.png"
+	FrameIndex XZWZ A 2 0
+	Skin 2 "ExploMuz1.png"
+	FrameIndex XZWZ B 2 0
+	Skin 2 "ExploMuz2.png"
+	FrameIndex XZWZ C 2 0
+	Skin 2 "ExploMuz3.png"
+	FrameIndex XZWZ D 2 0
+	Skin 2 "ExploMuz4.png"
+	FrameIndex XZWZ E 2 0
+	Skin 2 "ExploMuz5.png"
+	FrameIndex XZWZ F 2 0
+	Skin 2 "ExploMuz6.png"
+	FrameIndex XZWZ G 2 0
+	Skin 2 "ExploMuz7.png"
+	FrameIndex XZWZ H 2 0
+	Skin 2 "ExploMuz8.png"
+	FrameIndex XZWZ I 2 0
+	Skin 2 "ExploMuz9.png"
+	FrameIndex XZWZ J 2 0
+}
+
+Model "ExplodiumGun"
+{
+	Path "models"
+
+	Model 3 "ExplodiumGun1st_d.3d"
+	SurfaceSkin 3 4 "ExplodiumCasing_Used.png"
+
+	Scale -0.005 0.0025 0.005
+	AngleOffset -90
+	Offset 0 0 -2
+
+	// Casing
+	FrameIndex XZWA A 3 14
+	FrameIndex XZWA B 3 15
+	FrameIndex XZWA C 3 16
+	FrameIndex XZWA D 3 17
+	FrameIndex XZWA E 3 18
+	FrameIndex XZWA F 3 19
+	FrameIndex XZWA G 3 20
+	FrameIndex XZWA H 3 21
+	FrameIndex XZWA I 3 22
+	FrameIndex XZWA J 3 23
+}
+
+Model "ExplodiumGun"
+{
+	Path "models"
+
+	Model 1 "ExplodiumGun1st_d.3d"
+	SurfaceSkin 1 0 "DemoTags.png"
+	SurfaceSkin 1 1 "DemoArms.png"
+	SurfaceSkin 1 2 "DemoSoft.png"
+	SurfaceSkin 1 3 "ExplodiumGun.png"
+	SurfaceSkin 1 5 "ExplodiumGun.png"
+
+	Scale -0.005 0.0025 0.005
+	AngleOffset -90
+	Offset 0 0 -2
+
+	// Still
+	FrameIndex XZW2 A 1 0
+	// Deselect
+	FrameIndex XZWA T 1 1
+	FrameIndex XZWA U 1 2
+	FrameIndex XZWA V 1 3
+	FrameIndex XZWA W 1 4
+	// Select
+	FrameIndex XZW2 B 1 5
+	FrameIndex XZW2 C 1 6
+	FrameIndex XZW2 D 1 7
+	FrameIndex XZW2 E 1 8
+	FrameIndex XZW2 F 1 9
+	FrameIndex XZW2 G 1 10
+	FrameIndex XZW2 H 1 11
+	// Fire
+	FrameIndex XZW2 I 1 13
+	FrameIndex XZW2 J 1 14
+	FrameIndex XZW2 K 1 15
+	FrameIndex XZW2 L 1 16
+	FrameIndex XZW2 M 1 17
+	FrameIndex XZW2 N 1 18
+	FrameIndex XZW2 O 1 19
+	FrameIndex XZW2 P 1 20
+	FrameIndex XZW2 Q 1 21
+	// unused
+	FrameIndex XZW2 R 1 22
+	FrameIndex XZW2 S 1 23
+	// Reload (Part 1)
+	FrameIndex XZW2 T 1 25
+	FrameIndex XZW2 U 1 26
+	FrameIndex XZW2 V 1 27
+	FrameIndex XZW2 W 1 28
+	FrameIndex XZW2 X 1 29
+	FrameIndex XZW2 Y 1 30
+	FrameIndex XZW2 Z 1 31
+	FrameIndex XZW3 A 1 32
+	FrameIndex XZW3 B 1 33
+	FrameIndex XZW3 C 1 34
+	FrameIndex XZW3 D 1 35
+	FrameIndex XZW3 E 1 36
+	FrameIndex XZW3 F 1 37
+	FrameIndex XZW3 G 1 38
+	FrameIndex XZW3 H 1 39
+	FrameIndex XZW3 I 1 40
+	// Reload (Part 1 w/ Empty Mag)
+	SurfaceSkin 1 5 "ExplodiumGun_EmptyMag.png"	// empty mag
+	FrameIndex XZW3 J 1 25
+	FrameIndex XZW3 K 1 26
+	FrameIndex XZW3 L 1 27
+	FrameIndex XZW3 M 1 28
+	FrameIndex XZW3 N 1 29
+	FrameIndex XZW3 O 1 30
+	FrameIndex XZW3 P 1 31
+	FrameIndex XZW3 Q 1 32
+	FrameIndex XZW3 R 1 33
+	FrameIndex XZW3 S 1 34
+	FrameIndex XZW3 T 1 35
+	FrameIndex XZW3 U 1 36
+	FrameIndex XZW3 V 1 37
+	FrameIndex XZW3 W 1 38
+	FrameIndex XZW3 X 1 39
+	FrameIndex XZW3 Y 1 40
+	// Reload (Part 2)
+	SurfaceSkin 1 5 ""	// hide mag
+	SurfaceSkin 1 6 "ExplodiumGun.png"	// show new mag
+	FrameIndex XZW3 Z 1 41
+	FrameIndex XZW4 A 1 42
+	FrameIndex XZW4 B 1 43
+	FrameIndex XZW4 C 1 44
+	FrameIndex XZW4 D 1 45
+	FrameIndex XZW4 E 1 46
+	FrameIndex XZW4 F 1 47
+	FrameIndex XZW4 G 1 48
+	SurfaceSkin 1 6 ""	// hide new mag
+	FrameIndex XZW4 H 1 49
+	FrameIndex XZW4 I 1 50
+	FrameIndex XZW4 J 1 51
+	SurfaceSkin 1 5 "ExplodiumGun.png"	// show mag
+	FrameIndex XZW4 K 1 52
+	FrameIndex XZW4 L 1 53
+	FrameIndex XZW4 M 1 54
+	FrameIndex XZW4 N 1 55
+	FrameIndex XZW4 O 1 56
+	FrameIndex XZW4 P 1 57
+	FrameIndex XZW4 Q 1 58
+	FrameIndex XZW4 R 1 59
+	FrameIndex XZW4 S 1 60
+	FrameIndex XZW4 T 1 61
+	FrameIndex XZW4 U 1 62
+	FrameIndex XZW4 V 1 63
+	// Slide
+	FrameIndex XZW4 W 1 65
+	FrameIndex XZW4 X 1 66
+	FrameIndex XZW4 Y 1 67
+	FrameIndex XZW4 Z 1 68
+	FrameIndex XZW5 A 1 69
+	FrameIndex XZW5 B 1 70
+	FrameIndex XZW5 C 1 71
+	FrameIndex XZW5 D 1 72
+	FrameIndex XZW5 E 1 73
+	FrameIndex XZW5 F 1 74
+	FrameIndex XZW5 G 1 75
+	FrameIndex XZW5 H 1 76
+	FrameIndex XZW5 I 1 77
+	FrameIndex XZW5 J 1 78
+	FrameIndex XZW5 K 1 79
+	FrameIndex XZW5 L 1 80
+	FrameIndex XZW5 M 1 81
+	// "Explosive" Reload
+	FrameIndex XZW5 N 1 83
+	FrameIndex XZW5 O 1 84
+	FrameIndex XZW5 P 1 85
+	FrameIndex XZW5 Q 1 86
+	FrameIndex XZW5 R 1 87
+	FrameIndex XZW5 S 1 88
+	FrameIndex XZW5 T 1 89
+	FrameIndex XZW5 U 1 90
+	FrameIndex XZW5 V 1 91
+	FrameIndex XZW5 W 1 92
+	FrameIndex XZW5 X 1 93
+	FrameIndex XZW5 Y 1 94
+	FrameIndex XZW5 Z 1 95
+	FrameIndex XZW6 A 1 96
+	FrameIndex XZW6 B 1 97
+	FrameIndex XZW6 C 1 98
+	FrameIndex XZW6 D 1 99
+	FrameIndex XZW6 E 1 100
+	FrameIndex XZW6 F 1 101
+	FrameIndex XZW6 G 1 102
+	FrameIndex XZW6 H 1 103
+	FrameIndex XZW6 I 1 104
+	SurfaceSkin 1 5 ""	// hide mag
+	SurfaceSkin 1 6 "ExplodiumGun.png"	// show new mag
+	FrameIndex XZW6 J 1 105
+	FrameIndex XZW6 K 1 106
+	FrameIndex XZW6 L 1 107
+	FrameIndex XZW6 M 1 108
+	FrameIndex XZW6 N 1 109
+	FrameIndex XZW6 O 1 110
+	FrameIndex XZW6 P 1 111
+	FrameIndex XZW6 Q 1 112
+	FrameIndex XZW6 R 1 113
+	FrameIndex XZW6 S 1 114
+	SurfaceSkin 1 6 ""	// hide new mag
+	FrameIndex XZW6 T 1 115
+	FrameIndex XZW6 U 1 116
+	FrameIndex XZW6 V 1 117
+	FrameIndex XZW6 W 1 118
+	FrameIndex XZW6 X 1 119
+	FrameIndex XZW6 Y 1 120
+	FrameIndex XZW6 Z 1 121
+	SurfaceSkin 1 5 "ExplodiumGun.png"	// show mag
+	// Check Bullet
+	SurfaceSkin 1 4 "ExplodiumCasing.png"	// show casing
+	FrameIndex XZW7 A 1 157
+	FrameIndex XZW7 B 1 158
+	FrameIndex XZW7 C 1 159
+	FrameIndex XZW7 D 1 160
+	FrameIndex XZW7 E 1 161
+	FrameIndex XZW7 F 1 162
+	FrameIndex XZW7 G 1 163
+	FrameIndex XZW7 H 1 164
+	FrameIndex XZW7 I 1 165
+	FrameIndex XZW7 J 1 166
+	FrameIndex XZW7 K 1 167
+	FrameIndex XZW7 L 1 168
+	FrameIndex XZW7 M 1 169
+	FrameIndex XZW7 N 1 170
+	FrameIndex XZW7 O 1 171
+	FrameIndex XZW7 P 1 172
+	FrameIndex XZW7 Q 1 173
+	FrameIndex XZW7 R 1 174
+	FrameIndex XZW7 S 1 175
+	SurfaceSkin 1 4 ""	// hide casing
+	// Melee
+	FrameIndex XZW7 T 1 177
+	FrameIndex XZW7 U 1 178
+	FrameIndex XZW7 V 1 179
+	FrameIndex XZW7 W 1 180
+	FrameIndex XZW7 X 1 181
+	FrameIndex XZW7 Y 1 182
+	FrameIndex XZW7 Z 1 183
+	FrameIndex XZW8 A 1 184
+	FrameIndex XZW8 B 1 185
+	FrameIndex XZW8 C 1 186
+	FrameIndex XZW8 D 1 187
+	FrameIndex XZW8 E 1 188
+	FrameIndex XZW8 F 1 189
+	// Check Gun
+	FrameIndex XZW8 G 1 192
+	FrameIndex XZW8 H 1 193
+	FrameIndex XZW8 I 1 194
+	FrameIndex XZW8 J 1 195
+	FrameIndex XZW8 K 1 196
+	FrameIndex XZW8 L 1 197
+	FrameIndex XZW8 M 1 198
+	FrameIndex XZW8 N 1 199
+	FrameIndex XZW8 O 1 200
+	FrameIndex XZW8 P 1 201
+	FrameIndex XZW8 Q 1 202
+	FrameIndex XZW8 R 1 203
+	FrameIndex XZW8 S 1 204
+	FrameIndex XZW8 T 1 205
+	FrameIndex XZW8 U 1 206
+	FrameIndex XZW8 V 1 207
+	FrameIndex XZW8 W 1 208
+	FrameIndex XZW8 X 1 209
+	FrameIndex XZW8 Y 1 210
+	FrameIndex XZW8 Z 1 211
+	// Spin Gun
+	FrameIndex XZW9 A 1 213
+	FrameIndex XZW9 B 1 214
+	FrameIndex XZW9 C 1 215
+	FrameIndex XZW9 D 1 216
+	FrameIndex XZW9 E 1 217
+	FrameIndex XZW9 F 1 218
+	FrameIndex XZW9 G 1 219
+	FrameIndex XZW9 H 1 220
+	FrameIndex XZW9 I 1 221
+	FrameIndex XZW9 J 1 222
+	FrameIndex XZW9 K 1 223
+	FrameIndex XZW9 L 1 224
+	FrameIndex XZW9 M 1 225
+	FrameIndex XZW9 N 1 226
+	FrameIndex XZW9 O 1 227
+	FrameIndex XZW9 P 1 228
+	FrameIndex XZW9 Q 1 229
+	FrameIndex XZW9 R 1 230
+	FrameIndex XZW9 S 1 231
+	FrameIndex XZW9 T 1 232
+	FrameIndex XZW9 U 1 233
+	FrameIndex XZW9 V 1 234
+	FrameIndex XZW9 W 1 235
+	/// LAST ROUND
+	// Fire
+	FrameIndex XZWA K 1 237
+	FrameIndex XZWA L 1 238
+	FrameIndex XZWA M 1 239
+	FrameIndex XZWA N 1 240
+	FrameIndex XZWA O 1 241
+	FrameIndex XZWA P 1 242
+	FrameIndex XZWA Q 1 243
+	FrameIndex XZWA R 1 244
+	FrameIndex XZWA S 1 245
+	// Still
+	FrameIndex XZW9 X 1 248
+	// Reload (Part 1)
+	SurfaceSkin 1 5 "ExplodiumGun_EmptyMag.png"	// empty mag
+	FrameIndex XZW9 Z 1 249
+	FrameIndex XZWA X 1 250
+	FrameIndex XZWA Y 1 251
+	FrameIndex XZWA Z 1 252
+	FrameIndex XZWB A 1 253
+	FrameIndex XZWB B 1 254
+	FrameIndex XZWB C 1 255
+	FrameIndex XZWB D 1 256
+	FrameIndex XZWB E 1 257
+	FrameIndex XZWB F 1 258
+	FrameIndex XZWB G 1 259
+	FrameIndex XZWB H 1 260
+	FrameIndex XZWB I 1 261
+	FrameIndex XZWB J 1 262
+	FrameIndex XZWB K 1 263
+	FrameIndex XZWB L 1 264
+	// Reload (Part 2)
+	SurfaceSkin 1 5 ""	// hide mag
+	SurfaceSkin 1 6 "ExplodiumGun.png"	// show new mag
+	FrameIndex XZWB M 1 265
+	FrameIndex XZWB N 1 266
+	FrameIndex XZWB O 1 267
+	FrameIndex XZWB P 1 268
+	FrameIndex XZWB Q 1 269
+	FrameIndex XZWB R 1 270
+	FrameIndex XZWB S 1 271
+	FrameIndex XZWB T 1 272
+	SurfaceSkin 1 6 ""	// hide new mag
+	FrameIndex XZWB U 1 273
+	FrameIndex XZWB V 1 274
+	FrameIndex XZWB W 1 275
+	SurfaceSkin 1 5 "ExplodiumGun.png"	// show mag
+	FrameIndex XZWB X 1 276
+	FrameIndex XZWB Y 1 277
+	FrameIndex XZWB Z 1 278
+	FrameIndex XZWC A 1 279
+	FrameIndex XZWC B 1 280
+	FrameIndex XZWC C 1 281
+	FrameIndex XZWC D 1 282
+	FrameIndex XZWC E 1 283
+	FrameIndex XZWC F 1 284
+	FrameIndex XZWC G 1 285
+	FrameIndex XZWC H 1 286
+	FrameIndex XZWC I 1 287
+	FrameIndex XZWC J 1 288
+	FrameIndex XZWC K 1 289
+	FrameIndex XZWC L 1 290
+	FrameIndex XZWC M 1 291
+	FrameIndex XZWC N 1 292
+	FrameIndex XZWC O 1 293
+	FrameIndex XZWC P 1 294
+}
+
 Model "DualExplodiumGun"
 {
 	Path "models/extra"
diff --git a/modeldef.hellblazer b/modeldef/weapons/hellblazer.txt
similarity index 100%
rename from modeldef.hellblazer
rename to modeldef/weapons/hellblazer.txt
diff --git a/modeldef.silverbullet b/modeldef/weapons/silverbullet.txt
similarity index 100%
rename from modeldef.silverbullet
rename to modeldef/weapons/silverbullet.txt
diff --git a/modeldef.sparkster b/modeldef/weapons/sparkster.txt
similarity index 100%
rename from modeldef.sparkster
rename to modeldef/weapons/sparkster.txt
diff --git a/modeldef.spreadgun b/modeldef/weapons/spreadgun.txt
similarity index 100%
rename from modeldef.spreadgun
rename to modeldef/weapons/spreadgun.txt
diff --git a/modeldef.wallbuster b/modeldef/weapons/wallbuster.txt
similarity index 100%
rename from modeldef.wallbuster
rename to modeldef/weapons/wallbuster.txt
diff --git a/modeldef.ynykron b/modeldef/weapons/ynykron.txt
similarity index 100%
rename from modeldef.ynykron
rename to modeldef/weapons/ynykron.txt
diff --git a/precachefonts.txt b/precachefonts.txt
new file mode 100644
index 000000000..5a0cae8b1
--- /dev/null
+++ b/precachefonts.txt
@@ -0,0 +1,10 @@
+TewiFont
+TewiFontOutline
+MiniwiFont
+MiniwiFontOutline
+MiniHUDOutline
+MiniHUDShadow
+XekkasNum
+MortalFont20
+MortalFont40
+MortalFont80
diff --git a/zscript/swwm_statichandler.zsc b/zscript/swwm_statichandler.zsc
index 5167292fa..10e93294f 100644
--- a/zscript/swwm_statichandler.zsc
+++ b/zscript/swwm_statichandler.zsc
@@ -155,17 +155,21 @@ Class SWWMStaticHandler : StaticEventHandler
 		// load up the achievements
 		if ( swwm_achievementstate == "" ) MigrateAchievements();
 		else LoadAchievements();
-		// cache fonts
-		Font.GetFont("TewiFont");
-		Font.GetFont("TewiFontOutline");
-		Font.GetFont("MiniwiFont");
-		Font.GetFont("MiniwiFontOutline");
-		Font.GetFont("MiniHUDOutline");
-		Font.GetFont("MiniHUDShadow");
-		Font.GetFont("XekkasNum");
-		Font.GetFont("MortalFont20");
-		Font.GetFont("MortalFont40");
-		Font.GetFont("MortalFont80");
+		// precache fonts
+		Array<String> fonts;
+		for ( lmp = Wads.FindLumpFullName("precachefonts.txt"); lmp != -1; lmp = Wads.FindLumpFullName("precachefonts.txt",lmp+1) )
+		{
+			Array<String> lst;
+			lst.Clear();
+			String dat = Wads.ReadLump(lmp);
+			dat.Split(lst,"\n",0);
+			foreach ( l:lst )
+			{
+				if ( (l.Length() <= 0) || (l.GetNextCodePoint(0) == 0) || (l.Left(1) == "\n") || (l.Left(1) == "#") ) continue;
+				fonts.Push(l);
+			}
+		}
+		foreach ( f:fonts ) Font.GetFont(f);
 		// warn: mp no longer officially maintained
 		if ( multiplayer )
 		{