diff --git a/openfpm_io b/openfpm_io
index 62978d3e93b96017a38870b3a048863f17058406..cb37b2bc9e40a02de36ed664dc0bfe43f6257f37 160000
--- a/openfpm_io
+++ b/openfpm_io
@@ -1 +1 @@
-Subproject commit 62978d3e93b96017a38870b3a048863f17058406
+Subproject commit cb37b2bc9e40a02de36ed664dc0bfe43f6257f37
diff --git a/src/Decomposition/ie_loc_ghost.hpp b/src/Decomposition/ie_loc_ghost.hpp
index 493f204fd79556f85a5f96f9da49f7675f02d33e..ec2d08b6d57870766c063dfc33439879245d08fb 100644
--- a/src/Decomposition/ie_loc_ghost.hpp
+++ b/src/Decomposition/ie_loc_ghost.hpp
@@ -12,7 +12,7 @@
 #include "Space/Ghost.hpp"
 #include "Space/SpaceBox.hpp"
 #include "common.hpp"
-#include "VTKWriter.hpp"
+#include "VTKWriter/VTKWriter.hpp"
 #include "nn_processor.hpp"
 
 /*! \brief structure that store and compute the internal and external local ghost box
diff --git a/src/Grid/grid_dist_id.hpp b/src/Grid/grid_dist_id.hpp
index 6e24231d0c9c32b6168d4a8360e37b0019142532..d0f13a2d706eab88901d6c2bd4cc6123814f2b92 100644
--- a/src/Grid/grid_dist_id.hpp
+++ b/src/Grid/grid_dist_id.hpp
@@ -14,7 +14,7 @@
 #include "NN/CellList/CellDecomposer.hpp"
 #include "util/object_util.hpp"
 #include "memory/ExtPreAlloc.hpp"
-#include "VTKWriter.hpp"
+#include "VTKWriter/VTKWriter.hpp"
 #include "Packer_Unpacker/Packer.hpp"
 #include "Packer_Unpacker/Unpacker.hpp"
 
diff --git a/src/Grid/staggered_dist_grid.hpp b/src/Grid/staggered_dist_grid.hpp
index 4fbbe322f61f04b238c0ec807bd57ec8b3aff22a..75809182460dbe54de6068b3885d680ee136f7d1 100644
--- a/src/Grid/staggered_dist_grid.hpp
+++ b/src/Grid/staggered_dist_grid.hpp
@@ -10,7 +10,7 @@
 
 #include "Grid/grid_dist_id.hpp"
 #include "staggered_dist_grid_util.hpp"
-#include "VTKWriter.hpp"
+#include "VTKWriter/VTKWriter.hpp"
 
 
 /*! \brief Implementation of the staggered grid
diff --git a/src/Grid/staggered_dist_grid_util.hpp b/src/Grid/staggered_dist_grid_util.hpp
index fc9cf783eb8588fa13eb3578907924be5bc3ac77..5a269985abadcdf4efd169f8d55e733100ad1122 100644
--- a/src/Grid/staggered_dist_grid_util.hpp
+++ b/src/Grid/staggered_dist_grid_util.hpp
@@ -9,7 +9,7 @@
 #define SRC_GRID_STAGGERED_DIST_GRID_UTIL_HPP_
 
 #include "util/common.hpp"
-#include "VTKWriter.hpp"
+#include "VTKWriter/VTKWriter.hpp"
 #include "util/convert.hpp"
 
 
diff --git a/src/Vector/vector_dist.hpp b/src/Vector/vector_dist.hpp
index 64e581b87a0ce8afa0a1dae1a75775c396f3e0d3..d06a21d5ad83c76c49817bbf1e28c7c92d01044f 100644
--- a/src/Vector/vector_dist.hpp
+++ b/src/Vector/vector_dist.hpp
@@ -19,7 +19,7 @@
 #include "util/common.hpp"
 #include "util/object_util.hpp"
 #include "memory/ExtPreAlloc.hpp"
-#include "CSVWriter.hpp"
+#include "CSVWriter/CSVWriter.hpp"
 #include "Decomposition/common.hpp"
 #include "Grid/grid_dist_id_iterator_dec.hpp"
 #include "Vector/vector_dist_ofb.hpp"
diff --git a/src/metis_util.hpp b/src/metis_util.hpp
index 5fae0a30654b78364f59984487cae01ef2ff2cb7..e433933dd8d5a22b12b18e5a9401770b5ed117fe 100644
--- a/src/metis_util.hpp
+++ b/src/metis_util.hpp
@@ -10,7 +10,7 @@
 
 #include <iostream>
 #include "metis.h"
-#include "VTKWriter.hpp"
+#include "VTKWriter/VTKWriter.hpp"
 
 /*! \brief Metis graph structure
  *
diff --git a/vtk/domain_gen_vtk.cpp b/vtk/domain_gen_vtk.cpp
index 7a5e6fc06187ee9b78492668832e793130f54107..92bb77d3ab757118098a5a0fb6a67357b6bd4b33 100644
--- a/vtk/domain_gen_vtk.cpp
+++ b/vtk/domain_gen_vtk.cpp
@@ -7,7 +7,7 @@
 
 #include "Space/Shape/Box.hpp"
 #include "Vector/map_vector.hpp"
-#include "VTKWriter.hpp"
+#include "VTKWriter/VTKWriter.hpp"
 
 int main(int argc, char ** argv)
 {