54 files changed, 54 insertions, 54 deletions
diff --git a/npc/omobs/citycleaners.txt b/npc/mobs/citycleaners.txt
index 4a93340a6..4a93340a6 100644
--- a/npc/omobs/citycleaners.txt
+++ b/npc/mobs/citycleaners.txt
diff --git a/npc/omobs/dungeons/abyss.txt b/npc/mobs/dungeons/abyss.txt
index 1c045bd5f..1c045bd5f 100644
--- a/npc/omobs/dungeons/abyss.txt
+++ b/npc/mobs/dungeons/abyss.txt
diff --git a/npc/omobs/dungeons/amatdun.txt b/npc/mobs/dungeons/amatdun.txt
index 1ec841b08..1ec841b08 100644
--- a/npc/omobs/dungeons/amatdun.txt
+++ b/npc/mobs/dungeons/amatdun.txt
diff --git a/npc/omobs/dungeons/anthell.txt b/npc/mobs/dungeons/anthell.txt
index ad9c1864b..ad9c1864b 100644
--- a/npc/omobs/dungeons/anthell.txt
+++ b/npc/mobs/dungeons/anthell.txt
diff --git a/npc/omobs/dungeons/ayodun.txt b/npc/mobs/dungeons/ayodun.txt
index e0fdaa3e7..e0fdaa3e7 100644
--- a/npc/omobs/dungeons/ayodun.txt
+++ b/npc/mobs/dungeons/ayodun.txt
diff --git a/npc/omobs/dungeons/beachdun.txt b/npc/mobs/dungeons/beachdun.txt
index 7682d10f8..7682d10f8 100644
--- a/npc/omobs/dungeons/beachdun.txt
+++ b/npc/mobs/dungeons/beachdun.txt
diff --git a/npc/omobs/dungeons/byalan.txt b/npc/mobs/dungeons/byalan.txt
index 05238254b..05238254b 100644
--- a/npc/omobs/dungeons/byalan.txt
+++ b/npc/mobs/dungeons/byalan.txt
diff --git a/npc/omobs/dungeons/clocktower.txt b/npc/mobs/dungeons/clocktower.txt
index 96b7adaaa..96b7adaaa 100644
--- a/npc/omobs/dungeons/clocktower.txt
+++ b/npc/mobs/dungeons/clocktower.txt
diff --git a/npc/omobs/dungeons/coalmine.txt b/npc/mobs/dungeons/coalmine.txt
index 27ac91821..27ac91821 100644
--- a/npc/omobs/dungeons/coalmine.txt
+++ b/npc/mobs/dungeons/coalmine.txt
diff --git a/npc/omobs/dungeons/eindun.txt b/npc/mobs/dungeons/eindun.txt
index 94a216e83..94a216e83 100644
--- a/npc/omobs/dungeons/eindun.txt
+++ b/npc/mobs/dungeons/eindun.txt
diff --git a/npc/omobs/dungeons/gefenia.txt b/npc/mobs/dungeons/gefenia.txt
index 3289dec7e..3289dec7e 100644
--- a/npc/omobs/dungeons/gefenia.txt
+++ b/npc/mobs/dungeons/gefenia.txt
diff --git a/npc/omobs/dungeons/geftower.txt b/npc/mobs/dungeons/geftower.txt
index 5a8da85de..5a8da85de 100644
--- a/npc/omobs/dungeons/geftower.txt
+++ b/npc/mobs/dungeons/geftower.txt
diff --git a/npc/omobs/dungeons/glastheim.txt b/npc/mobs/dungeons/glastheim.txt
index 0914b0c9e..0914b0c9e 100644
--- a/npc/omobs/dungeons/glastheim.txt
+++ b/npc/mobs/dungeons/glastheim.txt
diff --git a/npc/omobs/dungeons/gondun.txt b/npc/mobs/dungeons/gondun.txt
index 796f38884..796f38884 100644
--- a/npc/omobs/dungeons/gondun.txt
+++ b/npc/mobs/dungeons/gondun.txt
diff --git a/npc/omobs/dungeons/guilddun.txt b/npc/mobs/dungeons/guilddun.txt
index eefcdc4cb..eefcdc4cb 100644
--- a/npc/omobs/dungeons/guilddun.txt
+++ b/npc/mobs/dungeons/guilddun.txt
diff --git a/npc/omobs/dungeons/jupedun.txt b/npc/mobs/dungeons/jupedun.txt
index 5a1087789..5a1087789 100644
--- a/npc/omobs/dungeons/jupedun.txt
+++ b/npc/mobs/dungeons/jupedun.txt
diff --git a/npc/omobs/dungeons/kiel.txt b/npc/mobs/dungeons/kiel.txt
index e847f4c88..e847f4c88 100644
--- a/npc/omobs/dungeons/kiel.txt
+++ b/npc/mobs/dungeons/kiel.txt
diff --git a/npc/omobs/dungeons/lhzdun.txt b/npc/mobs/dungeons/lhzdun.txt
index e60fa71fe..e60fa71fe 100644
--- a/npc/omobs/dungeons/lhzdun.txt
+++ b/npc/mobs/dungeons/lhzdun.txt
diff --git a/npc/omobs/dungeons/louydun.txt b/npc/mobs/dungeons/louydun.txt
index 6ce5067d4..6ce5067d4 100644
--- a/npc/omobs/dungeons/louydun.txt
+++ b/npc/mobs/dungeons/louydun.txt
diff --git a/npc/omobs/dungeons/magmadun.txt b/npc/mobs/dungeons/magmadun.txt
index 5d14cc4f0..5d14cc4f0 100644
--- a/npc/omobs/dungeons/magmadun.txt
+++ b/npc/mobs/dungeons/magmadun.txt
diff --git a/npc/omobs/dungeons/moc_pyramid.txt b/npc/mobs/dungeons/moc_pyramid.txt
index 533f4a090..533f4a090 100644
--- a/npc/omobs/dungeons/moc_pyramid.txt
+++ b/npc/mobs/dungeons/moc_pyramid.txt
diff --git a/npc/omobs/dungeons/moc_sphinx.txt b/npc/mobs/dungeons/moc_sphinx.txt
index d49a16426..d49a16426 100644
--- a/npc/omobs/dungeons/moc_sphinx.txt
+++ b/npc/mobs/dungeons/moc_sphinx.txt
diff --git a/npc/omobs/dungeons/orcdun.txt b/npc/mobs/dungeons/orcdun.txt
index ce5dc7a14..ce5dc7a14 100644
--- a/npc/omobs/dungeons/orcdun.txt
+++ b/npc/mobs/dungeons/orcdun.txt
diff --git a/npc/omobs/dungeons/payoncave.txt b/npc/mobs/dungeons/payoncave.txt
index 3d47ef050..3d47ef050 100644
--- a/npc/omobs/dungeons/payoncave.txt
+++ b/npc/mobs/dungeons/payoncave.txt
diff --git a/npc/omobs/dungeons/pront_maze.txt b/npc/mobs/dungeons/pront_maze.txt
index 116cdda13..116cdda13 100644
--- a/npc/omobs/dungeons/pront_maze.txt
+++ b/npc/mobs/dungeons/pront_maze.txt
diff --git a/npc/omobs/dungeons/pront_sewers.txt b/npc/mobs/dungeons/pront_sewers.txt
index df5ff2fff..df5ff2fff 100644
--- a/npc/omobs/dungeons/pront_sewers.txt
+++ b/npc/mobs/dungeons/pront_sewers.txt
diff --git a/npc/omobs/dungeons/sunkenship.txt b/npc/mobs/dungeons/sunkenship.txt
index c5f90843d..c5f90843d 100644
--- a/npc/omobs/dungeons/sunkenship.txt
+++ b/npc/mobs/dungeons/sunkenship.txt
diff --git a/npc/omobs/dungeons/thanatos.txt b/npc/mobs/dungeons/thanatos.txt
index dbd62d127..dbd62d127 100644
--- a/npc/omobs/dungeons/thanatos.txt
+++ b/npc/mobs/dungeons/thanatos.txt
diff --git a/npc/omobs/dungeons/toyfactory.txt b/npc/mobs/dungeons/toyfactory.txt
index 5073b6876..5073b6876 100644
--- a/npc/omobs/dungeons/toyfactory.txt
+++ b/npc/mobs/dungeons/toyfactory.txt
diff --git a/npc/omobs/dungeons/turtleisland.txt b/npc/mobs/dungeons/turtleisland.txt
index f63cfe403..f63cfe403 100644
--- a/npc/omobs/dungeons/turtleisland.txt
+++ b/npc/mobs/dungeons/turtleisland.txt
diff --git a/npc/omobs/dungeons/umbaladun.txt b/npc/mobs/dungeons/umbaladun.txt
index 68644df4e..68644df4e 100644
--- a/npc/omobs/dungeons/umbaladun.txt
+++ b/npc/mobs/dungeons/umbaladun.txt
diff --git a/npc/omobs/dungeons/yggdrasil.txt b/npc/mobs/dungeons/yggdrasil.txt
index 6a83f30ed..6a83f30ed 100644
--- a/npc/omobs/dungeons/yggdrasil.txt
+++ b/npc/mobs/dungeons/yggdrasil.txt
diff --git a/npc/omobs/fields/amatsu.txt b/npc/mobs/fields/amatsu.txt
index 5d2a9894a..5d2a9894a 100644
--- a/npc/omobs/fields/amatsu.txt
+++ b/npc/mobs/fields/amatsu.txt
diff --git a/npc/omobs/fields/ayothaya.txt b/npc/mobs/fields/ayothaya.txt
index e466d8ece..e466d8ece 100644
--- a/npc/omobs/fields/ayothaya.txt
+++ b/npc/mobs/fields/ayothaya.txt
diff --git a/npc/omobs/fields/comodo.txt b/npc/mobs/fields/comodo.txt
index ead03d814..ead03d814 100644
--- a/npc/omobs/fields/comodo.txt
+++ b/npc/mobs/fields/comodo.txt
diff --git a/npc/omobs/fields/einbroch.txt b/npc/mobs/fields/einbroch.txt
index 1c7db0d55..1c7db0d55 100644
--- a/npc/omobs/fields/einbroch.txt
+++ b/npc/mobs/fields/einbroch.txt
diff --git a/npc/omobs/fields/geffen.txt b/npc/mobs/fields/geffen.txt
index 8d4d3d6e5..8d4d3d6e5 100644
--- a/npc/omobs/fields/geffen.txt
+++ b/npc/mobs/fields/geffen.txt
diff --git a/npc/omobs/fields/gonryun.txt b/npc/mobs/fields/gonryun.txt
index 12a1c807c..12a1c807c 100644
--- a/npc/omobs/fields/gonryun.txt
+++ b/npc/mobs/fields/gonryun.txt
diff --git a/npc/omobs/fields/hugel.txt b/npc/mobs/fields/hugel.txt
index 8bfe34773..8bfe34773 100644
--- a/npc/omobs/fields/hugel.txt
+++ b/npc/mobs/fields/hugel.txt
diff --git a/npc/omobs/fields/jawaii.txt b/npc/mobs/fields/jawaii.txt
index f7fa27875..f7fa27875 100644
--- a/npc/omobs/fields/jawaii.txt
+++ b/npc/mobs/fields/jawaii.txt
diff --git a/npc/omobs/fields/lighthalzen.txt b/npc/mobs/fields/lighthalzen.txt
index a1043a998..a1043a998 100644
--- a/npc/omobs/fields/lighthalzen.txt
+++ b/npc/mobs/fields/lighthalzen.txt
diff --git a/npc/omobs/fields/louyang.txt b/npc/mobs/fields/louyang.txt
index bbcf10a78..bbcf10a78 100644
--- a/npc/omobs/fields/louyang.txt
+++ b/npc/mobs/fields/louyang.txt
diff --git a/npc/omobs/fields/lutie.txt b/npc/mobs/fields/lutie.txt
index af5e8c205..af5e8c205 100644
--- a/npc/omobs/fields/lutie.txt
+++ b/npc/mobs/fields/lutie.txt
diff --git a/npc/omobs/fields/mjolnir.txt b/npc/mobs/fields/mjolnir.txt
index a8e0a6f9b..a8e0a6f9b 100644
--- a/npc/omobs/fields/mjolnir.txt
+++ b/npc/mobs/fields/mjolnir.txt
diff --git a/npc/omobs/fields/morocc.txt b/npc/mobs/fields/morocc.txt
index 5e5395ab8..5e5395ab8 100644
--- a/npc/omobs/fields/morocc.txt
+++ b/npc/mobs/fields/morocc.txt
diff --git a/npc/omobs/fields/niflheim.txt b/npc/mobs/fields/niflheim.txt
index 245ed9b1d..245ed9b1d 100644
--- a/npc/omobs/fields/niflheim.txt
+++ b/npc/mobs/fields/niflheim.txt
diff --git a/npc/omobs/fields/odin.txt b/npc/mobs/fields/odin.txt
index acf08c163..acf08c163 100644
--- a/npc/omobs/fields/odin.txt
+++ b/npc/mobs/fields/odin.txt
diff --git a/npc/omobs/fields/payon.txt b/npc/mobs/fields/payon.txt
index e56efe5dd..e56efe5dd 100644
--- a/npc/omobs/fields/payon.txt
+++ b/npc/mobs/fields/payon.txt
diff --git a/npc/omobs/fields/prontera.txt b/npc/mobs/fields/prontera.txt
index 74d8acb27..74d8acb27 100644
--- a/npc/omobs/fields/prontera.txt
+++ b/npc/mobs/fields/prontera.txt
diff --git a/npc/omobs/fields/umbala.txt b/npc/mobs/fields/umbala.txt
index ed214249d..ed214249d 100644
--- a/npc/omobs/fields/umbala.txt
+++ b/npc/mobs/fields/umbala.txt
diff --git a/npc/omobs/fields/yuno.txt b/npc/mobs/fields/yuno.txt
index 57562d6c7..57562d6c7 100644
--- a/npc/omobs/fields/yuno.txt
+++ b/npc/mobs/fields/yuno.txt
diff --git a/npc/omobs/pvp.txt b/npc/mobs/pvp.txt
index 2d29bf574..2d29bf574 100644
--- a/npc/omobs/pvp.txt
+++ b/npc/mobs/pvp.txt
diff --git a/npc/scripts_eamonsters.conf b/npc/scripts_eamonsters.conf
index 17d318253..48ddd4119 100644
--- a/npc/scripts_eamonsters.conf
+++ b/npc/scripts_eamonsters.conf
@@ -15,8 +15,8 @@
 // --------------------------------------------------------------
 // -                      Monster  Scripts                      -
 // --------------------------------------------------------------
-npc: npc/omobs/citycleaners.txt
-npc: npc/omobs/pvp.txt
+npc: npc/mobs/citycleaners.txt
+npc: npc/mobs/pvp.txt
 
 npc: npc/eamobs/fields/amatsu.txt
 npc: npc/eamobs/fields/ayothaya.txt
diff --git a/npc/scripts_monsters.conf b/npc/scripts_monsters.conf
index 82b7bf4fe..0b784fa68 100644
--- a/npc/scripts_monsters.conf
+++ b/npc/scripts_monsters.conf
@@ -15,58 +15,58 @@
 // --------------------------------------------------------------
 // -                      Monster  Scripts                      -
 // --------------------------------------------------------------
-npc: npc/omobs/citycleaners.txt
-npc: npc/omobs/pvp.txt
+npc: npc/mobs/citycleaners.txt
+npc: npc/mobs/pvp.txt
 
-npc: npc/omobs/fields/amatsu.txt
-npc: npc/omobs/fields/ayothaya.txt
-npc: npc/omobs/fields/comodo.txt
-npc: npc/omobs/fields/einbroch.txt
-npc: npc/omobs/fields/geffen.txt
-npc: npc/omobs/fields/gonryun.txt
-npc: npc/omobs/fields/hugel.txt
-npc: npc/omobs/fields/jawaii.txt
-npc: npc/omobs/fields/lighthalzen.txt
-npc: npc/omobs/fields/louyang.txt
-npc: npc/omobs/fields/lutie.txt
-npc: npc/omobs/fields/mjolnir.txt
-npc: npc/omobs/fields/morocc.txt
-npc: npc/omobs/fields/niflheim.txt
-//npc: npc/omobs/fields/odin.txt
-npc: npc/omobs/fields/payon.txt
-npc: npc/omobs/fields/prontera.txt
-npc: npc/omobs/fields/umbala.txt
-npc: npc/omobs/fields/yuno.txt
+npc: npc/mobs/fields/amatsu.txt
+npc: npc/mobs/fields/ayothaya.txt
+npc: npc/mobs/fields/comodo.txt
+npc: npc/mobs/fields/einbroch.txt
+npc: npc/mobs/fields/geffen.txt
+npc: npc/mobs/fields/gonryun.txt
+npc: npc/mobs/fields/hugel.txt
+npc: npc/mobs/fields/jawaii.txt
+npc: npc/mobs/fields/lighthalzen.txt
+npc: npc/mobs/fields/louyang.txt
+npc: npc/mobs/fields/lutie.txt
+npc: npc/mobs/fields/mjolnir.txt
+npc: npc/mobs/fields/morocc.txt
+npc: npc/mobs/fields/niflheim.txt
+//npc: npc/mobs/fields/odin.txt
+npc: npc/mobs/fields/payon.txt
+npc: npc/mobs/fields/prontera.txt
+npc: npc/mobs/fields/umbala.txt
+npc: npc/mobs/fields/yuno.txt
 
-npc: npc/omobs/dungeons/amatdun.txt
-npc: npc/omobs/dungeons/anthell.txt
-npc: npc/omobs/dungeons/ayodun.txt
-npc: npc/omobs/dungeons/abyss.txt
-npc: npc/omobs/dungeons/beachdun.txt
-npc: npc/omobs/dungeons/byalan.txt
-npc: npc/omobs/dungeons/clocktower.txt
-npc: npc/omobs/dungeons/coalmine.txt
-npc: npc/omobs/dungeons/eindun.txt
-npc: npc/omobs/dungeons/gefenia.txt
-npc: npc/omobs/dungeons/geftower.txt
-npc: npc/omobs/dungeons/glastheim.txt
-npc: npc/omobs/dungeons/gondun.txt
-npc: npc/omobs/dungeons/guilddun.txt
-npc: npc/omobs/dungeons/jupedun.txt
-//npc: npc/omobs/dungeons/kiel.txt
-npc: npc/omobs/dungeons/lhzdun.txt
-npc: npc/omobs/dungeons/louydun.txt
-npc: npc/omobs/dungeons/magmadun.txt
-npc: npc/omobs/dungeons/moc_pyramid.txt
-npc: npc/omobs/dungeons/moc_sphinx.txt
-npc: npc/omobs/dungeons/orcdun.txt
-npc: npc/omobs/dungeons/payoncave.txt
-npc: npc/omobs/dungeons/pront_maze.txt
-npc: npc/omobs/dungeons/pront_sewers.txt
-npc: npc/omobs/dungeons/sunkenship.txt
-npc: npc/omobs/dungeons/thanatos.txt
-npc: npc/omobs/dungeons/toyfactory.txt
-npc: npc/omobs/dungeons/turtleisland.txt
-npc: npc/omobs/dungeons/umbaladun.txt
-npc: npc/omobs/dungeons/yggdrasil.txt
+npc: npc/mobs/dungeons/amatdun.txt
+npc: npc/mobs/dungeons/anthell.txt
+npc: npc/mobs/dungeons/ayodun.txt
+npc: npc/mobs/dungeons/abyss.txt
+npc: npc/mobs/dungeons/beachdun.txt
+npc: npc/mobs/dungeons/byalan.txt
+npc: npc/mobs/dungeons/clocktower.txt
+npc: npc/mobs/dungeons/coalmine.txt
+npc: npc/mobs/dungeons/eindun.txt
+npc: npc/mobs/dungeons/gefenia.txt
+npc: npc/mobs/dungeons/geftower.txt
+npc: npc/mobs/dungeons/glastheim.txt
+npc: npc/mobs/dungeons/gondun.txt
+npc: npc/mobs/dungeons/guilddun.txt
+npc: npc/mobs/dungeons/jupedun.txt
+//npc: npc/mobs/dungeons/kiel.txt
+npc: npc/mobs/dungeons/lhzdun.txt
+npc: npc/mobs/dungeons/louydun.txt
+npc: npc/mobs/dungeons/magmadun.txt
+npc: npc/mobs/dungeons/moc_pyramid.txt
+npc: npc/mobs/dungeons/moc_sphinx.txt
+npc: npc/mobs/dungeons/orcdun.txt
+npc: npc/mobs/dungeons/payoncave.txt
+npc: npc/mobs/dungeons/pront_maze.txt
+npc: npc/mobs/dungeons/pront_sewers.txt
+npc: npc/mobs/dungeons/sunkenship.txt
+npc: npc/mobs/dungeons/thanatos.txt
+npc: npc/mobs/dungeons/toyfactory.txt
+npc: npc/mobs/dungeons/turtleisland.txt
+npc: npc/mobs/dungeons/umbaladun.txt
+npc: npc/mobs/dungeons/yggdrasil.txt
 // --------------------------------------------------------------