504 files changed, 752 insertions, 738 deletions

diff --git a/npc/001-1/_import.txt b/npc/001-1/_import.txt
new file mode 100644
index 00000000..b6c625ff
--- /dev/null
+++ b/npc/001-1/_import.txt
@@ -0,0 +1,28 @@
+// Map 001-1: Tulimshar
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 001-1.gat
+npc: npc/001-1/_mobs.txt
+npc: npc/001-1/_warps.txt
+npc: npc/001-1/banker.txt
+npc: npc/001-1/barber.txt
+npc: npc/001-1/bard.txt
+npc: npc/001-1/bernard.txt
+npc: npc/001-1/bleacher.txt
+npc: npc/001-1/children.txt
+npc: npc/001-1/constable.txt
+npc: npc/001-1/elanore.txt
+npc: npc/001-1/entertainer.txt
+npc: npc/001-1/gossip.txt
+npc: npc/001-1/guards.txt
+npc: npc/001-1/guide.txt
+npc: npc/001-1/luca.txt
+npc: npc/001-1/mapflags.txt
+npc: npc/001-1/merchant.txt
+npc: npc/001-1/mikhail.txt
+npc: npc/001-1/monster_guide.txt
+npc: npc/001-1/rewards_master.txt
+npc: npc/001-1/sandra.txt
+npc: npc/001-1/sarah.txt
+npc: npc/001-1/soul-menhir.txt
+npc: npc/001-1/trader.txt
+npc: npc/001-1/vincent.txt
diff --git a/npc/001-1_Tulimshar/_mobs.txt b/npc/001-1/_mobs.txt
index 66e47d3e..c8aa210f 100644
--- a/npc/001-1_Tulimshar/_mobs.txt
+++ b/npc/001-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 001-1 Tulimshar mobs
+// Tulimshar mobs
 
 001-1.gat,45,86,2,1	monster	Scorpion	1003,1,30000,30000,Mob001-1::On1003
 001-1.gat,43,85,2,1	monster	Scorpion	1003,1,60000,30000,Mob001-1::On1003
diff --git a/npc/001-1_Tulimshar/_warps.txt b/npc/001-1/_warps.txt
index 4155caf0..d116051c 100644
--- a/npc/001-1_Tulimshar/_warps.txt
+++ b/npc/001-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 001-1 Tulimshar warps
+// Tulimshar warps
 
 001-1.gat,44,88	warp	ToSandstorm	3,-1,002-1.gat,58,17
 001-1.gat,44,20	warp	toCentralTulimshar	3,-1,021-1.gat,55,145
diff --git a/npc/001-1_Tulimshar/banker.txt b/npc/001-1/banker.txt
index 445b0ebf..445b0ebf 100644
--- a/npc/001-1_Tulimshar/banker.txt
+++ b/npc/001-1/banker.txt
diff --git a/npc/001-1_Tulimshar/barber.txt b/npc/001-1/barber.txt
index 502e5401..502e5401 100644
--- a/npc/001-1_Tulimshar/barber.txt
+++ b/npc/001-1/barber.txt
diff --git a/npc/001-1_Tulimshar/bard.txt b/npc/001-1/bard.txt
index 9de957e1..9de957e1 100644
--- a/npc/001-1_Tulimshar/bard.txt
+++ b/npc/001-1/bard.txt
diff --git a/npc/001-1_Tulimshar/bernard.txt b/npc/001-1/bernard.txt
index 1c5ee328..1c5ee328 100644
--- a/npc/001-1_Tulimshar/bernard.txt
+++ b/npc/001-1/bernard.txt
diff --git a/npc/001-1_Tulimshar/bleacher.txt b/npc/001-1/bleacher.txt
index a3827e43..a3827e43 100644
--- a/npc/001-1_Tulimshar/bleacher.txt
+++ b/npc/001-1/bleacher.txt
diff --git a/npc/001-1_Tulimshar/children.txt b/npc/001-1/children.txt
index c8941563..c8941563 100644
--- a/npc/001-1_Tulimshar/children.txt
+++ b/npc/001-1/children.txt
diff --git a/npc/001-1_Tulimshar/constable.txt b/npc/001-1/constable.txt
index 6131f0b4..6131f0b4 100644
--- a/npc/001-1_Tulimshar/constable.txt
+++ b/npc/001-1/constable.txt
diff --git a/npc/001-1_Tulimshar/elanore.txt b/npc/001-1/elanore.txt
index 2d96ae6c..2d96ae6c 100644
--- a/npc/001-1_Tulimshar/elanore.txt
+++ b/npc/001-1/elanore.txt
diff --git a/npc/001-1_Tulimshar/entertainer.txt b/npc/001-1/entertainer.txt
index 149f1e2f..149f1e2f 100644
--- a/npc/001-1_Tulimshar/entertainer.txt
+++ b/npc/001-1/entertainer.txt
diff --git a/npc/001-1_Tulimshar/gossip.txt b/npc/001-1/gossip.txt
index 0deb42ae..0deb42ae 100644
--- a/npc/001-1_Tulimshar/gossip.txt
+++ b/npc/001-1/gossip.txt
diff --git a/npc/001-1_Tulimshar/guards.txt b/npc/001-1/guards.txt
index 1cffa515..1cffa515 100644
--- a/npc/001-1_Tulimshar/guards.txt
+++ b/npc/001-1/guards.txt
diff --git a/npc/001-1_Tulimshar/guide.txt b/npc/001-1/guide.txt
index d00a2a6f..d00a2a6f 100644
--- a/npc/001-1_Tulimshar/guide.txt
+++ b/npc/001-1/guide.txt
diff --git a/npc/001-1_Tulimshar/luca.txt b/npc/001-1/luca.txt
index f8f51f63..f8f51f63 100644
--- a/npc/001-1_Tulimshar/luca.txt
+++ b/npc/001-1/luca.txt
diff --git a/npc/001-1_Tulimshar/mapflags.txt b/npc/001-1/mapflags.txt
index ba066398..ba066398 100644
--- a/npc/001-1_Tulimshar/mapflags.txt
+++ b/npc/001-1/mapflags.txt
diff --git a/npc/001-1_Tulimshar/merchant.txt b/npc/001-1/merchant.txt
index a664e74a..a664e74a 100644
--- a/npc/001-1_Tulimshar/merchant.txt
+++ b/npc/001-1/merchant.txt
diff --git a/npc/001-1_Tulimshar/mikhail.txt b/npc/001-1/mikhail.txt
index 6514c07d..6514c07d 100644
--- a/npc/001-1_Tulimshar/mikhail.txt
+++ b/npc/001-1/mikhail.txt
diff --git a/npc/001-1_Tulimshar/monster_guide.txt b/npc/001-1/monster_guide.txt
index 697dc38e..697dc38e 100644
--- a/npc/001-1_Tulimshar/monster_guide.txt
+++ b/npc/001-1/monster_guide.txt
diff --git a/npc/001-1_Tulimshar/rewards_master.txt b/npc/001-1/rewards_master.txt
index 028b24c1..028b24c1 100644
--- a/npc/001-1_Tulimshar/rewards_master.txt
+++ b/npc/001-1/rewards_master.txt
diff --git a/npc/001-1_Tulimshar/sandra.txt b/npc/001-1/sandra.txt
index 45b91ab3..45b91ab3 100644
--- a/npc/001-1_Tulimshar/sandra.txt
+++ b/npc/001-1/sandra.txt
diff --git a/npc/001-1_Tulimshar/sarah.txt b/npc/001-1/sarah.txt
index 7a109fa6..7a109fa6 100644
--- a/npc/001-1_Tulimshar/sarah.txt
+++ b/npc/001-1/sarah.txt
diff --git a/npc/001-1_Tulimshar/soul-menhir.txt b/npc/001-1/soul-menhir.txt
index 00208932..00208932 100644
--- a/npc/001-1_Tulimshar/soul-menhir.txt
+++ b/npc/001-1/soul-menhir.txt
diff --git a/npc/001-1_Tulimshar/trader.txt b/npc/001-1/trader.txt
index b99a0250..b99a0250 100644
--- a/npc/001-1_Tulimshar/trader.txt
+++ b/npc/001-1/trader.txt
diff --git a/npc/001-1_Tulimshar/vincent.txt b/npc/001-1/vincent.txt
index ffd05162..ffd05162 100644
--- a/npc/001-1_Tulimshar/vincent.txt
+++ b/npc/001-1/vincent.txt
diff --git a/npc/001-1_Tulimshar/_import.txt b/npc/001-1_Tulimshar/_import.txt
deleted file mode 100644
index 5383bd99..00000000
--- a/npc/001-1_Tulimshar/_import.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 001-1.gat
-npc: npc/001-1_Tulimshar/_mobs.txt
-npc: npc/001-1_Tulimshar/_warps.txt
-npc: npc/001-1_Tulimshar/banker.txt
-npc: npc/001-1_Tulimshar/barber.txt
-npc: npc/001-1_Tulimshar/bard.txt
-npc: npc/001-1_Tulimshar/bernard.txt
-npc: npc/001-1_Tulimshar/bleacher.txt
-npc: npc/001-1_Tulimshar/children.txt
-npc: npc/001-1_Tulimshar/constable.txt
-npc: npc/001-1_Tulimshar/elanore.txt
-npc: npc/001-1_Tulimshar/entertainer.txt
-npc: npc/001-1_Tulimshar/gossip.txt
-npc: npc/001-1_Tulimshar/guards.txt
-npc: npc/001-1_Tulimshar/guide.txt
-npc: npc/001-1_Tulimshar/luca.txt
-npc: npc/001-1_Tulimshar/mapflags.txt
-npc: npc/001-1_Tulimshar/merchant.txt
-npc: npc/001-1_Tulimshar/mikhail.txt
-npc: npc/001-1_Tulimshar/monster_guide.txt
-npc: npc/001-1_Tulimshar/rewards_master.txt
-npc: npc/001-1_Tulimshar/sandra.txt
-npc: npc/001-1_Tulimshar/sarah.txt
-npc: npc/001-1_Tulimshar/soul-menhir.txt
-npc: npc/001-1_Tulimshar/trader.txt
-npc: npc/001-1_Tulimshar/vincent.txt
diff --git a/npc/001-2/_import.txt b/npc/001-2/_import.txt
new file mode 100644
index 00000000..e318db9b
--- /dev/null
+++ b/npc/001-2/_import.txt
@@ -0,0 +1,10 @@
+// Map 001-2: Tulimshar
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 001-2.gat
+npc: npc/001-2/_mobs.txt
+npc: npc/001-2/_warps.txt
+npc: npc/001-2/casino.txt
+npc: npc/001-2/mapflags.txt
+npc: npc/001-2/phaet.txt
+npc: npc/001-2/shops.txt
+npc: npc/001-2/troupe_leader.txt
diff --git a/npc/001-2_Tulimshar/_mobs.txt b/npc/001-2/_mobs.txt
index c9183bc5..6ba5649e 100644
--- a/npc/001-2_Tulimshar/_mobs.txt
+++ b/npc/001-2/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 001-2 Tulimshar mobs
+// Tulimshar mobs
 
 
 
diff --git a/npc/001-2_Tulimshar/_warps.txt b/npc/001-2/_warps.txt
index 681c403c..fcf625f1 100644
--- a/npc/001-2_Tulimshar/_warps.txt
+++ b/npc/001-2/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 001-2 Tulimshar warps
+// Tulimshar warps
 
 001-2.gat,25,35	warp	ToOutside	-1,-1,001-1.gat,32,72
 001-2.gat,44,25	warp	To2ndFloor	-1,0,001-2.gat,65,25
diff --git a/npc/001-2_Tulimshar/casino.txt b/npc/001-2/casino.txt
index cf4943a4..cf4943a4 100644
--- a/npc/001-2_Tulimshar/casino.txt
+++ b/npc/001-2/casino.txt
diff --git a/npc/001-2_Tulimshar/mapflags.txt b/npc/001-2/mapflags.txt
index dda29b1e..dda29b1e 100644
--- a/npc/001-2_Tulimshar/mapflags.txt
+++ b/npc/001-2/mapflags.txt
diff --git a/npc/001-2_Tulimshar/phaet.txt b/npc/001-2/phaet.txt
index e495d93d..e495d93d 100644
--- a/npc/001-2_Tulimshar/phaet.txt
+++ b/npc/001-2/phaet.txt
diff --git a/npc/001-2_Tulimshar/shops.txt b/npc/001-2/shops.txt
index c70ad113..c70ad113 100644
--- a/npc/001-2_Tulimshar/shops.txt
+++ b/npc/001-2/shops.txt
diff --git a/npc/001-2_Tulimshar/troupe_leader.txt b/npc/001-2/troupe_leader.txt
index e7b0486e..e7b0486e 100644
--- a/npc/001-2_Tulimshar/troupe_leader.txt
+++ b/npc/001-2/troupe_leader.txt
diff --git a/npc/001-2_Tulimshar/_import.txt b/npc/001-2_Tulimshar/_import.txt
deleted file mode 100644
index 3e75640d..00000000
--- a/npc/001-2_Tulimshar/_import.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 001-2.gat
-npc: npc/001-2_Tulimshar/_mobs.txt
-npc: npc/001-2_Tulimshar/_warps.txt
-npc: npc/001-2_Tulimshar/casino.txt
-npc: npc/001-2_Tulimshar/mapflags.txt
-npc: npc/001-2_Tulimshar/phaet.txt
-npc: npc/001-2_Tulimshar/shops.txt
-npc: npc/001-2_Tulimshar/troupe_leader.txt
diff --git a/npc/001-3/_import.txt b/npc/001-3/_import.txt
new file mode 100644
index 00000000..a6b8b692
--- /dev/null
+++ b/npc/001-3/_import.txt
@@ -0,0 +1,8 @@
+// Map 001-3: Tulimshar arena
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 001-3.gat
+npc: npc/001-3/_mobs.txt
+npc: npc/001-3/_warps.txt
+npc: npc/001-3/guards.txt
+npc: npc/001-3/monsters.txt
+npc: npc/001-3/pvpflag.txt
diff --git a/npc/001-3_Tulimshar_arena/_mobs.txt b/npc/001-3/_mobs.txt
index 85880a75..ae4b044f 100644
--- a/npc/001-3_Tulimshar_arena/_mobs.txt
+++ b/npc/001-3/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 001-3 Tulimshar arena mobs
+// Tulimshar arena mobs
 
 
 
diff --git a/npc/001-3_Tulimshar_arena/_warps.txt b/npc/001-3/_warps.txt
index 244daeed..adb7642a 100644
--- a/npc/001-3_Tulimshar_arena/_warps.txt
+++ b/npc/001-3/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 001-3 Tulimshar arena warps
+// Tulimshar arena warps
 
 001-3.gat,72,29	warp	ToInn	1,-1,001-2.gat,24,23
diff --git a/npc/001-3_Tulimshar_arena/guards.txt b/npc/001-3/guards.txt
index 5b42ca4f..5b42ca4f 100644
--- a/npc/001-3_Tulimshar_arena/guards.txt
+++ b/npc/001-3/guards.txt
diff --git a/npc/001-3_Tulimshar_arena/monsters.txt b/npc/001-3/monsters.txt
index 04e6b11d..04e6b11d 100644
--- a/npc/001-3_Tulimshar_arena/monsters.txt
+++ b/npc/001-3/monsters.txt
diff --git a/npc/001-3_Tulimshar_arena/pvpflag.txt b/npc/001-3/pvpflag.txt
index 73b6e556..73b6e556 100644
--- a/npc/001-3_Tulimshar_arena/pvpflag.txt
+++ b/npc/001-3/pvpflag.txt
diff --git a/npc/001-3_Tulimshar_arena/_import.txt b/npc/001-3_Tulimshar_arena/_import.txt
deleted file mode 100644
index 01ec6939..00000000
--- a/npc/001-3_Tulimshar_arena/_import.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 001-3.gat
-npc: npc/001-3_Tulimshar_arena/_mobs.txt
-npc: npc/001-3_Tulimshar_arena/_warps.txt
-npc: npc/001-3_Tulimshar_arena/guards.txt
-npc: npc/001-3_Tulimshar_arena/monsters.txt
-npc: npc/001-3_Tulimshar_arena/pvpflag.txt
diff --git a/npc/001-4/_import.txt b/npc/001-4/_import.txt
new file mode 100644
index 00000000..aecdcb62
--- /dev/null
+++ b/npc/001-4/_import.txt
@@ -0,0 +1,7 @@
+// Map 001-4: Omars house
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 001-4.gat
+npc: npc/001-4/_mobs.txt
+npc: npc/001-4/_warps.txt
+npc: npc/001-4/dedication.txt
+npc: npc/001-4/omar.txt
diff --git a/npc/001-4_Omars_house/_mobs.txt b/npc/001-4/_mobs.txt
index b7c2cd3d..097896c8 100644
--- a/npc/001-4_Omars_house/_mobs.txt
+++ b/npc/001-4/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 001-4 Omars house mobs
+// Omars house mobs
 
 
 
diff --git a/npc/001-4_Omars_house/_warps.txt b/npc/001-4/_warps.txt
index dcfef8c8..7831e9a1 100644
--- a/npc/001-4_Omars_house/_warps.txt
+++ b/npc/001-4/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 001-4 Omars house warps
+// Omars house warps
 
 001-4.gat,26,34	warp	toOutdoor	-1,-1,001-1.gat,75,42
diff --git a/npc/001-4_Omars_house/dedication.txt b/npc/001-4/dedication.txt
index 4b240b11..4b240b11 100644
--- a/npc/001-4_Omars_house/dedication.txt
+++ b/npc/001-4/dedication.txt
diff --git a/npc/001-4_Omars_house/omar.txt b/npc/001-4/omar.txt
index aedf1806..aedf1806 100644
--- a/npc/001-4_Omars_house/omar.txt
+++ b/npc/001-4/omar.txt
diff --git a/npc/001-4_Omars_house/_import.txt b/npc/001-4_Omars_house/_import.txt
deleted file mode 100644
index 8db94949..00000000
--- a/npc/001-4_Omars_house/_import.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 001-4.gat
-npc: npc/001-4_Omars_house/_mobs.txt
-npc: npc/001-4_Omars_house/_warps.txt
-npc: npc/001-4_Omars_house/dedication.txt
-npc: npc/001-4_Omars_house/omar.txt
diff --git a/npc/002-1/_import.txt b/npc/002-1/_import.txt
new file mode 100644
index 00000000..dfda9d8f
--- /dev/null
+++ b/npc/002-1/_import.txt
@@ -0,0 +1,12 @@
+// Map 002-1: Sandstorm
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 002-1.gat
+npc: npc/002-1/_mobs.txt
+npc: npc/002-1/_warps.txt
+npc: npc/002-1/lieutenant_dausen.txt
+npc: npc/002-1/merchant.txt
+npc: npc/002-1/nickos.txt
+npc: npc/002-1/nomads.txt
+npc: npc/002-1/rogue.txt
+npc: npc/002-1/sandstorm_mine_barrier.txt
+npc: npc/002-1/stewen.txt
diff --git a/npc/002-1_Sandstorm/_mobs.txt b/npc/002-1/_mobs.txt
index 0b8be241..9a9b39b5 100644
--- a/npc/002-1_Sandstorm/_mobs.txt
+++ b/npc/002-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 002-1 Sandstorm mobs
+// Sandstorm mobs
 
 002-1.gat,0,0,0,0	monster	Maggot	1002,20,1000,500,Mob002-1::On1002
 002-1.gat,96,98,19,13	monster	Maggot	1002,10,100000,30000,Mob002-1::On1002
diff --git a/npc/002-1_Sandstorm/_warps.txt b/npc/002-1/_warps.txt
index fa911e50..85d404f6 100644
--- a/npc/002-1_Sandstorm/_warps.txt
+++ b/npc/002-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 002-1 Sandstorm warps
+// 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
diff --git a/npc/002-1_Sandstorm/lieutenant_dausen.txt b/npc/002-1/lieutenant_dausen.txt
index 69502cf6..69502cf6 100644
--- a/npc/002-1_Sandstorm/lieutenant_dausen.txt
+++ b/npc/002-1/lieutenant_dausen.txt
diff --git a/npc/002-1_Sandstorm/merchant.txt b/npc/002-1/merchant.txt
index 8a84ae92..8a84ae92 100644
--- a/npc/002-1_Sandstorm/merchant.txt
+++ b/npc/002-1/merchant.txt
diff --git a/npc/002-1_Sandstorm/nickos.txt b/npc/002-1/nickos.txt
index 04713ccf..04713ccf 100644
--- a/npc/002-1_Sandstorm/nickos.txt
+++ b/npc/002-1/nickos.txt
diff --git a/npc/002-1_Sandstorm/nomads.txt b/npc/002-1/nomads.txt
index 0b7e7426..0b7e7426 100644
--- a/npc/002-1_Sandstorm/nomads.txt
+++ b/npc/002-1/nomads.txt
diff --git a/npc/002-1_Sandstorm/rogue.txt b/npc/002-1/rogue.txt
index e5afe354..e5afe354 100644
--- a/npc/002-1_Sandstorm/rogue.txt
+++ b/npc/002-1/rogue.txt
diff --git a/npc/002-1_Sandstorm/sandstorm_mine_barrier.txt b/npc/002-1/sandstorm_mine_barrier.txt
index 62abceac..62abceac 100644
--- a/npc/002-1_Sandstorm/sandstorm_mine_barrier.txt
+++ b/npc/002-1/sandstorm_mine_barrier.txt
diff --git a/npc/002-1_Sandstorm/stewen.txt b/npc/002-1/stewen.txt
index 6c099b3a..6c099b3a 100644
--- a/npc/002-1_Sandstorm/stewen.txt
+++ b/npc/002-1/stewen.txt
diff --git a/npc/002-1_Sandstorm/_import.txt b/npc/002-1_Sandstorm/_import.txt
deleted file mode 100644
index 749a24df..00000000
--- a/npc/002-1_Sandstorm/_import.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 002-1.gat
-npc: npc/002-1_Sandstorm/_mobs.txt
-npc: npc/002-1_Sandstorm/_warps.txt
-npc: npc/002-1_Sandstorm/lieutenant_dausen.txt
-npc: npc/002-1_Sandstorm/merchant.txt
-npc: npc/002-1_Sandstorm/nickos.txt
-npc: npc/002-1_Sandstorm/nomads.txt
-npc: npc/002-1_Sandstorm/rogue.txt
-npc: npc/002-1_Sandstorm/sandstorm_mine_barrier.txt
-npc: npc/002-1_Sandstorm/stewen.txt
diff --git a/npc/002-3/_import.txt b/npc/002-3/_import.txt
new file mode 100644
index 00000000..c6568edf
--- /dev/null
+++ b/npc/002-3/_import.txt
@@ -0,0 +1,11 @@
+// Map 002-3: Desert mines
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 002-3.gat
+npc: npc/002-3/_mobs.txt
+npc: npc/002-3/_warps.txt
+npc: npc/002-3/mine_triggerone.txt
+npc: npc/002-3/mine_triggerthree.txt
+npc: npc/002-3/mine_triggertwo.txt
+npc: npc/002-3/naem.txt
+npc: npc/002-3/nathan.txt
+npc: npc/002-3/underground_palace_barrier.txt
diff --git a/npc/002-3_Desert_mines/_mobs.txt b/npc/002-3/_mobs.txt
index a85ec781..26e1a3f1 100644
--- a/npc/002-3_Desert_mines/_mobs.txt
+++ b/npc/002-3/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 002-3 Desert mines mobs
+// Desert mines mobs
 
 002-3.gat,39,37,14,10	monster	Cave Maggot	1056,5,100000,30000,Mob002-3::On1056
 002-3.gat,91,41,17,20	monster	Ice Goblin	1058,3,100000,30000,Mob002-3::On1058
diff --git a/npc/002-3_Desert_mines/_warps.txt b/npc/002-3/_warps.txt
index 1f2ec929..5b7ce47c 100644
--- a/npc/002-3_Desert_mines/_warps.txt
+++ b/npc/002-3/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 002-3 Desert mines warps
+// Desert mines warps
 
 002-3.gat,37,29	warp	Exit	-1,-1,002-1.gat,25,95
diff --git a/npc/002-3_Desert_mines/mine_triggerone.txt b/npc/002-3/mine_triggerone.txt
index d182609b..d182609b 100644
--- a/npc/002-3_Desert_mines/mine_triggerone.txt
+++ b/npc/002-3/mine_triggerone.txt
diff --git a/npc/002-3_Desert_mines/mine_triggerthree.txt b/npc/002-3/mine_triggerthree.txt
index 828eb594..828eb594 100644
--- a/npc/002-3_Desert_mines/mine_triggerthree.txt
+++ b/npc/002-3/mine_triggerthree.txt
diff --git a/npc/002-3_Desert_mines/mine_triggertwo.txt b/npc/002-3/mine_triggertwo.txt
index 5d005620..5d005620 100644
--- a/npc/002-3_Desert_mines/mine_triggertwo.txt
+++ b/npc/002-3/mine_triggertwo.txt
diff --git a/npc/002-3_Desert_mines/naem.txt b/npc/002-3/naem.txt
index 5f0f9bd6..5f0f9bd6 100644
--- a/npc/002-3_Desert_mines/naem.txt
+++ b/npc/002-3/naem.txt
diff --git a/npc/002-3_Desert_mines/nathan.txt b/npc/002-3/nathan.txt
index dde61d84..dde61d84 100644
--- a/npc/002-3_Desert_mines/nathan.txt
+++ b/npc/002-3/nathan.txt
diff --git a/npc/002-3_Desert_mines/underground_palace_barrier.txt b/npc/002-3/underground_palace_barrier.txt
index 34eeaf57..34eeaf57 100644
--- a/npc/002-3_Desert_mines/underground_palace_barrier.txt
+++ b/npc/002-3/underground_palace_barrier.txt
diff --git a/npc/002-3_Desert_mines/_import.txt b/npc/002-3_Desert_mines/_import.txt
deleted file mode 100644
index 88b4a9ec..00000000
--- a/npc/002-3_Desert_mines/_import.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 002-3.gat
-npc: npc/002-3_Desert_mines/_mobs.txt
-npc: npc/002-3_Desert_mines/_warps.txt
-npc: npc/002-3_Desert_mines/mine_triggerone.txt
-npc: npc/002-3_Desert_mines/mine_triggerthree.txt
-npc: npc/002-3_Desert_mines/mine_triggertwo.txt
-npc: npc/002-3_Desert_mines/naem.txt
-npc: npc/002-3_Desert_mines/nathan.txt
-npc: npc/002-3_Desert_mines/underground_palace_barrier.txt
diff --git a/npc/002-4/_import.txt b/npc/002-4/_import.txt
new file mode 100644
index 00000000..46fac3a9
--- /dev/null
+++ b/npc/002-4/_import.txt
@@ -0,0 +1,7 @@
+// Map 002-4: Desert mines
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 002-4.gat
+npc: npc/002-4/_mobs.txt
+npc: npc/002-4/_warps.txt
+npc: npc/002-4/chest.txt
+npc: npc/002-4/miners.txt
diff --git a/npc/002-4_Desert_mines/_mobs.txt b/npc/002-4/_mobs.txt
index 74487965..aa8d42a5 100644
--- a/npc/002-4_Desert_mines/_mobs.txt
+++ b/npc/002-4/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 002-4 Desert mines mobs
+// Desert mines mobs
 
 002-4.gat,36,89,11,6	monster	Ice Goblin	1058,3,100000,30000,Mob002-4::On1058
 002-4.gat,33,76,2,11	monster	Cave Maggot	1056,3,100000,30000,Mob002-4::On1056
diff --git a/npc/002-4_Desert_mines/_warps.txt b/npc/002-4/_warps.txt
index 9a063b0a..ed406935 100644
--- a/npc/002-4_Desert_mines/_warps.txt
+++ b/npc/002-4/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 002-4 Desert mines warps
+// Desert mines warps
 
 002-4.gat,34,99	warp	toLevel1	-1,-1,002-3.gat,68,99
diff --git a/npc/002-4_Desert_mines/chest.txt b/npc/002-4/chest.txt
index 542ce345..542ce345 100644
--- a/npc/002-4_Desert_mines/chest.txt
+++ b/npc/002-4/chest.txt
diff --git a/npc/002-4_Desert_mines/miners.txt b/npc/002-4/miners.txt
index 91350e21..91350e21 100644
--- a/npc/002-4_Desert_mines/miners.txt
+++ b/npc/002-4/miners.txt
diff --git a/npc/002-4_Desert_mines/_import.txt b/npc/002-4_Desert_mines/_import.txt
deleted file mode 100644
index 9aa89734..00000000
--- a/npc/002-4_Desert_mines/_import.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 002-4.gat
-npc: npc/002-4_Desert_mines/_mobs.txt
-npc: npc/002-4_Desert_mines/_warps.txt
-npc: npc/002-4_Desert_mines/chest.txt
-npc: npc/002-4_Desert_mines/miners.txt
diff --git a/npc/003-1_Beach/_import.txt b/npc/003-1/_import.txt
index 661204a3..02340ca2 100644
--- a/npc/003-1_Beach/_import.txt
+++ b/npc/003-1/_import.txt
@@ -1,5 +1,6 @@
+// Map 003-1: Beach
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 003-1.gat
-npc: npc/003-1_Beach/_mobs.txt
-npc: npc/003-1_Beach/_warps.txt
-npc: npc/003-1_Beach/stranger.txt
+npc: npc/003-1/_mobs.txt
+npc: npc/003-1/_warps.txt
+npc: npc/003-1/stranger.txt
diff --git a/npc/003-1_Beach/_mobs.txt b/npc/003-1/_mobs.txt
index f95e3490..5aa53375 100644
--- a/npc/003-1_Beach/_mobs.txt
+++ b/npc/003-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 003-1 Beach mobs
+// Beach mobs
 
 003-1.gat,64,67,87,93	monster	Sea Slime	1033,15,100000,30000,Mob003-1::On1033
 003-1.gat,120,31,22,22	monster	Sea Slime	1033,5,100000,30000,Mob003-1::On1033
diff --git a/npc/003-1_Beach/_warps.txt b/npc/003-1/_warps.txt
index 2145a038..09277f19 100644
--- a/npc/003-1_Beach/_warps.txt
+++ b/npc/003-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 003-1 Beach warps
+// Beach warps
 
 003-1.gat,172,77	warp	ToSandstorm	-1,3,002-1.gat,15,66
 003-1.gat,141,19	warp	ToBeach	1,-1,004-1.gat,37,111
diff --git a/npc/003-1_Beach/stranger.txt b/npc/003-1/stranger.txt
index 9bc6d47d..9bc6d47d 100644
--- a/npc/003-1_Beach/stranger.txt
+++ b/npc/003-1/stranger.txt
diff --git a/npc/003-2_Beach_House/_import.txt b/npc/003-2/_import.txt
index 67e7a4f5..1e6e34cc 100644
--- a/npc/003-2_Beach_House/_import.txt
+++ b/npc/003-2/_import.txt
@@ -1,4 +1,5 @@
+// Map 003-2: Beach House
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 003-2.gat
-npc: npc/003-2_Beach_House/_mobs.txt
-npc: npc/003-2_Beach_House/_warps.txt
+npc: npc/003-2/_mobs.txt
+npc: npc/003-2/_warps.txt
diff --git a/npc/003-2_Beach_House/_mobs.txt b/npc/003-2/_mobs.txt
index 8b19a02c..1828e169 100644
--- a/npc/003-2_Beach_House/_mobs.txt
+++ b/npc/003-2/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 003-2 Beach House mobs
+// Beach House mobs
 
 
 
diff --git a/npc/003-2_Beach_House/_warps.txt b/npc/003-2/_warps.txt
index 67f9162f..e9f4bad9 100644
--- a/npc/003-2_Beach_House/_warps.txt
+++ b/npc/003-2/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 003-2 Beach House warps
+// Beach House warps
 
 003-2.gat,27,29	warp	toOutside	-1,-1,003-1.gat,48,37
 003-2.gat,61,29	warp	toOutside	-1,-1,003-1.gat,59,30
diff --git a/npc/004-1_Beach/_import.txt b/npc/004-1/_import.txt
index db47e100..441b28ba 100644
--- a/npc/004-1_Beach/_import.txt
+++ b/npc/004-1/_import.txt
@@ -1,4 +1,5 @@
+// Map 004-1: Beach
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 004-1.gat
-npc: npc/004-1_Beach/_mobs.txt
-npc: npc/004-1_Beach/_warps.txt
+npc: npc/004-1/_mobs.txt
+npc: npc/004-1/_warps.txt
diff --git a/npc/004-1_Beach/_mobs.txt b/npc/004-1/_mobs.txt
index 722b6d65..07f32beb 100644
--- a/npc/004-1_Beach/_mobs.txt
+++ b/npc/004-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 004-1 Beach mobs
+// Beach mobs
 
 004-1.gat,39,57,8,29	monster	Sea slime	1033,5,100000,30000,Mob004-1::On1033
 004-1.gat,33,83,9,40	monster	Sea Slime	1033,11,100000,30000,Mob004-1::On1033
diff --git a/npc/004-1_Beach/_warps.txt b/npc/004-1/_warps.txt
index 5795092b..45c98920 100644
--- a/npc/004-1_Beach/_warps.txt
+++ b/npc/004-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 004-1 Beach warps
+// 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/004-2_Beach_House/_import.txt b/npc/004-2/_import.txt
index 4703e3d0..3efc4d70 100644
--- a/npc/004-2_Beach_House/_import.txt
+++ b/npc/004-2/_import.txt
@@ -1,4 +1,5 @@
+// Map 004-2: Beach House
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 004-2.gat
-npc: npc/004-2_Beach_House/_mobs.txt
-npc: npc/004-2_Beach_House/_warps.txt
+npc: npc/004-2/_mobs.txt
+npc: npc/004-2/_warps.txt
diff --git a/npc/004-2_Beach_House/_mobs.txt b/npc/004-2/_mobs.txt
index 2669f3c6..dd47ab77 100644
--- a/npc/004-2_Beach_House/_mobs.txt
+++ b/npc/004-2/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 004-2 Beach House mobs
+// Beach House mobs
 
 
 
diff --git a/npc/004-2_Beach_House/_warps.txt b/npc/004-2/_warps.txt
index e8a40633..b69569d3 100644
--- a/npc/004-2_Beach_House/_warps.txt
+++ b/npc/004-2/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 004-2 Beach House warps
+// Beach House warps
 
 004-2.gat,39,20	warp	ToRoom	0,-1,004-2.gat,75,29
 004-2.gat,75,30	warp	ToRoom	0,-1,004-2.gat,38,21
diff --git a/npc/005-1/_import.txt b/npc/005-1/_import.txt
new file mode 100644
index 00000000..968adcd7
--- /dev/null
+++ b/npc/005-1/_import.txt
@@ -0,0 +1,8 @@
+// Map 005-1: Snake desert
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 005-1.gat
+npc: npc/005-1/_mobs.txt
+npc: npc/005-1/_warps.txt
+npc: npc/005-1/npcs.txt
+npc: npc/005-1/spirit.txt
+npc: npc/005-1/tree.txt
diff --git a/npc/005-1_Snake_desert/_mobs.txt b/npc/005-1/_mobs.txt
index 1e4366f9..177b995e 100644
--- a/npc/005-1_Snake_desert/_mobs.txt
+++ b/npc/005-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 005-1 Snake desert mobs
+// Snake desert mobs
 
 005-1.gat,0,0,0,0	monster	Maggot	1002,1,100000,30000,Mob005-1::On1002
 005-1.gat,0,0,0,0	monster	Snake	1010,1,100000,30000,Mob005-1::On1010
diff --git a/npc/005-1_Snake_desert/_warps.txt b/npc/005-1/_warps.txt
index 1e09429d..6d8c2597 100644
--- a/npc/005-1_Snake_desert/_warps.txt
+++ b/npc/005-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 005-1 Snake desert warps
+// 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
diff --git a/npc/005-1_Snake_desert/npcs.txt b/npc/005-1/npcs.txt
index 12f37ca1..12f37ca1 100644
--- a/npc/005-1_Snake_desert/npcs.txt
+++ b/npc/005-1/npcs.txt
diff --git a/npc/005-1_Snake_desert/spirit.txt b/npc/005-1/spirit.txt
index d6723c8e..d6723c8e 100644
--- a/npc/005-1_Snake_desert/spirit.txt
+++ b/npc/005-1/spirit.txt
diff --git a/npc/005-1_Snake_desert/tree.txt b/npc/005-1/tree.txt
index 54b7ed1c..54b7ed1c 100644
--- a/npc/005-1_Snake_desert/tree.txt
+++ b/npc/005-1/tree.txt
diff --git a/npc/005-1_Snake_desert/_import.txt b/npc/005-1_Snake_desert/_import.txt
deleted file mode 100644
index 06f15373..00000000
--- a/npc/005-1_Snake_desert/_import.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 005-1.gat
-npc: npc/005-1_Snake_desert/_mobs.txt
-npc: npc/005-1_Snake_desert/_warps.txt
-npc: npc/005-1_Snake_desert/npcs.txt
-npc: npc/005-1_Snake_desert/spirit.txt
-npc: npc/005-1_Snake_desert/tree.txt
diff --git a/npc/005-3_Snake_pit/_import.txt b/npc/005-3/_import.txt
index 64787f76..23982113 100644
--- a/npc/005-3_Snake_pit/_import.txt
+++ b/npc/005-3/_import.txt
@@ -1,5 +1,6 @@
+// Map 005-3: Snake pit
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 005-3.gat
-npc: npc/005-3_Snake_pit/_mobs.txt
-npc: npc/005-3_Snake_pit/_warps.txt
-npc: npc/005-3_Snake_pit/monsters.txt
+npc: npc/005-3/_mobs.txt
+npc: npc/005-3/_warps.txt
+npc: npc/005-3/monsters.txt
diff --git a/npc/005-3_Snake_pit/_mobs.txt b/npc/005-3/_mobs.txt
index 6d36e1b2..b5c48308 100644
--- a/npc/005-3_Snake_pit/_mobs.txt
+++ b/npc/005-3/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 005-3 Snake pit mobs
+// Snake pit mobs
 
 
 
diff --git a/npc/005-3_Snake_pit/_warps.txt b/npc/005-3/_warps.txt
index f56e5fcc..09084cc1 100644
--- a/npc/005-3_Snake_pit/_warps.txt
+++ b/npc/005-3/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 005-3 Snake pit warps
+// 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,75
diff --git a/npc/005-3_Snake_pit/monsters.txt b/npc/005-3/monsters.txt
index 439b6300..439b6300 100644
--- a/npc/005-3_Snake_pit/monsters.txt
+++ b/npc/005-3/monsters.txt
diff --git a/npc/006-1/_import.txt b/npc/006-1/_import.txt
new file mode 100644
index 00000000..ec566450
--- /dev/null
+++ b/npc/006-1/_import.txt
@@ -0,0 +1,7 @@
+// Map 006-1: Desert mountains
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 006-1.gat
+npc: npc/006-1/_mobs.txt
+npc: npc/006-1/_warps.txt
+npc: npc/006-1/mika.txt
+npc: npc/006-1/pachua.txt
diff --git a/npc/006-1_Desert_mountains/_mobs.txt b/npc/006-1/_mobs.txt
index ae13bb84..d3dffdd8 100644
--- a/npc/006-1_Desert_mountains/_mobs.txt
+++ b/npc/006-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 006-1 Desert mountains mobs
+// Desert mountains mobs
 
 006-1.gat,25,34,12,31	monster	Snake	1010,3,100000,30000,Mob006-1::On1010
 006-1.gat,36,29,9,16	monster	Snake	1010,1,100000,30000,Mob006-1::On1010
diff --git a/npc/006-1_Desert_mountains/_warps.txt b/npc/006-1/_warps.txt
index 3dd14f00..eab79c2b 100644
--- a/npc/006-1_Desert_mountains/_warps.txt
+++ b/npc/006-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 006-1 Desert mountains warps
+// Desert mountains warps
 
 006-1.gat,28,21	warp	ToDesert	-1,-1,005-1.gat,175,96
 006-1.gat,27,22	warp	ToDesert	-1,-1,005-1.gat,174,97
diff --git a/npc/006-1_Desert_mountains/mika.txt b/npc/006-1/mika.txt
index fc2e6f44..fc2e6f44 100644
--- a/npc/006-1_Desert_mountains/mika.txt
+++ b/npc/006-1/mika.txt
diff --git a/npc/006-1_Desert_mountains/pachua.txt b/npc/006-1/pachua.txt
index a827205f..a827205f 100644
--- a/npc/006-1_Desert_mountains/pachua.txt
+++ b/npc/006-1/pachua.txt
diff --git a/npc/006-1_Desert_mountains/_import.txt b/npc/006-1_Desert_mountains/_import.txt
deleted file mode 100644
index 655acae9..00000000
--- a/npc/006-1_Desert_mountains/_import.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 006-1.gat
-npc: npc/006-1_Desert_mountains/_mobs.txt
-npc: npc/006-1_Desert_mountains/_warps.txt
-npc: npc/006-1_Desert_mountains/mika.txt
-npc: npc/006-1_Desert_mountains/pachua.txt
diff --git a/npc/006-3_Desert_mountain_caves/_import.txt b/npc/006-3/_import.txt
index 1f1f8e49..85228166 100644
--- a/npc/006-3_Desert_mountain_caves/_import.txt
+++ b/npc/006-3/_import.txt
@@ -1,4 +1,5 @@
+// Map 006-3: Desert mountain caves
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 006-3.gat
-npc: npc/006-3_Desert_mountain_caves/_mobs.txt
-npc: npc/006-3_Desert_mountain_caves/_warps.txt
+npc: npc/006-3/_mobs.txt
+npc: npc/006-3/_warps.txt
diff --git a/npc/006-3_Desert_mountain_caves/_mobs.txt b/npc/006-3/_mobs.txt
index 849bcc11..2a401fa6 100644
--- a/npc/006-3_Desert_mountain_caves/_mobs.txt
+++ b/npc/006-3/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 006-3 Desert mountain caves mobs
+// Desert mountain caves mobs
 
 006-3.gat,108,25,36,8	monster	Mountain Snake	1026,3,15000,90000,Mob006-3::On1026
 006-3.gat,99,50,14,13	monster	Mountain Snake	1026,1,15000,90000,Mob006-3::On1026
diff --git a/npc/006-3_Desert_mountain_caves/_warps.txt b/npc/006-3/_warps.txt
index 1d8557d8..807c49b8 100644
--- a/npc/006-3_Desert_mountain_caves/_warps.txt
+++ b/npc/006-3/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 006-3 Desert mountain caves warps
+// Desert mountain caves warps
 
 006-3.gat,40,26	warp	ToOutside	-1,-1,006-1.gat,40,27
 006-3.gat,55,27	warp	ToOutside	-1,-1,006-1.gat,55,28
diff --git a/npc/007-1_Woodland/_import.txt b/npc/007-1/_import.txt
index 3ce8fb26..0e3373a3 100644
--- a/npc/007-1_Woodland/_import.txt
+++ b/npc/007-1/_import.txt
@@ -1,5 +1,6 @@
+// Map 007-1: Woodland
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 007-1.gat
-npc: npc/007-1_Woodland/_mobs.txt
-npc: npc/007-1_Woodland/_warps.txt
-npc: npc/007-1_Woodland/voltain.txt
+npc: npc/007-1/_mobs.txt
+npc: npc/007-1/_warps.txt
+npc: npc/007-1/voltain.txt
diff --git a/npc/007-1_Woodland/_mobs.txt b/npc/007-1/_mobs.txt
index c5dec71a..ab7ade2f 100644
--- a/npc/007-1_Woodland/_mobs.txt
+++ b/npc/007-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 007-1 Woodland mobs
+// Woodland mobs
 
 007-1.gat,0,0,0,0	monster	PinkFlower	1014,17,100000,30000,Mob007-1::On1014
 007-1.gat,0,0,0,0	monster	Spiky Mushroom	1019,15,100000,30000,Mob007-1::On1019
diff --git a/npc/007-1_Woodland/_warps.txt b/npc/007-1/_warps.txt
index 15013312..71ac7a33 100644
--- a/npc/007-1_Woodland/_warps.txt
+++ b/npc/007-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 007-1 Woodland warps
+// Woodland warps
 
 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
diff --git a/npc/007-1_Woodland/voltain.txt b/npc/007-1/voltain.txt
index ff13d70b..ff13d70b 100644
--- a/npc/007-1_Woodland/voltain.txt
+++ b/npc/007-1/voltain.txt
diff --git a/npc/008-1/_import.txt b/npc/008-1/_import.txt
new file mode 100644
index 00000000..f517bb23
--- /dev/null
+++ b/npc/008-1/_import.txt
@@ -0,0 +1,10 @@
+// Map 008-1: Hurnscald outskirts
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 008-1.gat
+npc: npc/008-1/_mobs.txt
+npc: npc/008-1/_warps.txt
+npc: npc/008-1/andra.txt
+npc: npc/008-1/diryn.txt
+npc: npc/008-1/dock.txt
+npc: npc/008-1/george.txt
+npc: npc/008-1/hinnak.txt
diff --git a/npc/008-1_Hurnscald_outskirts/_mobs.txt b/npc/008-1/_mobs.txt
index 52c99708..4aaccfdf 100644
--- a/npc/008-1_Hurnscald_outskirts/_mobs.txt
+++ b/npc/008-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 008-1 Hurnscald outskirts mobs
+// Hurnscald outskirts mobs
 
 008-1.gat,0,0,0,0	monster	PinkFlower	1014,10,20,0,Mob008-1::On1014
 008-1.gat,0,0,0,0	monster	Pinkie	1018,18,20,0,Mob008-1::On1018
diff --git a/npc/008-1_Hurnscald_outskirts/_warps.txt b/npc/008-1/_warps.txt
index 2ee36380..8cc5b652 100644
--- a/npc/008-1_Hurnscald_outskirts/_warps.txt
+++ b/npc/008-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 008-1 Hurnscald outskirts warps
+// 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
diff --git a/npc/008-1_Hurnscald_outskirts/andra.txt b/npc/008-1/andra.txt
index e56cbbf5..e56cbbf5 100644
--- a/npc/008-1_Hurnscald_outskirts/andra.txt
+++ b/npc/008-1/andra.txt
diff --git a/npc/008-1_Hurnscald_outskirts/diryn.txt b/npc/008-1/diryn.txt
index c5ab21a4..c5ab21a4 100644
--- a/npc/008-1_Hurnscald_outskirts/diryn.txt
+++ b/npc/008-1/diryn.txt
diff --git a/npc/008-1_Hurnscald_outskirts/dock.txt b/npc/008-1/dock.txt
index 46aa5a92..46aa5a92 100644
--- a/npc/008-1_Hurnscald_outskirts/dock.txt
+++ b/npc/008-1/dock.txt
diff --git a/npc/008-1_Hurnscald_outskirts/george.txt b/npc/008-1/george.txt
index 429fdbca..429fdbca 100644
--- a/npc/008-1_Hurnscald_outskirts/george.txt
+++ b/npc/008-1/george.txt
diff --git a/npc/008-1_Hurnscald_outskirts/hinnak.txt b/npc/008-1/hinnak.txt
index 4d17310c..4d17310c 100644
--- a/npc/008-1_Hurnscald_outskirts/hinnak.txt
+++ b/npc/008-1/hinnak.txt
diff --git a/npc/008-1_Hurnscald_outskirts/_import.txt b/npc/008-1_Hurnscald_outskirts/_import.txt
deleted file mode 100644
index 6520f76d..00000000
--- a/npc/008-1_Hurnscald_outskirts/_import.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 008-1.gat
-npc: npc/008-1_Hurnscald_outskirts/_mobs.txt
-npc: npc/008-1_Hurnscald_outskirts/_warps.txt
-npc: npc/008-1_Hurnscald_outskirts/andra.txt
-npc: npc/008-1_Hurnscald_outskirts/diryn.txt
-npc: npc/008-1_Hurnscald_outskirts/dock.txt
-npc: npc/008-1_Hurnscald_outskirts/george.txt
-npc: npc/008-1_Hurnscald_outskirts/hinnak.txt
diff --git a/npc/009-1/_import.txt b/npc/009-1/_import.txt
new file mode 100644
index 00000000..cfd187fb
--- /dev/null
+++ b/npc/009-1/_import.txt
@@ -0,0 +1,13 @@
+// Map 009-1: Hurnscald
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 009-1.gat
+npc: npc/009-1/_mobs.txt
+npc: npc/009-1/_warps.txt
+npc: npc/009-1/jack.txt
+npc: npc/009-1/mapflags.txt
+npc: npc/009-1/milly.txt
+npc: npc/009-1/old_man.txt
+npc: npc/009-1/old_woman.txt
+npc: npc/009-1/sabine.txt
+npc: npc/009-1/soul-menhir.txt
+npc: npc/009-1/water_pump.txt
diff --git a/npc/009-1_Hurnscald/_mobs.txt b/npc/009-1/_mobs.txt
index 52cbcf86..629d177e 100644
--- a/npc/009-1_Hurnscald/_mobs.txt
+++ b/npc/009-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 009-1 Hurnscald mobs
+// Hurnscald mobs
 
 009-1.gat,74,32,2,1	monster	Clover patch	1037,1,100000,120000,Mob009-1::On1037
 009-1.gat,29,44,9,13	monster	PinkFlower	1014,2,0,250,Mob009-1::On1014
diff --git a/npc/009-1_Hurnscald/_warps.txt b/npc/009-1/_warps.txt
index 37b6ac14..c8a7fad7 100644
--- a/npc/009-1_Hurnscald/_warps.txt
+++ b/npc/009-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 009-1 Hurnscald warps
+// 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
diff --git a/npc/009-1_Hurnscald/jack.txt b/npc/009-1/jack.txt
index a0ee0b43..a0ee0b43 100644
--- a/npc/009-1_Hurnscald/jack.txt
+++ b/npc/009-1/jack.txt
diff --git a/npc/009-1_Hurnscald/mapflags.txt b/npc/009-1/mapflags.txt
index f435d5d7..f435d5d7 100644
--- a/npc/009-1_Hurnscald/mapflags.txt
+++ b/npc/009-1/mapflags.txt
diff --git a/npc/009-1_Hurnscald/milly.txt b/npc/009-1/milly.txt
index 2935d314..2935d314 100644
--- a/npc/009-1_Hurnscald/milly.txt
+++ b/npc/009-1/milly.txt
diff --git a/npc/009-1_Hurnscald/old_man.txt b/npc/009-1/old_man.txt
index 84079138..84079138 100644
--- a/npc/009-1_Hurnscald/old_man.txt
+++ b/npc/009-1/old_man.txt
diff --git a/npc/009-1_Hurnscald/old_woman.txt b/npc/009-1/old_woman.txt
index c48b3557..c48b3557 100644
--- a/npc/009-1_Hurnscald/old_woman.txt
+++ b/npc/009-1/old_woman.txt
diff --git a/npc/009-1_Hurnscald/sabine.txt b/npc/009-1/sabine.txt
index b8a45859..b8a45859 100644
--- a/npc/009-1_Hurnscald/sabine.txt
+++ b/npc/009-1/sabine.txt
diff --git a/npc/009-1_Hurnscald/soul-menhir.txt b/npc/009-1/soul-menhir.txt
index 5daadd23..5daadd23 100644
--- a/npc/009-1_Hurnscald/soul-menhir.txt
+++ b/npc/009-1/soul-menhir.txt
diff --git a/npc/009-1_Hurnscald/water_pump.txt b/npc/009-1/water_pump.txt
index 42c36d64..42c36d64 100644
--- a/npc/009-1_Hurnscald/water_pump.txt
+++ b/npc/009-1/water_pump.txt
diff --git a/npc/009-1_Hurnscald/_import.txt b/npc/009-1_Hurnscald/_import.txt
deleted file mode 100644
index 60e95cd4..00000000
--- a/npc/009-1_Hurnscald/_import.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 009-1.gat
-npc: npc/009-1_Hurnscald/_mobs.txt
-npc: npc/009-1_Hurnscald/_warps.txt
-npc: npc/009-1_Hurnscald/jack.txt
-npc: npc/009-1_Hurnscald/mapflags.txt
-npc: npc/009-1_Hurnscald/milly.txt
-npc: npc/009-1_Hurnscald/old_man.txt
-npc: npc/009-1_Hurnscald/old_woman.txt
-npc: npc/009-1_Hurnscald/sabine.txt
-npc: npc/009-1_Hurnscald/soul-menhir.txt
-npc: npc/009-1_Hurnscald/water_pump.txt
diff --git a/npc/009-2/_import.txt b/npc/009-2/_import.txt
new file mode 100644
index 00000000..4d3ae94e
--- /dev/null
+++ b/npc/009-2/_import.txt
@@ -0,0 +1,22 @@
+// Map 009-2: Hurnscald
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 009-2.gat
+npc: npc/009-2/_mobs.txt
+npc: npc/009-2/_warps.txt
+npc: npc/009-2/airlia.txt
+npc: npc/009-2/alan.txt
+npc: npc/009-2/doctor.txt
+npc: npc/009-2/drunks.txt
+npc: npc/009-2/inspector.txt
+npc: npc/009-2/kfahr.txt
+npc: npc/009-2/lena.txt
+npc: npc/009-2/mapflags.txt
+npc: npc/009-2/misc.txt
+npc: npc/009-2/nicholas.txt
+npc: npc/009-2/nurse.txt
+npc: npc/009-2/peter.txt
+npc: npc/009-2/richard.txt
+npc: npc/009-2/selim.txt
+npc: npc/009-2/shops.txt
+npc: npc/009-2/waitress.txt
+npc: npc/009-2/wyara.txt
diff --git a/npc/009-2_Hurnscald/_mobs.txt b/npc/009-2/_mobs.txt
index 1633168d..5ce2976c 100644
--- a/npc/009-2_Hurnscald/_mobs.txt
+++ b/npc/009-2/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 009-2 Hurnscald mobs
+// Hurnscald mobs
 
 
 
diff --git a/npc/009-2_Hurnscald/_warps.txt b/npc/009-2/_warps.txt
index 8ab2526b..647db1a4 100644
--- a/npc/009-2_Hurnscald/_warps.txt
+++ b/npc/009-2/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 009-2 Hurnscald warps
+// 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
diff --git a/npc/009-2_Hurnscald/airlia.txt b/npc/009-2/airlia.txt
index 3f65a955..3f65a955 100644
--- a/npc/009-2_Hurnscald/airlia.txt
+++ b/npc/009-2/airlia.txt
diff --git a/npc/009-2_Hurnscald/alan.txt b/npc/009-2/alan.txt
index f19990d9..f19990d9 100644
--- a/npc/009-2_Hurnscald/alan.txt
+++ b/npc/009-2/alan.txt
diff --git a/npc/009-2_Hurnscald/doctor.txt b/npc/009-2/doctor.txt
index 2fbfcbd1..2fbfcbd1 100644
--- a/npc/009-2_Hurnscald/doctor.txt
+++ b/npc/009-2/doctor.txt
diff --git a/npc/009-2_Hurnscald/drunks.txt b/npc/009-2/drunks.txt
index 61246b4e..61246b4e 100644
--- a/npc/009-2_Hurnscald/drunks.txt
+++ b/npc/009-2/drunks.txt
diff --git a/npc/009-2_Hurnscald/inspector.txt b/npc/009-2/inspector.txt
index f25d026a..f25d026a 100644
--- a/npc/009-2_Hurnscald/inspector.txt
+++ b/npc/009-2/inspector.txt
diff --git a/npc/009-2_Hurnscald/kfahr.txt b/npc/009-2/kfahr.txt
index 88438b40..88438b40 100644
--- a/npc/009-2_Hurnscald/kfahr.txt
+++ b/npc/009-2/kfahr.txt
diff --git a/npc/009-2_Hurnscald/lena.txt b/npc/009-2/lena.txt
index 9f215cde..9f215cde 100644
--- a/npc/009-2_Hurnscald/lena.txt
+++ b/npc/009-2/lena.txt
diff --git a/npc/009-2_Hurnscald/mapflags.txt b/npc/009-2/mapflags.txt
index 84ee64b6..84ee64b6 100644
--- a/npc/009-2_Hurnscald/mapflags.txt
+++ b/npc/009-2/mapflags.txt
diff --git a/npc/009-2_Hurnscald/misc.txt b/npc/009-2/misc.txt
index b969af7d..b969af7d 100644
--- a/npc/009-2_Hurnscald/misc.txt
+++ b/npc/009-2/misc.txt
diff --git a/npc/009-2_Hurnscald/nicholas.txt b/npc/009-2/nicholas.txt
index ac0b5e43..ac0b5e43 100644
--- a/npc/009-2_Hurnscald/nicholas.txt
+++ b/npc/009-2/nicholas.txt
diff --git a/npc/009-2_Hurnscald/nurse.txt b/npc/009-2/nurse.txt
index a47fdf95..a47fdf95 100644
--- a/npc/009-2_Hurnscald/nurse.txt
+++ b/npc/009-2/nurse.txt
diff --git a/npc/009-2_Hurnscald/peter.txt b/npc/009-2/peter.txt
index 995bfc31..995bfc31 100644
--- a/npc/009-2_Hurnscald/peter.txt
+++ b/npc/009-2/peter.txt
diff --git a/npc/009-2_Hurnscald/richard.txt b/npc/009-2/richard.txt
index 023f1244..023f1244 100644
--- a/npc/009-2_Hurnscald/richard.txt
+++ b/npc/009-2/richard.txt
diff --git a/npc/009-2_Hurnscald/selim.txt b/npc/009-2/selim.txt
index dc7d29df..dc7d29df 100644
--- a/npc/009-2_Hurnscald/selim.txt
+++ b/npc/009-2/selim.txt
diff --git a/npc/009-2_Hurnscald/shops.txt b/npc/009-2/shops.txt
index 733fa54f..733fa54f 100644
--- a/npc/009-2_Hurnscald/shops.txt
+++ b/npc/009-2/shops.txt
diff --git a/npc/009-2_Hurnscald/waitress.txt b/npc/009-2/waitress.txt
index 265cd234..265cd234 100644
--- a/npc/009-2_Hurnscald/waitress.txt
+++ b/npc/009-2/waitress.txt
diff --git a/npc/009-2_Hurnscald/wyara.txt b/npc/009-2/wyara.txt
index 145f09a5..145f09a5 100644
--- a/npc/009-2_Hurnscald/wyara.txt
+++ b/npc/009-2/wyara.txt
diff --git a/npc/009-2_Hurnscald/_import.txt b/npc/009-2_Hurnscald/_import.txt
deleted file mode 100644
index 6f52cf7c..00000000
--- a/npc/009-2_Hurnscald/_import.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 009-2.gat
-npc: npc/009-2_Hurnscald/_mobs.txt
-npc: npc/009-2_Hurnscald/_warps.txt
-npc: npc/009-2_Hurnscald/airlia.txt
-npc: npc/009-2_Hurnscald/alan.txt
-npc: npc/009-2_Hurnscald/doctor.txt
-npc: npc/009-2_Hurnscald/drunks.txt
-npc: npc/009-2_Hurnscald/inspector.txt
-npc: npc/009-2_Hurnscald/kfahr.txt
-npc: npc/009-2_Hurnscald/lena.txt
-npc: npc/009-2_Hurnscald/mapflags.txt
-npc: npc/009-2_Hurnscald/misc.txt
-npc: npc/009-2_Hurnscald/nicholas.txt
-npc: npc/009-2_Hurnscald/nurse.txt
-npc: npc/009-2_Hurnscald/peter.txt
-npc: npc/009-2_Hurnscald/richard.txt
-npc: npc/009-2_Hurnscald/selim.txt
-npc: npc/009-2_Hurnscald/shops.txt
-npc: npc/009-2_Hurnscald/waitress.txt
-npc: npc/009-2_Hurnscald/wyara.txt
diff --git a/npc/009-3/_import.txt b/npc/009-3/_import.txt
new file mode 100644
index 00000000..12bf619c
--- /dev/null
+++ b/npc/009-3/_import.txt
@@ -0,0 +1,7 @@
+// Map 009-3: Cave beneath Hurnscald
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 009-3.gat
+npc: npc/009-3/_mobs.txt
+npc: npc/009-3/_warps.txt
+npc: npc/009-3/monsters.txt
+npc: npc/009-3/sword.txt
diff --git a/npc/009-3_Cave_beneath_Hurnscald/_mobs.txt b/npc/009-3/_mobs.txt
index 0ac73785..b1cc7bc4 100644
--- a/npc/009-3_Cave_beneath_Hurnscald/_mobs.txt
+++ b/npc/009-3/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 009-3 Cave beneath Hurnscald mobs
+// Cave beneath Hurnscald mobs
 
 
 
diff --git a/npc/009-3_Cave_beneath_Hurnscald/_warps.txt b/npc/009-3/_warps.txt
index 4349cd6d..57adbca9 100644
--- a/npc/009-3_Cave_beneath_Hurnscald/_warps.txt
+++ b/npc/009-3/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 009-3 Cave beneath Hurnscald warps
+// 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
diff --git a/npc/009-3_Cave_beneath_Hurnscald/monsters.txt b/npc/009-3/monsters.txt
index b69bb3a1..b69bb3a1 100644
--- a/npc/009-3_Cave_beneath_Hurnscald/monsters.txt
+++ b/npc/009-3/monsters.txt
diff --git a/npc/009-3_Cave_beneath_Hurnscald/sword.txt b/npc/009-3/sword.txt
index fbb47433..fbb47433 100644
--- a/npc/009-3_Cave_beneath_Hurnscald/sword.txt
+++ b/npc/009-3/sword.txt
diff --git a/npc/009-3_Cave_beneath_Hurnscald/_import.txt b/npc/009-3_Cave_beneath_Hurnscald/_import.txt
deleted file mode 100644
index 514f9525..00000000
--- a/npc/009-3_Cave_beneath_Hurnscald/_import.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 009-3.gat
-npc: npc/009-3_Cave_beneath_Hurnscald/_mobs.txt
-npc: npc/009-3_Cave_beneath_Hurnscald/_warps.txt
-npc: npc/009-3_Cave_beneath_Hurnscald/monsters.txt
-npc: npc/009-3_Cave_beneath_Hurnscald/sword.txt
diff --git a/npc/009-4/_import.txt b/npc/009-4/_import.txt
index 686387b1..db91605c 100644
--- a/npc/009-4/_import.txt
+++ b/npc/009-4/_import.txt
@@ -1,3 +1,4 @@
+// Map 009-4: 
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 009-4.gat
 npc: npc/009-4/_mobs.txt
diff --git a/npc/009-4/_mobs.txt b/npc/009-4/_mobs.txt
index 4f7b34c3..f4c9140e 100644
--- a/npc/009-4/_mobs.txt
+++ b/npc/009-4/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 009-4 mobs
+//  mobs
 
 009-4.gat,117,97,24,15	monster	Silkworm	1035,3,20000,14000,Mob009-4::On1035
 009-4.gat,115,98,24,15	monster	Cave Snake	1021,5,20000,14000,Mob009-4::On1021
diff --git a/npc/009-4/_warps.txt b/npc/009-4/_warps.txt
index db64706a..e666d8ca 100644
--- a/npc/009-4/_warps.txt
+++ b/npc/009-4/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 009-4 warps
+//  warps
 
 009-4.gat,37,112	warp	to 009-3	-1,-1,009-3.gat,162,114
 009-4.gat,72,136	warp	to Cavern	-1,-1,009-4.gat,36,27
diff --git a/npc/010-1_Woodland/_import.txt b/npc/010-1/_import.txt
index a47035cb..c784dbe5 100644
--- a/npc/010-1_Woodland/_import.txt
+++ b/npc/010-1/_import.txt
@@ -1,4 +1,5 @@
+// Map 010-1: Woodland
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 010-1.gat
-npc: npc/010-1_Woodland/_mobs.txt
-npc: npc/010-1_Woodland/_warps.txt
+npc: npc/010-1/_mobs.txt
+npc: npc/010-1/_warps.txt
diff --git a/npc/010-1_Woodland/_mobs.txt b/npc/010-1/_mobs.txt
index a971df3f..b918a278 100644
--- a/npc/010-1_Woodland/_mobs.txt
+++ b/npc/010-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 010-1 Woodland mobs
+// Woodland mobs
 
 010-1.gat,82,63,19,19	monster	Scorpion	1003,1,100000,30000,Mob010-1::On1003
 010-1.gat,49,71,31,19	monster	Shroom	1019,1,100000,30000,Mob010-1::On1019
diff --git a/npc/010-1_Woodland/_warps.txt b/npc/010-1/_warps.txt
index aacac982..c2f5a4d8 100644
--- a/npc/010-1_Woodland/_warps.txt
+++ b/npc/010-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 010-1 Woodland warps
+// 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
diff --git a/npc/010-2/_import.txt b/npc/010-2/_import.txt
new file mode 100644
index 00000000..567b7a12
--- /dev/null
+++ b/npc/010-2/_import.txt
@@ -0,0 +1,10 @@
+// Map 010-2: Dimond's Cove
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 010-2.gat
+npc: npc/010-2/_mobs.txt
+npc: npc/010-2/_warps.txt
+npc: npc/010-2/chef.txt
+npc: npc/010-2/dimonds.txt
+npc: npc/010-2/doug.txt
+npc: npc/010-2/loratay.txt
+npc: npc/010-2/workers.txt
diff --git a/npc/010-2_Dimonds_Cove/_mobs.txt b/npc/010-2/_mobs.txt
index 2ac4b85c..efa9aa57 100644
--- a/npc/010-2_Dimonds_Cove/_mobs.txt
+++ b/npc/010-2/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 010-2 Dimond's Cove mobs
+// Dimond's Cove mobs
 
 
 
diff --git a/npc/010-2_Dimonds_Cove/_warps.txt b/npc/010-2/_warps.txt
index 64fd7113..76e2be8b 100644
--- a/npc/010-2_Dimonds_Cove/_warps.txt
+++ b/npc/010-2/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 010-2 Dimond's Cove warps
+// 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
diff --git a/npc/010-2_Dimonds_Cove/chef.txt b/npc/010-2/chef.txt
index 3d759005..3d759005 100644
--- a/npc/010-2_Dimonds_Cove/chef.txt
+++ b/npc/010-2/chef.txt
diff --git a/npc/010-2_Dimonds_Cove/dimonds.txt b/npc/010-2/dimonds.txt
index c1578d55..c1578d55 100644
--- a/npc/010-2_Dimonds_Cove/dimonds.txt
+++ b/npc/010-2/dimonds.txt
diff --git a/npc/010-2_Dimonds_Cove/doug.txt b/npc/010-2/doug.txt
index 0f35e02a..0f35e02a 100644
--- a/npc/010-2_Dimonds_Cove/doug.txt
+++ b/npc/010-2/doug.txt
diff --git a/npc/010-2_Dimonds_Cove/loratay.txt b/npc/010-2/loratay.txt
index cb784ebb..cb784ebb 100644
--- a/npc/010-2_Dimonds_Cove/loratay.txt
+++ b/npc/010-2/loratay.txt
diff --git a/npc/010-2_Dimonds_Cove/workers.txt b/npc/010-2/workers.txt
index 0d80f700..0d80f700 100644
--- a/npc/010-2_Dimonds_Cove/workers.txt
+++ b/npc/010-2/workers.txt
diff --git a/npc/010-2_Dimonds_Cove/_import.txt b/npc/010-2_Dimonds_Cove/_import.txt
deleted file mode 100644
index f9482a98..00000000
--- a/npc/010-2_Dimonds_Cove/_import.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 010-2.gat
-npc: npc/010-2_Dimonds_Cove/_mobs.txt
-npc: npc/010-2_Dimonds_Cove/_warps.txt
-npc: npc/010-2_Dimonds_Cove/chef.txt
-npc: npc/010-2_Dimonds_Cove/dimonds.txt
-npc: npc/010-2_Dimonds_Cove/doug.txt
-npc: npc/010-2_Dimonds_Cove/loratay.txt
-npc: npc/010-2_Dimonds_Cove/workers.txt
diff --git a/npc/011-1/_import.txt b/npc/011-1/_import.txt
new file mode 100644
index 00000000..53f564ce
--- /dev/null
+++ b/npc/011-1/_import.txt
@@ -0,0 +1,9 @@
+// Map 011-1: Woodland
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 011-1.gat
+npc: npc/011-1/_mobs.txt
+npc: npc/011-1/_warps.txt
+npc: npc/011-1/alchemist.txt
+npc: npc/011-1/auldsbel.txt
+npc: npc/011-1/oscar.txt
+npc: npc/011-1/shops.txt
diff --git a/npc/011-1_Woodland/_mobs.txt b/npc/011-1/_mobs.txt
index caf56cb4..afe279a9 100644
--- a/npc/011-1_Woodland/_mobs.txt
+++ b/npc/011-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 011-1 Woodland mobs
+// Woodland mobs
 
 011-1.gat,0,0,0,0	monster	EvilMushroom	1013,30,0,0,Mob011-1::On1013
 011-1.gat,0,0,0,0	monster	PinkFlower	1014,20,0,0,Mob011-1::On1014
diff --git a/npc/011-1_Woodland/_warps.txt b/npc/011-1/_warps.txt
index 976e3a93..44bc62c5 100644
--- a/npc/011-1_Woodland/_warps.txt
+++ b/npc/011-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 011-1 Woodland warps
+// 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,106,91
diff --git a/npc/011-1_Woodland/alchemist.txt b/npc/011-1/alchemist.txt
index bb7ef734..bb7ef734 100644
--- a/npc/011-1_Woodland/alchemist.txt
+++ b/npc/011-1/alchemist.txt
diff --git a/npc/011-1_Woodland/auldsbel.txt b/npc/011-1/auldsbel.txt
index 8982f699..8982f699 100644
--- a/npc/011-1_Woodland/auldsbel.txt
+++ b/npc/011-1/auldsbel.txt
diff --git a/npc/011-1_Woodland/oscar.txt b/npc/011-1/oscar.txt
index d2b40f0e..d2b40f0e 100644
--- a/npc/011-1_Woodland/oscar.txt
+++ b/npc/011-1/oscar.txt
diff --git a/npc/011-1_Woodland/shops.txt b/npc/011-1/shops.txt
index e9616d8c..e9616d8c 100644
--- a/npc/011-1_Woodland/shops.txt
+++ b/npc/011-1/shops.txt
diff --git a/npc/011-1_Woodland/_import.txt b/npc/011-1_Woodland/_import.txt
deleted file mode 100644
index 5de3354e..00000000
--- a/npc/011-1_Woodland/_import.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 011-1.gat
-npc: npc/011-1_Woodland/_mobs.txt
-npc: npc/011-1_Woodland/_warps.txt
-npc: npc/011-1_Woodland/alchemist.txt
-npc: npc/011-1_Woodland/auldsbel.txt
-npc: npc/011-1_Woodland/oscar.txt
-npc: npc/011-1_Woodland/shops.txt
diff --git a/npc/011-3/_import.txt b/npc/011-3/_import.txt
new file mode 100644
index 00000000..799e5dd0
--- /dev/null
+++ b/npc/011-3/_import.txt
@@ -0,0 +1,7 @@
+// Map 011-3: Hermit's cave
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 011-3.gat
+npc: npc/011-3/_mobs.txt
+npc: npc/011-3/_warps.txt
+npc: npc/011-3/hermit.txt
+npc: npc/011-3/monsters.txt
diff --git a/npc/011-3_Hermits_cave/_mobs.txt b/npc/011-3/_mobs.txt
index ae3db870..2fc7d85b 100644
--- a/npc/011-3_Hermits_cave/_mobs.txt
+++ b/npc/011-3/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 011-3 Hermit's cave mobs
+// Hermit's cave mobs
 
 
 
diff --git a/npc/011-3_Hermits_cave/_warps.txt b/npc/011-3/_warps.txt
index a293fa83..0c7ae9de 100644
--- a/npc/011-3_Hermits_cave/_warps.txt
+++ b/npc/011-3/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 011-3 Hermit's cave warps
+// Hermit's cave warps
 
 011-3.gat,31,21	warp	ToLakeCave	-1,-1,011-4.gat,72,11
diff --git a/npc/011-3_Hermits_cave/hermit.txt b/npc/011-3/hermit.txt
index 4b582cc4..4b582cc4 100644
--- a/npc/011-3_Hermits_cave/hermit.txt
+++ b/npc/011-3/hermit.txt
diff --git a/npc/011-3_Hermits_cave/monsters.txt b/npc/011-3/monsters.txt
index 37da9f40..37da9f40 100644
--- a/npc/011-3_Hermits_cave/monsters.txt
+++ b/npc/011-3/monsters.txt
diff --git a/npc/011-3_Hermits_cave/_import.txt b/npc/011-3_Hermits_cave/_import.txt
deleted file mode 100644
index 020a080e..00000000
--- a/npc/011-3_Hermits_cave/_import.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 011-3.gat
-npc: npc/011-3_Hermits_cave/_mobs.txt
-npc: npc/011-3_Hermits_cave/_warps.txt
-npc: npc/011-3_Hermits_cave/hermit.txt
-npc: npc/011-3_Hermits_cave/monsters.txt
diff --git a/npc/011-4/_import.txt b/npc/011-4/_import.txt
new file mode 100644
index 00000000..f2e5264f
--- /dev/null
+++ b/npc/011-4/_import.txt
@@ -0,0 +1,7 @@
+// Map 011-4: Lake cave
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 011-4.gat
+npc: npc/011-4/_mobs.txt
+npc: npc/011-4/_warps.txt
+npc: npc/011-4/bl_barrier.txt
+npc: npc/011-4/monsters.txt
diff --git a/npc/011-4_Lake_cave/_mobs.txt b/npc/011-4/_mobs.txt
index 1c5abe39..2e4f3576 100644
--- a/npc/011-4_Lake_cave/_mobs.txt
+++ b/npc/011-4/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 011-4 Lake cave mobs
+// Lake cave mobs
 
 011-4.gat,51,29,39,39	monster	Shroom	1019,1,100000,30000,Mob011-4::On1019
 011-4.gat,93,114,39,39	monster	Lamp Snake	1021,1,100000,30000,Mob011-4::On1021
diff --git a/npc/011-4_Lake_cave/_warps.txt b/npc/011-4/_warps.txt
index 0b7f027d..40058613 100644
--- a/npc/011-4_Lake_cave/_warps.txt
+++ b/npc/011-4/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 011-4 Lake cave warps
+// 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/011-4_Lake_cave/bl_barrier.txt b/npc/011-4/bl_barrier.txt
index 07b44999..07b44999 100644
--- a/npc/011-4_Lake_cave/bl_barrier.txt
+++ b/npc/011-4/bl_barrier.txt
diff --git a/npc/011-4_Lake_cave/monsters.txt b/npc/011-4/monsters.txt
index d3b78249..d3b78249 100644
--- a/npc/011-4_Lake_cave/monsters.txt
+++ b/npc/011-4/monsters.txt
diff --git a/npc/011-4_Lake_cave/_import.txt b/npc/011-4_Lake_cave/_import.txt
deleted file mode 100644
index aa662cb6..00000000
--- a/npc/011-4_Lake_cave/_import.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 011-4.gat
-npc: npc/011-4_Lake_cave/_mobs.txt
-npc: npc/011-4_Lake_cave/_warps.txt
-npc: npc/011-4_Lake_cave/bl_barrier.txt
-npc: npc/011-4_Lake_cave/monsters.txt
diff --git a/npc/011-5/_import.txt b/npc/011-5/_import.txt
index f66c2afa..0901afa2 100644
--- a/npc/011-5/_import.txt
+++ b/npc/011-5/_import.txt
@@ -1,3 +1,4 @@
+// Map 011-5: 
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 011-5.gat
 npc: npc/011-5/_mobs.txt
diff --git a/npc/011-5/_mobs.txt b/npc/011-5/_mobs.txt
index 5a7bbed1..22d89a4e 100644
--- a/npc/011-5/_mobs.txt
+++ b/npc/011-5/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 011-5 mobs
+//  mobs
 
 
 
diff --git a/npc/011-5/_warps.txt b/npc/011-5/_warps.txt
index e5b60b31..605abadf 100644
--- a/npc/011-5/_warps.txt
+++ b/npc/011-5/_warps.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 011-5 warps
+//  warps
 
diff --git a/npc/011-6/_import.txt b/npc/011-6/_import.txt
index 74e2fd98..0afbffa4 100644
--- a/npc/011-6/_import.txt
+++ b/npc/011-6/_import.txt
@@ -1,3 +1,4 @@
+// Map 011-6: 
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 011-6.gat
 npc: npc/011-6/_mobs.txt
diff --git a/npc/011-6/_mobs.txt b/npc/011-6/_mobs.txt
index 78b1ffcf..007e7e86 100644
--- a/npc/011-6/_mobs.txt
+++ b/npc/011-6/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 011-6 mobs
+//  mobs
 
 011-6.gat,152,72,283,127	monster	Silk Worm	1035,9,30000,100000,Mob011-6::On1035
 011-6.gat,263,38,30,34	monster	Bandit	1064,1,30000,30000,Mob011-6::On1064
diff --git a/npc/011-6/_warps.txt b/npc/011-6/_warps.txt
index 22911093..458bc283 100644
--- a/npc/011-6/_warps.txt
+++ b/npc/011-6/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 011-6 warps
+//  warps
 
 011-6.gat,51,75	warp	toMiddleCave1	-1,-1,011-6.gat,260,125
 011-6.gat,61,71	warp	toMiddleCave2	-1,-1,011-6.gat,270,122
diff --git a/npc/012-1/_import.txt b/npc/012-1/_import.txt
new file mode 100644
index 00000000..095de153
--- /dev/null
+++ b/npc/012-1/_import.txt
@@ -0,0 +1,8 @@
+// Map 012-1: Woodland Hills
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 012-1.gat
+npc: npc/012-1/_mobs.txt
+npc: npc/012-1/_warps.txt
+npc: npc/012-1/amrak.txt
+npc: npc/012-1/injured-mouboo.txt
+npc: npc/012-1/shops.txt
diff --git a/npc/012-1_Woodland_Hills/_mobs.txt b/npc/012-1/_mobs.txt
index e1f50317..0cfb2c14 100644
--- a/npc/012-1_Woodland_Hills/_mobs.txt
+++ b/npc/012-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 012-1 Woodland Hills mobs
+// Woodland Hills mobs
 
 012-1.gat,0,0,0,0	monster	PinkFlower	1014,13,0,100,Mob012-1::On1014
 012-1.gat,0,0,0,0	monster	SpikyMushroom	1019,25,0,10,Mob012-1::On1019
diff --git a/npc/012-1_Woodland_Hills/_warps.txt b/npc/012-1/_warps.txt
index 4fe031e0..de7ffc77 100644
--- a/npc/012-1_Woodland_Hills/_warps.txt
+++ b/npc/012-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 012-1 Woodland Hills warps
+// Woodland Hills warps
 
 012-1.gat,51,39	warp	ToCaves	-1,-1,012-3.gat,370,45
 012-1.gat,147,67	warp	ToCaves	-1,-1,012-3.gat,474,103
diff --git a/npc/012-1_Woodland_Hills/amrak.txt b/npc/012-1/amrak.txt
index 5a2a547a..5a2a547a 100644
--- a/npc/012-1_Woodland_Hills/amrak.txt
+++ b/npc/012-1/amrak.txt
diff --git a/npc/012-1_Woodland_Hills/injured-mouboo.txt b/npc/012-1/injured-mouboo.txt
index 1aa780f5..1aa780f5 100644
--- a/npc/012-1_Woodland_Hills/injured-mouboo.txt
+++ b/npc/012-1/injured-mouboo.txt
diff --git a/npc/012-1_Woodland_Hills/shops.txt b/npc/012-1/shops.txt
index b29e5542..b29e5542 100644
--- a/npc/012-1_Woodland_Hills/shops.txt
+++ b/npc/012-1/shops.txt
diff --git a/npc/012-1_Woodland_Hills/_import.txt b/npc/012-1_Woodland_Hills/_import.txt
deleted file mode 100644
index 282ca704..00000000
--- a/npc/012-1_Woodland_Hills/_import.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 012-1.gat
-npc: npc/012-1_Woodland_Hills/_mobs.txt
-npc: npc/012-1_Woodland_Hills/_warps.txt
-npc: npc/012-1_Woodland_Hills/amrak.txt
-npc: npc/012-1_Woodland_Hills/injured-mouboo.txt
-npc: npc/012-1_Woodland_Hills/shops.txt
diff --git a/npc/012-3/_import.txt b/npc/012-3/_import.txt
new file mode 100644
index 00000000..6e5ac13a
--- /dev/null
+++ b/npc/012-3/_import.txt
@@ -0,0 +1,8 @@
+// Map 012-3: Cave
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 012-3.gat
+npc: npc/012-3/_mobs.txt
+npc: npc/012-3/_warps.txt
+npc: npc/012-3/mana-seed.txt
+npc: npc/012-3/monsters.txt
+npc: npc/012-3/warningsigns.txt
diff --git a/npc/012-3_Cave/_mobs.txt b/npc/012-3/_mobs.txt
index df983cbd..ce7a365f 100644
--- a/npc/012-3_Cave/_mobs.txt
+++ b/npc/012-3/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 012-3 Cave mobs
+// Cave mobs
 
 012-3.gat,447,65,17,7	monster	Moggun	1061,5,100000,30000,Mob012-3::On1061
 012-3.gat,441,45,17,7	monster	Moggun	1061,5,100000,30000,Mob012-3::On1061
diff --git a/npc/012-3_Cave/_warps.txt b/npc/012-3/_warps.txt
index 15d47e27..41ef598f 100644
--- a/npc/012-3_Cave/_warps.txt
+++ b/npc/012-3/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 012-3 Cave warps
+// 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
diff --git a/npc/012-3_Cave/mana-seed.txt b/npc/012-3/mana-seed.txt
index 6877ee2c..6877ee2c 100644
--- a/npc/012-3_Cave/mana-seed.txt
+++ b/npc/012-3/mana-seed.txt
diff --git a/npc/012-3_Cave/monsters.txt b/npc/012-3/monsters.txt
index e6f4cf79..e6f4cf79 100644
--- a/npc/012-3_Cave/monsters.txt
+++ b/npc/012-3/monsters.txt
diff --git a/npc/012-3_Cave/warningsigns.txt b/npc/012-3/warningsigns.txt
index 2bd31346..2bd31346 100644
--- a/npc/012-3_Cave/warningsigns.txt
+++ b/npc/012-3/warningsigns.txt
diff --git a/npc/012-3_Cave/_import.txt b/npc/012-3_Cave/_import.txt
deleted file mode 100644
index e1a94876..00000000
--- a/npc/012-3_Cave/_import.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 012-3.gat
-npc: npc/012-3_Cave/_mobs.txt
-npc: npc/012-3_Cave/_warps.txt
-npc: npc/012-3_Cave/mana-seed.txt
-npc: npc/012-3_Cave/monsters.txt
-npc: npc/012-3_Cave/warningsigns.txt
diff --git a/npc/012-4_Cave/_import.txt b/npc/012-4/_import.txt
index 9aee72bc..7136ece3 100644
--- a/npc/012-4_Cave/_import.txt
+++ b/npc/012-4/_import.txt
@@ -1,5 +1,6 @@
+// Map 012-4: Cave
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 012-4.gat
-npc: npc/012-4_Cave/_mobs.txt
-npc: npc/012-4_Cave/_warps.txt
-npc: npc/012-4_Cave/pvpflag.txt
+npc: npc/012-4/_mobs.txt
+npc: npc/012-4/_warps.txt
+npc: npc/012-4/pvpflag.txt
diff --git a/npc/012-4_Cave/_mobs.txt b/npc/012-4/_mobs.txt
index 48859b7c..db88e63b 100644
--- a/npc/012-4_Cave/_mobs.txt
+++ b/npc/012-4/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 012-4 Cave mobs
+// Cave mobs
 
 012-4.gat,215,44,11,3	monster	Moggun	1061,3,100000,30000,Mob012-4::On1061
 012-4.gat,221,29,11,3	monster	Moggun	1061,3,100000,30000,Mob012-4::On1061
diff --git a/npc/012-4_Cave/_warps.txt b/npc/012-4/_warps.txt
index 1ee15ac7..8202452f 100644
--- a/npc/012-4_Cave/_warps.txt
+++ b/npc/012-4/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 012-4 Cave warps
+// Cave warps
 
 012-4.gat,194,58	warp	CaveEntrance	0,-1,012-3.gat,448,62
 012-4.gat,363,26	warp	CaveEntrance	-1,-1,012-4.gat,474,186
diff --git a/npc/012-4_Cave/pvpflag.txt b/npc/012-4/pvpflag.txt
index b796cefa..b796cefa 100644
--- a/npc/012-4_Cave/pvpflag.txt
+++ b/npc/012-4/pvpflag.txt
diff --git a/npc/013-1/_import.txt b/npc/013-1/_import.txt
new file mode 100644
index 00000000..62a26f85
--- /dev/null
+++ b/npc/013-1/_import.txt
@@ -0,0 +1,6 @@
+// Map 013-1: Woodland hills
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 013-1.gat
+npc: npc/013-1/_mobs.txt
+npc: npc/013-1/_warps.txt
+npc: npc/013-1/sagatha.txt
diff --git a/npc/013-1_Woodland_hills/_mobs.txt b/npc/013-1/_mobs.txt
index a3a4c2e1..018cbda6 100644
--- a/npc/013-1_Woodland_hills/_mobs.txt
+++ b/npc/013-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 013-1 Woodland hills mobs
+// Woodland hills mobs
 
 013-1.gat,0,0,0,0	monster	PinkFlower	1014,13,0,100,Mob013-1::On1014
 013-1.gat,0,0,0,0	monster	SpikyMushroom	1019,12,0,100,Mob013-1::On1019
diff --git a/npc/013-1_Woodland_hills/_warps.txt b/npc/013-1/_warps.txt
index 52cd8547..f82b948f 100644
--- a/npc/013-1_Woodland_hills/_warps.txt
+++ b/npc/013-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 013-1 Woodland hills warps
+// 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,148,60
diff --git a/npc/013-1_Woodland_hills/sagatha.txt b/npc/013-1/sagatha.txt
index 84df4fe6..84df4fe6 100644
--- a/npc/013-1_Woodland_hills/sagatha.txt
+++ b/npc/013-1/sagatha.txt
diff --git a/npc/013-1_Woodland_hills/_import.txt b/npc/013-1_Woodland_hills/_import.txt
deleted file mode 100644
index 580f0669..00000000
--- a/npc/013-1_Woodland_hills/_import.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 013-1.gat
-npc: npc/013-1_Woodland_hills/_mobs.txt
-npc: npc/013-1_Woodland_hills/_warps.txt
-npc: npc/013-1_Woodland_hills/sagatha.txt
diff --git a/npc/013-2/_import.txt b/npc/013-2/_import.txt
new file mode 100644
index 00000000..1ed37515
--- /dev/null
+++ b/npc/013-2/_import.txt
@@ -0,0 +1,8 @@
+// Map 013-2: Magic house
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 013-2.gat
+npc: npc/013-2/_mobs.txt
+npc: npc/013-2/_warps.txt
+npc: npc/013-2/apprentice.txt
+npc: npc/013-2/notes.txt
+npc: npc/013-2/wizard.txt
diff --git a/npc/013-2_Magic_house/_mobs.txt b/npc/013-2/_mobs.txt
index ef17f929..8bc43cdb 100644
--- a/npc/013-2_Magic_house/_mobs.txt
+++ b/npc/013-2/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 013-2 Magic house mobs
+// Magic house mobs
 
 
 
diff --git a/npc/013-2_Magic_house/_warps.txt b/npc/013-2/_warps.txt
index 22654434..b713ac0d 100644
--- a/npc/013-2_Magic_house/_warps.txt
+++ b/npc/013-2/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 013-2 Magic house warps
+// 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
diff --git a/npc/013-2_Magic_house/apprentice.txt b/npc/013-2/apprentice.txt
index 830b5171..830b5171 100644
--- a/npc/013-2_Magic_house/apprentice.txt
+++ b/npc/013-2/apprentice.txt
diff --git a/npc/013-2_Magic_house/notes.txt b/npc/013-2/notes.txt
index f45b2554..f45b2554 100644
--- a/npc/013-2_Magic_house/notes.txt
+++ b/npc/013-2/notes.txt
diff --git a/npc/013-2_Magic_house/wizard.txt b/npc/013-2/wizard.txt
index 927ddfc4..927ddfc4 100644
--- a/npc/013-2_Magic_house/wizard.txt
+++ b/npc/013-2/wizard.txt
diff --git a/npc/013-2_Magic_house/_import.txt b/npc/013-2_Magic_house/_import.txt
deleted file mode 100644
index d4b34905..00000000
--- a/npc/013-2_Magic_house/_import.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 013-2.gat
-npc: npc/013-2_Magic_house/_mobs.txt
-npc: npc/013-2_Magic_house/_warps.txt
-npc: npc/013-2_Magic_house/apprentice.txt
-npc: npc/013-2_Magic_house/notes.txt
-npc: npc/013-2_Magic_house/wizard.txt
diff --git a/npc/013-3/_import.txt b/npc/013-3/_import.txt
new file mode 100644
index 00000000..8be025b3
--- /dev/null
+++ b/npc/013-3/_import.txt
@@ -0,0 +1,9 @@
+// Map 013-3: Cave
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 013-3.gat
+npc: npc/013-3/_mobs.txt
+npc: npc/013-3/_warps.txt
+npc: npc/013-3/barrier.txt
+npc: npc/013-3/mask_chest.txt
+npc: npc/013-3/misc.txt
+npc: npc/013-3/sword_chest.txt
diff --git a/npc/013-3_Cave/_mobs.txt b/npc/013-3/_mobs.txt
index fb2d7595..bb36f0c7 100644
--- a/npc/013-3_Cave/_mobs.txt
+++ b/npc/013-3/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 013-3 Cave mobs
+// Cave mobs
 
 013-3.gat,28,89,16,52	monster	Cave Snake	1021,10,120000,60000,Mob013-3::On1021
 013-3.gat,61,22,2,2	monster	Fire Skull	1023,1,120000,60000,Mob013-3::On1023
diff --git a/npc/013-3_Cave/_warps.txt b/npc/013-3/_warps.txt
index d7d6e75c..373be260 100644
--- a/npc/013-3_Cave/_warps.txt
+++ b/npc/013-3/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 013-3 Cave warps
+// Cave warps
 
 013-3.gat,28,20	warp	hiddenExit	-1,-1,013-1.gat,0,0
 013-3.gat,34,63	warp	toOutside	-1,-1,013-1.gat,125,102
diff --git a/npc/013-3_Cave/barrier.txt b/npc/013-3/barrier.txt
index 0ec3f86a..0ec3f86a 100644
--- a/npc/013-3_Cave/barrier.txt
+++ b/npc/013-3/barrier.txt
diff --git a/npc/013-3_Cave/mask_chest.txt b/npc/013-3/mask_chest.txt
index fb72f54c..fb72f54c 100644
--- a/npc/013-3_Cave/mask_chest.txt
+++ b/npc/013-3/mask_chest.txt
diff --git a/npc/013-3_Cave/misc.txt b/npc/013-3/misc.txt
index 8f7da034..8f7da034 100644
--- a/npc/013-3_Cave/misc.txt
+++ b/npc/013-3/misc.txt
diff --git a/npc/013-3_Cave/sword_chest.txt b/npc/013-3/sword_chest.txt
index 5d2c97b7..5d2c97b7 100644
--- a/npc/013-3_Cave/sword_chest.txt
+++ b/npc/013-3/sword_chest.txt
diff --git a/npc/013-3_Cave/_import.txt b/npc/013-3_Cave/_import.txt
deleted file mode 100644
index 207e2694..00000000
--- a/npc/013-3_Cave/_import.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 013-3.gat
-npc: npc/013-3_Cave/_mobs.txt
-npc: npc/013-3_Cave/_warps.txt
-npc: npc/013-3_Cave/barrier.txt
-npc: npc/013-3_Cave/mask_chest.txt
-npc: npc/013-3_Cave/misc.txt
-npc: npc/013-3_Cave/sword_chest.txt
diff --git a/npc/014-1_Woodland/_import.txt b/npc/014-1/_import.txt
index dcfdd209..0483171c 100644
--- a/npc/014-1_Woodland/_import.txt
+++ b/npc/014-1/_import.txt
@@ -1,5 +1,6 @@
+// Map 014-1: Woodland
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 014-1.gat
-npc: npc/014-1_Woodland/_mobs.txt
-npc: npc/014-1_Woodland/_warps.txt
-npc: npc/014-1_Woodland/wedding-officiator.txt
+npc: npc/014-1/_mobs.txt
+npc: npc/014-1/_warps.txt
+npc: npc/014-1/wedding-officiator.txt
diff --git a/npc/014-1_Woodland/_mobs.txt b/npc/014-1/_mobs.txt
index f9a16d12..1c039ba1 100644
--- a/npc/014-1_Woodland/_mobs.txt
+++ b/npc/014-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 014-1 Woodland mobs
+// Woodland mobs
 
 014-1.gat,0,0,0,0	monster	EvilMushroom	1013,20,0,0,Mob014-1::On1013
 014-1.gat,0,0,0,0	monster	PinkFlower	1014,25,0,0,Mob014-1::On1014
diff --git a/npc/014-1_Woodland/_warps.txt b/npc/014-1/_warps.txt
index f81888e6..a3b9924b 100644
--- a/npc/014-1_Woodland/_warps.txt
+++ b/npc/014-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 014-1 Woodland warps
+// 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
diff --git a/npc/014-1_Woodland/wedding-officiator.txt b/npc/014-1/wedding-officiator.txt
index f6bf7c9d..f6bf7c9d 100644
--- a/npc/014-1_Woodland/wedding-officiator.txt
+++ b/npc/014-1/wedding-officiator.txt
diff --git a/npc/014-3_Cave/_import.txt b/npc/014-3/_import.txt
index 6b15d275..d2d03e67 100644
--- a/npc/014-3_Cave/_import.txt
+++ b/npc/014-3/_import.txt
@@ -1,5 +1,6 @@
+// Map 014-3: Cave
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 014-3.gat
-npc: npc/014-3_Cave/_mobs.txt
-npc: npc/014-3_Cave/_warps.txt
-npc: npc/014-3_Cave/monsters.txt
+npc: npc/014-3/_mobs.txt
+npc: npc/014-3/_warps.txt
+npc: npc/014-3/monsters.txt
diff --git a/npc/014-3_Cave/_mobs.txt b/npc/014-3/_mobs.txt
index c8452fdd..996181e3 100644
--- a/npc/014-3_Cave/_mobs.txt
+++ b/npc/014-3/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 014-3 Cave mobs
+// Cave mobs
 
 
 
diff --git a/npc/014-3_Cave/_warps.txt b/npc/014-3/_warps.txt
index 73a05160..2ff59a5f 100644
--- a/npc/014-3_Cave/_warps.txt
+++ b/npc/014-3/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 014-3 Cave warps
+// 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
diff --git a/npc/014-3_Cave/monsters.txt b/npc/014-3/monsters.txt
index 2237ea42..2237ea42 100644
--- a/npc/014-3_Cave/monsters.txt
+++ b/npc/014-3/monsters.txt
diff --git a/npc/015-1/_import.txt b/npc/015-1/_import.txt
new file mode 100644
index 00000000..94963d0b
--- /dev/null
+++ b/npc/015-1/_import.txt
@@ -0,0 +1,9 @@
+// Map 015-1: Woodland
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 015-1.gat
+npc: npc/015-1/_mobs.txt
+npc: npc/015-1/_warps.txt
+npc: npc/015-1/alice.txt
+npc: npc/015-1/barrier.txt
+npc: npc/015-1/monsters.txt
+npc: npc/015-1/sword.txt
diff --git a/npc/015-1_Woodland/_mobs.txt b/npc/015-1/_mobs.txt
index 22225157..cc1c71e9 100644
--- a/npc/015-1_Woodland/_mobs.txt
+++ b/npc/015-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 015-1 Woodland mobs
+// Woodland mobs
 
 015-1.gat,0,0,0,0	monster	Clover	1037,2,100000,1000,Mob015-1::On1037
 015-1.gat,0,0,0,0	monster	Butterfly	1055,10,30,20,Mob015-1::On1055
diff --git a/npc/015-1_Woodland/_warps.txt b/npc/015-1/_warps.txt
index 22598f14..a8152425 100644
--- a/npc/015-1_Woodland/_warps.txt
+++ b/npc/015-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 015-1 Woodland warps
+// Woodland warps
 
 015-1.gat,93,55	warp	ToWoodland	-1,0,010-1.gat,15,55
 015-1.gat,59,31	warp	to 015_3	-1,-1,015-3.gat,31,42
diff --git a/npc/015-1_Woodland/alice.txt b/npc/015-1/alice.txt
index 125cc104..125cc104 100644
--- a/npc/015-1_Woodland/alice.txt
+++ b/npc/015-1/alice.txt
diff --git a/npc/015-1_Woodland/barrier.txt b/npc/015-1/barrier.txt
index 0ba82ec9..0ba82ec9 100644
--- a/npc/015-1_Woodland/barrier.txt
+++ b/npc/015-1/barrier.txt
diff --git a/npc/015-1_Woodland/monsters.txt b/npc/015-1/monsters.txt
index b6ff0fd9..b6ff0fd9 100644
--- a/npc/015-1_Woodland/monsters.txt
+++ b/npc/015-1/monsters.txt
diff --git a/npc/015-1_Woodland/sword.txt b/npc/015-1/sword.txt
index f5f0cd17..f5f0cd17 100644
--- a/npc/015-1_Woodland/sword.txt
+++ b/npc/015-1/sword.txt
diff --git a/npc/015-1_Woodland/_import.txt b/npc/015-1_Woodland/_import.txt
deleted file mode 100644
index 42cd6522..00000000
--- a/npc/015-1_Woodland/_import.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 015-1.gat
-npc: npc/015-1_Woodland/_mobs.txt
-npc: npc/015-1_Woodland/_warps.txt
-npc: npc/015-1_Woodland/alice.txt
-npc: npc/015-1_Woodland/barrier.txt
-npc: npc/015-1_Woodland/monsters.txt
-npc: npc/015-1_Woodland/sword.txt
diff --git a/npc/015-3/_import.txt b/npc/015-3/_import.txt
new file mode 100644
index 00000000..9a9632ba
--- /dev/null
+++ b/npc/015-3/_import.txt
@@ -0,0 +1,8 @@
+// Map 015-3: Cave
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 015-3.gat
+npc: npc/015-3/_mobs.txt
+npc: npc/015-3/_warps.txt
+npc: npc/015-3/barrier.txt
+npc: npc/015-3/katze.txt
+npc: npc/015-3/pot.txt
diff --git a/npc/015-3_Cave/_mobs.txt b/npc/015-3/_mobs.txt
index 42fb3d4d..43f7eea0 100644
--- a/npc/015-3_Cave/_mobs.txt
+++ b/npc/015-3/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 015-3 Cave mobs
+// Cave mobs
 
 015-3.gat,21,25,3,4	monster	Bats	1017,2,100000,30000,Mob015-3::On1017
 015-3.gat,29,31,2,2	monster	Maggots	1002,2,100000,30000,Mob015-3::On1002
diff --git a/npc/015-3_Cave/_warps.txt b/npc/015-3/_warps.txt
index e2d241ef..861a6938 100644
--- a/npc/015-3_Cave/_warps.txt
+++ b/npc/015-3/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 015-3 Cave warps
+// Cave warps
 
 015-3.gat,31,43	warp	to 015-1	-1,-1,015-1.gat,59,32
diff --git a/npc/015-3_Cave/barrier.txt b/npc/015-3/barrier.txt
index 27a18bc3..27a18bc3 100644
--- a/npc/015-3_Cave/barrier.txt
+++ b/npc/015-3/barrier.txt
diff --git a/npc/015-3_Cave/katze.txt b/npc/015-3/katze.txt
index 1654542c..1654542c 100644
--- a/npc/015-3_Cave/katze.txt
+++ b/npc/015-3/katze.txt
diff --git a/npc/015-3_Cave/pot.txt b/npc/015-3/pot.txt
index a965223d..a965223d 100644
--- a/npc/015-3_Cave/pot.txt
+++ b/npc/015-3/pot.txt
diff --git a/npc/015-3_Cave/_import.txt b/npc/015-3_Cave/_import.txt
deleted file mode 100644
index 1763a0bc..00000000
--- a/npc/015-3_Cave/_import.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 015-3.gat
-npc: npc/015-3_Cave/_mobs.txt
-npc: npc/015-3_Cave/_warps.txt
-npc: npc/015-3_Cave/barrier.txt
-npc: npc/015-3_Cave/katze.txt
-npc: npc/015-3_Cave/pot.txt
diff --git a/npc/016-1/_import.txt b/npc/016-1/_import.txt
new file mode 100644
index 00000000..3ba02b95
--- /dev/null
+++ b/npc/016-1/_import.txt
@@ -0,0 +1,7 @@
+// Map 016-1: Woodland
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 016-1.gat
+npc: npc/016-1/_mobs.txt
+npc: npc/016-1/_warps.txt
+npc: npc/016-1/gwendolyn.txt
+npc: npc/016-1/monsters.txt
diff --git a/npc/016-1_Woodland/_mobs.txt b/npc/016-1/_mobs.txt
index 82977d3f..3cdcb753 100644
--- a/npc/016-1_Woodland/_mobs.txt
+++ b/npc/016-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 016-1 Woodland mobs
+// Woodland mobs
 
 016-1.gat,0,0,0,0	monster	Clover	1037,2,100000,30000,Mob016-1::On1037
 016-1.gat,0,0,0,0	monster	Butterfly	1055,10,30,20,Mob016-1::On1055
diff --git a/npc/016-1_Woodland/_warps.txt b/npc/016-1/_warps.txt
index a1b505d2..8503d94d 100644
--- a/npc/016-1_Woodland/_warps.txt
+++ b/npc/016-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 016-1 Woodland warps
+// Woodland warps
 
 016-1.gat,56,20	warp	ToWoodland	1,-1,010-1.gat,56,103
 016-1.gat,20,53	warp	toSwamp	-1,1,025-1.gat,129,58
diff --git a/npc/016-1_Woodland/gwendolyn.txt b/npc/016-1/gwendolyn.txt
index 469b720a..469b720a 100644
--- a/npc/016-1_Woodland/gwendolyn.txt
+++ b/npc/016-1/gwendolyn.txt
diff --git a/npc/016-1_Woodland/monsters.txt b/npc/016-1/monsters.txt
index d9d0de4f..d9d0de4f 100644
--- a/npc/016-1_Woodland/monsters.txt
+++ b/npc/016-1/monsters.txt
diff --git a/npc/016-1_Woodland/_import.txt b/npc/016-1_Woodland/_import.txt
deleted file mode 100644
index e81c1da2..00000000
--- a/npc/016-1_Woodland/_import.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 016-1.gat
-npc: npc/016-1_Woodland/_mobs.txt
-npc: npc/016-1_Woodland/_warps.txt
-npc: npc/016-1_Woodland/gwendolyn.txt
-npc: npc/016-1_Woodland/monsters.txt
diff --git a/npc/017-1/_import.txt b/npc/017-1/_import.txt
new file mode 100644
index 00000000..41eb315e
--- /dev/null
+++ b/npc/017-1/_import.txt
@@ -0,0 +1,6 @@
+// Map 017-1: Woodland hills
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 017-1.gat
+npc: npc/017-1/_mobs.txt
+npc: npc/017-1/_warps.txt
+npc: npc/017-1/monsters.txt
diff --git a/npc/017-1_Woodland_hills/_mobs.txt b/npc/017-1/_mobs.txt
index 0e918457..a28ae59b 100644
--- a/npc/017-1_Woodland_hills/_mobs.txt
+++ b/npc/017-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 017-1 Woodland hills mobs
+// Woodland hills mobs
 
 017-1.gat,0,0,0,0	monster	Clover	1037,2,0,1000,Mob017-1::On1037
 017-1.gat,29,29,19,12	monster	GambogeHerb	2033,1,0,25000,Mob017-1::On2033
diff --git a/npc/017-1_Woodland_hills/_warps.txt b/npc/017-1/_warps.txt
index edb30a42..3eb1c24e 100644
--- a/npc/017-1_Woodland_hills/_warps.txt
+++ b/npc/017-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 017-1 Woodland hills warps
+// Woodland hills warps
 
 017-1.gat,46,105	warp	toWoodland	2,-1,013-1.gat,45,22
 017-1.gat,43,32	warp	toTheatre	-1,-1,017-2.gat,26,28
diff --git a/npc/017-1_Woodland_hills/monsters.txt b/npc/017-1/monsters.txt
index 28f2d7e2..28f2d7e2 100644
--- a/npc/017-1_Woodland_hills/monsters.txt
+++ b/npc/017-1/monsters.txt
diff --git a/npc/017-1_Woodland_hills/_import.txt b/npc/017-1_Woodland_hills/_import.txt
deleted file mode 100644
index 505292d3..00000000
--- a/npc/017-1_Woodland_hills/_import.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 017-1.gat
-npc: npc/017-1_Woodland_hills/_mobs.txt
-npc: npc/017-1_Woodland_hills/_warps.txt
-npc: npc/017-1_Woodland_hills/monsters.txt
diff --git a/npc/017-2_Theater/_import.txt b/npc/017-2/_import.txt
index cb701730..843da4e7 100644
--- a/npc/017-2_Theater/_import.txt
+++ b/npc/017-2/_import.txt
@@ -1,4 +1,5 @@
+// Map 017-2: Theater
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 017-2.gat
-npc: npc/017-2_Theater/_mobs.txt
-npc: npc/017-2_Theater/_warps.txt
+npc: npc/017-2/_mobs.txt
+npc: npc/017-2/_warps.txt
diff --git a/npc/017-2_Theater/_mobs.txt b/npc/017-2/_mobs.txt
index eaf7b0d2..fff25198 100644
--- a/npc/017-2_Theater/_mobs.txt
+++ b/npc/017-2/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 017-2 Theater mobs
+// Theater mobs
 
 
 
diff --git a/npc/017-2_Theater/_warps.txt b/npc/017-2/_warps.txt
index 44084f31..0cd1dec9 100644
--- a/npc/017-2_Theater/_warps.txt
+++ b/npc/017-2/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 017-2 Theater warps
+// Theater warps
 
 017-2.gat,30,20	warp	toBackStage02	-1,-1,017-9.gat,30,23
 017-2.gat,26,30	warp	toWoodlandHills	-1,-1,017-1.gat,43,33
diff --git a/npc/017-9_Backstage/_import.txt b/npc/017-9/_import.txt
index db6bb923..819fd8b3 100644
--- a/npc/017-9_Backstage/_import.txt
+++ b/npc/017-9/_import.txt
@@ -1,4 +1,5 @@
+// Map 017-9: Backstage
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 017-9.gat
-npc: npc/017-9_Backstage/_mobs.txt
-npc: npc/017-9_Backstage/_warps.txt
+npc: npc/017-9/_mobs.txt
+npc: npc/017-9/_warps.txt
diff --git a/npc/017-9_Backstage/_mobs.txt b/npc/017-9/_mobs.txt
index 0fb9bb82..960546c2 100644
--- a/npc/017-9_Backstage/_mobs.txt
+++ b/npc/017-9/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 017-9 Backstage mobs
+// Backstage mobs
 
 
 
diff --git a/npc/017-9_Backstage/_warps.txt b/npc/017-9/_warps.txt
index 212679ba..905f4de2 100644
--- a/npc/017-9_Backstage/_warps.txt
+++ b/npc/017-9/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 017-9 Backstage warps
+// Backstage warps
 
 017-9.gat,22,21	warp	toLeftDoor	-1,-1,017-2.gat,22,21
 017-9.gat,26,22	warp	toWoodlandHills	-1,-1,017-1.gat,43,33
diff --git a/npc/018-1/_import.txt b/npc/018-1/_import.txt
new file mode 100644
index 00000000..b3ab9841
--- /dev/null
+++ b/npc/018-1/_import.txt
@@ -0,0 +1,8 @@
+// Map 018-1: Woodland mining camp
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 018-1.gat
+npc: npc/018-1/_mobs.txt
+npc: npc/018-1/_warps.txt
+npc: npc/018-1/mike.txt
+npc: npc/018-1/miners.txt
+npc: npc/018-1/sword.txt
diff --git a/npc/018-1_Woodland_mining_camp/_mobs.txt b/npc/018-1/_mobs.txt
index fd437b4f..02cdab24 100644
--- a/npc/018-1_Woodland_mining_camp/_mobs.txt
+++ b/npc/018-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 018-1 Woodland mining camp mobs
+// Woodland mining camp mobs
 
 018-1.gat,136,79,9,41	monster	Sea Slime	1033,10,100000,30000,Mob018-1::On1033
 018-1.gat,108,87,53,25	monster	Log Head	1025,10,100000,30000,Mob018-1::On1025
diff --git a/npc/018-1_Woodland_mining_camp/_warps.txt b/npc/018-1/_warps.txt
index 2bb21a22..4c620573 100644
--- a/npc/018-1_Woodland_mining_camp/_warps.txt
+++ b/npc/018-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 018-1 Woodland mining camp warps
+// 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
diff --git a/npc/018-1_Woodland_mining_camp/mike.txt b/npc/018-1/mike.txt
index 7e0d296c..7e0d296c 100644
--- a/npc/018-1_Woodland_mining_camp/mike.txt
+++ b/npc/018-1/mike.txt
diff --git a/npc/018-1_Woodland_mining_camp/miners.txt b/npc/018-1/miners.txt
index f16b8bd7..f16b8bd7 100644
--- a/npc/018-1_Woodland_mining_camp/miners.txt
+++ b/npc/018-1/miners.txt
diff --git a/npc/018-1_Woodland_mining_camp/sword.txt b/npc/018-1/sword.txt
index 78cad244..78cad244 100644
--- a/npc/018-1_Woodland_mining_camp/sword.txt
+++ b/npc/018-1/sword.txt
diff --git a/npc/018-1_Woodland_mining_camp/_import.txt b/npc/018-1_Woodland_mining_camp/_import.txt
deleted file mode 100644
index ac8d9913..00000000
--- a/npc/018-1_Woodland_mining_camp/_import.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 018-1.gat
-npc: npc/018-1_Woodland_mining_camp/_mobs.txt
-npc: npc/018-1_Woodland_mining_camp/_warps.txt
-npc: npc/018-1_Woodland_mining_camp/mike.txt
-npc: npc/018-1_Woodland_mining_camp/miners.txt
-npc: npc/018-1_Woodland_mining_camp/sword.txt
diff --git a/npc/018-2/_import.txt b/npc/018-2/_import.txt
new file mode 100644
index 00000000..8ce96730
--- /dev/null
+++ b/npc/018-2/_import.txt
@@ -0,0 +1,10 @@
+// Map 018-2: Woodland mining camp
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 018-2.gat
+npc: npc/018-2/_mobs.txt
+npc: npc/018-2/_warps.txt
+npc: npc/018-2/angus.txt
+npc: npc/018-2/books.txt
+npc: npc/018-2/caul.txt
+npc: npc/018-2/miners.txt
+npc: npc/018-2/receptionist.txt
diff --git a/npc/018-2_Woodland_mining_camp/_mobs.txt b/npc/018-2/_mobs.txt
index add80d14..87593b1c 100644
--- a/npc/018-2_Woodland_mining_camp/_mobs.txt
+++ b/npc/018-2/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 018-2 Woodland mining camp mobs
+// Woodland mining camp mobs
 
 018-2.gat,114,21,4,3	monster	Yellow Slime	1007,1,100000,30000,Mob018-2::On1007
 
diff --git a/npc/018-2_Woodland_mining_camp/_warps.txt b/npc/018-2/_warps.txt
index 1a51d7e8..78c97883 100644
--- a/npc/018-2_Woodland_mining_camp/_warps.txt
+++ b/npc/018-2/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 018-2 Woodland mining camp warps
+// Woodland mining 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
diff --git a/npc/018-2_Woodland_mining_camp/angus.txt b/npc/018-2/angus.txt
index 846bed7d..846bed7d 100644
--- a/npc/018-2_Woodland_mining_camp/angus.txt
+++ b/npc/018-2/angus.txt
diff --git a/npc/018-2_Woodland_mining_camp/books.txt b/npc/018-2/books.txt
index 22364c6d..22364c6d 100644
--- a/npc/018-2_Woodland_mining_camp/books.txt
+++ b/npc/018-2/books.txt
diff --git a/npc/018-2_Woodland_mining_camp/caul.txt b/npc/018-2/caul.txt
index 56734a69..56734a69 100644
--- a/npc/018-2_Woodland_mining_camp/caul.txt
+++ b/npc/018-2/caul.txt
diff --git a/npc/018-2_Woodland_mining_camp/miners.txt b/npc/018-2/miners.txt
index 1e337036..1e337036 100644
--- a/npc/018-2_Woodland_mining_camp/miners.txt
+++ b/npc/018-2/miners.txt
diff --git a/npc/018-2_Woodland_mining_camp/receptionist.txt b/npc/018-2/receptionist.txt
index ee735d14..ee735d14 100644
--- a/npc/018-2_Woodland_mining_camp/receptionist.txt
+++ b/npc/018-2/receptionist.txt
diff --git a/npc/018-2_Woodland_mining_camp/_import.txt b/npc/018-2_Woodland_mining_camp/_import.txt
deleted file mode 100644
index ad3cd0cd..00000000
--- a/npc/018-2_Woodland_mining_camp/_import.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 018-2.gat
-npc: npc/018-2_Woodland_mining_camp/_mobs.txt
-npc: npc/018-2_Woodland_mining_camp/_warps.txt
-npc: npc/018-2_Woodland_mining_camp/angus.txt
-npc: npc/018-2_Woodland_mining_camp/books.txt
-npc: npc/018-2_Woodland_mining_camp/caul.txt
-npc: npc/018-2_Woodland_mining_camp/miners.txt
-npc: npc/018-2_Woodland_mining_camp/receptionist.txt
diff --git a/npc/018-3/_import.txt b/npc/018-3/_import.txt
new file mode 100644
index 00000000..53391a07
--- /dev/null
+++ b/npc/018-3/_import.txt
@@ -0,0 +1,8 @@
+// Map 018-3: Cave
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 018-3.gat
+npc: npc/018-3/_mobs.txt
+npc: npc/018-3/_warps.txt
+npc: npc/018-3/bookcase.txt
+npc: npc/018-3/evil-obelisk.txt
+npc: npc/018-3/sword.txt
diff --git a/npc/018-3_Cave/_mobs.txt b/npc/018-3/_mobs.txt
index d0878d1a..5698f487 100644
--- a/npc/018-3_Cave/_mobs.txt
+++ b/npc/018-3/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 018-3 Cave mobs
+// Cave mobs
 
 018-3.gat,48,28,56,17	monster	Bat	1017,10,100000,30000,Mob018-3::On1017
 018-3.gat,35,144,31,48	monster	Evil Mushroom	1013,10,120000,30000,Mob018-3::On1013
diff --git a/npc/018-3_Cave/_warps.txt b/npc/018-3/_warps.txt
index d676b9c6..bdecd053 100644
--- a/npc/018-3_Cave/_warps.txt
+++ b/npc/018-3/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 018-3 Cave warps
+// 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
diff --git a/npc/018-3_Cave/bookcase.txt b/npc/018-3/bookcase.txt
index 843c94ae..843c94ae 100644
--- a/npc/018-3_Cave/bookcase.txt
+++ b/npc/018-3/bookcase.txt
diff --git a/npc/018-3_Cave/evil-obelisk.txt b/npc/018-3/evil-obelisk.txt
index 4893cfeb..4893cfeb 100644
--- a/npc/018-3_Cave/evil-obelisk.txt
+++ b/npc/018-3/evil-obelisk.txt
diff --git a/npc/018-3_Cave/sword.txt b/npc/018-3/sword.txt
index f8ee7725..f8ee7725 100644
--- a/npc/018-3_Cave/sword.txt
+++ b/npc/018-3/sword.txt
diff --git a/npc/018-3_Cave/_import.txt b/npc/018-3_Cave/_import.txt
deleted file mode 100644
index 40e09c80..00000000
--- a/npc/018-3_Cave/_import.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 018-3.gat
-npc: npc/018-3_Cave/_mobs.txt
-npc: npc/018-3_Cave/_warps.txt
-npc: npc/018-3_Cave/bookcase.txt
-npc: npc/018-3_Cave/evil-obelisk.txt
-npc: npc/018-3_Cave/sword.txt
diff --git a/npc/019-1/_import.txt b/npc/019-1/_import.txt
new file mode 100644
index 00000000..287a2cb2
--- /dev/null
+++ b/npc/019-1/_import.txt
@@ -0,0 +1,8 @@
+// Map 019-1: Snow field
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 019-1.gat
+npc: npc/019-1/_mobs.txt
+npc: npc/019-1/_warps.txt
+npc: npc/019-1/monsters.txt
+npc: npc/019-1/santa_helper.txt
+npc: npc/019-1/snowman.txt
diff --git a/npc/019-1_Snow_field/_mobs.txt b/npc/019-1/_mobs.txt
index 4ab8b0d6..68d42729 100644
--- a/npc/019-1_Snow_field/_mobs.txt
+++ b/npc/019-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 019-1 Snow field mobs
+// Snow field mobs
 
 
 
diff --git a/npc/019-1_Snow_field/_warps.txt b/npc/019-1/_warps.txt
index 2ed88379..6e1fa6c9 100644
--- a/npc/019-1_Snow_field/_warps.txt
+++ b/npc/019-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 019-1 Snow field warps
+// Snow field warps
 
 019-1.gat,70,21	warp	ToVillage	2,-1,020-1.gat,70,126
 019-1.gat,61,102	warp	toRomanticPlace	2,-1,030-1.gat,60,29
diff --git a/npc/019-1_Snow_field/monsters.txt b/npc/019-1/monsters.txt
index d41d63b3..d41d63b3 100644
--- a/npc/019-1_Snow_field/monsters.txt
+++ b/npc/019-1/monsters.txt
diff --git a/npc/019-1_Snow_field/santa_helper.txt b/npc/019-1/santa_helper.txt
index 79089975..79089975 100644
--- a/npc/019-1_Snow_field/santa_helper.txt
+++ b/npc/019-1/santa_helper.txt
diff --git a/npc/019-1_Snow_field/snowman.txt b/npc/019-1/snowman.txt
index eda1e733..eda1e733 100644
--- a/npc/019-1_Snow_field/snowman.txt
+++ b/npc/019-1/snowman.txt
diff --git a/npc/019-1_Snow_field/_import.txt b/npc/019-1_Snow_field/_import.txt
deleted file mode 100644
index e3a1035e..00000000
--- a/npc/019-1_Snow_field/_import.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 019-1.gat
-npc: npc/019-1_Snow_field/_mobs.txt
-npc: npc/019-1_Snow_field/_warps.txt
-npc: npc/019-1_Snow_field/monsters.txt
-npc: npc/019-1_Snow_field/santa_helper.txt
-npc: npc/019-1_Snow_field/snowman.txt
diff --git a/npc/019-3_Snow_Cave/_import.txt b/npc/019-3/_import.txt
index 7736709b..4ccd622b 100644
--- a/npc/019-3_Snow_Cave/_import.txt
+++ b/npc/019-3/_import.txt
@@ -1,4 +1,5 @@
+// Map 019-3: Snow Cave
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 019-3.gat
-npc: npc/019-3_Snow_Cave/_mobs.txt
-npc: npc/019-3_Snow_Cave/_warps.txt
+npc: npc/019-3/_mobs.txt
+npc: npc/019-3/_warps.txt
diff --git a/npc/019-3_Snow_Cave/_mobs.txt b/npc/019-3/_mobs.txt
index c1e33180..60d9e507 100644
--- a/npc/019-3_Snow_Cave/_mobs.txt
+++ b/npc/019-3/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 019-3 Snow Cave mobs
+// Snow Cave mobs
 
 019-3.gat,0,0,0,0	monster	Moggun	1061,10,100000,30000,Mob019-3::On1061
 019-3.gat,0,0,0,0	monster	Bats	1017,50,100000,30000,Mob019-3::On1017
diff --git a/npc/019-3_Snow_Cave/_warps.txt b/npc/019-3/_warps.txt
index f058a378..2df54be1 100644
--- a/npc/019-3_Snow_Cave/_warps.txt
+++ b/npc/019-3/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 019-3 Snow Cave warps
+// Snow Cave warps
 
 019-3.gat,40,99	warp	WarpOutside1	-1,-1,019-1.gat,38,73
 019-3.gat,98,25	warp	warpOutside2	-1,-1,019-1.gat,96,38
diff --git a/npc/020-1_Nivalis/KrickKrackKrock.txt b/npc/020-1/KrickKrackKrock.txt
index b37dd0e1..b37dd0e1 100755
--- a/npc/020-1_Nivalis/KrickKrackKrock.txt
+++ b/npc/020-1/KrickKrackKrock.txt
diff --git a/npc/020-1/_import.txt b/npc/020-1/_import.txt
new file mode 100644
index 00000000..704d916d
--- /dev/null
+++ b/npc/020-1/_import.txt
@@ -0,0 +1,10 @@
+// Map 020-1: Nivalis
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 020-1.gat
+npc: npc/020-1/KrickKrackKrock.txt
+npc: npc/020-1/_mobs.txt
+npc: npc/020-1/_warps.txt
+npc: npc/020-1/mapflags.txt
+npc: npc/020-1/rockscissor.txt
+npc: npc/020-1/soul-menhir.txt
+npc: npc/020-1/well.txt
diff --git a/npc/020-1_Nivalis/_mobs.txt b/npc/020-1/_mobs.txt
index a7304e20..d236884e 100644
--- a/npc/020-1_Nivalis/_mobs.txt
+++ b/npc/020-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 020-1 Nivalis mobs
+// Nivalis mobs
 
 
 
diff --git a/npc/020-1_Nivalis/_warps.txt b/npc/020-1/_warps.txt
index 83138739..5bac9e69 100644
--- a/npc/020-1_Nivalis/_warps.txt
+++ b/npc/020-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 020-1 Nivalis warps
+// Nivalis 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
diff --git a/npc/020-1_Nivalis/mapflags.txt b/npc/020-1/mapflags.txt
index 203cf649..203cf649 100644
--- a/npc/020-1_Nivalis/mapflags.txt
+++ b/npc/020-1/mapflags.txt
diff --git a/npc/020-1_Nivalis/rockscissor.txt b/npc/020-1/rockscissor.txt
index d4a9d6f6..d4a9d6f6 100755
--- a/npc/020-1_Nivalis/rockscissor.txt
+++ b/npc/020-1/rockscissor.txt
diff --git a/npc/020-1_Nivalis/soul-menhir.txt b/npc/020-1/soul-menhir.txt
index f6e52869..f6e52869 100644
--- a/npc/020-1_Nivalis/soul-menhir.txt
+++ b/npc/020-1/soul-menhir.txt
diff --git a/npc/020-1_Nivalis/well.txt b/npc/020-1/well.txt
index ed025a0f..ed025a0f 100755
--- a/npc/020-1_Nivalis/well.txt
+++ b/npc/020-1/well.txt
diff --git a/npc/020-1_Nivalis/_import.txt b/npc/020-1_Nivalis/_import.txt
deleted file mode 100644
index d4d1e1b3..00000000
--- a/npc/020-1_Nivalis/_import.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 020-1.gat
-npc: npc/020-1_Nivalis/KrickKrackKrock.txt
-npc: npc/020-1_Nivalis/_mobs.txt
-npc: npc/020-1_Nivalis/_warps.txt
-npc: npc/020-1_Nivalis/mapflags.txt
-npc: npc/020-1_Nivalis/rockscissor.txt
-npc: npc/020-1_Nivalis/soul-menhir.txt
-npc: npc/020-1_Nivalis/well.txt
diff --git a/npc/020-2/_import.txt b/npc/020-2/_import.txt
new file mode 100644
index 00000000..f77174ad
--- /dev/null
+++ b/npc/020-2/_import.txt
@@ -0,0 +1,8 @@
+// Map 020-2: Nivalis
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 020-2.gat
+npc: npc/020-2/_mobs.txt
+npc: npc/020-2/_warps.txt
+npc: npc/020-2/baktar.txt
+npc: npc/020-2/mapflags.txt
+npc: npc/020-2/shops.txt
diff --git a/npc/020-2_Nivalis/_mobs.txt b/npc/020-2/_mobs.txt
index 0031d6e0..04e864c0 100644
--- a/npc/020-2_Nivalis/_mobs.txt
+++ b/npc/020-2/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 020-2 Nivalis mobs
+// Nivalis mobs
 
 
 
diff --git a/npc/020-2_Nivalis/_warps.txt b/npc/020-2/_warps.txt
index 643436f0..fab55b38 100644
--- a/npc/020-2_Nivalis/_warps.txt
+++ b/npc/020-2/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 020-2 Nivalis warps
+// Nivalis 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
diff --git a/npc/020-2_Nivalis/baktar.txt b/npc/020-2/baktar.txt
index 1bcbf152..1bcbf152 100755
--- a/npc/020-2_Nivalis/baktar.txt
+++ b/npc/020-2/baktar.txt
diff --git a/npc/020-2_Nivalis/mapflags.txt b/npc/020-2/mapflags.txt
index aaa1b90f..aaa1b90f 100644
--- a/npc/020-2_Nivalis/mapflags.txt
+++ b/npc/020-2/mapflags.txt
diff --git a/npc/020-2_Nivalis/shops.txt b/npc/020-2/shops.txt
index b470d231..b470d231 100644
--- a/npc/020-2_Nivalis/shops.txt
+++ b/npc/020-2/shops.txt
diff --git a/npc/020-2_Nivalis/_import.txt b/npc/020-2_Nivalis/_import.txt
deleted file mode 100644
index 14e50193..00000000
--- a/npc/020-2_Nivalis/_import.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 020-2.gat
-npc: npc/020-2_Nivalis/_mobs.txt
-npc: npc/020-2_Nivalis/_warps.txt
-npc: npc/020-2_Nivalis/baktar.txt
-npc: npc/020-2_Nivalis/mapflags.txt
-npc: npc/020-2_Nivalis/shops.txt
diff --git a/npc/020-3_Ice_cave/_import.txt b/npc/020-3/_import.txt
index 77358dc1..fe2ee10c 100644
--- a/npc/020-3_Ice_cave/_import.txt
+++ b/npc/020-3/_import.txt
@@ -1,5 +1,6 @@
+// Map 020-3: Ice cave
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 020-3.gat
-npc: npc/020-3_Ice_cave/_mobs.txt
-npc: npc/020-3_Ice_cave/_warps.txt
-npc: npc/020-3_Ice_cave/monsters.txt
+npc: npc/020-3/_mobs.txt
+npc: npc/020-3/_warps.txt
+npc: npc/020-3/monsters.txt
diff --git a/npc/020-3_Ice_cave/_mobs.txt b/npc/020-3/_mobs.txt
index 0c06d75b..1b23103c 100644
--- a/npc/020-3_Ice_cave/_mobs.txt
+++ b/npc/020-3/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 020-3 Ice cave mobs
+// Ice cave mobs
 
 020-3.gat,40,36,29,4	monster	Bat	1017,1,100000,30000,Mob020-3::On1017
 020-3.gat,40,49,34,7	monster	Violet	1018,1,100000,30000,Mob020-3::On1018
diff --git a/npc/020-3_Ice_cave/_warps.txt b/npc/020-3/_warps.txt
index 3db3c780..b43072b5 100644
--- a/npc/020-3_Ice_cave/_warps.txt
+++ b/npc/020-3/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 020-3 Ice cave warps
+// Ice cave warps
 
 020-3.gat,31,25	warp	toOutside	-1,-1,020-1.gat,76,37
 020-3.gat,25,22	warp	toRightLowerCave	-1,-1,020-3.gat,97,101
diff --git a/npc/020-3_Ice_cave/monsters.txt b/npc/020-3/monsters.txt
index 062c6a9f..062c6a9f 100644
--- a/npc/020-3_Ice_cave/monsters.txt
+++ b/npc/020-3/monsters.txt
diff --git a/npc/020-4_Ice_cave/_import.txt b/npc/020-4_Ice_cave/_import.txt
deleted file mode 100644
index 64953f5d..00000000
--- a/npc/020-4_Ice_cave/_import.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-map: 020-4.gat
-npc: npc/020-4_Ice_cave/_mobs.txt
-npc: npc/020-4_Ice_cave/_warps.txt
-npc: npc/020-4_Ice_cave/monsters.txt
diff --git a/npc/020-4_Ice_cave/_mobs.txt b/npc/020-4_Ice_cave/_mobs.txt
deleted file mode 100644
index 99c21fea..00000000
--- a/npc/020-4_Ice_cave/_mobs.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-// 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
deleted file mode 100644
index a02cadc4..00000000
--- a/npc/020-4_Ice_cave/_warps.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-// 020-4 Ice cave warps
-
-020-4.gat,36,33	warp	toIceCave1	-1,-1,020-3.gat,25,23
diff --git a/npc/020-4_Ice_cave/monsters.txt b/npc/020-4_Ice_cave/monsters.txt
deleted file mode 100644
index 5aadddab..00000000
--- a/npc/020-4_Ice_cave/monsters.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-// Ice Cave second level
-
-020-4.gat,0,0,0,0	monster	Bat	1017,5,0,0,Mob21::OnBat
-020-4.gat,0,0,0,0	monster	Fluffy	1020,15,0,0,Mob21::OnFluffy
-
-020-4.gat,0,0,0	script	Mob21	-1,{
-OnBat:
-	set @mobID, 1017;
-	callfunc "MobPoints";
-	break;
-
-OnFluffy:
-	set @mobID, 1020;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}
diff --git a/npc/021-1/_import.txt b/npc/021-1/_import.txt
new file mode 100644
index 00000000..0c068010
--- /dev/null
+++ b/npc/021-1/_import.txt
@@ -0,0 +1,14 @@
+// Map 021-1: Tulimshar
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 021-1.gat
+npc: npc/021-1/_mobs.txt
+npc: npc/021-1/_warps.txt
+npc: npc/021-1/bakery.txt
+npc: npc/021-1/eurni.txt
+npc: npc/021-1/gate_guards.txt
+npc: npc/021-1/inac.txt
+npc: npc/021-1/mapflags.txt
+npc: npc/021-1/north_shops.txt
+npc: npc/021-1/royal_guards.txt
+npc: npc/021-1/weellos.txt
+npc: npc/021-1/workers.txt
diff --git a/npc/021-1_Tulimshar/_mobs.txt b/npc/021-1/_mobs.txt
index 4879d529..ab4a88c1 100644
--- a/npc/021-1_Tulimshar/_mobs.txt
+++ b/npc/021-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 021-1 Tulimshar mobs
+// Tulimshar mobs
 
 021-1.gat,126,86,3,2	monster	Maggot	1002,2,100000,30000,Mob021-1::On1002
 021-1.gat,90,65,3,2	monster	Maggot	1002,2,100000,30000,Mob021-1::On1002
diff --git a/npc/021-1_Tulimshar/_warps.txt b/npc/021-1/_warps.txt
index d6da764c..5d8bdc27 100644
--- a/npc/021-1_Tulimshar/_warps.txt
+++ b/npc/021-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 021-1 Tulimshar warps
+// Tulimshar warps
 
 021-1.gat,55,146	warp	toBazaar	3,-1,001-1.gat,44,20
 021-1.gat,136,146	warp	toSouthTulimshar	0,-1,001-1.gat,124,21
diff --git a/npc/021-1_Tulimshar/bakery.txt b/npc/021-1/bakery.txt
index d7ca399f..d7ca399f 100644
--- a/npc/021-1_Tulimshar/bakery.txt
+++ b/npc/021-1/bakery.txt
diff --git a/npc/021-1_Tulimshar/eurni.txt b/npc/021-1/eurni.txt
index 1a140e81..1a140e81 100644
--- a/npc/021-1_Tulimshar/eurni.txt
+++ b/npc/021-1/eurni.txt
diff --git a/npc/021-1_Tulimshar/gate_guards.txt b/npc/021-1/gate_guards.txt
index 2d0dc504..2d0dc504 100644
--- a/npc/021-1_Tulimshar/gate_guards.txt
+++ b/npc/021-1/gate_guards.txt
diff --git a/npc/021-1_Tulimshar/inac.txt b/npc/021-1/inac.txt
index 15f9eca3..15f9eca3 100644
--- a/npc/021-1_Tulimshar/inac.txt
+++ b/npc/021-1/inac.txt
diff --git a/npc/021-1_Tulimshar/mapflags.txt b/npc/021-1/mapflags.txt
index 3719ed0f..3719ed0f 100644
--- a/npc/021-1_Tulimshar/mapflags.txt
+++ b/npc/021-1/mapflags.txt
diff --git a/npc/021-1_Tulimshar/north_shops.txt b/npc/021-1/north_shops.txt
index 4fc3c481..4fc3c481 100644
--- a/npc/021-1_Tulimshar/north_shops.txt
+++ b/npc/021-1/north_shops.txt
diff --git a/npc/021-1_Tulimshar/royal_guards.txt b/npc/021-1/royal_guards.txt
index 02996184..02996184 100644
--- a/npc/021-1_Tulimshar/royal_guards.txt
+++ b/npc/021-1/royal_guards.txt
diff --git a/npc/021-1_Tulimshar/weellos.txt b/npc/021-1/weellos.txt
index 06bb8f17..06bb8f17 100644
--- a/npc/021-1_Tulimshar/weellos.txt
+++ b/npc/021-1/weellos.txt
diff --git a/npc/021-1_Tulimshar/workers.txt b/npc/021-1/workers.txt
index 24ea8f84..24ea8f84 100644
--- a/npc/021-1_Tulimshar/workers.txt
+++ b/npc/021-1/workers.txt
diff --git a/npc/021-1_Tulimshar/_import.txt b/npc/021-1_Tulimshar/_import.txt
deleted file mode 100644
index 346d975a..00000000
--- a/npc/021-1_Tulimshar/_import.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 021-1.gat
-npc: npc/021-1_Tulimshar/_mobs.txt
-npc: npc/021-1_Tulimshar/_warps.txt
-npc: npc/021-1_Tulimshar/bakery.txt
-npc: npc/021-1_Tulimshar/eurni.txt
-npc: npc/021-1_Tulimshar/gate_guards.txt
-npc: npc/021-1_Tulimshar/inac.txt
-npc: npc/021-1_Tulimshar/mapflags.txt
-npc: npc/021-1_Tulimshar/north_shops.txt
-npc: npc/021-1_Tulimshar/royal_guards.txt
-npc: npc/021-1_Tulimshar/weellos.txt
-npc: npc/021-1_Tulimshar/workers.txt
diff --git a/npc/021-2/_import.txt b/npc/021-2/_import.txt
new file mode 100644
index 00000000..5e8ae6c6
--- /dev/null
+++ b/npc/021-2/_import.txt
@@ -0,0 +1,13 @@
+// Map 021-2: Tulimshar
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 021-2.gat
+npc: npc/021-2/_mobs.txt
+npc: npc/021-2/_warps.txt
+npc: npc/021-2/bakery.txt
+npc: npc/021-2/furquest.txt
+npc: npc/021-2/government_building.txt
+npc: npc/021-2/heathin.txt
+npc: npc/021-2/inya.txt
+npc: npc/021-2/jhedia.txt
+npc: npc/021-2/mapflags.txt
+npc: npc/021-2/workshop.txt
diff --git a/npc/021-2_Tulimshar/_mobs.txt b/npc/021-2/_mobs.txt
index 7fbbb315..a390438e 100644
--- a/npc/021-2_Tulimshar/_mobs.txt
+++ b/npc/021-2/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 021-2 Tulimshar mobs
+// Tulimshar mobs
 
 
 
diff --git a/npc/021-2_Tulimshar/_warps.txt b/npc/021-2/_warps.txt
index 667da38f..0af6f275 100644
--- a/npc/021-2_Tulimshar/_warps.txt
+++ b/npc/021-2/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 021-2 Tulimshar warps
+// Tulimshar warps
 
 021-2.gat,27,30	warp	toOutside	-1,-1,021-1.gat,53,135
 021-2.gat,33,30	warp	toOutside	-1,-1,021-1.gat,55,135
diff --git a/npc/021-2_Tulimshar/bakery.txt b/npc/021-2/bakery.txt
index 9a3f1054..9a3f1054 100644
--- a/npc/021-2_Tulimshar/bakery.txt
+++ b/npc/021-2/bakery.txt
diff --git a/npc/021-2_Tulimshar/furquest.txt b/npc/021-2/furquest.txt
index 04814576..04814576 100644
--- a/npc/021-2_Tulimshar/furquest.txt
+++ b/npc/021-2/furquest.txt
diff --git a/npc/021-2_Tulimshar/government_building.txt b/npc/021-2/government_building.txt
index f4f9d0de..f4f9d0de 100644
--- a/npc/021-2_Tulimshar/government_building.txt
+++ b/npc/021-2/government_building.txt
diff --git a/npc/021-2_Tulimshar/heathin.txt b/npc/021-2/heathin.txt
index 270d510a..270d510a 100644
--- a/npc/021-2_Tulimshar/heathin.txt
+++ b/npc/021-2/heathin.txt
diff --git a/npc/021-2_Tulimshar/inya.txt b/npc/021-2/inya.txt
index 4d95bfb0..4d95bfb0 100644
--- a/npc/021-2_Tulimshar/inya.txt
+++ b/npc/021-2/inya.txt
diff --git a/npc/021-2_Tulimshar/jhedia.txt b/npc/021-2/jhedia.txt
index 2677a099..2677a099 100644
--- a/npc/021-2_Tulimshar/jhedia.txt
+++ b/npc/021-2/jhedia.txt
diff --git a/npc/021-2_Tulimshar/mapflags.txt b/npc/021-2/mapflags.txt
index 8f4a9dcd..8f4a9dcd 100644
--- a/npc/021-2_Tulimshar/mapflags.txt
+++ b/npc/021-2/mapflags.txt
diff --git a/npc/021-2_Tulimshar/workshop.txt b/npc/021-2/workshop.txt
index ffe732b4..ffe732b4 100644
--- a/npc/021-2_Tulimshar/workshop.txt
+++ b/npc/021-2/workshop.txt
diff --git a/npc/021-2_Tulimshar/_import.txt b/npc/021-2_Tulimshar/_import.txt
deleted file mode 100644
index 447aa1fe..00000000
--- a/npc/021-2_Tulimshar/_import.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 021-2.gat
-npc: npc/021-2_Tulimshar/_mobs.txt
-npc: npc/021-2_Tulimshar/_warps.txt
-npc: npc/021-2_Tulimshar/bakery.txt
-npc: npc/021-2_Tulimshar/furquest.txt
-npc: npc/021-2_Tulimshar/government_building.txt
-npc: npc/021-2_Tulimshar/heathin.txt
-npc: npc/021-2_Tulimshar/inya.txt
-npc: npc/021-2_Tulimshar/jhedia.txt
-npc: npc/021-2_Tulimshar/mapflags.txt
-npc: npc/021-2_Tulimshar/workshop.txt
diff --git a/npc/021-8_Meeting_Rooms/_import.txt b/npc/021-8_Meeting_Rooms/_import.txt
deleted file mode 100644
index 3c454cc1..00000000
--- a/npc/021-8_Meeting_Rooms/_import.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-map: 021-8.gat
-npc: npc/021-8_Meeting_Rooms/_mobs.txt
-npc: npc/021-8_Meeting_Rooms/_warps.txt
diff --git a/npc/021-8_Meeting_Rooms/_mobs.txt b/npc/021-8_Meeting_Rooms/_mobs.txt
deleted file mode 100644
index 993017ea..00000000
--- a/npc/021-8_Meeting_Rooms/_mobs.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-// 021-8 Meeting Rooms mobs
-
-
-
-021-8.gat,0,0,0	script	Mob021-8	-1,{
-	end;
-}
diff --git a/npc/021-8_Meeting_Rooms/_warps.txt b/npc/021-8_Meeting_Rooms/_warps.txt
deleted file mode 100644
index 9d92f8c4..00000000
--- a/npc/021-8_Meeting_Rooms/_warps.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-// 021-8 Meeting Rooms warps
-
diff --git a/npc/022-1/_import.txt b/npc/022-1/_import.txt
new file mode 100644
index 00000000..f0e9cc73
--- /dev/null
+++ b/npc/022-1/_import.txt
@@ -0,0 +1,9 @@
+// Map 022-1: Tulimshar
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 022-1.gat
+npc: npc/022-1/_mobs.txt
+npc: npc/022-1/_warps.txt
+npc: npc/022-1/dock.txt
+npc: npc/022-1/elanore.txt
+npc: npc/022-1/ferry_master.txt
+npc: npc/022-1/mapflags.txt
diff --git a/npc/022-1_Tulimshar/_mobs.txt b/npc/022-1/_mobs.txt
index 8fc7bbe8..a61eb346 100644
--- a/npc/022-1_Tulimshar/_mobs.txt
+++ b/npc/022-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 022-1 Tulimshar mobs
+// Tulimshar mobs
 
 
 
diff --git a/npc/022-1_Tulimshar/_warps.txt b/npc/022-1/_warps.txt
index 811db150..38e63696 100644
--- a/npc/022-1_Tulimshar/_warps.txt
+++ b/npc/022-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 022-1 Tulimshar warps
+// Tulimshar warps
 
 022-1.gat,72,108	warp	ToCentralTulimshar	3,-1,021-1.gat,73,21
 022-1.gat,113,108	warp	ToCentralTulimshar	3,-1,021-1.gat,113,21
diff --git a/npc/022-1_Tulimshar/dock.txt b/npc/022-1/dock.txt
index 72d28486..72d28486 100644
--- a/npc/022-1_Tulimshar/dock.txt
+++ b/npc/022-1/dock.txt
diff --git a/npc/022-1_Tulimshar/elanore.txt b/npc/022-1/elanore.txt
index 52e64171..52e64171 100644
--- a/npc/022-1_Tulimshar/elanore.txt
+++ b/npc/022-1/elanore.txt
diff --git a/npc/022-1_Tulimshar/ferry_master.txt b/npc/022-1/ferry_master.txt
index a1d9d69a..a1d9d69a 100644
--- a/npc/022-1_Tulimshar/ferry_master.txt
+++ b/npc/022-1/ferry_master.txt
diff --git a/npc/022-1_Tulimshar/mapflags.txt b/npc/022-1/mapflags.txt
index f1b0444b..f1b0444b 100644
--- a/npc/022-1_Tulimshar/mapflags.txt
+++ b/npc/022-1/mapflags.txt
diff --git a/npc/022-1_Tulimshar/_import.txt b/npc/022-1_Tulimshar/_import.txt
deleted file mode 100644
index f04f9443..00000000
--- a/npc/022-1_Tulimshar/_import.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 022-1.gat
-npc: npc/022-1_Tulimshar/_mobs.txt
-npc: npc/022-1_Tulimshar/_warps.txt
-npc: npc/022-1_Tulimshar/dock.txt
-npc: npc/022-1_Tulimshar/elanore.txt
-npc: npc/022-1_Tulimshar/ferry_master.txt
-npc: npc/022-1_Tulimshar/mapflags.txt
diff --git a/npc/023-1_Beach_Cliffs/_import.txt b/npc/023-1_Beach_Cliffs/_import.txt
deleted file mode 100644
index 3d0bf1e4..00000000
--- a/npc/023-1_Beach_Cliffs/_import.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-map: 023-1.gat
-npc: npc/023-1_Beach_Cliffs/_mobs.txt
-npc: npc/023-1_Beach_Cliffs/_warps.txt
diff --git a/npc/023-1_Beach_Cliffs/_mobs.txt b/npc/023-1_Beach_Cliffs/_mobs.txt
deleted file mode 100644
index 60725477..00000000
--- a/npc/023-1_Beach_Cliffs/_mobs.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-// 023-1 Beach Cliffs mobs
-
-
-
-023-1.gat,0,0,0	script	Mob023-1	-1,{
-	end;
-}
diff --git a/npc/023-1_Beach_Cliffs/_warps.txt b/npc/023-1_Beach_Cliffs/_warps.txt
deleted file mode 100644
index 0090bda5..00000000
--- a/npc/023-1_Beach_Cliffs/_warps.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-// 023-1 Beach Cliffs warps
-
diff --git a/npc/024-1/_import.txt b/npc/024-1/_import.txt
new file mode 100644
index 00000000..828b20ab
--- /dev/null
+++ b/npc/024-1/_import.txt
@@ -0,0 +1,9 @@
+// Map 024-1: Tulimshar Canyon
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 024-1.gat
+npc: npc/024-1/_mobs.txt
+npc: npc/024-1/_warps.txt
+npc: npc/024-1/ched.txt
+npc: npc/024-1/eomie.txt
+npc: npc/024-1/tinris.txt
+npc: npc/024-1/tondar.txt
diff --git a/npc/024-1_Tulimshar_Canyon/_mobs.txt b/npc/024-1/_mobs.txt
index 6309a08c..81103764 100644
--- a/npc/024-1_Tulimshar_Canyon/_mobs.txt
+++ b/npc/024-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 024-1 Tulimshar Canyon mobs
+// Tulimshar Canyon mobs
 
 024-1.gat,89,52,3,2	monster	Maggot	1002,2,100000,30000,Mob024-1::On1002
 024-1.gat,40,45,3,2	monster	Maggot	1002,2,100000,30000,Mob024-1::On1002
diff --git a/npc/024-1_Tulimshar_Canyon/_warps.txt b/npc/024-1/_warps.txt
index b1b545bb..12012376 100644
--- a/npc/024-1_Tulimshar_Canyon/_warps.txt
+++ b/npc/024-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 024-1 Tulimshar Canyon warps
+// Tulimshar Canyon warps
 
 024-1.gat,86,73	warp	toCentralTulimshar	3,-1,021-1.gat,49,64
 024-1.gat,80,48	warp	toBuilding	0,-1,024-2.gat,26,26
diff --git a/npc/024-1_Tulimshar_Canyon/ched.txt b/npc/024-1/ched.txt
index 43dd832e..43dd832e 100644
--- a/npc/024-1_Tulimshar_Canyon/ched.txt
+++ b/npc/024-1/ched.txt
diff --git a/npc/024-1_Tulimshar_Canyon/eomie.txt b/npc/024-1/eomie.txt
index f2b716ac..f2b716ac 100644
--- a/npc/024-1_Tulimshar_Canyon/eomie.txt
+++ b/npc/024-1/eomie.txt
diff --git a/npc/024-1_Tulimshar_Canyon/tinris.txt b/npc/024-1/tinris.txt
index 29381f57..29381f57 100644
--- a/npc/024-1_Tulimshar_Canyon/tinris.txt
+++ b/npc/024-1/tinris.txt
diff --git a/npc/024-1_Tulimshar_Canyon/tondar.txt b/npc/024-1/tondar.txt
index 585806df..585806df 100644
--- a/npc/024-1_Tulimshar_Canyon/tondar.txt
+++ b/npc/024-1/tondar.txt
diff --git a/npc/024-1_Tulimshar_Canyon/_import.txt b/npc/024-1_Tulimshar_Canyon/_import.txt
deleted file mode 100644
index 2e29ca1f..00000000
--- a/npc/024-1_Tulimshar_Canyon/_import.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 024-1.gat
-npc: npc/024-1_Tulimshar_Canyon/_mobs.txt
-npc: npc/024-1_Tulimshar_Canyon/_warps.txt
-npc: npc/024-1_Tulimshar_Canyon/ched.txt
-npc: npc/024-1_Tulimshar_Canyon/eomie.txt
-npc: npc/024-1_Tulimshar_Canyon/tinris.txt
-npc: npc/024-1_Tulimshar_Canyon/tondar.txt
diff --git a/npc/024-2/_import.txt b/npc/024-2/_import.txt
new file mode 100644
index 00000000..2a03af32
--- /dev/null
+++ b/npc/024-2/_import.txt
@@ -0,0 +1,8 @@
+// Map 024-2: Tulimshar Magic School
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 024-2.gat
+npc: npc/024-2/_mobs.txt
+npc: npc/024-2/_warps.txt
+npc: npc/024-2/barrier.txt
+npc: npc/024-2/tyer.txt
+npc: npc/024-2/tyer_trigger.txt
diff --git a/npc/024-2_Tulimshar_Magic_School/_mobs.txt b/npc/024-2/_mobs.txt
index 83a6819e..7074e7a7 100644
--- a/npc/024-2_Tulimshar_Magic_School/_mobs.txt
+++ b/npc/024-2/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 024-2 Tulimshar Magic School mobs
+// Tulimshar Magic School mobs
 
 
 
diff --git a/npc/024-2_Tulimshar_Magic_School/_warps.txt b/npc/024-2/_warps.txt
index fb152665..e7b9d28f 100644
--- a/npc/024-2_Tulimshar_Magic_School/_warps.txt
+++ b/npc/024-2/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 024-2 Tulimshar Magic School warps
+// Tulimshar Magic School warps
 
 024-2.gat,26,27	warp	toOutside	0,-1,024-1.gat,79,49
 024-2.gat,42,28	warp	toOutside	-1,-1,024-1.gat,86,49
diff --git a/npc/024-2_Tulimshar_Magic_School/barrier.txt b/npc/024-2/barrier.txt
index ede39644..ede39644 100644
--- a/npc/024-2_Tulimshar_Magic_School/barrier.txt
+++ b/npc/024-2/barrier.txt
diff --git a/npc/024-2_Tulimshar_Magic_School/tyer.txt b/npc/024-2/tyer.txt
index f6b78331..f6b78331 100644
--- a/npc/024-2_Tulimshar_Magic_School/tyer.txt
+++ b/npc/024-2/tyer.txt
diff --git a/npc/024-2_Tulimshar_Magic_School/tyer_trigger.txt b/npc/024-2/tyer_trigger.txt
index ee588365..ee588365 100644
--- a/npc/024-2_Tulimshar_Magic_School/tyer_trigger.txt
+++ b/npc/024-2/tyer_trigger.txt
diff --git a/npc/024-2_Tulimshar_Magic_School/_import.txt b/npc/024-2_Tulimshar_Magic_School/_import.txt
deleted file mode 100644
index 4022a12e..00000000
--- a/npc/024-2_Tulimshar_Magic_School/_import.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 024-2.gat
-npc: npc/024-2_Tulimshar_Magic_School/_mobs.txt
-npc: npc/024-2_Tulimshar_Magic_School/_warps.txt
-npc: npc/024-2_Tulimshar_Magic_School/barrier.txt
-npc: npc/024-2_Tulimshar_Magic_School/tyer.txt
-npc: npc/024-2_Tulimshar_Magic_School/tyer_trigger.txt
diff --git a/npc/025-1_Woodland_Swamp/_import.txt b/npc/025-1/_import.txt
index 651e7afa..bf3dd30e 100644
--- a/npc/025-1_Woodland_Swamp/_import.txt
+++ b/npc/025-1/_import.txt
@@ -1,4 +1,5 @@
+// Map 025-1: Woodland Swamp
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 025-1.gat
-npc: npc/025-1_Woodland_Swamp/_mobs.txt
-npc: npc/025-1_Woodland_Swamp/_warps.txt
+npc: npc/025-1/_mobs.txt
+npc: npc/025-1/_warps.txt
diff --git a/npc/025-1_Woodland_Swamp/_mobs.txt b/npc/025-1/_mobs.txt
index eb389ab5..e0c2b32e 100644
--- a/npc/025-1_Woodland_Swamp/_mobs.txt
+++ b/npc/025-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 025-1 Woodland Swamp mobs
+// Woodland Swamp mobs
 
 025-1.gat,100,60,56,79	monster	Clover Patch	1037,3,30000,10000,Mob025-1::On1037
 025-1.gat,56,96,13,5	monster	Clover Patch	1037,1,1200000,10000,Mob025-1::On1037
diff --git a/npc/025-1_Woodland_Swamp/_warps.txt b/npc/025-1/_warps.txt
index 84000cb2..e408c509 100644
--- a/npc/025-1_Woodland_Swamp/_warps.txt
+++ b/npc/025-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 025-1 Woodland Swamp warps
+// Woodland Swamp warps
 
 025-1.gat,19,66	warp	toSwamp	-1,-1,026-1.gat,128,66
 025-1.gat,90,19	warp	toWoodland	2,-1,015-1.gat,59,100
diff --git a/npc/026-1_Swamp/_import.txt b/npc/026-1/_import.txt
index bc7e00f5..ae18387c 100644
--- a/npc/026-1_Swamp/_import.txt
+++ b/npc/026-1/_import.txt
@@ -1,5 +1,6 @@
+// Map 026-1: Swamp
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 026-1.gat
-npc: npc/026-1_Swamp/_mobs.txt
-npc: npc/026-1_Swamp/_warps.txt
-npc: npc/026-1_Swamp/sign.txt
+npc: npc/026-1/_mobs.txt
+npc: npc/026-1/_warps.txt
+npc: npc/026-1/sign.txt
diff --git a/npc/026-1_Swamp/_mobs.txt b/npc/026-1/_mobs.txt
index ab0d5473..89a32db8 100644
--- a/npc/026-1_Swamp/_mobs.txt
+++ b/npc/026-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 026-1 Swamp mobs
+// Swamp mobs
 
 026-1.gat,70,58,111,83	monster	Wisp	1040,34,120000,40000,Mob026-1::On1040
 026-1.gat,70,59,110,84	monster	Spectre	1042,34,120000,40000,Mob026-1::On1042
diff --git a/npc/026-1_Swamp/_warps.txt b/npc/026-1/_warps.txt
index b555b2b7..dc5c51fc 100644
--- a/npc/026-1_Swamp/_warps.txt
+++ b/npc/026-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 026-1 Swamp warps
+// Swamp warps
 
 026-1.gat,63,16	warp	toGraveyard	-1,-1,027-1.gat,63,105
 026-1.gat,129,66	warp	toSwamp	-1,-1,025-1.gat,20,66
diff --git a/npc/026-1_Swamp/sign.txt b/npc/026-1/sign.txt
index 44813c38..44813c38 100644
--- a/npc/026-1_Swamp/sign.txt
+++ b/npc/026-1/sign.txt
diff --git a/npc/027-1/_import.txt b/npc/027-1/_import.txt
new file mode 100644
index 00000000..14fc594e
--- /dev/null
+++ b/npc/027-1/_import.txt
@@ -0,0 +1,8 @@
+// Map 027-1: Graveyard
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 027-1.gat
+npc: npc/027-1/_mobs.txt
+npc: npc/027-1/_warps.txt
+npc: npc/027-1/golbenez.txt
+npc: npc/027-1/graves.txt
+npc: npc/027-1/monsters.txt
diff --git a/npc/027-1_Graveyard/_mobs.txt b/npc/027-1/_mobs.txt
index 5f878e68..e7eac33a 100644
--- a/npc/027-1_Graveyard/_mobs.txt
+++ b/npc/027-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 027-1 Graveyard mobs
+// Graveyard mobs
 
 027-1.gat,81,91,95,27	monster	Poltergeist	1047,4,900000,60000,Mob027-1::On1047
 027-1.gat,81,91,97,25	monster	Spectre	1042,4,900000,60000,Mob027-1::On1042
diff --git a/npc/027-1_Graveyard/_warps.txt b/npc/027-1/_warps.txt
index 57062f58..b8f1991e 100644
--- a/npc/027-1_Graveyard/_warps.txt
+++ b/npc/027-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 027-1 Graveyard warps
+// Graveyard warps
 
 027-1.gat,88,84	warp	toCaretaker's	-1,-1,027-2.gat,26,32
 027-1.gat,63,106	warp	toSwamp	-1,-1,026-1.gat,63,17
diff --git a/npc/027-1_Graveyard/golbenez.txt b/npc/027-1/golbenez.txt
index 336cdea3..336cdea3 100644
--- a/npc/027-1_Graveyard/golbenez.txt
+++ b/npc/027-1/golbenez.txt
diff --git a/npc/027-1_Graveyard/graves.txt b/npc/027-1/graves.txt
index ecda6ea0..ecda6ea0 100644
--- a/npc/027-1_Graveyard/graves.txt
+++ b/npc/027-1/graves.txt
diff --git a/npc/027-1_Graveyard/monsters.txt b/npc/027-1/monsters.txt
index 0efe43c4..0efe43c4 100644
--- a/npc/027-1_Graveyard/monsters.txt
+++ b/npc/027-1/monsters.txt
diff --git a/npc/027-1_Graveyard/_import.txt b/npc/027-1_Graveyard/_import.txt
deleted file mode 100644
index 4a185c48..00000000
--- a/npc/027-1_Graveyard/_import.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 027-1.gat
-npc: npc/027-1_Graveyard/_mobs.txt
-npc: npc/027-1_Graveyard/_warps.txt
-npc: npc/027-1_Graveyard/golbenez.txt
-npc: npc/027-1_Graveyard/graves.txt
-npc: npc/027-1_Graveyard/monsters.txt
diff --git a/npc/027-2/_import.txt b/npc/027-2/_import.txt
new file mode 100644
index 00000000..56dcdd1b
--- /dev/null
+++ b/npc/027-2/_import.txt
@@ -0,0 +1,22 @@
+// Map 027-2: Caretaker's House
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 027-2.gat
+npc: npc/027-2/_mobs.txt
+npc: npc/027-2/_warps.txt
+npc: npc/027-2/alacrius.txt
+npc: npc/027-2/alacrius2.txt
+npc: npc/027-2/barman.txt
+npc: npc/027-2/caretaker.txt
+npc: npc/027-2/cerhan.txt
+npc: npc/027-2/crying_child.txt
+npc: npc/027-2/diary.txt
+npc: npc/027-2/door.txt
+npc: npc/027-2/evil_guard.txt
+npc: npc/027-2/golbenez.txt
+npc: npc/027-2/gy_inn_shops.txt
+npc: npc/027-2/headless_man.txt
+npc: npc/027-2/husband.txt
+npc: npc/027-2/innkeeper.txt
+npc: npc/027-2/lover.txt
+npc: npc/027-2/testnpcs.txt
+npc: npc/027-2/werewolf.txt
diff --git a/npc/027-2_Caretakers_House/_mobs.txt b/npc/027-2/_mobs.txt
index 5408e5fa..b316be00 100644
--- a/npc/027-2_Caretakers_House/_mobs.txt
+++ b/npc/027-2/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 027-2 Caretaker's House mobs
+// Caretaker's House mobs
 
 027-2.gat,81,41,11,9	monster	DrunkenSkeleton	1077,1,100000,30000,Mob027-2::On1077
 027-2.gat,91,38,11,9	monster	TipsySkeleton	1078,1,100000,30000,Mob027-2::On1078
diff --git a/npc/027-2_Caretakers_House/_warps.txt b/npc/027-2/_warps.txt
index 85f2d523..fcc40b4d 100644
--- a/npc/027-2_Caretakers_House/_warps.txt
+++ b/npc/027-2/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 027-2 Caretaker's House warps
+// Caretaker's House warps
 
 027-2.gat,26,33	warp	toGraveyard	-1,-1,027-1.gat,88,85
 027-2.gat,128,35	warp	To2ndFloor	0,-1,027-2.gat,75,93
diff --git a/npc/027-2_Caretakers_House/alacrius.txt b/npc/027-2/alacrius.txt
index 99714ebc..99714ebc 100755
--- a/npc/027-2_Caretakers_House/alacrius.txt
+++ b/npc/027-2/alacrius.txt
diff --git a/npc/027-2_Caretakers_House/alacrius2.txt b/npc/027-2/alacrius2.txt
index b48ebd3f..b48ebd3f 100755
--- a/npc/027-2_Caretakers_House/alacrius2.txt
+++ b/npc/027-2/alacrius2.txt
diff --git a/npc/027-2_Caretakers_House/barman.txt b/npc/027-2/barman.txt
index 616b761a..616b761a 100644
--- a/npc/027-2_Caretakers_House/barman.txt
+++ b/npc/027-2/barman.txt
diff --git a/npc/027-2_Caretakers_House/caretaker.txt b/npc/027-2/caretaker.txt
index bf4d35fc..bf4d35fc 100644
--- a/npc/027-2_Caretakers_House/caretaker.txt
+++ b/npc/027-2/caretaker.txt
diff --git a/npc/027-2_Caretakers_House/cerhan.txt b/npc/027-2/cerhan.txt
index 33ee7895..33ee7895 100644
--- a/npc/027-2_Caretakers_House/cerhan.txt
+++ b/npc/027-2/cerhan.txt
diff --git a/npc/027-2_Caretakers_House/crying_child.txt b/npc/027-2/crying_child.txt
index d7cbeac3..d7cbeac3 100644
--- a/npc/027-2_Caretakers_House/crying_child.txt
+++ b/npc/027-2/crying_child.txt
diff --git a/npc/027-2_Caretakers_House/diary.txt b/npc/027-2/diary.txt
index 15eaa85e..15eaa85e 100644
--- a/npc/027-2_Caretakers_House/diary.txt
+++ b/npc/027-2/diary.txt
diff --git a/npc/027-2_Caretakers_House/door.txt b/npc/027-2/door.txt
index 630e0ee2..630e0ee2 100644
--- a/npc/027-2_Caretakers_House/door.txt
+++ b/npc/027-2/door.txt
diff --git a/npc/027-2_Caretakers_House/evil_guard.txt b/npc/027-2/evil_guard.txt
index 0ee91cfa..0ee91cfa 100644
--- a/npc/027-2_Caretakers_House/evil_guard.txt
+++ b/npc/027-2/evil_guard.txt
diff --git a/npc/027-2_Caretakers_House/golbenez.txt b/npc/027-2/golbenez.txt
index 44724d37..44724d37 100644
--- a/npc/027-2_Caretakers_House/golbenez.txt
+++ b/npc/027-2/golbenez.txt
diff --git a/npc/027-2_Caretakers_House/gy_inn_shops.txt b/npc/027-2/gy_inn_shops.txt
index a90d4301..a90d4301 100755
--- a/npc/027-2_Caretakers_House/gy_inn_shops.txt
+++ b/npc/027-2/gy_inn_shops.txt
diff --git a/npc/027-2_Caretakers_House/headless_man.txt b/npc/027-2/headless_man.txt
index b777e07d..b777e07d 100644
--- a/npc/027-2_Caretakers_House/headless_man.txt
+++ b/npc/027-2/headless_man.txt
diff --git a/npc/027-2_Caretakers_House/husband.txt b/npc/027-2/husband.txt
index 2ff39f60..2ff39f60 100644
--- a/npc/027-2_Caretakers_House/husband.txt
+++ b/npc/027-2/husband.txt
diff --git a/npc/027-2_Caretakers_House/innkeeper.txt b/npc/027-2/innkeeper.txt
index a8cd3778..a8cd3778 100644
--- a/npc/027-2_Caretakers_House/innkeeper.txt
+++ b/npc/027-2/innkeeper.txt
diff --git a/npc/027-2_Caretakers_House/lover.txt b/npc/027-2/lover.txt
index d88a91cd..d88a91cd 100644
--- a/npc/027-2_Caretakers_House/lover.txt
+++ b/npc/027-2/lover.txt
diff --git a/npc/027-2_Caretakers_House/testnpcs.txt b/npc/027-2/testnpcs.txt
index 57dc1f7b..57dc1f7b 100755
--- a/npc/027-2_Caretakers_House/testnpcs.txt
+++ b/npc/027-2/testnpcs.txt
diff --git a/npc/027-2_Caretakers_House/werewolf.txt b/npc/027-2/werewolf.txt
index 87d93173..87d93173 100644
--- a/npc/027-2_Caretakers_House/werewolf.txt
+++ b/npc/027-2/werewolf.txt
diff --git a/npc/027-2_Caretakers_House/_import.txt b/npc/027-2_Caretakers_House/_import.txt
deleted file mode 100644
index 56365f9d..00000000
--- a/npc/027-2_Caretakers_House/_import.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 027-2.gat
-npc: npc/027-2_Caretakers_House/_mobs.txt
-npc: npc/027-2_Caretakers_House/_warps.txt
-npc: npc/027-2_Caretakers_House/alacrius.txt
-npc: npc/027-2_Caretakers_House/alacrius2.txt
-npc: npc/027-2_Caretakers_House/barman.txt
-npc: npc/027-2_Caretakers_House/caretaker.txt
-npc: npc/027-2_Caretakers_House/cerhan.txt
-npc: npc/027-2_Caretakers_House/crying_child.txt
-npc: npc/027-2_Caretakers_House/diary.txt
-npc: npc/027-2_Caretakers_House/door.txt
-npc: npc/027-2_Caretakers_House/evil_guard.txt
-npc: npc/027-2_Caretakers_House/golbenez.txt
-npc: npc/027-2_Caretakers_House/gy_inn_shops.txt
-npc: npc/027-2_Caretakers_House/headless_man.txt
-npc: npc/027-2_Caretakers_House/husband.txt
-npc: npc/027-2_Caretakers_House/innkeeper.txt
-npc: npc/027-2_Caretakers_House/lover.txt
-npc: npc/027-2_Caretakers_House/testnpcs.txt
-npc: npc/027-2_Caretakers_House/werewolf.txt
diff --git a/npc/027-3/_import.txt b/npc/027-3/_import.txt
new file mode 100755
index 00000000..96b4da1a
--- /dev/null
+++ b/npc/027-3/_import.txt
@@ -0,0 +1,8 @@
+// Map 027-3: Crypt
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 027-3.gat
+npc: npc/027-3/_mobs.txt
+npc: npc/027-3/_warps.txt
+npc: npc/027-3/caskets.txt
+npc: npc/027-3/entrance.txt
+npc: npc/027-3/mapflags.txt
diff --git a/npc/027-3_Crypt/_mobs.txt b/npc/027-3/_mobs.txt
index 74c61824..11df5c67 100755
--- a/npc/027-3_Crypt/_mobs.txt
+++ b/npc/027-3/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 027-3 Crypt mobs
+// Crypt mobs
 
 
 
diff --git a/npc/027-3_Crypt/_warps.txt b/npc/027-3/_warps.txt
index 28e8a16e..50380b5d 100755
--- a/npc/027-3_Crypt/_warps.txt
+++ b/npc/027-3/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 027-3 Crypt warps
+// Crypt warps
 
 027-3.gat,127,44	warp	toCryptLevel2	1,-1,027-4.gat,37,21
diff --git a/npc/027-3_Crypt/caskets.txt b/npc/027-3/caskets.txt
index c7ae44bd..c7ae44bd 100755
--- a/npc/027-3_Crypt/caskets.txt
+++ b/npc/027-3/caskets.txt
diff --git a/npc/027-3_Crypt/entrance.txt b/npc/027-3/entrance.txt
index 0ba3def5..0ba3def5 100755
--- a/npc/027-3_Crypt/entrance.txt
+++ b/npc/027-3/entrance.txt
diff --git a/npc/027-3_Crypt/mapflags.txt b/npc/027-3/mapflags.txt
index 5f9c091d..5f9c091d 100755
--- a/npc/027-3_Crypt/mapflags.txt
+++ b/npc/027-3/mapflags.txt
diff --git a/npc/027-3_Crypt/_import.txt b/npc/027-3_Crypt/_import.txt
deleted file mode 100755
index 97563a74..00000000
--- a/npc/027-3_Crypt/_import.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 027-3.gat
-npc: npc/027-3_Crypt/_mobs.txt
-npc: npc/027-3_Crypt/_warps.txt
-npc: npc/027-3_Crypt/caskets.txt
-npc: npc/027-3_Crypt/entrance.txt
-npc: npc/027-3_Crypt/mapflags.txt
diff --git a/npc/027-4/_import.txt b/npc/027-4/_import.txt
new file mode 100755
index 00000000..d5638404
--- /dev/null
+++ b/npc/027-4/_import.txt
@@ -0,0 +1,7 @@
+// Map 027-4: Inner Chamber
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 027-4.gat
+npc: npc/027-4/_mobs.txt
+npc: npc/027-4/_warps.txt
+npc: npc/027-4/mapflags.txt
+npc: npc/027-4/reaper_script.txt
diff --git a/npc/027-4_Inner_Chamber/_mobs.txt b/npc/027-4/_mobs.txt
index e74f08a9..26dbe342 100755
--- a/npc/027-4_Inner_Chamber/_mobs.txt
+++ b/npc/027-4/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 027-4 Inner Chamber mobs
+// Inner Chamber mobs
 
 
 
diff --git a/npc/027-4_Inner_Chamber/_warps.txt b/npc/027-4/_warps.txt
index aa61724c..4611509a 100755
--- a/npc/027-4_Inner_Chamber/_warps.txt
+++ b/npc/027-4/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 027-4 Inner Chamber warps
+// Inner Chamber warps
 
 027-4.gat,37,19	warp	toCryptLevel1	1,-1,027-3.gat,127,42
diff --git a/npc/027-4_Inner_Chamber/mapflags.txt b/npc/027-4/mapflags.txt
index 1784cd64..1784cd64 100755
--- a/npc/027-4_Inner_Chamber/mapflags.txt
+++ b/npc/027-4/mapflags.txt
diff --git a/npc/027-4_Inner_Chamber/reaper_script.txt b/npc/027-4/reaper_script.txt
index b09a2399..b09a2399 100755
--- a/npc/027-4_Inner_Chamber/reaper_script.txt
+++ b/npc/027-4/reaper_script.txt
diff --git a/npc/027-4_Inner_Chamber/_import.txt b/npc/027-4_Inner_Chamber/_import.txt
deleted file mode 100755
index a873f1ff..00000000
--- a/npc/027-4_Inner_Chamber/_import.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 027-4.gat
-npc: npc/027-4_Inner_Chamber/_mobs.txt
-npc: npc/027-4_Inner_Chamber/_warps.txt
-npc: npc/027-4_Inner_Chamber/mapflags.txt
-npc: npc/027-4_Inner_Chamber/reaper_script.txt
diff --git a/npc/028-1/_import.txt b/npc/028-1/_import.txt
index 2bd71dba..1cfec48c 100644
--- a/npc/028-1/_import.txt
+++ b/npc/028-1/_import.txt
@@ -1,3 +1,4 @@
+// Map 028-1: 
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 028-1.gat
 npc: npc/028-1/Portal.txt
diff --git a/npc/028-1/_mobs.txt b/npc/028-1/_mobs.txt
index 09194112..a71093ad 100644
--- a/npc/028-1/_mobs.txt
+++ b/npc/028-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 028-1 mobs
+//  mobs
 
 028-1.gat,115,72,27,25	monster	SpikyMushrooms	1019,18,20000,600,Mob028-1::On1019
 028-1.gat,83,69,25,19	monster	Bat	1017,18,100000,1200,Mob028-1::On1017
diff --git a/npc/028-1/_warps.txt b/npc/028-1/_warps.txt
index 87cfe5a6..1d7ccba9 100644
--- a/npc/028-1/_warps.txt
+++ b/npc/028-1/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 028-1 warps
+//  warps
 
 028-1.gat,114,122	warp	To028-3	-1,-1,028-3.gat,33,78
diff --git a/npc/028-3/_import.txt b/npc/028-3/_import.txt
index beee1f4e..bb8dd79e 100644
--- a/npc/028-3/_import.txt
+++ b/npc/028-3/_import.txt
@@ -1,3 +1,4 @@
+// Map 028-3: 
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 028-3.gat
 npc: npc/028-3/_mobs.txt
diff --git a/npc/028-3/_mobs.txt b/npc/028-3/_mobs.txt
index 912ec985..a5dec284 100644
--- a/npc/028-3/_mobs.txt
+++ b/npc/028-3/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 028-3 mobs
+//  mobs
 
 028-3.gat,51,49,22,15	monster	Silkworm	1035,10,0,3000,Mob028-3::On1035
 028-3.gat,43,35,1,1	monster	EvilMushroom	1013,3,40000,5000,Mob028-3::On1013
diff --git a/npc/028-3/_warps.txt b/npc/028-3/_warps.txt
index e4074a2a..62972083 100644
--- a/npc/028-3/_warps.txt
+++ b/npc/028-3/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 028-3 warps
+//  warps
 
 028-3.gat,33,78	warp	To028-1	-1,-1,028-1.gat,114,122
diff --git a/npc/029-1/_import.txt b/npc/029-1/_import.txt
new file mode 100644
index 00000000..5c1410b0
--- /dev/null
+++ b/npc/029-1/_import.txt
@@ -0,0 +1,7 @@
+// Map 029-1: Candor
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 029-1.gat
+npc: npc/029-1/_mobs.txt
+npc: npc/029-1/_warps.txt
+npc: npc/029-1/barrier.txt
+npc: npc/029-1/dock.txt
diff --git a/npc/029-1_Candor/_mobs.txt b/npc/029-1/_mobs.txt
index 1b19f809..7fdf044c 100644
--- a/npc/029-1_Candor/_mobs.txt
+++ b/npc/029-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 029-1 Candor mobs
+// Candor mobs
 
 029-1.gat,68,64,11,13	monster	Evil Mushrooms	1013,4,20000,60000,Mob029-1::On1013
 029-1.gat,31,32,12,13	monster	Squirrel	1038,3,30000,60000,Mob029-1::On1038
diff --git a/npc/031-4_Cave/_warps.txt b/npc/029-1/_warps.txt
index 20946cc1..ffe9c2d6 100644
--- a/npc/031-4_Cave/_warps.txt
+++ b/npc/029-1/_warps.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 031-4 Cave warps
+// Candor warps
 
diff --git a/npc/029-1_Candor/barrier.txt b/npc/029-1/barrier.txt
index a92993ff..a92993ff 100644
--- a/npc/029-1_Candor/barrier.txt
+++ b/npc/029-1/barrier.txt
diff --git a/npc/029-1_Candor/dock.txt b/npc/029-1/dock.txt
index 76cc8a16..76cc8a16 100644
--- a/npc/029-1_Candor/dock.txt
+++ b/npc/029-1/dock.txt
diff --git a/npc/029-1_Candor/_import.txt b/npc/029-1_Candor/_import.txt
deleted file mode 100644
index d69775f4..00000000
--- a/npc/029-1_Candor/_import.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 029-1.gat
-npc: npc/029-1_Candor/_mobs.txt
-npc: npc/029-1_Candor/_warps.txt
-npc: npc/029-1_Candor/barrier.txt
-npc: npc/029-1_Candor/dock.txt
diff --git a/npc/029-3/_import.txt b/npc/029-3/_import.txt
new file mode 100644
index 00000000..e8ca1dac
--- /dev/null
+++ b/npc/029-3/_import.txt
@@ -0,0 +1,8 @@
+// Map 029-3: Fight Cave
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 029-3.gat
+npc: npc/029-3/_mobs.txt
+npc: npc/029-3/_warps.txt
+npc: npc/029-3/barrier.txt
+npc: npc/029-3/mapflags.txt
+npc: npc/029-3/parua.txt
diff --git a/npc/029-3_Fight_Cave/_mobs.txt b/npc/029-3/_mobs.txt
index 27a30031..4e3b4282 100644
--- a/npc/029-3_Fight_Cave/_mobs.txt
+++ b/npc/029-3/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 029-3 Fight Cave mobs
+// Fight Cave mobs
 
 
 
diff --git a/npc/029-1_Candor/_warps.txt b/npc/029-3/_warps.txt
index a928551f..42f13dee 100644
--- a/npc/029-1_Candor/_warps.txt
+++ b/npc/029-3/_warps.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 029-1 Candor warps
+// Fight Cave warps
 
diff --git a/npc/029-3_Fight_Cave/barrier.txt b/npc/029-3/barrier.txt
index ec8aeb3d..ec8aeb3d 100644
--- a/npc/029-3_Fight_Cave/barrier.txt
+++ b/npc/029-3/barrier.txt
diff --git a/npc/029-3_Fight_Cave/mapflags.txt b/npc/029-3/mapflags.txt
index 845a0f01..845a0f01 100644
--- a/npc/029-3_Fight_Cave/mapflags.txt
+++ b/npc/029-3/mapflags.txt
diff --git a/npc/029-3_Fight_Cave/parua.txt b/npc/029-3/parua.txt
index c292f963..c292f963 100644
--- a/npc/029-3_Fight_Cave/parua.txt
+++ b/npc/029-3/parua.txt
diff --git a/npc/029-3_Fight_Cave/_import.txt b/npc/029-3_Fight_Cave/_import.txt
deleted file mode 100644
index ff5c622c..00000000
--- a/npc/029-3_Fight_Cave/_import.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 029-3.gat
-npc: npc/029-3_Fight_Cave/_mobs.txt
-npc: npc/029-3_Fight_Cave/_warps.txt
-npc: npc/029-3_Fight_Cave/barrier.txt
-npc: npc/029-3_Fight_Cave/mapflags.txt
-npc: npc/029-3_Fight_Cave/parua.txt
diff --git a/npc/030-1_Snow_field/_import.txt b/npc/030-1/_import.txt
index 98b0f9e6..d8cabe5d 100644
--- a/npc/030-1_Snow_field/_import.txt
+++ b/npc/030-1/_import.txt
@@ -1,4 +1,5 @@
+// Map 030-1: Snow field
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 030-1.gat
-npc: npc/030-1_Snow_field/_mobs.txt
-npc: npc/030-1_Snow_field/_warps.txt
+npc: npc/030-1/_mobs.txt
+npc: npc/030-1/_warps.txt
diff --git a/npc/030-1_Snow_field/_mobs.txt b/npc/030-1/_mobs.txt
index 363761f6..830b17e4 100644
--- a/npc/030-1_Snow_field/_mobs.txt
+++ b/npc/030-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 030-1 Snow field mobs
+// Snow field mobs
 
 030-1.gat,78,55,66,70	monster	Santa Slime	1015,5,100000,30000,Mob030-1::On1015
 030-1.gat,84,57,66,70	monster	Squirrel	1038,10,100000,30000,Mob030-1::On1038
diff --git a/npc/030-1_Snow_field/_warps.txt b/npc/030-1/_warps.txt
index 82265e05..1a4e7582 100644
--- a/npc/030-1_Snow_field/_warps.txt
+++ b/npc/030-1/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 030-1 Snow field warps
+// Snow field warps
 
 030-1.gat,61,28	warp	toSnowfield	0,-1,019-1.gat,61,100
diff --git a/npc/031-1/_import.txt b/npc/031-1/_import.txt
new file mode 100644
index 00000000..f525795e
--- /dev/null
+++ b/npc/031-1/_import.txt
@@ -0,0 +1,8 @@
+// Map 031-1: NivalisPort
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 031-1.gat
+npc: npc/031-1/_mobs.txt
+npc: npc/031-1/_warps.txt
+npc: npc/031-1/angelaOutside.txt
+npc: npc/031-1/frozenbeard.txt
+npc: npc/031-1/house.txt
diff --git a/npc/031-1_NivalisPort/_mobs.txt b/npc/031-1/_mobs.txt
index 2c9fe2ce..2d799801 100644
--- a/npc/031-1_NivalisPort/_mobs.txt
+++ b/npc/031-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 031-1 NivalisPort mobs
+// NivalisPort mobs
 
 031-1.gat,75,72,86,110	monster	Santa Slime	1015,5,100000,30000,Mob031-1::On1015
 031-1.gat,89,74,86,110	monster	Squirrel	1038,10,100000,30000,Mob031-1::On1038
diff --git a/npc/031-1_NivalisPort/_warps.txt b/npc/031-1/_warps.txt
index 3c5b8a77..9ca21459 100644
--- a/npc/031-1_NivalisPort/_warps.txt
+++ b/npc/031-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 031-1 NivalisPort warps
+// NivalisPort warps
 
 031-1.gat,37,55	warp	toNivalis	-1,-1,020-1.gat,106,55
 031-1.gat,76,24	warp	toLabyrinth	-1,-1,031-3.gat,212,298
diff --git a/npc/031-1_NivalisPort/angelaOutside.txt b/npc/031-1/angelaOutside.txt
index 3df9daa9..3df9daa9 100644
--- a/npc/031-1_NivalisPort/angelaOutside.txt
+++ b/npc/031-1/angelaOutside.txt
diff --git a/npc/031-1_NivalisPort/frozenbeard.txt b/npc/031-1/frozenbeard.txt
index 4f871554..4f871554 100644
--- a/npc/031-1_NivalisPort/frozenbeard.txt
+++ b/npc/031-1/frozenbeard.txt
diff --git a/npc/031-1_NivalisPort/house.txt b/npc/031-1/house.txt
index d9714ef5..d9714ef5 100644
--- a/npc/031-1_NivalisPort/house.txt
+++ b/npc/031-1/house.txt
diff --git a/npc/031-1_NivalisPort/_import.txt b/npc/031-1_NivalisPort/_import.txt
deleted file mode 100644
index 8eee4e26..00000000
--- a/npc/031-1_NivalisPort/_import.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 031-1.gat
-npc: npc/031-1_NivalisPort/_mobs.txt
-npc: npc/031-1_NivalisPort/_warps.txt
-npc: npc/031-1_NivalisPort/angelaOutside.txt
-npc: npc/031-1_NivalisPort/frozenbeard.txt
-npc: npc/031-1_NivalisPort/house.txt
diff --git a/npc/031-2/_import.txt b/npc/031-2/_import.txt
new file mode 100644
index 00000000..39d9ffce
--- /dev/null
+++ b/npc/031-2/_import.txt
@@ -0,0 +1,7 @@
+// Map 031-2: Angela's House
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 031-2.gat
+npc: npc/031-2/_mobs.txt
+npc: npc/031-2/_warps.txt
+npc: npc/031-2/angelaHouse.txt
+npc: npc/031-2/cindyHouse.txt
diff --git a/npc/031-2_Angelas_House/_mobs.txt b/npc/031-2/_mobs.txt
index 939fb83f..196d0da7 100644
--- a/npc/031-2_Angelas_House/_mobs.txt
+++ b/npc/031-2/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 031-2 Angela's House mobs
+// Angela's House mobs
 
 
 
diff --git a/npc/031-2_Angelas_House/_warps.txt b/npc/031-2/_warps.txt
index 1313a7ef..e56544d2 100644
--- a/npc/031-2_Angelas_House/_warps.txt
+++ b/npc/031-2/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 031-2 Angela's House warps
+// Angela's House warps
 
 031-2.gat,23,30	warp	door	-1,-1,031-1.gat,95,82
diff --git a/npc/031-2_Angelas_House/angelaHouse.txt b/npc/031-2/angelaHouse.txt
index 488f600a..488f600a 100644
--- a/npc/031-2_Angelas_House/angelaHouse.txt
+++ b/npc/031-2/angelaHouse.txt
diff --git a/npc/031-2_Angelas_House/cindyHouse.txt b/npc/031-2/cindyHouse.txt
index 97aa2bb9..97aa2bb9 100644
--- a/npc/031-2_Angelas_House/cindyHouse.txt
+++ b/npc/031-2/cindyHouse.txt
diff --git a/npc/031-2_Angelas_House/_import.txt b/npc/031-2_Angelas_House/_import.txt
deleted file mode 100644
index 0762ea7f..00000000
--- a/npc/031-2_Angelas_House/_import.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 031-2.gat
-npc: npc/031-2_Angelas_House/_mobs.txt
-npc: npc/031-2_Angelas_House/_warps.txt
-npc: npc/031-2_Angelas_House/angelaHouse.txt
-npc: npc/031-2_Angelas_House/cindyHouse.txt
diff --git a/npc/031-3_Cave/_import.txt b/npc/031-3/_import.txt
index 098d7112..2cb30906 100644
--- a/npc/031-3_Cave/_import.txt
+++ b/npc/031-3/_import.txt
@@ -1,5 +1,6 @@
+// Map 031-3: Cave
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 031-3.gat
-npc: npc/031-3_Cave/_mobs.txt
-npc: npc/031-3_Cave/_warps.txt
-npc: npc/031-3_Cave/labyrinth.txt
+npc: npc/031-3/_mobs.txt
+npc: npc/031-3/_warps.txt
+npc: npc/031-3/labyrinth.txt
diff --git a/npc/031-3_Cave/_mobs.txt b/npc/031-3/_mobs.txt
index 0f13f117..106d0063 100644
--- a/npc/031-3_Cave/_mobs.txt
+++ b/npc/031-3/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 031-3 Cave mobs
+// Cave mobs
 
 031-3.gat,39,276,42,16	monster	Santa Slime	1015,5,100000,30000,Mob031-3::On1015
 031-3.gat,230,279,25,26	monster	IceGoblin	1058,5,100000,30000,Mob031-3::On1058
diff --git a/npc/031-3_Cave/_warps.txt b/npc/031-3/_warps.txt
index 05ca545d..520c7242 100644
--- a/npc/031-3_Cave/_warps.txt
+++ b/npc/031-3/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 031-3 Cave warps
+// Cave warps
 
 031-3.gat,212,300	warp	toOutside	-1,-1,031-1.gat,76,26
 031-3.gat,205,264	warp	toCave	-1,-1,031-3.gat,149,261
diff --git a/npc/031-3_Cave/labyrinth.txt b/npc/031-3/labyrinth.txt
index feef9c1d..feef9c1d 100755
--- a/npc/031-3_Cave/labyrinth.txt
+++ b/npc/031-3/labyrinth.txt
diff --git a/npc/031-4/_import.txt b/npc/031-4/_import.txt
new file mode 100644
index 00000000..87eec449
--- /dev/null
+++ b/npc/031-4/_import.txt
@@ -0,0 +1,8 @@
+// Map 031-4: Cave
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 031-4.gat
+npc: npc/031-4/_mobs.txt
+npc: npc/031-4/_warps.txt
+npc: npc/031-4/barrier.txt
+npc: npc/031-4/cindyCave.txt
+npc: npc/031-4/mapflags.txt
diff --git a/npc/031-4_Cave/_mobs.txt b/npc/031-4/_mobs.txt
index 838bd363..d1ce9b7c 100644
--- a/npc/031-4_Cave/_mobs.txt
+++ b/npc/031-4/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 031-4 Cave mobs
+// Cave mobs
 
 
 
diff --git a/npc/029-3_Fight_Cave/_warps.txt b/npc/031-4/_warps.txt
index 6d585fe9..d1984dbc 100644
--- a/npc/029-3_Fight_Cave/_warps.txt
+++ b/npc/031-4/_warps.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 029-3 Fight Cave warps
+// Cave warps
 
diff --git a/npc/031-4_Cave/barrier.txt b/npc/031-4/barrier.txt
index e8b4a5ac..e8b4a5ac 100644
--- a/npc/031-4_Cave/barrier.txt
+++ b/npc/031-4/barrier.txt
diff --git a/npc/031-4_Cave/cindyCave.txt b/npc/031-4/cindyCave.txt
index 223aa80b..223aa80b 100644
--- a/npc/031-4_Cave/cindyCave.txt
+++ b/npc/031-4/cindyCave.txt
diff --git a/npc/031-4_Cave/mapflags.txt b/npc/031-4/mapflags.txt
index 9e4e8f6b..9e4e8f6b 100644
--- a/npc/031-4_Cave/mapflags.txt
+++ b/npc/031-4/mapflags.txt
diff --git a/npc/031-4_Cave/_import.txt b/npc/031-4_Cave/_import.txt
deleted file mode 100644
index f6c88481..00000000
--- a/npc/031-4_Cave/_import.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 031-4.gat
-npc: npc/031-4_Cave/_mobs.txt
-npc: npc/031-4_Cave/_warps.txt
-npc: npc/031-4_Cave/barrier.txt
-npc: npc/031-4_Cave/cindyCave.txt
-npc: npc/031-4_Cave/mapflags.txt
diff --git a/npc/032-1_Outback/_import.txt b/npc/032-1/_import.txt
index ffbbd068..939f1d9c 100644
--- a/npc/032-1_Outback/_import.txt
+++ b/npc/032-1/_import.txt
@@ -1,5 +1,6 @@
+// Map 032-1: Outback
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 032-1.gat
-npc: npc/032-1_Outback/_mobs.txt
-npc: npc/032-1_Outback/_warps.txt
-npc: npc/032-1_Outback/miriam.txt
+npc: npc/032-1/_mobs.txt
+npc: npc/032-1/_warps.txt
+npc: npc/032-1/miriam.txt
diff --git a/npc/032-1_Outback/_mobs.txt b/npc/032-1/_mobs.txt
index 2abc3efd..54ab94bc 100644
--- a/npc/032-1_Outback/_mobs.txt
+++ b/npc/032-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 032-1 Outback mobs
+// Outback mobs
 
 032-1.gat,47,64,27,15	monster	BlackScorpion	1009,5,30000,100000,Mob032-1::On1009
 032-1.gat,24,72,27,24	monster	BlackScorpion	1009,5,30000,100000,Mob032-1::On1009
diff --git a/npc/032-1_Outback/_warps.txt b/npc/032-1/_warps.txt
index f35af59e..96d039cf 100644
--- a/npc/032-1_Outback/_warps.txt
+++ b/npc/032-1/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 032-1 Outback warps
+// Outback warps
 
 032-1.gat,64,52	warp	ToCave	-1,-1,032-3.gat,56,59
diff --git a/npc/032-1_Outback/miriam.txt b/npc/032-1/miriam.txt
index 5714f807..5714f807 100644
--- a/npc/032-1_Outback/miriam.txt
+++ b/npc/032-1/miriam.txt
diff --git a/npc/032-3_Cave/_import.txt b/npc/032-3/_import.txt
index 80db5cd7..67304eae 100644
--- a/npc/032-3_Cave/_import.txt
+++ b/npc/032-3/_import.txt
@@ -1,4 +1,5 @@
+// Map 032-3: Cave
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 032-3.gat
-npc: npc/032-3_Cave/_mobs.txt
-npc: npc/032-3_Cave/_warps.txt
+npc: npc/032-3/_mobs.txt
+npc: npc/032-3/_warps.txt
diff --git a/npc/032-3_Cave/_mobs.txt b/npc/032-3/_mobs.txt
index 785736ad..0e5fc998 100644
--- a/npc/032-3_Cave/_mobs.txt
+++ b/npc/032-3/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 032-3 Cave mobs
+// Cave mobs
 
 032-3.gat,90,44,9,10	monster	Sceleton	1043,3,30000,100000,Mob032-3::On1043
 032-3.gat,44,23,29,22	monster	MountainSnake	1026,7,30000,100000,Mob032-3::On1026
diff --git a/npc/032-3_Cave/_warps.txt b/npc/032-3/_warps.txt
index 92d7c667..e84a8da2 100644
--- a/npc/032-3_Cave/_warps.txt
+++ b/npc/032-3/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 032-3 Cave warps
+// Cave warps
 
 032-3.gat,128,33	warp	ToDesert	-1,-1,006-1.gat,30,124
 032-3.gat,56,61	warp	toDesert	-1,-1,032-1.gat,64,53
diff --git a/npc/033-1_Snow_field/_import.txt b/npc/033-1/_import.txt
index f4c9b02d..32de0cb4 100644
--- a/npc/033-1_Snow_field/_import.txt
+++ b/npc/033-1/_import.txt
@@ -1,4 +1,5 @@
+// Map 033-1: Snow field
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 033-1.gat
-npc: npc/033-1_Snow_field/_mobs.txt
-npc: npc/033-1_Snow_field/_warps.txt
+npc: npc/033-1/_mobs.txt
+npc: npc/033-1/_warps.txt
diff --git a/npc/033-1_Snow_field/_mobs.txt b/npc/033-1/_mobs.txt
index 81abc445..61a53305 100644
--- a/npc/033-1_Snow_field/_mobs.txt
+++ b/npc/033-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 033-1 Snow field mobs
+// Snow field mobs
 
 
 
diff --git a/npc/033-1_Snow_field/_warps.txt b/npc/033-1/_warps.txt
index 9e0c0d7e..37bdd507 100644
--- a/npc/033-1_Snow_field/_warps.txt
+++ b/npc/033-1/_warps.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 033-1 Snow field warps
+// Snow field warps
 
diff --git a/npc/034-1_Snow_field/_import.txt b/npc/034-1/_import.txt
index fd396fae..e4b39026 100644
--- a/npc/034-1_Snow_field/_import.txt
+++ b/npc/034-1/_import.txt
@@ -1,4 +1,5 @@
+// Map 034-1: Snow field
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 034-1.gat
-npc: npc/034-1_Snow_field/_mobs.txt
-npc: npc/034-1_Snow_field/_warps.txt
+npc: npc/034-1/_mobs.txt
+npc: npc/034-1/_warps.txt
diff --git a/npc/034-1_Snow_field/_mobs.txt b/npc/034-1/_mobs.txt
index ef65db49..50d15f66 100644
--- a/npc/034-1_Snow_field/_mobs.txt
+++ b/npc/034-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// 034-1 Snow field mobs
+// Snow field mobs
 
 
 
diff --git a/npc/034-1/_warps.txt b/npc/034-1/_warps.txt
new file mode 100644
index 00000000..37bdd507
--- /dev/null
+++ b/npc/034-1/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Snow field warps
+
diff --git a/npc/034-1_Snow_field/_warps.txt b/npc/034-1_Snow_field/_warps.txt
deleted file mode 100644
index 59239f0e..00000000
--- a/npc/034-1_Snow_field/_warps.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// 034-1 Snow field warps
-
diff --git a/npc/_import.txt b/npc/_import.txt
index a995eee5..def46287 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -1,77 +1,77 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 
-import: npc/001-1_Tulimshar/_import.txt
-import: npc/001-2_Tulimshar/_import.txt
-import: npc/001-3_Tulimshar_arena/_import.txt
-import: npc/001-4_Omars_house/_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/003-2_Beach_House/_import.txt
-import: npc/004-1_Beach/_import.txt
-import: npc/004-2_Beach_House/_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/001-1/_import.txt
+import: npc/001-2/_import.txt
+import: npc/001-3/_import.txt
+import: npc/001-4/_import.txt
+import: npc/002-1/_import.txt
+import: npc/002-3/_import.txt
+import: npc/002-4/_import.txt
+import: npc/003-1/_import.txt
+import: npc/003-2/_import.txt
+import: npc/004-1/_import.txt
+import: npc/004-2/_import.txt
+import: npc/005-1/_import.txt
+import: npc/005-3/_import.txt
+import: npc/006-1/_import.txt
+import: npc/006-3/_import.txt
+import: npc/007-1/_import.txt
+import: npc/008-1/_import.txt
+import: npc/009-1/_import.txt
+import: npc/009-2/_import.txt
+import: npc/009-3/_import.txt
 import: npc/009-4/_import.txt
-import: npc/010-1_Woodland/_import.txt
-import: npc/010-2_Dimonds_Cove/_import.txt
-import: npc/011-1_Woodland/_import.txt
-import: npc/011-3_Hermits_cave/_import.txt
-import: npc/011-4_Lake_cave/_import.txt
+import: npc/010-1/_import.txt
+import: npc/010-2/_import.txt
+import: npc/011-1/_import.txt
+import: npc/011-3/_import.txt
+import: npc/011-4/_import.txt
 import: npc/011-5/_import.txt
 import: npc/011-6/_import.txt
-import: npc/012-1_Woodland_Hills/_import.txt
-import: npc/012-3_Cave/_import.txt
-import: npc/012-4_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/015-3_Cave/_import.txt
-import: npc/016-1_Woodland/_import.txt
-import: npc/017-1_Woodland_hills/_import.txt
-import: npc/017-2_Theater/_import.txt
-import: npc/017-9_Backstage/_import.txt
-import: npc/018-1_Woodland_mining_camp/_import.txt
-import: npc/018-2_Woodland_mining_camp/_import.txt
-import: npc/018-3_Cave/_import.txt
-import: npc/019-1_Snow_field/_import.txt
-import: npc/019-3_Snow_Cave/_import.txt
-import: npc/020-1_Nivalis/_import.txt
-import: npc/020-2_Nivalis/_import.txt
-import: npc/020-3_Ice_cave/_import.txt
-import: npc/021-1_Tulimshar/_import.txt
-import: npc/021-2_Tulimshar/_import.txt
-import: npc/022-1_Tulimshar/_import.txt
-import: npc/024-1_Tulimshar_Canyon/_import.txt
-import: npc/024-2_Tulimshar_Magic_School/_import.txt
-import: npc/025-1_Woodland_Swamp/_import.txt
-import: npc/026-1_Swamp/_import.txt
-import: npc/027-1_Graveyard/_import.txt
-import: npc/027-2_Caretakers_House/_import.txt
-import: npc/027-3_Crypt/_import.txt
-import: npc/027-4_Inner_Chamber/_import.txt
+import: npc/012-1/_import.txt
+import: npc/012-3/_import.txt
+import: npc/012-4/_import.txt
+import: npc/013-1/_import.txt
+import: npc/013-2/_import.txt
+import: npc/013-3/_import.txt
+import: npc/014-1/_import.txt
+import: npc/014-3/_import.txt
+import: npc/015-1/_import.txt
+import: npc/015-3/_import.txt
+import: npc/016-1/_import.txt
+import: npc/017-1/_import.txt
+import: npc/017-2/_import.txt
+import: npc/017-9/_import.txt
+import: npc/018-1/_import.txt
+import: npc/018-2/_import.txt
+import: npc/018-3/_import.txt
+import: npc/019-1/_import.txt
+import: npc/019-3/_import.txt
+import: npc/020-1/_import.txt
+import: npc/020-2/_import.txt
+import: npc/020-3/_import.txt
+import: npc/021-1/_import.txt
+import: npc/021-2/_import.txt
+import: npc/022-1/_import.txt
+import: npc/024-1/_import.txt
+import: npc/024-2/_import.txt
+import: npc/025-1/_import.txt
+import: npc/026-1/_import.txt
+import: npc/027-1/_import.txt
+import: npc/027-2/_import.txt
+import: npc/027-3/_import.txt
+import: npc/027-4/_import.txt
 import: npc/028-1/_import.txt
 import: npc/028-3/_import.txt
-import: npc/029-1_Candor/_import.txt
-import: npc/029-3_Fight_Cave/_import.txt
-import: npc/030-1_Snow_field/_import.txt
-import: npc/031-1_NivalisPort/_import.txt
-import: npc/031-2_Angelas_House/_import.txt
-import: npc/031-3_Cave/_import.txt
-import: npc/031-4_Cave/_import.txt
-import: npc/032-1_Outback/_import.txt
-import: npc/032-3_Cave/_import.txt
-import: npc/033-1_Snow_field/_import.txt
-import: npc/034-1_Snow_field/_import.txt
+import: npc/029-1/_import.txt
+import: npc/029-3/_import.txt
+import: npc/030-1/_import.txt
+import: npc/031-1/_import.txt
+import: npc/031-2/_import.txt
+import: npc/031-3/_import.txt
+import: npc/031-4/_import.txt
+import: npc/032-1/_import.txt
+import: npc/032-3/_import.txt
+import: npc/033-1/_import.txt
+import: npc/034-1/_import.txt
 import: npc/botcheck/_import.txt
diff --git a/npc/botcheck/_import.txt b/npc/botcheck/_import.txt
index d1327a6d..8c1b3663 100644
--- a/npc/botcheck/_import.txt
+++ b/npc/botcheck/_import.txt
@@ -1,3 +1,4 @@
+// Map botcheck: 
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: botcheck.gat
 npc: npc/botcheck/_mobs.txt
diff --git a/npc/botcheck/_mobs.txt b/npc/botcheck/_mobs.txt
index d8144379..c54ee2ac 100644
--- a/npc/botcheck/_mobs.txt
+++ b/npc/botcheck/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// botcheck mobs
+//  mobs
 
 
 
diff --git a/npc/botcheck/_warps.txt b/npc/botcheck/_warps.txt
index 5d0524c1..605abadf 100644
--- a/npc/botcheck/_warps.txt
+++ b/npc/botcheck/_warps.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// botcheck warps
+//  warps
 
diff --git a/tools/tmwcon/src/converter/Process.java b/tools/tmwcon/src/converter/Process.java
index 8b01d0d0..92fa3da4 100644
--- a/tools/tmwcon/src/converter/Process.java
+++ b/tools/tmwcon/src/converter/Process.java
@@ -1,5 +1,5 @@
 /*
- * TMWServ to eAthena Converter (c) 2008 Jared Adams
+ * TMWServ to eAthena Converter (c) 2008, 2011 Jared Adams
  * License: GPL, v2 or later
  */
 
@@ -131,11 +131,12 @@ public class Process {
         }
     }
 
-    private static void makeInclude(String name, File folder) {
+    private static void makeInclude(String name, String title, File folder) {
         File _import = new File(folder, importFile);
         List<String> output_elements = new ArrayList<String>();
         processFiles(folder, output_elements);
         PrintWriter importOut = Main.getWriter(_import);
+        importOut.printf("// Map %s: %s\n", name, title);
         importOut.printf("// This file is generated automatically. All manually changes will be removed when running the Converter.\nmap: %s.gat\n", name);
         Collections.sort(output_elements);
         for (String s : output_elements)
@@ -152,12 +153,6 @@ public class Process {
         String title = getProp(props, "name", "");
 
         String folderName =  scriptDirectory + name;
-        if (title.length() > 0) {
-            folderName += "_" + title.replaceAll("\\s", "_").replaceAll("[^A-Za-z0-9\\-_]", "");
-            title = name + " " + title;
-        } else {
-            title = name;
-        }
 
         File folder = new File(baseFolder + folderName);
         folder.mkdirs();
@@ -168,12 +163,12 @@ public class Process {
 
         if (wlkFile.exists() && mapFile.lastModified() < wlkFile.lastModified()) {
             System.out.println("Up to date, skipping");
-            makeInclude(name, folder);
+            makeInclude(name, title, folder);
             return folderName;
         }
 
         if (summary != null) {
-            summary.printf("\tName: '%s'\n", title);
+            summary.printf("\tName: %s: '%s'\n", name, title);
             summary.printf("\tMusic: '%s'\n", getProp(props, "music", ""));
             summary.printf("\tMinimap: '%s'\n", getProp(props, "minimap", ""));
         }
@@ -209,7 +204,7 @@ public class Process {
         mobOut.flush();
         mobOut.close();
 
-        makeInclude(name, folder);
+        makeInclude(name, title, folder);
 
         return folderName;
     }