diff --git a/dumux/CMakeLists.txt b/dumux/CMakeLists.txt
index ffa73c2f91ba0ffe827dfce8b12d11d47f9d1f05..4e865412d8a2e1453310874040348c86257e1295 100644
--- a/dumux/CMakeLists.txt
+++ b/dumux/CMakeLists.txt
@@ -2,6 +2,7 @@ add_subdirectory(adaptive)
 add_subdirectory(assembly)
 add_subdirectory(common)
 add_subdirectory(discretization)
+add_subdirectory(flux)
 add_subdirectory(freeflow)
 add_subdirectory(geomechanics)
 add_subdirectory(io)
diff --git a/dumux/discretization/CMakeLists.txt b/dumux/discretization/CMakeLists.txt
index 5e45341da0989d89797cad3cf94026c2bc0bfb9e..5c7624912611589e7dfa12d1b8463bfd181d8952 100644
--- a/dumux/discretization/CMakeLists.txt
+++ b/dumux/discretization/CMakeLists.txt
@@ -5,27 +5,15 @@ add_subdirectory(staggered)
 install(FILES
 basefvgridgeometry.hh
 checkoverlapsize.hh
-darcyslaw.hh
-effectivestresslaw.hh
 elementsolution.hh
 evalgradients.hh
 evalsolution.hh
-fickslaw.hh
 fluxstencil.hh
-fluxvariablesbase.hh
-fluxvariablescaching.hh
-forchheimerslaw.hh
-fourierslaw.hh
-fourierslawnonequilibrium.hh
 fvgridvariables.hh
 fvproperties.hh
-hookeslaw.hh
 localview.hh
-maxwellstefanslaw.hh
 method.hh
 scvandscvfiterators.hh
-stationaryvelocityfield.hh
 subcontrolvolumebase.hh
 subcontrolvolumefacebase.hh
-upwindscheme.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/discretization)
diff --git a/dumux/discretization/box/effectivestresslaw.hh b/dumux/discretization/box/effectivestresslaw.hh
index e05016eefb07cdec01d4e8d1669cad24a72dcf1c..1aa5752a95f489b9d07e0538c72ced0ea7f3ab17 100644
--- a/dumux/discretization/box/effectivestresslaw.hh
+++ b/dumux/discretization/box/effectivestresslaw.hh
@@ -24,7 +24,7 @@
 #ifndef DUMUX_DISCRETIZATION_BOX_EFFECTIVE_STRESS_LAW_HH
 #define DUMUX_DISCRETIZATION_BOX_EFFECTIVE_STRESS_LAW_HH
 
-#include <dumux/discretization/effectivestresslaw.hh>
+#include <dumux/flux/effectivestresslaw.hh>
 #include <dumux/discretization/method.hh>
 
 namespace Dumux {
diff --git a/dumux/discretization/box/hookeslaw.hh b/dumux/discretization/box/hookeslaw.hh
index 65b45236e5e6c20a21f900146c8390c55feb67c0..323ed70be06d0930562560e0f54e49c546e85e01 100644
--- a/dumux/discretization/box/hookeslaw.hh
+++ b/dumux/discretization/box/hookeslaw.hh
@@ -27,7 +27,7 @@
 #include <dune/common/fmatrix.hh>
 
 #include <dumux/common/math.hh>
-#include <dumux/discretization/hookeslaw.hh>
+#include <dumux/flux/hookeslaw.hh>
 #include <dumux/discretization/method.hh>
 
 namespace Dumux {
diff --git a/dumux/discretization/box/maxwellstefanslaw.hh b/dumux/discretization/box/maxwellstefanslaw.hh
index 3b1287a62dbd5e016c04b36d8496318e31677bd7..3303d083acf286be3ea13bf81b1ab290cf493bf8 100644
--- a/dumux/discretization/box/maxwellstefanslaw.hh
+++ b/dumux/discretization/box/maxwellstefanslaw.hh
@@ -30,7 +30,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/discretization/method.hh>
-#include <dumux/discretization/fluxvariablescaching.hh>
+#include <dumux/flux/fluxvariablescaching.hh>
 
 namespace Dumux {
 
diff --git a/dumux/discretization/cellcentered/tpfa/maxwellstefanslaw.hh b/dumux/discretization/cellcentered/tpfa/maxwellstefanslaw.hh
index 2da51ac99dfa833f994cca0a4ec2406667da181d..28456638df3944ae870c9f1bac86064afd95ef33 100644
--- a/dumux/discretization/cellcentered/tpfa/maxwellstefanslaw.hh
+++ b/dumux/discretization/cellcentered/tpfa/maxwellstefanslaw.hh
@@ -30,7 +30,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/discretization/method.hh>
-#include <dumux/discretization/fluxvariablescaching.hh>
+#include <dumux/flux/fluxvariablescaching.hh>
 
 namespace Dumux {
 
diff --git a/dumux/discretization/staggered/freeflow/fickslaw.hh b/dumux/discretization/staggered/freeflow/fickslaw.hh
index b60a7941f0ac3cf45a61ea534bfe79eba0b5323d..b59ed496cfa2f9bf6fde78cc7aa8c12a453770e7 100644
--- a/dumux/discretization/staggered/freeflow/fickslaw.hh
+++ b/dumux/discretization/staggered/freeflow/fickslaw.hh
@@ -32,7 +32,7 @@
 #include <dumux/common/math.hh>
 
 #include <dumux/discretization/method.hh>
-#include <dumux/discretization/fluxvariablescaching.hh>
+#include <dumux/flux/fluxvariablescaching.hh>
 
 namespace Dumux
 {
diff --git a/dumux/discretization/staggered/freeflow/fourierslaw.hh b/dumux/discretization/staggered/freeflow/fourierslaw.hh
index 87190ee824927afbd23d45145b75a0f86f8332fe..afb3b3aeb4f3a772345b822738ccd59153f3bcf2 100644
--- a/dumux/discretization/staggered/freeflow/fourierslaw.hh
+++ b/dumux/discretization/staggered/freeflow/fourierslaw.hh
@@ -28,7 +28,7 @@
 #include <dumux/common/math.hh>
 
 #include <dumux/discretization/method.hh>
-#include <dumux/discretization/fluxvariablescaching.hh>
+#include <dumux/flux/fluxvariablescaching.hh>
 
 namespace Dumux
 {
diff --git a/dumux/discretization/staggered/freeflow/maxwellstefanslaw.hh b/dumux/discretization/staggered/freeflow/maxwellstefanslaw.hh
index db4019e618d49e2aad28ed8de4210f45216b52b3..593b701437038935d45de980f2299e16253cb7be 100644
--- a/dumux/discretization/staggered/freeflow/maxwellstefanslaw.hh
+++ b/dumux/discretization/staggered/freeflow/maxwellstefanslaw.hh
@@ -30,7 +30,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/discretization/method.hh>
-#include <dumux/discretization/fluxvariablescaching.hh>
+#include <dumux/flux/fluxvariablescaching.hh>
 
 namespace Dumux {
 
diff --git a/dumux/discretization/staggered/properties.hh b/dumux/discretization/staggered/properties.hh
index 7eda80d69421b1358740f4a300a00f864b6cb419..763bfc7fcafa273f15bea4b5a506b8b8e1701b75 100644
--- a/dumux/discretization/staggered/properties.hh
+++ b/dumux/discretization/staggered/properties.hh
@@ -32,7 +32,7 @@
 
 #include <dumux/discretization/method.hh>
 #include <dumux/discretization/fvproperties.hh>
-#include <dumux/discretization/fluxvariablescaching.hh>
+#include <dumux/flux/fluxvariablescaching.hh>
 
 #include <dumux/discretization/cellcentered/elementboundarytypes.hh>
 #include <dumux/assembly/staggeredlocalresidual.hh>
diff --git a/dumux/flux/CMakeLists.txt b/dumux/flux/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..fdfac891368f08c3f0f0599e13a91b3eccfaf83e
--- /dev/null
+++ b/dumux/flux/CMakeLists.txt
@@ -0,0 +1,14 @@
+install(FILES
+darcyslaw.hh
+effectivestresslaw.hh
+fickslaw.hh
+fluxvariablesbase.hh
+fluxvariablescaching.hh
+forchheimerslaw.hh
+fourierslaw.hh
+fourierslawnonequilibrium.hh
+hookeslaw.hh
+maxwellstefanslaw.hh
+stationaryvelocityfield.hh
+upwindscheme.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/flux)
diff --git a/dumux/discretization/darcyslaw.hh b/dumux/flux/darcyslaw.hh
similarity index 100%
rename from dumux/discretization/darcyslaw.hh
rename to dumux/flux/darcyslaw.hh
diff --git a/dumux/discretization/effectivestresslaw.hh b/dumux/flux/effectivestresslaw.hh
similarity index 100%
rename from dumux/discretization/effectivestresslaw.hh
rename to dumux/flux/effectivestresslaw.hh
diff --git a/dumux/discretization/fickslaw.hh b/dumux/flux/fickslaw.hh
similarity index 100%
rename from dumux/discretization/fickslaw.hh
rename to dumux/flux/fickslaw.hh
diff --git a/dumux/discretization/fluxvariablesbase.hh b/dumux/flux/fluxvariablesbase.hh
similarity index 100%
rename from dumux/discretization/fluxvariablesbase.hh
rename to dumux/flux/fluxvariablesbase.hh
diff --git a/dumux/discretization/fluxvariablescaching.hh b/dumux/flux/fluxvariablescaching.hh
similarity index 100%
rename from dumux/discretization/fluxvariablescaching.hh
rename to dumux/flux/fluxvariablescaching.hh
diff --git a/dumux/discretization/forchheimerslaw.hh b/dumux/flux/forchheimerslaw.hh
similarity index 100%
rename from dumux/discretization/forchheimerslaw.hh
rename to dumux/flux/forchheimerslaw.hh
diff --git a/dumux/discretization/fourierslaw.hh b/dumux/flux/fourierslaw.hh
similarity index 100%
rename from dumux/discretization/fourierslaw.hh
rename to dumux/flux/fourierslaw.hh
diff --git a/dumux/discretization/fourierslawnonequilibrium.hh b/dumux/flux/fourierslawnonequilibrium.hh
similarity index 100%
rename from dumux/discretization/fourierslawnonequilibrium.hh
rename to dumux/flux/fourierslawnonequilibrium.hh
diff --git a/dumux/discretization/hookeslaw.hh b/dumux/flux/hookeslaw.hh
similarity index 100%
rename from dumux/discretization/hookeslaw.hh
rename to dumux/flux/hookeslaw.hh
diff --git a/dumux/discretization/maxwellstefanslaw.hh b/dumux/flux/maxwellstefanslaw.hh
similarity index 100%
rename from dumux/discretization/maxwellstefanslaw.hh
rename to dumux/flux/maxwellstefanslaw.hh
diff --git a/dumux/discretization/stationaryvelocityfield.hh b/dumux/flux/stationaryvelocityfield.hh
similarity index 98%
rename from dumux/discretization/stationaryvelocityfield.hh
rename to dumux/flux/stationaryvelocityfield.hh
index 91ff078a12bd5d8f2a5071df107f79d952f5704f..e261d6335350390722fd5f383de6947feac4420a 100644
--- a/dumux/discretization/stationaryvelocityfield.hh
+++ b/dumux/flux/stationaryvelocityfield.hh
@@ -28,7 +28,7 @@
 #define DUMUX_DISCRETIZATION_STATIONARY_VELOCITY_FIELD_HH
 
 #include <dumux/discretization/method.hh>
-#include <dumux/discretization/fluxvariablescaching.hh>
+#include <dumux/flux/fluxvariablescaching.hh>
 
 namespace Dumux {
 
diff --git a/dumux/discretization/upwindscheme.hh b/dumux/flux/upwindscheme.hh
similarity index 100%
rename from dumux/discretization/upwindscheme.hh
rename to dumux/flux/upwindscheme.hh
diff --git a/dumux/freeflow/compositional/navierstokesncmodel.hh b/dumux/freeflow/compositional/navierstokesncmodel.hh
index ce3cdc8dc5e06cb0b8dd3e955deffa5077f668ab..7df4a068b2bd6503d72278c7ea28f4232af907af 100644
--- a/dumux/freeflow/compositional/navierstokesncmodel.hh
+++ b/dumux/freeflow/compositional/navierstokesncmodel.hh
@@ -56,8 +56,8 @@
 #include <dumux/freeflow/nonisothermal/model.hh>
 #include <dumux/freeflow/nonisothermal/indices.hh>
 #include <dumux/freeflow/nonisothermal/iofields.hh>
-#include <dumux/discretization/fickslaw.hh>
-#include <dumux/discretization/fourierslaw.hh>
+#include <dumux/flux/fickslaw.hh>
+#include <dumux/flux/fourierslaw.hh>
 
 #include "volumevariables.hh"
 #include "localresidual.hh"
diff --git a/dumux/freeflow/compositional/staggered/fluxvariables.hh b/dumux/freeflow/compositional/staggered/fluxvariables.hh
index 62120ac8c0e920f0c1e947235f1c248b4b1073f1..7a42ee8d7aa4b2d92940eb931785868b6e9acab1 100644
--- a/dumux/freeflow/compositional/staggered/fluxvariables.hh
+++ b/dumux/freeflow/compositional/staggered/fluxvariables.hh
@@ -26,7 +26,7 @@
 
 #include <numeric>
 #include <dumux/common/properties.hh>
-#include <dumux/discretization/fluxvariablesbase.hh>
+#include <dumux/flux/fluxvariablesbase.hh>
 #include <dumux/discretization/method.hh>
 #include <dumux/freeflow/navierstokes/fluxvariables.hh>
 
diff --git a/dumux/freeflow/navierstokes/model.hh b/dumux/freeflow/navierstokes/model.hh
index 3fdb573ea2737eeeed5b0c80720fbdcc3af1c904..413b45c9adafb515989d238f85f84eb4b16fc8b9 100644
--- a/dumux/freeflow/navierstokes/model.hh
+++ b/dumux/freeflow/navierstokes/model.hh
@@ -63,7 +63,7 @@
 
 #include <dumux/material/fluidstates/immiscible.hh>
 #include <dumux/discretization/method.hh>
-#include <dumux/discretization/fourierslaw.hh>
+#include <dumux/flux/fourierslaw.hh>
 
 namespace Dumux {
 
diff --git a/dumux/freeflow/navierstokes/staggered/fluxvariables.hh b/dumux/freeflow/navierstokes/staggered/fluxvariables.hh
index 6debed893331eb09b6f1f0d56d3b2682f5ac784f..f308c4607b6ebc417fe21594d6a2b15ca85fc85d 100644
--- a/dumux/freeflow/navierstokes/staggered/fluxvariables.hh
+++ b/dumux/freeflow/navierstokes/staggered/fluxvariables.hh
@@ -28,7 +28,7 @@
 #include <dumux/common/parameters.hh>
 #include <dumux/common/properties.hh>
 
-#include <dumux/discretization/fluxvariablesbase.hh>
+#include <dumux/flux/fluxvariablesbase.hh>
 #include <dumux/discretization/method.hh>
 
 namespace Dumux {
diff --git a/dumux/freeflow/properties.hh b/dumux/freeflow/properties.hh
index 5b9d414f2f24a9f976d79b238082fec421c21262..c89b01bc47a932b0b641eb07ff470f16b3fc3634 100644
--- a/dumux/freeflow/properties.hh
+++ b/dumux/freeflow/properties.hh
@@ -28,7 +28,7 @@
 
 #include <dumux/common/properties.hh>
 #include <dumux/common/properties/model.hh>
-#include <dumux/discretization/fourierslaw.hh>
+#include <dumux/flux/fourierslaw.hh>
 
 namespace Dumux {
 namespace Properties {
diff --git a/dumux/freeflow/rans/oneeq/staggered/fluxvariables.hh b/dumux/freeflow/rans/oneeq/staggered/fluxvariables.hh
index 38bab2114e5bdf6fda70ff307a762a9e52bd4060..55db12b5755f0c80b348c086385d1777e2a57a4a 100644
--- a/dumux/freeflow/rans/oneeq/staggered/fluxvariables.hh
+++ b/dumux/freeflow/rans/oneeq/staggered/fluxvariables.hh
@@ -26,7 +26,7 @@
 
 #include <numeric>
 #include <dumux/common/properties.hh>
-#include <dumux/discretization/fluxvariablesbase.hh>
+#include <dumux/flux/fluxvariablesbase.hh>
 #include <dumux/discretization/method.hh>
 #include <dumux/freeflow/navierstokes/fluxvariables.hh>
 #include <dumux/freeflow/rans/oneeq/fluxvariables.hh>
diff --git a/dumux/freeflow/rans/twoeq/kepsilon/staggered/fluxvariables.hh b/dumux/freeflow/rans/twoeq/kepsilon/staggered/fluxvariables.hh
index 1f1bdb4b345a2a1f299d7026f4b2147e8fb77c02..714c38f84312fa9039eda5e44746b1913090b59c 100644
--- a/dumux/freeflow/rans/twoeq/kepsilon/staggered/fluxvariables.hh
+++ b/dumux/freeflow/rans/twoeq/kepsilon/staggered/fluxvariables.hh
@@ -26,7 +26,7 @@
 
 #include <numeric>
 #include <dumux/common/properties.hh>
-#include <dumux/discretization/fluxvariablesbase.hh>
+#include <dumux/flux/fluxvariablesbase.hh>
 #include <dumux/discretization/method.hh>
 #include <dumux/freeflow/navierstokes/fluxvariables.hh>
 #include <dumux/freeflow/rans/twoeq/kepsilon/fluxvariables.hh>
diff --git a/dumux/freeflow/rans/twoeq/komega/staggered/fluxvariables.hh b/dumux/freeflow/rans/twoeq/komega/staggered/fluxvariables.hh
index 235d6502b56dcf24799689c3aaa03eb93af8c2d8..31cffed6a0aa915c10d7007c0704fffac84400d9 100644
--- a/dumux/freeflow/rans/twoeq/komega/staggered/fluxvariables.hh
+++ b/dumux/freeflow/rans/twoeq/komega/staggered/fluxvariables.hh
@@ -26,7 +26,7 @@
 
 #include <numeric>
 #include <dumux/common/properties.hh>
-#include <dumux/discretization/fluxvariablesbase.hh>
+#include <dumux/flux/fluxvariablesbase.hh>
 #include <dumux/discretization/method.hh>
 #include <dumux/freeflow/navierstokes/fluxvariables.hh>
 #include <dumux/freeflow/rans/twoeq/komega/fluxvariables.hh>
diff --git a/dumux/freeflow/rans/twoeq/lowrekepsilon/staggered/fluxvariables.hh b/dumux/freeflow/rans/twoeq/lowrekepsilon/staggered/fluxvariables.hh
index 6037562952b4112c4573c45e0ba99f81fc913747..a199216028d13c7a7e74aedfd1c6fd980ea4a75b 100644
--- a/dumux/freeflow/rans/twoeq/lowrekepsilon/staggered/fluxvariables.hh
+++ b/dumux/freeflow/rans/twoeq/lowrekepsilon/staggered/fluxvariables.hh
@@ -26,7 +26,7 @@
 
 #include <numeric>
 #include <dumux/common/properties.hh>
-#include <dumux/discretization/fluxvariablesbase.hh>
+#include <dumux/flux/fluxvariablesbase.hh>
 #include <dumux/discretization/method.hh>
 #include <dumux/freeflow/navierstokes/fluxvariables.hh>
 #include <dumux/freeflow/rans/twoeq/lowrekepsilon/fluxvariables.hh>
diff --git a/dumux/geomechanics/elastic/model.hh b/dumux/geomechanics/elastic/model.hh
index da9bfbe6951b7c5fe87c3b7aabcdc44e2946e5c5..d580968bf9dbc5a7759884ec0c6ab93473ab368b 100644
--- a/dumux/geomechanics/elastic/model.hh
+++ b/dumux/geomechanics/elastic/model.hh
@@ -32,7 +32,7 @@
 #include <dumux/common/properties/model.hh>
 
 #include <dumux/geomechanics/properties.hh>
-#include <dumux/discretization/hookeslaw.hh>
+#include <dumux/flux/hookeslaw.hh>
 
 #include "indices.hh"
 #include "localresidual.hh"
diff --git a/dumux/geomechanics/poroelastic/model.hh b/dumux/geomechanics/poroelastic/model.hh
index c2eac3e9acc4ca0c366005b244ee022a848f30dd..abb8d1e2b04490e5b18a6044235e2a8d4fc873be 100644
--- a/dumux/geomechanics/poroelastic/model.hh
+++ b/dumux/geomechanics/poroelastic/model.hh
@@ -32,8 +32,8 @@
 #include <dumux/geomechanics/elastic/indices.hh>
 #include <dumux/geomechanics/elastic/model.hh>
 
-#include <dumux/discretization/hookeslaw.hh>
-#include <dumux/discretization/effectivestresslaw.hh>
+#include <dumux/flux/hookeslaw.hh>
+#include <dumux/flux/effectivestresslaw.hh>
 
 #include "localresidual.hh"
 #include "volumevariables.hh"
diff --git a/dumux/geomechanics/properties.hh b/dumux/geomechanics/properties.hh
index 5e1d44c342ad6183d1a9760f8485b8a8c6ac2d51..7c602d899cca56a63458774691b004602f3febd6 100644
--- a/dumux/geomechanics/properties.hh
+++ b/dumux/geomechanics/properties.hh
@@ -31,7 +31,7 @@
 #include <dumux/material/components/constant.hh>
 #include <dumux/material/solidstates/inertsolidstate.hh>
 #include <dumux/material/solidsystems/inertsolidphase.hh>
-#include <dumux/discretization/hookeslaw.hh>
+#include <dumux/flux/hookeslaw.hh>
 
 #include "stressvariablescache.hh"
 #include "velocityoutput.hh"
diff --git a/dumux/geomechanics/stressvariablescache.hh b/dumux/geomechanics/stressvariablescache.hh
index f1dc05fbe8c139f8a2a59038bcd37d9b027998dd..3c976b3d5fbf2b2f489c9a9ca5c8f81c06c1bd8e 100644
--- a/dumux/geomechanics/stressvariablescache.hh
+++ b/dumux/geomechanics/stressvariablescache.hh
@@ -27,7 +27,7 @@
 #include <dune/common/exceptions.hh>
 
 #include <dumux/discretization/method.hh>
-#include <dumux/discretization/fluxvariablescaching.hh>
+#include <dumux/flux/fluxvariablescaching.hh>
 #include <dumux/discretization/box/fluxvariablescache.hh>
 
 namespace Dumux {
diff --git a/dumux/porousmediumflow/2p1c/darcyslaw.hh b/dumux/porousmediumflow/2p1c/darcyslaw.hh
index 624128bdeb7b0ee365f90a9b9250c65a018280cc..6e3ae6dfe4682af32a459d4b5b131a36f8a9bf15 100644
--- a/dumux/porousmediumflow/2p1c/darcyslaw.hh
+++ b/dumux/porousmediumflow/2p1c/darcyslaw.hh
@@ -28,7 +28,7 @@
 #include <dumux/common/parameters.hh>
 #include <dumux/common/properties.hh>
 #include <dumux/discretization/method.hh>
-#include <dumux/discretization/darcyslaw.hh>
+#include <dumux/flux/darcyslaw.hh>
 
 namespace Dumux
 {
diff --git a/dumux/porousmediumflow/boxdfm/fluxvariablescache.hh b/dumux/porousmediumflow/boxdfm/fluxvariablescache.hh
index cf69e32347622ef00eb5fbc202817792889b6c95..3b49c4dffe6c016015047269408fbf8332a4e436 100644
--- a/dumux/porousmediumflow/boxdfm/fluxvariablescache.hh
+++ b/dumux/porousmediumflow/boxdfm/fluxvariablescache.hh
@@ -28,7 +28,7 @@
 
 #include <dumux/common/properties.hh>
 #include <dumux/discretization/method.hh>
-#include <dumux/discretization/fluxvariablescaching.hh>
+#include <dumux/flux/fluxvariablescaching.hh>
 
 namespace Dumux {
 
diff --git a/dumux/porousmediumflow/fluxvariables.hh b/dumux/porousmediumflow/fluxvariables.hh
index ef15dc6d2e64b9927f0b9366aefb13d38a120cbd..080ed71282bc75b402c24aea204c0ce7b64cf77f 100644
--- a/dumux/porousmediumflow/fluxvariables.hh
+++ b/dumux/porousmediumflow/fluxvariables.hh
@@ -27,8 +27,8 @@
 #include <array>
 
 #include <dumux/common/properties.hh>
-#include <dumux/discretization/fluxvariablesbase.hh>
-#include <dumux/discretization/upwindscheme.hh>
+#include <dumux/flux/fluxvariablesbase.hh>
+#include <dumux/flux/upwindscheme.hh>
 
 namespace Dumux {
 
diff --git a/dumux/porousmediumflow/fluxvariablescache.hh b/dumux/porousmediumflow/fluxvariablescache.hh
index f35e0e691ca53c0d6b6375bec36d088d8c016450..774b6ba151fa8fde37aebf367b947d2a2e5bf3be 100644
--- a/dumux/porousmediumflow/fluxvariablescache.hh
+++ b/dumux/porousmediumflow/fluxvariablescache.hh
@@ -25,7 +25,7 @@
 
 #include <dumux/common/properties.hh>
 #include <dumux/discretization/method.hh>
-#include <dumux/discretization/fluxvariablescaching.hh>
+#include <dumux/flux/fluxvariablescaching.hh>
 #include <dumux/discretization/box/fluxvariablescache.hh>
 
 namespace Dumux {
diff --git a/dumux/porousmediumflow/nonequilibrium/model.hh b/dumux/porousmediumflow/nonequilibrium/model.hh
index 1fae5b6f485da8d23a00ec0d516499b9e5758617..1013d4031250b048857bca135bfa10e42a0f4354 100644
--- a/dumux/porousmediumflow/nonequilibrium/model.hh
+++ b/dumux/porousmediumflow/nonequilibrium/model.hh
@@ -30,8 +30,8 @@
 #include <dumux/common/dimensionlessnumbers.hh>
 #include <dumux/material/fluidstates/nonequilibrium.hh>
 
-#include <dumux/discretization/fourierslawnonequilibrium.hh>
-#include <dumux/discretization/fourierslawnonequilibrium.hh>
+#include <dumux/flux/fourierslawnonequilibrium.hh>
+#include <dumux/flux/fourierslawnonequilibrium.hh>
 #include <dumux/porousmediumflow/nonequilibrium/thermal/localresidual.hh>
 #include <dumux/porousmediumflow/nonequilibrium/localresidual.hh>
 
diff --git a/dumux/porousmediumflow/properties.hh b/dumux/porousmediumflow/properties.hh
index f04eb75a8f293e85b5eed3b733740fae9686931d..54273367d9a5f4ddc6971418354a72d1bccee1db 100644
--- a/dumux/porousmediumflow/properties.hh
+++ b/dumux/porousmediumflow/properties.hh
@@ -36,9 +36,9 @@
 #include <dumux/porousmediumflow/compositional/primaryvariableswitch.hh>
 #include <dumux/porousmediumflow/velocityoutput.hh>
 
-#include <dumux/discretization/darcyslaw.hh>
-#include <dumux/discretization/fickslaw.hh>
-#include <dumux/discretization/fourierslaw.hh>
+#include <dumux/flux/darcyslaw.hh>
+#include <dumux/flux/fickslaw.hh>
+#include <dumux/flux/fourierslaw.hh>
 
 #include <dumux/material/solidstates/inertsolidstate.hh>
 #include <dumux/material/solidsystems/inertsolidphase.hh>
diff --git a/dumux/porousmediumflow/tracer/model.hh b/dumux/porousmediumflow/tracer/model.hh
index 7b5f57931a3b6bba0ac2ce50de869d94d78f2a2d..63853886d55f54f762d678f8296380f7d3167a5f 100644
--- a/dumux/porousmediumflow/tracer/model.hh
+++ b/dumux/porousmediumflow/tracer/model.hh
@@ -53,7 +53,7 @@
 
 #include <dumux/common/properties.hh>
 #include <dumux/material/spatialparams/fv1p.hh>
-#include <dumux/discretization/stationaryvelocityfield.hh>
+#include <dumux/flux/stationaryvelocityfield.hh>
 #include <dumux/material/fluidmatrixinteractions/diffusivityconstanttortuosity.hh>
 #include <dumux/porousmediumflow/properties.hh>
 
diff --git a/test/freeflow/navierstokesnc/maxwellstefan/problem.hh b/test/freeflow/navierstokesnc/maxwellstefan/problem.hh
index 34e66b6fb234d644162bfffa6ad9771175aad273..1fdee6b90cdc08de893d7a02eb5e861dd114444a 100644
--- a/test/freeflow/navierstokesnc/maxwellstefan/problem.hh
+++ b/test/freeflow/navierstokesnc/maxwellstefan/problem.hh
@@ -32,7 +32,7 @@
 #include <dumux/material/components/simpleh2o.hh>
 #include <dumux/material/fluidsystems/h2oair.hh>
 
-#include <dumux/discretization/maxwellstefanslaw.hh>
+#include <dumux/flux/maxwellstefanslaw.hh>
 #include <dumux/discretization/staggered/freeflow/properties.hh>
 
 #include <dumux/io/gnuplotinterface.hh>
diff --git a/test/porousmediumflow/1p/implicit/isothermal/problem.hh b/test/porousmediumflow/1p/implicit/isothermal/problem.hh
index 4f5d6bdc47f4be953f41332cfbda6a0c746e03ea..ef54bf707810a5dad87f6066e491dfafc28fb204 100644
--- a/test/porousmediumflow/1p/implicit/isothermal/problem.hh
+++ b/test/porousmediumflow/1p/implicit/isothermal/problem.hh
@@ -38,7 +38,7 @@
 #include "spatialparams.hh"
 
 #if FORCHHEIMER
-#include <dumux/discretization/forchheimerslaw.hh>
+#include <dumux/flux/forchheimerslaw.hh>
 #endif
 
 namespace Dumux {
diff --git a/test/porousmediumflow/2pnc/implicit/diffusion/problem.hh b/test/porousmediumflow/2pnc/implicit/diffusion/problem.hh
index d56ad14ef4c41ccec02ffb1f38a4b80236eec881..b60f44e73e2a6c777009b23c73013934ae9e3ae7 100644
--- a/test/porousmediumflow/2pnc/implicit/diffusion/problem.hh
+++ b/test/porousmediumflow/2pnc/implicit/diffusion/problem.hh
@@ -33,7 +33,7 @@
 #include <dumux/material/fluidsystems/h2on2.hh>
 
 #include "spatialparams.hh"
-#include <dumux/discretization/maxwellstefanslaw.hh>
+#include <dumux/flux/maxwellstefanslaw.hh>
 
 #ifndef DIFFUSIONTYPE // default to Fick's law if not set through CMake
 #define DIFFUSIONTYPE FicksLaw<TypeTag>
diff --git a/test/porousmediumflow/tracer/multicomp/problem.hh b/test/porousmediumflow/tracer/multicomp/problem.hh
index eb7f6e01d16df2fbdda2d73e48dd418c326ae323..0d1054c77ad0611fe31a46a6a9910bfc637ea4e4 100644
--- a/test/porousmediumflow/tracer/multicomp/problem.hh
+++ b/test/porousmediumflow/tracer/multicomp/problem.hh
@@ -35,7 +35,7 @@
 #include <dumux/porousmediumflow/problem.hh>
 
 #include "spatialparams.hh"
-#include <dumux/discretization/maxwellstefanslaw.hh>
+#include <dumux/flux/maxwellstefanslaw.hh>
 
 #include <dumux/io/gnuplotinterface.hh>
 #include <dumux/material/fluidsystems/base.hh>