From cf9b7c39b97e9eadafd6538d630cbb0b83401304 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= <atgeirr@sintef.no>
Date: Fri, 9 Feb 2018 13:42:16 +0100
Subject: [PATCH] Adapt to moved opm-grid headers.

---
 examples/compute_eikonal_from_files.cpp               |  6 +++---
 examples/compute_initial_state.cpp                    |  6 +++---
 examples/compute_tof_from_files.cpp                   |  8 ++++----
 examples/diagnose_relperm.cpp                         |  6 +++---
 examples/flow_legacy.cpp                              |  2 +-
 examples/flow_reorder.cpp                             |  2 +-
 examples/flow_sequential.cpp                          |  2 +-
 examples/sim_2p_comp_reorder.cpp                      |  6 +++---
 examples/sim_2p_incomp_ad.cpp                         |  4 ++--
 examples/sim_poly2p_comp_reorder.cpp                  |  4 ++--
 examples/sim_poly2p_incomp_reorder.cpp                |  4 ++--
 examples/sim_simple.cpp                               |  8 ++++----
 examples/wells_example.cpp                            |  4 ++--
 opm/autodiff/AutoDiffHelpers.hpp                      |  4 ++--
 opm/autodiff/BlackoilModelBase_impl.hpp               |  2 +-
 opm/autodiff/BlackoilModelEbos.hpp                    |  2 +-
 opm/autodiff/BlackoilOutputEbos.hpp                   |  4 ++--
 opm/autodiff/BlackoilPropsAdFromDeck.cpp              |  2 +-
 opm/autodiff/BlackoilPropsAdFromDeck.hpp              |  2 +-
 opm/autodiff/BlackoilReorderingTransportModel.hpp     |  2 +-
 opm/autodiff/DebugTimeReport.hpp                      |  2 +-
 opm/autodiff/ExtractParallelGridInformationToISTL.hpp |  2 +-
 opm/autodiff/FlowMain.hpp                             |  2 +-
 opm/autodiff/GeoProps.hpp                             |  9 ++++-----
 opm/autodiff/GridHelpers.hpp                          | 10 +++++-----
 opm/autodiff/GridInit.hpp                             |  6 +++---
 opm/autodiff/ParallelDebugOutput.hpp                  |  4 ++--
 opm/autodiff/RateConverter.hpp                        |  2 +-
 opm/autodiff/SimulatorBase.hpp                        |  4 ++--
 opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp   |  2 +-
 opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp |  4 ++--
 opm/autodiff/SimulatorIncompTwophaseAd.cpp            |  4 ++--
 opm/autodiff/TransportSolverTwophaseAd.cpp            |  4 ++--
 opm/core/flowdiagnostics/AnisotropicEikonal.cpp       |  4 ++--
 opm/core/flowdiagnostics/AnisotropicEikonal.hpp       |  2 +-
 opm/core/flowdiagnostics/DGBasis.cpp                  |  2 +-
 opm/core/flowdiagnostics/TofDiscGalReorder.cpp        | 10 +++++-----
 opm/core/flowdiagnostics/TofReorder.cpp               |  4 ++--
 opm/core/linalg/ParallelIstlInformation.hpp           |  2 +-
 opm/core/pressure/CompressibleTpfa.cpp                |  2 +-
 opm/core/pressure/FlowBCManager.cpp                   |  2 +-
 opm/core/pressure/IncompTpfa.cpp                      |  2 +-
 opm/core/pressure/IncompTpfaSinglePhase.cpp           | 11 +----------
 opm/core/pressure/tpfa/cfs_tpfa_residual.c            |  2 +-
 opm/core/pressure/tpfa/cfs_tpfa_residual.h            |  2 +-
 opm/core/pressure/tpfa/ifs_tpfa.h                     |  2 +-
 opm/core/props/BlackoilPropertiesFromDeck.cpp         |  4 ++--
 opm/core/props/IncompPropertiesSinglePhase.cpp        |  2 +-
 opm/core/props/rock/RockFromDeck.cpp                  |  4 ++--
 opm/core/props/satfunc/RelpermDiagnostics.hpp         |  6 +++---
 opm/core/props/satfunc/RelpermDiagnostics_impl.hpp    |  2 +-
 opm/core/props/satfunc/SaturationPropsFromDeck.cpp    |  2 +-
 opm/core/props/satfunc/SaturationPropsFromDeck.hpp    |  2 +-
 opm/core/simulator/BlackoilState.hpp                  |  2 +-
 opm/core/simulator/EquilibrationHelpers.hpp           |  2 +-
 opm/core/simulator/initStateEquil.hpp                 |  6 +++---
 opm/core/simulator/initStateEquil_impl.hpp            |  4 ++--
 opm/core/simulator/initState_impl.hpp                 |  4 ++--
 opm/core/transport/reorder/ReorderSolverInterface.cpp |  4 ++--
 .../TransportSolverCompressibleTwophaseReorder.cpp    |  4 ++--
 .../reorder/TransportSolverTwophaseReorder.cpp        |  6 +++---
 opm/core/transport/reorder/reordersequence.cpp        |  2 +-
 opm/core/utility/miscUtilities.cpp                    |  2 +-
 opm/core/utility/miscUtilitiesBlackoil.cpp            |  2 +-
 opm/core/utility/miscUtilities_impl.hpp               |  2 +-
 opm/core/wells/WellCollection.hpp                     |  2 +-
 opm/core/wells/WellsGroup.hpp                         |  2 +-
 opm/core/wells/WellsManager.cpp                       |  2 +-
 opm/core/wells/WellsManager.hpp                       |  2 +-
 opm/core/wells/WellsManager_impl.hpp                  |  4 ++--
 opm/polymer/CompressibleTpfaPolymer.cpp               |  2 +-
 opm/polymer/GravityColumnSolverPolymer.hpp            |  2 +-
 opm/polymer/IncompTpfaPolymer.cpp                     |  2 +-
 opm/polymer/PolymerBlackoilState.hpp                  |  2 +-
 opm/polymer/PolymerState.hpp                          |  2 +-
 opm/polymer/SimulatorCompressiblePolymer.cpp          |  6 +++---
 opm/polymer/SimulatorPolymer.cpp                      |  6 +++---
 .../TransportSolverTwophaseCompressiblePolymer.cpp    |  4 ++--
 opm/polymer/TransportSolverTwophasePolymer.cpp        |  4 ++--
 opm/polymer/polymerUtilities.hpp                      |  2 +-
 opm/simulators/SimulatorCompressibleTwophase.cpp      |  6 +++---
 opm/simulators/flow_ebos_blackoil.cpp                 |  2 +-
 opm/simulators/flow_ebos_gasoil.cpp                   |  2 +-
 opm/simulators/flow_ebos_oilwater.cpp                 |  2 +-
 opm/simulators/flow_ebos_polymer.cpp                  |  2 +-
 opm/simulators/flow_ebos_solvent.cpp                  |  2 +-
 .../timestepping/AdaptiveTimeStepping_impl.hpp        |  2 +-
 opm/simulators/vtk/writeVtkData.cpp                   |  2 +-
 tests/test_anisotropiceikonal.cpp                     |  4 ++--
 tests/test_blackoilstate.cpp                          |  6 +++---
 tests/test_boprops_ad.cpp                             |  2 +-
 tests/test_dgbasis.cpp                                |  4 ++--
 tests/test_equil_legacy.cpp                           |  8 ++++----
 tests/test_pinchprocessor.cpp                         |  8 ++++----
 tests/test_rateconverter.cpp                          |  4 ++--
 tests/test_relpermdiagnostics.cpp                     |  6 +++---
 tests/test_satfunc.cpp                                |  6 +++---
 tests/test_singlecellsolves.cpp                       |  4 ++--
 tests/test_stoppedwells.cpp                           |  2 +-
 tests/test_thresholdpressure.cpp                      |  4 ++--
 tests/test_transmissibilitymultipliers.cpp            |  6 +++---
 tests/test_wellmodel.cpp                              |  2 +-
 tests/test_wellsmanager.cpp                           |  2 +-
 tutorials/sim_tutorial1.cpp                           |  4 ++--
 tutorials/sim_tutorial2.cpp                           |  4 ++--
 tutorials/sim_tutorial3.cpp                           |  4 ++--
 tutorials/sim_tutorial4.cpp                           |  4 ++--
 107 files changed, 191 insertions(+), 201 deletions(-)

diff --git a/examples/compute_eikonal_from_files.cpp b/examples/compute_eikonal_from_files.cpp
index 2fa941674..ab7902b76 100644
--- a/examples/compute_eikonal_from_files.cpp
+++ b/examples/compute_eikonal_from_files.cpp
@@ -24,10 +24,10 @@
 #endif // HAVE_CONFIG_H
 
 #include <opm/core/flowdiagnostics/AnisotropicEikonal.hpp>
-#include <opm/core/grid.h>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/GridManager.hpp>
 #include <opm/common/ErrorMacros.hpp>
-#include <opm/core/utility/StopWatch.hpp>
+#include <opm/grid/utility/StopWatch.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <boost/filesystem.hpp>
diff --git a/examples/compute_initial_state.cpp b/examples/compute_initial_state.cpp
index 4cd394d5c..099f55c0d 100644
--- a/examples/compute_initial_state.cpp
+++ b/examples/compute_initial_state.cpp
@@ -23,15 +23,15 @@
 #include "config.h"
 #endif // HAVE_CONFIG_H
 
-#include <opm/core/grid.h>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/GridManager.hpp>
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/core/simulator/initStateEquil.hpp>
 #include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <opm/core/props/BlackoilPhases.hpp>
 #include <opm/core/props/phaseUsageFromDeck.hpp>
 #include <opm/core/simulator/BlackoilState.hpp>
-#include <opm/core/utility/compressedToCartesian.hpp>
+#include <opm/grid/utility/compressedToCartesian.hpp>
 
 #include <opm/parser/eclipse/Parser/ParseContext.hpp>
 #include <opm/parser/eclipse/Parser/Parser.hpp>
diff --git a/examples/compute_tof_from_files.cpp b/examples/compute_tof_from_files.cpp
index cc796cec9..57820b038 100644
--- a/examples/compute_tof_from_files.cpp
+++ b/examples/compute_tof_from_files.cpp
@@ -22,13 +22,13 @@
 #include "config.h"
 #endif // HAVE_CONFIG_H
 
-#include <opm/core/grid.h>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/GridManager.hpp>
 #include <opm/core/wells.h>
 #include <opm/core/wells/WellsManager.hpp>
 #include <opm/common/ErrorMacros.hpp>
-#include <opm/core/utility/SparseTable.hpp>
-#include <opm/core/utility/StopWatch.hpp>
+#include <opm/grid/utility/SparseTable.hpp>
+#include <opm/grid/utility/StopWatch.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/common/utility/parameters/ParameterGroup.hpp>
 
diff --git a/examples/diagnose_relperm.cpp b/examples/diagnose_relperm.cpp
index dad2968db..379e52c82 100644
--- a/examples/diagnose_relperm.cpp
+++ b/examples/diagnose_relperm.cpp
@@ -23,12 +23,12 @@
 #include "config.h"
 #endif // HAVE_CONFIG_H
 
-#include <opm/core/grid.h>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/GridManager.hpp>
 #include <opm/core/props/satfunc/RelpermDiagnostics.hpp>
 #include <opm/core/props/satfunc/RelpermDiagnostics_impl.hpp>
 #include <opm/common/ErrorMacros.hpp>
-#include <opm/core/utility/StopWatch.hpp>
+#include <opm/grid/utility/StopWatch.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/common/utility/parameters/ParameterGroup.hpp>
 
diff --git a/examples/flow_legacy.cpp b/examples/flow_legacy.cpp
index fb9982a58..c181b59ad 100644
--- a/examples/flow_legacy.cpp
+++ b/examples/flow_legacy.cpp
@@ -27,7 +27,7 @@
 // Define making clear that the simulator supports AMG
 #define FLOW_SUPPORT_AMG !defined(HAVE_UMFPACK)
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/autodiff/SimulatorFullyImplicitBlackoil.hpp>
 #include <opm/autodiff/FlowMain.hpp>
 
diff --git a/examples/flow_reorder.cpp b/examples/flow_reorder.cpp
index a8669b63d..db62354ed 100644
--- a/examples/flow_reorder.cpp
+++ b/examples/flow_reorder.cpp
@@ -22,7 +22,7 @@
 #endif // HAVE_CONFIG_H
 
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/autodiff/SimulatorSequentialBlackoil.hpp>
 #include <opm/autodiff/FlowMainSequential.hpp>
 #include <opm/autodiff/BlackoilPressureModel.hpp>
diff --git a/examples/flow_sequential.cpp b/examples/flow_sequential.cpp
index 2d6de2c1c..2217689ad 100644
--- a/examples/flow_sequential.cpp
+++ b/examples/flow_sequential.cpp
@@ -22,7 +22,7 @@
 #endif // HAVE_CONFIG_H
 
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/autodiff/SimulatorSequentialBlackoil.hpp>
 #include <opm/autodiff/FlowMainSequential.hpp>
 #include <opm/autodiff/BlackoilPressureModel.hpp>
diff --git a/examples/sim_2p_comp_reorder.cpp b/examples/sim_2p_comp_reorder.cpp
index 67135a091..451a565db 100644
--- a/examples/sim_2p_comp_reorder.cpp
+++ b/examples/sim_2p_comp_reorder.cpp
@@ -23,9 +23,9 @@
 
 #include <opm/core/pressure/FlowBCManager.hpp>
 
-#include <opm/core/grid.h>
-#include <opm/core/grid/GridManager.hpp>
-#include <opm/core/grid/GridHelpers.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/GridManager.hpp>
+#include <opm/grid/GridHelpers.hpp>
 #include <opm/core/wells.h>
 #include <opm/core/wells/WellsManager.hpp>
 #include <opm/common/ErrorMacros.hpp>
diff --git a/examples/sim_2p_incomp_ad.cpp b/examples/sim_2p_incomp_ad.cpp
index dcab199c1..4d4e4325a 100644
--- a/examples/sim_2p_incomp_ad.cpp
+++ b/examples/sim_2p_incomp_ad.cpp
@@ -25,8 +25,8 @@
 
 #include <opm/core/pressure/FlowBCManager.hpp>
 
-#include <opm/core/grid.h>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/GridManager.hpp>
 #include <opm/core/wells.h>
 #include <opm/core/wells/WellsManager.hpp>
 #include <opm/common/ErrorMacros.hpp>
diff --git a/examples/sim_poly2p_comp_reorder.cpp b/examples/sim_poly2p_comp_reorder.cpp
index 53fe056e7..dee32a9fa 100644
--- a/examples/sim_poly2p_comp_reorder.cpp
+++ b/examples/sim_poly2p_comp_reorder.cpp
@@ -24,8 +24,8 @@
 
 #include <opm/core/pressure/FlowBCManager.hpp>
 
-#include <opm/core/grid.h>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/GridManager.hpp>
 #include <opm/core/wells.h>
 #include <opm/core/wells/WellsManager.hpp>
 #include <opm/common/ErrorMacros.hpp>
diff --git a/examples/sim_poly2p_incomp_reorder.cpp b/examples/sim_poly2p_incomp_reorder.cpp
index f1cd0ebf7..28a951ce5 100644
--- a/examples/sim_poly2p_incomp_reorder.cpp
+++ b/examples/sim_poly2p_incomp_reorder.cpp
@@ -24,8 +24,8 @@
 
 #include <opm/core/pressure/FlowBCManager.hpp>
 
-#include <opm/core/grid.h>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/GridManager.hpp>
 #include <opm/core/wells.h>
 #include <opm/core/wells/WellsManager.hpp>
 #include <opm/common/ErrorMacros.hpp>
diff --git a/examples/sim_simple.cpp b/examples/sim_simple.cpp
index 499ddd4d8..218d966a2 100644
--- a/examples/sim_simple.cpp
+++ b/examples/sim_simple.cpp
@@ -21,12 +21,12 @@
 
 #include <opm/autodiff/AutoDiffBlock.hpp>
 #include <opm/autodiff/AutoDiffHelpers.hpp>
-#include <opm/core/grid.h>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/GridManager.hpp>
 #include <opm/core/props/IncompPropertiesBasic.hpp>
 #include <opm/parser/eclipse/Units/Units.hpp>
-#include <opm/core/utility/StopWatch.hpp>
-#include <opm/core/pressure/tpfa/trans_tpfa.h>
+#include <opm/grid/utility/StopWatch.hpp>
+#include <opm/grid/transmissibility/trans_tpfa.h>
 
 #include <opm/common/utility/platform_dependent/disable_warnings.h>
 #if HAVE_SUITESPARSE_UMFPACK_H
diff --git a/examples/wells_example.cpp b/examples/wells_example.cpp
index a7a475a4f..78083397f 100644
--- a/examples/wells_example.cpp
+++ b/examples/wells_example.cpp
@@ -6,11 +6,11 @@
 #include <opm/core/simulator/initState.hpp>
 #include <opm/simulators/timestepping/SimulatorTimer.hpp>
 #include <opm/core/wells/WellsManager.hpp>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/GridManager.hpp>
 #include <opm/core/pressure/IncompTpfa.hpp>
 #include <opm/core/props/IncompPropertiesFromDeck.hpp>
 #include <opm/core/wells.h>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/core/simulator/TwophaseState.hpp>
 #include <opm/core/simulator/WellState.hpp>
diff --git a/opm/autodiff/AutoDiffHelpers.hpp b/opm/autodiff/AutoDiffHelpers.hpp
index fe2faf3a5..2c7d5b54a 100644
--- a/opm/autodiff/AutoDiffHelpers.hpp
+++ b/opm/autodiff/AutoDiffHelpers.hpp
@@ -24,8 +24,8 @@
 #include <opm/autodiff/AutoDiffBlock.hpp>
 #include <opm/autodiff/GridHelpers.hpp>
 #include <opm/autodiff/GeoProps.hpp>
-#include <opm/core/grid.h>
-#include <opm/core/grid/PinchProcessor.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/PinchProcessor.hpp>
 #include <opm/core/props/rock/RockFromDeck.hpp>
 
 #include <opm/common/ErrorMacros.hpp>
diff --git a/opm/autodiff/BlackoilModelBase_impl.hpp b/opm/autodiff/BlackoilModelBase_impl.hpp
index ce8d3ea31..3e1d24de2 100644
--- a/opm/autodiff/BlackoilModelBase_impl.hpp
+++ b/opm/autodiff/BlackoilModelBase_impl.hpp
@@ -39,7 +39,7 @@
 #include <opm/autodiff/VFPProdProperties.hpp>
 #include <opm/autodiff/VFPInjProperties.hpp>
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/linalg/LinearSolverInterface.hpp>
 #include <opm/core/linalg/ParallelIstlInformation.hpp>
 #include <opm/core/props/rock/RockCompressibility.hpp>
diff --git a/opm/autodiff/BlackoilModelEbos.hpp b/opm/autodiff/BlackoilModelEbos.hpp
index 7b07aaf69..98b0397d2 100644
--- a/opm/autodiff/BlackoilModelEbos.hpp
+++ b/opm/autodiff/BlackoilModelEbos.hpp
@@ -32,7 +32,7 @@
 #include <opm/autodiff/BlackoilDetails.hpp>
 #include <opm/autodiff/NewtonIterationBlackoilInterface.hpp>
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/simulator/SimulatorReport.hpp>
 #include <opm/core/linalg/LinearSolverInterface.hpp>
 #include <opm/core/linalg/ParallelIstlInformation.hpp>
diff --git a/opm/autodiff/BlackoilOutputEbos.hpp b/opm/autodiff/BlackoilOutputEbos.hpp
index e5304bba1..3e7d4be80 100644
--- a/opm/autodiff/BlackoilOutputEbos.hpp
+++ b/opm/autodiff/BlackoilOutputEbos.hpp
@@ -23,7 +23,7 @@
 #include <ebos/eclproblem.hh>
 #include <ewoms/common/start.hh>
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/simulators/timestepping/SimulatorTimerInterface.hpp>
 #include <opm/core/utility/DataMap.hpp>
 #include <opm/common/ErrorMacros.hpp>
@@ -57,7 +57,7 @@
 #include <boost/filesystem.hpp>
 
 #ifdef HAVE_OPM_GRID
-#include <dune/grid/CpGrid.hpp>
+#include <opm/grid/CpGrid.hpp>
 #endif
 namespace Opm
 {
diff --git a/opm/autodiff/BlackoilPropsAdFromDeck.cpp b/opm/autodiff/BlackoilPropsAdFromDeck.cpp
index a56f4201a..bbfc1e12c 100644
--- a/opm/autodiff/BlackoilPropsAdFromDeck.cpp
+++ b/opm/autodiff/BlackoilPropsAdFromDeck.cpp
@@ -28,7 +28,7 @@
 #include <opm/core/props/BlackoilPropertiesInterface.hpp>
 #include <opm/core/props/BlackoilPhases.hpp>
 #include <opm/parser/eclipse/Units/Units.hpp>
-#include <opm/core/utility/extractPvtTableIndex.hpp>
+#include <opm/grid/utility/extractPvtTableIndex.hpp>
 
 #include <opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp>
 #include <opm/material/common/Exceptions.hpp>
diff --git a/opm/autodiff/BlackoilPropsAdFromDeck.hpp b/opm/autodiff/BlackoilPropsAdFromDeck.hpp
index 0b1951c3a..76d0973d2 100644
--- a/opm/autodiff/BlackoilPropsAdFromDeck.hpp
+++ b/opm/autodiff/BlackoilPropsAdFromDeck.hpp
@@ -41,7 +41,7 @@
 
 #ifdef HAVE_OPM_GRID
 #include <opm/common/utility/platform_dependent/disable_warnings.h>
-#include <dune/grid/CpGrid.hpp>
+#include <opm/grid/CpGrid.hpp>
 #include <opm/common/utility/platform_dependent/reenable_warnings.h>
 #endif
 
diff --git a/opm/autodiff/BlackoilReorderingTransportModel.hpp b/opm/autodiff/BlackoilReorderingTransportModel.hpp
index 4fb87c70e..404b37a10 100644
--- a/opm/autodiff/BlackoilReorderingTransportModel.hpp
+++ b/opm/autodiff/BlackoilReorderingTransportModel.hpp
@@ -25,7 +25,7 @@
 #include <opm/autodiff/BlackoilModelParameters.hpp>
 #include <opm/autodiff/DebugTimeReport.hpp>
 #include <opm/autodiff/multiPhaseUpwind.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/transport/reorder/reordersequence.h>
 #include <opm/core/simulator/BlackoilState.hpp>
 
diff --git a/opm/autodiff/DebugTimeReport.hpp b/opm/autodiff/DebugTimeReport.hpp
index 5bae2e4b0..ad8649ae9 100644
--- a/opm/autodiff/DebugTimeReport.hpp
+++ b/opm/autodiff/DebugTimeReport.hpp
@@ -21,7 +21,7 @@
 #define OPM_DEBUGTIMEREPORT_HEADER_INCLUDED
 
 #include <opm/common/OpmLog/OpmLog.hpp>
-#include <opm/core/utility/StopWatch.hpp>
+#include <opm/grid/utility/StopWatch.hpp>
 #include <string>
 
 namespace Opm
diff --git a/opm/autodiff/ExtractParallelGridInformationToISTL.hpp b/opm/autodiff/ExtractParallelGridInformationToISTL.hpp
index b021a6bc2..5d095e67b 100644
--- a/opm/autodiff/ExtractParallelGridInformationToISTL.hpp
+++ b/opm/autodiff/ExtractParallelGridInformationToISTL.hpp
@@ -21,7 +21,7 @@
 #define OPM_EXTRACTPARALLELGRIDINFORMATIONTOISTL_HEADER_INCLUDED
 #ifdef HAVE_OPM_GRID
 
-#include<dune/grid/CpGrid.hpp>
+#include<opm/grid/CpGrid.hpp>
 #include<boost/any.hpp>
 
 namespace Opm
diff --git a/opm/autodiff/FlowMain.hpp b/opm/autodiff/FlowMain.hpp
index 6051083be..841e6e903 100644
--- a/opm/autodiff/FlowMain.hpp
+++ b/opm/autodiff/FlowMain.hpp
@@ -32,7 +32,7 @@
 #include <opm/common/utility/platform_dependent/reenable_warnings.h>
 
 
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/GridManager.hpp>
 #include <opm/autodiff/GridHelpers.hpp>
 #include <opm/autodiff/createGlobalCellArray.hpp>
 #include <opm/autodiff/GridInit.hpp>
diff --git a/opm/autodiff/GeoProps.hpp b/opm/autodiff/GeoProps.hpp
index d312a23b3..fe63c1055 100644
--- a/opm/autodiff/GeoProps.hpp
+++ b/opm/autodiff/GeoProps.hpp
@@ -20,18 +20,17 @@
 #ifndef OPM_GEOPROPS_HEADER_INCLUDED
 #define OPM_GEOPROPS_HEADER_INCLUDED
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/autodiff/GridHelpers.hpp>
 #include <opm/common/ErrorMacros.hpp>
-//#include <opm/core/pressure/tpfa/trans_tpfa.h>
-#include <opm/core/pressure/tpfa/TransTpfa.hpp>
+#include <opm/grid/transmissibility/TransTpfa.hpp>
 
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/GridProperty.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/NNC.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/TransMult.hpp>
-#include <opm/core/grid/PinchProcessor.hpp>
+#include <opm/grid/PinchProcessor.hpp>
 #include <opm/common/utility/platform_dependent/disable_warnings.h>
 #include <opm/output/data/Cells.hpp>
 #include <opm/output/data/Solution.hpp>
@@ -40,7 +39,7 @@
 
 #ifdef HAVE_OPM_GRID
 #include <dune/common/version.hh>
-#include <dune/grid/CpGrid.hpp>
+#include <opm/grid/CpGrid.hpp>
 #include <dune/grid/common/mcmgmapper.hh>
 #endif
 
diff --git a/opm/autodiff/GridHelpers.hpp b/opm/autodiff/GridHelpers.hpp
index 3c4fc76ea..7f76348dd 100644
--- a/opm/autodiff/GridHelpers.hpp
+++ b/opm/autodiff/GridHelpers.hpp
@@ -23,8 +23,8 @@
 
 #include <functional>
 
-#include <opm/core/grid.h>
-#include <opm/core/grid/GridHelpers.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/GridHelpers.hpp>
 
 #include <opm/common/utility/platform_dependent/disable_warnings.h>
 
@@ -34,9 +34,9 @@
 #include <boost/range/iterator_range.hpp>
 
 #ifdef HAVE_OPM_GRID
-#include <dune/grid/CpGrid.hpp>
-#include <dune/grid/cpgrid/GridHelpers.hpp>
-#include <dune/grid/polyhedralgrid.hh>
+#include <opm/grid/CpGrid.hpp>
+#include <opm/grid/cpgrid/GridHelpers.hpp>
+#include <opm/grid/polyhedralgrid.hh>
 #endif
 
 #include <opm/common/utility/platform_dependent/reenable_warnings.h>
diff --git a/opm/autodiff/GridInit.hpp b/opm/autodiff/GridInit.hpp
index e88044963..1610e23bb 100644
--- a/opm/autodiff/GridInit.hpp
+++ b/opm/autodiff/GridInit.hpp
@@ -22,11 +22,11 @@
 
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/GridManager.hpp>
 
 #if HAVE_OPM_GRID
-#include <dune/grid/polyhedralgrid.hh>
-#include <dune/grid/CpGrid.hpp>
+#include <opm/grid/polyhedralgrid.hh>
+#include <opm/grid/CpGrid.hpp>
 #endif
 
 
diff --git a/opm/autodiff/ParallelDebugOutput.hpp b/opm/autodiff/ParallelDebugOutput.hpp
index 61d9a336b..dc35f6e38 100644
--- a/opm/autodiff/ParallelDebugOutput.hpp
+++ b/opm/autodiff/ParallelDebugOutput.hpp
@@ -24,7 +24,7 @@
 #include <opm/common/data/SimulationDataContainer.hpp>
 
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/simulator/WellState.hpp>
 #include <opm/core/wells/WellsManager.hpp>
 
@@ -34,7 +34,7 @@
 #include <opm/core/wells/DynamicListEconLimited.hpp>
 
 #if HAVE_OPM_GRID
-#include <dune/grid/common/p2pcommunicator.hh>
+#include <opm/grid/common/p2pcommunicator.hh>
 #endif
 
 namespace Opm
diff --git a/opm/autodiff/RateConverter.hpp b/opm/autodiff/RateConverter.hpp
index a8c1e1217..716eeaa6f 100644
--- a/opm/autodiff/RateConverter.hpp
+++ b/opm/autodiff/RateConverter.hpp
@@ -24,7 +24,7 @@
 
 #include <opm/core/props/BlackoilPhases.hpp>
 #include <opm/core/simulator/BlackoilState.hpp>
-#include <opm/core/utility/RegionMapping.hpp>
+#include <opm/grid/utility/RegionMapping.hpp>
 #include <opm/core/linalg/ParallelIstlInformation.hpp>
 
 #include <dune/grid/common/gridenums.hh>
diff --git a/opm/autodiff/SimulatorBase.hpp b/opm/autodiff/SimulatorBase.hpp
index 49bb644be..5ab0168bc 100644
--- a/opm/autodiff/SimulatorBase.hpp
+++ b/opm/autodiff/SimulatorBase.hpp
@@ -34,7 +34,7 @@
 #include <opm/autodiff/WellStateFullyImplicitBlackoil.hpp>
 #include <opm/autodiff/RateConverter.hpp>
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/wells.h>
 #include <opm/core/well_controls.h>
 #include <opm/core/pressure/flow_bc.h>
@@ -42,7 +42,7 @@
 #include <opm/core/simulator/SimulatorReport.hpp>
 #include <opm/simulators/timestepping/SimulatorTimer.hpp>
 #include <opm/simulators/timestepping/AdaptiveSimulatorTimer.hpp>
-#include <opm/core/utility/StopWatch.hpp>
+#include <opm/grid/utility/StopWatch.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/core/utility/miscUtilitiesBlackoil.hpp>
 
diff --git a/opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp b/opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp
index 42676671f..5416354ed 100644
--- a/opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp
+++ b/opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp
@@ -31,7 +31,7 @@
 #include <opm/autodiff/BlackoilWellModel.hpp>
 #include <opm/autodiff/moduleVersion.hpp>
 #include <opm/simulators/timestepping/AdaptiveTimeStepping.hpp>
-#include <opm/core/utility/StopWatch.hpp>
+#include <opm/grid/utility/StopWatch.hpp>
 
 #include <opm/common/Exceptions.hpp>
 #include <opm/common/ErrorMacros.hpp>
diff --git a/opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp b/opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp
index ec2a74fb7..a12169e9b 100644
--- a/opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp
+++ b/opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp
@@ -19,7 +19,7 @@
 */
 #ifndef OPM_SIMULATORFULLYIMPLICITBLACKOILOUTPUT_HEADER_INCLUDED
 #define OPM_SIMULATORFULLYIMPLICITBLACKOILOUTPUT_HEADER_INCLUDED
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/simulators/timestepping/SimulatorTimerInterface.hpp>
 #include <opm/core/simulator/WellState.hpp>
 #include <opm/autodiff/Compat.hpp>
@@ -58,7 +58,7 @@
 #include <boost/filesystem.hpp>
 
 #ifdef HAVE_OPM_GRID
-#include <dune/grid/CpGrid.hpp>
+#include <opm/grid/CpGrid.hpp>
 #endif
 namespace Opm
 {
diff --git a/opm/autodiff/SimulatorIncompTwophaseAd.cpp b/opm/autodiff/SimulatorIncompTwophaseAd.cpp
index 2238aaa81..78f3da5bb 100644
--- a/opm/autodiff/SimulatorIncompTwophaseAd.cpp
+++ b/opm/autodiff/SimulatorIncompTwophaseAd.cpp
@@ -29,14 +29,14 @@
 
 #include <opm/core/pressure/IncompTpfa.hpp>
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/wells.h>
 #include <opm/core/well_controls.h>
 #include <opm/core/pressure/flow_bc.h>
 
 #include <opm/core/simulator/SimulatorReport.hpp>
 #include <opm/simulators/timestepping/SimulatorTimer.hpp>
-#include <opm/core/utility/StopWatch.hpp>
+#include <opm/grid/utility/StopWatch.hpp>
 #include <opm/core/utility/DataMap.hpp>
 #include <opm/simulators/vtk/writeVtkData.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
diff --git a/opm/autodiff/TransportSolverTwophaseAd.cpp b/opm/autodiff/TransportSolverTwophaseAd.cpp
index 674b05cb8..997c2c544 100644
--- a/opm/autodiff/TransportSolverTwophaseAd.cpp
+++ b/opm/autodiff/TransportSolverTwophaseAd.cpp
@@ -20,10 +20,10 @@
 #include <config.h>
 
 #include <opm/autodiff/TransportSolverTwophaseAd.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/linalg/LinearSolverInterface.hpp>
 #include <opm/core/props/IncompPropertiesInterface.hpp>
-#include <opm/core/pressure/tpfa/trans_tpfa.h>
+#include <opm/grid/transmissibility/trans_tpfa.h>
 #include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/common/Exceptions.hpp>
diff --git a/opm/core/flowdiagnostics/AnisotropicEikonal.cpp b/opm/core/flowdiagnostics/AnisotropicEikonal.cpp
index 8c1c22a22..ba7312f04 100644
--- a/opm/core/flowdiagnostics/AnisotropicEikonal.cpp
+++ b/opm/core/flowdiagnostics/AnisotropicEikonal.cpp
@@ -19,8 +19,8 @@
 
 #include <config.h>
 #include <opm/core/flowdiagnostics/AnisotropicEikonal.hpp>
-#include <opm/core/grid/GridUtilities.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/GridUtilities.hpp>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/common/utility/numeric/RootFinders.hpp>
 
 #if BOOST_HEAP_AVAILABLE
diff --git a/opm/core/flowdiagnostics/AnisotropicEikonal.hpp b/opm/core/flowdiagnostics/AnisotropicEikonal.hpp
index 2e92256c8..7eabd234f 100644
--- a/opm/core/flowdiagnostics/AnisotropicEikonal.hpp
+++ b/opm/core/flowdiagnostics/AnisotropicEikonal.hpp
@@ -20,7 +20,7 @@
 #ifndef OPM_ANISOTROPICEIKONAL_HEADER_INCLUDED
 #define OPM_ANISOTROPICEIKONAL_HEADER_INCLUDED
 
-#include <opm/core/utility/SparseTable.hpp>
+#include <opm/grid/utility/SparseTable.hpp>
 #include <vector>
 #include <set>
 #include <map>
diff --git a/opm/core/flowdiagnostics/DGBasis.cpp b/opm/core/flowdiagnostics/DGBasis.cpp
index 8390e2b0d..62d9b5dc6 100644
--- a/opm/core/flowdiagnostics/DGBasis.cpp
+++ b/opm/core/flowdiagnostics/DGBasis.cpp
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include <opm/core/flowdiagnostics/DGBasis.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/common/ErrorMacros.hpp>
 #include <numeric>
 
diff --git a/opm/core/flowdiagnostics/TofDiscGalReorder.cpp b/opm/core/flowdiagnostics/TofDiscGalReorder.cpp
index 62f952a07..2f9c31b12 100644
--- a/opm/core/flowdiagnostics/TofDiscGalReorder.cpp
+++ b/opm/core/flowdiagnostics/TofDiscGalReorder.cpp
@@ -18,14 +18,14 @@
 */
 
 #include "config.h"
-#include <opm/core/grid/CellQuadrature.hpp>
-#include <opm/core/grid/FaceQuadrature.hpp>
+#include <opm/grid/CellQuadrature.hpp>
+#include <opm/grid/FaceQuadrature.hpp>
 #include <opm/core/flowdiagnostics/TofDiscGalReorder.hpp>
 #include <opm/core/flowdiagnostics/DGBasis.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/common/ErrorMacros.hpp>
-#include <opm/core/utility/SparseTable.hpp>
-#include <opm/core/utility/VelocityInterpolation.hpp>
+#include <opm/grid/utility/SparseTable.hpp>
+#include <opm/grid/utility/VelocityInterpolation.hpp>
 #include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <opm/common/utility/numeric/blas_lapack.h>
 
diff --git a/opm/core/flowdiagnostics/TofReorder.cpp b/opm/core/flowdiagnostics/TofReorder.cpp
index 99fab8cbe..c0413e1a0 100644
--- a/opm/core/flowdiagnostics/TofReorder.cpp
+++ b/opm/core/flowdiagnostics/TofReorder.cpp
@@ -19,9 +19,9 @@
 
 #include "config.h"
 #include <opm/core/flowdiagnostics/TofReorder.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/common/ErrorMacros.hpp>
-#include <opm/core/utility/SparseTable.hpp>
+#include <opm/grid/utility/SparseTable.hpp>
 
 #include <algorithm>
 #include <numeric>
diff --git a/opm/core/linalg/ParallelIstlInformation.hpp b/opm/core/linalg/ParallelIstlInformation.hpp
index 58c0f7812..c1ef08fe0 100644
--- a/opm/core/linalg/ParallelIstlInformation.hpp
+++ b/opm/core/linalg/ParallelIstlInformation.hpp
@@ -22,7 +22,7 @@
 #define OPM_PARALLELISTLINFORMTION_HEADER_INCLUDED
 
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/common/ErrorMacros.hpp>
 #include <boost/any.hpp>
 #include <exception>
diff --git a/opm/core/pressure/CompressibleTpfa.cpp b/opm/core/pressure/CompressibleTpfa.cpp
index c4f2d2aa8..cbfc828d9 100644
--- a/opm/core/pressure/CompressibleTpfa.cpp
+++ b/opm/core/pressure/CompressibleTpfa.cpp
@@ -23,7 +23,7 @@
 #include <opm/core/pressure/tpfa/cfs_tpfa_residual.h>
 #include <opm/core/pressure/tpfa/compr_quant_general.h>
 #include <opm/core/pressure/tpfa/compr_source.h>
-#include <opm/core/pressure/tpfa/trans_tpfa.h>
+#include <opm/grid/transmissibility/trans_tpfa.h>
 #include <opm/core/linalg/LinearSolverInterface.hpp>
 #include <opm/core/linalg/sparse_sys.h>
 #include <opm/common/ErrorMacros.hpp>
diff --git a/opm/core/pressure/FlowBCManager.cpp b/opm/core/pressure/FlowBCManager.cpp
index 79889cc0f..d4d1b18fd 100644
--- a/opm/core/pressure/FlowBCManager.cpp
+++ b/opm/core/pressure/FlowBCManager.cpp
@@ -21,7 +21,7 @@
 #include "config.h"
 #include <opm/core/pressure/FlowBCManager.hpp>
 #include <opm/common/ErrorMacros.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <vector>
 
 namespace Opm
diff --git a/opm/core/pressure/IncompTpfa.cpp b/opm/core/pressure/IncompTpfa.cpp
index 61c3c104b..0fe7aac4d 100644
--- a/opm/core/pressure/IncompTpfa.cpp
+++ b/opm/core/pressure/IncompTpfa.cpp
@@ -25,7 +25,7 @@
 #include <opm/core/props/IncompPropertiesInterface.hpp>
 #include <opm/core/props/rock/RockCompressibility.hpp>
 #include <opm/core/pressure/tpfa/ifs_tpfa.h>
-#include <opm/core/pressure/tpfa/trans_tpfa.h>
+#include <opm/grid/transmissibility/trans_tpfa.h>
 #include <opm/core/pressure/mimetic/mimetic.h>
 #include <opm/core/pressure/flow_bc.h>
 #include <opm/core/linalg/LinearSolverInterface.hpp>
diff --git a/opm/core/pressure/IncompTpfaSinglePhase.cpp b/opm/core/pressure/IncompTpfaSinglePhase.cpp
index a534eb831..9c667076c 100644
--- a/opm/core/pressure/IncompTpfaSinglePhase.cpp
+++ b/opm/core/pressure/IncompTpfaSinglePhase.cpp
@@ -23,20 +23,11 @@
 
 #include <opm/core/props/IncompPropertiesSinglePhase.hpp>
 #include <opm/core/pressure/tpfa/ifs_tpfa.h>
-#include <opm/core/pressure/tpfa/trans_tpfa.h>
-// #include <opm/core/pressure/mimetic/mimetic.h>
-// #include <opm/core/pressure/flow_bc.h>
+#include <opm/grid/transmissibility/trans_tpfa.h>
 #include <opm/core/linalg/LinearSolverInterface.hpp>
 #include <opm/core/linalg/sparse_sys.h>
-// #include <opm/core/simulator/TwophaseState.hpp>
-// #include <opm/core/simulator/WellState.hpp>
 #include <opm/common/ErrorMacros.hpp>
-// #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/core/wells.h>
-// #include <iostream>
-// #include <iomanip>
-// #include <cmath>
-// #include <algorithm>
 
 namespace Opm
 {
diff --git a/opm/core/pressure/tpfa/cfs_tpfa_residual.c b/opm/core/pressure/tpfa/cfs_tpfa_residual.c
index b294ae28b..15621b741 100644
--- a/opm/core/pressure/tpfa/cfs_tpfa_residual.c
+++ b/opm/core/pressure/tpfa/cfs_tpfa_residual.c
@@ -13,7 +13,7 @@
 
 #include <opm/core/pressure/tpfa/compr_quant_general.h>
 #include <opm/core/pressure/tpfa/compr_source.h>
-#include <opm/core/pressure/tpfa/trans_tpfa.h>
+#include <opm/grid/transmissibility/trans_tpfa.h>
 
 #include <opm/core/pressure/tpfa/cfs_tpfa_residual.h>
 
diff --git a/opm/core/pressure/tpfa/cfs_tpfa_residual.h b/opm/core/pressure/tpfa/cfs_tpfa_residual.h
index 1abb53ad7..d852dcb98 100644
--- a/opm/core/pressure/tpfa/cfs_tpfa_residual.h
+++ b/opm/core/pressure/tpfa/cfs_tpfa_residual.h
@@ -20,7 +20,7 @@
 #ifndef OPM_CFS_TPFA_HEADER_INCLUDED
 #define OPM_CFS_TPFA_HEADER_INCLUDED
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/wells.h>
 
 #include <opm/core/pressure/tpfa/compr_source.h>
diff --git a/opm/core/pressure/tpfa/ifs_tpfa.h b/opm/core/pressure/tpfa/ifs_tpfa.h
index d7853bef2..41ab741ff 100644
--- a/opm/core/pressure/tpfa/ifs_tpfa.h
+++ b/opm/core/pressure/tpfa/ifs_tpfa.h
@@ -30,7 +30,7 @@
  * connection fluxes.
  */
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/opm/core/props/BlackoilPropertiesFromDeck.cpp b/opm/core/props/BlackoilPropertiesFromDeck.cpp
index c99841dc2..450031134 100644
--- a/opm/core/props/BlackoilPropertiesFromDeck.cpp
+++ b/opm/core/props/BlackoilPropertiesFromDeck.cpp
@@ -22,8 +22,8 @@
 #include <opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp>
 #include <opm/core/props/phaseUsageFromDeck.hpp>
 #include <opm/common/utility/parameters/ParameterGroup.hpp>
-#include <opm/core/utility/compressedToCartesian.hpp>
-#include <opm/core/utility/extractPvtTableIndex.hpp>
+#include <opm/grid/utility/compressedToCartesian.hpp>
+#include <opm/grid/utility/extractPvtTableIndex.hpp>
 #include <vector>
 #include <numeric>
 
diff --git a/opm/core/props/IncompPropertiesSinglePhase.cpp b/opm/core/props/IncompPropertiesSinglePhase.cpp
index 0c7b0db77..1848994c3 100644
--- a/opm/core/props/IncompPropertiesSinglePhase.cpp
+++ b/opm/core/props/IncompPropertiesSinglePhase.cpp
@@ -21,7 +21,7 @@
 #include "config.h"
 
 #include <opm/core/props/IncompPropertiesSinglePhase.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/parser/eclipse/Units/Units.hpp>
 #include <opm/common/ErrorMacros.hpp>
 
diff --git a/opm/core/props/rock/RockFromDeck.cpp b/opm/core/props/rock/RockFromDeck.cpp
index 84d9c8763..68ed4cfc7 100644
--- a/opm/core/props/rock/RockFromDeck.cpp
+++ b/opm/core/props/rock/RockFromDeck.cpp
@@ -20,12 +20,12 @@
 
 #include "config.h"
 #include <opm/core/props/rock/RockFromDeck.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/common/ErrorMacros.hpp>
 
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
 
-#include <opm/core/utility/CompressedPropertyAccess.hpp>
+#include <opm/grid/utility/CompressedPropertyAccess.hpp>
 
 #include <array>
 #include <string>
diff --git a/opm/core/props/satfunc/RelpermDiagnostics.hpp b/opm/core/props/satfunc/RelpermDiagnostics.hpp
index 14e73f0f4..f89c47360 100644
--- a/opm/core/props/satfunc/RelpermDiagnostics.hpp
+++ b/opm/core/props/satfunc/RelpermDiagnostics.hpp
@@ -27,9 +27,9 @@
 #include "config.h"
 #endif // HAVE_CONFIG_H
 
-#include <opm/core/grid.h>
-#include <opm/core/grid/GridManager.hpp>
-#include <opm/core/grid/GridHelpers.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/GridManager.hpp>
+#include <opm/grid/GridHelpers.hpp>
 #include <opm/common/utility/numeric/linearInterpolation.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
 #include <opm/parser/eclipse/Deck/Deck.hpp>
diff --git a/opm/core/props/satfunc/RelpermDiagnostics_impl.hpp b/opm/core/props/satfunc/RelpermDiagnostics_impl.hpp
index 7f7bd4720..69912cdd5 100644
--- a/opm/core/props/satfunc/RelpermDiagnostics_impl.hpp
+++ b/opm/core/props/satfunc/RelpermDiagnostics_impl.hpp
@@ -24,7 +24,7 @@
 #include <utility>
 
 #include <opm/core/props/satfunc/RelpermDiagnostics.hpp>
-#include <opm/core/utility/compressedToCartesian.hpp>
+#include <opm/grid/utility/compressedToCartesian.hpp>
 
 namespace Opm {
 
diff --git a/opm/core/props/satfunc/SaturationPropsFromDeck.cpp b/opm/core/props/satfunc/SaturationPropsFromDeck.cpp
index 091d5b09b..00163b932 100644
--- a/opm/core/props/satfunc/SaturationPropsFromDeck.cpp
+++ b/opm/core/props/satfunc/SaturationPropsFromDeck.cpp
@@ -24,7 +24,7 @@
 
 #include <opm/common/utility/numeric/UniformTableLinear.hpp>
 #include <opm/common/utility/numeric/NonuniformTableLinear.hpp>
-#include <opm/core/grid/GridHelpers.hpp>
+#include <opm/grid/GridHelpers.hpp>
 #include <opm/core/simulator/ExplicitArraysFluidState.hpp>
 #include <opm/core/simulator/ExplicitArraysSatDerivativesFluidState.hpp>
 
diff --git a/opm/core/props/satfunc/SaturationPropsFromDeck.hpp b/opm/core/props/satfunc/SaturationPropsFromDeck.hpp
index 186659e85..b9aaf88e5 100644
--- a/opm/core/props/satfunc/SaturationPropsFromDeck.hpp
+++ b/opm/core/props/satfunc/SaturationPropsFromDeck.hpp
@@ -24,7 +24,7 @@
 #include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <opm/core/props/BlackoilPhases.hpp>
 #include <opm/core/props/phaseUsageFromDeck.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
diff --git a/opm/core/simulator/BlackoilState.hpp b/opm/core/simulator/BlackoilState.hpp
index 276ee21c3..e70f6c08e 100644
--- a/opm/core/simulator/BlackoilState.hpp
+++ b/opm/core/simulator/BlackoilState.hpp
@@ -23,7 +23,7 @@
 
 #include <opm/common/data/SimulationDataContainer.hpp>
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/props/BlackoilPropertiesInterface.hpp>
 #include <vector>
 
diff --git a/opm/core/simulator/EquilibrationHelpers.hpp b/opm/core/simulator/EquilibrationHelpers.hpp
index bbd6ce2d3..bff675e1f 100644
--- a/opm/core/simulator/EquilibrationHelpers.hpp
+++ b/opm/core/simulator/EquilibrationHelpers.hpp
@@ -22,7 +22,7 @@
 #define OPM_EQUILIBRATIONHELPERS_HEADER_INCLUDED
 
 #include <opm/common/utility/numeric/linearInterpolation.hpp>
-#include <opm/core/utility/RegionMapping.hpp>
+#include <opm/grid/utility/RegionMapping.hpp>
 #include <opm/common/utility/numeric/RootFinders.hpp>
 
 #include <opm/parser/eclipse/EclipseState/InitConfig/Equil.hpp>
diff --git a/opm/core/simulator/initStateEquil.hpp b/opm/core/simulator/initStateEquil.hpp
index 218a2ddb0..3726d932b 100644
--- a/opm/core/simulator/initStateEquil.hpp
+++ b/opm/core/simulator/initStateEquil.hpp
@@ -23,10 +23,10 @@
 #ifndef OPM_INITSTATEEQUIL_HEADER_INCLUDED
 #define OPM_INITSTATEEQUIL_HEADER_INCLUDED
 
-#include <opm/core/grid/GridHelpers.hpp>
+#include <opm/grid/GridHelpers.hpp>
 #include <opm/core/simulator/EquilibrationHelpers.hpp>
-#include <opm/core/utility/RegionMapping.hpp>
-#include <opm/core/utility/extractPvtTableIndex.hpp>
+#include <opm/grid/utility/RegionMapping.hpp>
+#include <opm/grid/utility/extractPvtTableIndex.hpp>
 
 #include <opm/parser/eclipse/Units/Units.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
diff --git a/opm/core/simulator/initStateEquil_impl.hpp b/opm/core/simulator/initStateEquil_impl.hpp
index ef5d69962..551ef4ce4 100644
--- a/opm/core/simulator/initStateEquil_impl.hpp
+++ b/opm/core/simulator/initStateEquil_impl.hpp
@@ -23,8 +23,8 @@
 #ifndef OPM_INITSTATEEQUIL_IMPL_HEADER_INCLUDED
 #define OPM_INITSTATEEQUIL_IMPL_HEADER_INCLUDED
 
-#include <opm/core/grid.h>
-#include <opm/core/grid/GridHelpers.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/GridHelpers.hpp>
 
 #include <opm/material/fluidsystems/BlackOilFluidSystem.hpp>
 
diff --git a/opm/core/simulator/initState_impl.hpp b/opm/core/simulator/initState_impl.hpp
index 7f54b9eb2..eced3c936 100644
--- a/opm/core/simulator/initState_impl.hpp
+++ b/opm/core/simulator/initState_impl.hpp
@@ -24,8 +24,8 @@
 #include <opm/common/ErrorMacros.hpp>
 
 #include <opm/common/utility/parameters/ParameterGroup.hpp>
-#include <opm/core/grid.h>
-#include <opm/core/grid/GridHelpers.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/GridHelpers.hpp>
 #include <opm/common/utility/numeric/MonotCubicInterpolator.hpp>
 #include <opm/parser/eclipse/Units/Units.hpp>
 #include <opm/core/props/IncompPropertiesInterface.hpp>
diff --git a/opm/core/transport/reorder/ReorderSolverInterface.cpp b/opm/core/transport/reorder/ReorderSolverInterface.cpp
index d738339df..0eef40cb5 100644
--- a/opm/core/transport/reorder/ReorderSolverInterface.cpp
+++ b/opm/core/transport/reorder/ReorderSolverInterface.cpp
@@ -20,8 +20,8 @@
 #include "config.h"
 #include <opm/core/transport/reorder/ReorderSolverInterface.hpp>
 #include <opm/core/transport/reorder/reordersequence.h>
-#include <opm/core/grid.h>
-#include <opm/core/utility/StopWatch.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/utility/StopWatch.hpp>
 
 #include <vector>
 #include <cassert>
diff --git a/opm/core/transport/reorder/TransportSolverCompressibleTwophaseReorder.cpp b/opm/core/transport/reorder/TransportSolverCompressibleTwophaseReorder.cpp
index 0b00a0500..4fbe0e319 100644
--- a/opm/core/transport/reorder/TransportSolverCompressibleTwophaseReorder.cpp
+++ b/opm/core/transport/reorder/TransportSolverCompressibleTwophaseReorder.cpp
@@ -21,12 +21,12 @@
 #include "config.h"
 #include <opm/core/transport/reorder/TransportSolverCompressibleTwophaseReorder.hpp>
 #include <opm/core/props/BlackoilPropertiesInterface.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/transport/reorder/reordersequence.h>
 #include <opm/common/utility/numeric/RootFinders.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/core/utility/miscUtilitiesBlackoil.hpp>
-#include <opm/core/pressure/tpfa/trans_tpfa.h>
+#include <opm/grid/transmissibility/trans_tpfa.h>
 
 #include <iostream>
 #include <fstream>
diff --git a/opm/core/transport/reorder/TransportSolverTwophaseReorder.cpp b/opm/core/transport/reorder/TransportSolverTwophaseReorder.cpp
index de8eb6a97..84dbeab6b 100644
--- a/opm/core/transport/reorder/TransportSolverTwophaseReorder.cpp
+++ b/opm/core/transport/reorder/TransportSolverTwophaseReorder.cpp
@@ -20,12 +20,12 @@
 #include "config.h"
 #include <opm/core/transport/reorder/TransportSolverTwophaseReorder.hpp>
 #include <opm/core/props/IncompPropertiesInterface.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/transport/reorder/reordersequence.h>
-#include <opm/core/grid/ColumnExtract.hpp>
+#include <opm/grid/ColumnExtract.hpp>
 #include <opm/common/utility/numeric/RootFinders.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
-#include <opm/core/pressure/tpfa/trans_tpfa.h>
+#include <opm/grid/transmissibility/trans_tpfa.h>
 
 #include <iostream>
 #include <fstream>
diff --git a/opm/core/transport/reorder/reordersequence.cpp b/opm/core/transport/reorder/reordersequence.cpp
index 5e0df799f..2efc478a8 100644
--- a/opm/core/transport/reorder/reordersequence.cpp
+++ b/opm/core/transport/reorder/reordersequence.cpp
@@ -1,7 +1,7 @@
 /* Copyright 2011 (c) Jostein R. Natvig <Jostein.R.Natvig at sintef.no> */
 
 #include "config.h"
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 
 #ifdef MATLAB_MEX_FILE
 #include "reordersequence.h"
diff --git a/opm/core/utility/miscUtilities.cpp b/opm/core/utility/miscUtilities.cpp
index dfb973b2f..acb2e9ed3 100644
--- a/opm/core/utility/miscUtilities.cpp
+++ b/opm/core/utility/miscUtilities.cpp
@@ -20,7 +20,7 @@
 #include "config.h"
 #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/parser/eclipse/Units/Units.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/wells.h>
 #include <opm/core/well_controls.h>
 #include <opm/core/props/IncompPropertiesInterface.hpp>
diff --git a/opm/core/utility/miscUtilitiesBlackoil.cpp b/opm/core/utility/miscUtilitiesBlackoil.cpp
index dd872e911..14e1cbf69 100644
--- a/opm/core/utility/miscUtilitiesBlackoil.cpp
+++ b/opm/core/utility/miscUtilitiesBlackoil.cpp
@@ -22,7 +22,7 @@
 
 #include <opm/core/utility/miscUtilitiesBlackoil.hpp>
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/wells.h>
 #include <opm/common/utility/numeric/blas_lapack.h>
 #include <opm/core/props/BlackoilPropertiesInterface.hpp>
diff --git a/opm/core/utility/miscUtilities_impl.hpp b/opm/core/utility/miscUtilities_impl.hpp
index 25bc56111..c343d7bfa 100644
--- a/opm/core/utility/miscUtilities_impl.hpp
+++ b/opm/core/utility/miscUtilities_impl.hpp
@@ -1,4 +1,4 @@
-#include <opm/core/grid/GridHelpers.hpp>
+#include <opm/grid/GridHelpers.hpp>
 #include <opm/core/wells.h>
 #include <opm/core/props/rock/RockCompressibility.hpp>
 
diff --git a/opm/core/wells/WellCollection.hpp b/opm/core/wells/WellCollection.hpp
index 419e0f9c1..8b3c91cea 100644
--- a/opm/core/wells/WellCollection.hpp
+++ b/opm/core/wells/WellCollection.hpp
@@ -23,7 +23,7 @@
 #include <memory>
 
 #include <opm/core/wells/WellsGroup.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/props/phaseUsageFromDeck.hpp>
 
 #include <opm/parser/eclipse/EclipseState/Schedule/Well.hpp>
diff --git a/opm/core/wells/WellsGroup.hpp b/opm/core/wells/WellsGroup.hpp
index e18f62ded..398b6db16 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/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/props/BlackoilPhases.hpp>
 
 #include <opm/parser/eclipse/EclipseState/Schedule/Well.hpp>
diff --git a/opm/core/wells/WellsManager.cpp b/opm/core/wells/WellsManager.cpp
index ed05755a6..663ae1a65 100644
--- a/opm/core/wells/WellsManager.cpp
+++ b/opm/core/wells/WellsManager.cpp
@@ -22,7 +22,7 @@
 
 
 #include <opm/core/wells/WellsManager.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/wells.h>
 #include <opm/core/well_controls.h>
 #include <opm/common/ErrorMacros.hpp>
diff --git a/opm/core/wells/WellsManager.hpp b/opm/core/wells/WellsManager.hpp
index 0901b5be4..12e1512f2 100644
--- a/opm/core/wells/WellsManager.hpp
+++ b/opm/core/wells/WellsManager.hpp
@@ -29,7 +29,7 @@
 #include <opm/core/wells/DynamicListEconLimited.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/GroupTree.hpp>
 
-#include <opm/core/utility/CompressedPropertyAccess.hpp>
+#include <opm/grid/utility/CompressedPropertyAccess.hpp>
 
 struct Wells;
 struct UnstructuredGrid;
diff --git a/opm/core/wells/WellsManager_impl.hpp b/opm/core/wells/WellsManager_impl.hpp
index 687fd212b..fbb58b837 100644
--- a/opm/core/wells/WellsManager_impl.hpp
+++ b/opm/core/wells/WellsManager_impl.hpp
@@ -1,9 +1,9 @@
 #include <opm/parser/eclipse/Units/Units.hpp>
-#include <opm/core/grid/GridHelpers.hpp>
+#include <opm/grid/GridHelpers.hpp>
 
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/common/OpmLog/OpmLog.hpp>
-#include <opm/core/utility/compressedToCartesian.hpp>
+#include <opm/grid/utility/compressedToCartesian.hpp>
 #include <opm/core/props/rock/RockFromDeck.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/CompletionSet.hpp>
diff --git a/opm/polymer/CompressibleTpfaPolymer.cpp b/opm/polymer/CompressibleTpfaPolymer.cpp
index 45e4af562..34d7ad98e 100644
--- a/opm/polymer/CompressibleTpfaPolymer.cpp
+++ b/opm/polymer/CompressibleTpfaPolymer.cpp
@@ -24,7 +24,7 @@
 #include <opm/core/props/BlackoilPropertiesInterface.hpp>
 #include <opm/core/props/rock/RockCompressibility.hpp>
 #include <opm/core/pressure/tpfa/ifs_tpfa.h>
-#include <opm/core/pressure/tpfa/trans_tpfa.h>
+#include <opm/grid/transmissibility/trans_tpfa.h>
 #include <opm/core/pressure/mimetic/mimetic.h>
 #include <opm/core/pressure/flow_bc.h>
 #include <opm/core/linalg/LinearSolverInterface.hpp>
diff --git a/opm/polymer/GravityColumnSolverPolymer.hpp b/opm/polymer/GravityColumnSolverPolymer.hpp
index 922c0a46b..00f0b5f86 100644
--- a/opm/polymer/GravityColumnSolverPolymer.hpp
+++ b/opm/polymer/GravityColumnSolverPolymer.hpp
@@ -20,7 +20,7 @@
 #ifndef OPM_GRAVITYCOLUMNSOLVERPOLYMER_HEADER_INCLUDED
 #define OPM_GRAVITYCOLUMNSOLVERPOLYMER_HEADER_INCLUDED
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <vector>
 #include <map>
 
diff --git a/opm/polymer/IncompTpfaPolymer.cpp b/opm/polymer/IncompTpfaPolymer.cpp
index 61905d87b..a9adf14f5 100644
--- a/opm/polymer/IncompTpfaPolymer.cpp
+++ b/opm/polymer/IncompTpfaPolymer.cpp
@@ -27,7 +27,7 @@
 #include <opm/core/props/IncompPropertiesInterface.hpp>
 #include <opm/core/props/rock/RockCompressibility.hpp>
 #include <opm/core/pressure/tpfa/ifs_tpfa.h>
-#include <opm/core/pressure/tpfa/trans_tpfa.h>
+#include <opm/grid/transmissibility/trans_tpfa.h>
 #include <opm/core/pressure/mimetic/mimetic.h>
 #include <opm/core/pressure/flow_bc.h>
 #include <opm/core/linalg/LinearSolverInterface.hpp>
diff --git a/opm/polymer/PolymerBlackoilState.hpp b/opm/polymer/PolymerBlackoilState.hpp
index 521c284f4..597de8869 100644
--- a/opm/polymer/PolymerBlackoilState.hpp
+++ b/opm/polymer/PolymerBlackoilState.hpp
@@ -22,7 +22,7 @@
 
 
 #include <opm/core/simulator/BlackoilState.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <vector>
 
 namespace Opm
diff --git a/opm/polymer/PolymerState.hpp b/opm/polymer/PolymerState.hpp
index 87f810a00..9bee1a1e6 100644
--- a/opm/polymer/PolymerState.hpp
+++ b/opm/polymer/PolymerState.hpp
@@ -22,7 +22,7 @@
 
 #include <opm/common/data/SimulationDataContainer.hpp>
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <vector>
 
 namespace Opm
diff --git a/opm/polymer/SimulatorCompressiblePolymer.cpp b/opm/polymer/SimulatorCompressiblePolymer.cpp
index 0ffeea6a8..52db05872 100644
--- a/opm/polymer/SimulatorCompressiblePolymer.cpp
+++ b/opm/polymer/SimulatorCompressiblePolymer.cpp
@@ -27,13 +27,13 @@
 
 #include <opm/polymer/CompressibleTpfaPolymer.hpp>
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/wells.h>
 #include <opm/core/pressure/flow_bc.h>
 
 #include <opm/core/simulator/SimulatorReport.hpp>
 #include <opm/simulators/timestepping/SimulatorTimer.hpp>
-#include <opm/core/utility/StopWatch.hpp>
+#include <opm/grid/utility/StopWatch.hpp>
 #include <opm/core/utility/DataMap.hpp>
 #include <opm/simulators/vtk/writeVtkData.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
@@ -44,7 +44,7 @@
 #include <opm/core/props/BlackoilPropertiesInterface.hpp>
 #include <opm/core/props/rock/RockCompressibility.hpp>
 
-#include <opm/core/grid/ColumnExtract.hpp>
+#include <opm/grid/ColumnExtract.hpp>
 #include <opm/parser/eclipse/Units/Units.hpp>
 #include <opm/polymer/PolymerBlackoilState.hpp>
 #include <opm/core/simulator/WellState.hpp>
diff --git a/opm/polymer/SimulatorPolymer.cpp b/opm/polymer/SimulatorPolymer.cpp
index bb87c3c6d..d78341925 100644
--- a/opm/polymer/SimulatorPolymer.cpp
+++ b/opm/polymer/SimulatorPolymer.cpp
@@ -28,14 +28,14 @@
 
 #include <opm/polymer/IncompTpfaPolymer.hpp>
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/wells.h>
 #include <opm/core/well_controls.h>
 #include <opm/core/pressure/flow_bc.h>
 
 #include <opm/core/simulator/SimulatorReport.hpp>
 #include <opm/simulators/timestepping/SimulatorTimer.hpp>
-#include <opm/core/utility/StopWatch.hpp>
+#include <opm/grid/utility/StopWatch.hpp>
 #include <opm/autodiff/Compat.hpp>
 #include <opm/core/utility/DataMap.hpp>
 #include <opm/simulators/vtk/writeVtkData.hpp>
@@ -46,7 +46,7 @@
 #include <opm/core/props/IncompPropertiesInterface.hpp>
 #include <opm/core/props/rock/RockCompressibility.hpp>
 
-#include <opm/core/grid/ColumnExtract.hpp>
+#include <opm/grid/ColumnExtract.hpp>
 #include <opm/parser/eclipse/Units/Units.hpp>
 #include <opm/polymer/PolymerState.hpp>
 #include <opm/core/simulator/WellState.hpp>
diff --git a/opm/polymer/TransportSolverTwophaseCompressiblePolymer.cpp b/opm/polymer/TransportSolverTwophaseCompressiblePolymer.cpp
index 2412089b0..fad703c63 100644
--- a/opm/polymer/TransportSolverTwophaseCompressiblePolymer.cpp
+++ b/opm/polymer/TransportSolverTwophaseCompressiblePolymer.cpp
@@ -21,12 +21,12 @@
 
 #include <opm/polymer/TransportSolverTwophaseCompressiblePolymer.hpp>
 #include <opm/core/props/BlackoilPropertiesInterface.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/transport/reorder/reordersequence.h>
 #include <opm/common/utility/numeric/RootFinders.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/core/utility/miscUtilitiesBlackoil.hpp>
-#include <opm/core/pressure/tpfa/trans_tpfa.h>
+#include <opm/grid/transmissibility/trans_tpfa.h>
 #include <opm/common/ErrorMacros.hpp>
 #include <cmath>
 #include <list>
diff --git a/opm/polymer/TransportSolverTwophasePolymer.cpp b/opm/polymer/TransportSolverTwophasePolymer.cpp
index 6499b8ff8..127e3bcc9 100644
--- a/opm/polymer/TransportSolverTwophasePolymer.cpp
+++ b/opm/polymer/TransportSolverTwophasePolymer.cpp
@@ -22,10 +22,10 @@
 
 #include <opm/polymer/TransportSolverTwophasePolymer.hpp>
 #include <opm/core/props/IncompPropertiesInterface.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/common/utility/numeric/RootFinders.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
-#include <opm/core/pressure/tpfa/trans_tpfa.h>
+#include <opm/grid/transmissibility/trans_tpfa.h>
 #include <opm/common/ErrorMacros.hpp>
 #include <cmath>
 #include <list>
diff --git a/opm/polymer/polymerUtilities.hpp b/opm/polymer/polymerUtilities.hpp
index f0c5668b1..5c516e34b 100644
--- a/opm/polymer/polymerUtilities.hpp
+++ b/opm/polymer/polymerUtilities.hpp
@@ -21,7 +21,7 @@
 #define OPM_POLYMERUTILITIES_HEADER_INCLUDED
 
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/props/IncompPropertiesInterface.hpp>
 #include <opm/core/props/BlackoilPropertiesInterface.hpp>
 #include <opm/polymer/PolymerProperties.hpp>
diff --git a/opm/simulators/SimulatorCompressibleTwophase.cpp b/opm/simulators/SimulatorCompressibleTwophase.cpp
index 56410b123..92f8dafaa 100644
--- a/opm/simulators/SimulatorCompressibleTwophase.cpp
+++ b/opm/simulators/SimulatorCompressibleTwophase.cpp
@@ -27,13 +27,13 @@
 
 #include <opm/core/pressure/CompressibleTpfa.hpp>
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/wells.h>
 #include <opm/core/pressure/flow_bc.h>
 
 #include <opm/core/simulator/SimulatorReport.hpp>
 #include <opm/simulators/timestepping/SimulatorTimer.hpp>
-#include <opm/core/utility/StopWatch.hpp>
+#include <opm/grid/utility/StopWatch.hpp>
 #include <opm/core/utility/DataMap.hpp>
 #include <opm/simulators/vtk/writeVtkData.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
@@ -44,7 +44,7 @@
 #include <opm/core/props/BlackoilPropertiesInterface.hpp>
 #include <opm/core/props/rock/RockCompressibility.hpp>
 
-#include <opm/core/grid/ColumnExtract.hpp>
+#include <opm/grid/ColumnExtract.hpp>
 #include <opm/core/simulator/BlackoilState.hpp>
 #include <opm/core/simulator/WellState.hpp>
 #include <opm/core/transport/reorder/TransportSolverCompressibleTwophaseReorder.hpp>
diff --git a/opm/simulators/flow_ebos_blackoil.cpp b/opm/simulators/flow_ebos_blackoil.cpp
index ca683edee..fa70826e6 100644
--- a/opm/simulators/flow_ebos_blackoil.cpp
+++ b/opm/simulators/flow_ebos_blackoil.cpp
@@ -22,7 +22,7 @@
 #include <opm/simulators/flow_ebos_blackoil.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
-#include <dune/grid/CpGrid.hpp>
+#include <opm/grid/CpGrid.hpp>
 #include <opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp>
 #include <opm/autodiff/FlowMainEbos.hpp>
 
diff --git a/opm/simulators/flow_ebos_gasoil.cpp b/opm/simulators/flow_ebos_gasoil.cpp
index 6667739ba..cf80c599d 100644
--- a/opm/simulators/flow_ebos_gasoil.cpp
+++ b/opm/simulators/flow_ebos_gasoil.cpp
@@ -24,7 +24,7 @@
 #include <opm/material/common/ResetLocale.hpp>
 #include <ewoms/models/blackoil/blackoiltwophaseindices.hh>
 
-#include <dune/grid/CpGrid.hpp>
+#include <opm/grid/CpGrid.hpp>
 #include <opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp>
 #include <opm/autodiff/FlowMainEbos.hpp>
 
diff --git a/opm/simulators/flow_ebos_oilwater.cpp b/opm/simulators/flow_ebos_oilwater.cpp
index 22e599a11..3fcbbc078 100644
--- a/opm/simulators/flow_ebos_oilwater.cpp
+++ b/opm/simulators/flow_ebos_oilwater.cpp
@@ -24,7 +24,7 @@
 #include <opm/material/common/ResetLocale.hpp>
 #include <ewoms/models/blackoil/blackoiltwophaseindices.hh>
 
-#include <dune/grid/CpGrid.hpp>
+#include <opm/grid/CpGrid.hpp>
 #include <opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp>
 #include <opm/autodiff/FlowMainEbos.hpp>
 
diff --git a/opm/simulators/flow_ebos_polymer.cpp b/opm/simulators/flow_ebos_polymer.cpp
index c4d8ee2c4..395221e3c 100644
--- a/opm/simulators/flow_ebos_polymer.cpp
+++ b/opm/simulators/flow_ebos_polymer.cpp
@@ -19,7 +19,7 @@
 #include <opm/simulators/flow_ebos_polymer.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
-#include <dune/grid/CpGrid.hpp>
+#include <opm/grid/CpGrid.hpp>
 #include <opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp>
 #include <opm/autodiff/FlowMainEbos.hpp>
 
diff --git a/opm/simulators/flow_ebos_solvent.cpp b/opm/simulators/flow_ebos_solvent.cpp
index f83fc131d..c3504d113 100644
--- a/opm/simulators/flow_ebos_solvent.cpp
+++ b/opm/simulators/flow_ebos_solvent.cpp
@@ -19,7 +19,7 @@
 #include <opm/simulators/flow_ebos_solvent.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
-#include <dune/grid/CpGrid.hpp>
+#include <opm/grid/CpGrid.hpp>
 #include <opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp>
 #include <opm/autodiff/FlowMainEbos.hpp>
 
diff --git a/opm/simulators/timestepping/AdaptiveTimeStepping_impl.hpp b/opm/simulators/timestepping/AdaptiveTimeStepping_impl.hpp
index 92ceaa5ba..4d38768db 100644
--- a/opm/simulators/timestepping/AdaptiveTimeStepping_impl.hpp
+++ b/opm/simulators/timestepping/AdaptiveTimeStepping_impl.hpp
@@ -26,7 +26,7 @@
 #include <opm/simulators/timestepping/SimulatorTimer.hpp>
 #include <opm/simulators/timestepping/AdaptiveSimulatorTimer.hpp>
 #include <opm/simulators/timestepping/TimeStepControl.hpp>
-#include <opm/core/utility/StopWatch.hpp>
+#include <opm/grid/utility/StopWatch.hpp>
 #include <opm/common/Exceptions.hpp>
 #include <opm/common/OpmLog/OpmLog.hpp>
 #include <dune/istl/istlexception.hh>
diff --git a/opm/simulators/vtk/writeVtkData.cpp b/opm/simulators/vtk/writeVtkData.cpp
index 5916fb1ae..e015cb56b 100644
--- a/opm/simulators/vtk/writeVtkData.cpp
+++ b/opm/simulators/vtk/writeVtkData.cpp
@@ -21,7 +21,7 @@
 #include <opm/simulators/vtk/writeVtkData.hpp>
 #include <opm/common/OpmLog/OpmLog.hpp>
 #include <opm/common/ErrorMacros.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <set>
 #include <cmath>
 #include <algorithm>
diff --git a/tests/test_anisotropiceikonal.cpp b/tests/test_anisotropiceikonal.cpp
index 85a75322f..e7174841a 100644
--- a/tests/test_anisotropiceikonal.cpp
+++ b/tests/test_anisotropiceikonal.cpp
@@ -31,8 +31,8 @@
 #include <opm/common/utility/platform_dependent/reenable_warnings.h>
 
 #include <opm/core/flowdiagnostics/AnisotropicEikonal.hpp>
-#include <opm/core/grid/GridManager.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/GridManager.hpp>
+#include <opm/grid/UnstructuredGrid.h>
 #include <cmath>
 
 using namespace Opm;
diff --git a/tests/test_blackoilstate.cpp b/tests/test_blackoilstate.cpp
index 232eeb8ad..5858de4a6 100644
--- a/tests/test_blackoilstate.cpp
+++ b/tests/test_blackoilstate.cpp
@@ -1,7 +1,7 @@
 #include <config.h>
 
-#include <opm/core/grid/GridManager.hpp>
-#include <opm/core/grid/GridHelpers.hpp>
+#include <opm/grid/GridManager.hpp>
+#include <opm/grid/GridHelpers.hpp>
 #include <opm/core/props/BlackoilPhases.hpp>
 
 #include <opm/parser/eclipse/Parser/Parser.hpp>
@@ -21,7 +21,7 @@
 #include <vector>
 #include <string>
 
-#include "opm/core/grid/GridManager.hpp"
+#include "opm/grid/GridManager.hpp"
 #include "opm/core/simulator/BlackoilState.hpp"
 
 using namespace Opm;
diff --git a/tests/test_boprops_ad.cpp b/tests/test_boprops_ad.cpp
index a0a5fb569..8f13b92da 100644
--- a/tests/test_boprops_ad.cpp
+++ b/tests/test_boprops_ad.cpp
@@ -32,7 +32,7 @@
 
 #include <opm/autodiff/BlackoilPropsAdFromDeck.hpp>
 
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/GridManager.hpp>
 #include <opm/parser/eclipse/Units/Units.hpp>
 #include <opm/common/utility/parameters/ParameterGroup.hpp>
 
diff --git a/tests/test_dgbasis.cpp b/tests/test_dgbasis.cpp
index 467310bd7..0f7316d9f 100644
--- a/tests/test_dgbasis.cpp
+++ b/tests/test_dgbasis.cpp
@@ -28,8 +28,8 @@
 #include <boost/test/unit_test.hpp>
 
 #include <opm/core/flowdiagnostics/DGBasis.hpp>
-#include <opm/core/grid/GridManager.hpp>
-#include <opm/core/grid.h>
+#include <opm/grid/GridManager.hpp>
+#include <opm/grid/UnstructuredGrid.h>
 #include <cmath>
 
 using namespace Opm;
diff --git a/tests/test_equil_legacy.cpp b/tests/test_equil_legacy.cpp
index 385dfd9a1..101171a15 100644
--- a/tests/test_equil_legacy.cpp
+++ b/tests/test_equil_legacy.cpp
@@ -19,10 +19,10 @@
 
 #include <opm/core/simulator/initStateEquil.hpp>
 
-#include <opm/core/grid.h>
-#include <opm/core/grid/cart_grid.h>
-#include <opm/core/grid/GridManager.hpp>
-#include <opm/core/utility/compressedToCartesian.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/cart_grid.h>
+#include <opm/grid/GridManager.hpp>
+#include <opm/grid/utility/compressedToCartesian.hpp>
 #include <opm/common/utility/parameters/ParameterGroup.hpp>
 
 #include <opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp>
diff --git a/tests/test_pinchprocessor.cpp b/tests/test_pinchprocessor.cpp
index a59053fa6..81cc7ff26 100644
--- a/tests/test_pinchprocessor.cpp
+++ b/tests/test_pinchprocessor.cpp
@@ -32,8 +32,8 @@
 #include <opm/common/utility/platform_dependent/reenable_warnings.h>
 
 #include <vector>
-#include <opm/core/grid.h>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/GridManager.hpp>
 #include <opm/parser/eclipse/Parser/Parser.hpp>
 #include <opm/parser/eclipse/Parser/ParseContext.hpp>
 #include <opm/parser/eclipse/Deck/Deck.hpp>
@@ -42,8 +42,8 @@
 #include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/GridProperty.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/TransMult.hpp>
-#include <opm/core/pressure/tpfa/TransTpfa.hpp>
-#include <opm/core/grid/PinchProcessor.hpp>
+#include <opm/grid/transmissibility/TransTpfa.hpp>
+#include <opm/grid/PinchProcessor.hpp>
 #include <opm/core/props/rock/RockFromDeck.hpp>
 
 
diff --git a/tests/test_rateconverter.cpp b/tests/test_rateconverter.cpp
index 0760d8b1f..8fd10a83f 100644
--- a/tests/test_rateconverter.cpp
+++ b/tests/test_rateconverter.cpp
@@ -32,8 +32,8 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include <opm/core/grid/GridHelpers.hpp>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/GridHelpers.hpp>
+#include <opm/grid/GridManager.hpp>
 #include <opm/core/props/BlackoilPropertiesFromDeck.hpp>
 #include <opm/parser/eclipse/Units/Units.hpp>
 #include <opm/common/utility/parameters/ParameterGroup.hpp>
diff --git a/tests/test_relpermdiagnostics.cpp b/tests/test_relpermdiagnostics.cpp
index c4cdd8cac..a1eed9936 100644
--- a/tests/test_relpermdiagnostics.cpp
+++ b/tests/test_relpermdiagnostics.cpp
@@ -36,9 +36,9 @@
 #include <opm/common/OpmLog/OpmLog.hpp>
 #include <opm/common/OpmLog/CounterLog.hpp>
 
-#include <opm/core/grid.h>
-#include <opm/core/grid/cart_grid.h>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/cart_grid.h>
+#include <opm/grid/GridManager.hpp>
 
 #include <opm/core/props/satfunc/RelpermDiagnostics.hpp>
 #include <opm/parser/eclipse/Parser/Parser.hpp>
diff --git a/tests/test_satfunc.cpp b/tests/test_satfunc.cpp
index 0e16dbfc6..86b8e3e05 100644
--- a/tests/test_satfunc.cpp
+++ b/tests/test_satfunc.cpp
@@ -19,9 +19,9 @@
 
 #include <opm/core/simulator/initStateEquil.hpp>
 
-#include <opm/core/grid.h>
-#include <opm/core/grid/cart_grid.h>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/cart_grid.h>
+#include <opm/grid/GridManager.hpp>
 
 #include <opm/core/props/BlackoilPropertiesBasic.hpp>
 #include <opm/core/props/BlackoilPropertiesFromDeck.hpp>
diff --git a/tests/test_singlecellsolves.cpp b/tests/test_singlecellsolves.cpp
index cd1a3405a..c50ed8900 100644
--- a/tests/test_singlecellsolves.cpp
+++ b/tests/test_singlecellsolves.cpp
@@ -24,8 +24,8 @@
 
 #include <opm/core/pressure/FlowBCManager.hpp>
 
-#include <opm/core/grid.h>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/GridManager.hpp>
 #include <opm/core/wells.h>
 #include <opm/core/wells/WellsManager.hpp>
 #include <opm/common/ErrorMacros.hpp>
diff --git a/tests/test_stoppedwells.cpp b/tests/test_stoppedwells.cpp
index 3daf8df53..9e40f1e72 100644
--- a/tests/test_stoppedwells.cpp
+++ b/tests/test_stoppedwells.cpp
@@ -35,7 +35,7 @@
 #include <opm/core/well_controls.h>
 #include <opm/core/simulator/BlackoilState.hpp>
 #include <opm/core/simulator/WellState.hpp>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/GridManager.hpp>
 
 
 using namespace Opm;
diff --git a/tests/test_thresholdpressure.cpp b/tests/test_thresholdpressure.cpp
index 7b34b93dc..c69ea42dc 100644
--- a/tests/test_thresholdpressure.cpp
+++ b/tests/test_thresholdpressure.cpp
@@ -2,9 +2,9 @@
 #include <opm/parser/eclipse/Parser/ParseContext.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/grid/cornerpoint_grid.h>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/GridManager.hpp>
 #include <opm/autodiff/GridHelpers.hpp>
 #include <opm/simulators/thresholdPressures.hpp> // Note: the GridHelpers must be included before this (to make overloads available)
 
diff --git a/tests/test_transmissibilitymultipliers.cpp b/tests/test_transmissibilitymultipliers.cpp
index c9365dc32..246de90dc 100644
--- a/tests/test_transmissibilitymultipliers.cpp
+++ b/tests/test_transmissibilitymultipliers.cpp
@@ -27,7 +27,7 @@
 #include <opm/autodiff/GeoProps.hpp>
 #include <opm/autodiff/BlackoilPropsAdFromDeck.hpp>
 
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/GridManager.hpp>
 #include <opm/common/utility/parameters/ParameterGroup.hpp>
 
 #include <opm/parser/eclipse/Parser/Parser.hpp>
@@ -38,10 +38,10 @@
 #if HAVE_OPM_GRID
 #include <dune/common/version.hh>
 #include <dune/common/parallel/mpihelper.hh>
-#include <dune/grid/CpGrid.hpp>
+#include <opm/grid/CpGrid.hpp>
 #endif
 
-#include <opm/core/grid/GridHelpers.hpp>
+#include <opm/grid/GridHelpers.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include <string>
diff --git a/tests/test_wellmodel.cpp b/tests/test_wellmodel.cpp
index 754812c92..6a805ae8d 100644
--- a/tests/test_wellmodel.cpp
+++ b/tests/test_wellmodel.cpp
@@ -39,7 +39,7 @@
 #include <opm/parser/eclipse/EclipseState/Schedule/ScheduleEnums.hpp>
 #include <opm/parser/eclipse/EclipseState/Tables/TableManager.hpp>
 
-#include <opm/core/grid.h>
+#include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/props/satfunc/SaturationPropsFromDeck.hpp>
 #include <opm/parser/eclipse/Units/Units.hpp>
 #include <opm/core/wells/WellsManager.hpp>
diff --git a/tests/test_wellsmanager.cpp b/tests/test_wellsmanager.cpp
index 6940b93c6..6efc8dc26 100644
--- a/tests/test_wellsmanager.cpp
+++ b/tests/test_wellsmanager.cpp
@@ -37,7 +37,7 @@
 #include <opm/core/wells.h>
 #include <opm/core/well_controls.h>
 
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/GridManager.hpp>
 
 void wells_static_check(const Wells* wells) {
     BOOST_CHECK_EQUAL(2, wells->number_of_wells);
diff --git a/tutorials/sim_tutorial1.cpp b/tutorials/sim_tutorial1.cpp
index 43216d172..193826403 100644
--- a/tutorials/sim_tutorial1.cpp
+++ b/tutorials/sim_tutorial1.cpp
@@ -35,8 +35,8 @@
 #include "config.h"
 #endif
 
-#include <opm/core/grid.h>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/GridManager.hpp>
 // 17.03.2016 Temporarily removed while moving functionality to opm-output
 #ifdef DISABLE_OUTPUT
 #include <opm/core/io/vtk/writeVtkData.hpp>
diff --git a/tutorials/sim_tutorial2.cpp b/tutorials/sim_tutorial2.cpp
index 84984f638..7e820f70c 100644
--- a/tutorials/sim_tutorial2.cpp
+++ b/tutorials/sim_tutorial2.cpp
@@ -32,8 +32,8 @@
 #include "config.h"
 #endif
 
-#include <opm/core/grid.h>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/GridManager.hpp>
 // 17.03.2016 Temporarily removed while moving functionality to opm-output
 #ifdef DISABLE_OUTPUT
 #include <opm/core/io/vtk/writeVtkData.hpp>
diff --git a/tutorials/sim_tutorial3.cpp b/tutorials/sim_tutorial3.cpp
index fd9a8bbc1..7317425d2 100644
--- a/tutorials/sim_tutorial3.cpp
+++ b/tutorials/sim_tutorial3.cpp
@@ -27,8 +27,8 @@
 #include <fstream>
 #include <vector>
 #include <cassert>
-#include <opm/core/grid.h>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/GridManager.hpp>
 // 17.03.2016 Temporarily removed while moving functionality to opm-output
 #ifdef DISABLE_OUTPUT
 #include <opm/core/io/vtk/writeVtkData.hpp>
diff --git a/tutorials/sim_tutorial4.cpp b/tutorials/sim_tutorial4.cpp
index cebd98902..811e02c7f 100644
--- a/tutorials/sim_tutorial4.cpp
+++ b/tutorials/sim_tutorial4.cpp
@@ -27,8 +27,8 @@
 #include <fstream>
 #include <vector>
 #include <cassert>
-#include <opm/core/grid.h>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/GridManager.hpp>
 // 17.03.2016 Temporarily removed while moving functionality to opm-output
 #ifdef DISABLE_OUTPUT
 #include <opm/core/io/vtk/writeVtkData.hpp>