diff --git a/gfx/OLD/460f.png b/gfx/Archive/460f.png
similarity index 100%
rename from gfx/OLD/460f.png
rename to gfx/Archive/460f.png
diff --git a/gfx/OLD/BR170a.png b/gfx/Archive/BR170a.png
similarity index 100%
rename from gfx/OLD/BR170a.png
rename to gfx/Archive/BR170a.png
diff --git a/gfx/OLD/BR170b.png b/gfx/Archive/BR170b.png
similarity index 100%
rename from gfx/OLD/BR170b.png
rename to gfx/Archive/BR170b.png
diff --git a/gfx/OLD/BR170c.png b/gfx/Archive/BR170c.png
similarity index 100%
rename from gfx/OLD/BR170c.png
rename to gfx/Archive/BR170c.png
diff --git a/gfx/OLD/BR319.png b/gfx/Archive/BR319.png
similarity index 100%
rename from gfx/OLD/BR319.png
rename to gfx/Archive/BR319.png
diff --git a/gfx/OLD/BR350.png b/gfx/Archive/BR350.png
similarity index 100%
rename from gfx/OLD/BR350.png
rename to gfx/Archive/BR350.png
diff --git a/gfx/OLD/BR373_GNER.png b/gfx/Archive/BR373_GNER.png
similarity index 100%
rename from gfx/OLD/BR373_GNER.png
rename to gfx/Archive/BR373_GNER.png
diff --git a/gfx/OLD/BR377.png b/gfx/Archive/BR377.png
similarity index 100%
rename from gfx/OLD/BR377.png
rename to gfx/Archive/BR377.png
diff --git a/gfx/OLD/BR377_2.png b/gfx/Archive/BR377_2.png
similarity index 100%
rename from gfx/OLD/BR377_2.png
rename to gfx/Archive/BR377_2.png
diff --git a/gfx/OLD/BR377_3.png b/gfx/Archive/BR377_3.png
similarity index 100%
rename from gfx/OLD/BR377_3.png
rename to gfx/Archive/BR377_3.png
diff --git a/gfx/OLD/BR377b.png b/gfx/Archive/BR377b.png
similarity index 100%
rename from gfx/OLD/BR377b.png
rename to gfx/Archive/BR377b.png
diff --git a/gfx/OLD/BR377c.png b/gfx/Archive/BR377c.png
similarity index 100%
rename from gfx/OLD/BR377c.png
rename to gfx/Archive/BR377c.png
diff --git a/gfx/OLD/BR377d.png b/gfx/Archive/BR377d.png
similarity index 100%
rename from gfx/OLD/BR377d.png
rename to gfx/Archive/BR377d.png
diff --git a/gfx/OLD/BR395New.png b/gfx/Archive/BR395New.png
similarity index 100%
rename from gfx/OLD/BR395New.png
rename to gfx/Archive/BR395New.png
diff --git a/gfx/OLD/BR444.png b/gfx/Archive/BR444.png
similarity index 100%
rename from gfx/OLD/BR444.png
rename to gfx/Archive/BR444.png
diff --git a/gfx/OLD/BR450.png b/gfx/Archive/BR450.png
similarity index 100%
rename from gfx/OLD/BR450.png
rename to gfx/Archive/BR450.png
diff --git a/gfx/OLD/BR455-2.png b/gfx/Archive/BR455-2.png
similarity index 100%
rename from gfx/OLD/BR455-2.png
rename to gfx/Archive/BR455-2.png
diff --git a/gfx/OLD/BR455.png b/gfx/Archive/BR455.png
similarity index 100%
rename from gfx/OLD/BR455.png
rename to gfx/Archive/BR455.png
diff --git a/gfx/OLD/BR456.png b/gfx/Archive/BR456.png
similarity index 100%
rename from gfx/OLD/BR456.png
rename to gfx/Archive/BR456.png
diff --git a/gfx/OLD/BR504.png b/gfx/Archive/BR504.png
similarity index 100%
rename from gfx/OLD/BR504.png
rename to gfx/Archive/BR504.png
diff --git a/gfx/OLD/BR67.png b/gfx/Archive/BR67.png
similarity index 100%
rename from gfx/OLD/BR67.png
rename to gfx/Archive/BR67.png
diff --git a/gfx/OLD/BR68.png b/gfx/Archive/BR68.png
similarity index 100%
rename from gfx/OLD/BR68.png
rename to gfx/Archive/BR68.png
diff --git a/gfx/OLD/BR700.png b/gfx/Archive/BR700.png
similarity index 100%
rename from gfx/OLD/BR700.png
rename to gfx/Archive/BR700.png
diff --git a/gfx/OLD/BR800.png b/gfx/Archive/BR800.png
similarity index 100%
rename from gfx/OLD/BR800.png
rename to gfx/Archive/BR800.png
diff --git a/gfx/OLD/BR800_1.png b/gfx/Archive/BR800_1.png
similarity index 100%
rename from gfx/OLD/BR800_1.png
rename to gfx/Archive/BR800_1.png
diff --git a/gfx/OLD/BR801.png b/gfx/Archive/BR801.png
similarity index 100%
rename from gfx/OLD/BR801.png
rename to gfx/Archive/BR801.png
diff --git a/gfx/OLD/BR801_1.png b/gfx/Archive/BR801_1.png
similarity index 100%
rename from gfx/OLD/BR801_1.png
rename to gfx/Archive/BR801_1.png
diff --git a/gfx/OLD/BR802.png b/gfx/Archive/BR802.png
similarity index 100%
rename from gfx/OLD/BR802.png
rename to gfx/Archive/BR802.png
diff --git a/gfx/OLD/BR802_1.png b/gfx/Archive/BR802_1.png
similarity index 100%
rename from gfx/OLD/BR802_1.png
rename to gfx/Archive/BR802_1.png
diff --git a/gfx/OLD/BR91Reversed.png b/gfx/Archive/BR91Reversed.png
similarity index 100%
rename from gfx/OLD/BR91Reversed.png
rename to gfx/Archive/BR91Reversed.png
diff --git a/gfx/OLD/Class 450.png b/gfx/Archive/Class 450.png
similarity index 100%
rename from gfx/OLD/Class 450.png
rename to gfx/Archive/Class 450.png
diff --git a/gfx/OLD/Electrostar.png b/gfx/Archive/Electrostar.png
similarity index 100%
rename from gfx/OLD/Electrostar.png
rename to gfx/Archive/Electrostar.png
diff --git a/gfx/OLD/FurnessK1K2 - Copy.png b/gfx/Archive/FurnessK1K2 - Copy.png
similarity index 100%
rename from gfx/OLD/FurnessK1K2 - Copy.png
rename to gfx/Archive/FurnessK1K2 - Copy.png
diff --git a/gfx/OLD/LULDS9295.png b/gfx/Archive/LULDS9295.png
similarity index 100%
rename from gfx/OLD/LULDS9295.png
rename to gfx/Archive/LULDS9295.png
diff --git a/gfx/OLD/LU_1992.png b/gfx/Archive/LU_1992.png
similarity index 100%
rename from gfx/OLD/LU_1992.png
rename to gfx/Archive/LU_1992.png
diff --git a/gfx/OLD/LU_1995_1996.png b/gfx/Archive/LU_1995_1996.png
similarity index 100%
rename from gfx/OLD/LU_1995_1996.png
rename to gfx/Archive/LU_1995_1996.png
diff --git a/gfx/OLD/LU_D.png b/gfx/Archive/LU_D.png
similarity index 100%
rename from gfx/OLD/LU_D.png
rename to gfx/Archive/LU_D.png
diff --git a/gfx/OLD/LU_S7_S8.png b/gfx/Archive/LU_S7_S8.png
similarity index 100%
rename from gfx/OLD/LU_S7_S8.png
rename to gfx/Archive/LU_S7_S8.png
diff --git a/gfx/OLD/Networker Combined.png b/gfx/Archive/Networker Combined.png
similarity index 100%
rename from gfx/OLD/Networker Combined.png
rename to gfx/Archive/Networker Combined.png
diff --git a/gfx/OLD/Networker.png b/gfx/Archive/Networker.png
similarity index 100%
rename from gfx/OLD/Networker.png
rename to gfx/Archive/Networker.png
diff --git a/gfx/OLD/br_345.png b/gfx/Archive/br_345.png
similarity index 100%
rename from gfx/OLD/br_345.png
rename to gfx/Archive/br_345.png
diff --git a/gfx/OLD/br_701.png b/gfx/Archive/br_701.png
similarity index 100%
rename from gfx/OLD/br_701.png
rename to gfx/Archive/br_701.png
diff --git a/gfx/OLD/br_707.png b/gfx/Archive/br_707.png
similarity index 100%
rename from gfx/OLD/br_707.png
rename to gfx/Archive/br_707.png
diff --git a/gfx/OLD/br_710.png b/gfx/Archive/br_710.png
similarity index 100%
rename from gfx/OLD/br_710.png
rename to gfx/Archive/br_710.png
diff --git a/gfx/OLD/br_720.png b/gfx/Archive/br_720.png
similarity index 100%
rename from gfx/OLD/br_720.png
rename to gfx/Archive/br_720.png
diff --git a/gfx/OLD/br_745_ga.png b/gfx/Archive/br_745_ga.png
similarity index 100%
rename from gfx/OLD/br_745_ga.png
rename to gfx/Archive/br_745_ga.png
diff --git a/gfx/OLD/br_745_st.png b/gfx/Archive/br_745_st.png
similarity index 100%
rename from gfx/OLD/br_745_st.png
rename to gfx/Archive/br_745_st.png
diff --git a/gfx/OLD/br_755_ga.png b/gfx/Archive/br_755_ga.png
similarity index 100%
rename from gfx/OLD/br_755_ga.png
rename to gfx/Archive/br_755_ga.png
diff --git a/gfx/OLD/br_756_tfw.png b/gfx/Archive/br_756_tfw.png
similarity index 100%
rename from gfx/OLD/br_756_tfw.png
rename to gfx/Archive/br_756_tfw.png
diff --git a/gfx/OLD/br_769_gwr.png b/gfx/Archive/br_769_gwr.png
similarity index 100%
rename from gfx/OLD/br_769_gwr.png
rename to gfx/Archive/br_769_gwr.png
diff --git a/gfx/OLD/br_769_northern.png b/gfx/Archive/br_769_northern.png
similarity index 100%
rename from gfx/OLD/br_769_northern.png
rename to gfx/Archive/br_769_northern.png
diff --git a/gfx/OLD/br_769_rog.png b/gfx/Archive/br_769_rog.png
similarity index 100%
rename from gfx/OLD/br_769_rog.png
rename to gfx/Archive/br_769_rog.png
diff --git a/gfx/OLD/br_769_tfw.png b/gfx/Archive/br_769_tfw.png
similarity index 100%
rename from gfx/OLD/br_769_tfw.png
rename to gfx/Archive/br_769_tfw.png
diff --git a/gfx/OLD/br_800_avanti.png b/gfx/Archive/br_800_avanti.png
similarity index 100%
rename from gfx/OLD/br_800_avanti.png
rename to gfx/Archive/br_800_avanti.png
diff --git a/gfx/OLD/br_800_gwr.png b/gfx/Archive/br_800_gwr.png
similarity index 100%
rename from gfx/OLD/br_800_gwr.png
rename to gfx/Archive/br_800_gwr.png
diff --git a/gfx/OLD/br_800_hitachi.png b/gfx/Archive/br_800_hitachi.png
similarity index 100%
rename from gfx/OLD/br_800_hitachi.png
rename to gfx/Archive/br_800_hitachi.png
diff --git a/gfx/OLD/br_800_hull.png b/gfx/Archive/br_800_hull.png
similarity index 100%
rename from gfx/OLD/br_800_hull.png
rename to gfx/Archive/br_800_hull.png
diff --git a/gfx/OLD/br_800_lner.png b/gfx/Archive/br_800_lner.png
similarity index 100%
rename from gfx/OLD/br_800_lner.png
rename to gfx/Archive/br_800_lner.png
diff --git a/gfx/OLD/br_800_tpx.png b/gfx/Archive/br_800_tpx.png
similarity index 100%
rename from gfx/OLD/br_800_tpx.png
rename to gfx/Archive/br_800_tpx.png
diff --git a/gfx/OLD/mk3_Greater_Anglia.jpg b/gfx/Archive/mk3_Greater_Anglia.jpg
similarity index 100%
rename from gfx/OLD/mk3_Greater_Anglia.jpg
rename to gfx/Archive/mk3_Greater_Anglia.jpg
diff --git a/gfx/OLD/v (42).png b/gfx/Archive/v (42).png
similarity index 100%
rename from gfx/OLD/v (42).png
rename to gfx/Archive/v (42).png
diff --git a/gfx/OLD/v (43).png b/gfx/Archive/v (43).png
similarity index 100%
rename from gfx/OLD/v (43).png
rename to gfx/Archive/v (43).png
diff --git a/gfx/Diesel tmp/BR20.png b/gfx/Diesel/BR20.png
similarity index 100%
rename from gfx/Diesel tmp/BR20.png
rename to gfx/Diesel/BR20.png
diff --git a/gfx/Diesel tmp/Kestrel.png b/gfx/Diesel/Kestrel.png
similarity index 100%
rename from gfx/Diesel tmp/Kestrel.png
rename to gfx/Diesel/Kestrel.png
diff --git a/gfx/Electric tmp/BR8X.png b/gfx/Electric/BR8X.png
similarity index 100%
rename from gfx/Electric tmp/BR8X.png
rename to gfx/Electric/BR8X.png
diff --git a/gfx/Freight tmp/BRHHA.png b/gfx/Freight/BRHHA.png
similarity index 100%
rename from gfx/Freight tmp/BRHHA.png
rename to gfx/Freight/BRHHA.png
diff --git a/gfx/Freight tmp/BRTTA.png b/gfx/Freight/BRTTA.png
similarity index 100%
rename from gfx/Freight tmp/BRTTA.png
rename to gfx/Freight/BRTTA.png
diff --git a/gfx/Freight tmp/Containers.png b/gfx/Freight/Containers.png
similarity index 100%
rename from gfx/Freight tmp/Containers.png
rename to gfx/Freight/Containers.png
diff --git a/gfx/Freight tmp/Lumber_Wagon_Small.png b/gfx/Freight/Lumber_Wagon_Small.png
similarity index 100%
rename from gfx/Freight tmp/Lumber_Wagon_Small.png
rename to gfx/Freight/Lumber_Wagon_Small.png
diff --git a/gfx/Freight tmp/Ore_Dumper_Wagon_Medium.png b/gfx/Freight/Ore_Dumper_Wagon_Medium.png
similarity index 100%
rename from gfx/Freight tmp/Ore_Dumper_Wagon_Medium.png
rename to gfx/Freight/Ore_Dumper_Wagon_Medium.png
diff --git a/gfx/Freight tmp/RM_TPO.png b/gfx/Freight/RM_TPO.png
similarity index 100%
rename from gfx/Freight tmp/RM_TPO.png
rename to gfx/Freight/RM_TPO.png
diff --git a/gfx/Freight tmp/RS_SWB_Hopper.png b/gfx/Freight/RS_SWB_Hopper.png
similarity index 100%
rename from gfx/Freight tmp/RS_SWB_Hopper.png
rename to gfx/Freight/RS_SWB_Hopper.png
diff --git a/gfx/Freight tmp/RS_SWB_Open_Vans.png b/gfx/Freight/RS_SWB_Open_Vans.png
similarity index 100%
rename from gfx/Freight tmp/RS_SWB_Open_Vans.png
rename to gfx/Freight/RS_SWB_Open_Vans.png
diff --git a/gfx/Freight tmp/bulk_hopper.png b/gfx/Freight/bulk_hopper.png
similarity index 100%
rename from gfx/Freight tmp/bulk_hopper.png
rename to gfx/Freight/bulk_hopper.png
diff --git a/gfx/Freight tmp/bulk_hopper_large.png b/gfx/Freight/bulk_hopper_large.png
similarity index 100%
rename from gfx/Freight tmp/bulk_hopper_large.png
rename to gfx/Freight/bulk_hopper_large.png
diff --git a/gfx/Freight tmp/goods_van.png b/gfx/Freight/goods_van.png
similarity index 100%
rename from gfx/Freight tmp/goods_van.png
rename to gfx/Freight/goods_van.png
diff --git a/gfx/Freight tmp/mail_van.png b/gfx/Freight/mail_van.png
similarity index 100%
rename from gfx/Freight tmp/mail_van.png
rename to gfx/Freight/mail_van.png
diff --git a/gfx/Rolling Stock tmp/BRMk1BlueGrey.png b/gfx/Rolling Stock/BRMk1BlueGrey.png
similarity index 100%
rename from gfx/Rolling Stock tmp/BRMk1BlueGrey.png
rename to gfx/Rolling Stock/BRMk1BlueGrey.png
diff --git a/gfx/Rolling Stock tmp/BRMk1CarmCream.png b/gfx/Rolling Stock/BRMk1CarmCream.png
similarity index 100%
rename from gfx/Rolling Stock tmp/BRMk1CarmCream.png
rename to gfx/Rolling Stock/BRMk1CarmCream.png
diff --git a/gfx/Rolling Stock tmp/BRMk1ChocCream.png b/gfx/Rolling Stock/BRMk1ChocCream.png
similarity index 100%
rename from gfx/Rolling Stock tmp/BRMk1ChocCream.png
rename to gfx/Rolling Stock/BRMk1ChocCream.png
diff --git a/gfx/Rolling Stock tmp/BRMk1Intercity.png b/gfx/Rolling Stock/BRMk1Intercity.png
similarity index 100%
rename from gfx/Rolling Stock tmp/BRMk1Intercity.png
rename to gfx/Rolling Stock/BRMk1Intercity.png
diff --git a/gfx/Rolling Stock tmp/BRMk1Malachite.png b/gfx/Rolling Stock/BRMk1Malachite.png
similarity index 100%
rename from gfx/Rolling Stock tmp/BRMk1Malachite.png
rename to gfx/Rolling Stock/BRMk1Malachite.png
diff --git a/gfx/Rolling Stock tmp/BRMk1Maroon.png b/gfx/Rolling Stock/BRMk1Maroon.png
similarity index 100%
rename from gfx/Rolling Stock tmp/BRMk1Maroon.png
rename to gfx/Rolling Stock/BRMk1Maroon.png
diff --git a/gfx/Rolling Stock tmp/BRMk1Purchase.png b/gfx/Rolling Stock/BRMk1Purchase.png
similarity index 100%
rename from gfx/Rolling Stock tmp/BRMk1Purchase.png
rename to gfx/Rolling Stock/BRMk1Purchase.png
diff --git a/gfx/Rolling Stock tmp/BRMk2A-C.png b/gfx/Rolling Stock/BRMk2A-C.png
similarity index 100%
rename from gfx/Rolling Stock tmp/BRMk2A-C.png
rename to gfx/Rolling Stock/BRMk2A-C.png
diff --git a/gfx/Rolling Stock tmp/BRMk2Coach.png b/gfx/Rolling Stock/BRMk2Coach.png
similarity index 100%
rename from gfx/Rolling Stock tmp/BRMk2Coach.png
rename to gfx/Rolling Stock/BRMk2Coach.png
diff --git a/gfx/Rolling Stock tmp/BRMk2D-F.png b/gfx/Rolling Stock/BRMk2D-F.png
similarity index 100%
rename from gfx/Rolling Stock tmp/BRMk2D-F.png
rename to gfx/Rolling Stock/BRMk2D-F.png
diff --git a/gfx/Rolling Stock tmp/BRMk2Purchase.png b/gfx/Rolling Stock/BRMk2Purchase.png
similarity index 100%
rename from gfx/Rolling Stock tmp/BRMk2Purchase.png
rename to gfx/Rolling Stock/BRMk2Purchase.png
diff --git a/gfx/Rolling Stock tmp/BRMk3DMB.png b/gfx/Rolling Stock/BRMk3DMB.png
similarity index 100%
rename from gfx/Rolling Stock tmp/BRMk3DMB.png
rename to gfx/Rolling Stock/BRMk3DMB.png
diff --git a/gfx/Rolling Stock tmp/BRMk3DVT.png b/gfx/Rolling Stock/BRMk3DVT.png
similarity index 100%
rename from gfx/Rolling Stock tmp/BRMk3DVT.png
rename to gfx/Rolling Stock/BRMk3DVT.png
diff --git a/gfx/Rolling Stock tmp/BRMk3TF.png b/gfx/Rolling Stock/BRMk3TF.png
similarity index 100%
rename from gfx/Rolling Stock tmp/BRMk3TF.png
rename to gfx/Rolling Stock/BRMk3TF.png
diff --git a/gfx/Rolling Stock tmp/BRMk3TGS.png b/gfx/Rolling Stock/BRMk3TGS.png
similarity index 100%
rename from gfx/Rolling Stock tmp/BRMk3TGS.png
rename to gfx/Rolling Stock/BRMk3TGS.png
diff --git a/gfx/Rolling Stock tmp/BRMk3TRSB.png b/gfx/Rolling Stock/BRMk3TRSB.png
similarity index 100%
rename from gfx/Rolling Stock tmp/BRMk3TRSB.png
rename to gfx/Rolling Stock/BRMk3TRSB.png
diff --git a/gfx/Rolling Stock tmp/BRMk3TRUB.png b/gfx/Rolling Stock/BRMk3TRUB.png
similarity index 100%
rename from gfx/Rolling Stock tmp/BRMk3TRUB.png
rename to gfx/Rolling Stock/BRMk3TRUB.png
diff --git a/gfx/Rolling Stock tmp/BRMk3TRUK.png b/gfx/Rolling Stock/BRMk3TRUK.png
similarity index 100%
rename from gfx/Rolling Stock tmp/BRMk3TRUK.png
rename to gfx/Rolling Stock/BRMk3TRUK.png
diff --git a/gfx/Rolling Stock tmp/BRMk3TS.png b/gfx/Rolling Stock/BRMk3TS.png
similarity index 100%
rename from gfx/Rolling Stock tmp/BRMk3TS.png
rename to gfx/Rolling Stock/BRMk3TS.png
diff --git a/gfx/Rolling Stock tmp/BRSleeper.png b/gfx/Rolling Stock/BRSleeper.png
similarity index 100%
rename from gfx/Rolling Stock tmp/BRSleeper.png
rename to gfx/Rolling Stock/BRSleeper.png
diff --git a/gfx/Rolling Stock tmp/LNERBRCarmCream.png b/gfx/Rolling Stock/LNERBRCarmCream.png
similarity index 100%
rename from gfx/Rolling Stock tmp/LNERBRCarmCream.png
rename to gfx/Rolling Stock/LNERBRCarmCream.png
diff --git a/gfx/Rolling Stock tmp/LNERBRMaroon.png b/gfx/Rolling Stock/LNERBRMaroon.png
similarity index 100%
rename from gfx/Rolling Stock tmp/LNERBRMaroon.png
rename to gfx/Rolling Stock/LNERBRMaroon.png
diff --git a/gfx/Rolling Stock tmp/LNERTeakBCK.png b/gfx/Rolling Stock/LNERTeakBCK.png
similarity index 100%
rename from gfx/Rolling Stock tmp/LNERTeakBCK.png
rename to gfx/Rolling Stock/LNERTeakBCK.png
diff --git a/gfx/Rolling Stock tmp/LNERTeakBG.png b/gfx/Rolling Stock/LNERTeakBG.png
similarity index 100%
rename from gfx/Rolling Stock tmp/LNERTeakBG.png
rename to gfx/Rolling Stock/LNERTeakBG.png
diff --git a/gfx/Rolling Stock tmp/LNERTeakPV.png b/gfx/Rolling Stock/LNERTeakPV.png
similarity index 100%
rename from gfx/Rolling Stock tmp/LNERTeakPV.png
rename to gfx/Rolling Stock/LNERTeakPV.png
diff --git a/gfx/Rolling Stock tmp/LNERTeakTK.png b/gfx/Rolling Stock/LNERTeakTK.png
similarity index 100%
rename from gfx/Rolling Stock tmp/LNERTeakTK.png
rename to gfx/Rolling Stock/LNERTeakTK.png