diff --git a/cScripts/Loadouts/CfgLoadouts_Bravo.hpp b/cScripts/Loadouts/CfgLoadouts_Bravo.hpp
index 4e6c0e3d1..cf98e95fd 100644
--- a/cScripts/Loadouts/CfgLoadouts_Bravo.hpp
+++ b/cScripts/Loadouts/CfgLoadouts_Bravo.hpp
@@ -1,143 +1,151 @@
-class Cav_B_B_Officer_F: Cav_B_Charlie_base_F { // Not used (scope 0)
+class Cav_B_B_Officer_F: Cav_B_Bravo_base_F { // Not used (scope 0)
     scope = 0;
-    category[] += {"cScripts_Loadout_Cat_Charlie_Leadership"};
+    category[] += {"cScripts_Loadout_Cat_Bravo_Leadership"};
     loadout = [[],[],[],[],[],[],"","",[],["","","","","",""]];
 };
 class Cav_B_B_PlatoonSergeant_F: Cav_B_B_Officer_F {
     scope = 2;
-    category[] += {"cScripts_Loadout_Cat_Charlie_Leadership"};
+    //category[] += {"cScripts_Loadout_Cat_Bravo_Leadership"};
     loadout = [[],[],[],[],[],[],"","",[],["","","","","",""]];
     equipmentTags[] = {};
 };
 class Cav_B_B_PlatoonLeader_F: Cav_B_B_Officer_F {
     scope = 2;
-    category[] += {"cScripts_Loadout_Cat_Charlie_Leadership"};
+    //category[] += {"cScripts_Loadout_Cat_Bravo_Leadership"};
     loadout = [[],[],[],[],[],[],"","",[],["","","","","",""]];
     equipmentTags[] = {};
 };
 
 
-class Cav_B_B_SquadLeader_F: Cav_B_Charlie_base_F {
+class Cav_B_B_SquadLeader_F: Cav_B_Bravo_base_F {
     scope = 2;
-    category[] += {"cScripts_Loadout_Cat_Charlie_Leadership"};
+    category[] += {"cScripts_Loadout_Cat_Bravo_Leadership"};
     loadout = [[],[],[],[],[],[],"","",[],["","","","","",""]];
     equipmentTags[] = {};
 };
-class Cav_B_B_FireTeamLeader_F: Cav_B_Charlie_base_F {
+class Cav_B_B_FireTeamLeader_F: Cav_B_Bravo_base_F {
     scope = 2;
-    category[] += {"cScripts_Loadout_Cat_Charlie_Squad"};
+    category[] += {"cScripts_Loadout_Cat_Bravo_Squad"};
     loadout = [[],[],[],[],[],[],"","",[],["","","","","",""]];
     equipmentTags[] = {};
 };
 
-class Cav_B_B_Rifleman_F: Cav_B_Charlie_base_F {
+class Cav_B_B_Rifleman_F: Cav_B_Bravo_base_F {
     scope = 2;
-    category[] += {"cScripts_Loadout_Cat_Charlie_Squad"};
+    category[] += {"cScripts_Loadout_Cat_Bravo_Squad"};
     loadout = [[],[],[],[],[],[],"","",[],["","","","","",""]];
     equipmentTags[] = {};
 };
-class Cav_B_B_AutomaticRifleman_F: Cav_B_Charlie_base_F {
+class Cav_B_B_AutomaticRifleman_F: Cav_B_Bravo_base_F {
     scope = 2;
-    category[] += {"cScripts_Loadout_Cat_Charlie_Squad"};
+    category[] += {"cScripts_Loadout_Cat_Bravo_Squad"};
     loadout = [[],[],[],[],[],[],"","",[],["","","","","",""]];
     equipmentTags[] = {};
 };
-class Cav_B_B_AssistantAutomaticRifleman_F: Cav_B_Charlie_base_F { // Not used (scope 0)
+class Cav_B_B_AssistantAutomaticRifleman_F: Cav_B_Bravo_base_F {
+    scope = 2;
+    category[] += {"cScripts_Loadout_Cat_Bravo_Squad"};
+    loadout = [[],[],[],[],[],[],"","",[],["","","","","",""]];
+    equipmentTags[] = {};
+};
+class Cav_B_B_MachineGunner_F: Cav_B_Bravo_base_F { // Not used (scope 0)
     scope = 0;
-    category[] += {"cScripts_Loadout_Cat_Charlie_Squad"};
+    category[] += {"cScripts_Loadout_Cat_Bravo_Weapons"};
     loadout = [[],[],[],[],[],[],"","",[],["","","","","",""]];
     equipmentTags[] = {};
 };
-class Cav_B_B_Grenadier_F: Cav_B_Charlie_base_F {
-    scope = 2;
-    category[] += {"cScripts_Loadout_Cat_Charlie_Squad"};
+class Cav_B_B_AssistantMachineGunner_F: Cav_B_Bravo_base_F { // Not used (scope 0)
+    scope = 0;
+    category[] += {"cScripts_Loadout_Cat_Bravo_Weapons"};
     loadout = [[],[],[],[],[],[],"","",[],["","","","","",""]];
     equipmentTags[] = {};
 };
-class Cav_B_B_RiflemanLAT_F: Cav_B_Charlie_base_F {
+class Cav_B_B_Grenadier_F: Cav_B_Bravo_base_F {
     scope = 2;
-    category[] += {"cScripts_Loadout_Cat_Charlie_Squad"};
+    category[] += {"cScripts_Loadout_Cat_Bravo_Squad"};
     loadout = [[],[],[],[],[],[],"","",[],["","","","","",""]];
     equipmentTags[] = {};
 };
-
-class Cav_B_B_MachineGunner_F: Cav_B_Charlie_base_F { // Not used (scope 0)
+class Cav_B_B_RiflemanLAT_F: Cav_B_Bravo_base_F { // Not used (scope 0)
     scope = 0;
-    category[] += {"cScripts_Loadout_Cat_Charlie_Weapons"};
+    category[] += {"cScripts_Loadout_Cat_Bravo_Squad"};
     loadout = [[],[],[],[],[],[],"","",[],["","","","","",""]];
     equipmentTags[] = {};
 };
-class Cav_B_B_AssistantMachineGunner_F: Cav_B_Charlie_base_F { // Not used (scope 0)
+class Cav_B_B_RiflemanAT_F: Cav_B_Bravo_base_F { // Not used (scope 0)
     scope = 0;
-    category[] += {"cScripts_Loadout_Cat_Charlie_Weapons"};
+    category[] += {"cScripts_Loadout_Cat_Bravo_Weapons"};
     loadout = [[],[],[],[],[],[],"","",[],["","","","","",""]];
     equipmentTags[] = {};
 };
-class Cav_B_B_RiflemanAT_F: Cav_B_Charlie_base_F { // Not used (scope 0)
+class Cav_B_B_RiflemanATAssistant_F: Cav_B_Bravo_base_F { // Not used (scope 0)
     scope = 0;
-    category[] += {"cScripts_Loadout_Cat_Charlie_Weapons"};
+    category[] += {"cScripts_Loadout_Cat_Bravo_Weapons"};
     loadout = [[],[],[],[],[],[],"","",[],["","","","","",""]];
     equipmentTags[] = {};
 };
-class Cav_B_B_RiflemanATAssistant_F: Cav_B_Charlie_base_F { // Not used (scope 0)
+class Cav_B_B_RiflemanAA_F: Cav_B_Bravo_base_F { // Not used (scope 0)
     scope = 0;
-    category[] += {"cScripts_Loadout_Cat_Charlie_Weapons"};
+    category[] += {"cScripts_Loadout_Cat_Bravo_Weapons"};
     loadout = [[],[],[],[],[],[],"","",[],["","","","","",""]];
     equipmentTags[] = {};
 };
-class Cav_B_B_RiflemanAA_F: Cav_B_Charlie_base_F { // Not used (scope 0)
+class Cav_B_B_RiflemanAAAssistant_F: Cav_B_Bravo_base_F { // Not used (scope 0)
     scope = 0;
-    category[] += {"cScripts_Loadout_Cat_Charlie_Weapons"};
+    category[] += {"cScripts_Loadout_Cat_Bravo_Weapons"};
     loadout = [[],[],[],[],[],[],"","",[],["","","","","",""]];
     equipmentTags[] = {};
 };
-class Cav_B_B_RiflemanAAAssistant_F: Cav_B_Charlie_base_F { // Not used (scope 0)
+class Cav_B_B_RiflemanATR_F: Cav_B_Bravo_base_F { // Not used (scope 0)
     scope = 0;
-    category[] += {"cScripts_Loadout_Cat_Charlie_Weapons"};
+    category[] += {"cScripts_Loadout_Cat_Bravo_Weapons"};
     loadout = [[],[],[],[],[],[],"","",[],["","","","","",""]];
     equipmentTags[] = {};
 };
-class Cav_B_B_RiflemanATR_F: Cav_B_Charlie_base_F { // Not used (scope 0)
+class Cav_B_B_RiflemanATRAssistant_F: Cav_B_Bravo_base_F { // Not used (scope 0)
     scope = 0;
-    category[] += {"cScripts_Loadout_Cat_Charlie_Weapons"};
+    category[] += {"cScripts_Loadout_Cat_Bravo_Weapons"};
+    loadout = [[],[],[],[],[],[],"","",[],["","","","","",""]];
+    equipmentTags[] = {};
+};
+class Cav_B_B_PlatoonMedic_F: Cav_B_Bravo_base_F {
+    scope = 2;
+    category[] += {"cScripts_Loadout_Cat_Bravo_Leadership"};
     loadout = [[],[],[],[],[],[],"","",[],["","","","","",""]];
     equipmentTags[] = {};
+    abilityMedic = 2;
 };
-class Cav_B_B_RiflemanATRAssistant_F: Cav_B_Charlie_base_F { // Not used (scope 0)
+class Cav_B_B_Medic_F: Cav_B_Bravo_base_F { // Not used (scope 0)
     scope = 0;
-    category[] += {"cScripts_Loadout_Cat_Charlie_Weapons"};
+    category[] += {"cScripts_Loadout_Cat_Bravo_Squad"};
     loadout = [[],[],[],[],[],[],"","",[],["","","","","",""]];
     equipmentTags[] = {};
+    abilityMedic = 3;
 };
-
-class Cav_B_B_Marksman_F: Cav_B_Charlie_base_F {
+class Cav_B_B_CombatLifeSaver_F: Cav_B_Bravo_base_F {
     scope = 2;
-    category[] += {"cScripts_Loadout_Cat_Charlie_Special"};
+    category[] += {"cScripts_Loadout_Cat_Bravo_Squad"};
     loadout = [[],[],[],[],[],[],"","",[],["","","","","",""]];
     equipmentTags[] = {};
+    abilityMedic = 1;
 };
 
 
-class Cav_B_B_Medic_F: Cav_B_Charlie_base_F { // Not used (scope 0)
-    scope = 0;
-    category[] += {"cScripts_Loadout_Cat_Charlie_Squad"};
+class Cav_B_B_IFV_Commander_F: Cav_B_Bravo_base_F {
+    scope = 2;
+    category[] += {"cScripts_Loadout_Cat_Bravo_IFV"};
     loadout = [[],[],[],[],[],[],"","",[],["","","","","",""]];
     equipmentTags[] = {};
-    abilityMedic = 3;
 };
-class Cav_B_B_PlatoonMedic_F: Cav_B_Charlie_base_F {
+class Cav_B_B_IFV_Driver_F: Cav_B_Bravo_base_F {
     scope = 2;
-    category[] += {"cScripts_Loadout_Cat_Charlie_Squad"};
+    category[] += {"cScripts_Loadout_Cat_Bravo_IFV"};
     loadout = [[],[],[],[],[],[],"","",[],["","","","","",""]];
     equipmentTags[] = {};
-    abilityMedic = 2;
 };
-class Cav_B_B_CombatLifeSaver_F: Cav_B_Charlie_base_F {
+class Cav_B_B_IFV_Gunner_F: Cav_B_Bravo_base_F {
     scope = 2;
-    category[] += {"cScripts_Loadout_Cat_Charlie_Squad"};
+    category[] += {"cScripts_Loadout_Cat_Bravo_IFV"};
     loadout = [[],[],[],[],[],[],"","",[],["","","","","",""]];
     equipmentTags[] = {};
-    abilityMedic = 1;
-};
-
-//FIXME: Add first platoon units. Here basically
+};
\ No newline at end of file
diff --git a/cScripts/Loadouts/CfgLoadouts_Bravo_Labeled.hpp b/cScripts/Loadouts/CfgLoadouts_Bravo_Labeled.hpp
index 69e73de01..e69de29bb 100644
--- a/cScripts/Loadouts/CfgLoadouts_Bravo_Labeled.hpp
+++ b/cScripts/Loadouts/CfgLoadouts_Bravo_Labeled.hpp
@@ -1,285 +0,0 @@
-// First Platoon
-// FIXME: Add labeled first platoon units Here
-
-// Second Platoon
-class Cav_B_B_PlatoonSergeant_2_5_F: Cav_B_B_PlatoonSergeant_F {
-    scope = 1;
-    platoon = 2;
-    squad = 5;
-    insignia = "cav_insignia_bravo_2";
-};
-class Cav_B_B_PlatoonLeader_2_6_F: Cav_B_B_PlatoonLeader_F {
-    scope = 1;
-    platoon = 2;
-    squad = 6;
-    insignia = "cav_insignia_bravo_2";
-};
-class Cav_B_B_PlatoonMedic_2_7_F: Cav_B_B_PlatoonMedic_F {
-    scope = 1;
-    platoon = 2;
-    squad = 7;
-    insignia = "cav_insignia_bravo_2";
-};
-
-// Squad 1-2-C-1/7
-class Cav_B_B_SquadLeader_2_1_F: Cav_B_B_SquadLeader_F {
-    scope = 1;
-    platoon = 2;
-    squad = 1;
-    insignia = "cav_insignia_bravo_2_1";
-};
-
-class Cav_B_B_FireTeamLeader_2_1_A_F: Cav_B_B_FireTeamLeader_F {
-    scope = 1;
-    platoon = 2;
-    squad = 1;
-    team = "alpha";
-    insignia = "cav_insignia_bravo_2_1";
-};
-class Cav_B_B_AutomaticRifleman_2_1_A_F: Cav_B_B_AutomaticRifleman_F {
-    scope = 1;
-    platoon = 2;
-    squad = 1;
-    team = "alpha";
-    insignia = "cav_insignia_bravo_2_1";
-};
-class Cav_B_B_Grenadier_2_1_A_F: Cav_B_B_Grenadier_F {
-    scope = 1;
-    platoon = 2;
-    squad = 1;
-    insignia = "cav_insignia_bravo_2_1";
-};
-class Cav_B_B_Rifleman_2_1_A_F: Cav_B_B_Rifleman_F {
-    scope = 1;
-    platoon = 2;
-    squad = 1;
-    team = "alpha";
-    insignia = "cav_insignia_bravo_2_1";
-};
-
-class Cav_B_B_FireTeamLeader_2_1_B_F: Cav_B_B_FireTeamLeader_F {
-    scope = 1;
-    platoon = 2;
-    squad = 1;
-    team = "bravo";
-    insignia = "cav_insignia_bravo_2_1";
-};
-class Cav_B_B_AutomaticRifleman_2_1_B_F: Cav_B_B_AutomaticRifleman_F {
-    scope = 1;
-    platoon = 2;
-    squad = 1;
-    team = "bravo";
-    insignia = "cav_insignia_bravo_2_1";
-};
-class Cav_B_B_Grenadier_2_1_B_F: Cav_B_B_Grenadier_F {
-    scope = 1;
-    platoon = 2;
-    squad = 1;
-    team = "bravo";
-    insignia = "cav_insignia_bravo_2_1";
-};
-class Cav_B_B_CombatLifeSaver_2_1_B_F: Cav_B_B_CombatLifeSaver_F {
-    scope = 1;
-    platoon = 2;
-    squad = 1;
-    team = "bravo";
-    insignia = "cav_insignia_bravo_2_1";
-};
-
-// Squad 2-1-C-1/7
-class Cav_B_B_SquadLeader_2_2_F: Cav_B_B_SquadLeader_F {
-    scope = 1;
-    platoon = 2;
-    squad = 2;
-    insignia = "cav_insignia_bravo_2_2";
-};
-
-class Cav_B_B_FireTeamLeader_2_2_A_F: Cav_B_B_FireTeamLeader_F {
-    scope = 1;
-    platoon = 2;
-    squad = 2;
-    team = "alpha";
-    insignia = "cav_insignia_bravo_2_2";
-};
-class Cav_B_B_AutomaticRifleman_2_2_A_F: Cav_B_B_AutomaticRifleman_F {
-    scope = 1;
-    platoon = 2;
-    squad = 2;
-    team = "alpha";
-    insignia = "cav_insignia_bravo_2_2";
-};
-class Cav_B_B_Grenadier_2_2_A_F: Cav_B_B_Grenadier_F {
-    scope = 1;
-    platoon = 2;
-    squad = 2;
-    team = "alpha";
-    insignia = "cav_insignia_bravo_2_2";
-};
-class Cav_B_B_Rifleman_2_2_A_F: Cav_B_B_Rifleman_F {
-    scope = 1;
-    platoon = 2;
-    squad = 2;
-    team = "alpha";
-    insignia = "cav_insignia_bravo_2_2";
-};
-
-class Cav_B_B_FireTeamLeader_2_2_B_F: Cav_B_B_FireTeamLeader_F {
-    scope = 1;
-    platoon = 2;
-    squad = 2;
-    team = "bravo";
-    insignia = "cav_insignia_bravo_2_2";
-};
-class Cav_B_B_AutomaticRifleman_2_2_B_F: Cav_B_B_AutomaticRifleman_F {
-    scope = 1;
-    platoon = 2;
-    squad = 2;
-    team = "bravo";
-    insignia = "cav_insignia_bravo_2_2";
-};
-class Cav_B_B_Grenadier_2_2_B_F: Cav_B_B_Grenadier_F {
-    scope = 1;
-    platoon = 2;
-    squad = 2;
-    team = "bravo";
-    insignia = "cav_insignia_bravo_2_2";
-};
-class Cav_B_B_CombatLifeSaver_2_2_B_F: Cav_B_B_CombatLifeSaver_F {
-    scope = 1;
-    platoon = 2;
-    squad = 2;
-    team = "bravo";
-    insignia = "cav_insignia_bravo_2_2";
-};
-
-// Squad 3-1-C-1/7
-class Cav_B_B_SquadLeader_2_3_F: Cav_B_B_SquadLeader_F {
-    scope = 1;
-    platoon = 2;
-    squad = 3;
-    insignia = "cav_insignia_bravo_2_3";
-};
-
-class Cav_B_B_FireTeamLeader_2_3_A_F: Cav_B_B_FireTeamLeader_F {
-    scope = 1;
-    platoon = 2;
-    squad = 3;
-    team = "alpha";
-    insignia = "cav_insignia_bravo_2_3";
-};
-class Cav_B_B_AutomaticRifleman_2_3_A_F: Cav_B_B_AutomaticRifleman_F {
-    scope = 1;
-    platoon = 1;
-    squad = 1;
-    team = "alpha";
-    insignia = "cav_insignia_bravo_2_3";
-};
-class Cav_B_B_Grenadier_2_3_A_F: Cav_B_B_Grenadier_F {
-    scope = 1;
-    platoon = 2;
-    squad = 3;
-    team = "alpha";
-    insignia = "cav_insignia_bravo_2_3";
-};
-class Cav_B_B_Rifleman_2_3_A_F: Cav_B_B_Rifleman_F {
-    scope = 1;
-    platoon = 2;
-    squad = 3;
-    team = "alpha";
-    insignia = "cav_insignia_bravo_2_3";
-};
-
-class Cav_B_B_FireTeamLeader_2_3_B_F: Cav_B_B_FireTeamLeader_F {
-    scope = 1;
-    platoon = 2;
-    squad = 3;
-    team = "bravo";
-    insignia = "cav_insignia_bravo_2_3";
-};
-class Cav_B_B_AutomaticRifleman_2_3_B_F: Cav_B_B_AutomaticRifleman_F {
-    scope = 1;
-    platoon = 2;
-    squad = 3;
-    team = "bravo";
-    insignia = "cav_insignia_bravo_2_3";
-};
-class Cav_B_B_Grenadier_2_3_B_F: Cav_B_B_Grenadier_F {
-    scope = 1;
-    platoon = 2;
-    squad = 3;
-    team = "bravo";
-    insignia = "cav_insignia_bravo_2_3";
-};
-class Cav_B_B_CombatLifeSaver_2_3_B_F: Cav_B_B_CombatLifeSaver_F {
-    scope = 1;
-    platoon = 2;
-    squad = 3;
-    team = "bravo";
-    insignia = "cav_insignia_bravo_2_3";
-};
-
-// Squad 4-1-C-1/7
-class Cav_B_B_SquadLeader_2_4_F: Cav_B_B_SquadLeader_F {
-    scope = 1;
-    platoon = 2;
-    squad = 4;
-    insignia = "cav_insignia_bravo_2_4";
-};
-
-class Cav_B_B_FireTeamLeader_2_4_A_F: Cav_B_B_FireTeamLeader_F {
-    scope = 1;
-    platoon = 2;
-    squad = 4;
-    team = "alpha";
-    insignia = "cav_insignia_bravo_2_4";
-};
-class Cav_B_B_AutomaticRifleman_2_4_A_F: Cav_B_B_AutomaticRifleman_F {
-    scope = 1;
-    platoon = 2;
-    squad = 4;
-    team = "alpha";
-    insignia = "cav_insignia_bravo_2_4";
-};
-class Cav_B_B_Grenadier_2_4_A_F: Cav_B_B_Grenadier_F {
-    scope = 1;
-    platoon = 2;
-    squad = 4;
-    team = "alpha";
-    insignia = "cav_insignia_bravo_2_4";
-};
-class Cav_B_B_Rifleman_2_4_A_F: Cav_B_B_Rifleman_F {
-    scope = 1;
-    platoon = 2;
-    squad = 4;
-    team = "alpha";
-    insignia = "cav_insignia_bravo_2_4";
-};
-
-class Cav_B_B_FireTeamLeader_2_4_B_F: Cav_B_B_FireTeamLeader_F {
-    scope = 1;
-    platoon = 2;
-    squad = 4;
-    team = "bravo";
-    insignia = "cav_insignia_bravo_2_4";
-};
-class Cav_B_B_AutomaticRifleman_2_4_B_F: Cav_B_B_AutomaticRifleman_F {
-    scope = 1;
-    platoon = 2;
-    squad = 4;
-    team = "bravo";
-    insignia = "cav_insignia_bravo_2_4";
-};
-class Cav_B_B_Grenadier_2_4_B_F: Cav_B_B_Grenadier_F {
-    scope = 1;
-    platoon = 2;
-    squad = 4;
-    team = "bravo";
-    insignia = "cav_insignia_bravo_2_4";
-};
-class Cav_B_B_CombatLifeSaver_2_4_B_F: Cav_B_B_CombatLifeSaver_F {
-    scope = 1;
-    platoon = 2;
-    squad = 4;
-    team = "bravo";
-    insignia = "cav_insignia_bravo_2_4";
-};