Index: ps/trunk/binaries/data/mods/public/simulation/templates/mixins/builder.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/mixins/builder.xml	(revision 27024)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/mixins/builder.xml	(revision 27025)
@@ -1,41 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity>
   <Builder>
     <Rate>1.0</Rate>
     <Entities datatype="tokens">
       structures/{civ}/civil_centre
-      structures/{civ}/ministry
       structures/{civ}/crannog
       structures/{civ}/military_colony
       structures/{civ}/house
+      structures/{civ}/ice_house
       structures/{civ}/pyramid_small
       structures/{civ}/apartment
       structures/{civ}/storehouse
       structures/{civ}/farmstead
       structures/{civ}/field
       structures/{civ}/corral
       structures/{civ}/dock
       structures/{civ}/barracks
       structures/{civ}/stable
       structures/{civ}/elephant_stable
       structures/{civ}/forge
       structures/{civ}/temple
       structures/{civ}/market
+      structures/{civ}/ministry
       structures/{civ}/outpost
       structures/{civ}/sentry_tower
       structures/{civ}/defense_tower
       structures/{civ}/arsenal
       structures/{civ}/academy
       structures/{civ}/fortress
       structures/wallset_palisade
       structures/{civ}/wallset_palisade
       structures/{civ}/wallset_siege
       structures/{civ}/wallset_stone
       structures/{civ}/theater
+      structures/{civ}/apadana
       structures/{civ}/wonder
     </Entities>
   </Builder>
   <Identity>
     <VisibleClasses datatype="tokens">Builder</VisibleClasses>
   </Identity>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/infantry_archer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/infantry_archer_b.xml	(revision 27024)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/infantry_archer_b.xml	(revision 27025)
@@ -1,23 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_archer">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/pers/apadana
-      structures/pers/ice_house
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>pers</Civ>
     <Lang>persian</Lang>
     <SelectionGroupName>units/pers/infantry_archer_b</SelectionGroupName>
     <GenericName>Sogdian Archer</GenericName>
     <SpecificName>Θanuvaniya Suguda</SpecificName>
     <Icon>units/pers_infantry_archer.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/pers/infantry_archer_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/persians/infantry_archer_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/infantry_javelineer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/infantry_javelineer_b.xml	(revision 27024)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/infantry_javelineer_b.xml	(revision 27025)
@@ -1,24 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_javelineer">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/pers/apadana
-      structures/pers/ice_house
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>pers</Civ>
     <Lang>persian</Lang>
     <SelectionGroupName>units/pers/infantry_javelineer_b</SelectionGroupName>
     <GenericName>Lydian Auxiliary</GenericName>
     <SpecificName>Pastiš Spardiya</SpecificName>
     <Icon>units/pers_infantry_javelinist.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/pers/infantry_javelineer_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/persians/infantry_javelinist_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/infantry_spearman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/infantry_spearman_b.xml	(revision 27024)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/infantry_spearman_b.xml	(revision 27025)
@@ -1,23 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_spearman">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/pers/apadana
-      structures/pers/ice_house
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>pers</Civ>
     <Lang>persian</Lang>
     <SelectionGroupName>units/pers/infantry_spearman_b</SelectionGroupName>
     <GenericName>Shield Bearer</GenericName>
     <SpecificName>Sparabara</SpecificName>
     <Icon>units/pers_infantry_spearman.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/pers/infantry_spearman_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/persians/infantry_spearman_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/support_female_citizen.xml	(revision 27024)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/support_female_citizen.xml	(revision 27025)
@@ -1,19 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/pers/apadana
-      structures/pers/ice_house
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>pers</Civ>
     <Lang>persian</Lang>
     <SpecificName>Banu Miyanrudani</SpecificName>
     <GenericName>Mesopotamian Woman</GenericName>
     <Icon>units/pers_support_female_citizen.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/persians/female_citizen.xml</Actor>
   </VisualActor>
 </Entity>