diff --git a/Models/Liveries/A320/IAE/9A-CTK.png b/Models/Liveries/A320/CFM/9A-CTK.png
similarity index 100%
rename from Models/Liveries/A320/IAE/9A-CTK.png
rename to Models/Liveries/A320/CFM/9A-CTK.png
diff --git a/Models/Liveries/A320/IAE/9A-CTK.xml b/Models/Liveries/A320/CFM/9A-CTK.xml
similarity index 100%
rename from Models/Liveries/A320/IAE/9A-CTK.xml
rename to Models/Liveries/A320/CFM/9A-CTK.xml
diff --git a/Models/Liveries/A320/CFM/AAL.png b/Models/Liveries/A320/CFM/AAL.png
new file mode 100644
index 00000000..ab517adf
Binary files /dev/null and b/Models/Liveries/A320/CFM/AAL.png differ
diff --git a/Models/Liveries/A320/CFM/AAL.xml b/Models/Liveries/A320/CFM/AAL.xml
new file mode 100644
index 00000000..3b89c786
--- /dev/null
+++ b/Models/Liveries/A320/CFM/AAL.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+ American Airlines
+ Liveries/A320/IAE/AAL.png
+
+
+
+
+
+ 0
+
+
+ 0
+
diff --git a/Models/Liveries/A320/CFM/AAN.png b/Models/Liveries/A320/CFM/AAN.png
new file mode 100644
index 00000000..c8b9c77a
Binary files /dev/null and b/Models/Liveries/A320/CFM/AAN.png differ
diff --git a/Models/Liveries/A320/CFM/AAN.xml b/Models/Liveries/A320/CFM/AAN.xml
new file mode 100644
index 00000000..59ae07ab
--- /dev/null
+++ b/Models/Liveries/A320/CFM/AAN.xml
@@ -0,0 +1,16 @@
+
+
+
+
+ Amsterdam Airlines
+ Liveries/A320/IAE/AAN.png
+
+
+
+
+
+ 1
+
+
+ 0
+
diff --git a/Models/Liveries/A320/IAE/ACA.png b/Models/Liveries/A320/CFM/ACA.png
similarity index 100%
rename from Models/Liveries/A320/IAE/ACA.png
rename to Models/Liveries/A320/CFM/ACA.png
diff --git a/Models/Liveries/A320/IAE/ACA.xml b/Models/Liveries/A320/CFM/ACA.xml
similarity index 100%
rename from Models/Liveries/A320/IAE/ACA.xml
rename to Models/Liveries/A320/CFM/ACA.xml
diff --git a/Models/Liveries/A320/CFM/ADR.png b/Models/Liveries/A320/CFM/ADR.png
new file mode 100644
index 00000000..e12c85ff
Binary files /dev/null and b/Models/Liveries/A320/CFM/ADR.png differ
diff --git a/Models/Liveries/A320/CFM/ADR.xml b/Models/Liveries/A320/CFM/ADR.xml
new file mode 100644
index 00000000..41b22ca5
--- /dev/null
+++ b/Models/Liveries/A320/CFM/ADR.xml
@@ -0,0 +1,16 @@
+
+
+
+
+ Adria Airways
+ Liveries/A320/IAE/ADR.png
+
+
+
+
+
+ 0
+
+
+ 0
+
diff --git a/Models/Liveries/A320/IAE/AFR-dirt.png b/Models/Liveries/A320/CFM/AFR-dirt.png
similarity index 100%
rename from Models/Liveries/A320/IAE/AFR-dirt.png
rename to Models/Liveries/A320/CFM/AFR-dirt.png
diff --git a/Models/Liveries/A320/IAE/AFR-dirt.xml b/Models/Liveries/A320/CFM/AFR-dirt.xml
similarity index 100%
rename from Models/Liveries/A320/IAE/AFR-dirt.xml
rename to Models/Liveries/A320/CFM/AFR-dirt.xml
diff --git a/Models/Liveries/A320/IAE/AFR-skyteam.png b/Models/Liveries/A320/CFM/AFR-skyteam.png
similarity index 100%
rename from Models/Liveries/A320/IAE/AFR-skyteam.png
rename to Models/Liveries/A320/CFM/AFR-skyteam.png
diff --git a/Models/Liveries/A320/IAE/AFR-skyteam.xml b/Models/Liveries/A320/CFM/AFR-skyteam.xml
similarity index 100%
rename from Models/Liveries/A320/IAE/AFR-skyteam.xml
rename to Models/Liveries/A320/CFM/AFR-skyteam.xml
diff --git a/Models/Liveries/A320/IAE/AJM.png b/Models/Liveries/A320/CFM/AJM.png
similarity index 100%
rename from Models/Liveries/A320/IAE/AJM.png
rename to Models/Liveries/A320/CFM/AJM.png
diff --git a/Models/Liveries/A320/IAE/AJM.xml b/Models/Liveries/A320/CFM/AJM.xml
similarity index 100%
rename from Models/Liveries/A320/IAE/AJM.xml
rename to Models/Liveries/A320/CFM/AJM.xml
diff --git a/Models/Liveries/A320/CFM/ALK.png b/Models/Liveries/A320/CFM/ALK.png
new file mode 100644
index 00000000..23868b30
Binary files /dev/null and b/Models/Liveries/A320/CFM/ALK.png differ
diff --git a/Models/Liveries/A320/CFM/ALK.xml b/Models/Liveries/A320/CFM/ALK.xml
new file mode 100644
index 00000000..bfc29a44
--- /dev/null
+++ b/Models/Liveries/A320/CFM/ALK.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+ SriLankan Airlines
+ Liveries/A320/IAE/ALK.png
+
+
+
+
+
+ 1
+
+
+ 0
+
diff --git a/Models/Liveries/A320/CFM/AMC.png b/Models/Liveries/A320/CFM/AMC.png
new file mode 100644
index 00000000..d26accaf
Binary files /dev/null and b/Models/Liveries/A320/CFM/AMC.png differ
diff --git a/Models/Liveries/A320/CFM/AMC.xml b/Models/Liveries/A320/CFM/AMC.xml
new file mode 100644
index 00000000..7050527d
--- /dev/null
+++ b/Models/Liveries/A320/CFM/AMC.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+ Air Malta
+ Liveries/A320/IAE/AMC.png
+ FanDisk.png
+
+
+
+
+
+ 1
+
+
+ 0
+
diff --git a/Models/Liveries/A320/CFM/AP-BLA.png b/Models/Liveries/A320/CFM/AP-BLA.png
new file mode 100644
index 00000000..2f568737
Binary files /dev/null and b/Models/Liveries/A320/CFM/AP-BLA.png differ
diff --git a/Models/Liveries/A320/CFM/AP-BLA.xml b/Models/Liveries/A320/CFM/AP-BLA.xml
new file mode 100644
index 00000000..d5daad37
--- /dev/null
+++ b/Models/Liveries/A320/CFM/AP-BLA.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+ PIA Retro
+ Liveries/A320/IAE/AP-BLA.png
+
+
+
+
+
+ 0
+
+
+ 0
+
diff --git a/Models/Liveries/A320/IAE/AVA.png b/Models/Liveries/A320/CFM/AVA.png
similarity index 100%
rename from Models/Liveries/A320/IAE/AVA.png
rename to Models/Liveries/A320/CFM/AVA.png
diff --git a/Models/Liveries/A320/IAE/AVA.xml b/Models/Liveries/A320/CFM/AVA.xml
similarity index 100%
rename from Models/Liveries/A320/IAE/AVA.xml
rename to Models/Liveries/A320/CFM/AVA.xml
diff --git a/Models/Liveries/A320/IAE/AZA.png b/Models/Liveries/A320/CFM/AZA.png
similarity index 100%
rename from Models/Liveries/A320/IAE/AZA.png
rename to Models/Liveries/A320/CFM/AZA.png
diff --git a/Models/Liveries/A320/IAE/AZA.xml b/Models/Liveries/A320/CFM/AZA.xml
similarity index 100%
rename from Models/Liveries/A320/IAE/AZA.xml
rename to Models/Liveries/A320/CFM/AZA.xml
diff --git a/Models/Liveries/A320/CFM/BAW.png b/Models/Liveries/A320/CFM/BAW.png
new file mode 100644
index 00000000..d07b82b2
Binary files /dev/null and b/Models/Liveries/A320/CFM/BAW.png differ
diff --git a/Models/Liveries/A320/CFM/BAW.xml b/Models/Liveries/A320/CFM/BAW.xml
new file mode 100644
index 00000000..12a98459
--- /dev/null
+++ b/Models/Liveries/A320/CFM/BAW.xml
@@ -0,0 +1,16 @@
+
+
+
+
+ British Airways
+ Liveries/A320/IAE/BAW.png
+
+
+
+
+
+ 0
+
+
+ 0
+
diff --git a/Models/Liveries/A320/CFM/BER.png b/Models/Liveries/A320/CFM/BER.png
new file mode 100644
index 00000000..d8414cfc
Binary files /dev/null and b/Models/Liveries/A320/CFM/BER.png differ
diff --git a/Models/Liveries/A320/CFM/BER.xml b/Models/Liveries/A320/CFM/BER.xml
new file mode 100644
index 00000000..ae21b380
--- /dev/null
+++ b/Models/Liveries/A320/CFM/BER.xml
@@ -0,0 +1,16 @@
+
+
+
+
+ Air Berlin
+ Liveries/A320/IAE/BER.png
+
+
+
+
+
+ 1
+
+
+ 0
+
diff --git a/Models/Liveries/A320/CFM/BER2.png b/Models/Liveries/A320/CFM/BER2.png
new file mode 100644
index 00000000..63a05614
Binary files /dev/null and b/Models/Liveries/A320/CFM/BER2.png differ
diff --git a/Models/Liveries/A320/CFM/BER2.xml b/Models/Liveries/A320/CFM/BER2.xml
new file mode 100644
index 00000000..adecf566
--- /dev/null
+++ b/Models/Liveries/A320/CFM/BER2.xml
@@ -0,0 +1,16 @@
+
+
+
+
+ Air Berlin (old)
+ Liveries/A320/IAE/BER2.png
+
+
+
+
+
+ 1
+
+
+ 0
+
diff --git a/Models/Liveries/A320/IAE/CEB.png b/Models/Liveries/A320/CFM/CEB.png
similarity index 100%
rename from Models/Liveries/A320/IAE/CEB.png
rename to Models/Liveries/A320/CFM/CEB.png
diff --git a/Models/Liveries/A320/IAE/CEB.xml b/Models/Liveries/A320/CFM/CEB.xml
similarity index 100%
rename from Models/Liveries/A320/IAE/CEB.xml
rename to Models/Liveries/A320/CFM/CEB.xml
diff --git a/Models/Liveries/A320/IAE/CS-TQG.png b/Models/Liveries/A320/CFM/CS-TQG.png
similarity index 100%
rename from Models/Liveries/A320/IAE/CS-TQG.png
rename to Models/Liveries/A320/CFM/CS-TQG.png
diff --git a/Models/Liveries/A320/IAE/CS-TQG.xml b/Models/Liveries/A320/CFM/CS-TQG.xml
similarity index 100%
rename from Models/Liveries/A320/IAE/CS-TQG.xml
rename to Models/Liveries/A320/CFM/CS-TQG.xml
diff --git a/Models/Liveries/A320/IAE/CSA.png b/Models/Liveries/A320/CFM/CSA.png
similarity index 100%
rename from Models/Liveries/A320/IAE/CSA.png
rename to Models/Liveries/A320/CFM/CSA.png
diff --git a/Models/Liveries/A320/IAE/CSA.xml b/Models/Liveries/A320/CFM/CSA.xml
similarity index 100%
rename from Models/Liveries/A320/IAE/CSA.xml
rename to Models/Liveries/A320/CFM/CSA.xml
diff --git a/Models/Liveries/A320/IAE/CSA_2007.png b/Models/Liveries/A320/CFM/CSA_2007.png
similarity index 100%
rename from Models/Liveries/A320/IAE/CSA_2007.png
rename to Models/Liveries/A320/CFM/CSA_2007.png
diff --git a/Models/Liveries/A320/IAE/CSA_2007.xml b/Models/Liveries/A320/CFM/CSA_2007.xml
similarity index 100%
rename from Models/Liveries/A320/IAE/CSA_2007.xml
rename to Models/Liveries/A320/CFM/CSA_2007.xml
diff --git a/Models/Liveries/A320/CFM/CTV.png b/Models/Liveries/A320/CFM/CTV.png
new file mode 100644
index 00000000..2f0f9682
Binary files /dev/null and b/Models/Liveries/A320/CFM/CTV.png differ
diff --git a/Models/Liveries/A320/CFM/CTV.xml b/Models/Liveries/A320/CFM/CTV.xml
new file mode 100644
index 00000000..a1ec8f56
--- /dev/null
+++ b/Models/Liveries/A320/CFM/CTV.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+ Citilink
+ Liveries/A320/IAE/CTV.png
+
+
+
+
+
+ 1
+
+
+ 0
+
diff --git a/Models/Liveries/A320/CFM/CUB.png b/Models/Liveries/A320/CFM/CUB.png
new file mode 100644
index 00000000..aa94e7a0
Binary files /dev/null and b/Models/Liveries/A320/CFM/CUB.png differ
diff --git a/Models/Liveries/A320/CFM/CUB.xml b/Models/Liveries/A320/CFM/CUB.xml
new file mode 100644
index 00000000..39e6fe4b
--- /dev/null
+++ b/Models/Liveries/A320/CFM/CUB.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+ Cubana de Aviacion (AvEx, LY-VEQ)
+ Liveries/A320/IAE/CUB.png
+
+
+
+
+
+ 0
+
+
+ 0
+
diff --git a/Models/Liveries/A320/IAE/D-AIPE.png b/Models/Liveries/A320/CFM/D-AIPE.png
similarity index 100%
rename from Models/Liveries/A320/IAE/D-AIPE.png
rename to Models/Liveries/A320/CFM/D-AIPE.png
diff --git a/Models/Liveries/A320/IAE/D-AIPE.xml b/Models/Liveries/A320/CFM/D-AIPE.xml
similarity index 100%
rename from Models/Liveries/A320/IAE/D-AIPE.xml
rename to Models/Liveries/A320/CFM/D-AIPE.xml
diff --git a/Models/Liveries/A320/IAE/DLH.png b/Models/Liveries/A320/CFM/DLH.png
similarity index 100%
rename from Models/Liveries/A320/IAE/DLH.png
rename to Models/Liveries/A320/CFM/DLH.png
diff --git a/Models/Liveries/A320/IAE/DLH.xml b/Models/Liveries/A320/CFM/DLH.xml
similarity index 100%
rename from Models/Liveries/A320/IAE/DLH.xml
rename to Models/Liveries/A320/CFM/DLH.xml