diff --git a/lecture/efm/1p2c_2p_2p2c/lens1p2cproblem.hh b/lecture/efm/1p2c_2p_2p2c/lens1p2cproblem.hh
index f13255ca5ca9cb96c596d9fbd75fa98a47cb6cb0..0f61b5e35fe897a1276ffcbf99319728fc6517d5 100644
--- a/lecture/efm/1p2c_2p_2p2c/lens1p2cproblem.hh
+++ b/lecture/efm/1p2c_2p_2p2c/lens1p2cproblem.hh
@@ -25,9 +25,9 @@
 #ifndef DUMUX_LENS_1P2C_PROBLEM_HH
 #define DUMUX_LENS_1P2C_PROBLEM_HH
 
-#include <dumux/implicit/1p2c/1p2cmodel.hh>
-#include <dumux/implicit/common/implicitporousmediaproblem.hh>
-#include <dumux/material/fluidsystems/h2on2fluidsystem.hh>
+#include <dumux/porousmediumflow/1p2c/implicit/model.hh>
+#include <dumux/porousmediumflow/implicit/problem.hh>
+#include <dumux/material/fluidsystems/h2on2.hh>
 
 #include "lens1p2cspatialparams.hh"
 
diff --git a/lecture/efm/1p2c_2p_2p2c/lens1p2cspatialparams.hh b/lecture/efm/1p2c_2p_2p2c/lens1p2cspatialparams.hh
index bdad1b1f3ea5725297bcc8907bd6c40e63349d2c..6cbcd50a3fd2404352b5cbced0308bce61d93291 100644
--- a/lecture/efm/1p2c_2p_2p2c/lens1p2cspatialparams.hh
+++ b/lecture/efm/1p2c_2p_2p2c/lens1p2cspatialparams.hh
@@ -19,8 +19,8 @@
 #ifndef DUMUX_1P2C_SPATIALPARAMS_HH
 #define DUMUX_1P2C_SPATIALPARAMS_HH
 
-#include <dumux/material/spatialparams/implicitspatialparams1p.hh>
-#include <dumux/implicit/1p2c/1p2cmodel.hh>
+#include <dumux/material/spatialparams/implicit1p.hh>
+#include <dumux/porousmediumflow/1p2c/implicit/model.hh>
 
 /**
  * @file
diff --git a/lecture/efm/1p2c_2p_2p2c/lens2p2cproblem.hh b/lecture/efm/1p2c_2p_2p2c/lens2p2cproblem.hh
index 717d07999d182b9969aea4c6ed1924ddccee7d48..73c6b248fb696642bfd2176bb0339141eb709206 100644
--- a/lecture/efm/1p2c_2p_2p2c/lens2p2cproblem.hh
+++ b/lecture/efm/1p2c_2p_2p2c/lens2p2cproblem.hh
@@ -25,9 +25,9 @@
 #ifndef DUMUX_LENS_2P2C_PROBLEM_HH
 #define DUMUX_LENS_2P2C_PROBLEM_HH
 
-#include <dumux/implicit/2p2c/2p2cmodel.hh>
-#include <dumux/implicit/common/implicitporousmediaproblem.hh>
-#include <dumux/material/fluidsystems/h2on2fluidsystem.hh>
+#include <dumux/porousmediumflow/2p2c/implicit/model.hh>
+#include <dumux/porousmediumflow/implicit/problem.hh>
+#include <dumux/material/fluidsystems/h2on2.hh>
 
 #include "lens2pspatialparams.hh"
 
diff --git a/lecture/efm/1p2c_2p_2p2c/lens2pproblem.hh b/lecture/efm/1p2c_2p_2p2c/lens2pproblem.hh
index 6ce52bf62b5ea5dd594ef25785573f7b954c6a87..ec786d9780cff451f7b3ad84087c1af5fe4e7654 100644
--- a/lecture/efm/1p2c_2p_2p2c/lens2pproblem.hh
+++ b/lecture/efm/1p2c_2p_2p2c/lens2pproblem.hh
@@ -25,13 +25,13 @@
 #ifndef DUMUX_LENS2P_PROBLEM_HH
 #define DUMUX_LENS2P_PROBLEM_HH
 
-#include <dumux/implicit/2p/2pmodel.hh>
-#include <dumux/implicit/common/implicitporousmediaproblem.hh>
+#include <dumux/porousmediumflow/2p/implicit/model.hh>
+#include <dumux/porousmediumflow/implicit/problem.hh>
 #include <dumux/material/components/h2o.hh>
 #include <dumux/material/components/n2.hh>
 #include <dumux/material/fluidsystems/liquidphase.hh>
 #include <dumux/material/fluidsystems/gasphase.hh>
-#include <dumux/material/fluidsystems/2pimmisciblefluidsystem.hh>
+#include <dumux/material/fluidsystems/2pimmiscible.hh>
 
 #include "lens2pspatialparams.hh"
 
diff --git a/lecture/efm/1p2c_2p_2p2c/lens2pspatialparams.hh b/lecture/efm/1p2c_2p_2p2c/lens2pspatialparams.hh
index 6482e4a591a156e8bab18b0c576474babcae0471..6beb35cb512e5adf42e7f8e17eac732a51d7b115 100644
--- a/lecture/efm/1p2c_2p_2p2c/lens2pspatialparams.hh
+++ b/lecture/efm/1p2c_2p_2p2c/lens2pspatialparams.hh
@@ -26,7 +26,7 @@
 #ifndef DUMUX_LENS2P_SPATIALPARAMS_HH
 #define DUMUX_LENS2P_SPATIALPARAMS_HH
 
-#include <dumux/material/spatialparams/implicitspatialparams.hh>
+#include <dumux/material/spatialparams/implicit.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
diff --git a/lecture/efm/1p2cvs2p/lens1p2cproblem.hh b/lecture/efm/1p2cvs2p/lens1p2cproblem.hh
index 61af1c74aa3f1c5a6b0a81d269e4f7f9b92bb517..2eddc55c85c27471fc2ee7887c2fbc306929c2a6 100644
--- a/lecture/efm/1p2cvs2p/lens1p2cproblem.hh
+++ b/lecture/efm/1p2cvs2p/lens1p2cproblem.hh
@@ -25,9 +25,9 @@
 #ifndef DUMUX_LENS_1P2C_PROBLEM_HH
 #define DUMUX_LENS_1P2C_PROBLEM_HH
 
-#include <dumux/implicit/1p2c/1p2cmodel.hh>
-#include <dumux/implicit/common/implicitporousmediaproblem.hh>
-#include <dumux/material/fluidsystems/h2on2liquidphasefluidsystem.hh>
+#include <dumux/porousmediumflow/1p2c/implicit/model.hh>
+#include <dumux/porousmediumflow/implicit/problem.hh>
+#include <dumux/material/fluidsystems/h2on2liquidphase.hh>
 
 #include "../1p2c_2p_2p2c/lens1p2cspatialparams.hh"
 
diff --git a/lecture/efm/1p2cvs2p/lens2pproblem.hh b/lecture/efm/1p2cvs2p/lens2pproblem.hh
index 14c623db6b884f565202995b17a9488e78df3da8..1158eb493534e7dc0c9ed7c2092edb703d0f56d0 100644
--- a/lecture/efm/1p2cvs2p/lens2pproblem.hh
+++ b/lecture/efm/1p2cvs2p/lens2pproblem.hh
@@ -25,8 +25,8 @@
 #ifndef DUMUX_LENS2P_PROBLEM_HH
 #define DUMUX_LENS2P_PROBLEM_HH
 
-#include <dumux/implicit/2p/2pmodel.hh>
-#include <dumux/implicit/common/implicitporousmediaproblem.hh>
+#include <dumux/porousmediumflow/2p/implicit/model.hh>
+#include <dumux/porousmediumflow/implicit/problem.hh>
 #include <dumux/material/components/simpleh2o.hh>
 #include <dumux/material/components/dnapl.hh>
 #include <dumux/material/fluidsystems/liquidphase.hh>
diff --git a/lecture/efm/2p/lens2pproblem.hh b/lecture/efm/2p/lens2pproblem.hh
index c01d32b2e3fa40ad63ff06969e0707184929984b..347936cf49dfc2c3cd3722d3f77d1a12f2096dd2 100644
--- a/lecture/efm/2p/lens2pproblem.hh
+++ b/lecture/efm/2p/lens2pproblem.hh
@@ -25,12 +25,12 @@
 #ifndef DUMUX_LENS2P_PROBLEM_HH
 #define DUMUX_LENS2P_PROBLEM_HH
 
-#include <dumux/implicit/2p/2pmodel.hh>
-#include <dumux/implicit/common/implicitporousmediaproblem.hh>
+#include <dumux/porousmediumflow/2p/implicit/model.hh>
+#include <dumux/porousmediumflow/implicit/problem.hh>
 #include <dumux/material/components/simpleh2o.hh>
 #include <dumux/material/components/dnapl.hh>
 #include <dumux/material/fluidsystems/liquidphase.hh>
-#include <dumux/material/fluidsystems/2pimmisciblefluidsystem.hh>
+#include <dumux/material/fluidsystems/2pimmiscible.hh>
 
 #include "../1p2c_2p_2p2c/lens2pspatialparams.hh"
 
diff --git a/lecture/mhs/groundwater/groundwaterproblem.hh b/lecture/mhs/groundwater/groundwaterproblem.hh
index dd100bda3b8ec0a50c6a094a31ff0f11e77e8600..833732a4203b889e162771bc244f0bd828124591 100644
--- a/lecture/mhs/groundwater/groundwaterproblem.hh
+++ b/lecture/mhs/groundwater/groundwaterproblem.hh
@@ -24,9 +24,9 @@
 
 #include <cmath>
 
-#include <dumux/decoupled/1p/diffusion/fv/fvpressureproperties1p.hh>
-#include <dumux/decoupled/1p/diffusion/diffusionproblem1p.hh>
-#include <dumux/decoupled/common/fv/fvvelocity.hh>
+#include <dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/pressureproperties.hh>
+#include <dumux/porousmediumflow/1p/sequential/diffusion/problem.hh>
+#include <dumux/porousmediumflow/sequential/cellcentered/velocity.hh>
 #include <dumux/material/fluidsystems/liquidphase.hh>
 
 #include <lecture/mm/buckleyleverett/pseudoh2o.hh>
diff --git a/lecture/mhs/groundwater/groundwaterspatialparams.hh b/lecture/mhs/groundwater/groundwaterspatialparams.hh
index ded95546f064c5081934ab0693bf9f8c96db1378..52c2444660b5a10b8ca402bdd7cf94d1b8b606ef 100644
--- a/lecture/mhs/groundwater/groundwaterspatialparams.hh
+++ b/lecture/mhs/groundwater/groundwaterspatialparams.hh
@@ -22,7 +22,7 @@
 #ifndef DUMUX_LECTURE_MHS_GROUNDWATER_SPATIALPARAMS_HH
 #define DUMUX_LECTURE_MHS_GROUNDWATER_SPATIALPARAMS_HH
 
-#include <dumux/material/spatialparams/fvspatialparams1p.hh>
+#include <dumux/material/spatialparams/fv1p.hh>
 
 namespace Dumux
 {
diff --git a/lecture/mm/buckleyleverett/buckleyleverettanalyticsolution.hh b/lecture/mm/buckleyleverett/buckleyleverettanalyticsolution.hh
index 125973d85be364012b8d64e6caf1fc71dd6ff405..b80a6a537871cc915e0acad0d55fd7f2ad58631f 100644
--- a/lecture/mm/buckleyleverett/buckleyleverettanalyticsolution.hh
+++ b/lecture/mm/buckleyleverett/buckleyleverettanalyticsolution.hh
@@ -19,7 +19,7 @@
 #ifndef DUMUX_BUCKLEYLEVERETT_ANALYTICAL_HH
 #define DUMUX_BUCKLEYLEVERETT_ANALYTICAL_HH
 
-#include <dumux/decoupled/2p/2pproperties.hh>
+#include <dumux/porousmediumflow/2p/sequential/properties.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
 
diff --git a/lecture/mm/buckleyleverett/buckleyleverettproblem.hh b/lecture/mm/buckleyleverett/buckleyleverettproblem.hh
index 50715a04ef6746bc1fba0fafb983d5c564299f1c..7a92444e2673b5e7a441766c31cb243c66a01258 100644
--- a/lecture/mm/buckleyleverett/buckleyleverettproblem.hh
+++ b/lecture/mm/buckleyleverett/buckleyleverettproblem.hh
@@ -22,10 +22,10 @@
 #include <dune/common/exceptions.hh>
 
 #include <dumux/material/fluidsystems/liquidphase.hh>
-#include <dumux/decoupled/2p/diffusion/fv/fvpressureproperties2p.hh>
-#include <dumux/decoupled/2p/transport/fv/fvtransportproperties2p.hh>
-#include <dumux/decoupled/2p/transport/fv/evalcflfluxcoats.hh>
-#include <dumux/decoupled/2p/impes/impesproblem2p.hh>
+#include <dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressureproperties.hh>
+#include <dumux/porousmediumflow/2p/sequential/transport/cellcentered/properties.hh>
+#include <dumux/porousmediumflow/2p/sequential/transport/cellcentered/evalcflfluxcoats.hh>
+#include <dumux/porousmediumflow/2p/sequential/impes/problem.hh>
 
 //pseudo-oil and h2o have to be used to make viscosity and density input parameters
 #include "pseudooil.hh"
diff --git a/lecture/mm/buckleyleverett/buckleyleverettspatialparams.hh b/lecture/mm/buckleyleverett/buckleyleverettspatialparams.hh
index 360b34d4631e3d9c73254d2b9e68547f1bebe1ad..3b759093db5e768447235766f2a49e9eafd3835f 100644
--- a/lecture/mm/buckleyleverett/buckleyleverettspatialparams.hh
+++ b/lecture/mm/buckleyleverett/buckleyleverettspatialparams.hh
@@ -19,7 +19,7 @@
 #ifndef BUCKLEYLEVERETT_SPATIALPARAMS_HH
 #define BUCKLEYLEVERETT_SPATIALPARAMS_HH
 
-#include <dumux/material/spatialparams/fvspatialparams.hh>
+#include <dumux/material/spatialparams/fv.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
diff --git a/lecture/mm/co2plume/co2plumeshapeproblem.hh b/lecture/mm/co2plume/co2plumeshapeproblem.hh
index 39f8102107e6b1cd91d908dddd9d51ba6a500250..0630dc836988e63f6958f266a2e07905fe75fc65 100644
--- a/lecture/mm/co2plume/co2plumeshapeproblem.hh
+++ b/lecture/mm/co2plume/co2plumeshapeproblem.hh
@@ -28,11 +28,11 @@
 
 //#define PI 3.14159
 
-#include <dumux/implicit/co2/co2model.hh>
-#include <dumux/implicit/co2/co2volumevariables.hh>
-#include <dumux/material/fluidsystems/brineco2fluidsystem.hh>
+#include <dumux/porousmediumflow/co2/implicit/model.hh>
+#include <dumux/porousmediumflow/co2/implicit/volumevariables.hh>
+#include <dumux/material/fluidsystems/brineco2.hh>
 #include <dumux/material/components/co2.hh>
-#include <dumux/implicit/common/implicitporousmediaproblem.hh>
+#include <dumux/porousmediumflow/implicit/problem.hh>
 #include <dumux/implicit/box/intersectiontovertexbc.hh>
 
 
diff --git a/lecture/mm/co2plume/co2plumeshapespatialparameters.hh b/lecture/mm/co2plume/co2plumeshapespatialparameters.hh
index 26607ff92d6edc8ce00cb9dcddd0113b89bd8df7..06175ab56f765d781402b7b1f846ae6a15ff25b5 100644
--- a/lecture/mm/co2plume/co2plumeshapespatialparameters.hh
+++ b/lecture/mm/co2plume/co2plumeshapespatialparameters.hh
@@ -19,12 +19,12 @@
 #ifndef CO2_PLUMESHAPE_SPATIALPARAMETERS_HH_
 #define CO2_PLUMESHAPE_SPATIALPARAMETERS_HH_
 
-#include <dumux/material/spatialparams/implicitspatialparams.hh>
+#include <dumux/material/spatialparams/implicit.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
 
-#include <dumux/implicit/co2/co2model.hh>
+#include <dumux/porousmediumflow/co2/implicit/model.hh>
 
 namespace Dumux
 {
diff --git a/lecture/mm/columnxylene/columnxyleneproblem.hh b/lecture/mm/columnxylene/columnxyleneproblem.hh
index bf71296fc0e1eacb9449df9f0e08ab32c6d50604..34a2a10fea52f4d334bb11ae73e27e1a95562160 100644
--- a/lecture/mm/columnxylene/columnxyleneproblem.hh
+++ b/lecture/mm/columnxylene/columnxyleneproblem.hh
@@ -26,10 +26,10 @@
 #ifndef DUMUX_COLUMNXYLENEPROBLEM_HH
 #define DUMUX_COLUMNXYLENEPROBLEM_HH
 
-#include <dumux/material/fluidsystems/h2oairxylenefluidsystem.hh>
+#include <dumux/material/fluidsystems/h2oairxylene.hh>
 
-#include <dumux/implicit/3p3c/3p3cmodel.hh>
-#include <dumux/implicit/common/implicitporousmediaproblem.hh>
+#include <dumux/porousmediumflow/3p3c/implicit/model.hh>
+#include <dumux/porousmediumflow/implicit/problem.hh>
 
 //#include <dumux/common/deprecated.hh>
 
diff --git a/lecture/mm/columnxylene/columnxyleneproblem2.hh b/lecture/mm/columnxylene/columnxyleneproblem2.hh
index c7e01c64cb07d977b21a5164c105bccad29c3861..060c8ec23b02f4000313e604ce613a3a721bbd1a 100644
--- a/lecture/mm/columnxylene/columnxyleneproblem2.hh
+++ b/lecture/mm/columnxylene/columnxyleneproblem2.hh
@@ -29,10 +29,10 @@
 #ifndef DUMUX_COLUMNXYLENEPROBLEM_HH
 #define DUMUX_COLUMNXYLENEPROBLEM_HH
 
-#include <dumux/material/fluidsystems/h2oairxylenefluidsystem.hh>
+#include <dumux/material/fluidsystems/h2oairxylene.hh>
 
-#include <dumux/implicit/3p3c/3p3cmodel.hh>
-#include <dumux/implicit/common/implicitporousmediaproblem.hh>
+#include <dumux/porousmediumflow/3p3c/implicit/model.hh>
+#include <dumux/porousmediumflow/implicit/problem.hh>
 
 //#include <dumux/common/deprecated.hh>
 
diff --git a/lecture/mm/columnxylene/columnxylenespatialparams.hh b/lecture/mm/columnxylene/columnxylenespatialparams.hh
index efe90df021dfc1e9a0e312da9f98c0773fff39f6..f129031e46026a0f928cfa89b537891e97a609dc 100644
--- a/lecture/mm/columnxylene/columnxylenespatialparams.hh
+++ b/lecture/mm/columnxylene/columnxylenespatialparams.hh
@@ -24,8 +24,8 @@
 #ifndef DUMUX_COLUMNXYLENE_SPATIAL_PARAMS_HH
 #define DUMUX_COLUMNXYLENE_SPATIAL_PARAMS_HH
 
-#include <dumux/implicit/3p3c/3p3cindices.hh>
-#include <dumux/material/spatialparams/implicitspatialparams.hh>
+#include <dumux/porousmediumflow/3p3c/implicit/indices.hh>
+#include <dumux/material/spatialparams/implicit.hh>
 #include <dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3p.hh>
 #include <dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3pparams.hh>
 #include <dumux/material/fluidmatrixinteractions/3p/efftoabslaw.hh>
diff --git a/lecture/mm/columnxylene/columnxylenespatialparams2.hh b/lecture/mm/columnxylene/columnxylenespatialparams2.hh
index 663a051342a1ad08b5dd7034f0c2e4f943f620a5..25b22939284f9cbaf11f9cf45ec6a09e6f2aebca 100644
--- a/lecture/mm/columnxylene/columnxylenespatialparams2.hh
+++ b/lecture/mm/columnxylene/columnxylenespatialparams2.hh
@@ -29,8 +29,8 @@
 #ifndef DUMUX_COLUMNXYLENE_SPATIAL_PARAMS_HH
 #define DUMUX_COLUMNXYLENE_SPATIAL_PARAMS_HH
 
-#include <dumux/implicit/3p3c/3p3cindices.hh>
-#include <dumux/material/spatialparams/implicitspatialparams.hh>
+#include <dumux/porousmediumflow/3p3c/implicit/indices.hh>
+#include <dumux/material/spatialparams/implicit.hh>
 #include <dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3p.hh>
 #include <dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3pparams.hh>
 #include <dumux/material/fluidmatrixinteractions/3p/efftoabslaw.hh>
diff --git a/lecture/mm/convectivemixing/convmixproblem.hh b/lecture/mm/convectivemixing/convmixproblem.hh
index d5cac0bb26aae7ff7dd388cb44fbbed83404cbc5..691eb4a1170c98fce973d4f119c8fbe008469662 100644
--- a/lecture/mm/convectivemixing/convmixproblem.hh
+++ b/lecture/mm/convectivemixing/convmixproblem.hh
@@ -19,10 +19,10 @@
 #ifndef DUMUX_CONVECTIVE_MIXING_PROBLEM_HH
 #define DUMUX_CONVECTIVE_MIXING_PROBLEM_HH
 
-#include <dumux/implicit/1p2c/1p2cmodel.hh>
-#include <dumux/implicit/common/implicitporousmediaproblem.hh>
+#include <dumux/porousmediumflow/1p2c/implicit/model.hh>
+#include <dumux/porousmediumflow/implicit/problem.hh>
 
-#include <dumux/material/fluidsystems/brineco2fluidsystem.hh>
+#include <dumux/material/fluidsystems/brineco2.hh>
 #include <dumux/material/fluidmatrixinteractions/diffusivityconstanttau.hh>
 #include <dumux/material/binarycoefficients/brine_co2.hh>
 
diff --git a/lecture/mm/convectivemixing/convmixspatialparams.hh b/lecture/mm/convectivemixing/convmixspatialparams.hh
index 8b0f37529fa302ece479b7caca06b5b41834e2ef..29b48456e55b6a2e7244d5a85543b90fe2724b72 100644
--- a/lecture/mm/convectivemixing/convmixspatialparams.hh
+++ b/lecture/mm/convectivemixing/convmixspatialparams.hh
@@ -19,7 +19,7 @@
 #ifndef DUMUX_CONVMIX_SPATIAL_PARAMETERS_HH
 #define DUMUX_CONVMIX_SPATIAL_PARAMETERS_HH
 
-#include <dumux/material/spatialparams/implicitspatialparams1p.hh>
+#include <dumux/material/spatialparams/implicit1p.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
diff --git a/lecture/mm/fuelcell/fuelcellproblem.hh b/lecture/mm/fuelcell/fuelcellproblem.hh
index d12a17ef746171e89bb6f91f94ff1303abae7bae..9fc6b85f32a7dbadef287c4b5d7d19d3666be640 100644
--- a/lecture/mm/fuelcell/fuelcellproblem.hh
+++ b/lecture/mm/fuelcell/fuelcellproblem.hh
@@ -24,9 +24,9 @@
 #ifndef DUMUX_FUELCELL_LECTURE_PROBLEM_HH
 #define DUMUX_FUELCELL_LECTURE_PROBLEM_HH
 
-#include <dumux/implicit/common/implicitporousmediaproblem.hh>
-#include <dumux/implicit/2pnc/2pncmodel.hh>
-#include <dumux/material/fluidsystems/h2on2o2fluidsystem.hh>
+#include <dumux/porousmediumflow/implicit/problem.hh>
+#include <dumux/porousmediumflow/2pnc/implicit/model.hh>
+#include <dumux/material/fluidsystems/h2on2o2.hh>
 #include <dumux/material/constants.hh>
 #include <dumux/io/cubegridcreator.hh>
 
diff --git a/lecture/mm/fuelcell/fuelcellspatialparams.hh b/lecture/mm/fuelcell/fuelcellspatialparams.hh
index de666d94c2a599665c911bd7bf1ceba059b353e1..ee0d994dc4cc15b403030b4e412c3f9da541f203 100644
--- a/lecture/mm/fuelcell/fuelcellspatialparams.hh
+++ b/lecture/mm/fuelcell/fuelcellspatialparams.hh
@@ -26,7 +26,7 @@
 #ifndef DUMUX_FUELCELL_LECTURE_SPATIAL_PARAMS_HH
 #define DUMUX_FUELCELL_LECTURE_SPATIAL_PARAMS_HH
 
-#include <dumux/material/spatialparams/implicitspatialparams.hh>
+#include <dumux/material/spatialparams/implicit.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
 //#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
 //#include <dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh>
diff --git a/lecture/mm/heatpipe/heatpipeproblem.hh b/lecture/mm/heatpipe/heatpipeproblem.hh
index 0315eb81ad6dc1f8a3dad07537985cd8541f3ba3..32bb72c0ade0d6f7d5421f7cbe2b4ca8894441e9 100644
--- a/lecture/mm/heatpipe/heatpipeproblem.hh
+++ b/lecture/mm/heatpipe/heatpipeproblem.hh
@@ -25,10 +25,10 @@
 #ifndef DUMUX_HEATPIPE_PROBLEM_HH
 #define DUMUX_HEATPIPE_PROBLEM_HH
 
-#include <dumux/material/fluidsystems/h2oairfluidsystem.hh>
+#include <dumux/material/fluidsystems/h2oair.hh>
 
-#include <dumux/implicit/2p2c/2p2cmodel.hh>
-#include <dumux/implicit/common/implicitporousmediaproblem.hh>
+#include <dumux/porousmediumflow/2p2c/implicit/model.hh>
+#include <dumux/porousmediumflow/implicit/problem.hh>
 
 #include "heatpipespatialparams.hh"
 
diff --git a/lecture/mm/heatpipe/heatpipespatialparams.hh b/lecture/mm/heatpipe/heatpipespatialparams.hh
index 0885df300a28b615a6cc959506363b5a42ab4681..38ee5f6760429d627968f567e920566961a7a070 100644
--- a/lecture/mm/heatpipe/heatpipespatialparams.hh
+++ b/lecture/mm/heatpipe/heatpipespatialparams.hh
@@ -24,8 +24,8 @@
 #ifndef DUMUX_HEATPIPE_SPATIAL_PARAMS_HH
 #define DUMUX_HEATPIPE_SPATIAL_PARAMS_HH
 
-#include <dumux/implicit/2p2c/2p2cproperties.hh>
-#include <dumux/material/spatialparams/implicitspatialparams.hh>
+#include <dumux/porousmediumflow/2p2c/implicit/properties.hh>
+#include <dumux/material/spatialparams/implicit.hh>
 //#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
 //#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
 //#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
diff --git a/lecture/mm/heavyoil/3p2cni/3p2cnimodel.hh b/lecture/mm/heavyoil/3p2cni/3p2cnimodel.hh
index dfe42dcda5c8f9db3467338ad93204b8578ac604..8856b0f3c676282ba66507c8a8063c802a3daa05 100644
--- a/lecture/mm/heavyoil/3p2cni/3p2cnimodel.hh
+++ b/lecture/mm/heavyoil/3p2cni/3p2cnimodel.hh
@@ -27,7 +27,7 @@
 #ifndef DUMUX_3P2CNI_MODEL_HH
 #define DUMUX_3P2CNI_MODEL_HH
 
-#include <dumux/implicit/common/implicitvelocityoutput.hh>
+#include <dumux/porousmediumflow/implicit/velocityoutput.hh>
 #include "3p2cniproperties.hh"
 
 namespace Dumux
diff --git a/lecture/mm/heavyoil/3p2cni/3p2cniproperties.hh b/lecture/mm/heavyoil/3p2cni/3p2cniproperties.hh
index 0d929e5725ecdb02eab2d701478c733c34fa3528..318eb53febab9c81c2cad018af3bd1597726bb57 100644
--- a/lecture/mm/heavyoil/3p2cni/3p2cniproperties.hh
+++ b/lecture/mm/heavyoil/3p2cni/3p2cniproperties.hh
@@ -27,8 +27,8 @@
 #ifndef DUMUX_3P2CNI_PROPERTIES_HH
 #define DUMUX_3P2CNI_PROPERTIES_HH
 
-#include <dumux/implicit/box/boxproperties.hh>
-#include <dumux/implicit/cellcentered/ccproperties.hh>
+#include <dumux/implicit/box/properties.hh>
+#include <dumux/implicit/cellcentered/properties.hh>
 
 namespace Dumux
 {
diff --git a/lecture/mm/heavyoil/3p2cni/3p2cnipropertydefaults.hh b/lecture/mm/heavyoil/3p2cni/3p2cnipropertydefaults.hh
index 674fe32abfb1f253b8195bc3fb6a0a4478bd479d..ae658b41254ea05c33649949ce15ee3406113fb0 100644
--- a/lecture/mm/heavyoil/3p2cni/3p2cnipropertydefaults.hh
+++ b/lecture/mm/heavyoil/3p2cni/3p2cnipropertydefaults.hh
@@ -38,8 +38,8 @@
 #include "3p2cninewtoncontroller.hh"
 #include "3p2cnilocalresidual.hh"
 
-#include <dumux/implicit/common/implicitdarcyfluxvariables.hh>
-#include <dumux/material/spatialparams/implicitspatialparams.hh>
+#include <dumux/porousmediumflow/implicit/darcyfluxvariables.hh>
+#include <dumux/material/spatialparams/implicit.hh>
 
 namespace Dumux
 {
diff --git a/lecture/mm/heavyoil/3p2cni/3p2cnivolumevariables.hh b/lecture/mm/heavyoil/3p2cni/3p2cnivolumevariables.hh
index 7fda0fb83792b9edaec5c5e33cc49f59474af532..c9228af65c480e8be153305b9ef0bc82d1357382 100644
--- a/lecture/mm/heavyoil/3p2cni/3p2cnivolumevariables.hh
+++ b/lecture/mm/heavyoil/3p2cni/3p2cnivolumevariables.hh
@@ -25,7 +25,7 @@
 #ifndef DUMUX_3P2CNI_VOLUME_VARIABLES_HH
 #define DUMUX_3P2CNI_VOLUME_VARIABLES_HH
 
-#include <dumux/implicit/common/implicitmodel.hh>
+#include <dumux/implicit/model.hh>
 #include <dumux/common/math.hh>
 
 #include <dune/common/parallel/collectivecommunication.hh>
@@ -35,7 +35,7 @@
 #include "3p2cniproperties.hh"
 
 #include <dumux/material/constants.hh>
-#include <dumux/material/fluidstates/compositionalfluidstate.hh>
+#include <dumux/material/fluidstates/compositional.hh>
 #include <dumux/material/constraintsolvers/computefromreferencephase.hh>
 #include <dumux/material/constraintsolvers/misciblemultiphasecomposition.hh>
 
diff --git a/lecture/mm/heavyoil/h2oheavyoilfluidsystem.hh b/lecture/mm/heavyoil/h2oheavyoilfluidsystem.hh
index b31d282df93b7a6e3c324075ad8430fac4ed4acd..9e020d7887e96caf1bf59e2519522d228edb0f81 100644
--- a/lecture/mm/heavyoil/h2oheavyoilfluidsystem.hh
+++ b/lecture/mm/heavyoil/h2oheavyoilfluidsystem.hh
@@ -35,7 +35,7 @@
 
 #include <lecture/mm/heavyoil/h2o_heavyoil.hh>
 
-#include <dumux/material/fluidsystems/basefluidsystem.hh>
+#include <dumux/material/fluidsystems/base.hh>
 
 namespace Dumux
 {
diff --git a/lecture/mm/heavyoil/sagd/sagdproblem.hh b/lecture/mm/heavyoil/sagd/sagdproblem.hh
index a6357f100fb931ef9db7a46b2e734f74b50c665a..10cbb1c6cfa1a21066b29dabbce229ab022e851a 100644
--- a/lecture/mm/heavyoil/sagd/sagdproblem.hh
+++ b/lecture/mm/heavyoil/sagd/sagdproblem.hh
@@ -26,7 +26,7 @@
 #define DUMUX_SAGDPROBLEM_HH
 
 #include "../3p2cni/3p2cnimodel.hh"
-#include <dumux/implicit/common/implicitporousmediaproblem.hh>
+#include <dumux/porousmediumflow/implicit/problem.hh>
 
 #include "sagdspatialparams.hh"
 #include "../h2oheavyoilfluidsystem.hh"
diff --git a/lecture/mm/heavyoil/sagd/sagdspatialparams.hh b/lecture/mm/heavyoil/sagd/sagdspatialparams.hh
index 80868256809c4646137795c73c627c83cd5f0670..bf8ee7c471ac8dd7c15716039497e37fb4da16c0 100644
--- a/lecture/mm/heavyoil/sagd/sagdspatialparams.hh
+++ b/lecture/mm/heavyoil/sagd/sagdspatialparams.hh
@@ -26,7 +26,7 @@
 #define DUMUX_SAGD_SPATIAL_PARAMS_HH
 
 #include "../3p2cni/3p2cniindices.hh"
-#include <dumux/material/spatialparams/implicitspatialparams.hh>
+#include <dumux/material/spatialparams/implicit.hh>
 #include "../3p/parkerVanGenZero3p.hh"
 #include "../3p/parkerVanGenZero3pparams.hh"
 
diff --git a/lecture/mm/heavyoil/sagdCyclic/sagdCyclicproblem.hh b/lecture/mm/heavyoil/sagdCyclic/sagdCyclicproblem.hh
index bcd8cfba0612f1902cf2aa84e6cad10ccf3558a3..3aba85b3658c8bab5d089d5ff10533f5953b3094 100644
--- a/lecture/mm/heavyoil/sagdCyclic/sagdCyclicproblem.hh
+++ b/lecture/mm/heavyoil/sagdCyclic/sagdCyclicproblem.hh
@@ -27,7 +27,7 @@
 #define DUMUX_SAGDCYCLICPROBLEM_HH
 
 #include "../3p2cni/3p2cnimodel.hh"
-#include <dumux/implicit/common/implicitporousmediaproblem.hh>
+#include <dumux/porousmediumflow/implicit/problem.hh>
 
 #include "sagdCyclicspatialparams.hh"
 #include "../h2oheavyoilfluidsystem.hh"
diff --git a/lecture/mm/heavyoil/sagdCyclic/sagdCyclicspatialparams.hh b/lecture/mm/heavyoil/sagdCyclic/sagdCyclicspatialparams.hh
index acb6d443dd5ec57a44642ebee02d3f4bf89d43e0..0e31a023b515d08d66dd00dba81e98221e8028d5 100644
--- a/lecture/mm/heavyoil/sagdCyclic/sagdCyclicspatialparams.hh
+++ b/lecture/mm/heavyoil/sagdCyclic/sagdCyclicspatialparams.hh
@@ -26,7 +26,7 @@
 #define DUMUX_SAGDCYCLIC_SPATIAL_PARAMS_HH
 
 #include "../3p2cni/3p2cniindices.hh"
-#include <dumux/material/spatialparams/implicitspatialparams.hh>
+#include <dumux/material/spatialparams/implicit.hh>
 #include "../3p/parkerVanGenZero3p.hh"
 #include "../3p/parkerVanGenZero3pparams.hh"
 
diff --git a/lecture/mm/heavyoil/sagdCyclicHyst/sagdCyclicHystproblem.hh b/lecture/mm/heavyoil/sagdCyclicHyst/sagdCyclicHystproblem.hh
index e1ef4187a6c8ea7ad44009227712ad9a4daf729b..c6828be5ae510dd3f6b023484d20f859e2f78711 100644
--- a/lecture/mm/heavyoil/sagdCyclicHyst/sagdCyclicHystproblem.hh
+++ b/lecture/mm/heavyoil/sagdCyclicHyst/sagdCyclicHystproblem.hh
@@ -27,7 +27,7 @@
 
 #include <algorithm>
 
-#include <dumux/implicit/common/implicitporousmediaproblem.hh>
+#include <dumux/porousmediumflow/implicit/problem.hh>
 
 #include "../3p2cni/3p2cnimodel.hh"
 #include "../h2oheavyoilfluidsystem.hh"
diff --git a/lecture/mm/heavyoil/sagdCyclicHyst/sagdCyclicHystspatialparams.hh b/lecture/mm/heavyoil/sagdCyclicHyst/sagdCyclicHystspatialparams.hh
index 83e9473375355a0b827cf7c31270034610762c62..9fdfb42e529d0b3468e2418384a3f0f6a981659f 100644
--- a/lecture/mm/heavyoil/sagdCyclicHyst/sagdCyclicHystspatialparams.hh
+++ b/lecture/mm/heavyoil/sagdCyclicHyst/sagdCyclicHystspatialparams.hh
@@ -25,7 +25,7 @@
 #define DUMUX_SAGDCYCLICHYST_SPATIAL_PARAMS_HH
 
 #include "../3p2cni/3p2cniindices.hh"
-#include <dumux/material/spatialparams/implicitspatialparams.hh>
+#include <dumux/material/spatialparams/implicit.hh>
 #include "../3p/parkerVanGenZeroHyst3p.hh"
 #include "../3p/parkerVanGenZeroHyst3pparams.hh"
 
diff --git a/lecture/mm/henryproblem/henry1p2c/henry1p2cproblem.hh b/lecture/mm/henryproblem/henry1p2c/henry1p2cproblem.hh
index 6399770979e702ba800bc439ed2908aa02341244..fcdeb8ff245432b913aaa99da605ddc187f5c9ac 100644
--- a/lecture/mm/henryproblem/henry1p2c/henry1p2cproblem.hh
+++ b/lecture/mm/henryproblem/henry1p2c/henry1p2cproblem.hh
@@ -24,8 +24,8 @@
 #ifndef DUMUX_HENRY1P2C_PROBLEM_HH
 #define DUMUX_HENRY1P2C_PROBLEM_HH
 
-#include <dumux/implicit/1p2c/1p2cmodel.hh>
-#include <dumux/implicit/common/implicitporousmediaproblem.hh>
+#include <dumux/porousmediumflow/1p2c/implicit/model.hh>
+#include <dumux/porousmediumflow/implicit/problem.hh>
 
 #include "watersaltfluidsystem.hh"
 #include "henry1p2cspatialparameters.hh"
diff --git a/lecture/mm/henryproblem/henry1p2c/henry1p2cspatialparameters.hh b/lecture/mm/henryproblem/henry1p2c/henry1p2cspatialparameters.hh
index 734104e932db7627409f3b00f7d280a54797335b..58efe639188679dd25bda4956235fe2abfe231ab 100644
--- a/lecture/mm/henryproblem/henry1p2c/henry1p2cspatialparameters.hh
+++ b/lecture/mm/henryproblem/henry1p2c/henry1p2cspatialparameters.hh
@@ -25,7 +25,7 @@
 #ifndef DUMUX_HENRY1P2C_SPATIAL_PARAMETERS_HH
 #define DUMUX_HENRY1P2C_SPATIAL_PARAMETERS_HH
 
-#include <dumux/material/spatialparams/implicitspatialparams1p.hh>
+#include <dumux/material/spatialparams/implicit1p.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
diff --git a/lecture/mm/henryproblem/henry1p2c/watersaltfluidsystem.hh b/lecture/mm/henryproblem/henry1p2c/watersaltfluidsystem.hh
index bf6f6b6ab03366facf3563799b2b18843e4b3d90..47c737058145845d7ff621a2843cc1baab71f704 100644
--- a/lecture/mm/henryproblem/henry1p2c/watersaltfluidsystem.hh
+++ b/lecture/mm/henryproblem/henry1p2c/watersaltfluidsystem.hh
@@ -28,7 +28,7 @@
 
 #include <dune/common/exceptions.hh>
 
-#include <dumux/material/fluidsystems/basefluidsystem.hh>
+#include <dumux/material/fluidsystems/base.hh>
 #include <dumux/material/components/h2o.hh>
 #include <assert.h>
 
diff --git a/lecture/mm/henryproblem/henry2p/henry2pproblem.hh b/lecture/mm/henryproblem/henry2p/henry2pproblem.hh
index c09d1b1bbb586cf526a6f4514cf35995f768994e..9460e7c4ac066c08963cf7c871072c6bca9544a6 100644
--- a/lecture/mm/henryproblem/henry2p/henry2pproblem.hh
+++ b/lecture/mm/henryproblem/henry2p/henry2pproblem.hh
@@ -29,10 +29,10 @@
 #include <dumux/material/components/simpleh2o.hh>
 #include "simplesaltwater.hh"
 
-#include <dumux/implicit/2p/2pmodel.hh>
-#include <dumux/implicit/common/implicitporousmediaproblem.hh>
+#include <dumux/porousmediumflow/2p/implicit/model.hh>
+#include <dumux/porousmediumflow/implicit/problem.hh>
 
-#include <dumux/material/fluidsystems/2pimmisciblefluidsystem.hh>
+#include <dumux/material/fluidsystems/2pimmiscible.hh>
 
 #include "henry2pspatialparams.hh"
 
diff --git a/lecture/mm/henryproblem/henry2p/henry2pspatialparams.hh b/lecture/mm/henryproblem/henry2p/henry2pspatialparams.hh
index f52cfa74531b513bdb79684a8f2e610ea419894f..5c2238e6604f68ca3e41cdc6cf0d43b9e33ca79f 100644
--- a/lecture/mm/henryproblem/henry2p/henry2pspatialparams.hh
+++ b/lecture/mm/henryproblem/henry2p/henry2pspatialparams.hh
@@ -25,12 +25,12 @@
 #ifndef DUMUX_LENS_SPATIAL_PARAMS_HH
 #define DUMUX_LENS_SPATIAL_PARAMS_HH
 
-#include <dumux/material/spatialparams/implicitspatialparams.hh>
+#include <dumux/material/spatialparams/implicit.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
 
-#include <dumux/implicit/2p/2pmodel.hh>
+#include <dumux/porousmediumflow/2p/implicit/model.hh>
 
 namespace Dumux
 {
diff --git a/lecture/mm/mcwhorter/mcwhorteranalyticsolution.hh b/lecture/mm/mcwhorter/mcwhorteranalyticsolution.hh
index 114339f82200a7039add96176e198ffc5c1c4755..e4db69f4e693c1584b8e81025afb2d0778a6fbc0 100644
--- a/lecture/mm/mcwhorter/mcwhorteranalyticsolution.hh
+++ b/lecture/mm/mcwhorter/mcwhorteranalyticsolution.hh
@@ -26,7 +26,7 @@
  * @author Markus Wolff, Anneli Schöniger
  */
 
-#include <dumux/decoupled/2p/2pproperties.hh>
+#include <dumux/porousmediumflow/2p/sequential/properties.hh>
 
 namespace Dumux
 {
diff --git a/lecture/mm/mcwhorter/mcwhorterproblem.hh b/lecture/mm/mcwhorter/mcwhorterproblem.hh
index e386059cb6182d1e4fa5afba6ccc96b7a8dce283..efd35dfc0c6da8b7d9cacd33522bb4c347775362 100644
--- a/lecture/mm/mcwhorter/mcwhorterproblem.hh
+++ b/lecture/mm/mcwhorter/mcwhorterproblem.hh
@@ -21,10 +21,10 @@
 
 #include <dumux/material/fluidsystems/liquidphase.hh>
 
-#include <dumux/decoupled/2p/diffusion/fv/fvpressureproperties2p.hh>
-#include <dumux/decoupled/2p/transport/fv/fvtransportproperties2p.hh>
-#include <dumux/decoupled/2p/transport/fv/evalcflfluxcoats.hh>
-#include <dumux/decoupled/2p/impes/impesproblem2p.hh>
+#include <dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressureproperties.hh>
+#include <dumux/porousmediumflow/2p/sequential/transport/cellcentered/properties.hh>
+#include <dumux/porousmediumflow/2p/sequential/transport/cellcentered/evalcflfluxcoats.hh>
+#include <dumux/porousmediumflow/2p/sequential/impes/problem.hh>
 
 //pseudo-oil and h2o have to be used to make viscosity and density input parameters
 #include "../buckleyleverett/pseudooil.hh"
diff --git a/lecture/mm/naplinfiltration/h2oairnaplfluidsystem.hh b/lecture/mm/naplinfiltration/h2oairnaplfluidsystem.hh
index 2061d45125b2c0345fb019e719933c7192c96d7d..2ef83d3b69f558d6295c28e86c97b349d749b7cf 100644
--- a/lecture/mm/naplinfiltration/h2oairnaplfluidsystem.hh
+++ b/lecture/mm/naplinfiltration/h2oairnaplfluidsystem.hh
@@ -38,7 +38,7 @@
 #include <dumux/material/binarycoefficients/h2o_mesitylene.hh>
 #include <dumux/material/binarycoefficients/air_mesitylene.hh>
 
-#include <dumux/material/fluidsystems/basefluidsystem.hh>
+#include <dumux/material/fluidsystems/base.hh>
 #include <dumux/common/parameters.hh>
 
 namespace Dumux
diff --git a/lecture/mm/naplinfiltration/naplinfiltrationproblem.hh b/lecture/mm/naplinfiltration/naplinfiltrationproblem.hh
index 13253de02bc30b5d98bd51ed385ec569e1ae20ef..77bdaa96f8f84da139ff0c32bdeace2c9c6e3684 100644
--- a/lecture/mm/naplinfiltration/naplinfiltrationproblem.hh
+++ b/lecture/mm/naplinfiltration/naplinfiltrationproblem.hh
@@ -25,9 +25,9 @@
 #ifndef DUMUX_NAPLINFILTRATIONPROBLEM_HH
 #define DUMUX_NAPLINFILTRATIONPROBLEM_HH
 
-#include <dumux/implicit/3p/3ppropertydefaults.hh>
-#include <dumux/implicit/3p3c/3p3cpropertydefaults.hh>
-#include <dumux/implicit/common/implicitporousmediaproblem.hh>
+#include <dumux/porousmediumflow/3p/implicit/propertydefaults.hh>
+#include <dumux/porousmediumflow/3p3c/implicit/propertydefaults.hh>
+#include <dumux/porousmediumflow/implicit/problem.hh>
 
 #include "h2oairnaplfluidsystem.hh"
 #include "naplinfiltrationspatialparams.hh"
diff --git a/lecture/mm/naplinfiltration/naplinfiltrationspatialparams.hh b/lecture/mm/naplinfiltration/naplinfiltrationspatialparams.hh
index ea549c704e982b825e704828b3701775bc28be0d..2ad14470fa1195e57d1abf061ee186c30824dfea 100644
--- a/lecture/mm/naplinfiltration/naplinfiltrationspatialparams.hh
+++ b/lecture/mm/naplinfiltration/naplinfiltrationspatialparams.hh
@@ -24,7 +24,7 @@
 #ifndef DUMUX_NAPLINFILTRATION_SPATIAL_PARAMS_HH
 #define DUMUX_NAPLINFILTRATION_SPATIAL_PARAMS_HH
 
-#include <dumux/material/spatialparams/implicitspatialparams.hh>
+#include <dumux/material/spatialparams/implicit.hh>
 #include <dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3p.hh>
 #include <dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3pparams.hh>
 #include <dumux/material/fluidmatrixinteractions/3p/efftoabslaw.hh>
diff --git a/lecture/mm/remediationscenarios/remediationscenariosproblem.hh b/lecture/mm/remediationscenarios/remediationscenariosproblem.hh
index 74b2c9ed19e73e77e309a35028ad4f75f6ca8d24..267e81be9017a50dd01260a1367a3083f3a1b4f5 100644
--- a/lecture/mm/remediationscenarios/remediationscenariosproblem.hh
+++ b/lecture/mm/remediationscenarios/remediationscenariosproblem.hh
@@ -26,10 +26,10 @@
 #ifndef DUMUX_REMEDIATIONSCENARIOS_PROBLEM_HH
 #define DUMUX_REMEDIATIONSCENARIOS_PROBLEM_HH
 
-#include <dumux/material/fluidsystems/h2oairmesitylenefluidsystem.hh>
+#include <dumux/material/fluidsystems/h2oairmesitylene.hh>
 
-#include <dumux/implicit/3p3c/3p3cmodel.hh>
-#include <dumux/implicit/common/implicitporousmediaproblem.hh>
+#include <dumux/porousmediumflow/3p3c/implicit/model.hh>
+#include <dumux/porousmediumflow/implicit/problem.hh>
 
 #include "remediationscenariosspatialparams.hh"
 
diff --git a/lecture/mm/remediationscenarios/remediationscenariosspatialparams.hh b/lecture/mm/remediationscenarios/remediationscenariosspatialparams.hh
index 7edf7bf79dfdb3359d798882c156289bf65955bb..117e9e65b9c83945e70d39555a460f4ca9b51610 100644
--- a/lecture/mm/remediationscenarios/remediationscenariosspatialparams.hh
+++ b/lecture/mm/remediationscenarios/remediationscenariosspatialparams.hh
@@ -24,8 +24,8 @@
 #ifndef DUMUX_REMEDIATIONSCENARIOS_SPATIAL_PARAMS_HH
 #define DUMUX_REMEDIATIONSCENARIOS_SPATIAL_PARAMS_HH
 
-#include <dumux/implicit/3p3c/3p3cindices.hh>
-#include <dumux/material/spatialparams/implicitspatialparams.hh>
+#include <dumux/porousmediumflow/3p3c/implicit/indices.hh>
+#include <dumux/material/spatialparams/implicit.hh>
 #include <dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3p.hh>
 #include <dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3pparams.hh>
 #include <dumux/material/fluidmatrixinteractions/3p/efftoabslaw.hh>