diff --git a/Demo/CEP/StationCorrelator/src/DH_CorrCube.cc b/Demo/CEP/StationCorrelator/src/DH_CorrCube.cc
index 70cfa9fb8342b44f1dcb26a4273c843cbf33f1dd..c4be082544663fa4a1932a2c4191c14e5aee08f2 100644
--- a/Demo/CEP/StationCorrelator/src/DH_CorrCube.cc
+++ b/Demo/CEP/StationCorrelator/src/DH_CorrCube.cc
@@ -12,7 +12,7 @@
 #include <lofar_config.h>
 
 #include <DH_CorrCube.h>
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 
 namespace LOFAR
 {
diff --git a/Demo/CEP/StationCorrelator/src/DH_RSP.h b/Demo/CEP/StationCorrelator/src/DH_RSP.h
index ae46a6a4d5db628b20466342cc6b7947a3a3ee2f..6a8672241ce4970fdce29e1108214b1a70535978 100644
--- a/Demo/CEP/StationCorrelator/src/DH_RSP.h
+++ b/Demo/CEP/StationCorrelator/src/DH_RSP.h
@@ -27,7 +27,7 @@
 
 #include <Transport/DataHolder.h>
 #include <complex>
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 
 using std::complex;
 
diff --git a/Demo/CEP/StationCorrelator/src/DH_RSPSync.cc b/Demo/CEP/StationCorrelator/src/DH_RSPSync.cc
index 3f8c95e5b5176bc7111a01bdd0de05bfadb65012..8416da8244a4282c9b00d1db0245cb9f4dedec65 100644
--- a/Demo/CEP/StationCorrelator/src/DH_RSPSync.cc
+++ b/Demo/CEP/StationCorrelator/src/DH_RSPSync.cc
@@ -12,7 +12,7 @@
 
 
 #include <DH_RSPSync.h>
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 
 namespace LOFAR
 {
diff --git a/Demo/CEP/StationCorrelator/src/DH_Vis.cc b/Demo/CEP/StationCorrelator/src/DH_Vis.cc
index 636da90c4102188b3cdbaf5973c4c11e35b2804c..aac0d08e5878f55d74823f394449ef125493a1c2 100644
--- a/Demo/CEP/StationCorrelator/src/DH_Vis.cc
+++ b/Demo/CEP/StationCorrelator/src/DH_Vis.cc
@@ -12,7 +12,7 @@
 
 
 #include <DH_Vis.h>
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 
 namespace LOFAR
 {
diff --git a/Demo/CEP/StationCorrelator/src/StationCorrelator.cc b/Demo/CEP/StationCorrelator/src/StationCorrelator.cc
index f78b871da756c46fb37989297ef12df8a5b013be..98793749c73bf2ee74e735f33eca55f83fd399ff 100644
--- a/Demo/CEP/StationCorrelator/src/StationCorrelator.cc
+++ b/Demo/CEP/StationCorrelator/src/StationCorrelator.cc
@@ -25,8 +25,8 @@
 
 #include <StationCorrelator.h>
 
-#include <Common/KeyParser.h>
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyParser.h>
+#include <Blob/KeyValueMap.h>
 #include <Common/LofarLogger.h>
 #include <Common/lofar_iostream.h>
 
diff --git a/Demo/CEP/StationCorrelator/src/StationCorrelator.h b/Demo/CEP/StationCorrelator/src/StationCorrelator.h
index 8572c46133dbcb34c848e3c5eb11ace80c93dd61..61ce2b1d79a8aa22d82975361ced2fa12b5bbe19 100644
--- a/Demo/CEP/StationCorrelator/src/StationCorrelator.h
+++ b/Demo/CEP/StationCorrelator/src/StationCorrelator.h
@@ -23,7 +23,7 @@
 #ifndef STATIONCORRELATOR_H
 #define STATIONCORRELATOR_H
 
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 #include <CEPFrame/ApplicationHolder.h>
 
 namespace LOFAR {
diff --git a/Demo/CEP/StationCorrelator/src/StationCorrelatorMain.cc b/Demo/CEP/StationCorrelator/src/StationCorrelatorMain.cc
index 49cad90468297ec83c20a8949b06b023d45325dd..87a79d8db8d10fbb24d224342995bbccd4497cdc 100644
--- a/Demo/CEP/StationCorrelator/src/StationCorrelatorMain.cc
+++ b/Demo/CEP/StationCorrelator/src/StationCorrelatorMain.cc
@@ -23,8 +23,8 @@
 //# Always #include <lofar_config.h> first!
 #include <lofar_config.h>
 
-#include <Common/KeyParser.h>
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyParser.h>
+#include <Blob/KeyValueMap.h>
 #include <Common/LofarLogger.h>
 #include <Common/lofar_iostream.h>
 #include <Common/lofar_string.h>
diff --git a/Demo/CEP/StationCorrelator/src/WH_Correlator.cc b/Demo/CEP/StationCorrelator/src/WH_Correlator.cc
index b46c7ec7367209825ec0d613fcc80100d76b9fc1..3863785f082ec484133afb8864bed3d53c3a2e40 100644
--- a/Demo/CEP/StationCorrelator/src/WH_Correlator.cc
+++ b/Demo/CEP/StationCorrelator/src/WH_Correlator.cc
@@ -24,7 +24,7 @@
 #include <stdio.h>
 
 // General includes
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 #include <Common/LofarLogger.h>
 
 #ifdef HAVE_MPI
diff --git a/Demo/CEP/StationCorrelator/src/WH_Dump.cc b/Demo/CEP/StationCorrelator/src/WH_Dump.cc
index dfdec0042de53e60c0f44766cafdc1c84b6e375b..d1e70ddd6bf544a9efdfdfcc5be0fae66911a705 100644
--- a/Demo/CEP/StationCorrelator/src/WH_Dump.cc
+++ b/Demo/CEP/StationCorrelator/src/WH_Dump.cc
@@ -16,7 +16,7 @@
 
 // General includes
 #include <Common/LofarLogger.h>
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 
 // Application specific includes
 #include <WH_Dump.h>
diff --git a/Demo/CEP/StationCorrelator/src/WH_Dump.h b/Demo/CEP/StationCorrelator/src/WH_Dump.h
index 305c2e9026e72283d925fa3295343fafcf046721..0fb4c08bf6898c05d6209072c7b66330a55c4ad5 100644
--- a/Demo/CEP/StationCorrelator/src/WH_Dump.h
+++ b/Demo/CEP/StationCorrelator/src/WH_Dump.h
@@ -13,7 +13,7 @@
 #include <sys/time.h>
 
 #include <tinyCEP/WorkHolder.h>
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 
 using namespace std;
 namespace LOFAR
diff --git a/Demo/CEP/StationCorrelator/src/WH_Plot2MAC.cc b/Demo/CEP/StationCorrelator/src/WH_Plot2MAC.cc
index d3688fa87c31b433f491022ff4b6f9a61b7afcdc..0fda0422ef59725c0ed402cf4df4cc5623853173 100644
--- a/Demo/CEP/StationCorrelator/src/WH_Plot2MAC.cc
+++ b/Demo/CEP/StationCorrelator/src/WH_Plot2MAC.cc
@@ -15,7 +15,7 @@
 
 // General includes
 #include <Common/LofarLogger.h>
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 
 // Application specific includes
 #include <WH_Plot2MAC.h>
diff --git a/Demo/CEP/StationCorrelator/src/WH_Plot2MAC.h b/Demo/CEP/StationCorrelator/src/WH_Plot2MAC.h
index 246bce9c40b05e86fc8c03fcb7f6275ccbf0c5dd..e53dc9bc7112fbca53999a93c458f154394c2982 100644
--- a/Demo/CEP/StationCorrelator/src/WH_Plot2MAC.h
+++ b/Demo/CEP/StationCorrelator/src/WH_Plot2MAC.h
@@ -14,7 +14,7 @@
 
 #include <lofar_config.h>
 #include <tinyCEP/WorkHolder.h>
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 #include <GCF/PALlight/CEPPropertySet.h>
 
 
diff --git a/Demo/CEP/StationCorrelator/src/WH_RSP.h b/Demo/CEP/StationCorrelator/src/WH_RSP.h
index 5b489bd52bf5d3fee09bcdd5a75ad79f67da5ba0..aa2a843ee3c38574e974afa8de3ba37d278f9a4f 100644
--- a/Demo/CEP/StationCorrelator/src/WH_RSP.h
+++ b/Demo/CEP/StationCorrelator/src/WH_RSP.h
@@ -25,7 +25,7 @@
 #define STATIONCORRELATOR_WH_RSP_H
 
 
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 #include <tinyCEP/WorkHolder.h>
 #include <DH_RSPSync.h>
 
diff --git a/Demo/CEP/StationCorrelator/src/WH_RSPBoard.h b/Demo/CEP/StationCorrelator/src/WH_RSPBoard.h
index 00fe8c57b1b44ca9009ee2cfac7fe21922eaeb3f..2759d617e5d253af86ca4cfd0e29450e24eb75cf 100644
--- a/Demo/CEP/StationCorrelator/src/WH_RSPBoard.h
+++ b/Demo/CEP/StationCorrelator/src/WH_RSPBoard.h
@@ -24,7 +24,7 @@
 #define STATIONCORRELATOR_WH_RSPBOARD_H
 
 
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 #include <tinyCEP/WorkHolder.h>
 #include <SyncStamp.h>
 
diff --git a/Demo/CEP/StationCorrelator/src/WH_RSPInput.h b/Demo/CEP/StationCorrelator/src/WH_RSPInput.h
index 4dafba4542546de066daa004ca502570684d035f..b5541dab47dca858bb7b64c802b2de703f4a2bdf 100644
--- a/Demo/CEP/StationCorrelator/src/WH_RSPInput.h
+++ b/Demo/CEP/StationCorrelator/src/WH_RSPInput.h
@@ -24,7 +24,7 @@
 #define STATIONCORRELATOR_WH_RSPINPUT_H
 
 
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 #include <tinyCEP/WorkHolder.h>
 #include <DH_RSPSync.h>
 
diff --git a/Demo/CEP/StationCorrelator/src/WH_Transpose.h b/Demo/CEP/StationCorrelator/src/WH_Transpose.h
index 80e29176ca865f6a4c1e1e8e44b490ab66af8db8..2979c0eea98aa938d4f986e420177f7e7ec6c3f0 100644
--- a/Demo/CEP/StationCorrelator/src/WH_Transpose.h
+++ b/Demo/CEP/StationCorrelator/src/WH_Transpose.h
@@ -29,7 +29,7 @@
 // one line description.
 
 //# Includes
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 #include <tinyCEP/WorkHolder.h>
 
 namespace LOFAR
diff --git a/Demo/CEP/TFlopCorrelator/TFC_BGLProc/test/tWH_BGL_Processing.h b/Demo/CEP/TFlopCorrelator/TFC_BGLProc/test/tWH_BGL_Processing.h
index 0e309eed64cb5641a70ad96d7d52f2668e2ed0f8..be23bc8468c6080c69896a84771ef5c909d3cc90 100644
--- a/Demo/CEP/TFlopCorrelator/TFC_BGLProc/test/tWH_BGL_Processing.h
+++ b/Demo/CEP/TFlopCorrelator/TFC_BGLProc/test/tWH_BGL_Processing.h
@@ -24,7 +24,7 @@
 
 #include <tinyCEP/TinyApplicationHolder.h>
 #include <tinyCEP/WorkHolder.h>
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 #include <Transport/Connection.h>
 #include <Transport/TransportHolder.h>
 #include <Transport/DataHolder.h>
diff --git a/Demo/CEP/TFlopCorrelator/TFC_BGLProc/test/tWH_Correlator.h b/Demo/CEP/TFlopCorrelator/TFC_BGLProc/test/tWH_Correlator.h
index 3e265d896bfafa2bb2d92724773e9ec29bc7882d..00ed8d3bca882035990760dc790ddd24337fb875 100644
--- a/Demo/CEP/TFlopCorrelator/TFC_BGLProc/test/tWH_Correlator.h
+++ b/Demo/CEP/TFlopCorrelator/TFC_BGLProc/test/tWH_Correlator.h
@@ -25,7 +25,7 @@
 
 #include <tinyCEP/TinyApplicationHolder.h>
 #include <tinyCEP/WorkHolder.h>
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 #include <Transport/Connection.h>
 #include <Transport/TransportHolder.h>
 #include <Transport/DataHolder.h>
diff --git a/Demo/CEP/TFlopCorrelator/TFC_BGLProc/test/tWH_PPF.h b/Demo/CEP/TFlopCorrelator/TFC_BGLProc/test/tWH_PPF.h
index cd9765d104b65a3ae46f614a5ea834f4fa1d2df3..ab94a8ee9aeb936394e7ebda682bfb73def89dcd 100644
--- a/Demo/CEP/TFlopCorrelator/TFC_BGLProc/test/tWH_PPF.h
+++ b/Demo/CEP/TFlopCorrelator/TFC_BGLProc/test/tWH_PPF.h
@@ -27,7 +27,7 @@
 
 #include <tinyCEP/TinyApplicationHolder.h>
 #include <tinyCEP/WorkHolder.h>
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 #include <Transport/Connection.h>
 #include <Transport/TransportHolder.h>
 #include <Transport/DataHolder.h>
diff --git a/Demo/CEP/TFlopCorrelator/TFC_InputSection/src/WH_SBCollect.h b/Demo/CEP/TFlopCorrelator/TFC_InputSection/src/WH_SBCollect.h
index f1963ddb9327ee197b55e93bb08a3dbc1d2fb643..0faaf5d5f8d95531dfc6292ffffb3a8039b71f49 100644
--- a/Demo/CEP/TFlopCorrelator/TFC_InputSection/src/WH_SBCollect.h
+++ b/Demo/CEP/TFlopCorrelator/TFC_InputSection/src/WH_SBCollect.h
@@ -24,7 +24,7 @@
 #define TFLOPCORRELATOR_TFC_INPUTSECTION_WH_SBCOLLECT_H
 
 
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 #include <tinyCEP/WorkHolder.h>
 
 
diff --git a/Demo/CEP/TFlopCorrelator/TFC_InputSection/test/tWH_SBCollect.h b/Demo/CEP/TFlopCorrelator/TFC_InputSection/test/tWH_SBCollect.h
index 478013fdbbe6ccf7307c17cd081f525b3ada1858..92dac28e5623504785c0f1a1346f226112bea6c1 100644
--- a/Demo/CEP/TFlopCorrelator/TFC_InputSection/test/tWH_SBCollect.h
+++ b/Demo/CEP/TFlopCorrelator/TFC_InputSection/test/tWH_SBCollect.h
@@ -25,7 +25,7 @@
 
 #include <tinyCEP/TinyApplicationHolder.h>
 #include <tinyCEP/WorkHolder.h>
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 #include <Transport/Connection.h>
 #include <Transport/TransportHolder.h>
 #include <Transport/DataHolder.h>
diff --git a/Demo/CEP/TFlopCorrelator/TFC_Interface/src/DH_RSPSync.cc b/Demo/CEP/TFlopCorrelator/TFC_Interface/src/DH_RSPSync.cc
index 497e3d58d85418cff0a78e97d6e3ef9c357261a0..bea8f769bcdb59e0185d4d1af66a958b9eaeebc9 100644
--- a/Demo/CEP/TFlopCorrelator/TFC_Interface/src/DH_RSPSync.cc
+++ b/Demo/CEP/TFlopCorrelator/TFC_Interface/src/DH_RSPSync.cc
@@ -12,7 +12,7 @@
 
 
 #include <DH_RSPSync.h>
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 
 namespace LOFAR
 {
diff --git a/Demo/CEP/TFlopCorrelator/TFC_Storage/src/WH_Storage.h b/Demo/CEP/TFlopCorrelator/TFC_Storage/src/WH_Storage.h
index 4867a3457d51e1334fbc1cfab4ef5d2aa53149fc..2923c89bb84eb1d9bc4a24fad70ffb1b1e6bec45 100644
--- a/Demo/CEP/TFlopCorrelator/TFC_Storage/src/WH_Storage.h
+++ b/Demo/CEP/TFlopCorrelator/TFC_Storage/src/WH_Storage.h
@@ -24,7 +24,7 @@
 #define TFLOPCORRELATOR_WH_STORAGE_H
 
 
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 #include <tinyCEP/WorkHolder.h>
 #ifdef USE_MAC_PI
 #include <GCF/PALlight/CEPPropertySet.h>
diff --git a/Demo/CEP/TFlopCorrelator/TFC_Storage/test/tAH_TestStorage.h b/Demo/CEP/TFlopCorrelator/TFC_Storage/test/tAH_TestStorage.h
index b984c87e55b9a8c101f73a4a47886c3d2c2b5acb..decdfb4911fff197cc7d166314dbc36a5df85ffe 100644
--- a/Demo/CEP/TFlopCorrelator/TFC_Storage/test/tAH_TestStorage.h
+++ b/Demo/CEP/TFlopCorrelator/TFC_Storage/test/tAH_TestStorage.h
@@ -25,7 +25,7 @@
 
 #include <tinyCEP/TinyApplicationHolder.h>
 #include <tinyCEP/WorkHolder.h>
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 #include <Transport/Connection.h>
 #include <Transport/TransportHolder.h>
 #include <Transport/DataHolder.h>