From b9583aefb71efb5d6811d143436e4d75c0ba455c Mon Sep 17 00:00:00 2001
From: elexis <elexis@wildfiregames.com>
Date: Wed, 26 Apr 2017 21:14:16 +0000
Subject: [PATCH] Sort aura templates into a more clear directory structure.

Differential Revision: https://code.wildfiregames.com/D288
Reviewed By: bb
This was SVN commit r19462.
---
 .../data/auras/{ => structures}/cart_super_dock_repair.json | 0
 .../data/auras/{ => structures}/epic_temple_heal.json       | 0
 .../data/auras/{ => structures}/iber_monument.json          | 0
 .../simulation/data/auras/{ => structures}/library.json     | 0
 .../data/auras/{ => structures}/loyalty_regen.json          | 0
 .../simulation/data/auras/{ => structures}/maur_pillar.json | 0
 .../simulation/data/auras/{ => structures}/rotary_mill.json | 0
 .../simulation/data/auras/{ => structures}/temple_heal.json | 0
 .../simulation/data/auras/{ => structures}/theatron.json    | 0
 .../data/auras/{ => structures}/wall_garrisoned.json        | 0
 .../data/auras/{ => structures}/wonder_pop_1.json           | 0
 .../data/auras/{ => structures}/wonder_pop_2.json           | 0
 .../auras/{ => units}/catafalques/athen_catafalque_1.json   | 0
 .../auras/{ => units}/catafalques/athen_catafalque_2.json   | 0
 .../auras/{ => units}/catafalques/brit_catafalque_1.json    | 0
 .../auras/{ => units}/catafalques/brit_catafalque_2.json    | 0
 .../data/auras/{ => units}/catafalques/cart_catafalque.json | 0
 .../auras/{ => units}/catafalques/gaul_catafalque_1.json    | 0
 .../auras/{ => units}/catafalques/gaul_catafalque_2.json    | 0
 .../auras/{ => units}/catafalques/iber_catafalque_1.json    | 0
 .../auras/{ => units}/catafalques/iber_catafalque_2.json    | 0
 .../data/auras/{ => units}/catafalques/mace_catafalque.json | 0
 .../auras/{ => units}/catafalques/maur_catafalque_1.json    | 0
 .../auras/{ => units}/catafalques/maur_catafalque_2.json    | 0
 .../data/auras/{ => units}/catafalques/pers_catafalque.json | 0
 .../data/auras/{ => units}/catafalques/ptol_catafalque.json | 0
 .../auras/{ => units}/catafalques/rome_catafalque_1.json    | 0
 .../auras/{ => units}/catafalques/rome_catafalque_2.json    | 0
 .../auras/{ => units}/catafalques/sele_catafalque_1.json    | 0
 .../auras/{ => units}/catafalques/sele_catafalque_2.json    | 0
 .../auras/{ => units}/catafalques/sele_catafalque_3.json    | 0
 .../auras/{ => units}/catafalques/spart_catafalque_1.json   | 0
 .../auras/{ => units}/catafalques/spart_catafalque_2.json   | 0
 .../auras/{ => units}/catafalques/spart_catafalque_3.json   | 0
 .../data/auras/{ => units}/female_inspiration.json          | 0
 .../auras/{ => units/heroes}/athen_hero_iphicrates_1.json   | 0
 .../auras/{ => units/heroes}/athen_hero_iphicrates_2.json   | 0
 .../auras/{ => units/heroes}/athen_hero_pericles_1.json     | 0
 .../auras/{ => units/heroes}/athen_hero_pericles_2.json     | 0
 .../auras/{ => units/heroes}/athen_hero_themistocles_1.json | 0
 .../auras/{ => units/heroes}/athen_hero_themistocles_2.json | 0
 .../data/auras/{ => units/heroes}/brit_hero_boudicca.json   | 0
 .../data/auras/{ => units/heroes}/brit_hero_caratacos.json  | 0
 .../data/auras/{ => units/heroes}/brit_hero_cunobelin.json  | 0
 .../data/auras/{ => units/heroes}/cart_hero_hamilcar.json   | 0
 .../data/auras/{ => units/heroes}/cart_hero_hannibal.json   | 0
 .../data/auras/{ => units/heroes}/cart_hero_maharbal.json   | 0
 .../data/auras/{ => units/heroes}/gaul_hero_brennus.json    | 0
 .../auras/{ => units/heroes}/gaul_hero_britomartus.json     | 0
 .../auras/{ => units/heroes}/gaul_hero_vercingetorix.json   | 0
 .../data/auras/{ => units/heroes}/hero_garrison.json        | 0
 .../data/auras/{ => units/heroes}/mace_hero_alexander.json  | 0
 .../data/auras/{ => units/heroes}/mace_hero_craterus.json   | 0
 .../data/auras/{ => units/heroes}/mace_hero_demetrius.json  | 0
 .../data/auras/{ => units/heroes}/mace_hero_philip.json     | 0
 .../data/auras/{ => units/heroes}/mace_hero_pyrrhus.json    | 0
 .../data/auras/{ => units/heroes}/maur_hero_ashoka.json     | 0
 .../data/auras/{ => units/heroes}/maur_hero_chanakya.json   | 0
 .../data/auras/{ => units/heroes}/pers_hero_cyrus.json      | 0
 .../data/auras/{ => units/heroes}/pers_hero_darius.json     | 0
 .../data/auras/{ => units/heroes}/pers_hero_xerxes.json     | 0
 .../auras/{ => units/heroes}/ptol_hero_cleopatra_1.json     | 0
 .../auras/{ => units/heroes}/ptol_hero_cleopatra_2.json     | 0
 .../auras/{ => units/heroes}/ptol_hero_cleopatra_3.json     | 0
 .../data/auras/{ => units/heroes}/ptol_hero_ptolemy_IV.json | 0
 .../auras/{ => units/heroes}/ptol_hero_ptolemy_I_1.json     | 0
 .../auras/{ => units/heroes}/ptol_hero_ptolemy_I_2.json     | 0
 .../data/auras/{ => units/heroes}/rome_hero_marcellus.json  | 0
 .../data/auras/{ => units/heroes}/rome_hero_maximus.json    | 0
 .../auras/{ => units/heroes}/sele_hero_antiochus_great.json | 0
 .../{ => units/heroes}/sele_hero_antiochus_righteous.json   | 0
 .../auras/{ => units/heroes}/sele_hero_seleucus_victor.json | 0
 .../data/auras/{ => units/heroes}/spart_hero_brasidas.json  | 0
 .../data/auras/{ => units/heroes}/spart_hero_leonidas.json  | 0
 .../templates/other/catafalque/athen_catafalque.xml         | 5 ++++-
 .../templates/other/catafalque/brit_catafalque.xml          | 5 ++++-
 .../templates/other/catafalque/cart_catafalque.xml          | 4 +++-
 .../templates/other/catafalque/gaul_catafalque.xml          | 5 ++++-
 .../templates/other/catafalque/iber_catafalque.xml          | 5 ++++-
 .../templates/other/catafalque/mace_catafalque.xml          | 4 +++-
 .../templates/other/catafalque/maur_catafalque.xml          | 5 ++++-
 .../templates/other/catafalque/pers_catafalque.xml          | 4 +++-
 .../templates/other/catafalque/ptol_catafalque.xml          | 4 +++-
 .../templates/other/catafalque/rome_catafalque.xml          | 5 ++++-
 .../templates/other/catafalque/sele_catafalque.xml          | 6 +++++-
 .../templates/other/catafalque/spart_catafalque.xml         | 6 +++++-
 .../public/simulation/templates/special/player_athen.xml    | 4 +++-
 .../public/simulation/templates/special/player_cart.xml     | 4 +++-
 .../public/simulation/templates/special/player_iber.xml     | 4 +++-
 .../public/simulation/templates/special/player_maur.xml     | 4 +++-
 .../public/simulation/templates/special/player_pers.xml     | 4 +++-
 .../public/simulation/templates/special/player_ptol.xml     | 4 +++-
 .../public/simulation/templates/special/player_sele.xml     | 4 +++-
 .../public/simulation/templates/structures/athen_wonder.xml | 2 +-
 .../simulation/templates/structures/cart_super_dock.xml     | 4 +++-
 .../public/simulation/templates/structures/cart_wonder.xml  | 2 +-
 .../simulation/templates/structures/iber_monument.xml       | 4 +++-
 .../public/simulation/templates/structures/mace_wonder.xml  | 2 +-
 .../simulation/templates/structures/maur_pillar_ashoka.xml  | 4 +++-
 .../simulation/templates/structures/pers_ishtar_gate.xml    | 4 +++-
 .../public/simulation/templates/structures/ptol_wonder.xml  | 2 +-
 .../simulation/templates/structures/rome_temple_vesta.xml   | 4 +++-
 .../public/simulation/templates/structures/rome_wonder.xml  | 4 +++-
 .../public/simulation/templates/structures/spart_wonder.xml | 2 +-
 .../templates/template_structure_civic_temple.xml           | 4 +++-
 .../templates/template_structure_defense_wall_long.xml      | 4 +++-
 .../templates/template_structure_defense_wall_medium.xml    | 4 +++-
 .../templates/template_structure_special_library.xml        | 4 +++-
 .../templates/template_structure_special_rotarymill.xml     | 4 +++-
 .../templates/template_structure_special_theatron.xml       | 4 +++-
 .../simulation/templates/template_structure_wonder.xml      | 5 ++++-
 .../mods/public/simulation/templates/template_unit_hero.xml | 4 +++-
 .../templates/template_unit_support_female_citizen.xml      | 4 +++-
 .../simulation/templates/units/athen_hero_iphicrates.xml    | 5 ++++-
 .../simulation/templates/units/athen_hero_pericles.xml      | 5 ++++-
 .../simulation/templates/units/athen_hero_themistocles.xml  | 5 ++++-
 .../simulation/templates/units/brit_hero_boudicca.xml       | 4 +++-
 .../simulation/templates/units/brit_hero_boudicca_sword.xml | 4 +++-
 .../simulation/templates/units/brit_hero_caratacos.xml      | 4 +++-
 .../simulation/templates/units/brit_hero_cunobelin.xml      | 4 +++-
 .../templates/units/brit_hero_cunobelin_infantry.xml        | 4 +++-
 .../simulation/templates/units/cart_hero_hamilcar.xml       | 4 +++-
 .../simulation/templates/units/cart_hero_hannibal.xml       | 4 +++-
 .../simulation/templates/units/cart_hero_maharbal.xml       | 4 +++-
 .../public/simulation/templates/units/gaul_hero_brennus.xml | 4 +++-
 .../simulation/templates/units/gaul_hero_britomartus.xml    | 4 +++-
 .../simulation/templates/units/gaul_hero_vercingetorix.xml  | 4 +++-
 .../simulation/templates/units/mace_hero_alexander.xml      | 4 +++-
 .../simulation/templates/units/mace_hero_craterus.xml       | 4 +++-
 .../simulation/templates/units/mace_hero_demetrius.xml      | 4 +++-
 .../public/simulation/templates/units/mace_hero_philip.xml  | 4 +++-
 .../simulation/templates/units/mace_hero_philip_pike.xml    | 4 +++-
 .../public/simulation/templates/units/mace_hero_pyrrhus.xml | 4 +++-
 .../public/simulation/templates/units/maur_hero_ashoka.xml  | 4 +++-
 .../simulation/templates/units/maur_hero_chanakya.xml       | 5 ++++-
 .../public/simulation/templates/units/pers_hero_cyrus.xml   | 4 +++-
 .../public/simulation/templates/units/pers_hero_darius.xml  | 4 +++-
 .../public/simulation/templates/units/pers_hero_xerxes.xml  | 4 +++-
 .../simulation/templates/units/pers_hero_xerxes_chariot.xml | 4 +++-
 .../simulation/templates/units/ptol_hero_cleopatra.xml      | 6 +++++-
 .../simulation/templates/units/ptol_hero_ptolemy_I.xml      | 5 ++++-
 .../simulation/templates/units/ptol_hero_ptolemy_IV.xml     | 4 +++-
 .../simulation/templates/units/rome_hero_marcellus.xml      | 4 +++-
 .../public/simulation/templates/units/rome_hero_maximus.xml | 4 +++-
 .../templates/units/sele_hero_antiochus_great.xml           | 4 +++-
 .../templates/units/sele_hero_antiochus_righteous.xml       | 4 +++-
 .../templates/units/sele_hero_seleucus_victor.xml           | 4 +++-
 .../simulation/templates/units/spart_hero_brasidas.xml      | 4 +++-
 .../simulation/templates/units/spart_hero_leonidas.xml      | 4 +++-
 149 files changed, 233 insertions(+), 75 deletions(-)
 rename binaries/data/mods/public/simulation/data/auras/{ => structures}/cart_super_dock_repair.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => structures}/epic_temple_heal.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => structures}/iber_monument.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => structures}/library.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => structures}/loyalty_regen.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => structures}/maur_pillar.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => structures}/rotary_mill.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => structures}/temple_heal.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => structures}/theatron.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => structures}/wall_garrisoned.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => structures}/wonder_pop_1.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => structures}/wonder_pop_2.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units}/catafalques/athen_catafalque_1.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units}/catafalques/athen_catafalque_2.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units}/catafalques/brit_catafalque_1.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units}/catafalques/brit_catafalque_2.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units}/catafalques/cart_catafalque.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units}/catafalques/gaul_catafalque_1.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units}/catafalques/gaul_catafalque_2.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units}/catafalques/iber_catafalque_1.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units}/catafalques/iber_catafalque_2.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units}/catafalques/mace_catafalque.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units}/catafalques/maur_catafalque_1.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units}/catafalques/maur_catafalque_2.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units}/catafalques/pers_catafalque.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units}/catafalques/ptol_catafalque.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units}/catafalques/rome_catafalque_1.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units}/catafalques/rome_catafalque_2.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units}/catafalques/sele_catafalque_1.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units}/catafalques/sele_catafalque_2.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units}/catafalques/sele_catafalque_3.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units}/catafalques/spart_catafalque_1.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units}/catafalques/spart_catafalque_2.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units}/catafalques/spart_catafalque_3.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units}/female_inspiration.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/athen_hero_iphicrates_1.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/athen_hero_iphicrates_2.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/athen_hero_pericles_1.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/athen_hero_pericles_2.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/athen_hero_themistocles_1.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/athen_hero_themistocles_2.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/brit_hero_boudicca.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/brit_hero_caratacos.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/brit_hero_cunobelin.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/cart_hero_hamilcar.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/cart_hero_hannibal.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/cart_hero_maharbal.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/gaul_hero_brennus.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/gaul_hero_britomartus.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/gaul_hero_vercingetorix.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/hero_garrison.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/mace_hero_alexander.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/mace_hero_craterus.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/mace_hero_demetrius.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/mace_hero_philip.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/mace_hero_pyrrhus.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/maur_hero_ashoka.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/maur_hero_chanakya.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/pers_hero_cyrus.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/pers_hero_darius.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/pers_hero_xerxes.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/ptol_hero_cleopatra_1.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/ptol_hero_cleopatra_2.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/ptol_hero_cleopatra_3.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/ptol_hero_ptolemy_IV.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/ptol_hero_ptolemy_I_1.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/ptol_hero_ptolemy_I_2.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/rome_hero_marcellus.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/rome_hero_maximus.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/sele_hero_antiochus_great.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/sele_hero_antiochus_righteous.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/sele_hero_seleucus_victor.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/spart_hero_brasidas.json (100%)
 rename binaries/data/mods/public/simulation/data/auras/{ => units/heroes}/spart_hero_leonidas.json (100%)

diff --git a/binaries/data/mods/public/simulation/data/auras/cart_super_dock_repair.json b/binaries/data/mods/public/simulation/data/auras/structures/cart_super_dock_repair.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/cart_super_dock_repair.json
rename to binaries/data/mods/public/simulation/data/auras/structures/cart_super_dock_repair.json
diff --git a/binaries/data/mods/public/simulation/data/auras/epic_temple_heal.json b/binaries/data/mods/public/simulation/data/auras/structures/epic_temple_heal.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/epic_temple_heal.json
rename to binaries/data/mods/public/simulation/data/auras/structures/epic_temple_heal.json
diff --git a/binaries/data/mods/public/simulation/data/auras/iber_monument.json b/binaries/data/mods/public/simulation/data/auras/structures/iber_monument.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/iber_monument.json
rename to binaries/data/mods/public/simulation/data/auras/structures/iber_monument.json
diff --git a/binaries/data/mods/public/simulation/data/auras/library.json b/binaries/data/mods/public/simulation/data/auras/structures/library.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/library.json
rename to binaries/data/mods/public/simulation/data/auras/structures/library.json
diff --git a/binaries/data/mods/public/simulation/data/auras/loyalty_regen.json b/binaries/data/mods/public/simulation/data/auras/structures/loyalty_regen.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/loyalty_regen.json
rename to binaries/data/mods/public/simulation/data/auras/structures/loyalty_regen.json
diff --git a/binaries/data/mods/public/simulation/data/auras/maur_pillar.json b/binaries/data/mods/public/simulation/data/auras/structures/maur_pillar.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/maur_pillar.json
rename to binaries/data/mods/public/simulation/data/auras/structures/maur_pillar.json
diff --git a/binaries/data/mods/public/simulation/data/auras/rotary_mill.json b/binaries/data/mods/public/simulation/data/auras/structures/rotary_mill.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/rotary_mill.json
rename to binaries/data/mods/public/simulation/data/auras/structures/rotary_mill.json
diff --git a/binaries/data/mods/public/simulation/data/auras/temple_heal.json b/binaries/data/mods/public/simulation/data/auras/structures/temple_heal.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/temple_heal.json
rename to binaries/data/mods/public/simulation/data/auras/structures/temple_heal.json
diff --git a/binaries/data/mods/public/simulation/data/auras/theatron.json b/binaries/data/mods/public/simulation/data/auras/structures/theatron.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/theatron.json
rename to binaries/data/mods/public/simulation/data/auras/structures/theatron.json
diff --git a/binaries/data/mods/public/simulation/data/auras/wall_garrisoned.json b/binaries/data/mods/public/simulation/data/auras/structures/wall_garrisoned.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/wall_garrisoned.json
rename to binaries/data/mods/public/simulation/data/auras/structures/wall_garrisoned.json
diff --git a/binaries/data/mods/public/simulation/data/auras/wonder_pop_1.json b/binaries/data/mods/public/simulation/data/auras/structures/wonder_pop_1.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/wonder_pop_1.json
rename to binaries/data/mods/public/simulation/data/auras/structures/wonder_pop_1.json
diff --git a/binaries/data/mods/public/simulation/data/auras/wonder_pop_2.json b/binaries/data/mods/public/simulation/data/auras/structures/wonder_pop_2.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/wonder_pop_2.json
rename to binaries/data/mods/public/simulation/data/auras/structures/wonder_pop_2.json
diff --git a/binaries/data/mods/public/simulation/data/auras/catafalques/athen_catafalque_1.json b/binaries/data/mods/public/simulation/data/auras/units/catafalques/athen_catafalque_1.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/catafalques/athen_catafalque_1.json
rename to binaries/data/mods/public/simulation/data/auras/units/catafalques/athen_catafalque_1.json
diff --git a/binaries/data/mods/public/simulation/data/auras/catafalques/athen_catafalque_2.json b/binaries/data/mods/public/simulation/data/auras/units/catafalques/athen_catafalque_2.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/catafalques/athen_catafalque_2.json
rename to binaries/data/mods/public/simulation/data/auras/units/catafalques/athen_catafalque_2.json
diff --git a/binaries/data/mods/public/simulation/data/auras/catafalques/brit_catafalque_1.json b/binaries/data/mods/public/simulation/data/auras/units/catafalques/brit_catafalque_1.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/catafalques/brit_catafalque_1.json
rename to binaries/data/mods/public/simulation/data/auras/units/catafalques/brit_catafalque_1.json
diff --git a/binaries/data/mods/public/simulation/data/auras/catafalques/brit_catafalque_2.json b/binaries/data/mods/public/simulation/data/auras/units/catafalques/brit_catafalque_2.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/catafalques/brit_catafalque_2.json
rename to binaries/data/mods/public/simulation/data/auras/units/catafalques/brit_catafalque_2.json
diff --git a/binaries/data/mods/public/simulation/data/auras/catafalques/cart_catafalque.json b/binaries/data/mods/public/simulation/data/auras/units/catafalques/cart_catafalque.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/catafalques/cart_catafalque.json
rename to binaries/data/mods/public/simulation/data/auras/units/catafalques/cart_catafalque.json
diff --git a/binaries/data/mods/public/simulation/data/auras/catafalques/gaul_catafalque_1.json b/binaries/data/mods/public/simulation/data/auras/units/catafalques/gaul_catafalque_1.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/catafalques/gaul_catafalque_1.json
rename to binaries/data/mods/public/simulation/data/auras/units/catafalques/gaul_catafalque_1.json
diff --git a/binaries/data/mods/public/simulation/data/auras/catafalques/gaul_catafalque_2.json b/binaries/data/mods/public/simulation/data/auras/units/catafalques/gaul_catafalque_2.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/catafalques/gaul_catafalque_2.json
rename to binaries/data/mods/public/simulation/data/auras/units/catafalques/gaul_catafalque_2.json
diff --git a/binaries/data/mods/public/simulation/data/auras/catafalques/iber_catafalque_1.json b/binaries/data/mods/public/simulation/data/auras/units/catafalques/iber_catafalque_1.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/catafalques/iber_catafalque_1.json
rename to binaries/data/mods/public/simulation/data/auras/units/catafalques/iber_catafalque_1.json
diff --git a/binaries/data/mods/public/simulation/data/auras/catafalques/iber_catafalque_2.json b/binaries/data/mods/public/simulation/data/auras/units/catafalques/iber_catafalque_2.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/catafalques/iber_catafalque_2.json
rename to binaries/data/mods/public/simulation/data/auras/units/catafalques/iber_catafalque_2.json
diff --git a/binaries/data/mods/public/simulation/data/auras/catafalques/mace_catafalque.json b/binaries/data/mods/public/simulation/data/auras/units/catafalques/mace_catafalque.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/catafalques/mace_catafalque.json
rename to binaries/data/mods/public/simulation/data/auras/units/catafalques/mace_catafalque.json
diff --git a/binaries/data/mods/public/simulation/data/auras/catafalques/maur_catafalque_1.json b/binaries/data/mods/public/simulation/data/auras/units/catafalques/maur_catafalque_1.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/catafalques/maur_catafalque_1.json
rename to binaries/data/mods/public/simulation/data/auras/units/catafalques/maur_catafalque_1.json
diff --git a/binaries/data/mods/public/simulation/data/auras/catafalques/maur_catafalque_2.json b/binaries/data/mods/public/simulation/data/auras/units/catafalques/maur_catafalque_2.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/catafalques/maur_catafalque_2.json
rename to binaries/data/mods/public/simulation/data/auras/units/catafalques/maur_catafalque_2.json
diff --git a/binaries/data/mods/public/simulation/data/auras/catafalques/pers_catafalque.json b/binaries/data/mods/public/simulation/data/auras/units/catafalques/pers_catafalque.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/catafalques/pers_catafalque.json
rename to binaries/data/mods/public/simulation/data/auras/units/catafalques/pers_catafalque.json
diff --git a/binaries/data/mods/public/simulation/data/auras/catafalques/ptol_catafalque.json b/binaries/data/mods/public/simulation/data/auras/units/catafalques/ptol_catafalque.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/catafalques/ptol_catafalque.json
rename to binaries/data/mods/public/simulation/data/auras/units/catafalques/ptol_catafalque.json
diff --git a/binaries/data/mods/public/simulation/data/auras/catafalques/rome_catafalque_1.json b/binaries/data/mods/public/simulation/data/auras/units/catafalques/rome_catafalque_1.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/catafalques/rome_catafalque_1.json
rename to binaries/data/mods/public/simulation/data/auras/units/catafalques/rome_catafalque_1.json
diff --git a/binaries/data/mods/public/simulation/data/auras/catafalques/rome_catafalque_2.json b/binaries/data/mods/public/simulation/data/auras/units/catafalques/rome_catafalque_2.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/catafalques/rome_catafalque_2.json
rename to binaries/data/mods/public/simulation/data/auras/units/catafalques/rome_catafalque_2.json
diff --git a/binaries/data/mods/public/simulation/data/auras/catafalques/sele_catafalque_1.json b/binaries/data/mods/public/simulation/data/auras/units/catafalques/sele_catafalque_1.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/catafalques/sele_catafalque_1.json
rename to binaries/data/mods/public/simulation/data/auras/units/catafalques/sele_catafalque_1.json
diff --git a/binaries/data/mods/public/simulation/data/auras/catafalques/sele_catafalque_2.json b/binaries/data/mods/public/simulation/data/auras/units/catafalques/sele_catafalque_2.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/catafalques/sele_catafalque_2.json
rename to binaries/data/mods/public/simulation/data/auras/units/catafalques/sele_catafalque_2.json
diff --git a/binaries/data/mods/public/simulation/data/auras/catafalques/sele_catafalque_3.json b/binaries/data/mods/public/simulation/data/auras/units/catafalques/sele_catafalque_3.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/catafalques/sele_catafalque_3.json
rename to binaries/data/mods/public/simulation/data/auras/units/catafalques/sele_catafalque_3.json
diff --git a/binaries/data/mods/public/simulation/data/auras/catafalques/spart_catafalque_1.json b/binaries/data/mods/public/simulation/data/auras/units/catafalques/spart_catafalque_1.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/catafalques/spart_catafalque_1.json
rename to binaries/data/mods/public/simulation/data/auras/units/catafalques/spart_catafalque_1.json
diff --git a/binaries/data/mods/public/simulation/data/auras/catafalques/spart_catafalque_2.json b/binaries/data/mods/public/simulation/data/auras/units/catafalques/spart_catafalque_2.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/catafalques/spart_catafalque_2.json
rename to binaries/data/mods/public/simulation/data/auras/units/catafalques/spart_catafalque_2.json
diff --git a/binaries/data/mods/public/simulation/data/auras/catafalques/spart_catafalque_3.json b/binaries/data/mods/public/simulation/data/auras/units/catafalques/spart_catafalque_3.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/catafalques/spart_catafalque_3.json
rename to binaries/data/mods/public/simulation/data/auras/units/catafalques/spart_catafalque_3.json
diff --git a/binaries/data/mods/public/simulation/data/auras/female_inspiration.json b/binaries/data/mods/public/simulation/data/auras/units/female_inspiration.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/female_inspiration.json
rename to binaries/data/mods/public/simulation/data/auras/units/female_inspiration.json
diff --git a/binaries/data/mods/public/simulation/data/auras/athen_hero_iphicrates_1.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_iphicrates_1.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/athen_hero_iphicrates_1.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_iphicrates_1.json
diff --git a/binaries/data/mods/public/simulation/data/auras/athen_hero_iphicrates_2.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_iphicrates_2.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/athen_hero_iphicrates_2.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_iphicrates_2.json
diff --git a/binaries/data/mods/public/simulation/data/auras/athen_hero_pericles_1.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_pericles_1.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/athen_hero_pericles_1.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_pericles_1.json
diff --git a/binaries/data/mods/public/simulation/data/auras/athen_hero_pericles_2.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_pericles_2.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/athen_hero_pericles_2.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_pericles_2.json
diff --git a/binaries/data/mods/public/simulation/data/auras/athen_hero_themistocles_1.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_themistocles_1.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/athen_hero_themistocles_1.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_themistocles_1.json
diff --git a/binaries/data/mods/public/simulation/data/auras/athen_hero_themistocles_2.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_themistocles_2.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/athen_hero_themistocles_2.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_themistocles_2.json
diff --git a/binaries/data/mods/public/simulation/data/auras/brit_hero_boudicca.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/brit_hero_boudicca.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/brit_hero_boudicca.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/brit_hero_boudicca.json
diff --git a/binaries/data/mods/public/simulation/data/auras/brit_hero_caratacos.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/brit_hero_caratacos.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/brit_hero_caratacos.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/brit_hero_caratacos.json
diff --git a/binaries/data/mods/public/simulation/data/auras/brit_hero_cunobelin.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/brit_hero_cunobelin.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/brit_hero_cunobelin.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/brit_hero_cunobelin.json
diff --git a/binaries/data/mods/public/simulation/data/auras/cart_hero_hamilcar.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/cart_hero_hamilcar.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/cart_hero_hamilcar.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/cart_hero_hamilcar.json
diff --git a/binaries/data/mods/public/simulation/data/auras/cart_hero_hannibal.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/cart_hero_hannibal.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/cart_hero_hannibal.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/cart_hero_hannibal.json
diff --git a/binaries/data/mods/public/simulation/data/auras/cart_hero_maharbal.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/cart_hero_maharbal.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/cart_hero_maharbal.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/cart_hero_maharbal.json
diff --git a/binaries/data/mods/public/simulation/data/auras/gaul_hero_brennus.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/gaul_hero_brennus.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/gaul_hero_brennus.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/gaul_hero_brennus.json
diff --git a/binaries/data/mods/public/simulation/data/auras/gaul_hero_britomartus.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/gaul_hero_britomartus.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/gaul_hero_britomartus.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/gaul_hero_britomartus.json
diff --git a/binaries/data/mods/public/simulation/data/auras/gaul_hero_vercingetorix.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/gaul_hero_vercingetorix.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/gaul_hero_vercingetorix.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/gaul_hero_vercingetorix.json
diff --git a/binaries/data/mods/public/simulation/data/auras/hero_garrison.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/hero_garrison.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/hero_garrison.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/hero_garrison.json
diff --git a/binaries/data/mods/public/simulation/data/auras/mace_hero_alexander.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_alexander.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/mace_hero_alexander.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_alexander.json
diff --git a/binaries/data/mods/public/simulation/data/auras/mace_hero_craterus.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_craterus.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/mace_hero_craterus.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_craterus.json
diff --git a/binaries/data/mods/public/simulation/data/auras/mace_hero_demetrius.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_demetrius.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/mace_hero_demetrius.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_demetrius.json
diff --git a/binaries/data/mods/public/simulation/data/auras/mace_hero_philip.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_philip.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/mace_hero_philip.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_philip.json
diff --git a/binaries/data/mods/public/simulation/data/auras/mace_hero_pyrrhus.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_pyrrhus.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/mace_hero_pyrrhus.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_pyrrhus.json
diff --git a/binaries/data/mods/public/simulation/data/auras/maur_hero_ashoka.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/maur_hero_ashoka.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/maur_hero_ashoka.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/maur_hero_ashoka.json
diff --git a/binaries/data/mods/public/simulation/data/auras/maur_hero_chanakya.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/maur_hero_chanakya.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/maur_hero_chanakya.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/maur_hero_chanakya.json
diff --git a/binaries/data/mods/public/simulation/data/auras/pers_hero_cyrus.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/pers_hero_cyrus.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/pers_hero_cyrus.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/pers_hero_cyrus.json
diff --git a/binaries/data/mods/public/simulation/data/auras/pers_hero_darius.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/pers_hero_darius.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/pers_hero_darius.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/pers_hero_darius.json
diff --git a/binaries/data/mods/public/simulation/data/auras/pers_hero_xerxes.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/pers_hero_xerxes.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/pers_hero_xerxes.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/pers_hero_xerxes.json
diff --git a/binaries/data/mods/public/simulation/data/auras/ptol_hero_cleopatra_1.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_cleopatra_1.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/ptol_hero_cleopatra_1.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_cleopatra_1.json
diff --git a/binaries/data/mods/public/simulation/data/auras/ptol_hero_cleopatra_2.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_cleopatra_2.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/ptol_hero_cleopatra_2.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_cleopatra_2.json
diff --git a/binaries/data/mods/public/simulation/data/auras/ptol_hero_cleopatra_3.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_cleopatra_3.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/ptol_hero_cleopatra_3.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_cleopatra_3.json
diff --git a/binaries/data/mods/public/simulation/data/auras/ptol_hero_ptolemy_IV.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_ptolemy_IV.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/ptol_hero_ptolemy_IV.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_ptolemy_IV.json
diff --git a/binaries/data/mods/public/simulation/data/auras/ptol_hero_ptolemy_I_1.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_ptolemy_I_1.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/ptol_hero_ptolemy_I_1.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_ptolemy_I_1.json
diff --git a/binaries/data/mods/public/simulation/data/auras/ptol_hero_ptolemy_I_2.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_ptolemy_I_2.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/ptol_hero_ptolemy_I_2.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_ptolemy_I_2.json
diff --git a/binaries/data/mods/public/simulation/data/auras/rome_hero_marcellus.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/rome_hero_marcellus.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/rome_hero_marcellus.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/rome_hero_marcellus.json
diff --git a/binaries/data/mods/public/simulation/data/auras/rome_hero_maximus.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/rome_hero_maximus.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/rome_hero_maximus.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/rome_hero_maximus.json
diff --git a/binaries/data/mods/public/simulation/data/auras/sele_hero_antiochus_great.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/sele_hero_antiochus_great.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/sele_hero_antiochus_great.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/sele_hero_antiochus_great.json
diff --git a/binaries/data/mods/public/simulation/data/auras/sele_hero_antiochus_righteous.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/sele_hero_antiochus_righteous.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/sele_hero_antiochus_righteous.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/sele_hero_antiochus_righteous.json
diff --git a/binaries/data/mods/public/simulation/data/auras/sele_hero_seleucus_victor.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/sele_hero_seleucus_victor.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/sele_hero_seleucus_victor.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/sele_hero_seleucus_victor.json
diff --git a/binaries/data/mods/public/simulation/data/auras/spart_hero_brasidas.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_brasidas.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/spart_hero_brasidas.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_brasidas.json
diff --git a/binaries/data/mods/public/simulation/data/auras/spart_hero_leonidas.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_leonidas.json
similarity index 100%
rename from binaries/data/mods/public/simulation/data/auras/spart_hero_leonidas.json
rename to binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_leonidas.json
diff --git a/binaries/data/mods/public/simulation/templates/other/catafalque/athen_catafalque.xml b/binaries/data/mods/public/simulation/templates/other/catafalque/athen_catafalque.xml
index 149a32ed10..c8534329a8 100644
--- a/binaries/data/mods/public/simulation/templates/other/catafalque/athen_catafalque.xml
+++ b/binaries/data/mods/public/simulation/templates/other/catafalque/athen_catafalque.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="other/special_catafalque">
-  <Auras datatype="tokens">catafalques/athen_catafalque_1 catafalques/athen_catafalque_2</Auras>
+  <Auras datatype="tokens">
+    units/catafalques/athen_catafalque_1
+    units/catafalques/athen_catafalque_2
+  </Auras>
   <Identity>
     <Civ>athen</Civ>
     <SpecificName>Solon</SpecificName>
diff --git a/binaries/data/mods/public/simulation/templates/other/catafalque/brit_catafalque.xml b/binaries/data/mods/public/simulation/templates/other/catafalque/brit_catafalque.xml
index 04898ba807..500ca45eb4 100644
--- a/binaries/data/mods/public/simulation/templates/other/catafalque/brit_catafalque.xml
+++ b/binaries/data/mods/public/simulation/templates/other/catafalque/brit_catafalque.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="other/special_catafalque">
-  <Auras datatype="tokens">catafalques/brit_catafalque_1 catafalques/brit_catafalque_2</Auras>
+  <Auras datatype="tokens">
+    units/catafalques/brit_catafalque_1
+    units/catafalques/brit_catafalque_2
+  </Auras>
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Cassivellaunus</SpecificName>
diff --git a/binaries/data/mods/public/simulation/templates/other/catafalque/cart_catafalque.xml b/binaries/data/mods/public/simulation/templates/other/catafalque/cart_catafalque.xml
index c6f49ca669..1658bd1298 100644
--- a/binaries/data/mods/public/simulation/templates/other/catafalque/cart_catafalque.xml
+++ b/binaries/data/mods/public/simulation/templates/other/catafalque/cart_catafalque.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="other/special_catafalque">
-  <Auras datatype="tokens">catafalques/cart_catafalque</Auras>
+  <Auras datatype="tokens">
+    units/catafalques/cart_catafalque
+  </Auras>
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Hasdrubal (Quartermaster)</SpecificName>
diff --git a/binaries/data/mods/public/simulation/templates/other/catafalque/gaul_catafalque.xml b/binaries/data/mods/public/simulation/templates/other/catafalque/gaul_catafalque.xml
index 73fb17dcb1..50bf4e4bc3 100644
--- a/binaries/data/mods/public/simulation/templates/other/catafalque/gaul_catafalque.xml
+++ b/binaries/data/mods/public/simulation/templates/other/catafalque/gaul_catafalque.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="other/special_catafalque">
-  <Auras datatype="tokens">catafalques/gaul_catafalque_1 catafalques/gaul_catafalque_2</Auras>
+  <Auras datatype="tokens">
+    units/catafalques/gaul_catafalque_1
+    units/catafalques/gaul_catafalque_2
+  </Auras>
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Ambiorix</SpecificName>
diff --git a/binaries/data/mods/public/simulation/templates/other/catafalque/iber_catafalque.xml b/binaries/data/mods/public/simulation/templates/other/catafalque/iber_catafalque.xml
index 284c37effd..b23bbb366b 100644
--- a/binaries/data/mods/public/simulation/templates/other/catafalque/iber_catafalque.xml
+++ b/binaries/data/mods/public/simulation/templates/other/catafalque/iber_catafalque.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="other/special_catafalque">
-  <Auras datatype="tokens">catafalques/iber_catafalque_1 catafalques/iber_catafalque_2</Auras>
+  <Auras datatype="tokens">
+    units/catafalques/iber_catafalque_1
+    units/catafalques/iber_catafalque_2
+  </Auras>
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Mandonius</SpecificName>
diff --git a/binaries/data/mods/public/simulation/templates/other/catafalque/mace_catafalque.xml b/binaries/data/mods/public/simulation/templates/other/catafalque/mace_catafalque.xml
index 306097a792..ccbd066810 100644
--- a/binaries/data/mods/public/simulation/templates/other/catafalque/mace_catafalque.xml
+++ b/binaries/data/mods/public/simulation/templates/other/catafalque/mace_catafalque.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="other/special_catafalque">
-  <Auras datatype="tokens">catafalques/mace_catafalque</Auras>
+  <Auras datatype="tokens">
+    units/catafalques/mace_catafalque
+  </Auras>
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Philip V</SpecificName>
diff --git a/binaries/data/mods/public/simulation/templates/other/catafalque/maur_catafalque.xml b/binaries/data/mods/public/simulation/templates/other/catafalque/maur_catafalque.xml
index 30a5e6069c..e4144ee8cf 100644
--- a/binaries/data/mods/public/simulation/templates/other/catafalque/maur_catafalque.xml
+++ b/binaries/data/mods/public/simulation/templates/other/catafalque/maur_catafalque.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="other/special_catafalque">
-  <Auras datatype="tokens">catafalques/maur_catafalque_1 catafalques/maur_catafalque_2</Auras>
+  <Auras datatype="tokens">
+    units/catafalques/maur_catafalque_1
+    units/catafalques/maur_catafalque_2
+  </Auras>
   <Identity>
     <Civ>maur</Civ>
     <SpecificName>Bindusara</SpecificName>
diff --git a/binaries/data/mods/public/simulation/templates/other/catafalque/pers_catafalque.xml b/binaries/data/mods/public/simulation/templates/other/catafalque/pers_catafalque.xml
index d27c63ddd5..7e39e719b6 100644
--- a/binaries/data/mods/public/simulation/templates/other/catafalque/pers_catafalque.xml
+++ b/binaries/data/mods/public/simulation/templates/other/catafalque/pers_catafalque.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="other/special_catafalque">
-  <Auras datatype="tokens">catafalques/pers_catafalque</Auras>
+  <Auras datatype="tokens">
+    units/catafalques/pers_catafalque
+  </Auras>
   <Identity>
     <Civ>pers</Civ>
     <SpecificName>Artaxerxes II</SpecificName>
diff --git a/binaries/data/mods/public/simulation/templates/other/catafalque/ptol_catafalque.xml b/binaries/data/mods/public/simulation/templates/other/catafalque/ptol_catafalque.xml
index 6b4c3ed38a..4e9a748777 100644
--- a/binaries/data/mods/public/simulation/templates/other/catafalque/ptol_catafalque.xml
+++ b/binaries/data/mods/public/simulation/templates/other/catafalque/ptol_catafalque.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="other/special_catafalque">
-  <Auras datatype="tokens">catafalques/ptol_catafalque</Auras>
+  <Auras datatype="tokens">
+    units/catafalques/ptol_catafalque
+  </Auras>
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Ptolemy III Euergetes (Benefactor)</SpecificName>
diff --git a/binaries/data/mods/public/simulation/templates/other/catafalque/rome_catafalque.xml b/binaries/data/mods/public/simulation/templates/other/catafalque/rome_catafalque.xml
index 2202954771..0712ca4b58 100644
--- a/binaries/data/mods/public/simulation/templates/other/catafalque/rome_catafalque.xml
+++ b/binaries/data/mods/public/simulation/templates/other/catafalque/rome_catafalque.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="other/special_catafalque">
-  <Auras datatype="tokens">catafalques/rome_catafalque_1 catafalques/rome_catafalque_2</Auras>
+  <Auras datatype="tokens">
+    units/catafalques/rome_catafalque_1
+    units/catafalques/rome_catafalque_2
+  </Auras>
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Lucius Junius Brutus</SpecificName>
diff --git a/binaries/data/mods/public/simulation/templates/other/catafalque/sele_catafalque.xml b/binaries/data/mods/public/simulation/templates/other/catafalque/sele_catafalque.xml
index 24254024ac..c73c51550f 100644
--- a/binaries/data/mods/public/simulation/templates/other/catafalque/sele_catafalque.xml
+++ b/binaries/data/mods/public/simulation/templates/other/catafalque/sele_catafalque.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="other/special_catafalque">
-  <Auras datatype="tokens">catafalques/sele_catafalque_1 catafalques/sele_catafalque_2 catafalques/sele_catafalque_3</Auras>
+  <Auras datatype="tokens">
+    units/catafalques/sele_catafalque_1
+    units/catafalques/sele_catafalque_2
+    units/catafalques/sele_catafalque_3
+  </Auras>
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Antiochus I Soter (Savior)</SpecificName>
diff --git a/binaries/data/mods/public/simulation/templates/other/catafalque/spart_catafalque.xml b/binaries/data/mods/public/simulation/templates/other/catafalque/spart_catafalque.xml
index 6fd3ef60a3..8768dce217 100644
--- a/binaries/data/mods/public/simulation/templates/other/catafalque/spart_catafalque.xml
+++ b/binaries/data/mods/public/simulation/templates/other/catafalque/spart_catafalque.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="other/special_catafalque">
-  <Auras datatype="tokens">catafalques/spart_catafalque_1 catafalques/spart_catafalque_2 catafalques/spart_catafalque_3</Auras>
+  <Auras datatype="tokens">
+    units/catafalques/spart_catafalque_1
+    units/catafalques/spart_catafalque_2
+    units/catafalques/spart_catafalque_3
+  </Auras>
   <Identity>
     <Civ>spart</Civ>
     <SpecificName>Lycurgus</SpecificName>
diff --git a/binaries/data/mods/public/simulation/templates/special/player_athen.xml b/binaries/data/mods/public/simulation/templates/special/player_athen.xml
index 0fe43969ca..4c82d447a8 100644
--- a/binaries/data/mods/public/simulation/templates/special/player_athen.xml
+++ b/binaries/data/mods/public/simulation/templates/special/player_athen.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="special/player">
-  <Auras datatype="tokens">teambonuses/athen_player_teambonus</Auras>
+  <Auras datatype="tokens">
+    teambonuses/athen_player_teambonus
+  </Auras>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/special/player_cart.xml b/binaries/data/mods/public/simulation/templates/special/player_cart.xml
index 6a613a64b4..41e6bbbca1 100644
--- a/binaries/data/mods/public/simulation/templates/special/player_cart.xml
+++ b/binaries/data/mods/public/simulation/templates/special/player_cart.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="special/player">
-  <Auras datatype="tokens">teambonuses/cart_player_teambonus</Auras>
+  <Auras datatype="tokens">
+    teambonuses/cart_player_teambonus
+  </Auras>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/special/player_iber.xml b/binaries/data/mods/public/simulation/templates/special/player_iber.xml
index 0658f00d5e..3a633a9be7 100644
--- a/binaries/data/mods/public/simulation/templates/special/player_iber.xml
+++ b/binaries/data/mods/public/simulation/templates/special/player_iber.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="special/player">
-  <Auras datatype="tokens">teambonuses/iber_player_teambonus</Auras>
+  <Auras datatype="tokens">
+    teambonuses/iber_player_teambonus
+  </Auras>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/special/player_maur.xml b/binaries/data/mods/public/simulation/templates/special/player_maur.xml
index b08f7ec7ad..5e312a8b13 100644
--- a/binaries/data/mods/public/simulation/templates/special/player_maur.xml
+++ b/binaries/data/mods/public/simulation/templates/special/player_maur.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="special/player">
-  <Auras datatype="tokens">teambonuses/maur_player_teambonus</Auras>
+  <Auras datatype="tokens">
+    teambonuses/maur_player_teambonus
+  </Auras>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/special/player_pers.xml b/binaries/data/mods/public/simulation/templates/special/player_pers.xml
index 774de4cf1f..f603451e10 100644
--- a/binaries/data/mods/public/simulation/templates/special/player_pers.xml
+++ b/binaries/data/mods/public/simulation/templates/special/player_pers.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="special/player">
-  <Auras datatype="tokens">teambonuses/pers_player_teambonus</Auras>
+  <Auras datatype="tokens">
+    teambonuses/pers_player_teambonus
+  </Auras>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/special/player_ptol.xml b/binaries/data/mods/public/simulation/templates/special/player_ptol.xml
index 1c9a103ecd..40eeef9256 100644
--- a/binaries/data/mods/public/simulation/templates/special/player_ptol.xml
+++ b/binaries/data/mods/public/simulation/templates/special/player_ptol.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="special/player">
-  <Auras datatype="tokens">teambonuses/ptol_player_teambonus</Auras>
+  <Auras datatype="tokens">
+    teambonuses/ptol_player_teambonus
+  </Auras>
   <EntityLimits>
     <LimitRemovers>
       <CivilCentre>
diff --git a/binaries/data/mods/public/simulation/templates/special/player_sele.xml b/binaries/data/mods/public/simulation/templates/special/player_sele.xml
index ae201cb03d..60dd30b525 100644
--- a/binaries/data/mods/public/simulation/templates/special/player_sele.xml
+++ b/binaries/data/mods/public/simulation/templates/special/player_sele.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="special/player">
-  <Auras datatype="tokens">teambonuses/sele_player_teambonus</Auras>
+  <Auras datatype="tokens">
+    teambonuses/sele_player_teambonus
+  </Auras>
   <EntityLimits>
     <LimitRemovers>
       <CivilCentre>
diff --git a/binaries/data/mods/public/simulation/templates/structures/athen_wonder.xml b/binaries/data/mods/public/simulation/templates/structures/athen_wonder.xml
index ae16ee7dc9..e01f2d1741 100644
--- a/binaries/data/mods/public/simulation/templates/structures/athen_wonder.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/athen_wonder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_wonder">
   <Auras datatype="tokens">
-    epic_temple_heal
+    structures/epic_temple_heal
   </Auras>
   <Footprint>
     <Square width="28.0" depth="58.0"/>
diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_super_dock.xml b/binaries/data/mods/public/simulation/templates/structures/cart_super_dock.xml
index 8b8c0783ca..56aa2c7e8b 100644
--- a/binaries/data/mods/public/simulation/templates/structures/cart_super_dock.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/cart_super_dock.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
-  <Auras datatype="tokens">cart_super_dock_repair</Auras>
+  <Auras datatype="tokens">
+    structures/cart_super_dock_repair
+  </Auras>
   <BuildRestrictions>
     <Territory>own ally neutral</Territory>
     <PlacementType>shore</PlacementType>
diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_wonder.xml b/binaries/data/mods/public/simulation/templates/structures/cart_wonder.xml
index 3c10d2aa76..7ef5055d9b 100644
--- a/binaries/data/mods/public/simulation/templates/structures/cart_wonder.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/cart_wonder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_wonder">
   <Auras datatype="tokens">
-    epic_temple_heal
+    structures/epic_temple_heal
   </Auras>
   <Footprint>
     <Square width="29.0" depth="59.0"/>
diff --git a/binaries/data/mods/public/simulation/templates/structures/iber_monument.xml b/binaries/data/mods/public/simulation/templates/structures/iber_monument.xml
index 3e82f08651..e2f7dce580 100644
--- a/binaries/data/mods/public/simulation/templates/structures/iber_monument.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/iber_monument.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
-  <Auras datatype="tokens">iber_monument</Auras>
+  <Auras datatype="tokens">
+    structures/iber_monument
+  </Auras>
   <BuildRestrictions>
     <Category>Monument</Category>
     <Distance>
diff --git a/binaries/data/mods/public/simulation/templates/structures/mace_wonder.xml b/binaries/data/mods/public/simulation/templates/structures/mace_wonder.xml
index 05662729e5..2ea0fc8c11 100644
--- a/binaries/data/mods/public/simulation/templates/structures/mace_wonder.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/mace_wonder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_wonder">
   <Auras datatype="tokens">
-    epic_temple_heal
+    structures/epic_temple_heal
   </Auras>
   <Footprint>
     <Square width="28.0" depth="58.0"/>
diff --git a/binaries/data/mods/public/simulation/templates/structures/maur_pillar_ashoka.xml b/binaries/data/mods/public/simulation/templates/structures/maur_pillar_ashoka.xml
index 1a71b0b1fb..bb146b2247 100644
--- a/binaries/data/mods/public/simulation/templates/structures/maur_pillar_ashoka.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/maur_pillar_ashoka.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
-  <Auras datatype="tokens">maur_pillar</Auras>
+  <Auras datatype="tokens">
+    structures/maur_pillar
+  </Auras>
   <BuildRestrictions>
     <Category>Pillar</Category>
     <Distance>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers_ishtar_gate.xml b/binaries/data/mods/public/simulation/templates/structures/pers_ishtar_gate.xml
index 2324121b64..2ef95a9a02 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers_ishtar_gate.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/pers_ishtar_gate.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
-  <Auras datatype="tokens">loyalty_regen</Auras>
+  <Auras datatype="tokens">
+    structures/loyalty_regen
+  </Auras>
   <BuildRestrictions>
     <Category>UniqueBuilding</Category>
   </BuildRestrictions>
diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol_wonder.xml b/binaries/data/mods/public/simulation/templates/structures/ptol_wonder.xml
index 0bafd3cd32..4114d377b1 100644
--- a/binaries/data/mods/public/simulation/templates/structures/ptol_wonder.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/ptol_wonder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_wonder">
   <Auras datatype="tokens">
-    epic_temple_heal
+    structures/epic_temple_heal
   </Auras>
   <Footprint>
     <Square width="48.0" depth="66.0"/>
diff --git a/binaries/data/mods/public/simulation/templates/structures/rome_temple_vesta.xml b/binaries/data/mods/public/simulation/templates/structures/rome_temple_vesta.xml
index 49bcdd2f0b..ef9d2d8403 100644
--- a/binaries/data/mods/public/simulation/templates/structures/rome_temple_vesta.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/rome_temple_vesta.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="structures/rome_temple">
-  <Auras datatype="tokens">loyalty_regen</Auras>
+  <Auras datatype="tokens">
+    structures/loyalty_regen
+  </Auras>
   <BuildRestrictions>
     <Category>UniqueBuilding</Category>
   </BuildRestrictions>
diff --git a/binaries/data/mods/public/simulation/templates/structures/rome_wonder.xml b/binaries/data/mods/public/simulation/templates/structures/rome_wonder.xml
index 40cc2172f9..37c2656741 100644
--- a/binaries/data/mods/public/simulation/templates/structures/rome_wonder.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/rome_wonder.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_wonder">
-  <Auras datatype="tokens">epic_temple_heal</Auras>
+  <Auras datatype="tokens">
+    structures/epic_temple_heal
+  </Auras>
   <Footprint>
     <Square width="46.0" depth="54.0"/>
     <Height>12.0</Height>
diff --git a/binaries/data/mods/public/simulation/templates/structures/spart_wonder.xml b/binaries/data/mods/public/simulation/templates/structures/spart_wonder.xml
index c36ea25d14..15f7f99863 100644
--- a/binaries/data/mods/public/simulation/templates/structures/spart_wonder.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/spart_wonder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_wonder">
   <Auras datatype="tokens">
-    epic_temple_heal
+    structures/epic_temple_heal
   </Auras>
   <Footprint>
     <Square width="28.0" depth="58.0"/>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml b/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml
index 9668b3285a..e470a6bfc8 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic">
-  <Auras datatype="tokens">temple_heal</Auras>
+  <Auras datatype="tokens">
+    structures/temple_heal
+  </Auras>
   <BuildRestrictions>
     <Category>Temple</Category>
   </BuildRestrictions>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_long.xml b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_long.xml
index 80438f1e0b..e4fa03a7c6 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_long.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_long.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall">
-  <Auras datatype="tokens">wall_garrisoned</Auras>
+  <Auras datatype="tokens">
+    structures/wall_garrisoned
+  </Auras>
   <Cost>
     <BuildTime>45</BuildTime>
     <Resources>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_medium.xml b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_medium.xml
index fc374edf24..8ad3ea5c6c 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_medium.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_medium.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall">
-  <Auras datatype="tokens">wall_garrisoned</Auras>
+  <Auras datatype="tokens">
+    structures/wall_garrisoned
+  </Auras>
   <Cost>
     <BuildTime>30</BuildTime>
     <Resources>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_special_library.xml b/binaries/data/mods/public/simulation/templates/template_structure_special_library.xml
index 8eea19fa1c..d8279dc0e0 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_special_library.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_special_library.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
-  <Auras datatype="tokens">library</Auras>
+  <Auras datatype="tokens">
+    structures/library
+  </Auras>
   <BuildRestrictions>
     <Category>Library</Category>
   </BuildRestrictions>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_special_rotarymill.xml b/binaries/data/mods/public/simulation/templates/template_structure_special_rotarymill.xml
index 1e47fb7613..77a559b038 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_special_rotarymill.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_special_rotarymill.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
-  <Auras datatype="tokens">rotary_mill</Auras>
+  <Auras datatype="tokens">
+    structures/rotary_mill
+  </Auras>
   <Cost>
     <BuildTime>100</BuildTime>
     <PopulationBonus>2</PopulationBonus>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_special_theatron.xml b/binaries/data/mods/public/simulation/templates/template_structure_special_theatron.xml
index 30f456a0d4..d997289408 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_special_theatron.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_special_theatron.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
-  <Auras datatype="tokens">theatron</Auras>
+  <Auras datatype="tokens">
+    structures/theatron
+  </Auras>
   <BuildRestrictions>
     <Category>Theater</Category>
   </BuildRestrictions>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml b/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml
index e539957aab..9e88dc7510 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml
@@ -10,7 +10,10 @@
       <Crush>2</Crush>
     </Foundation>
   </Armour>
-  <Auras datatype="tokens">wonder_pop_1 wonder_pop_2</Auras>
+  <Auras datatype="tokens">
+    structures/wonder_pop_1
+    structures/wonder_pop_2
+  </Auras>
   <BuildRestrictions>
     <Category>Wonder</Category>
   </BuildRestrictions>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
index 71fd442f5d..db0e00e39c 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
@@ -12,7 +12,9 @@
       <RepeatTime>1000</RepeatTime>
     </Capture>
   </Attack>
-  <Auras datatype="tokens">hero_garrison</Auras>
+  <Auras datatype="tokens">
+    units/heroes/hero_garrison
+  </Auras>
   <Cost>
     <Population>2</Population>
     <BuildTime>40</BuildTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml b/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
index 4ec274579f..5240b53745 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
@@ -17,7 +17,9 @@
       <MaxRange>4.0</MaxRange>
     </Slaughter>
   </Attack>
-  <Auras datatype="tokens">female_inspiration</Auras>
+  <Auras datatype="tokens">
+    units/female_inspiration
+  </Auras>
   <Builder>
     <Rate>1.0</Rate>
     <Entities datatype="tokens">
diff --git a/binaries/data/mods/public/simulation/templates/units/athen_hero_iphicrates.xml b/binaries/data/mods/public/simulation/templates/units/athen_hero_iphicrates.xml
index cd38c246ad..ab92b2b943 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen_hero_iphicrates.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen_hero_iphicrates.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_javelinist">
-  <Auras datatype="tokens">athen_hero_iphicrates_1 athen_hero_iphicrates_2</Auras>
+  <Auras datatype="tokens">
+    units/heroes/athen_hero_iphicrates_1
+    units/heroes/athen_hero_iphicrates_2
+  </Auras>
   <Identity>
     <Civ>athen</Civ>
     <Lang>greek</Lang>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen_hero_pericles.xml b/binaries/data/mods/public/simulation/templates/units/athen_hero_pericles.xml
index 0d83612648..801ac12d4e 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen_hero_pericles.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen_hero_pericles.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_spearman">
-  <Auras datatype="tokens">athen_hero_pericles_1 athen_hero_pericles_2</Auras>
+  <Auras datatype="tokens">
+    units/heroes/athen_hero_pericles_1
+    units/heroes/athen_hero_pericles_2
+  </Auras>
   <Identity>
     <Civ>athen</Civ>
     <Lang>greek</Lang>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen_hero_themistocles.xml b/binaries/data/mods/public/simulation/templates/units/athen_hero_themistocles.xml
index 772d2ec066..d9d1e920f3 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen_hero_themistocles.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen_hero_themistocles.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_swordsman">
-  <Auras datatype="tokens">athen_hero_themistocles_1 athen_hero_themistocles_2</Auras>
+  <Auras datatype="tokens">
+    units/heroes/athen_hero_themistocles_1
+    units/heroes/athen_hero_themistocles_2
+  </Auras>
   <Identity>
     <Civ>athen</Civ>
     <Lang>greek</Lang>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml b/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml
index fef583e78f..4413bac6ef 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_javelinist">
-  <Auras datatype="tokens">brit_hero_boudicca</Auras>
+  <Auras datatype="tokens">
+    units/heroes/brit_hero_boudicca
+  </Auras>
   <Footprint replace="">
     <Square width="4.5" depth="9.0"/>
     <Height>5.0</Height>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca_sword.xml b/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca_sword.xml
index eb96135383..efbc5a839e 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca_sword.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca_sword.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_swordsman">
-  <Auras datatype="tokens">brit_hero_boudicca</Auras>
+  <Auras datatype="tokens">
+    units/heroes/brit_hero_boudicca
+  </Auras>
   <Identity>
     <Civ>brit</Civ>
     <GenericName>Boudicca (Sword)</GenericName>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_hero_caratacos.xml b/binaries/data/mods/public/simulation/templates/units/brit_hero_caratacos.xml
index 04962f1bb3..d4e1f12457 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit_hero_caratacos.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit_hero_caratacos.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_swordsman">
-  <Auras datatype="tokens">brit_hero_caratacos</Auras>
+  <Auras datatype="tokens">
+    units/heroes/brit_hero_caratacos
+  </Auras>
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Caratacos</SpecificName>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin.xml b/binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin.xml
index 86d4e8396a..89df5f8ce2 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_swordsman">
-  <Auras datatype="tokens">brit_hero_cunobelin</Auras>
+  <Auras datatype="tokens">
+    units/heroes/brit_hero_cunobelin
+  </Auras>
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Cunobelin</SpecificName>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin_infantry.xml b/binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin_infantry.xml
index 7b126c3d6f..37be4089c8 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin_infantry.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_swordsman">
-  <Auras datatype="tokens">brit_hero_cunobelin</Auras>
+  <Auras datatype="tokens">
+    units/heroes/brit_hero_cunobelin
+  </Auras>
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Cunobelin</SpecificName>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_hero_hamilcar.xml b/binaries/data/mods/public/simulation/templates/units/cart_hero_hamilcar.xml
index f5e62f6307..a4e5ab45a9 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_hero_hamilcar.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_hero_hamilcar.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_swordsman">
-  <Auras datatype="tokens">cart_hero_hamilcar</Auras>
+  <Auras datatype="tokens">
+    units/heroes/cart_hero_hamilcar
+  </Auras>
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Ḥimelqart Baraq</SpecificName>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_hero_hannibal.xml b/binaries/data/mods/public/simulation/templates/units/cart_hero_hannibal.xml
index 4fc89e388e..dd070531a3 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_hero_hannibal.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_hero_hannibal.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_elephant_melee">
-  <Auras datatype="tokens">cart_hero_hannibal</Auras>
+  <Auras datatype="tokens">
+    units/heroes/cart_hero_hannibal
+  </Auras>
   <Identity>
     <Civ>cart</Civ>
     <GenericName>Hannibal Barca</GenericName>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_hero_maharbal.xml b/binaries/data/mods/public/simulation/templates/units/cart_hero_maharbal.xml
index baba5e753d..e5ac434cf2 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_hero_maharbal.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_hero_maharbal.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_spearman">
-  <Auras datatype="tokens">cart_hero_maharbal</Auras>
+  <Auras datatype="tokens">
+    units/heroes/cart_hero_maharbal
+  </Auras>
   <Identity>
     <Civ>cart</Civ>
     <GenericName>Maharbal</GenericName>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul_hero_brennus.xml b/binaries/data/mods/public/simulation/templates/units/gaul_hero_brennus.xml
index 33f199c1e5..d7274a4f95 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul_hero_brennus.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul_hero_brennus.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_swordsman">
-  <Auras datatype="tokens">gaul_hero_brennus</Auras>
+  <Auras datatype="tokens">
+    units/heroes/gaul_hero_brennus
+  </Auras>
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Brennus</SpecificName>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul_hero_britomartus.xml b/binaries/data/mods/public/simulation/templates/units/gaul_hero_britomartus.xml
index 6ff9643ec8..c3437e2684 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul_hero_britomartus.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul_hero_britomartus.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_spearman">
-  <Auras datatype="tokens">gaul_hero_britomartus</Auras>
+  <Auras datatype="tokens">
+    units/heroes/gaul_hero_britomartus
+  </Auras>
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Britomartus</SpecificName>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul_hero_vercingetorix.xml b/binaries/data/mods/public/simulation/templates/units/gaul_hero_vercingetorix.xml
index 7ab16bb6a8..5a31a46ffc 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul_hero_vercingetorix.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul_hero_vercingetorix.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_swordsman">
-  <Auras datatype="tokens">gaul_hero_vercingetorix</Auras>
+  <Auras datatype="tokens">
+    units/heroes/gaul_hero_vercingetorix
+  </Auras>
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Vercingetorix</SpecificName>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_hero_alexander.xml b/binaries/data/mods/public/simulation/templates/units/mace_hero_alexander.xml
index 18feb2bc91..b5236302eb 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_hero_alexander.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_hero_alexander.xml
@@ -10,7 +10,9 @@
       </Bonuses>
     </Melee>
   </Attack>
-  <Auras datatype="tokens">mace_hero_alexander</Auras>
+  <Auras datatype="tokens">
+    units/heroes/mace_hero_alexander
+  </Auras>
   <Identity>
     <Civ>mace</Civ>
     <Lang>greek</Lang>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_hero_craterus.xml b/binaries/data/mods/public/simulation/templates/units/mace_hero_craterus.xml
index 29a4a9314d..36037c312d 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_hero_craterus.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_hero_craterus.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_swordsman">
-  <Auras datatype="tokens">mace_hero_craterus</Auras>
+  <Auras datatype="tokens">
+    units/heroes/mace_hero_craterus
+  </Auras>
   <Identity>
     <Civ>mace</Civ>
     <Lang>greek</Lang>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_hero_demetrius.xml b/binaries/data/mods/public/simulation/templates/units/mace_hero_demetrius.xml
index df8aa66f0e..407ab4d16c 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_hero_demetrius.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_hero_demetrius.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_swordsman">
-  <Auras datatype="tokens">mace_hero_demetrius</Auras>
+  <Auras datatype="tokens">
+    units/heroes/mace_hero_demetrius
+  </Auras>
   <Identity>
     <Civ>mace</Civ>
     <Lang>greek</Lang>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_hero_philip.xml b/binaries/data/mods/public/simulation/templates/units/mace_hero_philip.xml
index 437e1bba0b..9c70f2f4ad 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_hero_philip.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_hero_philip.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_spearman">
-  <Auras datatype="tokens">mace_hero_philip</Auras>
+  <Auras datatype="tokens">
+    units/heroes/mace_hero_philip
+  </Auras>
   <Identity>
     <Civ>mace</Civ>
     <Lang>greek</Lang>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_hero_philip_pike.xml b/binaries/data/mods/public/simulation/templates/units/mace_hero_philip_pike.xml
index 2b7e3bd70a..79c76fb5c4 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_hero_philip_pike.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_hero_philip_pike.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_pikeman">
-  <Auras datatype="tokens">mace_hero_philip</Auras>
+  <Auras datatype="tokens">
+    units/heroes/mace_hero_philip
+  </Auras>
   <Identity>
     <Civ>mace</Civ>
     <Lang>greek</Lang>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_hero_pyrrhus.xml b/binaries/data/mods/public/simulation/templates/units/mace_hero_pyrrhus.xml
index 92999fdc65..268d686f92 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_hero_pyrrhus.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_hero_pyrrhus.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_spearman">
-  <Auras datatype="tokens">mace_hero_pyrrhus</Auras>
+  <Auras datatype="tokens">
+    units/heroes/mace_hero_pyrrhus
+  </Auras>
   <Identity>
     <Civ>mace</Civ>
     <Lang>greek</Lang>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_hero_ashoka.xml b/binaries/data/mods/public/simulation/templates/units/maur_hero_ashoka.xml
index 3cd608d8ec..fa36754f15 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_hero_ashoka.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_hero_ashoka.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_archer">
-  <Auras datatype="tokens">maur_hero_ashoka</Auras>
+  <Auras datatype="tokens">
+    units/heroes/maur_hero_ashoka
+  </Auras>
   <Footprint replace="">
     <Square width="6.0" depth="12.0"/>
     <Height>5.0</Height>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_hero_chanakya.xml b/binaries/data/mods/public/simulation/templates/units/maur_hero_chanakya.xml
index e9c7554c2e..c76dd9e00b 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_hero_chanakya.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_hero_chanakya.xml
@@ -5,7 +5,10 @@
     <Pierce>8.0</Pierce>
     <Crush>4.0</Crush>
   </Armour>
-  <Auras datatype="tokens">hero_garrison maur_hero_chanakya</Auras>
+  <Auras datatype="tokens">
+    units/heroes/hero_garrison
+    units/heroes/maur_hero_chanakya
+  </Auras>
   <Cost>
     <Population>2</Population>
     <BuildTime>60</BuildTime>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_hero_cyrus.xml b/binaries/data/mods/public/simulation/templates/units/pers_hero_cyrus.xml
index 1a3600defd..e20efdf5e2 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_hero_cyrus.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_hero_cyrus.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_spearman">
-  <Auras datatype="tokens">pers_hero_cyrus</Auras>
+  <Auras datatype="tokens">
+    units/heroes/pers_hero_cyrus
+  </Auras>
   <Identity>
     <Civ>pers</Civ>
     <GenericName>Cyrus II The Great</GenericName>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_hero_darius.xml b/binaries/data/mods/public/simulation/templates/units/pers_hero_darius.xml
index 051ad8e1c0..93ace0e83e 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_hero_darius.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_hero_darius.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_archer">
-  <Auras datatype="tokens">pers_hero_darius</Auras>
+  <Auras datatype="tokens">
+    units/heroes/pers_hero_darius
+  </Auras>
   <Footprint replace="">
     <Square width="6.0" depth="12.0"/>
     <Height>5.0</Height>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes.xml b/binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes.xml
index 7a26dfaf77..ad2250de24 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_archer">
-  <Auras datatype="tokens">pers_hero_xerxes</Auras>
+  <Auras datatype="tokens">
+    units/heroes/pers_hero_xerxes
+  </Auras>
   <Identity>
     <Civ>pers</Civ>
     <GenericName>Xerxes I</GenericName>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_chariot.xml b/binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_chariot.xml
index 21fa7f1a2c..cf5df4b8a5 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_chariot.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_chariot.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_archer">
-  <Auras datatype="tokens">pers_hero_xerxes</Auras>
+  <Auras datatype="tokens">
+    units/heroes/pers_hero_xerxes
+  </Auras>
   <Footprint replace="">
     <Square width="6.0" depth="12.0"/>
     <Height>5.0</Height>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_hero_cleopatra.xml b/binaries/data/mods/public/simulation/templates/units/ptol_hero_cleopatra.xml
index 311fbefa66..b3eeeef5b0 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_hero_cleopatra.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_hero_cleopatra.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_archer">
-  <Auras datatype="tokens">ptol_hero_cleopatra_1 ptol_hero_cleopatra_2 ptol_hero_cleopatra_3</Auras>
+  <Auras datatype="tokens">
+    units/heroes/ptol_hero_cleopatra_1
+    units/heroes/ptol_hero_cleopatra_2
+    units/heroes/ptol_hero_cleopatra_3
+  </Auras>
   <Identity>
     <Civ>ptol</Civ>
     <Gender>female</Gender>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_I.xml b/binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_I.xml
index 3933f7d186..879484976b 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_I.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_I.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_elephant_melee">
-  <Auras datatype="tokens">ptol_hero_ptolemy_I_1 ptol_hero_ptolemy_I_2</Auras>
+  <Auras datatype="tokens">
+    units/heroes/ptol_hero_ptolemy_I_1
+    units/heroes/ptol_hero_ptolemy_I_2
+  </Auras>
   <Identity>
     <Civ>ptol</Civ>
     <GenericName>Ptolemy I "Savior"</GenericName>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_IV.xml b/binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_IV.xml
index a58c4761ea..e369bf0b37 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_IV.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_IV.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_swordsman">
-  <Auras datatype="tokens">ptol_hero_ptolemy_IV</Auras>
+  <Auras datatype="tokens">
+    units/heroes/ptol_hero_ptolemy_IV
+  </Auras>
   <Identity>
     <Civ>ptol</Civ>
     <GenericName>Ptolemy IV "Father Loving"</GenericName>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_hero_marcellus.xml b/binaries/data/mods/public/simulation/templates/units/rome_hero_marcellus.xml
index 7f82b6f03f..b974170117 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_hero_marcellus.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_hero_marcellus.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_swordsman">
-  <Auras datatype="tokens">rome_hero_marcellus</Auras>
+  <Auras datatype="tokens">
+    units/heroes/rome_hero_marcellus
+  </Auras>
   <Identity>
     <Civ>rome</Civ>
     <Lang>latin</Lang>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_hero_maximus.xml b/binaries/data/mods/public/simulation/templates/units/rome_hero_maximus.xml
index 311c364dbc..45fba9d394 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_hero_maximus.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_hero_maximus.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_swordsman">
-  <Auras datatype="tokens">rome_hero_maximus</Auras>
+  <Auras datatype="tokens">
+    units/heroes/rome_hero_maximus
+  </Auras>
   <Identity>
     <Civ>rome</Civ>
     <Lang>latin</Lang>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele_hero_antiochus_great.xml b/binaries/data/mods/public/simulation/templates/units/sele_hero_antiochus_great.xml
index d3a035ae64..9d3b9a5b76 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele_hero_antiochus_great.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele_hero_antiochus_great.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_spearman">
-  <Auras datatype="tokens">sele_hero_antiochus_great</Auras>
+  <Auras datatype="tokens">
+    units/heroes/sele_hero_antiochus_great
+  </Auras>
   <Identity>
     <Civ>sele</Civ>
     <Lang>greek</Lang>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele_hero_antiochus_righteous.xml b/binaries/data/mods/public/simulation/templates/units/sele_hero_antiochus_righteous.xml
index 9fa0b24f1f..9ba044b2bc 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele_hero_antiochus_righteous.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele_hero_antiochus_righteous.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_swordsman">
-  <Auras datatype="tokens">sele_hero_antiochus_righteous</Auras>
+  <Auras datatype="tokens">
+    units/heroes/sele_hero_antiochus_righteous
+  </Auras>
   <Identity>
     <Civ>sele</Civ>
     <Lang>greek</Lang>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele_hero_seleucus_victor.xml b/binaries/data/mods/public/simulation/templates/units/sele_hero_seleucus_victor.xml
index cb7cf8d43d..283d2b56b6 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele_hero_seleucus_victor.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele_hero_seleucus_victor.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_elephant_melee">
-  <Auras datatype="tokens">sele_hero_seleucus_victor</Auras>
+  <Auras datatype="tokens">
+    units/heroes/sele_hero_seleucus_victor
+  </Auras>
   <Identity>
     <Civ>sele</Civ>
     <Lang>greek</Lang>
diff --git a/binaries/data/mods/public/simulation/templates/units/spart_hero_brasidas.xml b/binaries/data/mods/public/simulation/templates/units/spart_hero_brasidas.xml
index bd7fbb2c15..050f7588ad 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart_hero_brasidas.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart_hero_brasidas.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_swordsman">
-  <Auras datatype="tokens">spart_hero_brasidas</Auras>
+  <Auras datatype="tokens">
+    units/heroes/spart_hero_brasidas
+  </Auras>
   <Identity>
     <Civ>spart</Civ>
     <Lang>greek</Lang>
diff --git a/binaries/data/mods/public/simulation/templates/units/spart_hero_leonidas.xml b/binaries/data/mods/public/simulation/templates/units/spart_hero_leonidas.xml
index c2e423b495..039ce05b57 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart_hero_leonidas.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart_hero_leonidas.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_spearman">
-  <Auras datatype="tokens">spart_hero_leonidas</Auras>
+  <Auras datatype="tokens">
+    units/heroes/spart_hero_leonidas
+  </Auras>
   <Identity>
     <Civ>spart</Civ>
     <Lang>greek</Lang>