diff --git a/DEF-files/SHMS/PROD/AERO/paero_histos.def b/DEF-files/SHMS/PRODUCTION/AERO/paero_histos.def
similarity index 100%
rename from DEF-files/SHMS/PROD/AERO/paero_histos.def
rename to DEF-files/SHMS/PRODUCTION/AERO/paero_histos.def
diff --git a/DEF-files/SHMS/PROD/BLOCK/pblock_vars.def b/DEF-files/SHMS/PRODUCTION/BLOCK/pblock_vars.def
similarity index 100%
rename from DEF-files/SHMS/PROD/BLOCK/pblock_vars.def
rename to DEF-files/SHMS/PRODUCTION/BLOCK/pblock_vars.def
diff --git a/DEF-files/SHMS/PROD/CAL/pcal_histos.def b/DEF-files/SHMS/PRODUCTION/CAL/pcal_histos.def
similarity index 100%
rename from DEF-files/SHMS/PROD/CAL/pcal_histos.def
rename to DEF-files/SHMS/PRODUCTION/CAL/pcal_histos.def
diff --git a/DEF-files/SHMS/PROD/DC/pdc_histos.def b/DEF-files/SHMS/PRODUCTION/DC/pdc_histos.def
similarity index 100%
rename from DEF-files/SHMS/PROD/DC/pdc_histos.def
rename to DEF-files/SHMS/PRODUCTION/DC/pdc_histos.def
diff --git a/DEF-files/SHMS/PROD/EPICS/pepics_vars.def b/DEF-files/SHMS/PRODUCTION/EPICS/pepics_vars.def
similarity index 100%
rename from DEF-files/SHMS/PROD/EPICS/pepics_vars.def
rename to DEF-files/SHMS/PRODUCTION/EPICS/pepics_vars.def
diff --git a/DEF-files/SHMS/PROD/HGCER/phgcer_histos.def b/DEF-files/SHMS/PRODUCTION/HGCER/phgcer_histos.def
similarity index 100%
rename from DEF-files/SHMS/PROD/HGCER/phgcer_histos.def
rename to DEF-files/SHMS/PRODUCTION/HGCER/phgcer_histos.def
diff --git a/DEF-files/SHMS/PROD/HODO/phodo_histos.def b/DEF-files/SHMS/PRODUCTION/HODO/phodo_histos.def
similarity index 100%
rename from DEF-files/SHMS/PROD/HODO/phodo_histos.def
rename to DEF-files/SHMS/PRODUCTION/HODO/phodo_histos.def
diff --git a/DEF-files/SHMS/PROD/NGCER/pngcer_histos.def b/DEF-files/SHMS/PRODUCTION/NGCER/pngcer_histos.def
similarity index 100%
rename from DEF-files/SHMS/PROD/NGCER/pngcer_histos.def
rename to DEF-files/SHMS/PRODUCTION/NGCER/pngcer_histos.def
diff --git a/DEF-files/SHMS/PROD/TRIG/ptrig_histos.def b/DEF-files/SHMS/PRODUCTION/TRIG/ptrig_histos.def
similarity index 100%
rename from DEF-files/SHMS/PROD/TRIG/ptrig_histos.def
rename to DEF-files/SHMS/PRODUCTION/TRIG/ptrig_histos.def
diff --git a/DEF-files/SHMS/PROD/merge_def_files.py b/DEF-files/SHMS/PRODUCTION/merge_def_files.py
similarity index 100%
rename from DEF-files/SHMS/PROD/merge_def_files.py
rename to DEF-files/SHMS/PRODUCTION/merge_def_files.py
diff --git a/DEF-files/SHMS/PROD/merge_list.txt b/DEF-files/SHMS/PRODUCTION/merge_list.txt
similarity index 100%
rename from DEF-files/SHMS/PROD/merge_list.txt
rename to DEF-files/SHMS/PRODUCTION/merge_list.txt
diff --git a/DEF-files/SHMS/PROD/pstackana_all.def b/DEF-files/SHMS/PRODUCTION/pstackana_production.def
similarity index 100%
rename from DEF-files/SHMS/PROD/pstackana_all.def
rename to DEF-files/SHMS/PRODUCTION/pstackana_production.def
diff --git a/DEF-files/SHMS/PROD/pstackana_all_cuts.def b/DEF-files/SHMS/PRODUCTION/pstackana_production_cuts.def
similarity index 100%
rename from DEF-files/SHMS/PROD/pstackana_all_cuts.def
rename to DEF-files/SHMS/PRODUCTION/pstackana_production_cuts.def
diff --git a/SCRIPTS/SHMS/ALL/replay_all_shms.C b/SCRIPTS/SHMS/PRODUCTION/replay_production_shms.C
similarity index 88%
rename from SCRIPTS/SHMS/ALL/replay_all_shms.C
rename to SCRIPTS/SHMS/PRODUCTION/replay_production_shms.C
index a2d28fa4f2b42ea9dd96af54becde622986aa8ad..0285c21310768db8a875a8310bc77c064b0fcc05 100644
--- a/SCRIPTS/SHMS/ALL/replay_all_shms.C
+++ b/SCRIPTS/SHMS/PRODUCTION/replay_production_shms.C
@@ -1,4 +1,4 @@
-void replay_all_shms (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
+void replay_production_shms (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
 
   // Get RunNumber and MaxEvent if not provided.
   if(RunNumber == 0) {
@@ -17,7 +17,7 @@ void replay_all_shms (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
 
   // Create file name patterns.
   const char* RunFileNamePattern = "raw/shms_all_%05d.dat";
-  const char* ROOTFileNamePattern = "ROOTfiles/shms_replay_all_%d_%d.root";
+  const char* ROOTFileNamePattern = "ROOTfiles/shms_replay_production_%d_%d.root";
   
   // Load global parameters
   // Add variables to global list.
@@ -120,15 +120,15 @@ void replay_all_shms (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
   // Define output ROOT file
   analyzer->SetOutFile(ROOTFileName.Data());
   // Define DEF-file
-  analyzer->SetOdefFile("DEF-files/SHMS/ALL/pstackana_all.def");
+  analyzer->SetOdefFile("DEF-files/SHMS/PRODUCTION/pstackana_production.def");
   // Define cuts file
-  analyzer->SetCutFile("DEF-files/SHMS/ALL/pstackana_all_cuts.def");  // optional
+  analyzer->SetCutFile("DEF-files/SHMS/PRODUCTION/pstackana_production_cuts.def");  // optional
   // File to record accounting information for cuts
-  analyzer->SetSummaryFile(Form("REPORT_OUTPUT/SHMS/ALL/summary_all_%d_%d.report", RunNumber, MaxEvent));  // optional
+  analyzer->SetSummaryFile(Form("REPORT_OUTPUT/SHMS/PRODUCTION/summary_production_%d_%d.report", RunNumber, MaxEvent));  // optional
   // Start the actual analysis.
   analyzer->Process(run);
   // Create report file from template
-  analyzer->PrintReport("TEMPLATES/SHMS/ALL/pstackana_all.template",
-  			Form("REPORT_OUTPUT/SHMS/ALL/replay_shms_all_%d_%d.report", RunNumber, MaxEvent));  // optional
+  analyzer->PrintReport("TEMPLATES/SHMS/PRODUCTION/pstackana_production.template",
+  			Form("REPORT_OUTPUT/SHMS/PRODUCTION/replay_shms_production_%d_%d.report", RunNumber, MaxEvent));  // optional
 
 }
diff --git a/TEMPLATES/SHMS/ALL/pstackana_all.template b/TEMPLATES/SHMS/PRODUCTION/pstackana_production.template
similarity index 100%
rename from TEMPLATES/SHMS/ALL/pstackana_all.template
rename to TEMPLATES/SHMS/PRODUCTION/pstackana_production.template