diff --git a/data/core/units/Drake_Armageddon.cfg b/data/core/units/drakes/Armageddon.cfg
similarity index 100%
rename from data/core/units/Drake_Armageddon.cfg
rename to data/core/units/drakes/Armageddon.cfg
diff --git a/data/core/units/Drake_Blademaster.cfg b/data/core/units/drakes/Blademaster.cfg
similarity index 100%
rename from data/core/units/Drake_Blademaster.cfg
rename to data/core/units/drakes/Blademaster.cfg
diff --git a/data/core/units/Drake_Burner.cfg b/data/core/units/drakes/Burner.cfg
similarity index 100%
rename from data/core/units/Drake_Burner.cfg
rename to data/core/units/drakes/Burner.cfg
diff --git a/data/core/units/Drake_Clasher.cfg b/data/core/units/drakes/Clasher.cfg
similarity index 100%
rename from data/core/units/Drake_Clasher.cfg
rename to data/core/units/drakes/Clasher.cfg
diff --git a/data/core/units/Drake_Enforcer.cfg b/data/core/units/drakes/Enforcer.cfg
similarity index 100%
rename from data/core/units/Drake_Enforcer.cfg
rename to data/core/units/drakes/Enforcer.cfg
diff --git a/data/core/units/Drake_Fighter.cfg b/data/core/units/drakes/Fighter.cfg
similarity index 100%
rename from data/core/units/Drake_Fighter.cfg
rename to data/core/units/drakes/Fighter.cfg
diff --git a/data/core/units/Drake_Fire.cfg b/data/core/units/drakes/Fire.cfg
similarity index 100%
rename from data/core/units/Drake_Fire.cfg
rename to data/core/units/drakes/Fire.cfg
diff --git a/data/core/units/Drake_Flameheart.cfg b/data/core/units/drakes/Flameheart.cfg
similarity index 100%
rename from data/core/units/Drake_Flameheart.cfg
rename to data/core/units/drakes/Flameheart.cfg
diff --git a/data/core/units/Drake_Flare.cfg b/data/core/units/drakes/Flare.cfg
similarity index 100%
rename from data/core/units/Drake_Flare.cfg
rename to data/core/units/drakes/Flare.cfg
diff --git a/data/core/units/Drake_Gladiator.cfg b/data/core/units/drakes/Gladiator.cfg
similarity index 100%
rename from data/core/units/Drake_Gladiator.cfg
rename to data/core/units/drakes/Gladiator.cfg
diff --git a/data/core/units/Drake_Glider.cfg b/data/core/units/drakes/Glider.cfg
similarity index 100%
rename from data/core/units/Drake_Glider.cfg
rename to data/core/units/drakes/Glider.cfg
diff --git a/data/core/units/Drake_Hurricane.cfg b/data/core/units/drakes/Hurricane.cfg
similarity index 100%
rename from data/core/units/Drake_Hurricane.cfg
rename to data/core/units/drakes/Hurricane.cfg
diff --git a/data/core/units/Drake_Inferno.cfg b/data/core/units/drakes/Inferno.cfg
similarity index 100%
rename from data/core/units/Drake_Inferno.cfg
rename to data/core/units/drakes/Inferno.cfg
diff --git a/data/core/units/Drake_Sky.cfg b/data/core/units/drakes/Sky.cfg
similarity index 100%
rename from data/core/units/Drake_Sky.cfg
rename to data/core/units/drakes/Sky.cfg
diff --git a/data/core/units/Drake_Slasher.cfg b/data/core/units/drakes/Slasher.cfg
similarity index 100%
rename from data/core/units/Drake_Slasher.cfg
rename to data/core/units/drakes/Slasher.cfg
diff --git a/data/core/units/Drake_Warden.cfg b/data/core/units/drakes/Warden.cfg
similarity index 100%
rename from data/core/units/Drake_Warden.cfg
rename to data/core/units/drakes/Warden.cfg
diff --git a/data/core/units/Drake_Warrior.cfg b/data/core/units/drakes/Warrior.cfg
similarity index 100%
rename from data/core/units/Drake_Warrior.cfg
rename to data/core/units/drakes/Warrior.cfg
diff --git a/data/core/units/Dwarvish_Berserker.cfg b/data/core/units/dwarves/Berserker.cfg
similarity index 100%
rename from data/core/units/Dwarvish_Berserker.cfg
rename to data/core/units/dwarves/Berserker.cfg
diff --git a/data/core/units/Dwarvish_Dragonguard.cfg b/data/core/units/dwarves/Dragonguard.cfg
similarity index 100%
rename from data/core/units/Dwarvish_Dragonguard.cfg
rename to data/core/units/dwarves/Dragonguard.cfg
diff --git a/data/core/units/Dwarvish_Fighter.cfg b/data/core/units/dwarves/Fighter.cfg
similarity index 100%
rename from data/core/units/Dwarvish_Fighter.cfg
rename to data/core/units/dwarves/Fighter.cfg
diff --git a/data/core/units/Dwarvish_Guardsman.cfg b/data/core/units/dwarves/Guardsman.cfg
similarity index 100%
rename from data/core/units/Dwarvish_Guardsman.cfg
rename to data/core/units/dwarves/Guardsman.cfg
diff --git a/data/core/units/Dwarvish_Lord.cfg b/data/core/units/dwarves/Lord.cfg
similarity index 100%
rename from data/core/units/Dwarvish_Lord.cfg
rename to data/core/units/dwarves/Lord.cfg
diff --git a/data/core/units/Dwarvish_Runemaster.cfg b/data/core/units/dwarves/Runemaster.cfg
similarity index 100%
rename from data/core/units/Dwarvish_Runemaster.cfg
rename to data/core/units/dwarves/Runemaster.cfg
diff --git a/data/core/units/Dwarvish_Sentinel.cfg b/data/core/units/dwarves/Sentinel.cfg
similarity index 100%
rename from data/core/units/Dwarvish_Sentinel.cfg
rename to data/core/units/dwarves/Sentinel.cfg
diff --git a/data/core/units/Dwarvish_Stalwart.cfg b/data/core/units/dwarves/Stalwart.cfg
similarity index 100%
rename from data/core/units/Dwarvish_Stalwart.cfg
rename to data/core/units/dwarves/Stalwart.cfg
diff --git a/data/core/units/Dwarvish_Steelclad.cfg b/data/core/units/dwarves/Steelclad.cfg
similarity index 100%
rename from data/core/units/Dwarvish_Steelclad.cfg
rename to data/core/units/dwarves/Steelclad.cfg
diff --git a/data/core/units/Dwarvish_Thunderer.cfg b/data/core/units/dwarves/Thunderer.cfg
similarity index 100%
rename from data/core/units/Dwarvish_Thunderer.cfg
rename to data/core/units/dwarves/Thunderer.cfg
diff --git a/data/core/units/Dwarvish_Thunderguard.cfg b/data/core/units/dwarves/Thunderguard.cfg
similarity index 100%
rename from data/core/units/Dwarvish_Thunderguard.cfg
rename to data/core/units/dwarves/Thunderguard.cfg
diff --git a/data/core/units/Dwarvish_Ulfserker.cfg b/data/core/units/dwarves/Ulfserker.cfg
similarity index 100%
rename from data/core/units/Dwarvish_Ulfserker.cfg
rename to data/core/units/dwarves/Ulfserker.cfg
diff --git a/data/core/units/Elvish_Archer.cfg b/data/core/units/elves/Archer.cfg
similarity index 100%
rename from data/core/units/Elvish_Archer.cfg
rename to data/core/units/elves/Archer.cfg
diff --git a/data/core/units/Elvish_Avenger.cfg b/data/core/units/elves/Avenger.cfg
similarity index 100%
rename from data/core/units/Elvish_Avenger.cfg
rename to data/core/units/elves/Avenger.cfg
diff --git a/data/core/units/Elvish_Captain.cfg b/data/core/units/elves/Captain.cfg
similarity index 100%
rename from data/core/units/Elvish_Captain.cfg
rename to data/core/units/elves/Captain.cfg
diff --git a/data/core/units/Elvish_Champion.cfg b/data/core/units/elves/Champion.cfg
similarity index 100%
rename from data/core/units/Elvish_Champion.cfg
rename to data/core/units/elves/Champion.cfg
diff --git a/data/core/units/Elvish_Druid.cfg b/data/core/units/elves/Druid.cfg
similarity index 100%
rename from data/core/units/Elvish_Druid.cfg
rename to data/core/units/elves/Druid.cfg
diff --git a/data/core/units/Elvish_Enchantress.cfg b/data/core/units/elves/Enchantress.cfg
similarity index 100%
rename from data/core/units/Elvish_Enchantress.cfg
rename to data/core/units/elves/Enchantress.cfg
diff --git a/data/core/units/Elvish_Fighter.cfg b/data/core/units/elves/Fighter.cfg
similarity index 100%
rename from data/core/units/Elvish_Fighter.cfg
rename to data/core/units/elves/Fighter.cfg
diff --git a/data/core/units/Elvish_Hero.cfg b/data/core/units/elves/Hero.cfg
similarity index 100%
rename from data/core/units/Elvish_Hero.cfg
rename to data/core/units/elves/Hero.cfg
diff --git a/data/core/units/Elvish_Marksman.cfg b/data/core/units/elves/Marksman.cfg
similarity index 100%
rename from data/core/units/Elvish_Marksman.cfg
rename to data/core/units/elves/Marksman.cfg
diff --git a/data/core/units/Elvish_Marshal.cfg b/data/core/units/elves/Marshal.cfg
similarity index 100%
rename from data/core/units/Elvish_Marshal.cfg
rename to data/core/units/elves/Marshal.cfg
diff --git a/data/core/units/Elvish_Outrider.cfg b/data/core/units/elves/Outrider.cfg
similarity index 100%
rename from data/core/units/Elvish_Outrider.cfg
rename to data/core/units/elves/Outrider.cfg
diff --git a/data/core/units/Elvish_Ranger.cfg b/data/core/units/elves/Ranger.cfg
similarity index 100%
rename from data/core/units/Elvish_Ranger.cfg
rename to data/core/units/elves/Ranger.cfg
diff --git a/data/core/units/Elvish_Rider.cfg b/data/core/units/elves/Rider.cfg
similarity index 100%
rename from data/core/units/Elvish_Rider.cfg
rename to data/core/units/elves/Rider.cfg
diff --git a/data/core/units/Elvish_Scout.cfg b/data/core/units/elves/Scout.cfg
similarity index 100%
rename from data/core/units/Elvish_Scout.cfg
rename to data/core/units/elves/Scout.cfg
diff --git a/data/core/units/Elvish_Shaman.cfg b/data/core/units/elves/Shaman.cfg
similarity index 100%
rename from data/core/units/Elvish_Shaman.cfg
rename to data/core/units/elves/Shaman.cfg
diff --git a/data/core/units/Elvish_Sharpshooter.cfg b/data/core/units/elves/Sharpshooter.cfg
similarity index 100%
rename from data/core/units/Elvish_Sharpshooter.cfg
rename to data/core/units/elves/Sharpshooter.cfg
diff --git a/data/core/units/Elvish_Shyde.cfg b/data/core/units/elves/Shyde.cfg
similarity index 100%
rename from data/core/units/Elvish_Shyde.cfg
rename to data/core/units/elves/Shyde.cfg
diff --git a/data/core/units/Elvish_Sorceress.cfg b/data/core/units/elves/Sorceress.cfg
similarity index 100%
rename from data/core/units/Elvish_Sorceress.cfg
rename to data/core/units/elves/Sorceress.cfg
diff --git a/data/core/units/Elvish_Sylph.cfg b/data/core/units/elves/Sylph.cfg
similarity index 100%
rename from data/core/units/Elvish_Sylph.cfg
rename to data/core/units/elves/Sylph.cfg
diff --git a/data/core/units/Goblin_Direwolf_Rider.cfg b/data/core/units/goblins/Direwolf_Rider.cfg
similarity index 100%
rename from data/core/units/Goblin_Direwolf_Rider.cfg
rename to data/core/units/goblins/Direwolf_Rider.cfg
diff --git a/data/core/units/Goblin_Impaler.cfg b/data/core/units/goblins/Impaler.cfg
similarity index 100%
rename from data/core/units/Goblin_Impaler.cfg
rename to data/core/units/goblins/Impaler.cfg
diff --git a/data/core/units/Goblin_Knight.cfg b/data/core/units/goblins/Knight.cfg
similarity index 100%
rename from data/core/units/Goblin_Knight.cfg
rename to data/core/units/goblins/Knight.cfg
diff --git a/data/core/units/Goblin_Pillager.cfg b/data/core/units/goblins/Pillager.cfg
similarity index 100%
rename from data/core/units/Goblin_Pillager.cfg
rename to data/core/units/goblins/Pillager.cfg
diff --git a/data/core/units/Goblin_Rouser.cfg b/data/core/units/goblins/Rouser.cfg
similarity index 100%
rename from data/core/units/Goblin_Rouser.cfg
rename to data/core/units/goblins/Rouser.cfg
diff --git a/data/core/units/Goblin_Spearman.cfg b/data/core/units/goblins/Spearman.cfg
similarity index 100%
rename from data/core/units/Goblin_Spearman.cfg
rename to data/core/units/goblins/Spearman.cfg
diff --git a/data/core/units/Goblin_Wolf_Rider.cfg b/data/core/units/goblins/Wolf_Rider.cfg
similarity index 100%
rename from data/core/units/Goblin_Wolf_Rider.cfg
rename to data/core/units/goblins/Wolf_Rider.cfg
diff --git a/data/core/units/Merman_Entangler.cfg b/data/core/units/merfolk/Entangler.cfg
similarity index 100%
rename from data/core/units/Merman_Entangler.cfg
rename to data/core/units/merfolk/Entangler.cfg
diff --git a/data/core/units/Merman_Fighter.cfg b/data/core/units/merfolk/Fighter.cfg
similarity index 100%
rename from data/core/units/Merman_Fighter.cfg
rename to data/core/units/merfolk/Fighter.cfg
diff --git a/data/core/units/Merman_Hoplite.cfg b/data/core/units/merfolk/Hoplite.cfg
similarity index 100%
rename from data/core/units/Merman_Hoplite.cfg
rename to data/core/units/merfolk/Hoplite.cfg
diff --git a/data/core/units/Merman_Hunter.cfg b/data/core/units/merfolk/Hunter.cfg
similarity index 100%
rename from data/core/units/Merman_Hunter.cfg
rename to data/core/units/merfolk/Hunter.cfg
diff --git a/data/core/units/Merman_Javelineer.cfg b/data/core/units/merfolk/Javelineer.cfg
similarity index 100%
rename from data/core/units/Merman_Javelineer.cfg
rename to data/core/units/merfolk/Javelineer.cfg
diff --git a/data/core/units/Merman_Netcaster.cfg b/data/core/units/merfolk/Netcaster.cfg
similarity index 100%
rename from data/core/units/Merman_Netcaster.cfg
rename to data/core/units/merfolk/Netcaster.cfg
diff --git a/data/core/units/Merman_Spearman.cfg b/data/core/units/merfolk/Spearman.cfg
similarity index 100%
rename from data/core/units/Merman_Spearman.cfg
rename to data/core/units/merfolk/Spearman.cfg
diff --git a/data/core/units/Merman_Triton.cfg b/data/core/units/merfolk/Triton.cfg
similarity index 100%
rename from data/core/units/Merman_Triton.cfg
rename to data/core/units/merfolk/Triton.cfg
diff --git a/data/core/units/Merman_Warrior.cfg b/data/core/units/merfolk/Warrior.cfg
similarity index 100%
rename from data/core/units/Merman_Warrior.cfg
rename to data/core/units/merfolk/Warrior.cfg
diff --git a/data/core/units/Mermaid_Diviner.cfg b/data/core/units/merfolkDiviner.cfg
similarity index 100%
rename from data/core/units/Mermaid_Diviner.cfg
rename to data/core/units/merfolkDiviner.cfg
diff --git a/data/core/units/Mermaid_Enchantress.cfg b/data/core/units/merfolkEnchantress.cfg
similarity index 100%
rename from data/core/units/Mermaid_Enchantress.cfg
rename to data/core/units/merfolkEnchantress.cfg
diff --git a/data/core/units/Mermaid_Initiate.cfg b/data/core/units/merfolkInitiate.cfg
similarity index 100%
rename from data/core/units/Mermaid_Initiate.cfg
rename to data/core/units/merfolkInitiate.cfg
diff --git a/data/core/units/Mermaid_Priestess.cfg b/data/core/units/merfolkPriestess.cfg
similarity index 100%
rename from data/core/units/Mermaid_Priestess.cfg
rename to data/core/units/merfolkPriestess.cfg
diff --git a/data/core/units/Mermaid_Siren.cfg b/data/core/units/merfolkSiren.cfg
similarity index 100%
rename from data/core/units/Mermaid_Siren.cfg
rename to data/core/units/merfolkSiren.cfg
diff --git a/data/core/units/Monster_Cave_Spider.cfg b/data/core/units/monsters/Monster_Cave_Spider.cfg
similarity index 100%
rename from data/core/units/Monster_Cave_Spider.cfg
rename to data/core/units/monsters/Monster_Cave_Spider.cfg
diff --git a/data/core/units/Monster_Cuttle_Fish.cfg b/data/core/units/monsters/Monster_Cuttle_Fish.cfg
similarity index 100%
rename from data/core/units/Monster_Cuttle_Fish.cfg
rename to data/core/units/monsters/Monster_Cuttle_Fish.cfg
diff --git a/data/core/units/Monster_Giant_Mudcrawler.cfg b/data/core/units/monsters/Monster_Giant_Mudcrawler.cfg
similarity index 100%
rename from data/core/units/Monster_Giant_Mudcrawler.cfg
rename to data/core/units/monsters/Monster_Giant_Mudcrawler.cfg
diff --git a/data/core/units/Monster_Giant_Scorpion.cfg b/data/core/units/monsters/Monster_Giant_Scorpion.cfg
similarity index 100%
rename from data/core/units/Monster_Giant_Scorpion.cfg
rename to data/core/units/monsters/Monster_Giant_Scorpion.cfg
diff --git a/data/core/units/Monster_Mudcrawler.cfg b/data/core/units/monsters/Monster_Mudcrawler.cfg
similarity index 100%
rename from data/core/units/Monster_Mudcrawler.cfg
rename to data/core/units/monsters/Monster_Mudcrawler.cfg
diff --git a/data/core/units/Monster_Sea_Serpent.cfg b/data/core/units/monsters/Monster_Sea_Serpent.cfg
similarity index 100%
rename from data/core/units/Monster_Sea_Serpent.cfg
rename to data/core/units/monsters/Monster_Sea_Serpent.cfg
diff --git a/data/core/units/Monster_Skeletal_Dragon.cfg b/data/core/units/monsters/Monster_Skeletal_Dragon.cfg
similarity index 100%
rename from data/core/units/Monster_Skeletal_Dragon.cfg
rename to data/core/units/monsters/Monster_Skeletal_Dragon.cfg
diff --git a/data/core/units/Monster_Tentacle.cfg b/data/core/units/monsters/Monster_Tentacle.cfg
similarity index 100%
rename from data/core/units/Monster_Tentacle.cfg
rename to data/core/units/monsters/Monster_Tentacle.cfg
diff --git a/data/core/units/Monster_Wolf.cfg b/data/core/units/monsters/Monster_Wolf.cfg
similarity index 100%
rename from data/core/units/Monster_Wolf.cfg
rename to data/core/units/monsters/Monster_Wolf.cfg
diff --git a/data/core/units/Monster_Yeti.cfg b/data/core/units/monsters/Monster_Yeti.cfg
similarity index 100%
rename from data/core/units/Monster_Yeti.cfg
rename to data/core/units/monsters/Monster_Yeti.cfg
diff --git a/data/core/units/Orcish_Archer.cfg b/data/core/units/orcs/Archer.cfg
similarity index 100%
rename from data/core/units/Orcish_Archer.cfg
rename to data/core/units/orcs/Archer.cfg
diff --git a/data/core/units/Orcish_Assassin.cfg b/data/core/units/orcs/Assassin.cfg
similarity index 100%
rename from data/core/units/Orcish_Assassin.cfg
rename to data/core/units/orcs/Assassin.cfg
diff --git a/data/core/units/Orcish_Crossbowman.cfg b/data/core/units/orcs/Crossbowman.cfg
similarity index 100%
rename from data/core/units/Orcish_Crossbowman.cfg
rename to data/core/units/orcs/Crossbowman.cfg
diff --git a/data/core/units/Orcish_Grunt.cfg b/data/core/units/orcs/Grunt.cfg
similarity index 100%
rename from data/core/units/Orcish_Grunt.cfg
rename to data/core/units/orcs/Grunt.cfg
diff --git a/data/core/units/Orcish_Leader.cfg b/data/core/units/orcs/Leader.cfg
similarity index 100%
rename from data/core/units/Orcish_Leader.cfg
rename to data/core/units/orcs/Leader.cfg
diff --git a/data/core/units/Orcish_Ruler.cfg b/data/core/units/orcs/Ruler.cfg
similarity index 100%
rename from data/core/units/Orcish_Ruler.cfg
rename to data/core/units/orcs/Ruler.cfg
diff --git a/data/core/units/Orcish_Slayer.cfg b/data/core/units/orcs/Slayer.cfg
similarity index 100%
rename from data/core/units/Orcish_Slayer.cfg
rename to data/core/units/orcs/Slayer.cfg
diff --git a/data/core/units/Orcish_Slurbow.cfg b/data/core/units/orcs/Slurbow.cfg
similarity index 100%
rename from data/core/units/Orcish_Slurbow.cfg
rename to data/core/units/orcs/Slurbow.cfg
diff --git a/data/core/units/Orcish_Sovereign.cfg b/data/core/units/orcs/Sovereign.cfg
similarity index 100%
rename from data/core/units/Orcish_Sovereign.cfg
rename to data/core/units/orcs/Sovereign.cfg
diff --git a/data/core/units/Orcish_Warlord.cfg b/data/core/units/orcs/Warlord.cfg
similarity index 100%
rename from data/core/units/Orcish_Warlord.cfg
rename to data/core/units/orcs/Warlord.cfg
diff --git a/data/core/units/Orcish_Warrior.cfg b/data/core/units/orcs/Warrior.cfg
similarity index 100%
rename from data/core/units/Orcish_Warrior.cfg
rename to data/core/units/orcs/Warrior.cfg
diff --git a/data/core/units/Saurian_Ambusher.cfg b/data/core/units/saurians/Ambusher.cfg
similarity index 100%
rename from data/core/units/Saurian_Ambusher.cfg
rename to data/core/units/saurians/Ambusher.cfg
diff --git a/data/core/units/Saurian_Augur.cfg b/data/core/units/saurians/Augur.cfg
similarity index 100%
rename from data/core/units/Saurian_Augur.cfg
rename to data/core/units/saurians/Augur.cfg
diff --git a/data/core/units/Saurian_Flanker.cfg b/data/core/units/saurians/Flanker.cfg
similarity index 100%
rename from data/core/units/Saurian_Flanker.cfg
rename to data/core/units/saurians/Flanker.cfg
diff --git a/data/core/units/Saurian_Oracle.cfg b/data/core/units/saurians/Oracle.cfg
similarity index 100%
rename from data/core/units/Saurian_Oracle.cfg
rename to data/core/units/saurians/Oracle.cfg
diff --git a/data/core/units/Saurian_Skirmisher.cfg b/data/core/units/saurians/Skirmisher.cfg
similarity index 100%
rename from data/core/units/Saurian_Skirmisher.cfg
rename to data/core/units/saurians/Skirmisher.cfg
diff --git a/data/core/units/Saurian_Soothsayer.cfg b/data/core/units/saurians/Soothsayer.cfg
similarity index 100%
rename from data/core/units/Saurian_Soothsayer.cfg
rename to data/core/units/saurians/Soothsayer.cfg
diff --git a/data/core/units/Troll_Great.cfg b/data/core/units/trolls/Great.cfg
similarity index 100%
rename from data/core/units/Troll_Great.cfg
rename to data/core/units/trolls/Great.cfg
diff --git a/data/core/units/Troll_Hero.cfg b/data/core/units/trolls/Hero.cfg
similarity index 100%
rename from data/core/units/Troll_Hero.cfg
rename to data/core/units/trolls/Hero.cfg
diff --git a/data/core/units/Troll_Rocklobber.cfg b/data/core/units/trolls/Rocklobber.cfg
similarity index 100%
rename from data/core/units/Troll_Rocklobber.cfg
rename to data/core/units/trolls/Rocklobber.cfg
diff --git a/data/core/units/Troll.cfg b/data/core/units/trolls/Troll.cfg
similarity index 100%
rename from data/core/units/Troll.cfg
rename to data/core/units/trolls/Troll.cfg
diff --git a/data/core/units/Troll_Warrior.cfg b/data/core/units/trolls/Warrior.cfg
similarity index 100%
rename from data/core/units/Troll_Warrior.cfg
rename to data/core/units/trolls/Warrior.cfg
diff --git a/data/core/units/Troll_Whelp.cfg b/data/core/units/trolls/Whelp.cfg
similarity index 100%
rename from data/core/units/Troll_Whelp.cfg
rename to data/core/units/trolls/Whelp.cfg
diff --git a/data/core/units/Undead_Bat_Blood.cfg b/data/core/units/undead/Bat_Blood.cfg
similarity index 100%
rename from data/core/units/Undead_Bat_Blood.cfg
rename to data/core/units/undead/Bat_Blood.cfg
diff --git a/data/core/units/Undead_Bat_Vampire.cfg b/data/core/units/undead/Bat_Vampire.cfg
similarity index 100%
rename from data/core/units/Undead_Bat_Vampire.cfg
rename to data/core/units/undead/Bat_Vampire.cfg
diff --git a/data/core/units/Undead_Corpse_Ghoul.cfg b/data/core/units/undead/Corpse_Ghoul.cfg
similarity index 100%
rename from data/core/units/Undead_Corpse_Ghoul.cfg
rename to data/core/units/undead/Corpse_Ghoul.cfg
diff --git a/data/core/units/Undead_Corpse_Necrophage.cfg b/data/core/units/undead/Corpse_Necrophage.cfg
similarity index 100%
rename from data/core/units/Undead_Corpse_Necrophage.cfg
rename to data/core/units/undead/Corpse_Necrophage.cfg
diff --git a/data/core/units/Undead_Corpse_Soulless.cfg b/data/core/units/undead/Corpse_Soulless.cfg
similarity index 100%
rename from data/core/units/Undead_Corpse_Soulless.cfg
rename to data/core/units/undead/Corpse_Soulless.cfg
diff --git a/data/core/units/Undead_Corpse_Walking.cfg b/data/core/units/undead/Corpse_Walking.cfg
similarity index 100%
rename from data/core/units/Undead_Corpse_Walking.cfg
rename to data/core/units/undead/Corpse_Walking.cfg
diff --git a/data/core/units/Undead_Necro_Ancient_Lich.cfg b/data/core/units/undead/Necro_Ancient_Lich.cfg
similarity index 100%
rename from data/core/units/Undead_Necro_Ancient_Lich.cfg
rename to data/core/units/undead/Necro_Ancient_Lich.cfg
diff --git a/data/core/units/Undead_Necro_Dark_Adept.cfg b/data/core/units/undead/Necro_Dark_Adept.cfg
similarity index 100%
rename from data/core/units/Undead_Necro_Dark_Adept.cfg
rename to data/core/units/undead/Necro_Dark_Adept.cfg
diff --git a/data/core/units/Undead_Necro_Dark_Sorcerer.cfg b/data/core/units/undead/Necro_Dark_Sorcerer.cfg
similarity index 100%
rename from data/core/units/Undead_Necro_Dark_Sorcerer.cfg
rename to data/core/units/undead/Necro_Dark_Sorcerer.cfg
diff --git a/data/core/units/Undead_Necro_Lich.cfg b/data/core/units/undead/Necro_Lich.cfg
similarity index 100%
rename from data/core/units/Undead_Necro_Lich.cfg
rename to data/core/units/undead/Necro_Lich.cfg
diff --git a/data/core/units/Undead_Necromancer.cfg b/data/core/units/undead/Necromancer.cfg
similarity index 100%
rename from data/core/units/Undead_Necromancer.cfg
rename to data/core/units/undead/Necromancer.cfg
diff --git a/data/core/units/Undead_Skele_Bone_Shooter.cfg b/data/core/units/undead/Skele_Bone_Shooter.cfg
similarity index 100%
rename from data/core/units/Undead_Skele_Bone_Shooter.cfg
rename to data/core/units/undead/Skele_Bone_Shooter.cfg
diff --git a/data/core/units/Undead_Skele_Chocobone.cfg b/data/core/units/undead/Skele_Chocobone.cfg
similarity index 100%
rename from data/core/units/Undead_Skele_Chocobone.cfg
rename to data/core/units/undead/Skele_Chocobone.cfg
diff --git a/data/core/units/Undead_Skele_Death_Knight.cfg b/data/core/units/undead/Skele_Death_Knight.cfg
similarity index 100%
rename from data/core/units/Undead_Skele_Death_Knight.cfg
rename to data/core/units/undead/Skele_Death_Knight.cfg
diff --git a/data/core/units/Undead_Skele_Deathblade.cfg b/data/core/units/undead/Skele_Deathblade.cfg
similarity index 100%
rename from data/core/units/Undead_Skele_Deathblade.cfg
rename to data/core/units/undead/Skele_Deathblade.cfg
diff --git a/data/core/units/Undead_Skele_Draug.cfg b/data/core/units/undead/Skele_Draug.cfg
similarity index 100%
rename from data/core/units/Undead_Skele_Draug.cfg
rename to data/core/units/undead/Skele_Draug.cfg
diff --git a/data/core/units/Undead_Skele_Revenant.cfg b/data/core/units/undead/Skele_Revenant.cfg
similarity index 100%
rename from data/core/units/Undead_Skele_Revenant.cfg
rename to data/core/units/undead/Skele_Revenant.cfg
diff --git a/data/core/units/Undead_Skele_Soul_Shooter.cfg b/data/core/units/undead/Skele_Soul_Shooter.cfg
similarity index 100%
rename from data/core/units/Undead_Skele_Soul_Shooter.cfg
rename to data/core/units/undead/Skele_Soul_Shooter.cfg
diff --git a/data/core/units/Undead_Skeleton.cfg b/data/core/units/undead/Skeleton.cfg
similarity index 100%
rename from data/core/units/Undead_Skeleton.cfg
rename to data/core/units/undead/Skeleton.cfg
diff --git a/data/core/units/Undead_Skeleton_Archer.cfg b/data/core/units/undead/Skeleton_Archer.cfg
similarity index 100%
rename from data/core/units/Undead_Skeleton_Archer.cfg
rename to data/core/units/undead/Skeleton_Archer.cfg
diff --git a/data/core/units/Undead_Spirit_Ghost.cfg b/data/core/units/undead/Spirit_Ghost.cfg
similarity index 100%
rename from data/core/units/Undead_Spirit_Ghost.cfg
rename to data/core/units/undead/Spirit_Ghost.cfg
diff --git a/data/core/units/Undead_Spirit_Nightgaunt.cfg b/data/core/units/undead/Spirit_Nightgaunt.cfg
similarity index 100%
rename from data/core/units/Undead_Spirit_Nightgaunt.cfg
rename to data/core/units/undead/Spirit_Nightgaunt.cfg
diff --git a/data/core/units/Undead_Spirit_Shadow.cfg b/data/core/units/undead/Spirit_Shadow.cfg
similarity index 100%
rename from data/core/units/Undead_Spirit_Shadow.cfg
rename to data/core/units/undead/Spirit_Shadow.cfg
diff --git a/data/core/units/Undead_Spirit_Spectre.cfg b/data/core/units/undead/Spirit_Spectre.cfg
similarity index 100%
rename from data/core/units/Undead_Spirit_Spectre.cfg
rename to data/core/units/undead/Spirit_Spectre.cfg
diff --git a/data/core/units/Undead_Spirit_Wraith.cfg b/data/core/units/undead/Spirit_Wraith.cfg
similarity index 100%
rename from data/core/units/Undead_Spirit_Wraith.cfg
rename to data/core/units/undead/Spirit_Wraith.cfg
diff --git a/data/core/units/Wose_Ancient.cfg b/data/core/units/wose/Ancient.cfg
similarity index 100%
rename from data/core/units/Wose_Ancient.cfg
rename to data/core/units/wose/Ancient.cfg
diff --git a/data/core/units/Wose_Elder.cfg b/data/core/units/wose/Elder.cfg
similarity index 100%
rename from data/core/units/Wose_Elder.cfg
rename to data/core/units/wose/Elder.cfg
diff --git a/data/core/units/Wose.cfg b/data/core/units/wose/Wose.cfg
similarity index 100%
rename from data/core/units/Wose.cfg
rename to data/core/units/wose/Wose.cfg