Improve Layout System and adopt to review

- adopted to review comments - removed the role from layouts - reworked the Groups within the layouts - added more documentation - rebased to latest changes
2025-11-10 14:22:26 +00:00 · 2022-02-15 17:02:52 +01:00
parent 2c17a9a52e
commit 54e24dff39
93 changed files with 1606 additions and 1710 deletions
--- a/resources/units/groups/Ally-Flak.yaml
+++ b/resources/units/groups/Ally-Flak.yaml
@@ -1,5 +1,4 @@
 name: Ally Flak
-role: AntiAir
 tasks:
  - AAA
 units:
--- a/resources/units/groups/Carrier_Strike_Group_8.yaml
+++ b/resources/units/groups/Carrier_Strike_Group_8.yaml
@@ -1,5 +1,4 @@
 name: Carrier Strike Group 8
-role: Naval
 tasks:
  - Navy
 units:
--- a/resources/units/groups/Chinese-Navy.yaml
+++ b/resources/units/groups/Chinese-Navy.yaml
@@ -1,5 +1,4 @@
 name: Chinese Navy
-role: Naval
 tasks:
  - Navy
 units:
--- a/resources/units/groups/Cold-War-Flak.yaml
+++ b/resources/units/groups/Cold-War-Flak.yaml
@@ -1,5 +1,4 @@
 name: Cold-War-Flak
-role: AntiAir
 tasks:
  - AAA
 units:
--- a/resources/units/groups/Flak.yaml
+++ b/resources/units/groups/Flak.yaml
@@ -1,5 +1,4 @@
 name: Flak
-role: AntiAir
 tasks:
  - AAA
 units:
--- a/resources/units/groups/Freya.yaml
+++ b/resources/units/groups/Freya.yaml
@@ -1,5 +1,4 @@
 name: Freya
-role: AntiAir
 tasks:
  - SHORAD
 units:
--- a/resources/units/groups/HQ-7.yaml
+++ b/resources/units/groups/HQ-7.yaml
@@ -1,5 +1,4 @@
 name: HQ-7
-role: AntiAir
 tasks:
  - SHORAD
 units:
--- a/resources/units/groups/Hawk.yaml
+++ b/resources/units/groups/Hawk.yaml
@@ -1,5 +1,4 @@
 name: Hawk
-role: AntiAir
 tasks:
  - MERAD
 units:
--- a/resources/units/groups/KS-19.yaml
+++ b/resources/units/groups/KS-19.yaml
@@ -1,5 +1,4 @@
 name: KS-19
-role: AntiAir
 tasks:
  - AAA
 units:
--- a/resources/units/groups/NASAMS-B.yaml
+++ b/resources/units/groups/NASAMS-B.yaml
@@ -1,5 +1,4 @@
 name: NASAMS AIM-120B
-role: AntiAir
 tasks:
  - MERAD
 units:
--- a/resources/units/groups/NASAMS-C.yaml
+++ b/resources/units/groups/NASAMS-C.yaml
@@ -1,5 +1,4 @@
 name: NASAMS AIM-120C
-role: AntiAir
 tasks:
  - MERAD
 units:
--- a/resources/units/groups/Patriot.yaml
+++ b/resources/units/groups/Patriot.yaml
@@ -1,5 +1,4 @@
 name: Patriot
-role: AntiAir
 tasks:
  - LORAD
 units:
--- a/resources/units/groups/Rapier.yaml
+++ b/resources/units/groups/Rapier.yaml
@@ -1,5 +1,4 @@
 name: Rapier
-role: AntiAir
 tasks:
  - SHORAD
 units:
--- a/resources/units/groups/Roland.yaml
+++ b/resources/units/groups/Roland.yaml
@@ -1,5 +1,4 @@
 name: Roland
-role: AntiAir
 tasks:
  - SHORAD
 units:
--- a/resources/units/groups/Russian-Navy.yaml
+++ b/resources/units/groups/Russian-Navy.yaml
@@ -1,5 +1,4 @@
 name: Russian Navy
-role: Naval
 tasks:
  - Navy
 units:
--- a/resources/units/groups/SA-10.yaml
+++ b/resources/units/groups/SA-10.yaml
@@ -1,5 +1,4 @@
 name: SA-10/S-300PS
-role: AntiAir
 tasks:
  - LORAD
 units:
--- a/resources/units/groups/SA-10B.yaml
+++ b/resources/units/groups/SA-10B.yaml
@@ -1,5 +1,4 @@
 name: SA-10B/S-300PS
-role: AntiAir
 tasks:
  - LORAD
 units:
--- a/resources/units/groups/SA-11.yaml
+++ b/resources/units/groups/SA-11.yaml
@@ -1,5 +1,4 @@
 name: SA-11
-role: AntiAir
 tasks:
  - MERAD
 units:
--- a/resources/units/groups/SA-12.yaml
+++ b/resources/units/groups/SA-12.yaml
@@ -1,5 +1,4 @@
 name: SA-12/S-300V
-role: AntiAir
 tasks:
  - LORAD
 units:
--- a/resources/units/groups/SA-17.yaml
+++ b/resources/units/groups/SA-17.yaml
@@ -1,5 +1,4 @@
 name: SA-17
-role: AntiAir
 tasks:
  - MERAD
 units:
--- a/resources/units/groups/SA-2.yaml
+++ b/resources/units/groups/SA-2.yaml
@@ -1,5 +1,4 @@
 name: SA-2/S-75
-role: AntiAir
 tasks:
  - MERAD
 units:
--- a/resources/units/groups/SA-20.yaml
+++ b/resources/units/groups/SA-20.yaml
@@ -1,5 +1,4 @@
 name: SA-20/S-300PMU-1
-role: AntiAir
 tasks:
  - LORAD
 units:
--- a/resources/units/groups/SA-20B.yaml
+++ b/resources/units/groups/SA-20B.yaml
@@ -1,5 +1,4 @@
 name: SA-20B/S-300PMU-2
-role: AntiAir
 tasks:
  - LORAD
 units:
--- a/resources/units/groups/SA-23.yaml
+++ b/resources/units/groups/SA-23.yaml
@@ -1,5 +1,4 @@
 name: SA-23/S-300VM
-role: AntiAir
 tasks:
  - LORAD
 units:
--- a/resources/units/groups/SA-3.yaml
+++ b/resources/units/groups/SA-3.yaml
@@ -1,5 +1,4 @@
 name: SA-3/S-125
-role: AntiAir
 tasks:
  - MERAD
 units:
--- a/resources/units/groups/SA-5.yaml
+++ b/resources/units/groups/SA-5.yaml
@@ -1,5 +1,4 @@
 name: SA-5/S-200
-role: AntiAir
 tasks:
  - LORAD
 units:
--- a/resources/units/groups/SA-6.yaml
+++ b/resources/units/groups/SA-6.yaml
@@ -1,5 +1,4 @@
 name: SA-6
-role: AntiAir
 tasks:
  - MERAD
 units:
--- a/resources/units/groups/Silkworm.yaml
+++ b/resources/units/groups/Silkworm.yaml
@@ -1,5 +1,4 @@
 name: Silkworm
-role: Defenses
 tasks:
  - Coastal
 units:
--- a/resources/units/groups/WW2LST.yaml
+++ b/resources/units/groups/WW2LST.yaml
@@ -1,5 +1,4 @@
 name: WW2LST
-role: Naval
 tasks:
  - Navy
 units:
--- a/resources/layouts/anti_air/AAA_Mobile.yaml
+++ b/resources/layouts/anti_air/AAA_Mobile.yaml
@@ -1,23 +1,21 @@
 name: AAA Mobile
 description: A standard AAA template
-generic: true
-role: AntiAir
+generic: true # This Layout will be used to generate ForceGroups
 tasks:
  - AAA
 groups:
-  - name: AAA Mobile 0
-    group: 1
-    unit_count:
-      - 2
-      - 6
-    unit_classes:
-      - AAA
-  - name: AAA Mobile 1
-    optional: true
-    group: 1
-    unit_count:
-      - 1
-      - 2
-    unit_classes:
-      - Logistics
+  - AAA: # Group Name
+    - name: AAA Mobile 0 # Sub group which will be merged into the group
+      unit_count:
+        - 2
+        - 6
+      unit_classes:
+        - AAA
+    - name: AAA Mobile 1 # Sub group which will be merged into the group
+      optional: true
+      unit_count:
+        - 1
+        - 2
+      unit_classes:
+        - Logistics
 layout_file: resources/layouts/anti_air/AAA.miz
--- a/resources/layouts/anti_air/AAA_Radar.yaml
+++ b/resources/layouts/anti_air/AAA_Radar.yaml
@@ -1,29 +1,26 @@
 name: AAA Radar Site
 description: AAA Template with a Radar
 generic: false
-role: AntiAir
 tasks:
  - AAA
 groups:
-  - name: AAA Radar Site 0
-    group: 1
-    unit_count:
-      - 1
-    unit_classes:
-      - SearchRadar
-  - name: AAA Radar Site 1
-    group: 1
-    unit_count:
-      - 2
-      - 6
-    unit_classes:
-      - AAA
-  - name: AAA Radar Site 2
-    optional: true
-    group: 1
-    unit_count:
-      - 1
-      - 2
-    unit_classes:
-      - Logistics
+  - AAA:
+    - name: AAA Radar Site 0
+      unit_count:
+        - 1
+      unit_classes:
+        - SearchRadar
+    - name: AAA Radar Site 1
+      unit_count:
+        - 2
+        - 6
+      unit_classes:
+        - AAA
+    - name: AAA Radar Site 2
+      optional: true
+      unit_count:
+        - 1
+        - 2
+      unit_classes:
+        - Logistics
 layout_file: resources/layouts/anti_air/AAA.miz
--- a/resources/layouts/anti_air/AAA_Site.yaml
+++ b/resources/layouts/anti_air/AAA_Site.yaml
@@ -1,23 +1,21 @@
 name: AAA Site
 description: A standard AAA template
 generic: true
-role: AntiAir
 tasks:
  - AAA
 groups:
-  - name: AAA Site 0
-    group: 1
-    unit_count:
-      - 2
-      - 6
-    unit_classes:
-      - AAA
-  - name: AAA Site 1
-    optional: true
-    group: 1
-    unit_count:
-      - 1
-      - 2
-    unit_classes:
-      - Logistics
+  - AAA:
+    - name: AAA Site 0
+      unit_count:
+        - 2
+        - 6
+      unit_classes:
+        - AAA
+    - name: AAA Site 1
+      optional: true
+      unit_count:
+        - 1
+        - 2
+      unit_classes:
+        - Logistics
 layout_file: resources/layouts/anti_air/AAA.miz
--- a/resources/layouts/anti_air/Cold_War_Flak_Site.yaml
+++ b/resources/layouts/anti_air/Cold_War_Flak_Site.yaml
@@ -1,36 +1,36 @@
 name: Cold War Flak Site
-role: AntiAir
 tasks:
  - AAA
 groups:
-  - name: Cold War Flak Site Radar
-    optional: true # Only available to Late Cold War
-    unit_count:
-      - 1
-    unit_classes:
-      - SearchRadar
-  - name: Cold War Flak Site Flak
-    unit_count:
-      - 4
-      - 6
-    unit_types:
-      - flak18
-  - name: Cold War Flak Site S-60
-    unit_count:
-      - 2
-    unit_types:
-      - S-60_Type59_Artillery
-  - name: Cold War Flak Site AAA
-    optional: true
-    unit_count:
-      - 2
-    unit_classes:
-      - AAA
-  - name: Cold War Flak Site Logistics
-    optional: true
-    unit_count:
-      - 1
-      - 2
-    unit_classes:
-      - Logistics
+  - AAA:
+    - name: Cold War Flak Site Radar
+      optional: true # Only available to Late Cold War
+      unit_count:
+        - 1
+      unit_classes:
+        - SearchRadar
+    - name: Cold War Flak Site Flak
+      unit_count:
+        - 4
+        - 6
+      unit_types:
+        - flak18
+    - name: Cold War Flak Site S-60
+      unit_count:
+        - 2
+      unit_types:
+        - S-60_Type59_Artillery
+    - name: Cold War Flak Site AAA
+      optional: true
+      unit_count:
+        - 2
+      unit_classes:
+        - AAA
+    - name: Cold War Flak Site Logistics
+      optional: true
+      unit_count:
+        - 1
+        - 2
+      unit_classes:
+        - Logistics
 layout_file: resources/layouts/anti_air/flak.miz
--- a/resources/layouts/anti_air/Early-Warning_Radar.yaml
+++ b/resources/layouts/anti_air/Early-Warning_Radar.yaml
@@ -1,15 +1,15 @@
 name: Early-Warning Radar
 generic: true
-role: AntiAir
 tasks:
  - EarlyWarningRadar
 groups:
-  - name: Early-Warning Radar 0
-    unit_count:
-      - 1
-    unit_classes:
-      - EarlyWarningRadar
-    alternative_classes:
-      - SearchRadar
-      - SearchTrackRadar
+  - EWR:
+    - name: Early-Warning Radar 0
+      unit_count:
+        - 1
+      unit_classes:
+        - EarlyWarningRadar
+      alternative_classes:
+        - SearchRadar
+        - SearchTrackRadar
 layout_file: resources/layouts/anti_air/legacy_ground_templates.miz
--- a/resources/layouts/anti_air/Flak_Site.yaml
+++ b/resources/layouts/anti_air/Flak_Site.yaml
@@ -1,51 +1,51 @@
 name: Flak Site
-role: AntiAir
 tasks:
  - AAA
 groups:
-  - name: Flak Site 0
-    unit_count:
-      - 4
-    unit_types:
-      - flak38
-      - flak18
-      - flak36
-      - flak37
-      - flak41
-      - flak30
-  - name: Flak Site 1
-    unit_count:
-      - 1
-    unit_types:
-      - flak38
-  - name: Flak Site 2
-    unit_count:
-      - 1
-    unit_types:
-      - flak36
-  - name: Flak Site 3
-    unit_count:
-      - 2
-    unit_types:
-      - Flakscheinwerfer_37
-  - name: Flak Site 4
-    unit_count:
-      - 1
-    unit_types:
-      - Maschinensatz_33
-  - name: Flak Site 5
-    unit_count:
-      - 1
-    unit_types:
-      - KDO_Mod40
-  - name: Flak Site 6
-    unit_count:
-      - 1
-    unit_types:
-      - Kubelwagen_82
-  - name: Flak Site 7
-    unit_count:
-      - 4
-    unit_types:
-      - Blitz_36-6700A
+  - Flak:
+    - name: Flak Site 0
+      unit_count:
+        - 4
+      unit_types:
+        - flak38
+        - flak18
+        - flak36
+        - flak37
+        - flak41
+        - flak30
+    - name: Flak Site 1
+      unit_count:
+        - 1
+      unit_types:
+        - flak38
+    - name: Flak Site 2
+      unit_count:
+        - 1
+      unit_types:
+        - flak36
+    - name: Flak Site 3
+      unit_count:
+        - 2
+      unit_types:
+        - Flakscheinwerfer_37
+    - name: Flak Site 4
+      unit_count:
+        - 1
+      unit_types:
+        - Maschinensatz_33
+    - name: Flak Site 5
+      unit_count:
+        - 1
+      unit_types:
+        - KDO_Mod40
+    - name: Flak Site 6
+      unit_count:
+        - 1
+      unit_types:
+        - Kubelwagen_82
+    - name: Flak Site 7
+      unit_count:
+        - 4
+      unit_types:
+        - Blitz_36-6700A
 layout_file: resources/layouts/anti_air/legacy_ground_templates.miz
--- a/resources/layouts/anti_air/Freya_EWR_Site.yaml
+++ b/resources/layouts/anti_air/Freya_EWR_Site.yaml
@@ -1,51 +1,51 @@
 name: Freya EWR Site
-role: AntiAir
 tasks:
  - SHORAD
 groups:
-  - name: Freya EWR Site 0
-    unit_count:
-      - 1
-    unit_types:
-      - FuMG-401
-  - name: Freya EWR Site 1
-    unit_count:
-      - 4
-    unit_types:
-      - flak38
-  - name: Freya EWR Site 2
-    unit_count:
-      - 4
-    unit_types:
-      - flak18
-  - name: Freya EWR Site 3
-    unit_count:
-      - 1
-    unit_types:
-      - Kubelwagen_82
-  - name: Freya EWR Site 4
-    unit_count:
-      - 1
-    unit_types:
-      - Sd_Kfz_7
-  - name: Freya EWR Site 5
-    unit_count:
-      - 1
-    unit_types:
-      - Sd_Kfz_2
-  - name: Freya EWR Site 6
-    unit_count:
-      - 1
-    unit_types:
-      - Maschinensatz_33
-  - name: Freya EWR Site 7
-    unit_count:
-      - 1
-    unit_types:
-      - KDO_Mod40
-  - name: Freya EWR Site 8
-    unit_count:
-      - 3
-    unit_types:
-      - soldier_mauser98
+  - Freya:
+    - name: Freya EWR Site 0
+      unit_count:
+        - 1
+      unit_types:
+        - FuMG-401
+    - name: Freya EWR Site 1
+      unit_count:
+        - 4
+      unit_types:
+        - flak38
+    - name: Freya EWR Site 2
+      unit_count:
+        - 4
+      unit_types:
+        - flak18
+    - name: Freya EWR Site 3
+      unit_count:
+        - 1
+      unit_types:
+        - Kubelwagen_82
+    - name: Freya EWR Site 4
+      unit_count:
+        - 1
+      unit_types:
+        - Sd_Kfz_7
+    - name: Freya EWR Site 5
+      unit_count:
+        - 1
+      unit_types:
+        - Sd_Kfz_2
+    - name: Freya EWR Site 6
+      unit_count:
+        - 1
+      unit_types:
+        - Maschinensatz_33
+    - name: Freya EWR Site 7
+      unit_count:
+        - 1
+      unit_types:
+        - KDO_Mod40
+    - name: Freya EWR Site 8
+      unit_count:
+        - 3
+      unit_types:
+        - soldier_mauser98
 layout_file: resources/layouts/anti_air/legacy_ground_templates.miz
--- a/resources/layouts/anti_air/HQ-7_Site.yaml
+++ b/resources/layouts/anti_air/HQ-7_Site.yaml
@@ -1,24 +1,21 @@
 name: HQ-7 Site
-role: AntiAir
 tasks:
  - SHORAD
 groups:
-  - name: HQ-7 Site 0
-    group: 1
-    unit_count:
-      - 1
-    unit_types:
-      - HQ-7_STR_SP
-  - name: HQ-7 Site 1
-    group: 1
-    unit_count:
-      - 2
-    unit_types:
-      - HQ-7_LN_SP
-  - name: HQ-7 Site 2
-    group: 2
-    unit_count:
-      - 2
-    unit_types:
-      - Ural-375 ZU-23
+  - HQ-7:
+    - name: HQ-7 Site 0
+      unit_count:
+        - 1
+      unit_types:
+        - HQ-7_STR_SP
+    - name: HQ-7 Site 1
+      unit_count:
+        - 2
+      unit_types:
+        - HQ-7_LN_SP
+    - name: HQ-7 Site 2
+      unit_count:
+        - 2
+      unit_types:
+        - Ural-375 ZU-23
 layout_file: resources/layouts/anti_air/legacy_ground_templates.miz
--- a/resources/layouts/anti_air/Hawk_Site.yaml
+++ b/resources/layouts/anti_air/Hawk_Site.yaml
@@ -1,36 +1,33 @@
 name: Hawk Site
-role: AntiAir
 tasks:
  - MERAD
 groups:
-  - name: Hawk Site 0
-    group: 1
-    unit_count:
-      - 1
-    unit_types:
-      - Hawk sr
-  - name: Hawk Site 1
-    group: 1
-    unit_count:
-      - 1
-    unit_types:
-      - Hawk pcp
-  - name: Hawk Site 2
-    group: 1
-    unit_count:
-      - 1
-    unit_types:
-      - Hawk tr
-  - name: Hawk Site 3
-    group: 1
-    unit_count:
-      - 6
-    unit_types:
-      - Hawk ln
-  - name: Hawk Site 4
-    group: 2
-    unit_count:
-      - 1
-    unit_types:
-      - Vulcan
+  - Hawk: # Main Battery as one group
+    - name: Hawk Site 0
+      unit_count:
+        - 1
+      unit_types:
+        - Hawk sr
+    - name: Hawk Site 1
+      unit_count:
+        - 1
+      unit_types:
+        - Hawk pcp
+    - name: Hawk Site 2
+      unit_count:
+        - 1
+      unit_types:
+        - Hawk tr
+    - name: Hawk Site 3
+      unit_count:
+        - 6
+      unit_types:
+        - Hawk ln
+  - PD: # Point Defense as separate group
+    - name: Hawk Site 4
+      optional: true
+      unit_count:
+        - 1
+      unit_types:
+        - Vulcan
 layout_file: resources/layouts/anti_air/legacy_ground_templates.miz
--- a/resources/layouts/anti_air/NASAMS_AIM-120B.yaml
+++ b/resources/layouts/anti_air/NASAMS_AIM-120B.yaml
@@ -1,21 +1,21 @@
 name: NASAMS AIM-120B
-role: AntiAir
 tasks:
  - MERAD
 groups:
-  - name: NASAMS AIM-120B 1
-    unit_count:
-      - 1
-    unit_types:
-      - NASAMS_Radar_MPQ64F1
-  - name: NASAMS AIM-120B 0
-    unit_count:
-      - 1
-    unit_types:
-      - NASAMS_Command_Post
-  - name: NASAMS AIM-120B 2
-    unit_count:
-      - 4
-    unit_types:
-      - NASAMS_LN_B
+  - NASAMS:
+    - name: NASAMS AIM-120B 1
+      unit_count:
+        - 1
+      unit_types:
+        - NASAMS_Radar_MPQ64F1
+    - name: NASAMS AIM-120B 0
+      unit_count:
+        - 1
+      unit_types:
+        - NASAMS_Command_Post
+    - name: NASAMS AIM-120B 2
+      unit_count:
+        - 4
+      unit_types:
+        - NASAMS_LN_B
 layout_file: resources/layouts/anti_air/legacy_ground_templates.miz
--- a/resources/layouts/anti_air/NASAMS_AIM-120C.yaml
+++ b/resources/layouts/anti_air/NASAMS_AIM-120C.yaml
@@ -1,21 +1,21 @@
 name: NASAMS AIM-120C
-role: AntiAir
 tasks:
  - MERAD
 groups:
-  - name: NASAMS AIM-120C 1
-    unit_count:
-      - 1
-    unit_types:
-      - NASAMS_Radar_MPQ64F1
-  - name: NASAMS AIM-120C 0
-    unit_count:
-      - 1
-    unit_types:
-      - NASAMS_Command_Post
-  - name: NASAMS AIM-120C 2
-    unit_count:
-      - 4
-    unit_types:
-      - NASAMS_LN_C
+  - NASAMS:
+    - name: NASAMS AIM-120C 1
+      unit_count:
+        - 1
+      unit_types:
+        - NASAMS_Radar_MPQ64F1
+    - name: NASAMS AIM-120C 0
+      unit_count:
+        - 1
+      unit_types:
+        - NASAMS_Command_Post
+    - name: NASAMS AIM-120C 2
+      unit_count:
+        - 4
+      unit_types:
+        - NASAMS_LN_C
 layout_file: resources/layouts/anti_air/legacy_ground_templates.miz
--- a/resources/layouts/anti_air/Patriot_Battery.yaml
+++ b/resources/layouts/anti_air/Patriot_Battery.yaml
@@ -1,56 +1,50 @@
 name: Patriot Battery
-role: AntiAir
 tasks:
  - LORAD
 groups:
-  - name: Patriot Battery 0
-    group: 1
-    unit_count:
-      - 1
-    unit_types:
-      - Patriot str
-  - name: Patriot Battery 1
-    group: 1
-    unit_count:
-      - 1
-    unit_types:
-      - Patriot AMG
-  - name: Patriot Battery 2
-    group: 1
-    unit_count:
-      - 1
-    unit_types:
-      - Patriot ECS
-  - name: Patriot Battery 3
-    group: 1
-    unit_count:
-      - 1
-    unit_types:
-      - Patriot cp
-  - name: Patriot Battery 4
-    group: 1
-    unit_count:
-      - 1
-    unit_types:
-      - Patriot EPP
-  - name: Patriot Battery 5
-    group: 1
-    unit_count:
-      - 8
-    unit_types:
-      - Patriot ln
-  - name: Patriot Battery 6
-    optional: true
-    group: 2
-    unit_count:
-      - 2
-    unit_classes:
-      - AAA
-  - name: Patriot Battery 7
-    optional: true
-    group: 2
-    unit_count:
-      - 2
-    unit_classes:
-      - SHORAD
+  - Patriot:
+    - name: Patriot Battery 0
+      unit_count:
+        - 1
+      unit_types:
+        - Patriot str
+    - name: Patriot Battery 1
+      unit_count:
+        - 1
+      unit_types:
+        - Patriot AMG
+    - name: Patriot Battery 2
+      unit_count:
+        - 1
+      unit_types:
+        - Patriot ECS
+    - name: Patriot Battery 3
+      unit_count:
+        - 1
+      unit_types:
+        - Patriot cp
+    - name: Patriot Battery 4
+      unit_count:
+        - 1
+      unit_types:
+        - Patriot EPP
+    - name: Patriot Battery 5
+      unit_count:
+        - 8
+      unit_types:
+        - Patriot ln
+  - AAA:
+    - name: Patriot Battery 6
+      optional: true
+      unit_count:
+        - 2
+      unit_classes:
+        - AAA
+  - PD:
+    - name: Patriot Battery 7
+      optional: true
+      unit_count:
+        - 2
+      unit_classes:
+        - SHORAD
 layout_file: resources/layouts/anti_air/legacy_ground_templates.miz
--- a/resources/layouts/anti_air/Rapier_AA_Site.yaml
+++ b/resources/layouts/anti_air/Rapier_AA_Site.yaml
@@ -1,21 +1,21 @@
 name: Rapier AA Site
-role: AntiAir
 tasks:
  - SHORAD
 groups:
-  - name: Rapier AA Site 0
-    unit_count:
-      - 1
-    unit_types:
-      - rapier_fsa_blindfire_radar
-  - name: Rapier AA Site 1
-    unit_count:
-      - 1
-    unit_types:
-      - rapier_fsa_optical_tracker_unit
-  - name: Rapier AA Site 2
-    unit_count:
-      - 2
-    unit_types:
-      - rapier_fsa_launcher
+  - Rapier:
+    - name: Rapier AA Site 0
+      unit_count:
+        - 1
+      unit_types:
+        - rapier_fsa_blindfire_radar
+    - name: Rapier AA Site 1
+      unit_count:
+        - 1
+      unit_types:
+        - rapier_fsa_optical_tracker_unit
+    - name: Rapier AA Site 2
+      unit_count:
+        - 2
+      unit_types:
+        - rapier_fsa_launcher
 layout_file: resources/layouts/anti_air/legacy_ground_templates.miz
--- a/resources/layouts/anti_air/Roland_Site.yaml
+++ b/resources/layouts/anti_air/Roland_Site.yaml
@@ -1,21 +1,21 @@
 name: Roland Site
-role: AntiAir
 tasks:
  - SHORAD
 groups:
-  - name: Roland Site 0
-    unit_count:
-      - 1
-    unit_types:
-      - Roland Radar
-  - name: Roland Site 1
-    unit_count:
-      - 2
-    unit_types:
-      - Roland ADS
-  - name: Roland Site 2
-    unit_count:
-      - 1
-    unit_types:
-      - M 818
+  - Roland:
+    - name: Roland Site 0
+      unit_count:
+        - 1
+      unit_types:
+        - Roland Radar
+    - name: Roland Site 1
+      unit_count:
+        - 2
+      unit_types:
+        - Roland ADS
+    - name: Roland Site 2
+      unit_count:
+        - 1
+      unit_types:
+        - M 818
 layout_file: resources/layouts/anti_air/legacy_ground_templates.miz
--- a/resources/layouts/anti_air/S-300_Site.yaml
+++ b/resources/layouts/anti_air/S-300_Site.yaml
@@ -1,89 +1,85 @@
 name: S-300 Site
-role: AntiAir
 tasks:
  - LORAD
 groups:
-  - name: S-300 Site SR1
-    group: 1
-    unit_count:
-      - 1
-    unit_types:
-      - S-300PS 40B6MD sr # SA-10
-      - S-300PS SA-10B 40B6MD MAST sr # SA-10B
-      - S-300V 9S15 sr # SA-12
-      - S-300PMU1 40B6MD sr # SA-20 + B, is the 5N66E
-      - S-300VM 9S15M2 sr # SA-23
-  - name: S-300 Site SR2
-    group: 1
-    unit_count:
-      - 1
-    unit_types:
-      - S-300PS 64H6E sr # SA-10
-      - S-300PS 64H6E TRAILER sr # SA-10B
-      - S-300V 9S19 sr # SA-12
-      - S-300PMU1 64N6E sr # SA-20 + B
-      - S-300VM 9S19M2 sr # SA-23
-  - name: S-300 Site CP
-    group: 1
-    unit_count:
-      - 1
-    unit_types:
-      - S-300PS 54K6 cp # SA-10
-      - S-300PS SA-10B 54K6 cp # SA-10B
-      - S-300V 9S457 cp # SA-12
-      - S-300PMU1 54K6 cp # SA-20
-      - S-300PMU2 54K6E2 cp # SA-20B
-      - S-300VM 9S457ME cp # SA-23
-  - name: S-300 Site TR
-    group: 1
-    unit_count:
-      - 1
-    unit_types:
-      - S-300PS 40B6M tr # SA-10
-      - S-300PS 30N6 TRAILER tr # SA-10B
-      - S-300V 9S32 tr # SA-12
-      - S-300PMU1 40B6M tr # SA-20, is the 30N6E!
-      - S-300PMU2 92H6E tr # SA-20B
-      - S-300VM 9S32ME tr # SA-23
-  - name: S-300 Site LN1
-    group: 1
-    unit_count:
-      - 3
-    unit_types:
-      - S-300PS 5P85C ln # SA-10
-      - S-300PS 5P85SE_mod ln # SA-10B
-      - S-300V 9A82 ln # SA-12
-      - S-300PMU1 5P85CE ln # SA-20
-      - S-300PMU2 5P85SE2 ln # SA-20B
-      - S-300VM 9A82ME ln # SA-23
-  - name: S-300 Site LN2
-    group: 1
-    unit_count:
-      - 3
-    unit_types:
-      - S-300PS 5P85D ln # SA-10
-      - S-300PS 5P85SU_mod ln # SA-10B
-      - S-300V 9A83 ln # SA-12
-      - S-300PMU1 5P85DE ln # SA-20
-      - S-300PMU2 5P85SE2 ln # SA-20B
-      - S-300VM 9A83ME ln # SA-23
-  - name: S-300 Site AAA
-    group: 2
-    unit_count:
-      - 2
-    unit_classes:
-      - AAA
-  - name: S-300 Site SHORAD1
-    group: 3
-    unit_count:
-      - 0
-      - 2
-    unit_classes:
-      - SHORAD
-  - name: S-300 Site SHORAD2
-    group: 3
-    unit_count:
-      - 0
-      - 2
-    unit_classes:
-      - SHORAD
+  - S-300:
+    - name: S-300 Site SR1
+      unit_count:
+        - 1
+      unit_types:
+        - S-300PS 40B6MD sr # SA-10
+        - S-300PS SA-10B 40B6MD MAST sr # SA-10B
+        - S-300V 9S15 sr # SA-12
+        - S-300PMU1 40B6MD sr # SA-20 + B, is the 5N66E
+        - S-300VM 9S15M2 sr # SA-23
+    - name: S-300 Site SR2
+      unit_count:
+        - 1
+      unit_types:
+        - S-300PS 64H6E sr # SA-10
+        - S-300PS 64H6E TRAILER sr # SA-10B
+        - S-300V 9S19 sr # SA-12
+        - S-300PMU1 64N6E sr # SA-20 + B
+        - S-300VM 9S19M2 sr # SA-23
+    - name: S-300 Site CP
+      unit_count:
+        - 1
+      unit_types:
+        - S-300PS 54K6 cp # SA-10
+        - S-300PS SA-10B 54K6 cp # SA-10B
+        - S-300V 9S457 cp # SA-12
+        - S-300PMU1 54K6 cp # SA-20
+        - S-300PMU2 54K6E2 cp # SA-20B
+        - S-300VM 9S457ME cp # SA-23
+    - name: S-300 Site TR
+      unit_count:
+        - 1
+      unit_types:
+        - S-300PS 40B6M tr # SA-10
+        - S-300PS 30N6 TRAILER tr # SA-10B
+        - S-300V 9S32 tr # SA-12
+        - S-300PMU1 40B6M tr # SA-20, is the 30N6E!
+        - S-300PMU2 92H6E tr # SA-20B
+        - S-300VM 9S32ME tr # SA-23
+    - name: S-300 Site LN1
+      unit_count:
+        - 3
+      unit_types:
+        - S-300PS 5P85C ln # SA-10
+        - S-300PS 5P85SE_mod ln # SA-10B
+        - S-300V 9A82 ln # SA-12
+        - S-300PMU1 5P85CE ln # SA-20
+        - S-300PMU2 5P85SE2 ln # SA-20B
+        - S-300VM 9A82ME ln # SA-23
+    - name: S-300 Site LN2
+      unit_count:
+        - 3
+      unit_types:
+        - S-300PS 5P85D ln # SA-10
+        - S-300PS 5P85SU_mod ln # SA-10B
+        - S-300V 9A83 ln # SA-12
+        - S-300PMU1 5P85DE ln # SA-20
+        - S-300PMU2 5P85SE2 ln # SA-20B
+        - S-300VM 9A83ME ln # SA-23
+  - AAA:
+    - name: S-300 Site AAA
+      optional: true
+      unit_count:
+        - 2
+      unit_classes:
+        - AAA
+  - PD:
+    - name: S-300 Site SHORAD1
+      optional: true
+      unit_count:
+        - 0
+        - 2
+      unit_classes:
+        - SHORAD
+    - name: S-300 Site SHORAD2
+      optional: true
+      unit_count:
+        - 0
+        - 2
+      unit_classes:
+        - SHORAD
--- a/resources/layouts/anti_air/SA-11_Buk_Battery.yaml
+++ b/resources/layouts/anti_air/SA-11_Buk_Battery.yaml
@@ -1,21 +1,21 @@
 name: SA-11 Buk Battery
-role: AntiAir
 tasks:
  - MERAD
 groups:
-  - name: SA-11 Buk Battery 0
-    unit_count:
-      - 1
-    unit_types:
-      - SA-11 Buk SR 9S18M1
-  - name: SA-11 Buk Battery 1
-    unit_count:
-      - 1
-    unit_types:
-      - SA-11 Buk CC 9S470M1
-  - name: SA-11 Buk Battery 2
-    unit_count:
-      - 4
-    unit_types:
-      - SA-11 Buk LN 9A310M1
+  - SA-11:
+    - name: SA-11 Buk Battery 0
+      unit_count:
+        - 1
+      unit_types:
+        - SA-11 Buk SR 9S18M1
+    - name: SA-11 Buk Battery 1
+      unit_count:
+        - 1
+      unit_types:
+        - SA-11 Buk CC 9S470M1
+    - name: SA-11 Buk Battery 2
+      unit_count:
+        - 4
+      unit_types:
+        - SA-11 Buk LN 9A310M1
 layout_file: resources/layouts/anti_air/legacy_ground_templates.miz
--- a/resources/layouts/anti_air/SA-17_Grizzly_Battery.yaml
+++ b/resources/layouts/anti_air/SA-17_Grizzly_Battery.yaml
@@ -1,21 +1,21 @@
 name: SA-17 Grizzly Battery
-role: AntiAir
 tasks:
  - MERAD
 groups:
-  - name: SA-17 Grizzly Battery 0
-    unit_count:
-      - 1
-    unit_types:
-      - SA-11 Buk SR 9S18M1
-  - name: SA-17 Grizzly Battery 1
-    unit_count:
-      - 1
-    unit_types:
-      - SA-11 Buk CC 9S470M1
-  - name: SA-17 Grizzly Battery 2
-    unit_count:
-      - 3
-    unit_types:
-      - SA-17 Buk M1-2 LN 9A310M1-2
+  - SA-17:
+    - name: SA-17 Grizzly Battery 0
+      unit_count:
+        - 1
+      unit_types:
+        - SA-11 Buk SR 9S18M1
+    - name: SA-17 Grizzly Battery 1
+      unit_count:
+        - 1
+      unit_types:
+        - SA-11 Buk CC 9S470M1
+    - name: SA-17 Grizzly Battery 2
+      unit_count:
+        - 3
+      unit_types:
+        - SA-17 Buk M1-2 LN 9A310M1-2
 layout_file: resources/layouts/anti_air/legacy_ground_templates.miz
--- a/resources/layouts/anti_air/SA-2_S-75_Site.yaml
+++ b/resources/layouts/anti_air/SA-2_S-75_Site.yaml
@@ -1,21 +1,21 @@
 name: SA-2/S-75 Site
-role: AntiAir
 tasks:
  - MERAD
 groups:
-  - name: SA-2/S-75 Site 0
-    unit_count:
-      - 1
-    unit_types:
-      - p-19 s-125 sr
-  - name: SA-2/S-75 Site 1
-    unit_count:
-      - 1
-    unit_types:
-      - SNR_75V
-  - name: SA-2/S-75 Site 2
-    unit_count:
-      - 6
-    unit_types:
-      - S_75M_Volhov
+  - SA-2:
+    - name: SA-2/S-75 Site 0
+      unit_count:
+        - 1
+      unit_types:
+        - p-19 s-125 sr
+    - name: SA-2/S-75 Site 1
+      unit_count:
+        - 1
+      unit_types:
+        - SNR_75V
+    - name: SA-2/S-75 Site 2
+      unit_count:
+        - 6
+      unit_types:
+        - S_75M_Volhov
 layout_file: resources/layouts/anti_air/legacy_ground_templates.miz
--- a/resources/layouts/anti_air/SA-3_S-125_Site.yaml
+++ b/resources/layouts/anti_air/SA-3_S-125_Site.yaml
@@ -1,21 +1,21 @@
 name: SA-3/S-125 Site
-role: AntiAir
 tasks:
  - MERAD
 groups:
-  - name: SA-3/S-125 Site 0
-    unit_count:
-      - 1
-    unit_types:
-      - p-19 s-125 sr
-  - name: SA-3/S-125 Site 1
-    unit_count:
-      - 1
-    unit_types:
-      - snr s-125 tr
-  - name: SA-3/S-125 Site 2
-    unit_count:
-      - 4
-    unit_types:
-      - 5p73 s-125 ln
+  - SA-3:
+    - name: SA-3/S-125 Site 0
+      unit_count:
+        - 1
+      unit_types:
+        - p-19 s-125 sr
+    - name: SA-3/S-125 Site 1
+      unit_count:
+        - 1
+      unit_types:
+        - snr s-125 tr
+    - name: SA-3/S-125 Site 2
+      unit_count:
+        - 4
+      unit_types:
+        - 5p73 s-125 ln
 layout_file: resources/layouts/anti_air/legacy_ground_templates.miz
--- a/resources/layouts/anti_air/SA-5_S-200_Site.yaml
+++ b/resources/layouts/anti_air/SA-5_S-200_Site.yaml
@@ -1,26 +1,26 @@
 name: SA-5/S-200 Site
-role: AntiAir
 tasks:
  - LORAD
 groups:
-  - name: SA-5/S-200 Site 0
-    unit_count:
-      - 1
-    unit_types:
-      - RLS_19J6
-  - name: SA-5/S-200 Site 1
-    unit_count:
-      - 1
-    unit_types:
-      - RPC_5N62V
-  - name: SA-5/S-200 Site 2
-    unit_count:
-      - 1
-    unit_types:
-      - Ural-375
-  - name: SA-5/S-200 Site 3
-    unit_count:
-      - 6
-    unit_types:
-      - S-200_Launcher
+  - SA-5:
+    - name: SA-5/S-200 Site 0
+      unit_count:
+        - 1
+      unit_types:
+        - RLS_19J6
+    - name: SA-5/S-200 Site 1
+      unit_count:
+        - 1
+      unit_types:
+        - RPC_5N62V
+    - name: SA-5/S-200 Site 2
+      unit_count:
+        - 1
+      unit_types:
+        - Ural-375
+    - name: SA-5/S-200 Site 3
+      unit_count:
+        - 6
+      unit_types:
+        - S-200_Launcher
 layout_file: resources/layouts/anti_air/legacy_ground_templates.miz
--- a/resources/layouts/anti_air/SA-6_Kub_Site.yaml
+++ b/resources/layouts/anti_air/SA-6_Kub_Site.yaml
@@ -1,16 +1,16 @@
 name: SA-6 Kub Site
-role: AntiAir
 tasks:
  - MERAD
 groups:
-  - name: SA-6 Kub Site 0
-    unit_count:
-      - 1
-    unit_types:
-      - Kub 1S91 str
-  - name: SA-6 Kub Site 1
-    unit_count:
-      - 4
-    unit_types:
-      - Kub 2P25 ln
+  - SA-6:
+    - name: SA-6 Kub Site 0
+      unit_count:
+        - 1
+      unit_types:
+        - Kub 1S91 str
+    - name: SA-6 Kub Site 1
+      unit_count:
+        - 4
+      unit_types:
+        - Kub 2P25 ln
 layout_file: resources/layouts/anti_air/legacy_ground_templates.miz
--- a/resources/layouts/anti_air/Short_Range_Anti_Air.yaml
+++ b/resources/layouts/anti_air/Short_Range_Anti_Air.yaml
@@ -1,19 +1,19 @@
 name: Short Range Anti Air Group
-role: AntiAir
 generic: true
 tasks:
  - SHORAD
 groups:
-  - name: SHORAD Group 0
-    unit_count:
-      - 2
-    unit_classes:
-      - SHORAD
-  - name: SHORAD Group 1
-    optional: true
-    unit_count:
-      - 1
-      - 2
-    unit_classes:
-      - Logistics
+  - SHORAD:
+    - name: SHORAD Group 0
+      unit_count:
+        - 2
+      unit_classes:
+        - SHORAD
+    - name: SHORAD Group 1
+      optional: true
+      unit_count:
+        - 1
+        - 2
+      unit_classes:
+        - Logistics
 layout_file: resources/layouts/anti_air/shorad.miz
--- a/resources/layouts/anti_air/WW2_Ally_Flak_Site.yaml
+++ b/resources/layouts/anti_air/WW2_Ally_Flak_Site.yaml
@@ -1,41 +1,41 @@
 name: WW2 Ally Flak Site
-role: AntiAir
 tasks:
  - AAA
 groups:
-  - name: WW2 Ally Flak Site 0
-    unit_count:
-      - 4
-    unit_types:
-      - QF_37_AA
-  - name: WW2 Ally Flak Site 1
-    unit_count:
-      - 8
-    unit_types:
-      - M1_37mm
-  - name: WW2 Ally Flak Site 2
-    unit_count:
-      - 8
-    unit_types:
-      - M45_Quadmount
-  - name: WW2 Ally Flak Site 3
-    unit_count:
-      - 1
-    unit_types:
-      - Willys_MB
-  - name: WW2 Ally Flak Site 4
-    unit_count:
-      - 1
-    unit_types:
-      - M30_CC
-  - name: WW2 Ally Flak Site 5
-    unit_count:
-      - 1
-    unit_types:
-      - M4_Tractor
-  - name: WW2 Ally Flak Site 6
-    unit_count:
-      - 1
-    unit_types:
-      - Bedford_MWD
+  - Flak:
+    - name: WW2 Ally Flak Site 0
+      unit_count:
+        - 4
+      unit_types:
+        - QF_37_AA
+    - name: WW2 Ally Flak Site 1
+      unit_count:
+        - 8
+      unit_types:
+        - M1_37mm
+    - name: WW2 Ally Flak Site 2
+      unit_count:
+        - 8
+      unit_types:
+        - M45_Quadmount
+    - name: WW2 Ally Flak Site 3
+      unit_count:
+        - 1
+      unit_types:
+        - Willys_MB
+    - name: WW2 Ally Flak Site 4
+      unit_count:
+        - 1
+      unit_types:
+        - M30_CC
+    - name: WW2 Ally Flak Site 5
+      unit_count:
+        - 1
+      unit_types:
+        - M4_Tractor
+    - name: WW2 Ally Flak Site 6
+      unit_count:
+        - 1
+      unit_types:
+        - Bedford_MWD
 layout_file: resources/layouts/anti_air/legacy_ground_templates.miz
--- a/resources/layouts/anti_air/WW2_Flak_Site.yaml
+++ b/resources/layouts/anti_air/WW2_Flak_Site.yaml
@@ -1,16 +1,16 @@
 name: WW2 Flak Site
-role: AntiAir
 tasks:
  - AAA
 groups:
-  - name: WW2 Flak Site 0
-    unit_count:
-      - 6
-    unit_types:
-      - flak18
-  - name: WW2 Flak Site 1
-    unit_count:
-      - 1
-    unit_types:
-      - Blitz_36-6700A
+  - Flak:
+    - name: WW2 Flak Site 0
+      unit_count:
+        - 6
+      unit_types:
+        - flak18
+    - name: WW2 Flak Site 1
+      unit_count:
+        - 1
+      unit_types:
+        - Blitz_36-6700A
 layout_file: resources/layouts/anti_air/legacy_ground_templates.miz
--- a/resources/layouts/anti_air/legacy_ground_templates.miz
+++ b/resources/layouts/anti_air/legacy_ground_templates.miz
--- a/resources/layouts/buildings/allycamp1.yaml
+++ b/resources/layouts/buildings/allycamp1.yaml
@@ -1,84 +1,84 @@
 name: allycamp1
 generic: true
-role: Building
 tasks:
  - StrikeTarget
  - AllyCamp
 groups:
-  - name: allycamp1 0
-    statics:
-      - allycamp1 0-0
-      - allycamp1 0-1
-      - allycamp1 0-2
-      - allycamp1 0-3
-    unit_count:
-      - 4
-    unit_types:
-      - FARP Tent
-  - name: allycamp1 1
-    statics:
-      - allycamp1 1-0
-      - allycamp1 1-1
-      - allycamp1 1-2
-      - allycamp1 1-3
-      - allycamp1 1-4
-      - allycamp1 1-5
-      - allycamp1 1-6
-      - allycamp1 1-7
-      - allycamp1 1-8
-      - allycamp1 1-9
-      - allycamp1 1-10
-      - allycamp1 1-11
-      - allycamp1 1-12
-      - allycamp1 1-13
-      - allycamp1 1-14
-      - allycamp1 1-15
-      - allycamp1 1-16
-      - allycamp1 1-17
-      - allycamp1 1-18
-      - allycamp1 1-19
-      - allycamp1 1-20
-      - allycamp1 1-21
-    unit_count:
-      - 22
-    unit_types:
-      - Haystack 4
-  - name: allycamp1 2
-    statics:
-      - allycamp1 2-0
-      - allycamp1 2-1
-      - allycamp1 2-2
-      - allycamp1 2-3
-      - allycamp1 2-4
-      - allycamp1 2-5
-      - allycamp1 2-6
-      - allycamp1 2-7
-      - allycamp1 2-8
-      - allycamp1 2-9
-      - allycamp1 2-10
-      - allycamp1 2-11
-    unit_count:
-      - 12
-    unit_types:
-      - Haystack 3
-  - name: allycamp1 3
-    statics:
-      - allycamp1 3-0
-      - allycamp1 3-1
-      - allycamp1 3-2
-      - allycamp1 3-3
-      - allycamp1 3-4
-      - allycamp1 3-5
-      - allycamp1 3-6
-      - allycamp1 3-7
-    unit_count:
-      - 8
-    unit_types:
-      - Concertina wire
-  - name: allycamp1 4
-    group: 2 # Vehicle and static can not be mixed
-    unit_count:
-      - 4
-    unit_types:
-      - house2arm
+  - AllyCamp:
+    - name: allycamp1 0
+      statics:
+        - allycamp1 0-0
+        - allycamp1 0-1
+        - allycamp1 0-2
+        - allycamp1 0-3
+      unit_count:
+        - 4
+      unit_types:
+        - FARP Tent
+    - name: allycamp1 1
+      statics:
+        - allycamp1 1-0
+        - allycamp1 1-1
+        - allycamp1 1-2
+        - allycamp1 1-3
+        - allycamp1 1-4
+        - allycamp1 1-5
+        - allycamp1 1-6
+        - allycamp1 1-7
+        - allycamp1 1-8
+        - allycamp1 1-9
+        - allycamp1 1-10
+        - allycamp1 1-11
+        - allycamp1 1-12
+        - allycamp1 1-13
+        - allycamp1 1-14
+        - allycamp1 1-15
+        - allycamp1 1-16
+        - allycamp1 1-17
+        - allycamp1 1-18
+        - allycamp1 1-19
+        - allycamp1 1-20
+        - allycamp1 1-21
+      unit_count:
+        - 22
+      unit_types:
+        - Haystack 4
+    - name: allycamp1 2
+      statics:
+        - allycamp1 2-0
+        - allycamp1 2-1
+        - allycamp1 2-2
+        - allycamp1 2-3
+        - allycamp1 2-4
+        - allycamp1 2-5
+        - allycamp1 2-6
+        - allycamp1 2-7
+        - allycamp1 2-8
+        - allycamp1 2-9
+        - allycamp1 2-10
+        - allycamp1 2-11
+      unit_count:
+        - 12
+      unit_types:
+        - Haystack 3
+    - name: allycamp1 3
+      statics:
+        - allycamp1 3-0
+        - allycamp1 3-1
+        - allycamp1 3-2
+        - allycamp1 3-3
+        - allycamp1 3-4
+        - allycamp1 3-5
+        - allycamp1 3-6
+        - allycamp1 3-7
+      unit_count:
+        - 8
+      unit_types:
+        - Concertina wire
+  - AllyCamp2: # Vehicle and static can not be mixed
+    - name: allycamp1 4
+      unit_count:
+        - 4
+      unit_types:
+        - house2arm
 layout_file: resources/layouts/buildings/buildings.miz
--- a/resources/layouts/buildings/ammo1.yaml
+++ b/resources/layouts/buildings/ammo1.yaml
@@ -1,22 +1,22 @@
 name: ammo1
 generic: true
-role: Building
 tasks:
  - Ammo
 groups:
-  - name: ammo1 0
-    statics:
-      - ammo1 0-0
-    unit_count:
-      - 1
-    unit_types:
-      - .Ammunition depot
-  - name: ammo1 1
-    statics:
-      - ammo1 1-0
-      - ammo1 1-1
-    unit_count:
-      - 2
-    unit_types:
-      - Hangar B
+  - Ammo:
+    - name: ammo1 0
+      statics:
+        - ammo1 0-0
+      unit_count:
+        - 1
+      unit_types:
+        - .Ammunition depot
+    - name: ammo1 1
+      statics:
+        - ammo1 1-0
+        - ammo1 1-1
+      unit_count:
+        - 2
+      unit_types:
+        - Hangar B
 layout_file: resources/layouts/buildings/buildings.miz
--- a/resources/layouts/buildings/comms.yaml
+++ b/resources/layouts/buildings/comms.yaml
@@ -1,16 +1,16 @@
 name: comms
 generic: true
-role: Building
 tasks:
  - StrikeTarget
  - Comms
 groups:
-  - name: comms1 0
-    statics:
-      - comms1 0-0
-    unit_count:
-      - 1
-    unit_types:
-      - TV tower
-      - Comms tower M
+  - Comms:
+    - name: comms1 0
+      statics:
+        - comms1 0-0
+      unit_count:
+        - 1
+      unit_types:
+        - TV tower
+        - Comms tower M
 layout_file: resources/layouts/buildings/buildings.miz
--- a/resources/layouts/buildings/derrick1.yaml
+++ b/resources/layouts/buildings/derrick1.yaml
@@ -1,31 +1,31 @@
 name: derrick1
 generic: true
-role: Building
 tasks:
  - StrikeTarget
  - Derrick
 groups:
-  - name: derrick1 0
-    statics:
-      - derrick1 0-0
-      - derrick1 0-1
-    unit_count:
-      - 2
-    unit_types:
-      - Oil derrick
-  - name: derrick1 1
-    statics:
-      - derrick1 1-0
-      - derrick1 1-1
-    unit_count:
-      - 2
-    unit_types:
-      - Pump station
-  - name: derrick1 2
-    statics:
-      - derrick1 2-0
-    unit_count:
-      - 1
-    unit_types:
-      - Subsidiary structure 2
+  - Derrick:
+    - name: derrick1 0
+      statics:
+        - derrick1 0-0
+        - derrick1 0-1
+      unit_count:
+        - 2
+      unit_types:
+        - Oil derrick
+    - name: derrick1 1
+      statics:
+        - derrick1 1-0
+        - derrick1 1-1
+      unit_count:
+        - 2
+      unit_types:
+        - Pump station
+    - name: derrick1 2
+      statics:
+        - derrick1 2-0
+      unit_count:
+        - 1
+      unit_types:
+        - Subsidiary structure 2
 layout_file: resources/layouts/buildings/buildings.miz
--- a/resources/layouts/buildings/factory1.yaml
+++ b/resources/layouts/buildings/factory1.yaml
@@ -1,23 +1,23 @@
 name: factory1
 generic: true
-role: Building
 tasks:
  - Factory
 groups:
-  - name: factory1 0
-    statics:
-      - factory1 0-0
-    unit_count:
-      - 1
-    unit_types:
-      - Tech combine
-  - name: factory1 1
-    statics:
-      - factory1 1-0
-      - factory1 1-1
-      - factory1 1-2
-    unit_count:
-      - 3
-    unit_types:
-      - Tech hangar A
+  - Factory:
+    - name: factory1 0
+      statics:
+        - factory1 0-0
+      unit_count:
+        - 1
+      unit_types:
+        - Tech combine
+    - name: factory1 1
+      statics:
+        - factory1 1-0
+        - factory1 1-1
+        - factory1 1-2
+      unit_count:
+        - 3
+      unit_types:
+        - Tech hangar A
 layout_file: resources/layouts/buildings/buildings.miz
--- a/resources/layouts/buildings/farp1.yaml
+++ b/resources/layouts/buildings/farp1.yaml
@@ -1,41 +1,41 @@
 name: farp1
 generic: true
-role: Building
 tasks:
  - StrikeTarget
  - Farp
 groups:
-  - name: farp1 0
-    statics:
-      - farp1 0-0
-      - farp1 0-1
-      - farp1 0-2
-      - farp1 0-3
-      - farp1 0-4
-    unit_count:
-      - 5
-    unit_types:
-      - FARP Tent
-  - name: farp1 1
-    statics:
-      - farp1 1-0
-    unit_count:
-      - 1
-    unit_types:
-      - FARP Ammo Dump Coating
-  - name: farp1 2
-    statics:
-      - farp1 2-0
-    unit_count:
-      - 1
-    unit_types:
-      - FARP CP Blindage
-  - name: farp1 3
-    statics:
-      - farp1 3-0
-      - farp1 3-1
-    unit_count:
-      - 2
-    unit_types:
-      - FARP Fuel Depot
+  - Farp:
+    - name: farp1 0
+      statics:
+        - farp1 0-0
+        - farp1 0-1
+        - farp1 0-2
+        - farp1 0-3
+        - farp1 0-4
+      unit_count:
+        - 5
+      unit_types:
+        - FARP Tent
+    - name: farp1 1
+      statics:
+        - farp1 1-0
+      unit_count:
+        - 1
+      unit_types:
+        - FARP Ammo Dump Coating
+    - name: farp1 2
+      statics:
+        - farp1 2-0
+      unit_count:
+        - 1
+      unit_types:
+        - FARP CP Blindage
+    - name: farp1 3
+      statics:
+        - farp1 3-0
+        - farp1 3-1
+      unit_count:
+        - 2
+      unit_types:
+        - FARP Fuel Depot
 layout_file: resources/layouts/buildings/buildings.miz
--- a/resources/layouts/buildings/fob1.yaml
+++ b/resources/layouts/buildings/fob1.yaml
@@ -1,31 +1,31 @@
 name: fob1
 generic: true
-role: Building
 tasks:
  - FOB
 groups:
-  - name: fob1 0
-    statics:
-      - fob1 0-0
-    unit_count:
-      - 1
-    unit_types:
-      - .Command Center
-  - name: fob1 1
-    statics:
-      - fob1 1-0
-      - fob1 1-1
-      - fob1 1-2
-    unit_count:
-      - 3
-    unit_types:
-      - Barracks 2
-  - name: fob1 2
-    statics:
-      - fob1 2-0
-      - fob1 2-1
-    unit_count:
-      - 2
-    unit_types:
-      - Garage small B
+  - FOB:
+    - name: fob1 0
+      statics:
+        - fob1 0-0
+      unit_count:
+        - 1
+      unit_types:
+        - .Command Center
+    - name: fob1 1
+      statics:
+        - fob1 1-0
+        - fob1 1-1
+        - fob1 1-2
+      unit_count:
+        - 3
+      unit_types:
+        - Barracks 2
+    - name: fob1 2
+      statics:
+        - fob1 2-0
+        - fob1 2-1
+      unit_count:
+        - 2
+      unit_types:
+        - Garage small B
 layout_file: resources/layouts/buildings/buildings.miz
--- a/resources/layouts/buildings/fuel1.yaml
+++ b/resources/layouts/buildings/fuel1.yaml
@@ -1,28 +1,28 @@
 name: fuel1
 generic: true
-role: Building
 tasks:
  - StrikeTarget
  - Fuel
 groups:
-  - name: fuel1 0
-    statics:
-      - fuel1 0-0
-      - fuel1 0-1
-      - fuel1 0-2
-      - fuel1 0-3
-      - fuel1 0-4
-      - fuel1 0-5
-    unit_count:
-      - 6
-    unit_types:
-      - Tank
-  - name: fuel1 1
-    statics:
-      - fuel1 1-0
-      - fuel1 1-1
-    unit_count:
-      - 2
-    unit_types:
-      - Tank 3
+  - Fuel:
+    - name: fuel1 0
+      statics:
+        - fuel1 0-0
+        - fuel1 0-1
+        - fuel1 0-2
+        - fuel1 0-3
+        - fuel1 0-4
+        - fuel1 0-5
+      unit_count:
+        - 6
+      unit_types:
+        - Tank
+    - name: fuel1 1
+      statics:
+        - fuel1 1-0
+        - fuel1 1-1
+      unit_count:
+        - 2
+      unit_types:
+        - Tank 3
 layout_file: resources/layouts/buildings/buildings.miz
--- a/resources/layouts/buildings/oil1.yaml
+++ b/resources/layouts/buildings/oil1.yaml
@@ -1,18 +1,18 @@
 name: oil1
 generic: true
-role: Building
 tasks:
  - OffShoreStrikeTarget
  - Oil
 groups:
-  - name: oil1 0
-    statics:
-      - oil1 0-0
-      - oil1 0-1
-      - oil1 0-2
-      - oil1 0-3
-    unit_count:
-      - 4
-    unit_types:
-      - Oil platform
+  - Oil:
+    - name: oil1 0
+      statics:
+        - oil1 0-0
+        - oil1 0-1
+        - oil1 0-2
+        - oil1 0-3
+      unit_count:
+        - 4
+      unit_types:
+        - Oil platform
 layout_file: resources/layouts/buildings/buildings.miz
--- a/resources/layouts/buildings/power1.yaml
+++ b/resources/layouts/buildings/power1.yaml
@@ -1,37 +1,37 @@
 name: power1
 generic: true
-role: Building
 tasks:
  - StrikeTarget
  - Power
 groups:
-  - name: power1 0
-    statics:
-      - power1 0-0
-    unit_count:
-      - 1
-    unit_types:
-      - Repair workshop
-  - name: power1 1
-    statics:
-      - power1 1-0
-    unit_count:
-      - 1
-    unit_types:
-      - Workshop A
-  - name: power1 2
-    statics:
-      - power1 2-0
-      - power1 2-1
-    unit_count:
-      - 2
-    unit_types:
-      - Garage B
-  - name: power1 3
-    statics:
-      - power1 3-0
-    unit_count:
-      - 1
-    unit_types:
-      - Farm B
+  - Power:
+    - name: power1 0
+      statics:
+        - power1 0-0
+      unit_count:
+        - 1
+      unit_types:
+        - Repair workshop
+    - name: power1 1
+      statics:
+        - power1 1-0
+      unit_count:
+        - 1
+      unit_types:
+        - Workshop A
+    - name: power1 2
+      statics:
+        - power1 2-0
+        - power1 2-1
+      unit_count:
+        - 2
+      unit_types:
+        - Garage B
+    - name: power1 3
+      statics:
+        - power1 3-0
+      unit_count:
+        - 1
+      unit_types:
+        - Farm B
 layout_file: resources/layouts/buildings/buildings.miz
--- a/resources/layouts/buildings/village1.yaml
+++ b/resources/layouts/buildings/village1.yaml
@@ -1,39 +1,39 @@
 name: village1
 generic: true
-role: Building
 tasks:
  - StrikeTarget
  - Village
 groups:
-  - name: village1 0
-    statics:
-      - village1 0-0
-      - village1 0-1
-    unit_count:
-      - 2
-    unit_types:
-      - Small house 1A
-  - name: village1 1
-    statics:
-      - village1 1-0
-      - village1 1-1
-      - village1 1-2
-      - village1 1-3
-      - village1 1-4
-      - village1 1-5
-      - village1 1-6
-      - village1 1-7
-    unit_count:
-      - 8
-    unit_types:
-      - Small werehouse 1
-  - name: village1 2
-    statics:
-      - village1 2-0
-      - village1 2-1
-      - village1 2-2
-    unit_count:
-      - 3
-    unit_types:
-      - Small house 1B
+  - Village:
+    - name: village1 0
+      statics:
+        - village1 0-0
+        - village1 0-1
+      unit_count:
+        - 2
+      unit_types:
+        - Small house 1A
+    - name: village1 1
+      statics:
+        - village1 1-0
+        - village1 1-1
+        - village1 1-2
+        - village1 1-3
+        - village1 1-4
+        - village1 1-5
+        - village1 1-6
+        - village1 1-7
+      unit_count:
+        - 8
+      unit_types:
+        - Small werehouse 1
+    - name: village1 2
+      statics:
+        - village1 2-0
+        - village1 2-1
+        - village1 2-2
+      unit_count:
+        - 3
+      unit_types:
+        - Small house 1B
 layout_file: resources/layouts/buildings/buildings.miz
--- a/resources/layouts/buildings/ware1.yaml
+++ b/resources/layouts/buildings/ware1.yaml
@@ -1,24 +1,24 @@
 name: ware1
 generic: true
-role: Building
 tasks:
  - StrikeTarget
  - Ware
 groups:
-  - name: ware1 0
-    statics:
-      - ware1 0-0
-    unit_count:
-      - 1
-    unit_types:
-      - Warehouse
-  - name: ware1 1
-    statics:
-      - ware1 1-0
-      - ware1 1-1
-      - ware1 1-2
-    unit_count:
-      - 3
-    unit_types:
-      - Hangar A
+  - Ware:
+    - name: ware1 0
+      statics:
+        - ware1 0-0
+      unit_count:
+        - 1
+      unit_types:
+        - Warehouse
+    - name: ware1 1
+      statics:
+        - ware1 1-0
+        - ware1 1-1
+        - ware1 1-2
+      unit_count:
+        - 3
+      unit_types:
+        - Hangar A
 layout_file: resources/layouts/buildings/buildings.miz
--- a/resources/layouts/buildings/ww2bunker1.yaml
+++ b/resources/layouts/buildings/ww2bunker1.yaml
@@ -1,34 +1,34 @@
 name: ww2bunker1
 generic: true
-role: Building
 tasks:
  - StrikeTarget
  - WW2Bunker
 groups:
-  - name: ww2bunker1 0
-    statics:
-      - ww2bunker1 0-0
-      - ww2bunker1 0-1
-      - ww2bunker1 0-2
-      - ww2bunker1 0-3
-    unit_count:
-      - 4
-    unit_types:
-      - Siegfried Line
-  - name: ww2bunker1 1
-    statics:
-      - ww2bunker1 1-0
-      - ww2bunker1 1-1
-      - ww2bunker1 1-2
-      - ww2bunker1 1-3
-    unit_count:
-      - 4
-    unit_types:
-      - Fire Control Bunker
-  - name: ww2bunker1 2
-    group: 2 # Vehicle and static can not be mixed
-    unit_count:
-      - 4
-    unit_types:
-      - SK_C_28_naval_gun
+  - Bunker:
+    - name: ww2bunker1 0
+      statics:
+        - ww2bunker1 0-0
+        - ww2bunker1 0-1
+        - ww2bunker1 0-2
+        - ww2bunker1 0-3
+      unit_count:
+        - 4
+      unit_types:
+        - Siegfried Line
+    - name: ww2bunker1 1
+      statics:
+        - ww2bunker1 1-0
+        - ww2bunker1 1-1
+        - ww2bunker1 1-2
+        - ww2bunker1 1-3
+      unit_count:
+        - 4
+      unit_types:
+        - Fire Control Bunker
+  - Bunker2: # Vehicle and static can not be mixed
+    - name: ww2bunker1 2
+      unit_count:
+        - 4
+      unit_types:
+        - SK_C_28_naval_gun
 layout_file: resources/layouts/buildings/buildings.miz
--- a/resources/layouts/buildings/ww2bunker2.yaml
+++ b/resources/layouts/buildings/ww2bunker2.yaml
@@ -1,57 +1,57 @@
 name: ww2bunker2
 generic: true
-role: Building
 tasks:
  - StrikeTarget
  - WW2Bunker
 groups:
-  - name: ww2bunker2 0
-    statics:
-      - ww2bunker2 0-0
-    unit_count:
-      - 1
-    unit_types:
-      - Fire Control Bunker
-  - name: ww2bunker2 1
-    statics:
-      - ww2bunker2 1-0
-      - ww2bunker2 1-1
-    unit_count:
-      - 2
-    unit_types:
-      - Siegfried Line
-  - name: ww2bunker2 2
-    statics:
-      - ww2bunker2 2-0
-      - ww2bunker2 2-1
-      - ww2bunker2 2-2
-      - ww2bunker2 2-3
-      - ww2bunker2 2-4
-      - ww2bunker2 2-5
-      - ww2bunker2 2-6
-      - ww2bunker2 2-7
-    unit_count:
-      - 8
-    unit_types:
-      - Concertina wire
-  - name: ww2bunker2 3
-    statics:
-      - ww2bunker2 3-0
-    unit_count:
-      - 1
-    unit_types:
-      - Belgian gate
-  - name: ww2bunker2 4
-    statics:
-      - ww2bunker2 4-0
-      - ww2bunker2 4-1
-      - ww2bunker2 4-2
-      - ww2bunker2 4-3
-      - ww2bunker2 4-4
-      - ww2bunker2 4-5
-      - ww2bunker2 4-6
-    unit_count:
-      - 7
-    unit_types:
-      - Czech hedgehogs 1
+  - Bunker:
+    - name: ww2bunker2 0
+      statics:
+        - ww2bunker2 0-0
+      unit_count:
+        - 1
+      unit_types:
+        - Fire Control Bunker
+    - name: ww2bunker2 1
+      statics:
+        - ww2bunker2 1-0
+        - ww2bunker2 1-1
+      unit_count:
+        - 2
+      unit_types:
+        - Siegfried Line
+    - name: ww2bunker2 2
+      statics:
+        - ww2bunker2 2-0
+        - ww2bunker2 2-1
+        - ww2bunker2 2-2
+        - ww2bunker2 2-3
+        - ww2bunker2 2-4
+        - ww2bunker2 2-5
+        - ww2bunker2 2-6
+        - ww2bunker2 2-7
+      unit_count:
+        - 8
+      unit_types:
+        - Concertina wire
+    - name: ww2bunker2 3
+      statics:
+        - ww2bunker2 3-0
+      unit_count:
+        - 1
+      unit_types:
+        - Belgian gate
+    - name: ww2bunker2 4
+      statics:
+        - ww2bunker2 4-0
+        - ww2bunker2 4-1
+        - ww2bunker2 4-2
+        - ww2bunker2 4-3
+        - ww2bunker2 4-4
+        - ww2bunker2 4-5
+        - ww2bunker2 4-6
+      unit_count:
+        - 7
+      unit_types:
+        - Czech hedgehogs 1
 layout_file: resources/layouts/buildings/buildings.miz
--- a/resources/layouts/defenses/Silkworm.yaml
+++ b/resources/layouts/defenses/Silkworm.yaml
@@ -1,34 +1,34 @@
 name: Silkworm
-role: Defenses
 tasks:
  - Coastal
 groups:
-  - name: SilkwormGenerator 0
-    unit_count:
-      - 1
-    unit_classes:
-      - SearchRadar
-  - name: SilkwormGenerator 1
-    unit_count:
-      - 5
-    unit_classes:
-      - Missile
-  - name: SilkwormGenerator 2
-    optional: true
-    unit_count:
-      - 1
-    unit_classes:
-      - Logistics
-  - name: SilkwormGenerator 3
-    optional: true
-    unit_count:
-      - 1
-    unit_classes:
-      - AAA
-  - name: SilkwormGenerator 4
-    optional: true
-    unit_count:
-      - 1
-    unit_classes:
-      - SHORAD
+  - Silkworm:
+    - name: SilkwormGenerator 0
+      unit_count:
+        - 1
+      unit_classes:
+        - SearchRadar
+    - name: SilkwormGenerator 1
+      unit_count:
+        - 5
+      unit_classes:
+        - Missile
+    - name: SilkwormGenerator 2
+      optional: true
+      unit_count:
+        - 1
+      unit_classes:
+        - Logistics
+    - name: SilkwormGenerator 3
+      optional: true
+      unit_count:
+        - 1
+      unit_classes:
+        - AAA
+    - name: SilkwormGenerator 4
+      optional: true
+      unit_count:
+        - 1
+      unit_classes:
+        - SHORAD
 layout_file: resources/layouts/defenses/defenses.miz
--- a/resources/layouts/defenses/missile.yaml
+++ b/resources/layouts/defenses/missile.yaml
@@ -1,29 +1,29 @@
 name: Missile
-role: Defenses
 generic: true
 tasks:
  - Missile
 groups:
-  - name: ScudGenerator 0
-    unit_count:
-      - 3
-    unit_classes:
-      - Missile
-  - name: ScudGenerator 1
-    unit_count:
-      - 1
-    unit_classes:
-      - Logistics
-  - name: ScudGenerator 2
-    optional: true
-    unit_count:
-      - 1
-    unit_classes:
-      - AAA
-  - name: ScudGenerator 3
-    optional: true
-    unit_count:
-      - 1
-    unit_classes:
-      - SHORAD
+  - Missile:
+    - name: ScudGenerator 0
+      unit_count:
+        - 3
+      unit_classes:
+        - Missile
+    - name: ScudGenerator 1
+      unit_count:
+        - 1
+      unit_classes:
+        - Logistics
+    - name: ScudGenerator 2
+      optional: true
+      unit_count:
+        - 1
+      unit_classes:
+        - AAA
+    - name: ScudGenerator 3
+      optional: true
+      unit_count:
+        - 1
+      unit_classes:
+        - SHORAD
 layout_file: resources/layouts/defenses/defenses.miz
--- a/resources/layouts/ground_forces/Armor_Group.yaml
+++ b/resources/layouts/ground_forces/Armor_Group.yaml
@@ -1,17 +1,17 @@
 name: Armor Group
-role: GroundForce
 generic: true
 tasks:
  - BaseDefense
  - FrontLine
 groups:
-  - name: Armor Group 0
-    unit_count:
-      - 2
-      - 6
-    unit_classes:
-      - APC
-      - ATGM
-      - IFV
-      - Tank
+  - Armor Group:
+    - name: Armor Group 0
+      unit_count:
+        - 2
+        - 6
+      unit_classes:
+        - APC
+        - ATGM
+        - IFV
+        - Tank
 layout_file: resources/layouts/ground_forces/ground_forces.miz
--- a/resources/layouts/ground_forces/Armor_Group_with_Anti-Air.yaml
+++ b/resources/layouts/ground_forces/Armor_Group_with_Anti-Air.yaml
@@ -1,26 +1,26 @@
 name: Armor Group with Anti-Air
-role: GroundForce
 generic: true
 tasks:
  - BaseDefense
  - FrontLine
 groups:
-  - name: Armor Group with Anti-Air 0
-    unit_count:
-      - 2
-      - 6
-    unit_classes:
-      - APC
-      - ATGM
-      - IFV
-      - Tank
-  - name: Armor Group with Anti-Air 1
-    optional: true
-    unit_count:
-      - 1
-      - 2
-    unit_classes:
-      - AAA
-      - SHORAD
-      - Manpad
+  - Armor Group:
+    - name: Armor Group with Anti-Air 0
+      unit_count:
+        - 2
+        - 6
+      unit_classes:
+        - APC
+        - ATGM
+        - IFV
+        - Tank
+    - name: Armor Group with Anti-Air 1
+      optional: true
+      unit_count:
+        - 1
+        - 2
+      unit_classes:
+        - AAA
+        - SHORAD
+        - Manpad
 layout_file: resources/layouts/ground_forces/ground_forces.miz
--- a/resources/layouts/naval/Carrier_Group.yaml
+++ b/resources/layouts/naval/Carrier_Group.yaml
@@ -1,19 +1,18 @@
 name: Carrier Group
-role: Naval
 generic: true
 tasks:
  - AircraftCarrier
 groups:
-  - name: Carrier Group 0
-    group: 1
-    unit_count:
-      - 1
-    unit_classes:
-      - AircraftCarrier
-  - name: Carrier Group 1
-    group: 2
-    unit_count:
-      - 4
-    unit_classes:
-      - Destroyer
+  - Carrier:
+    - name: Carrier Group 0
+      unit_count:
+        - 1
+      unit_classes:
+        - AircraftCarrier
+  - Escort:
+    - name: Carrier Group 1
+      unit_count:
+        - 4
+      unit_classes:
+        - Destroyer
 layout_file: resources/layouts/naval/legacy_naval_templates.miz
--- a/resources/layouts/naval/Carrier_Strike_Group_8.yaml
+++ b/resources/layouts/naval/Carrier_Strike_Group_8.yaml
@@ -1,25 +1,23 @@
 name: Carrier Strike Group 8
-role: Naval
 generic: true
 tasks:
  - AircraftCarrier
 groups:
-  - name: Carrier Strike Group 8 0
-    group: 1
-    unit_count:
-      - 1
-    unit_types:
-      - Stennis
-  - name: Carrier Strike Group 8 1
-    group: 2
-    unit_count:
-      - 5
-    unit_types:
-      - USS_Arleigh_Burke_IIa
-  - name: Carrier Strike Group 8 2
-    group: 2
-    unit_count:
-      - 2
-    unit_types:
-      - TICONDEROG
+  - Carrier:
+    - name: Carrier Strike Group 8 0
+      unit_count:
+        - 1
+      unit_types:
+        - Stennis
+  - Escort:
+    - name: Carrier Strike Group 8 1
+      unit_count:
+        - 4
+      unit_types:
+        - USS_Arleigh_Burke_IIa
+    - name: Carrier Strike Group 8 2
+      unit_count:
+        - 1
+      unit_types:
+        - TICONDEROG
 layout_file: resources/layouts/naval/legacy_naval_templates.miz
--- a/resources/layouts/naval/LHA_Group.yaml
+++ b/resources/layouts/naval/LHA_Group.yaml
@@ -1,19 +1,18 @@
 name: LHA Group
 generic: true
-role: Naval
 tasks:
  - HelicopterCarrier
 groups:
-  - name: LHA Group 0
-    group: 1
-    unit_count:
-      - 1
-    unit_classes:
-      - HelicopterCarrier
-  - name: LHA Group 1
-    group: 2
-    unit_count:
-      - 2
-    unit_classes:
-      - Destroyer
+  - LHA:
+    - name: LHA Group 0
+      unit_count:
+        - 1
+      unit_classes:
+        - HelicopterCarrier
+  - Escort:
+    - name: LHA Group 1
+      unit_count:
+        - 2
+      unit_classes:
+        - Destroyer
 layout_file: resources/layouts/naval/legacy_naval_templates.miz
--- a/resources/layouts/naval/Naval-Group.yaml
+++ b/resources/layouts/naval/Naval-Group.yaml
@@ -1,23 +1,23 @@
 name: Naval Group
-role: Naval
 tasks:
  - Navy
 groups:
-  - name: Naval Group 0
-    unit_count:
-      - 2
-    unit_classes:
-      - Frigate
-  - name: Naval Group 1
-    unit_count:
-      - 2
-    unit_classes:
-      - Destroyer
-  - name: Naval Group 2
-    optional: true
-    unit_count:
-      - 0
-      - 1
-    unit_classes:
-      - Cruiser
+  - Naval Group:
+    - name: Naval Group 0
+      unit_count:
+        - 2
+      unit_classes:
+        - Frigate
+    - name: Naval Group 1
+      unit_count:
+        - 2
+      unit_classes:
+        - Destroyer
+    - name: Naval Group 2
+      optional: true
+      unit_count:
+        - 0
+        - 1
+      unit_classes:
+        - Cruiser
 layout_file: resources/layouts/naval/naval.miz
--- a/resources/layouts/naval/Naval-Two-Ship.yaml
+++ b/resources/layouts/naval/Naval-Two-Ship.yaml
@@ -1,17 +1,17 @@
 name: Naval Two Ship
-role: Naval
 generic: true
 tasks:
  - Navy
 groups:
-  - name: Naval Two Ship
-    unit_count:
-      - 2
-    unit_classes:
-      - Frigate
-      - Destroyer
-      - Cruiser
-      - Boat
-      - Submarine
-      - LandingShip
+  - Naval Two Ship:
+    - name: Naval Two Ship
+      unit_count:
+        - 2
+      unit_classes:
+        - Frigate
+        - Destroyer
+        - Cruiser
+        - Boat
+        - Submarine
+        - LandingShip
 layout_file: resources/layouts/naval/naval.miz
--- a/resources/layouts/naval/WW2-LST.yaml
+++ b/resources/layouts/naval/WW2-LST.yaml
@@ -3,14 +3,15 @@ role: Naval
 tasks:
  - Navy
 groups:
-  - name: WW2 LST Group 0
-    unit_count:
-      - 1
-    unit_types:
-      - USS_Samuel_Chase
-  - name: WW2 LST Group 1
-    unit_count:
-      - 3
-    unit_types:
-      - LST_Mk2
+  - LST:
+    - name: WW2 LST Group 0
+      unit_count:
+        - 1
+      unit_types:
+        - USS_Samuel_Chase
+    - name: WW2 LST Group 1
+      unit_count:
+        - 3
+      unit_types:
+        - LST_Mk2
 layout_file: resources/layouts/naval/legacy_naval_templates.miz