diff --git a/conf/e3/races.json b/conf/e3/races.json
index 1ac473f49..a7cd06857 100644
--- a/conf/e3/races.json
+++ b/conf/e3/races.json
@@ -1,9 +1,9 @@
 {
     "include": [
-        "config://res/races/goblin-3.xml",
-        "config://res/races/wyrm.xml",
-        "config://res/races/dragon.xml",
-        "config://res/races/youngdragon.xml",
-        "config://res/e3a/races.xml"
+        "config://res/e3a/races.xml",
+        "config://res/e3a/races/goblin.xml",
+        "config://res/e3a/races/wyrm.xml",
+        "config://res/e3a/races/dragon.xml",
+        "config://res/e3a/races/youngdragon.xml"
     ]
 }
diff --git a/res/races/dragon.xml b/res/e3a/races/dragon.xml
similarity index 100%
rename from res/races/dragon.xml
rename to res/e3a/races/dragon.xml
diff --git a/res/races/goblin-3.xml b/res/e3a/races/goblin.xml
similarity index 100%
rename from res/races/goblin-3.xml
rename to res/e3a/races/goblin.xml
diff --git a/res/races/wyrm.xml b/res/e3a/races/wyrm.xml
similarity index 100%
rename from res/races/wyrm.xml
rename to res/e3a/races/wyrm.xml
diff --git a/res/races/youngdragon.xml b/res/e3a/races/youngdragon.xml
similarity index 100%
rename from res/races/youngdragon.xml
rename to res/e3a/races/youngdragon.xml
diff --git a/res/races/aquarian.xml b/res/races/aquarian.xml
deleted file mode 100644
index 4950d60d1..000000000
--- a/res/races/aquarian.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" ?>
-<race name="aquarian" maxaura="1.000000" regaura="1.000000" recruitcost="80" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="20" damage="1d5" unarmedattack="-2" unarmeddefense="-2" shipspeed="yes" playerrace="yes" coastal="yes" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
-    <ai splitsize="10000" moverandom="yes" learn="yes"/>
-    <skill name="mining" modifier="-2"/>
-    <skill name="building" modifier="-1"/>
-    <skill name="trade" modifier="2"/>
-    <skill name="armorer" modifier="-1"/>
-    <skill name="shipcraft" modifier="3"/>
-    <skill name="sailing" modifier="3"/>
-    <skill name="roadwork" modifier="-1"/>
-    <skill name="unarmed" modifier="-99"/>
-    <attack type="1" damage="1d5"/>
-    <familiar race="giantturtle"/>
-    <familiar race="dolphin"/>
-    <familiar race="giantturtle"/>
-    <familiar race="dolphin"/>
-    <familiar race="dolphin"/>
-    <familiar race="kraken"/>
-</race>
diff --git a/res/races/cat.xml b/res/races/cat.xml
deleted file mode 100644
index 2e0f73dcf..000000000
--- a/res/races/cat.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
-<race name="cat" maxaura="1.000000" regaura="1.000000" recruitcost="90" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="20" damage="1d5" unarmedattack="-2" unarmeddefense="-2" defensemodifier="1" playerrace="yes" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
-    <ai splitsize="10000" moverandom="yes" learn="yes"/>
-    <skill name="alchemy" modifier="-1"/>
-    <skill name="mining" modifier="-2"/>
-    <skill name="building" modifier="-1"/>
-    <skill name="catapult" modifier="-1"/>
-    <skill name="herbalism" modifier="1"/>
-    <skill name="armorer" modifier="-1"/>
-    <skill name="shipcraft" modifier="-1"/>
-    <skill name="sailing" modifier="-2"/>
-    <skill name="espionage" modifier="2"/>
-    <skill name="quarrying" modifier="-1"/>
-    <skill name="roadwork" modifier="-1"/>
-    <skill name="stealth" modifier="1"/>
-    <skill name="perception" modifier="2"/>
-    <skill name="taxation" modifier="1"/>
-    <skill name="unarmed" modifier="-99"/>
-    <attack type="1" damage="1d5"/>
-    <familiar race="lynx"/>
-    <familiar race="dreamcat"/>
-    <familiar race="lynx"/>
-    <familiar race="songdragon"/>
-    <familiar race="tiger"/>
-    <familiar race="hellcat"/>
-</race>
diff --git a/res/races/demon.xml b/res/races/demon.xml
deleted file mode 100644
index 21a1f289d..000000000
--- a/res/races/demon.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" ?>
-<race name="demon" magres="15" maxaura="1.000000"
-regaura="1.250000" recruitcost="150" maintenance="10" weight="1000"
-capacity="540" speed="1.000000" hp="50" ac="2" damage="1d5"
-unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes"
-shapeshift="yes" giveperson="yes" giveunit="yes" getitem="yes"
-recruitethereal="yes" equipment="yes" healing="1.5">
-    <ai splitsize="10000" moverandom="yes" learn="yes"/>
-    <skill name="alchemy" modifier="2"/>
-    <skill name="trade" modifier="-3"/>
-    <skill name="forestry" modifier="1"/>
-    <skill name="herbalism" modifier="-3"/>
-    <skill name="magic" modifier="1"/>
-    <skill name="training" modifier="-3"/>
-    <skill name="riding" modifier="-1"/>
-    <skill name="shipcraft" modifier="-1"/>
-    <skill name="melee" modifier="1"/>
-    <skill name="sailing" modifier="-1"/>
-    <skill name="polearm" modifier="1"/>
-    <skill name="tactics" modifier="-1"/>
-    <skill name="stealth" modifier="1"/>
-    <skill name="entertainment" modifier="-3"/>
-    <skill name="weaponsmithing" modifier="1"/>
-    <skill name="cartmaking" modifier="-2"/>
-    <skill name="perception" modifier="1"/>
-    <skill name="taxation" modifier="1"/>
-    <skill name="unarmed" modifier="-99"/>
-    <attack type="1" damage="1d5"/>
-    <attack type="5"/>
-    <familiar race="imp"/>
-    <familiar race="imp"/>
-    <familiar race="ghost"/>
-    <familiar race="rat"/>
-    <familiar race="wolf"/>
-    <familiar race="imp"/>
-</race>
diff --git a/res/races/dwarf.xml b/res/races/dwarf.xml
deleted file mode 100644
index 4f2719649..000000000
--- a/res/races/dwarf.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" ?>
-<race name="dwarf" magres="5" maxaura="1.000000" regaura="0.500000" recruitcost="110" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="24" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
-    <ai splitsize="10000" moverandom="yes" learn="yes"/>
-    <skill name="mining" modifier="2"/>
-    <skill name="bow" modifier="-1"/>
-    <skill name="building" modifier="2"/>
-    <skill name="trade" modifier="1"/>
-    <skill name="forestry" modifier="-1"/>
-    <skill name="catapult" modifier="2"/>
-    <skill name="herbalism" modifier="-2"/>
-    <skill name="magic" modifier="-2"/>
-    <skill name="training" modifier="-2"/>
-    <skill name="riding" modifier="-2"/>
-    <skill name="armorer" modifier="2"/>
-    <skill name="shipcraft" modifier="-1"/>
-    <skill name="melee" modifier="1"/>
-    <skill name="sailing" modifier="-2"/>
-    <skill name="quarrying" modifier="2"/>
-    <skill name="roadwork" modifier="2"/>
-    <skill name="stealth" modifier="-1"/>
-    <skill name="entertainment" modifier="-1"/>
-    <skill name="weaponsmithing" modifier="2"/>
-    <skill name="taxation" modifier="1"/>
-    <skill name="unarmed" modifier="-99"/>
-    <attack type="1" damage="1d5"/>
-    <familiar race="tunnelworm"/>
-    <familiar race="eagle"/>
-    <familiar race="owl"/>
-    <familiar race="lynx"/>
-    <familiar race="wolf"/>
-    <familiar race="rat"/>
-</race>  
diff --git a/res/races/elf.xml b/res/races/elf.xml
deleted file mode 100644
index 968ad22f2..000000000
--- a/res/races/elf.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" ?>
-<race name="elf" magres="10" maxaura="1.000000" regaura="1.250000" recruitcost="130" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="18" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
-    <ai splitsize="10000" moverandom="yes" learn="yes"/>
-    <skill name="alchemy" modifier="-1"/>
-    <skill name="mining" modifier="-2"/>
-    <skill name="bow" modifier="2"/>
-    <skill name="building" modifier="-1"/>
-    <skill name="catapult" modifier="-2"/>
-    <skill name="herbalism" modifier="2"/>
-    <skill name="magic" modifier="1"/>
-    <skill name="training" modifier="1"/>
-    <skill name="armorer" modifier="-1"/>
-    <skill name="shipcraft" modifier="-1"/>
-    <skill name="sailing" modifier="-1"/>
-    <skill name="quarrying" modifier="-1"/>
-    <skill name="roadwork" modifier="-1"/>
-    <skill name="stealth" modifier="1"/>
-    <skill name="perception" modifier="1"/>
-    <skill name="unarmed" modifier="-99"/>
-    <attack type="1" damage="1d5"/>
-    <familiar race="lynx"/>
-    <familiar race="fairy"/>
-    <familiar race="owl"/>
-    <familiar race="nymph"/>
-    <familiar race="unicorn"/>
-    <familiar race="imp"/>
-</race>
-  
diff --git a/res/races/goblin.xml b/res/races/goblin.xml
deleted file mode 100644
index ec224a0c7..000000000
--- a/res/races/goblin.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" ?>
-<race name="goblin" magres="-5" maxaura="1.000000"
-recruitcost="40" maintenance="10" weight="600"
-capacity="440" speed="1.000000" hp="16" damage="1d5"
-unarmedattack="-2" unarmeddefense="0" playerrace="yes" walk="yes"
-giveperson="yes" giveunit="yes" getitem="yes" equipment="yes"
-healing="2.0">
-    <ai splitsize="10000" moverandom="yes" learn="yes"/>
-    <skill name="alchemy" modifier="1"/>
-    <skill name="mining" modifier="1"/>
-    <skill name="building" modifier="1"/>
-    <skill name="trade" modifier="-1"/>
-    <skill name="catapult" modifier="1"/>
-    <skill name="magic" modifier="-1"/>
-    <skill name="shipcraft" modifier="-2"/>
-    <skill name="sailing" modifier="-2"/>
-    <skill name="roadwork" modifier="-2"/>
-    <skill name="tactics" modifier="-2"/>
-    <skill name="stealth" modifier="1"/>
-    <skill name="entertainment" modifier="-1"/>
-    <skill name="cartmaking" modifier="-1"/>
-    <skill name="unarmed" modifier="-99"/>
-    <attack type="1" damage="1d5"/>
-    <familiar race="rat"/>
-    <familiar race="songdragon"/>
-    <familiar race="imp"/>
-    <familiar race="rat"/>
-    <familiar race="rat"/>
-    <familiar race="imp"/>
-</race>
diff --git a/res/races/halfling.xml b/res/races/halfling.xml
deleted file mode 100644
index 22001df7d..000000000
--- a/res/races/halfling.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" ?>
-<race name="halfling" magres="5" maxaura="1.000000" regaura="1.000000" recruitcost="80" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="18" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
-    <ai splitsize="10000" moverandom="yes" learn="yes"/>
-    <param name="hunger_damage" value="1d14+14"/>
-    <skill name="crossbow" modifier="1"/>
-    <skill name="mining" modifier="1"/>
-    <skill name="bow" modifier="-1"/>
-    <skill name="building" modifier="1"/>
-    <skill name="trade" modifier="2"/>
-    <skill name="catapult" modifier="-1"/>
-    <skill name="herbalism" modifier="2"/>
-    <skill name="training" modifier="-1"/>
-    <skill name="riding" modifier="-1"/>
-    <skill name="shipcraft" modifier="-1"/>
-    <skill name="melee" modifier="-1"/>
-    <skill name="sailing" modifier="-2"/>
-    <skill name="polearm" modifier="-1"/>
-    <skill name="espionage" modifier="1"/>
-    <skill name="roadwork" modifier="1"/>
-    <skill name="stealth" modifier="1"/>
-    <skill name="entertainment" modifier="1"/>
-    <skill name="cartmaking" modifier="2"/>
-    <skill name="perception" modifier="1"/>
-    <skill name="taxation" modifier="-1"/>
-    <skill name="unarmed" modifier="-99"/>
-    <attack type="1" damage="1d5"/>
-    <familiar race="owl"/>
-    <familiar race="rat"/>
-    <familiar race="eagle"/>
-    <familiar race="songdragon"/>
-    <familiar race="eagle"/>
-    <familiar race="rat"/>
-</race>
diff --git a/res/races/human.xml b/res/races/human.xml
deleted file mode 100644
index 00c11f8a6..000000000
--- a/res/races/human.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" ?>
-<race name="human" maxaura="1.000000" regaura="1.000000" recruitcost="75" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="20" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
-    <ai splitsize="10000" moverandom="yes" learn="yes"/>
-    <skill name="trade" modifier="1"/>
-    <skill name="herbalism" modifier="-1"/>
-    <skill name="shipcraft" modifier="1"/>
-    <skill name="sailing" modifier="1"/>
-    <skill name="unarmed" modifier="-99"/>
-    <attack type="1" damage="1d5"/>
-    <familiar race="wolf"/>
-    <familiar race="dreamcat"/>
-    <familiar race="owl"/>
-    <familiar race="owl"/>
-    <familiar race="eagle"/>
-    <familiar race="imp"/>
-</race>
diff --git a/res/races/insect.xml b/res/races/insect.xml
deleted file mode 100644
index b783f047a..000000000
--- a/res/races/insect.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" ?>
-<race name="insect" magres="5" maxaura="1.000000" regaura="1.000000" recruitcost="80" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="24" ac="2" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
-    <ai splitsize="10000" moverandom="yes" learn="yes"/>
-    <skill name="crossbow" modifier="1"/>
-    <skill name="mining" modifier="1"/>
-    <skill name="bow" modifier="-2"/>
-    <skill name="building" modifier="2"/>
-    <skill name="trade" modifier="-1"/>
-    <skill name="forestry" modifier="1"/>
-    <skill name="herbalism" modifier="1"/>
-    <skill name="training" modifier="-3"/>
-    <skill name="riding" modifier="-3"/>
-    <skill name="armorer" modifier="2"/>
-    <skill name="melee" modifier="-1"/>
-    <skill name="polearm" modifier="1"/>
-    <skill name="roadwork" modifier="-1"/>
-    <skill name="tactics" modifier="-1"/>
-    <skill name="stealth" modifier="-1"/>
-    <skill name="entertainment" modifier="-2"/>
-    <skill name="perception" modifier="1"/>
-    <skill name="unarmed" modifier="-99"/>
-    <attack type="1" damage="1d5"/>
-    <familiar race="ghost"/>
-    <familiar race="rat"/>
-    <familiar race="owl"/>
-    <familiar race="rat"/>
-    <familiar race="tunnelworm"/>
-    <familiar race="imp"/>
-</race>
diff --git a/res/races/orc.xml b/res/races/orc.xml
deleted file mode 100644
index 47754152a..000000000
--- a/res/races/orc.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" ?>
-<race name="orc" studyspeed="-5" magres="-5" maxaura="1.000000" regaura="1.000000" recruitcost="70" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="24" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
-    <ai splitsize="10000" moverandom="yes" learn="yes"/>
-    <param name="recruit_multi" value="0.5"/>
-    <skill name="alchemy" modifier="1"/>
-    <skill name="mining" modifier="1"/>
-    <skill name="building" modifier="1"/>
-    <skill name="trade" modifier="-3"/>
-    <skill name="forestry" modifier="1"/>
-    <skill name="herbalism" modifier="-2"/>
-    <skill name="magic" modifier="-1"/>
-    <skill name="training" modifier="-1"/>
-    <skill name="armorer" modifier="1"/>
-    <skill name="shipcraft" modifier="-1"/>
-    <skill name="sailing" modifier="-1"/>
-    <skill name="espionage" modifier="-1"/>
-    <skill name="quarrying" modifier="1"/>
-    <skill name="tactics" modifier="1"/>
-    <skill name="entertainment" modifier="-2"/>
-    <skill name="weaponsmithing" modifier="2"/>
-    <skill name="cartmaking" modifier="-1"/>
-    <skill name="taxation" modifier="1"/>
-    <skill name="unarmed" modifier="-99"/>
-    <attack type="1" damage="1d5"/>
-    <familiar race="goblin"/>
-    <familiar race="ghost"/>
-    <familiar race="imp"/>
-    <familiar race="rat"/>
-    <familiar race="wolf"/>
-    <familiar race="demon"/>
-</race>
diff --git a/res/races/troll.xml b/res/races/troll.xml
deleted file mode 100644
index 7d3f18551..000000000
--- a/res/races/troll.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" ?>
-<race name="troll" magres="10" maxaura="1.000000"
-regaura="1.000000" recruitcost="90" maintenance="10" weight="2000"
-capacity="1080" speed="1.000000" hp="30" ac="1" damage="1d5+3"
-unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes"
-giveperson="yes" giveunit="yes" getitem="yes" equipment="yes"
-healing="1.5">
-    <ai splitsize="10000" moverandom="yes" learn="yes"/>
-    <skill name="mining" modifier="2"/>
-    <skill name="bow" modifier="-2"/>
-    <skill name="building" modifier="2"/>
-    <skill name="catapult" modifier="2"/>
-    <skill name="herbalism" modifier="-1"/>
-    <skill name="training" modifier="-1"/>
-    <skill name="riding" modifier="-2"/>
-    <skill name="armorer" modifier="2"/>
-    <skill name="shipcraft" modifier="-1"/>
-    <skill name="melee" modifier="1"/>
-    <skill name="sailing" modifier="-1"/>
-    <skill name="espionage" modifier="-3"/>
-    <skill name="quarrying" modifier="2"/>
-    <skill name="roadwork" modifier="2"/>
-    <skill name="tactics" modifier="-1"/>
-    <skill name="stealth" modifier="-3"/>
-    <skill name="entertainment" modifier="-1"/>
-    <skill name="perception" modifier="-1"/>
-    <skill name="taxation" modifier="1"/>
-    <skill name="unarmed" modifier="-99"/>
-    <attack type="1" damage="1d5+3"/>
-    <familiar race="tunnelworm"/>
-    <familiar race="rat"/>
-    <familiar race="rat"/>
-    <familiar race="eagle"/>
-    <familiar race="tunnelworm"/>
-    <familiar race="wolf"/>
-</race>
diff --git a/res/races/zombie.xml b/res/races/zombie.xml
deleted file mode 100644
index 01407b29a..000000000
--- a/res/races/zombie.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" ?>
-<race name="zombie" magres="20" maxaura="1.0" regaura="1.0"
-	recruitcost="-1" maintenance="0" weight="1000" capacity="440" speed="1.000000"
-	hp="20" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="no"
-	walk="yes" shapeshift="no" giveperson="no" giveunit="no"
-	getitem="no" equipment="yes" scarepeasants="yes"
-	cansteal="no" unarmedguard="yes" noheal="yes"
-	undead="yes" resistpierce="yes">
-	<ai splitsize="1000" moverandom="yes" learn="yes" absorbpeasants="yes"/>
-	<attack type="1" damage="1d5" />
-	<attack type="5" />
-</race>