Moved the monsters into the monsters/ subfolder.

62 files changed, 80 insertions, 80 deletions

diff --git a/graphics/sprites/monster-skeleton.xml b/graphics/sprites/monster-skeleton.xml
deleted file mode 100644
index 0c91c94f..00000000
--- a/graphics/sprites/monster-skeleton.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<sprite>
-
-	<imageset name="base" src="graphics/sprites/monster-skeleton.png|W" width="64" height="64" />
-
-	<include file="player_male_base.xml"/>
-
-</sprite>
diff --git a/graphics/sprites/monster-bat.png b/graphics/sprites/monsters/monster-bat.png
index f84a1f76..f84a1f76 100644
--- a/graphics/sprites/monster-bat.png
+++ b/graphics/sprites/monsters/monster-bat.png
diff --git a/graphics/sprites/monster-bat.xml b/graphics/sprites/monsters/monster-bat.xml
index f02ed109..66a3ced2 100644
--- a/graphics/sprites/monster-bat.xml
+++ b/graphics/sprites/monsters/monster-bat.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-bat.png" width="37" height="58" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-bat.png" width="37" height="58" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-duck.png b/graphics/sprites/monsters/monster-duck.png
index 44319fb9..44319fb9 100644
--- a/graphics/sprites/monster-duck.png
+++ b/graphics/sprites/monsters/monster-duck.png
diff --git a/graphics/sprites/monster-duck.xml b/graphics/sprites/monsters/monster-duck.xml
index 95527eaa..baf2dcfb 100644
--- a/graphics/sprites/monster-duck.xml
+++ b/graphics/sprites/monsters/monster-duck.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>

 <sprite>

 

-   <imageset name="base" src="graphics/sprites/monster-duck.png|W;M;R;G;C;B" width="24" height="26" />

+   <imageset name="base" src="graphics/sprites/monsters/monster-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/monster-flower.png b/graphics/sprites/monsters/monster-flower.png
index eeedd44a..eeedd44a 100644
--- a/graphics/sprites/monster-flower.png
+++ b/graphics/sprites/monsters/monster-flower.png
diff --git a/graphics/sprites/monster-flower.xml b/graphics/sprites/monsters/monster-flower.xml
index 8e9b36c8..9ac93f22 100644
--- a/graphics/sprites/monster-flower.xml
+++ b/graphics/sprites/monsters/monster-flower.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-flower.png" width="60" height="60" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-flower.png" width="60" height="60" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-fluffy.png b/graphics/sprites/monsters/monster-fluffy.png
index 8cb26d03..8cb26d03 100644
--- a/graphics/sprites/monster-fluffy.png
+++ b/graphics/sprites/monsters/monster-fluffy.png
diff --git a/graphics/sprites/monster-fluffy.xml b/graphics/sprites/monsters/monster-fluffy.xml
index a3eb8a2e..938051c7 100644
--- a/graphics/sprites/monster-fluffy.xml
+++ b/graphics/sprites/monsters/monster-fluffy.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-fluffy.png" width="28" height="32" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-fluffy.png" width="28" height="32" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-ghost-pumpkin.png b/graphics/sprites/monsters/monster-ghost-pumpkin.png
index e464c885..e464c885 100644
--- a/graphics/sprites/monster-ghost-pumpkin.png
+++ b/graphics/sprites/monsters/monster-ghost-pumpkin.png
diff --git a/graphics/sprites/monster-ghost-pumpkin.xml b/graphics/sprites/monsters/monster-ghost-pumpkin.xml
index 0b1e9542..27aa7a9f 100644
--- a/graphics/sprites/monster-ghost-pumpkin.xml
+++ b/graphics/sprites/monsters/monster-ghost-pumpkin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-	<imageset name="base" src="graphics/sprites/monster-ghost-pumpkin.png" width="60" height="60" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-ghost-pumpkin.png" width="60" height="60" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-goblin-fire.png b/graphics/sprites/monsters/monster-goblin-fire.png
index b52d274e..b52d274e 100644
--- a/graphics/sprites/monster-goblin-fire.png
+++ b/graphics/sprites/monsters/monster-goblin-fire.png
diff --git a/graphics/sprites/monster-goblin-fire.xml b/graphics/sprites/monsters/monster-goblin-fire.xml
index 5b3f472a..5b6045c1 100644
--- a/graphics/sprites/monster-goblin-fire.xml
+++ b/graphics/sprites/monsters/monster-goblin-fire.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-goblin-fire.png" width="60" height="43" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-goblin-fire.png" width="60" height="43" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-lizard.png b/graphics/sprites/monsters/monster-lizard.png
index 1d0ff1b7..1d0ff1b7 100644
--- a/graphics/sprites/monster-lizard.png
+++ b/graphics/sprites/monsters/monster-lizard.png
diff --git a/graphics/sprites/monster-lizard.xml b/graphics/sprites/monsters/monster-lizard.xml
index 9a4be0a8..0478e391 100644
--- a/graphics/sprites/monster-lizard.xml
+++ b/graphics/sprites/monsters/monster-lizard.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-lizard.png|W" width="80" height="56" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-lizard.png|W" width="80" height="56" />
 
 
 <action name="stand" imageset="base">
diff --git a/graphics/sprites/monster-logmonster.png b/graphics/sprites/monsters/monster-logmonster.png
index 183faf69..183faf69 100644
--- a/graphics/sprites/monster-logmonster.png
+++ b/graphics/sprites/monsters/monster-logmonster.png
diff --git a/graphics/sprites/monster-logmonster.xml b/graphics/sprites/monsters/monster-logmonster.xml
index f180e235..0c2c3d0e 100644
--- a/graphics/sprites/monster-logmonster.xml
+++ b/graphics/sprites/monsters/monster-logmonster.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <sprite>
-  <imageset name="base" src="graphics/sprites/monster-logmonster.png" width="45" height="43" />
+  <imageset name="base" src="graphics/sprites/monsters/monster-logmonster.png" width="45" height="43" />
   <action name="stand" imageset="base">
     <animation direction="down">
       <frame index="0" delay="100" />
diff --git a/graphics/sprites/monster-maggot-giant.png b/graphics/sprites/monsters/monster-maggot-giant.png
index a9bf0fb7..a9bf0fb7 100644
--- a/graphics/sprites/monster-maggot-giant.png
+++ b/graphics/sprites/monsters/monster-maggot-giant.png
diff --git a/graphics/sprites/monster-maggot-giant.xml b/graphics/sprites/monsters/monster-maggot-giant.xml
index 7742e44f..a4f77936 100644
--- a/graphics/sprites/monster-maggot-giant.xml
+++ b/graphics/sprites/monsters/monster-maggot-giant.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-maggot-giant.png" width="58" height="46" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-maggot-giant.png" width="58" height="46" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-maggot.png b/graphics/sprites/monsters/monster-maggot.png
index 64474f94..64474f94 100644
--- a/graphics/sprites/monster-maggot.png
+++ b/graphics/sprites/monsters/monster-maggot.png
diff --git a/graphics/sprites/monster-maggot.xml b/graphics/sprites/monsters/monster-maggot.xml
index c10a7f9c..f603b8db 100644
--- a/graphics/sprites/monster-maggot.xml
+++ b/graphics/sprites/monsters/monster-maggot.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-maggot.png" width="20" height="15" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-maggot.png" width="20" height="15" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-mouboo.png b/graphics/sprites/monsters/monster-mouboo.png
index 813176bf..813176bf 100644
--- a/graphics/sprites/monster-mouboo.png
+++ b/graphics/sprites/monsters/monster-mouboo.png
diff --git a/graphics/sprites/monster-mouboo.xml b/graphics/sprites/monsters/monster-mouboo.xml
index 2c6e59d5..3ab9c3ba 100644
--- a/graphics/sprites/monster-mouboo.xml
+++ b/graphics/sprites/monsters/monster-mouboo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-mouboo.png" width="80" height="80" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-mouboo.png" width="80" height="80" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-mushroom-red.png b/graphics/sprites/monsters/monster-mushroom-red.png
index 743d83e7..743d83e7 100644
--- a/graphics/sprites/monster-mushroom-red.png
+++ b/graphics/sprites/monsters/monster-mushroom-red.png
diff --git a/graphics/sprites/monster-mushroom-red.xml b/graphics/sprites/monsters/monster-mushroom-red.xml
index d0954fc1..1e2876a3 100644
--- a/graphics/sprites/monster-mushroom-red.xml
+++ b/graphics/sprites/monsters/monster-mushroom-red.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-mushroom-red.png" width="42" height="33" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-mushroom-red.png" width="42" height="33" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-mushroom-spiky.png b/graphics/sprites/monsters/monster-mushroom-spiky.png
index 78ac875d..78ac875d 100644
--- a/graphics/sprites/monster-mushroom-spiky.png
+++ b/graphics/sprites/monsters/monster-mushroom-spiky.png
diff --git a/graphics/sprites/monster-mushroom-spiky.xml b/graphics/sprites/monsters/monster-mushroom-spiky.xml
index 7cd29d84..514704a5 100644
--- a/graphics/sprites/monster-mushroom-spiky.xml
+++ b/graphics/sprites/monsters/monster-mushroom-spiky.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-mushroom-spiky.png" width="42" height="40" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-mushroom-spiky.png" width="42" height="40" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-pinkie.png b/graphics/sprites/monsters/monster-pinkie.png
index 90b5c97b..90b5c97b 100644
--- a/graphics/sprites/monster-pinkie.png
+++ b/graphics/sprites/monsters/monster-pinkie.png
diff --git a/graphics/sprites/monster-pinkie.xml b/graphics/sprites/monsters/monster-pinkie.xml
index 53ba66e5..a080ea3e 100644
--- a/graphics/sprites/monster-pinkie.xml
+++ b/graphics/sprites/monsters/monster-pinkie.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-pinkie.png" width="50" height="42" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-pinkie.png" width="50" height="42" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-scorpion.png b/graphics/sprites/monsters/monster-scorpion.png
index 0bd693fd..0bd693fd 100644
--- a/graphics/sprites/monster-scorpion.png
+++ b/graphics/sprites/monsters/monster-scorpion.png
diff --git a/graphics/sprites/monster-scorpion.xml b/graphics/sprites/monsters/monster-scorpion.xml
index 72a3b848..ab1986a3 100644
--- a/graphics/sprites/monster-scorpion.xml
+++ b/graphics/sprites/monsters/monster-scorpion.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-scorpion.png|W" width="48" height="45" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-scorpion.png|W" width="48" height="45" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-silkworm.png b/graphics/sprites/monsters/monster-silkworm.png
index b5a78964..b5a78964 100644
--- a/graphics/sprites/monster-silkworm.png
+++ b/graphics/sprites/monsters/monster-silkworm.png
diff --git a/graphics/sprites/monster-silkworm.xml b/graphics/sprites/monsters/monster-silkworm.xml
index 06378861..c1388bae 100644
--- a/graphics/sprites/monster-silkworm.xml
+++ b/graphics/sprites/monsters/monster-silkworm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-silkworm.png|W;R" width="32" height="24" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-silkworm.png|W;R" width="32" height="24" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-skeleton.png b/graphics/sprites/monsters/monster-skeleton.png
index 53438cf3..53438cf3 100644
--- a/graphics/sprites/monster-skeleton.png
+++ b/graphics/sprites/monsters/monster-skeleton.png
diff --git a/graphics/sprites/monsters/monster-skeleton.xml b/graphics/sprites/monsters/monster-skeleton.xml
new file mode 100644
index 00000000..cb468320
--- /dev/null
+++ b/graphics/sprites/monsters/monster-skeleton.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<sprite>
+
+	<imageset name="base" src="graphics/sprites/monsters/monster-skeleton.png|W" width="64" height="64" />
+
+	<include file="player_male_base.xml"/>
+
+</sprite>
diff --git a/graphics/sprites/monster-skull-fire.png b/graphics/sprites/monsters/monster-skull-fire.png
index 843a7a5f..843a7a5f 100644
--- a/graphics/sprites/monster-skull-fire.png
+++ b/graphics/sprites/monsters/monster-skull-fire.png
diff --git a/graphics/sprites/monster-skull-fire.xml b/graphics/sprites/monsters/monster-skull-fire.xml
index 5400a4e3..44751124 100644
--- a/graphics/sprites/monster-skull-fire.xml
+++ b/graphics/sprites/monsters/monster-skull-fire.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-skull-fire.png" width="50" height="64" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-skull-fire.png" width="50" height="64" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-skull-poison.png b/graphics/sprites/monsters/monster-skull-poison.png
index 5d1b3a48..5d1b3a48 100644
--- a/graphics/sprites/monster-skull-poison.png
+++ b/graphics/sprites/monsters/monster-skull-poison.png
diff --git a/graphics/sprites/monster-skull-poison.xml b/graphics/sprites/monsters/monster-skull-poison.xml
index 9a8064dc..a769e74c 100644
--- a/graphics/sprites/monster-skull-poison.xml
+++ b/graphics/sprites/monsters/monster-skull-poison.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-skull-poison.png" width="50" height="64" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-skull-poison.png" width="50" height="64" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-slime-rudolph.png b/graphics/sprites/monsters/monster-slime-rudolph.png
index bfd38cc0..bfd38cc0 100644
--- a/graphics/sprites/monster-slime-rudolph.png
+++ b/graphics/sprites/monsters/monster-slime-rudolph.png
diff --git a/graphics/sprites/monster-slime-rudolph.xml b/graphics/sprites/monsters/monster-slime-rudolph.xml
index 8697ee12..7c74e1c6 100644
--- a/graphics/sprites/monster-slime-rudolph.xml
+++ b/graphics/sprites/monsters/monster-slime-rudolph.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-slime-rudolph.png" width="52" height="28" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-slime-rudolph.png" width="52" height="28" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-slime-santa.png b/graphics/sprites/monsters/monster-slime-santa.png
index 4f5897fa..4f5897fa 100644
--- a/graphics/sprites/monster-slime-santa.png
+++ b/graphics/sprites/monsters/monster-slime-santa.png
diff --git a/graphics/sprites/monster-slime-santa.xml b/graphics/sprites/monsters/monster-slime-santa.xml
index 15ba358e..3d0d7fec 100644
--- a/graphics/sprites/monster-slime-santa.xml
+++ b/graphics/sprites/monsters/monster-slime-santa.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-slime-santa.png" width="52" height="24" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-slime-santa.png" width="52" height="24" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-slime.png b/graphics/sprites/monsters/monster-slime.png
index 877b4a44..877b4a44 100644
--- a/graphics/sprites/monster-slime.png
+++ b/graphics/sprites/monsters/monster-slime.png
diff --git a/graphics/sprites/monster-slime.xml b/graphics/sprites/monsters/monster-slime.xml
index 89be82f7..dbc27e9d 100644
--- a/graphics/sprites/monster-slime.xml
+++ b/graphics/sprites/monsters/monster-slime.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-slime.png|W" width="52" height="24" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-slime.png|W" width="52" height="24" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-snail.png b/graphics/sprites/monsters/monster-snail.png
index 2e974de2..2e974de2 100644
--- a/graphics/sprites/monster-snail.png
+++ b/graphics/sprites/monsters/monster-snail.png
diff --git a/graphics/sprites/monster-snail.xml b/graphics/sprites/monsters/monster-snail.xml
index 54ca1f3f..530345ed 100644
--- a/graphics/sprites/monster-snail.xml
+++ b/graphics/sprites/monsters/monster-snail.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-snail.png|W:#FDC689;R:#E0A6E3;Y:#E0A6E3;G:#F06EAA;C:#C69C6D;B:#A9FF02" width="50" height="50" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-snail.png|W:#FDC689;R:#E0A6E3;Y:#E0A6E3;G:#F06EAA;C:#C69C6D;B:#A9FF02" width="50" height="50" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-snake-cave.png b/graphics/sprites/monsters/monster-snake-cave.png
index ea4045d1..ea4045d1 100644
--- a/graphics/sprites/monster-snake-cave.png
+++ b/graphics/sprites/monsters/monster-snake-cave.png
diff --git a/graphics/sprites/monster-snake-cave.xml b/graphics/sprites/monsters/monster-snake-cave.xml
index 798cece4..e7140451 100644
--- a/graphics/sprites/monster-snake-cave.xml
+++ b/graphics/sprites/monsters/monster-snake-cave.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-snake-cave.png" width="96" height="56" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-snake-cave.png" width="96" height="56" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-snake.png b/graphics/sprites/monsters/monster-snake.png
index 2164d69b..2164d69b 100644
--- a/graphics/sprites/monster-snake.png
+++ b/graphics/sprites/monsters/monster-snake.png
diff --git a/graphics/sprites/monster-snake.xml b/graphics/sprites/monsters/monster-snake.xml
index 991f2369..027242f3 100644
--- a/graphics/sprites/monster-snake.xml
+++ b/graphics/sprites/monsters/monster-snake.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-snake.png|W" width="48" height="29" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-snake.png|W" width="48" height="29" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-spider.png b/graphics/sprites/monsters/monster-spider.png
index e1bcacbb..e1bcacbb 100644
--- a/graphics/sprites/monster-spider.png
+++ b/graphics/sprites/monsters/monster-spider.png
diff --git a/graphics/sprites/monster-spider.xml b/graphics/sprites/monsters/monster-spider.xml
index 4ae0c918..55505e78 100644
--- a/graphics/sprites/monster-spider.xml
+++ b/graphics/sprites/monsters/monster-spider.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-spider.png" width="24" height="30" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-spider.png" width="24" height="30" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-squirrel.png b/graphics/sprites/monsters/monster-squirrel.png
index 0a1f1d36..0a1f1d36 100644
--- a/graphics/sprites/monster-squirrel.png
+++ b/graphics/sprites/monsters/monster-squirrel.png
diff --git a/graphics/sprites/monster-squirrel.xml b/graphics/sprites/monsters/monster-squirrel.xml
index cd8d0758..2cb4db9a 100644
--- a/graphics/sprites/monster-squirrel.xml
+++ b/graphics/sprites/monsters/monster-squirrel.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <sprite>
-  <imageset name="base" src="graphics/sprites/monster-squirrel.png" width="32" height="32" />
+  <imageset name="base" src="graphics/sprites/monsters/monster-squirrel.png" width="32" height="32" />
   <action name="stand" imageset="base">
     <animation direction="down">
       <sequence start="16" end="19" delay="75" />
diff --git a/graphics/sprites/monster-terranite-mask.png b/graphics/sprites/monsters/monster-terranite-mask.png
index 3ec1653b..3ec1653b 100644
--- a/graphics/sprites/monster-terranite-mask.png
+++ b/graphics/sprites/monsters/monster-terranite-mask.png
diff --git a/graphics/sprites/monster-terranite-mask.xml b/graphics/sprites/monsters/monster-terranite-mask.xml
index be148556..1c788b9c 100644
--- a/graphics/sprites/monster-terranite-mask.xml
+++ b/graphics/sprites/monsters/monster-terranite-mask.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-	<imageset name="base" src="graphics/sprites/monster-terranite-mask.png" width="19" height="28" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-terranite-mask.png" width="19" height="28" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-wisp.png b/graphics/sprites/monsters/monster-wisp.png
index c0641cae..c0641cae 100644
--- a/graphics/sprites/monster-wisp.png
+++ b/graphics/sprites/monsters/monster-wisp.png
diff --git a/graphics/sprites/monster-wisp.xml b/graphics/sprites/monsters/monster-wisp.xml
index 9dc5f9a2..4ca542b3 100644
--- a/graphics/sprites/monster-wisp.xml
+++ b/graphics/sprites/monsters/monster-wisp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-wisp.png|W" width="64" height="64" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-wisp.png|W" width="64" height="64" />
 
 	<action name="stand" imageset="base">
 		<animation direction="default">
diff --git a/graphics/sprites/monster-zombie.png b/graphics/sprites/monsters/monster-zombie.png
index bf1f1818..bf1f1818 100644
--- a/graphics/sprites/monster-zombie.png
+++ b/graphics/sprites/monsters/monster-zombie.png
diff --git a/graphics/sprites/monster-zombie.xml b/graphics/sprites/monsters/monster-zombie.xml
index 244ba926..bb930af7 100644
--- a/graphics/sprites/monster-zombie.xml
+++ b/graphics/sprites/monsters/monster-zombie.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-zombie.png" width="64" height="64" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-zombie.png" width="64" height="64" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/monsters.xml b/monsters.xml
index 91f2dfc8..1a5d8213 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -2,7 +2,7 @@
 <monsters>
 
     <monster id="0" name="Maggot" targetCursor="small">
-        <sprite>monster-maggot.xml</sprite>
+        <sprite>monsters/monster-maggot.xml</sprite>
         <sound event="hit">monsters/maggot/maggot-hit1.ogg</sound>
         <sound event="hit">monsters/maggot/maggot-hit2.ogg</sound>
         <sound event="miss">monsters/maggot/maggot-miss1.ogg</sound>
@@ -50,7 +50,7 @@
     </monster>
 
     <monster id="1" name="Scorpion">
-        <sprite>monster-scorpion.xml|#4d422d,826242,d8c282,ffffff</sprite>
+        <sprite>monsters/monster-scorpion.xml|#4d422d,826242,d8c282,ffffff</sprite>
         <sound event="hit">monsters/scorpion/scorpion-hit1.ogg</sound>
         <sound event="hit">monsters/scorpion/scorpion-hit2.ogg</sound>
         <sound event="hit">monsters/scorpion/scorpion-hit3.ogg</sound>
@@ -104,7 +104,7 @@
     </monster>
 
     <monster id="2" name="Red Scorpion">
-        <sprite>monster-scorpion.xml|#791d0a,cd5d27,f28d54,ffffff</sprite>
+        <sprite>monsters/monster-scorpion.xml|#791d0a,cd5d27,f28d54,ffffff</sprite>
         <sound event="hit">monsters/scorpion/scorpion-hit1.ogg</sound>
         <sound event="hit">monsters/scorpion/scorpion-hit2.ogg</sound>
         <sound event="hit">monsters/scorpion/scorpion-hit3.ogg</sound>
@@ -151,7 +151,7 @@
     </monster>
 
     <monster id="3" name="Green Slime">
-        <sprite>monster-slime.xml|#72982c,ffffff</sprite>
+        <sprite>monsters/monster-slime.xml|#72982c,ffffff</sprite>
         <sound event="hit">monsters/slime/slime-hit1.ogg</sound>
         <drop item="502" percent="2"/>
         <drop item="513" percent="1"/>
@@ -186,7 +186,7 @@
     </monster>
 
     <monster id="4" name="Giant Maggot" targetCursor="large">
-        <sprite>monster-maggot-giant.xml</sprite>
+        <sprite>monsters/monster-maggot-giant.xml</sprite>
         <sound event="hit">monsters/maggot/maggot-hit1.ogg</sound>
         <sound event="hit">monsters/maggot/maggot-hit2.ogg</sound>
         <sound event="miss">monsters/maggot/maggot-miss1.ogg</sound>
@@ -214,7 +214,7 @@
     </monster>
 
     <monster id="5" name="Yellow Slime">
-        <sprite>monster-slime.xml|#b47f00,ffffff</sprite>
+        <sprite>monsters/monster-slime.xml|#b47f00,ffffff</sprite>
         <sound event="hit">monsters/slime/slime-hit1.ogg</sound>
         <drop item="534" percent="2"/>
         <drop item="519" percent="1"/>
@@ -237,7 +237,7 @@
     </monster>
 
     <monster id="6" name="Red Slime">
-        <sprite>monster-slime.xml|#7e0000,ffffff</sprite>
+        <sprite>monsters/monster-slime.xml|#7e0000,ffffff</sprite>
         <sound event="hit">monsters/slime/slime-hit1.ogg</sound>
         <drop item="1201" percent="3"/>
         <drop item="509" percent="1.1"/>
@@ -263,7 +263,7 @@
     </monster>
 
     <monster id="7" name="Black Scorpion">
-        <sprite>monster-scorpion.xml|#0d1313,435a5a,879999,ffffff</sprite>
+        <sprite>monsters/monster-scorpion.xml|#0d1313,435a5a,879999,ffffff</sprite>
         <sound event="hit">monsters/scorpion/scorpion-hit1.ogg</sound>
         <sound event="hit">monsters/scorpion/scorpion-hit2.ogg</sound>
         <sound event="hit">monsters/scorpion/scorpion-hit3.ogg</sound>
@@ -288,7 +288,7 @@
     </monster>
 
     <monster id="8" name="Snake">
-        <sprite>monster-snake.xml|#664d28,a6673a,dbbc86,ffffff</sprite>
+        <sprite>monsters/monster-snake.xml|#664d28,a6673a,dbbc86,ffffff</sprite>
         <attributes
             hp="20"
             size="4"
@@ -305,7 +305,7 @@
     </monster>
 
     <monster id="9" name="Fire Goblin">
-        <sprite>monster-goblin-fire.xml</sprite>
+        <sprite>monsters/monster-goblin-fire.xml</sprite>
         <sound event="hit">monsters/fire-goblin/fire-goblin-hit1.ogg</sound>
         <sound event="hit">monsters/fire-goblin/fire-goblin-hit2.ogg</sound>
         <sound event="miss">monsters/fire-goblin/fire-goblin-miss1.ogg</sound>
@@ -353,7 +353,7 @@
     </monster>
 
     <monster id="10" name="Spider">
-        <sprite>monster-spider.xml</sprite>
+        <sprite>monsters/monster-spider.xml</sprite>
         <drop item="537" percent="5"/>
         <drop item="535" percent="1"/>
         <attributes
@@ -372,7 +372,7 @@
     </monster>
 
     <monster id="11" name="Evil Mushroom">
-        <sprite>monster-mushroom-red.xml</sprite>
+        <sprite>monsters/monster-mushroom-red.xml</sprite>
         <sound event="hit">monsters/shroom/shroom-hit1.ogg</sound>
         <drop item="535" percent="5"/>
         <drop item="540" percent="0.1"/>
@@ -394,7 +394,7 @@
     </monster>
 
     <monster id="12" name="Flower">
-        <sprite>monster-flower.xml</sprite>
+        <sprite>monsters/monster-flower.xml</sprite>
         <sound event="hit">monsters/flower/flower-hit1.ogg</sound>
         <sound event="hit">monsters/flower/flower-hit2.ogg</sound>
         <sound event="miss">monsters/flower/flower-miss1.ogg</sound>
@@ -428,7 +428,7 @@
     </monster>
 
     <monster id="13" name="Santa Slime">
-        <sprite>monster-slime-santa.xml</sprite>
+        <sprite>monsters/monster-slime-santa.xml</sprite>
         <drop item="512" percent="8"/>
         <drop item="513" percent="7"/>
         <drop item="514" percent="6"/>
@@ -451,7 +451,7 @@
     </monster>
 
     <monster id="14" name="Rudolph Slime">
-        <sprite>monster-slime-rudolph.xml</sprite>
+        <sprite>monsters/monster-slime-rudolph.xml</sprite>
         <drop item="504" percent="8"/>
         <drop item="506" percent="5"/>
         <drop item="508" percent="2"/>
@@ -475,7 +475,7 @@
     </monster>
 
     <monster id="15" name="Bat">
-        <sprite>monster-bat.xml</sprite>
+        <sprite>monsters/monster-bat.xml</sprite>
         <sound event="die">monsters/bat/bat-dying1.ogg</sound>
         <sound event="hit">monsters/bat/bat-hit1.ogg</sound>
         <drop item="505" percent="8"/>
@@ -500,7 +500,7 @@
     </monster>
 
     <monster id="16" name="Pinkie" targetCursor="small">
-        <sprite>monster-pinkie.xml</sprite>
+        <sprite>monsters/monster-pinkie.xml</sprite>
         <sound event="hit">monsters/pinkie/pinkie-hit1.ogg</sound>
         <sound event="miss">monsters/pinkie/pinkie-miss1.ogg</sound>
         <drop item="614" percent="8"/>
@@ -520,7 +520,7 @@
     </monster>
 
     <monster id="17" name="Spiky Mushroom">
-        <sprite>monster-mushroom-spiky.xml</sprite>
+        <sprite>monsters/monster-mushroom-spiky.xml</sprite>
         <sound event="hit">monsters/shroom/shroom-hit1.ogg</sound>
         <drop item="567" percent="8"/>
         <drop item="501" percent="1.5"/>
@@ -542,7 +542,7 @@
     </monster>
 
     <monster id="18" name="Fluffy">
-        <sprite>monster-fluffy.xml</sprite>
+        <sprite>monsters/monster-fluffy.xml</sprite>
         <sound event="hit">monsters/fluffy/fluffy-hit1.ogg</sound>
         <sound event="hit">monsters/fluffy/fluffy-hit2.ogg</sound>
         <sound event="hit">monsters/fluffy/fluffy-hit3.ogg</sound>
@@ -567,7 +567,7 @@
     </monster>
 
     <monster id="19" name="Cave Snake">
-        <sprite>monster-snake-cave.xml</sprite>
+        <sprite>monsters/monster-snake-cave.xml</sprite>
         <sound event="hit">monsters/cavesnake/cavesnake-hit1.ogg</sound>
         <drop item="612" percent="8"/>
         <drop item="610" percent="0.1"/>
@@ -587,7 +587,7 @@
     </monster>
 
     <monster id="20" name="Jack O">
-        <sprite>monster-ghost-pumpkin.xml</sprite>
+        <sprite>monsters/monster-ghost-pumpkin.xml</sprite>
         <attributes
             hp="20"
             size="4"
@@ -604,7 +604,7 @@
     </monster>
 
     <monster id="21" name="Fire Skull">
-        <sprite>monster-skull-fire.xml</sprite>
+        <sprite>monsters/monster-skull-fire.xml</sprite>
         <drop item="621" percent="0.1"/>
         <drop item="540" percent="1.5"/>
         <attributes
@@ -623,7 +623,7 @@
     </monster>
 
     <monster id="22" name="Poison Skull">
-        <sprite>monster-skull-poison.xml</sprite>
+        <sprite>monsters/monster-skull-poison.xml</sprite>
         <drop item="621" percent="0.1"/>
         <drop item="540" percent="1.5"/>
         <attributes
@@ -642,7 +642,7 @@
     </monster>
 
     <monster id="23" name="Log Head">
-        <sprite>monster-logmonster.xml</sprite>
+        <sprite>monsters/monster-logmonster.xml</sprite>
         <sound event="hurt">monsters/loghead/loghead-hurt1.ogg</sound>
         <sound event="hurt">monsters/loghead/loghead-hurt2.ogg</sound>
         <sound event="hurt">monsters/loghead/loghead-hurt3.ogg</sound>
@@ -665,7 +665,7 @@
     </monster>
 
     <monster id="24" name="Mountain Snake">
-        <sprite>monster-snake.xml|#585b39,a67c5d,dbc9a9,ffffff</sprite>
+        <sprite>monsters/monster-snake.xml|#585b39,a67c5d,dbc9a9,ffffff</sprite>
         <attributes
             hp="20"
             size="4"
@@ -682,7 +682,7 @@
     </monster>
 
     <monster id="25" name="Easter Fluffy">
-        <sprite>monster-fluffy.xml</sprite>
+        <sprite>monsters/monster-fluffy.xml</sprite>
         <sound event="hit">monsters/fluffy/fluffy-hit1.ogg</sound>
         <sound event="hit">monsters/fluffy/fluffy-hit2.ogg</sound>
         <sound event="hit">monsters/fluffy/fluffy-hit3.ogg</sound>
@@ -704,7 +704,7 @@
     </monster>
 
     <monster id="26" name="Mouboo">
-        <sprite>monster-mouboo.xml</sprite>
+        <sprite>monsters/monster-mouboo.xml</sprite>
         <attributes
             hp="20"
             size="4"
@@ -789,7 +789,7 @@
     </monster>
     
     <monster id="31" name="Sea Slime">
-        <sprite>monster-slime.xml|#4ca1a0,ffffff</sprite>
+        <sprite>monsters/monster-slime.xml|#4ca1a0,ffffff</sprite>
         <sound event="hit">monsters/slime/slime-hit1.ogg</sound>
         <attributes
             hp="20"
@@ -807,7 +807,7 @@
     </monster>
 
     <monster id="32" name="Grass Snake">
-        <sprite>monster-snake.xml|#205839,60a65d,80dba9,ffffff</sprite>
+        <sprite>monsters/monster-snake.xml|#205839,60a65d,80dba9,ffffff</sprite>
         <attributes
             hp="20"
             size="4"
@@ -824,7 +824,7 @@
     </monster>
 
     <monster id="33" name="Silkworm">
-        <sprite>monster-silkworm.xml|#807d20,e0dac0;#c0a830</sprite>
+        <sprite>monsters/monster-silkworm.xml|#807d20,e0dac0;#c0a830</sprite>
         <attributes
             hp="20"
             size="4"
@@ -841,7 +841,7 @@
     </monster>
 
     <monster id="34" name="Zombie">
-        <sprite>monster-zombie.xml</sprite>
+        <sprite>monsters/monster-zombie.xml</sprite>
         <sound event="move">monsters/zombie/zombie-move1.ogg</sound>
         <sound event="move">monsters/zombie/zombie-move2.ogg</sound>
         <sound event="hit">monsters/zombie/zombie-hit1.ogg</sound>
@@ -881,7 +881,7 @@
     </monster>
 
     <monster id="36" name="Squirrel">
-        <sprite>monster-squirrel.xml</sprite>
+        <sprite>monsters/monster-squirrel.xml</sprite>
         <sound event="hurt">monsters/squirrel/squirrel-hurt1.ogg</sound>
         <sound event="hurt">monsters/squirrel/squirrel-hurt2.ogg</sound>
         <sound event="die">monsters/squirrel/squirrel-die1.ogg</sound>
@@ -902,7 +902,7 @@
     </monster>
 
     <monster id="37" name="Fire Lizard">
-        <sprite>monster-lizard.xml|#673132,923F42,CD5961,E163A4,ffffff</sprite>
+        <sprite>monsters/monster-lizard.xml|#673132,923F42,CD5961,E163A4,ffffff</sprite>
         <sound event="hit">monsters/fire-goblin/fire-goblin-hit1.ogg</sound>
         <sound event="hit">monsters/fire-goblin/fire-goblin-hit2.ogg</sound>
         <sound event="miss">monsters/fire-goblin/fire-goblin-miss1.ogg</sound>
@@ -934,7 +934,7 @@
     </monster>
 
     <monster id="38" name="Wisp">
-        <sprite>monster-wisp.xml|#aadd44,ffff66</sprite>
+        <sprite>monsters/monster-wisp.xml|#aadd44,ffff66</sprite>
 	<particlefx>graphics/particles/wisp.particle.xml</particlefx>
         <exp>20</exp>
         <attributes
@@ -969,7 +969,7 @@
     </monster>
 
     <monster id="39" name="Snail">
-        <sprite>monster-snail.xml</sprite>
+        <sprite>monsters/monster-snail.xml</sprite>
         <exp>200</exp>
         <attributes
             hp="220"
@@ -1004,7 +1004,7 @@
     </monster>
 
     <monster id="40" name="Spectre">
-        <sprite>monster-wisp.xml|#ff77dd,dd77ff</sprite>
+        <sprite>monsters/monster-wisp.xml|#ff77dd,dd77ff</sprite>
 	<particlefx>graphics/particles/wisp.particle.xml</particlefx>
         <exp>20</exp>
         <attributes
@@ -1039,7 +1039,7 @@
     </monster>
 
     <monster id="41" name="Skeleton">
-        <sprite>monster-skeleton.xml|#ffe8bf</sprite>
+        <sprite>monsters/monster-skeleton.xml|#ffe8bf</sprite>
         <!-- stats identical to maggot - change this when making up real monster stats -->
         <attributes
             hp="20"
@@ -1068,7 +1068,7 @@
     </monster>
 
     <monster id="42" name="Lady Skeleton">
-        <sprite>monster-skeleton.xml|#ffe8bf</sprite>
+        <sprite>monsters/monster-skeleton.xml|#ffe8bf</sprite>
         <sprite>hairstyle8.xml</sprite>
         <!-- stats identical to maggot - change this when making up real monster stats -->
         <attributes
@@ -1098,7 +1098,7 @@
     </monster>
 
     <monster id="43" name="Fallen">
-        <sprite>monster-skeleton.xml|#ffe8bf</sprite>
+        <sprite>monsters/monster-skeleton.xml|#ffe8bf</sprite>
         <sprite>leg-chaps-male.xml</sprite>
         <sprite>chest-warlordplate-male.xml</sprite>
         <sprite>head-warlordhelm.xml</sprite>
@@ -1132,7 +1132,7 @@
     <!-- Snake lord 44 -->
 
     <monster id="45" name="Poltergeist">
-        <sprite>monster-wisp.xml|#77ffdd,77ddff</sprite>
+        <sprite>monsters/monster-wisp.xml|#77ffdd,77ddff</sprite>
 	<particlefx>graphics/particles/wisp.particle.xml</particlefx>
         <exp>20</exp>
         <attributes
@@ -1166,7 +1166,7 @@
             />
     </monster>
     <monster id="46" name="Duck" targetCursor="small">
-        <sprite>monster-duck.xml</sprite>
+        <sprite>monsters/monster-duck.xml</sprite>
         <attributes
             hp="20"
             size="4"