diff --git a/Models/Liveries/A319/AFR.png b/Models/Liveries/A319/CFM/AFR.png
similarity index 100%
rename from Models/Liveries/A319/AFR.png
rename to Models/Liveries/A319/CFM/AFR.png
diff --git a/Models/Liveries/A319/AFR.xml b/Models/Liveries/A319/CFM/AFR.xml
similarity index 82%
rename from Models/Liveries/A319/AFR.xml
rename to Models/Liveries/A319/CFM/AFR.xml
index d5f4d597..17a7bf75 100644
--- a/Models/Liveries/A319/AFR.xml
+++ b/Models/Liveries/A319/CFM/AFR.xml
@@ -5,7 +5,7 @@
     <model>
         <livery>
             <name type="string">Air France</name>
-            <texture>Liveries/A319/AFR.png</texture>
+            <texture>Liveries/A319/CFM/AFR.png</texture>
         </livery>
     </model>
 </sim>
diff --git a/Models/Liveries/A319/N901FR.png b/Models/Liveries/A319/CFM/N901FR.png
similarity index 100%
rename from Models/Liveries/A319/N901FR.png
rename to Models/Liveries/A319/CFM/N901FR.png
diff --git a/Models/Liveries/A319/N901FR.xml b/Models/Liveries/A319/CFM/N901FR.xml
similarity index 80%
rename from Models/Liveries/A319/N901FR.xml
rename to Models/Liveries/A319/CFM/N901FR.xml
index 494c5fb1..5653b83c 100644
--- a/Models/Liveries/A319/N901FR.xml
+++ b/Models/Liveries/A319/CFM/N901FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Wally the Wolf)</name>
-				<texture>Liveries/A319/N901FR.png</texture>
+				<texture>Liveries/A319/CFM/N901FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N902FR.png b/Models/Liveries/A319/CFM/N902FR.png
similarity index 100%
rename from Models/Liveries/A319/N902FR.png
rename to Models/Liveries/A319/CFM/N902FR.png
diff --git a/Models/Liveries/A319/N902FR.xml b/Models/Liveries/A319/CFM/N902FR.xml
similarity index 80%
rename from Models/Liveries/A319/N902FR.xml
rename to Models/Liveries/A319/CFM/N902FR.xml
index d265f638..109de1a8 100644
--- a/Models/Liveries/A319/N902FR.xml
+++ b/Models/Liveries/A319/CFM/N902FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Woody the Wood Duck)</name>
-				<texture>Liveries/A319/N902FR.png</texture>
+				<texture>Liveries/A319/CFM/N902FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N903FR.png b/Models/Liveries/A319/CFM/N903FR.png
similarity index 100%
rename from Models/Liveries/A319/N903FR.png
rename to Models/Liveries/A319/CFM/N903FR.png
diff --git a/Models/Liveries/A319/N903FR.xml b/Models/Liveries/A319/CFM/N903FR.xml
similarity index 80%
rename from Models/Liveries/A319/N903FR.xml
rename to Models/Liveries/A319/CFM/N903FR.xml
index 7910c5e8..53ae7adf 100644
--- a/Models/Liveries/A319/N903FR.xml
+++ b/Models/Liveries/A319/CFM/N903FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Ozzy the Orca)</name>
-				<texture>Liveries/A319/N903FR.png</texture>
+				<texture>Liveries/A319/CFM/N903FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N904FR.png b/Models/Liveries/A319/CFM/N904FR.png
similarity index 100%
rename from Models/Liveries/A319/N904FR.png
rename to Models/Liveries/A319/CFM/N904FR.png
diff --git a/Models/Liveries/A319/N904FR.xml b/Models/Liveries/A319/CFM/N904FR.xml
similarity index 80%
rename from Models/Liveries/A319/N904FR.xml
rename to Models/Liveries/A319/CFM/N904FR.xml
index 543c8ee7..7c6ceff5 100644
--- a/Models/Liveries/A319/N904FR.xml
+++ b/Models/Liveries/A319/CFM/N904FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Grace the Swan)</name>
-				<texture>Liveries/A319/N904FR.png</texture>
+				<texture>Liveries/A319/CFM/N904FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N905FR.png b/Models/Liveries/A319/CFM/N905FR.png
similarity index 100%
rename from Models/Liveries/A319/N905FR.png
rename to Models/Liveries/A319/CFM/N905FR.png
diff --git a/Models/Liveries/A319/N905FR.xml b/Models/Liveries/A319/CFM/N905FR.xml
similarity index 80%
rename from Models/Liveries/A319/N905FR.xml
rename to Models/Liveries/A319/CFM/N905FR.xml
index 7bc17ace..9cb013b6 100644
--- a/Models/Liveries/A319/N905FR.xml
+++ b/Models/Liveries/A319/CFM/N905FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Sherman the Seal)</name>
-				<texture>Liveries/A319/N905FR.png</texture>
+				<texture>Liveries/A319/CFM/N905FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N906FR.png b/Models/Liveries/A319/CFM/N906FR.png
similarity index 100%
rename from Models/Liveries/A319/N906FR.png
rename to Models/Liveries/A319/CFM/N906FR.png
diff --git a/Models/Liveries/A319/N906FR.xml b/Models/Liveries/A319/CFM/N906FR.xml
similarity index 80%
rename from Models/Liveries/A319/N906FR.xml
rename to Models/Liveries/A319/CFM/N906FR.xml
index c970b81e..0a9af127 100644
--- a/Models/Liveries/A319/N906FR.xml
+++ b/Models/Liveries/A319/CFM/N906FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Andy the Pronghorn)</name>
-				<texture>Liveries/A319/N906FR.png</texture>
+				<texture>Liveries/A319/CFM/N906FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N907FR.png b/Models/Liveries/A319/CFM/N907FR.png
similarity index 100%
rename from Models/Liveries/A319/N907FR.png
rename to Models/Liveries/A319/CFM/N907FR.png
diff --git a/Models/Liveries/A319/N907FR.xml b/Models/Liveries/A319/CFM/N907FR.xml
similarity index 80%
rename from Models/Liveries/A319/N907FR.xml
rename to Models/Liveries/A319/CFM/N907FR.xml
index 2d1cb748..ab6954c8 100644
--- a/Models/Liveries/A319/N907FR.xml
+++ b/Models/Liveries/A319/CFM/N907FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Mel the Mule Deer)</name>
-				<texture>Liveries/A319/N907FR.png</texture>
+				<texture>Liveries/A319/CFM/N907FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N908FR.png b/Models/Liveries/A319/CFM/N908FR.png
similarity index 100%
rename from Models/Liveries/A319/N908FR.png
rename to Models/Liveries/A319/CFM/N908FR.png
diff --git a/Models/Liveries/A319/N908FR.xml b/Models/Liveries/A319/CFM/N908FR.xml
similarity index 80%
rename from Models/Liveries/A319/N908FR.xml
rename to Models/Liveries/A319/CFM/N908FR.xml
index 7e0b3e12..e96e5b7b 100644
--- a/Models/Liveries/A319/N908FR.xml
+++ b/Models/Liveries/A319/CFM/N908FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Polly the Macaw)</name>
-				<texture>Liveries/A319/N908FR.png</texture>
+				<texture>Liveries/A319/CFM/N908FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N909FR.png b/Models/Liveries/A319/CFM/N909FR.png
similarity index 100%
rename from Models/Liveries/A319/N909FR.png
rename to Models/Liveries/A319/CFM/N909FR.png
diff --git a/Models/Liveries/A319/N909FR.xml b/Models/Liveries/A319/CFM/N909FR.xml
similarity index 80%
rename from Models/Liveries/A319/N909FR.xml
rename to Models/Liveries/A319/CFM/N909FR.xml
index fd1022b4..0ad3fdc6 100644
--- a/Models/Liveries/A319/N909FR.xml
+++ b/Models/Liveries/A319/CFM/N909FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Lucy the Canada Goose)</name>
-				<texture>Liveries/A319/N909FR.png</texture>
+				<texture>Liveries/A319/CFM/N909FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N910FR.png b/Models/Liveries/A319/CFM/N910FR.png
similarity index 100%
rename from Models/Liveries/A319/N910FR.png
rename to Models/Liveries/A319/CFM/N910FR.png
diff --git a/Models/Liveries/A319/N910FR.xml b/Models/Liveries/A319/CFM/N910FR.xml
similarity index 80%
rename from Models/Liveries/A319/N910FR.xml
rename to Models/Liveries/A319/CFM/N910FR.xml
index ddce11dd..8ecf1a00 100644
--- a/Models/Liveries/A319/N910FR.xml
+++ b/Models/Liveries/A319/CFM/N910FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Sal the Mountain Lion)</name>
-				<texture>Liveries/A319/N910FR.png</texture>
+				<texture>Liveries/A319/CFM/N910FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N912FR.png b/Models/Liveries/A319/CFM/N912FR.png
similarity index 100%
rename from Models/Liveries/A319/N912FR.png
rename to Models/Liveries/A319/CFM/N912FR.png
diff --git a/Models/Liveries/A319/N912FR.xml b/Models/Liveries/A319/CFM/N912FR.xml
similarity index 80%
rename from Models/Liveries/A319/N912FR.xml
rename to Models/Liveries/A319/CFM/N912FR.xml
index a73450fc..2aba3013 100644
--- a/Models/Liveries/A319/N912FR.xml
+++ b/Models/Liveries/A319/CFM/N912FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Trixie the Red Fox)</name>
-				<texture>Liveries/A319/N912FR.png</texture>
+				<texture>Liveries/A319/CFM/N912FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N913FR.png b/Models/Liveries/A319/CFM/N913FR.png
similarity index 100%
rename from Models/Liveries/A319/N913FR.png
rename to Models/Liveries/A319/CFM/N913FR.png
diff --git a/Models/Liveries/A319/N913FR.xml b/Models/Liveries/A319/CFM/N913FR.xml
similarity index 80%
rename from Models/Liveries/A319/N913FR.xml
rename to Models/Liveries/A319/CFM/N913FR.xml
index deafcffd..7e09cbec 100644
--- a/Models/Liveries/A319/N913FR.xml
+++ b/Models/Liveries/A319/CFM/N913FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Hamilton the Hummingbird)</name>
-				<texture>Liveries/A319/N913FR.png</texture>
+				<texture>Liveries/A319/CFM/N913FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N914FR.png b/Models/Liveries/A319/CFM/N914FR.png
similarity index 100%
rename from Models/Liveries/A319/N914FR.png
rename to Models/Liveries/A319/CFM/N914FR.png
diff --git a/Models/Liveries/A319/N914FR.xml b/Models/Liveries/A319/CFM/N914FR.xml
similarity index 80%
rename from Models/Liveries/A319/N914FR.xml
rename to Models/Liveries/A319/CFM/N914FR.xml
index 9bfaa4b4..27e1ae91 100644
--- a/Models/Liveries/A319/N914FR.xml
+++ b/Models/Liveries/A319/CFM/N914FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Stretch the Egret)</name>
-				<texture>Liveries/A319/N914FR.png</texture>
+				<texture>Liveries/A319/CFM/N914FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N915FR.png b/Models/Liveries/A319/CFM/N915FR.png
similarity index 100%
rename from Models/Liveries/A319/N915FR.png
rename to Models/Liveries/A319/CFM/N915FR.png
diff --git a/Models/Liveries/A319/N915FR.xml b/Models/Liveries/A319/CFM/N915FR.xml
similarity index 80%
rename from Models/Liveries/A319/N915FR.xml
rename to Models/Liveries/A319/CFM/N915FR.xml
index 88e4836f..0dc3715d 100644
--- a/Models/Liveries/A319/N915FR.xml
+++ b/Models/Liveries/A319/CFM/N915FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Sally the Mustang)</name>
-				<texture>Liveries/A319/N915FR.png</texture>
+				<texture>Liveries/A319/CFM/N915FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N916FR.png b/Models/Liveries/A319/CFM/N916FR.png
similarity index 100%
rename from Models/Liveries/A319/N916FR.png
rename to Models/Liveries/A319/CFM/N916FR.png
diff --git a/Models/Liveries/A319/N916FR.xml b/Models/Liveries/A319/CFM/N916FR.xml
similarity index 80%
rename from Models/Liveries/A319/N916FR.xml
rename to Models/Liveries/A319/CFM/N916FR.xml
index 2893f976..2d5199f4 100644
--- a/Models/Liveries/A319/N916FR.xml
+++ b/Models/Liveries/A319/CFM/N916FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (O'Malley the Mallard Duck)</name>
-				<texture>Liveries/A319/N916FR.png</texture>
+				<texture>Liveries/A319/CFM/N916FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N917FR.png b/Models/Liveries/A319/CFM/N917FR.png
similarity index 100%
rename from Models/Liveries/A319/N917FR.png
rename to Models/Liveries/A319/CFM/N917FR.png
diff --git a/Models/Liveries/A319/N917FR.xml b/Models/Liveries/A319/CFM/N917FR.xml
similarity index 80%
rename from Models/Liveries/A319/N917FR.xml
rename to Models/Liveries/A319/CFM/N917FR.xml
index 9e860a74..316d4a8c 100644
--- a/Models/Liveries/A319/N917FR.xml
+++ b/Models/Liveries/A319/CFM/N917FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Doc the Snowy Owl)</name>
-				<texture>Liveries/A319/N917FR.png</texture>
+				<texture>Liveries/A319/CFM/N917FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N918FR.png b/Models/Liveries/A319/CFM/N918FR.png
similarity index 100%
rename from Models/Liveries/A319/N918FR.png
rename to Models/Liveries/A319/CFM/N918FR.png
diff --git a/Models/Liveries/A319/N918FR.xml b/Models/Liveries/A319/CFM/N918FR.xml
similarity index 80%
rename from Models/Liveries/A319/N918FR.xml
rename to Models/Liveries/A319/CFM/N918FR.xml
index a4c07501..b6701b63 100644
--- a/Models/Liveries/A319/N918FR.xml
+++ b/Models/Liveries/A319/CFM/N918FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Jake the Whitetail Deer)</name>
-				<texture>Liveries/A319/N918FR.png</texture>
+				<texture>Liveries/A319/CFM/N918FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N919FR.png b/Models/Liveries/A319/CFM/N919FR.png
similarity index 100%
rename from Models/Liveries/A319/N919FR.png
rename to Models/Liveries/A319/CFM/N919FR.png
diff --git a/Models/Liveries/A319/N919FR.xml b/Models/Liveries/A319/CFM/N919FR.xml
similarity index 80%
rename from Models/Liveries/A319/N919FR.xml
rename to Models/Liveries/A319/CFM/N919FR.xml
index 99e9bcbc..f67560fb 100644
--- a/Models/Liveries/A319/N919FR.xml
+++ b/Models/Liveries/A319/CFM/N919FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Lance the Ocelot)</name>
-				<texture>Liveries/A319/N919FR.png</texture>
+				<texture>Liveries/A319/CFM/N919FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N920FR.png b/Models/Liveries/A319/CFM/N920FR.png
similarity index 100%
rename from Models/Liveries/A319/N920FR.png
rename to Models/Liveries/A319/CFM/N920FR.png
diff --git a/Models/Liveries/A319/N920FR.xml b/Models/Liveries/A319/CFM/N920FR.xml
similarity index 80%
rename from Models/Liveries/A319/N920FR.xml
rename to Models/Liveries/A319/CFM/N920FR.xml
index 9f40e1c6..baceaf60 100644
--- a/Models/Liveries/A319/N920FR.xml
+++ b/Models/Liveries/A319/CFM/N920FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Carl the Coyote)</name>
-				<texture>Liveries/A319/N920FR.png</texture>
+				<texture>Liveries/A319/CFM/N920FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N921FR.png b/Models/Liveries/A319/CFM/N921FR.png
similarity index 100%
rename from Models/Liveries/A319/N921FR.png
rename to Models/Liveries/A319/CFM/N921FR.png
diff --git a/Models/Liveries/A319/N921FR.xml b/Models/Liveries/A319/CFM/N921FR.xml
similarity index 80%
rename from Models/Liveries/A319/N921FR.xml
rename to Models/Liveries/A319/CFM/N921FR.xml
index 8def7367..1fcd9fb0 100644
--- a/Models/Liveries/A319/N921FR.xml
+++ b/Models/Liveries/A319/CFM/N921FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Fritz the Mountain Goat)</name>
-				<texture>Liveries/A319/N921FR.png</texture>
+				<texture>Liveries/A319/CFM/N921FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N922FR.png b/Models/Liveries/A319/CFM/N922FR.png
similarity index 100%
rename from Models/Liveries/A319/N922FR.png
rename to Models/Liveries/A319/CFM/N922FR.png
diff --git a/Models/Liveries/A319/N922FR.xml b/Models/Liveries/A319/CFM/N922FR.xml
similarity index 80%
rename from Models/Liveries/A319/N922FR.xml
rename to Models/Liveries/A319/CFM/N922FR.xml
index 51a532b0..47531afb 100644
--- a/Models/Liveries/A319/N922FR.xml
+++ b/Models/Liveries/A319/CFM/N922FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Foxy the Red Fox)</name>
-				<texture>Liveries/A319/N922FR.png</texture>
+				<texture>Liveries/A319/CFM/N922FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N923FR.png b/Models/Liveries/A319/CFM/N923FR.png
similarity index 100%
rename from Models/Liveries/A319/N923FR.png
rename to Models/Liveries/A319/CFM/N923FR.png
diff --git a/Models/Liveries/A319/N923FR.xml b/Models/Liveries/A319/CFM/N923FR.xml
similarity index 80%
rename from Models/Liveries/A319/N923FR.xml
rename to Models/Liveries/A319/CFM/N923FR.xml
index 8cb04489..910d35b3 100644
--- a/Models/Liveries/A319/N923FR.xml
+++ b/Models/Liveries/A319/CFM/N923FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Rudy the Raccoon)</name>
-				<texture>Liveries/A319/N923FR.png</texture>
+				<texture>Liveries/A319/CFM/N923FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N924FR.png b/Models/Liveries/A319/CFM/N924FR.png
similarity index 100%
rename from Models/Liveries/A319/N924FR.png
rename to Models/Liveries/A319/CFM/N924FR.png
diff --git a/Models/Liveries/A319/N924FR.xml b/Models/Liveries/A319/CFM/N924FR.xml
similarity index 81%
rename from Models/Liveries/A319/N924FR.xml
rename to Models/Liveries/A319/CFM/N924FR.xml
index e657e258..f0fd099c 100644
--- a/Models/Liveries/A319/N924FR.xml
+++ b/Models/Liveries/A319/CFM/N924FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Klondike and Snow the Polar Bear Cubs)</name>
-				<texture>Liveries/A319/N924FR.png</texture>
+				<texture>Liveries/A319/CFM/N924FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N925FR.png b/Models/Liveries/A319/CFM/N925FR.png
similarity index 100%
rename from Models/Liveries/A319/N925FR.png
rename to Models/Liveries/A319/CFM/N925FR.png
diff --git a/Models/Liveries/A319/N925FR.xml b/Models/Liveries/A319/CFM/N925FR.xml
similarity index 80%
rename from Models/Liveries/A319/N925FR.xml
rename to Models/Liveries/A319/CFM/N925FR.xml
index 05c4b820..67186739 100644
--- a/Models/Liveries/A319/N925FR.xml
+++ b/Models/Liveries/A319/CFM/N925FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Dale the Dall's Sheep)</name>
-				<texture>Liveries/A319/N925FR.png</texture>
+				<texture>Liveries/A319/CFM/N925FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N926FR.png b/Models/Liveries/A319/CFM/N926FR.png
similarity index 100%
rename from Models/Liveries/A319/N926FR.png
rename to Models/Liveries/A319/CFM/N926FR.png
diff --git a/Models/Liveries/A319/N926FR.xml b/Models/Liveries/A319/CFM/N926FR.xml
similarity index 80%
rename from Models/Liveries/A319/N926FR.xml
rename to Models/Liveries/A319/CFM/N926FR.xml
index 843a0443..88501c97 100644
--- a/Models/Liveries/A319/N926FR.xml
+++ b/Models/Liveries/A319/CFM/N926FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Domino the Fawn)</name>
-				<texture>Liveries/A319/N926FR.png</texture>
+				<texture>Liveries/A319/CFM/N926FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N927FR.png b/Models/Liveries/A319/CFM/N927FR.png
similarity index 100%
rename from Models/Liveries/A319/N927FR.png
rename to Models/Liveries/A319/CFM/N927FR.png
diff --git a/Models/Liveries/A319/N927FR.xml b/Models/Liveries/A319/CFM/N927FR.xml
similarity index 81%
rename from Models/Liveries/A319/N927FR.xml
rename to Models/Liveries/A319/CFM/N927FR.xml
index 338f7ecf..6e542382 100644
--- a/Models/Liveries/A319/N927FR.xml
+++ b/Models/Liveries/A319/CFM/N927FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Flip the Bottlenose Dolphin)</name>
-				<texture>Liveries/A319/N927FR.png</texture>
+				<texture>Liveries/A319/CFM/N927FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N928FR.png b/Models/Liveries/A319/CFM/N928FR.png
similarity index 100%
rename from Models/Liveries/A319/N928FR.png
rename to Models/Liveries/A319/CFM/N928FR.png
diff --git a/Models/Liveries/A319/N928FR.xml b/Models/Liveries/A319/CFM/N928FR.xml
similarity index 80%
rename from Models/Liveries/A319/N928FR.xml
rename to Models/Liveries/A319/CFM/N928FR.xml
index 6839b041..3c60bc42 100644
--- a/Models/Liveries/A319/N928FR.xml
+++ b/Models/Liveries/A319/CFM/N928FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Hank the Bobcat)</name>
-				<texture>Liveries/A319/N928FR.png</texture>
+				<texture>Liveries/A319/CFM/N928FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N929FR.png b/Models/Liveries/A319/CFM/N929FR.png
similarity index 100%
rename from Models/Liveries/A319/N929FR.png
rename to Models/Liveries/A319/CFM/N929FR.png
diff --git a/Models/Liveries/A319/N929FR.xml b/Models/Liveries/A319/CFM/N929FR.xml
similarity index 80%
rename from Models/Liveries/A319/N929FR.xml
rename to Models/Liveries/A319/CFM/N929FR.xml
index 4049682a..199fccc9 100644
--- a/Models/Liveries/A319/N929FR.xml
+++ b/Models/Liveries/A319/CFM/N929FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Larry the Lynx)</name>
-				<texture>Liveries/A319/N929FR.png</texture>
+				<texture>Liveries/A319/CFM/N929FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N930FR.png b/Models/Liveries/A319/CFM/N930FR.png
similarity index 100%
rename from Models/Liveries/A319/N930FR.png
rename to Models/Liveries/A319/CFM/N930FR.png
diff --git a/Models/Liveries/A319/N930FR.xml b/Models/Liveries/A319/CFM/N930FR.xml
similarity index 80%
rename from Models/Liveries/A319/N930FR.xml
rename to Models/Liveries/A319/CFM/N930FR.xml
index 21bb7dd5..103eef4b 100644
--- a/Models/Liveries/A319/N930FR.xml
+++ b/Models/Liveries/A319/CFM/N930FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Lola and Max the Cougers)</name>
-				<texture>Liveries/A319/N930FR.png</texture>
+				<texture>Liveries/A319/CFM/N930FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N931FR.png b/Models/Liveries/A319/CFM/N931FR.png
similarity index 100%
rename from Models/Liveries/A319/N931FR.png
rename to Models/Liveries/A319/CFM/N931FR.png
diff --git a/Models/Liveries/A319/N931FR.xml b/Models/Liveries/A319/CFM/N931FR.xml
similarity index 80%
rename from Models/Liveries/A319/N931FR.xml
rename to Models/Liveries/A319/CFM/N931FR.xml
index 66b49d07..4a8c6bb7 100644
--- a/Models/Liveries/A319/N931FR.xml
+++ b/Models/Liveries/A319/CFM/N931FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Jo-Jo the Black Bear Cub)</name>
-				<texture>Liveries/A319/N931FR.png</texture>
+				<texture>Liveries/A319/CFM/N931FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N932FR.png b/Models/Liveries/A319/CFM/N932FR.png
similarity index 100%
rename from Models/Liveries/A319/N932FR.png
rename to Models/Liveries/A319/CFM/N932FR.png
diff --git a/Models/Liveries/A319/N932FR.xml b/Models/Liveries/A319/CFM/N932FR.xml
similarity index 80%
rename from Models/Liveries/A319/N932FR.xml
rename to Models/Liveries/A319/CFM/N932FR.xml
index b509157f..fd86c7de 100644
--- a/Models/Liveries/A319/N932FR.xml
+++ b/Models/Liveries/A319/CFM/N932FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Sarge the Bald Eagle)</name>
-				<texture>Liveries/A319/N932FR.png</texture>
+				<texture>Liveries/A319/CFM/N932FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N933FR.png b/Models/Liveries/A319/CFM/N933FR.png
similarity index 100%
rename from Models/Liveries/A319/N933FR.png
rename to Models/Liveries/A319/CFM/N933FR.png
diff --git a/Models/Liveries/A319/N933FR.xml b/Models/Liveries/A319/CFM/N933FR.xml
similarity index 80%
rename from Models/Liveries/A319/N933FR.xml
rename to Models/Liveries/A319/CFM/N933FR.xml
index 15c1baaf..ff543abf 100644
--- a/Models/Liveries/A319/N933FR.xml
+++ b/Models/Liveries/A319/CFM/N933FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Sebastian the Hawk)</name>
-				<texture>Liveries/A319/N933FR.png</texture>
+				<texture>Liveries/A319/CFM/N933FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N934FR.png b/Models/Liveries/A319/CFM/N934FR.png
similarity index 100%
rename from Models/Liveries/A319/N934FR.png
rename to Models/Liveries/A319/CFM/N934FR.png
diff --git a/Models/Liveries/A319/N934FR.xml b/Models/Liveries/A319/CFM/N934FR.xml
similarity index 80%
rename from Models/Liveries/A319/N934FR.xml
rename to Models/Liveries/A319/CFM/N934FR.xml
index 85d3dae8..5c945d58 100644
--- a/Models/Liveries/A319/N934FR.xml
+++ b/Models/Liveries/A319/CFM/N934FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (L.J. the Lynx)</name>
-				<texture>Liveries/A319/N934FR.png</texture>
+				<texture>Liveries/A319/CFM/N934FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N935FR.png b/Models/Liveries/A319/CFM/N935FR.png
similarity index 100%
rename from Models/Liveries/A319/N935FR.png
rename to Models/Liveries/A319/CFM/N935FR.png
diff --git a/Models/Liveries/A319/N935FR.xml b/Models/Liveries/A319/CFM/N935FR.xml
similarity index 80%
rename from Models/Liveries/A319/N935FR.xml
rename to Models/Liveries/A319/CFM/N935FR.xml
index 5f1b47ec..47605198 100644
--- a/Models/Liveries/A319/N935FR.xml
+++ b/Models/Liveries/A319/CFM/N935FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Hector the Sea Otter)</name>
-				<texture>Liveries/A319/N935FR.png</texture>
+				<texture>Liveries/A319/CFM/N935FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N936FR.png b/Models/Liveries/A319/CFM/N936FR.png
similarity index 100%
rename from Models/Liveries/A319/N936FR.png
rename to Models/Liveries/A319/CFM/N936FR.png
diff --git a/Models/Liveries/A319/N936FR.xml b/Models/Liveries/A319/CFM/N936FR.xml
similarity index 80%
rename from Models/Liveries/A319/N936FR.xml
rename to Models/Liveries/A319/CFM/N936FR.xml
index b4b79406..60cdfabd 100644
--- a/Models/Liveries/A319/N936FR.xml
+++ b/Models/Liveries/A319/CFM/N936FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Earl the Walrus)</name>
-				<texture>Liveries/A319/N936FR.png</texture>
+				<texture>Liveries/A319/CFM/N936FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N937FR.png b/Models/Liveries/A319/CFM/N937FR.png
similarity index 100%
rename from Models/Liveries/A319/N937FR.png
rename to Models/Liveries/A319/CFM/N937FR.png
diff --git a/Models/Liveries/A319/N937FR.xml b/Models/Liveries/A319/CFM/N937FR.xml
similarity index 81%
rename from Models/Liveries/A319/N937FR.xml
rename to Models/Liveries/A319/CFM/N937FR.xml
index 7c2525a2..dd668259 100644
--- a/Models/Liveries/A319/N937FR.xml
+++ b/Models/Liveries/A319/CFM/N937FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Carmen the Blue Crowned Conure)</name>
-				<texture>Liveries/A319/N937FR.png</texture>
+				<texture>Liveries/A319/CFM/N937FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N938FR.png b/Models/Liveries/A319/CFM/N938FR.png
similarity index 100%
rename from Models/Liveries/A319/N938FR.png
rename to Models/Liveries/A319/CFM/N938FR.png
diff --git a/Models/Liveries/A319/N938FR.xml b/Models/Liveries/A319/CFM/N938FR.xml
similarity index 80%
rename from Models/Liveries/A319/N938FR.xml
rename to Models/Liveries/A319/CFM/N938FR.xml
index 7885fd8f..354fb514 100644
--- a/Models/Liveries/A319/N938FR.xml
+++ b/Models/Liveries/A319/CFM/N938FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Misty the Arctic Fox)</name>
-				<texture>Liveries/A319/N938FR.png</texture>
+				<texture>Liveries/A319/CFM/N938FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N939FR.png b/Models/Liveries/A319/CFM/N939FR.png
similarity index 100%
rename from Models/Liveries/A319/N939FR.png
rename to Models/Liveries/A319/CFM/N939FR.png
diff --git a/Models/Liveries/A319/N939FR.xml b/Models/Liveries/A319/CFM/N939FR.xml
similarity index 81%
rename from Models/Liveries/A319/N939FR.xml
rename to Models/Liveries/A319/CFM/N939FR.xml
index 1f472872..7faf1711 100644
--- a/Models/Liveries/A319/N939FR.xml
+++ b/Models/Liveries/A319/CFM/N939FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Jim, Joe, Jay and Gary the Emperor Penguins)</name>
-				<texture>Liveries/A319/N939FR.png</texture>
+				<texture>Liveries/A319/CFM/N939FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N940FR.png b/Models/Liveries/A319/CFM/N940FR.png
similarity index 100%
rename from Models/Liveries/A319/N940FR.png
rename to Models/Liveries/A319/CFM/N940FR.png
diff --git a/Models/Liveries/A319/N940FR.xml b/Models/Liveries/A319/CFM/N940FR.xml
similarity index 80%
rename from Models/Liveries/A319/N940FR.xml
rename to Models/Liveries/A319/CFM/N940FR.xml
index 49e8528b..d682991e 100644
--- a/Models/Liveries/A319/N940FR.xml
+++ b/Models/Liveries/A319/CFM/N940FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Jack the Snowshoe Hare)</name>
-				<texture>Liveries/A319/N940FR.png</texture>
+				<texture>Liveries/A319/CFM/N940FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N941FR.png b/Models/Liveries/A319/CFM/N941FR.png
similarity index 100%
rename from Models/Liveries/A319/N941FR.png
rename to Models/Liveries/A319/CFM/N941FR.png
diff --git a/Models/Liveries/A319/N941FR.xml b/Models/Liveries/A319/CFM/N941FR.xml
similarity index 80%
rename from Models/Liveries/A319/N941FR.xml
rename to Models/Liveries/A319/CFM/N941FR.xml
index 94b5dbf8..0c8e2920 100644
--- a/Models/Liveries/A319/N941FR.xml
+++ b/Models/Liveries/A319/CFM/N941FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Lobo the Gray Wolf)</name>
-				<texture>Liveries/A319/N941FR.png</texture>
+				<texture>Liveries/A319/CFM/N941FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N942FR.png b/Models/Liveries/A319/CFM/N942FR.png
similarity index 100%
rename from Models/Liveries/A319/N942FR.png
rename to Models/Liveries/A319/CFM/N942FR.png
diff --git a/Models/Liveries/A319/N942FR.xml b/Models/Liveries/A319/CFM/N942FR.xml
similarity index 80%
rename from Models/Liveries/A319/N942FR.xml
rename to Models/Liveries/A319/CFM/N942FR.xml
index 1f95c7d7..e2bfc405 100644
--- a/Models/Liveries/A319/N942FR.xml
+++ b/Models/Liveries/A319/CFM/N942FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Stanley the Bighorn Sheep)</name>
-				<texture>Liveries/A319/N942FR.png</texture>
+				<texture>Liveries/A319/CFM/N942FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N943FR.png b/Models/Liveries/A319/CFM/N943FR.png
similarity index 100%
rename from Models/Liveries/A319/N943FR.png
rename to Models/Liveries/A319/CFM/N943FR.png
diff --git a/Models/Liveries/A319/N943FR.xml b/Models/Liveries/A319/CFM/N943FR.xml
similarity index 80%
rename from Models/Liveries/A319/N943FR.xml
rename to Models/Liveries/A319/CFM/N943FR.xml
index f7fdaed2..2d530d9c 100644
--- a/Models/Liveries/A319/N943FR.xml
+++ b/Models/Liveries/A319/CFM/N943FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Cloe the Deer Fawn)</name>
-				<texture>Liveries/A319/N943FR.png</texture>
+				<texture>Liveries/A319/CFM/N943FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N944FR.png b/Models/Liveries/A319/CFM/N944FR.png
similarity index 100%
rename from Models/Liveries/A319/N944FR.png
rename to Models/Liveries/A319/CFM/N944FR.png
diff --git a/Models/Liveries/A319/N944FR.xml b/Models/Liveries/A319/CFM/N944FR.xml
similarity index 81%
rename from Models/Liveries/A319/N944FR.xml
rename to Models/Liveries/A319/CFM/N944FR.xml
index c763a635..506f775e 100644
--- a/Models/Liveries/A319/N944FR.xml
+++ b/Models/Liveries/A319/CFM/N944FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Alberta and Clip the Polar Bears)</name>
-				<texture>Liveries/A319/N944FR.png</texture>
+				<texture>Liveries/A319/CFM/N944FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N945FR.png b/Models/Liveries/A319/CFM/N945FR.png
similarity index 100%
rename from Models/Liveries/A319/N945FR.png
rename to Models/Liveries/A319/CFM/N945FR.png
diff --git a/Models/Liveries/A319/N945FR.xml b/Models/Liveries/A319/CFM/N945FR.xml
similarity index 80%
rename from Models/Liveries/A319/N945FR.xml
rename to Models/Liveries/A319/CFM/N945FR.xml
index c18bd6fb..dfc796e6 100644
--- a/Models/Liveries/A319/N945FR.xml
+++ b/Models/Liveries/A319/CFM/N945FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Chocolate the Moose)</name>
-				<texture>Liveries/A319/N945FR.png</texture>
+				<texture>Liveries/A319/CFM/N945FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N946FR.png b/Models/Liveries/A319/CFM/N946FR.png
similarity index 100%
rename from Models/Liveries/A319/N946FR.png
rename to Models/Liveries/A319/CFM/N946FR.png
diff --git a/Models/Liveries/A319/N946FR.xml b/Models/Liveries/A319/CFM/N946FR.xml
similarity index 80%
rename from Models/Liveries/A319/N946FR.xml
rename to Models/Liveries/A319/CFM/N946FR.xml
index 06e61706..3f192455 100644
--- a/Models/Liveries/A319/N946FR.xml
+++ b/Models/Liveries/A319/CFM/N946FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Perry the Puffin)</name>
-				<texture>Liveries/A319/N946FR.png</texture>
+				<texture>Liveries/A319/CFM/N946FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N947FR.png b/Models/Liveries/A319/CFM/N947FR.png
similarity index 100%
rename from Models/Liveries/A319/N947FR.png
rename to Models/Liveries/A319/CFM/N947FR.png
diff --git a/Models/Liveries/A319/N947FR.xml b/Models/Liveries/A319/CFM/N947FR.xml
similarity index 80%
rename from Models/Liveries/A319/N947FR.xml
rename to Models/Liveries/A319/CFM/N947FR.xml
index 72d8cf39..6b980ecd 100644
--- a/Models/Liveries/A319/N947FR.xml
+++ b/Models/Liveries/A319/CFM/N947FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Maya the Jaguar)</name>
-				<texture>Liveries/A319/N947FR.png</texture>
+				<texture>Liveries/A319/CFM/N947FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N948FR.png b/Models/Liveries/A319/CFM/N948FR.png
similarity index 100%
rename from Models/Liveries/A319/N948FR.png
rename to Models/Liveries/A319/CFM/N948FR.png
diff --git a/Models/Liveries/A319/N948FR.xml b/Models/Liveries/A319/CFM/N948FR.xml
similarity index 80%
rename from Models/Liveries/A319/N948FR.xml
rename to Models/Liveries/A319/CFM/N948FR.xml
index 27ce0f5e..ffbb6384 100644
--- a/Models/Liveries/A319/N948FR.xml
+++ b/Models/Liveries/A319/CFM/N948FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Pete the Pelican)</name>
-				<texture>Liveries/A319/N948FR.png</texture>
+				<texture>Liveries/A319/CFM/N948FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N949FR.png b/Models/Liveries/A319/CFM/N949FR.png
similarity index 100%
rename from Models/Liveries/A319/N949FR.png
rename to Models/Liveries/A319/CFM/N949FR.png
diff --git a/Models/Liveries/A319/N949FR.xml b/Models/Liveries/A319/CFM/N949FR.xml
similarity index 80%
rename from Models/Liveries/A319/N949FR.xml
rename to Models/Liveries/A319/CFM/N949FR.xml
index 57231c37..561969f9 100644
--- a/Models/Liveries/A319/N949FR.xml
+++ b/Models/Liveries/A319/CFM/N949FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Erma the White Ermine)</name>
-				<texture>Liveries/A319/N949FR.png</texture>
+				<texture>Liveries/A319/CFM/N949FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N950FR.png b/Models/Liveries/A319/CFM/N950FR.png
similarity index 100%
rename from Models/Liveries/A319/N950FR.png
rename to Models/Liveries/A319/CFM/N950FR.png
diff --git a/Models/Liveries/A319/N950FR.xml b/Models/Liveries/A319/CFM/N950FR.xml
similarity index 80%
rename from Models/Liveries/A319/N950FR.xml
rename to Models/Liveries/A319/CFM/N950FR.xml
index 7ed344d8..c80c1c1b 100644
--- a/Models/Liveries/A319/N950FR.xml
+++ b/Models/Liveries/A319/CFM/N950FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Bob the Dolphin)</name>
-				<texture>Liveries/A319/N950FR.png</texture>
+				<texture>Liveries/A319/CFM/N950FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N951FR.png b/Models/Liveries/A319/CFM/N951FR.png
similarity index 100%
rename from Models/Liveries/A319/N951FR.png
rename to Models/Liveries/A319/CFM/N951FR.png
diff --git a/Models/Liveries/A319/N951FR.xml b/Models/Liveries/A319/CFM/N951FR.xml
similarity index 80%
rename from Models/Liveries/A319/N951FR.xml
rename to Models/Liveries/A319/CFM/N951FR.xml
index 1ddcb26b..4d038fe3 100644
--- a/Models/Liveries/A319/N951FR.xml
+++ b/Models/Liveries/A319/CFM/N951FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Benny the Grizzly Bear)</name>
-				<texture>Liveries/A319/N951FR.png</texture>
+				<texture>Liveries/A319/CFM/N951FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A319/N954FR.png b/Models/Liveries/A319/CFM/N954FR.png
similarity index 100%
rename from Models/Liveries/A319/N954FR.png
rename to Models/Liveries/A319/CFM/N954FR.png
diff --git a/Models/Liveries/A319/N954FR.xml b/Models/Liveries/A319/CFM/N954FR.xml
similarity index 80%
rename from Models/Liveries/A319/N954FR.xml
rename to Models/Liveries/A319/CFM/N954FR.xml
index b031a415..9b52ac01 100644
--- a/Models/Liveries/A319/N954FR.xml
+++ b/Models/Liveries/A319/CFM/N954FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Mickey the Moose)</name>
-				<texture>Liveries/A319/N954FR.png</texture>
+				<texture>Liveries/A319/CFM/N954FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A320/N201FR.png b/Models/Liveries/A320/CFM/N201FR.png
similarity index 100%
rename from Models/Liveries/A320/N201FR.png
rename to Models/Liveries/A320/CFM/N201FR.png
diff --git a/Models/Liveries/A320/N201FR.xml b/Models/Liveries/A320/CFM/N201FR.xml
similarity index 80%
rename from Models/Liveries/A320/N201FR.xml
rename to Models/Liveries/A320/CFM/N201FR.xml
index d7bcc397..a89fda2c 100644
--- a/Models/Liveries/A320/N201FR.xml
+++ b/Models/Liveries/A320/CFM/N201FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Yukon the Caribou)</name>
-				<texture>Liveries/A320/N201FR.png</texture>
+				<texture>Liveries/A320/CFM/N201FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A320/N202FR.png b/Models/Liveries/A320/CFM/N202FR.png
similarity index 100%
rename from Models/Liveries/A320/N202FR.png
rename to Models/Liveries/A320/CFM/N202FR.png
diff --git a/Models/Liveries/A320/N202FR.xml b/Models/Liveries/A320/CFM/N202FR.xml
similarity index 80%
rename from Models/Liveries/A320/N202FR.xml
rename to Models/Liveries/A320/CFM/N202FR.xml
index 7fb9d92a..37fe147d 100644
--- a/Models/Liveries/A320/N202FR.xml
+++ b/Models/Liveries/A320/CFM/N202FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Colorado the Bighorn Sheep)</name>
-				<texture>Liveries/A320/N202FR.png</texture>
+				<texture>Liveries/A320/CFM/N202FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A320/N203FR.png b/Models/Liveries/A320/CFM/N203FR.png
similarity index 100%
rename from Models/Liveries/A320/N203FR.png
rename to Models/Liveries/A320/CFM/N203FR.png
diff --git a/Models/Liveries/A320/N203FR.xml b/Models/Liveries/A320/CFM/N203FR.xml
similarity index 80%
rename from Models/Liveries/A320/N203FR.xml
rename to Models/Liveries/A320/CFM/N203FR.xml
index d744ddd5..dbb58ecf 100644
--- a/Models/Liveries/A320/N203FR.xml
+++ b/Models/Liveries/A320/CFM/N203FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Sally the Mustang)</name>
-				<texture>Liveries/A320/N203FR.png</texture>
+				<texture>Liveries/A320/CFM/N203FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A320/N204FR.png b/Models/Liveries/A320/CFM/N204FR.png
similarity index 100%
rename from Models/Liveries/A320/N204FR.png
rename to Models/Liveries/A320/CFM/N204FR.png
diff --git a/Models/Liveries/A320/N204FR.xml b/Models/Liveries/A320/CFM/N204FR.xml
similarity index 80%
rename from Models/Liveries/A320/N204FR.xml
rename to Models/Liveries/A320/CFM/N204FR.xml
index e033d39c..a248dfaa 100644
--- a/Models/Liveries/A320/N204FR.xml
+++ b/Models/Liveries/A320/CFM/N204FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Freedom the Bald Eagle)</name>
-				<texture>Liveries/A320/N204FR.png</texture>
+				<texture>Liveries/A320/CFM/N204FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A320/N205FR.png b/Models/Liveries/A320/CFM/N205FR.png
similarity index 100%
rename from Models/Liveries/A320/N205FR.png
rename to Models/Liveries/A320/CFM/N205FR.png
diff --git a/Models/Liveries/A320/N205FR.xml b/Models/Liveries/A320/CFM/N205FR.xml
similarity index 79%
rename from Models/Liveries/A320/N205FR.xml
rename to Models/Liveries/A320/CFM/N205FR.xml
index f0a1baa0..a1d0185e 100644
--- a/Models/Liveries/A320/N205FR.xml
+++ b/Models/Liveries/A320/CFM/N205FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Ozzy the Orca)</name>
-				<texture>Liveries/A320/N205FR.png</texture>
+				<texture>Liveries/A320/CFM/N205FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A320/N206FR.png b/Models/Liveries/A320/CFM/N206FR.png
similarity index 100%
rename from Models/Liveries/A320/N206FR.png
rename to Models/Liveries/A320/CFM/N206FR.png
diff --git a/Models/Liveries/A320/N206FR.xml b/Models/Liveries/A320/CFM/N206FR.xml
similarity index 81%
rename from Models/Liveries/A320/N206FR.xml
rename to Models/Liveries/A320/CFM/N206FR.xml
index ff278523..38aa2940 100644
--- a/Models/Liveries/A320/N206FR.xml
+++ b/Models/Liveries/A320/CFM/N206FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Alberta and Clipper the Polar Bears)</name>
-				<texture>Liveries/A320/N206FR.png</texture>
+				<texture>Liveries/A320/CFM/N206FR.png</texture>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A320/N207FR.png b/Models/Liveries/A320/CFM/N207FR.png
similarity index 100%
rename from Models/Liveries/A320/N207FR.png
rename to Models/Liveries/A320/CFM/N207FR.png
diff --git a/Models/Liveries/A320/N207FR.xml b/Models/Liveries/A320/CFM/N207FR.xml
similarity index 80%
rename from Models/Liveries/A320/N207FR.xml
rename to Models/Liveries/A320/CFM/N207FR.xml
index ea35d6d1..932f9c50 100644
--- a/Models/Liveries/A320/N207FR.xml
+++ b/Models/Liveries/A320/CFM/N207FR.xml
@@ -5,7 +5,7 @@
 		<model>
 			<livery>
 				<name>Frontier Airlines (Thunder the Bison)</name>
-				<texture>Liveries/A320/N207FR.png</texture>
+				<texture>Liveries/A320/CFM/N207FR.png</texture>
 			</livery>
 		</model>
 	</sim>