Change all script folders

Script files fixes are comming

341 files changed, 1234 insertions, 1063 deletions

diff --git a/conf/map_athena.conf b/conf/map_athena.conf
index 25ea0676..82e8c08b 100644
--- a/conf/map_athena.conf
+++ b/conf/map_athena.conf
@@ -1,323 +1,17 @@
 // eAthena Map-Server Configuration File
 
-// Maps
-map: new_39-1.gat
-map: new_38-1.gat
-map: new_37-1.gat
-map: new_36-1.gat
-map: new_35-1.gat
-map: new_34-1.gat
-map: new_33-1.gat
-map: new_32-1.gat
-map: new_31-1.gat
-map: new_30-1.gat
-map: new_29-1.gat
-map: new_28-1.gat
-map: new_27-1.gat
-map: new_26-1.gat
-map: new_25-1.gat
-map: new_24-1.gat
-map: new_23-1.gat
-map: new_22-1.gat
-map: new_21-1.gat
-map: new_20-1.gat
-map: new_19-1.gat
-map: new_18-1.gat
-map: new_17-1.gat
-map: new_16-1.gat
-map: new_15-1.gat
-map: new_14-1.gat
-map: new_13-1.gat
-map: new_12-1.gat
-map: new_11-1.gat
-map: new_10-1.gat
-map: new_9-1.gat
-map: new_8-1.gat
-map: new_7-1.gat
-map: new_6-1.gat
-map: new_5-1.gat
-map: new_4-1.gat
-map: new_3-1.gat
-map: new_2-1.gat
-map: new_1-1.gat
+// Database autosave time, in seconds.
+autosave_time: 60
 
-// NPC Functions
-npc: npc/functions/banker.txt
-npc: npc/functions/barber.txt
-npc: npc/functions/game_rules.txt
-npc: npc/functions/inn.txt
-npc: npc/functions/mob_points.txt
-npc: npc/functions/process_equip.txt
-npc: npc/functions/slot_machine.txt
-npc: npc/functions/soul_menhir.txt
+// Message of the day file, when a character logs on, this message is displayed.
+motd_txt: conf/motd.txt
 
-// NPCs (ordered by map number).
+// When @help or @h is typed when you are a gm, this is displayed for helping new gms understand gm commands.
+help_txt: conf/help.txt
 
-// new_1-1 Western desert
-// npc: npc/western-desert/dark_mage.txt
-npc: npc/new_1-1-western-desert/rogue.txt
-npc: npc/new_1-1-western-desert/merchant.txt
-npc: npc/new_1-1-western-desert/monsters.txt
-npc: npc/new_1-1-western-desert/nomads.txt
-npc: npc/new_1-1-western-desert/passages.txt
+mapreg_txt: save/mapreg.txt
 
-// new-2_1 Cave level 1
-npc: npc/new_2-1-cave1/miners.txt
-npc: npc/new_2-1-cave1/monsters.txt
-npc: npc/new_2-1-cave1/passages.txt
-
-// new_3-1 Tulimshar
-npc: npc/new_3-1-tulimshar/banker.txt
-npc: npc/new_3-1-tulimshar/barber.txt
-npc: npc/new_3-1-tulimshar/bard.txt
-npc: npc/new_3-1-tulimshar/bleacher.txt
-npc: npc/new_3-1-tulimshar/children.txt
-npc: npc/new_3-1-tulimshar/constable.txt
-npc: npc/new_3-1-tulimshar/elanore.txt
-npc: npc/new_3-1-tulimshar/guards.txt
-npc: npc/new_3-1-tulimshar/guide.txt
-npc: npc/new_3-1-tulimshar/man.txt
-npc: npc/new_3-1-tulimshar/merchant.txt
-npc: npc/new_3-1-tulimshar/monster_guide.txt
-npc: npc/new_3-1-tulimshar/monsters.txt
-npc: npc/new_3-1-tulimshar/passages.txt
-npc: npc/new_3-1-tulimshar/rewards_master.txt
-npc: npc/new_3-1-tulimshar/rules.txt
-npc: npc/new_3-1-tulimshar/sandra.txt
-npc: npc/new_3-1-tulimshar/vincent.txt
-npc: npc/new_3-1-tulimshar/soul-menhir.txt
-npc: npc/new_3-1-tulimshar/workers.txt
-
-// new_4-1 Small bat cave
-npc: npc/new_4-1-cave-small/hermit.txt
-npc: npc/new_4-1-cave-small/monsters.txt
-npc: npc/new_4-1-cave-small/passages.txt
-
-// new_5-1 Cave level 2 (Underground Palace)
-npc: npc/new_5-1-cave2/chest.txt
-npc: npc/new_5-1-cave2/monsters.txt
-npc: npc/new_5-1-cave2/passages.txt
-
-// new_6-1 Arena
-npc: npc/new_6-1-arena/guards.txt
-npc: npc/new_6-1-arena/monsters.txt
-npc: npc/new_6-1-arena/pvpflag.txt
-
-// new_7-1 Eastern desert
-npc: npc/new_7-1-eastern-desert/monsters.txt
-npc: npc/new_7-1-eastern-desert/passages.txt
-npc: npc/new_7-1-eastern-desert/npcs.txt
-
-// new_8-1 Tulimshar indoor
-npc: npc/new_8-1-tulimshar/casino.txt
-npc: npc/new_8-1-tulimshar/omar.txt
-npc: npc/new_8-1-tulimshar/passages.txt
-npc: npc/new_8-1-tulimshar/phaet.txt
-npc: npc/new_8-1-tulimshar/shops.txt
-npc: npc/new_8-1-tulimshar/troupe_leader.txt
-
-// new_9-1 Woodland
-npc: npc/new_9-1-woodland/alchemist.txt
-npc: npc/new_9-1-woodland/monsters.txt
-npc: npc/new_9-1-woodland/passages.txt
-npc: npc/new_9-1-woodland/oscar.txt
-
-// new_10-1 Xmas snow map
-npc: npc/new_10-1-xmas/monsters.txt
-npc: npc/new_10-1-xmas/passages.txt
-// npc: npc/new_10-1-xmas/santa.txt
-npc: npc/new_10-1-xmas/snowman.txt
-npc: npc/new_10-1-xmas/taro.txt
-
-// new_11-1 Snow village
-// npc: npc/new_11-1-snow-village/monsters.txt
-npc: npc/new_11-1-snow-village/sexchanger.txt
-npc: npc/new_11-1-snow-village/startrek.txt
-npc: npc/new_11-1-snow-village/passages.txt
-npc: npc/new_11-1-snow-village/soul-menhir.txt
-npc: npc/new_11-1-snow-village/amrak.txt
-
-// new_12-1 Ice cave
-npc: npc/new_12-1-ice-cave/monsters.txt
-npc: npc/new_12-1-ice-cave/passages.txt
-
-// new_13-1 Snow village shops.
-npc: npc/new_13-1-snow-village-shops/shops.txt
-npc: npc/new_13-1-snow-village-shops/passages.txt
-npc: npc/new_13-1-snow-village-shops/furquest.txt
-
-// new_14-1 South-woodland
-npc: npc/new_14-1-south-woodland/monsters.txt
-npc: npc/new_14-1-south-woodland/passages.txt
-
-// new_15-1 Woodland-desert link
-npc: npc/new_15-1-woodland-desert/monsters.txt
-npc: npc/new_15-1-woodland-desert/passages.txt
-
-// new_16-1 South-west woodland
-npc: npc/new_16-1-south-east-woodland/monsters.txt
-npc: npc/new_16-1-south-east-woodland/passages.txt
-
-// new_17-1 Big cave
-npc: npc/new_17-1-cave-big/monsters.txt
-npc: npc/new_17-1-cave-big/passages.txt
-
-// new_18-1 Woodland village surroundings
-npc: npc/new_18-1-woodland-village/monsters.txt
-npc: npc/new_18-1-woodland-village/passages.txt
-npc: npc/new_18-1-woodland-village/george.txt
-npc: npc/new_18-1-woodland-village/hinnak.txt
-
-// new_19-1 Woodland village
-npc: npc/new_19-1-woodland-village/jack.txt
-npc: npc/new_19-1-woodland-village/milly.txt
-npc: npc/new_19-1-woodland-village/old_man.txt
-npc: npc/new_19-1-woodland-village/old_woman.txt
-npc: npc/new_19-1-woodland-village/passages.txt
-npc: npc/new_19-1-woodland-village/sabine.txt
-npc: npc/new_19-1-woodland-village/soul-menhir.txt
-
-// new_20-1 Woodland village indoor
-npc: npc/new_20-1-woodland-village/alan.txt
-npc: npc/new_20-1-woodland-village/doctor.txt
-npc: npc/new_20-1-woodland-village/drunks.txt
-npc: npc/new_20-1-woodland-village/inspector.txt
-npc: npc/new_20-1-woodland-village/kfahr.txt
-npc: npc/new_20-1-woodland-village/misc.txt
-npc: npc/new_20-1-woodland-village/nicholas.txt
-npc: npc/new_20-1-woodland-village/nurse.txt
-npc: npc/new_20-1-woodland-village/passages.txt
-npc: npc/new_20-1-woodland-village/richard.txt
-npc: npc/new_20-1-woodland-village/selim.txt
-npc: npc/new_20-1-woodland-village/shops.txt
-npc: npc/new_20-1-woodland-village/waitress.txt
-
-// new_21-1 Ice cave 2
-npc: npc/new_21-1-ice-cave2/monsters.txt
-npc: npc/new_21-1-ice-cave2/passages.txt
-
-// new_22-1 Snake cave
-npc: npc/new_22-1-snake-cave/monsters.txt
-npc: npc/new_22-1-snake-cave/passages.txt
-
-// new_23-1 Dimonds Cove
-npc: npc/new_23-1-dimonds-cove/passages.txt
-npc: npc/new_23-1-dimonds-cove/dimonds.txt
-npc: npc/new_23-1-dimonds-cove/doug.txt
-npc: npc/new_23-1-dimonds-cove/loratay.txt
-npc: npc/new_23-1-dimonds-cove/workers.txt
-
-// new_24-1 Eastern desert mountain passage
-npc: npc/new_24-1-eastern-desert-mountain-passage/mika.txt
-npc: npc/new_24-1-eastern-desert-mountain-passage/monsters.txt
-npc: npc/new_24-1-eastern-desert-mountain-passage/pachua.txt
-npc: npc/new_24-1-eastern-desert-mountain-passage/passages.txt
-
-// new_25-1 Eastern desert cave
-npc: npc/new_25-1-eastern-desert-cave/monsters.txt
-npc: npc/new_25-1-eastern-desert-cave/passages.txt
-
-// new_26-1 Forest Hill 1
-npc: npc/new_26-1-hill1/monsters.txt
-npc: npc/new_26-1-hill1/passages.txt
-npc: npc/new_26-1-hill1/shops.txt
-
-// new_27-1 Forest Hill 2 (Cave)
-npc: npc/new_27-1-hill2/monsters.txt
-npc: npc/new_27-1-hill2/passages.txt
-
-// new_28-1 Forest east of map 26
-npc: npc/new_28-1-hillwest/passages.txt
-npc: npc/new_28-1-hillwest/monsters.txt
-
-// new_29-1 Forest west of map 9
-npc: npc/new_29-1-west-woodland/passages.txt
-npc: npc/new_29-1-west-woodland/monsters.txt
-npc: npc/new_29-1-west-woodland/taro.txt
-npc: npc/new_29-1-west-woodland/wedding-officiator.txt
-
-// new_30-1 Caves for map 29
-npc: npc/new_30-1-west-woodland-cave/passages.txt
-npc: npc/new_30-1-west-woodland-cave/monsters.txt
-
-// new_31-1 Forest west of map 14
-npc: npc/new_31-1-southwest-woodland/passages.txt
-npc: npc/new_31-1-southwest-woodland/monsters.txt
-npc: npc/new_31-1-southwest-woodland/alice.txt
-
-// new_32-1 Forest south of map 14
-npc: npc/new_32-1-south-woodland-2/passages.txt
-npc: npc/new_32-1-south-woodland-2/monsters.txt
-
-// new_33-1 Forest north of map 28
-npc: npc/new_33-1-hill-northwest/passages.txt
-npc: npc/new_33-1-hill-northwest/monsters.txt
-
-// new_34-1 Beach west of Tulimshar
-npc: npc/new_34-1-north-beach/passages.txt
-npc: npc/new_34-1-north-beach/monsters.txt
-
-// new_35-1 Cave beneath Hurnscald
-npc: npc/new_35-1-woodland-village/passages.txt
-npc: npc/new_35-1-woodland-village/monsters.txt
-
-// new_36-1 Magic house in forest 28
-npc: npc/new_36-1-magic-house/passages.txt
-npc: npc/new_36-1-magic-house/wizard.txt
-npc: npc/new_36-1-magic-house/apprentice.txt
-npc: npc/new_36-1-magic-house/notes.txt
-
-// new_37-1 Mine north of Hurnscald
-npc: npc/new_37-1-woodland-mine/miners.txt
-npc: npc/new_37-1-woodland-mine/monsters.txt
-npc: npc/new_37-1-woodland-mine/passages.txt
-
-// new_38-1 Mines north of Hurnscald (indoor)
-npc: npc/new_38-1-woodland-mine/angus.txt
-npc: npc/new_38-1-woodland-mine/books.txt
-npc: npc/new_38-1-woodland-mine/caul.txt
-npc: npc/new_38-1-woodland-mine/miners.txt
-npc: npc/new_38-1-woodland-mine/monsters.txt
-npc: npc/new_38-1-woodland-mine/passages.txt
-npc: npc/new_38-1-woodland-mine/receptionist.txt
-
-// Christmas 2006
-// npc: npc/xmas/xmas1.txt
-// npc: npc/xmas/xmas2.txt
-// npc: npc/xmas/xmas3.txt
-// npc: npc/xmas/xmas4.txt
-// npc: npc/xmas/xmas5.txt
-// npc: npc/xmas/xmas6.txt
-// npc: npc/xmas/xmas7.txt
-// npc: npc/xmas/xmas8.txt
-// npc: npc/xmas/xmas9.txt
-// npc: npc/xmas/xmas10.txt
-// npc: npc/xmas/xmas11.txt
-// npc: npc/xmas/xmas12.txt
-// npc: npc/xmas/xmas13.txt
-// npc: npc/xmas/xmas14.txt
-// npc: npc/xmas/xmas15.txt
-// npc: npc/xmas/xmas16.txt
-// npc: npc/xmas/xmas17.txt
-// npc: npc/xmas/xmas18.txt
-// npc: npc/xmas/xmas19.txt
-// npc: npc/xmas/xmas20.txt
-
-// Halloween 2007
-// npc: npc/halloween/2007/monsters.txt
-// npc: npc/halloween/2007/summon.txt
-
-// Christmas 2007
-// npc: npc/xmas2007/pre-xmas.txt
-// npc: npc/xmas2007/after-xmas.txt
-
-// Easter 2008
-// npc: npc/easter2008/monsters.txt
-// npc: npc/easter2008/npc.txt
-
-// Halloween 2008
-// npc: npc/halloween/2008/monsters.txt
-// npc: npc/halloween/2008/prize_master.txt
+import: npc/scripts.conf
 
 // local settings for this server in this file
 import: conf/map_local.conf
diff --git a/conf/map_local.conf.example b/conf/map_local.conf.example
index 42e98bce..0f09bf59 100644
--- a/conf/map_local.conf.example
+++ b/conf/map_local.conf.example
@@ -13,14 +13,3 @@ char_port: 6122
 map_ip:81.161.192.4
 // Map Server Port
 map_port: 5122
-
-// Database autosave time, in seconds.
-autosave_time: 60
-
-// Message of the day file, when a character logs on, this message is displayed.
-motd_txt: conf/motd.txt
-
-// When @help or @h is typed when you are a gm, this is displayed for helping new gms understand gm commands.
-help_txt: conf/help.txt
-
-mapreg_txt: save/mapreg.txt
diff --git a/data/new_1-1.wlk b/data/new_1-1.wlk
deleted file mode 100644
index 871a2267..00000000
--- a/data/new_1-1.wlk
+++ /dev/null
diff --git a/data/new_10-1.wlk b/data/new_10-1.wlk
deleted file mode 100644
index 9ac1927c..00000000
--- a/data/new_10-1.wlk
+++ /dev/null
diff --git a/data/new_11-1.wlk b/data/new_11-1.wlk
deleted file mode 100644
index f3119594..00000000
--- a/data/new_11-1.wlk
+++ /dev/null
diff --git a/data/new_12-1.wlk b/data/new_12-1.wlk
deleted file mode 100644
index 7b7f6c25..00000000
--- a/data/new_12-1.wlk
+++ /dev/null
diff --git a/data/new_13-1.wlk b/data/new_13-1.wlk
deleted file mode 100644
index b51db172..00000000
--- a/data/new_13-1.wlk
+++ /dev/null
diff --git a/data/new_14-1.wlk b/data/new_14-1.wlk
deleted file mode 100644
index 6311da10..00000000
--- a/data/new_14-1.wlk
+++ /dev/null
diff --git a/data/new_15-1.wlk b/data/new_15-1.wlk
deleted file mode 100644
index 3ba9d269..00000000
--- a/data/new_15-1.wlk
+++ /dev/null
diff --git a/data/new_16-1.wlk b/data/new_16-1.wlk
deleted file mode 100644
index 768cf1c4..00000000
--- a/data/new_16-1.wlk
+++ /dev/null
diff --git a/data/new_17-1.wlk b/data/new_17-1.wlk
deleted file mode 100644
index 8796a8f4..00000000
--- a/data/new_17-1.wlk
+++ /dev/null
diff --git a/data/new_18-1.wlk b/data/new_18-1.wlk
deleted file mode 100644
index b011a566..00000000
--- a/data/new_18-1.wlk
+++ /dev/null
diff --git a/data/new_19-1.wlk b/data/new_19-1.wlk
deleted file mode 100644
index 51e508fa..00000000
--- a/data/new_19-1.wlk
+++ /dev/null
diff --git a/data/new_2-1.wlk b/data/new_2-1.wlk
deleted file mode 100644
index 5abd252f..00000000
--- a/data/new_2-1.wlk
+++ /dev/null
diff --git a/data/new_20-1.wlk b/data/new_20-1.wlk
deleted file mode 100644
index 596bb0e3..00000000
--- a/data/new_20-1.wlk
+++ /dev/null
diff --git a/data/new_21-1.wlk b/data/new_21-1.wlk
deleted file mode 100644
index e2a1852c..00000000
--- a/data/new_21-1.wlk
+++ /dev/null
diff --git a/data/new_22-1.wlk b/data/new_22-1.wlk
deleted file mode 100644
index f3c047db..00000000
--- a/data/new_22-1.wlk
+++ /dev/null
diff --git a/data/new_23-1.wlk b/data/new_23-1.wlk
deleted file mode 100644
index f2cfcd6c..00000000
--- a/data/new_23-1.wlk
+++ /dev/null
diff --git a/data/new_24-1.wlk b/data/new_24-1.wlk
deleted file mode 100644
index 39bc32a1..00000000
--- a/data/new_24-1.wlk
+++ /dev/null
diff --git a/data/new_25-1.wlk b/data/new_25-1.wlk
deleted file mode 100644
index d635df84..00000000
--- a/data/new_25-1.wlk
+++ /dev/null
diff --git a/data/new_26-1.wlk b/data/new_26-1.wlk
deleted file mode 100644
index 79ad3078..00000000
--- a/data/new_26-1.wlk
+++ /dev/null
diff --git a/data/new_27-1.wlk b/data/new_27-1.wlk
deleted file mode 100644
index d485cd87..00000000
--- a/data/new_27-1.wlk
+++ /dev/null
diff --git a/data/new_28-1.wlk b/data/new_28-1.wlk
deleted file mode 100644
index 2c925d89..00000000
--- a/data/new_28-1.wlk
+++ /dev/null
diff --git a/data/new_29-1.wlk b/data/new_29-1.wlk
deleted file mode 100644
index 34a98185..00000000
--- a/data/new_29-1.wlk
+++ /dev/null
diff --git a/data/new_3-1.wlk b/data/new_3-1.wlk
deleted file mode 100644
index 05b6c7aa..00000000
--- a/data/new_3-1.wlk
+++ /dev/null
diff --git a/data/new_30-1.wlk b/data/new_30-1.wlk
deleted file mode 100644
index bcdaa8c5..00000000
--- a/data/new_30-1.wlk
+++ /dev/null
diff --git a/data/new_31-1.wlk b/data/new_31-1.wlk
deleted file mode 100644
index f3e7bbc9..00000000
--- a/data/new_31-1.wlk
+++ /dev/null
diff --git a/data/new_32-1.wlk b/data/new_32-1.wlk
deleted file mode 100644
index 2d4f1bbf..00000000
--- a/data/new_32-1.wlk
+++ /dev/null
diff --git a/data/new_33-1.wlk b/data/new_33-1.wlk
deleted file mode 100644
index 7632b813..00000000
--- a/data/new_33-1.wlk
+++ /dev/null
diff --git a/data/new_34-1.wlk b/data/new_34-1.wlk
deleted file mode 100644
index 68d9c716..00000000
--- a/data/new_34-1.wlk
+++ /dev/null
diff --git a/data/new_35-1.wlk b/data/new_35-1.wlk
deleted file mode 100644
index 1336606f..00000000
--- a/data/new_35-1.wlk
+++ /dev/null
diff --git a/data/new_36-1.wlk b/data/new_36-1.wlk
deleted file mode 100644
index c6c06b31..00000000
--- a/data/new_36-1.wlk
+++ /dev/null
diff --git a/data/new_37-1.wlk b/data/new_37-1.wlk
deleted file mode 100644
index 7a62dc2e..00000000
--- a/data/new_37-1.wlk
+++ /dev/null
diff --git a/data/new_38-1.wlk b/data/new_38-1.wlk
deleted file mode 100644
index b80a18a8..00000000
--- a/data/new_38-1.wlk
+++ /dev/null
diff --git a/data/new_4-1.wlk b/data/new_4-1.wlk
deleted file mode 100644
index a1e039c4..00000000
--- a/data/new_4-1.wlk
+++ /dev/null
diff --git a/data/new_5-1.wlk b/data/new_5-1.wlk
deleted file mode 100644
index 2e2e7b75..00000000
--- a/data/new_5-1.wlk
+++ /dev/null
diff --git a/data/new_6-1.wlk b/data/new_6-1.wlk
deleted file mode 100644
index 4a9cd117..00000000
--- a/data/new_6-1.wlk
+++ /dev/null
diff --git a/data/new_7-1.wlk b/data/new_7-1.wlk
deleted file mode 100644
index fe816a52..00000000
--- a/data/new_7-1.wlk
+++ /dev/null
diff --git a/data/new_8-1.wlk b/data/new_8-1.wlk
deleted file mode 100644
index 0a762e12..00000000
--- a/data/new_8-1.wlk
+++ /dev/null
diff --git a/data/new_9-1.wlk b/data/new_9-1.wlk
deleted file mode 100644
index 2fa117b4..00000000
--- a/data/new_9-1.wlk
+++ /dev/null
diff --git a/data/resnametable.txt b/data/resnametable.txt
index 7b4ae334..8815b378 100644
--- a/data/resnametable.txt
+++ b/data/resnametable.txt
@@ -1,39 +1,41 @@
-new_1-1.gat#new_1-1.wlk#
-new_2-1.gat#new_2-1.wlk#
-new_3-1.gat#new_3-1.wlk#
-new_4-1.gat#new_4-1.wlk#
-new_5-1.gat#new_5-1.wlk#
-new_6-1.gat#new_6-1.wlk#
-new_7-1.gat#new_7-1.wlk#
-new_8-1.gat#new_8-1.wlk#
-new_9-1.gat#new_9-1.wlk#
-new_10-1.gat#new_10-1.wlk#
-new_11-1.gat#new_11-1.wlk#
-new_12-1.gat#new_12-1.wlk#
-new_13-1.gat#new_13-1.wlk#
-new_14-1.gat#new_14-1.wlk#
-new_15-1.gat#new_15-1.wlk#
-new_16-1.gat#new_16-1.wlk#
-new_17-1.gat#new_17-1.wlk#
-new_18-1.gat#new_18-1.wlk#
-new_19-1.gat#new_19-1.wlk#
-new_20-1.gat#new_20-1.wlk#
-new_21-1.gat#new_21-1.wlk#
-new_22-1.gat#new_22-1.wlk#
-new_23-1.gat#new_23-1.wlk#
-new_24-1.gat#new_24-1.wlk#
-new_25-1.gat#new_25-1.wlk#
-new_26-1.gat#new_26-1.wlk#
-new_27-1.gat#new_27-1.wlk#
-new_28-1.gat#new_28-1.wlk#
-new_29-1.gat#new_29-1.wlk#
-new_30-1.gat#new_30-1.wlk#
-new_31-1.gat#new_31-1.wlk#
-new_32-1.gat#new_32-1.wlk#
-new_33-1.gat#new_33-1.wlk#
-new_34-1.gat#new_34-1.wlk#
-new_35-1.gat#new_35-1.wlk#
-new_36-1.gat#new_36-1.wlk#
-new_37-1.gat#new_37-1.wlk#
-new_38-1.gat#new_38-1.wlk#
-new_39-1.gat#new_39-1.wlk#
+#001-1.gat#001-1.wlk#
+#001-2.gat#001-2.wlk#
+#001-3.gat#001-3.wlk#
+#002-1.gat#002-1.wlk#
+#002-2.gat#002-2.wlk#
+#002-3.gat#002-3.wlk#
+#002-4.gat#002-4.wlk#
+#003-1.gat#003-1.wlk#
+#004-1.gat#004-1.wlk#
+#005-1.gat#005-1.wlk#
+#005-3.gat#005-3.wlk#
+#006-1.gat#006-1.wlk#
+#006-3.gat#006-3.wlk#
+#007-1.gat#007-1.wlk#
+#008-1.gat#008-1.wlk#
+#009-1.gat#009-1.wlk#
+#009-2.gat#009-2.wlk#
+#009-3.gat#009-3.wlk#
+#010-1.gat#010-1.wlk#
+#010-2.gat#010-2.wlk#
+#011-1.gat#011-1.wlk#
+#011-3.gat#011-3.wlk#
+#011-4.gat#011-4.wlk#
+#012-1.gat#012-1.wlk#
+#012-3.gat#012-3.wlk#
+#013-1.gat#013-1.wlk#
+#013-2.gat#013-2.wlk#
+#013-3.gat#013-3.wlk#
+#014-1.gat#014-1.wlk#
+#014-3.gat#014-3.wlk#
+#015-1.gat#015-1.wlk#
+#016-1.gat#016-1.wlk#
+#017-1.gat#017-1.wlk#
+#018-1.gat#018-1.wlk#
+#018-2.gat#018-2.wlk#
+#018-3.gat#018-3.wlkv
+#019-1.gat#019-1.wlk#
+#020-1.gat#020-1.wlk#
+#020-2.gat#020-2.wlk#
+#020-3.gat#020-3.wlk#
+#020-4.gat#020-4.wlk#
diff --git a/npc/001-1_Tulimshar/_import.txt b/npc/001-1_Tulimshar/_import.txt
new file mode 100644
index 00000000..7c475922
--- /dev/null
+++ b/npc/001-1_Tulimshar/_import.txt
@@ -0,0 +1,22 @@
+map: 001-1.gat
+npc: npc/001-1_Tulimshar/workers.txt
+npc: npc/001-1_Tulimshar/vincent.txt
+npc: npc/001-1_Tulimshar/soul-menhir.txt
+npc: npc/001-1_Tulimshar/sandra.txt
+npc: npc/001-1_Tulimshar/rules.txt
+npc: npc/001-1_Tulimshar/rewards_master.txt
+npc: npc/001-1_Tulimshar/monsters.txt
+npc: npc/001-1_Tulimshar/monster_guide.txt
+npc: npc/001-1_Tulimshar/merchant.txt
+npc: npc/001-1_Tulimshar/man.txt
+npc: npc/001-1_Tulimshar/guide.txt
+npc: npc/001-1_Tulimshar/guards.txt
+npc: npc/001-1_Tulimshar/elanore.txt
+npc: npc/001-1_Tulimshar/constable.txt
+npc: npc/001-1_Tulimshar/children.txt
+npc: npc/001-1_Tulimshar/bleacher.txt
+npc: npc/001-1_Tulimshar/bard.txt
+npc: npc/001-1_Tulimshar/barber.txt
+npc: npc/001-1_Tulimshar/banker.txt
+npc: npc/001-1_Tulimshar/_warps.txt
+npc: npc/001-1_Tulimshar/_mobs.txt
diff --git a/npc/001-1_Tulimshar/_mobs.txt b/npc/001-1_Tulimshar/_mobs.txt
new file mode 100644
index 00000000..db1ae2e8
--- /dev/null
+++ b/npc/001-1_Tulimshar/_mobs.txt
@@ -0,0 +1,7 @@
+// 001-1 Tulimshar mobs
+
+
+
+001-1.gat,0,0,0	script	Mob001-1	-1,{
+	end;
+}
diff --git a/npc/001-1_Tulimshar/_warps.txt b/npc/001-1_Tulimshar/_warps.txt
new file mode 100644
index 00000000..7e8af69d
--- /dev/null
+++ b/npc/001-1_Tulimshar/_warps.txt
@@ -0,0 +1,5 @@
+// 001-1 Tulimshar warps
+
+001-1.gat,44,88	warp	ToSandstorm	3,-1,002-1.gat,58,17
+001-1.gat,32,71	warp	ToInn	-1,-1,001-2.gat,25,34
+001-1.gat,75,41	warp	ToHouse	-1,-1,001-2.gat,71,72
diff --git a/npc/new_3-1-tulimshar/banker.txt b/npc/001-1_Tulimshar/banker.txt
index 9431f5cc..9431f5cc 100644
--- a/npc/new_3-1-tulimshar/banker.txt
+++ b/npc/001-1_Tulimshar/banker.txt
diff --git a/npc/new_3-1-tulimshar/barber.txt b/npc/001-1_Tulimshar/barber.txt
index bd6b148e..bd6b148e 100644
--- a/npc/new_3-1-tulimshar/barber.txt
+++ b/npc/001-1_Tulimshar/barber.txt
diff --git a/npc/new_3-1-tulimshar/bard.txt b/npc/001-1_Tulimshar/bard.txt
index dcb56424..dcb56424 100644
--- a/npc/new_3-1-tulimshar/bard.txt
+++ b/npc/001-1_Tulimshar/bard.txt
diff --git a/npc/new_3-1-tulimshar/bleacher.txt b/npc/001-1_Tulimshar/bleacher.txt
index 6a15e273..6a15e273 100644
--- a/npc/new_3-1-tulimshar/bleacher.txt
+++ b/npc/001-1_Tulimshar/bleacher.txt
diff --git a/npc/new_3-1-tulimshar/children.txt b/npc/001-1_Tulimshar/children.txt
index 40efb233..40efb233 100644
--- a/npc/new_3-1-tulimshar/children.txt
+++ b/npc/001-1_Tulimshar/children.txt
diff --git a/npc/new_3-1-tulimshar/constable.txt b/npc/001-1_Tulimshar/constable.txt
index 673ff0a0..673ff0a0 100644
--- a/npc/new_3-1-tulimshar/constable.txt
+++ b/npc/001-1_Tulimshar/constable.txt
diff --git a/npc/new_3-1-tulimshar/elanore.txt b/npc/001-1_Tulimshar/elanore.txt
index cc474ca0..cc474ca0 100644
--- a/npc/new_3-1-tulimshar/elanore.txt
+++ b/npc/001-1_Tulimshar/elanore.txt
diff --git a/npc/new_3-1-tulimshar/guards.txt b/npc/001-1_Tulimshar/guards.txt
index 158a00a1..158a00a1 100644
--- a/npc/new_3-1-tulimshar/guards.txt
+++ b/npc/001-1_Tulimshar/guards.txt
diff --git a/npc/new_3-1-tulimshar/guide.txt b/npc/001-1_Tulimshar/guide.txt
index b1458919..b1458919 100644
--- a/npc/new_3-1-tulimshar/guide.txt
+++ b/npc/001-1_Tulimshar/guide.txt
diff --git a/npc/new_3-1-tulimshar/man.txt b/npc/001-1_Tulimshar/man.txt
index f2638a51..f2638a51 100644
--- a/npc/new_3-1-tulimshar/man.txt
+++ b/npc/001-1_Tulimshar/man.txt
diff --git a/npc/new_3-1-tulimshar/merchant.txt b/npc/001-1_Tulimshar/merchant.txt
index 186365d6..186365d6 100644
--- a/npc/new_3-1-tulimshar/merchant.txt
+++ b/npc/001-1_Tulimshar/merchant.txt
diff --git a/npc/new_3-1-tulimshar/monster_guide.txt b/npc/001-1_Tulimshar/monster_guide.txt
index 3b2d8b6f..3b2d8b6f 100644
--- a/npc/new_3-1-tulimshar/monster_guide.txt
+++ b/npc/001-1_Tulimshar/monster_guide.txt
diff --git a/npc/new_3-1-tulimshar/monsters.txt b/npc/001-1_Tulimshar/monsters.txt
index 1a17628f..1a17628f 100644
--- a/npc/new_3-1-tulimshar/monsters.txt
+++ b/npc/001-1_Tulimshar/monsters.txt
diff --git a/npc/new_3-1-tulimshar/rewards_master.txt b/npc/001-1_Tulimshar/rewards_master.txt
index 9c0ddb43..9c0ddb43 100644
--- a/npc/new_3-1-tulimshar/rewards_master.txt
+++ b/npc/001-1_Tulimshar/rewards_master.txt
diff --git a/npc/new_3-1-tulimshar/rules.txt b/npc/001-1_Tulimshar/rules.txt
index 70917804..70917804 100644
--- a/npc/new_3-1-tulimshar/rules.txt
+++ b/npc/001-1_Tulimshar/rules.txt
diff --git a/npc/new_3-1-tulimshar/sandra.txt b/npc/001-1_Tulimshar/sandra.txt
index 4922bd60..4922bd60 100644
--- a/npc/new_3-1-tulimshar/sandra.txt
+++ b/npc/001-1_Tulimshar/sandra.txt
diff --git a/npc/new_3-1-tulimshar/soul-menhir.txt b/npc/001-1_Tulimshar/soul-menhir.txt
index 147ed63d..147ed63d 100644
--- a/npc/new_3-1-tulimshar/soul-menhir.txt
+++ b/npc/001-1_Tulimshar/soul-menhir.txt
diff --git a/npc/new_3-1-tulimshar/vincent.txt b/npc/001-1_Tulimshar/vincent.txt
index 4e2a0926..4e2a0926 100644
--- a/npc/new_3-1-tulimshar/vincent.txt
+++ b/npc/001-1_Tulimshar/vincent.txt
diff --git a/npc/new_3-1-tulimshar/workers.txt b/npc/001-1_Tulimshar/workers.txt
index 31c6afa3..31c6afa3 100644
--- a/npc/new_3-1-tulimshar/workers.txt
+++ b/npc/001-1_Tulimshar/workers.txt
diff --git a/npc/001-2_Tulimshar/_import.txt b/npc/001-2_Tulimshar/_import.txt
new file mode 100644
index 00000000..15ecfe64
--- /dev/null
+++ b/npc/001-2_Tulimshar/_import.txt
@@ -0,0 +1,8 @@
+map: 001-2.gat
+npc: npc/001-2_Tulimshar/troupe_leader.txt
+npc: npc/001-2_Tulimshar/shops.txt
+npc: npc/001-2_Tulimshar/phaet.txt
+npc: npc/001-2_Tulimshar/omar.txt
+npc: npc/001-2_Tulimshar/casino.txt
+npc: npc/001-2_Tulimshar/_warps.txt
+npc: npc/001-2_Tulimshar/_mobs.txt
diff --git a/npc/001-2_Tulimshar/_mobs.txt b/npc/001-2_Tulimshar/_mobs.txt
new file mode 100644
index 00000000..afe32cd5
--- /dev/null
+++ b/npc/001-2_Tulimshar/_mobs.txt
@@ -0,0 +1,7 @@
+// 001-2 Tulimshar mobs
+
+
+
+001-2.gat,0,0,0	script	Mob001-2	-1,{
+	end;
+}
diff --git a/npc/001-2_Tulimshar/_warps.txt b/npc/001-2_Tulimshar/_warps.txt
new file mode 100644
index 00000000..87d2254d
--- /dev/null
+++ b/npc/001-2_Tulimshar/_warps.txt
@@ -0,0 +1,13 @@
+// 001-2 Tulimshar warps
+
+001-2.gat,25,35	warp	ToOutside	-1,-1,001-1.gat,32,72
+001-2.gat,23,24	warp	ToArena	-1,0,001-3.gat,72,31
+001-2.gat,44,25	warp	To2ndFloor	-1,0,001-2.gat,65,25
+001-2.gat,64,25	warp	To1stFloor	-1,-1,001-2.gat,42,25
+001-2.gat,67,30	warp	ToBedroom	-1,-1,001-2.gat,102,23
+001-2.gat,76,30	warp	ToDeposit	-1,-1,001-2.gat,130,23
+001-2.gat,69,22	warp	ToCasino	0,-1,001-2.gat,32,72
+001-2.gat,103,22	warp	To2ndFloor	0,-1,001-2.gat,67,29
+001-2.gat,131,22	warp	To2ndFloor	0,-1,001-2.gat,76,29
+001-2.gat,32,73	warp	To2ndFloor	-1,-1,001-2.gat,68,23
+001-2.gat,71,73	warp	ToOutdoor	-1,-1,001-1.gat,75,42
diff --git a/npc/new_8-1-tulimshar/casino.txt b/npc/001-2_Tulimshar/casino.txt
index 58f99ea5..58f99ea5 100644
--- a/npc/new_8-1-tulimshar/casino.txt
+++ b/npc/001-2_Tulimshar/casino.txt
diff --git a/npc/new_8-1-tulimshar/omar.txt b/npc/001-2_Tulimshar/omar.txt
index 25865e5f..25865e5f 100644
--- a/npc/new_8-1-tulimshar/omar.txt
+++ b/npc/001-2_Tulimshar/omar.txt
diff --git a/npc/new_8-1-tulimshar/phaet.txt b/npc/001-2_Tulimshar/phaet.txt
index 4cc13e9a..4cc13e9a 100644
--- a/npc/new_8-1-tulimshar/phaet.txt
+++ b/npc/001-2_Tulimshar/phaet.txt
diff --git a/npc/new_8-1-tulimshar/shops.txt b/npc/001-2_Tulimshar/shops.txt
index 8482edd9..8482edd9 100644
--- a/npc/new_8-1-tulimshar/shops.txt
+++ b/npc/001-2_Tulimshar/shops.txt
diff --git a/npc/new_8-1-tulimshar/troupe_leader.txt b/npc/001-2_Tulimshar/troupe_leader.txt
index a602b1d2..a602b1d2 100644
--- a/npc/new_8-1-tulimshar/troupe_leader.txt
+++ b/npc/001-2_Tulimshar/troupe_leader.txt
diff --git a/npc/001-3_Tulimshar_arena/_import.txt b/npc/001-3_Tulimshar_arena/_import.txt
new file mode 100644
index 00000000..c0d05ff3
--- /dev/null
+++ b/npc/001-3_Tulimshar_arena/_import.txt
@@ -0,0 +1,6 @@
+map: 001-3.gat
+npc: npc/001-3_Tulimshar_arena/pvpflag.txt
+npc: npc/001-3_Tulimshar_arena/monsters.txt
+npc: npc/001-3_Tulimshar_arena/guards.txt
+npc: npc/001-3_Tulimshar_arena/_warps.txt
+npc: npc/001-3_Tulimshar_arena/_mobs.txt
diff --git a/npc/001-3_Tulimshar_arena/_mobs.txt b/npc/001-3_Tulimshar_arena/_mobs.txt
new file mode 100644
index 00000000..493a64ad
--- /dev/null
+++ b/npc/001-3_Tulimshar_arena/_mobs.txt
@@ -0,0 +1,7 @@
+// 001-3 Tulimshar arena mobs
+
+
+
+001-3.gat,0,0,0	script	Mob001-3	-1,{
+	end;
+}
diff --git a/npc/001-3_Tulimshar_arena/_warps.txt b/npc/001-3_Tulimshar_arena/_warps.txt
new file mode 100644
index 00000000..bd8cd0d1
--- /dev/null
+++ b/npc/001-3_Tulimshar_arena/_warps.txt
@@ -0,0 +1,3 @@
+// 001-3 Tulimshar arena warps
+
+001-3.gat,72,29	warp	ToInn	1,-1,001-2.gat,24,23
diff --git a/npc/new_6-1-arena/guards.txt b/npc/001-3_Tulimshar_arena/guards.txt
index 065ed765..065ed765 100644
--- a/npc/new_6-1-arena/guards.txt
+++ b/npc/001-3_Tulimshar_arena/guards.txt
diff --git a/npc/new_6-1-arena/monsters.txt b/npc/001-3_Tulimshar_arena/monsters.txt
index 51d72132..51d72132 100644
--- a/npc/new_6-1-arena/monsters.txt
+++ b/npc/001-3_Tulimshar_arena/monsters.txt
diff --git a/npc/new_6-1-arena/pvpflag.txt b/npc/001-3_Tulimshar_arena/pvpflag.txt
index 361e062b..361e062b 100644
--- a/npc/new_6-1-arena/pvpflag.txt
+++ b/npc/001-3_Tulimshar_arena/pvpflag.txt
diff --git a/npc/002-1_Sandstorm/_import.txt b/npc/002-1_Sandstorm/_import.txt
new file mode 100644
index 00000000..4697808e
--- /dev/null
+++ b/npc/002-1_Sandstorm/_import.txt
@@ -0,0 +1,8 @@
+map: 002-1.gat
+npc: npc/002-1_Sandstorm/rogue.txt
+npc: npc/002-1_Sandstorm/nomads.txt
+npc: npc/002-1_Sandstorm/monsters.txt
+npc: npc/002-1_Sandstorm/merchant.txt
+npc: npc/002-1_Sandstorm/dark_mage.txt
+npc: npc/002-1_Sandstorm/_warps.txt
+npc: npc/002-1_Sandstorm/_mobs.txt
diff --git a/npc/002-1_Sandstorm/_mobs.txt b/npc/002-1_Sandstorm/_mobs.txt
new file mode 100644
index 00000000..2ef2a902
--- /dev/null
+++ b/npc/002-1_Sandstorm/_mobs.txt
@@ -0,0 +1,13 @@
+// 002-1 Sandstorm mobs
+
+002-1.gat,0,0,0,0	monster	Maggot	1002,20,1000,500,Mob002-1::On1002
+
+
+002-1.gat,0,0,0	script	Mob002-1	-1,{
+On1002:
+	set @mobID, 1002;
+	callfunc "MobPoints";
+	break;
+
+	end;
+}
diff --git a/npc/002-1_Sandstorm/_warps.txt b/npc/002-1_Sandstorm/_warps.txt
new file mode 100644
index 00000000..5153e83b
--- /dev/null
+++ b/npc/002-1_Sandstorm/_warps.txt
@@ -0,0 +1,7 @@
+// 002-1 Sandstorm warps
+
+002-1.gat,58,12	warp	ToTulimshar	3,-1,001-1.gat,44,80
+002-1.gat,108,79	warp	ToEasternDesert	-1,1,005-1.gat,23,40
+002-1.gat,12,66	warp	ToWesternDesert	-1,3,003-1.gat,168,76
+002-1.gat,28,13	warp	ToBeach	1,-1,004-1.gat,84,111
+002-1.gat,20,94	warp	ToCave	-1,-1,002-3.gat,37,32
diff --git a/npc/new_1-1-western-desert/dark_mage.txt b/npc/002-1_Sandstorm/dark_mage.txt
index 1bf8df8c..1bf8df8c 100644
--- a/npc/new_1-1-western-desert/dark_mage.txt
+++ b/npc/002-1_Sandstorm/dark_mage.txt
diff --git a/npc/new_1-1-western-desert/merchant.txt b/npc/002-1_Sandstorm/merchant.txt
index d01a9164..d01a9164 100644
--- a/npc/new_1-1-western-desert/merchant.txt
+++ b/npc/002-1_Sandstorm/merchant.txt
diff --git a/npc/new_1-1-western-desert/monsters.txt b/npc/002-1_Sandstorm/monsters.txt
index a98c8406..a98c8406 100644
--- a/npc/new_1-1-western-desert/monsters.txt
+++ b/npc/002-1_Sandstorm/monsters.txt
diff --git a/npc/new_1-1-western-desert/nomads.txt b/npc/002-1_Sandstorm/nomads.txt
index 13edea35..13edea35 100644
--- a/npc/new_1-1-western-desert/nomads.txt
+++ b/npc/002-1_Sandstorm/nomads.txt
diff --git a/npc/new_1-1-western-desert/rogue.txt b/npc/002-1_Sandstorm/rogue.txt
index 87ec45fa..87ec45fa 100644
--- a/npc/new_1-1-western-desert/rogue.txt
+++ b/npc/002-1_Sandstorm/rogue.txt
diff --git a/npc/002-3_Desert_mines/_import.txt b/npc/002-3_Desert_mines/_import.txt
new file mode 100644
index 00000000..fdbfc449
--- /dev/null
+++ b/npc/002-3_Desert_mines/_import.txt
@@ -0,0 +1,4 @@
+map: 002-3.gat
+npc: npc/002-3_Desert_mines/miners.txt
+npc: npc/002-3_Desert_mines/_warps.txt
+npc: npc/002-3_Desert_mines/_mobs.txt
diff --git a/npc/002-3_Desert_mines/_mobs.txt b/npc/002-3_Desert_mines/_mobs.txt
new file mode 100644
index 00000000..63150759
--- /dev/null
+++ b/npc/002-3_Desert_mines/_mobs.txt
@@ -0,0 +1,19 @@
+// 002-3 Desert mines mobs
+
+002-3.gat,38,38,9,9	monster	Red Slime	1008,1,0,0,Mob002-3::On1008
+002-3.gat,82,92,9,9	monster	Black Scorpion	1009,1,0,0,Mob002-3::On1009
+
+
+002-3.gat,0,0,0	script	Mob002-3	-1,{
+On1008:
+	set @mobID, 1008;
+	callfunc "MobPoints";
+	break;
+
+On1009:
+	set @mobID, 1009;
+	callfunc "MobPoints";
+	break;
+
+	end;
+}
diff --git a/npc/002-3_Desert_mines/_warps.txt b/npc/002-3_Desert_mines/_warps.txt
new file mode 100644
index 00000000..8f5b51c2
--- /dev/null
+++ b/npc/002-3_Desert_mines/_warps.txt
@@ -0,0 +1,4 @@
+// 002-3 Desert mines warps
+
+002-3.gat,38,30	warp	CaveExit	2,-1,002-1.gat,25,95
+002-3.gat,68,98	warp	toLevel2	-1,-1,002-4.gat,34,98
diff --git a/npc/new_2-1-cave1/miners.txt b/npc/002-3_Desert_mines/miners.txt
index 1bbb1637..1bbb1637 100644
--- a/npc/new_2-1-cave1/miners.txt
+++ b/npc/002-3_Desert_mines/miners.txt
diff --git a/npc/002-4_Desert_mines/_import.txt b/npc/002-4_Desert_mines/_import.txt
new file mode 100644
index 00000000..e22b6c19
--- /dev/null
+++ b/npc/002-4_Desert_mines/_import.txt
@@ -0,0 +1,5 @@
+map: 002-4.gat
+npc: npc/002-4_Desert_mines/monsters.txt
+npc: npc/002-4_Desert_mines/chest.txt
+npc: npc/002-4_Desert_mines/_warps.txt
+npc: npc/002-4_Desert_mines/_mobs.txt
diff --git a/npc/002-4_Desert_mines/_mobs.txt b/npc/002-4_Desert_mines/_mobs.txt
new file mode 100644
index 00000000..ff53d9c6
--- /dev/null
+++ b/npc/002-4_Desert_mines/_mobs.txt
@@ -0,0 +1,19 @@
+// 002-4 Desert mines mobs
+
+002-4.gat,0,0,0,0	monster	Spider	1012,20,0,0,Mob002-4::On1012
+002-4.gat,0,0,0,0	monster	Yellow Slime	1007,25,0,0,Mob002-4::On1007
+
+
+002-4.gat,0,0,0	script	Mob002-4	-1,{
+On1007:
+	set @mobID, 1007;
+	callfunc "MobPoints";
+	break;
+
+On1012:
+	set @mobID, 1012;
+	callfunc "MobPoints";
+	break;
+
+	end;
+}
diff --git a/npc/002-4_Desert_mines/_warps.txt b/npc/002-4_Desert_mines/_warps.txt
new file mode 100644
index 00000000..24f71a1d
--- /dev/null
+++ b/npc/002-4_Desert_mines/_warps.txt
@@ -0,0 +1,3 @@
+// 002-4 Desert mines warps
+
+002-4.gat,34,99	warp	toLevel1	-1,-1,002-3.gat,68,99
diff --git a/npc/new_5-1-cave2/chest.txt b/npc/002-4_Desert_mines/chest.txt
index 865c0f7e..865c0f7e 100644
--- a/npc/new_5-1-cave2/chest.txt
+++ b/npc/002-4_Desert_mines/chest.txt
diff --git a/npc/new_5-1-cave2/monsters.txt b/npc/002-4_Desert_mines/monsters.txt
index 0b8f967b..0b8f967b 100644
--- a/npc/new_5-1-cave2/monsters.txt
+++ b/npc/002-4_Desert_mines/monsters.txt
diff --git a/npc/003-1_Beach/_import.txt b/npc/003-1_Beach/_import.txt
new file mode 100644
index 00000000..68474692
--- /dev/null
+++ b/npc/003-1_Beach/_import.txt
@@ -0,0 +1,4 @@
+map: 003-1.gat
+npc: npc/003-1_Beach/monsters.txt
+npc: npc/003-1_Beach/_warps.txt
+npc: npc/003-1_Beach/_mobs.txt
diff --git a/npc/003-1_Beach/_mobs.txt b/npc/003-1_Beach/_mobs.txt
new file mode 100644
index 00000000..c7daca33
--- /dev/null
+++ b/npc/003-1_Beach/_mobs.txt
@@ -0,0 +1,19 @@
+// 003-1 Beach mobs
+
+003-1.gat,117,48,19,19	monster	Black Scorpion	1009,10,0,0,Mob003-1::On1009
+003-1.gat,105,64,19,19	monster	Snake	1010,10,0,0,Mob003-1::On1010
+
+
+003-1.gat,0,0,0	script	Mob003-1	-1,{
+On1009:
+	set @mobID, 1009;
+	callfunc "MobPoints";
+	break;
+
+On1010:
+	set @mobID, 1010;
+	callfunc "MobPoints";
+	break;
+
+	end;
+}
diff --git a/npc/003-1_Beach/_warps.txt b/npc/003-1_Beach/_warps.txt
new file mode 100644
index 00000000..2358947b
--- /dev/null
+++ b/npc/003-1_Beach/_warps.txt
@@ -0,0 +1,4 @@
+// 003-1 Beach warps
+
+003-1.gat,172,77	warp	ToSandstorm	-1,3,002-1.gat,37,109
+003-1.gat,20,23	warp	ToWoodland	1,-1,007-1.gat,120,112
diff --git a/npc/new_15-1-woodland-desert/monsters.txt b/npc/003-1_Beach/monsters.txt
index 81246489..81246489 100644
--- a/npc/new_15-1-woodland-desert/monsters.txt
+++ b/npc/003-1_Beach/monsters.txt
diff --git a/npc/004-1_Beach/_import.txt b/npc/004-1_Beach/_import.txt
new file mode 100644
index 00000000..fc7c344b
--- /dev/null
+++ b/npc/004-1_Beach/_import.txt
@@ -0,0 +1,4 @@
+map: 004-1.gat
+npc: npc/004-1_Beach/monsters.txt
+npc: npc/004-1_Beach/_warps.txt
+npc: npc/004-1_Beach/_mobs.txt
diff --git a/npc/004-1_Beach/_mobs.txt b/npc/004-1_Beach/_mobs.txt
new file mode 100644
index 00000000..bc8e68a9
--- /dev/null
+++ b/npc/004-1_Beach/_mobs.txt
@@ -0,0 +1,7 @@
+// 004-1 Beach mobs
+
+
+
+004-1.gat,0,0,0	script	Mob004-1	-1,{
+	end;
+}
diff --git a/npc/004-1_Beach/_warps.txt b/npc/004-1_Beach/_warps.txt
new file mode 100644
index 00000000..b6ccc7d0
--- /dev/null
+++ b/npc/004-1_Beach/_warps.txt
@@ -0,0 +1,4 @@
+// 004-1 Beach warps
+
+004-1.gat,84,113	warp	ToSandstorm	1,-1,002-1.gat,29,15
+004-1.gat,37,111	warp	ToBeach	1,-1,003-1.gat,141,21
diff --git a/npc/new_34-1-north-beach/monsters.txt b/npc/004-1_Beach/monsters.txt
index 89fcbda7..89fcbda7 100644
--- a/npc/new_34-1-north-beach/monsters.txt
+++ b/npc/004-1_Beach/monsters.txt
diff --git a/npc/005-1_Snake_desert/_import.txt b/npc/005-1_Snake_desert/_import.txt
new file mode 100644
index 00000000..88bd9e5d
--- /dev/null
+++ b/npc/005-1_Snake_desert/_import.txt
@@ -0,0 +1,5 @@
+map: 005-1.gat
+npc: npc/005-1_Snake_desert/npcs.txt
+npc: npc/005-1_Snake_desert/monsters.txt
+npc: npc/005-1_Snake_desert/_warps.txt
+npc: npc/005-1_Snake_desert/_mobs.txt
diff --git a/npc/005-1_Snake_desert/_mobs.txt b/npc/005-1_Snake_desert/_mobs.txt
new file mode 100644
index 00000000..79d958db
--- /dev/null
+++ b/npc/005-1_Snake_desert/_mobs.txt
@@ -0,0 +1,19 @@
+// 005-1 Snake desert mobs
+
+005-1.gat,0,0,0,0	monster	Maggot	1002,1,0,0,Mob005-1::On1002
+005-1.gat,0,0,0,0	monster	Snake	1010,1,0,0,Mob005-1::On1010
+
+
+005-1.gat,0,0,0	script	Mob005-1	-1,{
+On1002:
+	set @mobID, 1002;
+	callfunc "MobPoints";
+	break;
+
+On1010:
+	set @mobID, 1010;
+	callfunc "MobPoints";
+	break;
+
+	end;
+}
diff --git a/npc/005-1_Snake_desert/_warps.txt b/npc/005-1_Snake_desert/_warps.txt
new file mode 100644
index 00000000..f21bdf8a
--- /dev/null
+++ b/npc/005-1_Snake_desert/_warps.txt
@@ -0,0 +1,18 @@
+// 005-1 Snake desert warps
+
+005-1.gat,19,41	warp	ToSandstorm	-1,2,002-1.gat,106,78
+005-1.gat,89,23	warp	ToSnakeCave	-1,-1,005-3.gat,52,34
+005-1.gat,71,75	warp	ToSnakeCave	-1,-1,005-3.gat,33,83
+005-1.gat,167,108	warp	ToDesertMountains	-1,-1,006-1.gat,20,33
+005-1.gat,168,107	warp	ToDesertMountains	-1,-1,006-1.gat,21,32
+005-1.gat,169,106	warp	ToDesertMountains	-1,-1,006-1.gat,22,31
+005-1.gat,171,104	warp	ToDesertMountains	-1,-1,006-1.gat,24,29
+005-1.gat,170,105	warp	ToDesertMountains	-1,-1,006-1.gat,23,30
+005-1.gat,172,103	warp	ToDesertMountains	-1,-1,006-1.gat,25,28
+005-1.gat,174,101	warp	ToDesertMountains	-1,-1,006-1.gat,27,26
+005-1.gat,173,102	warp	ToDesertMountains	-1,-1,006-1.gat,26,27
+005-1.gat,175,100	warp	ToDesertMountains	-1,-1,006-1.gat,28,25
+005-1.gat,176,99	warp	ToDesertMountains	-1,-1,006-1.gat,29,24
+005-1.gat,177,98	warp	ToDesertMountains	-1,-1,006-1.gat,30,23
+005-1.gat,178,97	warp	ToDesertMountains	-1,-1,006-1.gat,31,22
+005-1.gat,179,96	warp	ToDesertMountains	-1,-1,006-1.gat,32,21
diff --git a/npc/new_7-1-eastern-desert/monsters.txt b/npc/005-1_Snake_desert/monsters.txt
index c2ec4c71..c2ec4c71 100644
--- a/npc/new_7-1-eastern-desert/monsters.txt
+++ b/npc/005-1_Snake_desert/monsters.txt
diff --git a/npc/new_7-1-eastern-desert/npcs.txt b/npc/005-1_Snake_desert/npcs.txt
index 8b3d1d0a..8b3d1d0a 100644
--- a/npc/new_7-1-eastern-desert/npcs.txt
+++ b/npc/005-1_Snake_desert/npcs.txt
diff --git a/npc/005-3_Snake_pit/_import.txt b/npc/005-3_Snake_pit/_import.txt
new file mode 100644
index 00000000..b22eb36a
--- /dev/null
+++ b/npc/005-3_Snake_pit/_import.txt
@@ -0,0 +1,4 @@
+map: 005-3.gat
+npc: npc/005-3_Snake_pit/monsters.txt
+npc: npc/005-3_Snake_pit/_warps.txt
+npc: npc/005-3_Snake_pit/_mobs.txt
diff --git a/npc/005-3_Snake_pit/_mobs.txt b/npc/005-3_Snake_pit/_mobs.txt
new file mode 100644
index 00000000..c129d051
--- /dev/null
+++ b/npc/005-3_Snake_pit/_mobs.txt
@@ -0,0 +1,7 @@
+// 005-3 Snake pit mobs
+
+
+
+005-3.gat,0,0,0	script	Mob005-3	-1,{
+	end;
+}
diff --git a/npc/005-3_Snake_pit/_warps.txt b/npc/005-3_Snake_pit/_warps.txt
new file mode 100644
index 00000000..95a1e419
--- /dev/null
+++ b/npc/005-3_Snake_pit/_warps.txt
@@ -0,0 +1,4 @@
+// 005-3 Snake pit warps
+
+005-3.gat,52,33	warp	CaveExit	-1,-1,005-1.gat,89,24
+005-3.gat,33,82	warp	CaveExit	-1,-1,005-1.gat,71,76
diff --git a/npc/new_22-1-snake-cave/monsters.txt b/npc/005-3_Snake_pit/monsters.txt
index 8d88def8..8d88def8 100644
--- a/npc/new_22-1-snake-cave/monsters.txt
+++ b/npc/005-3_Snake_pit/monsters.txt
diff --git a/npc/006-1_Desert_mountains/_import.txt b/npc/006-1_Desert_mountains/_import.txt
new file mode 100644
index 00000000..607997ed
--- /dev/null
+++ b/npc/006-1_Desert_mountains/_import.txt
@@ -0,0 +1,6 @@
+map: 006-1.gat
+npc: npc/006-1_Desert_mountains/pachua.txt
+npc: npc/006-1_Desert_mountains/monsters.txt
+npc: npc/006-1_Desert_mountains/mika.txt
+npc: npc/006-1_Desert_mountains/_warps.txt
+npc: npc/006-1_Desert_mountains/_mobs.txt
diff --git a/npc/006-1_Desert_mountains/_mobs.txt b/npc/006-1_Desert_mountains/_mobs.txt
new file mode 100644
index 00000000..0225efff
--- /dev/null
+++ b/npc/006-1_Desert_mountains/_mobs.txt
@@ -0,0 +1,7 @@
+// 006-1 Desert mountains mobs
+
+
+
+006-1.gat,0,0,0	script	Mob006-1	-1,{
+	end;
+}
diff --git a/npc/006-1_Desert_mountains/_warps.txt b/npc/006-1_Desert_mountains/_warps.txt
new file mode 100644
index 00000000..6bc6e86c
--- /dev/null
+++ b/npc/006-1_Desert_mountains/_warps.txt
@@ -0,0 +1,34 @@
+// 006-1 Desert mountains warps
+
+006-1.gat,28,21	warp	ToSnakeDesert	-1,-1,005-1.gat,175,96
+006-1.gat,27,22	warp	ToSnakeDesert	-1,-1,005-1.gat,174,97
+006-1.gat,30,19	warp	ToSnakeDesert	-1,-1,005-1.gat,177,94
+006-1.gat,29,20	warp	ToSnakeDesert	-1,-1,005-1.gat,176,95
+006-1.gat,26,23	warp	ToSnakeDesert	-1,-1,005-1.gat,173,98
+006-1.gat,25,24	warp	ToSnakeDesert	-1,-1,005-1.gat,172,99
+006-1.gat,23,26	warp	ToSnakeDesert	-1,-1,005-1.gat,170,101
+006-1.gat,24,25	warp	ToSnakeDesert	-1,-1,005-1.gat,171,100
+006-1.gat,22,27	warp	ToSnakeDesert	-1,-1,005-1.gat,169,102
+006-1.gat,21,28	warp	ToSnakeDesert	-1,-1,005-1.gat,168,103
+006-1.gat,20,29	warp	ToSnakeDesert	-1,-1,005-1.gat,167,104
+006-1.gat,19,30	warp	ToSnakeDesert	-1,-1,005-1.gat,166,105
+006-1.gat,18,31	warp	ToSnakeDesert	-1,-1,005-1.gat,165,106
+006-1.gat,40,26	warp	ToDesertMountainCaves	-1,-1,006-3.gat,40,27
+006-1.gat,60,58	warp	ToDesertMountainCaves	-1,-1,006-3.gat,60,69
+006-1.gat,62,30	warp	ToDesertMountainCaves	-1,-1,006-3.gat,62,31
+006-1.gat,55,27	warp	ToDesertMountainCaves	-1,-1,006-3.gat,55,28
+006-1.gat,77,44	warp	ToDesertMountainCaves	-1,-1,006-3.gat,77,45
+006-1.gat,86,24	warp	ToDesertMountainCaves	-1,-1,006-3.gat,86,25
+006-1.gat,91,24	warp	ToDesertMountainCaves	-1,-1,006-3.gat,91,25
+006-1.gat,104,44	warp	ToDesertMountainCaves	-1,-1,006-3.gat,104,45
+006-1.gat,122,24	warp	ToDesertMountainCaves	-1,-1,006-3.gat,122,25
+006-1.gat,114,49	warp	ToDesertMountainCaves	-1,-1,006-3.gat,114,50
+006-1.gat,110,56	warp	ToDesertMountainCaves	-1,-1,006-3.gat,110,57
+006-1.gat,125,59	warp	ToDesertMountainCaves	-1,-1,006-3.gat,125,60
+006-1.gat,92,63	warp	ToDesertMountainCaves	-1,-1,006-3.gat,92,64
+006-1.gat,112,74	warp	ToDesertMountainCaves	-1,-1,006-3.gat,112,75
+006-1.gat,121,110	warp	ToDesertMountainCaves	-1,-1,006-3.gat,121,111
+006-1.gat,79,120	warp	ToDesertMountainCaves	-1,-1,006-3.gat,79,121
+006-1.gat,38,121	warp	ToDesertMountainCaves	-1,-1,006-3.gat,38,122
+006-1.gat,74,90	warp	ToDesertMountainCaves	-1,-1,006-3.gat,74,91
+006-1.gat,51,90	warp	ToDesertMountainCaves	-1,-1,006-3.gat,51,91
diff --git a/npc/new_24-1-eastern-desert-mountain-passage/mika.txt b/npc/006-1_Desert_mountains/mika.txt
index 222accde..222accde 100644
--- a/npc/new_24-1-eastern-desert-mountain-passage/mika.txt
+++ b/npc/006-1_Desert_mountains/mika.txt
diff --git a/npc/new_24-1-eastern-desert-mountain-passage/monsters.txt b/npc/006-1_Desert_mountains/monsters.txt
index 649abc39..649abc39 100644
--- a/npc/new_24-1-eastern-desert-mountain-passage/monsters.txt
+++ b/npc/006-1_Desert_mountains/monsters.txt
diff --git a/npc/new_24-1-eastern-desert-mountain-passage/pachua.txt b/npc/006-1_Desert_mountains/pachua.txt
index a40c652c..a40c652c 100644
--- a/npc/new_24-1-eastern-desert-mountain-passage/pachua.txt
+++ b/npc/006-1_Desert_mountains/pachua.txt
diff --git a/npc/006-3_Desert_mountain_caves/_import.txt b/npc/006-3_Desert_mountain_caves/_import.txt
new file mode 100644
index 00000000..90fb5864
--- /dev/null
+++ b/npc/006-3_Desert_mountain_caves/_import.txt
@@ -0,0 +1,4 @@
+map: 006-3.gat
+npc: npc/006-3_Desert_mountain_caves/monsters.txt
+npc: npc/006-3_Desert_mountain_caves/_warps.txt
+npc: npc/006-3_Desert_mountain_caves/_mobs.txt
diff --git a/npc/006-3_Desert_mountain_caves/_mobs.txt b/npc/006-3_Desert_mountain_caves/_mobs.txt
new file mode 100644
index 00000000..fd6e317b
--- /dev/null
+++ b/npc/006-3_Desert_mountain_caves/_mobs.txt
@@ -0,0 +1,7 @@
+// 006-3 Desert mountain caves mobs
+
+
+
+006-3.gat,0,0,0	script	Mob006-3	-1,{
+	end;
+}
diff --git a/npc/006-3_Desert_mountain_caves/_warps.txt b/npc/006-3_Desert_mountain_caves/_warps.txt
new file mode 100644
index 00000000..9c40defc
--- /dev/null
+++ b/npc/006-3_Desert_mountain_caves/_warps.txt
@@ -0,0 +1,20 @@
+// 006-3 Desert mountain caves warps
+
+006-3.gat,40,26	warp	CavesExit	-1,-1,006-1.gat,40,27
+006-3.gat,55,27	warp	CavesExit	-1,-1,006-1.gat,55,28
+006-3.gat,62,30	warp	CavesExit	-1,-1,006-1.gat,62,31
+006-3.gat,86,24	warp	CavesExit	-1,-1,006-1.gat,86,25
+006-3.gat,91,24	warp	CavesExit	-1,-1,006-1.gat,91,25
+006-3.gat,122,24	warp	CavesExit	-1,-1,006-1.gat,122,25
+006-3.gat,114,49	warp	CavesExit	-1,-1,006-1.gat,114,50
+006-3.gat,104,44	warp	CavesExit	-1,-1,006-1.gat,104,45
+006-3.gat,60,68	warp	CavesExit	-1,-1,006-1.gat,60,59
+006-3.gat,92,63	warp	CavesExit	-1,-1,006-1.gat,92,64
+006-3.gat,112,74	warp	CavesExit	-1,-1,006-1.gat,112,75
+006-3.gat,110,56	warp	CavesExit	-1,-1,006-1.gat,110,57
+006-3.gat,125,59	warp	CavesExit	-1,-1,006-1.gat,125,60
+006-3.gat,74,90	warp	CavesExit	-1,-1,006-1.gat,74,91
+006-3.gat,51,90	warp	CavesExit	-1,-1,006-1.gat,51,91
+006-3.gat,38,121	warp	CavesExit	-1,-1,006-1.gat,38,122
+006-3.gat,79,120	warp	CavesExit	-1,-1,006-1.gat,79,121
+006-3.gat,121,110	warp	CavesExit	-1,-1,006-1.gat,121,111
diff --git a/npc/new_25-1-eastern-desert-cave/monsters.txt b/npc/006-3_Desert_mountain_caves/monsters.txt
index b24d2e7c..b24d2e7c 100644
--- a/npc/new_25-1-eastern-desert-cave/monsters.txt
+++ b/npc/006-3_Desert_mountain_caves/monsters.txt
diff --git a/npc/007-1_Woodland/_import.txt b/npc/007-1_Woodland/_import.txt
new file mode 100644
index 00000000..946aaa92
--- /dev/null
+++ b/npc/007-1_Woodland/_import.txt
@@ -0,0 +1,4 @@
+map: 007-1.gat
+npc: npc/007-1_Woodland/monsters.txt
+npc: npc/007-1_Woodland/_warps.txt
+npc: npc/007-1_Woodland/_mobs.txt
diff --git a/npc/007-1_Woodland/_mobs.txt b/npc/007-1_Woodland/_mobs.txt
new file mode 100644
index 00000000..b4653078
--- /dev/null
+++ b/npc/007-1_Woodland/_mobs.txt
@@ -0,0 +1,19 @@
+// 007-1 Woodland mobs
+
+007-1.gat,119,66,9,9	monster	Fluffy	1020,1,0,0,Mob007-1::On1020
+007-1.gat,96,35,9,9	monster	Sleep Flower	1014,1,0,0,Mob007-1::On1014
+
+
+007-1.gat,0,0,0	script	Mob007-1	-1,{
+On1014:
+	set @mobID, 1014;
+	callfunc "MobPoints";
+	break;
+
+On1020:
+	set @mobID, 1020;
+	callfunc "MobPoints";
+	break;
+
+	end;
+}
diff --git a/npc/007-1_Woodland/_warps.txt b/npc/007-1_Woodland/_warps.txt
new file mode 100644
index 00000000..00d0b60d
--- /dev/null
+++ b/npc/007-1_Woodland/_warps.txt
@@ -0,0 +1,6 @@
+// 007-1 Woodland warps
+
+007-1.gat,120,114	warp	ToBeach	1,-1,003-1.gat,20,24
+007-1.gat,20,54	warp	ToHurnscald	-1,0,010-1.gat,127,53
+007-1.gat,69,21	warp	ToHurnscald	2,-1,008-1.gat,78,100
+007-1.gat,122,20	warp	ToHurnscald	1,-1,008-1.gat,132,98
diff --git a/npc/new_16-1-south-east-woodland/monsters.txt b/npc/007-1_Woodland/monsters.txt
index e384b02b..e384b02b 100644
--- a/npc/new_16-1-south-east-woodland/monsters.txt
+++ b/npc/007-1_Woodland/monsters.txt
diff --git a/npc/008-1_Hurnscald_outskirts/_import.txt b/npc/008-1_Hurnscald_outskirts/_import.txt
new file mode 100644
index 00000000..a734d9f3
--- /dev/null
+++ b/npc/008-1_Hurnscald_outskirts/_import.txt
@@ -0,0 +1,6 @@
+map: 008-1.gat
+npc: npc/008-1_Hurnscald_outskirts/monsters.txt
+npc: npc/008-1_Hurnscald_outskirts/hinnak.txt
+npc: npc/008-1_Hurnscald_outskirts/george.txt
+npc: npc/008-1_Hurnscald_outskirts/_warps.txt
+npc: npc/008-1_Hurnscald_outskirts/_mobs.txt
diff --git a/npc/008-1_Hurnscald_outskirts/_mobs.txt b/npc/008-1_Hurnscald_outskirts/_mobs.txt
new file mode 100644
index 00000000..2ae45fb9
--- /dev/null
+++ b/npc/008-1_Hurnscald_outskirts/_mobs.txt
@@ -0,0 +1,7 @@
+// 008-1 Hurnscald outskirts mobs
+
+
+
+008-1.gat,0,0,0	script	Mob008-1	-1,{
+	end;
+}
diff --git a/npc/008-1_Hurnscald_outskirts/_warps.txt b/npc/008-1_Hurnscald_outskirts/_warps.txt
new file mode 100644
index 00000000..275de68e
--- /dev/null
+++ b/npc/008-1_Hurnscald_outskirts/_warps.txt
@@ -0,0 +1,10 @@
+// 008-1 Hurnscald outskirts warps
+
+008-1.gat,54,61	warp	HurnscaldWestGate	-1,1,009-1.gat,26,36
+008-1.gat,79,80	warp	HurnscaldSouthGate	2,-1,009-1.gat,48,54
+008-1.gat,127,61	warp	HurnscaldEastGate	-1,0,009-1.gat,96,35
+008-1.gat,79,49	warp	HurnscaldNorthGate	2,-1,009-1.gat,48,24
+008-1.gat,24,62	warp	ToWoodland	-1,2,011-1.gat,122,61
+008-1.gat,79,17	warp	ToWoodlandMines	2,-1,018-1.gat,79,97
+008-1.gat,79,102	warp	ToWoodland	2,-1,007-1.gat,68,23
+008-1.gat,132,101	warp	ToWoodland	1,-1,007-1.gat,122,23
diff --git a/npc/new_18-1-woodland-village/george.txt b/npc/008-1_Hurnscald_outskirts/george.txt
index 42966bf8..42966bf8 100644
--- a/npc/new_18-1-woodland-village/george.txt
+++ b/npc/008-1_Hurnscald_outskirts/george.txt
diff --git a/npc/new_18-1-woodland-village/hinnak.txt b/npc/008-1_Hurnscald_outskirts/hinnak.txt
index 39f4bc5a..39f4bc5a 100644
--- a/npc/new_18-1-woodland-village/hinnak.txt
+++ b/npc/008-1_Hurnscald_outskirts/hinnak.txt
diff --git a/npc/new_18-1-woodland-village/monsters.txt b/npc/008-1_Hurnscald_outskirts/monsters.txt
index 8755285c..8755285c 100644
--- a/npc/new_18-1-woodland-village/monsters.txt
+++ b/npc/008-1_Hurnscald_outskirts/monsters.txt
diff --git a/npc/009-1_Hurnscald/_import.txt b/npc/009-1_Hurnscald/_import.txt
new file mode 100644
index 00000000..94bf97b6
--- /dev/null
+++ b/npc/009-1_Hurnscald/_import.txt
@@ -0,0 +1,9 @@
+map: 009-1.gat
+npc: npc/009-1_Hurnscald/soul-menhir.txt
+npc: npc/009-1_Hurnscald/sabine.txt
+npc: npc/009-1_Hurnscald/old_woman.txt
+npc: npc/009-1_Hurnscald/old_man.txt
+npc: npc/009-1_Hurnscald/milly.txt
+npc: npc/009-1_Hurnscald/jack.txt
+npc: npc/009-1_Hurnscald/_warps.txt
+npc: npc/009-1_Hurnscald/_mobs.txt
diff --git a/npc/009-1_Hurnscald/_mobs.txt b/npc/009-1_Hurnscald/_mobs.txt
new file mode 100644
index 00000000..8e5290ee
--- /dev/null
+++ b/npc/009-1_Hurnscald/_mobs.txt
@@ -0,0 +1,7 @@
+// 009-1 Hurnscald mobs
+
+
+
+009-1.gat,0,0,0	script	Mob009-1	-1,{
+	end;
+}
diff --git a/npc/009-1_Hurnscald/_warps.txt b/npc/009-1_Hurnscald/_warps.txt
new file mode 100644
index 00000000..a41c63a4
--- /dev/null
+++ b/npc/009-1_Hurnscald/_warps.txt
@@ -0,0 +1,13 @@
+// 009-1 Hurnscald warps
+
+009-1.gat,49,55	warp	HurnscaldSouthGate	2,-1,008-1.gat,78,82
+009-1.gat,97,36	warp	HurnscaldEastGate	-1,0,008-1.gat,129,60
+009-1.gat,35,30	warp	ToInn	-1,-1,009-2.gat,50,55
+009-1.gat,58,46	warp	ToGeneralStore	-1,-1,009-2.gat,27,105
+009-1.gat,59,33	warp	ToArcherShop	-1,-1,009-2.gat,95,29
+009-1.gat,71,30	warp	ToPotionShop	-1,-1,009-2.gat,130,25
+009-1.gat,80,31	warp	ToHospital	-1,-1,009-2.gat,149,66
+009-1.gat,72,44	warp	ToMayor	-1,-1,009-2.gat,113,77
+009-1.gat,91,46	warp	ToBlacksmith	-1,-1,009-2.gat,181,66
+009-1.gat,24,36	warp	HurnscaldWestGate	-1,1,008-1.gat,53,61
+009-1.gat,49,24	warp	HurnscaldNorthGate	2,-1,008-1.gat,78,48
diff --git a/npc/new_19-1-woodland-village/jack.txt b/npc/009-1_Hurnscald/jack.txt
index 721c4cce..721c4cce 100644
--- a/npc/new_19-1-woodland-village/jack.txt
+++ b/npc/009-1_Hurnscald/jack.txt
diff --git a/npc/new_19-1-woodland-village/milly.txt b/npc/009-1_Hurnscald/milly.txt
index b8bf7460..b8bf7460 100644
--- a/npc/new_19-1-woodland-village/milly.txt
+++ b/npc/009-1_Hurnscald/milly.txt
diff --git a/npc/new_19-1-woodland-village/old_man.txt b/npc/009-1_Hurnscald/old_man.txt
index 55812260..55812260 100644
--- a/npc/new_19-1-woodland-village/old_man.txt
+++ b/npc/009-1_Hurnscald/old_man.txt
diff --git a/npc/new_19-1-woodland-village/old_woman.txt b/npc/009-1_Hurnscald/old_woman.txt
index c94fe63f..c94fe63f 100644
--- a/npc/new_19-1-woodland-village/old_woman.txt
+++ b/npc/009-1_Hurnscald/old_woman.txt
diff --git a/npc/new_19-1-woodland-village/sabine.txt b/npc/009-1_Hurnscald/sabine.txt
index e45ae7a8..e45ae7a8 100644
--- a/npc/new_19-1-woodland-village/sabine.txt
+++ b/npc/009-1_Hurnscald/sabine.txt
diff --git a/npc/new_19-1-woodland-village/soul-menhir.txt b/npc/009-1_Hurnscald/soul-menhir.txt
index 152f05be..152f05be 100644
--- a/npc/new_19-1-woodland-village/soul-menhir.txt
+++ b/npc/009-1_Hurnscald/soul-menhir.txt
diff --git a/npc/009-2_Hurnscald/_import.txt b/npc/009-2_Hurnscald/_import.txt
new file mode 100644
index 00000000..84ddc0a2
--- /dev/null
+++ b/npc/009-2_Hurnscald/_import.txt
@@ -0,0 +1,15 @@
+map: 009-2.gat
+npc: npc/009-2_Hurnscald/waitress.txt
+npc: npc/009-2_Hurnscald/shops.txt
+npc: npc/009-2_Hurnscald/selim.txt
+npc: npc/009-2_Hurnscald/richard.txt
+npc: npc/009-2_Hurnscald/nurse.txt
+npc: npc/009-2_Hurnscald/nicholas.txt
+npc: npc/009-2_Hurnscald/misc.txt
+npc: npc/009-2_Hurnscald/kfahr.txt
+npc: npc/009-2_Hurnscald/inspector.txt
+npc: npc/009-2_Hurnscald/drunks.txt
+npc: npc/009-2_Hurnscald/doctor.txt
+npc: npc/009-2_Hurnscald/alan.txt
+npc: npc/009-2_Hurnscald/_warps.txt
+npc: npc/009-2_Hurnscald/_mobs.txt
diff --git a/npc/009-2_Hurnscald/_mobs.txt b/npc/009-2_Hurnscald/_mobs.txt
new file mode 100644
index 00000000..d7a860f9
--- /dev/null
+++ b/npc/009-2_Hurnscald/_mobs.txt
@@ -0,0 +1,7 @@
+// 009-2 Hurnscald mobs
+
+
+
+009-2.gat,0,0,0	script	Mob009-2	-1,{
+	end;
+}
diff --git a/npc/009-2_Hurnscald/_warps.txt b/npc/009-2_Hurnscald/_warps.txt
new file mode 100644
index 00000000..bb75379b
--- /dev/null
+++ b/npc/009-2_Hurnscald/_warps.txt
@@ -0,0 +1,20 @@
+// 009-2 Hurnscald warps
+
+009-2.gat,75,23	warp	To1stFloor	0,-1,009-2.gat,73,46
+009-2.gat,95,30	warp	ToOutdoor	-1,-1,009-1.gat,59,34
+009-2.gat,130,26	warp	ToOutdoor	-1,-1,009-1.gat,71,31
+009-2.gat,144,26	warp	To2ndFloor	0,-1,009-2.gat,143,44
+009-2.gat,144,42	warp	To3rdFloor	0,-1,009-2.gat,143,24
+009-2.gat,155,47	warp	To1stFloor	0,-1,009-2.gat,154,63
+009-2.gat,114,46	warp	To1stFloor	0,-1,009-2.gat,113,69
+009-2.gat,50,55	warp	ToOutdoor	-1,-1,009-1.gat,35,31
+009-2.gat,74,53	warp	ToCellar	-1,-1,009-2.gat,143,81
+009-2.gat,74,45	warp	To2ndFloor	0,-1,009-2.gat,74,23
+009-2.gat,114,78	warp	ToOutdoor	0,-1,009-1.gat,72,45
+009-2.gat,114,68	warp	To2ndFloor	0,-1,009-2.gat,113,46
+009-2.gat,149,67	warp	ToOutdoor	-1,-1,009-1.gat,80,32
+009-2.gat,143,79	warp	To1stFloor	-1,-1,009-2.gat,74,52
+009-2.gat,155,62	warp	To2ndFloor	0,-1,009-2.gat,154,46
+009-2.gat,182,67	warp	ToOutdoor	0,-1,009-1.gat,91,47
+009-2.gat,147,89	warp	ToCaveBeneathHurnscald	-1,-1,009-3.gat,173,22
+009-2.gat,27,106	warp	ToOutdoor	-1,-1,009-1.gat,58,47
diff --git a/npc/new_20-1-woodland-village/alan.txt b/npc/009-2_Hurnscald/alan.txt
index fc779676..fc779676 100644
--- a/npc/new_20-1-woodland-village/alan.txt
+++ b/npc/009-2_Hurnscald/alan.txt
diff --git a/npc/new_20-1-woodland-village/doctor.txt b/npc/009-2_Hurnscald/doctor.txt
index 825db4cc..825db4cc 100644
--- a/npc/new_20-1-woodland-village/doctor.txt
+++ b/npc/009-2_Hurnscald/doctor.txt
diff --git a/npc/new_20-1-woodland-village/drunks.txt b/npc/009-2_Hurnscald/drunks.txt
index 410bb081..410bb081 100644
--- a/npc/new_20-1-woodland-village/drunks.txt
+++ b/npc/009-2_Hurnscald/drunks.txt
diff --git a/npc/new_20-1-woodland-village/inspector.txt b/npc/009-2_Hurnscald/inspector.txt
index 89192104..89192104 100644
--- a/npc/new_20-1-woodland-village/inspector.txt
+++ b/npc/009-2_Hurnscald/inspector.txt
diff --git a/npc/new_20-1-woodland-village/kfahr.txt b/npc/009-2_Hurnscald/kfahr.txt
index 3ca72226..3ca72226 100644
--- a/npc/new_20-1-woodland-village/kfahr.txt
+++ b/npc/009-2_Hurnscald/kfahr.txt
diff --git a/npc/new_20-1-woodland-village/misc.txt b/npc/009-2_Hurnscald/misc.txt
index b2cfe9da..b2cfe9da 100644
--- a/npc/new_20-1-woodland-village/misc.txt
+++ b/npc/009-2_Hurnscald/misc.txt
diff --git a/npc/new_20-1-woodland-village/nicholas.txt b/npc/009-2_Hurnscald/nicholas.txt
index 7d21ab0f..7d21ab0f 100644
--- a/npc/new_20-1-woodland-village/nicholas.txt
+++ b/npc/009-2_Hurnscald/nicholas.txt
diff --git a/npc/new_20-1-woodland-village/nurse.txt b/npc/009-2_Hurnscald/nurse.txt
index 2ea8acb1..2ea8acb1 100644
--- a/npc/new_20-1-woodland-village/nurse.txt
+++ b/npc/009-2_Hurnscald/nurse.txt
diff --git a/npc/new_20-1-woodland-village/richard.txt b/npc/009-2_Hurnscald/richard.txt
index 17336ee7..17336ee7 100644
--- a/npc/new_20-1-woodland-village/richard.txt
+++ b/npc/009-2_Hurnscald/richard.txt
diff --git a/npc/new_20-1-woodland-village/selim.txt b/npc/009-2_Hurnscald/selim.txt
index 952bac9e..952bac9e 100644
--- a/npc/new_20-1-woodland-village/selim.txt
+++ b/npc/009-2_Hurnscald/selim.txt
diff --git a/npc/new_20-1-woodland-village/shops.txt b/npc/009-2_Hurnscald/shops.txt
index d965cf68..d965cf68 100644
--- a/npc/new_20-1-woodland-village/shops.txt
+++ b/npc/009-2_Hurnscald/shops.txt
diff --git a/npc/new_20-1-woodland-village/waitress.txt b/npc/009-2_Hurnscald/waitress.txt
index 6cf9791b..6cf9791b 100644
--- a/npc/new_20-1-woodland-village/waitress.txt
+++ b/npc/009-2_Hurnscald/waitress.txt
diff --git a/npc/009-3_Cave_beneath_Hurnscald/_import.txt b/npc/009-3_Cave_beneath_Hurnscald/_import.txt
new file mode 100644
index 00000000..51acac0c
--- /dev/null
+++ b/npc/009-3_Cave_beneath_Hurnscald/_import.txt
@@ -0,0 +1,4 @@
+map: 009-3.gat
+npc: npc/009-3_Cave_beneath_Hurnscald/monsters.txt
+npc: npc/009-3_Cave_beneath_Hurnscald/_warps.txt
+npc: npc/009-3_Cave_beneath_Hurnscald/_mobs.txt
diff --git a/npc/009-3_Cave_beneath_Hurnscald/_mobs.txt b/npc/009-3_Cave_beneath_Hurnscald/_mobs.txt
new file mode 100644
index 00000000..45708c75
--- /dev/null
+++ b/npc/009-3_Cave_beneath_Hurnscald/_mobs.txt
@@ -0,0 +1,7 @@
+// 009-3 Cave beneath Hurnscald mobs
+
+
+
+009-3.gat,0,0,0	script	Mob009-3	-1,{
+	end;
+}
diff --git a/npc/009-3_Cave_beneath_Hurnscald/_warps.txt b/npc/009-3_Cave_beneath_Hurnscald/_warps.txt
new file mode 100644
index 00000000..513872a0
--- /dev/null
+++ b/npc/009-3_Cave_beneath_Hurnscald/_warps.txt
@@ -0,0 +1,6 @@
+// 009-3 Cave beneath Hurnscald warps
+
+009-3.gat,173,20	warp	CaveExitToInn	-1,-1,009-2.gat,147,88
+009-3.gat,20,56	warp	ToLakeCave	-1,-1,011-4.gat,129,88
+009-3.gat,157,30	warp	toCave	-1,-1,018-3.gat,179,178
+009-3.gat,117,19	warp	toCave	-1,-1,013-3.gat,160,101
diff --git a/npc/new_35-1-woodland-village/monsters.txt b/npc/009-3_Cave_beneath_Hurnscald/monsters.txt
index 9b108f5f..9b108f5f 100644
--- a/npc/new_35-1-woodland-village/monsters.txt
+++ b/npc/009-3_Cave_beneath_Hurnscald/monsters.txt
diff --git a/npc/010-1_Woodland/_import.txt b/npc/010-1_Woodland/_import.txt
new file mode 100644
index 00000000..b57664d0
--- /dev/null
+++ b/npc/010-1_Woodland/_import.txt
@@ -0,0 +1,4 @@
+map: 010-1.gat
+npc: npc/010-1_Woodland/monsters.txt
+npc: npc/010-1_Woodland/_warps.txt
+npc: npc/010-1_Woodland/_mobs.txt
diff --git a/npc/010-1_Woodland/_mobs.txt b/npc/010-1_Woodland/_mobs.txt
new file mode 100644
index 00000000..c4b359db
--- /dev/null
+++ b/npc/010-1_Woodland/_mobs.txt
@@ -0,0 +1,19 @@
+// 010-1 Woodland mobs
+
+010-1.gat,82,63,19,19	monster	Scorpion	1003,1,0,0,Mob010-1::On1003
+010-1.gat,49,71,31,19	monster	Shroom	1019,1,0,0,Mob010-1::On1019
+
+
+010-1.gat,0,0,0	script	Mob010-1	-1,{
+On1003:
+	set @mobID, 1003;
+	callfunc "MobPoints";
+	break;
+
+On1019:
+	set @mobID, 1019;
+	callfunc "MobPoints";
+	break;
+
+	end;
+}
diff --git a/npc/010-1_Woodland/_warps.txt b/npc/010-1_Woodland/_warps.txt
new file mode 100644
index 00000000..b02dc45c
--- /dev/null
+++ b/npc/010-1_Woodland/_warps.txt
@@ -0,0 +1,7 @@
+// 010-1 Woodland warps
+
+010-1.gat,49,23	warp	ToWoodland	0,-1,011-1.gat,46,99
+010-1.gat,14,55	warp	ToWoodland	-1,0,015-1.gat,92,54
+010-1.gat,36,94	warp	ToDimondsCove	-1,-1,010-2.gat,32,44
+010-1.gat,56,104	warp	ToWoodland	1,-1,015-1.gat,56,21
+010-1.gat,131,54	warp	ToWoodland	-1,0,007-1.gat,25,53
diff --git a/npc/new_14-1-south-woodland/monsters.txt b/npc/010-1_Woodland/monsters.txt
index f371e497..f371e497 100644
--- a/npc/new_14-1-south-woodland/monsters.txt
+++ b/npc/010-1_Woodland/monsters.txt
diff --git a/npc/010-2_Dimond's_Cove/_import.txt b/npc/010-2_Dimond's_Cove/_import.txt
new file mode 100644
index 00000000..0ffbdeed
--- /dev/null
+++ b/npc/010-2_Dimond's_Cove/_import.txt
@@ -0,0 +1,7 @@
+map: 010-2.gat
+npc: npc/010-2_Dimond's_Cove/workers.txt
+npc: npc/010-2_Dimond's_Cove/loratay.txt
+npc: npc/010-2_Dimond's_Cove/doug.txt
+npc: npc/010-2_Dimond's_Cove/dimonds.txt
+npc: npc/010-2_Dimond's_Cove/_warps.txt
+npc: npc/010-2_Dimond's_Cove/_mobs.txt
diff --git a/npc/010-2_Dimond's_Cove/_mobs.txt b/npc/010-2_Dimond's_Cove/_mobs.txt
new file mode 100644
index 00000000..7ccbfc8c
--- /dev/null
+++ b/npc/010-2_Dimond's_Cove/_mobs.txt
@@ -0,0 +1,7 @@
+// 010-2 Dimond's Cove mobs
+
+
+
+010-2.gat,0,0,0	script	Mob010-2	-1,{
+	end;
+}
diff --git a/npc/010-2_Dimond's_Cove/_warps.txt b/npc/010-2_Dimond's_Cove/_warps.txt
new file mode 100644
index 00000000..8760c121
--- /dev/null
+++ b/npc/010-2_Dimond's_Cove/_warps.txt
@@ -0,0 +1,9 @@
+// 010-2 Dimond's Cove warps
+
+010-2.gat,27,24	warp	ToCellar	-1,-1,010-2.gat,35,68
+010-2.gat,32,45	warp	ToOutdoor	-1,-1,010-1.gat,36,95
+010-2.gat,40,27	warp	To2ndFloor	1,-1,010-2.gat,82,26
+010-2.gat,36,68	warp	To1stFloor	-1,-1,010-2.gat,28,24
+010-2.gat,67,27	warp	To3rdFloor	1,-1,010-2.gat,67,71
+010-2.gat,83,29	warp	To1stFloor	1,-1,010-2.gat,40,27
+010-2.gat,67,73	warp	To2ndFloor	1,-1,010-2.gat,67,28
diff --git a/npc/new_23-1-dimonds-cove/dimonds.txt b/npc/010-2_Dimond's_Cove/dimonds.txt
index 05d83b5c..05d83b5c 100644
--- a/npc/new_23-1-dimonds-cove/dimonds.txt
+++ b/npc/010-2_Dimond's_Cove/dimonds.txt
diff --git a/npc/new_23-1-dimonds-cove/doug.txt b/npc/010-2_Dimond's_Cove/doug.txt
index 301ae9a7..301ae9a7 100644
--- a/npc/new_23-1-dimonds-cove/doug.txt
+++ b/npc/010-2_Dimond's_Cove/doug.txt
diff --git a/npc/new_23-1-dimonds-cove/loratay.txt b/npc/010-2_Dimond's_Cove/loratay.txt
index 744557e7..744557e7 100644
--- a/npc/new_23-1-dimonds-cove/loratay.txt
+++ b/npc/010-2_Dimond's_Cove/loratay.txt
diff --git a/npc/new_23-1-dimonds-cove/workers.txt b/npc/010-2_Dimond's_Cove/workers.txt
index 5579dadd..5579dadd 100644
--- a/npc/new_23-1-dimonds-cove/workers.txt
+++ b/npc/010-2_Dimond's_Cove/workers.txt
diff --git a/npc/011-1_Woodland/_import.txt b/npc/011-1_Woodland/_import.txt
new file mode 100644
index 00000000..2afbca54
--- /dev/null
+++ b/npc/011-1_Woodland/_import.txt
@@ -0,0 +1,6 @@
+map: 011-1.gat
+npc: npc/011-1_Woodland/oscar.txt
+npc: npc/011-1_Woodland/monsters.txt
+npc: npc/011-1_Woodland/alchemist.txt
+npc: npc/011-1_Woodland/_warps.txt
+npc: npc/011-1_Woodland/_mobs.txt
diff --git a/npc/011-1_Woodland/_mobs.txt b/npc/011-1_Woodland/_mobs.txt
new file mode 100644
index 00000000..9d20aeaa
--- /dev/null
+++ b/npc/011-1_Woodland/_mobs.txt
@@ -0,0 +1,7 @@
+// 011-1 Woodland mobs
+
+
+
+011-1.gat,0,0,0	script	Mob011-1	-1,{
+	end;
+}
diff --git a/npc/011-1_Woodland/_warps.txt b/npc/011-1_Woodland/_warps.txt
new file mode 100644
index 00000000..345ffbe2
--- /dev/null
+++ b/npc/011-1_Woodland/_warps.txt
@@ -0,0 +1,7 @@
+// 011-1 Woodland warps
+
+011-1.gat,58,92	warp	ToCave	-1,-1,011-3.gat,15,15
+011-1.gat,30,61	warp	ToWoodland	-1,1,014-1.gat,180,90
+011-1.gat,49,104	warp	ToWoodland	0,-1,010-1.gat,50,25
+011-1.gat,125,62	warp	ToWoodland	-1,2,008-1.gat,27,61
+011-1.gat,73,11	warp	ToWoodlandHills	0,-1,012-1.gat,131,162
diff --git a/npc/new_9-1-woodland/alchemist.txt b/npc/011-1_Woodland/alchemist.txt
index ed6582fa..ed6582fa 100644
--- a/npc/new_9-1-woodland/alchemist.txt
+++ b/npc/011-1_Woodland/alchemist.txt
diff --git a/npc/new_9-1-woodland/monsters.txt b/npc/011-1_Woodland/monsters.txt
index 52f1bc74..52f1bc74 100644
--- a/npc/new_9-1-woodland/monsters.txt
+++ b/npc/011-1_Woodland/monsters.txt
diff --git a/npc/new_9-1-woodland/oscar.txt b/npc/011-1_Woodland/oscar.txt
index f33e0e47..f33e0e47 100644
--- a/npc/new_9-1-woodland/oscar.txt
+++ b/npc/011-1_Woodland/oscar.txt
diff --git a/npc/011-3_Hermit's_cave/_import.txt b/npc/011-3_Hermit's_cave/_import.txt
new file mode 100644
index 00000000..08b2f921
--- /dev/null
+++ b/npc/011-3_Hermit's_cave/_import.txt
@@ -0,0 +1,5 @@
+map: 011-3.gat
+npc: npc/011-3_Hermit's_cave/monsters.txt
+npc: npc/011-3_Hermit's_cave/hermit.txt
+npc: npc/011-3_Hermit's_cave/_warps.txt
+npc: npc/011-3_Hermit's_cave/_mobs.txt
diff --git a/npc/011-3_Hermit's_cave/_mobs.txt b/npc/011-3_Hermit's_cave/_mobs.txt
new file mode 100644
index 00000000..39ac018b
--- /dev/null
+++ b/npc/011-3_Hermit's_cave/_mobs.txt
@@ -0,0 +1,7 @@
+// 011-3 Hermit's cave mobs
+
+
+
+011-3.gat,0,0,0	script	Mob011-3	-1,{
+	end;
+}
diff --git a/npc/011-3_Hermit's_cave/_warps.txt b/npc/011-3_Hermit's_cave/_warps.txt
new file mode 100644
index 00000000..be9b6a83
--- /dev/null
+++ b/npc/011-3_Hermit's_cave/_warps.txt
@@ -0,0 +1,3 @@
+// 011-3 Hermit's cave warps
+
+011-3.gat,31,21	warp	ToLakeCave	-1,-1,011-4.gat,72,11
diff --git a/npc/new_4-1-cave-small/hermit.txt b/npc/011-3_Hermit's_cave/hermit.txt
index 2ef32941..2ef32941 100644
--- a/npc/new_4-1-cave-small/hermit.txt
+++ b/npc/011-3_Hermit's_cave/hermit.txt
diff --git a/npc/new_4-1-cave-small/monsters.txt b/npc/011-3_Hermit's_cave/monsters.txt
index f51d010d..f51d010d 100644
--- a/npc/new_4-1-cave-small/monsters.txt
+++ b/npc/011-3_Hermit's_cave/monsters.txt
diff --git a/npc/011-4_Lake_cave/_import.txt b/npc/011-4_Lake_cave/_import.txt
new file mode 100644
index 00000000..37f9085e
--- /dev/null
+++ b/npc/011-4_Lake_cave/_import.txt
@@ -0,0 +1,4 @@
+map: 011-4.gat
+npc: npc/011-4_Lake_cave/monsters.txt
+npc: npc/011-4_Lake_cave/_warps.txt
+npc: npc/011-4_Lake_cave/_mobs.txt
diff --git a/npc/011-4_Lake_cave/_mobs.txt b/npc/011-4_Lake_cave/_mobs.txt
new file mode 100644
index 00000000..62bb6fb4
--- /dev/null
+++ b/npc/011-4_Lake_cave/_mobs.txt
@@ -0,0 +1,19 @@
+// 011-4 Lake cave mobs
+
+011-4.gat,51,29,39,39	monster	Shroom	1019,1,0,0,Mob011-4::On1019
+011-4.gat,93,114,39,39	monster	Lamp Snake	1021,1,0,0,Mob011-4::On1021
+
+
+011-4.gat,0,0,0	script	Mob011-4	-1,{
+On1019:
+	set @mobID, 1019;
+	callfunc "MobPoints";
+	break;
+
+On1021:
+	set @mobID, 1021;
+	callfunc "MobPoints";
+	break;
+
+	end;
+}
diff --git a/npc/011-4_Lake_cave/_warps.txt b/npc/011-4_Lake_cave/_warps.txt
new file mode 100644
index 00000000..e0fe5a00
--- /dev/null
+++ b/npc/011-4_Lake_cave/_warps.txt
@@ -0,0 +1,4 @@
+// 011-4 Lake cave warps
+
+011-4.gat,73,8	warp	ToHermitsCave	0,-1,011-3.gat,31,24
+011-4.gat,129,86	warp	ToCaveBeneathHurnscald	-1,-1,009-3.gat,21,55
diff --git a/npc/new_17-1-cave-big/monsters.txt b/npc/011-4_Lake_cave/monsters.txt
index 95d09026..95d09026 100644
--- a/npc/new_17-1-cave-big/monsters.txt
+++ b/npc/011-4_Lake_cave/monsters.txt
diff --git a/npc/012-1_Woodland_Hills/_import.txt b/npc/012-1_Woodland_Hills/_import.txt
new file mode 100644
index 00000000..178bca3f
--- /dev/null
+++ b/npc/012-1_Woodland_Hills/_import.txt
@@ -0,0 +1,5 @@
+map: 012-1.gat
+npc: npc/012-1_Woodland_Hills/shops.txt
+npc: npc/012-1_Woodland_Hills/monsters.txt
+npc: npc/012-1_Woodland_Hills/_warps.txt
+npc: npc/012-1_Woodland_Hills/_mobs.txt
diff --git a/npc/012-1_Woodland_Hills/_mobs.txt b/npc/012-1_Woodland_Hills/_mobs.txt
new file mode 100644
index 00000000..8bb05fe9
--- /dev/null
+++ b/npc/012-1_Woodland_Hills/_mobs.txt
@@ -0,0 +1,7 @@
+// 012-1 Woodland Hills mobs
+
+
+
+012-1.gat,0,0,0	script	Mob012-1	-1,{
+	end;
+}
diff --git a/npc/012-1_Woodland_Hills/_warps.txt b/npc/012-1_Woodland_Hills/_warps.txt
new file mode 100644
index 00000000..f8c58466
--- /dev/null
+++ b/npc/012-1_Woodland_Hills/_warps.txt
@@ -0,0 +1,12 @@
+// 012-1 Woodland Hills warps
+
+012-1.gat,51,39	warp	ToCaves	-1,-1,012-3.gat,370,45
+012-1.gat,41,48	warp	ToCaves	-1,-1,012-3.gat,353,78
+012-1.gat,44,88	warp	ToCaves	-1,-1,012-3.gat,354,187
+012-1.gat,92,104	warp	ToCaves	-1,-1,012-3.gat,270,111
+012-1.gat,98,99	warp	ToCaves	-1,-1,012-3.gat,36,81
+012-1.gat,109,92	warp	ToCaves	-1,-1,012-3.gat,79,73
+012-1.gat,123,90	warp	ToCaves	-1,-1,012-3.gat,38,156
+012-1.gat,150,61	warp	ToWoodlandHills	-1,2,013-1.gat,21,75
+012-1.gat,132,163	warp	ToWoodland	0,-1,011-1.gat,72,16
+012-1.gat,65,126	warp	ToCaves	-1,-1,012-3.gat,176,139
diff --git a/npc/new_26-1-hill1/monsters.txt b/npc/012-1_Woodland_Hills/monsters.txt
index cc95281f..cc95281f 100644
--- a/npc/new_26-1-hill1/monsters.txt
+++ b/npc/012-1_Woodland_Hills/monsters.txt
diff --git a/npc/new_26-1-hill1/shops.txt b/npc/012-1_Woodland_Hills/shops.txt
index 4e2ce96e..4e2ce96e 100644
--- a/npc/new_26-1-hill1/shops.txt
+++ b/npc/012-1_Woodland_Hills/shops.txt
diff --git a/npc/012-3_Cave/_import.txt b/npc/012-3_Cave/_import.txt
new file mode 100644
index 00000000..270632e0
--- /dev/null
+++ b/npc/012-3_Cave/_import.txt
@@ -0,0 +1,4 @@
+map: 012-3.gat
+npc: npc/012-3_Cave/monsters.txt
+npc: npc/012-3_Cave/_warps.txt
+npc: npc/012-3_Cave/_mobs.txt
diff --git a/npc/012-3_Cave/_mobs.txt b/npc/012-3_Cave/_mobs.txt
new file mode 100644
index 00000000..70c39e3d
--- /dev/null
+++ b/npc/012-3_Cave/_mobs.txt
@@ -0,0 +1,7 @@
+// 012-3 Cave mobs
+
+
+
+012-3.gat,0,0,0	script	Mob012-3	-1,{
+	end;
+}
diff --git a/npc/012-3_Cave/_warps.txt b/npc/012-3_Cave/_warps.txt
new file mode 100644
index 00000000..58e842ba
--- /dev/null
+++ b/npc/012-3_Cave/_warps.txt
@@ -0,0 +1,11 @@
+// 012-3 Cave warps
+
+012-3.gat,37,82	warp	CaveExit	0,-1,012-1.gat,98,100
+012-3.gat,80,74	warp	CaveExit	0,-1,012-1.gat,109,93
+012-3.gat,39,157	warp	CaveExit	0,-1,012-1.gat,123,91
+012-3.gat,270,112	warp	CaveExit	-1,-1,012-1.gat,92,105
+012-3.gat,176,138	warp	CaveExit	-1,-1,012-1.gat,65,127
+012-3.gat,355,188	warp	CaveExit	0,-1,012-1.gat,44,89
+012-3.gat,371,46	warp	CaveExit	0,-1,012-1.gat,51,40
+012-3.gat,354,79	warp	CaveExit	0,-1,012-1.gat,41,48
+012-3.gat,473,104	warp	CaveExit	-1,1,012-1.gat,146,67
diff --git a/npc/new_27-1-hill2/monsters.txt b/npc/012-3_Cave/monsters.txt
index bb0799bb..bb0799bb 100644
--- a/npc/new_27-1-hill2/monsters.txt
+++ b/npc/012-3_Cave/monsters.txt
diff --git a/npc/013-1_Woodland_hills/_import.txt b/npc/013-1_Woodland_hills/_import.txt
new file mode 100644
index 00000000..8ee0c0be
--- /dev/null
+++ b/npc/013-1_Woodland_hills/_import.txt
@@ -0,0 +1,4 @@
+map: 013-1.gat
+npc: npc/013-1_Woodland_hills/monsters.txt
+npc: npc/013-1_Woodland_hills/_warps.txt
+npc: npc/013-1_Woodland_hills/_mobs.txt
diff --git a/npc/013-1_Woodland_hills/_mobs.txt b/npc/013-1_Woodland_hills/_mobs.txt
new file mode 100644
index 00000000..159476a8
--- /dev/null
+++ b/npc/013-1_Woodland_hills/_mobs.txt
@@ -0,0 +1,7 @@
+// 013-1 Woodland hills mobs
+
+
+
+013-1.gat,0,0,0	script	Mob013-1	-1,{
+	end;
+}
diff --git a/npc/013-1_Woodland_hills/_warps.txt b/npc/013-1_Woodland_hills/_warps.txt
new file mode 100644
index 00000000..6daa4447
--- /dev/null
+++ b/npc/013-1_Woodland_hills/_warps.txt
@@ -0,0 +1,6 @@
+// 013-1 Woodland hills warps
+
+013-1.gat,125,103	warp	toCave	-1,-1,013-3.gat,34,64
+013-1.gat,20,76	warp	ToWoodlandHills	-1,2,012-1.gat,149,78
+013-1.gat,45,21	warp	ToWoodland	1,-1,017-1.gat,46,104
+013-1.gat,42,90	warp	toHouse	-1,-1,013-2.gat,63,41
diff --git a/npc/new_28-1-hillwest/monsters.txt b/npc/013-1_Woodland_hills/monsters.txt
index fe216eae..fe216eae 100644
--- a/npc/new_28-1-hillwest/monsters.txt
+++ b/npc/013-1_Woodland_hills/monsters.txt
diff --git a/npc/013-2_Magic_house/_import.txt b/npc/013-2_Magic_house/_import.txt
new file mode 100644
index 00000000..a1303967
--- /dev/null
+++ b/npc/013-2_Magic_house/_import.txt
@@ -0,0 +1,6 @@
+map: 013-2.gat
+npc: npc/013-2_Magic_house/wizard.txt
+npc: npc/013-2_Magic_house/notes.txt
+npc: npc/013-2_Magic_house/apprentice.txt
+npc: npc/013-2_Magic_house/_warps.txt
+npc: npc/013-2_Magic_house/_mobs.txt
diff --git a/npc/013-2_Magic_house/_mobs.txt b/npc/013-2_Magic_house/_mobs.txt
new file mode 100644
index 00000000..4215f188
--- /dev/null
+++ b/npc/013-2_Magic_house/_mobs.txt
@@ -0,0 +1,7 @@
+// 013-2 Magic house mobs
+
+
+
+013-2.gat,0,0,0	script	Mob013-2	-1,{
+	end;
+}
diff --git a/npc/013-2_Magic_house/_warps.txt b/npc/013-2_Magic_house/_warps.txt
new file mode 100644
index 00000000..56df14d3
--- /dev/null
+++ b/npc/013-2_Magic_house/_warps.txt
@@ -0,0 +1,5 @@
+// 013-2 Magic house warps
+
+013-2.gat,63,43	warp	toOutside	-1,-1,013-1.gat,42,91
+013-2.gat,67,36	warp	toRoom	-1,-1,013-2.gat,21,41
+013-2.gat,21,42	warp	toRoom	-1,-1,013-2.gat,67,37
diff --git a/npc/new_36-1-magic-house/apprentice.txt b/npc/013-2_Magic_house/apprentice.txt
index b27d271d..b27d271d 100644
--- a/npc/new_36-1-magic-house/apprentice.txt
+++ b/npc/013-2_Magic_house/apprentice.txt
diff --git a/npc/new_36-1-magic-house/notes.txt b/npc/013-2_Magic_house/notes.txt
index dbcb1209..dbcb1209 100644
--- a/npc/new_36-1-magic-house/notes.txt
+++ b/npc/013-2_Magic_house/notes.txt
diff --git a/npc/new_36-1-magic-house/wizard.txt b/npc/013-2_Magic_house/wizard.txt
index ec7deb36..ec7deb36 100644
--- a/npc/new_36-1-magic-house/wizard.txt
+++ b/npc/013-2_Magic_house/wizard.txt
diff --git a/npc/013-3_Cave/_import.txt b/npc/013-3_Cave/_import.txt
new file mode 100644
index 00000000..83f4256e
--- /dev/null
+++ b/npc/013-3_Cave/_import.txt
@@ -0,0 +1,3 @@
+map: 013-3.gat
+npc: npc/013-3_Cave/_warps.txt
+npc: npc/013-3_Cave/_mobs.txt
diff --git a/npc/013-3_Cave/_mobs.txt b/npc/013-3_Cave/_mobs.txt
new file mode 100644
index 00000000..4c3e8330
--- /dev/null
+++ b/npc/013-3_Cave/_mobs.txt
@@ -0,0 +1,7 @@
+// 013-3 Cave mobs
+
+
+
+013-3.gat,0,0,0	script	Mob013-3	-1,{
+	end;
+}
diff --git a/npc/013-3_Cave/_warps.txt b/npc/013-3_Cave/_warps.txt
new file mode 100644
index 00000000..404ada8c
--- /dev/null
+++ b/npc/013-3_Cave/_warps.txt
@@ -0,0 +1,29 @@
+// 013-3 Cave warps
+
+013-3.gat,28,20	warp	hiddenExit	-1,-1,013-1.gat,126,102
+013-3.gat,34,63	warp	toOutside	-1,-1,013-1.gat,125,104
+013-3.gat,36,96	warp	toCave	-1,-1,013-3.gat,79,126
+013-3.gat,79,125	warp	toCave	-1,-1,013-3.gat,35,96
+013-3.gat,22,115	warp	toOutside	-1,-1,018-1.gat,115,41
+013-3.gat,139,45	warp	toOutside	-1,-1,018-1.gat,127,37
+013-3.gat,61,179	warp	toOutside	-1,-1,018-1.gat,134,46
+013-3.gat,69,143	warp	toCave	-1,-1,018-3.gat,50,89
+013-3.gat,81,103	warp	toOutside	-1,-1,018-1.gat,147,41
+013-3.gat,177,91	warp	toOutside	-1,-1,018-1.gat,177,21
+013-3.gat,178,44	warp	toCave	-1,-1,018-3.gat,97,70
+013-3.gat,169,45	warp	toCave	-1,-1,018-3.gat,27,55
+013-3.gat,152,28	warp	toCave	-1,-1,018-3.gat,134,62
+013-3.gat,123,104	warp	toCave	-1,-1,018-3.gat,172,22
+013-3.gat,147,104	warp	toCave	-1,-1,018-3.gat,177,22
+013-3.gat,158,66	warp	toCave	-1,-1,018-3.gat,27,90
+013-3.gat,75,51	warp	toCave	-1,-1,013-3.gat,75,52
+013-3.gat,109,64	warp	toCave	-1,-1,013-3.gat,75,50
+013-3.gat,67,51	warp	toCave	-1,-1,018-3.gat,90,51
+013-3.gat,71,20	warp	toCave	-1,-1,013-3.gat,28,40
+013-3.gat,28,41	warp	toCave	-1,-1,013-3.gat,71,21
+013-3.gat,71,42	warp	toCave	-1,-1,013-3.gat,198,21
+013-3.gat,109,20	warp	toCave	-1,-1,013-3.gat,71,41
+013-3.gat,111,42	warp	toCave	-1,-1,018-3.gat,71,123
+013-3.gat,62,100	warp	toCave	-1,-1,018-1.gat,174,86
+013-3.gat,68,97	warp	toCave	-1,-1,018-3.gat,102,70
+013-3.gat,160,102	warp	toCave	-1,-1,009-3.gat,117,20
diff --git a/npc/014-1_Woodland/_import.txt b/npc/014-1_Woodland/_import.txt
new file mode 100644
index 00000000..9828f4d8
--- /dev/null
+++ b/npc/014-1_Woodland/_import.txt
@@ -0,0 +1,6 @@
+map: 014-1.gat
+npc: npc/014-1_Woodland/wedding-officiator.txt
+npc: npc/014-1_Woodland/taro.txt
+npc: npc/014-1_Woodland/monsters.txt
+npc: npc/014-1_Woodland/_warps.txt
+npc: npc/014-1_Woodland/_mobs.txt
diff --git a/npc/014-1_Woodland/_mobs.txt b/npc/014-1_Woodland/_mobs.txt
new file mode 100644
index 00000000..3fd75a93
--- /dev/null
+++ b/npc/014-1_Woodland/_mobs.txt
@@ -0,0 +1,7 @@
+// 014-1 Woodland mobs
+
+
+
+014-1.gat,0,0,0	script	Mob014-1	-1,{
+	end;
+}
diff --git a/npc/014-1_Woodland/_warps.txt b/npc/014-1_Woodland/_warps.txt
new file mode 100644
index 00000000..5922f1f1
--- /dev/null
+++ b/npc/014-1_Woodland/_warps.txt
@@ -0,0 +1,5 @@
+// 014-1 Woodland warps
+
+014-1.gat,109,91	warp	ToWoodland	-1,1,011-1.gat,31,62
+014-1.gat,93,58	warp	ToCave	-1,-1,014-3.gat,56,172
+014-1.gat,76,38	warp	ToCave	-1,-1,014-3.gat,35,33
diff --git a/npc/new_29-1-west-woodland/monsters.txt b/npc/014-1_Woodland/monsters.txt
index cbb9e182..cbb9e182 100644
--- a/npc/new_29-1-west-woodland/monsters.txt
+++ b/npc/014-1_Woodland/monsters.txt
diff --git a/npc/new_29-1-west-woodland/taro.txt b/npc/014-1_Woodland/taro.txt
index db6b4551..db6b4551 100644
--- a/npc/new_29-1-west-woodland/taro.txt
+++ b/npc/014-1_Woodland/taro.txt
diff --git a/npc/new_29-1-west-woodland/wedding-officiator.txt b/npc/014-1_Woodland/wedding-officiator.txt
index 93a27c6d..93a27c6d 100644
--- a/npc/new_29-1-west-woodland/wedding-officiator.txt
+++ b/npc/014-1_Woodland/wedding-officiator.txt
diff --git a/npc/014-3_Cave/_import.txt b/npc/014-3_Cave/_import.txt
new file mode 100644
index 00000000..f18b6e02
--- /dev/null
+++ b/npc/014-3_Cave/_import.txt
@@ -0,0 +1,4 @@
+map: 014-3.gat
+npc: npc/014-3_Cave/monsters.txt
+npc: npc/014-3_Cave/_warps.txt
+npc: npc/014-3_Cave/_mobs.txt
diff --git a/npc/014-3_Cave/_mobs.txt b/npc/014-3_Cave/_mobs.txt
new file mode 100644
index 00000000..417a4ef0
--- /dev/null
+++ b/npc/014-3_Cave/_mobs.txt
@@ -0,0 +1,7 @@
+// 014-3 Cave mobs
+
+
+
+014-3.gat,0,0,0	script	Mob014-3	-1,{
+	end;
+}
diff --git a/npc/014-3_Cave/_warps.txt b/npc/014-3_Cave/_warps.txt
new file mode 100644
index 00000000..39704f98
--- /dev/null
+++ b/npc/014-3_Cave/_warps.txt
@@ -0,0 +1,6 @@
+// 014-3 Cave warps
+
+014-3.gat,35,32	warp	ToOutside	-1,-1,014-1.gat,76,39
+014-3.gat,57,173	warp	ToOutside	0,-1,014-1.gat,93,59
+014-3.gat,91,108	warp	ToCave	-1,-1,014-3.gat,103,53
+014-3.gat,103,54	warp	ToCave	-1,-1,014-3.gat,91,109
diff --git a/npc/new_30-1-west-woodland-cave/monsters.txt b/npc/014-3_Cave/monsters.txt
index b0620568..b0620568 100644
--- a/npc/new_30-1-west-woodland-cave/monsters.txt
+++ b/npc/014-3_Cave/monsters.txt
diff --git a/npc/015-1_Woodland/_import.txt b/npc/015-1_Woodland/_import.txt
new file mode 100644
index 00000000..e37b2791
--- /dev/null
+++ b/npc/015-1_Woodland/_import.txt
@@ -0,0 +1,5 @@
+map: 015-1.gat
+npc: npc/015-1_Woodland/monsters.txt
+npc: npc/015-1_Woodland/alice.txt
+npc: npc/015-1_Woodland/_warps.txt
+npc: npc/015-1_Woodland/_mobs.txt
diff --git a/npc/015-1_Woodland/_mobs.txt b/npc/015-1_Woodland/_mobs.txt
new file mode 100644
index 00000000..6ec8206f
--- /dev/null
+++ b/npc/015-1_Woodland/_mobs.txt
@@ -0,0 +1,7 @@
+// 015-1 Woodland mobs
+
+
+
+015-1.gat,0,0,0	script	Mob015-1	-1,{
+	end;
+}
diff --git a/npc/015-1_Woodland/_warps.txt b/npc/015-1_Woodland/_warps.txt
new file mode 100644
index 00000000..c6ca1856
--- /dev/null
+++ b/npc/015-1_Woodland/_warps.txt
@@ -0,0 +1,3 @@
+// 015-1 Woodland warps
+
+015-1.gat,93,55	warp	ToWoodland	-1,0,010-1.gat,15,55
diff --git a/npc/new_31-1-southwest-woodland/alice.txt b/npc/015-1_Woodland/alice.txt
index e35f4802..e35f4802 100644
--- a/npc/new_31-1-southwest-woodland/alice.txt
+++ b/npc/015-1_Woodland/alice.txt
diff --git a/npc/new_31-1-southwest-woodland/monsters.txt b/npc/015-1_Woodland/monsters.txt
index 0ce818c1..0ce818c1 100644
--- a/npc/new_31-1-southwest-woodland/monsters.txt
+++ b/npc/015-1_Woodland/monsters.txt
diff --git a/npc/016-1_Woodland/_import.txt b/npc/016-1_Woodland/_import.txt
new file mode 100644
index 00000000..5147cc8f
--- /dev/null
+++ b/npc/016-1_Woodland/_import.txt
@@ -0,0 +1,4 @@
+map: 016-1.gat
+npc: npc/016-1_Woodland/monsters.txt
+npc: npc/016-1_Woodland/_warps.txt
+npc: npc/016-1_Woodland/_mobs.txt
diff --git a/npc/016-1_Woodland/_mobs.txt b/npc/016-1_Woodland/_mobs.txt
new file mode 100644
index 00000000..dd0a4eca
--- /dev/null
+++ b/npc/016-1_Woodland/_mobs.txt
@@ -0,0 +1,7 @@
+// 016-1 Woodland mobs
+
+
+
+016-1.gat,0,0,0	script	Mob016-1	-1,{
+	end;
+}
diff --git a/npc/016-1_Woodland/_warps.txt b/npc/016-1_Woodland/_warps.txt
new file mode 100644
index 00000000..a9c59657
--- /dev/null
+++ b/npc/016-1_Woodland/_warps.txt
@@ -0,0 +1,3 @@
+// 016-1 Woodland warps
+
+016-1.gat,56,20	warp	ToWoodland	1,-1,010-1.gat,56,103
diff --git a/npc/new_32-1-south-woodland-2/monsters.txt b/npc/016-1_Woodland/monsters.txt
index 8075550c..8075550c 100644
--- a/npc/new_32-1-south-woodland-2/monsters.txt
+++ b/npc/016-1_Woodland/monsters.txt
diff --git a/npc/017-1_Woodland_hills/_import.txt b/npc/017-1_Woodland_hills/_import.txt
new file mode 100644
index 00000000..a447c2d4
--- /dev/null
+++ b/npc/017-1_Woodland_hills/_import.txt
@@ -0,0 +1,4 @@
+map: 017-1.gat
+npc: npc/017-1_Woodland_hills/monsters.txt
+npc: npc/017-1_Woodland_hills/_warps.txt
+npc: npc/017-1_Woodland_hills/_mobs.txt
diff --git a/npc/017-1_Woodland_hills/_mobs.txt b/npc/017-1_Woodland_hills/_mobs.txt
new file mode 100644
index 00000000..c14e5e2f
--- /dev/null
+++ b/npc/017-1_Woodland_hills/_mobs.txt
@@ -0,0 +1,7 @@
+// 017-1 Woodland hills mobs
+
+
+
+017-1.gat,0,0,0	script	Mob017-1	-1,{
+	end;
+}
diff --git a/npc/017-1_Woodland_hills/_warps.txt b/npc/017-1_Woodland_hills/_warps.txt
new file mode 100644
index 00000000..26917709
--- /dev/null
+++ b/npc/017-1_Woodland_hills/_warps.txt
@@ -0,0 +1,3 @@
+// 017-1 Woodland hills warps
+
+017-1.gat,46,105	warp	toWoodland	2,-1,013-1.gat,45,22
diff --git a/npc/new_33-1-hill-northwest/monsters.txt b/npc/017-1_Woodland_hills/monsters.txt
index 8ec54d78..8ec54d78 100644
--- a/npc/new_33-1-hill-northwest/monsters.txt
+++ b/npc/017-1_Woodland_hills/monsters.txt
diff --git a/npc/018-1_Woodland_mining_camp/_import.txt b/npc/018-1_Woodland_mining_camp/_import.txt
new file mode 100644
index 00000000..c8cd0a44
--- /dev/null
+++ b/npc/018-1_Woodland_mining_camp/_import.txt
@@ -0,0 +1,5 @@
+map: 018-1.gat
+npc: npc/018-1_Woodland_mining_camp/monsters.txt
+npc: npc/018-1_Woodland_mining_camp/miners.txt
+npc: npc/018-1_Woodland_mining_camp/_warps.txt
+npc: npc/018-1_Woodland_mining_camp/_mobs.txt
diff --git a/npc/018-1_Woodland_mining_camp/_mobs.txt b/npc/018-1_Woodland_mining_camp/_mobs.txt
new file mode 100644
index 00000000..df2cf445
--- /dev/null
+++ b/npc/018-1_Woodland_mining_camp/_mobs.txt
@@ -0,0 +1,104 @@
+// 018-1 Woodland mining camp mobs
+
+018-1.gat,136,79,9,41	monster	Sea Slime	1033,10,0,0,Mob018-1::On1033
+018-1.gat,108,87,53,25	monster	Log Head	1025,10,0,0,Mob018-1::On1025
+018-1.gat,116,44,6,7	monster	Sea  Slime	1033,3,0,0,Mob018-1::On1033
+018-1.gat,119,56,13,6	monster	Flower	1014,2,0,0,Mob018-1::On1014
+018-1.gat,175,28,17,19	monster	Jack O	1022,1,300000,240000,Mob018-1::On1022
+018-1.gat,78,59,3,1	monster	Yellow Slime	1007,1,0,0,Mob018-1::On1007
+018-1.gat,57,63,14,7	monster	Silk Worm	1035,2,0,0,Mob018-1::On1035
+018-1.gat,43,63,31,28	monster	Bat	1017,10,0,0,Mob018-1::On1017
+018-1.gat,134,39,18,10	monster	Grass Snake	1034,4,0,0,Mob018-1::On1034
+018-1.gat,124,42,9,11	monster	Grass Snake	1034,2,0,0,Mob018-1::On1034
+018-1.gat,124,19,22,9	monster	Mountain Snake	1026,3,0,0,Mob018-1::On1026
+018-1.gat,122,29,19,9	monster	Mountain Snake	1026,2,0,0,Mob018-1::On1026
+018-1.gat,149,45,10,8	monster	Bat	1017,5,0,0,Mob018-1::On1017
+018-1.gat,169,47,20,10	monster	Pinkie	1018,4,0,0,Mob018-1::On1018
+018-1.gat,136,49,13,8	monster	Fluffy	1020,4,0,0,Mob018-1::On1020
+018-1.gat,111,62,5,2	monster	Silk Worm	1035,1,0,0,Mob018-1::On1035
+018-1.gat,117,50,4,3	monster	Sea Slime	1033,1,0,0,Mob018-1::On1033
+018-1.gat,96,47,18,11	monster	Mouboo	1028,3,0,0,Mob018-1::On1028
+018-1.gat,106,52,15,6	monster	Mouboo	1028,1,0,0,Mob018-1::On1028
+018-1.gat,78,55,37,6	monster	Fire Goblin	1011,7,0,0,Mob018-1::On1011
+018-1.gat,145,24,10,9	monster	Green Slime	1005,3,0,0,Mob018-1::On1005
+018-1.gat,68,89,14,17	monster	Scorpion	1003,3,0,0,Mob018-1::On1003
+
+
+018-1.gat,0,0,0	script	Mob018-1	-1,{
+On1003:
+	set @mobID, 1003;
+	callfunc "MobPoints";
+	break;
+
+On1005:
+	set @mobID, 1005;
+	callfunc "MobPoints";
+	break;
+
+On1007:
+	set @mobID, 1007;
+	callfunc "MobPoints";
+	break;
+
+On1011:
+	set @mobID, 1011;
+	callfunc "MobPoints";
+	break;
+
+On1014:
+	set @mobID, 1014;
+	callfunc "MobPoints";
+	break;
+
+On1017:
+	set @mobID, 1017;
+	callfunc "MobPoints";
+	break;
+
+On1018:
+	set @mobID, 1018;
+	callfunc "MobPoints";
+	break;
+
+On1020:
+	set @mobID, 1020;
+	callfunc "MobPoints";
+	break;
+
+On1022:
+	set @mobID, 1022;
+	callfunc "MobPoints";
+	break;
+
+On1025:
+	set @mobID, 1025;
+	callfunc "MobPoints";
+	break;
+
+On1026:
+	set @mobID, 1026;
+	callfunc "MobPoints";
+	break;
+
+On1028:
+	set @mobID, 1028;
+	callfunc "MobPoints";
+	break;
+
+On1033:
+	set @mobID, 1033;
+	callfunc "MobPoints";
+	break;
+
+On1034:
+	set @mobID, 1034;
+	callfunc "MobPoints";
+	break;
+
+On1035:
+	set @mobID, 1035;
+	callfunc "MobPoints";
+	break;
+
+	end;
+}
diff --git a/npc/018-1_Woodland_mining_camp/_warps.txt b/npc/018-1_Woodland_mining_camp/_warps.txt
new file mode 100644
index 00000000..c8d4c8d6
--- /dev/null
+++ b/npc/018-1_Woodland_mining_camp/_warps.txt
@@ -0,0 +1,17 @@
+// 018-1 Woodland mining camp warps
+
+018-1.gat,79,59	warp	toMine	0,-1,018-3.gat,100,130
+018-1.gat,112,61	warp	toCave	-1,-1,018-3.gat,44,36
+018-1.gat,115,40	warp	toCave	-1,-1,013-3.gat,22,114
+018-1.gat,128,56	warp	toCave	-1,-1,018-3.gat,49,97
+018-1.gat,90,42	warp	toCave	-1,-1,018-3.gat,123,164
+018-1.gat,69,54	warp	toCave	-1,-1,018-3.gat,70,103
+018-1.gat,127,36	warp	toCave	-1,-1,013-3.gat,139,44
+018-1.gat,134,45	warp	toCave	-1,-1,013-3.gat,61,178
+018-1.gat,147,40	warp	toCave	-1,-1,013-3.gat,81,102
+018-1.gat,153,46	warp	toCave	-1,-1,018-3.gat,146,160
+018-1.gat,158,34	warp	toCave	-1,-1,018-3.gat,64,101
+018-1.gat,162,44	warp	toCave	-1,-1,018-3.gat,29,164
+018-1.gat,177,20	warp	toCave	-1,-1,013-1.gat,177,90
+018-1.gat,65,73	warp	toIndoor	-1,-1,018-2.gat,50,28
+018-1.gat,79,98	warp	toHurnscald	2,-1,008-1.gat,79,18
diff --git a/npc/new_37-1-woodland-mine/miners.txt b/npc/018-1_Woodland_mining_camp/miners.txt
index 99bba7fb..99bba7fb 100644
--- a/npc/new_37-1-woodland-mine/miners.txt
+++ b/npc/018-1_Woodland_mining_camp/miners.txt
diff --git a/npc/new_37-1-woodland-mine/monsters.txt b/npc/018-1_Woodland_mining_camp/monsters.txt
index d38d2695..d38d2695 100644
--- a/npc/new_37-1-woodland-mine/monsters.txt
+++ b/npc/018-1_Woodland_mining_camp/monsters.txt
diff --git a/npc/018-2_Woodland_minning_camp/_import.txt b/npc/018-2_Woodland_minning_camp/_import.txt
new file mode 100644
index 00000000..0f2ce698
--- /dev/null
+++ b/npc/018-2_Woodland_minning_camp/_import.txt
@@ -0,0 +1,9 @@
+map: 018-2.gat
+npc: npc/018-2_Woodland_minning_camp/receptionist.txt
+npc: npc/018-2_Woodland_minning_camp/monsters.txt
+npc: npc/018-2_Woodland_minning_camp/miners.txt
+npc: npc/018-2_Woodland_minning_camp/caul.txt
+npc: npc/018-2_Woodland_minning_camp/books.txt
+npc: npc/018-2_Woodland_minning_camp/angus.txt
+npc: npc/018-2_Woodland_minning_camp/_warps.txt
+npc: npc/018-2_Woodland_minning_camp/_mobs.txt
diff --git a/npc/018-2_Woodland_minning_camp/_mobs.txt b/npc/018-2_Woodland_minning_camp/_mobs.txt
new file mode 100644
index 00000000..756b1956
--- /dev/null
+++ b/npc/018-2_Woodland_minning_camp/_mobs.txt
@@ -0,0 +1,13 @@
+// 018-2 Woodland minning camp mobs
+
+018-2.gat,114,21,4,3	monster	Yellow Slime	1007,1,0,0,Mob018-2::On1007
+
+
+018-2.gat,0,0,0	script	Mob018-2	-1,{
+On1007:
+	set @mobID, 1007;
+	callfunc "MobPoints";
+	break;
+
+	end;
+}
diff --git a/npc/018-2_Woodland_minning_camp/_warps.txt b/npc/018-2_Woodland_minning_camp/_warps.txt
new file mode 100644
index 00000000..a4252c53
--- /dev/null
+++ b/npc/018-2_Woodland_minning_camp/_warps.txt
@@ -0,0 +1,9 @@
+// 018-2 Woodland minning camp warps
+
+018-2.gat,50,29	warp	toOutside	-1,-1,018-1.gat,65,74
+018-2.gat,41,20	warp	toOutside	-1,-1,018-1.gat,65,69
+018-2.gat,20,24	warp	toBasement	-1,-1,018-2.gat,112,27
+018-2.gat,112,26	warp	toFirstFloor	-1,-1,018-2.gat,20,23
+018-2.gat,21,28	warp	toSecondFloor	0,-1,018-2.gat,79,25
+018-2.gat,79,26	warp	toFirstFloor	0,-1,018-2.gat,21,29
+018-2.gat,114,20	warp	toCave	-1,-1,018-3.gat,177,53
diff --git a/npc/new_38-1-woodland-mine/angus.txt b/npc/018-2_Woodland_minning_camp/angus.txt
index 7be183f4..7be183f4 100644
--- a/npc/new_38-1-woodland-mine/angus.txt
+++ b/npc/018-2_Woodland_minning_camp/angus.txt
diff --git a/npc/new_38-1-woodland-mine/books.txt b/npc/018-2_Woodland_minning_camp/books.txt
index dfd4ecda..dfd4ecda 100644
--- a/npc/new_38-1-woodland-mine/books.txt
+++ b/npc/018-2_Woodland_minning_camp/books.txt
diff --git a/npc/new_38-1-woodland-mine/caul.txt b/npc/018-2_Woodland_minning_camp/caul.txt
index e84b507d..e84b507d 100644
--- a/npc/new_38-1-woodland-mine/caul.txt
+++ b/npc/018-2_Woodland_minning_camp/caul.txt
diff --git a/npc/new_38-1-woodland-mine/miners.txt b/npc/018-2_Woodland_minning_camp/miners.txt
index 92261cb5..92261cb5 100644
--- a/npc/new_38-1-woodland-mine/miners.txt
+++ b/npc/018-2_Woodland_minning_camp/miners.txt
diff --git a/npc/new_38-1-woodland-mine/monsters.txt b/npc/018-2_Woodland_minning_camp/monsters.txt
index 7eb44908..7eb44908 100644
--- a/npc/new_38-1-woodland-mine/monsters.txt
+++ b/npc/018-2_Woodland_minning_camp/monsters.txt
diff --git a/npc/new_38-1-woodland-mine/receptionist.txt b/npc/018-2_Woodland_minning_camp/receptionist.txt
index 822d09a3..822d09a3 100644
--- a/npc/new_38-1-woodland-mine/receptionist.txt
+++ b/npc/018-2_Woodland_minning_camp/receptionist.txt
diff --git a/npc/018-3_Cave/_import.txt b/npc/018-3_Cave/_import.txt
new file mode 100644
index 00000000..c716a259
--- /dev/null
+++ b/npc/018-3_Cave/_import.txt
@@ -0,0 +1,3 @@
+map: 018-3.gat
+npc: npc/018-3_Cave/_warps.txt
+npc: npc/018-3_Cave/_mobs.txt
diff --git a/npc/018-3_Cave/_mobs.txt b/npc/018-3_Cave/_mobs.txt
new file mode 100644
index 00000000..f18b58ab
--- /dev/null
+++ b/npc/018-3_Cave/_mobs.txt
@@ -0,0 +1,7 @@
+// 018-3 Cave mobs
+
+
+
+018-3.gat,0,0,0	script	Mob018-3	-1,{
+	end;
+}
diff --git a/npc/018-3_Cave/_warps.txt b/npc/018-3_Cave/_warps.txt
new file mode 100644
index 00000000..9228c2d6
--- /dev/null
+++ b/npc/018-3_Cave/_warps.txt
@@ -0,0 +1,23 @@
+// 018-3 Cave warps
+
+018-3.gat,100,131	warp	toOutside	0,-1,018-1.gat,79,60
+018-3.gat,44,37	warp	toOutside	-1,-1,018-1.gat,112,62
+018-3.gat,49,98	warp	toOutside	-1,-1,018-1.gat,128,57
+018-3.gat,123,165	warp	toOutside	-1,-1,018-1.gat,98,43
+018-3.gat,70,104	warp	toOutside	-1,-1,018-1.gat,69,55
+018-3.gat,50,88	warp	toCave	-1,-1,013-3.gat,69,142
+018-3.gat,146,161	warp	toOutside	0,-1,018-1.gat,153,47
+018-3.gat,64,102	warp	toOutside	-1,-1,018-1.gat,158,35
+018-3.gat,29,165	warp	toOutside	-1,-1,018-1.gat,162,45
+018-3.gat,97,69	warp	toCave	-1,-1,013-3.gat,178,43
+018-3.gat,27,54	warp	toCave	-1,-1,013-3.gat,169,44
+018-3.gat,134,61	warp	toCave	-1,-1,013-3.gat,152,29
+018-3.gat,177,54	warp	toBasement	-1,-1,018-2.gat,114,20
+018-3.gat,172,21	warp	toCave	-1,-1,013-3.gat,123,103
+018-3.gat,177,21	warp	toCave	-1,-1,013-3.gat,147,103
+018-3.gat,27,91	warp	toCave	-1,-1,013-3.gat,158,67
+018-3.gat,90,50	warp	toCave	-1,-1,013-3.gat,67,50
+018-3.gat,71,122	warp	toCave	-1,-1,013-3.gat,111,41
+018-3.gat,174,85	warp	toCave	-1,-1,013-3.gat,62,99
+018-3.gat,102,69	warp	toCave	-1,-1,013-3.gat,68,86
+018-3.gat,179,179	warp	toCave	-1,-1,009-3.gat,157,31
diff --git a/npc/019-1_Snow_field/_import.txt b/npc/019-1_Snow_field/_import.txt
new file mode 100644
index 00000000..3db5780c
--- /dev/null
+++ b/npc/019-1_Snow_field/_import.txt
@@ -0,0 +1,7 @@
+map: 019-1.gat
+npc: npc/019-1_Snow_field/taro.txt
+npc: npc/019-1_Snow_field/snowman.txt
+npc: npc/019-1_Snow_field/santa.txt
+npc: npc/019-1_Snow_field/monsters.txt
+npc: npc/019-1_Snow_field/_warps.txt
+npc: npc/019-1_Snow_field/_mobs.txt
diff --git a/npc/019-1_Snow_field/_mobs.txt b/npc/019-1_Snow_field/_mobs.txt
new file mode 100644
index 00000000..bdc591a7
--- /dev/null
+++ b/npc/019-1_Snow_field/_mobs.txt
@@ -0,0 +1,7 @@
+// 019-1 Snow field mobs
+
+
+
+019-1.gat,0,0,0	script	Mob019-1	-1,{
+	end;
+}
diff --git a/npc/019-1_Snow_field/_warps.txt b/npc/019-1_Snow_field/_warps.txt
new file mode 100644
index 00000000..63b04561
--- /dev/null
+++ b/npc/019-1_Snow_field/_warps.txt
@@ -0,0 +1,3 @@
+// 019-1 Snow field warps
+
+019-1.gat,70,21	warp	ToVillage	2,-1,020-1.gat,70,126
diff --git a/npc/new_10-1-xmas/monsters.txt b/npc/019-1_Snow_field/monsters.txt
index b4515cf2..b4515cf2 100644
--- a/npc/new_10-1-xmas/monsters.txt
+++ b/npc/019-1_Snow_field/monsters.txt
diff --git a/npc/new_10-1-xmas/santa.txt b/npc/019-1_Snow_field/santa.txt
index c53ce55f..c53ce55f 100644
--- a/npc/new_10-1-xmas/santa.txt
+++ b/npc/019-1_Snow_field/santa.txt
diff --git a/npc/new_10-1-xmas/snowman.txt b/npc/019-1_Snow_field/snowman.txt
index 1e5ba412..1e5ba412 100644
--- a/npc/new_10-1-xmas/snowman.txt
+++ b/npc/019-1_Snow_field/snowman.txt
diff --git a/npc/new_10-1-xmas/taro.txt b/npc/019-1_Snow_field/taro.txt
index c5ab3289..c5ab3289 100644
--- a/npc/new_10-1-xmas/taro.txt
+++ b/npc/019-1_Snow_field/taro.txt
diff --git a/npc/020-1/_import.txt b/npc/020-1/_import.txt
new file mode 100644
index 00000000..bae7c91f
--- /dev/null
+++ b/npc/020-1/_import.txt
@@ -0,0 +1,8 @@
+map: 020-1.gat
+npc: npc/020-1/startrek.txt
+npc: npc/020-1/soul-menhir.txt
+npc: npc/020-1/sexchanger.txt
+npc: npc/020-1/monsters.txt
+npc: npc/020-1/amrak.txt
+npc: npc/020-1/_warps.txt
+npc: npc/020-1/_mobs.txt
diff --git a/npc/020-1/_mobs.txt b/npc/020-1/_mobs.txt
new file mode 100644
index 00000000..fa94c232
--- /dev/null
+++ b/npc/020-1/_mobs.txt
@@ -0,0 +1,7 @@
+// 020-1 mobs
+
+
+
+020-1.gat,0,0,0	script	Mob020-1	-1,{
+	end;
+}
diff --git a/npc/020-1/_warps.txt b/npc/020-1/_warps.txt
new file mode 100644
index 00000000..36e0449a
--- /dev/null
+++ b/npc/020-1/_warps.txt
@@ -0,0 +1,9 @@
+// 020-1 warps
+
+020-1.gat,76,38	warp	ToIceCave	1,-1,020-3.gat,31,28
+020-1.gat,47,48	warp	ToClothesShop	-1,-1,020-2.gat,25,33
+020-1.gat,66,52	warp	ToHouse	-1,-1,020-2.gat,72,68
+020-1.gat,70,127	warp	toSnowField	2,-1,019-1.gat,70,22
+020-1.gat,64,82	warp	toInn	-1,-1,020-2.gat,111,31
+020-1.gat,86,46	warp	toWeaponShop	-1,-1,020-2.gat,32,72
+020-1.gat,56,90	warp	ToPotionsShop	-1,-1,020-2.gat,66,25
diff --git a/npc/new_11-1-snow-village/amrak.txt b/npc/020-1/amrak.txt
index b5b52962..b5b52962 100644
--- a/npc/new_11-1-snow-village/amrak.txt
+++ b/npc/020-1/amrak.txt
diff --git a/npc/new_11-1-snow-village/monsters.txt b/npc/020-1/monsters.txt
index 92c95f81..92c95f81 100644
--- a/npc/new_11-1-snow-village/monsters.txt
+++ b/npc/020-1/monsters.txt
diff --git a/npc/new_11-1-snow-village/sexchanger.txt b/npc/020-1/sexchanger.txt
index b26f9e14..b26f9e14 100644
--- a/npc/new_11-1-snow-village/sexchanger.txt
+++ b/npc/020-1/sexchanger.txt
diff --git a/npc/new_11-1-snow-village/soul-menhir.txt b/npc/020-1/soul-menhir.txt
index 7769530c..7769530c 100644
--- a/npc/new_11-1-snow-village/soul-menhir.txt
+++ b/npc/020-1/soul-menhir.txt
diff --git a/npc/new_11-1-snow-village/startrek.txt b/npc/020-1/startrek.txt
index 72afe5e3..72afe5e3 100644
--- a/npc/new_11-1-snow-village/startrek.txt
+++ b/npc/020-1/startrek.txt
diff --git a/npc/020-2/_import.txt b/npc/020-2/_import.txt
new file mode 100644
index 00000000..2190955a
--- /dev/null
+++ b/npc/020-2/_import.txt
@@ -0,0 +1,5 @@
+map: 020-2.gat
+npc: npc/020-2/shops.txt
+npc: npc/020-2/furquest.txt
+npc: npc/020-2/_warps.txt
+npc: npc/020-2/_mobs.txt
diff --git a/npc/020-2/_mobs.txt b/npc/020-2/_mobs.txt
new file mode 100644
index 00000000..4289bb7e
--- /dev/null
+++ b/npc/020-2/_mobs.txt
@@ -0,0 +1,7 @@
+// 020-2 mobs
+
+
+
+020-2.gat,0,0,0	script	Mob020-2	-1,{
+	end;
+}
diff --git a/npc/020-2/_warps.txt b/npc/020-2/_warps.txt
new file mode 100644
index 00000000..2306316d
--- /dev/null
+++ b/npc/020-2/_warps.txt
@@ -0,0 +1,7 @@
+// 020-2 warps
+
+020-2.gat,25,35	warp	ToOutside	-1,-1,020-1.gat,47,50
+020-2.gat,64,25	warp	ToOutside	-1,-1,020-1.gat,55,90
+020-2.gat,111,32	warp	ToOutside	-1,-1,020-1.gat,64,83
+020-2.gat,32,73	warp	ToOutside	-1,-1,020-1.gat,84,48
+020-2.gat,72,70	warp	ToOutside	-1,-1,020-1.gat,66,54
diff --git a/npc/new_13-1-snow-village-shops/furquest.txt b/npc/020-2/furquest.txt
index 01b6c546..01b6c546 100644
--- a/npc/new_13-1-snow-village-shops/furquest.txt
+++ b/npc/020-2/furquest.txt
diff --git a/npc/new_13-1-snow-village-shops/shops.txt b/npc/020-2/shops.txt
index eb84181e..eb84181e 100644
--- a/npc/new_13-1-snow-village-shops/shops.txt
+++ b/npc/020-2/shops.txt
diff --git a/npc/020-3_Ice_cave/_import.txt b/npc/020-3_Ice_cave/_import.txt
new file mode 100644
index 00000000..98550f66
--- /dev/null
+++ b/npc/020-3_Ice_cave/_import.txt
@@ -0,0 +1,4 @@
+map: 020-3.gat
+npc: npc/020-3_Ice_cave/monsters.txt
+npc: npc/020-3_Ice_cave/_warps.txt
+npc: npc/020-3_Ice_cave/_mobs.txt
diff --git a/npc/020-3_Ice_cave/_mobs.txt b/npc/020-3_Ice_cave/_mobs.txt
new file mode 100644
index 00000000..12acdfe0
--- /dev/null
+++ b/npc/020-3_Ice_cave/_mobs.txt
@@ -0,0 +1,19 @@
+// 020-3 Ice cave mobs
+
+020-3.gat,40,36,29,4	monster	Bat	1017,1,0,0,Mob020-3::On1017
+020-3.gat,40,49,34,7	monster	Violet	1018,1,0,0,Mob020-3::On1018
+
+
+020-3.gat,0,0,0	script	Mob020-3	-1,{
+On1017:
+	set @mobID, 1017;
+	callfunc "MobPoints";
+	break;
+
+On1018:
+	set @mobID, 1018;
+	callfunc "MobPoints";
+	break;
+
+	end;
+}
diff --git a/npc/020-3_Ice_cave/_warps.txt b/npc/020-3_Ice_cave/_warps.txt
new file mode 100644
index 00000000..51539391
--- /dev/null
+++ b/npc/020-3_Ice_cave/_warps.txt
@@ -0,0 +1,4 @@
+// 020-3 Ice cave warps
+
+020-3.gat,31,25	warp	toOutside	-1,-1,020-1.gat,76,37
+020-3.gat,25,22	warp	toIceCave2	-1,-1,020-4.gat,36,34
diff --git a/npc/new_12-1-ice-cave/monsters.txt b/npc/020-3_Ice_cave/monsters.txt
index b9dce5f5..b9dce5f5 100644
--- a/npc/new_12-1-ice-cave/monsters.txt
+++ b/npc/020-3_Ice_cave/monsters.txt
diff --git a/npc/020-4_Ice_cave/_import.txt b/npc/020-4_Ice_cave/_import.txt
new file mode 100644
index 00000000..925010e5
--- /dev/null
+++ b/npc/020-4_Ice_cave/_import.txt
@@ -0,0 +1,4 @@
+map: 020-4.gat
+npc: npc/020-4_Ice_cave/monsters.txt
+npc: npc/020-4_Ice_cave/_warps.txt
+npc: npc/020-4_Ice_cave/_mobs.txt
diff --git a/npc/020-4_Ice_cave/_mobs.txt b/npc/020-4_Ice_cave/_mobs.txt
new file mode 100644
index 00000000..99c21fea
--- /dev/null
+++ b/npc/020-4_Ice_cave/_mobs.txt
@@ -0,0 +1,7 @@
+// 020-4 Ice cave mobs
+
+
+
+020-4.gat,0,0,0	script	Mob020-4	-1,{
+	end;
+}
diff --git a/npc/020-4_Ice_cave/_warps.txt b/npc/020-4_Ice_cave/_warps.txt
new file mode 100644
index 00000000..a02cadc4
--- /dev/null
+++ b/npc/020-4_Ice_cave/_warps.txt
@@ -0,0 +1,3 @@
+// 020-4 Ice cave warps
+
+020-4.gat,36,33	warp	toIceCave1	-1,-1,020-3.gat,25,23
diff --git a/npc/new_21-1-ice-cave2/monsters.txt b/npc/020-4_Ice_cave/monsters.txt
index b1a238b3..b1a238b3 100644
--- a/npc/new_21-1-ice-cave2/monsters.txt
+++ b/npc/020-4_Ice_cave/monsters.txt
diff --git a/npc/021-1_Tulimshar/_import.txt b/npc/021-1_Tulimshar/_import.txt
new file mode 100644
index 00000000..27ebcad7
--- /dev/null
+++ b/npc/021-1_Tulimshar/_import.txt
@@ -0,0 +1,3 @@
+map: 021-1.gat
+npc: npc/021-1_Tulimshar/_warps.txt
+npc: npc/021-1_Tulimshar/_mobs.txt
diff --git a/npc/021-1_Tulimshar/_mobs.txt b/npc/021-1_Tulimshar/_mobs.txt
new file mode 100644
index 00000000..e488bf54
--- /dev/null
+++ b/npc/021-1_Tulimshar/_mobs.txt
@@ -0,0 +1,7 @@
+// 021-1 Tulimshar mobs
+
+
+
+021-1.gat,0,0,0	script	Mob021-1	-1,{
+	end;
+}
diff --git a/npc/021-1_Tulimshar/_warps.txt b/npc/021-1_Tulimshar/_warps.txt
new file mode 100644
index 00000000..7e907749
--- /dev/null
+++ b/npc/021-1_Tulimshar/_warps.txt
@@ -0,0 +1,2 @@
+// 021-1 Tulimshar warps
+
diff --git a/npc/_import.txt b/npc/_import.txt
new file mode 100644
index 00000000..7a74dfed
--- /dev/null
+++ b/npc/_import.txt
@@ -0,0 +1,41 @@
+import: npc/001-1_Tulimshar/_import.txt
+import: npc/001-2_Tulimshar/_import.txt
+import: npc/001-3_Tulimshar_arena/_import.txt
+import: npc/002-1_Sandstorm/_import.txt
+import: npc/002-3_Desert_mines/_import.txt
+import: npc/002-4_Desert_mines/_import.txt
+import: npc/003-1_Beach/_import.txt
+import: npc/004-1_Beach/_import.txt
+import: npc/005-1_Snake_desert/_import.txt
+import: npc/005-3_Snake_pit/_import.txt
+import: npc/006-1_Desert_mountains/_import.txt
+import: npc/006-3_Desert_mountain_caves/_import.txt
+import: npc/007-1_Woodland/_import.txt
+import: npc/008-1_Hurnscald_outskirts/_import.txt
+import: npc/009-1_Hurnscald/_import.txt
+import: npc/009-2_Hurnscald/_import.txt
+import: npc/009-3_Cave_beneath_Hurnscald/_import.txt
+import: npc/010-1_Woodland/_import.txt
+import: npc/010-2_Dimond's_Cove/_import.txt
+import: npc/011-1_Woodland/_import.txt
+import: npc/011-3_Hermit's_cave/_import.txt
+import: npc/011-4_Lake_cave/_import.txt
+import: npc/012-1_Woodland_Hills/_import.txt
+import: npc/012-3_Cave/_import.txt
+import: npc/013-1_Woodland_hills/_import.txt
+import: npc/013-2_Magic_house/_import.txt
+import: npc/013-3_Cave/_import.txt
+import: npc/014-1_Woodland/_import.txt
+import: npc/014-3_Cave/_import.txt
+import: npc/015-1_Woodland/_import.txt
+import: npc/016-1_Woodland/_import.txt
+import: npc/017-1_Woodland_hills/_import.txt
+import: npc/018-1_Woodland_mining_camp/_import.txt
+import: npc/018-2_Woodland_minning_camp/_import.txt
+import: npc/018-3_Cave/_import.txt
+import: npc/019-1_Snow_field/_import.txt
+import: npc/020-1/_import.txt
+import: npc/020-2/_import.txt
+import: npc/020-3_Ice_cave/_import.txt
+import: npc/020-4_Ice_cave/_import.txt
+import: npc/021-1_Tulimshar/_import.txt
diff --git a/npc/new_1-1-western-desert/passages.txt b/npc/new_1-1-western-desert/passages.txt
deleted file mode 100644
index 61212ec0..00000000
--- a/npc/new_1-1-western-desert/passages.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-new_1-1.gat,19,94   warp caveentrance 1,1,new_2-1.gat,37,31
-new_1-1.gat,111,79  warp eastdesert   2,2,new_7-1.gat,23,40
-new_1-1.gat,11,66   warp tobeach      1,2,new_15-1.gat,168,76
-new_1-1.gat,56,12   warp totown       5,1,new_3-1.gat,44,80
-new_1-1.gat,27,12   warp tobeach      3,1,new_34-1.gat,84,111
diff --git a/npc/new_10-1-xmas/passages.txt b/npc/new_10-1-xmas/passages.txt
deleted file mode 100644
index 6a879b95..00000000
--- a/npc/new_10-1-xmas/passages.txt
+++ /dev/null
@@ -1 +0,0 @@
-new_10-1.gat,69,19	warp	tovillage	4,1,new_11-1.gat,69,127
\ No newline at end of file
diff --git a/npc/new_11-1-snow-village/passages.txt b/npc/new_11-1-snow-village/passages.txt
deleted file mode 100644
index b42939ec..00000000
--- a/npc/new_11-1-snow-village/passages.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-new_11-1.gat,76,38	warp	tocave	0,0,new_12-1.gat,31,28
-new_11-1.gat,69,128	warp	tomap	3,0,new_10-1.gat,69,21
-
-// outside -> Clothes shop
-new_11-1.gat,47,49	warp	inside1	0,0,new_13-1.gat,25,33
-// outside -> Potions shop
-new_11-1.gat,57,90	warp	inside2	0,0,new_13-1.gat,66,25
-// outside -> INN
-new_11-1.gat,64,83	warp	inside3	0,0,new_13-1.gat,111,30
-// outside -> Weapons shop
-new_11-1.gat,87,47	warp	inside4	0,0,new_13-1.gat,32,71
-// outside -> House
-new_11-1.gat,66,53	warp	inside5	0,0,new_13-1.gat,72,68
\ No newline at end of file
diff --git a/npc/new_12-1-ice-cave/passages.txt b/npc/new_12-1-ice-cave/passages.txt
deleted file mode 100644
index 3db46ebe..00000000
--- a/npc/new_12-1-ice-cave/passages.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-new_12-1.gat,31,25	warp	totown	2,1,new_11-1.gat,76,36
-new_12-1.gat,26,23	warp	toice2	1,0,new_21-1.gat,37,36
diff --git a/npc/new_13-1-snow-village-shops/passages.txt b/npc/new_13-1-snow-village-shops/passages.txt
deleted file mode 100644
index afae9fe4..00000000
--- a/npc/new_13-1-snow-village-shops/passages.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-// Clothes shop -> outside
-new_13-1.gat,25,36	warp	outside1	0,0,new_11-1.gat,47,50
-// Potions shop -> outside
-new_13-1.gat,64,25	warp	outside2	1,1,new_11-1.gat,55,90
-// INN -> outside
-new_13-1.gat,111,33	warp	outside3	0,0,new_11-1.gat,64,84
-// Weapons shop -> outside
-new_13-1.gat,32,74	warp	outside4	0,0,new_11-1.gat,86,48
-// House -> outside
-new_13-1.gat,72,71	warp	outside5	0,0,new_11-1.gat,66,54
diff --git a/npc/new_14-1-south-woodland/passages.txt b/npc/new_14-1-south-woodland/passages.txt
deleted file mode 100644
index 787de46c..00000000
--- a/npc/new_14-1-south-woodland/passages.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-new_14-1.gat,131,53       warp    tofield 2,2,new_16-1.gat,25,53
-new_14-1.gat,48,23       warp    tofield 1,1,new_9-1.gat,46,99
-new_14-1.gat,14,54       warp    tomap31 0,2,new_31-1.gat,92,54
-new_14-1.gat,55,104       warp    tomap32 3,1,new_32-1.gat,56,21
\ No newline at end of file
diff --git a/npc/new_15-1-woodland-desert/passages.txt b/npc/new_15-1-woodland-desert/passages.txt
deleted file mode 100644
index b9969e9b..00000000
--- a/npc/new_15-1-woodland-desert/passages.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-new_15-1.gat,170,75  warp todesert   2,2,new_1-1.gat,15,66
-new_15-1.gat,20,23   warp towoodland 2,0,new_16-1.gat,120,112
-new_15-1.gat,140,19  warp tobeach    2,0,new_34-1.gat,37,109
diff --git a/npc/new_16-1-south-east-woodland/passages.txt b/npc/new_16-1-south-east-woodland/passages.txt
deleted file mode 100644
index 4696b482..00000000
--- a/npc/new_16-1-south-east-woodland/passages.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-new_16-1.gat,120,114       warp    todesert 3,0,new_15-1.gat,20,24
-new_16-1.gat,22,54       warp    towoodland 2,2,new_14-1.gat,127,53
-new_16-1.gat,68,22       warp    warp2 3,1,new_18-1.gat,78,100
-new_16-1.gat,122,21       warp    warp2 1,1,new_18-1.gat,132,98
diff --git a/npc/new_17-1-cave-big/passages.txt b/npc/new_17-1-cave-big/passages.txt
deleted file mode 100644
index 8192c69e..00000000
--- a/npc/new_17-1-cave-big/passages.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-new_17-1.gat,71,10	warp firstlvl 3,0,new_4-1.gat,31,24
-new_17-1.gat,129,87	warp cave 0,0,new_35-1.gat,21,55
diff --git a/npc/new_18-1-woodland-village/passages.txt b/npc/new_18-1-woodland-village/passages.txt
deleted file mode 100644
index d8fdecb9..00000000
--- a/npc/new_18-1-woodland-village/passages.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-// West gate
-new_18-1.gat,54,61       warp    warp1 0,1,new_19-1.gat,26,36
-
-// South gate
-new_18-1.gat,78,80       warp    warp1 3,0,new_19-1.gat,48,54
-
-// East gate
-new_18-1.gat,128,60       warp    warp1 0,1,new_19-1.gat,96,35
-
-// North gate
-new_18-1.gat,78,49       warp    warp1 3,0,new_19-1.gat,48,24
-
-// To woodland
-new_18-1.gat,78,101       warp    warp1 3,1,new_16-1.gat,68,23
-
-new_18-1.gat,132,100       warp    warp1 1,1,new_16-1.gat,122,23
-
-// Mine
-new_18-1.gat,79,17	warp	woodland	2,-1,new_37-1.gat,78,96
diff --git a/npc/new_19-1-woodland-village/passages.txt b/npc/new_19-1-woodland-village/passages.txt
deleted file mode 100644
index 990b50e7..00000000
--- a/npc/new_19-1-woodland-village/passages.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-// West gate
-new_19-1.gat,23,36       warp    warp2 1,1,new_18-1.gat,53,61
-
-// South gate
-new_19-1.gat,48,56       warp    warp2 3,1,new_18-1.gat,78,82
-
-// East gate
-new_19-1.gat,97,36       warp    warp2 1,1,new_18-1.gat,129,60
-
-// North gate
-new_19-1.gat,48,23       warp    warp2 3,1,new_18-1.gat,78,48
-
-// indoor <-> outdoor and indoor <-> indoor
-
-// Inn
-new_19-1.gat,35,29      warp out-in 1,1,new_20-1.gat,50,55
-
-// Archer Shop
-new_19-1.gat,59,33      warp out-in 0,0,new_20-1.gat,95,29
-
-// Potion Shop
-new_19-1.gat,71,30      warp out-in 0,0,new_20-1.gat,130,25
-
-// Doctor
-new_19-1.gat,80,31      warp out-in 0,0,new_20-1.gat,149,66
-
-// Blacksmith
-
-// Mayor
-new_19-1.gat,72,44      warp out-in 0,0,new_20-1.gat,113,77
diff --git a/npc/new_2-1-cave1/monsters.txt b/npc/new_2-1-cave1/monsters.txt
deleted file mode 100644
index b673ef65..00000000
--- a/npc/new_2-1-cave1/monsters.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-// Map: new_2-1
-// This is the Desert mines south of Tulimshar -- level 1.
-//
-
-new_2-1.gat,0,0,0,0	monster	RedSlime	1008,30,2500,0,Mob2::OnRedSlime
-new_2-1.gat,0,0,0,0	monster	BlackScorpion	1009,15,2500,0,Mob2::OnBlackScorpion
-
-new_2-1.gat,0,0,0	script	Mob2	-1,{
-OnRedSlime:
-	set @mobID, 1008;
-	callfunc "MobPoints";
-	break;
-
-OnBlackScorpion:
-	set @mobID, 1009;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}
diff --git a/npc/new_2-1-cave1/passages.txt b/npc/new_2-1-cave1/passages.txt
deleted file mode 100644
index e11badd6..00000000
--- a/npc/new_2-1-cave1/passages.txt
+++ /dev/null
@@ -1 +0,0 @@
-new_2-1.gat,36,30	warp	caveexit	3,0,new_1-1.gat,25,95
diff --git a/npc/new_20-1-woodland-village/passages.txt b/npc/new_20-1-woodland-village/passages.txt
deleted file mode 100644
index fab35171..00000000
--- a/npc/new_20-1-woodland-village/passages.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-// West gate
-new_18-1.gat,54,61       warp    warp1 0,1,new_19-1.gat,26,36
-new_19-1.gat,23,36       warp    warp2 1,1,new_18-1.gat,53,61
-
-// South gate
-new_18-1.gat,78,80       warp    warp1 3,0,new_19-1.gat,48,54
-new_19-1.gat,48,56       warp    warp2 3,1,new_18-1.gat,78,82
-
-// East gate
-new_18-1.gat,128,60       warp    warp1 0,1,new_19-1.gat,96,35
-new_19-1.gat,97,36       warp    warp2 1,1,new_18-1.gat,129,60
-
-// North gate
-new_18-1.gat,78,49       warp    warp1 3,0,new_19-1.gat,48,24
-new_19-1.gat,48,23       warp    warp2 3,1,new_18-1.gat,78,48
-
-// To woodland
-new_18-1.gat,78,101       warp    warp1 3,1,new_16-1.gat,68,23
-new_16-1.gat,68,22       warp    warp2 3,1,new_18-1.gat,78,100
-
-new_18-1.gat,132,100       warp    warp1 1,1,new_16-1.gat,122,23
-new_16-1.gat,122,21       warp    warp2 1,1,new_18-1.gat,132,98
-
-new_9-1.gat,124,61       warp    warp1 1,3,new_18-1.gat,27,61
-new_18-1.gat,25,61       warp    warp2 1,3,new_9-1.gat,122,61
-
-// indoor <-> outdoor and indoor <-> indoor
-
-// Inn
-new_19-1.gat,35,29      warp out-in 1,1,new_20-1.gat,50,55
-new_20-1.gat,50,56      warp in-out 1,1,new_19-1.gat,35,31
-new_20-1.gat,73,45      warp in-1f 2,1,new_20-1.gat,74,23
-new_20-1.gat,74,24      warp 1f-in 2,1,new_20-1.gat,73,46
-new_20-1.gat,74,53      warp 1f-1b 0,0,new_20-1.gat,143,81
-new_20-1.gat,143,79      warp 1b-1f 0,0,new_20-1.gat,74,52
-new_20-1.gat,147,89     warp 1b-cv 0,0,new_35-1.gat,173,22
-
-// Archer Shop
-new_19-1.gat,59,33      warp out-in 0,0,new_20-1.gat,95,29
-new_20-1.gat,95,31      warp in-out 0,0,new_19-1.gat,59,34
-
-// Potion Shop
-new_19-1.gat,71,30      warp out-in 0,0,new_20-1.gat,130,25
-new_20-1.gat,130,27      warp in-out 0,0,new_19-1.gat,71,31
-
-// Doctor
-new_19-1.gat,80,31      warp out-in 0,0,new_20-1.gat,149,66
-new_20-1.gat,149,68     warp in-out 0,0,new_19-1.gat,80,32
-new_20-1.gat,154,62     warp in-1f 1,0,new_20-1.gat,154,46
-new_20-1.gat,154,47     warp 1f-in 1,0,new_20-1.gat,154,63
-new_20-1.gat,143,43     warp 1f-2f 1,0,new_20-1.gat,143,24
-new_20-1.gat,143,26     warp 2f-1f 1,0,new_20-1.gat,143,44
-
-// Blacksmith
-new_19-1.gat,91,46      warp out-in 0,0,new_20-1.gat,181,66
-new_20-1.gat,181,68     warp in-out 1,0,new_19-1.gat,91,47
-
-// Mayor
-new_19-1.gat,72,44      warp out-in 0,0,new_20-1.gat,113,77
-new_20-1.gat,113,79     warp in-out 1,0,new_19-1.gat,72,45
-new_20-1.gat,113,68     warp in-1f 1,0,new_20-1.gat,113,46
-new_20-1.gat,113,47     warp 1f-in 1,0,new_20-1.gat,113,69
-
-// General Store
-new_19-1.gat,58,46      warp out-in 0,0,new_20-1.gat,27,105
-new_20-1.gat,27,107     warp in-out 0,0,new_19-1.gat,58,47
diff --git a/npc/new_21-1-ice-cave2/passages.txt b/npc/new_21-1-ice-cave2/passages.txt
deleted file mode 100644
index 6e419384..00000000
--- a/npc/new_21-1-ice-cave2/passages.txt
+++ /dev/null
@@ -1 +0,0 @@
-new_21-1.gat,36,34	warp	toice1	1,0,new_12-1.gat,26,25
diff --git a/npc/new_22-1-snake-cave/passages.txt b/npc/new_22-1-snake-cave/passages.txt
deleted file mode 100644
index adf4468d..00000000
--- a/npc/new_22-1-snake-cave/passages.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-new_22-1.gat,52,33	warp	fromsnakecaveN	0,0,new_7-1.gat,89,24
-new_22-1.gat,33,82	warp	fromsnakecaveS	0,0,new_7-1.gat,71,76
\ No newline at end of file
diff --git a/npc/new_23-1-dimonds-cove/passages.txt b/npc/new_23-1-dimonds-cove/passages.txt
deleted file mode 100644
index 5d9fcc8b..00000000
--- a/npc/new_23-1-dimonds-cove/passages.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-new_14-1.gat,36,94  warp    toDimondsCove   0,0,new_23-1.gat,32,44
-new_23-1.gat,32,46  warp    fromDimondsCove 0,0,new_14-1.gat,36,95
-
-
-new_23-1.gat,27,24  warp    toBasement      0,1,new_23-1.gat,35,68
-new_23-1.gat,37,68  warp    fromBasement    0,1,new_23-1.gat,28,24
-
-new_23-1.gat,39,26  warp    toSecond        0,0,new_23-1.gat,82,26
-new_23-1.gat,40,26  warp    toSecond        0,0,new_23-1.gat,83,26
-new_23-1.gat,41,26  warp    toSecond        0,0,new_23-1.gat,84,26
-new_23-1.gat,82,29  warp    toFirst         0,0,new_23-1.gat,39,27
-new_23-1.gat,83,29  warp    toFirst         0,0,new_23-1.gat,40,27
-new_23-1.gat,84,29  warp    toFirst         0,0,new_23-1.gat,41,27
-
-new_23-1.gat,66,27  warp    toThird         0,0,new_23-1.gat,66,71
-new_23-1.gat,67,27  warp    toThird         0,0,new_23-1.gat,67,71
-new_23-1.gat,68,27  warp    toThird         0,0,new_23-1.gat,68,71
-new_23-1.gat,66,73  warp    toSecond        0,0,new_23-1.gat,66,28
-new_23-1.gat,67,73  warp    toSecond        0,0,new_23-1.gat,67,28
-new_23-1.gat,68,73  warp    toSecond        0,0,new_23-1.gat,68,28
-
diff --git a/npc/new_24-1-eastern-desert-mountain-passage/passages.txt b/npc/new_24-1-eastern-desert-mountain-passage/passages.txt
deleted file mode 100644
index ae6d5a01..00000000
--- a/npc/new_24-1-eastern-desert-mountain-passage/passages.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-new_24-1.gat,19,32	warp	toEastDesert	0,0,new_7-1.gat,160,101
-new_24-1.gat,20,31	warp	toEastDesert	0,0,new_7-1.gat,161,100
-new_24-1.gat,21,30	warp	toEastDesert	0,0,new_7-1.gat,162,99
-new_24-1.gat,22,29	warp	toEastDesert	0,0,new_7-1.gat,163,98
-new_24-1.gat,23,28	warp	toEastDesert	0,0,new_7-1.gat,164,97
-new_24-1.gat,24,27	warp	toEastDesert	0,0,new_7-1.gat,165,96
-new_24-1.gat,25,26	warp	toEastDesert	0,0,new_7-1.gat,166,95
-new_24-1.gat,26,25	warp	toEastDesert	0,0,new_7-1.gat,167,94
-new_24-1.gat,27,24	warp	toEastDesert	0,0,new_7-1.gat,168,93
-new_24-1.gat,28,23	warp	toEastDesert	0,0,new_7-1.gat,169,92
-new_24-1.gat,29,22	warp	toEastDesert	0,0,new_7-1.gat,170,91
-new_24-1.gat,30,21	warp	toEastDesert	0,0,new_7-1.gat,171,90
-new_24-1.gat,31,20	warp	toEastDesert	0,0,new_7-1.gat,172,89
-new_24-1.gat,40,26	warp	toMountainCave	0,0,new_25-1.gat,40,27
-new_24-1.gat,55,27	warp	toMountainCave	0,0,new_25-1.gat,55,28
-new_24-1.gat,62,30	warp	toMountainCave	0,0,new_25-1.gat,62,31
-new_24-1.gat,86,24	warp	toMountainCave	0,0,new_25-1.gat,86,25
-new_24-1.gat,91,24	warp	toMountainCave	0,0,new_25-1.gat,91,25
-new_24-1.gat,122,24	warp	toMountainCave	0,0,new_25-1.gat,122,25
-new_24-1.gat,77,44	warp	toMountainCave	0,0,new_25-1.gat,77,45
-new_24-1.gat,104,44	warp	toMountainCave	0,0,new_25-1.gat,104,45
-new_24-1.gat,114,49	warp	toMountainCave	0,0,new_25-1.gat,114,50
-new_24-1.gat,110,56	warp	toMountainCave	0,0,new_25-1.gat,110,57
-new_24-1.gat,125,59	warp	toMountainCave	0,0,new_25-1.gat,125,60
-new_24-1.gat,60,58	warp	toMountainCave	0,0,new_25-1.gat,60,69
-new_24-1.gat,92,63	warp	toMountainCave	0,0,new_25-1.gat,92,64
-new_24-1.gat,112,74	warp	toMountainCave	0,0,new_25-1.gat,112,75
-new_24-1.gat,51,90	warp	toMountainCave	0,0,new_25-1.gat,51,91
-new_24-1.gat,74,90	warp	toMountainCave	0,0,new_25-1.gat,74,91
-new_24-1.gat,38,121	warp	toMountainCave	0,0,new_25-1.gat,38,122
-new_24-1.gat,79,120	warp	toMountainCave	0,0,new_25-1.gat,79,121
-new_24-1.gat,121,110	warp	toMountainCave	0,0,new_25-1.gat,121,111
diff --git a/npc/new_25-1-eastern-desert-cave/passages.txt b/npc/new_25-1-eastern-desert-cave/passages.txt
deleted file mode 100644
index 9fc66eff..00000000
--- a/npc/new_25-1-eastern-desert-cave/passages.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-new_25-1.gat,40,26	warp	toMountainPass	0,0,new_24-1.gat,40,27
-new_25-1.gat,55,27	warp	toMountainPass	0,0,new_24-1.gat,55,28
-new_25-1.gat,62,30	warp	toMountainPass	0,0,new_24-1.gat,62,31
-new_25-1.gat,86,24	warp	toMountainPass	0,0,new_24-1.gat,86,25
-new_25-1.gat,91,24	warp	toMountainPass	0,0,new_24-1.gat,91,25
-new_25-1.gat,122,24	warp	toMountainPass	0,0,new_24-1.gat,122,25
-new_25-1.gat,77,44	warp	toMountainPass	0,0,new_24-1.gat,77,45
-new_25-1.gat,104,44	warp	toMountainPass	0,0,new_24-1.gat,104,45
-new_25-1.gat,114,49	warp	toMountainPass	0,0,new_24-1.gat,114,50
-new_25-1.gat,110,56	warp	toMountainPass	0,0,new_24-1.gat,110,57
-new_25-1.gat,125,59	warp	toMountainPass	0,0,new_24-1.gat,125,60
-new_25-1.gat,60,68	warp	toMountainPass	0,0,new_24-1.gat,60,59
-new_25-1.gat,92,63	warp	toMountainPass	0,0,new_24-1.gat,92,64
-new_25-1.gat,112,74	warp	toMountainPass	0,0,new_24-1.gat,112,75
-new_25-1.gat,51,90	warp	toMountainPass	0,0,new_24-1.gat,51,91
-new_25-1.gat,74,90	warp	toMountainPass	0,0,new_24-1.gat,74,91
-new_25-1.gat,38,121	warp	toMountainPass	0,0,new_24-1.gat,38,122
-new_25-1.gat,79,120	warp	toMountainPass	0,0,new_24-1.gat,79,121
-new_25-1.gat,121,110	warp	toMountainPass	0,0,new_24-1.gat,121,111
diff --git a/npc/new_26-1-hill1/passages.txt b/npc/new_26-1-hill1/passages.txt
deleted file mode 100644
index 6d5cabe0..00000000
--- a/npc/new_26-1-hill1/passages.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-new_26-1.gat,132,164	warp	south	        2,0,new_9-1.gat,72,16
-new_26-1.gat,98,99	warp	lowtunnel1	0,0,new_27-1.gat,36,81
-new_26-1.gat,109,92	warp	hightunnel1	0,0,new_27-1.gat,79,73
-new_26-1.gat,123,90	warp	npccave		0,0,new_27-1.gat,38,156
-new_26-1.gat,92,104	warp	lowtunnel2	0,0,new_27-1.gat,270,111
-new_26-1.gat,65,126	warp	hightunnel2	0,0,new_27-1.gat,176,139
-new_26-1.gat,44,88	warp	starttunnel3	0,0,new_27-1.gat,354,187
-new_26-1.gat,41,48	warp	realhightunnel3	0,0,new_27-1.gat,353,78
-new_26-1.gat,51,39	warp	high1tunnel3	0,0,new_27-1.gat,370,45
-new_26-1.gat,148,67	warp	high2tunnel3	0,0,new_27-1.gat,475,104
-new_26-1.gat,150,59	warp	map26to28	0,4,new_28-1.gat,21,75
diff --git a/npc/new_27-1-hill2/passages.txt b/npc/new_27-1-hill2/passages.txt
deleted file mode 100644
index b85404fb..00000000
--- a/npc/new_27-1-hill2/passages.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-new_27-1.gat,36,83	warp	lowerexit	1,0,new_26-1.gat,98,100
-new_27-1.gat,79,75	warp	higherexit	1,0,new_26-1.gat,109,93
-new_27-1.gat,38,157	warp	caveexit	1,0,new_26-1.gat,123,91
-new_27-1.gat,270,112	warp	lowerexit	0,1,new_26-1.gat,92,105
-new_27-1.gat,176,138	warp	higherexit	0,0,new_26-1.gat,65,127
-new_27-1.gat,354,189	warp	startexit	1,0,new_26-1.gat,44,89
-new_27-1.gat,353,80	warp	realexit	1,0,new_26-1.gat,41,48
-new_27-1.gat,370,47	warp	higher1exit	1,0,new_26-1.gat,51,40
-new_27-1.gat,474,104	warp	higher2exit	0,1,new_26-1.gat,146,67
diff --git a/npc/new_28-1-hillwest/passages.txt b/npc/new_28-1-hillwest/passages.txt
deleted file mode 100644
index ed0ea552..00000000
--- a/npc/new_28-1-hillwest/passages.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-new_28-1.gat,20,74	warp	map28to26	0,4,new_26-1.gat,148,60
-new_28-1.gat,45,21	warp	map28to33	1,0,new_33-1.gat,46,104
-new_28-1.gat,43,90	warp	map28to36	0,0,new_36-1.gat,63,41
diff --git a/npc/new_29-1-west-woodland/passages.txt b/npc/new_29-1-west-woodland/passages.txt
deleted file mode 100644
index 1bfb67a7..00000000
--- a/npc/new_29-1-west-woodland/passages.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-new_29-1.gat,109,90	warp	map29to9	0,3,new_9-1.gat,31,60
-new_29-1.gat,93,58	warp	map29to30low	0,0,new_30-1.gat,56,172
-new_29-1.gat,76,38	warp	map29to30high	0,0,new_30-1.gat,35,33
\ No newline at end of file
diff --git a/npc/new_3-1-tulimshar/passages.txt b/npc/new_3-1-tulimshar/passages.txt
deleted file mode 100644
index 2ce31455..00000000
--- a/npc/new_3-1-tulimshar/passages.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-//
-
-new_3-1.gat,42,88	warp	tofield	5,2,new_1-1.gat,58,17
-new_3-1.gat,32,71	warp	toinn	0,0,new_8-1.gat,25,34
-new_3-1.gat,75,41	warp	tohouse	0,0,new_8-1.gat,71,72
diff --git a/npc/new_30-1-west-woodland-cave/passages.txt b/npc/new_30-1-west-woodland-cave/passages.txt
deleted file mode 100644
index 9ef108a2..00000000
--- a/npc/new_30-1-west-woodland-cave/passages.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-new_30-1.gat,91,108	warp	lowtohigh	0,0,new_30-1.gat,103,52
-new_30-1.gat,101,54	warp	hightolow	5,0,new_30-1.gat,91,109
-new_30-1.gat,56,174	warp	tomap29low	2,0,new_29-1.gat,93,59
-new_30-1.gat,35,32	warp	tomap29high	0,0,new_29-1.gat,76,39
\ No newline at end of file
diff --git a/npc/new_31-1-southwest-woodland/passages.txt b/npc/new_31-1-southwest-woodland/passages.txt
deleted file mode 100644
index 4adfcdcd..00000000
--- a/npc/new_31-1-southwest-woodland/passages.txt
+++ /dev/null
@@ -1 +0,0 @@
-new_31-1.gat,93,54	warp	map31to14	0,1,new_14-1.gat,15,54
\ No newline at end of file
diff --git a/npc/new_32-1-south-woodland-2/passages.txt b/npc/new_32-1-south-woodland-2/passages.txt
deleted file mode 100644
index 06fba664..00000000
--- a/npc/new_32-1-south-woodland-2/passages.txt
+++ /dev/null
@@ -1 +0,0 @@
-new_32-1.gat,55,20	warp	map32to14	3,0,new_14-1.gat,56,103
diff --git a/npc/new_33-1-hill-northwest/passages.txt b/npc/new_33-1-hill-northwest/passages.txt
deleted file mode 100644
index f026428c..00000000
--- a/npc/new_33-1-hill-northwest/passages.txt
+++ /dev/null
@@ -1 +0,0 @@
-new_33-1.gat,46,105	warp	map33to28	2,-1,new_28-1.gat,45,22
diff --git a/npc/new_34-1-north-beach/passages.txt b/npc/new_34-1-north-beach/passages.txt
deleted file mode 100644
index 198c55b4..00000000
--- a/npc/new_34-1-north-beach/passages.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-new_34-1.gat,83,113 warp todesert 3,1,new_1-1.gat,29,15
-new_34-1.gat,36,111 warp tobeach  3,1,new_15-1.gat,141,21
diff --git a/npc/new_35-1-woodland-village/passages.txt b/npc/new_35-1-woodland-village/passages.txt
deleted file mode 100644
index c72af585..00000000
--- a/npc/new_35-1-woodland-village/passages.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-// To village
-new_35-1.gat,173,20	warp cv-1b 0,0,new_20-1.gat,147,88
-
-// To cave snake cave
-new_35-1.gat,20,57	warp cave 0,1,new_17-1.gat,129,88
diff --git a/npc/new_36-1-magic-house/passages.txt b/npc/new_36-1-magic-house/passages.txt
deleted file mode 100644
index d5376f5b..00000000
--- a/npc/new_36-1-magic-house/passages.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-new_36-1.gat,63,43	warp	map36to28	0,1,new_28-1.gat,42,91
-new_36-1.gat,67,35	warp	tobigroom	0,0,new_36-1.gat,21,40
-new_36-1.gat,21,42	warp	tosmallroom	0,1,new_36-1.gat,67,37
diff --git a/npc/new_37-1-woodland-mine/passages.txt b/npc/new_37-1-woodland-mine/passages.txt
deleted file mode 100644
index be98b28c..00000000
--- a/npc/new_37-1-woodland-mine/passages.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-// To village
-new_37-1.gat,79,97	warp woodland 2,-1,new_18-1.gat,78,18
-
-// To camp building
-new_37-1.gat,65,73	warp inside -1,-1,new_38-1.gat,50,27
diff --git a/npc/new_38-1-woodland-mine/passages.txt b/npc/new_38-1-woodland-mine/passages.txt
deleted file mode 100644
index 8ab42aa4..00000000
--- a/npc/new_38-1-woodland-mine/passages.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-// Outside
-new_38-1.gat,50,28	warp	outside	-1,-1,new_37-1.gat,65,74
-new_38-1.gat,41,21	warp	outside	-1,-1,new_37-1.gat,64,69
-
-// Basement
-new_38-1.gat,20,24	warp	1b	-1,-1,new_38-1.gat,112,27
-new_38-1.gat,112,26	warp	1f	-1,-1,new_38-1.gat,20,23
-
-// Second floor
-new_38-1.gat,21,28	warp	2f	0,-1,new_38-1.gat,79,25
-new_38-1.gat,79,26	warp	1f	0,-1,new_38-1.gat,21,29
- 
\ No newline at end of file
diff --git a/npc/new_4-1-cave-small/passages.txt b/npc/new_4-1-cave-small/passages.txt
deleted file mode 100644
index 200ab60f..00000000
--- a/npc/new_4-1-cave-small/passages.txt
+++ /dev/null
@@ -1 +0,0 @@
-new_4-1.gat,31,22	warp	secondlvl	3,0,new_17-1.gat,72,11
diff --git a/npc/new_5-1-cave2/passages.txt b/npc/new_5-1-cave2/passages.txt
deleted file mode 100644
index ec363db0..00000000
--- a/npc/new_5-1-cave2/passages.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-new_2-1.gat,36,30	warp	caveexit	3,0,new_1-1.gat,25,95
-new_1-1.gat,19,94	warp	caveentrance	1,1,new_2-1.gat,37,31
-new_1-1.gat,111,79	warp	eastdesert	2,2,new_7-1.gat,23,40
-new_7-1.gat,18,39	warp	westdesert	3,4,new_1-1.gat,106,78
\ No newline at end of file
diff --git a/npc/new_7-1-eastern-desert/passages.txt b/npc/new_7-1-eastern-desert/passages.txt
deleted file mode 100644
index f0850ca1..00000000
--- a/npc/new_7-1-eastern-desert/passages.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-new_2-1.gat,36,30	warp	caveexit	3,0,new_1-1.gat,25,95
-new_1-1.gat,19,94	warp	caveentrance	1,1,new_2-1.gat,37,31
-new_1-1.gat,111,79	warp	eastdesert	2,2,new_7-1.gat,23,40
-new_7-1.gat,18,39	warp	westdesert	3,4,new_1-1.gat,106,78
-new_7-1.gat,89,23	warp	tosnakecaveN	0,0,new_22-1.gat,52,34
-new_7-1.gat,71,75	warp	tosnakecaveS	0,0,new_22-1.gat,33,83
-new_7-1.gat,162,103     warp    toMountainPass  0,0,new_24-1.gat,20,33
-new_7-1.gat,163,102     warp    toMountainPass  0,0,new_24-1.gat,21,32
-new_7-1.gat,164,101     warp    toMountainPass  0,0,new_24-1.gat,22,31
-new_7-1.gat,165,100     warp    toMountainPass  0,0,new_24-1.gat,23,30
-new_7-1.gat,166,99      warp    toMountainPass  0,0,new_24-1.gat,24,29
-new_7-1.gat,167,98      warp    toMountainPass  0,0,new_24-1.gat,25,28
-new_7-1.gat,168,97      warp    toMountainPass  0,0,new_24-1.gat,26,27
-new_7-1.gat,169,96      warp    toMountainPass  0,0,new_24-1.gat,27,26
-new_7-1.gat,170,95      warp    toMountainPass  0,0,new_24-1.gat,28,25
-new_7-1.gat,171,94      warp    toMountainPass  0,0,new_24-1.gat,29,24
-new_7-1.gat,172,93      warp    toMountainPass  0,0,new_24-1.gat,30,23
-new_7-1.gat,173,92      warp    toMountainPass  0,0,new_24-1.gat,31,22
-new_7-1.gat,174,91      warp    toMountainPass  0,0,new_24-1.gat,32,21
-new_22-1.gat,52,33	warp	fromsnakecaveN	0,0,new_7-1.gat,89,24
-new_22-1.gat,33,82	warp	fromsnakecaveS	0,0,new_7-1.gat,71,76
\ No newline at end of file
diff --git a/npc/new_8-1-tulimshar/passages.txt b/npc/new_8-1-tulimshar/passages.txt
deleted file mode 100644
index 43a7f9f7..00000000
--- a/npc/new_8-1-tulimshar/passages.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-///////////////
-// Inn/Casino
-///////////////
-
-// Warps room 1
-new_8-1.gat,45,24	warp	upstairs	0,2,new_8-1.gat,65,25
-new_8-1.gat,25,35	warp	outside	0,0,new_3-1.gat,32,72
-
-// Warps room 2
-new_8-1.gat,65,25	warp	downstairs	0,1,new_8-1.gat,42,25
-new_8-1.gat,68,22	warp	tocasino	2,0,new_8-1.gat,32,72
-new_8-1.gat,67,31	warp	tobedroom1	1,1,new_8-1.gat,102,23
-new_8-1.gat,76,31	warp	tobedroom2	1,1,new_8-1.gat,130,23
-
-// Warps room 3
-new_8-1.gat,102,22	warp	bedroom1tohall	2,0,new_8-1.gat,67,29
-
-// Warps room 4
-new_8-1.gat,130,22	warp	bedroom2tohall	2,0,new_8-1.gat,76,29
-
-// Warps room 5
-new_8-1.gat,32,74	warp	tohall	1,0,new_8-1.gat,68,23
-
-///////////////
-// Houses
-///////////////
-
-new_8-1.gat,71,73	warp	outside	0,0,new_3-1.gat,75,42
diff --git a/npc/new_9-1-woodland/passages.txt b/npc/new_9-1-woodland/passages.txt
deleted file mode 100644
index fa980cae..00000000
--- a/npc/new_9-1-woodland/passages.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-new_9-1.gat,58,91       warp    tofield 1,1,new_4-1.gat,15,15
-new_9-1.gat,47,102	warp	tosouth	2,2,new_14-1.gat,50,25
-new_9-1.gat,124,61       warp    warp1 1,3,new_18-1.gat,27,61
-new_9-1.gat,30,60       warp    tomap29 0,3,new_29-1.gat,108,90
-new_9-1.gat,72,15	warp	tomap26	2,1,new_26-1.gat,131,162
diff --git a/npc/scripts.conf b/npc/scripts.conf
new file mode 100644
index 00000000..e10705cd
--- /dev/null
+++ b/npc/scripts.conf
@@ -0,0 +1,51 @@
+// This is the main script import file
+
+// NPC Functions
+npc: npc/functions/banker.txt
+npc: npc/functions/barber.txt
+npc: npc/functions/game_rules.txt
+npc: npc/functions/inn.txt
+npc: npc/functions/mob_points.txt
+npc: npc/functions/process_equip.txt
+npc: npc/functions/slot_machine.txt
+npc: npc/functions/soul_menhir.txt
+
+import: npc/_import.txt
+
+// Christmas 2006
+// npc: npc/xmas/2006/xmas1.txt
+// npc: npc/xmas/2006/xmas2.txt
+// npc: npc/xmas/2006/xmas3.txt
+// npc: npc/xmas/2006/xmas4.txt
+// npc: npc/xmas/2006/xmas5.txt
+// npc: npc/xmas/2006/xmas6.txt
+// npc: npc/xmas/2006/xmas7.txt
+// npc: npc/xmas/2006/xmas8.txt
+// npc: npc/xmas/2006/xmas9.txt
+// npc: npc/xmas/2006/xmas10.txt
+// npc: npc/xmas/2006/xmas11.txt
+// npc: npc/xmas/2006/xmas12.txt
+// npc: npc/xmas/2006/xmas13.txt
+// npc: npc/xmas/2006/xmas14.txt
+// npc: npc/xmas/2006/xmas15.txt
+// npc: npc/xmas/2006/xmas16.txt
+// npc: npc/xmas/2006/xmas17.txt
+// npc: npc/xmas/2006/xmas18.txt
+// npc: npc/xmas/2006/xmas19.txt
+// npc: npc/xmas/2006/xmas20.txt
+
+// Halloween 2007
+// npc: npc/halloween/2007/monsters.txt
+// npc: npc/halloween/2007/summon.txt
+
+// Christmas 2007
+// npc: npc/xmas2007/pre-xmas.txt
+// npc: npc/xmas2007/after-xmas.txt
+
+// Easter 2008
+// npc: npc/easter2008/monsters.txt
+// npc: npc/easter2008/npc.txt
+
+// Halloween 2008
+// npc: npc/halloween/2008/monsters.txt
+// npc: npc/halloween/2008/prize_master.txt
diff --git a/npc/scripts.txt b/npc/scripts.txt
deleted file mode 100644
index 4418817b..00000000
--- a/npc/scripts.txt
+++ /dev/null
@@ -1,320 +0,0 @@
-// This is the main script import file
-
-// Maps
-map: new_39-1.gat
-map: new_38-1.gat
-map: new_37-1.gat
-map: new_36-1.gat
-map: new_35-1.gat
-map: new_34-1.gat
-map: new_33-1.gat
-map: new_32-1.gat
-map: new_31-1.gat
-map: new_30-1.gat
-map: new_29-1.gat
-map: new_28-1.gat
-map: new_27-1.gat
-map: new_26-1.gat
-map: new_25-1.gat
-map: new_24-1.gat
-map: new_23-1.gat
-map: new_22-1.gat
-map: new_21-1.gat
-map: new_20-1.gat
-map: new_19-1.gat
-map: new_18-1.gat
-map: new_17-1.gat
-map: new_16-1.gat
-map: new_15-1.gat
-map: new_14-1.gat
-map: new_13-1.gat
-map: new_12-1.gat
-map: new_11-1.gat
-map: new_10-1.gat
-map: new_9-1.gat
-map: new_8-1.gat
-map: new_7-1.gat
-map: new_6-1.gat
-map: new_5-1.gat
-map: new_4-1.gat
-map: new_3-1.gat
-map: new_2-1.gat
-map: new_1-1.gat
-
-// NPC Functions
-npc: npc/functions/banker.txt
-npc: npc/functions/barber.txt
-npc: npc/functions/game_rules.txt
-npc: npc/functions/inn.txt
-npc: npc/functions/mob_points.txt
-npc: npc/functions/process_equip.txt
-npc: npc/functions/slot_machine.txt
-npc: npc/functions/soul_menhir.txt
-
-// NPCs (ordered by map number).
-
-// new_1-1 Western desert
-// npc: npc/western-desert/dark_mage.txt
-npc: npc/new_1-1-western-desert/rogue.txt
-npc: npc/new_1-1-western-desert/merchant.txt
-npc: npc/new_1-1-western-desert/monsters.txt
-npc: npc/new_1-1-western-desert/nomads.txt
-npc: npc/new_1-1-western-desert/passages.txt
-
-// new-2_1 Cave level 1
-npc: npc/new_2-1-cave1/miners.txt
-npc: npc/new_2-1-cave1/monsters.txt
-npc: npc/new_2-1-cave1/passages.txt
-
-// new_3-1 Tulimshar
-npc: npc/new_3-1-tulimshar/banker.txt
-npc: npc/new_3-1-tulimshar/barber.txt
-npc: npc/new_3-1-tulimshar/bard.txt
-npc: npc/new_3-1-tulimshar/bleacher.txt
-npc: npc/new_3-1-tulimshar/children.txt
-npc: npc/new_3-1-tulimshar/constable.txt
-npc: npc/new_3-1-tulimshar/elanore.txt
-npc: npc/new_3-1-tulimshar/guards.txt
-npc: npc/new_3-1-tulimshar/guide.txt
-npc: npc/new_3-1-tulimshar/man.txt
-npc: npc/new_3-1-tulimshar/merchant.txt
-npc: npc/new_3-1-tulimshar/monster_guide.txt
-npc: npc/new_3-1-tulimshar/monsters.txt
-npc: npc/new_3-1-tulimshar/passages.txt
-npc: npc/new_3-1-tulimshar/rewards_master.txt
-npc: npc/new_3-1-tulimshar/rules.txt
-npc: npc/new_3-1-tulimshar/sandra.txt
-npc: npc/new_3-1-tulimshar/vincent.txt
-npc: npc/new_3-1-tulimshar/soul-menhir.txt
-npc: npc/new_3-1-tulimshar/workers.txt
-
-// new_4-1 Small bat cave
-npc: npc/new_4-1-cave-small/hermit.txt
-npc: npc/new_4-1-cave-small/monsters.txt
-npc: npc/new_4-1-cave-small/passages.txt
-
-// new_5-1 Cave level 2 (Underground Palace)
-npc: npc/new_5-1-cave2/chest.txt
-npc: npc/new_5-1-cave2/monsters.txt
-npc: npc/new_5-1-cave2/passages.txt
-
-// new_6-1 Arena
-npc: npc/new_6-1-arena/guards.txt
-npc: npc/new_6-1-arena/monsters.txt
-npc: npc/new_6-1-arena/pvpflag.txt
-
-// new_7-1 Eastern desert
-npc: npc/new_7-1-eastern-desert/monsters.txt
-npc: npc/new_7-1-eastern-desert/passages.txt
-npc: npc/new_7-1-eastern-desert/npcs.txt
-
-// new_8-1 Tulimshar indoor
-npc: npc/new_8-1-tulimshar/casino.txt
-npc: npc/new_8-1-tulimshar/omar.txt
-npc: npc/new_8-1-tulimshar/passages.txt
-npc: npc/new_8-1-tulimshar/phaet.txt
-npc: npc/new_8-1-tulimshar/shops.txt
-npc: npc/new_8-1-tulimshar/troupe_leader.txt
-
-// new_9-1 Woodland
-npc: npc/new_9-1-woodland/alchemist.txt
-npc: npc/new_9-1-woodland/monsters.txt
-npc: npc/new_9-1-woodland/passages.txt
-npc: npc/new_9-1-woodland/oscar.txt
-
-// new_10-1 Xmas snow map
-npc: npc/new_10-1-xmas/monsters.txt
-npc: npc/new_10-1-xmas/passages.txt
-// npc: npc/new_10-1-xmas/santa.txt
-npc: npc/new_10-1-xmas/snowman.txt
-npc: npc/new_10-1-xmas/taro.txt
-
-// new_11-1 Snow village
-// npc: npc/new_11-1-snow-village/monsters.txt
-npc: npc/new_11-1-snow-village/sexchanger.txt
-npc: npc/new_11-1-snow-village/startrek.txt
-npc: npc/new_11-1-snow-village/passages.txt
-npc: npc/new_11-1-snow-village/soul-menhir.txt
-npc: npc/new_11-1-snow-village/amrak.txt
-
-// new_12-1 Ice cave
-npc: npc/new_12-1-ice-cave/monsters.txt
-npc: npc/new_12-1-ice-cave/passages.txt
-
-// new_13-1 Snow village shops.
-npc: npc/new_13-1-snow-village-shops/shops.txt
-npc: npc/new_13-1-snow-village-shops/passages.txt
-npc: npc/new_13-1-snow-village-shops/furquest.txt
-
-// new_14-1 South-woodland
-npc: npc/new_14-1-south-woodland/monsters.txt
-npc: npc/new_14-1-south-woodland/passages.txt
-
-// new_15-1 Woodland-desert link
-npc: npc/new_15-1-woodland-desert/monsters.txt
-npc: npc/new_15-1-woodland-desert/passages.txt
-
-// new_16-1 South-west woodland
-npc: npc/new_16-1-south-east-woodland/monsters.txt
-npc: npc/new_16-1-south-east-woodland/passages.txt
-
-// new_17-1 Big cave
-npc: npc/new_17-1-cave-big/monsters.txt
-npc: npc/new_17-1-cave-big/passages.txt
-
-// new_18-1 Woodland village surroundings
-npc: npc/new_18-1-woodland-village/monsters.txt
-npc: npc/new_18-1-woodland-village/passages.txt
-npc: npc/new_18-1-woodland-village/george.txt
-npc: npc/new_18-1-woodland-village/hinnak.txt
-
-// new_19-1 Woodland village
-npc: npc/new_19-1-woodland-village/jack.txt
-npc: npc/new_19-1-woodland-village/milly.txt
-npc: npc/new_19-1-woodland-village/old_man.txt
-npc: npc/new_19-1-woodland-village/old_woman.txt
-npc: npc/new_19-1-woodland-village/passages.txt
-npc: npc/new_19-1-woodland-village/sabine.txt
-npc: npc/new_19-1-woodland-village/soul-menhir.txt
-
-// new_20-1 Woodland village indoor
-npc: npc/new_20-1-woodland-village/alan.txt
-npc: npc/new_20-1-woodland-village/doctor.txt
-npc: npc/new_20-1-woodland-village/drunks.txt
-npc: npc/new_20-1-woodland-village/inspector.txt
-npc: npc/new_20-1-woodland-village/kfahr.txt
-npc: npc/new_20-1-woodland-village/misc.txt
-npc: npc/new_20-1-woodland-village/nicholas.txt
-npc: npc/new_20-1-woodland-village/nurse.txt
-npc: npc/new_20-1-woodland-village/passages.txt
-npc: npc/new_20-1-woodland-village/richard.txt
-npc: npc/new_20-1-woodland-village/selim.txt
-npc: npc/new_20-1-woodland-village/shops.txt
-npc: npc/new_20-1-woodland-village/waitress.txt
-
-// new_21-1 Ice cave 2
-npc: npc/new_21-1-ice-cave2/monsters.txt
-npc: npc/new_21-1-ice-cave2/passages.txt
-
-// new_22-1 Snake cave
-npc: npc/new_22-1-snake-cave/monsters.txt
-npc: npc/new_22-1-snake-cave/passages.txt
-
-// new_23-1 Dimonds Cove
-npc: npc/new_23-1-dimonds-cove/passages.txt
-npc: npc/new_23-1-dimonds-cove/dimonds.txt
-npc: npc/new_23-1-dimonds-cove/doug.txt
-npc: npc/new_23-1-dimonds-cove/loratay.txt
-npc: npc/new_23-1-dimonds-cove/workers.txt
-
-// new_24-1 Eastern desert mountain passage
-npc: npc/new_24-1-eastern-desert-mountain-passage/mika.txt
-npc: npc/new_24-1-eastern-desert-mountain-passage/monsters.txt
-npc: npc/new_24-1-eastern-desert-mountain-passage/pachua.txt
-npc: npc/new_24-1-eastern-desert-mountain-passage/passages.txt
-
-// new_25-1 Eastern desert cave
-npc: npc/new_25-1-eastern-desert-cave/monsters.txt
-npc: npc/new_25-1-eastern-desert-cave/passages.txt
-
-// new_26-1 Forest Hill 1
-npc: npc/new_26-1-hill1/monsters.txt
-npc: npc/new_26-1-hill1/passages.txt
-npc: npc/new_26-1-hill1/shops.txt
-
-// new_27-1 Forest Hill 2 (Cave)
-npc: npc/new_27-1-hill2/monsters.txt
-npc: npc/new_27-1-hill2/passages.txt
-
-// new_28-1 Forest east of map 26
-npc: npc/new_28-1-hillwest/passages.txt
-npc: npc/new_28-1-hillwest/monsters.txt
-
-// new_29-1 Forest west of map 9
-npc: npc/new_29-1-west-woodland/passages.txt
-npc: npc/new_29-1-west-woodland/monsters.txt
-npc: npc/new_29-1-west-woodland/taro.txt
-npc: npc/new_29-1-west-woodland/wedding-officiator.txt
-
-// new_30-1 Caves for map 29
-npc: npc/new_30-1-west-woodland-cave/passages.txt
-npc: npc/new_30-1-west-woodland-cave/monsters.txt
-
-// new_31-1 Forest west of map 14
-npc: npc/new_31-1-southwest-woodland/passages.txt
-npc: npc/new_31-1-southwest-woodland/monsters.txt
-npc: npc/new_31-1-southwest-woodland/alice.txt
-
-// new_32-1 Forest south of map 14
-npc: npc/new_32-1-south-woodland-2/passages.txt
-npc: npc/new_32-1-south-woodland-2/monsters.txt
-
-// new_33-1 Forest north of map 28
-npc: npc/new_33-1-hill-northwest/passages.txt
-npc: npc/new_33-1-hill-northwest/monsters.txt
-
-// new_34-1 Beach west of Tulimshar
-npc: npc/new_34-1-north-beach/passages.txt
-npc: npc/new_34-1-north-beach/monsters.txt
-
-// new_35-1 Cave beneath Hurnscald
-npc: npc/new_35-1-woodland-village/passages.txt
-npc: npc/new_35-1-woodland-village/monsters.txt
-
-// new_36-1 Magic house in forest 28
-npc: npc/new_36-1-magic-house/passages.txt
-npc: npc/new_36-1-magic-house/wizard.txt
-npc: npc/new_36-1-magic-house/apprentice.txt
-npc: npc/new_36-1-magic-house/notes.txt
-
-// new_37-1 Mine north of Hurnscald
-npc: npc/new_37-1-woodland-mine/miners.txt
-npc: npc/new_37-1-woodland-mine/monsters.txt
-npc: npc/new_37-1-woodland-mine/passages.txt
-
-// new_38-1 Mines north of Hurnscald (indoor)
-npc: npc/new_38-1-woodland-mine/angus.txt
-npc: npc/new_38-1-woodland-mine/books.txt
-npc: npc/new_38-1-woodland-mine/caul.txt
-npc: npc/new_38-1-woodland-mine/miners.txt
-npc: npc/new_38-1-woodland-mine/monsters.txt
-npc: npc/new_38-1-woodland-mine/passages.txt
-npc: npc/new_38-1-woodland-mine/receptionist.txt
-
-// Christmas 2006
-// npc: npc/xmas/xmas1.txt
-// npc: npc/xmas/xmas2.txt
-// npc: npc/xmas/xmas3.txt
-// npc: npc/xmas/xmas4.txt
-// npc: npc/xmas/xmas5.txt
-// npc: npc/xmas/xmas6.txt
-// npc: npc/xmas/xmas7.txt
-// npc: npc/xmas/xmas8.txt
-// npc: npc/xmas/xmas9.txt
-// npc: npc/xmas/xmas10.txt
-// npc: npc/xmas/xmas11.txt
-// npc: npc/xmas/xmas12.txt
-// npc: npc/xmas/xmas13.txt
-// npc: npc/xmas/xmas14.txt
-// npc: npc/xmas/xmas15.txt
-// npc: npc/xmas/xmas16.txt
-// npc: npc/xmas/xmas17.txt
-// npc: npc/xmas/xmas18.txt
-// npc: npc/xmas/xmas19.txt
-// npc: npc/xmas/xmas20.txt
-
-// Halloween 2007
-// npc: npc/halloween/2007/monsters.txt
-// npc: npc/halloween/2007/summon.txt
-
-// Christmas 2007
-// npc: npc/xmas2007/pre-xmas.txt
-// npc: npc/xmas2007/after-xmas.txt
-
-// Easter 2008
-// npc: npc/easter2008/monsters.txt
-// npc: npc/easter2008/npc.txt
-
-// Halloween 2008
-// npc: npc/halloween/2008/monsters.txt
-// npc: npc/halloween/2008/prize_master.txt
diff --git a/npc/new_10-1-xmas/xmas1.txt b/npc/xmas/2006/xmas1.txt
index 814dd9cc..814dd9cc 100644
--- a/npc/new_10-1-xmas/xmas1.txt
+++ b/npc/xmas/2006/xmas1.txt
diff --git a/npc/new_10-1-xmas/xmas10.txt b/npc/xmas/2006/xmas10.txt
index 8ba50ae0..8ba50ae0 100644
--- a/npc/new_10-1-xmas/xmas10.txt
+++ b/npc/xmas/2006/xmas10.txt
diff --git a/npc/new_10-1-xmas/xmas11.txt b/npc/xmas/2006/xmas11.txt
index 212a5225..212a5225 100644
--- a/npc/new_10-1-xmas/xmas11.txt
+++ b/npc/xmas/2006/xmas11.txt
diff --git a/npc/new_10-1-xmas/xmas12.txt b/npc/xmas/2006/xmas12.txt
index a8527eaf..a8527eaf 100644
--- a/npc/new_10-1-xmas/xmas12.txt
+++ b/npc/xmas/2006/xmas12.txt
diff --git a/npc/new_10-1-xmas/xmas13.txt b/npc/xmas/2006/xmas13.txt
index 534403da..534403da 100644
--- a/npc/new_10-1-xmas/xmas13.txt
+++ b/npc/xmas/2006/xmas13.txt
diff --git a/npc/new_10-1-xmas/xmas14.txt b/npc/xmas/2006/xmas14.txt
index 2f1269a4..2f1269a4 100644
--- a/npc/new_10-1-xmas/xmas14.txt
+++ b/npc/xmas/2006/xmas14.txt
diff --git a/npc/new_10-1-xmas/xmas15.txt b/npc/xmas/2006/xmas15.txt
index 32dc490c..32dc490c 100644
--- a/npc/new_10-1-xmas/xmas15.txt
+++ b/npc/xmas/2006/xmas15.txt
diff --git a/npc/new_10-1-xmas/xmas16.txt b/npc/xmas/2006/xmas16.txt
index c072684b..c072684b 100644
--- a/npc/new_10-1-xmas/xmas16.txt
+++ b/npc/xmas/2006/xmas16.txt
diff --git a/npc/new_10-1-xmas/xmas17.txt b/npc/xmas/2006/xmas17.txt
index 292744ef..292744ef 100644
--- a/npc/new_10-1-xmas/xmas17.txt
+++ b/npc/xmas/2006/xmas17.txt
diff --git a/npc/new_10-1-xmas/xmas18.txt b/npc/xmas/2006/xmas18.txt
index e78e1b0c..e78e1b0c 100644
--- a/npc/new_10-1-xmas/xmas18.txt
+++ b/npc/xmas/2006/xmas18.txt
diff --git a/npc/new_10-1-xmas/xmas19.txt b/npc/xmas/2006/xmas19.txt
index 3c60aab7..3c60aab7 100644
--- a/npc/new_10-1-xmas/xmas19.txt
+++ b/npc/xmas/2006/xmas19.txt
diff --git a/npc/new_10-1-xmas/xmas2.txt b/npc/xmas/2006/xmas2.txt
index bba2b0c8..bba2b0c8 100644
--- a/npc/new_10-1-xmas/xmas2.txt
+++ b/npc/xmas/2006/xmas2.txt
diff --git a/npc/new_10-1-xmas/xmas20.txt b/npc/xmas/2006/xmas20.txt
index 0bc045db..0bc045db 100644
--- a/npc/new_10-1-xmas/xmas20.txt
+++ b/npc/xmas/2006/xmas20.txt
diff --git a/npc/new_10-1-xmas/xmas3.txt b/npc/xmas/2006/xmas3.txt
index 28dbc605..28dbc605 100644
--- a/npc/new_10-1-xmas/xmas3.txt
+++ b/npc/xmas/2006/xmas3.txt
diff --git a/npc/new_10-1-xmas/xmas4.txt b/npc/xmas/2006/xmas4.txt
index c9f13e3e..c9f13e3e 100644
--- a/npc/new_10-1-xmas/xmas4.txt
+++ b/npc/xmas/2006/xmas4.txt
diff --git a/npc/new_10-1-xmas/xmas5.txt b/npc/xmas/2006/xmas5.txt
index 7269717c..7269717c 100644
--- a/npc/new_10-1-xmas/xmas5.txt
+++ b/npc/xmas/2006/xmas5.txt
diff --git a/npc/new_10-1-xmas/xmas6.txt b/npc/xmas/2006/xmas6.txt
index da47ca1f..da47ca1f 100644
--- a/npc/new_10-1-xmas/xmas6.txt
+++ b/npc/xmas/2006/xmas6.txt
diff --git a/npc/new_10-1-xmas/xmas7.txt b/npc/xmas/2006/xmas7.txt
index 7bcc2983..7bcc2983 100644
--- a/npc/new_10-1-xmas/xmas7.txt
+++ b/npc/xmas/2006/xmas7.txt
diff --git a/npc/new_10-1-xmas/xmas8.txt b/npc/xmas/2006/xmas8.txt
index 47752239..47752239 100644
--- a/npc/new_10-1-xmas/xmas8.txt
+++ b/npc/xmas/2006/xmas8.txt
diff --git a/npc/new_10-1-xmas/xmas9.txt b/npc/xmas/2006/xmas9.txt
index f27629d8..f27629d8 100644
--- a/npc/new_10-1-xmas/xmas9.txt
+++ b/npc/xmas/2006/xmas9.txt
diff --git a/npc/xmas2007/after-xmas.txt b/npc/xmas/2007/after-xmas.txt
index 0d39f858..0d39f858 100644
--- a/npc/xmas2007/after-xmas.txt
+++ b/npc/xmas/2007/after-xmas.txt
diff --git a/npc/xmas2007/pre-xmas.txt b/npc/xmas/2007/pre-xmas.txt
index 8516f7e7..8516f7e7 100644
--- a/npc/xmas2007/pre-xmas.txt
+++ b/npc/xmas/2007/pre-xmas.txt