diff --git a/Aircraft/c172p/Models/bumpspec-fuselage.eff b/Aircraft/c172p/Models/Effects/bumpspec-fuselage.eff
similarity index 100%
rename from Aircraft/c172p/Models/bumpspec-fuselage.eff
rename to Aircraft/c172p/Models/Effects/bumpspec-fuselage.eff
diff --git a/Aircraft/c172p/Models/bumpspec-tail.eff b/Aircraft/c172p/Models/Effects/bumpspec-tail.eff
similarity index 100%
rename from Aircraft/c172p/Models/bumpspec-tail.eff
rename to Aircraft/c172p/Models/Effects/bumpspec-tail.eff
diff --git a/Aircraft/c172p/Models/bumpspec-wing.eff b/Aircraft/c172p/Models/Effects/bumpspec-wing.eff
similarity index 100%
rename from Aircraft/c172p/Models/bumpspec-wing.eff
rename to Aircraft/c172p/Models/Effects/bumpspec-wing.eff
diff --git a/Aircraft/c172p/Models/Liveries/EI-MCF.xml b/Aircraft/c172p/Models/Liveries/EI-MCF.xml
index 6e48e03a7..06b0f9eb6 100644
--- a/Aircraft/c172p/Models/Liveries/EI-MCF.xml
+++ b/Aircraft/c172p/Models/Liveries/EI-MCF.xml
@@ -3,33 +3,30 @@
 <PropertyList>
   <sim>
     <model>
-     
+	 <livery>
+	  <name type="string">EI-MCF</name>
+	  <index type="int">2</index>
+	  <texture>Liveries/fuselage-eimcf.png</texture>
+	 </livery>
       
-      
-      <livery>
-        <name type="string">EI-MCF</name>
-	 <index type="int">2</index>
-	<texture>Liveries/fuselage.eimcf.png</texture>
-	      </livery>
-      
-       <liverytail>
-	     <name type="string">EI-MCF</name>
-	     <index type="int">2</index>
-	    <texture>Liveries/tail.png</texture>
-	    	    </liverytail>
+	 <liverytail>
+	  <name type="string">EI-MCF</name>
+	  <index type="int">2</index>
+	  <texture>Liveries/tail.png</texture>
+	 </liverytail>
 	    
 	 <liverywing>
-	    <name type="string">EI-MCF</name>
-	     <index type="int">2</index>
-	    <texture>Liveries/wing.png</texture>
-	    	    </liverywing>
+	  <name type="string">EI-MCF</name>
+	  <index type="int">2</index>
+	  <texture>Liveries/wing.png</texture>
+	 </liverywing>
 	    
-	    <c172p>
-	     <immat>false</immat>
+	 <c172p>
+	  <immat>false</immat>
       <fairing1>true</fairing1>
       <fairing2>false</fairing2>
       <fairing3>false</fairing3>
-      </c172p>
+     </c172p>
       
     </model>
   </sim>
diff --git a/Aircraft/c172p/Models/fuselage.eimcf.png b/Aircraft/c172p/Models/Liveries/fuselage-eimcf.png
similarity index 100%
rename from Aircraft/c172p/Models/fuselage.eimcf.png
rename to Aircraft/c172p/Models/Liveries/fuselage-eimcf.png
diff --git a/Aircraft/c172p/Models/Liveries/fuselage.n301dp.png b/Aircraft/c172p/Models/Liveries/fuselage-n301dp.png
similarity index 100%
rename from Aircraft/c172p/Models/Liveries/fuselage.n301dp.png
rename to Aircraft/c172p/Models/Liveries/fuselage-n301dp.png
diff --git a/Aircraft/c172p/Models/c172.14-fuselage.rgb b/Aircraft/c172p/Models/c172.14-fuselage.rgb
deleted file mode 100644
index a8da40225..000000000
Binary files a/Aircraft/c172p/Models/c172.14-fuselage.rgb and /dev/null differ
diff --git a/Aircraft/c172p/Models/c172.15-fuselage.rgb b/Aircraft/c172p/Models/c172.15-fuselage.rgb
deleted file mode 100644
index 50a306a4d..000000000
Binary files a/Aircraft/c172p/Models/c172.15-fuselage.rgb and /dev/null differ
diff --git a/Aircraft/c172p/Models/c172.16-fuselage.rgb b/Aircraft/c172p/Models/c172.16-fuselage.rgb
deleted file mode 100644
index f63bc314b..000000000
Binary files a/Aircraft/c172p/Models/c172.16-fuselage.rgb and /dev/null differ
diff --git a/Aircraft/c172p/Models/c172p-01.png b/Aircraft/c172p/Models/c172p-01.png
new file mode 100644
index 000000000..a5dd6636b
Binary files /dev/null and b/Aircraft/c172p/Models/c172p-01.png differ
diff --git a/Aircraft/c172p/Models/c172p-01.rgb b/Aircraft/c172p/Models/c172p-01.rgb
deleted file mode 100644
index b79aa20da..000000000
Binary files a/Aircraft/c172p/Models/c172p-01.rgb and /dev/null differ
diff --git a/Aircraft/c172p/Models/c172p-02.png b/Aircraft/c172p/Models/c172p-02.png
new file mode 100644
index 000000000..bce9c6303
Binary files /dev/null and b/Aircraft/c172p/Models/c172p-02.png differ
diff --git a/Aircraft/c172p/Models/c172p-02.rgb b/Aircraft/c172p/Models/c172p-02.rgb
deleted file mode 100644
index f4213b53f..000000000
Binary files a/Aircraft/c172p/Models/c172p-02.rgb and /dev/null differ
diff --git a/Aircraft/c172p/Models/c172p-2d-panel.xml b/Aircraft/c172p/Models/c172p-2d-panel.xml
index 161235788..4a2b3dcdf 100644
--- a/Aircraft/c172p/Models/c172p-2d-panel.xml
+++ b/Aircraft/c172p/Models/c172p-2d-panel.xml
@@ -17,7 +17,7 @@ Legacy 2D instruments and actions for the 3D C172P cockpit.
  <instruments>
 
 <!-- labels -->
-  <instrument include="/labels/labelbcn.xml">
+  <instrument include="/Labels/labelbcn.xml">
    <name>labelbcn</name>
    <x>495</x>
    <y>-270</y>
@@ -26,7 +26,7 @@ Legacy 2D instruments and actions for the 3D C172P cockpit.
   </instrument>
 
 <!-- labels -->
-  <instrument include="/labels/labelnav.xml">
+  <instrument include="/Labels/labelnav.xml">
    <name>labelnav</name>
    <x>458</x>
    <y>-270</y>
@@ -35,7 +35,7 @@ Legacy 2D instruments and actions for the 3D C172P cockpit.
   </instrument>
 
 <!-- labels -->
-  <instrument include="/labels/labelpto.xml">
+  <instrument include="/Labels/labelpto.xml">
    <name>labelpto</name>
    <x>422</x>
    <y>-270</y>
@@ -44,7 +44,7 @@ Legacy 2D instruments and actions for the 3D C172P cockpit.
   </instrument>
 
 <!-- labels -->
-  <instrument include="/labels/labelsto.xml">
+  <instrument include="/Labels/Labelsto.xml">
    <name>labelsto</name>
    <x>525</x>
    <y>-270</y>
@@ -53,7 +53,7 @@ Legacy 2D instruments and actions for the 3D C172P cockpit.
   </instrument>
 
 <!-- labels -->
-  <instrument include="/labels/labeltax.xml">
+  <instrument include="/Labels/labeltax.xml">
    <name>labeltax</name>
    <x>493</x>
    <y>-204</y>
@@ -62,7 +62,7 @@ Legacy 2D instruments and actions for the 3D C172P cockpit.
   </instrument>
 
 <!-- labels -->
-  <instrument include="/labels/labellng.xml">
+  <instrument include="/Labels/labellng.xml">
    <name>labellng</name>
    <x>525</x>
    <y>-204</y>
diff --git a/Aircraft/c172p/Models/fuselage.n301dp.png b/Aircraft/c172p/Models/c172p-fuselage-skyhawk.png
similarity index 100%
rename from Aircraft/c172p/Models/fuselage.n301dp.png
rename to Aircraft/c172p/Models/c172p-fuselage-skyhawk.png
diff --git a/Aircraft/c172p/Models/c172p-int-01.png b/Aircraft/c172p/Models/c172p-int-01.png
new file mode 100644
index 000000000..48a52a179
Binary files /dev/null and b/Aircraft/c172p/Models/c172p-int-01.png differ
diff --git a/Aircraft/c172p/Models/c172p-int-01.rgb b/Aircraft/c172p/Models/c172p-int-01.rgb
deleted file mode 100644
index 433d0eecc..000000000
Binary files a/Aircraft/c172p/Models/c172p-int-01.rgb and /dev/null differ
diff --git a/Aircraft/c172p/Models/c172p-int-02.png b/Aircraft/c172p/Models/c172p-int-02.png
new file mode 100644
index 000000000..8495d62e2
Binary files /dev/null and b/Aircraft/c172p/Models/c172p-int-02.png differ
diff --git a/Aircraft/c172p/Models/c172p-int-02.rgb b/Aircraft/c172p/Models/c172p-int-02.rgb
deleted file mode 100644
index e2e65a9d2..000000000
Binary files a/Aircraft/c172p/Models/c172p-int-02.rgb and /dev/null differ
diff --git a/Aircraft/c172p/Models/c172p.ac b/Aircraft/c172p/Models/c172p.ac
index eb59600a4..e2e65b2b7 100644
--- a/Aircraft/c172p/Models/c172p.ac
+++ b/Aircraft/c172p/Models/c172p.ac
@@ -44,7 +44,7 @@ name "BottomLink"
 loc 0.0176049 -0.0188099 0
 data 8
 Mesh.009
-texture "c172p-02.rgb"
+texture "c172p-02.png"
 crease 30.000000
 numvert 4
 -1.048 -0.921304 0.020872
@@ -65,7 +65,7 @@ name "TopLink"
 loc 0.0274526 -0.0318764 0
 data 8
 Mesh.009
-texture "c172p-02.rgb"
+texture "c172p-02.png"
 crease 30.000000
 numvert 4
 -0.881331 -0.859786 0.020872
@@ -6481,7 +6481,7 @@ OBJECT poly
 name "Panel_1"
 data 8
 Mesh.026
-texture "c172p-int-02.rgb"
+texture "c172p-int-02.png"
 crease 80.000000
 numvert 27
 -0.596017 0.059132 0.497091
@@ -21670,7 +21670,7 @@ OBJECT poly
 name "BackSeat"
 data 8
 Mesh.099
-texture "c172p-int-01.rgb"
+texture "c172p-int-01.png"
 crease 30.000000
 numvert 28
 1.0541 -0.62155 -0.460064
@@ -22051,7 +22051,7 @@ OBJECT poly
 name "BeaconSwitch"
 data 16
 RockerSwitch.006
-texture "c172p-int-01.rgb"
+texture "c172p-int-01.png"
 crease 30.000000
 numvert 10
 -0.355953 -0.258566 0.147111
@@ -25546,7 +25546,7 @@ OBJECT poly
 name "CopilotSeat"
 data 13
 FrontSeat.002
-texture "c172p-int-01.rgb"
+texture "c172p-int-01.png"
 crease 30.000000
 numvert 24
 0.324408 -0.59928 -0.432994
@@ -25811,7 +25811,7 @@ OBJECT poly
 name "Exhaust"
 data 8
 Mesh.108
-texture "c172p-02.rgb"
+texture "c172p-02.png"
 crease 30.000000
 numvert 16
 -1.29585 -0.770666 -0.290534
@@ -26519,7 +26519,7 @@ OBJECT poly
 name "LandingLightSwitch"
 data 16
 RockerSwitch.007
-texture "c172p-int-01.rgb"
+texture "c172p-int-01.png"
 crease 30.000000
 numvert 10
 -0.355953 -0.210915 0.122068
@@ -26847,7 +26847,7 @@ OBJECT poly
 name "LeftWheel"
 data 8
 Mesh.013
-texture "c172p-02.rgb"
+texture "c172p-02.png"
 crease 30.000000
 numvert 64
 0.660989 -1.02105 1.09349
@@ -27364,7 +27364,7 @@ OBJECT poly
 name "LeftWheelStrut"
 data 8
 Mesh.014
-texture "fuselage.n301dp.png"
+texture "c172p-fuselage-skyhawk.png"
 crease 30.000000
 numvert 24
 0.764081 -0.650906 0.414912
@@ -30339,7 +30339,7 @@ OBJECT poly
 name "NavLightSwitch"
 data 16
 RockerSwitch.008
-texture "c172p-int-01.rgb"
+texture "c172p-int-01.png"
 crease 30.000000
 numvert 10
 -0.355953 -0.258566 0.17285
@@ -30410,7 +30410,7 @@ OBJECT poly
 name "NoseWheel"
 data 8
 Mesh.003
-texture "c172p-02.rgb"
+texture "c172p-02.png"
 crease 30.000000
 numvert 64
 -1.0174 -1.06218 -0.04389
@@ -30927,7 +30927,7 @@ OBJECT poly
 name "NoseWheelStrut"
 data 8
 Mesh.005
-texture "c172p-02.rgb"
+texture "c172p-02.png"
 crease 30.000000
 numvert 24
 -0.951212 -0.69659 0.025989
@@ -33719,7 +33719,7 @@ OBJECT poly
 name "PilotSeat"
 data 13
 FrontSeat.003
-texture "c172p-int-01.rgb"
+texture "c172p-int-01.png"
 crease 30.000000
 numvert 24
 0.324408 -0.59928 0.05193
@@ -33926,7 +33926,7 @@ OBJECT poly
 name "PitotHeatSwitch"
 data 16
 RockerSwitch.009
-texture "c172p-int-01.rgb"
+texture "c172p-int-01.png"
 crease 30.000000
 numvert 10
 -0.355953 -0.258566 0.198937
@@ -33997,7 +33997,7 @@ OBJECT poly
 name "PitotTube"
 data 8
 Mesh.111
-texture "c172p-02.rgb"
+texture "c172p-02.png"
 crease 30.000000
 numvert 9
 -0.227717 0.464279 1.53536
@@ -35166,7 +35166,7 @@ OBJECT poly
 name "Propeller"
 data 8
 Mesh.102
-texture "c172p-02.rgb"
+texture "c172p-02.png"
 crease 30.000000
 numvert 26
 -1.80489 -0.18863 0.878791
@@ -35401,7 +35401,7 @@ OBJECT poly
 name "Propeller.Fast"
 data 8
 Mesh.136
-texture "c172p-01.rgb"
+texture "c172p-fuselage-skyhawk.png"
 crease 30.000000
 numvert 32
 -1.78664 0.657935 -0.710061
@@ -35622,7 +35622,7 @@ OBJECT poly
 name "Propeller.Slow"
 data 8
 Mesh.137
-texture "c172p-01.rgb"
+texture "c172p-fuselage-skyhawk.png"
 crease 30.000000
 numvert 32
 -1.78664 0.657935 -0.710061
@@ -36100,7 +36100,7 @@ OBJECT poly
 name "RightWheel"
 data 8
 Mesh.070
-texture "c172p-02.rgb"
+texture "c172p-02.png"
 crease 30.000000
 numvert 64
 0.66085 -1.02854 -1.22172
@@ -36617,7 +36617,7 @@ OBJECT poly
 name "RightWheelStrut"
 data 8
 Mesh.004
-texture "fuselage.n301dp.png"
+texture "c172p-fuselage-skyhawk.png"
 crease 30.000000
 numvert 24
 0.576418 -1.10992 -1.08343
@@ -36692,7 +36692,7 @@ OBJECT poly
 name "StrobeSwitch"
 data 16
 RockerSwitch.010
-texture "c172p-int-02.rgb"
+texture "c172p-int-02.png"
 crease 30.000000
 numvert 10
 -0.355953 -0.258566 0.122068
@@ -36763,7 +36763,7 @@ OBJECT poly
 name "TaxiLightSwitch"
 data 16
 RockerSwitch.011
-texture "c172p-int-01.rgb"
+texture "c172p-int-01.png"
 crease 30.000000
 numvert 10
 -0.355953 -0.211263 0.147111
@@ -42563,7 +42563,7 @@ OBJECT poly
 name "baggagedoor"
 data 8
 Mesh.072
-texture "fuselage.n301dp.png"
+texture "c172p-fuselage-skyhawk.png"
 crease 30.000000
 numvert 44
 1.45499 -0.166666 0.478551
@@ -44122,7 +44122,7 @@ OBJECT poly
 name "charniere3"
 data 8
 Mesh.191
-texture "fuselage.n301dp.png"
+texture "c172p-fuselage-skyhawk.png"
 crease 55.000000
 numvert 28
 -0.128478 -0.335913 0.535157
@@ -44317,7 +44317,7 @@ OBJECT poly
 name "charniere4"
 data 8
 Mesh.141
-texture "fuselage.n301dp.png"
+texture "c172p-fuselage-skyhawk.png"
 crease 55.000000
 numvert 28
 -0.128478 -0.335913 -0.535158
@@ -45270,7 +45270,7 @@ OBJECT poly
 name "fairing1"
 data 9
 Plane.019
-texture "fuselage.n301dp.png"
+texture "c172p-fuselage-skyhawk.png"
 crease 30.000000
 numvert 324
 -1.17802 -1.00328 0.034077
@@ -47857,7 +47857,7 @@ OBJECT poly
 name "fairing2"
 data 9
 Plane.021
-texture "fuselage.n301dp.png"
+texture "c172p-fuselage-skyhawk.png"
 crease 30.000000
 numvert 324
 0.444673 -0.918008 1.18589
@@ -50444,7 +50444,7 @@ OBJECT poly
 name "fairing3"
 data 9
 Plane.020
-texture "fuselage.n301dp.png"
+texture "c172p-fuselage-skyhawk.png"
 crease 30.000000
 numvert 324
 0.444673 -0.913253 -1.14083
@@ -53222,7 +53222,7 @@ OBJECT poly
 name "fuselage_1"
 data 8
 Mesh.073
-texture "fuselage.n301dp.png"
+texture "c172p-fuselage-skyhawk.png"
 crease 80.000000
 numvert 1166
 1.73839 0.167172 0
@@ -64254,7 +64254,7 @@ OBJECT poly
 name "leftdoor"
 data 8
 Mesh.074
-texture "fuselage.n301dp.png"
+texture "c172p-fuselage-skyhawk.png"
 crease 30.000000
 numvert 125
 -0.10498 -0.63518 0.50491
@@ -78790,7 +78790,7 @@ OBJECT poly
 name "rightdoor"
 data 8
 Mesh.075
-texture "fuselage.n301dp.png"
+texture "c172p-fuselage-skyhawk.png"
 crease 30.000000
 numvert 125
 -0.10498 -0.63518 -0.504908
diff --git a/Aircraft/c172p/Models/c172p.xml b/Aircraft/c172p/Models/c172p.xml
index 6c5b0e21c..ddc67f296 100644
--- a/Aircraft/c172p/Models/c172p.xml
+++ b/Aircraft/c172p/Models/c172p.xml
@@ -2499,7 +2499,7 @@
    <object-name>LeftWheelStrut</object-name>
    <property-base>sim/model/livery/</property-base>
    <texture-prop>texture</texture-prop>
-   <texture>fuselage.n301dp.png</texture>
+   <texture>fuselage-n301dp.png</texture>
  </animation>
 
  <animation>
@@ -2508,7 +2508,7 @@
    <object-name>fairing1</object-name>
    <property-base>sim/model/livery/</property-base>
    <texture-prop>texture</texture-prop>
-   <texture>fuselage.n301dp.png</texture>
+   <texture>fuselage-n301dp.png</texture>
  </animation>
 
  <animation>
@@ -2517,7 +2517,7 @@
    <object-name>fairing2</object-name>
    <property-base>sim/model/livery/</property-base>
    <texture-prop>texture</texture-prop>
-   <texture>fuselage.n301dp.png</texture>
+   <texture>fuselage-n301dp.png</texture>
  </animation>
 
  <animation>
@@ -2526,7 +2526,7 @@
    <object-name>fairing3</object-name>
    <property-base>sim/model/livery/</property-base>
    <texture-prop>texture</texture-prop>
-   <texture>fuselage.n301dp.png</texture>
+   <texture>fuselage-n301dp.png</texture>
  </animation>
 
  <animation>
@@ -2535,7 +2535,7 @@
    <object-name>fuselage</object-name>
    <property-base>sim/model/livery/</property-base>
    <texture-prop>texture</texture-prop>
-   <texture>fuselage.n301dp.png</texture>
+   <texture>fuselage-n301dp.png</texture>
  </animation>
 
  <animation>
@@ -2547,7 +2547,7 @@
    <object-name>charniere4</object-name>
    <property-base>sim/model/livery/</property-base>
    <texture-prop>texture</texture-prop>
-   <texture>fuselage.n301dp.png</texture>
+   <texture>fuselage-n301dp.png</texture>
  </animation>
 
  <animation>
@@ -2556,7 +2556,7 @@
    <object-name>leftdoor</object-name>
    <property-base>sim/model/livery/</property-base>
    <texture-prop>texture</texture-prop>
-   <texture>fuselage.n301dp.png</texture>
+   <texture>fuselage-n301dp.png</texture>
  </animation>
 
  <animation>
@@ -2565,7 +2565,7 @@
    <object-name>rightdoor</object-name>
    <property-base>sim/model/livery/</property-base>
    <texture-prop>texture</texture-prop>
-   <texture>fuselage.n301dp.png</texture>
+   <texture>fuselage-n301dp.png</texture>
  </animation>
 
  <animation>
@@ -2574,7 +2574,7 @@
    <object-name>baggagedoor</object-name>
    <property-base>sim/model/livery/</property-base>
    <texture-prop>texture</texture-prop>
-   <texture>fuselage.n301dp.png</texture>
+   <texture>fuselage-n301dp.png</texture>
  </animation>
 
  <animation>
diff --git a/Aircraft/c172p/Models/glass_shader.rgb b/Aircraft/c172p/Models/glass_shader.rgb
deleted file mode 100644
index 2e89c032e..000000000
Binary files a/Aircraft/c172p/Models/glass_shader.rgb and /dev/null differ