diff --git a/.gitmodules b/.gitmodules
index 7645f2cab6c681f55ad3f97b575b6b141fbc25c2..34adb2b886fec12365f1658f98c77d737a5a3d1a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,15 +1,15 @@
 [submodule "openfpm_vcluster"]
 	path = openfpm_vcluster
-	url = ssh://git@ppmcoremirror.dynu.com:2222/incardon/openfpm_vcluster.git
+	url = ssh://git@ppmcore.mpi-cbg.de:/incardon/openfpm_vcluster.git
 [submodule "openfpm_devices"]
 	path = openfpm_devices
-	url = ssh://git@ppmcoremirror.dynu.com:2222/incardon/openfpm_devices.git
+	url = ssh://git@ppmcore.mpi-cbg.de:/incardon/openfpm_devices.git
 [submodule "openfpm_io"]
 	path = openfpm_io
-	url = ssh://git@ppmcoremirror.dynu.com:2222/incardon/openfpm_io.git
+	url = ssh://git@ppmcore.mpi-cbg.de:/incardon/openfpm_io.git
 [submodule "openfpm_data"]
 	path = openfpm_data
-	url = ssh://git@ppmcoremirror.dynu.com:2222/incardon/openfpm_data.git
+	url = ssh://git@ppmcore.mpi-cbg.de:/incardon/openfpm_data.git
 [submodule "openfpm_numerics"]
 	path = openfpm_numerics
-	url = ssh://git@ppmcoremirror.dynu.com:2222/incardon/openfpm_numerics.git
+	url = ssh://git@ppmcore.mpi-cbg.de:/incardon/openfpm_numerics.git
diff --git a/openfpm_data b/openfpm_data
index 2e36a553e379e6712b62abeffce479b005774c91..26eb52e20ea3678be90de05f70031efadcb6bcfd 160000
--- a/openfpm_data
+++ b/openfpm_data
@@ -1 +1 @@
-Subproject commit 2e36a553e379e6712b62abeffce479b005774c91
+Subproject commit 26eb52e20ea3678be90de05f70031efadcb6bcfd
diff --git a/openfpm_io b/openfpm_io
index 935c25aaa275530ef1dafb86b7a9074e649a1d1f..3b2e69cf915aeb1ccf6eec96d269512029465533 160000
--- a/openfpm_io
+++ b/openfpm_io
@@ -1 +1 @@
-Subproject commit 935c25aaa275530ef1dafb86b7a9074e649a1d1f
+Subproject commit 3b2e69cf915aeb1ccf6eec96d269512029465533
diff --git a/src/Makefile.am b/src/Makefile.am
index 24bdf6db5ef294866fe3b94336bf1c625cadea71..f28a9e454f8235f976ef3e8678b48a914d5fdddd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,12 +1,12 @@
 LINKLIBS = $(METIS_LIB) $(PTHREAD_LIBS) $(OPT_LIBS) $(BOOST_LDFLAGS) $(BOOST_IOSTREAMS_LIB) $(CUDA_LIBS)
 
 noinst_PROGRAMS = pdata
-pdata_SOURCES = main.cpp ../openfpm_devices/src/memory/HeapMemory.cpp ../openfpm_devices/src/memory/PtrMemory.cpp ../openfpm_vcluster/src/VCluster.cpp ../openfpm_data/src/Memleak_check.cpp
+pdata_SOURCES = main.cpp ../openfpm_devices/src/memory/HeapMemory.cpp ../openfpm_devices/src/memory/PtrMemory.cpp ../openfpm_vcluster/src/VCluster.cpp ../openfpm_devices/src/Memleak_check.cpp
 pdata_CXXFLAGS = $(CUDA_CFLAGS) $(INCLUDES_PATH) $(METIS_INCLUDE) $(BOOST_CPPFLAGS) -Wno-unused-function
 pdata_CFLAGS = $(CUDA_CFLAGS)
 pdata_LDADD = $(LINKLIBS) -lmetis -lparmetis
 nobase_include_HEADERS = Decomposition/CartDecomposition.hpp Decomposition/common.hpp Decomposition/Decomposition.hpp  Decomposition/ie_ghost.hpp \
-         Decomposition/nn_processor.hpp Decomposition/DistModel.hpp Decomposition/ie_loc_ghost.hpp Decomposition/ORB.hpp \
+         Decomposition/nn_processor.hpp Decomposition/ie_loc_ghost.hpp Decomposition/ORB.hpp \
          Graph/CartesianGraphFactory.hpp \
          Grid/grid_dist_id.hpp Grid/grid_dist_id_iterator.hpp Grid/grid_dist_key.hpp \
          Vector/vector_dist.hpp Vector/vector_dist_iterator.hpp Vector/vector_dist_key.hpp \