diff --git a/_data/SMR Files/EGAA/Belfast Aldergrove SMR.kmz b/_data/SMR Files/EGAA/EGAA.kmz
similarity index 100%
rename from _data/SMR Files/EGAA/Belfast Aldergrove SMR.kmz
rename to _data/SMR Files/EGAA/EGAA.kmz
diff --git a/_data/SMR Files/EGAC/Belfast City SMR.kmz b/_data/SMR Files/EGAC/EGAC.kmz
similarity index 100%
rename from _data/SMR Files/EGAC/Belfast City SMR.kmz
rename to _data/SMR Files/EGAC/EGAC.kmz
diff --git a/_data/SMR Files/EGAE/EGAE - Derry_2020-04.kmz b/_data/SMR Files/EGAE/EGAE.kmz
similarity index 100%
rename from _data/SMR Files/EGAE/EGAE - Derry_2020-04.kmz
rename to _data/SMR Files/EGAE/EGAE.kmz
diff --git a/_data/SMR Files/EGBB/Birmingham SMR.kmz b/_data/SMR Files/EGBB/EGBB.kmz
similarity index 100%
rename from _data/SMR Files/EGBB/Birmingham SMR.kmz
rename to _data/SMR Files/EGBB/EGBB.kmz
diff --git a/_data/SMR Files/EGBJ/Gloucestershire SMR 2207.kmz b/_data/SMR Files/EGBJ/EGBJ.kmz
similarity index 100%
rename from _data/SMR Files/EGBJ/Gloucestershire SMR 2207.kmz
rename to _data/SMR Files/EGBJ/EGBJ.kmz
diff --git a/_data/SMR Files/EGBJ/Gloucestershire SMR.kmz b/_data/SMR Files/EGBJ/Old KMZs/Gloucestershire SMR (OLD).kmz
similarity index 100%
rename from _data/SMR Files/EGBJ/Gloucestershire SMR.kmz
rename to _data/SMR Files/EGBJ/Old KMZs/Gloucestershire SMR (OLD).kmz
diff --git a/_data/SMR Files/EGBK/EGBK Sywell.kmz b/_data/SMR Files/EGBK/EGBK.kmz
similarity index 100%
rename from _data/SMR Files/EGBK/EGBK Sywell.kmz
rename to _data/SMR Files/EGBK/EGBK.kmz
diff --git a/_data/SMR Files/EGBO/EGBO SMR Helper 2003.kmz b/_data/SMR Files/EGBO/EGBO-Helper.kmz
similarity index 100%
rename from _data/SMR Files/EGBO/EGBO SMR Helper 2003.kmz
rename to _data/SMR Files/EGBO/EGBO-Helper.kmz
diff --git a/_data/SMR Files/EGBO/EGBO SMR 2305.kmz b/_data/SMR Files/EGBO/EGBO.kmz
similarity index 100%
rename from _data/SMR Files/EGBO/EGBO SMR 2305.kmz
rename to _data/SMR Files/EGBO/EGBO.kmz
diff --git a/_data/SMR Files/EGBW/EGBW--SMR.kmz b/_data/SMR Files/EGBW/EGBW.kmz
similarity index 100%
rename from _data/SMR Files/EGBW/EGBW--SMR.kmz
rename to _data/SMR Files/EGBW/EGBW.kmz
diff --git a/_data/SMR Files/EGCC/EGCC SMR Helper.kmz b/_data/SMR Files/EGCC/EGCC-Helper.kmz
similarity index 100%
rename from _data/SMR Files/EGCC/EGCC SMR Helper.kmz
rename to _data/SMR Files/EGCC/EGCC-Helper.kmz
diff --git a/_data/SMR Files/EGCC/Manchester SMR.kmz b/_data/SMR Files/EGCC/EGCC.kmz
similarity index 100%
rename from _data/SMR Files/EGCC/Manchester SMR.kmz
rename to _data/SMR Files/EGCC/EGCC.kmz
diff --git a/_data/SMR Files/EGCC/EGCC_SMR_20-13.kmz b/_data/SMR Files/EGCC/Old KMZs/EGCC_SMR_20-13.kmz
similarity index 100%
rename from _data/SMR Files/EGCC/EGCC_SMR_20-13.kmz
rename to _data/SMR Files/EGCC/Old KMZs/EGCC_SMR_20-13.kmz
diff --git a/_data/SMR Files/EGCC/EGCC_SMR_23-05.kmz b/_data/SMR Files/EGCC/Old KMZs/EGCC_SMR_23-05.kmz
similarity index 100%
rename from _data/SMR Files/EGCC/EGCC_SMR_23-05.kmz
rename to _data/SMR Files/EGCC/Old KMZs/EGCC_SMR_23-05.kmz
diff --git a/_data/SMR Files/EGCC/Old (HS)/Manchester SMR.kmz b/_data/SMR Files/EGCC/Old KMZs/Old (HS)/Manchester SMR.kmz
similarity index 100%
rename from _data/SMR Files/EGCC/Old (HS)/Manchester SMR.kmz
rename to _data/SMR Files/EGCC/Old KMZs/Old (HS)/Manchester SMR.kmz
diff --git a/_data/SMR Files/EGCC/Old (HS)/Taxiway Lines.kmz b/_data/SMR Files/EGCC/Old KMZs/Old (HS)/Taxiway Lines.kmz
similarity index 100%
rename from _data/SMR Files/EGCC/Old (HS)/Taxiway Lines.kmz
rename to _data/SMR Files/EGCC/Old KMZs/Old (HS)/Taxiway Lines.kmz
diff --git a/_data/SMR Files/EGCN/Doncaster SMR.kmz b/_data/SMR Files/EGCN/EGCN.kmz
similarity index 100%
rename from _data/SMR Files/EGCN/Doncaster SMR.kmz
rename to _data/SMR Files/EGCN/EGCN.kmz
diff --git a/_data/SMR Files/EGEO/EGEO Oban.kmz b/_data/SMR Files/EGEO/EGEO.kmz
similarity index 100%
rename from _data/SMR Files/EGEO/EGEO Oban.kmz
rename to _data/SMR Files/EGEO/EGEO.kmz
diff --git a/_data/SMR Files/EGET/EGET Tingwall.kmz b/_data/SMR Files/EGET/EGET.kmz
similarity index 100%
rename from _data/SMR Files/EGET/EGET Tingwall.kmz
rename to _data/SMR Files/EGET/EGET.kmz
diff --git a/_data/SMR Files/EGFH/Swansea SMR.kmz b/_data/SMR Files/EGFH/EGFH.kmz
similarity index 100%
rename from _data/SMR Files/EGFH/Swansea SMR.kmz
rename to _data/SMR Files/EGFH/EGFH.kmz
diff --git a/_data/SMR Files/EGGP/Liverpool SMR.kmz b/_data/SMR Files/EGGP/EGGP.kmz
similarity index 100%
rename from _data/SMR Files/EGGP/Liverpool SMR.kmz
rename to _data/SMR Files/EGGP/EGGP.kmz
diff --git a/_data/SMR Files/EGGW/Luton SMR.kmz b/_data/SMR Files/EGGW/EGGW.kmz
similarity index 100%
rename from _data/SMR Files/EGGW/Luton SMR.kmz
rename to _data/SMR Files/EGGW/EGGW.kmz
diff --git a/_data/SMR Files/EGHE/St Marys SMR.kmz b/_data/SMR Files/EGHE/EGHE.kmz
similarity index 100%
rename from _data/SMR Files/EGHE/St Marys SMR.kmz
rename to _data/SMR Files/EGHE/EGHE.kmz
diff --git a/_data/SMR Files/EGHH/EGHH_SMR.kmz b/_data/SMR Files/EGHH/EGHH.kmz
similarity index 100%
rename from _data/SMR Files/EGHH/EGHH_SMR.kmz
rename to _data/SMR Files/EGHH/EGHH.kmz
diff --git a/_data/SMR Files/EGHJ/EGHJ Bembridge SMR Helper 20-13.kmz b/_data/SMR Files/EGHJ/EGHJ-Helper.kmz
similarity index 100%
rename from _data/SMR Files/EGHJ/EGHJ Bembridge SMR Helper 20-13.kmz
rename to _data/SMR Files/EGHJ/EGHJ-Helper.kmz
diff --git a/_data/SMR Files/EGHJ/EGHJ Bembridge SMR 20-13.kmz b/_data/SMR Files/EGHJ/EGHJ.kmz
similarity index 100%
rename from _data/SMR Files/EGHJ/EGHJ Bembridge SMR 20-13.kmz
rename to _data/SMR Files/EGHJ/EGHJ.kmz
diff --git a/_data/SMR Files/EGHN/EGHN Sandown SMR.kmz b/_data/SMR Files/EGHN/EGHN.kmz
similarity index 100%
rename from _data/SMR Files/EGHN/EGHN Sandown SMR.kmz
rename to _data/SMR Files/EGHN/EGHN.kmz
diff --git a/_data/SMR Files/EGHQ/EGHQ 2212.kmz b/_data/SMR Files/EGHQ/EGHQ.kmz
similarity index 100%
rename from _data/SMR Files/EGHQ/EGHQ 2212.kmz
rename to _data/SMR Files/EGHQ/EGHQ.kmz
diff --git a/_data/SMR Files/EGHQ/EGHQ 2209.kmz b/_data/SMR Files/EGHQ/Old KMZs/EGHQ 2209.kmz
similarity index 100%
rename from _data/SMR Files/EGHQ/EGHQ 2209.kmz
rename to _data/SMR Files/EGHQ/Old KMZs/EGHQ 2209.kmz
diff --git a/_data/SMR Files/EGHQ/Newquay SMR 2101.kmz b/_data/SMR Files/EGHQ/Old KMZs/Newquay SMR 2101.kmz
similarity index 100%
rename from _data/SMR Files/EGHQ/Newquay SMR 2101.kmz
rename to _data/SMR Files/EGHQ/Old KMZs/Newquay SMR 2101.kmz
diff --git a/_data/SMR Files/EGHQ/Newquay SMR Pre-2101.kmz b/_data/SMR Files/EGHQ/Old KMZs/Newquay SMR Pre-2101.kmz
similarity index 100%
rename from _data/SMR Files/EGHQ/Newquay SMR Pre-2101.kmz
rename to _data/SMR Files/EGHQ/Old KMZs/Newquay SMR Pre-2101.kmz
diff --git a/_data/SMR Files/EGHR/EGHR SMR Helper 20-13.kmz b/_data/SMR Files/EGHR/EGHR-Helper.kmz
similarity index 100%
rename from _data/SMR Files/EGHR/EGHR SMR Helper 20-13.kmz
rename to _data/SMR Files/EGHR/EGHR-Helper.kmz
diff --git a/_data/SMR Files/EGHR/EGHR SMR 20-13.kmz b/_data/SMR Files/EGHR/EGHR.kmz
similarity index 100%
rename from _data/SMR Files/EGHR/EGHR SMR 20-13.kmz
rename to _data/SMR Files/EGHR/EGHR.kmz
diff --git a/_data/SMR Files/EGJA/EGJA Alderney.kmz b/_data/SMR Files/EGJA/EGJA.kmz
similarity index 100%
rename from _data/SMR Files/EGJA/EGJA Alderney.kmz
rename to _data/SMR Files/EGJA/EGJA.kmz
diff --git a/_data/SMR Files/EGJA/Alderney SMR.kmz b/_data/SMR Files/EGJA/Old KMZs/Alderney SMR.kmz
similarity index 100%
rename from _data/SMR Files/EGJA/Alderney SMR.kmz
rename to _data/SMR Files/EGJA/Old KMZs/Alderney SMR.kmz
diff --git a/_data/SMR Files/EGJB/EGJB Guernesy.kmz b/_data/SMR Files/EGJB/EGJB.kmz
similarity index 100%
rename from _data/SMR Files/EGJB/EGJB Guernesy.kmz
rename to _data/SMR Files/EGJB/EGJB.kmz
diff --git a/_data/SMR Files/EGJB/Guernsey SMR.kmz b/_data/SMR Files/EGJB/Old KMZs/Guernsey SMR.kmz
similarity index 100%
rename from _data/SMR Files/EGJB/Guernsey SMR.kmz
rename to _data/SMR Files/EGJB/Old KMZs/Guernsey SMR.kmz
diff --git a/_data/SMR Files/EGJJ/Jersey SMR 2305.kmz b/_data/SMR Files/EGJJ/EGJJ.kmz
similarity index 100%
rename from _data/SMR Files/EGJJ/Jersey SMR 2305.kmz
rename to _data/SMR Files/EGJJ/EGJJ.kmz
diff --git a/_data/SMR Files/EGJJ/Jersey SMR 2009.kmz b/_data/SMR Files/EGJJ/Old KMZs/Jersey SMR 2009.kmz
similarity index 100%
rename from _data/SMR Files/EGJJ/Jersey SMR 2009.kmz
rename to _data/SMR Files/EGJJ/Old KMZs/Jersey SMR 2009.kmz
diff --git a/_data/SMR Files/EGJJ/v1 (KH)/Geo.txt b/_data/SMR Files/EGJJ/Old KMZs/v1 (KH)/Geo.txt
similarity index 100%
rename from _data/SMR Files/EGJJ/v1 (KH)/Geo.txt
rename to _data/SMR Files/EGJJ/Old KMZs/v1 (KH)/Geo.txt
diff --git a/_data/SMR Files/EGJJ/v1 (KH)/Jersey SMR v1 (KH).kmz b/_data/SMR Files/EGJJ/Old KMZs/v1 (KH)/Jersey SMR v1 (KH).kmz
similarity index 100%
rename from _data/SMR Files/EGJJ/v1 (KH)/Jersey SMR v1 (KH).kmz
rename to _data/SMR Files/EGJJ/Old KMZs/v1 (KH)/Jersey SMR v1 (KH).kmz
diff --git a/_data/SMR Files/EGJJ/v1 (KH)/Labels.txt b/_data/SMR Files/EGJJ/Old KMZs/v1 (KH)/Labels.txt
similarity index 100%
rename from _data/SMR Files/EGJJ/v1 (KH)/Labels.txt
rename to _data/SMR Files/EGJJ/Old KMZs/v1 (KH)/Labels.txt
diff --git a/_data/SMR Files/EGJJ/v1 (KH)/Regions.txt b/_data/SMR Files/EGJJ/Old KMZs/v1 (KH)/Regions.txt
similarity index 100%
rename from _data/SMR Files/EGJJ/v1 (KH)/Regions.txt
rename to _data/SMR Files/EGJJ/Old KMZs/v1 (KH)/Regions.txt
diff --git a/_data/SMR Files/EGJJ/v2 (SWRTS)/Jersey SMR v2 (SWRTS).kmz b/_data/SMR Files/EGJJ/Old KMZs/v2 (SWRTS)/Jersey SMR v2 (SWRTS).kmz
similarity index 100%
rename from _data/SMR Files/EGJJ/v2 (SWRTS)/Jersey SMR v2 (SWRTS).kmz
rename to _data/SMR Files/EGJJ/Old KMZs/v2 (SWRTS)/Jersey SMR v2 (SWRTS).kmz
diff --git a/_data/SMR Files/EGJJ/v2 (SWRTS)/Jersey SMR v2.1 (SWRTS).kmz b/_data/SMR Files/EGJJ/Old KMZs/v2 (SWRTS)/Jersey SMR v2.1 (SWRTS).kmz
similarity index 100%
rename from _data/SMR Files/EGJJ/v2 (SWRTS)/Jersey SMR v2.1 (SWRTS).kmz
rename to _data/SMR Files/EGJJ/Old KMZs/v2 (SWRTS)/Jersey SMR v2.1 (SWRTS).kmz
diff --git a/_data/SMR Files/EGJJ/v2 (SWRTS)/Jersey SMR v2.2 (SWRTS) 2015-06.kmz b/_data/SMR Files/EGJJ/Old KMZs/v2 (SWRTS)/Jersey SMR v2.2 (SWRTS) 2015-06.kmz
similarity index 100%
rename from _data/SMR Files/EGJJ/v2 (SWRTS)/Jersey SMR v2.2 (SWRTS) 2015-06.kmz
rename to _data/SMR Files/EGJJ/Old KMZs/v2 (SWRTS)/Jersey SMR v2.2 (SWRTS) 2015-06.kmz
diff --git a/_data/SMR Files/EGKA/Shoreham SMR.kmz b/_data/SMR Files/EGKA/EGKA.kmz
similarity index 100%
rename from _data/SMR Files/EGKA/Shoreham SMR.kmz
rename to _data/SMR Files/EGKA/EGKA.kmz
diff --git a/_data/SMR Files/EGKB/EGKB-2206.kmz b/_data/SMR Files/EGKB/EGKB-2206.kmz
deleted file mode 100644
index 27cfd897fe..0000000000
Binary files a/_data/SMR Files/EGKB/EGKB-2206.kmz and /dev/null differ
diff --git a/_data/SMR Files/EGKB/EGKB.kmz b/_data/SMR Files/EGKB/EGKB.kmz
index 8063e906f2..27cfd897fe 100644
Binary files a/_data/SMR Files/EGKB/EGKB.kmz and b/_data/SMR Files/EGKB/EGKB.kmz differ
diff --git a/_data/SMR Files/EGKB/Old KMZs/EGKB (OLD).kmz b/_data/SMR Files/EGKB/Old KMZs/EGKB (OLD).kmz
new file mode 100644
index 0000000000..8063e906f2
Binary files /dev/null and b/_data/SMR Files/EGKB/Old KMZs/EGKB (OLD).kmz differ
diff --git a/_data/SMR Files/EGKB/EGKB-2109.kmz b/_data/SMR Files/EGKB/Old KMZs/EGKB-2109.kmz
similarity index 100%
rename from _data/SMR Files/EGKB/EGKB-2109.kmz
rename to _data/SMR Files/EGKB/Old KMZs/EGKB-2109.kmz
diff --git a/_data/SMR Files/EGKK/Gatwick SMR 2307.kmz b/_data/SMR Files/EGKK/EGKK.kmz
similarity index 100%
rename from _data/SMR Files/EGKK/Gatwick SMR 2307.kmz
rename to _data/SMR Files/EGKK/EGKK.kmz
diff --git a/_data/SMR Files/EGKK/Gatwick SMR (2010).kmz b/_data/SMR Files/EGKK/Old KMZs/Gatwick SMR (2010).kmz
similarity index 100%
rename from _data/SMR Files/EGKK/Gatwick SMR (2010).kmz
rename to _data/SMR Files/EGKK/Old KMZs/Gatwick SMR (2010).kmz
diff --git a/_data/SMR Files/EGKK/Gatwick SMR.kmz b/_data/SMR Files/EGKK/Old KMZs/Gatwick SMR (OLD).kmz
similarity index 100%
rename from _data/SMR Files/EGKK/Gatwick SMR.kmz
rename to _data/SMR Files/EGKK/Old KMZs/Gatwick SMR (OLD).kmz
diff --git a/_data/SMR Files/EGKK/Gatwick SMR 2008.kmz b/_data/SMR Files/EGKK/Old KMZs/Gatwick SMR 2008.kmz
similarity index 100%
rename from _data/SMR Files/EGKK/Gatwick SMR 2008.kmz
rename to _data/SMR Files/EGKK/Old KMZs/Gatwick SMR 2008.kmz
diff --git a/_data/SMR Files/EGKK/Gatwick SMR 2021.kmz b/_data/SMR Files/EGKK/Old KMZs/Gatwick SMR 2021.kmz
similarity index 100%
rename from _data/SMR Files/EGKK/Gatwick SMR 2021.kmz
rename to _data/SMR Files/EGKK/Old KMZs/Gatwick SMR 2021.kmz
diff --git a/_data/SMR Files/EGLC/EGLC SMR Helper 20-13.kmz b/_data/SMR Files/EGLC/EGLC-Helper.kmz
similarity index 100%
rename from _data/SMR Files/EGLC/EGLC SMR Helper 20-13.kmz
rename to _data/SMR Files/EGLC/EGLC-Helper.kmz
diff --git a/_data/SMR Files/EGLC/EGLC SMR 21-06.kmz b/_data/SMR Files/EGLC/EGLC.kmz
similarity index 100%
rename from _data/SMR Files/EGLC/EGLC SMR 21-06.kmz
rename to _data/SMR Files/EGLC/EGLC.kmz
diff --git a/_data/SMR Files/EGLC/EGLC SMR 20-03.kmz b/_data/SMR Files/EGLC/Old KMZs/EGLC SMR 20-03.kmz
similarity index 100%
rename from _data/SMR Files/EGLC/EGLC SMR 20-03.kmz
rename to _data/SMR Files/EGLC/Old KMZs/EGLC SMR 20-03.kmz
diff --git a/_data/SMR Files/EGLC/EGLC SMR 20-13.kmz b/_data/SMR Files/EGLC/Old KMZs/EGLC SMR 20-13.kmz
similarity index 100%
rename from _data/SMR Files/EGLC/EGLC SMR 20-13.kmz
rename to _data/SMR Files/EGLC/Old KMZs/EGLC SMR 20-13.kmz
diff --git a/_data/SMR Files/EGLC/EGLC SMR Helper 20-03.kmz b/_data/SMR Files/EGLC/Old KMZs/EGLC SMR Helper 20-03.kmz
similarity index 100%
rename from _data/SMR Files/EGLC/EGLC SMR Helper 20-03.kmz
rename to _data/SMR Files/EGLC/Old KMZs/EGLC SMR Helper 20-03.kmz
diff --git a/_data/SMR Files/EGLK/Blackbushe EGLK.kmz b/_data/SMR Files/EGLK/EGLK.kmz
similarity index 100%
rename from _data/SMR Files/EGLK/Blackbushe EGLK.kmz
rename to _data/SMR Files/EGLK/EGLK.kmz
diff --git a/_data/SMR Files/EGLL/Heathrow SMR Helper.kmz b/_data/SMR Files/EGLL/EGLL-Helper.kmz
similarity index 100%
rename from _data/SMR Files/EGLL/Heathrow SMR Helper.kmz
rename to _data/SMR Files/EGLL/EGLL-Helper.kmz
diff --git a/_data/SMR Files/EGLL/Heathrow SMR.kmz b/_data/SMR Files/EGLL/EGLL.kmz
similarity index 100%
rename from _data/SMR Files/EGLL/Heathrow SMR.kmz
rename to _data/SMR Files/EGLL/EGLL.kmz
diff --git a/_data/SMR Files/EGLL/Previous .kmz files/Heathrow SMR 20-14.kmz b/_data/SMR Files/EGLL/Old KMZs/Heathrow SMR 20-14.kmz
similarity index 100%
rename from _data/SMR Files/EGLL/Previous .kmz files/Heathrow SMR 20-14.kmz
rename to _data/SMR Files/EGLL/Old KMZs/Heathrow SMR 20-14.kmz
diff --git a/_data/SMR Files/EGLL/Previous .kmz files/Heathrow SMR pre 20-14.kmz b/_data/SMR Files/EGLL/Old KMZs/Heathrow SMR pre 20-14.kmz
similarity index 100%
rename from _data/SMR Files/EGLL/Previous .kmz files/Heathrow SMR pre 20-14.kmz
rename to _data/SMR Files/EGLL/Old KMZs/Heathrow SMR pre 20-14.kmz
diff --git a/_data/SMR Files/EGLW/London Heliport (EGLW) SMR.kmz b/_data/SMR Files/EGLW/EGLW.kmz
similarity index 100%
rename from _data/SMR Files/EGLW/London Heliport (EGLW) SMR.kmz
rename to _data/SMR Files/EGLW/EGLW.kmz
diff --git a/_data/SMR Files/EGMC/EGMC SMR Helper 2014.kmz b/_data/SMR Files/EGMC/EGMC-Helper.kmz
similarity index 100%
rename from _data/SMR Files/EGMC/EGMC SMR Helper 2014.kmz
rename to _data/SMR Files/EGMC/EGMC-Helper.kmz
diff --git a/_data/SMR Files/EGMC/Southend SMR 2014.kmz b/_data/SMR Files/EGMC/EGMC.kmz
similarity index 100%
rename from _data/SMR Files/EGMC/Southend SMR 2014.kmz
rename to _data/SMR Files/EGMC/EGMC.kmz
diff --git a/_data/SMR Files/EGMC/EGMC SMR Helper 2013.kmz b/_data/SMR Files/EGMC/Old KMZs/EGMC SMR Helper 2013.kmz
similarity index 100%
rename from _data/SMR Files/EGMC/EGMC SMR Helper 2013.kmz
rename to _data/SMR Files/EGMC/Old KMZs/EGMC SMR Helper 2013.kmz
diff --git a/_data/SMR Files/EGMC/Southend SMR.kmz b/_data/SMR Files/EGMC/Old KMZs/Southend SMR (Old).kmz
similarity index 100%
rename from _data/SMR Files/EGMC/Southend SMR.kmz
rename to _data/SMR Files/EGMC/Old KMZs/Southend SMR (Old).kmz
diff --git a/_data/SMR Files/EGMC/Southend SMR (issue 949).kmz b/_data/SMR Files/EGMC/Old KMZs/Southend SMR (issue 949).kmz
similarity index 100%
rename from _data/SMR Files/EGMC/Southend SMR (issue 949).kmz
rename to _data/SMR Files/EGMC/Old KMZs/Southend SMR (issue 949).kmz
diff --git a/_data/SMR Files/EGMC/Southend SMR 2004.kmz b/_data/SMR Files/EGMC/Old KMZs/Southend SMR 2004.kmz
similarity index 100%
rename from _data/SMR Files/EGMC/Southend SMR 2004.kmz
rename to _data/SMR Files/EGMC/Old KMZs/Southend SMR 2004.kmz
diff --git a/_data/SMR Files/EGMC/Southend SMR 2008.kmz b/_data/SMR Files/EGMC/Old KMZs/Southend SMR 2008.kmz
similarity index 100%
rename from _data/SMR Files/EGMC/Southend SMR 2008.kmz
rename to _data/SMR Files/EGMC/Old KMZs/Southend SMR 2008.kmz
diff --git a/_data/SMR Files/EGMC/Southend SMR 2013.kmz b/_data/SMR Files/EGMC/Old KMZs/Southend SMR 2013.kmz
similarity index 100%
rename from _data/SMR Files/EGMC/Southend SMR 2013.kmz
rename to _data/SMR Files/EGMC/Old KMZs/Southend SMR 2013.kmz
diff --git a/_data/SMR Files/EGMD/Lydd SMR.kmz b/_data/SMR Files/EGMD/EGMD.kmz
similarity index 100%
rename from _data/SMR Files/EGMD/Lydd SMR.kmz
rename to _data/SMR Files/EGMD/EGMD.kmz
diff --git a/_data/SMR Files/EGNE/EGNE Gamston.kmz b/_data/SMR Files/EGNE/EGNE.kmz
similarity index 100%
rename from _data/SMR Files/EGNE/EGNE Gamston.kmz
rename to _data/SMR Files/EGNE/EGNE.kmz
diff --git a/_data/SMR Files/EGNH/Blackpool - EGNH SMR.kmz b/_data/SMR Files/EGNH/EGNH.kmz
similarity index 100%
rename from _data/SMR Files/EGNH/Blackpool - EGNH SMR.kmz
rename to _data/SMR Files/EGNH/EGNH.kmz
diff --git a/_data/SMR Files/EGNJ/Humberside SMR.kmz b/_data/SMR Files/EGNJ/EGNJ.kmz
similarity index 100%
rename from _data/SMR Files/EGNJ/Humberside SMR.kmz
rename to _data/SMR Files/EGNJ/EGNJ.kmz
diff --git a/_data/SMR Files/EGNL/Walney - EGNL SMR.kmz b/_data/SMR Files/EGNL/EGNL.kmz
similarity index 100%
rename from _data/SMR Files/EGNL/Walney - EGNL SMR.kmz
rename to _data/SMR Files/EGNL/EGNL.kmz
diff --git a/_data/SMR Files/EGNM/Leeds SMR.kmz b/_data/SMR Files/EGNM/EGNM.kmz
similarity index 100%
rename from _data/SMR Files/EGNM/Leeds SMR.kmz
rename to _data/SMR Files/EGNM/EGNM.kmz
diff --git a/_data/SMR Files/EGNR/Hawarden EGNR.kmz b/_data/SMR Files/EGNR/EGNR.kmz
similarity index 100%
rename from _data/SMR Files/EGNR/Hawarden EGNR.kmz
rename to _data/SMR Files/EGNR/EGNR.kmz
diff --git a/_data/SMR Files/EGNS/Isle of Man SMR.kmz b/_data/SMR Files/EGNS/EGNS.kmz
similarity index 100%
rename from _data/SMR Files/EGNS/Isle of Man SMR.kmz
rename to _data/SMR Files/EGNS/EGNS.kmz
diff --git a/_data/SMR Files/EGNT/EGNT_2022_3.kmz b/_data/SMR Files/EGNT/EGNT.kmz
similarity index 100%
rename from _data/SMR Files/EGNT/EGNT_2022_3.kmz
rename to _data/SMR Files/EGNT/EGNT.kmz
diff --git a/_data/SMR Files/EGNT/Newcastle SMR.kmz b/_data/SMR Files/EGNT/Old KMZs/Newcastle SMR (OLD).kmz
similarity index 100%
rename from _data/SMR Files/EGNT/Newcastle SMR.kmz
rename to _data/SMR Files/EGNT/Old KMZs/Newcastle SMR (OLD).kmz
diff --git a/_data/SMR Files/EGPA/Kirkwall SMR.kmz b/_data/SMR Files/EGPA/EGPA.kmz
similarity index 100%
rename from _data/SMR Files/EGPA/Kirkwall SMR.kmz
rename to _data/SMR Files/EGPA/EGPA.kmz
diff --git a/_data/SMR Files/EGPD/Aberdeen SMR 2009.kmz b/_data/SMR Files/EGPD/EGPD.kmz
similarity index 100%
rename from _data/SMR Files/EGPD/Aberdeen SMR 2009.kmz
rename to _data/SMR Files/EGPD/EGPD.kmz
diff --git a/_data/SMR Files/EGPD/Aberdeen SMR.kmz b/_data/SMR Files/EGPD/Old KMZs/Aberdeen SMR (OLD).kmz
similarity index 100%
rename from _data/SMR Files/EGPD/Aberdeen SMR.kmz
rename to _data/SMR Files/EGPD/Old KMZs/Aberdeen SMR (OLD).kmz
diff --git a/_data/SMR Files/EGPE/EGPE_SMR_Additions_2208.kmz b/_data/SMR Files/EGPE/EGPE-Incomplete.kmz
similarity index 100%
rename from _data/SMR Files/EGPE/EGPE_SMR_Additions_2208.kmz
rename to _data/SMR Files/EGPE/EGPE-Incomplete.kmz
diff --git a/_data/SMR Files/EGPF/Glasgow SMR.kmz b/_data/SMR Files/EGPF/EGPF.kmz
similarity index 100%
rename from _data/SMR Files/EGPF/Glasgow SMR.kmz
rename to _data/SMR Files/EGPF/EGPF.kmz
diff --git a/_data/SMR Files/EGPH/Edinburgh SMR.kmz b/_data/SMR Files/EGPH/EGPH.kmz
similarity index 100%
rename from _data/SMR Files/EGPH/Edinburgh SMR.kmz
rename to _data/SMR Files/EGPH/EGPH.kmz
diff --git a/_data/SMR Files/EGPN/Dundee SMR.kmz b/_data/SMR Files/EGPN/EGPN.kmz
similarity index 100%
rename from _data/SMR Files/EGPN/Dundee SMR.kmz
rename to _data/SMR Files/EGPN/EGPN.kmz
diff --git a/_data/SMR Files/EGPO/Stornoway - EGPO SMR.kmz b/_data/SMR Files/EGPO/EGPO.kmz
similarity index 100%
rename from _data/SMR Files/EGPO/Stornoway - EGPO SMR.kmz
rename to _data/SMR Files/EGPO/EGPO.kmz
diff --git a/_data/SMR Files/EGSH/Norwich SMR.kmz b/_data/SMR Files/EGSH/EGSH.kmz
similarity index 100%
rename from _data/SMR Files/EGSH/Norwich SMR.kmz
rename to _data/SMR Files/EGSH/EGSH.kmz
diff --git a/_data/SMR Files/EGSS/Stansted SMR.kmz b/_data/SMR Files/EGSS/EGSS.kmz
similarity index 100%
rename from _data/SMR Files/EGSS/Stansted SMR.kmz
rename to _data/SMR Files/EGSS/EGSS.kmz
diff --git a/_data/SMR Files/EGSU/Duxford SMR.kmz b/_data/SMR Files/EGSU/EGSU.kmz
similarity index 100%
rename from _data/SMR Files/EGSU/Duxford SMR.kmz
rename to _data/SMR Files/EGSU/EGSU.kmz
diff --git a/_data/SMR Files/EGSY/EGSY (2113).kmz b/_data/SMR Files/EGSY/EGSY (2113).kmz
deleted file mode 100644
index 8f64508b0c..0000000000
Binary files a/_data/SMR Files/EGSY/EGSY (2113).kmz and /dev/null differ
diff --git a/_data/SMR Files/EGSY/EGSY.kmz b/_data/SMR Files/EGSY/EGSY.kmz
index d77e86fddb..8f64508b0c 100644
Binary files a/_data/SMR Files/EGSY/EGSY.kmz and b/_data/SMR Files/EGSY/EGSY.kmz differ
diff --git a/_data/SMR Files/EGSY/Old KMZs/EGSY (OLD).kmz b/_data/SMR Files/EGSY/Old KMZs/EGSY (OLD).kmz
new file mode 100644
index 0000000000..d77e86fddb
Binary files /dev/null and b/_data/SMR Files/EGSY/Old KMZs/EGSY (OLD).kmz differ
diff --git a/_data/SMR Files/EGTB/Wycombe SMR.kmz b/_data/SMR Files/EGTB/EGTB.kmz
similarity index 100%
rename from _data/SMR Files/EGTB/Wycombe SMR.kmz
rename to _data/SMR Files/EGTB/EGTB.kmz
diff --git a/_data/SMR Files/EGTC/Cranfield SMR.kmz b/_data/SMR Files/EGTC/EGTC.kmz
similarity index 100%
rename from _data/SMR Files/EGTC/Cranfield SMR.kmz
rename to _data/SMR Files/EGTC/EGTC.kmz
diff --git a/_data/SMR Files/EGTE/Exeter (EGTE) SMR.kmz b/_data/SMR Files/EGTE/EGTE.kmz
similarity index 100%
rename from _data/SMR Files/EGTE/Exeter (EGTE) SMR.kmz
rename to _data/SMR Files/EGTE/EGTE.kmz
diff --git a/_data/SMR Files/EGTF/EGTF.kmz b/_data/SMR Files/EGTF/EGTF.kmz
index e57eb2844a..64bda90ca3 100644
Binary files a/_data/SMR Files/EGTF/EGTF.kmz and b/_data/SMR Files/EGTF/EGTF.kmz differ
diff --git a/_data/SMR Files/EGTF/Fairoaks New SMR.kmz b/_data/SMR Files/EGTF/Fairoaks New SMR.kmz
deleted file mode 100644
index 64bda90ca3..0000000000
Binary files a/_data/SMR Files/EGTF/Fairoaks New SMR.kmz and /dev/null differ
diff --git a/_data/SMR Files/EGTF/Old KMZs/EGTF (OLD).kmz b/_data/SMR Files/EGTF/Old KMZs/EGTF (OLD).kmz
new file mode 100644
index 0000000000..e57eb2844a
Binary files /dev/null and b/_data/SMR Files/EGTF/Old KMZs/EGTF (OLD).kmz differ
diff --git a/_data/SMR Files/EGTO/EGTO Rochester.kmz b/_data/SMR Files/EGTO/EGTO.kmz
similarity index 100%
rename from _data/SMR Files/EGTO/EGTO Rochester.kmz
rename to _data/SMR Files/EGTO/EGTO.kmz
diff --git a/_data/SMR Files/EGWC/Cosford_SMR.kmz b/_data/SMR Files/EGWC/EGWC.kmz
similarity index 100%
rename from _data/SMR Files/EGWC/Cosford_SMR.kmz
rename to _data/SMR Files/EGWC/EGWC.kmz