diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake
index 67e09852..74990d84 100644
--- a/CMakeLists_files.cmake
+++ b/CMakeLists_files.cmake
@@ -26,8 +26,6 @@
 # originally generated with the command:
 # find opm -name '*.c*' -printf '\t%p\n' | sort
 list (APPEND MAIN_SOURCE_FILES
-	opm/core/eclipse/EclipseGridInspector.cpp
-	opm/core/eclipse/EclipseGridParser.cpp
 	opm/core/fluid/blackoil/BlackoilPvtProperties.cpp
 	opm/core/fluid/BlackoilPropertiesBasic.cpp
 	opm/core/fluid/BlackoilPropertiesFromDeck.cpp
@@ -57,6 +55,11 @@ list (APPEND MAIN_SOURCE_FILES
 	opm/core/grid/cpgpreprocess/processgrid.c
 	opm/core/grid/cpgpreprocess/uniquepoints.c
 	opm/core/GridManager.cpp
+	opm/core/io/eclipse/EclipseGridInspector.cpp
+	opm/core/io/eclipse/EclipseGridParser.cpp
+	opm/core/io/eclipse/writeECLData.cpp
+	opm/core/io/vag/vag.cpp
+	opm/core/io/vtk/writeVtkData.cpp
 	opm/core/linalg/call_umfpack.c
 	opm/core/linalg/LinearSolverAGMG.cpp
 	opm/core/linalg/LinearSolverFactory.cpp
@@ -122,9 +125,6 @@ list (APPEND MAIN_SOURCE_FILES
 	opm/core/utility/StopWatch.cpp
 	opm/core/utility/VelocityInterpolation.cpp
 	opm/core/utility/WachspressCoord.cpp
-	opm/core/utility/writeECLData.cpp
-	opm/core/utility/writeVtkData.cpp
-	opm/core/vag_format/vag.cpp
 	opm/core/wells/InjectionSpecification.cpp
 	opm/core/wells/ProductionSpecification.cpp
 	opm/core/wells/WellCollection.cpp
@@ -198,13 +198,16 @@ list (APPEND PUBLIC_HEADER_FILES
 	opm/core/transport/GravityColumnSolver.hpp
 	opm/core/transport/NormSupport.hpp
 	opm/core/transport/spu_explicit.h
-	opm/core/eclipse/SpecialEclipseFields.hpp
-	opm/core/eclipse/EclipseUnits.hpp
-	opm/core/eclipse/EclipseGridParserHelpers.hpp
-	opm/core/eclipse/CornerpointChopper.hpp
-	opm/core/eclipse/EclipseGridParser.hpp
-	opm/core/eclipse/EclipseGridInspector.hpp
 	opm/core/GridManager.hpp
+	opm/core/io/eclipse/SpecialEclipseFields.hpp
+	opm/core/io/eclipse/EclipseUnits.hpp
+	opm/core/io/eclipse/EclipseGridParserHelpers.hpp
+	opm/core/io/eclipse/CornerpointChopper.hpp
+	opm/core/io/eclipse/EclipseGridParser.hpp
+	opm/core/io/eclipse/EclipseGridInspector.hpp
+	opm/core/io/eclipse/writeECLData.hpp
+	opm/core/io/vag/vag.hpp
+	opm/core/io/vtk/writeVtkData.hpp
 	opm/core/linalg/blas_lapack.h
 	opm/core/linalg/LinearSolverAGMG.hpp
 	opm/core/linalg/LinearSolverFactory.hpp
@@ -214,7 +217,6 @@ list (APPEND PUBLIC_HEADER_FILES
 	opm/core/linalg/sparse_sys.h
 	opm/core/linalg/LinearSolverInterface.hpp
 	opm/core/newwells.h
-	opm/core/vag_format/vag.hpp
 	opm/core/doxygen_main.hpp
 	opm/core/simulator/SimulatorIncompTwophase.hpp
 	opm/core/simulator/WellState.hpp
@@ -244,7 +246,6 @@ list (APPEND PUBLIC_HEADER_FILES
 	opm/core/utility/miscUtilitiesBlackoil.hpp
 	opm/core/utility/MonotCubicInterpolator.hpp
 	opm/core/utility/UniformTableLinear.hpp
-	opm/core/utility/writeVtkData.hpp
 	opm/core/utility/Average.hpp
 	opm/core/utility/Factory.hpp
 	opm/core/utility/VelocityInterpolation.hpp
@@ -257,7 +258,6 @@ list (APPEND PUBLIC_HEADER_FILES
 	opm/core/utility/RootFinders.hpp
 	opm/core/utility/SparseTable.hpp
 	opm/core/utility/have_boost_redef.hpp
-	opm/core/utility/writeECLData.hpp
 	opm/core/grid/CellQuadrature.hpp
 	opm/core/grid/cornerpoint_grid.h
 	opm/core/grid/cpgpreprocess/geometry.h
diff --git a/examples/import_rewrite.cpp b/examples/import_rewrite.cpp
index 585161b3..50ec9da2 100644
--- a/examples/import_rewrite.cpp
+++ b/examples/import_rewrite.cpp
@@ -2,12 +2,12 @@
 #include "config.h"
 #endif // HAVE_CONFIG_H
 
-#include <opm/core/eclipse/EclipseGridParser.hpp>
+#include <opm/core/io/eclipse/EclipseGridParser.hpp>
 
 #include <boost/filesystem/convenience.hpp>
 
 #ifdef HAVE_ERT
-#include <opm/core/utility/writeECLData.hpp>
+#include <opm/core/io/eclipse/writeECLData.hpp>
 #include <ert/util/util.h>
 #include <ert/ecl/ecl_util.h>
 #include <ert/ecl/ecl_kw.h>
diff --git a/examples/refine_wells.cpp b/examples/refine_wells.cpp
index 0058c483..0ddb28fd 100644
--- a/examples/refine_wells.cpp
+++ b/examples/refine_wells.cpp
@@ -17,7 +17,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <opm/core/eclipse/EclipseGridParser.hpp>
+#include <opm/core/io/eclipse/EclipseGridParser.hpp>
 
 // Double I and J coordinates of wells and completions.
 // Do not change any well productivity indices or any other data.
diff --git a/examples/sim_wateroil.cpp b/examples/sim_wateroil.cpp
index 0fe1f51c..69229c33 100644
--- a/examples/sim_wateroil.cpp
+++ b/examples/sim_wateroil.cpp
@@ -33,7 +33,7 @@
 #include <opm/core/simulator/SimulatorTimer.hpp>
 #include <opm/core/utility/StopWatch.hpp>
 #include <opm/core/utility/Units.hpp>
-#include <opm/core/utility/writeVtkData.hpp>
+#include <opm/core/io/vtk/writeVtkData.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/core/utility/miscUtilitiesBlackoil.hpp>
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
diff --git a/examples/spu_2p.cpp b/examples/spu_2p.cpp
index a5a664d0..d088015a 100644
--- a/examples/spu_2p.cpp
+++ b/examples/spu_2p.cpp
@@ -49,7 +49,7 @@
 #include <opm/core/simulator/SimulatorTimer.hpp>
 #include <opm/core/utility/StopWatch.hpp>
 #include <opm/core/utility/Units.hpp>
-#include <opm/core/utility/writeVtkData.hpp>
+#include <opm/core/io/vtk/writeVtkData.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
 
@@ -95,7 +95,7 @@
 
 
 #ifdef HAVE_ERT
-#include <opm/core/utility/writeECLData.hpp>
+#include <opm/core/io/eclipse/writeECLData.hpp>
 #endif
 
 
diff --git a/examples/wells_example.cpp b/examples/wells_example.cpp
index 1c523420..b4aa0024 100644
--- a/examples/wells_example.cpp
+++ b/examples/wells_example.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include <opm/core/eclipse/EclipseGridParser.hpp>
+#include <opm/core/io/eclipse/EclipseGridParser.hpp>
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
 
 
diff --git a/opm/core/GridManager.cpp b/opm/core/GridManager.cpp
index 528e2e12..76fa6fce 100644
--- a/opm/core/GridManager.cpp
+++ b/opm/core/GridManager.cpp
@@ -18,7 +18,7 @@
 */
 
 #include <opm/core/GridManager.hpp>
-#include <opm/core/eclipse/EclipseGridParser.hpp>
+#include <opm/core/io/eclipse/EclipseGridParser.hpp>
 #include <opm/core/grid.h>
 #include <opm/core/grid/cart_grid.h>
 #include <opm/core/grid/cornerpoint_grid.h>
diff --git a/opm/core/fluid/BlackoilPropertiesFromDeck.hpp b/opm/core/fluid/BlackoilPropertiesFromDeck.hpp
index eb8b947b..2d3c1818 100644
--- a/opm/core/fluid/BlackoilPropertiesFromDeck.hpp
+++ b/opm/core/fluid/BlackoilPropertiesFromDeck.hpp
@@ -25,7 +25,7 @@
 #include <opm/core/fluid/RockFromDeck.hpp>
 #include <opm/core/fluid/blackoil/BlackoilPvtProperties.hpp>
 #include <opm/core/fluid/SaturationPropsFromDeck.hpp>
-#include <opm/core/eclipse/EclipseGridParser.hpp>
+#include <opm/core/io/eclipse/EclipseGridParser.hpp>
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
 #include <boost/scoped_ptr.hpp>
 
diff --git a/opm/core/fluid/IncompPropertiesFromDeck.hpp b/opm/core/fluid/IncompPropertiesFromDeck.hpp
index 6680eaa4..fd0812f3 100644
--- a/opm/core/fluid/IncompPropertiesFromDeck.hpp
+++ b/opm/core/fluid/IncompPropertiesFromDeck.hpp
@@ -24,7 +24,7 @@
 #include <opm/core/fluid/RockFromDeck.hpp>
 #include <opm/core/fluid/PvtPropertiesIncompFromDeck.hpp>
 #include <opm/core/fluid/SaturationPropsFromDeck.hpp>
-#include <opm/core/eclipse/EclipseGridParser.hpp>
+#include <opm/core/io/eclipse/EclipseGridParser.hpp>
 
 struct UnstructuredGrid;
 
diff --git a/opm/core/fluid/PvtPropertiesIncompFromDeck.cpp b/opm/core/fluid/PvtPropertiesIncompFromDeck.cpp
index 34a4ba00..42e36c1c 100644
--- a/opm/core/fluid/PvtPropertiesIncompFromDeck.cpp
+++ b/opm/core/fluid/PvtPropertiesIncompFromDeck.cpp
@@ -20,7 +20,7 @@
 
 #include <opm/core/fluid/PvtPropertiesIncompFromDeck.hpp>
 #include <opm/core/fluid/blackoil/phaseUsageFromDeck.hpp>
-#include <opm/core/eclipse/EclipseGridParser.hpp>
+#include <opm/core/io/eclipse/EclipseGridParser.hpp>
 #include <opm/core/utility/Units.hpp>
 #include <opm/core/utility/ErrorMacros.hpp>
 #include <opm/core/fluid/blackoil/BlackoilPhases.hpp>
diff --git a/opm/core/fluid/PvtPropertiesIncompFromDeck.hpp b/opm/core/fluid/PvtPropertiesIncompFromDeck.hpp
index 01bbeed1..62663559 100644
--- a/opm/core/fluid/PvtPropertiesIncompFromDeck.hpp
+++ b/opm/core/fluid/PvtPropertiesIncompFromDeck.hpp
@@ -21,7 +21,7 @@
 #define OPM_PVTPROPERTIESINCOMPFROMDECK_HEADER_INCLUDED
 
 
-#include <opm/core/eclipse/EclipseGridParser.hpp>
+#include <opm/core/io/eclipse/EclipseGridParser.hpp>
 #include <tr1/array>
 
 namespace Opm
diff --git a/opm/core/fluid/RockCompressibility.cpp b/opm/core/fluid/RockCompressibility.cpp
index af65d852..a39bfcba 100644
--- a/opm/core/fluid/RockCompressibility.cpp
+++ b/opm/core/fluid/RockCompressibility.cpp
@@ -18,7 +18,7 @@
 */
 
 #include <opm/core/fluid/RockCompressibility.hpp>
-#include <opm/core/eclipse/EclipseGridParser.hpp>
+#include <opm/core/io/eclipse/EclipseGridParser.hpp>
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
 #include <opm/core/utility/Units.hpp>
 #include <opm/core/utility/ErrorMacros.hpp>
diff --git a/opm/core/fluid/RockFromDeck.hpp b/opm/core/fluid/RockFromDeck.hpp
index 63e71a6e..e277ee2a 100644
--- a/opm/core/fluid/RockFromDeck.hpp
+++ b/opm/core/fluid/RockFromDeck.hpp
@@ -21,7 +21,7 @@
 #define OPM_ROCKFROMDECK_HEADER_INCLUDED
 
 
-#include <opm/core/eclipse/EclipseGridParser.hpp>
+#include <opm/core/io/eclipse/EclipseGridParser.hpp>
 #include <vector>
 
 struct UnstructuredGrid;
diff --git a/opm/core/fluid/SatFuncGwseg.hpp b/opm/core/fluid/SatFuncGwseg.hpp
index ae5b47a6..eb40fc31 100644
--- a/opm/core/fluid/SatFuncGwseg.hpp
+++ b/opm/core/fluid/SatFuncGwseg.hpp
@@ -19,7 +19,7 @@
 #ifndef SATFUNCGWSEG_HPP
 #define SATFUNCGWSEG_HPP
 
-#include <opm/core/eclipse/EclipseGridParser.hpp>
+#include <opm/core/io/eclipse/EclipseGridParser.hpp>
 #include <opm/core/utility/UniformTableLinear.hpp>
 #include <opm/core/utility/NonuniformTableLinear.hpp>
 #include <opm/core/fluid/blackoil/BlackoilPhases.hpp>
diff --git a/opm/core/fluid/SatFuncSimple.hpp b/opm/core/fluid/SatFuncSimple.hpp
index 1b6ba03b..f3d34be9 100644
--- a/opm/core/fluid/SatFuncSimple.hpp
+++ b/opm/core/fluid/SatFuncSimple.hpp
@@ -19,7 +19,7 @@
 #ifndef SATFUNCSIMPLE_HPP
 #define SATFUNCSIMPLE_HPP
 
-#include <opm/core/eclipse/EclipseGridParser.hpp>
+#include <opm/core/io/eclipse/EclipseGridParser.hpp>
 #include <opm/core/utility/UniformTableLinear.hpp>
 #include <opm/core/utility/NonuniformTableLinear.hpp>
 #include <opm/core/fluid/blackoil/BlackoilPhases.hpp>
diff --git a/opm/core/fluid/SatFuncStone2.hpp b/opm/core/fluid/SatFuncStone2.hpp
index fc906126..f85f8a80 100644
--- a/opm/core/fluid/SatFuncStone2.hpp
+++ b/opm/core/fluid/SatFuncStone2.hpp
@@ -19,7 +19,7 @@
 #ifndef SATFUNCSTONE2_HPP
 #define SATFUNCSTONE2_HPP
 
-#include <opm/core/eclipse/EclipseGridParser.hpp>
+#include <opm/core/io/eclipse/EclipseGridParser.hpp>
 #include <opm/core/utility/UniformTableLinear.hpp>
 #include <opm/core/utility/NonuniformTableLinear.hpp>
 #include <opm/core/fluid/blackoil/BlackoilPhases.hpp>
diff --git a/opm/core/fluid/SaturationPropsFromDeck.hpp b/opm/core/fluid/SaturationPropsFromDeck.hpp
index 1492c5a5..e2b22c91 100644
--- a/opm/core/fluid/SaturationPropsFromDeck.hpp
+++ b/opm/core/fluid/SaturationPropsFromDeck.hpp
@@ -22,7 +22,7 @@
 
 #include <opm/core/fluid/SaturationPropsInterface.hpp>
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
-#include <opm/core/eclipse/EclipseGridParser.hpp>
+#include <opm/core/io/eclipse/EclipseGridParser.hpp>
 #include <opm/core/fluid/blackoil/BlackoilPhases.hpp>
 #include <opm/core/fluid/SatFuncStone2.hpp>
 #include <opm/core/fluid/SatFuncSimple.hpp>
diff --git a/opm/core/fluid/blackoil/BlackoilPvtProperties.cpp b/opm/core/fluid/blackoil/BlackoilPvtProperties.cpp
index 4a0004ee..eb1548ec 100644
--- a/opm/core/fluid/blackoil/BlackoilPvtProperties.cpp
+++ b/opm/core/fluid/blackoil/BlackoilPvtProperties.cpp
@@ -26,7 +26,7 @@
 #include <opm/core/fluid/blackoil/SinglePvtLiveGas.hpp>
 #include <opm/core/fluid/blackoil/SinglePvtConstCompr.hpp>
 #include <opm/core/fluid/blackoil/phaseUsageFromDeck.hpp>
-#include <opm/core/eclipse/EclipseGridParser.hpp>
+#include <opm/core/io/eclipse/EclipseGridParser.hpp>
 #include <opm/core/utility/Units.hpp>
 #include <opm/core/utility/ErrorMacros.hpp>
 #include <opm/core/utility/linInt.hpp>
diff --git a/opm/core/fluid/blackoil/BlackoilPvtProperties.hpp b/opm/core/fluid/blackoil/BlackoilPvtProperties.hpp
index 8633fd9e..29abb1f7 100644
--- a/opm/core/fluid/blackoil/BlackoilPvtProperties.hpp
+++ b/opm/core/fluid/blackoil/BlackoilPvtProperties.hpp
@@ -24,7 +24,7 @@
 
 #include <opm/core/fluid/blackoil/SinglePvtInterface.hpp>
 #include <opm/core/fluid/blackoil/BlackoilPhases.hpp>
-#include <opm/core/eclipse/EclipseGridParser.hpp>
+#include <opm/core/io/eclipse/EclipseGridParser.hpp>
 #include <string>
 #include <tr1/memory>
 
diff --git a/opm/core/fluid/blackoil/phaseUsageFromDeck.hpp b/opm/core/fluid/blackoil/phaseUsageFromDeck.hpp
index 5c4e3238..fa139e2d 100644
--- a/opm/core/fluid/blackoil/phaseUsageFromDeck.hpp
+++ b/opm/core/fluid/blackoil/phaseUsageFromDeck.hpp
@@ -21,7 +21,7 @@
 #define OPM_PHASEUSAGEFROMDECK_HEADER_INCLUDED
 
 
-#include <opm/core/eclipse/EclipseGridParser.hpp>
+#include <opm/core/io/eclipse/EclipseGridParser.hpp>
 #include <opm/core/fluid/blackoil/BlackoilPhases.hpp>
 
 
diff --git a/opm/core/eclipse/CornerpointChopper.hpp b/opm/core/io/eclipse/CornerpointChopper.hpp
similarity index 99%
rename from opm/core/eclipse/CornerpointChopper.hpp
rename to opm/core/io/eclipse/CornerpointChopper.hpp
index 4e158749..a757f4e6 100644
--- a/opm/core/eclipse/CornerpointChopper.hpp
+++ b/opm/core/io/eclipse/CornerpointChopper.hpp
@@ -20,7 +20,7 @@
 #ifndef OPM_CORNERPOINTCHOPPER_HEADER_INCLUDED
 #define OPM_CORNERPOINTCHOPPER_HEADER_INCLUDED
 
-#include <opm/core/eclipse/EclipseGridParser.hpp>
+#include <opm/core/io/eclipse/EclipseGridParser.hpp>
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
 #include <iostream>
 #include <fstream>
diff --git a/opm/core/eclipse/EclipseGridInspector.cpp b/opm/core/io/eclipse/EclipseGridInspector.cpp
similarity index 98%
rename from opm/core/eclipse/EclipseGridInspector.cpp
rename to opm/core/io/eclipse/EclipseGridInspector.cpp
index 8c8a35a3..fed61a8a 100644
--- a/opm/core/eclipse/EclipseGridInspector.cpp
+++ b/opm/core/io/eclipse/EclipseGridInspector.cpp
@@ -42,9 +42,9 @@
 #include <cmath>
 #include <cfloat>
 #include <algorithm>
-#include <opm/core/eclipse/EclipseGridInspector.hpp>
-#include <opm/core/eclipse/EclipseGridParser.hpp>
-#include <opm/core/eclipse/SpecialEclipseFields.hpp>
+#include <opm/core/io/eclipse/EclipseGridInspector.hpp>
+#include <opm/core/io/eclipse/EclipseGridParser.hpp>
+#include <opm/core/io/eclipse/SpecialEclipseFields.hpp>
 
 namespace Opm
 {
diff --git a/opm/core/eclipse/EclipseGridInspector.hpp b/opm/core/io/eclipse/EclipseGridInspector.hpp
similarity index 100%
rename from opm/core/eclipse/EclipseGridInspector.hpp
rename to opm/core/io/eclipse/EclipseGridInspector.hpp
diff --git a/opm/core/eclipse/EclipseGridParser.cpp b/opm/core/io/eclipse/EclipseGridParser.cpp
similarity index 99%
rename from opm/core/eclipse/EclipseGridParser.cpp
rename to opm/core/io/eclipse/EclipseGridParser.cpp
index 9de425d4..faed259d 100644
--- a/opm/core/eclipse/EclipseGridParser.cpp
+++ b/opm/core/io/eclipse/EclipseGridParser.cpp
@@ -43,9 +43,9 @@
 #include <limits>
 #include <numeric>
 #include <cfloat>
-#include <opm/core/eclipse/EclipseGridParser.hpp>
-#include <opm/core/eclipse/EclipseGridParserHelpers.hpp>
-#include <opm/core/eclipse/SpecialEclipseFields.hpp>
+#include <opm/core/io/eclipse/EclipseGridParser.hpp>
+#include <opm/core/io/eclipse/EclipseGridParserHelpers.hpp>
+#include <opm/core/io/eclipse/SpecialEclipseFields.hpp>
 #include <opm/core/utility/ErrorMacros.hpp>
 #include <opm/core/utility/Units.hpp>
 #include <opm/core/grid/cpgpreprocess/preprocess.h>
diff --git a/opm/core/eclipse/EclipseGridParser.hpp b/opm/core/io/eclipse/EclipseGridParser.hpp
similarity index 98%
rename from opm/core/eclipse/EclipseGridParser.hpp
rename to opm/core/io/eclipse/EclipseGridParser.hpp
index db4701d7..b781d058 100644
--- a/opm/core/eclipse/EclipseGridParser.hpp
+++ b/opm/core/io/eclipse/EclipseGridParser.hpp
@@ -41,8 +41,8 @@
 #include <map>
 #include <set>
 #include <tr1/memory>
-#include <opm/core/eclipse/SpecialEclipseFields.hpp>
-#include <opm/core/eclipse/EclipseUnits.hpp>
+#include <opm/core/io/eclipse/SpecialEclipseFields.hpp>
+#include <opm/core/io/eclipse/EclipseUnits.hpp>
 #include <opm/core/utility/Factory.hpp>
 
 #include <opm/core/grid/cornerpoint_grid.h>
diff --git a/opm/core/eclipse/EclipseGridParserHelpers.hpp b/opm/core/io/eclipse/EclipseGridParserHelpers.hpp
similarity index 100%
rename from opm/core/eclipse/EclipseGridParserHelpers.hpp
rename to opm/core/io/eclipse/EclipseGridParserHelpers.hpp
diff --git a/opm/core/eclipse/EclipseUnits.hpp b/opm/core/io/eclipse/EclipseUnits.hpp
similarity index 100%
rename from opm/core/eclipse/EclipseUnits.hpp
rename to opm/core/io/eclipse/EclipseUnits.hpp
diff --git a/opm/core/eclipse/SpecialEclipseFields.hpp b/opm/core/io/eclipse/SpecialEclipseFields.hpp
similarity index 99%
rename from opm/core/eclipse/SpecialEclipseFields.hpp
rename to opm/core/io/eclipse/SpecialEclipseFields.hpp
index 00d79444..9041b28b 100644
--- a/opm/core/eclipse/SpecialEclipseFields.hpp
+++ b/opm/core/io/eclipse/SpecialEclipseFields.hpp
@@ -41,8 +41,8 @@
 #include <fstream>
 #include <limits>
 #include <opm/core/utility/ErrorMacros.hpp>
-#include <opm/core/eclipse/EclipseGridParserHelpers.hpp>
-#include <opm/core/eclipse/EclipseUnits.hpp>
+#include <opm/core/io/eclipse/EclipseGridParserHelpers.hpp>
+#include <opm/core/io/eclipse/EclipseUnits.hpp>
 
 namespace Opm
 {
diff --git a/opm/core/utility/writeECLData.cpp b/opm/core/io/eclipse/writeECLData.cpp
similarity index 99%
rename from opm/core/utility/writeECLData.cpp
rename to opm/core/io/eclipse/writeECLData.cpp
index 959989ce..ab733410 100644
--- a/opm/core/utility/writeECLData.cpp
+++ b/opm/core/io/eclipse/writeECLData.cpp
@@ -23,7 +23,7 @@
 #endif
 
 #include <opm/core/grid.h>
-#include <opm/core/utility/writeECLData.hpp>
+#include <opm/core/io/eclipse/writeECLData.hpp>
 #include <opm/core/utility/Units.hpp>
 #include <opm/core/utility/ErrorMacros.hpp>
 
diff --git a/opm/core/utility/writeECLData.hpp b/opm/core/io/eclipse/writeECLData.hpp
similarity index 100%
rename from opm/core/utility/writeECLData.hpp
rename to opm/core/io/eclipse/writeECLData.hpp
diff --git a/opm/core/vag_format/vag.cpp b/opm/core/io/vag/vag.cpp
similarity index 99%
rename from opm/core/vag_format/vag.cpp
rename to opm/core/io/vag/vag.cpp
index 9beedbb5..2b9fb77d 100644
--- a/opm/core/vag_format/vag.cpp
+++ b/opm/core/io/vag/vag.cpp
@@ -33,7 +33,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <opm/core/vag_format/vag.hpp>
+#include <opm/core/io/vag/vag.hpp>
 #include <opm/core/grid/cornerpoint_grid.h>	 	      
 #include <iostream>
 #include <fstream>
diff --git a/opm/core/vag_format/vag.hpp b/opm/core/io/vag/vag.hpp
similarity index 100%
rename from opm/core/vag_format/vag.hpp
rename to opm/core/io/vag/vag.hpp
diff --git a/opm/core/utility/writeVtkData.cpp b/opm/core/io/vtk/writeVtkData.cpp
similarity index 99%
rename from opm/core/utility/writeVtkData.cpp
rename to opm/core/io/vtk/writeVtkData.cpp
index 3c70016e..04880b55 100644
--- a/opm/core/utility/writeVtkData.cpp
+++ b/opm/core/io/vtk/writeVtkData.cpp
@@ -17,7 +17,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <opm/core/utility/writeVtkData.hpp>
+#include <opm/core/io/vtk/writeVtkData.hpp>
 #include <opm/core/utility/DataMap.hpp>
 #include <opm/core/grid.h>
 #include <opm/core/utility/ErrorMacros.hpp>
diff --git a/opm/core/utility/writeVtkData.hpp b/opm/core/io/vtk/writeVtkData.hpp
similarity index 100%
rename from opm/core/utility/writeVtkData.hpp
rename to opm/core/io/vtk/writeVtkData.hpp
diff --git a/opm/core/simulator/SimulatorCompressibleTwophase.cpp b/opm/core/simulator/SimulatorCompressibleTwophase.cpp
index 8b8e8736..5f830de2 100644
--- a/opm/core/simulator/SimulatorCompressibleTwophase.cpp
+++ b/opm/core/simulator/SimulatorCompressibleTwophase.cpp
@@ -34,7 +34,7 @@
 #include <opm/core/simulator/SimulatorReport.hpp>
 #include <opm/core/simulator/SimulatorTimer.hpp>
 #include <opm/core/utility/StopWatch.hpp>
-#include <opm/core/utility/writeVtkData.hpp>
+#include <opm/core/io/vtk/writeVtkData.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/core/utility/miscUtilitiesBlackoil.hpp>
 
diff --git a/opm/core/simulator/SimulatorIncompTwophase.cpp b/opm/core/simulator/SimulatorIncompTwophase.cpp
index 28e18a45..b90f2317 100644
--- a/opm/core/simulator/SimulatorIncompTwophase.cpp
+++ b/opm/core/simulator/SimulatorIncompTwophase.cpp
@@ -34,7 +34,7 @@
 #include <opm/core/simulator/SimulatorReport.hpp>
 #include <opm/core/simulator/SimulatorTimer.hpp>
 #include <opm/core/utility/StopWatch.hpp>
-#include <opm/core/utility/writeVtkData.hpp>
+#include <opm/core/io/vtk/writeVtkData.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
 
 #include <opm/core/wells/WellsManager.hpp>
diff --git a/opm/core/simulator/SimulatorTimer.cpp b/opm/core/simulator/SimulatorTimer.cpp
index 337723db..8a5471d3 100644
--- a/opm/core/simulator/SimulatorTimer.cpp
+++ b/opm/core/simulator/SimulatorTimer.cpp
@@ -20,7 +20,7 @@
 #include <opm/core/simulator/SimulatorTimer.hpp>
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
 #include <opm/core/utility/Units.hpp>
-#include <opm/core/eclipse/EclipseGridParser.hpp>
+#include <opm/core/io/eclipse/EclipseGridParser.hpp>
 #include <ostream>
 #include <numeric>
 
diff --git a/opm/core/utility/initState_impl.hpp b/opm/core/utility/initState_impl.hpp
index 575e18a4..73d09ae9 100644
--- a/opm/core/utility/initState_impl.hpp
+++ b/opm/core/utility/initState_impl.hpp
@@ -23,7 +23,7 @@
 
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
 #include <opm/core/grid.h>
-#include <opm/core/eclipse/EclipseGridParser.hpp>
+#include <opm/core/io/eclipse/EclipseGridParser.hpp>
 #include <opm/core/utility/ErrorMacros.hpp>
 #include <opm/core/utility/MonotCubicInterpolator.hpp>
 #include <opm/core/utility/Units.hpp>
diff --git a/opm/core/wells/WellCollection.hpp b/opm/core/wells/WellCollection.hpp
index 4bda76d9..de73a757 100644
--- a/opm/core/wells/WellCollection.hpp
+++ b/opm/core/wells/WellCollection.hpp
@@ -25,7 +25,7 @@
 #include <vector>
 #include <opm/core/wells/WellsGroup.hpp>
 #include <opm/core/grid.h>
-#include <opm/core/eclipse/EclipseGridParser.hpp>
+#include <opm/core/io/eclipse/EclipseGridParser.hpp>
 
 namespace Opm
 {
diff --git a/opm/core/wells/WellsGroup.hpp b/opm/core/wells/WellsGroup.hpp
index f1b1afbb..f2175947 100644
--- a/opm/core/wells/WellsGroup.hpp
+++ b/opm/core/wells/WellsGroup.hpp
@@ -22,7 +22,7 @@
 
 #include <opm/core/wells/InjectionSpecification.hpp>
 #include <opm/core/wells/ProductionSpecification.hpp>
-#include <opm/core/eclipse/EclipseGridParser.hpp>
+#include <opm/core/io/eclipse/EclipseGridParser.hpp>
 #include <opm/core/grid.h>
 #include <opm/core/fluid/blackoil/BlackoilPhases.hpp>
 #include <string>
diff --git a/opm/core/wells/WellsManager.cpp b/opm/core/wells/WellsManager.cpp
index 8aaca9e2..a7bc3edd 100644
--- a/opm/core/wells/WellsManager.cpp
+++ b/opm/core/wells/WellsManager.cpp
@@ -19,7 +19,7 @@
 
 
 #include <opm/core/wells/WellsManager.hpp>
-#include <opm/core/eclipse/EclipseGridParser.hpp>
+#include <opm/core/io/eclipse/EclipseGridParser.hpp>
 #include <opm/core/grid.h>
 #include <opm/core/newwells.h>
 #include <opm/core/utility/ErrorMacros.hpp>
diff --git a/tests/test_column_extract.cpp b/tests/test_column_extract.cpp
index 3ab9cd90..c3408ca9 100644
--- a/tests/test_column_extract.cpp
+++ b/tests/test_column_extract.cpp
@@ -10,7 +10,7 @@
 #include <boost/test/unit_test.hpp>
 #include <opm/core/utility/ColumnExtract.hpp>
 #include <opm/core/GridManager.hpp>
-#include <opm/core/eclipse/EclipseGridParser.hpp>
+#include <opm/core/io/eclipse/EclipseGridParser.hpp>
 
 #include <cstddef>
 
diff --git a/tutorials/tutorial1.cpp b/tutorials/tutorial1.cpp
index c1eff0cb..b744a0f2 100644
--- a/tutorials/tutorial1.cpp
+++ b/tutorials/tutorial1.cpp
@@ -36,7 +36,7 @@
 /// \internal [including headers] 
 #include <opm/core/grid.h>
 #include <opm/core/GridManager.hpp>
-#include <opm/core/utility/writeVtkData.hpp>
+#include <opm/core/io/vtk/writeVtkData.hpp>
 #include <iostream>
 #include <fstream>
 #include <vector>
diff --git a/tutorials/tutorial2.cpp b/tutorials/tutorial2.cpp
index c489ca51..92379530 100644
--- a/tutorials/tutorial2.cpp
+++ b/tutorials/tutorial2.cpp
@@ -33,7 +33,7 @@
 
 #include <opm/core/grid.h>
 #include <opm/core/GridManager.hpp>
-#include <opm/core/utility/writeVtkData.hpp>
+#include <opm/core/io/vtk/writeVtkData.hpp>
 #include <iostream>
 #include <fstream>
 #include <vector>
diff --git a/tutorials/tutorial3.cpp b/tutorials/tutorial3.cpp
index b00035c1..13640dd7 100644
--- a/tutorials/tutorial3.cpp
+++ b/tutorials/tutorial3.cpp
@@ -29,7 +29,7 @@
 #include <cassert>
 #include <opm/core/grid.h>
 #include <opm/core/GridManager.hpp>
-#include <opm/core/utility/writeVtkData.hpp>
+#include <opm/core/io/vtk/writeVtkData.hpp>
 #include <opm/core/linalg/LinearSolverUmfpack.hpp>
 #include <opm/core/pressure/IncompTpfa.hpp>
 #include <opm/core/pressure/FlowBCManager.hpp>
diff --git a/tutorials/tutorial4.cpp b/tutorials/tutorial4.cpp
index f55a2ad4..059f0132 100644
--- a/tutorials/tutorial4.cpp
+++ b/tutorials/tutorial4.cpp
@@ -29,7 +29,7 @@
 #include <cassert>
 #include <opm/core/grid.h>
 #include <opm/core/GridManager.hpp>
-#include <opm/core/utility/writeVtkData.hpp>
+#include <opm/core/io/vtk/writeVtkData.hpp>
 #include <opm/core/linalg/LinearSolverUmfpack.hpp>
 #include <opm/core/pressure/IncompTpfa.hpp>
 #include <opm/core/pressure/FlowBCManager.hpp>