36 files changed, 23 insertions, 23 deletions
diff --git a/graphics/sprites/monsters/weapon-bow.xml b/graphics/sprites/monsters/accessories/weapon-bow.xml
index 2429a5e0..2429a5e0 100644
--- a/graphics/sprites/monsters/weapon-bow.xml
+++ b/graphics/sprites/monsters/accessories/weapon-bow.xml
diff --git a/graphics/sprites/monsters/weapon-dagger.xml b/graphics/sprites/monsters/accessories/weapon-dagger.xml
index 5159b49f..5159b49f 100644
--- a/graphics/sprites/monsters/weapon-dagger.xml
+++ b/graphics/sprites/monsters/accessories/weapon-dagger.xml
diff --git a/graphics/sprites/monsters/monster-archant.png b/graphics/sprites/monsters/archant.png
index b554435f..b554435f 100644
--- a/graphics/sprites/monsters/monster-archant.png
+++ b/graphics/sprites/monsters/archant.png
diff --git a/graphics/sprites/monsters/monster-archant.xml b/graphics/sprites/monsters/archant.xml
index 79862707..68c3918c 100644
--- a/graphics/sprites/monsters/monster-archant.xml
+++ b/graphics/sprites/monsters/archant.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-archant.png" width="24" height="30" />
+	<imageset name="base" src="graphics/sprites/monsters/archant.png" width="24" height="30" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monsters/monster-ball-lightning.png b/graphics/sprites/monsters/ball-lightning.png
index 894dcecc..894dcecc 100755
--- a/graphics/sprites/monsters/monster-ball-lightning.png
+++ b/graphics/sprites/monsters/ball-lightning.png
diff --git a/graphics/sprites/monsters/monster-ball-lightning.xml b/graphics/sprites/monsters/ball-lightning.xml
index 335d39a4..49bdc273 100755
--- a/graphics/sprites/monsters/monster-ball-lightning.xml
+++ b/graphics/sprites/monsters/ball-lightning.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-ball-lightning.png" width="70" height="60" />
+	<imageset name="base" src="graphics/sprites/monsters/ball-lightning.png" width="70" height="60" />
 
 	<action name="stand" imageset="base">
 		<animation direction="default">
@@ -29,4 +29,4 @@
 		</animation>
 	</action>
 	
-</sprite>
-\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/monsters/monster-bandit-lord.png b/graphics/sprites/monsters/bandit-lord.png
index 8c860143..8c860143 100644
--- a/graphics/sprites/monsters/monster-bandit-lord.png
+++ b/graphics/sprites/monsters/bandit-lord.png
diff --git a/graphics/sprites/monsters/monster-bandit-lord.xml b/graphics/sprites/monsters/bandit-lord.xml
index a4bb7b73..5876969f 100644
--- a/graphics/sprites/monsters/monster-bandit-lord.xml
+++ b/graphics/sprites/monsters/bandit-lord.xml
@@ -2,7 +2,7 @@
 <sprite>
 
 	<imageset name="base" 
-		src=      "graphics/sprites/monsters/monster-bandit-lord.png" 
+		src=      "graphics/sprites/monsters/bandit-lord.png" 
 		width=    "64" 
 		height=   "64" 
 	/>
diff --git a/graphics/sprites/monsters/monster-bandit.png b/graphics/sprites/monsters/bandit.png
index a0c2fd46..a0c2fd46 100644
--- a/graphics/sprites/monsters/monster-bandit.png
+++ b/graphics/sprites/monsters/bandit.png
diff --git a/graphics/sprites/monsters/monster-bandit.xml b/graphics/sprites/monsters/bandit.xml
index dbcfa681..7caeda14 100644
--- a/graphics/sprites/monsters/monster-bandit.xml
+++ b/graphics/sprites/monsters/bandit.xml
@@ -2,7 +2,7 @@
 <sprite>
 
 	<imageset name="base" 
-		src=      "graphics/sprites/monsters/monster-bandit.png" 
+		src=      "graphics/sprites/monsters/bandit.png" 
 		width=    "64" 
 		height=   "64" 
 	/>
diff --git a/graphics/sprites/monsters/monster-bat.png b/graphics/sprites/monsters/bat.png
index f84a1f76..f84a1f76 100644
--- a/graphics/sprites/monsters/monster-bat.png
+++ b/graphics/sprites/monsters/bat.png
diff --git a/graphics/sprites/monsters/monster-bat.xml b/graphics/sprites/monsters/bat.xml
index 66a3ced2..844ad7cf 100644
--- a/graphics/sprites/monsters/monster-bat.xml
+++ b/graphics/sprites/monsters/bat.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-bat.png" width="37" height="58" />
+	<imageset name="base" src="graphics/sprites/monsters/bat.png" width="37" height="58" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
@@ -52,4 +52,4 @@
 		</animation>
 	</action>
 
-</sprite>
-\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/monsters/monster-bee.png b/graphics/sprites/monsters/bee.png
index cd1f8bcd..cd1f8bcd 100644
--- a/graphics/sprites/monsters/monster-bee.png
+++ b/graphics/sprites/monsters/bee.png
diff --git a/graphics/sprites/monsters/monster-bee.xml b/graphics/sprites/monsters/bee.xml
index c6eb61b1..6a1c3018 100644
--- a/graphics/sprites/monsters/monster-bee.xml
+++ b/graphics/sprites/monsters/bee.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-	<imageset name="base" src="graphics/sprites/monsters/monster-bee.png" width="20" height="19" />
+	<imageset name="base" src="graphics/sprites/monsters/bee.png" width="20" height="19" />
 	<action name="stand" imageset="base">
 		<animation direction="down">
 			<sequence start="8" end="11" delay="75" offsetY="-20" />
diff --git a/graphics/sprites/monsters/monster-butterfly.png b/graphics/sprites/monsters/butterfly.png
index f15cd2c7..f15cd2c7 100644
--- a/graphics/sprites/monsters/monster-butterfly.png
+++ b/graphics/sprites/monsters/butterfly.png
diff --git a/graphics/sprites/monsters/monster-butterfly.xml b/graphics/sprites/monsters/butterfly.xml
index 063983aa..0c6647bf 100644
--- a/graphics/sprites/monsters/monster-butterfly.xml
+++ b/graphics/sprites/monsters/butterfly.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-	<imageset name="base" src="graphics/sprites/monsters/monster-butterfly.png|W" width="28" height="28" />
+	<imageset name="base" src="graphics/sprites/monsters/butterfly.png|W" width="28" height="28" />
 	<action name="stand" imageset="base">
 		<animation direction="up">
 			<sequence start="0" end="3" delay="100" offsetY="-20" />
diff --git a/graphics/sprites/monsters/monster-cave-maggot-giant.png b/graphics/sprites/monsters/cave-maggot-giant.png
index 4eee44d7..4eee44d7 100644
--- a/graphics/sprites/monsters/monster-cave-maggot-giant.png
+++ b/graphics/sprites/monsters/cave-maggot-giant.png
diff --git a/graphics/sprites/monsters/monster-cave-maggot-giant.xml b/graphics/sprites/monsters/cave-maggot-giant.xml
index e3c65356..635b8011 100644
--- a/graphics/sprites/monsters/monster-cave-maggot-giant.xml
+++ b/graphics/sprites/monsters/cave-maggot-giant.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-cave-maggot-giant.png|W" width="58" height="46" />
+	<imageset name="base" src="graphics/sprites/monsters/cave-maggot-giant.png|W" width="58" height="46" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monsters/monster-cave-maggot.png b/graphics/sprites/monsters/cave-maggot.png
index fe5f3c0d..fe5f3c0d 100644
--- a/graphics/sprites/monsters/monster-cave-maggot.png
+++ b/graphics/sprites/monsters/cave-maggot.png
diff --git a/graphics/sprites/monsters/monster-cave-maggot.xml b/graphics/sprites/monsters/cave-maggot.xml
index ac2a0741..58b2f752 100644
--- a/graphics/sprites/monsters/monster-cave-maggot.xml
+++ b/graphics/sprites/monsters/cave-maggot.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-cave-maggot.png" width="20" height="15" />
+	<imageset name="base" src="graphics/sprites/monsters/cave-maggot.png" width="20" height="15" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/resource-clover.png b/graphics/sprites/monsters/clover.png
index c2d3ee3d..c2d3ee3d 100644
--- a/graphics/sprites/resource-clover.png
+++ b/graphics/sprites/monsters/clover.png
diff --git a/graphics/sprites/resource-clover.xml b/graphics/sprites/monsters/clover.xml
index 3e4a365b..450c80a6 100644
--- a/graphics/sprites/resource-clover.xml
+++ b/graphics/sprites/monsters/clover.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-    <imageset name="base" src="graphics/sprites/resource-clover.png" width="30" height="30" />
+    <imageset name="base" src="graphics/sprites/monsters/clover.png" width="30" height="30" />
 
     <action name="stand" imageset="base">
         <animation>
@@ -13,4 +13,4 @@
             <frame index="1"/>
         </animation>
     </action>
-</sprite>
-\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/monsters/monster-duck.png b/graphics/sprites/monsters/duck.png
index 44319fb9..44319fb9 100644
--- a/graphics/sprites/monsters/monster-duck.png
+++ b/graphics/sprites/monsters/duck.png
diff --git a/graphics/sprites/monsters/monster-duck.xml b/graphics/sprites/monsters/duck.xml
index dcb03026..4aa1c812 100644
--- a/graphics/sprites/monsters/monster-duck.xml
+++ b/graphics/sprites/monsters/duck.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-   <imageset name="base" src="graphics/sprites/monsters/monster-duck.png|W;M;R;G;C;B" width="24" height="26" />
+   <imageset name="base" src="graphics/sprites/monsters/duck.png|W;M;R;G;C;B" width="24" height="26" />
 
    <action name="stand" imageset="base">
       <animation direction="down">
diff --git a/graphics/sprites/monsters/monster-element-ball.png b/graphics/sprites/monsters/element-ball.png
index 9d28f45a..9d28f45a 100644
--- a/graphics/sprites/monsters/monster-element-ball.png
+++ b/graphics/sprites/monsters/element-ball.png
diff --git a/graphics/sprites/monsters/monster-element-ball.xml b/graphics/sprites/monsters/element-ball.xml
index 99934944..6815846a 100644
--- a/graphics/sprites/monsters/monster-element-ball.xml
+++ b/graphics/sprites/monsters/element-ball.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-<imageset name="base" src="graphics/sprites/monsters/monster-element-ball.png|W" width="50" height="80" />
+<imageset name="base" src="graphics/sprites/monsters/element-ball.png|W" width="50" height="80" />
 
 <action name="stand" imageset="base">
 <animation direction="default">
diff --git a/graphics/sprites/monsters/monster-flower.png b/graphics/sprites/monsters/flower.png
index f398b862..f398b862 100644
--- a/graphics/sprites/monsters/monster-flower.png
+++ b/graphics/sprites/monsters/flower.png
diff --git a/graphics/sprites/monsters/monster-flower.xml b/graphics/sprites/monsters/flower.xml
index f7753277..afa65e7c 100644
--- a/graphics/sprites/monsters/monster-flower.xml
+++ b/graphics/sprites/monsters/flower.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-flower.png|W;R;Y" width="58" height="45" />
+	<imageset name="base" src="graphics/sprites/monsters/flower.png|W;R;Y" width="58" height="45" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monsters/monster-fluffy.png b/graphics/sprites/monsters/fluffy.png
index 8cb26d03..8cb26d03 100644
--- a/graphics/sprites/monsters/monster-fluffy.png
+++ b/graphics/sprites/monsters/fluffy.png
diff --git a/graphics/sprites/monsters/monster-fluffy.xml b/graphics/sprites/monsters/fluffy.xml
index 938051c7..ee074b31 100644
--- a/graphics/sprites/monsters/monster-fluffy.xml
+++ b/graphics/sprites/monsters/fluffy.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-fluffy.png" width="28" height="32" />
+	<imageset name="base" src="graphics/sprites/monsters/fluffy.png" width="28" height="32" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
@@ -67,4 +67,4 @@
 		</animation>
 	</action>
 
-</sprite>
-\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/monsters/monster-ghost-pumpkin.png b/graphics/sprites/monsters/ghost-pumpkin.png
index e464c885..e464c885 100644
--- a/graphics/sprites/monsters/monster-ghost-pumpkin.png
+++ b/graphics/sprites/monsters/ghost-pumpkin.png
diff --git a/graphics/sprites/monsters/monster-ghost-pumpkin.xml b/graphics/sprites/monsters/ghost-pumpkin.xml
index 27aa7a9f..4d867290 100644
--- a/graphics/sprites/monsters/monster-ghost-pumpkin.xml
+++ b/graphics/sprites/monsters/ghost-pumpkin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-	<imageset name="base" src="graphics/sprites/monsters/monster-ghost-pumpkin.png" width="60" height="60" />
+	<imageset name="base" src="graphics/sprites/monsters/ghost-pumpkin.png" width="60" height="60" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
@@ -39,4 +39,4 @@
 		</animation>
 	</action>
 
-</sprite>
-\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/resource-plant.png b/graphics/sprites/monsters/plant.png
index 04bb0490..04bb0490 100644
--- a/graphics/sprites/resource-plant.png
+++ b/graphics/sprites/monsters/plant.png
diff --git a/graphics/sprites/resource-plant.xml b/graphics/sprites/monsters/plant.xml
index c61ccbcd..778f12f8 100644
--- a/graphics/sprites/resource-plant.xml
+++ b/graphics/sprites/monsters/plant.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/resource-plant.png|W" width="46" height="42" />
+	<imageset name="base" src="graphics/sprites/monsters/plant.png|W" width="46" height="42" />
 
 	<action name="stand" imageset="base">
 		<animation>
@@ -15,4 +15,4 @@
 		</animation>
 	</action>
 
-</sprite>
-\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/resource-pumpkin.png b/graphics/sprites/monsters/pumpkin.png
index 011b097b..011b097b 100644
--- a/graphics/sprites/resource-pumpkin.png
+++ b/graphics/sprites/monsters/pumpkin.png
diff --git a/graphics/sprites/resource-pumpkin.xml b/graphics/sprites/monsters/pumpkin.xml
index 2e51a847..544b6b95 100644
--- a/graphics/sprites/resource-pumpkin.xml
+++ b/graphics/sprites/monsters/pumpkin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-    <imageset name="base" src="graphics/sprites/resource-pumpkin.png" width="50" height="50" />
+    <imageset name="base" src="graphics/sprites/monsters/pumpkin.png" width="50" height="50" />
 
     <action name="stand" imageset="base">
         <animation>