diff --git a/run_JFCalibration.txt b/run_JFCalibration.txt
index d1bdf74..35053ea 100644
--- a/run_JFCalibration.txt
+++ b/run_JFCalibration.txt
@@ -29,19 +29,19 @@ Module 004
 
 
 Module 006
-./CuFluo_analysis 006 G0 /mnt/pcmoench_jungfrau_data/Module_006_161116 10us_500Hz_QS_allgain_pede 10us_500Hz_QS_G0_Cu
-./BP_analysis 006 /mnt/pcmoench_jungfrau_data/Module_006_vbackpulse/scan4_170217
-./DB_analysis 006 /mnt/pcmoench_jungfrau_data/Module_006_161116 100us_500Hz_QS_allgain_pede_1055 100us_500Hz_QS_beam_scan_a
+./CuFluo_analysis 006 G0 /mnt/pcmoench_jungfrau_calib/data/Module_006_161116 10us_500Hz_QS_allgain_pede 10us_500Hz_QS_G0_Cu
+./BP_analysis 006 /mnt/pcmoench_jungfrau_calib/data/Module_006_vbackpulse/scan4_170217
+./DB_analysis 006 /mnt/pcmoench_jungfrau_calib/data/Module_006_161116 100us_500Hz_QS_allgain_pede_1055 100us_500Hz_QS_beam_scan_a
 ./BP_DB_Comp 006
-./CS_analysis 006 /mnt/pcmoench_jungfrau_data/Module_006_2017-08-21_CSBaselineTest CurrentSource_scan12
-./CS_BaselineTest 006 /mnt/pcmoench_jungfrau_data/Module_006_2017-08-21_CSBaselineTest CurrentSource_scan12 BaselineG1_scan12 BaselineG2_scan12
+./CS_analysis 006 /mnt/pcmoench_jungfrau_calib/data/Module_006_2017-08-21_CSBaselineTest CurrentSource_scan12
+./CS_BaselineTest 006 /mnt/pcmoench_jungfrau_calib/data/Module_006_2017-08-21_CSBaselineTest CurrentSource_scan12 BaselineG1_scan12 BaselineG2_scan12
 ./JFMC_CalibWriter_wBP 006
 
 
 Module 008
-./CuFluo_analysis 008 G0 /mnt/pcmoench_jungfrau_data/Module_008_181116 10us_500Hz_QS_allgain_pede_1558 10us_500Hz_QS_G0_Cu_2
-./DB_analysis 008 /mnt/pcmoench_jungfrau_data/Module_008_181116 150us_500Hz_QS_allgain_pede_1332 150us_500Hz_QS_beam_scan_b
-./CS_analysis 008 /mnt/pcmoench_jungfrau_data/Module_008_181116 Current_source_scan_a
+./CuFluo_analysis 008 G0 /mnt/pcmoench_jungfrau_calib/data/Module_008_181116 10us_500Hz_QS_allgain_pede_1558 10us_500Hz_QS_G0_Cu_2
+./DB_analysis 008 /mnt/pcmoench_jungfrau_calib/data/Module_008_181116 150us_500Hz_QS_allgain_pede_1332 150us_500Hz_QS_beam_scan_b
+./CS_analysis 008 /mnt/pcmoench_jungfrau_calib/data/Module_008_181116 Current_source_scan_a
 ./JFMC_CalibWriter_wBP 008
 ./CuFluo_analysis 008 G0 /mnt/pcmoench_jungfrau_calib/data/Module_008_Calib pedeG0_M008_2019-05-24 CuFluoG0_M008_2019-05-24
 ./CuFluo_analysis 008 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_008_Calib pedeHG0_M008_2019-05-24 CuFluoHG0_M008_2019-05-24
@@ -58,22 +58,22 @@ Module 011
 
 
 Module 021
-./CuFluo_analysis 021 G0 /mnt/pcmoench_jungfrau_data/1M_021_022_150916 10us_200Hz_QS_allgain_pede__B 10us_200Hz_QS_G0_Cu__B
-./CuFluo_analysis 021 G0 /mnt/pcmoench_jungfrau_data/Module_021_2017-11-24_Calib pedeG0_1145 CuFluo_G0_
-./CuFluo_analysis 021 HG0 /mnt/pcmoench_jungfrau_data/Module_021_2017-11-24_Calib pedeHG0_1205 CuFluo_HG0
-./BP_analysis 021 /mnt/pcmoench_jungfrau_data/Module_021_vbackpulse/bpp_scan1_20170303
-./BP_analysis 021 /mnt/pcmoench_jungfrau_data/Module_021_2017-11-24_Calib/BP_scan1
-./DB_analysis 021 /mnt/pcmoench_jungfrau_data/1M_021_022_150916 200us_200Hz_QS_allgain_pede_scan_d_B 200us_200Hz_QS_beam_scan_d_B
+./CuFluo_analysis 021 G0 /mnt/pcmoench_jungfrau_calib/data/1M_021_022_150916 10us_200Hz_QS_allgain_pede__B 10us_200Hz_QS_G0_Cu__B
+./CuFluo_analysis 021 G0 /mnt/pcmoench_jungfrau_calib/data/Module_021_2017-11-24_Calib pedeG0_1145 CuFluo_G0_
+./CuFluo_analysis 021 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_021_2017-11-24_Calib pedeHG0_1205 CuFluo_HG0
+./BP_analysis 021 /mnt/pcmoench_jungfrau_calib/data/Module_021_vbackpulse/bpp_scan1_20170303
+./BP_analysis 021 /mnt/pcmoench_jungfrau_calib/data/Module_021_2017-11-24_Calib/BP_scan1
+./DB_analysis 021 /mnt/pcmoench_jungfrau_calib/data/1M_021_022_150916 200us_200Hz_QS_allgain_pede_scan_d_B 200us_200Hz_QS_beam_scan_d_B
 ./BP_DB_Comp 021
-./CS_analysis 021 /mnt/pcmoench_jungfrau_data/1M_021_022_150916 Current_source_scan_a_B
-./CS_analysis 021 /mnt/pcmoench_jungfrau_data/Module_021_2017-11-24_Calib CS_scan1
+./CS_analysis 021 /mnt/pcmoench_jungfrau_calib/data/1M_021_022_150916 Current_source_scan_a_B
+./CS_analysis 021 /mnt/pcmoench_jungfrau_calib/data/Module_021_2017-11-24_Calib CS_scan1
 ./JFMC_CalibWriter_wBP 021
 
 
 Module 022
-./CuFluo_analysis 022 G0 /mnt/pcmoench_jungfrau_data/1M_021_022_150916 10us_200Hz_QS_allgain_pede__A 10us_200Hz_QS_G0_Cu__A
-./BP_analysis 022 /mnt/pcmoench_jungfrau_data/Module_022_vbackpulse/bpp_scan1_20170303
-./DB_analysis 022 /mnt/pcmoench_jungfrau_data/1M_021_022_150916 200us_200Hz_QS_allgain_pede_scan_d_A 200us_200Hz_QS_beam_scan_d_A
+./CuFluo_analysis 022 G0 /mnt/pcmoench_jungfrau_calib/data/1M_021_022_150916 10us_200Hz_QS_allgain_pede__A 10us_200Hz_QS_G0_Cu__A
+./BP_analysis 022 /mnt/pcmoench_jungfrau_calib/data/Module_022_vbackpulse/bpp_scan1_20170303
+./DB_analysis 022 /mnt/pcmoench_jungfrau_calib/data/1M_021_022_150916 200us_200Hz_QS_allgain_pede_scan_d_A 200us_200Hz_QS_beam_scan_d_A
 ./BP_DB_Comp 022
 ./CS_analysis 022 /mnt/pcmoench_jungfrau_calib/data/Module_022_Calib CS_HS_NF_200Hz_scan1
 ./JFMC_CalibWriter_wBP 022
@@ -105,7 +105,7 @@ Module 027
 
 
 Module 028
-./DB_analysis 028 /mnt/pcmoench_jungfrau_data/test_module028_direct_beam_scan__01092016 200us_scan_a_pedestal_QS 200us_scan_a_beam_QS
+./DB_analysis 028 /mnt/pcmoench_jungfrau_calib/data/test_module028_direct_beam_scan__01092016 200us_scan_a_pedestal_QS 200us_scan_a_beam_QS
 
 
 Module 029
@@ -120,7 +120,7 @@ Module 029
 
 
 Module 032
-./CS_analysis 032 /mnt/pcmoench_jungfrau_data/test_module032_cal_source_15082016 test_currentsourcescan_5
+./CS_analysis 032 /mnt/pcmoench_jungfrau_calib/data/test_module032_cal_source_15082016 test_currentsourcescan_5
 
 
 Module 035
@@ -154,11 +154,11 @@ Module 043
 
 
 Module 044
-./CuFluo_analysis 044 G0 /mnt/pcmoench_jungfrau_data/Module044 allpede_10us_500Hz_QS_G0_1500 CuFluo_10us_500Hz_QS_G0
-./BP_analysis 044 /mnt/pcmoench_jungfrau_data/Module_044_vbackpulse/bpp_scan2_20170303
-./DB_analysis 044 /mnt/pcmoench_jungfrau_data/Module044 allpede_150us_500Hz_QS_1620 DB_170221_scan1
+./CuFluo_analysis 044 G0 /mnt/pcmoench_jungfrau_calib/data/Module044 allpede_10us_500Hz_QS_G0_1500 CuFluo_10us_500Hz_QS_G0
+./BP_analysis 044 /mnt/pcmoench_jungfrau_calib/data/Module_044_vbackpulse/bpp_scan2_20170303
+./DB_analysis 044 /mnt/pcmoench_jungfrau_calib/data/Module044 allpede_150us_500Hz_QS_1620 DB_170221_scan1
 ./BP_DB_Comp 044
-./CS_analysis 044 /mnt/pcmoench_jungfrau_data/Module044 CS_170221_scan2
+./CS_analysis 044 /mnt/pcmoench_jungfrau_calib/data/Module044 CS_170221_scan2
 ./JFMC_CalibWriter_wBP 044