From c63416cf8185a6817fd42c23dcbfb0984a584a8a Mon Sep 17 00:00:00 2001
From: legoboyvdlp R <legoboyvdlp@gmail.com>
Date: Sat, 14 Aug 2021 18:10:37 +0100
Subject: [PATCH] Change livery structure

---
 A320-200-CFM-set.xml                          |   2 +-
 A320-200-IAE-set.xml                          |   2 +-
 A320neo-CFM-set.xml                           |   2 +-
 A320neo-PW-set.xml                            |   2 +-
 Models/A320-200-CFM.xml                       |   6 ++--
 Models/A320-200-IAE.xml                       |   6 ++--
 Models/A320neo-CFM.xml                        |   2 +-
 Models/A320neo-PW.xml                         |   2 +-
 .../Liveries/{A320 => }/CFM-NEO/example.xml   |   4 +--
 .../{A320 => }/CFM/2k/CFM56-white.png         | Bin
 .../Liveries/{A320 => }/CFM/2k/SWR-engine.png | Bin
 .../{A320 => }/CFM/4k/AUA-fuselage.png        | Bin
 .../{A320 => }/CFM/4k/SWR-fuselage.png        | Bin
 Models/Liveries/{A320 => }/CFM/AUA.xml        |   0
 Models/Liveries/{A320 => }/CFM/SWR.xml        |   0
 .../Liveries/{A320 => }/CFM/engine-dirt.png   | Bin
 .../{A320 => }/IAE/2k/IAE-V2500-white.png     | Bin
 .../{A320 => }/IAE/2k/N680AW-engine.png       | Bin
 .../Liveries/{A320 => }/IAE/2k/QTR-engine.png | Bin
 .../Liveries/{A320 => }/IAE/2k/SAS-engine.png | Bin
 .../{A320 => }/IAE/4k/N680AW-fuselage.png     | Bin
 .../{A320 => }/IAE/4k/QTR-fuselage.png        | Bin
 .../{A320 => }/IAE/4k/SAS-fuselage.png        | Bin
 Models/Liveries/{A320 => }/IAE/N680AW.xml     |   0
 Models/Liveries/{A320 => }/IAE/QTR.xml        |   0
 Models/Liveries/{A320 => }/IAE/SAS.xml        |   0
 .../Liveries/{A320 => }/IAE/engine-dirt.png   | Bin
 Models/Liveries/{A320 => }/PW-NEO/example.xml |   4 +--
 Models/Liveries/{A320 => }/fuselage-dirt.png  | Bin
 Nasal/Libraries/libraries.nas                 |  26 +++++++++---------
 30 files changed, 29 insertions(+), 29 deletions(-)
 rename Models/Liveries/{A320 => }/CFM-NEO/example.xml (82%)
 rename Models/Liveries/{A320 => }/CFM/2k/CFM56-white.png (100%)
 rename Models/Liveries/{A320 => }/CFM/2k/SWR-engine.png (100%)
 rename Models/Liveries/{A320 => }/CFM/4k/AUA-fuselage.png (100%)
 rename Models/Liveries/{A320 => }/CFM/4k/SWR-fuselage.png (100%)
 rename Models/Liveries/{A320 => }/CFM/AUA.xml (100%)
 rename Models/Liveries/{A320 => }/CFM/SWR.xml (100%)
 rename Models/Liveries/{A320 => }/CFM/engine-dirt.png (100%)
 rename Models/Liveries/{A320 => }/IAE/2k/IAE-V2500-white.png (100%)
 rename Models/Liveries/{A320 => }/IAE/2k/N680AW-engine.png (100%)
 rename Models/Liveries/{A320 => }/IAE/2k/QTR-engine.png (100%)
 rename Models/Liveries/{A320 => }/IAE/2k/SAS-engine.png (100%)
 rename Models/Liveries/{A320 => }/IAE/4k/N680AW-fuselage.png (100%)
 rename Models/Liveries/{A320 => }/IAE/4k/QTR-fuselage.png (100%)
 rename Models/Liveries/{A320 => }/IAE/4k/SAS-fuselage.png (100%)
 rename Models/Liveries/{A320 => }/IAE/N680AW.xml (100%)
 rename Models/Liveries/{A320 => }/IAE/QTR.xml (100%)
 rename Models/Liveries/{A320 => }/IAE/SAS.xml (100%)
 rename Models/Liveries/{A320 => }/IAE/engine-dirt.png (100%)
 rename Models/Liveries/{A320 => }/PW-NEO/example.xml (86%)
 rename Models/Liveries/{A320 => }/fuselage-dirt.png (100%)

diff --git a/A320-200-CFM-set.xml b/A320-200-CFM-set.xml
index 38b7e567..79e9f394 100644
--- a/A320-200-CFM-set.xml
+++ b/A320-200-CFM-set.xml
@@ -16,7 +16,7 @@
 				<texture-fuselage>SWR-fuselage.png</texture-fuselage>
 				<texture-engine>SWR-engine.png</texture-engine>
 			</livery>
-			<livery-dir type="string">Aircraft/A320-family/Models/Liveries/A320/CFM</livery-dir>
+			<livery-dir type="string">Aircraft/A320-family/Models/Liveries//CFM</livery-dir>
 		</model>
 		
 		<sound>
diff --git a/A320-200-IAE-set.xml b/A320-200-IAE-set.xml
index e227b533..1b38894b 100644
--- a/A320-200-IAE-set.xml
+++ b/A320-200-IAE-set.xml
@@ -16,7 +16,7 @@
 				<texture-fuselage>SAS-fuselage.png</texture-fuselage>
 				<texture-engine>SAS-engine.png</texture-engine>
 			</livery>
-			<livery-dir type="string">Aircraft/A320-family/Models/Liveries/A320/IAE</livery-dir>
+			<livery-dir type="string">Aircraft/A320-family/Models/Liveries//IAE</livery-dir>
 		</model>
 		
 		<sound>
diff --git a/A320neo-CFM-set.xml b/A320neo-CFM-set.xml
index b46ea2b2..b300b2c4 100644
--- a/A320neo-CFM-set.xml
+++ b/A320neo-CFM-set.xml
@@ -14,7 +14,7 @@
 			<livery>
 				<file>Airbus</file>
 			</livery>
-			<livery-dir type="string">Aircraft/A320-family/Models/Liveries/A320/CFM-NEO</livery-dir>
+			<livery-dir type="string">Aircraft/A320-family/Models/Liveries//CFM-NEO</livery-dir>
 		</model>
 		
 		<sound>
diff --git a/A320neo-PW-set.xml b/A320neo-PW-set.xml
index 791b1637..1ac8a626 100644
--- a/A320neo-PW-set.xml
+++ b/A320neo-PW-set.xml
@@ -14,7 +14,7 @@
 			<livery>
 				<file>Airbus</file>
 			</livery>
-			<livery-dir type="string">Aircraft/A320-family/Models/Liveries/A320/PW-NEO</livery-dir>
+			<livery-dir type="string">Aircraft/A320-family/Models/Liveries//PW-NEO</livery-dir>
 		</model>
 		
 		<sound>
diff --git a/Models/A320-200-CFM.xml b/Models/A320-200-CFM.xml
index c035c3dc..43148fa3 100644
--- a/Models/A320-200-CFM.xml
+++ b/Models/A320-200-CFM.xml
@@ -28,12 +28,12 @@
 	<!-- Nasal code -->
 	<nasal>
 		<load><![CDATA[
-			var livery_update = aircraft.canvas_livery_update.init("Models/Liveries/A320/CFM", _module_id);
+			var livery_update = aircraft.canvas_livery_update.init("Models/Liveries//CFM", _module_id);
 			var elements = ["AileronL","AileronR","Antenna1","Antenna2","ApuFlap","AvionicsVentDoor","Cargo1","Cargo2","Cargo3","DoorL1","DoorL4","DoorR1","DoorR4","ElevatorL","ElevatorR","EngineFairingL","EngineFairingR","FairingL1","FairingL2","FairingL3","FairingR1","FairingR2","FairingR3","FlapL1","FlapL2","FlapR1","FlapR2","Fuselage","GPUServiceDoor","Hstabs","MLGGearDoorL","MLGGearDoorR","MLGWingDoorL1","MLGWingDoorL2","MLGWingDoorR1","MLGWingDoorR2","NLGAftDoorL","NLGAftDoorR","NLGFittingPanel","NLGForewardDoorL","NLGForewardDoorR","OutflowValveDoor1","OutflowValveDoor2","RatDoorL","RatDoorR","Rudder","Sharklet","SlatL1","SlatL2","SlatR1","SlatR2","SpoilerL1","SpoilerL2","SpoilerL3","SpoilerL4","SpoilerL5","SpoilerR1","SpoilerR2","SpoilerR3","SpoilerR4","SpoilerR5","Wings","WingtipFence"];
-			livery_update.createTarget("fuselage", elements, "sim/model/livery/texture-fuselage", "Aircraft/A320-family/Models/Liveries/A320/CFM/4k/SWR-fuselage.png", resolution=8192);
+			livery_update.createTarget("fuselage", elements, "sim/model/livery/texture-fuselage", "Aircraft/A320-family/Models/Liveries//CFM/4k/SWR-fuselage.png", resolution=8192);
 
 			elements = ["EngineCFM56L","EngineCFM56R","ReverserLDoor1","ReverserLDoor2","ReverserLDoor3","ReverserLDoor4","ReverserRDoor1","ReverserRDoor2","ReverserRDoor3","ReverserRDoor4","PylonCFM56L","PylonCFM56R","IntakeCFM56L","IntakeCFM56R"];
-			livery_update.createTarget("engines", elements, "sim/model/livery/texture-engine", "Aircraft/A320-family/Models/Liveries/A320/CFM/2k/SWR-engine.png");
+			livery_update.createTarget("engines", elements, "sim/model/livery/texture-engine", "Aircraft/A320-family/Models/Liveries//CFM/2k/SWR-engine.png");
 		]]></load>
 		<unload>
 			livery_update.stop();
diff --git a/Models/A320-200-IAE.xml b/Models/A320-200-IAE.xml
index 8821af9a..3eccea09 100644
--- a/Models/A320-200-IAE.xml
+++ b/Models/A320-200-IAE.xml
@@ -27,12 +27,12 @@
 	<!-- Nasal code -->
 	<nasal>
 		<load><![CDATA[
-			var livery_update = aircraft.canvas_livery_update.init("Models/Liveries/A320/IAE", _module_id);
+			var livery_update = aircraft.canvas_livery_update.init("Models/Liveries//IAE", _module_id);
 			var elements = ["AileronL","AileronR","Antenna1","Antenna2","ApuFlap","AvionicsVentDoor","Cargo1","Cargo2","Cargo3","DoorL1","DoorL4","DoorR1","DoorR4","ElevatorL","ElevatorR","EngineFairingL","EngineFairingR","FairingL1","FairingL2","FairingL3","FairingR1","FairingR2","FairingR3","FlapL1","FlapL2","FlapR1","FlapR2","Fuselage","GPUServiceDoor","Hstabs","MLGGearDoorL","MLGGearDoorR","MLGWingDoorL1","MLGWingDoorL2","MLGWingDoorR1","MLGWingDoorR2","NLGAftDoorL","NLGAftDoorR","NLGFittingPanel","NLGForewardDoorL","NLGForewardDoorR","OutflowValveDoor1","OutflowValveDoor2","RatDoorL","RatDoorR","Rudder","Sharklet","SlatL1","SlatL2","SlatR1","SlatR2","SpoilerL1","SpoilerL2","SpoilerL3","SpoilerL4","SpoilerL5","SpoilerR1","SpoilerR2","SpoilerR3","SpoilerR4","SpoilerR5","Wings","WingtipFence"];
-			livery_update.createTarget("fuselage", elements, "sim/model/livery/texture-fuselage", "Aircraft/A320-family/Models/Liveries/A320/IAE/4k/QTR-fuselage.png", resolution=8192);
+			livery_update.createTarget("fuselage", elements, "sim/model/livery/texture-fuselage", "Aircraft/A320-family/Models/Liveries//IAE/4k/QTR-fuselage.png", resolution=8192);
 
 			elements = ["EngineIAEV2500L","EngineIAEV2500R","ReverserLDoor","ReverserRDoor","PylonIAEV2500L","PylonIAEV2500R","IntakeIAEV2500L","IntakeIAEV2500R"];
-			livery_update.createTarget("engines", elements, "sim/model/livery/texture-engine", "Aircraft/A320-family/Models/Liveries/A320/IAE/2k/QTR-engine.png");
+			livery_update.createTarget("engines", elements, "sim/model/livery/texture-engine", "Aircraft/A320-family/Models/Liveries//IAE/2k/QTR-engine.png");
 		]]></load>
 		<unload>
 			livery_update.stop();
diff --git a/Models/A320neo-CFM.xml b/Models/A320neo-CFM.xml
index 06c1f42c..8c6b0ea0 100644
--- a/Models/A320neo-CFM.xml
+++ b/Models/A320neo-CFM.xml
@@ -19,7 +19,7 @@
 	<!-- Nasal code -->
 	<nasal>
 		<load><![CDATA[
-			var livery_update = aircraft.canvas_livery_update.init("Models/Liveries/A320/CFM-NEO", _module_id);
+			var livery_update = aircraft.canvas_livery_update.init("Models/Liveries//CFM-NEO", _module_id);
 			var elements = ["AileronL","AileronR","Antenna1","Antenna2","ApuFlap","AvionicsVentDoor","Cargo1","Cargo2","Cargo3","DoorL1","DoorL4","DoorR1","DoorR4","ElevatorL","ElevatorR","EngineFairingL","EngineFairingR","FairingL1","FairingL2","FairingL3","FairingR1","FairingR2","FairingR3","FlapL1","FlapL2","FlapR1","FlapR2","Fuselage","GPUServiceDoor","Hstabs","MLGGearDoorL","MLGGearDoorR","MLGWingDoorL1","MLGWingDoorL2","MLGWingDoorR1","MLGWingDoorR2","NLGAftDoorL","NLGAftDoorR","NLGFittingPanel","NLGForewardDoorL","NLGForewardDoorR","OutflowValveDoor1","OutflowValveDoor2","RatDoorL","RatDoorR","Rudder","Sharklet","SlatL1","SlatL2","SlatR1","SlatR2","SpoilerL1","SpoilerL2","SpoilerL3","SpoilerL4","SpoilerL5","SpoilerR1","SpoilerR2","SpoilerR3","SpoilerR4","SpoilerR5","Wings","WingtipFence"];
 			livery_update.createTarget("fuselage", elements, "sim/model/livery/texture-fuselage", resolution=8192);
 
diff --git a/Models/A320neo-PW.xml b/Models/A320neo-PW.xml
index bfd251d5..e3f2c2dd 100644
--- a/Models/A320neo-PW.xml
+++ b/Models/A320neo-PW.xml
@@ -19,7 +19,7 @@
 	<!-- Nasal code -->
 	<nasal>
 		<load><![CDATA[
-			var livery_update = aircraft.canvas_livery_update.init("Models/Liveries/A320/PW-NEO", _module_id);
+			var livery_update = aircraft.canvas_livery_update.init("Models/Liveries//PW-NEO", _module_id);
 			var elements = ["AileronL","AileronR","Antenna1","Antenna2","ApuFlap","AvionicsVentDoor","Cargo1","Cargo2","Cargo3","DoorL1","DoorL4","DoorR1","DoorR4","ElevatorL","ElevatorR","EngineFairingL","EngineFairingR","FairingL1","FairingL2","FairingL3","FairingR1","FairingR2","FairingR3","FlapL1","FlapL2","FlapR1","FlapR2","Fuselage","GPUServiceDoor","Hstabs","MLGGearDoorL","MLGGearDoorR","MLGWingDoorL1","MLGWingDoorL2","MLGWingDoorR1","MLGWingDoorR2","NLGAftDoorL","NLGAftDoorR","NLGFittingPanel","NLGForewardDoorL","NLGForewardDoorR","OutflowValveDoor1","OutflowValveDoor2","RatDoorL","RatDoorR","Rudder","Sharklet","SlatL1","SlatL2","SlatR1","SlatR2","SpoilerL1","SpoilerL2","SpoilerL3","SpoilerL4","SpoilerL5","SpoilerR1","SpoilerR2","SpoilerR3","SpoilerR4","SpoilerR5","Wings","WingtipFence"];
 			livery_update.createTarget("fuselage", elements, "sim/model/livery/texture-fuselage", resolution=8192);
 
diff --git a/Models/Liveries/A320/CFM-NEO/example.xml b/Models/Liveries/CFM-NEO/example.xml
similarity index 82%
rename from Models/Liveries/A320/CFM-NEO/example.xml
rename to Models/Liveries/CFM-NEO/example.xml
index 779ad6bd..1f48d5d4 100644
--- a/Models/Liveries/A320/CFM-NEO/example.xml
+++ b/Models/Liveries/CFM-NEO/example.xml
@@ -5,8 +5,8 @@
 		<model>
 			<livery>
 				<name>ICAO Airline Name (Extra Info)</name>
-				<texture-fuselage>Aircraft/A320-family/Models/Liveries/A320/CFM/texture.png</texture-fuselage>
-				<texture-engine>Aircraft/A320-family/Models/Liveries/A320/CFM/texture.png</texture-engine>
+				<texture-fuselage>Aircraft/A320-family/Models/Liveries//CFM/texture.png</texture-fuselage>
+				<texture-engine>Aircraft/A320-family/Models/Liveries//CFM/texture.png</texture-engine>
 				<logo>logo.png</logo>
 			</livery>
 		</model>
diff --git a/Models/Liveries/A320/CFM/2k/CFM56-white.png b/Models/Liveries/CFM/2k/CFM56-white.png
similarity index 100%
rename from Models/Liveries/A320/CFM/2k/CFM56-white.png
rename to Models/Liveries/CFM/2k/CFM56-white.png
diff --git a/Models/Liveries/A320/CFM/2k/SWR-engine.png b/Models/Liveries/CFM/2k/SWR-engine.png
similarity index 100%
rename from Models/Liveries/A320/CFM/2k/SWR-engine.png
rename to Models/Liveries/CFM/2k/SWR-engine.png
diff --git a/Models/Liveries/A320/CFM/4k/AUA-fuselage.png b/Models/Liveries/CFM/4k/AUA-fuselage.png
similarity index 100%
rename from Models/Liveries/A320/CFM/4k/AUA-fuselage.png
rename to Models/Liveries/CFM/4k/AUA-fuselage.png
diff --git a/Models/Liveries/A320/CFM/4k/SWR-fuselage.png b/Models/Liveries/CFM/4k/SWR-fuselage.png
similarity index 100%
rename from Models/Liveries/A320/CFM/4k/SWR-fuselage.png
rename to Models/Liveries/CFM/4k/SWR-fuselage.png
diff --git a/Models/Liveries/A320/CFM/AUA.xml b/Models/Liveries/CFM/AUA.xml
similarity index 100%
rename from Models/Liveries/A320/CFM/AUA.xml
rename to Models/Liveries/CFM/AUA.xml
diff --git a/Models/Liveries/A320/CFM/SWR.xml b/Models/Liveries/CFM/SWR.xml
similarity index 100%
rename from Models/Liveries/A320/CFM/SWR.xml
rename to Models/Liveries/CFM/SWR.xml
diff --git a/Models/Liveries/A320/CFM/engine-dirt.png b/Models/Liveries/CFM/engine-dirt.png
similarity index 100%
rename from Models/Liveries/A320/CFM/engine-dirt.png
rename to Models/Liveries/CFM/engine-dirt.png
diff --git a/Models/Liveries/A320/IAE/2k/IAE-V2500-white.png b/Models/Liveries/IAE/2k/IAE-V2500-white.png
similarity index 100%
rename from Models/Liveries/A320/IAE/2k/IAE-V2500-white.png
rename to Models/Liveries/IAE/2k/IAE-V2500-white.png
diff --git a/Models/Liveries/A320/IAE/2k/N680AW-engine.png b/Models/Liveries/IAE/2k/N680AW-engine.png
similarity index 100%
rename from Models/Liveries/A320/IAE/2k/N680AW-engine.png
rename to Models/Liveries/IAE/2k/N680AW-engine.png
diff --git a/Models/Liveries/A320/IAE/2k/QTR-engine.png b/Models/Liveries/IAE/2k/QTR-engine.png
similarity index 100%
rename from Models/Liveries/A320/IAE/2k/QTR-engine.png
rename to Models/Liveries/IAE/2k/QTR-engine.png
diff --git a/Models/Liveries/A320/IAE/2k/SAS-engine.png b/Models/Liveries/IAE/2k/SAS-engine.png
similarity index 100%
rename from Models/Liveries/A320/IAE/2k/SAS-engine.png
rename to Models/Liveries/IAE/2k/SAS-engine.png
diff --git a/Models/Liveries/A320/IAE/4k/N680AW-fuselage.png b/Models/Liveries/IAE/4k/N680AW-fuselage.png
similarity index 100%
rename from Models/Liveries/A320/IAE/4k/N680AW-fuselage.png
rename to Models/Liveries/IAE/4k/N680AW-fuselage.png
diff --git a/Models/Liveries/A320/IAE/4k/QTR-fuselage.png b/Models/Liveries/IAE/4k/QTR-fuselage.png
similarity index 100%
rename from Models/Liveries/A320/IAE/4k/QTR-fuselage.png
rename to Models/Liveries/IAE/4k/QTR-fuselage.png
diff --git a/Models/Liveries/A320/IAE/4k/SAS-fuselage.png b/Models/Liveries/IAE/4k/SAS-fuselage.png
similarity index 100%
rename from Models/Liveries/A320/IAE/4k/SAS-fuselage.png
rename to Models/Liveries/IAE/4k/SAS-fuselage.png
diff --git a/Models/Liveries/A320/IAE/N680AW.xml b/Models/Liveries/IAE/N680AW.xml
similarity index 100%
rename from Models/Liveries/A320/IAE/N680AW.xml
rename to Models/Liveries/IAE/N680AW.xml
diff --git a/Models/Liveries/A320/IAE/QTR.xml b/Models/Liveries/IAE/QTR.xml
similarity index 100%
rename from Models/Liveries/A320/IAE/QTR.xml
rename to Models/Liveries/IAE/QTR.xml
diff --git a/Models/Liveries/A320/IAE/SAS.xml b/Models/Liveries/IAE/SAS.xml
similarity index 100%
rename from Models/Liveries/A320/IAE/SAS.xml
rename to Models/Liveries/IAE/SAS.xml
diff --git a/Models/Liveries/A320/IAE/engine-dirt.png b/Models/Liveries/IAE/engine-dirt.png
similarity index 100%
rename from Models/Liveries/A320/IAE/engine-dirt.png
rename to Models/Liveries/IAE/engine-dirt.png
diff --git a/Models/Liveries/A320/PW-NEO/example.xml b/Models/Liveries/PW-NEO/example.xml
similarity index 86%
rename from Models/Liveries/A320/PW-NEO/example.xml
rename to Models/Liveries/PW-NEO/example.xml
index 6e12cadc..4aaa903c 100644
--- a/Models/Liveries/A320/PW-NEO/example.xml
+++ b/Models/Liveries/PW-NEO/example.xml
@@ -5,8 +5,8 @@
 		<model>
 			<livery>
 				<name>ICAO Airline Name (Extra Info)</name>
-				<texture-fuselage>Liveries/A320/CFM/texture.png</texture-fuselage>
-				<texture-engine>Liveries/A320/CFM/texture.png</texture-engine>
+				<texture-fuselage>Liveries//CFM/texture.png</texture-fuselage>
+				<texture-engine>Liveries//CFM/texture.png</texture-engine>
 			</livery>
 		</model>
 	</sim>
diff --git a/Models/Liveries/A320/fuselage-dirt.png b/Models/Liveries/fuselage-dirt.png
similarity index 100%
rename from Models/Liveries/A320/fuselage-dirt.png
rename to Models/Liveries/fuselage-dirt.png
diff --git a/Nasal/Libraries/libraries.nas b/Nasal/Libraries/libraries.nas
index cfa1fe06..ad07473b 100644
--- a/Nasal/Libraries/libraries.nas
+++ b/Nasal/Libraries/libraries.nas
@@ -39,32 +39,32 @@ aircraft.rain.init();
 var aero = getprop("/sim/aero");
 var defaultFuseLiv = "";
 if (aero == "A320-200-CFM") {
-	var livery = aircraft.canvas_livery.init("Models/Liveries/A320/CFM");
+	var livery = aircraft.canvas_livery.init("Models/Liveries/CFM");
 	elements = ["EngineCFM56L","EngineCFM56R","ReverserLDoor1","ReverserLDoor2","ReverserLDoor3","ReverserLDoor4","ReverserRDoor1","ReverserRDoor2","ReverserRDoor3","ReverserRDoor4","PylonCFM56L","PylonCFM56R","IntakeCFM56L","IntakeCFM56R"];
-	livery.createTarget("engines", elements, "sim/model/livery/texture-engine", "Aircraft/A320-family/Models/Liveries/A320/CFM/2k/SWR-engine.png");
-	livery.addLayer("engines", "dirt", "Aircraft/A320-family/Models/Liveries/A320/CFM/engine-dirt.png");
-	defaultFuseLiv = "Aircraft/A320-family/Models/Liveries/A320/CFM/4k/SWR-fuselage.png";
+	livery.createTarget("engines", elements, "sim/model/livery/texture-engine", "Aircraft/A320-family/Models/Liveries/CFM/2k/SWR-engine.png");
+	livery.addLayer("engines", "dirt", "Aircraft/A320-family/Models/Liveries/CFM/engine-dirt.png");
+	defaultFuseLiv = "Aircraft/A320-family/Models/Liveries/CFM/4k/SWR-fuselage.png";
 } else if (aero == "A320-200-IAE") {
-	var livery = aircraft.canvas_livery.init("Models/Liveries/A320/IAE");
+	var livery = aircraft.canvas_livery.init("Models/Liveries/IAE");
 	elements = ["EngineIAEV2500L","EngineIAEV2500R","ReverserLDoor","ReverserRDoor","PylonIAEV2500L","PylonIAEV2500R","IntakeIAEV2500L","IntakeIAEV2500R"];
-	livery.createTarget("engines", elements, "sim/model/livery/texture-engine", "Aircraft/A320-family/Models/Liveries/A320/IAE/2k/QTR-engine.png");
-	livery.addLayer("engines", "dirt", "Aircraft/A320-family/Models/Liveries/A320/IAE/engine-dirt.png");
-	defaultFuseLiv = "Aircraft/A320-family/Models/Liveries/A320/IAE/4k/QTR-fuselage.png";
+	livery.createTarget("engines", elements, "sim/model/livery/texture-engine", "Aircraft/A320-family/Models/Liveries/IAE/2k/QTR-engine.png");
+	livery.addLayer("engines", "dirt", "Aircraft/A320-family/Models/Liveries/IAE/engine-dirt.png");
+	defaultFuseLiv = "Aircraft/A320-family/Models/Liveries/IAE/4k/QTR-fuselage.png";
 } else if (aero == "A320neo-CFM") {
-	var livery = aircraft.canvas_livery.init("Models/Liveries/A320/CFM-NEO");
+	var livery = aircraft.canvas_livery.init("Models/Liveries/CFM-NEO");
 	elements = ["EngineLEAPL", "EngineLEAPL.007", "EngineLEAPL.Inner", "EngineLEAPR", "EngineLEAPR.Inner", "Exhaust2LEAPL", "Exhaust2LEAPR", "Exhaust3LEAPL", "Exhaust3LEAPR", "IntakeLEAPL", "IntakeLEAPR", "PylonLEAPL", "PylonLEAPR", "ReverserLDoorLEAP", "ReverserRDoorLEAP"];
 	livery.createTarget("engines", elements, "sim/model/livery/texture-engine");
-#	livery.addLayer("engines", "dirt", "Aircraft/A320-family/Models/Liveries/A320/CFM-NEO/engine-dirt.png");
+#	livery.addLayer("engines", "dirt", "Aircraft/A320-family/Models/Liveries/CFM-NEO/engine-dirt.png");
 } else if (aero == "A320neo-PW") {
-	var livery = aircraft.canvas_livery.init("Models/Liveries/A320/PW-NEO");
+	var livery = aircraft.canvas_livery.init("Models/Liveries/PW-NEO");
 	elements = ["EnginePWPP", "EnginePWPPL.Inner", "EnginePWPPR", "EnginePWPPR.Inner", "Exhaust3PWPPL", "Exhaust3PWPPR", "Exxhaust2PWPPL", "Exxhaust2PWPPR", "IntakePWPPL", "IntakePWPPR", "PylonPWPPL", "PylonPWPPR", "ReverserLDoorLPWPP", "ReverserLDoorRPWPP"];
 	livery.createTarget("engines", elements, "sim/model/livery/texture-engine");
-#	livery.addLayer("engines", "dirt", "Aircraft/A320-family/Models/Liveries/A320/PW-NEO/engine-dirt.png");
+#	livery.addLayer("engines", "dirt", "Aircraft/A320-family/Models/Liveries/PW-NEO/engine-dirt.png");
 }
 
 var elements = ["AileronL","AileronR","Antenna1","Antenna2","ApuFlap","AvionicsVentDoor","Cargo1","Cargo2","Cargo3","DoorL1","DoorL4","DoorR1","DoorR4","ElevatorL","ElevatorR","EngineFairingL","EngineFairingR","FairingL1","FairingL2","FairingL3","FairingR1","FairingR2","FairingR3","FlapL1","FlapL2","FlapR1","FlapR2","Fuselage","GPUServiceDoor","Hstabs","MLGGearDoorL","MLGGearDoorR","MLGWingDoorL1","MLGWingDoorL2","MLGWingDoorR1","MLGWingDoorR2","NLGAftDoorL","NLGAftDoorR","NLGFittingPanel","NLGForewardDoorL","NLGForewardDoorR","OutflowValveDoor1","OutflowValveDoor2","RatDoorL","RatDoorR","Rudder","Sharklet","SlatL1","SlatL2","SlatR1","SlatR2","SpoilerL1","SpoilerL2","SpoilerL3","SpoilerL4","SpoilerL5","SpoilerR1","SpoilerR2","SpoilerR3","SpoilerR4","SpoilerR5","Wings","WingtipFence"];
 livery.createTarget("fuselage", elements, "sim/model/livery/texture-fuselage", defaultFuseLiv, resolution=16384);
-livery.addLayer("fuselage", "dirt", "Aircraft/A320-family/Models/Liveries/A320/fuselage-dirt.png");
+livery.addLayer("fuselage", "dirt", "Aircraft/A320-family/Models/Liveries/fuselage-dirt.png");
 
 #########
 # Doors #