diff --git a/test/files/real/1-CO106833.007 - 2019-07-04 1120 - Final - 1.ags b/test/files/real/AGS3/1-CO106833.007 - 2019-07-04 1120 - Final - 1.ags
similarity index 100%
rename from test/files/real/1-CO106833.007 - 2019-07-04 1120 - Final - 1.ags
rename to test/files/real/AGS3/1-CO106833.007 - 2019-07-04 1120 - Final - 1.ags
diff --git a/test/files/real/101145.ags b/test/files/real/AGS3/101145.ags
similarity index 100%
rename from test/files/real/101145.ags
rename to test/files/real/AGS3/101145.ags
diff --git a/test/files/real/132028.ags b/test/files/real/AGS3/132028.ags
similarity index 100%
rename from test/files/real/132028.ags
rename to test/files/real/AGS3/132028.ags
diff --git a/test/files/real/19684.ags b/test/files/real/AGS3/19684.ags
similarity index 100%
rename from test/files/real/19684.ags
rename to test/files/real/AGS3/19684.ags
diff --git a/test/files/real/1AB76CEF (2).ags b/test/files/real/AGS3/1AB76CEF (2).ags
similarity index 100%
rename from test/files/real/1AB76CEF (2).ags
rename to test/files/real/AGS3/1AB76CEF (2).ags
diff --git a/test/files/real/205119F5 (2).ags b/test/files/real/AGS3/205119F5 (2).ags
similarity index 100%
rename from test/files/real/205119F5 (2).ags
rename to test/files/real/AGS3/205119F5 (2).ags
diff --git a/test/files/real/21-7-10-NLE(2).ags b/test/files/real/AGS3/21-7-10-NLE(2).ags
similarity index 100%
rename from test/files/real/21-7-10-NLE(2).ags
rename to test/files/real/AGS3/21-7-10-NLE(2).ags
diff --git a/test/files/real/23551KD05-06-15.ags b/test/files/real/AGS3/23551KD05-06-15.ags
similarity index 100%
rename from test/files/real/23551KD05-06-15.ags
rename to test/files/real/AGS3/23551KD05-06-15.ags
diff --git a/test/files/real/24C39411.AGS b/test/files/real/AGS3/24C39411.AGS
similarity index 100%
rename from test/files/real/24C39411.AGS
rename to test/files/real/AGS3/24C39411.AGS
diff --git a/test/files/real/29663.ags b/test/files/real/AGS3/29663.ags
similarity index 100%
rename from test/files/real/29663.ags
rename to test/files/real/AGS3/29663.ags
diff --git a/test/files/real/2A37870A (2).ags b/test/files/real/AGS3/2A37870A (2).ags
similarity index 100%
rename from test/files/real/2A37870A (2).ags
rename to test/files/real/AGS3/2A37870A (2).ags
diff --git a/test/files/real/300d final.ags b/test/files/real/AGS3/300d final.ags
similarity index 100%
rename from test/files/real/300d final.ags
rename to test/files/real/AGS3/300d final.ags
diff --git a/test/files/real/3877B(a)GNRAIsteInvestigations-Easterhouse,Site1-StepfordRoad(DraftAGS).ags b/test/files/real/AGS3/3877B(a)GNRAIsteInvestigations-Easterhouse,Site1-StepfordRoad(DraftAGS).ags
similarity index 100%
rename from test/files/real/3877B(a)GNRAIsteInvestigations-Easterhouse,Site1-StepfordRoad(DraftAGS).ags
rename to test/files/real/AGS3/3877B(a)GNRAIsteInvestigations-Easterhouse,Site1-StepfordRoad(DraftAGS).ags
diff --git a/test/files/real/3877B(b)GNRASiteInvestigations-Easterhouse,Site2BlairtummockRoad(DraftAGS).ags b/test/files/real/AGS3/3877B(b)GNRASiteInvestigations-Easterhouse,Site2BlairtummockRoad(DraftAGS).ags
similarity index 100%
rename from test/files/real/3877B(b)GNRASiteInvestigations-Easterhouse,Site2BlairtummockRoad(DraftAGS).ags
rename to test/files/real/AGS3/3877B(b)GNRASiteInvestigations-Easterhouse,Site2BlairtummockRoad(DraftAGS).ags
diff --git a/test/files/real/41546.ags b/test/files/real/AGS3/41546.ags
similarity index 100%
rename from test/files/real/41546.ags
rename to test/files/real/AGS3/41546.ags
diff --git a/test/files/real/41563.ags b/test/files/real/AGS3/41563.ags
similarity index 100%
rename from test/files/real/41563.ags
rename to test/files/real/AGS3/41563.ags
diff --git a/test/files/real/437923A8 (2).ags b/test/files/real/AGS3/437923A8 (2).ags
similarity index 100%
rename from test/files/real/437923A8 (2).ags
rename to test/files/real/AGS3/437923A8 (2).ags
diff --git a/test/files/real/4642atotal.ags b/test/files/real/AGS3/4642atotal.ags
similarity index 100%
rename from test/files/real/4642atotal.ags
rename to test/files/real/AGS3/4642atotal.ags
diff --git a/test/files/real/5136919-2015-05-141134-Final-2.ags b/test/files/real/AGS3/5136919-2015-05-141134-Final-2.ags
similarity index 100%
rename from test/files/real/5136919-2015-05-141134-Final-2.ags
rename to test/files/real/AGS3/5136919-2015-05-141134-Final-2.ags
diff --git a/test/files/real/5142.ags b/test/files/real/AGS3/5142.ags
similarity index 100%
rename from test/files/real/5142.ags
rename to test/files/real/AGS3/5142.ags
diff --git a/test/files/real/5381rev.ags b/test/files/real/AGS3/5381rev.ags
similarity index 100%
rename from test/files/real/5381rev.ags
rename to test/files/real/AGS3/5381rev.ags
diff --git a/test/files/real/5441.ags b/test/files/real/AGS3/5441.ags
similarity index 100%
rename from test/files/real/5441.ags
rename to test/files/real/AGS3/5441.ags
diff --git a/test/files/real/5442.ags b/test/files/real/AGS3/5442.ags
similarity index 100%
rename from test/files/real/5442.ags
rename to test/files/real/AGS3/5442.ags
diff --git a/test/files/real/5444.ags b/test/files/real/AGS3/5444.ags
similarity index 100%
rename from test/files/real/5444.ags
rename to test/files/real/AGS3/5444.ags
diff --git a/test/files/real/5634.ags b/test/files/real/AGS3/5634.ags
similarity index 100%
rename from test/files/real/5634.ags
rename to test/files/real/AGS3/5634.ags
diff --git a/test/files/real/66D657CD (2).ags b/test/files/real/AGS3/66D657CD (2).ags
similarity index 100%
rename from test/files/real/66D657CD (2).ags
rename to test/files/real/AGS3/66D657CD (2).ags
diff --git a/test/files/real/727938.ags b/test/files/real/AGS3/727938.ags
similarity index 100%
rename from test/files/real/727938.ags
rename to test/files/real/AGS3/727938.ags
diff --git a/test/files/real/A1001.ags b/test/files/real/AGS3/A1001.ags
similarity index 100%
rename from test/files/real/A1001.ags
rename to test/files/real/AGS3/A1001.ags
diff --git a/test/files/real/A1031.ags b/test/files/real/AGS3/A1031.ags
similarity index 100%
rename from test/files/real/A1031.ags
rename to test/files/real/AGS3/A1031.ags
diff --git a/test/files/real/A1047.ags b/test/files/real/AGS3/A1047.ags
similarity index 100%
rename from test/files/real/A1047.ags
rename to test/files/real/AGS3/A1047.ags
diff --git a/test/files/real/A1077.ags b/test/files/real/AGS3/A1077.ags
similarity index 100%
rename from test/files/real/A1077.ags
rename to test/files/real/AGS3/A1077.ags
diff --git a/test/files/real/A112794-70 - 2021-02-05 1018 - Final - 1.ags b/test/files/real/AGS3/A112794-70 - 2021-02-05 1018 - Final - 1.ags
similarity index 100%
rename from test/files/real/A112794-70 - 2021-02-05 1018 - Final - 1.ags
rename to test/files/real/AGS3/A112794-70 - 2021-02-05 1018 - Final - 1.ags
diff --git a/test/files/real/A13098.ags b/test/files/real/AGS3/A13098.ags
similarity index 100%
rename from test/files/real/A13098.ags
rename to test/files/real/AGS3/A13098.ags
diff --git a/test/files/real/A2025.ags b/test/files/real/AGS3/A2025.ags
similarity index 100%
rename from test/files/real/A2025.ags
rename to test/files/real/AGS3/A2025.ags
diff --git a/test/files/real/A3040_03.ags b/test/files/real/AGS3/A3040_03.ags
similarity index 100%
rename from test/files/real/A3040_03.ags
rename to test/files/real/AGS3/A3040_03.ags
diff --git a/test/files/real/A3092_04.ags b/test/files/real/AGS3/A3092_04.ags
similarity index 100%
rename from test/files/real/A3092_04.ags
rename to test/files/real/AGS3/A3092_04.ags
diff --git a/test/files/real/A4026-14.ags b/test/files/real/AGS3/A4026-14.ags
similarity index 100%
rename from test/files/real/A4026-14.ags
rename to test/files/real/AGS3/A4026-14.ags
diff --git a/test/files/real/A4106.ags b/test/files/real/AGS3/A4106.ags
similarity index 100%
rename from test/files/real/A4106.ags
rename to test/files/real/AGS3/A4106.ags
diff --git a/test/files/real/A5009a_06.ags b/test/files/real/AGS3/A5009a_06.ags
similarity index 100%
rename from test/files/real/A5009a_06.ags
rename to test/files/real/AGS3/A5009a_06.ags
diff --git a/test/files/real/A5133_1.ags b/test/files/real/AGS3/A5133_1.ags
similarity index 100%
rename from test/files/real/A5133_1.ags
rename to test/files/real/AGS3/A5133_1.ags
diff --git a/test/files/real/A5133_3.ags b/test/files/real/AGS3/A5133_3.ags
similarity index 100%
rename from test/files/real/A5133_3.ags
rename to test/files/real/AGS3/A5133_3.ags
diff --git a/test/files/real/A5133_4.ags b/test/files/real/AGS3/A5133_4.ags
similarity index 100%
rename from test/files/real/A5133_4.ags
rename to test/files/real/AGS3/A5133_4.ags
diff --git a/test/files/real/A6054_06.ags b/test/files/real/AGS3/A6054_06.ags
similarity index 100%
rename from test/files/real/A6054_06.ags
rename to test/files/real/AGS3/A6054_06.ags
diff --git a/test/files/real/A7096_2.ags b/test/files/real/AGS3/A7096_2.ags
similarity index 100%
rename from test/files/real/A7096_2.ags
rename to test/files/real/AGS3/A7096_2.ags
diff --git a/test/files/real/A8152_A.ags b/test/files/real/AGS3/A8152_A.ags
similarity index 100%
rename from test/files/real/A8152_A.ags
rename to test/files/real/AGS3/A8152_A.ags
diff --git a/test/files/real/A9003.ags b/test/files/real/AGS3/A9003.ags
similarity index 100%
rename from test/files/real/A9003.ags
rename to test/files/real/AGS3/A9003.ags
diff --git a/test/files/real/A9093.ags b/test/files/real/AGS3/A9093.ags
similarity index 100%
rename from test/files/real/A9093.ags
rename to test/files/real/AGS3/A9093.ags
diff --git a/test/files/real/Appendix_F_-_AGS_data.ags b/test/files/real/AGS3/Appendix_F_-_AGS_data.ags
similarity index 100%
rename from test/files/real/Appendix_F_-_AGS_data.ags
rename to test/files/real/AGS3/Appendix_F_-_AGS_data.ags
diff --git a/test/files/real/Babworth TPs.AGS b/test/files/real/AGS3/Babworth TPs.AGS
similarity index 99%
rename from test/files/real/Babworth TPs.AGS
rename to test/files/real/AGS3/Babworth TPs.AGS
index 286eef70..b6b2b936 100644
--- a/test/files/real/Babworth TPs.AGS	
+++ b/test/files/real/AGS3/Babworth TPs.AGS	
@@ -1,4 +1,3 @@
-
 "**PROJ"
 "*PROJ_ID","*PROJ_AGS","*PROJ_DATE"
 "<UNITS>","","dd/mm/yyyy"
diff --git a/test/files/real/C1052.ags b/test/files/real/AGS3/C1052.ags
similarity index 100%
rename from test/files/real/C1052.ags
rename to test/files/real/AGS3/C1052.ags
diff --git a/test/files/real/C13031.ags b/test/files/real/AGS3/C13031.ags
similarity index 100%
rename from test/files/real/C13031.ags
rename to test/files/real/AGS3/C13031.ags
diff --git a/test/files/real/C2030.ags b/test/files/real/AGS3/C2030.ags
similarity index 100%
rename from test/files/real/C2030.ags
rename to test/files/real/AGS3/C2030.ags
diff --git a/test/files/real/C3035.ags b/test/files/real/AGS3/C3035.ags
similarity index 100%
rename from test/files/real/C3035.ags
rename to test/files/real/AGS3/C3035.ags
diff --git a/test/files/real/C4050.ags b/test/files/real/AGS3/C4050.ags
similarity index 100%
rename from test/files/real/C4050.ags
rename to test/files/real/AGS3/C4050.ags
diff --git a/test/files/real/C6034.ags b/test/files/real/AGS3/C6034.ags
similarity index 100%
rename from test/files/real/C6034.ags
rename to test/files/real/AGS3/C6034.ags
diff --git a/test/files/real/C6048.ags b/test/files/real/AGS3/C6048.ags
similarity index 100%
rename from test/files/real/C6048.ags
rename to test/files/real/AGS3/C6048.ags
diff --git a/test/files/real/C6E82F4C (2).ags b/test/files/real/AGS3/C6E82F4C (2).ags
similarity index 100%
rename from test/files/real/C6E82F4C (2).ags
rename to test/files/real/AGS3/C6E82F4C (2).ags
diff --git a/test/files/real/C7023.ags b/test/files/real/AGS3/C7023.ags
similarity index 100%
rename from test/files/real/C7023.ags
rename to test/files/real/AGS3/C7023.ags
diff --git a/test/files/real/C8011.ags b/test/files/real/AGS3/C8011.ags
similarity index 100%
rename from test/files/real/C8011.ags
rename to test/files/real/AGS3/C8011.ags
diff --git a/test/files/real/CG014058_F.ags b/test/files/real/AGS3/CG014058_F.ags
similarity index 100%
rename from test/files/real/CG014058_F.ags
rename to test/files/real/AGS3/CG014058_F.ags
diff --git a/test/files/real/Castleford Junction Lock.ags b/test/files/real/AGS3/Castleford Junction Lock.ags
similarity index 100%
rename from test/files/real/Castleford Junction Lock.ags
rename to test/files/real/AGS3/Castleford Junction Lock.ags
diff --git a/test/files/real/Cowlairs park.ags b/test/files/real/AGS3/Cowlairs park.ags
similarity index 100%
rename from test/files/real/Cowlairs park.ags
rename to test/files/real/AGS3/Cowlairs park.ags
diff --git a/test/files/real/DB9E33D5 (2).ags b/test/files/real/AGS3/DB9E33D5 (2).ags
similarity index 100%
rename from test/files/real/DB9E33D5 (2).ags
rename to test/files/real/AGS3/DB9E33D5 (2).ags
diff --git a/test/files/real/E52A4379 (2).ags b/test/files/real/AGS3/E52A4379 (2).ags
similarity index 100%
rename from test/files/real/E52A4379 (2).ags
rename to test/files/real/AGS3/E52A4379 (2).ags
diff --git a/test/files/real/ECFFEF3A (2).ags b/test/files/real/AGS3/ECFFEF3A (2).ags
similarity index 100%
rename from test/files/real/ECFFEF3A (2).ags
rename to test/files/real/AGS3/ECFFEF3A (2).ags
diff --git a/test/files/real/F11661_F.AGS b/test/files/real/AGS3/F11661_F.AGS
similarity index 100%
rename from test/files/real/F11661_F.AGS
rename to test/files/real/AGS3/F11661_F.AGS
diff --git a/test/files/real/F11724_F.ags b/test/files/real/AGS3/F11724_F.ags
similarity index 100%
rename from test/files/real/F11724_F.ags
rename to test/files/real/AGS3/F11724_F.ags
diff --git a/test/files/real/F4002-14.ags b/test/files/real/AGS3/F4002-14.ags
similarity index 100%
rename from test/files/real/F4002-14.ags
rename to test/files/real/AGS3/F4002-14.ags
diff --git a/test/files/real/F4003-14.ags b/test/files/real/AGS3/F4003-14.ags
similarity index 100%
rename from test/files/real/F4003-14.ags
rename to test/files/real/AGS3/F4003-14.ags
diff --git a/test/files/real/F4004-14.ags b/test/files/real/AGS3/F4004-14.ags
similarity index 100%
rename from test/files/real/F4004-14.ags
rename to test/files/real/AGS3/F4004-14.ags
diff --git a/test/files/real/F4005-14.ags b/test/files/real/AGS3/F4005-14.ags
similarity index 100%
rename from test/files/real/F4005-14.ags
rename to test/files/real/AGS3/F4005-14.ags
diff --git a/test/files/real/F4016-14.ags b/test/files/real/AGS3/F4016-14.ags
similarity index 100%
rename from test/files/real/F4016-14.ags
rename to test/files/real/AGS3/F4016-14.ags
diff --git a/test/files/real/F4017-14.ags b/test/files/real/AGS3/F4017-14.ags
similarity index 100%
rename from test/files/real/F4017-14.ags
rename to test/files/real/AGS3/F4017-14.ags
diff --git a/test/files/real/F6102.ags b/test/files/real/AGS3/F6102.ags
similarity index 100%
rename from test/files/real/F6102.ags
rename to test/files/real/AGS3/F6102.ags
diff --git a/test/files/real/FINAL_06_03_2015.ags b/test/files/real/AGS3/FINAL_06_03_2015.ags
similarity index 100%
rename from test/files/real/FINAL_06_03_2015.ags
rename to test/files/real/AGS3/FINAL_06_03_2015.ags
diff --git a/test/files/real/G11004.ags b/test/files/real/AGS3/G11004.ags
similarity index 100%
rename from test/files/real/G11004.ags
rename to test/files/real/AGS3/G11004.ags
diff --git a/test/files/real/GCC_19934-1_Sighthill_PreviousSI_2006.ags b/test/files/real/AGS3/GCC_19934-1_Sighthill_PreviousSI_2006.ags
similarity index 100%
rename from test/files/real/GCC_19934-1_Sighthill_PreviousSI_2006.ags
rename to test/files/real/AGS3/GCC_19934-1_Sighthill_PreviousSI_2006.ags
diff --git a/test/files/real/GCC_19934-2_Sighthill_Phase1SI_14.02.13_gINT.ags b/test/files/real/AGS3/GCC_19934-2_Sighthill_Phase1SI_14.02.13_gINT.ags
similarity index 100%
rename from test/files/real/GCC_19934-2_Sighthill_Phase1SI_14.02.13_gINT.ags
rename to test/files/real/AGS3/GCC_19934-2_Sighthill_Phase1SI_14.02.13_gINT.ags
diff --git a/test/files/real/GCC_19934-3_Sighthill_Phase2SI_30.01.14_CHISremoved.ags b/test/files/real/AGS3/GCC_19934-3_Sighthill_Phase2SI_30.01.14_CHISremoved.ags
similarity index 100%
rename from test/files/real/GCC_19934-3_Sighthill_Phase2SI_30.01.14_CHISremoved.ags
rename to test/files/real/AGS3/GCC_19934-3_Sighthill_Phase2SI_30.01.14_CHISremoved.ags
diff --git a/test/files/real/GCC_19934-4_Sighthill_Phase3SI_20.03.15_CPTremoved.ags b/test/files/real/AGS3/GCC_19934-4_Sighthill_Phase3SI_20.03.15_CPTremoved.ags
similarity index 100%
rename from test/files/real/GCC_19934-4_Sighthill_Phase3SI_20.03.15_CPTremoved.ags
rename to test/files/real/AGS3/GCC_19934-4_Sighthill_Phase3SI_20.03.15_CPTremoved.ags
diff --git a/test/files/real/GCC_19934-5_Sighthill_RoadsGI_2016.ags b/test/files/real/AGS3/GCC_19934-5_Sighthill_RoadsGI_2016.ags
similarity index 100%
rename from test/files/real/GCC_19934-5_Sighthill_RoadsGI_2016.ags
rename to test/files/real/AGS3/GCC_19934-5_Sighthill_RoadsGI_2016.ags
diff --git a/test/files/real/M655R  2019-03-25  AGS export.ags b/test/files/real/AGS3/M655R  2019-03-25  AGS export.ags
similarity index 100%
rename from test/files/real/M655R  2019-03-25  AGS export.ags
rename to test/files/real/AGS3/M655R  2019-03-25  AGS export.ags
diff --git a/test/files/real/OPUS MORPETH AGS FINAL 13.08.18.ags b/test/files/real/AGS3/OPUS MORPETH AGS FINAL 13.08.18.ags
similarity index 100%
rename from test/files/real/OPUS MORPETH AGS FINAL 13.08.18.ags
rename to test/files/real/AGS3/OPUS MORPETH AGS FINAL 13.08.18.ags
diff --git a/test/files/real/PE120990.ags b/test/files/real/AGS3/PE120990.ags
similarity index 100%
rename from test/files/real/PE120990.ags
rename to test/files/real/AGS3/PE120990.ags
diff --git a/test/files/real/PE131061.ags b/test/files/real/AGS3/PE131061.ags
similarity index 100%
rename from test/files/real/PE131061.ags
rename to test/files/real/AGS3/PE131061.ags
diff --git a/test/files/real/PE141097.ags b/test/files/real/AGS3/PE141097.ags
similarity index 100%
rename from test/files/real/PE141097.ags
rename to test/files/real/AGS3/PE141097.ags
diff --git a/test/files/real/PE141099.ags b/test/files/real/AGS3/PE141099.ags
similarity index 100%
rename from test/files/real/PE141099.ags
rename to test/files/real/AGS3/PE141099.ags
diff --git a/test/files/real/PE141124.ags b/test/files/real/AGS3/PE141124.ags
similarity index 100%
rename from test/files/real/PE141124.ags
rename to test/files/real/AGS3/PE141124.ags
diff --git a/test/files/real/PE141134.ags b/test/files/real/AGS3/PE141134.ags
similarity index 100%
rename from test/files/real/PE141134.ags
rename to test/files/real/AGS3/PE141134.ags
diff --git a/test/files/real/PE141152.ags b/test/files/real/AGS3/PE141152.ags
similarity index 100%
rename from test/files/real/PE141152.ags
rename to test/files/real/AGS3/PE141152.ags
diff --git a/test/files/real/PE141176.ags b/test/files/real/AGS3/PE141176.ags
similarity index 100%
rename from test/files/real/PE141176.ags
rename to test/files/real/AGS3/PE141176.ags
diff --git a/test/files/real/PE151184.ags b/test/files/real/AGS3/PE151184.ags
similarity index 100%
rename from test/files/real/PE151184.ags
rename to test/files/real/AGS3/PE151184.ags
diff --git a/test/files/real/PE151205.ags b/test/files/real/AGS3/PE151205.ags
similarity index 100%
rename from test/files/real/PE151205.ags
rename to test/files/real/AGS3/PE151205.ags
diff --git a/test/files/real/Redmile Embankment - Borehole Logs.ags b/test/files/real/AGS3/Redmile Embankment - Borehole Logs.ags
similarity index 100%
rename from test/files/real/Redmile Embankment - Borehole Logs.ags
rename to test/files/real/AGS3/Redmile Embankment - Borehole Logs.ags
diff --git a/test/files/real/TB7219F8.ags b/test/files/real/AGS3/TB7219F8.ags
similarity index 100%
rename from test/files/real/TB7219F8.ags
rename to test/files/real/AGS3/TB7219F8.ags
diff --git a/test/files/real/a5027.ags b/test/files/real/AGS3/a5027.ags
similarity index 100%
rename from test/files/real/a5027.ags
rename to test/files/real/AGS3/a5027.ags
diff --git a/test/files/real/f12426_Cor.ags b/test/files/real/AGS3/f12426_Cor.ags
similarity index 100%
rename from test/files/real/f12426_Cor.ags
rename to test/files/real/AGS3/f12426_Cor.ags
diff --git a/test/files/real/f12548_P.ags b/test/files/real/AGS3/f12548_P.ags
similarity index 100%
rename from test/files/real/f12548_P.ags
rename to test/files/real/AGS3/f12548_P.ags
diff --git a/test/files/real/f12743_P.ags b/test/files/real/AGS3/f12743_P.ags
similarity index 100%
rename from test/files/real/f12743_P.ags
rename to test/files/real/AGS3/f12743_P.ags
diff --git a/test/files/real/finalags3766Testosjunction.ags b/test/files/real/AGS3/finalags3766Testosjunction.ags
similarity index 100%
rename from test/files/real/finalags3766Testosjunction.ags
rename to test/files/real/AGS3/finalags3766Testosjunction.ags
diff --git a/test/fixtures.py b/test/fixtures.py
index 5d174441..2d36c1c7 100644
--- a/test/fixtures.py
+++ b/test/fixtures.py
@@ -12,11 +12,11 @@
     ('empty.ags', ('No valid AGS4 data found in input file.', 0)),
     ('dummy.xlsx', ("ERROR: Conversion failed", 4787)),
     ('random_binary.ags', ('No valid AGS4 data found in input file.', 1024)),
-    ('real/A3040_03.ags', ("ERROR: File contains duplicate headers", 264526)),
+    ('real/AGS3/A3040_03.ags', ("ERROR: File contains duplicate headers", 264526)),
     ('extension_is.bad', ("ERROR: extension_is.bad is not .ags or .xlsx format", 0)),
     ('real/JohnStPrimarySchool.ags', ("Line 27 does not have the same number of entries "
                                       "as the HEADING row in GEOL.", 12430)),
-    ('real/19684.ags', ("No valid AGS4 data found in input file.", 12542))
+    ('real/AGS3/19684.ags', ("No valid AGS4 data found in input file.", 12542))
 ]
 
 DICTIONARIES = {
diff --git a/test/fixtures_json.py b/test/fixtures_json.py
index 42878ca4..596d9aee 100644
--- a/test/fixtures_json.py
+++ b/test/fixtures_json.py
@@ -198,7 +198,7 @@
         'valid': False,
         'additional_metadata': {}
     },
-    'real/CG014058_F.ags': {
+    'real/AGS3/CG014058_F.ags': {
         'filename': 'CG014058_F.ags',
         'filesize': 50574,
         'checkers': ['python_ags4 v0.5.0'],
@@ -612,7 +612,7 @@
         'valid': False,
         'additional_metadata': {}
     },
-    'real/A3040_03.ags': {
+    'real/AGS3/A3040_03.ags': {
         'filename': 'A3040_03.ags',
         'filesize': 264526,
         'checkers': ['python_ags4 v0.5.0'],
diff --git a/test/unit/test_checkers.py b/test/unit/test_checkers.py
index 548357e6..0ddc6663 100644
--- a/test/unit/test_checkers.py
+++ b/test/unit/test_checkers.py
@@ -25,12 +25,12 @@
     ('nonsense.AGS', {'AGS Format Rule 2a', 'AGS Format Rule 3', 'AGS Format Rule 5', 'AGS Format Rule 13',
                       'AGS Format Rule 14', 'AGS Format Rule 15', 'AGS Format Rule 17'}),
     ('empty.ags', {'AGS Format Rule 13', 'AGS Format Rule 14', 'AGS Format Rule 15', 'AGS Format Rule 17'}),
-    ('real/A3040_03.ags', {'AGS Format Rule 3'}),
+    ('real/AGS3/A3040_03.ags', {'AGS Format Rule 3'}),
     ('real/43370.ags', {'General', 'AGS Format Rule 2a', 'AGS Format Rule 1'}),
     ('real/JohnStPrimarySchool.ags', {'AGS Format Rule 3', 'AGS Format Rule 5', 'AGS Format Rule ?',
                                       'AGS Format Rule 4', 'AGS Format Rule 2a'}),
-    ('real/19684.ags', {'AGS Format Rule 3'}),
-    ('real/E52A4379 (2).ags', {'AGS Format Rule 3'}),
+    ('real/AGS3/19684.ags', {'AGS Format Rule 3'}),
+    ('real/AGS3/E52A4379 (2).ags', {'AGS Format Rule 3'}),
 ])
 def test_check_ags(filename, expected_rules):
     """Check that broken rules are returned and exceptions handled correctly."""
@@ -63,13 +63,13 @@ def test_check_ags(filename, expected_rules):
      ['BGS data validation: Non-numeric coordinate types', 'BGS data validation: Spatial Referencing'], None),
     ('real/A112794-16 Glenally_Road_Factual_FINAL.ags',
      ['BGS data validation: Spatial Referencing', 'BGS data validation: LOCA within Great Britain'], None),
-    ('real/A3040_03.ags',
+    ('real/AGS3/A3040_03.ags',
      ['File read error'], 'ERROR: File contains duplicate headers'),
     ('real/43370.ags',  # File has no errors
      [], None),
     ('real/JohnStPrimarySchool.ags',
      ['File read error'], 'Line 27 does not have the same number of entries as the HEADING row in GEOL.'),
-    ('real/19684.ags',
+    ('real/AGS3/19684.ags',
      ['BGS data validation: Required Groups', 'BGS data validation: Required BGS Groups'], None),
     # This file crashes because it asks for user input
     # ('real/E52A4379 (2).ags', {}),