diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_axe_a.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_axe_a.xml
deleted file mode 100644
index b6afb19ca7..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_axe_a.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_axe_b.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_axe_b.xml
deleted file mode 100644
index 7ae511f35c..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_axe_b.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_axe_c.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_axe_c.xml
deleted file mode 100644
index a748c86fcc..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_axe_c.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_axe_d.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_axe_d.xml
deleted file mode 100644
index 97fa72ecf7..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_axe_d.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_axe_double.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_axe_double.xml
new file mode 100644
index 0000000000..f93c8e9721
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/weapon/weap_axe_double.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+ props/prop_weap.dds
+
+
+
+
+
+ props/weap_axe_c.pmd
+
+
+ props/weap_axe_d.pmd
+
+
+
+
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_axe_single.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_axe_single.xml
new file mode 100644
index 0000000000..82f3dc9273
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/weapon/weap_axe_single.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+ props/prop_weap.dds
+
+
+
+
+
+ props/weap_axe_a.pmd
+
+
+ props/weap_axe_b.pmd
+
+
+
+
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_bow_a.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_bow_a.xml
deleted file mode 100644
index 7f7e2b4990..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_bow_a.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_bow_b.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_bow_b.xml
deleted file mode 100644
index 1308e30810..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_bow_b.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_bow_c.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_bow_c.xml
deleted file mode 100644
index 890500656d..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_bow_c.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_bow_d.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_bow_d.xml
deleted file mode 100644
index 96b343d640..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_bow_d.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_bow_e.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_bow_e.xml
deleted file mode 100644
index 30de566856..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_bow_e.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_bow_f.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_bow_f.xml
deleted file mode 100644
index 90bc09d0c7..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_bow_f.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_bow_g.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_bow_g.xml
deleted file mode 100644
index df655983c1..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_bow_g.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_bow_h.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_bow_h.xml
deleted file mode 100644
index e88dcc3a87..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_bow_h.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_bow_i.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_bow_i.xml
deleted file mode 100644
index 3e685d685d..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_bow_i.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_bow_long.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_bow_long.xml
new file mode 100644
index 0000000000..dd61c3edfb
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/weapon/weap_bow_long.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+ props/prop_weap.dds
+
+
+
+
+
+ props/weap_bow_d.pmd
+
+
+ props/weap_bow_e.pmd
+
+
+ props/weap_bow_f.pmd
+
+
+
+
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_bow_recurve.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_bow_recurve.xml
new file mode 100644
index 0000000000..0ccb327c9f
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/weapon/weap_bow_recurve.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+ props/prop_weap.dds
+
+
+
+
+
+ props/weap_bow_g.pmd
+
+
+ props/weap_bow_h.pmd
+
+
+ props/weap_bow_i.pmd
+
+
+
+
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_bow_short.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_bow_short.xml
new file mode 100644
index 0000000000..2548d2e2b3
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/weapon/weap_bow_short.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+ props/prop_weap.dds
+
+
+
+
+
+ props/weap_bow_a.pmd
+
+
+ props/weap_bow_b.pmd
+
+
+ props/weap_bow_c.pmd
+
+
+
+
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_csword_a.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_csword_a.xml
deleted file mode 100644
index 4908341119..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_csword_a.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_csword_b.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_csword_b.xml
deleted file mode 100644
index dc60838c77..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_csword_b.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_csword_c.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_csword_c.xml
deleted file mode 100644
index aad6c908d0..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_csword_c.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_falcata.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_falcata.xml
new file mode 100644
index 0000000000..63b9c87dde
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/weapon/weap_falcata.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+ props/prop_weap.dds
+
+
+
+
+
+ props/weap_falcata_a.pmd
+
+
+ props/weap_falcata_b.pmd
+
+
+ props/weap_falcata_c.pmd
+
+
+ props/weap_falcata_d.pmd
+
+
+ props/weap_falcata_e.pmd
+
+
+
+
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_falcata_a.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_falcata_a.xml
deleted file mode 100644
index ff1ab1fa59..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_falcata_a.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_falcata_b.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_falcata_b.xml
deleted file mode 100644
index 27b25e2ec5..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_falcata_b.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_falcata_c.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_falcata_c.xml
deleted file mode 100644
index ff4bdf843c..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_falcata_c.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_falcata_d.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_falcata_d.xml
deleted file mode 100644
index c0a5fa01b8..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_falcata_d.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_falcata_e.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_falcata_e.xml
deleted file mode 100644
index 965d736c30..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_falcata_e.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_gladus.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_gladus.xml
new file mode 100644
index 0000000000..6fa5c26e66
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/weapon/weap_gladus.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+ props/prop_weap.dds
+
+
+
+
+
+ props/weap_gladus_c.pmd
+
+
+ props/weap_gladus_d.pmd
+
+
+ props/weap_gladus_e.pmd
+
+
+ props/weap_gladus_f.pmd
+
+
+ props/weap_gladus_g.pmd
+
+
+ props/weap_gladus_h.pmd
+
+
+
+
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_gladus_a.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_gladus_a.xml
deleted file mode 100644
index 8804f6dd4f..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_gladus_a.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_gladus_b.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_gladus_b.xml
deleted file mode 100644
index 7831f0acde..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_gladus_b.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_gladus_c.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_gladus_c.xml
deleted file mode 100644
index c3427931eb..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_gladus_c.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_gladus_d.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_gladus_d.xml
deleted file mode 100644
index 2f073dc6a3..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_gladus_d.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_gladus_e.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_gladus_e.xml
deleted file mode 100644
index 443d4ee39c..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_gladus_e.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_gladus_f.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_gladus_f.xml
deleted file mode 100644
index 2beaf90aac..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_gladus_f.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_gladus_g.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_gladus_g.xml
deleted file mode 100644
index 480ab1a374..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_gladus_g.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_gladus_h.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_gladus_h.xml
deleted file mode 100644
index 597604b97a..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_gladus_h.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_jav.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_jav.xml
new file mode 100644
index 0000000000..91c32d94b5
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/weapon/weap_jav.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+ props/prop_weap.dds
+
+
+
+
+
+ props/weap_jav_a.pmd
+
+
+ props/weap_jav_b.pmd
+
+
+ props/weap_jav_c.pmd
+
+
+ props/weap_jav_d.pmd
+
+
+ props/weap_jav_e.pmd
+
+
+
+
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_jav_a.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_jav_a.xml
deleted file mode 100644
index 693dc79052..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_jav_a.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_jav_b.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_jav_b.xml
deleted file mode 100644
index b53c6e68c3..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_jav_b.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_jav_c.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_jav_c.xml
deleted file mode 100644
index b623e072fa..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_jav_c.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_jav_d.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_jav_d.xml
deleted file mode 100644
index 0b72271b95..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_jav_d.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_jav_e.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_jav_e.xml
deleted file mode 100644
index 2d22683679..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_jav_e.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_jav_f.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_jav_f.xml
deleted file mode 100644
index 11b5302fae..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_jav_f.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_jav_g.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_jav_g.xml
deleted file mode 100644
index 547f910fa0..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_jav_g.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_jav_gold.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_jav_gold.xml
new file mode 100644
index 0000000000..7662b22010
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/weapon/weap_jav_gold.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+ props/weap_jav_f.pmd
+ props/prop_weap.dds
+
+
+
+
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_jav_iron.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_jav_iron.xml
new file mode 100644
index 0000000000..17697a8980
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/weapon/weap_jav_iron.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+ props/weap_jav_g.pmd
+ props/prop_weap.dds
+
+
+
+
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_pillum.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_pillum.xml
new file mode 100644
index 0000000000..420e2fb883
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/weapon/weap_pillum.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+ props/prop_weap.dds
+
+
+
+
+
+ props/weap_pillum_c.pmd
+
+
+ props/weap_pillum_d.pmd
+
+
+
+
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_pillum_a.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_pillum_a.xml
deleted file mode 100644
index c3db6ff982..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_pillum_a.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_pillum_b.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_pillum_b.xml
deleted file mode 100644
index ae09a3b337..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_pillum_b.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_pillum_c.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_pillum_c.xml
deleted file mode 100644
index b1fc77a2a9..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_pillum_c.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_pillum_d.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_pillum_d.xml
deleted file mode 100644
index 021dee0721..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_pillum_d.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_pillum_e.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_pillum_e.xml
deleted file mode 100644
index d8f900935a..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_pillum_e.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_pillum_f.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_pillum_f.xml
deleted file mode 100644
index ace6b2123b..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_pillum_f.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_pillum_weight.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_pillum_weight.xml
new file mode 100644
index 0000000000..df7f4279fa
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/weapon/weap_pillum_weight.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+ props/prop_weap.dds
+
+
+
+
+
+ props/weap_pillum_a.pmd
+
+
+ props/weap_pillum_b.pmd
+
+
+
+
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_saunion.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_saunion.xml
new file mode 100644
index 0000000000..9fedd7efe8
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/weapon/weap_saunion.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+ props/weap_spear_c.pmd
+ props/prop_weap.dds
+
+
+
+
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_sling.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_sling.xml
new file mode 100644
index 0000000000..56f1242a39
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/weapon/weap_sling.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+ props/prop_weap.dds
+
+
+
+
+
+ props/weap_sling_a.pmd
+
+
+ props/weap_sling_b.pmd
+
+
+
+
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_sling_a.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_sling_a.xml
deleted file mode 100644
index da0b2a803f..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_sling_a.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_sling_b.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_sling_b.xml
deleted file mode 100644
index a20dd05877..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_sling_b.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_spatha.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_spatha.xml
new file mode 100644
index 0000000000..953e0a85d1
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/weapon/weap_spatha.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+ props/prop_weap.dds
+
+
+
+
+
+ props/weap_gladus_a.pmd
+
+
+ props/weap_gladus_a.pmd
+
+
+
+
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_spear_a.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_spear.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/weapon/weap_spear_a.xml
rename to binaries/data/mods/official/art/actors/props/weapon/weap_spear.xml
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_spear_b.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_spear_b.xml
deleted file mode 100644
index 37a3b709f9..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_spear_b.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_spear_ball.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_spear_ball.xml
new file mode 100644
index 0000000000..33b43900fb
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/weapon/weap_spear_ball.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+ props/prop_weap.dds
+
+
+
+
+
+ props/weap_spear_a.pmd
+
+
+ props/weap_spear_b.pmd
+
+
+ props/weap_spear_c.pmd
+
+
+ props/weap_spear_d.pmd
+
+
+ props/weap_spear_e.pmd
+
+
+
+
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_spear_ball_a.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_spear_ball_a.xml
deleted file mode 100644
index 041827cd13..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_spear_ball_a.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_spear_ball_b.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_spear_ball_b.xml
deleted file mode 100644
index 5f9aa16cfd..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_spear_ball_b.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_spear_ball_c.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_spear_ball_c.xml
deleted file mode 100644
index bb3b4181cd..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_spear_ball_c.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_spear_ball_d.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_spear_ball_d.xml
deleted file mode 100644
index ae09b07eb8..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_spear_ball_d.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_spear_ball_e.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_spear_ball_e.xml
deleted file mode 100644
index e070a34143..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_spear_ball_e.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_spear_c.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_spear_c.xml
deleted file mode 100644
index 7797eedf56..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_spear_c.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_spear_d.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_spear_d.xml
deleted file mode 100644
index 352a9cf8b2..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_spear_d.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_spear_e.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_spear_e.xml
deleted file mode 100644
index 23c035299d..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_spear_e.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_spear_long.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_spear_long.xml
new file mode 100644
index 0000000000..c44d5eae4f
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/weapon/weap_spear_long.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+ props/prop_weap.dds
+
+
+
+
+
+ props/weap_spear_a.pmd
+
+
+ props/weap_spear_b.pmd
+
+
+ props/weap_spear_c.pmd
+
+
+ props/weap_spear_d.pmd
+
+
+
+
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_spear_long_a.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_spear_long_a.xml
deleted file mode 100644
index 43bc5cc57f..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_spear_long_a.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_spear_long_b.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_spear_long_b.xml
deleted file mode 100644
index ddf94c14b5..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_spear_long_b.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_spear_long_c.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_spear_long_c.xml
deleted file mode 100644
index 6f7770b697..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_spear_long_c.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_spear_long_d.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_spear_long_d.xml
deleted file mode 100644
index 59ae32422f..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_spear_long_d.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_spear_long_e.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_spear_long_e.xml
deleted file mode 100644
index 3e370956d5..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_spear_long_e.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_spear_long_iron.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_spear_long_iron.xml
new file mode 100644
index 0000000000..a0823c67cf
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/weapon/weap_spear_long_iron.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+ props/weap_spear_e.pmd
+ props/prop_weap.dds
+
+
+
+
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_verutum.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_verutum.xml
new file mode 100644
index 0000000000..8f6d708dab
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/weapon/weap_verutum.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+ props/prop_weap.dds
+
+
+
+
+
+ props/weap_pillum_e.pmd
+
+
+ props/weap_pillum_f.pmd
+
+
+
+
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_xiphos.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_xiphos.xml
new file mode 100644
index 0000000000..19544c3806
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/weapon/weap_xiphos.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+ props/prop_weap.dds
+
+
+
+
+
+ props/weap_xiphos_a.pmd
+
+
+ props/weap_xiphos_b.pmd
+
+
+ props/weap_xiphos_c.pmd
+
+
+ props/weap_xiphos_d.pmd
+
+
+ props/weap_xiphos_e.pmd
+
+
+ props/weap_xiphos_f.pmd
+
+
+
+
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_xiphos_a.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_xiphos_a.xml
deleted file mode 100644
index 7486f91d13..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_xiphos_a.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_xiphos_b.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_xiphos_b.xml
deleted file mode 100644
index 867741ea57..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_xiphos_b.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_xiphos_c.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_xiphos_c.xml
deleted file mode 100644
index b2a4977dee..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_xiphos_c.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_xiphos_d.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_xiphos_d.xml
deleted file mode 100644
index 0fa0137814..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_xiphos_d.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_xiphos_e.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_xiphos_e.xml
deleted file mode 100644
index c425ba61a7..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_xiphos_e.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/binaries/data/mods/official/art/actors/props/weapon/weap_xiphos_f.xml b/binaries/data/mods/official/art/actors/props/weapon/weap_xiphos_f.xml
deleted file mode 100644
index cb42c2a44e..0000000000
--- a/binaries/data/mods/official/art/actors/props/weapon/weap_xiphos_f.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-