diff --git a/macro/rich/geotest/RotPMT/CreateGeo/2015_minus10deg_LowerPart.gdml b/macro/rich/geotest/legacy/RotPMT/CreateGeo/2015_minus10deg_LowerPart.gdml
similarity index 100%
rename from macro/rich/geotest/RotPMT/CreateGeo/2015_minus10deg_LowerPart.gdml
rename to macro/rich/geotest/legacy/RotPMT/CreateGeo/2015_minus10deg_LowerPart.gdml
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/2015_minus10deg_LowerPart_ModAug2015.gdml b/macro/rich/geotest/legacy/RotPMT/CreateGeo/2015_minus10deg_LowerPart_ModAug2015.gdml
similarity index 100%
rename from macro/rich/geotest/RotPMT/CreateGeo/2015_minus10deg_LowerPart_ModAug2015.gdml
rename to macro/rich/geotest/legacy/RotPMT/CreateGeo/2015_minus10deg_LowerPart_ModAug2015.gdml
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/2015_minus10deg_UpperPart.gdml b/macro/rich/geotest/legacy/RotPMT/CreateGeo/2015_minus10deg_UpperPart.gdml
similarity index 100%
rename from macro/rich/geotest/RotPMT/CreateGeo/2015_minus10deg_UpperPart.gdml
rename to macro/rich/geotest/legacy/RotPMT/CreateGeo/2015_minus10deg_UpperPart.gdml
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfileNew.C b/macro/rich/geotest/legacy/RotPMT/CreateGeo/CreateGDMLfileNew.C
similarity index 100%
rename from macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfileNew.C
rename to macro/rich/geotest/legacy/RotPMT/CreateGeo/CreateGDMLfileNew.C
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfileNew_Dec2014.C b/macro/rich/geotest/legacy/RotPMT/CreateGeo/CreateGDMLfileNew_Dec2014.C
similarity index 100%
rename from macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfileNew_Dec2014.C
rename to macro/rich/geotest/legacy/RotPMT/CreateGeo/CreateGDMLfileNew_Dec2014.C
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfileOld.C b/macro/rich/geotest/legacy/RotPMT/CreateGeo/CreateGDMLfileOld.C
similarity index 100%
rename from macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfileOld.C
rename to macro/rich/geotest/legacy/RotPMT/CreateGeo/CreateGDMLfileOld.C
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_April2015.C b/macro/rich/geotest/legacy/RotPMT/CreateGeo/CreateGDMLfile_April2015.C
similarity index 100%
rename from macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_April2015.C
rename to macro/rich/geotest/legacy/RotPMT/CreateGeo/CreateGDMLfile_April2015.C
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_April2015_ModAug2015.C b/macro/rich/geotest/legacy/RotPMT/CreateGeo/CreateGDMLfile_April2015_ModAug2015.C
similarity index 100%
rename from macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_April2015_ModAug2015.C
rename to macro/rich/geotest/legacy/RotPMT/CreateGeo/CreateGDMLfile_April2015_ModAug2015.C
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_April2015_ModOct2015.C b/macro/rich/geotest/legacy/RotPMT/CreateGeo/CreateGDMLfile_April2015_ModOct2015.C
similarity index 100%
rename from macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_April2015_ModOct2015.C
rename to macro/rich/geotest/legacy/RotPMT/CreateGeo/CreateGDMLfile_April2015_ModOct2015.C
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_ExtMirrOct2015.C b/macro/rich/geotest/legacy/RotPMT/CreateGeo/CreateGDMLfile_ExtMirrOct2015.C
similarity index 100%
rename from macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_ExtMirrOct2015.C
rename to macro/rich/geotest/legacy/RotPMT/CreateGeo/CreateGDMLfile_ExtMirrOct2015.C
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/CreateInputForGeo.C b/macro/rich/geotest/legacy/RotPMT/CreateGeo/CreateInputForGeo.C
similarity index 100%
rename from macro/rich/geotest/RotPMT/CreateGeo/CreateInputForGeo.C
rename to macro/rich/geotest/legacy/RotPMT/CreateGeo/CreateInputForGeo.C
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/CreateReducedGDMLfileNew.C b/macro/rich/geotest/legacy/RotPMT/CreateGeo/CreateReducedGDMLfileNew.C
similarity index 100%
rename from macro/rich/geotest/RotPMT/CreateGeo/CreateReducedGDMLfileNew.C
rename to macro/rich/geotest/legacy/RotPMT/CreateGeo/CreateReducedGDMLfileNew.C
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/GdmlLowerPart.txt b/macro/rich/geotest/legacy/RotPMT/CreateGeo/GdmlLowerPart.txt
similarity index 100%
rename from macro/rich/geotest/RotPMT/CreateGeo/GdmlLowerPart.txt
rename to macro/rich/geotest/legacy/RotPMT/CreateGeo/GdmlLowerPart.txt
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/GdmlLowerPart_CO2.txt b/macro/rich/geotest/legacy/RotPMT/CreateGeo/GdmlLowerPart_CO2.txt
similarity index 100%
rename from macro/rich/geotest/RotPMT/CreateGeo/GdmlLowerPart_CO2.txt
rename to macro/rich/geotest/legacy/RotPMT/CreateGeo/GdmlLowerPart_CO2.txt
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/GdmlLowerPart_Dec2014.txt b/macro/rich/geotest/legacy/RotPMT/CreateGeo/GdmlLowerPart_Dec2014.txt
similarity index 100%
rename from macro/rich/geotest/RotPMT/CreateGeo/GdmlLowerPart_Dec2014.txt
rename to macro/rich/geotest/legacy/RotPMT/CreateGeo/GdmlLowerPart_Dec2014.txt
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/GdmlLowerPart_reduced.txt b/macro/rich/geotest/legacy/RotPMT/CreateGeo/GdmlLowerPart_reduced.txt
similarity index 100%
rename from macro/rich/geotest/RotPMT/CreateGeo/GdmlLowerPart_reduced.txt
rename to macro/rich/geotest/legacy/RotPMT/CreateGeo/GdmlLowerPart_reduced.txt
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/GdmlUpperPart.txt b/macro/rich/geotest/legacy/RotPMT/CreateGeo/GdmlUpperPart.txt
similarity index 100%
rename from macro/rich/geotest/RotPMT/CreateGeo/GdmlUpperPart.txt
rename to macro/rich/geotest/legacy/RotPMT/CreateGeo/GdmlUpperPart.txt
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/GdmlUpperPart_Dec2014.txt b/macro/rich/geotest/legacy/RotPMT/CreateGeo/GdmlUpperPart_Dec2014.txt
similarity index 100%
rename from macro/rich/geotest/RotPMT/CreateGeo/GdmlUpperPart_Dec2014.txt
rename to macro/rich/geotest/legacy/RotPMT/CreateGeo/GdmlUpperPart_Dec2014.txt
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/GdmlUpperPart_reduced.txt b/macro/rich/geotest/legacy/RotPMT/CreateGeo/GdmlUpperPart_reduced.txt
similarity index 100%
rename from macro/rich/geotest/RotPMT/CreateGeo/GdmlUpperPart_reduced.txt
rename to macro/rich/geotest/legacy/RotPMT/CreateGeo/GdmlUpperPart_reduced.txt
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/Lower.txt b/macro/rich/geotest/legacy/RotPMT/CreateGeo/Lower.txt
similarity index 100%
rename from macro/rich/geotest/RotPMT/CreateGeo/Lower.txt
rename to macro/rich/geotest/legacy/RotPMT/CreateGeo/Lower.txt
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/Upper_RotMir_m10.txt b/macro/rich/geotest/legacy/RotPMT/CreateGeo/Upper_RotMir_m10.txt
similarity index 100%
rename from macro/rich/geotest/RotPMT/CreateGeo/Upper_RotMir_m10.txt
rename to macro/rich/geotest/legacy/RotPMT/CreateGeo/Upper_RotMir_m10.txt
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/create_RICH_geo_file.C b/macro/rich/geotest/legacy/RotPMT/CreateGeo/create_RICH_geo_file.C
similarity index 100%
rename from macro/rich/geotest/RotPMT/CreateGeo/create_RICH_geo_file.C
rename to macro/rich/geotest/legacy/RotPMT/CreateGeo/create_RICH_geo_file.C
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/minus10deg_ext_mirror_LowerPart.gdml b/macro/rich/geotest/legacy/RotPMT/CreateGeo/minus10deg_ext_mirror_LowerPart.gdml
similarity index 100%
rename from macro/rich/geotest/RotPMT/CreateGeo/minus10deg_ext_mirror_LowerPart.gdml
rename to macro/rich/geotest/legacy/RotPMT/CreateGeo/minus10deg_ext_mirror_LowerPart.gdml
diff --git a/macro/rich/geotest/RotPMT/Import_GDML_Export_ROOT.c b/macro/rich/geotest/legacy/RotPMT/Import_GDML_Export_ROOT.c
similarity index 100%
rename from macro/rich/geotest/RotPMT/Import_GDML_Export_ROOT.c
rename to macro/rich/geotest/legacy/RotPMT/Import_GDML_Export_ROOT.c
diff --git a/macro/rich/geotest/RotPMT/RunSimOnBatch.sh b/macro/rich/geotest/legacy/RotPMT/RunSimOnBatch.sh
similarity index 100%
rename from macro/rich/geotest/RotPMT/RunSimOnBatch.sh
rename to macro/rich/geotest/legacy/RotPMT/RunSimOnBatch.sh
diff --git a/macro/rich/geotest/RotPMT/Run_Ana_GeoOpt_Batch.C b/macro/rich/geotest/legacy/RotPMT/Run_Ana_GeoOpt_Batch.C
similarity index 100%
rename from macro/rich/geotest/RotPMT/Run_Ana_GeoOpt_Batch.C
rename to macro/rich/geotest/legacy/RotPMT/Run_Ana_GeoOpt_Batch.C
diff --git a/macro/rich/geotest/RotPMT/Run_Reco_GeoOpt_Batch.C b/macro/rich/geotest/legacy/RotPMT/Run_Reco_GeoOpt_Batch.C
similarity index 100%
rename from macro/rich/geotest/RotPMT/Run_Reco_GeoOpt_Batch.C
rename to macro/rich/geotest/legacy/RotPMT/Run_Reco_GeoOpt_Batch.C
diff --git a/macro/rich/geotest/RotPMT/Run_Sim_GeoOpt_Batch.C b/macro/rich/geotest/legacy/RotPMT/Run_Sim_GeoOpt_Batch.C
similarity index 100%
rename from macro/rich/geotest/RotPMT/Run_Sim_GeoOpt_Batch.C
rename to macro/rich/geotest/legacy/RotPMT/Run_Sim_GeoOpt_Batch.C
diff --git a/macro/rich/geotest/RotPMT/SendJobs.sh b/macro/rich/geotest/legacy/RotPMT/SendJobs.sh
similarity index 100%
rename from macro/rich/geotest/RotPMT/SendJobs.sh
rename to macro/rich/geotest/legacy/RotPMT/SendJobs.sh
diff --git a/macro/rich/geotest/RotPMT/SendJobsToBatch.sh b/macro/rich/geotest/legacy/RotPMT/SendJobsToBatch.sh
similarity index 100%
rename from macro/rich/geotest/RotPMT/SendJobsToBatch.sh
rename to macro/rich/geotest/legacy/RotPMT/SendJobsToBatch.sh
diff --git a/macro/rich/geotest/RotPMT/SendJobsToBatch_Rot.sh b/macro/rich/geotest/legacy/RotPMT/SendJobsToBatch_Rot.sh
similarity index 100%
rename from macro/rich/geotest/RotPMT/SendJobsToBatch_Rot.sh
rename to macro/rich/geotest/legacy/RotPMT/SendJobsToBatch_Rot.sh
diff --git a/macro/rich/geotest/RotPMT/SendSimBatch.sh b/macro/rich/geotest/legacy/RotPMT/SendSimBatch.sh
similarity index 100%
rename from macro/rich/geotest/RotPMT/SendSimBatch.sh
rename to macro/rich/geotest/legacy/RotPMT/SendSimBatch.sh
diff --git a/macro/rich/geotest/RotPMT/eventDisplay.C b/macro/rich/geotest/legacy/RotPMT/eventDisplay.C
similarity index 100%
rename from macro/rich/geotest/RotPMT/eventDisplay.C
rename to macro/rich/geotest/legacy/RotPMT/eventDisplay.C
diff --git a/macro/rich/geotest/TransPMT/CreateGeo/2015_minus10degLower.txt b/macro/rich/geotest/legacy/TransPMT/CreateGeo/2015_minus10degLower.txt
similarity index 100%
rename from macro/rich/geotest/TransPMT/CreateGeo/2015_minus10degLower.txt
rename to macro/rich/geotest/legacy/TransPMT/CreateGeo/2015_minus10degLower.txt
diff --git a/macro/rich/geotest/TransPMT/CreateGeo/2015_minus10deg_.gdml b/macro/rich/geotest/legacy/TransPMT/CreateGeo/2015_minus10deg_.gdml
similarity index 100%
rename from macro/rich/geotest/TransPMT/CreateGeo/2015_minus10deg_.gdml
rename to macro/rich/geotest/legacy/TransPMT/CreateGeo/2015_minus10deg_.gdml
diff --git a/macro/rich/geotest/TransPMT/CreateGeo/2015_minus10deg_LowerPart.gdml b/macro/rich/geotest/legacy/TransPMT/CreateGeo/2015_minus10deg_LowerPart.gdml
similarity index 100%
rename from macro/rich/geotest/TransPMT/CreateGeo/2015_minus10deg_LowerPart.gdml
rename to macro/rich/geotest/legacy/TransPMT/CreateGeo/2015_minus10deg_LowerPart.gdml
diff --git a/macro/rich/geotest/TransPMT/CreateGeo/2015_minus10deg_UpperPart.gdml b/macro/rich/geotest/legacy/TransPMT/CreateGeo/2015_minus10deg_UpperPart.gdml
similarity index 100%
rename from macro/rich/geotest/TransPMT/CreateGeo/2015_minus10deg_UpperPart.gdml
rename to macro/rich/geotest/legacy/TransPMT/CreateGeo/2015_minus10deg_UpperPart.gdml
diff --git a/macro/rich/geotest/TransPMT/CreateGeo/CreateGDMLfile_April2015.C b/macro/rich/geotest/legacy/TransPMT/CreateGeo/CreateGDMLfile_April2015.C
similarity index 100%
rename from macro/rich/geotest/TransPMT/CreateGeo/CreateGDMLfile_April2015.C
rename to macro/rich/geotest/legacy/TransPMT/CreateGeo/CreateGDMLfile_April2015.C
diff --git a/macro/rich/geotest/TransPMT/CreateGeo/CreateTransGDMLfile_April2015.C b/macro/rich/geotest/legacy/TransPMT/CreateGeo/CreateTransGDMLfile_April2015.C
similarity index 100%
rename from macro/rich/geotest/TransPMT/CreateGeo/CreateTransGDMLfile_April2015.C
rename to macro/rich/geotest/legacy/TransPMT/CreateGeo/CreateTransGDMLfile_April2015.C
diff --git a/macro/rich/geotest/TransPMT/CreateGeo/GDML_to_ROOT_Trans.C b/macro/rich/geotest/legacy/TransPMT/CreateGeo/GDML_to_ROOT_Trans.C
similarity index 100%
rename from macro/rich/geotest/TransPMT/CreateGeo/GDML_to_ROOT_Trans.C
rename to macro/rich/geotest/legacy/TransPMT/CreateGeo/GDML_to_ROOT_Trans.C
diff --git a/macro/rich/geotest/TransPMT/CreateGeo/Import_GDML_Export_ROOT.c b/macro/rich/geotest/legacy/TransPMT/CreateGeo/Import_GDML_Export_ROOT.c
similarity index 100%
rename from macro/rich/geotest/TransPMT/CreateGeo/Import_GDML_Export_ROOT.c
rename to macro/rich/geotest/legacy/TransPMT/CreateGeo/Import_GDML_Export_ROOT.c
diff --git a/macro/rich/geotest/TransPMT/RunSimOnBatch.sh b/macro/rich/geotest/legacy/TransPMT/RunSimOnBatch.sh
similarity index 100%
rename from macro/rich/geotest/TransPMT/RunSimOnBatch.sh
rename to macro/rich/geotest/legacy/TransPMT/RunSimOnBatch.sh
diff --git a/macro/rich/geotest/TransPMT/Run_Ana_GeoOpt_Batch.C b/macro/rich/geotest/legacy/TransPMT/Run_Ana_GeoOpt_Batch.C
similarity index 100%
rename from macro/rich/geotest/TransPMT/Run_Ana_GeoOpt_Batch.C
rename to macro/rich/geotest/legacy/TransPMT/Run_Ana_GeoOpt_Batch.C
diff --git a/macro/rich/geotest/TransPMT/Run_Reco_GeoOpt_Batch.C b/macro/rich/geotest/legacy/TransPMT/Run_Reco_GeoOpt_Batch.C
similarity index 100%
rename from macro/rich/geotest/TransPMT/Run_Reco_GeoOpt_Batch.C
rename to macro/rich/geotest/legacy/TransPMT/Run_Reco_GeoOpt_Batch.C
diff --git a/macro/rich/geotest/TransPMT/Run_Sim_GeoOpt_Batch.C b/macro/rich/geotest/legacy/TransPMT/Run_Sim_GeoOpt_Batch.C
similarity index 100%
rename from macro/rich/geotest/TransPMT/Run_Sim_GeoOpt_Batch.C
rename to macro/rich/geotest/legacy/TransPMT/Run_Sim_GeoOpt_Batch.C
diff --git a/macro/rich/geotest/TransPMT/SendSimBatch.sh b/macro/rich/geotest/legacy/TransPMT/SendSimBatch.sh
similarity index 100%
rename from macro/rich/geotest/TransPMT/SendSimBatch.sh
rename to macro/rich/geotest/legacy/TransPMT/SendSimBatch.sh
diff --git a/macro/rich/geotest/TransPMT/SendSimBatch_10.sh b/macro/rich/geotest/legacy/TransPMT/SendSimBatch_10.sh
similarity index 100%
rename from macro/rich/geotest/TransPMT/SendSimBatch_10.sh
rename to macro/rich/geotest/legacy/TransPMT/SendSimBatch_10.sh