diff --git a/.gitattributes b/.gitattributes
index 632c07ef0f82e378d4987bb30436b547a6810ca6..38bd01e279aec7084093af282b6faf25544e5121 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -72,44 +72,44 @@ CEP/Calibration/BBSKernel/test/tParmMerge.in_mep2/table.f0i -text svneol=unset#u
 CEP/Calibration/BBSKernel/test/tParmMerge.in_mep2/table.lock -text svneol=unset#unset
 CEP/Calibration/BBSKernel/test/utils.cc -text
 CEP/Calibration/BBSKernel/test/utils.h -text
-CEP/DP3/CS1_pp_lib/CS1_pp_lib.spec.in -text
-CEP/DP3/CS1_pp_lib/Makefile.am -text
-CEP/DP3/CS1_pp_lib/bootstrap -text
-CEP/DP3/CS1_pp_lib/configure.in -text
-CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/BandpassCorrector.h -text
-CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/ComplexMedianFlagger.h -text
-CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/ComplexMedianFlagger2.h -text
-CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/DataBuffer.h -text
-CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/DataSquasher.h -text
-CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/Flagger.h -text
-CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/FrequencyFlagger.h -text
-CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/MADFlagger.h -text
-CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/Makefile.am -text
-CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/MsFile.h -text
-CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/Pipeline.h -text
-CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/PipelineProcessControl.h -text
-CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/RunDetails.h -text
-CEP/DP3/CS1_pp_lib/include/Makefile.am -text
-CEP/DP3/CS1_pp_lib/package.dox -text
-CEP/DP3/CS1_pp_lib/scripts/Create_DPPP_Config.py -text
-CEP/DP3/CS1_pp_lib/scripts/GuessDataset.py -text
-CEP/DP3/CS1_pp_lib/scripts/LOFAR_Parset.py -text
-CEP/DP3/CS1_pp_lib/src/BandpassCorrector.cc -text
-CEP/DP3/CS1_pp_lib/src/ComplexMedianFlagger.cc -text
-CEP/DP3/CS1_pp_lib/src/ComplexMedianFlagger2.cc -text
-CEP/DP3/CS1_pp_lib/src/DataBuffer.cc -text
-CEP/DP3/CS1_pp_lib/src/DataSquasher.cc -text
-CEP/DP3/CS1_pp_lib/src/FrequencyFlagger.cc -text
-CEP/DP3/CS1_pp_lib/src/IDPPP.cc -text
-CEP/DP3/CS1_pp_lib/src/MADFlagger.cc -text
-CEP/DP3/CS1_pp_lib/src/Makefile.am -text
-CEP/DP3/CS1_pp_lib/src/MsFile.cc -text
-CEP/DP3/CS1_pp_lib/src/Pipeline.cc -text
-CEP/DP3/CS1_pp_lib/src/PipelineProcessControl.cc -text
-CEP/DP3/CS1_pp_lib/src/RunDetails.cc -text
-CEP/DP3/CS1_pp_lib/test/CS1_IDPPP.log_prop -text
-CEP/DP3/CS1_pp_lib/test/CS1_IDPPP.parset -text
-CEP/DP3/CS1_pp_lib/test/Makefile.am -text
+CEP/DP3/DPPP/CS1_pp_lib.spec.in -text
+CEP/DP3/DPPP/Makefile.am -text
+CEP/DP3/DPPP/bootstrap -text
+CEP/DP3/DPPP/configure.in -text
+CEP/DP3/DPPP/include/CS1_pp_lib/BandpassCorrector.h -text
+CEP/DP3/DPPP/include/CS1_pp_lib/ComplexMedianFlagger.h -text
+CEP/DP3/DPPP/include/CS1_pp_lib/ComplexMedianFlagger2.h -text
+CEP/DP3/DPPP/include/CS1_pp_lib/DataBuffer.h -text
+CEP/DP3/DPPP/include/CS1_pp_lib/DataSquasher.h -text
+CEP/DP3/DPPP/include/CS1_pp_lib/Flagger.h -text
+CEP/DP3/DPPP/include/CS1_pp_lib/FrequencyFlagger.h -text
+CEP/DP3/DPPP/include/CS1_pp_lib/MADFlagger.h -text
+CEP/DP3/DPPP/include/CS1_pp_lib/Makefile.am -text
+CEP/DP3/DPPP/include/CS1_pp_lib/MsFile.h -text
+CEP/DP3/DPPP/include/CS1_pp_lib/Pipeline.h -text
+CEP/DP3/DPPP/include/CS1_pp_lib/PipelineProcessControl.h -text
+CEP/DP3/DPPP/include/CS1_pp_lib/RunDetails.h -text
+CEP/DP3/DPPP/include/Makefile.am -text
+CEP/DP3/DPPP/package.dox -text
+CEP/DP3/DPPP/scripts/Create_DPPP_Config.py -text
+CEP/DP3/DPPP/scripts/GuessDataset.py -text
+CEP/DP3/DPPP/scripts/LOFAR_Parset.py -text
+CEP/DP3/DPPP/src/BandpassCorrector.cc -text
+CEP/DP3/DPPP/src/ComplexMedianFlagger.cc -text
+CEP/DP3/DPPP/src/ComplexMedianFlagger2.cc -text
+CEP/DP3/DPPP/src/DataBuffer.cc -text
+CEP/DP3/DPPP/src/DataSquasher.cc -text
+CEP/DP3/DPPP/src/FrequencyFlagger.cc -text
+CEP/DP3/DPPP/src/IDPPP.cc -text
+CEP/DP3/DPPP/src/MADFlagger.cc -text
+CEP/DP3/DPPP/src/Makefile.am -text
+CEP/DP3/DPPP/src/MsFile.cc -text
+CEP/DP3/DPPP/src/Pipeline.cc -text
+CEP/DP3/DPPP/src/PipelineProcessControl.cc -text
+CEP/DP3/DPPP/src/RunDetails.cc -text
+CEP/DP3/DPPP/test/CS1_IDPPP.log_prop -text
+CEP/DP3/DPPP/test/CS1_IDPPP.parset -text
+CEP/DP3/DPPP/test/Makefile.am -text
 CEP/Imager/MWCommon/bootstrap -text
 CEP/Imager/MWCommon/src/socketrun -text
 CEP/Imager/MWCommon/src/startdistproc -text
diff --git a/.gitignore b/.gitignore
index 45d71d07043c8add1348564c81dd349fb41625bf..9316555b15a4571a8fc3a8a87a8b3a3f2e55b646 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,9 +7,9 @@ CEP/Calibration/BBSKernel/lofarconf
 CEP/DP3/CS1_SPWCombine/Makefile.common
 CEP/DP3/CS1_SPWCombine/autoconf_share
 CEP/DP3/CS1_SPWCombine/lofarconf
-CEP/DP3/CS1_pp_lib/Makefile.common
-CEP/DP3/CS1_pp_lib/autoconf_share
-CEP/DP3/CS1_pp_lib/lofarconf
+CEP/DP3/DPPP/Makefile.common
+CEP/DP3/DPPP/autoconf_share
+CEP/DP3/DPPP/lofarconf
 CEP/Imager/MWCommon/Makefile.common
 CEP/Imager/MWCommon/autoconf_share
 CEP/Imager/MWCommon/lofarconf
diff --git a/CEP/DP3/CS1_pp_lib/CS1_pp_lib.spec.in b/CEP/DP3/DPPP/CS1_pp_lib.spec.in
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/CS1_pp_lib.spec.in
rename to CEP/DP3/DPPP/CS1_pp_lib.spec.in
diff --git a/CEP/DP3/CS1_pp_lib/Makefile.am b/CEP/DP3/DPPP/Makefile.am
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/Makefile.am
rename to CEP/DP3/DPPP/Makefile.am
diff --git a/CEP/DP3/CS1_pp_lib/bootstrap b/CEP/DP3/DPPP/bootstrap
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/bootstrap
rename to CEP/DP3/DPPP/bootstrap
diff --git a/CEP/DP3/CS1_pp_lib/configure.in b/CEP/DP3/DPPP/configure.in
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/configure.in
rename to CEP/DP3/DPPP/configure.in
diff --git a/CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/BandpassCorrector.h b/CEP/DP3/DPPP/include/CS1_pp_lib/BandpassCorrector.h
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/BandpassCorrector.h
rename to CEP/DP3/DPPP/include/CS1_pp_lib/BandpassCorrector.h
diff --git a/CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/ComplexMedianFlagger.h b/CEP/DP3/DPPP/include/CS1_pp_lib/ComplexMedianFlagger.h
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/ComplexMedianFlagger.h
rename to CEP/DP3/DPPP/include/CS1_pp_lib/ComplexMedianFlagger.h
diff --git a/CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/ComplexMedianFlagger2.h b/CEP/DP3/DPPP/include/CS1_pp_lib/ComplexMedianFlagger2.h
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/ComplexMedianFlagger2.h
rename to CEP/DP3/DPPP/include/CS1_pp_lib/ComplexMedianFlagger2.h
diff --git a/CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/DataBuffer.h b/CEP/DP3/DPPP/include/CS1_pp_lib/DataBuffer.h
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/DataBuffer.h
rename to CEP/DP3/DPPP/include/CS1_pp_lib/DataBuffer.h
diff --git a/CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/DataSquasher.h b/CEP/DP3/DPPP/include/CS1_pp_lib/DataSquasher.h
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/DataSquasher.h
rename to CEP/DP3/DPPP/include/CS1_pp_lib/DataSquasher.h
diff --git a/CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/Flagger.h b/CEP/DP3/DPPP/include/CS1_pp_lib/Flagger.h
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/Flagger.h
rename to CEP/DP3/DPPP/include/CS1_pp_lib/Flagger.h
diff --git a/CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/FlaggerStatistics.h b/CEP/DP3/DPPP/include/CS1_pp_lib/FlaggerStatistics.h
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/FlaggerStatistics.h
rename to CEP/DP3/DPPP/include/CS1_pp_lib/FlaggerStatistics.h
diff --git a/CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/FrequencyFlagger.h b/CEP/DP3/DPPP/include/CS1_pp_lib/FrequencyFlagger.h
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/FrequencyFlagger.h
rename to CEP/DP3/DPPP/include/CS1_pp_lib/FrequencyFlagger.h
diff --git a/CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/MADFlagger.h b/CEP/DP3/DPPP/include/CS1_pp_lib/MADFlagger.h
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/MADFlagger.h
rename to CEP/DP3/DPPP/include/CS1_pp_lib/MADFlagger.h
diff --git a/CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/Makefile.am b/CEP/DP3/DPPP/include/CS1_pp_lib/Makefile.am
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/Makefile.am
rename to CEP/DP3/DPPP/include/CS1_pp_lib/Makefile.am
diff --git a/CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/MsFile.h b/CEP/DP3/DPPP/include/CS1_pp_lib/MsFile.h
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/MsFile.h
rename to CEP/DP3/DPPP/include/CS1_pp_lib/MsFile.h
diff --git a/CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/MsInfo.h b/CEP/DP3/DPPP/include/CS1_pp_lib/MsInfo.h
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/MsInfo.h
rename to CEP/DP3/DPPP/include/CS1_pp_lib/MsInfo.h
diff --git a/CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/Pipeline.h b/CEP/DP3/DPPP/include/CS1_pp_lib/Pipeline.h
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/Pipeline.h
rename to CEP/DP3/DPPP/include/CS1_pp_lib/Pipeline.h
diff --git a/CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/PipelineProcessControl.h b/CEP/DP3/DPPP/include/CS1_pp_lib/PipelineProcessControl.h
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/PipelineProcessControl.h
rename to CEP/DP3/DPPP/include/CS1_pp_lib/PipelineProcessControl.h
diff --git a/CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/RunDetails.h b/CEP/DP3/DPPP/include/CS1_pp_lib/RunDetails.h
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/RunDetails.h
rename to CEP/DP3/DPPP/include/CS1_pp_lib/RunDetails.h
diff --git a/CEP/DP3/CS1_pp_lib/include/Makefile.am b/CEP/DP3/DPPP/include/Makefile.am
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/include/Makefile.am
rename to CEP/DP3/DPPP/include/Makefile.am
diff --git a/CEP/DP3/CS1_pp_lib/package.dox b/CEP/DP3/DPPP/package.dox
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/package.dox
rename to CEP/DP3/DPPP/package.dox
diff --git a/CEP/DP3/CS1_pp_lib/scripts/CS1_Offline_pipeline_control.py b/CEP/DP3/DPPP/scripts/CS1_Offline_pipeline_control.py
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/scripts/CS1_Offline_pipeline_control.py
rename to CEP/DP3/DPPP/scripts/CS1_Offline_pipeline_control.py
diff --git a/CEP/DP3/CS1_pp_lib/scripts/CS1_Offline_pipeline_node.py b/CEP/DP3/DPPP/scripts/CS1_Offline_pipeline_node.py
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/scripts/CS1_Offline_pipeline_node.py
rename to CEP/DP3/DPPP/scripts/CS1_Offline_pipeline_node.py
diff --git a/CEP/DP3/CS1_pp_lib/scripts/Create_DPPP_Config.py b/CEP/DP3/DPPP/scripts/Create_DPPP_Config.py
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/scripts/Create_DPPP_Config.py
rename to CEP/DP3/DPPP/scripts/Create_DPPP_Config.py
diff --git a/CEP/DP3/CS1_pp_lib/scripts/GuessDataset.py b/CEP/DP3/DPPP/scripts/GuessDataset.py
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/scripts/GuessDataset.py
rename to CEP/DP3/DPPP/scripts/GuessDataset.py
diff --git a/CEP/DP3/CS1_pp_lib/scripts/LOFAR_Parset.py b/CEP/DP3/DPPP/scripts/LOFAR_Parset.py
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/scripts/LOFAR_Parset.py
rename to CEP/DP3/DPPP/scripts/LOFAR_Parset.py
diff --git a/CEP/DP3/CS1_pp_lib/src/BandpassCorrector.cc b/CEP/DP3/DPPP/src/BandpassCorrector.cc
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/src/BandpassCorrector.cc
rename to CEP/DP3/DPPP/src/BandpassCorrector.cc
diff --git a/CEP/DP3/CS1_pp_lib/src/ComplexMedianFlagger.cc b/CEP/DP3/DPPP/src/ComplexMedianFlagger.cc
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/src/ComplexMedianFlagger.cc
rename to CEP/DP3/DPPP/src/ComplexMedianFlagger.cc
diff --git a/CEP/DP3/CS1_pp_lib/src/ComplexMedianFlagger2.cc b/CEP/DP3/DPPP/src/ComplexMedianFlagger2.cc
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/src/ComplexMedianFlagger2.cc
rename to CEP/DP3/DPPP/src/ComplexMedianFlagger2.cc
diff --git a/CEP/DP3/CS1_pp_lib/src/DataBuffer.cc b/CEP/DP3/DPPP/src/DataBuffer.cc
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/src/DataBuffer.cc
rename to CEP/DP3/DPPP/src/DataBuffer.cc
diff --git a/CEP/DP3/CS1_pp_lib/src/DataSquasher.cc b/CEP/DP3/DPPP/src/DataSquasher.cc
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/src/DataSquasher.cc
rename to CEP/DP3/DPPP/src/DataSquasher.cc
diff --git a/CEP/DP3/CS1_pp_lib/src/FlaggerStatistics.cc b/CEP/DP3/DPPP/src/FlaggerStatistics.cc
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/src/FlaggerStatistics.cc
rename to CEP/DP3/DPPP/src/FlaggerStatistics.cc
diff --git a/CEP/DP3/CS1_pp_lib/src/FrequencyFlagger.cc b/CEP/DP3/DPPP/src/FrequencyFlagger.cc
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/src/FrequencyFlagger.cc
rename to CEP/DP3/DPPP/src/FrequencyFlagger.cc
diff --git a/CEP/DP3/CS1_pp_lib/src/IDPPP.cc b/CEP/DP3/DPPP/src/IDPPP.cc
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/src/IDPPP.cc
rename to CEP/DP3/DPPP/src/IDPPP.cc
diff --git a/CEP/DP3/CS1_pp_lib/src/MADFlagger.cc b/CEP/DP3/DPPP/src/MADFlagger.cc
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/src/MADFlagger.cc
rename to CEP/DP3/DPPP/src/MADFlagger.cc
diff --git a/CEP/DP3/CS1_pp_lib/src/Makefile.am b/CEP/DP3/DPPP/src/Makefile.am
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/src/Makefile.am
rename to CEP/DP3/DPPP/src/Makefile.am
diff --git a/CEP/DP3/CS1_pp_lib/src/MsFile.cc b/CEP/DP3/DPPP/src/MsFile.cc
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/src/MsFile.cc
rename to CEP/DP3/DPPP/src/MsFile.cc
diff --git a/CEP/DP3/CS1_pp_lib/src/MsInfo.cc b/CEP/DP3/DPPP/src/MsInfo.cc
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/src/MsInfo.cc
rename to CEP/DP3/DPPP/src/MsInfo.cc
diff --git a/CEP/DP3/CS1_pp_lib/src/Pipeline.cc b/CEP/DP3/DPPP/src/Pipeline.cc
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/src/Pipeline.cc
rename to CEP/DP3/DPPP/src/Pipeline.cc
diff --git a/CEP/DP3/CS1_pp_lib/src/PipelineProcessControl.cc b/CEP/DP3/DPPP/src/PipelineProcessControl.cc
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/src/PipelineProcessControl.cc
rename to CEP/DP3/DPPP/src/PipelineProcessControl.cc
diff --git a/CEP/DP3/CS1_pp_lib/src/RunDetails.cc b/CEP/DP3/DPPP/src/RunDetails.cc
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/src/RunDetails.cc
rename to CEP/DP3/DPPP/src/RunDetails.cc
diff --git a/CEP/DP3/CS1_pp_lib/test/CS1_IDPPP.log_prop b/CEP/DP3/DPPP/test/CS1_IDPPP.log_prop
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/test/CS1_IDPPP.log_prop
rename to CEP/DP3/DPPP/test/CS1_IDPPP.log_prop
diff --git a/CEP/DP3/CS1_pp_lib/test/CS1_IDPPP.parset b/CEP/DP3/DPPP/test/CS1_IDPPP.parset
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/test/CS1_IDPPP.parset
rename to CEP/DP3/DPPP/test/CS1_IDPPP.parset
diff --git a/CEP/DP3/CS1_pp_lib/test/Makefile.am b/CEP/DP3/DPPP/test/Makefile.am
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/test/Makefile.am
rename to CEP/DP3/DPPP/test/Makefile.am
diff --git a/CEP/DP3/CS1_pp_lib/test/test_flaggers.cc b/CEP/DP3/DPPP/test/test_flaggers.cc
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/test/test_flaggers.cc
rename to CEP/DP3/DPPP/test/test_flaggers.cc
diff --git a/CEP/DP3/CS1_pp_lib/test/test_flaggers.sh b/CEP/DP3/DPPP/test/test_flaggers.sh
similarity index 100%
rename from CEP/DP3/CS1_pp_lib/test/test_flaggers.sh
rename to CEP/DP3/DPPP/test/test_flaggers.sh