diff --git a/megamek/data/images/units/mechset.txt b/megamek/data/images/units/mechset.txt
index c03a23f0b2b..6ada82ef578 100644
--- a/megamek/data/images/units/mechset.txt
+++ b/megamek/data/images/units/mechset.txt
@@ -1791,8 +1791,8 @@ exact "Black Hawk (Nova) S" "mechs/Blackhawk_S-CO.png"
 exact "Black Hawk (Nova) U" "mechs/Blackhawk_U-CO.png"
 exact "Black Hawk (Nova) X" "mechs/Blackhawk_X-CO.png"
 #STANDARD
-chassis "Black Hawk" "mechs/BlackhawkSTD.png"
-exact "Black Hawk 3" "mechs/BlackhawkSTD_3.png"
+chassis "Black Hawk (Standard)" "mechs/BlackhawkSTD.png"
+exact "Black Hawk (Standard) 3" "mechs/BlackhawkSTD_3.png"
 #IS Version
 chassis "Black Hawk-KU" "mechs/BlackhawkKU.png"
 exact "Black Hawk-KU BHKU-OA" "mechs/BlackhawkKU_A.png"
@@ -3499,8 +3499,8 @@ exact "Koschei KSC-5MC" "mechs/Koschei KSC-5MC.png"
 exact "Koschei KSC-5X" "mechs/Koschei KSC-5X.png"
 exact "Koschei KSC-6L" "mechs/Koschei KSC-6L.png"
 #Koshi (Standard)
-chassis "Koshi" "mechs/KoshiSTD.png"
-exact "Koshi 3" "mechs/KoshiSTD_3.png"
+chassis "Koshi (Standard)" "mechs/KoshiSTD.png"
+exact "Koshi (Standard) 3" "mechs/KoshiSTD_3.png"
 #Kishi (Omni)
 #chassis "Koshi (Mist Lynx)" "mechs/Koshi.png"
 #exact "Koshi (Mist Lynx) A" "mechs/Koshi_A.png"
diff --git a/megamek/data/mechfiles/fighters/3039u/Cheetah F-10.blk b/megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-10.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Cheetah F-10.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-10.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Cheetah F-11-R.blk b/megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-11-R.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Cheetah F-11-R.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-11-R.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Cheetah F-11-RR.blk b/megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-11-RR.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Cheetah F-11-RR.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-11-RR.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Cheetah F-11.blk b/megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-11.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Cheetah F-11.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-11.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Cheetah F-12-S.blk b/megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-12-S.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Cheetah F-12-S.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-12-S.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Cheetah F-13.blk b/megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-13.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Cheetah F-13.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-13.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Cheetah F-14-S.blk b/megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-14-S.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Cheetah F-14-S.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-14-S.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Chippewa CHP-W10.blk b/megamek/data/mechfiles/fighters/TRO3039u/Chippewa CHP-W10.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Chippewa CHP-W10.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Chippewa CHP-W10.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Chippewa CHP-W5.blk b/megamek/data/mechfiles/fighters/TRO3039u/Chippewa CHP-W5.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Chippewa CHP-W5.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Chippewa CHP-W5.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Chippewa CHP-W7.blk b/megamek/data/mechfiles/fighters/TRO3039u/Chippewa CHP-W7.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Chippewa CHP-W7.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Chippewa CHP-W7.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Chippewa CHP-W7T.blk b/megamek/data/mechfiles/fighters/TRO3039u/Chippewa CHP-W7T.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Chippewa CHP-W7T.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Chippewa CHP-W7T.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Chippewa CHP-W8.blk b/megamek/data/mechfiles/fighters/TRO3039u/Chippewa CHP-W8.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Chippewa CHP-W8.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Chippewa CHP-W8.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Corsair CSR-V12.blk b/megamek/data/mechfiles/fighters/TRO3039u/Corsair CSR-V12.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Corsair CSR-V12.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Corsair CSR-V12.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Corsair CSR-V12M Regulus.blk b/megamek/data/mechfiles/fighters/TRO3039u/Corsair CSR-V12M Regulus.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Corsair CSR-V12M Regulus.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Corsair CSR-V12M Regulus.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Corsair CSR-V14.blk b/megamek/data/mechfiles/fighters/TRO3039u/Corsair CSR-V14.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Corsair CSR-V14.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Corsair CSR-V14.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Corsair CSR-V18.blk b/megamek/data/mechfiles/fighters/TRO3039u/Corsair CSR-V18.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Corsair CSR-V18.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Corsair CSR-V18.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Corsair CSR-V20.blk b/megamek/data/mechfiles/fighters/TRO3039u/Corsair CSR-V20.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Corsair CSR-V20.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Corsair CSR-V20.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Lucifer II LCF-R16K.blk b/megamek/data/mechfiles/fighters/TRO3039u/Lucifer II LCF-R16K.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Lucifer II LCF-R16K.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Lucifer II LCF-R16K.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Lucifer II LCF-R16KR.blk b/megamek/data/mechfiles/fighters/TRO3039u/Lucifer II LCF-R16KR.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Lucifer II LCF-R16KR.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Lucifer II LCF-R16KR.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Lucifer LCF-R15.blk b/megamek/data/mechfiles/fighters/TRO3039u/Lucifer LCF-R15.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Lucifer LCF-R15.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Lucifer LCF-R15.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Lucifer LCF-R16.blk b/megamek/data/mechfiles/fighters/TRO3039u/Lucifer LCF-R16.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Lucifer LCF-R16.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Lucifer LCF-R16.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Lucifer LCF-R20.blk b/megamek/data/mechfiles/fighters/TRO3039u/Lucifer LCF-R20.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Lucifer LCF-R20.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Lucifer LCF-R20.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Riever F-100.blk b/megamek/data/mechfiles/fighters/TRO3039u/Riever F-100.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Riever F-100.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Riever F-100.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Riever F-100a.blk b/megamek/data/mechfiles/fighters/TRO3039u/Riever F-100a.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Riever F-100a.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Riever F-100a.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Riever F-100b.blk b/megamek/data/mechfiles/fighters/TRO3039u/Riever F-100b.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Riever F-100b.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Riever F-100b.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Riever F-700.blk b/megamek/data/mechfiles/fighters/TRO3039u/Riever F-700.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Riever F-700.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Riever F-700.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Riever F-700a.blk b/megamek/data/mechfiles/fighters/TRO3039u/Riever F-700a.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Riever F-700a.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Riever F-700a.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Riever F-700b.blk b/megamek/data/mechfiles/fighters/TRO3039u/Riever F-700b.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Riever F-700b.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Riever F-700b.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Sai S-3.blk b/megamek/data/mechfiles/fighters/TRO3039u/Sai S-3.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Sai S-3.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Sai S-3.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Sai S-4.blk b/megamek/data/mechfiles/fighters/TRO3039u/Sai S-4.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Sai S-4.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Sai S-4.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Sai S-4C.blk b/megamek/data/mechfiles/fighters/TRO3039u/Sai S-4C.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Sai S-4C.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Sai S-4C.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Sai S-4X.blk b/megamek/data/mechfiles/fighters/TRO3039u/Sai S-4X.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Sai S-4X.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Sai S-4X.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Sai S-7.blk b/megamek/data/mechfiles/fighters/TRO3039u/Sai S-7.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Sai S-7.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Sai S-7.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Sai S-8.blk b/megamek/data/mechfiles/fighters/TRO3039u/Sai S-8.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Sai S-8.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Sai S-8.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Samurai SL-25.blk b/megamek/data/mechfiles/fighters/TRO3039u/Samurai SL-25.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Samurai SL-25.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Samurai SL-25.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Samurai SL-26.blk b/megamek/data/mechfiles/fighters/TRO3039u/Samurai SL-26.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Samurai SL-26.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Samurai SL-26.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Samurai SL-27.blk b/megamek/data/mechfiles/fighters/TRO3039u/Samurai SL-27.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Samurai SL-27.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Samurai SL-27.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Seydlitz SYD-21.blk b/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-21.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Seydlitz SYD-21.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-21.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Seydlitz SYD-Z1.blk b/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z1.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Seydlitz SYD-Z1.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z1.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Seydlitz SYD-Z2.blk b/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z2.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Seydlitz SYD-Z2.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z2.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Seydlitz SYD-Z2A.blk b/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z2A.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Seydlitz SYD-Z2A.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z2A.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Seydlitz SYD-Z2B.blk b/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z2B.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Seydlitz SYD-Z2B.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z2B.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Seydlitz SYD-Z3.blk b/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z3.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Seydlitz SYD-Z3.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z3.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Seydlitz SYD-Z3A.blk b/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z3A.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Seydlitz SYD-Z3A.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z3A.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Seydlitz SYD-Z4.blk b/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z4.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Seydlitz SYD-Z4.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z4.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Shilone SL-17.blk b/megamek/data/mechfiles/fighters/TRO3039u/Shilone SL-17.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Shilone SL-17.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Shilone SL-17.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Shilone SL-17AC.blk b/megamek/data/mechfiles/fighters/TRO3039u/Shilone SL-17AC.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Shilone SL-17AC.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Shilone SL-17AC.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Shilone SL-17R.blk b/megamek/data/mechfiles/fighters/TRO3039u/Shilone SL-17R.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Shilone SL-17R.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Shilone SL-17R.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Shilone SL-18.blk b/megamek/data/mechfiles/fighters/TRO3039u/Shilone SL-18.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Shilone SL-18.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Shilone SL-18.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Sholagar SL-21.blk b/megamek/data/mechfiles/fighters/TRO3039u/Sholagar SL-21.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Sholagar SL-21.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Sholagar SL-21.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Sholagar SL-21L.blk b/megamek/data/mechfiles/fighters/TRO3039u/Sholagar SL-21L.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Sholagar SL-21L.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Sholagar SL-21L.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Sholagar SL-22.blk b/megamek/data/mechfiles/fighters/TRO3039u/Sholagar SL-22.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Sholagar SL-22.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Sholagar SL-22.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Slayer SL-15.blk b/megamek/data/mechfiles/fighters/TRO3039u/Slayer SL-15.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Slayer SL-15.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Slayer SL-15.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Slayer SL-15A.blk b/megamek/data/mechfiles/fighters/TRO3039u/Slayer SL-15A.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Slayer SL-15A.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Slayer SL-15A.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Slayer SL-15B.blk b/megamek/data/mechfiles/fighters/TRO3039u/Slayer SL-15B.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Slayer SL-15B.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Slayer SL-15B.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Slayer SL-15C.blk b/megamek/data/mechfiles/fighters/TRO3039u/Slayer SL-15C.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Slayer SL-15C.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Slayer SL-15C.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Slayer SL-15K.blk b/megamek/data/mechfiles/fighters/TRO3039u/Slayer SL-15K.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Slayer SL-15K.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Slayer SL-15K.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Slayer SL-15R.blk b/megamek/data/mechfiles/fighters/TRO3039u/Slayer SL-15R.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Slayer SL-15R.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Slayer SL-15R.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Sparrowhawk SPR-6D.blk b/megamek/data/mechfiles/fighters/TRO3039u/Sparrowhawk SPR-6D.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Sparrowhawk SPR-6D.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Sparrowhawk SPR-6D.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Sparrowhawk SPR-7D.blk b/megamek/data/mechfiles/fighters/TRO3039u/Sparrowhawk SPR-7D.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Sparrowhawk SPR-7D.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Sparrowhawk SPR-7D.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Sparrowhawk SPR-8H.blk b/megamek/data/mechfiles/fighters/TRO3039u/Sparrowhawk SPR-8H.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Sparrowhawk SPR-8H.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Sparrowhawk SPR-8H.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Sparrowhawk SPR-H5.blk b/megamek/data/mechfiles/fighters/TRO3039u/Sparrowhawk SPR-H5.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Sparrowhawk SPR-H5.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Sparrowhawk SPR-H5.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Sparrowhawk SPR-H5K.blk b/megamek/data/mechfiles/fighters/TRO3039u/Sparrowhawk SPR-H5K.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Sparrowhawk SPR-H5K.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Sparrowhawk SPR-H5K.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Stingray F-90.blk b/megamek/data/mechfiles/fighters/TRO3039u/Stingray F-90.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Stingray F-90.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Stingray F-90.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Stingray F-90S.blk b/megamek/data/mechfiles/fighters/TRO3039u/Stingray F-90S.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Stingray F-90S.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Stingray F-90S.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Stingray F-92.blk b/megamek/data/mechfiles/fighters/TRO3039u/Stingray F-92.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Stingray F-92.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Stingray F-92.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Stingray F-94.blk b/megamek/data/mechfiles/fighters/TRO3039u/Stingray F-94.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Stingray F-94.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Stingray F-94.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Stingray F-95.blk b/megamek/data/mechfiles/fighters/TRO3039u/Stingray F-95.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Stingray F-95.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Stingray F-95.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Stuka STU-D6.blk b/megamek/data/mechfiles/fighters/TRO3039u/Stuka STU-D6.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Stuka STU-D6.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Stuka STU-D6.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Stuka STU-D7.blk b/megamek/data/mechfiles/fighters/TRO3039u/Stuka STU-D7.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Stuka STU-D7.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Stuka STU-D7.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Stuka STU-K10.blk b/megamek/data/mechfiles/fighters/TRO3039u/Stuka STU-K10.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Stuka STU-K10.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Stuka STU-K10.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Stuka STU-K15.blk b/megamek/data/mechfiles/fighters/TRO3039u/Stuka STU-K15.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Stuka STU-K15.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Stuka STU-K15.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Stuka STU-K5.blk b/megamek/data/mechfiles/fighters/TRO3039u/Stuka STU-K5.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Stuka STU-K5.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Stuka STU-K5.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Thrush TR-7.blk b/megamek/data/mechfiles/fighters/TRO3039u/Thrush TR-7.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Thrush TR-7.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Thrush TR-7.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Thrush TR-7p.blk b/megamek/data/mechfiles/fighters/TRO3039u/Thrush TR-7p.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Thrush TR-7p.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Thrush TR-7p.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Thrush TR-8.blk b/megamek/data/mechfiles/fighters/TRO3039u/Thrush TR-8.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Thrush TR-8.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Thrush TR-8.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Transgressor TR-13.blk b/megamek/data/mechfiles/fighters/TRO3039u/Transgressor TR-13.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Transgressor TR-13.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Transgressor TR-13.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Transgressor TR-13A.blk b/megamek/data/mechfiles/fighters/TRO3039u/Transgressor TR-13A.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Transgressor TR-13A.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Transgressor TR-13A.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Transgressor TR-14 AC.blk b/megamek/data/mechfiles/fighters/TRO3039u/Transgressor TR-14 AC.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Transgressor TR-14 AC.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Transgressor TR-14 AC.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Transgressor TR-15.blk b/megamek/data/mechfiles/fighters/TRO3039u/Transgressor TR-15.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Transgressor TR-15.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Transgressor TR-15.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Transgressor TR-16.blk b/megamek/data/mechfiles/fighters/TRO3039u/Transgressor TR-16.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Transgressor TR-16.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Transgressor TR-16.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Transit TR-10.blk b/megamek/data/mechfiles/fighters/TRO3039u/Transit TR-10.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Transit TR-10.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Transit TR-10.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Transit TR-11.blk b/megamek/data/mechfiles/fighters/TRO3039u/Transit TR-11.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Transit TR-11.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Transit TR-11.blk
diff --git a/megamek/data/mechfiles/fighters/3039u/Transit TR-12.blk b/megamek/data/mechfiles/fighters/TRO3039u/Transit TR-12.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3039u/Transit TR-12.blk
rename to megamek/data/mechfiles/fighters/TRO3039u/Transit TR-12.blk
diff --git a/megamek/data/mechfiles/fighters/3067 Unabridged/Clan Aerospace/Ammon 2.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Ammon 2.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3067 Unabridged/Clan Aerospace/Ammon 2.blk
rename to megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Ammon 2.blk
diff --git a/megamek/data/mechfiles/fighters/3067 Unabridged/Clan Aerospace/Chaeronea 2.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Chaeronea 2.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3067 Unabridged/Clan Aerospace/Chaeronea 2.blk
rename to megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Chaeronea 2.blk
diff --git a/megamek/data/mechfiles/fighters/3067 Unabridged/Clan Aerospace/Chaeronea 3.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Chaeronea 3.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3067 Unabridged/Clan Aerospace/Chaeronea 3.blk
rename to megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Chaeronea 3.blk
diff --git a/megamek/data/mechfiles/fighters/3067 Unabridged/Clan Aerospace/Chaeronea 4.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Chaeronea 4.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3067 Unabridged/Clan Aerospace/Chaeronea 4.blk
rename to megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Chaeronea 4.blk
diff --git a/megamek/data/mechfiles/fighters/3067 Unabridged/Clan Aerospace/Hydaspes 2.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Hydaspes 2.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3067 Unabridged/Clan Aerospace/Hydaspes 2.blk
rename to megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Hydaspes 2.blk
diff --git a/megamek/data/mechfiles/fighters/3067 Unabridged/Clan Aerospace/Issus 2.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Issus 2.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3067 Unabridged/Clan Aerospace/Issus 2.blk
rename to megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Issus 2.blk
diff --git a/megamek/data/mechfiles/fighters/3067 Unabridged/Clan Aerospace/Issus 3.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Issus 3.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3067 Unabridged/Clan Aerospace/Issus 3.blk
rename to megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Issus 3.blk
diff --git a/megamek/data/mechfiles/fighters/3067 Unabridged/Clan Aerospace/Xerxes 2.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Xerxes 2.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3067 Unabridged/Clan Aerospace/Xerxes 2.blk
rename to megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Xerxes 2.blk
diff --git a/megamek/data/mechfiles/fighters/3067 Unabridged/Clan Aerospace/Xerxes 3.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Xerxes 3.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3067 Unabridged/Clan Aerospace/Xerxes 3.blk
rename to megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Xerxes 3.blk
diff --git a/megamek/data/mechfiles/fighters/3067 Unabridged/Clan Aerospace/Xerxes.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Xerxes.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3067 Unabridged/Clan Aerospace/Xerxes.blk
rename to megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Xerxes.blk
diff --git a/megamek/data/mechfiles/fighters/3067 Unabridged/IS Aerospace/Corax CRX-OD.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Corax CRX-OD.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3067 Unabridged/IS Aerospace/Corax CRX-OD.blk
rename to megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Corax CRX-OD.blk
diff --git a/megamek/data/mechfiles/fighters/3067 Unabridged/IS Aerospace/Corax CRX-OR.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Corax CRX-OR.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3067 Unabridged/IS Aerospace/Corax CRX-OR.blk
rename to megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Corax CRX-OR.blk
diff --git a/megamek/data/mechfiles/fighters/3067 Unabridged/IS Aerospace/Dagger DARO-1C.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Dagger DARO-1C.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3067 Unabridged/IS Aerospace/Dagger DARO-1C.blk
rename to megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Dagger DARO-1C.blk
diff --git a/megamek/data/mechfiles/fighters/3067 Unabridged/IS Aerospace/Dagger DARO-1D.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Dagger DARO-1D.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3067 Unabridged/IS Aerospace/Dagger DARO-1D.blk
rename to megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Dagger DARO-1D.blk
diff --git a/megamek/data/mechfiles/fighters/3067 Unabridged/IS Aerospace/Defiance DFC-OD.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Defiance DFC-OD.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3067 Unabridged/IS Aerospace/Defiance DFC-OD.blk
rename to megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Defiance DFC-OD.blk
diff --git a/megamek/data/mechfiles/fighters/3067 Unabridged/IS Aerospace/Eisensturm EST-OD.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Eisensturm EST-OD.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3067 Unabridged/IS Aerospace/Eisensturm EST-OD.blk
rename to megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Eisensturm EST-OD.blk
diff --git a/megamek/data/mechfiles/fighters/3067 Unabridged/IS Aerospace/Huscarl HSCL-1-OD.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Huscarl HSCL-1-OD.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3067 Unabridged/IS Aerospace/Huscarl HSCL-1-OD.blk
rename to megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Huscarl HSCL-1-OD.blk
diff --git a/megamek/data/mechfiles/fighters/3067 Unabridged/IS Aerospace/Huscarl HSCL-1-OR.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Huscarl HSCL-1-OR.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3067 Unabridged/IS Aerospace/Huscarl HSCL-1-OR.blk
rename to megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Huscarl HSCL-1-OR.blk
diff --git a/megamek/data/mechfiles/fighters/3067 Unabridged/IS Aerospace/Lancer LX-3.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Lancer LX-3.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3067 Unabridged/IS Aerospace/Lancer LX-3.blk
rename to megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Lancer LX-3.blk
diff --git a/megamek/data/mechfiles/fighters/3067 Unabridged/IS Aerospace/Shiva SHV-OD.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Shiva SHV-OD.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3067 Unabridged/IS Aerospace/Shiva SHV-OD.blk
rename to megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Shiva SHV-OD.blk
diff --git a/megamek/data/mechfiles/fighters/3067 Unabridged/IS Aerospace/Tatsu MIK-OD.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Tatsu MIK-OD.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3067 Unabridged/IS Aerospace/Tatsu MIK-OD.blk
rename to megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Tatsu MIK-OD.blk
diff --git a/megamek/data/mechfiles/fighters/3067 Unabridged/IS Aerospace/Tatsu MIK-OE.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Tatsu MIK-OE.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3067 Unabridged/IS Aerospace/Tatsu MIK-OE.blk
rename to megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Tatsu MIK-OE.blk
diff --git a/megamek/data/mechfiles/fighters/3067 Unabridged/IS Aerospace/Troika CMT-6T.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Troika CMT-6T.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3067 Unabridged/IS Aerospace/Troika CMT-6T.blk
rename to megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Troika CMT-6T.blk
diff --git a/megamek/data/mechfiles/fighters/3085u/Cutting Edge/Mengqin MNG-8L.blk b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Mengqin MNG-8L.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3085u/Cutting Edge/Mengqin MNG-8L.blk
rename to megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Mengqin MNG-8L.blk
diff --git a/megamek/data/mechfiles/fighters/3085u/Cutting Edge/Morgenstern MR-1S.blk b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Morgenstern MR-1S.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3085u/Cutting Edge/Morgenstern MR-1S.blk
rename to megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Morgenstern MR-1S.blk
diff --git a/megamek/data/mechfiles/fighters/3085u/Cutting Edge/Morgenstern MR-1SA.blk b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Morgenstern MR-1SA.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3085u/Cutting Edge/Morgenstern MR-1SA.blk
rename to megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Morgenstern MR-1SA.blk
diff --git a/megamek/data/mechfiles/fighters/3085u/Cutting Edge/Morgenstern MR-1SB.blk b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Morgenstern MR-1SB.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3085u/Cutting Edge/Morgenstern MR-1SB.blk
rename to megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Morgenstern MR-1SB.blk
diff --git a/megamek/data/mechfiles/fighters/3085u/Cutting Edge/Morgenstern MR-1SC.blk b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Morgenstern MR-1SC.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3085u/Cutting Edge/Morgenstern MR-1SC.blk
rename to megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Morgenstern MR-1SC.blk
diff --git a/megamek/data/mechfiles/fighters/3085u/Cutting Edge/Morgenstern MR-1SD.blk b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Morgenstern MR-1SD.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3085u/Cutting Edge/Morgenstern MR-1SD.blk
rename to megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Morgenstern MR-1SD.blk
diff --git a/megamek/data/mechfiles/fighters/3085u/Cutting Edge/Ostrogoth A.blk b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Ostrogoth A.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3085u/Cutting Edge/Ostrogoth A.blk
rename to megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Ostrogoth A.blk
diff --git a/megamek/data/mechfiles/fighters/3085u/Cutting Edge/Ostrogoth B.blk b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Ostrogoth B.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3085u/Cutting Edge/Ostrogoth B.blk
rename to megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Ostrogoth B.blk
diff --git a/megamek/data/mechfiles/fighters/3085u/Cutting Edge/Ostrogoth C.blk b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Ostrogoth C.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3085u/Cutting Edge/Ostrogoth C.blk
rename to megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Ostrogoth C.blk
diff --git a/megamek/data/mechfiles/fighters/3085u/Cutting Edge/Ostrogoth Prime.blk b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Ostrogoth Prime.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3085u/Cutting Edge/Ostrogoth Prime.blk
rename to megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Ostrogoth Prime.blk
diff --git a/megamek/data/mechfiles/fighters/3085u/Cutting Edge/Poignard PGD-L3.blk b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Poignard PGD-L3.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3085u/Cutting Edge/Poignard PGD-L3.blk
rename to megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Poignard PGD-L3.blk
diff --git a/megamek/data/mechfiles/fighters/3085u/Cutting Edge/Poignard PGD-R3.blk b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Poignard PGD-R3.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3085u/Cutting Edge/Poignard PGD-R3.blk
rename to megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Poignard PGD-R3.blk
diff --git a/megamek/data/mechfiles/fighters/3085u/Cutting Edge/Poignard PGD-Y3.blk b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Poignard PGD-Y3.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3085u/Cutting Edge/Poignard PGD-Y3.blk
rename to megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Poignard PGD-Y3.blk
diff --git a/megamek/data/mechfiles/fighters/3085u/Cutting Edge/Sagittarii SGT-2R.blk b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Sagittarii SGT-2R.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3085u/Cutting Edge/Sagittarii SGT-2R.blk
rename to megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Sagittarii SGT-2R.blk
diff --git a/megamek/data/mechfiles/fighters/3085u/Cutting Edge/Sagittarii SGT-3R.blk b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Sagittarii SGT-3R.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3085u/Cutting Edge/Sagittarii SGT-3R.blk
rename to megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Sagittarii SGT-3R.blk
diff --git a/megamek/data/mechfiles/fighters/3085u/Cutting Edge/Wusun A.blk b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Wusun A.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3085u/Cutting Edge/Wusun A.blk
rename to megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Wusun A.blk
diff --git a/megamek/data/mechfiles/fighters/3085u/Cutting Edge/Wusun B.blk b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Wusun B.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3085u/Cutting Edge/Wusun B.blk
rename to megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Wusun B.blk
diff --git a/megamek/data/mechfiles/fighters/3085u/Cutting Edge/Wusun C.blk b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Wusun C.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3085u/Cutting Edge/Wusun C.blk
rename to megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Wusun C.blk
diff --git a/megamek/data/mechfiles/fighters/3085u/Cutting Edge/Wusun Prime.blk b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Wusun Prime.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3085u/Cutting Edge/Wusun Prime.blk
rename to megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Wusun Prime.blk
diff --git a/megamek/data/mechfiles/fighters/3145/Davion/Cutlass CUT-01D.blk b/megamek/data/mechfiles/fighters/TRO3145/Davion/Cutlass CUT-01D.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3145/Davion/Cutlass CUT-01D.blk
rename to megamek/data/mechfiles/fighters/TRO3145/Davion/Cutlass CUT-01D.blk
diff --git a/megamek/data/mechfiles/fighters/3145/Davion/Cutlass CUT-01E.blk b/megamek/data/mechfiles/fighters/TRO3145/Davion/Cutlass CUT-01E.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3145/Davion/Cutlass CUT-01E.blk
rename to megamek/data/mechfiles/fighters/TRO3145/Davion/Cutlass CUT-01E.blk
diff --git a/megamek/data/mechfiles/fighters/3145/Davion/Rondel RDL-01C.blk b/megamek/data/mechfiles/fighters/TRO3145/Davion/Rondel RDL-01C.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3145/Davion/Rondel RDL-01C.blk
rename to megamek/data/mechfiles/fighters/TRO3145/Davion/Rondel RDL-01C.blk
diff --git a/megamek/data/mechfiles/fighters/3145/Kurita/Koroshiya KOS-1A.blk b/megamek/data/mechfiles/fighters/TRO3145/Kurita/Koroshiya KOS-1A.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3145/Kurita/Koroshiya KOS-1A.blk
rename to megamek/data/mechfiles/fighters/TRO3145/Kurita/Koroshiya KOS-1A.blk
diff --git a/megamek/data/mechfiles/fighters/3145/Liao/Yun Y-2.blk b/megamek/data/mechfiles/fighters/TRO3145/Liao/Yun Y-2.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3145/Liao/Yun Y-2.blk
rename to megamek/data/mechfiles/fighters/TRO3145/Liao/Yun Y-2.blk
diff --git a/megamek/data/mechfiles/fighters/3145/Marik/Aquila AQA-1M.blk b/megamek/data/mechfiles/fighters/TRO3145/Marik/Aquila AQA-1M.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3145/Marik/Aquila AQA-1M.blk
rename to megamek/data/mechfiles/fighters/TRO3145/Marik/Aquila AQA-1M.blk
diff --git a/megamek/data/mechfiles/fighters/3145/Marik/Picaroon CSR-F100.blk b/megamek/data/mechfiles/fighters/TRO3145/Marik/Picaroon CSR-F100.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3145/Marik/Picaroon CSR-F100.blk
rename to megamek/data/mechfiles/fighters/TRO3145/Marik/Picaroon CSR-F100.blk
diff --git a/megamek/data/mechfiles/fighters/3145/Marik/Shikra SKR-4M.blk b/megamek/data/mechfiles/fighters/TRO3145/Marik/Shikra SKR-4M.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3145/Marik/Shikra SKR-4M.blk
rename to megamek/data/mechfiles/fighters/TRO3145/Marik/Shikra SKR-4M.blk
diff --git a/megamek/data/mechfiles/fighters/3145/NTNU/Jengiz F.blk b/megamek/data/mechfiles/fighters/TRO3145/NTNU/Jengiz F.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3145/NTNU/Jengiz F.blk
rename to megamek/data/mechfiles/fighters/TRO3145/NTNU/Jengiz F.blk
diff --git a/megamek/data/mechfiles/fighters/3145/NTNU/Morgenstern MR-1SE.blk b/megamek/data/mechfiles/fighters/TRO3145/NTNU/Morgenstern MR-1SE.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3145/NTNU/Morgenstern MR-1SE.blk
rename to megamek/data/mechfiles/fighters/TRO3145/NTNU/Morgenstern MR-1SE.blk
diff --git a/megamek/data/mechfiles/fighters/3145/NTNU/Ostrogoth D.blk b/megamek/data/mechfiles/fighters/TRO3145/NTNU/Ostrogoth D.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3145/NTNU/Ostrogoth D.blk
rename to megamek/data/mechfiles/fighters/TRO3145/NTNU/Ostrogoth D.blk
diff --git a/megamek/data/mechfiles/fighters/3145/NTNU/Sagittarii SGT-4R.blk b/megamek/data/mechfiles/fighters/TRO3145/NTNU/Sagittarii SGT-4R.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3145/NTNU/Sagittarii SGT-4R.blk
rename to megamek/data/mechfiles/fighters/TRO3145/NTNU/Sagittarii SGT-4R.blk
diff --git a/megamek/data/mechfiles/fighters/3145/NTNU/Scytha F.blk b/megamek/data/mechfiles/fighters/TRO3145/NTNU/Scytha F.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3145/NTNU/Scytha F.blk
rename to megamek/data/mechfiles/fighters/TRO3145/NTNU/Scytha F.blk
diff --git a/megamek/data/mechfiles/fighters/3145/NTNU/Sparrowhawk SPR-7Dr.blk b/megamek/data/mechfiles/fighters/TRO3145/NTNU/Sparrowhawk SPR-7Dr.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3145/NTNU/Sparrowhawk SPR-7Dr.blk
rename to megamek/data/mechfiles/fighters/TRO3145/NTNU/Sparrowhawk SPR-7Dr.blk
diff --git a/megamek/data/mechfiles/fighters/3145/NTNU/Stingray F-96R.blk b/megamek/data/mechfiles/fighters/TRO3145/NTNU/Stingray F-96R.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3145/NTNU/Stingray F-96R.blk
rename to megamek/data/mechfiles/fighters/TRO3145/NTNU/Stingray F-96R.blk
diff --git a/megamek/data/mechfiles/fighters/3145/NTNU/Sulla F.blk b/megamek/data/mechfiles/fighters/TRO3145/NTNU/Sulla F.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3145/NTNU/Sulla F.blk
rename to megamek/data/mechfiles/fighters/TRO3145/NTNU/Sulla F.blk
diff --git a/megamek/data/mechfiles/fighters/3145/NTNU/Tatsu MIK-OF.blk b/megamek/data/mechfiles/fighters/TRO3145/NTNU/Tatsu MIK-OF.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3145/NTNU/Tatsu MIK-OF.blk
rename to megamek/data/mechfiles/fighters/TRO3145/NTNU/Tatsu MIK-OF.blk
diff --git a/megamek/data/mechfiles/fighters/3145/NTNU/Troika CMT-7T.blk b/megamek/data/mechfiles/fighters/TRO3145/NTNU/Troika CMT-7T.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3145/NTNU/Troika CMT-7T.blk
rename to megamek/data/mechfiles/fighters/TRO3145/NTNU/Troika CMT-7T.blk
diff --git a/megamek/data/mechfiles/fighters/3145/NTNU/Wusun D.blk b/megamek/data/mechfiles/fighters/TRO3145/NTNU/Wusun D.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3145/NTNU/Wusun D.blk
rename to megamek/data/mechfiles/fighters/TRO3145/NTNU/Wusun D.blk
diff --git a/megamek/data/mechfiles/fighters/3145/Republic/Schrack SCK-O.blk b/megamek/data/mechfiles/fighters/TRO3145/Republic/Schrack SCK-O.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3145/Republic/Schrack SCK-O.blk
rename to megamek/data/mechfiles/fighters/TRO3145/Republic/Schrack SCK-O.blk
diff --git a/megamek/data/mechfiles/fighters/3145/Republic/Schrack SCK-OA.blk b/megamek/data/mechfiles/fighters/TRO3145/Republic/Schrack SCK-OA.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3145/Republic/Schrack SCK-OA.blk
rename to megamek/data/mechfiles/fighters/TRO3145/Republic/Schrack SCK-OA.blk
diff --git a/megamek/data/mechfiles/fighters/3145/Republic/Schrack SCK-OB.blk b/megamek/data/mechfiles/fighters/TRO3145/Republic/Schrack SCK-OB.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3145/Republic/Schrack SCK-OB.blk
rename to megamek/data/mechfiles/fighters/TRO3145/Republic/Schrack SCK-OB.blk
diff --git a/megamek/data/mechfiles/fighters/3145/Republic/Simurgh SMG-O.blk b/megamek/data/mechfiles/fighters/TRO3145/Republic/Simurgh SMG-O.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3145/Republic/Simurgh SMG-O.blk
rename to megamek/data/mechfiles/fighters/TRO3145/Republic/Simurgh SMG-O.blk
diff --git a/megamek/data/mechfiles/fighters/3145/Republic/Simurgh SMG-OA.blk b/megamek/data/mechfiles/fighters/TRO3145/Republic/Simurgh SMG-OA.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3145/Republic/Simurgh SMG-OA.blk
rename to megamek/data/mechfiles/fighters/TRO3145/Republic/Simurgh SMG-OA.blk
diff --git a/megamek/data/mechfiles/fighters/3145/Republic/Simurgh SMG-OB.blk b/megamek/data/mechfiles/fighters/TRO3145/Republic/Simurgh SMG-OB.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3145/Republic/Simurgh SMG-OB.blk
rename to megamek/data/mechfiles/fighters/TRO3145/Republic/Simurgh SMG-OB.blk
diff --git a/megamek/data/mechfiles/fighters/3145/Steiner/Sternensturm STM-O.blk b/megamek/data/mechfiles/fighters/TRO3145/Steiner/Sternensturm STM-O.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3145/Steiner/Sternensturm STM-O.blk
rename to megamek/data/mechfiles/fighters/TRO3145/Steiner/Sternensturm STM-O.blk
diff --git a/megamek/data/mechfiles/fighters/3145/Steiner/Sternensturm STM-OA.blk b/megamek/data/mechfiles/fighters/TRO3145/Steiner/Sternensturm STM-OA.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3145/Steiner/Sternensturm STM-OA.blk
rename to megamek/data/mechfiles/fighters/TRO3145/Steiner/Sternensturm STM-OA.blk
diff --git a/megamek/data/mechfiles/fighters/3145/Steiner/Sternensturm STM-OB.blk b/megamek/data/mechfiles/fighters/TRO3145/Steiner/Sternensturm STM-OB.blk
similarity index 100%
rename from megamek/data/mechfiles/fighters/3145/Steiner/Sternensturm STM-OB.blk
rename to megamek/data/mechfiles/fighters/TRO3145/Steiner/Sternensturm STM-OB.blk
diff --git a/megamek/data/mechfiles/mechs/DarkAge/Black Hawk 2.mtf b/megamek/data/mechfiles/mechs/3145/Merc/Black Hawk 2.mtf
similarity index 98%
rename from megamek/data/mechfiles/mechs/DarkAge/Black Hawk 2.mtf
rename to megamek/data/mechfiles/mechs/3145/Merc/Black Hawk 2.mtf
index 754cd6710cd..4468a3c4ce8 100644
--- a/megamek/data/mechfiles/mechs/DarkAge/Black Hawk 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Merc/Black Hawk 2.mtf	
@@ -1,5 +1,5 @@
 Version:1.0
-Black Hawk
+Black Hawk (Standard)
 2
 mul id:6555
 
diff --git a/megamek/data/mechfiles/mechs/3145/Merc/Black Hawk 3.mtf b/megamek/data/mechfiles/mechs/3145/Merc/Black Hawk 3.mtf
index 8b56812e802..c567bc605c2 100644
--- a/megamek/data/mechfiles/mechs/3145/Merc/Black Hawk 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Merc/Black Hawk 3.mtf	
@@ -1,5 +1,5 @@
 Version:1.0
-Black Hawk
+Black Hawk (Standard)
 3
 mul id:6556
 
diff --git a/megamek/data/mechfiles/mechs/DarkAge/Black Hawk.mtf b/megamek/data/mechfiles/mechs/3145/Merc/Black Hawk.mtf
similarity index 98%
rename from megamek/data/mechfiles/mechs/DarkAge/Black Hawk.mtf
rename to megamek/data/mechfiles/mechs/3145/Merc/Black Hawk.mtf
index ae8168bc201..2ce2ec35f9d 100644
--- a/megamek/data/mechfiles/mechs/DarkAge/Black Hawk.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Merc/Black Hawk.mtf	
@@ -1,6 +1,6 @@
 Version:1.0
-Black Hawk
-(Standard)
+Black Hawk (Standard)
+
 mul id:6554
 Config:Biped
 TechBase:Clan
diff --git a/megamek/data/mechfiles/mechs/3145/Merc/Koshi (Standard) 2.mtf b/megamek/data/mechfiles/mechs/3145/Merc/Koshi (Standard) 2.mtf
index d7df345a918..c54f9f497c2 100644
--- a/megamek/data/mechfiles/mechs/3145/Merc/Koshi (Standard) 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Merc/Koshi (Standard) 2.mtf	
@@ -1,5 +1,5 @@
 Version:1.0
-Koshi
+Koshi (Standard)
 2
 mul id:6548
 
diff --git a/megamek/data/mechfiles/mechs/3145/Merc/Koshi (Standard) 3.mtf b/megamek/data/mechfiles/mechs/3145/Merc/Koshi (Standard) 3.mtf
index c715bc75c50..335d3e68130 100644
--- a/megamek/data/mechfiles/mechs/3145/Merc/Koshi (Standard) 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Merc/Koshi (Standard) 3.mtf	
@@ -1,5 +1,5 @@
 Version:1.0
-Koshi
+Koshi (Standard)
 3
 mul id:6549
 
diff --git a/megamek/data/mechfiles/mechs/3145/Merc/Koshi (Standard).mtf b/megamek/data/mechfiles/mechs/3145/Merc/Koshi (Standard).mtf
index 323c980c87f..7aff523007c 100644
--- a/megamek/data/mechfiles/mechs/3145/Merc/Koshi (Standard).mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Merc/Koshi (Standard).mtf	
@@ -1,8 +1,7 @@
 Version:1.0
-Koshi
-(Standard)
-mul id:6547
+Koshi (Standard)
 
+mul id:6547
 Config:Biped
 TechBase:Clan
 Era:3091
diff --git a/megamek/data/mechfiles/mechs/Hist 2nd SW/Thunderbolt TDR-5L.mtf b/megamek/data/mechfiles/mechs/Historicals/Hist 2nd SW/Thunderbolt TDR-5L.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/Hist 2nd SW/Thunderbolt TDR-5L.mtf
rename to megamek/data/mechfiles/mechs/Historicals/Hist 2nd SW/Thunderbolt TDR-5L.mtf
diff --git a/megamek/data/mechfiles/mechs/Hist 2nd SW/Thunderbolt TDR-5LS.mtf b/megamek/data/mechfiles/mechs/Historicals/Hist 2nd SW/Thunderbolt TDR-5LS.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/Hist 2nd SW/Thunderbolt TDR-5LS.mtf
rename to megamek/data/mechfiles/mechs/Historicals/Hist 2nd SW/Thunderbolt TDR-5LS.mtf
diff --git a/megamek/data/mechfiles/mechs/Hist LOT II/Dragoon AEM-01.mtf b/megamek/data/mechfiles/mechs/Historicals/Hist LOT II/Dragoon AEM-01.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/Hist LOT II/Dragoon AEM-01.mtf
rename to megamek/data/mechfiles/mechs/Historicals/Hist LOT II/Dragoon AEM-01.mtf
diff --git a/megamek/data/mechfiles/mechs/Hist LOT II/Dragoon AEM-02.mtf b/megamek/data/mechfiles/mechs/Historicals/Hist LOT II/Dragoon AEM-02.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/Hist LOT II/Dragoon AEM-02.mtf
rename to megamek/data/mechfiles/mechs/Historicals/Hist LOT II/Dragoon AEM-02.mtf
diff --git a/megamek/data/mechfiles/mechs/Hist LOT II/Dragoon AEM-03.mtf b/megamek/data/mechfiles/mechs/Historicals/Hist LOT II/Dragoon AEM-03.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/Hist LOT II/Dragoon AEM-03.mtf
rename to megamek/data/mechfiles/mechs/Historicals/Hist LOT II/Dragoon AEM-03.mtf
diff --git a/megamek/data/mechfiles/mechs/Hist LOT II/Dragoon AEM-04.mtf b/megamek/data/mechfiles/mechs/Historicals/Hist LOT II/Dragoon AEM-04.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/Hist LOT II/Dragoon AEM-04.mtf
rename to megamek/data/mechfiles/mechs/Historicals/Hist LOT II/Dragoon AEM-04.mtf
diff --git a/megamek/data/mechfiles/mechs/Hist Reunification War/Alfar AL-A1.mtf b/megamek/data/mechfiles/mechs/Historicals/Hist Reunification War/Alfar AL-A1.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/Hist Reunification War/Alfar AL-A1.mtf
rename to megamek/data/mechfiles/mechs/Historicals/Hist Reunification War/Alfar AL-A1.mtf
diff --git a/megamek/data/mechfiles/mechs/Hist Reunification War/Alfar AL-D1 Dokkalfar.mtf b/megamek/data/mechfiles/mechs/Historicals/Hist Reunification War/Alfar AL-D1 Dokkalfar.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/Hist Reunification War/Alfar AL-D1 Dokkalfar.mtf
rename to megamek/data/mechfiles/mechs/Historicals/Hist Reunification War/Alfar AL-D1 Dokkalfar.mtf
diff --git a/megamek/data/mechfiles/mechs/Hist Reunification War/Talos TLS-1B.mtf b/megamek/data/mechfiles/mechs/Historicals/Hist Reunification War/Talos TLS-1B.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/Hist Reunification War/Talos TLS-1B.mtf
rename to megamek/data/mechfiles/mechs/Historicals/Hist Reunification War/Talos TLS-1B.mtf
diff --git a/megamek/data/mechfiles/mechs/Hist WOTRA/Bakeneko BKN-1K.mtf b/megamek/data/mechfiles/mechs/Historicals/Hist WOTRA/Bakeneko BKN-1K.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/Hist WOTRA/Bakeneko BKN-1K.mtf
rename to megamek/data/mechfiles/mechs/Historicals/Hist WOTRA/Bakeneko BKN-1K.mtf
diff --git a/megamek/data/mechfiles/mechs/Recognition Guide ilClan/Vol 7/War Crow A.mtf b/megamek/data/mechfiles/mechs/Recognition Guide ilClan/Vol 7/War Crow A.mtf
index 5b8069c0cc3..0a364a6d252 100644
--- a/megamek/data/mechfiles/mechs/Recognition Guide ilClan/Vol 7/War Crow A.mtf	
+++ b/megamek/data/mechfiles/mechs/Recognition Guide ilClan/Vol 7/War Crow A.mtf	
@@ -7,7 +7,7 @@ Config:Biped Omnimech
 techbase:Clan
 era:3145
 source:Rec Guide:ilClan #7 - Dark Age
-rules level:4
+rules level:2
 
 mass:70
 engine:350 XL (Clan) Engine(IS)
diff --git a/megamek/data/mechfiles/mechs/Recognition Guide ilClan/Vol 7/War Crow B.mtf b/megamek/data/mechfiles/mechs/Recognition Guide ilClan/Vol 7/War Crow B.mtf
index ceeff36619f..49382ad3732 100644
--- a/megamek/data/mechfiles/mechs/Recognition Guide ilClan/Vol 7/War Crow B.mtf	
+++ b/megamek/data/mechfiles/mechs/Recognition Guide ilClan/Vol 7/War Crow B.mtf	
@@ -7,7 +7,7 @@ Config:Biped Omnimech
 techbase:Clan
 era:3145
 source:Rec Guide:ilClan #7 - Dark Age
-rules level:4
+rules level:2
 
 mass:70
 engine:350 XL (Clan) Engine(IS)
diff --git a/megamek/data/mechfiles/mechs/Recognition Guide ilClan/Vol 7/War Crow C.mtf b/megamek/data/mechfiles/mechs/Recognition Guide ilClan/Vol 7/War Crow C.mtf
index f3f9d2a47f8..6ec6cb92f3f 100644
--- a/megamek/data/mechfiles/mechs/Recognition Guide ilClan/Vol 7/War Crow C.mtf	
+++ b/megamek/data/mechfiles/mechs/Recognition Guide ilClan/Vol 7/War Crow C.mtf	
@@ -7,7 +7,7 @@ Config:Biped Omnimech
 techbase:Clan
 era:3145
 source:Rec Guide:ilClan #7 - Dark Age
-rules level:4
+rules level:2
 
 mass:70
 engine:350 XL (Clan) Engine(IS)
diff --git a/megamek/data/mechfiles/mechs/Recognition Guide ilClan/Vol 7/War Crow Prime.mtf b/megamek/data/mechfiles/mechs/Recognition Guide ilClan/Vol 7/War Crow Prime.mtf
index d5c9d54607e..7f2086cf4b8 100644
--- a/megamek/data/mechfiles/mechs/Recognition Guide ilClan/Vol 7/War Crow Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/Recognition Guide ilClan/Vol 7/War Crow Prime.mtf	
@@ -7,7 +7,7 @@ Config:Biped Omnimech
 techbase:Clan
 era:3145
 source:Rec Guide:ilClan #7 - Dark Age
-rules level:4
+rules level:2
 
 mass:70
 engine:350 XL (Clan) Engine(IS)
diff --git a/megamek/data/mechfiles/mechs/MWO Canon/Bull Shark BSK-M3.mtf b/megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Bull Shark BSK-M3.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/MWO Canon/Bull Shark BSK-M3.mtf
rename to megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Bull Shark BSK-M3.mtf
diff --git a/megamek/data/mechfiles/mechs/MWO Canon/Bull Shark BSK-MAZ.mtf b/megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Bull Shark BSK-MAZ.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/MWO Canon/Bull Shark BSK-MAZ.mtf
rename to megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Bull Shark BSK-MAZ.mtf
diff --git a/megamek/data/mechfiles/mechs/MWO Canon/Corsair COR-5R.mtf b/megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Corsair COR-5R.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/MWO Canon/Corsair COR-5R.mtf
rename to megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Corsair COR-5R.mtf
diff --git a/megamek/data/mechfiles/mechs/MWO Canon/Corsair COR-5T.mtf b/megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Corsair COR-5T.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/MWO Canon/Corsair COR-5T.mtf
rename to megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Corsair COR-5T.mtf
diff --git a/megamek/data/mechfiles/mechs/MWO Canon/Corsair COR-6R.mtf b/megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Corsair COR-6R.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/MWO Canon/Corsair COR-6R.mtf
rename to megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Corsair COR-6R.mtf
diff --git a/megamek/data/mechfiles/mechs/MWO Canon/Corsair COR-7A.mtf b/megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Corsair COR-7A.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/MWO Canon/Corsair COR-7A.mtf
rename to megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Corsair COR-7A.mtf
diff --git a/megamek/data/mechfiles/mechs/MWO Canon/Corsair COR-7R.mtf b/megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Corsair COR-7R.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/MWO Canon/Corsair COR-7R.mtf
rename to megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Corsair COR-7R.mtf
diff --git a/megamek/data/mechfiles/mechs/MWO Canon/Corsair COR-BR Broadside.mtf b/megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Corsair COR-BR Broadside.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/MWO Canon/Corsair COR-BR Broadside.mtf
rename to megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Corsair COR-BR Broadside.mtf
diff --git a/megamek/data/mechfiles/mechs/MWO Canon/Corsair COR-RA Ravager.mtf b/megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Corsair COR-RA Ravager.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/MWO Canon/Corsair COR-RA Ravager.mtf
rename to megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Corsair COR-RA Ravager.mtf
diff --git a/megamek/data/mechfiles/mechs/MWO Canon/Roughneck RGH-1A.mtf b/megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Roughneck RGH-1A.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/MWO Canon/Roughneck RGH-1A.mtf
rename to megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Roughneck RGH-1A.mtf
diff --git a/megamek/data/mechfiles/mechs/MWO Canon/Roughneck RGH-1B.mtf b/megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Roughneck RGH-1B.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/MWO Canon/Roughneck RGH-1B.mtf
rename to megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Roughneck RGH-1B.mtf
diff --git a/megamek/data/mechfiles/mechs/MWO Canon/Roughneck RGH-1C.mtf b/megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Roughneck RGH-1C.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/MWO Canon/Roughneck RGH-1C.mtf
rename to megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Roughneck RGH-1C.mtf
diff --git a/megamek/data/mechfiles/mechs/MWO Canon/Roughneck RGH-2A.mtf b/megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Roughneck RGH-2A.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/MWO Canon/Roughneck RGH-2A.mtf
rename to megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Roughneck RGH-2A.mtf
diff --git a/megamek/data/mechfiles/mechs/MWO Canon/Roughneck RGH-3A.mtf b/megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Roughneck RGH-3A.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/MWO Canon/Roughneck RGH-3A.mtf
rename to megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Roughneck RGH-3A.mtf
diff --git a/megamek/data/mechfiles/mechs/MWO Canon/Roughneck RGH-BLT Bolt.mtf b/megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Roughneck RGH-BLT Bolt.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/MWO Canon/Roughneck RGH-BLT Bolt.mtf
rename to megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Roughneck RGH-BLT Bolt.mtf
diff --git a/megamek/data/mechfiles/mechs/MWO Canon/Roughneck RGH-PH Powerhouse.mtf b/megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Roughneck RGH-PH Powerhouse.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/MWO Canon/Roughneck RGH-PH Powerhouse.mtf
rename to megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Roughneck RGH-PH Powerhouse.mtf
diff --git a/megamek/data/mechfiles/mechs/MWO Canon/Roughneck RGH-R Reaver.mtf b/megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Roughneck RGH-R Reaver.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/MWO Canon/Roughneck RGH-R Reaver.mtf
rename to megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Roughneck RGH-R Reaver.mtf
diff --git a/megamek/data/mechfiles/mechs/MWO Canon/Sun Spider A.mtf b/megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Sun Spider A.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/MWO Canon/Sun Spider A.mtf
rename to megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Sun Spider A.mtf
diff --git a/megamek/data/mechfiles/mechs/MWO Canon/Sun Spider Ambush.mtf b/megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Sun Spider Ambush.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/MWO Canon/Sun Spider Ambush.mtf
rename to megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Sun Spider Ambush.mtf
diff --git a/megamek/data/mechfiles/mechs/MWO Canon/Sun Spider B.mtf b/megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Sun Spider B.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/MWO Canon/Sun Spider B.mtf
rename to megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Sun Spider B.mtf
diff --git a/megamek/data/mechfiles/mechs/MWO Canon/Sun Spider C.mtf b/megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Sun Spider C.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/MWO Canon/Sun Spider C.mtf
rename to megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Sun Spider C.mtf
diff --git a/megamek/data/mechfiles/mechs/MWO Canon/Sun Spider D.mtf b/megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Sun Spider D.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/MWO Canon/Sun Spider D.mtf
rename to megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Sun Spider D.mtf
diff --git a/megamek/data/mechfiles/mechs/MWO Canon/Sun Spider Manul.mtf b/megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Sun Spider Manul.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/MWO Canon/Sun Spider Manul.mtf
rename to megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Sun Spider Manul.mtf
diff --git a/megamek/data/mechfiles/mechs/MWO Canon/Sun Spider Prime.mtf b/megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Sun Spider Prime.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/MWO Canon/Sun Spider Prime.mtf
rename to megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Sun Spider Prime.mtf
diff --git a/megamek/data/mechfiles/mechs/MWO Canon/Sun Spider Vanguard.mtf b/megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Sun Spider Vanguard.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/MWO Canon/Sun Spider Vanguard.mtf
rename to megamek/data/mechfiles/mechs/Videogame (Apocryphal)/Sun Spider Vanguard.mtf
diff --git a/megamek/data/mechfiles/name_changes.txt b/megamek/data/mechfiles/name_changes.txt
index 687cd79dfcc..afa5042baa7 100644
--- a/megamek/data/mechfiles/name_changes.txt
+++ b/megamek/data/mechfiles/name_changes.txt
@@ -541,140 +541,148 @@ Tramp JumpShip (Lithium-Fusion)|Tramp JumpShip (3071)
 
 #Mechs
 Atlas AS7-D(C)|Atlas C
-Jagermech JM6-DG|JagerMech JM6-DG
-Mad Cat III (Eve)|Mad Cat III 3 (Eve)
-Puma (Adder) A|Adder (Puma) A
-Puma (Adder) B|Adder (Puma) B
-Puma (Adder) C|Adder (Puma) C
-Puma (Adder) D|Adder (Puma) D
-Puma (Adder) Prime|Adder (Puma) Prime
-Hankyu (Arctic Cheetah) A|Arctic Cheetah (Hankyu) A
-Hankyu (Arctic Cheetah) B|Arctic Cheetah (Hankyu) B
-Hankyu (Arctic Cheetah) C|Arctic Cheetah (Hankyu) C
-Hankyu (Arctic Cheetah) D|Arctic Cheetah (Hankyu) D
-Hankyu (Arctic Cheetah) Prime|Arctic Cheetah (Hankyu) Prime
-Hellhound (Conjurer) (Standard)|Conjurer (Hellhound)
-Hellhound (Conjurer) 2|Conjurer (Hellhound) 2
+Baboon (Howler) (Standard)|Howler (Baboon)
+Behemoth (Stone Rhino) (Standard)|Stone Rhino (Behemoth)
+Behemoth (Stone Rhino) 4|Stone Rhino (Behemoth) 4
+Behemoth (Stone Rhino) 5|Stone Rhino (Behemoth) 5
+Behemoth (Stone Rhino) 6|Stone Rhino (Behemoth) 6
+Black Hawk (Nova) A|Nova (Black Hawk) A
+Black Hawk (Nova) B|Nova (Black Hawk) B
+Black Hawk (Nova) C|Nova (Black Hawk) C
+Black Hawk (Nova) D|Nova (Black Hawk) D
+Black Hawk (Nova) Prime|Nova (Black Hawk) Prime
+Black Hawk (Nova) S|Nova (Black Hawk) S
+Black Hawk (Standard)|Black Hawk (Standard)
+Black Hawk 2|Black Hawk (Standard) 2
+Black Hawk 3|Black Hawk (Standard) 3
+Cauldron-Born (Ebon Jaguar) A|Ebon Jaguar (Cauldron-Born) A
+Cauldron-Born (Ebon Jaguar) B|Ebon Jaguar (Cauldron-Born) B
+Cauldron-Born (Ebon Jaguar) C|Ebon Jaguar (Cauldron-Born) C
+Cauldron-Born (Ebon Jaguar) Prime|Ebon Jaguar (Cauldron-Born) Prime
 Daishi (Dire Wolf) A|Dire Wolf (Daishi) A
 Daishi (Dire Wolf) B|Dire Wolf (Daishi) B
 Daishi (Dire Wolf) Prime|Dire Wolf (Daishi) Prime
 Daishi (Dire Wolf) S|Dire Wolf (Daishi) S
 Daishi (Dire Wolf) W|Dire Wolf (Daishi) W
-Cauldron-Born (Ebon Jaguar) A|Ebon Jaguar (Cauldron-Born) A
-Cauldron-Born (Ebon Jaguar) B|Ebon Jaguar (Cauldron-Born) B
-Cauldron-Born (Ebon Jaguar) C|Ebon Jaguar (Cauldron-Born) C
-Cauldron-Born (Ebon Jaguar) Prime|Ebon Jaguar (Cauldron-Born) Prime
-Gladiator (Executioner) A|Executioner (Gladiator) A
-Gladiator (Executioner) B|Executioner (Gladiator) B
-Gladiator (Executioner) C|Executioner (Gladiator) C
-Gladiator (Executioner) D|Executioner (Gladiator) D
-Gladiator (Executioner) Prime|Executioner (Gladiator) Prime
 Dasher (Fire Moth) A|Fire Moth (Dasher) A
 Dasher (Fire Moth) B|Fire Moth (Dasher) B
 Dasher (Fire Moth) C|Fire Moth (Dasher) C
 Dasher (Fire Moth) D|Fire Moth (Dasher) D
 Dasher (Fire Moth) Prime|Fire Moth (Dasher) Prime
-Iron Cheetah Prime-NA|Iron Cheetah Prime.png
+Dragonfly (Viper) A|Viper (Dragonfly) A
+Dragonfly (Viper) B|Viper (Dragonfly) B
+Dragonfly (Viper) C|Viper (Dragonfly) C
+Dragonfly (Viper) D|Viper (Dragonfly) D
+Dragonfly (Viper) Prime|Viper (Dragonfly) Prime
+Fenris (Ice Ferret) A|Ice Ferret (Fenris) A
+Fenris (Ice Ferret) B|Ice Ferret (Fenris) B
+Fenris (Ice Ferret) C|Ice Ferret (Fenris) C
+Fenris (Ice Ferret) D|Ice Ferret (Fenris) D
+Fenris (Ice Ferret) Prime|Ice Ferret (Fenris) Prime
+Gladiator (Executioner) A|Executioner (Gladiator) A
+Gladiator (Executioner) B|Executioner (Gladiator) B
+Gladiator (Executioner) C|Executioner (Gladiator) C
+Gladiator (Executioner) D|Executioner (Gladiator) D
+Gladiator (Executioner) Prime|Executioner (Gladiator) Prime
+Goshawk (Vapor Eagle) (Standard)|Vapor Eagle (Goshawk)
+Goshawk (Vapor Eagle) 2|Vapor Eagle (Goshawk) 2
+Grendel (Mongrel) A|Mongrel (Grendel) A
+Grendel (Mongrel) B|Mongrel (Grendel) B
+Grendel (Mongrel) C|Mongrel (Grendel) C
+Grendel (Mongrel) D|Mongrel (Grendel) D
+Grendel (Mongrel) Prime|Mongrel (Grendel) Prime
+Hankyu (Arctic Cheetah) A|Arctic Cheetah (Hankyu) A
+Hankyu (Arctic Cheetah) B|Arctic Cheetah (Hankyu) B
+Hankyu (Arctic Cheetah) C|Arctic Cheetah (Hankyu) C
+Hankyu (Arctic Cheetah) D|Arctic Cheetah (Hankyu) D
+Hankyu (Arctic Cheetah) Prime|Arctic Cheetah (Hankyu) Prime
+Hellhound (Conjurer) (Standard)|Conjurer (Hellhound)
+Hellhound (Conjurer) 2|Conjurer (Hellhound) 2
+Hunchback IIC (Standard)|Hunchback IIC
 Iron Cheetah A-NA|Iron Cheetah A
 Iron Cheetah B-NA|Iron Cheetah B
 Iron Cheetah C-NA|Iron Cheetah C
 Iron Cheetah D-NA|Iron Cheetah D
 Iron Cheetah E-NA|Iron Cheetah E
 Iron Cheetah F-NA|Iron Cheetah L
+Iron Cheetah Prime-NA|Iron Cheetah Prime.png
+Jagermech JM6-DG|JagerMech JM6-DG
+Kodiak (Standard)|Kodiak
+Koshi (Mist Lynx) A|Mist Lynx (Koshi) A
+Koshi (Mist Lynx) B|Mist Lynx (Koshi) B
+Koshi (Mist Lynx) C|Mist Lynx (Koshi) C
+Koshi (Mist Lynx) D|Mist Lynx (Koshi) D
+Koshi (Mist Lynx) Prime|Mist Lynx (Koshi) Prime
+Koshi (Standard)|Koshi (Standard)
+Koshi 2|Koshi (Standard) 2
+Koshi 3|Koshi (Standard) 3
 Loki (Hellbringer) A|Hellbringer (Loki) A
 Loki (Hellbringer) B|Hellbringer (Loki) B
 Loki (Hellbringer) Prime|Hellbringer (Loki) Prime
-Peregrine (Horned Owl) (Standard)|Horned Owl (Peregrine)
-Peregrine (Horned Owl) 2|Horned Owl (Peregrine) 2
-Baboon (Howler) (Standard)|Howler (Baboon)
-Hunchback IIC (Standard)|Hunchback IIC
+Mad Cat (Timber Wolf) A|Timber Wolf (Mad Cat) A
+Mad Cat (Timber Wolf) B|Timber Wolf (Mad Cat) B
+Mad Cat (Timber Wolf) C|Timber WOlf (Mad Cat) C
+Mad Cat (Timber WOlf) D|Timber Wolf (Mad Cat) D
+Mad Cat (Timber Wolf) Prime|Timber Wolf (Mad Cat) Prime
+Mad Cat (Timber Wolf) S|Timber Wolf (Mad Cat) S
+Mad Cat III (Eve)|Mad Cat III 3 (Eve)
+Man O' War (Gargoyle) A|Gargoyle (Man O' War) A
+Man O' War (Gargoyle) B|Gargoyle (Man O' War) B
+Man O' War (Gargoyle) C|Gargoyle (Man O' War) C
+Man O' War (Gargoyle) D|Gargoyle (Man O' War) D
+Man O' War (Gargoyle) Prime|Gargoyle (Man O' War) Prime
+Marauder IIC (Standard)|Marauder IIC
+Masakari (Warhawk) A|Warhawk (Masakari) A
+Masakari (Warhawk) B|Warhawk (Masakari) B
+Masakari (Warhawk) C|Warhawk (Masakari) C
+Masakari (Warhawk) Prime|Warhawk (Masakari) Prime
 Nobori-nin (Huntsman) A|Huntsman (Nobori-nin) A
 Nobori-nin (Huntsman) B|Huntsman (Nobori-nin) B
 Nobori-nin (Huntsman) C|Huntsman (Nobori-nin) C
 Nobori-nin (Huntsman) Prime|Huntsman (Nobori-nin) Prime
-Fenris (Ice Ferret) A|Ice Ferret (Fenris) A
-Fenris (Ice Ferret) B|Ice Ferret (Fenris) B
-Fenris (Ice Ferret) C|Ice Ferret (Fenris) C
-Fenris (Ice Ferret) D|Ice Ferret (Fenris) D
-Fenris (Ice Ferret) Prime|Ice Ferret (Fenris) Prime
-Vixen (Incubus) 2|Incubus (Vixen) 2
-Vixen (Incubus) 3|Incubus (Vixen) 3
-Vixen (Incubus) (Standard)|Incubus (Vixen)
-Uller (Kit Fox) A|Kit Fox (Uller) A
-Uller (Kit Fox) B|Kit Fox (Uller) B
-Uller (Kit Fox) C|Kit Fox (Uller) C
-Uller (Kit Fox) D|Kit Fox (Uller) D
-Uller (Kit Fox) Prime|Kit Fox (Uller) Prime
-Uller (Kit Fox) S|Kit Fox (Uller) S
-Kodiak (Standard)|Kodiak
-Vulture (Mad Dog) A|Mad Dog (Vulture) A
-Vulture (Mad Dog) B|Mad Dog (Vulture) B
-Vulture (Mad Dog) C|Mad Dog (Vulture) C
-Vulture (Mad Dog) Prime|Mad Dog (Vulture) Prime
-Marauder IIC (Standard)|Marauder IIC
-Koshi (Mist Lynx) Prime|Mist Lynx (Koshi) Prime
-Koshi (Mist Lynx) A|Mist Lynx (Koshi) A
-Koshi (Mist Lynx) B|Mist Lynx (Koshi) B
-Koshi (Mist Lynx) C|Mist Lynx (Koshi) C
-Koshi (Mist Lynx) D|Mist Lynx (Koshi) D
-Grendel (Mongrel) Prime|Mongrel (Grendel) Prime
-Grendel (Mongrel) A|Mongrel (Grendel) A
-Grendel (Mongrel) B|Mongrel (Grendel) B
-Grendel (Mongrel) C|Mongrel (Grendel) C
-Grendel (Mongrel) D|Mongrel (Grendel) D
-Black Hawk (Nova) Prime|Nova (Black Hawk) Prime
-Black Hawk (Nova) A|Nova (Black Hawk) A
-Black Hawk (Nova) B|Nova (Black Hawk) B
-Black Hawk (Nova) C|Nova (Black Hawk) C
-Black Hawk (Nova) D|Nova (Black Hawk) D
-Black Hawk (Nova) S|Nova (Black Hawk) S
+'OMEGA' SHP-4X|OMEGA SHP-4X
+Peregrine (Horned Owl) (Standard)|Horned Owl (Peregrine)
+Peregrine (Horned Owl) 2|Horned Owl (Peregrine) 2
+Phoenix Hawk LAM PXH-HK2|Phoenix Hawk LAM PHX-HK2
 Piranha (Standard)|Piranha
-Behemoth (Stone Rhino) (Standard)|Stone Rhino (Behemoth)
-Behemoth (Stone Rhino) 4|Stone Rhino (Behemoth) 4
-Behemoth (Stone Rhino) 5|Stone Rhino (Behemoth) 5
-Behemoth (Stone Rhino) 6|Stone Rhino (Behemoth) 6
-Ryoken (Stormcrow) Prime|Stormcrow (Ryoken) Prime
+Puma (Adder) A|Adder (Puma) A
+Puma (Adder) B|Adder (Puma) B
+Puma (Adder) C|Adder (Puma) C
+Puma (Adder) D|Adder (Puma) D
+Puma (Adder) Prime|Adder (Puma) Prime
+Raijin RJN101-A|Raijin RJN-101-A
+Raijin RJN101-C|Raijin RJN-101-C
 Ryoken (Stormcrow) A|Stormcrow (Ryoken) A
 Ryoken (Stormcrow) B|Stormcrow (Ryoken) B
 Ryoken (Stormcrow) C|Stormcrow (Ryoken) C
 Ryoken (Stormcrow) D|Stormcrow (Ryoken) D
-Thor (Summoner) Prime|Summoner (Thor) Prime
+Ryoken (Stormcrow) Prime|Stormcrow (Ryoken) Prime
+Supernova (Standard)|Supernova
 Thor (Summoner) A|Summoner (Thor) A
 Thor (Summoner) B|Summoner (Thor) B
 Thor (Summoner) C|Summoner (Thor) C
 Thor (Summoner) D|Summoner (Thor) D
 Thor (Summoner) M|Summoner (Thor) M
-Supernova (Standard)|Supernova
-Mad Cat (Timber Wolf) Prime|Timber Wolf (Mad Cat) Prime
-Mad Cat (Timber Wolf) A|Timber Wolf (Mad Cat) A
-Mad Cat (Timber Wolf) B|Timber Wolf (Mad Cat) B
-Mad Cat (Timber Wolf) C|Timber WOlf (Mad Cat) C
-Mad Cat (Timber WOlf) D|Timber Wolf (Mad Cat) D
-Mad Cat (Timber Wolf) S|Timber Wolf (Mad Cat) S
+Thor (Summoner) Prime|Summoner (Thor) Prime
 Timber Wolf (Mad Cat) M|Mad Cat (Timber Wolf) M
 Timber Wolf (Mad Cat) N|Mad Cat (Timber Wolf) N
 Timber Wolf (Mad Cat) T|Mad Cat (Timber Wolf) T
 Timber Wolf (Mad Cat) W|Mad Cat (Timber Wolf) W
-Goshawk (Vapor Eagle) 2|Vapor Eagle (Goshawk) 2
-Goshawk (Vapor Eagle) (Standard)|Vapor Eagle (Goshawk)
-Dragonfly (Viper) Prime|Viper (Dragonfly) Prime
-Dragonfly (Viper) A|Viper (Dragonfly) A
-Dragonfly (Viper) B|Viper (Dragonfly) B
-Dragonfly (Viper) C|Viper (Dragonfly) C
-Dragonfly (Viper) D|Viper (Dragonfly) D
+Uller (Kit Fox) A|Kit Fox (Uller) A
+Uller (Kit Fox) B|Kit Fox (Uller) B
+Uller (Kit Fox) C|Kit Fox (Uller) C
+Uller (Kit Fox) D|Kit Fox (Uller) D
+Uller (Kit Fox) Prime|Kit Fox (Uller) Prime
+Uller (Kit Fox) S|Kit Fox (Uller) S
+Vixen (Incubus) (Standard)|Incubus (Vixen)
+Vixen (Incubus) 2|Incubus (Vixen) 2
+Vixen (Incubus) 3|Incubus (Vixen) 3
+Vulture (Mad Dog) A|Mad Dog (Vulture) A
+Vulture (Mad Dog) B|Mad Dog (Vulture) B
+Vulture (Mad Dog) C|Mad Dog (Vulture) C
+Vulture (Mad Dog) Prime|Mad Dog (Vulture) Prime
 Warhammer IIC (Standard)|Warhammer IIC
-Masakari (Warhawk) Prime|Warhawk (Masakari) Prime
-Masakari (Warhawk) A|Warhawk (Masakari) A
-Masakari (Warhawk) B|Warhawk (Masakari) B
-Masakari (Warhawk) C|Warhawk (Masakari) C
-Man O' War (Gargoyle) Prime|Gargoyle (Man O' War) Prime
-Man O' War (Gargoyle) A|Gargoyle (Man O' War) A
-Man O' War (Gargoyle) B|Gargoyle (Man O' War) B
-Man O' War (Gargoyle) C|Gargoyle (Man O' War) C
-Man O' War (Gargoyle) D|Gargoyle (Man O' War) D
-Raijin RJN101-A|Raijin RJN-101-A
-Raijin RJN101-C|Raijin RJN-101-C
-'OMEGA' SHP-4X|OMEGA SHP-4X
+
 
 #Protomechs
 Boggart (Quad) 1|Boggart Ultraheavy ProtoMech (Standard)
@@ -714,6 +722,10 @@ Sleipnir APC (SRM)|Sleipnir AP Tank (SRM)
 Sturmfeur Heavy Tank (SRM)|SturmFeur Heavy Tank (SRM)
 Sturmfeur Heavy Tank (Standard)|SturmFeur Heavy Tank (Standard)
 Hover Tank (Standard)|LTV-4 Hover Tank
+Vector (Attack)|Vector Combat Support VTOL (Attack)
+Vector (EW)|Vector Combat Support VTOL (EW)
+Vector (Scout)|Vector Combat Support VTOL (Scout)
+Vector (Transport)|Vector Combat Support VTOL (Transport)
 
 #Warships
 Aegis Heavy Cruiser (Clan)|Aegis Heavy Cruiser (2843)
diff --git a/megamek/data/mechfiles/vehicles/3075/Crow Scout Helicopter 'Dragonfly'.blk b/megamek/data/mechfiles/vehicles/3075/Crow Scout Helicopter 'Dragonfly'.blk
new file mode 100644
index 00000000000..377c6290793
--- /dev/null
+++ b/megamek/data/mechfiles/vehicles/3075/Crow Scout Helicopter 'Dragonfly'.blk	
@@ -0,0 +1,123 @@
+#building block data file
+<BlockVersion>
+1
+</BlockVersion>
+
+##Write the version number just in case...
+<Version>
+MAM0
+</Version>
+
+<UnitType>
+VTOL
+</UnitType>
+
+<Name>
+Crow Scout Helicopter
+</Name>
+
+<Model>
+'Dragonfly'
+</Model>
+
+<mul id:>
+8411
+</mul id:>
+
+<year>
+3070
+</year>
+
+<originalBuildYear>
+3070
+</originalBuildYear>
+
+<type>
+IS Level 2
+</type>
+
+<motion_type>
+VTOL
+</motion_type>
+
+<transporters>
+</transporters>
+
+<cruiseMP>
+13
+</cruiseMP>
+
+<engine_type>
+0
+</engine_type>
+
+<armor>
+8
+5
+5
+4
+2
+</armor>
+
+<Body Equipment>
+ISGuardianECMSuite
+BeagleActiveProbe
+ISC3SlaveUnit
+</Body Equipment>
+
+<Front Equipment>
+ISTAG
+</Front Equipment>
+
+<Right Equipment>
+</Right Equipment>
+
+<Left Equipment>
+</Left Equipment>
+
+<Rear Equipment>
+</Rear Equipment>
+
+<Rotor Equipment>
+</Rotor Equipment>
+
+<capabilities>
+The most obvious advantage of the Crow is its 216 km/h top speed. The incredibly fast vehicle can often get in and out of trouble spots before its enemies can effectively bring their weapons to bear. In order to fulfill its duties as a scout, the Crow carries a suite of advanced electronics, though the cost of those pushed the vehicle's price tag far above what Procurement officials expect out of a fifteen-ton VTOL. For scout duties, it has a Wunderland Beagle Active Probe, while a Forward-1 TAG allows the Crow to spot for indirect bombardments. An Apple-Churchill Guardian ECM Suite protects it from enemy spotting devices. The Crow's speed is its best armor. It mounts a meager one and a half tons of standard armor.
+</capabilities>
+
+<overview>
+The Crow Scout VTOL is a military-grade, scout combat vehicle that is based upon the civilian Soar.
+</overview>
+
+<deployment>
+The Dragonfly variant carries no weapons. It is equipped with a Beagle Probe, Guardian ECM suite, C3 Slave, and a TAG unit to designate targets.
+</deployment>
+
+<history>
+Yan Manufacturing designed the Crow to replace the many scout BattleMechs the Draconis Combine lost during the Combine-Ghost Bear War. The Yan team kept many of the strengths of the search-and-rescue vehicle the Crow is descended from, though they improved it using military-grade technologies. Yan initially had trouble selling the Crow to the DCMS. Finally, Yan agreed to give the unit to them as long as the Combine supplied the electronics. In exchange, Yan is free to sell the unit to mercenary units.
+</history>
+
+<manufacturer>
+Yan Manufacturing
+</manufacturer>
+
+<primaryFactory>
+New Samarkand
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:DAV 100 fusion
+ARMOR:Starslab/3
+COMMUNICATIONS:Scuti Dualcom with Apple-Churchill Guardian ECM Suite
+TARGETING:Skyhunter IV with Forward-1 TAG and Wunderland Beagle Active Probe
+</systemManufacturers>
+
+<source>
+TRO 3075 - Jihad
+</source>
+
+<tonnage>
+15.0
+</tonnage>
+
diff --git a/megamek/data/mechfiles/vehicles/3075/Crow Scout Helicopter (C3).blk b/megamek/data/mechfiles/vehicles/3075/Crow Scout Helicopter (C3).blk
index 28950aa8bb0..260d9f8f295 100644
--- a/megamek/data/mechfiles/vehicles/3075/Crow Scout Helicopter (C3).blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Crow Scout Helicopter (C3).blk	
@@ -29,7 +29,7 @@ Crow Scout Helicopter
 </year>
 
 <source>
-Jihad
+TRO 3075 - Jihad
 </source>
 
 <type>
@@ -90,3 +90,39 @@ ISERSmallLaser
 <armor_type>
 0
 </armor_type>
+
+<capabilities>
+The most obvious advantage of the Crow is its 216 km/h top speed. The incredibly fast vehicle can often get in and out of trouble spots before its enemies can effectively bring their weapons to bear. In order to fulfill its duties as a scout, the Crow carries a suite of advanced electronics, though the cost of those pushed the vehicle's price tag far above what Procurement officials expect out of a fifteen-ton VTOL. For scout duties, it has a Wunderland Beagle Active Probe, while a Forward-1 TAG allows the Crow to spot for indirect bombardments. An Apple-Churchill Guardian ECM Suite protects it from enemy spotting devices. The Crow's speed is its best armor. It mounts a meager one and a half tons of standard armor.
+</capabilities>
+
+<overview>
+The Crow Scout VTOL is a military-grade, scout combat vehicle that is based upon the civilian Soar.
+</overview>
+
+<deployment>
+Due to shortage of TAGs, some Crows come equipped with a C3 slave unit instead
+</deployment>
+
+<history>
+Yan Manufacturing designed the Crow to replace the many scout BattleMechs the Draconis Combine lost during the Combine-Ghost Bear War. The Yan team kept many of the strengths of the search-and-rescue vehicle the Crow is descended from, though they improved it using military-grade technologies. Yan initially had trouble selling the Crow to the DCMS. Finally, Yan agreed to give the unit to them as long as the Combine supplied the electronics. In exchange, Yan is free to sell the unit to mercenary units.
+</history>
+
+<manufacturer>
+Yan Manufacturing
+</manufacturer>
+
+<primaryFactory>
+New Samarkand
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:DAV 100 fusion
+ARMOR:Starslab/3
+COMMUNICATIONS:Scuti Dualcom with Apple-Churchill Guardian ECM Suite
+TARGETING:Skyhunter IV with Forward-1 TAG and Wunderland Beagle Active Probe
+</systemManufacturers>
+
+<source>
+TRO 3075 - Jihad
+</source>
\ No newline at end of file
diff --git a/megamek/data/mechfiles/vehicles/3075/Crow Scout Helicopter (Export).blk b/megamek/data/mechfiles/vehicles/3075/Crow Scout Helicopter (Export).blk
index c09ad48b841..9dc1abf176f 100644
--- a/megamek/data/mechfiles/vehicles/3075/Crow Scout Helicopter (Export).blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Crow Scout Helicopter (Export).blk	
@@ -29,7 +29,7 @@ Crow Scout Helicopter
 </year>
 
 <source>
-Jihad
+TRO 3075 - Jihad
 </source>
 
 <type>
@@ -92,3 +92,39 @@ Machine Gun
 <armor_type>
 0
 </armor_type>
+
+<capabilities>
+The most obvious advantage of the Crow is its 216 km/h top speed. The incredibly fast vehicle can often get in and out of trouble spots before its enemies can effectively bring their weapons to bear. In order to fulfill its duties as a scout, the Crow carries a suite of advanced electronics, though the cost of those pushed the vehicle's price tag far above what Procurement officials expect out of a fifteen-ton VTOL. For scout duties, it has a Wunderland Beagle Active Probe, while a Forward-1 TAG allows the Crow to spot for indirect bombardments. An Apple-Churchill Guardian ECM Suite protects it from enemy spotting devices. The Crow's speed is its best armor. It mounts a meager one and a half tons of standard armor.
+</capabilities>
+
+<overview>
+The Crow Scout VTOL is a military-grade, scout combat vehicle that is based upon the civilian Soar.
+</overview>
+
+<deployment>
+Targeted at the mercenary market, this variant transforms the Crow into a harasser. It removes the electronics and replaces them with armor and weapons. The added guns include two Machine Guns for anti-infantry work and Rocket Launchers.
+</deployment>
+
+<history>
+Yan Manufacturing designed the Crow to replace the many scout BattleMechs the Draconis Combine lost during the Combine-Ghost Bear War. The Yan team kept many of the strengths of the search-and-rescue vehicle the Crow is descended from, though they improved it using military-grade technologies. Yan initially had trouble selling the Crow to the DCMS. Finally, Yan agreed to give the unit to them as long as the Combine supplied the electronics. In exchange, Yan is free to sell the unit to mercenary units.
+</history>
+
+<manufacturer>
+Yan Manufacturing
+</manufacturer>
+
+<primaryFactory>
+New Samarkand
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:DAV 100 fusion
+ARMOR:Starslab/3
+COMMUNICATIONS:Scuti Dualcom with Apple-Churchill Guardian ECM Suite
+TARGETING:Skyhunter IV with Forward-1 TAG and Wunderland Beagle Active Probe
+</systemManufacturers>
+
+<source>
+TRO 3075 - Jihad
+</source>
\ No newline at end of file
diff --git a/megamek/data/mechfiles/vehicles/3075/Crow Scout Helicopter.blk b/megamek/data/mechfiles/vehicles/3075/Crow Scout Helicopter.blk
index 792e69424a6..7e486689bd8 100644
--- a/megamek/data/mechfiles/vehicles/3075/Crow Scout Helicopter.blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Crow Scout Helicopter.blk	
@@ -29,7 +29,7 @@ Crow Scout Helicopter
 </year>
 
 <source>
-Jihad
+TRO 3075 - Jihad
 </source>
 
 <type>
@@ -74,3 +74,39 @@ ISERSmallLaser
 ISERSmallLaser
 ISTAG
 </Front Equipment>
+
+<capabilities>
+The most obvious advantage of the Crow is its 216 km/h top speed. The incredibly fast vehicle can often get in and out of trouble spots before its enemies can effectively bring their weapons to bear. In order to fulfill its duties as a scout, the Crow carries a suite of advanced electronics, though the cost of those pushed the vehicle's price tag far above what Procurement officials expect out of a fifteen-ton VTOL. For scout duties, it has a Wunderland Beagle Active Probe, while a Forward-1 TAG allows the Crow to spot for indirect bombardments. An Apple-Churchill Guardian ECM Suite protects it from enemy spotting devices. The Crow's speed is its best armor. It mounts a meager one and a half tons of standard armor.
+</capabilities>
+
+<overview>
+The Crow Scout VTOL is a military-grade, scout combat vehicle that is based upon the civilian Soar.
+</overview>
+
+<deployment>
+As a scout and spotter, the TAG is the Crow's strongest offense, though it requires coordinating with other units. The only weaponry the Crow mounts is a pair of Exostar ER Small Lasers in its front
+</deployment>
+
+<history>
+Yan Manufacturing designed the Crow to replace the many scout BattleMechs the Draconis Combine lost during the Combine-Ghost Bear War. The Yan team kept many of the strengths of the search-and-rescue vehicle the Crow is descended from, though they improved it using military-grade technologies. Yan initially had trouble selling the Crow to the DCMS. Finally, Yan agreed to give the unit to them as long as the Combine supplied the electronics. In exchange, Yan is free to sell the unit to mercenary units.
+</history>
+
+<manufacturer>
+Yan Manufacturing
+</manufacturer>
+
+<primaryFactory>
+New Samarkand
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:DAV 100 fusion
+ARMOR:Starslab/3
+COMMUNICATIONS:Scuti Dualcom with Apple-Churchill Guardian ECM Suite
+TARGETING:Skyhunter IV with Forward-1 TAG and Wunderland Beagle Active Probe
+</systemManufacturers>
+
+<source>
+TRO 3075 - Jihad
+</source>
\ No newline at end of file