diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/athen_cavalry_javelinist.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/athen/cavalry_javelinist.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/athen_cavalry_javelinist.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/athen/cavalry_javelinist.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/athen_cavalry_swordsman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/athen/cavalry_swordsman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/athen_cavalry_swordsman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/athen/cavalry_swordsman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/athen_champion_infantry.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/athen/champion_infantry.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/athen_champion_infantry.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/athen/champion_infantry.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/athen_champion_marine.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/athen/champion_marine.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/athen_champion_marine.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/athen/champion_marine.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/athen_champion_ranged.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/athen/champion_ranged.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/athen_champion_ranged.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/athen/champion_ranged.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/athen_hero_iphicrates.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/athen/hero_iphicrates.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/athen_hero_iphicrates.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/athen/hero_iphicrates.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/athen_hero_pericles.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/athen/hero_pericles.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/athen_hero_pericles.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/athen/hero_pericles.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/athen_hero_themistocles.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/athen/hero_themistocles.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/athen_hero_themistocles.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/athen/hero_themistocles.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/athen_hero_xenophon.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/athen/hero_xenophon.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/athen_hero_xenophon.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/athen/hero_xenophon.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/athen_infantry_javelinist.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/athen/infantry_javelinist.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/athen_infantry_javelinist.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/athen/infantry_javelinist.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/athen_infantry_slinger.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/athen/infantry_slinger.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/athen_infantry_slinger.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/athen/infantry_slinger.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/athen_infantry_spearman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/athen/infantry_spearman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/athen_infantry_spearman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/athen/infantry_spearman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/athen_ship_bireme.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/athen/ship_bireme.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/athen_ship_bireme.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/athen/ship_bireme.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/athen_ship_trireme.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/athen/ship_trireme.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/athen_ship_trireme.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/athen/ship_trireme.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/athen_siege_ram.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/athen/siege_ram.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/athen_siege_ram.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/athen/siege_ram.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_cavalry_javelinist.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit/cavalry_javelinist.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_cavalry_javelinist.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/brit/cavalry_javelinist.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_cavalry_swordsman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit/cavalry_swordsman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_cavalry_swordsman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/brit/cavalry_swordsman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_champion_chariot.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit/champion_chariot.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_champion_chariot.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/brit/champion_chariot.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_champion_infantry.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit/champion_infantry.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_champion_infantry.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/brit/champion_infantry.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_champion_javelineer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit/champion_javelineer.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_champion_javelineer.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/brit/champion_javelineer.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_hero_boudicca.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit/hero_boudicca.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_hero_boudicca.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/brit/hero_boudicca.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_hero_caratacos.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit/hero_caratacos.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_hero_caratacos.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/brit/hero_caratacos.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_hero_cunobelin.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit/hero_cunobelin.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_hero_cunobelin.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/brit/hero_cunobelin.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_infantry_javelinist.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit/infantry_javelinist.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_infantry_javelinist.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/brit/infantry_javelinist.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_infantry_spearman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit/infantry_spearman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_infantry_spearman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/brit/infantry_spearman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_war_dog.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit/war_dog.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_war_dog.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/brit/war_dog.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_wolfhound.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/brit/wolfhound.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/brit_wolfhound.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/brit/wolfhound.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_cavalry_javelinist.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/cavalry_javelinist.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_cavalry_javelinist.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/cavalry_javelinist.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_cavalry_spearman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/cavalry_spearman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_cavalry_spearman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/cavalry_spearman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_cavalry_swordsman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/cavalry_swordsman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_cavalry_swordsman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/cavalry_swordsman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_cavalry_swordsman_2.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/cavalry_swordsman_2.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_cavalry_swordsman_2.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/cavalry_swordsman_2.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_champion_cavalry.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/champion_cavalry.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_champion_cavalry.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/champion_cavalry.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_champion_elephant.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/champion_elephant.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_champion_elephant.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/champion_elephant.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_champion_infantry.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/champion_infantry.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_champion_infantry.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/champion_infantry.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_hero_hamilcar.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/hero_hamilcar.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_hero_hamilcar.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/hero_hamilcar.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_hero_hannibal.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/hero_hannibal.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_hero_hannibal.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/hero_hannibal.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_hero_maharbal.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/hero_maharbal.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_hero_maharbal.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/hero_maharbal.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_infantry_archer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/infantry_archer.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_infantry_archer.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/infantry_archer.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_infantry_javelinist.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/infantry_javelinist.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_infantry_javelinist.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/infantry_javelinist.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_infantry_slinger.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/infantry_slinger.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_infantry_slinger.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/infantry_slinger.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_infantry_spearman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/infantry_spearman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_infantry_spearman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/infantry_spearman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_infantry_swordsman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/infantry_swordsman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_infantry_swordsman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/infantry_swordsman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_infantry_swordsman_2.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/infantry_swordsman_2.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_infantry_swordsman_2.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/infantry_swordsman_2.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_ship_bireme.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/ship_bireme.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_ship_bireme.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/ship_bireme.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_ship_merchant.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/ship_merchant.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_ship_merchant.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/ship_merchant.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_ship_quinquereme.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/ship_quinquereme.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_ship_quinquereme.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/ship_quinquereme.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_ship_trireme.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/ship_trireme.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_ship_trireme.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/ship_trireme.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_siege_ballista.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/siege_ballista.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_siege_ballista.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/siege_ballista.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_siege_ballista_packed.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/siege_ballista_packed.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_siege_ballista_packed.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/siege_ballista_packed.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_siege_oxybeles.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/siege_oxybeles.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_siege_oxybeles.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/siege_oxybeles.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_siege_oxybeles_packed.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/siege_oxybeles_packed.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_siege_oxybeles_packed.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/siege_oxybeles_packed.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_support_female_citizen.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/support_female_citizen.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_support_female_citizen.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/support_female_citizen.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_support_healer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/support_healer.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_support_healer.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/support_healer.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_support_trader.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/support_trader.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_support_trader.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/support_trader.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_ship_fishing.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt/ship_fishing.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_ship_fishing.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/celt/ship_fishing.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_ship_merchant.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt/ship_merchant.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_ship_merchant.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/celt/ship_merchant.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_ship_trireme.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt/ship_trireme.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_ship_trireme.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/celt/ship_trireme.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_siege_ram.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt/siege_ram.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_siege_ram.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/celt/siege_ram.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_support_female_citizen.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt/support_female_citizen.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_support_female_citizen.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/celt/support_female_citizen.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_support_healer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt/support_healer.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_support_healer.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/celt/support_healer.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_support_trader.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt/support_trader.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_support_trader.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/celt/support_trader.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_cavalry_javelinist.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul/cavalry_javelinist.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_cavalry_javelinist.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul/cavalry_javelinist.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_cavalry_swordsman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul/cavalry_swordsman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_cavalry_swordsman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul/cavalry_swordsman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_champion_cavalry.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul/champion_cavalry.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_champion_cavalry.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul/champion_cavalry.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_champion_fanatic.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul/champion_fanatic.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_champion_fanatic.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul/champion_fanatic.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_champion_infantry.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul/champion_infantry.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_champion_infantry.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul/champion_infantry.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_champion_swordsman_carnyx.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul/champion_swordsman_carnyx.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_champion_swordsman_carnyx.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul/champion_swordsman_carnyx.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_hero_brennus.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul/hero_brennus.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_hero_brennus.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul/hero_brennus.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_hero_vercingetorix.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul/hero_vercingetorix.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_hero_vercingetorix.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul/hero_vercingetorix.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_hero_viridomarus.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul/hero_viridomarus.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_hero_viridomarus.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul/hero_viridomarus.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_infantry_javelinist.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul/infantry_javelinist.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_infantry_javelinist.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul/infantry_javelinist.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_infantry_slinger.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul/infantry_slinger.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_infantry_slinger.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul/infantry_slinger.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_infantry_spearman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul/infantry_spearman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_infantry_spearman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul/infantry_spearman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_infantry_swordsman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul/infantry_swordsman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul_infantry_swordsman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/gaul/infantry_swordsman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/global_mustang.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/global/mustang.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/global_mustang.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/global/mustang.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/global_slave.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/global/slave.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/global_slave.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/global/slave.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_champion_infantry_polis.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele/champion_infantry_polis.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_champion_infantry_polis.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/hele/champion_infantry_polis.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_champion_ranged_polis.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele/champion_ranged_polis.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_champion_ranged_polis.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/hele/champion_ranged_polis.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_infantry_archer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele/infantry_archer.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_infantry_archer.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/hele/infantry_archer.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_ship_bireme.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele/ship_bireme.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_ship_bireme.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/hele/ship_bireme.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_ship_fishing.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele/ship_fishing.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_ship_fishing.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/hele/ship_fishing.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_ship_merchant.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele/ship_merchant.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_ship_merchant.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/hele/ship_merchant.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_ship_trireme.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele/ship_trireme.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_ship_trireme.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/hele/ship_trireme.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_siege_lithobolos.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele/siege_lithobolos.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_siege_lithobolos.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/hele/siege_lithobolos.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_siege_lithobolos_packed.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele/siege_lithobolos_packed.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_siege_lithobolos_packed.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/hele/siege_lithobolos_packed.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_siege_oxybeles.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele/siege_oxybeles.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_siege_oxybeles.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/hele/siege_oxybeles.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_siege_oxybeles_packed.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele/siege_oxybeles_packed.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_siege_oxybeles_packed.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/hele/siege_oxybeles_packed.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_siege_tower.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele/siege_tower.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_siege_tower.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/hele/siege_tower.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_support_female_citizen.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele/support_female_citizen.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_support_female_citizen.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/hele/support_female_citizen.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_support_healer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele/support_healer.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_support_healer.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/hele/support_healer.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_support_trader.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele/support_trader.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/hele_support_trader.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/hele/support_trader.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/tarentine_cavalry_e.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/hele/tarentine_cavalry_e.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/tarentine_cavalry_e.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/hele/tarentine_cavalry_e.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber_cavalry_javelinist.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/cavalry_javelinist.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/iber_cavalry_javelinist.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/cavalry_javelinist.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber_cavalry_spearman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/cavalry_spearman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/iber_cavalry_spearman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/cavalry_spearman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/champion_cavalry.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/champion_cavalry.png
new file mode 100644
index 0000000000..8cdb493d50
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/champion_cavalry.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8a8aefa5fabb2e1f8cc5ac76aab64f5dfc4ea0a9b361dd7139c9f3a6bd264dff
+size 114564
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/champion_infantry.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/champion_infantry.png
new file mode 100644
index 0000000000..7bec68d9fc
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/champion_infantry.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3f7df5a7c669b204fe3fc027ccddb7e5f7313fd8f9fee20a1d8d08f7d238d29d
+size 112731
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber_hero_caros.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/hero_caros.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/iber_hero_caros.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/hero_caros.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber_hero_indibil.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/hero_indibil.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/iber_hero_indibil.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/hero_indibil.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber_hero_viriato.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/hero_viriato.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/iber_hero_viriato.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/hero_viriato.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber_infantry_javelinist.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/infantry_javelinist.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/iber_infantry_javelinist.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/infantry_javelinist.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber_infantry_slinger.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/infantry_slinger.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/iber_infantry_slinger.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/infantry_slinger.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber_infantry_spearman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/infantry_spearman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/iber_infantry_spearman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/infantry_spearman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber_infantry_swordsman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/infantry_swordsman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/iber_infantry_swordsman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/infantry_swordsman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber_ship_fire.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/ship_fire.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/iber_ship_fire.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/ship_fire.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber_ship_fishing.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/ship_fishing.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/iber_ship_fishing.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/ship_fishing.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber_ship_merchant.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/ship_merchant.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/iber_ship_merchant.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/ship_merchant.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber_siege_ram.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/siege_ram.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/iber_siege_ram.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/siege_ram.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber_support_female_citizen.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/support_female_citizen.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/iber_support_female_citizen.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/support_female_citizen.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber_support_healer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/support_healer.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/iber_support_healer.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/support_healer.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber_support_trader.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/support_trader.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/iber_support_trader.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/support_trader.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber_champion_cavalry.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber_champion_cavalry.png
deleted file mode 100644
index 102b998855..0000000000
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber_champion_cavalry.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fdd0bb79e6e90a42cc95be6f0408343abc6dbd3e3573bc82f6e39a9a13aff557
-size 130377
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber_champion_infantry.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber_champion_infantry.png
deleted file mode 100644
index 626d22bbd7..0000000000
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber_champion_infantry.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6cfa2ffe3d031a2e72441fed90a8921364789c43ba5fee24b7a5c80dee55be7c
-size 120216
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_camel_javelinist.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/camel_javelinist.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_camel_javelinist.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/camel_javelinist.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_camel_swordsman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/camel_swordsman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_camel_swordsman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/camel_swordsman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_cavalry_javelinist.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/cavalry_javelinist.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_cavalry_javelinist.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/cavalry_javelinist.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_cavalry_spearman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/cavalry_spearman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_cavalry_spearman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/cavalry_spearman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_champion_amun.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/champion_amun.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_champion_amun.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/champion_amun.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_champion_apedemak.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/champion_apedemak.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_champion_apedemak.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/champion_apedemak.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_champion_archer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/champion_archer.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_champion_archer.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/champion_archer.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_champion_cavalry.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/champion_cavalry.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_champion_cavalry.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/champion_cavalry.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_champion_elephant.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/champion_elephant.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_champion_elephant.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/champion_elephant.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_hero_amanirenas.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/hero_amanirenas.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_hero_amanirenas.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/hero_amanirenas.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_hero_arakamani.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/hero_arakamani.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_hero_arakamani.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/hero_arakamani.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_hero_harsiotef.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/hero_harsiotef.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_hero_harsiotef.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/hero_harsiotef.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_hero_nastasen.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/hero_nastasen.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_hero_nastasen.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/hero_nastasen.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_infantry_archer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/infantry_archer.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_infantry_archer.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/infantry_archer.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_infantry_javelinist.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/infantry_javelinist.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_infantry_javelinist.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/infantry_javelinist.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_infantry_maceman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/infantry_maceman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_infantry_maceman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/infantry_maceman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_infantry_pikeman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/infantry_pikeman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_infantry_pikeman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/infantry_pikeman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_infantry_spearman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/infantry_spearman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_infantry_spearman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/infantry_spearman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_infantry_swordsman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/infantry_swordsman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_infantry_swordsman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/infantry_swordsman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_infantry_swordsman_2.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/infantry_swordsman_2.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_infantry_swordsman_2.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/infantry_swordsman_2.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_ship_bireme.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/ship_bireme.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_ship_bireme.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/ship_bireme.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_ship_trireme.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/ship_trireme.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_ship_trireme.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/ship_trireme.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_support_female_citizen.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/support_female_citizen.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_support_female_citizen.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/support_female_citizen.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_support_healer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/support_healer.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_support_healer.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/support_healer.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_support_trader.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/support_trader.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_support_trader.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/support_trader.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_argyraspidai.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/argyraspidai.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_argyraspidai.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/argyraspidai.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_cavalry_javelinist.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/cavalry_javelinist.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_cavalry_javelinist.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/cavalry_javelinist.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_cavalry_spearman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/cavalry_spearman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_cavalry_spearman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/cavalry_spearman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_cavalry_spearman_merc.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/cavalry_spearman_merc.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_cavalry_spearman_merc.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/cavalry_spearman_merc.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_champion_cavalry.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/champion_cavalry.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_champion_cavalry.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/champion_cavalry.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_champion_infantry.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/champion_infantry.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_champion_infantry.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/champion_infantry.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_champion_infantry_crossbowman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/champion_infantry_crossbowman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_champion_infantry_crossbowman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/champion_infantry_crossbowman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_hero_alexander.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/hero_alexander.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_hero_alexander.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/hero_alexander.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_hero_craterus.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/hero_craterus.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_hero_craterus.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/hero_craterus.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_hero_demetrius.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/hero_demetrius.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_hero_demetrius.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/hero_demetrius.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_hero_philip.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/hero_philip.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_hero_philip.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/hero_philip.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_hero_pyrrhus.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/hero_pyrrhus.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_hero_pyrrhus.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/hero_pyrrhus.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_hypaspist.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/hypaspist.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_hypaspist.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/hypaspist.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_infantry_archer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/infantry_archer.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_infantry_archer.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/infantry_archer.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_infantry_javelinist.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/infantry_javelinist.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_infantry_javelinist.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/infantry_javelinist.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_infantry_pikeman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/infantry_pikeman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_infantry_pikeman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/infantry_pikeman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_infantry_slinger.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/infantry_slinger.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_infantry_slinger.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/infantry_slinger.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_ship_trireme.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/ship_trireme.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_ship_trireme.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/ship_trireme.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_siege_ram.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/siege_ram.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_siege_ram.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/siege_ram.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_thorakites.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/thorakites.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_thorakites.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/thorakites.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_thureophoros.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/thureophoros.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/mace_thureophoros.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/mace/thureophoros.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_cavalry_javelinist.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/cavalry_javelinist.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_cavalry_javelinist.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/cavalry_javelinist.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_cavalry_swordsman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/cavalry_swordsman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_cavalry_swordsman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/cavalry_swordsman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_champion_chariot.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/champion_chariot.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_champion_chariot.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/champion_chariot.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_champion_elephant.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/champion_elephant.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_champion_elephant.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/champion_elephant.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_champion_maceman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/champion_maceman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_champion_maceman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/champion_maceman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/champion_maiden.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/champion_maiden.png
new file mode 100644
index 0000000000..9e6c5a1ecc
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/champion_maiden.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8db5ba1aabfa2ced0175d35e99f9573b1b2331ce199d70c89cdcce85b727e816
+size 109247
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_champion_maiden_archer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/champion_maiden_archer.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_champion_maiden_archer.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/champion_maiden_archer.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_champion_maiden_archer_fire.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/champion_maiden_archer_fire.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_champion_maiden_archer_fire.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/champion_maiden_archer_fire.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_elephant_archer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/elephant_archer.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_elephant_archer.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/elephant_archer.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_hero_ashoka.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/hero_ashoka.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_hero_ashoka.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/hero_ashoka.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_hero_chanakya.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/hero_chanakya.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_hero_chanakya.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/hero_chanakya.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_hero_chandragupta.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/hero_chandragupta.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_hero_chandragupta.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/hero_chandragupta.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_infantry_archer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/infantry_archer.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_infantry_archer.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/infantry_archer.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_infantry_spearman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/infantry_spearman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_infantry_spearman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/infantry_spearman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_infantry_swordsman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/infantry_swordsman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_infantry_swordsman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/infantry_swordsman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_ship_bireme.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/ship_bireme.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_ship_bireme.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/ship_bireme.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_ship_fishing.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/ship_fishing.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_ship_fishing.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/ship_fishing.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_ship_merchant.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/ship_merchant.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_ship_merchant.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/ship_merchant.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_ship_trireme.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/ship_trireme.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_ship_trireme.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/ship_trireme.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_siege_ram.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/siege_ram.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_siege_ram.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/siege_ram.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_support_elephant.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/support_elephant.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_support_elephant.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/support_elephant.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_support_female_citizen.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/support_female_citizen.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_support_female_citizen.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/support_female_citizen.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_support_healer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/support_healer.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_support_healer.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/support_healer.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_support_trader.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/support_trader.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_support_trader.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/support_trader.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_champion_maiden.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_champion_maiden.png
deleted file mode 100644
index c2fdbc9c14..0000000000
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_champion_maiden.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:44efd5c595e87eba6828c58a1acd87f62df370832ce59aae69dac84b6b5d2c9c
-size 98477
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_arstibara.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/arstibara.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_arstibara.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/arstibara.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_cavalry_archer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/cavalry_archer.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_cavalry_archer.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/cavalry_archer.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_cavalry_axeman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/cavalry_axeman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_cavalry_axeman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/cavalry_axeman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_cavalry_javelinist.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/cavalry_javelinist.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_cavalry_javelinist.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/cavalry_javelinist.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_cavalry_spearman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/cavalry_spearman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_cavalry_spearman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/cavalry_spearman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_champion_cavalry.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/champion_cavalry.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_champion_cavalry.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/champion_cavalry.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_champion_cavalry_archer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/champion_cavalry_archer.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_champion_cavalry_archer.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/champion_cavalry_archer.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_champion_elephant.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/champion_elephant.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_champion_elephant.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/champion_elephant.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_champion_infantry.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/champion_infantry.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_champion_infantry.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/champion_infantry.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_champion_infantry_archer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/champion_infantry_archer.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_champion_infantry_archer.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/champion_infantry_archer.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_chariot_archer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/chariot_archer.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_chariot_archer.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/chariot_archer.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_hero_cyrus.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/hero_cyrus.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_hero_cyrus.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/hero_cyrus.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_hero_darius.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/hero_darius.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_hero_darius.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/hero_darius.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_hero_xerxes.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/hero_xerxes.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_hero_xerxes.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/hero_xerxes.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_infantry_archer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/infantry_archer.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_infantry_archer.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/infantry_archer.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_infantry_javelinist.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/infantry_javelinist.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_infantry_javelinist.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/infantry_javelinist.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_infantry_spearman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/infantry_spearman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_infantry_spearman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/infantry_spearman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_kardakes.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/kardakes.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_kardakes.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/kardakes.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_kardakes_skirmisher.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/kardakes_skirmisher.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_kardakes_skirmisher.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/kardakes_skirmisher.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_ship_bireme.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/ship_bireme.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_ship_bireme.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/ship_bireme.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_ship_fishing.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/ship_fishing.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_ship_fishing.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/ship_fishing.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_ship_merchant.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/ship_merchant.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_ship_merchant.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/ship_merchant.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_ship_trireme.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/ship_trireme.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_ship_trireme.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/ship_trireme.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_siege_ram.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/siege_ram.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_siege_ram.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/siege_ram.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_support_female_citizen.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/support_female_citizen.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_support_female_citizen.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/support_female_citizen.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_support_healer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/support_healer.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_support_healer.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/support_healer.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_support_trader.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/support_trader.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_support_trader.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/support_trader.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_camel_archer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/camel_archer.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_camel_archer.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/camel_archer.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_cavalry_spearman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/cavalry_spearman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_cavalry_spearman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/cavalry_spearman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_champion_cavalry.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/champion_cavalry.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_champion_cavalry.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/champion_cavalry.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_champion_elephant.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/champion_elephant.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_champion_elephant.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/champion_elephant.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_champion_infantry.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/champion_infantry.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_champion_infantry.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/champion_infantry.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_champion_infantry_ranged_gastraphetes.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/champion_infantry_ranged_gastraphetes.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_champion_infantry_ranged_gastraphetes.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/champion_infantry_ranged_gastraphetes.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_hero_cleopatra.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/hero_cleopatra.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_hero_cleopatra.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/hero_cleopatra.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_hero_ptolemy_I.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/hero_ptolemy_I.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_hero_ptolemy_I.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/hero_ptolemy_I.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_hero_ptolemy_IV.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/hero_ptolemy_IV.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_hero_ptolemy_IV.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/hero_ptolemy_IV.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_infantry_archer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/infantry_archer.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_infantry_archer.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/infantry_archer.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_infantry_javelinist_merc.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/infantry_javelinist_merc.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_infantry_javelinist_merc.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/infantry_javelinist_merc.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_infantry_slinger.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/infantry_slinger.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_infantry_slinger.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/infantry_slinger.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_infantry_spearman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/infantry_spearman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_infantry_spearman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/infantry_spearman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_infantry_spearman_2.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/infantry_spearman_2.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_infantry_spearman_2.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/infantry_spearman_2.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_ship_bireme.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/ship_bireme.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_ship_bireme.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/ship_bireme.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_ship_fishing.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/ship_fishing.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_ship_fishing.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/ship_fishing.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_ship_merchant.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/ship_merchant.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_ship_merchant.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/ship_merchant.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_ship_quinquereme.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/ship_quinquereme.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_ship_quinquereme.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/ship_quinquereme.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_ship_trireme.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/ship_trireme.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_ship_trireme.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/ship_trireme.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_support_female_citizen.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/support_female_citizen.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_support_female_citizen.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/support_female_citizen.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_support_healer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/support_healer.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_support_healer.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol/support_healer.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_cavalry_javelinist.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/cavalry_javelinist.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_cavalry_javelinist.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/cavalry_javelinist.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_cavalry_spearman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/cavalry_spearman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_cavalry_spearman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/cavalry_spearman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_champion_cavalry.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/champion_cavalry.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_champion_cavalry.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/champion_cavalry.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_champion_infantry.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/champion_infantry.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_champion_infantry.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/champion_infantry.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_champion_infantry_gladiator_spear.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/champion_infantry_gladiator_spear.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_champion_infantry_gladiator_spear.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/champion_infantry_gladiator_spear.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_champion_infantry_gladiator_sword.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/champion_infantry_gladiator_sword.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_champion_infantry_gladiator_sword.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/champion_infantry_gladiator_sword.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_champion_legion_centurio.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/champion_legion_centurio.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_champion_legion_centurio.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/champion_legion_centurio.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_champion_legion_imperial.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/champion_legion_imperial.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_champion_legion_imperial.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/champion_legion_imperial.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_champion_legion_marian.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/champion_legion_marian.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_champion_legion_marian.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/champion_legion_marian.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_hero_marcellus.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/hero_marcellus.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_hero_marcellus.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/hero_marcellus.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_hero_maximus.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/hero_maximus.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_hero_maximus.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/hero_maximus.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_hero_scipio.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/hero_scipio.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_hero_scipio.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/hero_scipio.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_infantry_javelinist.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/infantry_javelinist.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_infantry_javelinist.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/infantry_javelinist.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_infantry_spearman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/infantry_spearman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_infantry_spearman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/infantry_spearman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_infantry_spearman_militia.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/infantry_spearman_militia.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_infantry_spearman_militia.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/infantry_spearman_militia.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_infantry_swordsman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/infantry_swordsman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_infantry_swordsman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/infantry_swordsman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_ship_bireme.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/ship_bireme.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_ship_bireme.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/ship_bireme.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_ship_merchant.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/ship_merchant.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_ship_merchant.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/ship_merchant.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_ship_quinquereme.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/ship_quinquereme.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_ship_quinquereme.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/ship_quinquereme.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_ship_trireme.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/ship_trireme.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_ship_trireme.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/ship_trireme.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_siege_ballista.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/siege_ballista.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_siege_ballista.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/siege_ballista.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_siege_ballista_packed.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/siege_ballista_packed.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_siege_ballista_packed.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/siege_ballista_packed.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_siege_onager.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/siege_onager.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_siege_onager.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/siege_onager.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_siege_onager_packed.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/siege_onager_packed.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_siege_onager_packed.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/siege_onager_packed.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_siege_ram.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/siege_ram.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_siege_ram.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/siege_ram.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_siege_scorpio.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/siege_scorpio.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_siege_scorpio.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/siege_scorpio.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_siege_scorpio_packed.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/siege_scorpio_packed.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_siege_scorpio_packed.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/siege_scorpio_packed.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_support_female_citizen.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/support_female_citizen.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_support_female_citizen.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/support_female_citizen.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_support_healer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/support_healer.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_support_healer.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/support_healer.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_support_trader.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/support_trader.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/rome_support_trader.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/rome/support_trader.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/samnite_skirmisher.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/samn/skirmisher.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/samnite_skirmisher.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/samn/skirmisher.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/samnite_spearman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/samn/spearman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/samnite_spearman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/samn/spearman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/samnite_swordsman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/samn/swordsman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/samnite_swordsman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/samn/swordsman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_cavalry_javelinist.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/cavalry_javelinist.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_cavalry_javelinist.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/cavalry_javelinist.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/cavalry_militia.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/cavalry_militia.png
new file mode 100644
index 0000000000..ecedfa7eb5
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/cavalry_militia.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fc5f4704dde7f8c7c9b7f6bb4a4350beb547935c1ac65dab1bb78d75c7320a01
+size 102604
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_cavalry_spearman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/cavalry_spearman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_cavalry_spearman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/cavalry_spearman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_cavalry_spearman_merc.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/cavalry_spearman_merc.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_cavalry_spearman_merc.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/cavalry_spearman_merc.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_champion_cavalry.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/champion_cavalry.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_champion_cavalry.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/champion_cavalry.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_champion_chariot.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/champion_chariot.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_champion_chariot.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/champion_chariot.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_champion_elephant.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/champion_elephant.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_champion_elephant.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/champion_elephant.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_champion_pikeman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/champion_pikeman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_champion_pikeman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/champion_pikeman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_champion_swordsman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/champion_swordsman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_champion_swordsman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/champion_swordsman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_hero_antiochus_the_great.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/hero_antiochus_the_great.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_hero_antiochus_the_great.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/hero_antiochus_the_great.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_hero_antiochus_the_righteous.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/hero_antiochus_the_righteous.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_hero_antiochus_the_righteous.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/hero_antiochus_the_righteous.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_hero_seleucus.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/hero_seleucus.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_hero_seleucus.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/hero_seleucus.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_infantry_archer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/infantry_archer.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_infantry_archer.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/infantry_archer.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_infantry_javelinist.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/infantry_javelinist.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_infantry_javelinist.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/infantry_javelinist.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_infantry_javelinist_merc.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/infantry_javelinist_merc.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_infantry_javelinist_merc.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/infantry_javelinist_merc.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_infantry_spearman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/infantry_spearman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_infantry_spearman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/infantry_spearman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_infantry_spearman_2.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/infantry_spearman_2.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_infantry_spearman_2.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/infantry_spearman_2.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_infantry_swordsman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/infantry_swordsman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_infantry_swordsman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/infantry_swordsman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_support_female.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/support_female.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_support_female.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/support_female.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/spart_cavalry_javelinist.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/spart/cavalry_javelinist.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/spart_cavalry_javelinist.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/spart/cavalry_javelinist.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/spart_cavalry_spearman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/spart/cavalry_spearman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/spart_cavalry_spearman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/spart/cavalry_spearman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/spart_champion_infantry_commando.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/spart/champion_infantry_commando.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/spart_champion_infantry_commando.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/spart/champion_infantry_commando.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/spart_champion_infantry_olympian.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/spart/champion_infantry_olympian.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/spart_champion_infantry_olympian.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/spart/champion_infantry_olympian.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/spart_champion_infantry_pike.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/spart/champion_infantry_pike.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/spart_champion_infantry_pike.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/spart/champion_infantry_pike.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/spart_champion_infantry_spear.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/spart/champion_infantry_spear.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/spart_champion_infantry_spear.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/spart/champion_infantry_spear.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/spart_champion_infantry_sword.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/spart/champion_infantry_sword.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/spart_champion_infantry_sword.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/spart/champion_infantry_sword.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/spart_hero_agis.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/spart/hero_agis.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/spart_hero_agis.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/spart/hero_agis.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/spart_hero_brasidas.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/spart/hero_brasidas.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/spart_hero_brasidas.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/spart/hero_brasidas.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/spart_hero_leonidas.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/spart/hero_leonidas.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/spart_hero_leonidas.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/spart/hero_leonidas.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/spart_hero_leonidas_300.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/spart/hero_leonidas_300.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/spart_hero_leonidas_300.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/spart/hero_leonidas_300.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/spart_infantry_javelinist.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/spart/infantry_javelinist.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/spart_infantry_javelinist.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/spart/infantry_javelinist.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/spart_infantry_pikeman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/spart/infantry_pikeman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/spart_infantry_pikeman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/spart/infantry_pikeman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/spart_infantry_slinger.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/spart/infantry_slinger.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/spart_infantry_slinger.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/spart/infantry_slinger.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/spart_infantry_spearman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/spart/infantry_spearman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/spart_infantry_spearman.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/spart/infantry_spearman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/spart_siege_ram.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/spart/siege_ram.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/spart_siege_ram.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/spart/siege_ram.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/spart_support_female_citizen.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/spart/support_female_citizen.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/spart_support_female_citizen.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/spart/support_female_citizen.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/thebes_sacred_band_hoplitai.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/theb/champion_infantry_hoplite.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/thebes_sacred_band_hoplitai.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/theb/champion_infantry_hoplite.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/thespian_melanochitones.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/theb/champion_infantry_swordsman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/thespian_melanochitones.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/theb/champion_infantry_swordsman.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/theb/siege_fireraiser.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/theb/siege_fireraiser.png
new file mode 100644
index 0000000000..d5af5a7c41
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/theb/siege_fireraiser.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9e9b2416616ec2582b033f325b00910f3a059b6c52645caf82c344935cbc17b9
+size 89241
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/thracian_rhomphaia.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/thrac/champion_infantry_swordsman.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/thracian_rhomphaia.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/thrac/champion_infantry_swordsman.png