63 files changed, 62 insertions, 62 deletions
diff --git a/graphics/items/weapon-arrow-arrow.png b/graphics/items/equipment/ammo/arrow-arrow.png
index fd1836c9..fd1836c9 100644
--- a/graphics/items/weapon-arrow-arrow.png
+++ b/graphics/items/equipment/ammo/arrow-arrow.png
diff --git a/graphics/items/weapon-arrow-iron.png b/graphics/items/equipment/ammo/arrow-iron.png
index 2c87a12b..2c87a12b 100644
--- a/graphics/items/weapon-arrow-iron.png
+++ b/graphics/items/equipment/ammo/arrow-iron.png
diff --git a/graphics/items/weapon-thrown-bonedarts.png b/graphics/items/equipment/ammo/bonedarts.png
index f8536d3b..f8536d3b 100644
--- a/graphics/items/weapon-thrown-bonedarts.png
+++ b/graphics/items/equipment/ammo/bonedarts.png
diff --git a/graphics/items/armor-neck-enchanter.png b/graphics/items/equipment/neck/enchanter.png
index 3023715e..3023715e 100644
--- a/graphics/items/armor-neck-enchanter.png
+++ b/graphics/items/equipment/neck/enchanter.png
diff --git a/graphics/items/armor-neck-silver4leaf.png b/graphics/items/equipment/neck/silverfourleaf.png
index a02c76e4..a02c76e4 100644
--- a/graphics/items/armor-neck-silver4leaf.png
+++ b/graphics/items/equipment/neck/silverfourleaf.png
diff --git a/graphics/items/armor-shield-bladeshield.png b/graphics/items/equipment/shield/blade.png
index dde2ecbd..dde2ecbd 100644
--- a/graphics/items/armor-shield-bladeshield.png
+++ b/graphics/items/equipment/shield/blade.png
diff --git a/graphics/items/equipment/shield/brassshield.png b/graphics/items/equipment/shield/brass.png
index 5753148a..5753148a 100644
--- a/graphics/items/equipment/shield/brassshield.png
+++ b/graphics/items/equipment/shield/brass.png
diff --git a/graphics/items/armor-shield-britshield.png b/graphics/items/equipment/shield/brit.png
index c3a8f1d7..c3a8f1d7 100644
--- a/graphics/items/armor-shield-britshield.png
+++ b/graphics/items/equipment/shield/brit.png
diff --git a/graphics/items/armor-shield-knightshield.png b/graphics/items/equipment/shield/knight.png
index 0cb742c3..0cb742c3 100644
--- a/graphics/items/armor-shield-knightshield.png
+++ b/graphics/items/equipment/shield/knight.png
diff --git a/graphics/items/armor-shield-leathershield.png b/graphics/items/equipment/shield/leather.png
index af688611..af688611 100755
--- a/graphics/items/armor-shield-leathershield.png
+++ b/graphics/items/equipment/shield/leather.png
diff --git a/graphics/items/armor-hands-scarabarmlet.png b/graphics/items/equipment/shield/scarabarmlet.png
index c0a597b9..c0a597b9 100644
--- a/graphics/items/armor-hands-scarabarmlet.png
+++ b/graphics/items/equipment/shield/scarabarmlet.png
diff --git a/graphics/items/armor-shield-steelshield.png b/graphics/items/equipment/shield/steel.png
index 04d26199..04d26199 100644
--- a/graphics/items/armor-shield-steelshield.png
+++ b/graphics/items/equipment/shield/steel.png
diff --git a/graphics/items/armor-shield-woodenshield.png b/graphics/items/equipment/shield/wooden.png
index 7b409d4f..7b409d4f 100755
--- a/graphics/items/armor-shield-woodenshield.png
+++ b/graphics/items/equipment/shield/wooden.png
diff --git a/graphics/items/weapon-axe-axe.png b/graphics/items/equipment/weapon/axe-axe.png
index 007c4ec8..007c4ec8 100644
--- a/graphics/items/weapon-axe-axe.png
+++ b/graphics/items/equipment/weapon/axe-axe.png
diff --git a/graphics/items/weapon-axe-blacksmithsaxe.png b/graphics/items/equipment/weapon/axe-blacksmithsaxe.png
index b1236488..b1236488 100644
--- a/graphics/items/weapon-axe-blacksmithsaxe.png
+++ b/graphics/items/equipment/weapon/axe-blacksmithsaxe.png
diff --git a/graphics/items/weapon-axe-butcherscleaver.png b/graphics/items/equipment/weapon/axe-butcherscleaver.png
index 08a608e8..08a608e8 100644
--- a/graphics/items/weapon-axe-butcherscleaver.png
+++ b/graphics/items/equipment/weapon/axe-butcherscleaver.png
diff --git a/graphics/items/weapon-axe-hatchet.png b/graphics/items/equipment/weapon/axe-hatchet.png
index a32f4949..a32f4949 100644
--- a/graphics/items/weapon-axe-hatchet.png
+++ b/graphics/items/equipment/weapon/axe-hatchet.png
diff --git a/graphics/items/weapon-axe-meatcleaver.png b/graphics/items/equipment/weapon/axe-meatcleaver.png
index ebb910c0..ebb910c0 100644
--- a/graphics/items/weapon-axe-meatcleaver.png
+++ b/graphics/items/equipment/weapon/axe-meatcleaver.png
diff --git a/graphics/items/weapon-axe-tomahawk.png b/graphics/items/equipment/weapon/axe-tomahawk.png
index d552ddce..d552ddce 100644
--- a/graphics/items/weapon-axe-tomahawk.png
+++ b/graphics/items/equipment/weapon/axe-tomahawk.png
diff --git a/graphics/items/weapon-bow-bow.png b/graphics/items/equipment/weapon/bow-bow.png
index 2ab672dc..2ab672dc 100644
--- a/graphics/items/weapon-bow-bow.png
+++ b/graphics/items/equipment/weapon/bow-bow.png
diff --git a/graphics/items/weapon-bow-desertbow.png b/graphics/items/equipment/weapon/bow-desertbow.png
index 9ed99df9..9ed99df9 100644
--- a/graphics/items/weapon-bow-desertbow.png
+++ b/graphics/items/equipment/weapon/bow-desertbow.png
diff --git a/graphics/items/weapon-bow-forestbow.png b/graphics/items/equipment/weapon/bow-forestbow.png
index fb3580b8..fb3580b8 100644
--- a/graphics/items/weapon-bow-forestbow.png
+++ b/graphics/items/equipment/weapon/bow-forestbow.png
diff --git a/graphics/items/weapon-bow-shortbow.png b/graphics/items/equipment/weapon/bow-shortbow.png
index 8ceec1ca..8ceec1ca 100644
--- a/graphics/items/weapon-bow-shortbow.png
+++ b/graphics/items/equipment/weapon/bow-shortbow.png
diff --git a/graphics/items/weapon-dagger-boneknife.png b/graphics/items/equipment/weapon/dagger-boneknife.png
index 1e32aeee..1e32aeee 100644
--- a/graphics/items/weapon-dagger-boneknife.png
+++ b/graphics/items/equipment/weapon/dagger-boneknife.png
diff --git a/graphics/items/weapon-dagger-dagger.png b/graphics/items/equipment/weapon/dagger-dagger.png
index cdfc3708..cdfc3708 100644
--- a/graphics/items/weapon-dagger-dagger.png
+++ b/graphics/items/equipment/weapon/dagger-dagger.png
diff --git a/graphics/items/weapon-dagger-knive.png b/graphics/items/equipment/weapon/dagger-knive.png
index 52c1294f..52c1294f 100644
--- a/graphics/items/weapon-dagger-knive.png
+++ b/graphics/items/equipment/weapon/dagger-knive.png
diff --git a/graphics/items/weapon-dagger-rockknive.png b/graphics/items/equipment/weapon/dagger-rockknive.png
index 423171aa..423171aa 100644
--- a/graphics/items/weapon-dagger-rockknive.png
+++ b/graphics/items/equipment/weapon/dagger-rockknive.png
diff --git a/graphics/items/weapon-dagger-setzer.png b/graphics/items/equipment/weapon/dagger-setzer.png
index 7b03ed33..7b03ed33 100644
--- a/graphics/items/weapon-dagger-setzer.png
+++ b/graphics/items/equipment/weapon/dagger-setzer.png
diff --git a/graphics/items/weapon-dagger-sharpknife.png b/graphics/items/equipment/weapon/dagger-sharpknife.png
index eed9780f..eed9780f 100644
--- a/graphics/items/weapon-dagger-sharpknife.png
+++ b/graphics/items/equipment/weapon/dagger-sharpknife.png
diff --git a/graphics/items/weapon-dagger-shortsword.png b/graphics/items/equipment/weapon/dagger-shortsword.png
index 2808f989..2808f989 100644
--- a/graphics/items/weapon-dagger-shortsword.png
+++ b/graphics/items/equipment/weapon/dagger-shortsword.png
diff --git a/graphics/items/weapon-dagger-stiletto.png b/graphics/items/equipment/weapon/dagger-stiletto.png
index aabce433..aabce433 100644
--- a/graphics/items/weapon-dagger-stiletto.png
+++ b/graphics/items/equipment/weapon/dagger-stiletto.png
diff --git a/graphics/items/weapon-mace-club.png b/graphics/items/equipment/weapon/mace-club.png
index 30d64215..30d64215 100644
--- a/graphics/items/weapon-mace-club.png
+++ b/graphics/items/equipment/weapon/mace-club.png
diff --git a/graphics/items/weapon-polearm-bardiche.png b/graphics/items/equipment/weapon/polearm-bardiche.png
index 8b950254..8b950254 100644
--- a/graphics/items/weapon-polearm-bardiche.png
+++ b/graphics/items/equipment/weapon/polearm-bardiche.png
diff --git a/graphics/items/weapon-polearm-dualspear.png b/graphics/items/equipment/weapon/polearm-dualspear.png
index 2aa78c1a..2aa78c1a 100644
--- a/graphics/items/weapon-polearm-dualspear.png
+++ b/graphics/items/equipment/weapon/polearm-dualspear.png
diff --git a/graphics/items/weapon-polearm-halberd.png b/graphics/items/equipment/weapon/polearm-halberd.png
index 7cc83788..7cc83788 100644
--- a/graphics/items/weapon-polearm-halberd.png
+++ b/graphics/items/equipment/weapon/polearm-halberd.png
diff --git a/graphics/items/weapon-polearm-heavypike.png b/graphics/items/equipment/weapon/polearm-heavypike.png
index 29a3a884..29a3a884 100644
--- a/graphics/items/weapon-polearm-heavypike.png
+++ b/graphics/items/equipment/weapon/polearm-heavypike.png
diff --git a/graphics/items/weapon-polearm-heavyspear.png b/graphics/items/equipment/weapon/polearm-heavyspear.png
index 2e9e1945..2e9e1945 100644
--- a/graphics/items/weapon-polearm-heavyspear.png
+++ b/graphics/items/equipment/weapon/polearm-heavyspear.png
diff --git a/graphics/items/weapon-polearm-pike.png b/graphics/items/equipment/weapon/polearm-pike.png
index 15b80076..15b80076 100644
--- a/graphics/items/weapon-polearm-pike.png
+++ b/graphics/items/equipment/weapon/polearm-pike.png
diff --git a/graphics/items/weapon-polearm-scorpion.png b/graphics/items/equipment/weapon/polearm-scorpion.png
index 54be14f5..54be14f5 100644
--- a/graphics/items/weapon-polearm-scorpion.png
+++ b/graphics/items/equipment/weapon/polearm-scorpion.png
diff --git a/graphics/items/weapon-polearm-scythe.png b/graphics/items/equipment/weapon/polearm-scythe.png
index 61bff6dd..61bff6dd 100644
--- a/graphics/items/weapon-polearm-scythe.png
+++ b/graphics/items/equipment/weapon/polearm-scythe.png
diff --git a/graphics/items/weapon-polearm-spear.png b/graphics/items/equipment/weapon/polearm-spear.png
index 2a36cfbb..2a36cfbb 100644
--- a/graphics/items/weapon-polearm-spear.png
+++ b/graphics/items/equipment/weapon/polearm-spear.png
diff --git a/graphics/items/weapon-polearm-trident.png b/graphics/items/equipment/weapon/polearm-trident.png
index f950b9b9..f950b9b9 100644
--- a/graphics/items/weapon-polearm-trident.png
+++ b/graphics/items/equipment/weapon/polearm-trident.png
diff --git a/graphics/items/weapon-staff-crescentrod.png b/graphics/items/equipment/weapon/staff-crescentrod.png
index 2f8c87df..2f8c87df 100644
--- a/graphics/items/weapon-staff-crescentrod.png
+++ b/graphics/items/equipment/weapon/staff-crescentrod.png
diff --git a/graphics/items/weapon-staff-staffoffire.png b/graphics/items/equipment/weapon/staff-staffoffire.png
index ad6b5e60..ad6b5e60 100644
--- a/graphics/items/weapon-staff-staffoffire.png
+++ b/graphics/items/equipment/weapon/staff-staffoffire.png
diff --git a/graphics/items/weapon-staff-staffofice.png b/graphics/items/equipment/weapon/staff-staffofice.png
index 01db15d3..01db15d3 100644
--- a/graphics/items/weapon-staff-staffofice.png
+++ b/graphics/items/equipment/weapon/staff-staffofice.png
diff --git a/graphics/items/weapon-staff-staffoflife.png b/graphics/items/equipment/weapon/staff-staffoflife.png
index a0e7dee7..a0e7dee7 100644
--- a/graphics/items/weapon-staff-staffoflife.png
+++ b/graphics/items/equipment/weapon/staff-staffoflife.png
diff --git a/graphics/items/weapon-staff-woodstaff.png b/graphics/items/equipment/weapon/staff-woodstaff.png
index 3e1f0674..3e1f0674 100644
--- a/graphics/items/weapon-staff-woodstaff.png
+++ b/graphics/items/equipment/weapon/staff-woodstaff.png
diff --git a/graphics/items/weapon-sword-baselard.png b/graphics/items/equipment/weapon/sword-baselard.png
index 42347057..42347057 100644
--- a/graphics/items/weapon-sword-baselard.png
+++ b/graphics/items/equipment/weapon/sword-baselard.png
diff --git a/graphics/items/weapon-sword-bastardsword.png b/graphics/items/equipment/weapon/sword-bastardsword.png
index 25738b8b..25738b8b 100644
--- a/graphics/items/weapon-sword-bastardsword.png
+++ b/graphics/items/equipment/weapon/sword-bastardsword.png
diff --git a/graphics/items/weapon-sword-beheader.png b/graphics/items/equipment/weapon/sword-beheader.png
index 3017bd31..3017bd31 100644
--- a/graphics/items/weapon-sword-beheader.png
+++ b/graphics/items/equipment/weapon/sword-beheader.png
diff --git a/graphics/items/weapon-sword-broadsword.png b/graphics/items/equipment/weapon/sword-broadsword.png
index 0ef7af43..0ef7af43 100644
--- a/graphics/items/weapon-sword-broadsword.png
+++ b/graphics/items/equipment/weapon/sword-broadsword.png
diff --git a/graphics/items/weapon-sword-bronzesword.png b/graphics/items/equipment/weapon/sword-bronzesword.png
index 0c6cadd8..0c6cadd8 100644
--- a/graphics/items/weapon-sword-bronzesword.png
+++ b/graphics/items/equipment/weapon/sword-bronzesword.png
diff --git a/graphics/items/weapon-sword-falchion.png b/graphics/items/equipment/weapon/sword-falchion.png
index 87f7943d..87f7943d 100644
--- a/graphics/items/weapon-sword-falchion.png
+++ b/graphics/items/equipment/weapon/sword-falchion.png
diff --git a/graphics/items/weapon-sword-firesword.png b/graphics/items/equipment/weapon/sword-firesword.png
index eecb529a..eecb529a 100644
--- a/graphics/items/weapon-sword-firesword.png
+++ b/graphics/items/equipment/weapon/sword-firesword.png
diff --git a/graphics/items/weapon-sword-jackal.png b/graphics/items/equipment/weapon/sword-jackal.png
index f1f0a76a..f1f0a76a 100644
--- a/graphics/items/weapon-sword-jackal.png
+++ b/graphics/items/equipment/weapon/sword-jackal.png
diff --git a/graphics/items/weapon-sword-longsword.png b/graphics/items/equipment/weapon/sword-longsword.png
index 05241f17..05241f17 100644
--- a/graphics/items/weapon-sword-longsword.png
+++ b/graphics/items/equipment/weapon/sword-longsword.png
diff --git a/graphics/items/weapon-sword-rapier.png b/graphics/items/equipment/weapon/sword-rapier.png
index 3bed4aaf..3bed4aaf 100644
--- a/graphics/items/weapon-sword-rapier.png
+++ b/graphics/items/equipment/weapon/sword-rapier.png
diff --git a/graphics/items/weapon-sword-sabre.png b/graphics/items/equipment/weapon/sword-sabre.png
index 60dec1e0..60dec1e0 100644
--- a/graphics/items/weapon-sword-sabre.png
+++ b/graphics/items/equipment/weapon/sword-sabre.png
diff --git a/graphics/items/weapon-sword-sandcutter.png b/graphics/items/equipment/weapon/sword-sandcutter.png
index 98b8351e..98b8351e 100644
--- a/graphics/items/weapon-sword-sandcutter.png
+++ b/graphics/items/equipment/weapon/sword-sandcutter.png
diff --git a/graphics/items/weapon-sword-scimitar.png b/graphics/items/equipment/weapon/sword-scimitar.png
index 6b68186a..6b68186a 100644
--- a/graphics/items/weapon-sword-scimitar.png
+++ b/graphics/items/equipment/weapon/sword-scimitar.png
diff --git a/graphics/items/weapon-sword-sword.png b/graphics/items/equipment/weapon/sword-sword.png
index 571fb40e..571fb40e 100644
--- a/graphics/items/weapon-sword-sword.png
+++ b/graphics/items/equipment/weapon/sword-sword.png
diff --git a/graphics/sprites/weapon-axe-blacksmith.xml b/graphics/sprites/weapon-axe-blacksmith.xml
index 61806b50..6df37aeb 100755
--- a/graphics/sprites/weapon-axe-blacksmith.xml
+++ b/graphics/sprites/weapon-axe-blacksmith.xml
@@ -23,4 +23,4 @@
 		 	<end />
 		</animation>
 	</action>
-</sprite>
-\ No newline at end of file
+</sprite>
diff --git a/items.xml b/items.xml
index 6d27df64..c6ddb5ba 100644
--- a/items.xml
+++ b/items.xml
@@ -277,7 +277,7 @@
         hp="100"
         weight="1"/>
     <item id="521"
-        image="weapon-dagger-dagger.png"
+        image="equipment/weapon/dagger-dagger.png"
         name="Dagger"
         description="A simple dagger."
         effect="+15 Damage, 1 Range"
@@ -295,7 +295,7 @@
         <sound event="hit">weapons/swords/short-sword-hit1.ogg</sound>
     </item>
     <item id="522"
-        image="weapon-dagger-sharpknife.png"
+        image="equipment/weapon/dagger-sharpknife.png"
         name="Sharp Knife"
         description="A really sharp knife. Don't hurt yourself!"
         effect="+10 Damage, 1 Range"
@@ -375,7 +375,7 @@
         <sprite gender="female">equipment/feet/boots-female.xml|#623a34,f0c2b4</sprite>
     </item>
     <item id="529"
-        image="weapon-arrow-iron.png"
+        image="equipment/ammo/arrow-iron.png"
         name="Iron Arrow"
         description="A hard arrow made of iron."
         effect="+40 Damage"
@@ -383,7 +383,7 @@
         weight="1"
         max-per-slot="100"/>
     <item id="530"
-        image="weapon-bow-shortbow.png"
+        image="equipment/weapon/bow-shortbow.png"
         name="Short Bow"
         description="A bow for short distances."
         effect="+50 Damage, 5 Range"
@@ -450,7 +450,7 @@
         weight="5"
         max-per-slot="10"/>
     <item id="536"
-        image="weapon-dagger-shortsword.png"
+        image="equipment/weapon/dagger-shortsword.png"
         name="Short Sword"
         description="A small but sharp sword."
         effect="+100 Damage, 1 Range"
@@ -538,7 +538,7 @@
         <sprite>head-silkheadband.xml</sprite>
     </item>
     <item id="545"
-        image="weapon-bow-forestbow.png"
+        image="equipment/weapon/bow-forestbow.png"
         name="Forest Bow"
         description="A bow usually used for hunting."
         effect="+70 Damage, 5 Range"
@@ -566,7 +566,7 @@
         <sprite gender="female">chest-leather-female.xml|#251e06,443c21,71653b,a0945e;#b6574a</sprite>
     </item>
     <item id="547"
-        image="weapon-polearm-bardiche.png"
+        image="equipment/weapon/polearm-bardiche.png"
         name="Bardiche"
         description="A Bardiche."
         effect="??? Damage, ??? Range"
@@ -577,7 +577,7 @@
         attack-range="32"
         max-per-slot="1"/>
     <item id="548"
-        image="weapon-polearm-halberd.png"
+        image="equipment/weapon/polearm-halberd.png"
         name="Halberd"
         description="A weapon usually carried by guards."
         effect="??? Damage, ??? Range"
@@ -587,7 +587,7 @@
         attack-range="32"
         max-per-slot="1"/>
     <item id="549"
-        image="weapon-axe-axe.png"
+        image="equipment/weapon/axe-axe.png"
         name="Axe"
         description="An axe."
         effect="??? Damage, ??? Range"
@@ -598,7 +598,7 @@
         attack-range="32"
         max-per-slot="1"/>
     <item id="550"
-        image="weapon-axe-blacksmithsaxe.png"
+        image="equipment/weapon/axe-blacksmithsaxe.png"
         name="Blacksmith's Axe"
         description="An axe usually used by blacksmiths."
         effect="+80 Damage, 1 Range"
@@ -694,7 +694,7 @@
         weight="10"
         max-per-slot="10"/>
     <item id="561"
-        image="weapon-sword-sabre.png"
+        image="equipment/weapon/sword-sabre.png"
         name="Sabre"
         description="A sword with a very sharp, curved, single-edged blade."
         effect="??? Damage, ??? Range"
@@ -780,7 +780,7 @@
         weight="10"
         max-per-slot="10"/>
     <item id="570"
-        image="weapon-dagger-boneknife.png"
+        image="equipment/weapon/dagger-boneknife.png"
         name="Bone Knife"
         description="A knife masterly carved out of a bone."
         effect="+115 Damage, 1 Range"
@@ -793,7 +793,7 @@
         attack-range="32"
         view="521"/>
     <item id="571"
-        image="weapon-dagger-setzer.png"
+        image="equipment/weapon/dagger-setzer.png"
         name="Setzer"
         description="A sharp knife, named after a famous gambler."
         effect="+110 Damage, 1 Range"
@@ -806,7 +806,7 @@
         attack-range="32"
         view="521"/>
     <item id="572"
-        image="weapon-sword-scimitar.png"
+        image="equipment/weapon/sword-scimitar.png"
         name="Scimitar"
         description="A sword with a heavy, curved, single-edged blade."
         effect="??? Damage, ??? Range"
@@ -817,7 +817,7 @@
         attack-range="32"
         max-per-slot="1"/>
     <item id="573"
-        image="weapon-sword-falchion.png"
+        image="equipment/weapon/sword-falchion.png"
         name="Falchion"
         description="A heavy one-handed, single-edged sword."
         effect="??? Damage, ??? Range"
@@ -828,7 +828,7 @@
         attack-range="32"
         max-per-slot="1"/>
     <item id="574"
-        image="weapon-polearm-scorpion.png"
+        image="equipment/weapon/polearm-scorpion.png"
         name="Scorpion"
         description="A well crafted glaive."
         effect="??? Damage, ??? Range"
@@ -839,7 +839,7 @@
         attack-range="32"
         max-per-slot="1"/>
     <item id="575"
-        image="weapon-bow-desertbow.png"
+        image="equipment/weapon/bow-desertbow.png"
         name="Desert Bow"
         description="A tonorian short bow."
         effect="??? Damage, ??? Range"
@@ -851,7 +851,7 @@
         missile-particle="graphics/particles/arrow.particle.xml"
         max-per-slot="1"/>
     <item id="576"
-        image="weapon-sword-beheader.png"
+        image="equipment/weapon/sword-beheader.png"
         name="Beheader"
         description="An oddly designed sword especially made for beheading enemies."
         effect="??? Damage, ??? Range"
@@ -862,7 +862,7 @@
         attack-range="32"
         max-per-slot="1"/>
     <item id="577"
-        image="weapon-thrown-bonedarts.png"
+        image="equipment/ammo/bonedarts.png"
         name="Bone Darts"
         description="Darts made of bones."
         effect="??? Damage, ??? Range"
@@ -873,7 +873,7 @@
         attack-range="32"
         max-per-slot="1"/>
     <item id="578"
-        image="weapon-sword-sandcutter.png"
+        image="equipment/weapon/sword-sandcutter.png"
         name="Sand Cutter"
         description="A sand cutter."
         effect="??? Damage, ??? Range"
@@ -884,7 +884,7 @@
         attack-range="32"
         max-per-slot="1"/>
     <item id="579"
-        image="weapon-dagger-rockknive.png"
+        image="equipment/weapon/dagger-rockknive.png"
         name="Rock Knife"
         description="A knife made of stone."
         effect="+110 Damage, +3 Vitality"
@@ -895,7 +895,7 @@
         attack-range="32"
         max-per-slot="1"/>
     <item id="580"
-        image="weapon-staff-staffoflife.png"
+        image="equipment/weapon/staff-staffoflife.png"
         name="Staff of Life"
         description="A staff that increases healing magic."
         effect="??? Damage, ??? Range"
@@ -906,7 +906,7 @@
         attack-range="32"
         max-per-slot="1"/>
     <item id="581"
-        image="weapon-staff-crescentrod.png"
+        image="equipment/weapon/staff-crescentrod.png"
         name="Crescent Rod"
         description="A crescent rod."
         effect="+50 Damage, ??? Range"
@@ -917,7 +917,7 @@
         attack-range="32"
         max-per-slot="1"/>
     <item id="582"
-        image="weapon-staff-staffoffire.png"
+        image="equipment/weapon/staff-staffoffire.png"
         name="Staff of Fire"
         description="A staff that increases fire magic."
         effect="??? Damage, ??? Range"
@@ -928,7 +928,7 @@
         attack-range="32"
         max-per-slot="1"/>
     <item id="583"
-        image="weapon-staff-staffofice.png"
+        image="equipment/weapon/staff-staffofice.png"
         name="Staff of Ice"
         description="A staff that increases ice magic."
         effect="??? Damage, ??? Range"
@@ -939,7 +939,7 @@
         attack-range="32"
         max-per-slot="1"/>
     <item id="584"
-        image="weapon-sword-jackal.png"
+        image="equipment/weapon/sword-jackal.png"
         name="Jackal"
         description="A jackal."
         effect="??? Damage, ??? Range"
@@ -950,7 +950,7 @@
         attack-range="32"
         max-per-slot="1"/>
     <item id="585"
-        image="armor-hands-scarabarmlet.png"
+        image="equipment/shield/scarabarmlet.png"
         name="Scarab Armlet"
         description="A scarab armlet."
         effect="+0% Defense"
@@ -972,7 +972,7 @@
 
 
     <item id="587"
-        image="weapon-sword-sword.png"
+        image="equipment/weapon/sword-sword.png"
         name="Sword"
         description="A simple but reliable sword."
         effect="+25 Damage, 1 Range"
@@ -989,7 +989,7 @@
 	</item>
     <!--
 	<item id="588"
-        image="weapon-sword-bastardsword.png"
+        image="equipment/weapon/sword-bastardsword.png"
         name="Bastard Sword"
         description="A large two handed sword."
         effect="??? Damage, ??? Range"
@@ -998,7 +998,7 @@
         weight="10"
         max-per-slot="1"/>
     <item id="589"
-        image="weapon-sword-broadsword.png"
+        image="equipment/weapon/sword-broadsword.png"
         name="Broad Sword"
         description="A two handed sword with a very broad blade."
         effect="??? Damage, ??? Range"
@@ -1009,7 +1009,7 @@
         <sound event="hit">weapons/swords/broadsword-hit1.ogg</sound>
     </item>
     <item id="590"
-        image="weapon-sword-baselard.png"
+        image="equipment/weapon/sword-baselard.png"
         name="Baselard"
         description="A short and powerful sword."
         effect="??? Damage, ??? Range"
@@ -1018,7 +1018,7 @@
         weight="10"
         max-per-slot="1"/>
     <item id="591"
-        image="weapon-sword-longsword.png"
+        image="equipment/weapon/sword-longsword.png"
         name="Long Sword"
         description="A sword with a long and agile blade."
         effect="??? Damage, ??? Range"
@@ -1031,7 +1031,7 @@
         <sound event="strike">weapons/swords/longsword-miss1.ogg</sound>
     </item>
     <item id="592"
-        image="weapon-dagger-stiletto.png"
+        image="equipment/weapon/dagger-stiletto.png"
         name="Stiletto"
         description="A dagger with a long and thin blade."
         effect="??? Damage, ??? Range"
@@ -1040,7 +1040,7 @@
         weight="10"
         max-per-slot="1"/>
     <item id="593"
-        image="weapon-sword-rapier.png"
+        image="equipment/weapon/sword-rapier.png"
         name="Rapier"
         description="A light sword made for duels."
         effect="??? Damage, ??? Range"
@@ -1052,7 +1052,7 @@
     </item>
 	-->
     <item id="594"
-        image="weapon-polearm-spear.png"
+        image="equipment/weapon/polearm-spear.png"
         name="Spear"
         description="A light spear with a wooden pole."
         effect="+40 Damage, 1 Range"
@@ -1069,7 +1069,7 @@
 		</item>
     <!--
 	<item id="595"
-        image="weapon-polearm-heavyspear.png"
+        image="equipment/weapon/polearm-heavyspear.png"
         name="Heavy Spear"
         description="A heavy spear with a wooden pole."
         effect="??? Damage, ??? Range"
@@ -1078,7 +1078,7 @@
         weight="10"
         max-per-slot="1"/>
     <item id="596"
-        image="weapon-polearm-pike.png"
+        image="equipment/weapon/polearm-pike.png"
         name="Pike"
         description="A light spear with an iron pole."
         effect="??? Damage, ??? Range"
@@ -1087,7 +1087,7 @@
         weight="10"
         max-per-slot="1"/>
     <item id="597"
-        image="weapon-polearm-heavypike.png"
+        image="equipment/weapon/polearm-heavypike.png"
         name="Heavy Pike"
         description="A heavy spear with an iron pole."
         effect="??? Damage, ??? Range"
@@ -1096,7 +1096,7 @@
         weight="10"
         max-per-slot="1"/>
     <item id="598"
-        image="weapon-polearm-dualspear.png"
+        image="equipment/weapon/polearm-dualspear.png"
         name="Dual Spear"
         description="A spear with two tops."
         effect="??? Damage, ??? Range"
@@ -1105,7 +1105,7 @@
         weight="10"
         max-per-slot="1"/>
     <item id="599"
-        image="weapon-sword-firesword.png"
+        image="equipment/weapon/sword-firesword.png"
         name="Fire Sword"
         description="A magical sword enchanted with the power of fire."
         effect="??? Damage, ??? Range"
@@ -1116,7 +1116,7 @@
         <sound event="strike">weapons/swords/firesword-miss1.ogg</sound>
     </item>
     <item id="600"
-        image="armor-shield-britshield.png"
+        image="equipment/shield/brit.png"
         name="Brit Shield"
         description="A legendary shield that is said to save queens and rule waves."
         effect="-50 Cooking"
@@ -1126,7 +1126,7 @@
     -->
 
     <item id="601"
-        image="armor-shield-steelshield.png"
+        image="equipment/shield/steel.png"
         name="Steel Shield"
         description="A shield made of steel."
         effect="+20% Defense"
@@ -1134,7 +1134,7 @@
         weight="2500"
         max-per-slot="1"/>
     <item id="602"
-        image="armor-shield-woodenshield.png"
+        image="equipment/shield/wooden.png"
         name="Wooden Shield"
         description="A shield made of wood."
         effect="+14% Defense"
@@ -1142,7 +1142,7 @@
         weight="1500"
         max-per-slot="1"/>
     <item id="603"
-        image="armor-shield-leathershield.png"
+        image="equipment/shield/leather.png"
         name="Leather Shield"
         description="A shield made of leather on a wooden frame."
         effect="+7% Defense"
@@ -1152,7 +1152,7 @@
 
     <!--
     <item id="604"
-        image="armor-shield-knightshield.png"
+        image="equipment/shield/knight.png"
         name="Knight Shield"
         description="A high quality shield used by knights."
         effect="??? Defense"
@@ -1160,7 +1160,7 @@
         weight="10"
         max-per-slot="1"/>
     <item id="605"
-        image="weapon-axe-meatcleaver.png"
+        image="equipment/weapon/axe-meatcleaver.png"
         name="Meat Cleaver"
         description="A butcher's tool that also makes a nice one handed battle axe."
         effect="??? Damage, ??? Range"
@@ -1169,7 +1169,7 @@
         weight="10"
         max-per-slot="1"/>
     <item id="606"
-        image="weapon-axe-hatchet.png"
+        image="equipment/weapon/axe-hatchet.png"
         name="Hatchet"
         description="A short one handed axe."
         effect="??? Damage, ??? Range"
@@ -1178,7 +1178,7 @@
         weight="10"
         max-per-slot="1"/>
     <item id="607"
-        image="weapon-polearm-trident.png"
+        image="equipment/weapon/polearm-trident.png"
         name="Trident"
         description="A spear with three heads."
         effect="??? Damage, ??? Range"
@@ -1187,7 +1187,7 @@
         weight="10"
         max-per-slot="1"/>
     <item id="608"
-        image="armor-shield-bladeshield.png"
+        image="equipment/shield/blade.png"
         name="Blade Shield"
         description="A shield made of blades."
         effect=""
@@ -1195,7 +1195,7 @@
         weight="10"
         max-per-slot="1"/>
     <item id="609"
-        image="weapon-mace-club.png"
+        image="equipment/weapon/mace-club.png"
         name="Club"
         description="A primitive wooden club."
         effect="??? Damage, ??? Range"
@@ -1338,7 +1338,7 @@
         <sprite>head-bandana.xml</sprite>
     </item>
     <item id="623"
-        image="weapon-polearm-scythe.png"
+        image="equipment/weapon/polearm-scythe.png"
         name="Scythe"
         description="Usually used for farming but also usable as a weapon. Slow but deadly."
         effect="+75 Damage, 1 Range"
@@ -2537,7 +2537,7 @@
         <sprite gender="female">equipment/feet/assassin-boots-female.xml</sprite>
     </item>
     <item id="758"
-        image="weapon-staff-woodstaff.png"
+        image="equipment/weapon/staff-woodstaff.png"
         name="Wooden Staff"
         description="A basic wooden staff."
         effect="+50 Damage, 1 Range"
@@ -2586,7 +2586,7 @@
         <sprite>head-desert-helmet.xml</sprite>
     </item>
     <item id="762"
-        image="weapon-arrow-arrow.png|W:#8B4513"
+        image="equipment/ammo/arrow-arrow.png|W:#8B4513"
         name="Terranite Arrow"
         description="A terranite arrow."
         effect="+50 Damage +10 Critical"
@@ -2931,7 +2931,7 @@
         <sprite gender="female">equipment/leg/brasspants-female.xml</sprite>
     </item>
     <item id="797"
-        image="equipment/shield/brassshield.png"
+        image="equipment/shield/brass.png"
         name="Brass Shield"
         description="A shield made of brass."
         effect="+20% Defense"
@@ -3152,7 +3152,7 @@
         type="generic"
         weight="1"/>
     <item id="1199"
-        image="weapon-arrow-arrow.png"
+        image="equipment/ammo/arrow-arrow.png"
         name="Arrow"
         description="A standard arrow."
         effect="+20 Damage"
@@ -3160,7 +3160,7 @@
         weight="1"
         max-per-slot="100"/>
     <item id="1200"
-        image="weapon-bow-bow.png"
+        image="equipment/weapon/bow-bow.png"
         name="Bow"
         description="A distance weapon."
         effect="+15 Damage, 5 Range"
@@ -3178,7 +3178,7 @@
         <sound event="swing">weapons/bows/bow_shoot_1.ogg</sound>
     </item>
     <item id="1201"
-        image="weapon-dagger-knive.png"
+        image="equipment/weapon/dagger-knive.png"
         name="Knife"
         description="A small knife; the perfect weapon for a beginner."
         effect="+5 Damage, 1 Range"
@@ -3315,7 +3315,7 @@
         <sprite>head-bunnyears.xml</sprite>
     </item>
     <item id="1215"
-        image="weapon-sword-sabre.png"
+        image="equipment/weapon/sword-sabre.png"
         name="Toy Sabre"
         description="A toy item, doesn't do much damage."
         effect="+1 Damage, 1 Range"
@@ -3431,7 +3431,7 @@
         weight="25"
         max-per-slot="3"/>
     <item id="1227"
-        image="armor-neck-enchanter.png"
+        image="neck/enchanter.png"
         name="Enchanter's Amulet"
         description="An amulet made for true enchanters."
         effect="+5 Intelligence"
@@ -3440,7 +3440,7 @@
         max-per-slot="1"
         intelligence="5"/>
     <item id="1228"
-        image="armor-neck-silver4leaf.png"
+        image="neck/silverfourleaf.png"
         name="Silver Four-Leaf Amulet"
         description="An amulet made for people bringing luck wherever they go."
         effect="+5 Luck"
@@ -3739,7 +3739,7 @@
         type="usable"
         weight="5"/>
      <item id="1282"
-        image="weapon-thrown-bonedarts.png"
+        image="equipment/ammo/bonedarts.png"
         name="Bone Arrows"
         description="Arrows made from bone. Not much different from the normal variety, but are much lighter."
         effect="+55 Damage"