190 files changed, 6 insertions, 11 deletions

diff --git a/README b/README
index 798bce8..a9f711a 100644
--- a/README
+++ b/README
@@ -55,8 +55,7 @@ Default option values:
     gameServerPort          9604
 
     serverPath              .
-    serverDataPath          example/serverdata
-    clientDataPath          example/clientdata
+    worldDataPath           example
 
 
 RUNNING
diff --git a/docs/manaserv.xml.example b/docs/manaserv.xml.example
index fdb872e..b742c46 100644
--- a/docs/manaserv.xml.example
+++ b/docs/manaserv.xml.example
@@ -66,8 +66,7 @@
 -->
  <!-- Paths to data files -->
  <option name="serverPath" value="." />
- <option name="clientDataPath" value="example/clientdata" />
- <option name="serverDataPath" value="example/serverdata" />
+ <option name="worldDataPath" value="example" />
 
 <!-- end of paths configuration ******************************************* -->
 
diff --git a/example/clientdata/attributes.xml b/example/attributes.xml
index 69346e5..69346e5 100644
--- a/example/clientdata/attributes.xml
+++ b/example/attributes.xml
diff --git a/example/clientdata/effects.xml b/example/effects.xml
index 90de57e..90de57e 100644
--- a/example/clientdata/effects.xml
+++ b/example/effects.xml
diff --git a/example/clientdata/emotes.xml b/example/emotes.xml
index 0136b13..0136b13 100644
--- a/example/clientdata/emotes.xml
+++ b/example/emotes.xml
diff --git a/example/clientdata/equip.xml b/example/equip.xml
index 0a53a9a..0a53a9a 100644
--- a/example/clientdata/equip.xml
+++ b/example/equip.xml
diff --git a/example/clientdata/graphics/items/crafting/generic-ingot.png b/example/graphics/items/crafting/generic-ingot.png
index 0dc7b1e..0dc7b1e 100644
--- a/example/clientdata/graphics/items/crafting/generic-ingot.png
+++ b/example/graphics/items/crafting/generic-ingot.png
diff --git a/example/clientdata/graphics/items/crafting/generic-rawlog.png b/example/graphics/items/crafting/generic-rawlog.png
index 038d5a5..038d5a5 100644
--- a/example/clientdata/graphics/items/crafting/generic-rawlog.png
+++ b/example/graphics/items/crafting/generic-rawlog.png
diff --git a/example/clientdata/graphics/items/equipment/chest/chest-leathershirt.png b/example/graphics/items/equipment/chest/chest-leathershirt.png
index 761b9bf..761b9bf 100644
--- a/example/clientdata/graphics/items/equipment/chest/chest-leathershirt.png
+++ b/example/graphics/items/equipment/chest/chest-leathershirt.png
diff --git a/example/clientdata/graphics/items/equipment/feet/boots.png b/example/graphics/items/equipment/feet/boots.png
index 9f9913f..9f9913f 100644
--- a/example/clientdata/graphics/items/equipment/feet/boots.png
+++ b/example/graphics/items/equipment/feet/boots.png
diff --git a/example/clientdata/graphics/items/equipment/legs/pants.png b/example/graphics/items/equipment/legs/pants.png
index c50daf2..c50daf2 100644
--- a/example/clientdata/graphics/items/equipment/legs/pants.png
+++ b/example/graphics/items/equipment/legs/pants.png
diff --git a/example/clientdata/graphics/items/equipment/weapons/weapon-bow-bow.png b/example/graphics/items/equipment/weapons/weapon-bow-bow.png
index 2ab672d..2ab672d 100644
--- a/example/clientdata/graphics/items/equipment/weapons/weapon-bow-bow.png
+++ b/example/graphics/items/equipment/weapons/weapon-bow-bow.png
diff --git a/example/clientdata/graphics/items/equipment/weapons/weapon-dagger-dagger.png b/example/graphics/items/equipment/weapons/weapon-dagger-dagger.png
index cdfc370..cdfc370 100644
--- a/example/clientdata/graphics/items/equipment/weapons/weapon-dagger-dagger.png
+++ b/example/graphics/items/equipment/weapons/weapon-dagger-dagger.png
diff --git a/example/clientdata/graphics/items/equipment/weapons/weapon-sword-sword.png b/example/graphics/items/equipment/weapons/weapon-sword-sword.png
index 571fb40..571fb40 100644
--- a/example/clientdata/graphics/items/equipment/weapons/weapon-sword-sword.png
+++ b/example/graphics/items/equipment/weapons/weapon-sword-sword.png
diff --git a/example/clientdata/graphics/items/unknown.png b/example/graphics/items/unknown.png
index 9201d68..9201d68 100644
--- a/example/clientdata/graphics/items/unknown.png
+++ b/example/graphics/items/unknown.png
diff --git a/example/clientdata/graphics/items/usable/usable-candy.png b/example/graphics/items/usable/usable-candy.png
index e3d75c2..e3d75c2 100644
--- a/example/clientdata/graphics/items/usable/usable-candy.png
+++ b/example/graphics/items/usable/usable-candy.png
diff --git a/example/clientdata/graphics/items/usable/usable-minor-health-potion.png b/example/graphics/items/usable/usable-minor-health-potion.png
index a404d6f..a404d6f 100644
--- a/example/clientdata/graphics/items/usable/usable-minor-health-potion.png
+++ b/example/graphics/items/usable/usable-minor-health-potion.png
diff --git a/example/clientdata/graphics/items/usable/usable-regenerative-trinket.png b/example/graphics/items/usable/usable-regenerative-trinket.png
index ba69b57..ba69b57 100644
--- a/example/clientdata/graphics/items/usable/usable-regenerative-trinket.png
+++ b/example/graphics/items/usable/usable-regenerative-trinket.png
diff --git a/example/clientdata/graphics/items/usable/usable-token-of-speed.png b/example/graphics/items/usable/usable-token-of-speed.png
index 25c712f..25c712f 100644
--- a/example/clientdata/graphics/items/usable/usable-token-of-speed.png
+++ b/example/graphics/items/usable/usable-token-of-speed.png
diff --git a/example/clientdata/graphics/particles/arrow-down.png b/example/graphics/particles/arrow-down.png
index da94afc..da94afc 100644
--- a/example/clientdata/graphics/particles/arrow-down.png
+++ b/example/graphics/particles/arrow-down.png
diff --git a/example/clientdata/graphics/particles/arrow-hail.xml b/example/graphics/particles/arrow-hail.xml
index 5372e9a..5372e9a 100644
--- a/example/clientdata/graphics/particles/arrow-hail.xml
+++ b/example/graphics/particles/arrow-hail.xml
diff --git a/example/clientdata/graphics/particles/arrow.particle.xml b/example/graphics/particles/arrow.particle.xml
index e19e220..e19e220 100644
--- a/example/clientdata/graphics/particles/arrow.particle.xml
+++ b/example/graphics/particles/arrow.particle.xml
diff --git a/example/clientdata/graphics/particles/arrowh.png b/example/graphics/particles/arrowh.png
index 1182607..1182607 100644
--- a/example/clientdata/graphics/particles/arrowh.png
+++ b/example/graphics/particles/arrowh.png
diff --git a/example/clientdata/graphics/particles/attack.particle.xml b/example/graphics/particles/attack.particle.xml
index c8dc5f3..c8dc5f3 100644
--- a/example/clientdata/graphics/particles/attack.particle.xml
+++ b/example/graphics/particles/attack.particle.xml
diff --git a/example/clientdata/graphics/particles/emotes/angel.png b/example/graphics/particles/emotes/angel.png
index 043d075..043d075 100644
--- a/example/clientdata/graphics/particles/emotes/angel.png
+++ b/example/graphics/particles/emotes/angel.png
diff --git a/example/clientdata/graphics/particles/emotes/blah.png b/example/graphics/particles/emotes/blah.png
index 3eae88a..3eae88a 100644
--- a/example/clientdata/graphics/particles/emotes/blah.png
+++ b/example/graphics/particles/emotes/blah.png
diff --git a/example/clientdata/graphics/particles/emotes/blush.png b/example/graphics/particles/emotes/blush.png
index 22172ae..22172ae 100644
--- a/example/clientdata/graphics/particles/emotes/blush.png
+++ b/example/graphics/particles/emotes/blush.png
diff --git a/example/clientdata/graphics/particles/emotes/disgust.png b/example/graphics/particles/emotes/disgust.png
index 9965f89..9965f89 100644
--- a/example/clientdata/graphics/particles/emotes/disgust.png
+++ b/example/graphics/particles/emotes/disgust.png
diff --git a/example/clientdata/graphics/particles/emotes/emote-angel.particle.xml b/example/graphics/particles/emotes/emote-angel.particle.xml
index a4bb1b5..a4bb1b5 100644
--- a/example/clientdata/graphics/particles/emotes/emote-angel.particle.xml
+++ b/example/graphics/particles/emotes/emote-angel.particle.xml
diff --git a/example/clientdata/graphics/particles/emotes/emote-blah.particle.xml b/example/graphics/particles/emotes/emote-blah.particle.xml
index 38cb327..38cb327 100644
--- a/example/clientdata/graphics/particles/emotes/emote-blah.particle.xml
+++ b/example/graphics/particles/emotes/emote-blah.particle.xml
diff --git a/example/clientdata/graphics/particles/emotes/emote-blush.particle.xml b/example/graphics/particles/emotes/emote-blush.particle.xml
index 11d2689..11d2689 100644
--- a/example/clientdata/graphics/particles/emotes/emote-blush.particle.xml
+++ b/example/graphics/particles/emotes/emote-blush.particle.xml
diff --git a/example/clientdata/graphics/particles/emotes/emote-disgust.particle.xml b/example/graphics/particles/emotes/emote-disgust.particle.xml
index b04d18d..b04d18d 100644
--- a/example/clientdata/graphics/particles/emotes/emote-disgust.particle.xml
+++ b/example/graphics/particles/emotes/emote-disgust.particle.xml
diff --git a/example/clientdata/graphics/particles/emotes/emote-evil.particle.xml b/example/graphics/particles/emotes/emote-evil.particle.xml
index 433aef3..433aef3 100644
--- a/example/clientdata/graphics/particles/emotes/emote-evil.particle.xml
+++ b/example/graphics/particles/emotes/emote-evil.particle.xml
diff --git a/example/clientdata/graphics/particles/emotes/emote-grin.particle.xml b/example/graphics/particles/emotes/emote-grin.particle.xml
index 5c50aa9..5c50aa9 100644
--- a/example/clientdata/graphics/particles/emotes/emote-grin.particle.xml
+++ b/example/graphics/particles/emotes/emote-grin.particle.xml
diff --git a/example/clientdata/graphics/particles/emotes/emote-happy.particle.xml b/example/graphics/particles/emotes/emote-happy.particle.xml
index fa43997..fa43997 100644
--- a/example/clientdata/graphics/particles/emotes/emote-happy.particle.xml
+++ b/example/graphics/particles/emotes/emote-happy.particle.xml
diff --git a/example/clientdata/graphics/particles/emotes/emote-perturbed.particle.xml b/example/graphics/particles/emotes/emote-perturbed.particle.xml
index 47f92e3..47f92e3 100644
--- a/example/clientdata/graphics/particles/emotes/emote-perturbed.particle.xml
+++ b/example/graphics/particles/emotes/emote-perturbed.particle.xml
diff --git a/example/clientdata/graphics/particles/emotes/emote-sad.particle.xml b/example/graphics/particles/emotes/emote-sad.particle.xml
index 0e0b7dc..0e0b7dc 100644
--- a/example/clientdata/graphics/particles/emotes/emote-sad.particle.xml
+++ b/example/graphics/particles/emotes/emote-sad.particle.xml
diff --git a/example/clientdata/graphics/particles/emotes/emote-speech.particle.xml b/example/graphics/particles/emotes/emote-speech.particle.xml
index 7d6350b..7d6350b 100644
--- a/example/clientdata/graphics/particles/emotes/emote-speech.particle.xml
+++ b/example/graphics/particles/emotes/emote-speech.particle.xml
diff --git a/example/clientdata/graphics/particles/emotes/emote-surprise.particle.xml b/example/graphics/particles/emotes/emote-surprise.particle.xml
index 29498c8..29498c8 100644
--- a/example/clientdata/graphics/particles/emotes/emote-surprise.particle.xml
+++ b/example/graphics/particles/emotes/emote-surprise.particle.xml
diff --git a/example/clientdata/graphics/particles/emotes/emote-tongue.particle.xml b/example/graphics/particles/emotes/emote-tongue.particle.xml
index 2796ac6..2796ac6 100644
--- a/example/clientdata/graphics/particles/emotes/emote-tongue.particle.xml
+++ b/example/graphics/particles/emotes/emote-tongue.particle.xml
diff --git a/example/clientdata/graphics/particles/emotes/emote-upset.particle.xml b/example/graphics/particles/emotes/emote-upset.particle.xml
index 4b10d9f..4b10d9f 100644
--- a/example/clientdata/graphics/particles/emotes/emote-upset.particle.xml
+++ b/example/graphics/particles/emotes/emote-upset.particle.xml
diff --git a/example/clientdata/graphics/particles/emotes/emote-wink.particle.xml b/example/graphics/particles/emotes/emote-wink.particle.xml
index b217a64..b217a64 100644
--- a/example/clientdata/graphics/particles/emotes/emote-wink.particle.xml
+++ b/example/graphics/particles/emotes/emote-wink.particle.xml
diff --git a/example/clientdata/graphics/particles/emotes/evil.png b/example/graphics/particles/emotes/evil.png
index 7c417ec..7c417ec 100644
--- a/example/clientdata/graphics/particles/emotes/evil.png
+++ b/example/graphics/particles/emotes/evil.png
diff --git a/example/clientdata/graphics/particles/emotes/grin.png b/example/graphics/particles/emotes/grin.png
index 0c21cfe..0c21cfe 100644
--- a/example/clientdata/graphics/particles/emotes/grin.png
+++ b/example/graphics/particles/emotes/grin.png
diff --git a/example/clientdata/graphics/particles/emotes/happy.png b/example/graphics/particles/emotes/happy.png
index 8ca2930..8ca2930 100644
--- a/example/clientdata/graphics/particles/emotes/happy.png
+++ b/example/graphics/particles/emotes/happy.png
diff --git a/example/clientdata/graphics/particles/emotes/perturbed.png b/example/graphics/particles/emotes/perturbed.png
index 0a33e0a..0a33e0a 100644
--- a/example/clientdata/graphics/particles/emotes/perturbed.png
+++ b/example/graphics/particles/emotes/perturbed.png
diff --git a/example/clientdata/graphics/particles/emotes/sad.png b/example/graphics/particles/emotes/sad.png
index 3ceb3ca..3ceb3ca 100644
--- a/example/clientdata/graphics/particles/emotes/sad.png
+++ b/example/graphics/particles/emotes/sad.png
diff --git a/example/clientdata/graphics/particles/emotes/speech.png b/example/graphics/particles/emotes/speech.png
index 7204471..7204471 100644
--- a/example/clientdata/graphics/particles/emotes/speech.png
+++ b/example/graphics/particles/emotes/speech.png
diff --git a/example/clientdata/graphics/particles/emotes/surprise.png b/example/graphics/particles/emotes/surprise.png
index e1649a6..e1649a6 100644
--- a/example/clientdata/graphics/particles/emotes/surprise.png
+++ b/example/graphics/particles/emotes/surprise.png
diff --git a/example/clientdata/graphics/particles/emotes/tongue.png b/example/graphics/particles/emotes/tongue.png
index 0d5bc95..0d5bc95 100644
--- a/example/clientdata/graphics/particles/emotes/tongue.png
+++ b/example/graphics/particles/emotes/tongue.png
diff --git a/example/clientdata/graphics/particles/emotes/upset.png b/example/graphics/particles/emotes/upset.png
index b2f0ce2..b2f0ce2 100644
--- a/example/clientdata/graphics/particles/emotes/upset.png
+++ b/example/graphics/particles/emotes/upset.png
diff --git a/example/clientdata/graphics/particles/emotes/wink.png b/example/graphics/particles/emotes/wink.png
index 13488bb..13488bb 100644
--- a/example/clientdata/graphics/particles/emotes/wink.png
+++ b/example/graphics/particles/emotes/wink.png
diff --git a/example/clientdata/graphics/particles/fullbubble-16px.png b/example/graphics/particles/fullbubble-16px.png
index 93e3b57..93e3b57 100644
--- a/example/clientdata/graphics/particles/fullbubble-16px.png
+++ b/example/graphics/particles/fullbubble-16px.png
diff --git a/example/clientdata/graphics/particles/green-bubbles.particle.xml b/example/graphics/particles/green-bubbles.particle.xml
index e272d85..e272d85 100644
--- a/example/clientdata/graphics/particles/green-bubbles.particle.xml
+++ b/example/graphics/particles/green-bubbles.particle.xml
diff --git a/example/clientdata/graphics/particles/hit.particle.xml b/example/graphics/particles/hit.particle.xml
index c5c295f..c5c295f 100644
--- a/example/clientdata/graphics/particles/hit.particle.xml
+++ b/example/graphics/particles/hit.particle.xml
diff --git a/example/clientdata/graphics/particles/levelup.particle.xml b/example/graphics/particles/levelup.particle.xml
index 0c80626..0c80626 100644
--- a/example/clientdata/graphics/particles/levelup.particle.xml
+++ b/example/graphics/particles/levelup.particle.xml
diff --git a/example/clientdata/graphics/particles/magic.white.xml b/example/graphics/particles/magic.white.xml
index 5304b77..5304b77 100644
--- a/example/clientdata/graphics/particles/magic.white.xml
+++ b/example/graphics/particles/magic.white.xml
diff --git a/example/clientdata/graphics/particles/orb-medium.png b/example/graphics/particles/orb-medium.png
index eb896c8..eb896c8 100644
--- a/example/clientdata/graphics/particles/orb-medium.png
+++ b/example/graphics/particles/orb-medium.png
diff --git a/example/clientdata/graphics/particles/orb-small.png b/example/graphics/particles/orb-small.png
index 47cf957..47cf957 100644
--- a/example/clientdata/graphics/particles/orb-small.png
+++ b/example/graphics/particles/orb-small.png
diff --git a/example/clientdata/graphics/particles/skillup.particle.xml b/example/graphics/particles/skillup.particle.xml
index 91d79e7..91d79e7 100644
--- a/example/clientdata/graphics/particles/skillup.particle.xml
+++ b/example/graphics/particles/skillup.particle.xml
diff --git a/example/clientdata/graphics/particles/sparkle.png b/example/graphics/particles/sparkle.png
index 7cfbbb2..7cfbbb2 100644
--- a/example/clientdata/graphics/particles/sparkle.png
+++ b/example/graphics/particles/sparkle.png
diff --git a/example/clientdata/graphics/particles/star-medium.png b/example/graphics/particles/star-medium.png
index 667d233..667d233 100644
--- a/example/clientdata/graphics/particles/star-medium.png
+++ b/example/graphics/particles/star-medium.png
diff --git a/example/clientdata/graphics/particles/star-small.png b/example/graphics/particles/star-small.png
index 4c3bf36..4c3bf36 100644
--- a/example/clientdata/graphics/particles/star-small.png
+++ b/example/graphics/particles/star-small.png
diff --git a/example/clientdata/graphics/particles/warparea.particle.xml b/example/graphics/particles/warparea.particle.xml
index f498423..f498423 100644
--- a/example/clientdata/graphics/particles/warparea.particle.xml
+++ b/example/graphics/particles/warparea.particle.xml
diff --git a/example/clientdata/graphics/skills/axe.png b/example/graphics/skills/axe.png
index b2af034..b2af034 100644
--- a/example/clientdata/graphics/skills/axe.png
+++ b/example/graphics/skills/axe.png
diff --git a/example/clientdata/graphics/skills/bow.png b/example/graphics/skills/bow.png
index 78c4319..78c4319 100644
--- a/example/clientdata/graphics/skills/bow.png
+++ b/example/graphics/skills/bow.png
diff --git a/example/clientdata/graphics/skills/knife.png b/example/graphics/skills/knife.png
index 61f834c..61f834c 100644
--- a/example/clientdata/graphics/skills/knife.png
+++ b/example/graphics/skills/knife.png
diff --git a/example/clientdata/graphics/skills/mace.png b/example/graphics/skills/mace.png
index 7958d32..7958d32 100644
--- a/example/clientdata/graphics/skills/mace.png
+++ b/example/graphics/skills/mace.png
diff --git a/example/clientdata/graphics/skills/magic.png b/example/graphics/skills/magic.png
index 9201d68..9201d68 100644
--- a/example/clientdata/graphics/skills/magic.png
+++ b/example/graphics/skills/magic.png
diff --git a/example/clientdata/graphics/skills/polearm.png b/example/graphics/skills/polearm.png
index 52c8449..52c8449 100644
--- a/example/clientdata/graphics/skills/polearm.png
+++ b/example/graphics/skills/polearm.png
diff --git a/example/clientdata/graphics/skills/shooting.png b/example/graphics/skills/shooting.png
index e7b0806..e7b0806 100644
--- a/example/clientdata/graphics/skills/shooting.png
+++ b/example/graphics/skills/shooting.png
diff --git a/example/clientdata/graphics/skills/staff.png b/example/graphics/skills/staff.png
index e5c071e..e5c071e 100644
--- a/example/clientdata/graphics/skills/staff.png
+++ b/example/graphics/skills/staff.png
diff --git a/example/clientdata/graphics/skills/sword.png b/example/graphics/skills/sword.png
index 9b6db91..9b6db91 100644
--- a/example/clientdata/graphics/skills/sword.png
+++ b/example/graphics/skills/sword.png
diff --git a/example/clientdata/graphics/skills/thrown.png b/example/graphics/skills/thrown.png
index 3fc35de..3fc35de 100644
--- a/example/clientdata/graphics/skills/thrown.png
+++ b/example/graphics/skills/thrown.png
diff --git a/example/clientdata/graphics/skills/unarmed.png b/example/graphics/skills/unarmed.png
index adb139e..adb139e 100644
--- a/example/clientdata/graphics/skills/unarmed.png
+++ b/example/graphics/skills/unarmed.png
diff --git a/example/clientdata/graphics/skills/unknown.png b/example/graphics/skills/unknown.png
index 9201d68..9201d68 100644
--- a/example/clientdata/graphics/skills/unknown.png
+++ b/example/graphics/skills/unknown.png
diff --git a/example/clientdata/graphics/skills/whip.png b/example/graphics/skills/whip.png
index e5734e5..e5734e5 100644
--- a/example/clientdata/graphics/skills/whip.png
+++ b/example/graphics/skills/whip.png
diff --git a/example/clientdata/graphics/sprites/equipment/chest/chest-leather-female.png b/example/graphics/sprites/equipment/chest/chest-leather-female.png
index a6efbf9..a6efbf9 100644
--- a/example/clientdata/graphics/sprites/equipment/chest/chest-leather-female.png
+++ b/example/graphics/sprites/equipment/chest/chest-leather-female.png
diff --git a/example/clientdata/graphics/sprites/equipment/chest/chest-leather-female.xml b/example/graphics/sprites/equipment/chest/chest-leather-female.xml
index b44be8a..b44be8a 100644
--- a/example/clientdata/graphics/sprites/equipment/chest/chest-leather-female.xml
+++ b/example/graphics/sprites/equipment/chest/chest-leather-female.xml
diff --git a/example/clientdata/graphics/sprites/equipment/chest/chest-leather-male.png b/example/graphics/sprites/equipment/chest/chest-leather-male.png
index bc5a3c6..bc5a3c6 100644
--- a/example/clientdata/graphics/sprites/equipment/chest/chest-leather-male.png
+++ b/example/graphics/sprites/equipment/chest/chest-leather-male.png
diff --git a/example/clientdata/graphics/sprites/equipment/chest/chest-leather-male.xml b/example/graphics/sprites/equipment/chest/chest-leather-male.xml
index fd46be2..fd46be2 100644
--- a/example/clientdata/graphics/sprites/equipment/chest/chest-leather-male.xml
+++ b/example/graphics/sprites/equipment/chest/chest-leather-male.xml
diff --git a/example/clientdata/graphics/sprites/equipment/feet/boots-female.png b/example/graphics/sprites/equipment/feet/boots-female.png
index ba98432..ba98432 100644
--- a/example/clientdata/graphics/sprites/equipment/feet/boots-female.png
+++ b/example/graphics/sprites/equipment/feet/boots-female.png
diff --git a/example/clientdata/graphics/sprites/equipment/feet/boots-female.xml b/example/graphics/sprites/equipment/feet/boots-female.xml
index 4bb2fff..4bb2fff 100644
--- a/example/clientdata/graphics/sprites/equipment/feet/boots-female.xml
+++ b/example/graphics/sprites/equipment/feet/boots-female.xml
diff --git a/example/clientdata/graphics/sprites/equipment/feet/boots-male.png b/example/graphics/sprites/equipment/feet/boots-male.png
index f441c5b..f441c5b 100644
--- a/example/clientdata/graphics/sprites/equipment/feet/boots-male.png
+++ b/example/graphics/sprites/equipment/feet/boots-male.png
diff --git a/example/clientdata/graphics/sprites/equipment/feet/boots-male.xml b/example/graphics/sprites/equipment/feet/boots-male.xml
index 7edbcef..7edbcef 100644
--- a/example/clientdata/graphics/sprites/equipment/feet/boots-male.xml
+++ b/example/graphics/sprites/equipment/feet/boots-male.xml
diff --git a/example/clientdata/graphics/sprites/equipment/legs/pants-female.png b/example/graphics/sprites/equipment/legs/pants-female.png
index ad8c2e0..ad8c2e0 100644
--- a/example/clientdata/graphics/sprites/equipment/legs/pants-female.png
+++ b/example/graphics/sprites/equipment/legs/pants-female.png
diff --git a/example/clientdata/graphics/sprites/equipment/legs/pants-female.xml b/example/graphics/sprites/equipment/legs/pants-female.xml
index 4f5dbcd..4f5dbcd 100644
--- a/example/clientdata/graphics/sprites/equipment/legs/pants-female.xml
+++ b/example/graphics/sprites/equipment/legs/pants-female.xml
diff --git a/example/clientdata/graphics/sprites/equipment/legs/pants-male.png b/example/graphics/sprites/equipment/legs/pants-male.png
index f841575..f841575 100644
--- a/example/clientdata/graphics/sprites/equipment/legs/pants-male.png
+++ b/example/graphics/sprites/equipment/legs/pants-male.png
diff --git a/example/clientdata/graphics/sprites/equipment/legs/pants-male.xml b/example/graphics/sprites/equipment/legs/pants-male.xml
index 3a90c6a..3a90c6a 100644
--- a/example/clientdata/graphics/sprites/equipment/legs/pants-male.xml
+++ b/example/graphics/sprites/equipment/legs/pants-male.xml
diff --git a/example/clientdata/graphics/sprites/error.png b/example/graphics/sprites/error.png
index 108ad0e..108ad0e 100644
--- a/example/clientdata/graphics/sprites/error.png
+++ b/example/graphics/sprites/error.png
diff --git a/example/clientdata/graphics/sprites/error.xml b/example/graphics/sprites/error.xml
index 3504bd0..3504bd0 100644
--- a/example/clientdata/graphics/sprites/error.xml
+++ b/example/graphics/sprites/error.xml
diff --git a/example/clientdata/graphics/sprites/icons/icon-feather.png b/example/graphics/sprites/icons/icon-feather.png
index 425fb28..425fb28 100644
--- a/example/clientdata/graphics/sprites/icons/icon-feather.png
+++ b/example/graphics/sprites/icons/icon-feather.png
diff --git a/example/clientdata/graphics/sprites/icons/icon-feather.xml b/example/graphics/sprites/icons/icon-feather.xml
index 715a2f8..715a2f8 100644
--- a/example/clientdata/graphics/sprites/icons/icon-feather.xml
+++ b/example/graphics/sprites/icons/icon-feather.xml
diff --git a/example/clientdata/graphics/sprites/icons/icon-poison.png b/example/graphics/sprites/icons/icon-poison.png
index b7803cd..b7803cd 100644
--- a/example/clientdata/graphics/sprites/icons/icon-poison.png
+++ b/example/graphics/sprites/icons/icon-poison.png
diff --git a/example/clientdata/graphics/sprites/icons/icon-poison.xml b/example/graphics/sprites/icons/icon-poison.xml
index 0a8f751..0a8f751 100644
--- a/example/clientdata/graphics/sprites/icons/icon-poison.xml
+++ b/example/graphics/sprites/icons/icon-poison.xml
diff --git a/example/clientdata/graphics/sprites/monsters/monster-maggot.png b/example/graphics/sprites/monsters/monster-maggot.png
index 64474f9..64474f9 100644
--- a/example/clientdata/graphics/sprites/monsters/monster-maggot.png
+++ b/example/graphics/sprites/monsters/monster-maggot.png
diff --git a/example/clientdata/graphics/sprites/monsters/monster-maggot.xml b/example/graphics/sprites/monsters/monster-maggot.xml
index f603b8d..f603b8d 100644
--- a/example/clientdata/graphics/sprites/monsters/monster-maggot.xml
+++ b/example/graphics/sprites/monsters/monster-maggot.xml
diff --git a/example/clientdata/graphics/sprites/monsters/monster-scorpion.png b/example/graphics/sprites/monsters/monster-scorpion.png
index 0bd693f..0bd693f 100644
--- a/example/clientdata/graphics/sprites/monsters/monster-scorpion.png
+++ b/example/graphics/sprites/monsters/monster-scorpion.png
diff --git a/example/clientdata/graphics/sprites/monsters/monster-scorpion.xml b/example/graphics/sprites/monsters/monster-scorpion.xml
index ab1986a..ab1986a 100644
--- a/example/clientdata/graphics/sprites/monsters/monster-scorpion.xml
+++ b/example/graphics/sprites/monsters/monster-scorpion.xml
diff --git a/example/clientdata/graphics/sprites/monsters/monster-slime.png b/example/graphics/sprites/monsters/monster-slime.png
index ab14bbb..ab14bbb 100644
--- a/example/clientdata/graphics/sprites/monsters/monster-slime.png
+++ b/example/graphics/sprites/monsters/monster-slime.png
diff --git a/example/clientdata/graphics/sprites/monsters/monster-slime.xml b/example/graphics/sprites/monsters/monster-slime.xml
index 220a8e2..220a8e2 100644
--- a/example/clientdata/graphics/sprites/monsters/monster-slime.xml
+++ b/example/graphics/sprites/monsters/monster-slime.xml
diff --git a/example/clientdata/graphics/sprites/npcs/static-npcs.png b/example/graphics/sprites/npcs/static-npcs.png
index 812c88d..812c88d 100644
--- a/example/clientdata/graphics/sprites/npcs/static-npcs.png
+++ b/example/graphics/sprites/npcs/static-npcs.png
diff --git a/example/clientdata/graphics/sprites/npcs/static-npcs.xml b/example/graphics/sprites/npcs/static-npcs.xml
index 2cb4d08..2cb4d08 100644
--- a/example/clientdata/graphics/sprites/npcs/static-npcs.xml
+++ b/example/graphics/sprites/npcs/static-npcs.xml
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle0.xml b/example/graphics/sprites/races/humans/hairstyles/hairstyle0.xml
index 5f06bb2..5f06bb2 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle0.xml
+++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle0.xml
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle1.png b/example/graphics/sprites/races/humans/hairstyles/hairstyle1.png
index 6bb2657..6bb2657 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle1.png
+++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle1.png
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle1.xml b/example/graphics/sprites/races/humans/hairstyles/hairstyle1.xml
index 44b1d4e..44b1d4e 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle1.xml
+++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle1.xml
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle10.png b/example/graphics/sprites/races/humans/hairstyles/hairstyle10.png
index d52924b..d52924b 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle10.png
+++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle10.png
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle10.xml b/example/graphics/sprites/races/humans/hairstyles/hairstyle10.xml
index 6460d09..6460d09 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle10.xml
+++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle10.xml
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle11.png b/example/graphics/sprites/races/humans/hairstyles/hairstyle11.png
index 284772d..284772d 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle11.png
+++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle11.png
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle11.xml b/example/graphics/sprites/races/humans/hairstyles/hairstyle11.xml
index dc73a46..dc73a46 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle11.xml
+++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle11.xml
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle12.png b/example/graphics/sprites/races/humans/hairstyles/hairstyle12.png
index 0309637..0309637 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle12.png
+++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle12.png
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle12.xml b/example/graphics/sprites/races/humans/hairstyles/hairstyle12.xml
index f4bea1f..f4bea1f 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle12.xml
+++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle12.xml
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle13.png b/example/graphics/sprites/races/humans/hairstyles/hairstyle13.png
index 0421089..0421089 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle13.png
+++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle13.png
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle13.xml b/example/graphics/sprites/races/humans/hairstyles/hairstyle13.xml
index 56caee0..56caee0 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle13.xml
+++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle13.xml
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle14.png b/example/graphics/sprites/races/humans/hairstyles/hairstyle14.png
index 7b4cddd..7b4cddd 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle14.png
+++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle14.png
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle14.xml b/example/graphics/sprites/races/humans/hairstyles/hairstyle14.xml
index bc329d0..bc329d0 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle14.xml
+++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle14.xml
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle15.png b/example/graphics/sprites/races/humans/hairstyles/hairstyle15.png
index cd77639..cd77639 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle15.png
+++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle15.png
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle15.xml b/example/graphics/sprites/races/humans/hairstyles/hairstyle15.xml
index 0ce52c6..0ce52c6 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle15.xml
+++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle15.xml
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle16.png b/example/graphics/sprites/races/humans/hairstyles/hairstyle16.png
index fc13907..fc13907 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle16.png
+++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle16.png
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle16.xml b/example/graphics/sprites/races/humans/hairstyles/hairstyle16.xml
index 9ce2d53..9ce2d53 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle16.xml
+++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle16.xml
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle2.png b/example/graphics/sprites/races/humans/hairstyles/hairstyle2.png
index f80ad78..f80ad78 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle2.png
+++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle2.png
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle2.xml b/example/graphics/sprites/races/humans/hairstyles/hairstyle2.xml
index c2caf49..c2caf49 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle2.xml
+++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle2.xml
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle3.png b/example/graphics/sprites/races/humans/hairstyles/hairstyle3.png
index b04df51..b04df51 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle3.png
+++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle3.png
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle3.xml b/example/graphics/sprites/races/humans/hairstyles/hairstyle3.xml
index f0f0bcd..f0f0bcd 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle3.xml
+++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle3.xml
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle4.png b/example/graphics/sprites/races/humans/hairstyles/hairstyle4.png
index b004080..b004080 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle4.png
+++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle4.png
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle4.xml b/example/graphics/sprites/races/humans/hairstyles/hairstyle4.xml
index 7943d68..7943d68 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle4.xml
+++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle4.xml
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle5.png b/example/graphics/sprites/races/humans/hairstyles/hairstyle5.png
index d034fe6..d034fe6 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle5.png
+++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle5.png
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle5.xml b/example/graphics/sprites/races/humans/hairstyles/hairstyle5.xml
index 5a02327..5a02327 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle5.xml
+++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle5.xml
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle6.png b/example/graphics/sprites/races/humans/hairstyles/hairstyle6.png
index b871025..b871025 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle6.png
+++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle6.png
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle6.xml b/example/graphics/sprites/races/humans/hairstyles/hairstyle6.xml
index 0ad652c..0ad652c 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle6.xml
+++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle6.xml
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle7.png b/example/graphics/sprites/races/humans/hairstyles/hairstyle7.png
index c3a27dd..c3a27dd 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle7.png
+++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle7.png
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle7.xml b/example/graphics/sprites/races/humans/hairstyles/hairstyle7.xml
index aa385f7..aa385f7 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle7.xml
+++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle7.xml
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle8.png b/example/graphics/sprites/races/humans/hairstyles/hairstyle8.png
index 3c81a1a..3c81a1a 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle8.png
+++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle8.png
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle8.xml b/example/graphics/sprites/races/humans/hairstyles/hairstyle8.xml
index c2be3b0..c2be3b0 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle8.xml
+++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle8.xml
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle9.png b/example/graphics/sprites/races/humans/hairstyles/hairstyle9.png
index 01bc360..01bc360 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle9.png
+++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle9.png
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle9.xml b/example/graphics/sprites/races/humans/hairstyles/hairstyle9.xml
index 787df6d..787df6d 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle9.xml
+++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle9.xml
diff --git a/example/clientdata/graphics/sprites/races/humans/human_female_base.png b/example/graphics/sprites/races/humans/human_female_base.png
index c4c0a80..c4c0a80 100644
--- a/example/clientdata/graphics/sprites/races/humans/human_female_base.png
+++ b/example/graphics/sprites/races/humans/human_female_base.png
diff --git a/example/clientdata/graphics/sprites/races/humans/human_female_base.xml b/example/graphics/sprites/races/humans/human_female_base.xml
index 1d0ffea..1d0ffea 100644
--- a/example/clientdata/graphics/sprites/races/humans/human_female_base.xml
+++ b/example/graphics/sprites/races/humans/human_female_base.xml
diff --git a/example/clientdata/graphics/sprites/races/humans/human_male_base.png b/example/graphics/sprites/races/humans/human_male_base.png
index 72b9b37..72b9b37 100644
--- a/example/clientdata/graphics/sprites/races/humans/human_male_base.png
+++ b/example/graphics/sprites/races/humans/human_male_base.png
diff --git a/example/clientdata/graphics/sprites/races/humans/human_male_base.xml b/example/graphics/sprites/races/humans/human_male_base.xml
index fe495dd..fe495dd 100644
--- a/example/clientdata/graphics/sprites/races/humans/human_male_base.xml
+++ b/example/graphics/sprites/races/humans/human_male_base.xml
diff --git a/example/clientdata/graphics/sprites/weapons/weapon-bow.png b/example/graphics/sprites/weapons/weapon-bow.png
index b5f8a68..b5f8a68 100644
--- a/example/clientdata/graphics/sprites/weapons/weapon-bow.png
+++ b/example/graphics/sprites/weapons/weapon-bow.png
diff --git a/example/clientdata/graphics/sprites/weapons/weapon-bow.xml b/example/graphics/sprites/weapons/weapon-bow.xml
index 7580776..7580776 100644
--- a/example/clientdata/graphics/sprites/weapons/weapon-bow.xml
+++ b/example/graphics/sprites/weapons/weapon-bow.xml
diff --git a/example/clientdata/graphics/sprites/weapons/weapon-dagger.xml b/example/graphics/sprites/weapons/weapon-dagger.xml
index 1909aff..1909aff 100644
--- a/example/clientdata/graphics/sprites/weapons/weapon-dagger.xml
+++ b/example/graphics/sprites/weapons/weapon-dagger.xml
diff --git a/example/clientdata/graphics/sprites/weapons/weapon-fist.xml b/example/graphics/sprites/weapons/weapon-fist.xml
index 324dfd5..324dfd5 100644
--- a/example/clientdata/graphics/sprites/weapons/weapon-fist.xml
+++ b/example/graphics/sprites/weapons/weapon-fist.xml
diff --git a/example/clientdata/graphics/sprites/weapons/weapon-sword.png b/example/graphics/sprites/weapons/weapon-sword.png
index f691ef3..f691ef3 100644
--- a/example/clientdata/graphics/sprites/weapons/weapon-sword.png
+++ b/example/graphics/sprites/weapons/weapon-sword.png
diff --git a/example/clientdata/graphics/sprites/weapons/weapon-sword.xml b/example/graphics/sprites/weapons/weapon-sword.xml
index 1909aff..1909aff 100644
--- a/example/clientdata/graphics/sprites/weapons/weapon-sword.xml
+++ b/example/graphics/sprites/weapons/weapon-sword.xml
diff --git a/example/clientdata/hair.xml b/example/hair.xml
index b24d9ad..b24d9ad 100644
--- a/example/clientdata/hair.xml
+++ b/example/hair.xml
diff --git a/example/clientdata/items.xml b/example/items.xml
index 18e3889..18e3889 100644
--- a/example/clientdata/items.xml
+++ b/example/items.xml
diff --git a/example/serverdata/maps.xml b/example/maps.xml
index 9467385..9467385 100644
--- a/example/serverdata/maps.xml
+++ b/example/maps.xml
diff --git a/example/clientdata/maps/desert.tmx b/example/maps/desert.tmx
index f07aaeb..f07aaeb 100644
--- a/example/clientdata/maps/desert.tmx
+++ b/example/maps/desert.tmx
diff --git a/example/clientdata/monsters.xml b/example/monsters.xml
index ba882cc..ba882cc 100644
--- a/example/clientdata/monsters.xml
+++ b/example/monsters.xml
diff --git a/example/clientdata/npcs.xml b/example/npcs.xml
index 8fe4003..8fe4003 100644
--- a/example/clientdata/npcs.xml
+++ b/example/npcs.xml
diff --git a/example/clientdata/paths.xml b/example/paths.xml
index 21d1fc2..21d1fc2 100644
--- a/example/clientdata/paths.xml
+++ b/example/paths.xml
diff --git a/example/serverdata/permissions.xml b/example/permissions.xml
index a13d557..a13d557 100644
--- a/example/serverdata/permissions.xml
+++ b/example/permissions.xml
diff --git a/example/serverdata/scripts/bomtest.lua b/example/scripts/bomtest.lua
index d4b0212..d4b0212 100644
--- a/example/serverdata/scripts/bomtest.lua
+++ b/example/scripts/bomtest.lua
diff --git a/example/serverdata/scripts/crafting.lua b/example/scripts/crafting.lua
index eae26a4..eae26a4 100644
--- a/example/serverdata/scripts/crafting.lua
+++ b/example/scripts/crafting.lua
diff --git a/example/serverdata/scripts/global_events.lua b/example/scripts/global_events.lua
index 548351a..548351a 100644
--- a/example/serverdata/scripts/global_events.lua
+++ b/example/scripts/global_events.lua
diff --git a/example/serverdata/scripts/items/candy.lua b/example/scripts/items/candy.lua
index a740ce6..a740ce6 100644
--- a/example/serverdata/scripts/items/candy.lua
+++ b/example/scripts/items/candy.lua
diff --git a/example/serverdata/scripts/main.lua b/example/scripts/main.lua
index d5d8bd0..d5d8bd0 100644
--- a/example/serverdata/scripts/main.lua
+++ b/example/scripts/main.lua
diff --git a/example/serverdata/scripts/maps/desert.lua b/example/scripts/maps/desert.lua
index 976a949..c330247 100644
--- a/example/serverdata/scripts/maps/desert.lua
+++ b/example/scripts/maps/desert.lua
@@ -12,7 +12,7 @@
 
 -- From scripts/
 require "scripts/lua/npclib"
--- From example/serverdata/scripts
+-- From example/scripts
 require "scripts/npcs/banker"
 require "scripts/npcs/barber"
 require "scripts/npcs/merchant"
diff --git a/example/serverdata/scripts/monster/testmonster.lua b/example/scripts/monster/testmonster.lua
index 9938943..9938943 100644
--- a/example/serverdata/scripts/monster/testmonster.lua
+++ b/example/scripts/monster/testmonster.lua
diff --git a/example/serverdata/scripts/npcs/banker.lua b/example/scripts/npcs/banker.lua
index 4e04865..4e04865 100644
--- a/example/serverdata/scripts/npcs/banker.lua
+++ b/example/scripts/npcs/banker.lua
diff --git a/example/serverdata/scripts/npcs/barber.lua b/example/scripts/npcs/barber.lua
index fbb2862..fbb2862 100644
--- a/example/serverdata/scripts/npcs/barber.lua
+++ b/example/scripts/npcs/barber.lua
diff --git a/example/serverdata/scripts/npcs/debugger.lua b/example/scripts/npcs/debugger.lua
index 142c3fd..142c3fd 100644
--- a/example/serverdata/scripts/npcs/debugger.lua
+++ b/example/scripts/npcs/debugger.lua
diff --git a/example/serverdata/scripts/npcs/emotemaker.lua b/example/scripts/npcs/emotemaker.lua
index 83d2f56..83d2f56 100644
--- a/example/serverdata/scripts/npcs/emotemaker.lua
+++ b/example/scripts/npcs/emotemaker.lua
diff --git a/example/serverdata/scripts/npcs/healer.lua b/example/scripts/npcs/healer.lua
index 88335c2..88335c2 100644
--- a/example/serverdata/scripts/npcs/healer.lua
+++ b/example/scripts/npcs/healer.lua
diff --git a/example/serverdata/scripts/npcs/merchant.lua b/example/scripts/npcs/merchant.lua
index 92eeea3..92eeea3 100644
--- a/example/serverdata/scripts/npcs/merchant.lua
+++ b/example/scripts/npcs/merchant.lua
diff --git a/example/serverdata/scripts/npcs/postman.lua b/example/scripts/npcs/postman.lua
index 712ea99..712ea99 100644
--- a/example/serverdata/scripts/npcs/postman.lua
+++ b/example/scripts/npcs/postman.lua
diff --git a/example/serverdata/scripts/npcs/shaker.lua b/example/scripts/npcs/shaker.lua
index 9d7bafb..9d7bafb 100644
--- a/example/serverdata/scripts/npcs/shaker.lua
+++ b/example/scripts/npcs/shaker.lua
diff --git a/example/serverdata/scripts/special_actions.lua b/example/scripts/special_actions.lua
index 135ad35..135ad35 100644
--- a/example/serverdata/scripts/special_actions.lua
+++ b/example/scripts/special_actions.lua
diff --git a/example/serverdata/scripts/status/jump.lua b/example/scripts/status/jump.lua
index 3410747..3410747 100644
--- a/example/serverdata/scripts/status/jump.lua
+++ b/example/scripts/status/jump.lua
diff --git a/example/serverdata/scripts/status/plague.lua b/example/scripts/status/plague.lua
index 5f98268..5f98268 100644
--- a/example/serverdata/scripts/status/plague.lua
+++ b/example/scripts/status/plague.lua
diff --git a/example/clientdata/sfx/fist-swish.ogg b/example/sfx/fist-swish.ogg
index 757d0f7..757d0f7 100644
--- a/example/clientdata/sfx/fist-swish.ogg
+++ b/example/sfx/fist-swish.ogg
diff --git a/example/clientdata/sfx/monsters/maggot/maggot-dying1.ogg b/example/sfx/monsters/maggot/maggot-dying1.ogg
index e05a523..e05a523 100644
--- a/example/clientdata/sfx/monsters/maggot/maggot-dying1.ogg
+++ b/example/sfx/monsters/maggot/maggot-dying1.ogg
diff --git a/example/clientdata/sfx/monsters/maggot/maggot-hit1.ogg b/example/sfx/monsters/maggot/maggot-hit1.ogg
index 695cb48..695cb48 100644
--- a/example/clientdata/sfx/monsters/maggot/maggot-hit1.ogg
+++ b/example/sfx/monsters/maggot/maggot-hit1.ogg
diff --git a/example/clientdata/sfx/monsters/maggot/maggot-hit2.ogg b/example/sfx/monsters/maggot/maggot-hit2.ogg
index 12d92bb..12d92bb 100644
--- a/example/clientdata/sfx/monsters/maggot/maggot-hit2.ogg
+++ b/example/sfx/monsters/maggot/maggot-hit2.ogg
diff --git a/example/clientdata/sfx/monsters/maggot/maggot-miss1.ogg b/example/sfx/monsters/maggot/maggot-miss1.ogg
index a251bf9..a251bf9 100644
--- a/example/clientdata/sfx/monsters/maggot/maggot-miss1.ogg
+++ b/example/sfx/monsters/maggot/maggot-miss1.ogg
diff --git a/example/clientdata/sfx/monsters/scorpion/scorpion-hit1.ogg b/example/sfx/monsters/scorpion/scorpion-hit1.ogg
index d0cf8d0..d0cf8d0 100644
--- a/example/clientdata/sfx/monsters/scorpion/scorpion-hit1.ogg
+++ b/example/sfx/monsters/scorpion/scorpion-hit1.ogg
diff --git a/example/clientdata/sfx/monsters/scorpion/scorpion-hit2.ogg b/example/sfx/monsters/scorpion/scorpion-hit2.ogg
index 04521d6..04521d6 100644
--- a/example/clientdata/sfx/monsters/scorpion/scorpion-hit2.ogg
+++ b/example/sfx/monsters/scorpion/scorpion-hit2.ogg
diff --git a/example/clientdata/sfx/monsters/scorpion/scorpion-hit3.ogg b/example/sfx/monsters/scorpion/scorpion-hit3.ogg
index 283efff..283efff 100644
--- a/example/clientdata/sfx/monsters/scorpion/scorpion-hit3.ogg
+++ b/example/sfx/monsters/scorpion/scorpion-hit3.ogg
diff --git a/example/clientdata/sfx/monsters/scorpion/scorpion-hit4.ogg b/example/sfx/monsters/scorpion/scorpion-hit4.ogg
index bef6787..bef6787 100644
--- a/example/clientdata/sfx/monsters/scorpion/scorpion-hit4.ogg
+++ b/example/sfx/monsters/scorpion/scorpion-hit4.ogg
diff --git a/example/clientdata/sfx/monsters/scorpion/scorpion-miss1.ogg b/example/sfx/monsters/scorpion/scorpion-miss1.ogg
index 264fe44..264fe44 100644
--- a/example/clientdata/sfx/monsters/scorpion/scorpion-miss1.ogg
+++ b/example/sfx/monsters/scorpion/scorpion-miss1.ogg
diff --git a/example/clientdata/sfx/monsters/slime/slime-hit1.ogg b/example/sfx/monsters/slime/slime-hit1.ogg
index decf40a..decf40a 100644
--- a/example/clientdata/sfx/monsters/slime/slime-hit1.ogg
+++ b/example/sfx/monsters/slime/slime-hit1.ogg
diff --git a/example/clientdata/skills.xml b/example/skills.xml
index 340d903..340d903 100644
--- a/example/clientdata/skills.xml
+++ b/example/skills.xml
diff --git a/example/clientdata/specials.xml b/example/specials.xml
index c234f66..c234f66 100644
--- a/example/clientdata/specials.xml
+++ b/example/specials.xml
diff --git a/example/clientdata/status-effects.xml b/example/status-effects.xml
index 7b613c4..7b613c4 100644
--- a/example/clientdata/status-effects.xml
+++ b/example/status-effects.xml
diff --git a/example/clientdata/tilesets/collision.png b/example/tilesets/collision.png
index 9640aa8..9640aa8 100644
--- a/example/clientdata/tilesets/collision.png
+++ b/example/tilesets/collision.png
diff --git a/example/clientdata/tilesets/tmw_desert_spacing.png b/example/tilesets/tmw_desert_spacing.png
index 4e9995c..4e9995c 100644
--- a/example/clientdata/tilesets/tmw_desert_spacing.png
+++ b/example/tilesets/tmw_desert_spacing.png
diff --git a/example/clientdata/units.xml b/example/units.xml
index 265318f..265318f 100644
--- a/example/clientdata/units.xml
+++ b/example/units.xml
diff --git a/src/common/resourcemanager.cpp b/src/common/resourcemanager.cpp
index 5c177f7..edff1e0 100644
--- a/src/common/resourcemanager.cpp
+++ b/src/common/resourcemanager.cpp
@@ -44,14 +44,11 @@ void ResourceManager::initialize()
 
     const std::string serverPath =
             Configuration::getValue("serverPath", ".");
-    const std::string clientDataPath =
-            Configuration::getValue("clientDataPath", "example/clientdata");
-    const std::string serverDataPath =
-            Configuration::getValue("serverDataPath", "example/serverdata");
+    const std::string worldDataPath =
+            Configuration::getValue("worldDataPath", "example");
 
     PHYSFS_addToSearchPath(serverPath.c_str(), 1);
-    PHYSFS_addToSearchPath(clientDataPath.c_str(), 1);
-    PHYSFS_addToSearchPath(serverDataPath.c_str(), 1);
+    PHYSFS_addToSearchPath(worldDataPath.c_str(), 1);
 }
 
 /**