diff --git a/onlineGUI/CONFIG/HMS/PRODUCTION/hms_production.cfg b/onlineGUI/CONFIG/HMS/PRODUCTION/hms_production.cfg
index be1861371571e56f9663ccd43e8d18b5049b8ab9..7c6878aed2d11c67c8aa9542b62fbb165165c98c 100644
--- a/onlineGUI/CONFIG/HMS/PRODUCTION/hms_production.cfg
+++ b/onlineGUI/CONFIG/HMS/PRODUCTION/hms_production.cfg
@@ -114,18 +114,12 @@ hcal_hB_good_pped_vs_pmt_neg -nostat
 hcal_hC_good_pped_vs_pmt_pos -nostat
 hcal_hD_good_pped_vs_pmt_pos -nostat
 
-newpage 4 3 
+newpage 2 2 
 title HMS DC Reference Time
 htrig_hdc_ref1 -nostat
 htrig_hdc_ref2 -nostat
 htrig_hdc_ref3 -nostat
 htrig_hdc_ref4 -nostat
-hdc_refdiff_1m2 -nostat
-hdc_refdiff_1m3 -nostat
-hdc_refdiff_1m4 -nostat
-hdc_refdiff_2m3 -nostat
-hdc_refdiff_2m4 -nostat
-hdc_refdiff_3m4 -nostat
 
 newpage 4 2 
 title HMS TRIG Reference Time
@@ -143,12 +137,11 @@ title HMS Fast Raster
 hFRA_XvsY -nostat
 hFRB_XvsY -nostat
 
-newpage 3 2
+newpage 2 2
 title HMS Kinematics
 hkin_q2 -nostat
-hkin_omega -nostat
-hkin_w2 -nostat
 hkin_w  -nostat
+hkin_omega -nostat
 hkin_theta -nostat
 
 newpage 3 2
diff --git a/onlineGUI/CONFIG/HMS/CAL/hcal_stand.cfg b/onlineGUI/CONFIG/HMS/TEST_STANDS/CAL/hcal_stand.cfg
similarity index 100%
rename from onlineGUI/CONFIG/HMS/CAL/hcal_stand.cfg
rename to onlineGUI/CONFIG/HMS/TEST_STANDS/CAL/hcal_stand.cfg
diff --git a/onlineGUI/CONFIG/HMS/CER/hcer_stand.cfg b/onlineGUI/CONFIG/HMS/TEST_STANDS/CER/hcer_stand.cfg
similarity index 100%
rename from onlineGUI/CONFIG/HMS/CER/hcer_stand.cfg
rename to onlineGUI/CONFIG/HMS/TEST_STANDS/CER/hcer_stand.cfg
diff --git a/onlineGUI/CONFIG/HMS/DC/hdc_6gev_stand.cfg b/onlineGUI/CONFIG/HMS/TEST_STANDS/DC/hdc_6gev_stand.cfg
similarity index 100%
rename from onlineGUI/CONFIG/HMS/DC/hdc_6gev_stand.cfg
rename to onlineGUI/CONFIG/HMS/TEST_STANDS/DC/hdc_6gev_stand.cfg
diff --git a/onlineGUI/CONFIG/HMS/DC/hdc_stand.cfg b/onlineGUI/CONFIG/HMS/TEST_STANDS/DC/hdc_stand.cfg
similarity index 100%
rename from onlineGUI/CONFIG/HMS/DC/hdc_stand.cfg
rename to onlineGUI/CONFIG/HMS/TEST_STANDS/DC/hdc_stand.cfg
diff --git a/onlineGUI/CONFIG/HMS/HODO/good_hhodo_2d.cfg b/onlineGUI/CONFIG/HMS/TEST_STANDS/HODO/good_hhodo_2d.cfg
similarity index 100%
rename from onlineGUI/CONFIG/HMS/HODO/good_hhodo_2d.cfg
rename to onlineGUI/CONFIG/HMS/TEST_STANDS/HODO/good_hhodo_2d.cfg
diff --git a/onlineGUI/CONFIG/HMS/HODO/good_hhodo_2d_dis.cfg b/onlineGUI/CONFIG/HMS/TEST_STANDS/HODO/good_hhodo_2d_dis.cfg
similarity index 100%
rename from onlineGUI/CONFIG/HMS/HODO/good_hhodo_2d_dis.cfg
rename to onlineGUI/CONFIG/HMS/TEST_STANDS/HODO/good_hhodo_2d_dis.cfg
diff --git a/onlineGUI/CONFIG/HMS/HODO/hhodo_stand.cfg b/onlineGUI/CONFIG/HMS/TEST_STANDS/HODO/hhodo_stand.cfg
similarity index 100%
rename from onlineGUI/CONFIG/HMS/HODO/hhodo_stand.cfg
rename to onlineGUI/CONFIG/HMS/TEST_STANDS/HODO/hhodo_stand.cfg
diff --git a/onlineGUI/CONFIG/HMS/HODO/hodtest.cfg b/onlineGUI/CONFIG/HMS/TEST_STANDS/HODO/hodtest.cfg
similarity index 100%
rename from onlineGUI/CONFIG/HMS/HODO/hodtest.cfg
rename to onlineGUI/CONFIG/HMS/TEST_STANDS/HODO/hodtest.cfg
diff --git a/onlineGUI/CONFIG/HMS/HODO/raw_hhodo_1x.cfg b/onlineGUI/CONFIG/HMS/TEST_STANDS/HODO/raw_hhodo_1x.cfg
similarity index 100%
rename from onlineGUI/CONFIG/HMS/HODO/raw_hhodo_1x.cfg
rename to onlineGUI/CONFIG/HMS/TEST_STANDS/HODO/raw_hhodo_1x.cfg
diff --git a/onlineGUI/CONFIG/HMS/HODO/raw_hhodo_1y.cfg b/onlineGUI/CONFIG/HMS/TEST_STANDS/HODO/raw_hhodo_1y.cfg
similarity index 100%
rename from onlineGUI/CONFIG/HMS/HODO/raw_hhodo_1y.cfg
rename to onlineGUI/CONFIG/HMS/TEST_STANDS/HODO/raw_hhodo_1y.cfg
diff --git a/onlineGUI/CONFIG/HMS/HODO/raw_hhodo_2d.cfg b/onlineGUI/CONFIG/HMS/TEST_STANDS/HODO/raw_hhodo_2d.cfg
similarity index 100%
rename from onlineGUI/CONFIG/HMS/HODO/raw_hhodo_2d.cfg
rename to onlineGUI/CONFIG/HMS/TEST_STANDS/HODO/raw_hhodo_2d.cfg
diff --git a/onlineGUI/CONFIG/HMS/HODO/raw_hhodo_2x.cfg b/onlineGUI/CONFIG/HMS/TEST_STANDS/HODO/raw_hhodo_2x.cfg
similarity index 100%
rename from onlineGUI/CONFIG/HMS/HODO/raw_hhodo_2x.cfg
rename to onlineGUI/CONFIG/HMS/TEST_STANDS/HODO/raw_hhodo_2x.cfg
diff --git a/onlineGUI/CONFIG/HMS/HODO/raw_hhodo_2y.cfg b/onlineGUI/CONFIG/HMS/TEST_STANDS/HODO/raw_hhodo_2y.cfg
similarity index 100%
rename from onlineGUI/CONFIG/HMS/HODO/raw_hhodo_2y.cfg
rename to onlineGUI/CONFIG/HMS/TEST_STANDS/HODO/raw_hhodo_2y.cfg
diff --git a/onlineGUI/CONFIG/HMS/HODO/raw_hhodoana.cfg b/onlineGUI/CONFIG/HMS/TEST_STANDS/HODO/raw_hhodoana.cfg
similarity index 100%
rename from onlineGUI/CONFIG/HMS/HODO/raw_hhodoana.cfg
rename to onlineGUI/CONFIG/HMS/TEST_STANDS/HODO/raw_hhodoana.cfg
diff --git a/onlineGUI/CONFIG/HMS/TRIG/htrig_stand.cfg b/onlineGUI/CONFIG/HMS/TEST_STANDS/TRIG/htrig_stand.cfg
similarity index 100%
rename from onlineGUI/CONFIG/HMS/TRIG/htrig_stand.cfg
rename to onlineGUI/CONFIG/HMS/TEST_STANDS/TRIG/htrig_stand.cfg
diff --git a/onlineGUI/CONFIG/SHMS/AERO/aero_stand.cfg b/onlineGUI/CONFIG/SHMS/TEST_STANDS/AERO/aero_stand.cfg
similarity index 100%
rename from onlineGUI/CONFIG/SHMS/AERO/aero_stand.cfg
rename to onlineGUI/CONFIG/SHMS/TEST_STANDS/AERO/aero_stand.cfg
diff --git a/onlineGUI/CONFIG/SHMS/CAL/pcal_stand.cfg b/onlineGUI/CONFIG/SHMS/TEST_STANDS/CAL/pcal_stand.cfg
similarity index 100%
rename from onlineGUI/CONFIG/SHMS/CAL/pcal_stand.cfg
rename to onlineGUI/CONFIG/SHMS/TEST_STANDS/CAL/pcal_stand.cfg
diff --git a/onlineGUI/CONFIG/SHMS/CER/phgcer_stand.cfg b/onlineGUI/CONFIG/SHMS/TEST_STANDS/CER/phgcer_stand.cfg
similarity index 100%
rename from onlineGUI/CONFIG/SHMS/CER/phgcer_stand.cfg
rename to onlineGUI/CONFIG/SHMS/TEST_STANDS/CER/phgcer_stand.cfg
diff --git a/onlineGUI/CONFIG/SHMS/CER/pngcer_stand.cfg b/onlineGUI/CONFIG/SHMS/TEST_STANDS/CER/pngcer_stand.cfg
similarity index 100%
rename from onlineGUI/CONFIG/SHMS/CER/pngcer_stand.cfg
rename to onlineGUI/CONFIG/SHMS/TEST_STANDS/CER/pngcer_stand.cfg
diff --git a/onlineGUI/CONFIG/SHMS/CER/shms_cer_eff.cfg b/onlineGUI/CONFIG/SHMS/TEST_STANDS/CER/shms_cer_eff.cfg
similarity index 100%
rename from onlineGUI/CONFIG/SHMS/CER/shms_cer_eff.cfg
rename to onlineGUI/CONFIG/SHMS/TEST_STANDS/CER/shms_cer_eff.cfg
diff --git a/onlineGUI/CONFIG/SHMS/DC/pdc_stand.cfg b/onlineGUI/CONFIG/SHMS/TEST_STANDS/DC/pdc_stand.cfg
similarity index 100%
rename from onlineGUI/CONFIG/SHMS/DC/pdc_stand.cfg
rename to onlineGUI/CONFIG/SHMS/TEST_STANDS/DC/pdc_stand.cfg
diff --git a/onlineGUI/CONFIG/SHMS/HODO/good_phodo_2d.cfg b/onlineGUI/CONFIG/SHMS/TEST_STANDS/HODO/good_phodo_2d.cfg
similarity index 100%
rename from onlineGUI/CONFIG/SHMS/HODO/good_phodo_2d.cfg
rename to onlineGUI/CONFIG/SHMS/TEST_STANDS/HODO/good_phodo_2d.cfg
diff --git a/onlineGUI/CONFIG/SHMS/HODO/good_phodo_2d_dis.cfg b/onlineGUI/CONFIG/SHMS/TEST_STANDS/HODO/good_phodo_2d_dis.cfg
similarity index 100%
rename from onlineGUI/CONFIG/SHMS/HODO/good_phodo_2d_dis.cfg
rename to onlineGUI/CONFIG/SHMS/TEST_STANDS/HODO/good_phodo_2d_dis.cfg
diff --git a/onlineGUI/CONFIG/SHMS/HODO/phodo_stand.cfg b/onlineGUI/CONFIG/SHMS/TEST_STANDS/HODO/phodo_stand.cfg
similarity index 100%
rename from onlineGUI/CONFIG/SHMS/HODO/phodo_stand.cfg
rename to onlineGUI/CONFIG/SHMS/TEST_STANDS/HODO/phodo_stand.cfg
diff --git a/onlineGUI/CONFIG/SHMS/HODO/raw_phodo_1x.cfg b/onlineGUI/CONFIG/SHMS/TEST_STANDS/HODO/raw_phodo_1x.cfg
similarity index 100%
rename from onlineGUI/CONFIG/SHMS/HODO/raw_phodo_1x.cfg
rename to onlineGUI/CONFIG/SHMS/TEST_STANDS/HODO/raw_phodo_1x.cfg
diff --git a/onlineGUI/CONFIG/SHMS/HODO/raw_phodo_1y.cfg b/onlineGUI/CONFIG/SHMS/TEST_STANDS/HODO/raw_phodo_1y.cfg
similarity index 100%
rename from onlineGUI/CONFIG/SHMS/HODO/raw_phodo_1y.cfg
rename to onlineGUI/CONFIG/SHMS/TEST_STANDS/HODO/raw_phodo_1y.cfg
diff --git a/onlineGUI/CONFIG/SHMS/HODO/raw_phodo_2d.cfg b/onlineGUI/CONFIG/SHMS/TEST_STANDS/HODO/raw_phodo_2d.cfg
similarity index 100%
rename from onlineGUI/CONFIG/SHMS/HODO/raw_phodo_2d.cfg
rename to onlineGUI/CONFIG/SHMS/TEST_STANDS/HODO/raw_phodo_2d.cfg
diff --git a/onlineGUI/CONFIG/SHMS/HODO/raw_phodo_2d_pad.cfg b/onlineGUI/CONFIG/SHMS/TEST_STANDS/HODO/raw_phodo_2d_pad.cfg
similarity index 100%
rename from onlineGUI/CONFIG/SHMS/HODO/raw_phodo_2d_pad.cfg
rename to onlineGUI/CONFIG/SHMS/TEST_STANDS/HODO/raw_phodo_2d_pad.cfg
diff --git a/onlineGUI/CONFIG/SHMS/HODO/raw_phodo_2x.cfg b/onlineGUI/CONFIG/SHMS/TEST_STANDS/HODO/raw_phodo_2x.cfg
similarity index 100%
rename from onlineGUI/CONFIG/SHMS/HODO/raw_phodo_2x.cfg
rename to onlineGUI/CONFIG/SHMS/TEST_STANDS/HODO/raw_phodo_2x.cfg
diff --git a/onlineGUI/CONFIG/SHMS/HODO/raw_phodo_2y.cfg b/onlineGUI/CONFIG/SHMS/TEST_STANDS/HODO/raw_phodo_2y.cfg
similarity index 100%
rename from onlineGUI/CONFIG/SHMS/HODO/raw_phodo_2y.cfg
rename to onlineGUI/CONFIG/SHMS/TEST_STANDS/HODO/raw_phodo_2y.cfg
diff --git a/onlineGUI/CONFIG/SHMS/HODO/raw_phodoana.cfg b/onlineGUI/CONFIG/SHMS/TEST_STANDS/HODO/raw_phodoana.cfg
similarity index 100%
rename from onlineGUI/CONFIG/SHMS/HODO/raw_phodoana.cfg
rename to onlineGUI/CONFIG/SHMS/TEST_STANDS/HODO/raw_phodoana.cfg
diff --git a/onlineGUI/CONFIG/SHMS/TRIG/ptrig_stand.cfg b/onlineGUI/CONFIG/SHMS/TEST_STANDS/TRIG/ptrig_stand.cfg
similarity index 100%
rename from onlineGUI/CONFIG/SHMS/TRIG/ptrig_stand.cfg
rename to onlineGUI/CONFIG/SHMS/TEST_STANDS/TRIG/ptrig_stand.cfg