diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake
index 638bf4fc8..929cbaf77 100644
--- a/CMakeLists_files.cmake
+++ b/CMakeLists_files.cmake
@@ -23,11 +23,7 @@
 # originally generated with the command:
 # find opm -name '*.c*' -printf '\t%p\n' | sort
 list (APPEND MAIN_SOURCE_FILES
-  opm/autodiff/ExtractParallelGridInformationToISTL.cpp
-  opm/autodiff/moduleVersion.cpp
   opm/autodiff/MPIUtilities.cpp
-  opm/autodiff/VFPProdProperties.cpp
-  opm/autodiff/VFPInjProperties.cpp
   opm/autodiff/MissingFeatures.cpp
   opm/core/props/rock/RockFromDeck.cpp
   opm/core/props/satfunc/RelpermDiagnostics.cpp
@@ -39,12 +35,16 @@ list (APPEND MAIN_SOURCE_FILES
   opm/core/wells/WellsManager.cpp
   opm/core/wells/well_controls.c
   opm/core/wells/wells.c
-  opm/simulators/DeferredLogger.cpp
+  opm/simulators/linalg/ExtractParallelGridInformationToISTL.cpp
   opm/simulators/timestepping/TimeStepControl.cpp
   opm/simulators/timestepping/AdaptiveSimulatorTimer.cpp
   opm/simulators/timestepping/SimulatorTimer.cpp
   opm/simulators/timestepping/gatherConvergenceReport.cpp
-  opm/simulators/gatherDeferredLogger.cpp
+  opm/simulators/utils/DeferredLogger.cpp
+  opm/simulators/utils/gatherDeferredLogger.cpp
+  opm/simulators/utils/moduleVersion.cpp
+  opm/simulators/wells/VFPProdProperties.cpp
+  opm/simulators/wells/VFPInjProperties.cpp
   )
 
 # originally generated with the command:
@@ -114,55 +114,19 @@ list (APPEND TEST_DATA_FILES
 # originally generated with the command:
 # find opm -name '*.h*' -a ! -name '*-pch.hpp' -printf '\t%p\n' | sort
 list (APPEND PUBLIC_HEADER_FILES
-  opm/autodiff/AquiferInterface.hpp
-  opm/autodiff/AquiferCarterTracy.hpp
-  opm/autodiff/AquiferFetkovich.hpp
-  opm/autodiff/BlackoilAmg.hpp
-  opm/autodiff/BlackoilAmgCpr.hpp
-  opm/autodiff/amgcpr.hh
-  opm/autodiff/twolevelmethodcpr.hh
   opm/autodiff/BlackoilDetails.hpp
+  opm/autodiff/BlackoilModelEbos.hpp
   opm/autodiff/BlackoilModelParametersEbos.hpp
-  opm/autodiff/BlackoilAquiferModel.hpp
-  opm/autodiff/BlackoilAquiferModel_impl.hpp
-  opm/autodiff/CPRPreconditioner.hpp
   opm/autodiff/createGlobalCellArray.hpp
-  opm/autodiff/ExtractParallelGridInformationToISTL.hpp
-  opm/autodiff/FlowLinearSolverParameters.hpp
   opm/autodiff/FlowMainEbos.hpp
-  opm/autodiff/GraphColoring.hpp
-  opm/autodiff/ISTLSolverEbos.hpp
-  opm/autodiff/ISTLSolverEbosCpr.hpp
+  opm/autodiff/GridInit.hpp
   opm/autodiff/IterationReport.hpp
-  opm/autodiff/MatrixBlock.hpp
-  opm/autodiff/moduleVersion.hpp
   opm/autodiff/MPIUtilities.hpp
   opm/autodiff/NonlinearSolverEbos.hpp
-  opm/autodiff/ParallelOverlappingILU0.hpp
-  opm/autodiff/ParallelRestrictedAdditiveSchwarz.hpp
   opm/autodiff/RateConverter.hpp
   opm/autodiff/SimFIBODetails.hpp
   opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp
-  opm/autodiff/WellConnectionAuxiliaryModule.hpp
-  opm/autodiff/WellStateFullyImplicitBlackoil.hpp
-  opm/autodiff/VFPProperties.hpp
-  opm/autodiff/VFPHelpers.hpp
-  opm/autodiff/VFPInjProperties.hpp
-  opm/autodiff/VFPProdProperties.hpp
-  opm/autodiff/WellHelpers.hpp
-  opm/autodiff/WellInterface.hpp
-  opm/autodiff/WellInterface_impl.hpp
-  opm/autodiff/StandardWell.hpp
-  opm/autodiff/StandardWell_impl.hpp
-  opm/autodiff/MultisegmentWell.hpp
-  opm/autodiff/MultisegmentWell_impl.hpp
-  opm/autodiff/StandardWellV.hpp
-  opm/autodiff/StandardWellV_impl.hpp
-  opm/autodiff/MSWellHelpers.hpp
-  opm/autodiff/BlackoilWellModel.hpp
-  opm/autodiff/BlackoilWellModel_impl.hpp
   opm/autodiff/MissingFeatures.hpp
-  opm/core/linalg/ParallelIstlInformation.hpp
   opm/core/props/BlackoilPhases.hpp
   opm/core/props/phaseUsageFromDeck.hpp
   opm/core/props/rock/RockFromDeck.hpp
@@ -178,9 +142,25 @@ list (APPEND PUBLIC_HEADER_FILES
   opm/core/wells/WellsGroup.hpp
   opm/core/wells/WellsManager.hpp
   opm/core/wells/WellsManager_impl.hpp
-  opm/simulators/ParallelFileMerger.hpp
-  opm/simulators/DeferredLoggingErrorHelpers.hpp
-  opm/simulators/DeferredLogger.hpp
+  opm/simulators/aquifers/AquiferInterface.hpp
+  opm/simulators/aquifers/AquiferCarterTracy.hpp
+  opm/simulators/aquifers/AquiferFetkovich.hpp
+  opm/simulators/aquifers/BlackoilAquiferModel.hpp
+  opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp
+  opm/simulators/linalg/BlackoilAmg.hpp
+  opm/simulators/linalg/BlackoilAmgCpr.hpp
+  opm/simulators/linalg/amgcpr.hh
+  opm/simulators/linalg/twolevelmethodcpr.hh
+  opm/simulators/linalg/CPRPreconditioner.hpp
+  opm/simulators/linalg/ExtractParallelGridInformationToISTL.hpp
+  opm/simulators/linalg/FlowLinearSolverParameters.hpp
+  opm/simulators/linalg/GraphColoring.hpp
+  opm/simulators/linalg/ISTLSolverEbos.hpp
+  opm/simulators/linalg/ISTLSolverEbosCpr.hpp
+  opm/simulators/linalg/MatrixBlock.hpp
+  opm/simulators/linalg/ParallelOverlappingILU0.hpp
+  opm/simulators/linalg/ParallelRestrictedAdditiveSchwarz.hpp
+  opm/simulators/linalg/ParallelIstlInformation.hpp
   opm/simulators/timestepping/AdaptiveSimulatorTimer.hpp
   opm/simulators/timestepping/AdaptiveTimeSteppingEbos.hpp
   opm/simulators/timestepping/ConvergenceReport.hpp
@@ -189,5 +169,27 @@ list (APPEND PUBLIC_HEADER_FILES
   opm/simulators/timestepping/SimulatorTimer.hpp
   opm/simulators/timestepping/SimulatorTimerInterface.hpp
   opm/simulators/timestepping/gatherConvergenceReport.hpp
-  opm/simulators/gatherDeferredLogger.hpp
+  opm/simulators/utils/ParallelFileMerger.hpp
+  opm/simulators/utils/DeferredLoggingErrorHelpers.hpp
+  opm/simulators/utils/DeferredLogger.hpp
+  opm/simulators/utils/gatherDeferredLogger.hpp
+  opm/simulators/utils/moduleVersion.hpp
+  opm/simulators/wells/WellConnectionAuxiliaryModule.hpp
+  opm/simulators/wells/WellStateFullyImplicitBlackoil.hpp
+  opm/simulators/wells/VFPProperties.hpp
+  opm/simulators/wells/VFPHelpers.hpp
+  opm/simulators/wells/VFPInjProperties.hpp
+  opm/simulators/wells/VFPProdProperties.hpp
+  opm/simulators/wells/WellHelpers.hpp
+  opm/simulators/wells/WellInterface.hpp
+  opm/simulators/wells/WellInterface_impl.hpp
+  opm/simulators/wells/StandardWell.hpp
+  opm/simulators/wells/StandardWell_impl.hpp
+  opm/simulators/wells/MultisegmentWell.hpp
+  opm/simulators/wells/MultisegmentWell_impl.hpp
+  opm/simulators/wells/StandardWellV.hpp
+  opm/simulators/wells/StandardWellV_impl.hpp
+  opm/simulators/wells/MSWellHelpers.hpp
+  opm/simulators/wells/BlackoilWellModel.hpp
+  opm/simulators/wells/BlackoilWellModel_impl.hpp
   )
diff --git a/ebos/ebos.hh b/ebos/ebos.hh
index 336dd77e4..573a612a2 100644
--- a/ebos/ebos.hh
+++ b/ebos/ebos.hh
@@ -30,9 +30,9 @@
 
 #include "eclproblem.hh"
 
-#include <opm/autodiff/BlackoilWellModel.hpp>
-#include <opm/autodiff/BlackoilAquiferModel.hpp>
-#include <opm/autodiff/ISTLSolverEbos.hpp>
+#include <opm/simulators/wells/BlackoilWellModel.hpp>
+#include <opm/simulators/aquifers/BlackoilAquiferModel.hpp>
+#include <opm/simulators/linalg/ISTLSolverEbos.hpp>
 
 #include <ewoms/common/start.hh>
 
diff --git a/flow/flow.cpp b/flow/flow.cpp
index 9fea97880..e7d000940 100644
--- a/flow/flow.cpp
+++ b/flow/flow.cpp
@@ -31,7 +31,7 @@
 
 #include <opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp>
 #include <opm/autodiff/FlowMainEbos.hpp>
-#include <opm/autodiff/moduleVersion.hpp>
+#include <opm/simulators/utils/moduleVersion.hpp>
 #include <ewoms/common/propertysystem.hh>
 #include <ewoms/common/parametersystem.hh>
 #include <opm/autodiff/MissingFeatures.hpp>
diff --git a/flow/flow_blackoil_dunecpr.cpp b/flow/flow_blackoil_dunecpr.cpp
index 9896a7f74..bf6eca469 100644
--- a/flow/flow_blackoil_dunecpr.cpp
+++ b/flow/flow_blackoil_dunecpr.cpp
@@ -21,7 +21,7 @@
 #include "config.h"
 #include "flow/flow_tag.hpp"
 //#include <opm/linearsolvers/amgclsolverbackend.hh>
-#include  <opm/autodiff/ISTLSolverEbosCpr.hpp>
+#include  <opm/simulators/linalg/ISTLSolverEbosCpr.hpp>
 //#include <ewoms/linear/superlubackend.hh>
 
 BEGIN_PROPERTIES
diff --git a/opm/autodiff/BlackoilDetails.hpp b/opm/autodiff/BlackoilDetails.hpp
index d51793446..131a2d0e5 100644
--- a/opm/autodiff/BlackoilDetails.hpp
+++ b/opm/autodiff/BlackoilDetails.hpp
@@ -24,7 +24,7 @@
 #ifndef OPM_BLACKOILDETAILS_HEADER_INCLUDED
 #define OPM_BLACKOILDETAILS_HEADER_INCLUDED
 
-#include <opm/core/linalg/ParallelIstlInformation.hpp>
+#include <opm/simulators/linalg/ParallelIstlInformation.hpp>
 #include <opm/core/props/BlackoilPhases.hpp>
 
 namespace Opm {
diff --git a/opm/autodiff/BlackoilModelEbos.hpp b/opm/autodiff/BlackoilModelEbos.hpp
index 28ecec9d2..0f55f9cb3 100644
--- a/opm/autodiff/BlackoilModelEbos.hpp
+++ b/opm/autodiff/BlackoilModelEbos.hpp
@@ -31,14 +31,14 @@
 
 #include <opm/autodiff/NonlinearSolverEbos.hpp>
 #include <opm/autodiff/BlackoilModelParametersEbos.hpp>
-#include <opm/autodiff/BlackoilWellModel.hpp>
-#include <opm/autodiff/BlackoilAquiferModel.hpp>
-#include <opm/autodiff/WellConnectionAuxiliaryModule.hpp>
+#include <opm/simulators/wells/BlackoilWellModel.hpp>
+#include <opm/simulators/aquifers/BlackoilAquiferModel.hpp>
+#include <opm/simulators/wells/WellConnectionAuxiliaryModule.hpp>
 #include <opm/autodiff/BlackoilDetails.hpp>
 
 #include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/simulator/SimulatorReport.hpp>
-#include <opm/core/linalg/ParallelIstlInformation.hpp>
+#include <opm/simulators/linalg/ParallelIstlInformation.hpp>
 #include <opm/core/props/phaseUsageFromDeck.hpp>
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/common/Exceptions.hpp>
@@ -49,7 +49,7 @@
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
 #include <opm/parser/eclipse/EclipseState/Tables/TableManager.hpp>
 
-#include <opm/autodiff/ISTLSolverEbos.hpp>
+#include <opm/simulators/linalg/ISTLSolverEbos.hpp>
 #include <opm/common/data/SimulationDataContainer.hpp>
 
 #include <dune/istl/owneroverlapcopy.hh>
diff --git a/opm/autodiff/FlowMainEbos.hpp b/opm/autodiff/FlowMainEbos.hpp
index c7b7eb7bc..6489161f2 100644
--- a/opm/autodiff/FlowMainEbos.hpp
+++ b/opm/autodiff/FlowMainEbos.hpp
@@ -25,12 +25,12 @@
 
 #include <sys/utsname.h>
 
-#include <opm/simulators/ParallelFileMerger.hpp>
+#include <opm/simulators/utils/ParallelFileMerger.hpp>
 
 #include <opm/autodiff/BlackoilModelEbos.hpp>
 #include <opm/autodiff/MissingFeatures.hpp>
-#include <opm/autodiff/moduleVersion.hpp>
-#include <opm/autodiff/ExtractParallelGridInformationToISTL.hpp>
+#include <opm/simulators/utils/moduleVersion.hpp>
+#include <opm/simulators/linalg/ExtractParallelGridInformationToISTL.hpp>
 #include <opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp>
 
 #include <opm/core/props/satfunc/RelpermDiagnostics.hpp>
@@ -382,7 +382,7 @@ namespace Opm
         void printPRTHeader()
         {
           if (output_cout_) {
-              const std::string version = moduleVersionName();
+              const std::string version = moduleVersion();
               const double megabyte = 1024 * 1024;
               unsigned num_cpu = std::thread::hardware_concurrency();
               struct utsname arch;
diff --git a/opm/autodiff/MPIUtilities.cpp b/opm/autodiff/MPIUtilities.cpp
index 97ee15c5e..11baf402d 100644
--- a/opm/autodiff/MPIUtilities.cpp
+++ b/opm/autodiff/MPIUtilities.cpp
@@ -20,7 +20,7 @@
 
 #include <config.h>
 #include <boost/any.hpp>
-#include <opm/core/linalg/ParallelIstlInformation.hpp>
+#include <opm/simulators/linalg/ParallelIstlInformation.hpp>
 
 namespace Opm
 {
diff --git a/opm/autodiff/RateConverter.hpp b/opm/autodiff/RateConverter.hpp
index 75c989075..921fdac3f 100644
--- a/opm/autodiff/RateConverter.hpp
+++ b/opm/autodiff/RateConverter.hpp
@@ -24,7 +24,7 @@
 
 #include <opm/core/props/BlackoilPhases.hpp>
 #include <opm/grid/utility/RegionMapping.hpp>
-#include <opm/core/linalg/ParallelIstlInformation.hpp>
+#include <opm/simulators/linalg/ParallelIstlInformation.hpp>
 
 #include <dune/grid/common/gridenums.hh>
 #include <algorithm>
diff --git a/opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp b/opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp
index f6e7b44a6..237dbef2a 100644
--- a/opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp
+++ b/opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp
@@ -22,13 +22,12 @@
 #ifndef OPM_SIMULATORFULLYIMPLICITBLACKOILEBOS_HEADER_INCLUDED
 #define OPM_SIMULATORFULLYIMPLICITBLACKOILEBOS_HEADER_INCLUDED
 
-#include <opm/autodiff/IterationReport.hpp>
 #include <opm/autodiff/NonlinearSolverEbos.hpp>
 #include <opm/autodiff/BlackoilModelEbos.hpp>
 #include <opm/autodiff/BlackoilModelParametersEbos.hpp>
-#include <opm/autodiff/WellStateFullyImplicitBlackoil.hpp>
-#include <opm/autodiff/BlackoilAquiferModel.hpp>
-#include <opm/autodiff/moduleVersion.hpp>
+#include <opm/simulators/wells/WellStateFullyImplicitBlackoil.hpp>
+#include <opm/simulators/aquifers/BlackoilAquiferModel.hpp>
+#include <opm/simulators/utils/moduleVersion.hpp>
 #include <opm/simulators/timestepping/AdaptiveTimeSteppingEbos.hpp>
 #include <opm/grid/utility/StopWatch.hpp>
 
diff --git a/opm/autodiff/AquiferCarterTracy.hpp b/opm/simulators/aquifers/AquiferCarterTracy.hpp
similarity index 99%
rename from opm/autodiff/AquiferCarterTracy.hpp
rename to opm/simulators/aquifers/AquiferCarterTracy.hpp
index f487337f6..61de9108d 100644
--- a/opm/autodiff/AquiferCarterTracy.hpp
+++ b/opm/simulators/aquifers/AquiferCarterTracy.hpp
@@ -21,7 +21,7 @@
 #ifndef OPM_AQUIFERCT_HEADER_INCLUDED
 #define OPM_AQUIFERCT_HEADER_INCLUDED
 
-#include <opm/autodiff/AquiferInterface.hpp>
+#include <opm/simulators/aquifers/AquiferInterface.hpp>
 
 namespace Opm
 {
diff --git a/opm/autodiff/AquiferFetkovich.hpp b/opm/simulators/aquifers/AquiferFetkovich.hpp
similarity index 99%
rename from opm/autodiff/AquiferFetkovich.hpp
rename to opm/simulators/aquifers/AquiferFetkovich.hpp
index 1ad8cc255..b01c71bbf 100644
--- a/opm/autodiff/AquiferFetkovich.hpp
+++ b/opm/simulators/aquifers/AquiferFetkovich.hpp
@@ -21,7 +21,7 @@ along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef OPM_AQUIFETP_HEADER_INCLUDED
 #define OPM_AQUIFETP_HEADER_INCLUDED
 
-#include <opm/autodiff/AquiferInterface.hpp>
+#include <opm/simulators/aquifers/AquiferInterface.hpp>
 
 namespace Opm
 {
diff --git a/opm/autodiff/AquiferInterface.hpp b/opm/simulators/aquifers/AquiferInterface.hpp
similarity index 96%
rename from opm/autodiff/AquiferInterface.hpp
rename to opm/simulators/aquifers/AquiferInterface.hpp
index 48d35e1fc..91c192834 100644
--- a/opm/autodiff/AquiferInterface.hpp
+++ b/opm/simulators/aquifers/AquiferInterface.hpp
@@ -25,7 +25,6 @@
 #include <opm/parser/eclipse/EclipseState/AquiferCT.hpp>
 #include <opm/parser/eclipse/EclipseState/Aquifetp.hpp>
 #include <opm/parser/eclipse/EclipseState/Aquancon.hpp>
-#include <opm/autodiff/BlackoilAquiferModel.hpp>
 #include <opm/common/utility/numeric/linearInterpolation.hpp>
 
 #include <opm/material/common/MathToolbox.hpp>
diff --git a/opm/autodiff/BlackoilAquiferModel.hpp b/opm/simulators/aquifers/BlackoilAquiferModel.hpp
similarity index 96%
rename from opm/autodiff/BlackoilAquiferModel.hpp
rename to opm/simulators/aquifers/BlackoilAquiferModel.hpp
index b077bd4f9..c9b44d947 100644
--- a/opm/autodiff/BlackoilAquiferModel.hpp
+++ b/opm/simulators/aquifers/BlackoilAquiferModel.hpp
@@ -30,8 +30,8 @@
 #include <opm/parser/eclipse/EclipseState/Aquifetp.hpp>
 #include <opm/parser/eclipse/EclipseState/Aquancon.hpp>
 #include <opm/simulators/timestepping/SimulatorTimer.hpp>
-#include <opm/autodiff/AquiferCarterTracy.hpp>
-#include <opm/autodiff/AquiferFetkovich.hpp>
+#include <opm/simulators/aquifers/AquiferCarterTracy.hpp>
+#include <opm/simulators/aquifers/AquiferFetkovich.hpp>
 #include <opm/material/densead/Math.hpp>
 
 namespace Opm {
diff --git a/opm/autodiff/BlackoilAquiferModel_impl.hpp b/opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp
similarity index 100%
rename from opm/autodiff/BlackoilAquiferModel_impl.hpp
rename to opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp
diff --git a/opm/autodiff/BlackoilAmg.hpp b/opm/simulators/linalg/BlackoilAmg.hpp
similarity index 99%
rename from opm/autodiff/BlackoilAmg.hpp
rename to opm/simulators/linalg/BlackoilAmg.hpp
index 2560f69ad..580810bef 100644
--- a/opm/autodiff/BlackoilAmg.hpp
+++ b/opm/simulators/linalg/BlackoilAmg.hpp
@@ -20,11 +20,11 @@
 #define OPM_AMG_HEADER_INCLUDED
 
 #include <ewoms/linear/matrixblock.hh>
-#include <opm/autodiff/ParallelOverlappingILU0.hpp>
-#include <opm/autodiff/FlowLinearSolverParameters.hpp>
-#include <opm/autodiff/CPRPreconditioner.hpp>
-#include <opm/autodiff/amgcpr.hh>
-#include <opm/autodiff/twolevelmethodcpr.hh>
+#include <opm/simulators/linalg/ParallelOverlappingILU0.hpp>
+#include <opm/simulators/linalg/FlowLinearSolverParameters.hpp>
+#include <opm/simulators/linalg/CPRPreconditioner.hpp>
+#include <opm/simulators/linalg/amgcpr.hh>
+#include <opm/simulators/linalg/twolevelmethodcpr.hh>
 #include <dune/istl/paamg/twolevelmethod.hh>
 #include <dune/istl/paamg/aggregates.hh>
 #include <dune/istl/bvector.hh>
diff --git a/opm/autodiff/BlackoilAmgCpr.hpp b/opm/simulators/linalg/BlackoilAmgCpr.hpp
similarity index 96%
rename from opm/autodiff/BlackoilAmgCpr.hpp
rename to opm/simulators/linalg/BlackoilAmgCpr.hpp
index ae6ece976..ce41186ab 100644
--- a/opm/autodiff/BlackoilAmgCpr.hpp
+++ b/opm/simulators/linalg/BlackoilAmgCpr.hpp
@@ -19,12 +19,12 @@
 #ifndef OPM_AMGCPR_HEADER_INCLUDED
 #define OPM_AMGCPR_HEADER_INCLUDED
 
-#include <opm/autodiff/twolevelmethodcpr.hh>
+#include <opm/simulators/linalg/twolevelmethodcpr.hh>
 #include <ewoms/linear/matrixblock.hh>
-#include <opm/autodiff/ParallelOverlappingILU0.hpp>
-#include <opm/autodiff/FlowLinearSolverParameters.hpp>
-#include <opm/autodiff/CPRPreconditioner.hpp>
-#include <opm/autodiff/amgcpr.hh>
+#include <opm/simulators/linalg/ParallelOverlappingILU0.hpp>
+#include <opm/simulators/linalg/FlowLinearSolverParameters.hpp>
+#include <opm/simulators/linalg/CPRPreconditioner.hpp>
+#include <opm/simulators/linalg/amgcpr.hh>
 #include <dune/istl/paamg/twolevelmethod.hh>
 #include <dune/istl/paamg/aggregates.hh>
 #include <dune/istl/bvector.hh>
diff --git a/opm/autodiff/CPRPreconditioner.hpp b/opm/simulators/linalg/CPRPreconditioner.hpp
similarity index 98%
rename from opm/autodiff/CPRPreconditioner.hpp
rename to opm/simulators/linalg/CPRPreconditioner.hpp
index 5a97aa10c..fa31581aa 100644
--- a/opm/autodiff/CPRPreconditioner.hpp
+++ b/opm/simulators/linalg/CPRPreconditioner.hpp
@@ -29,8 +29,8 @@
 
 #include <opm/common/utility/platform_dependent/disable_warnings.h>
 #include <opm/common/utility/parameters/ParameterGroup.hpp>
-#include <opm/autodiff/ParallelOverlappingILU0.hpp>
-#include <opm/autodiff/FlowLinearSolverParameters.hpp>
+#include <opm/simulators/linalg/ParallelOverlappingILU0.hpp>
+#include <opm/simulators/linalg/FlowLinearSolverParameters.hpp>
 
 #include <dune/istl/bvector.hh>
 #include <dune/istl/bcrsmatrix.hh>
@@ -49,8 +49,8 @@
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/common/Exceptions.hpp>
 
-#include <opm/autodiff/ParallelRestrictedAdditiveSchwarz.hpp>
-#include <opm/autodiff/ParallelOverlappingILU0.hpp>
+#include <opm/simulators/linalg/ParallelRestrictedAdditiveSchwarz.hpp>
+#include <opm/simulators/linalg/ParallelOverlappingILU0.hpp>
 namespace Opm
 {
 
diff --git a/opm/autodiff/ExtractParallelGridInformationToISTL.cpp b/opm/simulators/linalg/ExtractParallelGridInformationToISTL.cpp
similarity index 97%
rename from opm/autodiff/ExtractParallelGridInformationToISTL.cpp
rename to opm/simulators/linalg/ExtractParallelGridInformationToISTL.cpp
index 3efece143..3caf416e1 100644
--- a/opm/autodiff/ExtractParallelGridInformationToISTL.cpp
+++ b/opm/simulators/linalg/ExtractParallelGridInformationToISTL.cpp
@@ -19,7 +19,7 @@
 */
 #include <config.h>
 #include "ExtractParallelGridInformationToISTL.hpp"
-#include <opm/core/linalg/ParallelIstlInformation.hpp>
+#include <opm/simulators/linalg/ParallelIstlInformation.hpp>
 #include <dune/common/version.hh>
 #include <dune/common/shared_ptr.hh>
  namespace Opm
diff --git a/opm/autodiff/ExtractParallelGridInformationToISTL.hpp b/opm/simulators/linalg/ExtractParallelGridInformationToISTL.hpp
similarity index 100%
rename from opm/autodiff/ExtractParallelGridInformationToISTL.hpp
rename to opm/simulators/linalg/ExtractParallelGridInformationToISTL.hpp
diff --git a/opm/autodiff/FlowLinearSolverParameters.hpp b/opm/simulators/linalg/FlowLinearSolverParameters.hpp
similarity index 99%
rename from opm/autodiff/FlowLinearSolverParameters.hpp
rename to opm/simulators/linalg/FlowLinearSolverParameters.hpp
index 45b7a4339..0b05bcf45 100644
--- a/opm/autodiff/FlowLinearSolverParameters.hpp
+++ b/opm/simulators/linalg/FlowLinearSolverParameters.hpp
@@ -25,7 +25,7 @@
 #define OPM_FLOWLINEARSOLVERPARAMETERS_HEADER_INCLUDED
 
 #include <opm/common/utility/parameters/ParameterGroup.hpp>
-#include <opm/autodiff/ParallelOverlappingILU0.hpp>
+#include <opm/simulators/linalg/ParallelOverlappingILU0.hpp>
 
 #include <ewoms/common/parametersystem.hh>
 
diff --git a/opm/autodiff/GraphColoring.hpp b/opm/simulators/linalg/GraphColoring.hpp
similarity index 100%
rename from opm/autodiff/GraphColoring.hpp
rename to opm/simulators/linalg/GraphColoring.hpp
diff --git a/opm/autodiff/ISTLSolverEbos.hpp b/opm/simulators/linalg/ISTLSolverEbos.hpp
similarity index 98%
rename from opm/autodiff/ISTLSolverEbos.hpp
rename to opm/simulators/linalg/ISTLSolverEbos.hpp
index 80891171d..db6fc1645 100644
--- a/opm/autodiff/ISTLSolverEbos.hpp
+++ b/opm/simulators/linalg/ISTLSolverEbos.hpp
@@ -21,16 +21,16 @@
 #ifndef OPM_ISTLSOLVER_EBOS_HEADER_INCLUDED
 #define OPM_ISTLSOLVER_EBOS_HEADER_INCLUDED
 
-#include <opm/autodiff/MatrixBlock.hpp>
-#include <opm/autodiff/BlackoilAmg.hpp>
-#include <opm/autodiff/CPRPreconditioner.hpp>
+#include <opm/simulators/linalg/MatrixBlock.hpp>
+#include <opm/simulators/linalg/BlackoilAmg.hpp>
+#include <opm/simulators/linalg/CPRPreconditioner.hpp>
 #include <opm/autodiff/MPIUtilities.hpp>
-#include <opm/autodiff/ParallelRestrictedAdditiveSchwarz.hpp>
-#include <opm/autodiff/ParallelOverlappingILU0.hpp>
-#include <opm/autodiff/ExtractParallelGridInformationToISTL.hpp>
+#include <opm/simulators/linalg/ParallelRestrictedAdditiveSchwarz.hpp>
+#include <opm/simulators/linalg/ParallelOverlappingILU0.hpp>
+#include <opm/simulators/linalg/ExtractParallelGridInformationToISTL.hpp>
 #include <opm/autodiff/BlackoilDetails.hpp>
 #include <opm/common/Exceptions.hpp>
-#include <opm/core/linalg/ParallelIstlInformation.hpp>
+#include <opm/simulators/linalg/ParallelIstlInformation.hpp>
 #include <opm/common/utility/platform_dependent/disable_warnings.h>
 #include <opm/material/fluidsystems/BlackOilDefaultIndexTraits.hpp>
 
diff --git a/opm/autodiff/ISTLSolverEbosCpr.hpp b/opm/simulators/linalg/ISTLSolverEbosCpr.hpp
similarity index 99%
rename from opm/autodiff/ISTLSolverEbosCpr.hpp
rename to opm/simulators/linalg/ISTLSolverEbosCpr.hpp
index 1c49641b5..58eef07f6 100644
--- a/opm/autodiff/ISTLSolverEbosCpr.hpp
+++ b/opm/simulators/linalg/ISTLSolverEbosCpr.hpp
@@ -20,8 +20,8 @@
 #ifndef OPM_ISTLSOLVERCPR_EBOS_HEADER_INCLUDED
 #define OPM_ISTLSOLVERCPR_EBOS_HEADER_INCLUDED
 
-#include <opm/autodiff/ISTLSolverEbos.hpp>
-#include <opm/autodiff/BlackoilAmgCpr.hpp>
+#include <opm/simulators/linalg/ISTLSolverEbos.hpp>
+#include <opm/simulators/linalg/BlackoilAmgCpr.hpp>
 #include <utility>
 #include <memory>
 
diff --git a/opm/autodiff/MatrixBlock.hpp b/opm/simulators/linalg/MatrixBlock.hpp
similarity index 100%
rename from opm/autodiff/MatrixBlock.hpp
rename to opm/simulators/linalg/MatrixBlock.hpp
diff --git a/opm/core/linalg/ParallelIstlInformation.hpp b/opm/simulators/linalg/ParallelIstlInformation.hpp
similarity index 100%
rename from opm/core/linalg/ParallelIstlInformation.hpp
rename to opm/simulators/linalg/ParallelIstlInformation.hpp
diff --git a/opm/autodiff/ParallelOverlappingILU0.hpp b/opm/simulators/linalg/ParallelOverlappingILU0.hpp
similarity index 99%
rename from opm/autodiff/ParallelOverlappingILU0.hpp
rename to opm/simulators/linalg/ParallelOverlappingILU0.hpp
index d65a41900..81cc66559 100644
--- a/opm/autodiff/ParallelOverlappingILU0.hpp
+++ b/opm/simulators/linalg/ParallelOverlappingILU0.hpp
@@ -20,7 +20,7 @@
 #ifndef OPM_PARALLELOVERLAPPINGILU0_HEADER_INCLUDED
 #define OPM_PARALLELOVERLAPPINGILU0_HEADER_INCLUDED
 
-#include <opm/autodiff/GraphColoring.hpp>
+#include <opm/simulators/linalg/GraphColoring.hpp>
 #include <opm/common/Exceptions.hpp>
 #include <opm/common/ErrorMacros.hpp>
 #include <dune/common/version.hh>
diff --git a/opm/autodiff/ParallelRestrictedAdditiveSchwarz.hpp b/opm/simulators/linalg/ParallelRestrictedAdditiveSchwarz.hpp
similarity index 100%
rename from opm/autodiff/ParallelRestrictedAdditiveSchwarz.hpp
rename to opm/simulators/linalg/ParallelRestrictedAdditiveSchwarz.hpp
diff --git a/opm/autodiff/amgcpr.hh b/opm/simulators/linalg/amgcpr.hh
similarity index 100%
rename from opm/autodiff/amgcpr.hh
rename to opm/simulators/linalg/amgcpr.hh
diff --git a/opm/autodiff/twolevelmethodcpr.hh b/opm/simulators/linalg/twolevelmethodcpr.hh
similarity index 100%
rename from opm/autodiff/twolevelmethodcpr.hh
rename to opm/simulators/linalg/twolevelmethodcpr.hh
diff --git a/opm/simulators/DeferredLogger.cpp b/opm/simulators/utils/DeferredLogger.cpp
similarity index 98%
rename from opm/simulators/DeferredLogger.cpp
rename to opm/simulators/utils/DeferredLogger.cpp
index 1c222598d..d55864b1a 100644
--- a/opm/simulators/DeferredLogger.cpp
+++ b/opm/simulators/utils/DeferredLogger.cpp
@@ -18,7 +18,7 @@
 */
 
 
-#include <opm/simulators/DeferredLogger.hpp>
+#include <opm/simulators/utils/DeferredLogger.hpp>
 
 namespace Opm
 {
diff --git a/opm/simulators/DeferredLogger.hpp b/opm/simulators/utils/DeferredLogger.hpp
similarity index 100%
rename from opm/simulators/DeferredLogger.hpp
rename to opm/simulators/utils/DeferredLogger.hpp
diff --git a/opm/simulators/DeferredLoggingErrorHelpers.hpp b/opm/simulators/utils/DeferredLoggingErrorHelpers.hpp
similarity index 98%
rename from opm/simulators/DeferredLoggingErrorHelpers.hpp
rename to opm/simulators/utils/DeferredLoggingErrorHelpers.hpp
index 72c420709..f0c3298fb 100644
--- a/opm/simulators/DeferredLoggingErrorHelpers.hpp
+++ b/opm/simulators/utils/DeferredLoggingErrorHelpers.hpp
@@ -21,7 +21,7 @@
 #ifndef OPM_DEFERREDLOGGINGERRORHELPERS_HPP
 #define OPM_DEFERREDLOGGINGERRORHELPERS_HPP
 
-#include <opm/simulators/DeferredLogger.hpp>
+#include <opm/simulators/utils/DeferredLogger.hpp>
 
 #include <dune/common/version.hh>
 #include <dune/common/parallel/mpihelper.hh>
diff --git a/opm/simulators/ParallelFileMerger.hpp b/opm/simulators/utils/ParallelFileMerger.hpp
similarity index 100%
rename from opm/simulators/ParallelFileMerger.hpp
rename to opm/simulators/utils/ParallelFileMerger.hpp
diff --git a/opm/simulators/gatherDeferredLogger.cpp b/opm/simulators/utils/gatherDeferredLogger.cpp
similarity index 99%
rename from opm/simulators/gatherDeferredLogger.cpp
rename to opm/simulators/utils/gatherDeferredLogger.cpp
index 1f5f46954..91e4798fa 100644
--- a/opm/simulators/gatherDeferredLogger.cpp
+++ b/opm/simulators/utils/gatherDeferredLogger.cpp
@@ -20,7 +20,7 @@
 
 #include "config.h"
 
-#include <opm/simulators/gatherDeferredLogger.hpp>
+#include <opm/simulators/utils/gatherDeferredLogger.hpp>
 
 #if HAVE_MPI
 
diff --git a/opm/simulators/gatherDeferredLogger.hpp b/opm/simulators/utils/gatherDeferredLogger.hpp
similarity index 95%
rename from opm/simulators/gatherDeferredLogger.hpp
rename to opm/simulators/utils/gatherDeferredLogger.hpp
index d5564585d..b5a76c227 100644
--- a/opm/simulators/gatherDeferredLogger.hpp
+++ b/opm/simulators/utils/gatherDeferredLogger.hpp
@@ -21,7 +21,7 @@
 #ifndef OPM_GATHERDEFERREDLOGGER_HEADER_INCLUDED
 #define OPM_GATHERDEFERREDLOGGER_HEADER_INCLUDED
 
-#include <opm/simulators/DeferredLogger.hpp>
+#include <opm/simulators/utils/DeferredLogger.hpp>
 
 namespace Opm
 {
diff --git a/opm/autodiff/moduleVersion.cpp b/opm/simulators/utils/moduleVersion.cpp
similarity index 96%
rename from opm/autodiff/moduleVersion.cpp
rename to opm/simulators/utils/moduleVersion.cpp
index 767356b98..91397eddf 100644
--- a/opm/autodiff/moduleVersion.cpp
+++ b/opm/simulators/utils/moduleVersion.cpp
@@ -17,7 +17,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <opm/autodiff/moduleVersion.hpp>
+#include <opm/simulators/utils/moduleVersion.hpp>
 #include "project-version.h"
 
 namespace Opm
diff --git a/opm/autodiff/moduleVersion.hpp b/opm/simulators/utils/moduleVersion.hpp
similarity index 100%
rename from opm/autodiff/moduleVersion.hpp
rename to opm/simulators/utils/moduleVersion.hpp
diff --git a/opm/autodiff/BlackoilWellModel.hpp b/opm/simulators/wells/BlackoilWellModel.hpp
similarity index 96%
rename from opm/autodiff/BlackoilWellModel.hpp
rename to opm/simulators/wells/BlackoilWellModel.hpp
index 59be94b60..556938455 100644
--- a/opm/autodiff/BlackoilWellModel.hpp
+++ b/opm/simulators/wells/BlackoilWellModel.hpp
@@ -39,24 +39,24 @@
 #include <opm/core/wells.h>
 #include <opm/core/wells/WellCollection.hpp>
 #include <opm/core/simulator/SimulatorReport.hpp>
-#include <opm/autodiff/VFPInjProperties.hpp>
-#include <opm/autodiff/VFPProdProperties.hpp>
+#include <opm/simulators/wells/VFPInjProperties.hpp>
+#include <opm/simulators/wells/VFPProdProperties.hpp>
 #include <opm/autodiff/BlackoilDetails.hpp>
-#include <opm/autodiff/WellStateFullyImplicitBlackoil.hpp>
+#include <opm/simulators/wells/WellStateFullyImplicitBlackoil.hpp>
 #include <opm/autodiff/RateConverter.hpp>
-#include <opm/autodiff/WellInterface.hpp>
-#include <opm/autodiff/StandardWell.hpp>
-#include <opm/autodiff/StandardWellV.hpp>
-#include <opm/autodiff/MultisegmentWell.hpp>
+#include <opm/simulators/wells/WellInterface.hpp>
+#include <opm/simulators/wells/StandardWell.hpp>
+#include <opm/simulators/wells/StandardWellV.hpp>
+#include <opm/simulators/wells/MultisegmentWell.hpp>
 #include <opm/simulators/timestepping/gatherConvergenceReport.hpp>
-#include<opm/autodiff/SimFIBODetails.hpp>
-#include<dune/common/fmatrix.hh>
-#include<dune/istl/bcrsmatrix.hh>
-#include<dune/istl/matrixmatrix.hh>
+#include <opm/autodiff/SimFIBODetails.hpp>
+#include <dune/common/fmatrix.hh>
+#include <dune/istl/bcrsmatrix.hh>
+#include <dune/istl/matrixmatrix.hh>
 
 #include <opm/material/densead/Math.hpp>
 
-#include <opm/simulators/DeferredLogger.hpp>
+#include <opm/simulators/utils/DeferredLogger.hpp>
 
 BEGIN_PROPERTIES
 
diff --git a/opm/autodiff/BlackoilWellModel_impl.hpp b/opm/simulators/wells/BlackoilWellModel_impl.hpp
similarity index 99%
rename from opm/autodiff/BlackoilWellModel_impl.hpp
rename to opm/simulators/wells/BlackoilWellModel_impl.hpp
index c2381d339..46ab68436 100644
--- a/opm/autodiff/BlackoilWellModel_impl.hpp
+++ b/opm/simulators/wells/BlackoilWellModel_impl.hpp
@@ -20,7 +20,7 @@
  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <opm/simulators/DeferredLoggingErrorHelpers.hpp>
+#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
 
 namespace Opm {
     template<typename TypeTag>
diff --git a/opm/autodiff/MSWellHelpers.hpp b/opm/simulators/wells/MSWellHelpers.hpp
similarity index 98%
rename from opm/autodiff/MSWellHelpers.hpp
rename to opm/simulators/wells/MSWellHelpers.hpp
index 0586aabc0..84f68f8e1 100644
--- a/opm/autodiff/MSWellHelpers.hpp
+++ b/opm/simulators/wells/MSWellHelpers.hpp
@@ -22,8 +22,8 @@
 #ifndef OPM_MSWELLHELPERS_HEADER_INCLUDED
 #define OPM_MSWELLHELPERS_HEADER_INCLUDED
 
-#include <opm/simulators/DeferredLoggingErrorHelpers.hpp>
-#include <opm/simulators/DeferredLogger.hpp>
+#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
+#include <opm/simulators/utils/DeferredLogger.hpp>
 #include <opm/common/ErrorMacros.hpp>
 #include <dune/istl/solvers.hh>
 #if HAVE_UMFPACK
diff --git a/opm/autodiff/MultisegmentWell.hpp b/opm/simulators/wells/MultisegmentWell.hpp
similarity index 99%
rename from opm/autodiff/MultisegmentWell.hpp
rename to opm/simulators/wells/MultisegmentWell.hpp
index b02863e60..6d5d872e3 100644
--- a/opm/autodiff/MultisegmentWell.hpp
+++ b/opm/simulators/wells/MultisegmentWell.hpp
@@ -23,7 +23,7 @@
 #define OPM_MULTISEGMENTWELL_HEADER_INCLUDED
 
 
-#include <opm/autodiff/WellInterface.hpp>
+#include <opm/simulators/wells/WellInterface.hpp>
 
 namespace Opm
 {
diff --git a/opm/autodiff/MultisegmentWell_impl.hpp b/opm/simulators/wells/MultisegmentWell_impl.hpp
similarity index 99%
rename from opm/autodiff/MultisegmentWell_impl.hpp
rename to opm/simulators/wells/MultisegmentWell_impl.hpp
index 3994e4935..b95dab391 100644
--- a/opm/autodiff/MultisegmentWell_impl.hpp
+++ b/opm/simulators/wells/MultisegmentWell_impl.hpp
@@ -19,8 +19,8 @@
 */
 
 
-#include <opm/autodiff/MSWellHelpers.hpp>
-#include <opm/simulators/DeferredLoggingErrorHelpers.hpp>
+#include <opm/simulators/wells/MSWellHelpers.hpp>
+#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
 
 namespace Opm
 {
diff --git a/opm/autodiff/StandardWell.hpp b/opm/simulators/wells/StandardWell.hpp
similarity index 99%
rename from opm/autodiff/StandardWell.hpp
rename to opm/simulators/wells/StandardWell.hpp
index 1625e59d8..db773f809 100644
--- a/opm/autodiff/StandardWell.hpp
+++ b/opm/simulators/wells/StandardWell.hpp
@@ -24,8 +24,8 @@
 #define OPM_STANDARDWELL_HEADER_INCLUDED
 
 
-#include <opm/autodiff/WellInterface.hpp>
-#include <opm/autodiff/ISTLSolverEbos.hpp>
+#include <opm/simulators/wells/WellInterface.hpp>
+#include <opm/simulators/linalg/ISTLSolverEbos.hpp>
 #include <opm/autodiff/RateConverter.hpp>
 
 namespace Opm
diff --git a/opm/autodiff/StandardWellV.hpp b/opm/simulators/wells/StandardWellV.hpp
similarity index 99%
rename from opm/autodiff/StandardWellV.hpp
rename to opm/simulators/wells/StandardWellV.hpp
index 0ed849f1a..061dc6959 100644
--- a/opm/autodiff/StandardWellV.hpp
+++ b/opm/simulators/wells/StandardWellV.hpp
@@ -24,8 +24,8 @@
 #define OPM_STANDARDWELLV_HEADER_INCLUDED
 
 
-#include <opm/autodiff/WellInterface.hpp>
-#include <opm/autodiff/ISTLSolverEbos.hpp>
+#include <opm/simulators/wells/WellInterface.hpp>
+#include <opm/simulators/linalg/ISTLSolverEbos.hpp>
 #include <opm/autodiff/RateConverter.hpp>
 
 #include <opm/material/densead/DynamicEvaluation.hpp>
diff --git a/opm/autodiff/StandardWellV_impl.hpp b/opm/simulators/wells/StandardWellV_impl.hpp
similarity index 99%
rename from opm/autodiff/StandardWellV_impl.hpp
rename to opm/simulators/wells/StandardWellV_impl.hpp
index 3c037881e..66e30c44b 100644
--- a/opm/autodiff/StandardWellV_impl.hpp
+++ b/opm/simulators/wells/StandardWellV_impl.hpp
@@ -19,7 +19,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <opm/simulators/DeferredLoggingErrorHelpers.hpp>
+#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
 
 namespace Opm
 {
diff --git a/opm/autodiff/StandardWell_impl.hpp b/opm/simulators/wells/StandardWell_impl.hpp
similarity index 99%
rename from opm/autodiff/StandardWell_impl.hpp
rename to opm/simulators/wells/StandardWell_impl.hpp
index 3bf520a0c..c72d99166 100644
--- a/opm/autodiff/StandardWell_impl.hpp
+++ b/opm/simulators/wells/StandardWell_impl.hpp
@@ -19,7 +19,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <opm/simulators/DeferredLoggingErrorHelpers.hpp>
+#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
 
 namespace Opm
 {
diff --git a/opm/autodiff/VFPHelpers.hpp b/opm/simulators/wells/VFPHelpers.hpp
similarity index 100%
rename from opm/autodiff/VFPHelpers.hpp
rename to opm/simulators/wells/VFPHelpers.hpp
diff --git a/opm/autodiff/VFPInjProperties.cpp b/opm/simulators/wells/VFPInjProperties.cpp
similarity index 96%
rename from opm/autodiff/VFPInjProperties.cpp
rename to opm/simulators/wells/VFPInjProperties.cpp
index 8d364e8dd..4ccd6b56b 100644
--- a/opm/autodiff/VFPInjProperties.cpp
+++ b/opm/simulators/wells/VFPInjProperties.cpp
@@ -23,11 +23,11 @@
 
 #include "config.h"
 
-#include <opm/autodiff/VFPInjProperties.hpp>
+#include <opm/simulators/wells/VFPInjProperties.hpp>
 #include <opm/core/props/BlackoilPhases.hpp>
 #include <opm/common/ErrorMacros.hpp>
 
-#include <opm/autodiff/VFPHelpers.hpp>
+#include <opm/simulators/wells/VFPHelpers.hpp>
 
 namespace Opm {
 
diff --git a/opm/autodiff/VFPInjProperties.hpp b/opm/simulators/wells/VFPInjProperties.hpp
similarity index 99%
rename from opm/autodiff/VFPInjProperties.hpp
rename to opm/simulators/wells/VFPInjProperties.hpp
index 44448b26f..f3021c94d 100644
--- a/opm/autodiff/VFPInjProperties.hpp
+++ b/opm/simulators/wells/VFPInjProperties.hpp
@@ -24,7 +24,7 @@
 #include <opm/core/wells.h>
 #include <opm/material/densead/Math.hpp>
 #include <opm/material/densead/Evaluation.hpp>
-#include <opm/autodiff/VFPHelpers.hpp>
+#include <opm/simulators/wells/VFPHelpers.hpp>
 
 #include <vector>
 #include <map>
diff --git a/opm/autodiff/VFPProdProperties.cpp b/opm/simulators/wells/VFPProdProperties.cpp
similarity index 99%
rename from opm/autodiff/VFPProdProperties.cpp
rename to opm/simulators/wells/VFPProdProperties.cpp
index 89c85adfb..a83b67afb 100644
--- a/opm/autodiff/VFPProdProperties.cpp
+++ b/opm/simulators/wells/VFPProdProperties.cpp
@@ -19,12 +19,12 @@
 
 #include "config.h"
 
-#include <opm/autodiff/VFPProdProperties.hpp>
+#include <opm/simulators/wells/VFPProdProperties.hpp>
 #include <opm/core/props/BlackoilPhases.hpp>
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/material/densead/Math.hpp>
 #include <opm/material/densead/Evaluation.hpp>
-#include <opm/autodiff/VFPHelpers.hpp>
+#include <opm/simulators/wells/VFPHelpers.hpp>
 
 
 
diff --git a/opm/autodiff/VFPProdProperties.hpp b/opm/simulators/wells/VFPProdProperties.hpp
similarity index 99%
rename from opm/autodiff/VFPProdProperties.hpp
rename to opm/simulators/wells/VFPProdProperties.hpp
index 0e0aeedf1..f66c34d6c 100644
--- a/opm/autodiff/VFPProdProperties.hpp
+++ b/opm/simulators/wells/VFPProdProperties.hpp
@@ -24,7 +24,7 @@
 #include <opm/core/wells.h>
 #include <opm/material/densead/Math.hpp>
 #include <opm/material/densead/Evaluation.hpp>
-#include <opm/autodiff/VFPHelpers.hpp>
+#include <opm/simulators/wells/VFPHelpers.hpp>
 
 #include <vector>
 #include <map>
diff --git a/opm/autodiff/VFPProperties.hpp b/opm/simulators/wells/VFPProperties.hpp
similarity index 100%
rename from opm/autodiff/VFPProperties.hpp
rename to opm/simulators/wells/VFPProperties.hpp
diff --git a/opm/autodiff/WellConnectionAuxiliaryModule.hpp b/opm/simulators/wells/WellConnectionAuxiliaryModule.hpp
similarity index 100%
rename from opm/autodiff/WellConnectionAuxiliaryModule.hpp
rename to opm/simulators/wells/WellConnectionAuxiliaryModule.hpp
diff --git a/opm/autodiff/WellHelpers.hpp b/opm/simulators/wells/WellHelpers.hpp
similarity index 100%
rename from opm/autodiff/WellHelpers.hpp
rename to opm/simulators/wells/WellHelpers.hpp
diff --git a/opm/autodiff/WellInterface.hpp b/opm/simulators/wells/WellInterface.hpp
similarity index 98%
rename from opm/autodiff/WellInterface.hpp
rename to opm/simulators/wells/WellInterface.hpp
index 9f67c9aa7..0dd8608a1 100644
--- a/opm/autodiff/WellInterface.hpp
+++ b/opm/simulators/wells/WellInterface.hpp
@@ -38,14 +38,14 @@
 #include <opm/core/wells/WellsManager.hpp>
 #include <opm/core/simulator/SimulatorReport.hpp>
 
-#include <opm/autodiff/VFPProperties.hpp>
-#include <opm/autodiff/WellHelpers.hpp>
-#include <opm/autodiff/WellStateFullyImplicitBlackoil.hpp>
+#include <opm/simulators/wells/VFPProperties.hpp>
+#include <opm/simulators/wells/WellHelpers.hpp>
+#include <opm/simulators/wells/WellStateFullyImplicitBlackoil.hpp>
 #include <opm/autodiff/BlackoilModelParametersEbos.hpp>
 #include <opm/autodiff/RateConverter.hpp>
 
 #include <opm/simulators/timestepping/ConvergenceReport.hpp>
-#include <opm/simulators/DeferredLogger.hpp>
+#include <opm/simulators/utils/DeferredLogger.hpp>
 
 #include <ewoms/models/blackoil/blackoilpolymermodules.hh>
 #include <ewoms/models/blackoil/blackoilsolventmodules.hh>
diff --git a/opm/autodiff/WellInterface_impl.hpp b/opm/simulators/wells/WellInterface_impl.hpp
similarity index 99%
rename from opm/autodiff/WellInterface_impl.hpp
rename to opm/simulators/wells/WellInterface_impl.hpp
index 5a0b844e3..ffc198507 100644
--- a/opm/autodiff/WellInterface_impl.hpp
+++ b/opm/simulators/wells/WellInterface_impl.hpp
@@ -19,7 +19,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <opm/simulators/DeferredLoggingErrorHelpers.hpp>
+#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
 
 namespace Opm
 {
diff --git a/opm/autodiff/WellStateFullyImplicitBlackoil.hpp b/opm/simulators/wells/WellStateFullyImplicitBlackoil.hpp
similarity index 100%
rename from opm/autodiff/WellStateFullyImplicitBlackoil.hpp
rename to opm/simulators/wells/WellStateFullyImplicitBlackoil.hpp
diff --git a/tests/test_blackoil_amg.cpp b/tests/test_blackoil_amg.cpp
index 298425341..44461ced5 100644
--- a/tests/test_blackoil_amg.cpp
+++ b/tests/test_blackoil_amg.cpp
@@ -21,7 +21,7 @@
 #define BOOST_TEST_MODULE BlackoilAmgTest
 #define BOOST_TEST_NO_MAIN
 #include <boost/test/unit_test.hpp>
-#include <opm/autodiff/BlackoilAmg.hpp>
+#include <opm/simulators/linalg/BlackoilAmg.hpp>
 
 #include <dune/common/parallel/mpihelper.hh>
 #include <dune/common/fmatrix.hh>
diff --git a/tests/test_deferredlogger.cpp b/tests/test_deferredlogger.cpp
index 10954615f..13634b695 100644
--- a/tests/test_deferredlogger.cpp
+++ b/tests/test_deferredlogger.cpp
@@ -24,7 +24,7 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include "opm/simulators/DeferredLogger.hpp"
+#include <opm/simulators/utils/DeferredLogger.hpp>
 
 #include <opm/common/OpmLog/OpmLog.hpp>
 #include <opm/common/OpmLog/LogBackend.hpp>
diff --git a/tests/test_gatherdeferredlogger.cpp b/tests/test_gatherdeferredlogger.cpp
index 2268fbd65..ec858717f 100644
--- a/tests/test_gatherdeferredlogger.cpp
+++ b/tests/test_gatherdeferredlogger.cpp
@@ -25,7 +25,7 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include <opm/simulators/gatherDeferredLogger.hpp>
+#include <opm/simulators/utils/gatherDeferredLogger.hpp>
 #include <dune/common/parallel/mpihelper.hh>
 
 #include <opm/common/OpmLog/OpmLog.hpp>
diff --git a/tests/test_graphcoloring.cpp b/tests/test_graphcoloring.cpp
index 22b2d34dd..c05a60741 100644
--- a/tests/test_graphcoloring.cpp
+++ b/tests/test_graphcoloring.cpp
@@ -4,7 +4,7 @@
 #include <dune/istl/bcrsmatrix.hh>
 #include <dune/istl/paamg/graph.hh>
 
-#include <opm/autodiff/GraphColoring.hpp>
+#include <opm/simulators/linalg/GraphColoring.hpp>
 
 #define BOOST_TEST_MODULE GraphColoringTest
 #define BOOST_TEST_MAIN
diff --git a/tests/test_invert.cpp b/tests/test_invert.cpp
index 3ea71ba93..5a339968b 100644
--- a/tests/test_invert.cpp
+++ b/tests/test_invert.cpp
@@ -21,7 +21,7 @@
 
 #define BOOST_TEST_MODULE InvertSpecializationTest
 #include <boost/test/unit_test.hpp>
-#include <opm/autodiff/MatrixBlock.hpp>
+#include <opm/simulators/linalg/MatrixBlock.hpp>
 
 
 void checkIdentity(Dune::FieldMatrix<double, 4, 4> M) {
diff --git a/tests/test_milu.cpp b/tests/test_milu.cpp
index 4c3ebda73..90415c1b5 100644
--- a/tests/test_milu.cpp
+++ b/tests/test_milu.cpp
@@ -9,7 +9,7 @@
 #include<dune/istl/bvector.hh>
 #include<dune/common/fmatrix.hh>
 #include<dune/common/fvector.hh>
-#include<opm/autodiff/ParallelOverlappingILU0.hpp>
+#include<opm/simulators/linalg/ParallelOverlappingILU0.hpp>
 
 #include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
diff --git a/tests/test_multmatrixtransposed.cpp b/tests/test_multmatrixtransposed.cpp
index 0095a3c30..8564c1362 100644
--- a/tests/test_multmatrixtransposed.cpp
+++ b/tests/test_multmatrixtransposed.cpp
@@ -21,7 +21,7 @@
 
 #define BOOST_TEST_MODULE MultMatrixTransposed
 #include <boost/test/unit_test.hpp>
-#include <opm/autodiff/MatrixBlock.hpp>
+#include <opm/simulators/linalg/MatrixBlock.hpp>
 
 using namespace Dune;
 using namespace Opm::Detail;
diff --git a/tests/test_parallelistlinformation.cpp b/tests/test_parallelistlinformation.cpp
index 8785d29b7..cde384da6 100644
--- a/tests/test_parallelistlinformation.cpp
+++ b/tests/test_parallelistlinformation.cpp
@@ -26,7 +26,7 @@
 #define BOOST_TEST_MODULE OPM-ParallelIstlInformation
 #include <boost/test/unit_test.hpp>
 #include "DuneIstlTestHelpers.hpp"
-#include <opm/core/linalg/ParallelIstlInformation.hpp>
+#include <opm/simulators/linalg/ParallelIstlInformation.hpp>
 #include <functional>
 #ifdef HAVE_DUNE_ISTL
 
diff --git a/tests/test_vfpproperties.cpp b/tests/test_vfpproperties.cpp
index 343d6815b..f3e923406 100644
--- a/tests/test_vfpproperties.cpp
+++ b/tests/test_vfpproperties.cpp
@@ -41,8 +41,8 @@
 #include <opm/parser/eclipse/EclipseState/Schedule/VFPProdTable.hpp>
 #include <opm/parser/eclipse/Units/UnitSystem.hpp>
 
-#include <opm/autodiff/VFPHelpers.hpp>
-#include <opm/autodiff/VFPProdProperties.hpp>
+#include <opm/simulators/wells/VFPHelpers.hpp>
+#include <opm/simulators/wells/VFPProdProperties.hpp>
 
 
 
diff --git a/tests/test_wellmodel.cpp b/tests/test_wellmodel.cpp
index 8d9a4b985..95846f208 100644
--- a/tests/test_wellmodel.cpp
+++ b/tests/test_wellmodel.cpp
@@ -49,8 +49,8 @@
 #include <ebos/eclproblem.hh>
 #include <ewoms/common/start.hh>
 
-#include <opm/autodiff/StandardWell.hpp>
-#include <opm/autodiff/BlackoilWellModel.hpp>
+#include <opm/simulators/wells/StandardWell.hpp>
+#include <opm/simulators/wells/BlackoilWellModel.hpp>
 
 #if HAVE_DUNE_FEM
 #include <dune/fem/misc/mpimanager.hh>
diff --git a/tests/test_wellstatefullyimplicitblackoil.cpp b/tests/test_wellstatefullyimplicitblackoil.cpp
index 3694f100e..92087b378 100644
--- a/tests/test_wellstatefullyimplicitblackoil.cpp
+++ b/tests/test_wellstatefullyimplicitblackoil.cpp
@@ -21,7 +21,7 @@
 
 #define BOOST_TEST_MODULE WellStateFIBOTest
 
-#include <opm/autodiff/WellStateFullyImplicitBlackoil.hpp>
+#include <opm/simulators/wells/WellStateFullyImplicitBlackoil.hpp>
 
 #include <boost/test/unit_test.hpp>