diff --git a/bin/util/create_cmakelists.py b/bin/util/create_cmakelists.py
new file mode 100644
index 0000000000000000000000000000000000000000..141334def20e0c6d67e5d678c6f7c3e5edceac80
--- /dev/null
+++ b/bin/util/create_cmakelists.py
@@ -0,0 +1,33 @@
+# Import the os module, for the os.walk function
+import os
+import re
+
+# Set the directory you want to start from
+rootDir = '.'
+for folderName, subFolders, files in os.walk(rootDir):
+    subFolders = sorted(subFolders)
+    files = sorted(files)
+
+    cmakelists = open(folderName + "/CMakeLists.txt", "w")
+
+    for subFolder in subFolders:
+        cmakelists.write("add_subdirectory(\"%s\")\n" % subFolder)
+
+    headersExist = False
+    for fileName in files:
+        if fileName != "CMakeLists.txt":
+            headersExist = True
+            break
+
+    if headersExist:
+        if subFolders:
+            cmakelists.write("\n")
+
+        cmakelists.write("install(FILES\n")
+
+        for fileName in files:
+            if fileName != "CMakeLists.txt":
+                cmakelists.write("%s\n" % fileName)
+
+        cmakelists.write("DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/%s)\n" % folderName[2:])
+        cmakelists.close()
diff --git a/bin/moduleutil/createdockerimage.sh b/bin/util/createdockerimage.sh
similarity index 100%
rename from bin/moduleutil/createdockerimage.sh
rename to bin/util/createdockerimage.sh
diff --git a/bin/moduleutil/extractmodulepart.sh b/bin/util/extractmodulepart.sh
similarity index 99%
rename from bin/moduleutil/extractmodulepart.sh
rename to bin/util/extractmodulepart.sh
index 9471bdd4cbac77a3e78795d81f097dc5f4f2ccc4..b2cea1644805d262738f4354675aa52b4949b6a4 100755
--- a/bin/moduleutil/extractmodulepart.sh
+++ b/bin/util/extractmodulepart.sh
@@ -174,7 +174,7 @@ while test "$LAST_REQUIRED_HEADERS" != "$REQUIRED_HEADERS"; do
         cd $(dirname $INCLUDED_HEADER_WITH_PATH)
         HEADER_FULL_PATH=$(pwd)
         HEADER_RELATIVE_PATH=${HEADER_FULL_PATH#$MODULE_FULL_PATH}
-        HEADER_RELATIVE_PATH=$(echo $HEADER_RELATIVE_PATH | sed 's/^.//') 
+        HEADER_RELATIVE_PATH=$(echo $HEADER_RELATIVE_PATH | sed 's/^.//')
         INCLUDED_HEADER_WITH_PATH="${HEADER_RELATIVE_PATH}/${INCLUDED_BASE_NAME}"
         cd $MODULE_FULL_PATH
         echo "$INCLUDED_HEADER_WITH_PATH" >> tmp_header_file
@@ -193,7 +193,7 @@ rm -f tmp_header_file
 echo ""
 echo -n "Number of required headers: "
 echo "$REQUIRED_HEADERS" | wc -w
-for HEADER in $REQUIRED_HEADERS; do 
+for HEADER in $REQUIRED_HEADERS; do
   echo $HEADER
   rsync -R $HEADER ../$MODULE_NAME
 done
diff --git a/bin/moduleutil/getusedversions.sh b/bin/util/getusedversions.sh
similarity index 100%
rename from bin/moduleutil/getusedversions.sh
rename to bin/util/getusedversions.sh
diff --git a/dumux/CMakeLists.txt b/dumux/CMakeLists.txt
index 61918c6fcfcd81959d5039aba1e750ef7553645d..2f0ad3bee0f208331195f6f191b16b39ea2a1fa4 100644
--- a/dumux/CMakeLists.txt
+++ b/dumux/CMakeLists.txt
@@ -1,13 +1,12 @@
-add_subdirectory("adaptive")
-add_subdirectory("assembly")
-add_subdirectory("common")
-add_subdirectory("discretization")
-add_subdirectory("geomechanics")
-add_subdirectory("freeflow")
-add_subdirectory("io")
-add_subdirectory("linear")
-add_subdirectory("material")
-#add_subdirectory("mixeddimension")
-add_subdirectory("nonlinear")
-add_subdirectory("parallel")
-add_subdirectory("porousmediumflow")
+add_subdirectory(adaptive)
+add_subdirectory(assembly)
+add_subdirectory(common)
+add_subdirectory(discretization)
+add_subdirectory(freeflow)
+add_subdirectory(geomechanics)
+add_subdirectory(io)
+add_subdirectory(linear)
+add_subdirectory(material)
+add_subdirectory(nonlinear)
+add_subdirectory(parallel)
+add_subdirectory(porousmediumflow)
diff --git a/dumux/adaptive/CMakeLists.txt b/dumux/adaptive/CMakeLists.txt
index 5f56a25371676e4a1b0700f6431e71e20e7e93e6..5dbeab8bccd9fd8dbd2b799c2f55b2e5b45b2eed 100644
--- a/dumux/adaptive/CMakeLists.txt
+++ b/dumux/adaptive/CMakeLists.txt
@@ -1,4 +1,3 @@
-#install sources
 install(FILES
 adapt.hh
 griddatatransfer.hh
diff --git a/dumux/assembly/CMakeLists.txt b/dumux/assembly/CMakeLists.txt
index bd2ebb628d681a0c1f904bbd7bd1e3b195791f25..4c77dc4373d20fa8d6bb09dafa75781f45828373 100644
--- a/dumux/assembly/CMakeLists.txt
+++ b/dumux/assembly/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 install(FILES
 boxlocalassembler.hh
 boxlocalresidual.hh
@@ -10,6 +9,7 @@ fvassembler.hh
 fvlocalassemblerbase.hh
 fvlocalresidual.hh
 jacobianpattern.hh
+numericepsilon.hh
 partialreassembler.hh
 staggeredfvassembler.hh
 staggeredlocalassembler.hh
diff --git a/dumux/common/CMakeLists.txt b/dumux/common/CMakeLists.txt
index 71a968c2b864435d892f96bad2f8b2a052baf1dc..e7d5753277724e689b5578ffdf0f26dd363267b6 100644
--- a/dumux/common/CMakeLists.txt
+++ b/dumux/common/CMakeLists.txt
@@ -1,13 +1,14 @@
-add_subdirectory(properties)
 add_subdirectory(geometry)
+add_subdirectory(properties)
+add_subdirectory(typetraits)
 
-#install headers
 install(FILES
 balanceequationopts.hh
 boundaryconditions.hh
 boundaryflag.hh
 boundarytypes.hh
 boundingboxtree.hh
+defaultmappertraits.hh
 defaultusagemessage.hh
 dimensionlessnumbers.hh
 dumuxmessage.hh
@@ -20,18 +21,20 @@ intrange.hh
 loggingparametertree.hh
 math.hh
 matrixvectorhelper.hh
-optional.hh
 numericdifferentiation.hh
+optional.hh
 parameters.hh
 pointsource.hh
 properties.hh
 quad.hh
 reorderingdofmapper.hh
+reservedblockvector.hh
 spline.hh
 splinecommon_.hh
 staggeredfvproblem.hh
 start.hh
 tabulated2dfunction.hh
+timeloop.hh
 timemanager.hh
 valgrind.hh
 variablelengthspline_.hh
diff --git a/dumux/common/geometry/CMakeLists.txt b/dumux/common/geometry/CMakeLists.txt
index 252f84e8e905583b4237f1ef2bed3b1cfafdcc37..25d3a6a071cc599c61cc66061cfd12b5eec212dc 100644
--- a/dumux/common/geometry/CMakeLists.txt
+++ b/dumux/common/geometry/CMakeLists.txt
@@ -1,10 +1,11 @@
-
-#install headers
 install(FILES
 boundingboxtree.hh
 boundingboxtreeintersection.hh
 geometricentityset.hh
+geometryintersection.hh
+grahamconvexhull.hh
 intersectingentities.hh
 intersectspointgeometry.hh
 intersectspointsimplex.hh
+makegeometry.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/common/geometry)
diff --git a/dumux/common/properties/CMakeLists.txt b/dumux/common/properties/CMakeLists.txt
index e60bf0e0804d4d9962c7b728048e1adee3176976..52bf5515f1453d05ead6a4438d3c78e02836a66a 100644
--- a/dumux/common/properties/CMakeLists.txt
+++ b/dumux/common/properties/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
 install(FILES
 grid.hh
 model.hh
diff --git a/dumux/common/typetraits/CMakeLists.txt b/dumux/common/typetraits/CMakeLists.txt
index f71dd84a50c7ae4e60327b1ecb0ea273ebb15675..6a7f753cad82a294247bd1bc8c99041a6bdef485 100644
--- a/dumux/common/typetraits/CMakeLists.txt
+++ b/dumux/common/typetraits/CMakeLists.txt
@@ -1,6 +1,6 @@
-#install headers
 install(FILES
+isvalid.hh
 matrix.hh
+typetraits.hh
 vector.hh
-isvalid.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/common/typetraits)
diff --git a/dumux/discretization/CMakeLists.txt b/dumux/discretization/CMakeLists.txt
index 1db77918eeddcf5ba017d7dbba7b867403ce610a..a55ac8b0ff9b4c3e3cdd089835c164b9d08ce049 100644
--- a/dumux/discretization/CMakeLists.txt
+++ b/dumux/discretization/CMakeLists.txt
@@ -1,10 +1,12 @@
-add_subdirectory("box")
-add_subdirectory("cellcentered")
-add_subdirectory("staggered")
+add_subdirectory(box)
+add_subdirectory(cellcentered)
+add_subdirectory(staggered)
 
 install(FILES
 basefvgridgeometry.hh
 darcyslaw.hh
+effectivestresslaw.hh
+elementsolution.hh
 evalgradients.hh
 evalsolution.hh
 fickslaw.hh
@@ -12,8 +14,12 @@ fluxstencil.hh
 fluxvariablesbase.hh
 fluxvariablescaching.hh
 fourierslaw.hh
+fourierslawnonequilibrium.hh
 fvgridvariables.hh
 fvproperties.hh
+hookeslaw.hh
+localview.hh
+maxwellstefanslaw.hh
 methods.hh
 scvandscvfiterators.hh
 stationaryvelocityfield.hh
diff --git a/dumux/discretization/box/CMakeLists.txt b/dumux/discretization/box/CMakeLists.txt
index 4e70dc703d5bb0cc932bef025c29dbd7c0793eb0..4f630fb250f56e08e2e80065051ae6592f3dabdd 100644
--- a/dumux/discretization/box/CMakeLists.txt
+++ b/dumux/discretization/box/CMakeLists.txt
@@ -1,17 +1,21 @@
-
 install(FILES
 boxgeometryhelper.hh
 darcyslaw.hh
+effectivestresslaw.hh
 elementboundarytypes.hh
 elementfluxvariablescache.hh
 elementsolution.hh
 elementvolumevariables.hh
 fickslaw.hh
+fluxvariablescache.hh
 fourierslaw.hh
+fourierslawnonequilibrium.hh
 fvelementgeometry.hh
 fvgridgeometry.hh
 gridfluxvariablescache.hh
 gridvolumevariables.hh
+hookeslaw.hh
+maxwellstefanslaw.hh
 properties.hh
 scvftoscvboundarytypes.hh
 subcontrolvolume.hh
diff --git a/dumux/discretization/cellcentered/CMakeLists.txt b/dumux/discretization/cellcentered/CMakeLists.txt
index 0e7f879f9b1c2ddb0289b5507fdd42e4712ac69a..2875cef25e58a54ca53f3b0182c24b05490ed6ad 100644
--- a/dumux/discretization/cellcentered/CMakeLists.txt
+++ b/dumux/discretization/cellcentered/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_subdirectory("tpfa")
-add_subdirectory("mpfa")
+add_subdirectory(mpfa)
+add_subdirectory(tpfa)
 
 install(FILES
 connectivitymap.hh
diff --git a/dumux/discretization/cellcentered/mpfa/CMakeLists.txt b/dumux/discretization/cellcentered/mpfa/CMakeLists.txt
index a77788d00fdce86f2d5275a4503a91d19c0df2ca..d1940659e201b9a8ba3bc6d6796fb655800bc45e 100644
--- a/dumux/discretization/cellcentered/mpfa/CMakeLists.txt
+++ b/dumux/discretization/cellcentered/mpfa/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_subdirectory("omethod")
+add_subdirectory(omethod)
 
 install(FILES
 computetransmissibility.hh
@@ -12,8 +12,10 @@ fluxvariablescachefiller.hh
 fourierslaw.hh
 fvelementgeometry.hh
 fvgridgeometry.hh
+fvgridgeometrytraits.hh
 gridfluxvariablescache.hh
 gridinteractionvolumeindexsets.hh
+gridvolumevariables.hh
 helper.hh
 interactionvolumebase.hh
 interactionvolumedatahandle.hh
diff --git a/dumux/discretization/cellcentered/tpfa/CMakeLists.txt b/dumux/discretization/cellcentered/tpfa/CMakeLists.txt
index d26039f556a7f500130bb6be516531a00543935e..7ac7f783507d514c4c0f4380c64200b38bbb5b6b 100644
--- a/dumux/discretization/cellcentered/tpfa/CMakeLists.txt
+++ b/dumux/discretization/cellcentered/tpfa/CMakeLists.txt
@@ -1,5 +1,4 @@
 install(FILES
-CMakeLists.txt
 computetransmissibility.hh
 darcyslaw.hh
 elementfluxvariablescache.hh
@@ -10,6 +9,8 @@ fourierslaw.hh
 fvelementgeometry.hh
 fvgridgeometry.hh
 gridfluxvariablescache.hh
+gridvolumevariables.hh
+maxwellstefanslaw.hh
 properties.hh
 subcontrolvolumeface.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/discretization/cellcentered/tpfa)
diff --git a/dumux/discretization/staggered/CMakeLists.txt b/dumux/discretization/staggered/CMakeLists.txt
index a792fb69ba3ff5558ae006ccd12efd27d2b86c14..910de10785f40496f9aee680b7a5f788ec2ff42a 100644
--- a/dumux/discretization/staggered/CMakeLists.txt
+++ b/dumux/discretization/staggered/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_subdirectory("freeflow")
+add_subdirectory(freeflow)
 
 install(FILES
 elementfacevariables.hh
diff --git a/dumux/discretization/staggered/freeflow/CMakeLists.txt b/dumux/discretization/staggered/freeflow/CMakeLists.txt
index e8636acf2356a1706d357d91b477d45943b0b550..89e3125719b871dec9f8184460127ae46d95117b 100644
--- a/dumux/discretization/staggered/freeflow/CMakeLists.txt
+++ b/dumux/discretization/staggered/freeflow/CMakeLists.txt
@@ -1,12 +1,15 @@
-
 install(FILES
 boundarytypes.hh
+connectivitymap.hh
+elementvolumevariables.hh
 facevariables.hh
 fickslaw.hh
 fourierslaw.hh
+fvgridgeometrytraits.hh
+gridvolumevariables.hh
 maxwellstefanslaw.hh
 properties.hh
 staggeredgeometryhelper.hh
 subcontrolvolumeface.hh
 velocityoutput.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/discretization/freeflow)
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/discretization/staggered/freeflow)
diff --git a/dumux/freeflow/CMakeLists.txt b/dumux/freeflow/CMakeLists.txt
index 0888d49c5c7b0b29ab6e9be2eaed07661f8f24f2..318f762168f1509c66e1f3c7e1b5f8cac466943e 100644
--- a/dumux/freeflow/CMakeLists.txt
+++ b/dumux/freeflow/CMakeLists.txt
@@ -1,4 +1,10 @@
-add_subdirectory("compositional")
-add_subdirectory("navierstokes")
-add_subdirectory("nonisothermal")
-add_subdirectory("rans")
+add_subdirectory(compositional)
+add_subdirectory(navierstokes)
+add_subdirectory(nonisothermal)
+add_subdirectory(rans)
+
+install(FILES
+properties.hh
+turbulenceproperties.hh
+volumevariables.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/freeflow)
diff --git a/dumux/freeflow/compositional/CMakeLists.txt b/dumux/freeflow/compositional/CMakeLists.txt
index 4be489a57036df61daf21c27e23f3ae3148166d4..ddd32e167c4c7415e6ebe3af2afed6b63c02f05a 100644
--- a/dumux/freeflow/compositional/CMakeLists.txt
+++ b/dumux/freeflow/compositional/CMakeLists.txt
@@ -1,12 +1,11 @@
-add_subdirectory("staggered")
+add_subdirectory(staggered)
 
-#install headers
 install(FILES
 fluxvariables.hh
 indices.hh
 localresidual.hh
-navierstokesncmodel.hh
 lowrekepsilonncmodel.hh
+navierstokesncmodel.hh
 volumevariables.hh
 vtkoutputfields.hh
 zeroeqncmodel.hh
diff --git a/dumux/freeflow/compositional/staggered/CMakeLists.txt b/dumux/freeflow/compositional/staggered/CMakeLists.txt
index 112b4aeb7ff91d16094b0e187ce626a60d4de5f2..c00b51bc13b523a1a9bfc41868d55a128dbd274a 100644
--- a/dumux/freeflow/compositional/staggered/CMakeLists.txt
+++ b/dumux/freeflow/compositional/staggered/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
 install(FILES
 fluxvariables.hh
 localresidual.hh
diff --git a/dumux/freeflow/navierstokes/CMakeLists.txt b/dumux/freeflow/navierstokes/CMakeLists.txt
index a00d0a700888f72e9ceeee56a25ce1b721f44638..15433fa7434c7f74f7a5f7e0b0400bdfb4f297c3 100644
--- a/dumux/freeflow/navierstokes/CMakeLists.txt
+++ b/dumux/freeflow/navierstokes/CMakeLists.txt
@@ -1,6 +1,5 @@
-add_subdirectory("staggered")
+add_subdirectory(staggered)
 
-#install headers
 install(FILES
 fluxvariables.hh
 fluxvariablescache.hh
diff --git a/dumux/freeflow/navierstokes/staggered/CMakeLists.txt b/dumux/freeflow/navierstokes/staggered/CMakeLists.txt
index d12ae0320aa19d72907b30cb8945ef2968c7f4d4..5d59b30262acbbf8b4c049b917e591cdc1a74ba7 100644
--- a/dumux/freeflow/navierstokes/staggered/CMakeLists.txt
+++ b/dumux/freeflow/navierstokes/staggered/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
 install(FILES
 fluxoversurface.hh
 fluxvariables.hh
diff --git a/dumux/freeflow/nonisothermal/CMakeLists.txt b/dumux/freeflow/nonisothermal/CMakeLists.txt
index 1f1856fa57efc0aa6e98aec8bbe11e7b832f9165..32acf8d65002420cd0cf13dd37f0785d0e115c71 100644
--- a/dumux/freeflow/nonisothermal/CMakeLists.txt
+++ b/dumux/freeflow/nonisothermal/CMakeLists.txt
@@ -1,7 +1,6 @@
-
-#install headers
 install(FILES
 indices.hh
+localresidual.hh
 model.hh
 vtkoutputfields.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/freeflow/nonisothermal)
diff --git a/dumux/freeflow/rans/CMakeLists.txt b/dumux/freeflow/rans/CMakeLists.txt
index 4aa29042dbfee63483572984cba91199c494ad6f..86696f58eff528a8b36dbe735d4168daa3f0cb73 100644
--- a/dumux/freeflow/rans/CMakeLists.txt
+++ b/dumux/freeflow/rans/CMakeLists.txt
@@ -1,7 +1,6 @@
-add_subdirectory("twoeq")
-add_subdirectory("zeroeq")
+add_subdirectory(twoeq)
+add_subdirectory(zeroeq)
 
-#install headers
 install(FILES
 model.hh
 problem.hh
diff --git a/dumux/freeflow/rans/twoeq/CMakeLists.txt b/dumux/freeflow/rans/twoeq/CMakeLists.txt
index ee8d7de6fc7399445c4ec478c02a4a856e8b926d..3778f272e5315c193e1fa36ff977d8e93a891eca 100644
--- a/dumux/freeflow/rans/twoeq/CMakeLists.txt
+++ b/dumux/freeflow/rans/twoeq/CMakeLists.txt
@@ -1,2 +1,2 @@
-add_subdirectory("kepsilon")
-add_subdirectory("lowrekepsilon")
+add_subdirectory(kepsilon)
+add_subdirectory(lowrekepsilon)
diff --git a/dumux/freeflow/rans/twoeq/kepsilon/CMakeLists.txt b/dumux/freeflow/rans/twoeq/kepsilon/CMakeLists.txt
index 1f77d858e5177b169536da8dca85bb9d9f7052cb..667725cb2d4109e848d48cf20e1320bbc317271d 100644
--- a/dumux/freeflow/rans/twoeq/kepsilon/CMakeLists.txt
+++ b/dumux/freeflow/rans/twoeq/kepsilon/CMakeLists.txt
@@ -1,10 +1,10 @@
-#install headers
+add_subdirectory(staggered)
+
 install(FILES
 fluxvariables.hh
 indices.hh
 localresidual.hh
 model.hh
-# models.hh
 problem.hh
 volumevariables.hh
 vtkoutputfields.hh
diff --git a/dumux/freeflow/rans/twoeq/kepsilon/staggered/CMakeLists.txt b/dumux/freeflow/rans/twoeq/kepsilon/staggered/CMakeLists.txt
index bbbf90a8c6582d728da226f48e959d3d1a164feb..1cb45e4c243701e0af18d5c07d1d5747549b3f06 100644
--- a/dumux/freeflow/rans/twoeq/kepsilon/staggered/CMakeLists.txt
+++ b/dumux/freeflow/rans/twoeq/kepsilon/staggered/CMakeLists.txt
@@ -1,4 +1,3 @@
-#install headers
 install(FILES
 fluxvariables.hh
 localresidual.hh
diff --git a/dumux/freeflow/rans/twoeq/lowrekepsilon/CMakeLists.txt b/dumux/freeflow/rans/twoeq/lowrekepsilon/CMakeLists.txt
index a83eea49537af1cc449c30a2043e2afe1f1f18f8..5d7f7ab24335663949b164e94fbc06e6964f63ea 100644
--- a/dumux/freeflow/rans/twoeq/lowrekepsilon/CMakeLists.txt
+++ b/dumux/freeflow/rans/twoeq/lowrekepsilon/CMakeLists.txt
@@ -1,10 +1,10 @@
-#install headers
+add_subdirectory(staggered)
+
 install(FILES
 fluxvariables.hh
 indices.hh
 localresidual.hh
 model.hh
-# models.hh
 problem.hh
 volumevariables.hh
 vtkoutputfields.hh
diff --git a/dumux/freeflow/rans/twoeq/lowrekepsilon/staggered/CMakeLists.txt b/dumux/freeflow/rans/twoeq/lowrekepsilon/staggered/CMakeLists.txt
index ac06a7249845a66f4288a4e2d10a2e194391f826..b2f6e23970816302912338ff6976a050ecb41cf9 100644
--- a/dumux/freeflow/rans/twoeq/lowrekepsilon/staggered/CMakeLists.txt
+++ b/dumux/freeflow/rans/twoeq/lowrekepsilon/staggered/CMakeLists.txt
@@ -1,4 +1,3 @@
-#install headers
 install(FILES
 fluxvariables.hh
 localresidual.hh
diff --git a/dumux/freeflow/rans/zeroeq/CMakeLists.txt b/dumux/freeflow/rans/zeroeq/CMakeLists.txt
index 24c5d3e332d68b052fc221df413c8cf9e4b0aec6..f73d39dad09f9f83b422b78a5fb5e7857872bdd4 100644
--- a/dumux/freeflow/rans/zeroeq/CMakeLists.txt
+++ b/dumux/freeflow/rans/zeroeq/CMakeLists.txt
@@ -1,4 +1,3 @@
-#install headers
 install(FILES
 model.hh
 problem.hh
diff --git a/dumux/geomechanics/CMakeLists.txt b/dumux/geomechanics/CMakeLists.txt
index 5b4bd9952f29ca189c32e36e8b7d872aabce9430..22205305a56f1b6a245fa1570d4f889962f83ffd 100644
--- a/dumux/geomechanics/CMakeLists.txt
+++ b/dumux/geomechanics/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_subdirectory("elastic")
-add_subdirectory("poroelastic")
+add_subdirectory(elastic)
+add_subdirectory(poroelastic)
 
 install(FILES
 fvproblem.hh
diff --git a/dumux/io/CMakeLists.txt b/dumux/io/CMakeLists.txt
index 90e7fdbf2536db78ce4881da96c0a29b35c49af7..d617dc5ef7541da43320b739ef7433186caceed1 100644
--- a/dumux/io/CMakeLists.txt
+++ b/dumux/io/CMakeLists.txt
@@ -1,13 +1,22 @@
 install(FILES
-  adaptivegridrestart.hh
-  container.hh
-  cpgridcreator.hh
-  gnuplotinterface.hh
-  gridcreator.hh
-  ploteffectivediffusivitymodel.hh
-  plotmateriallaw.hh
-  plotmateriallaw3p.hh
-  plotthermalconductivitymodel.hh
-  restart.hh
-  vtknestedfunction.hh
-  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/io)
+adaptivegridrestart.hh
+cakegridcreator.hh
+container.hh
+cpgridcreator.hh
+defaultvtkoutputfields.hh
+gnuplotinterface.hh
+gridcreator.hh
+ploteffectivediffusivitymodel.hh
+plotmateriallaw.hh
+plotmateriallaw3p.hh
+plotthermalconductivitymodel.hh
+pointcloudvtkwriter.hh
+restart.hh
+staggeredvtkoutputmodule.hh
+subgridgridcreator.hh
+vtkfunction.hh
+vtkmultiwriter.hh
+vtknestedfunction.hh
+vtkoutputmodule.hh
+vtksequencewriter.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/io)
diff --git a/dumux/linear/CMakeLists.txt b/dumux/linear/CMakeLists.txt
index 1c7080066724f65e90bb90ef46c39d005199b54e..22c6670cfbc9af3851a35494e2a6fd5ba8b4fd6a 100644
--- a/dumux/linear/CMakeLists.txt
+++ b/dumux/linear/CMakeLists.txt
@@ -1,4 +1,3 @@
-#install headers
 install(FILES
 amgbackend.hh
 amgparallelhelpers.hh
diff --git a/dumux/material/CMakeLists.txt b/dumux/material/CMakeLists.txt
index 40cabdc6276a8097cc2daf225261201eebb0e50e..43ad7f372faee2e028ecd9a16978775e44003e23 100644
--- a/dumux/material/CMakeLists.txt
+++ b/dumux/material/CMakeLists.txt
@@ -1,16 +1,15 @@
-add_subdirectory("binarycoefficients")
-add_subdirectory("chemistry")
-add_subdirectory("components")
-add_subdirectory("constraintsolvers")
-add_subdirectory("eos")
-add_subdirectory("fluidmatrixinteractions")
-add_subdirectory("fluidstates")
-add_subdirectory("fluidsystems")
-add_subdirectory("spatialparams")
-add_subdirectory("solidsystems")
-add_subdirectory("solidstates")
+add_subdirectory(binarycoefficients)
+add_subdirectory(chemistry)
+add_subdirectory(components)
+add_subdirectory(constraintsolvers)
+add_subdirectory(eos)
+add_subdirectory(fluidmatrixinteractions)
+add_subdirectory(fluidstates)
+add_subdirectory(fluidsystems)
+add_subdirectory(solidstates)
+add_subdirectory(solidsystems)
+add_subdirectory(spatialparams)
 
-#install headers
 install(FILES
 constants.hh
 idealgas.hh
diff --git a/dumux/material/binarycoefficients/CMakeLists.txt b/dumux/material/binarycoefficients/CMakeLists.txt
index 488f6622147c34981571697a46f8ae203b9baafd..b0dfe4b88f43b0feaaad2e233282e04bb77f9700 100644
--- a/dumux/material/binarycoefficients/CMakeLists.txt
+++ b/dumux/material/binarycoefficients/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
 install(FILES
 air_mesitylene.hh
 air_xylene.hh
@@ -7,6 +5,7 @@ brine_air.hh
 brine_co2.hh
 fullermethod.hh
 h2o_air.hh
+h2o_ch4.hh
 h2o_constant.hh
 h2o_heavyoil.hh
 h2o_mesitylene.hh
diff --git a/dumux/material/chemistry/CMakeLists.txt b/dumux/material/chemistry/CMakeLists.txt
index 346231785d611d741d0d73fe6a91e0e9e8aac7da..bd0aa945c7da81a3ebbdd93a4b7d8480ef51b25f 100644
--- a/dumux/material/chemistry/CMakeLists.txt
+++ b/dumux/material/chemistry/CMakeLists.txt
@@ -1 +1 @@
-add_subdirectory("electrochemistry")
+add_subdirectory(electrochemistry)
diff --git a/dumux/material/chemistry/electrochemistry/CMakeLists.txt b/dumux/material/chemistry/electrochemistry/CMakeLists.txt
index e38e6c8fd9836f44d3060c1b9c095d006320a999..f38151d68fc0e77abbcd82a80db7646fda10c0c8 100644
--- a/dumux/material/chemistry/electrochemistry/CMakeLists.txt
+++ b/dumux/material/chemistry/electrochemistry/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
 install(FILES
 electrochemistry.hh
 electrochemistryni.hh
diff --git a/dumux/material/components/CMakeLists.txt b/dumux/material/components/CMakeLists.txt
index 485bc5b4bd303da73ad02c5deea009f2776ed469..6450b2173ea483edabeed7ac1a30cf1d71478811 100644
--- a/dumux/material/components/CMakeLists.txt
+++ b/dumux/material/components/CMakeLists.txt
@@ -1,8 +1,8 @@
-add_subdirectory("iapws")
+add_subdirectory(iapws)
 
-#install headers
 install(FILES
 air.hh
+base.hh
 benzene.hh
 brine.hh
 cao.hh
@@ -11,17 +11,21 @@ ch4.hh
 co2.hh
 co2tablereader.hh
 co2tables.inc
+componenttraits.hh
 constant.hh
+gas.hh
 granite.hh
 h2.hh
 h2o.hh
 heavyoil.hh
+liquid.hh
 mesitylene.hh
 n2.hh
 nacl.hh
 o2.hh
 simpleco2.hh
 simpleh2o.hh
+solid.hh
 tabulatedcomponent.hh
 trichloroethene.hh
 xylene.hh
diff --git a/dumux/material/components/iapws/CMakeLists.txt b/dumux/material/components/iapws/CMakeLists.txt
index a7129275ab7d71f9dae4b7fcfbe23fb8db46a2a7..1d489e0751fd588e4012ebb0f4c6c135317de453 100644
--- a/dumux/material/components/iapws/CMakeLists.txt
+++ b/dumux/material/components/iapws/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
 install(FILES
 common.hh
 region1.hh
diff --git a/dumux/material/constraintsolvers/CMakeLists.txt b/dumux/material/constraintsolvers/CMakeLists.txt
index e7d03978dc5c728598345b011390f2f0f7e1c35f..0b165391a3dc122fbd735070a2ed5d4a81704e71 100644
--- a/dumux/material/constraintsolvers/CMakeLists.txt
+++ b/dumux/material/constraintsolvers/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
 install(FILES
 compositionalflash.hh
 compositionfromfugacities.hh
diff --git a/dumux/material/eos/CMakeLists.txt b/dumux/material/eos/CMakeLists.txt
index f9ffed4fcf80a025a4ecd67b42dc7b122f261bd2..9166d44fec56d1e220db4bb57f1c48f40473d28a 100644
--- a/dumux/material/eos/CMakeLists.txt
+++ b/dumux/material/eos/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
 install(FILES
 pengrobinson.hh
 pengrobinsonmixture.hh
diff --git a/dumux/material/fluidmatrixinteractions/1p/CMakeLists.txt b/dumux/material/fluidmatrixinteractions/1p/CMakeLists.txt
index 6ce4782dde667515ecf375c73fa78801a36ff9b1..35a5ae525508d87566aa0ef360c1b24c7c345257 100644
--- a/dumux/material/fluidmatrixinteractions/1p/CMakeLists.txt
+++ b/dumux/material/fluidmatrixinteractions/1p/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
 install(FILES
 thermalconductivityaverage.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/material/fluidmatrixinteractions/1p)
diff --git a/dumux/material/fluidmatrixinteractions/2p/CMakeLists.txt b/dumux/material/fluidmatrixinteractions/2p/CMakeLists.txt
index 05bb74d80ebe4354bd8df03407f6e1a3af697048..6f6255385f4bac08ca179727e6946cdd8cdfe876 100644
--- a/dumux/material/fluidmatrixinteractions/2p/CMakeLists.txt
+++ b/dumux/material/fluidmatrixinteractions/2p/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
 install(FILES
 brookscorey.hh
 brookscoreyparams.hh
diff --git a/dumux/material/fluidmatrixinteractions/2pia/CMakeLists.txt b/dumux/material/fluidmatrixinteractions/2pia/CMakeLists.txt
index 589bd97299afe008ddc97defb815ec0e7a7b43bb..4040d3bc88bb94d6831f70c691f388ddba601fc4 100644
--- a/dumux/material/fluidmatrixinteractions/2pia/CMakeLists.txt
+++ b/dumux/material/fluidmatrixinteractions/2pia/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
 install(FILES
 awnsurfaceexpfct.hh
 awnsurfaceexpfctparams.hh
diff --git a/dumux/material/fluidmatrixinteractions/3p/CMakeLists.txt b/dumux/material/fluidmatrixinteractions/3p/CMakeLists.txt
index 7d5371e22aeed3a5b1016e5d17e205fa381e4724..63d05e3b0364413bb1b3d841d2473e1aeb55ebeb 100644
--- a/dumux/material/fluidmatrixinteractions/3p/CMakeLists.txt
+++ b/dumux/material/fluidmatrixinteractions/3p/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
 install(FILES
 efftoabslaw.hh
 efftoabslawparams.hh
diff --git a/dumux/material/fluidmatrixinteractions/CMakeLists.txt b/dumux/material/fluidmatrixinteractions/CMakeLists.txt
index 72b92a74513e4ca92a22a44a448032e5558bc3ce..a7cb05704f2e9e76a3be97df5d525a4bcc353703 100644
--- a/dumux/material/fluidmatrixinteractions/CMakeLists.txt
+++ b/dumux/material/fluidmatrixinteractions/CMakeLists.txt
@@ -1,11 +1,10 @@
-add_subdirectory("1p")
-add_subdirectory("2p")
-add_subdirectory("2pia")
-add_subdirectory("3p")
-add_subdirectory("mp")
-add_subdirectory("mineralization")
+add_subdirectory(1p)
+add_subdirectory(2p)
+add_subdirectory(2pia)
+add_subdirectory(3p)
+add_subdirectory(mineralization)
+add_subdirectory(mp)
 
-#install headers
 install(FILES
 diffusivityconstanttortuosity.hh
 diffusivitymillingtonquirk.hh
diff --git a/dumux/material/fluidmatrixinteractions/mineralization/CMakeLists.txt b/dumux/material/fluidmatrixinteractions/mineralization/CMakeLists.txt
index 6034e22bf8da74a6ec6649342dc6fdfb6e5fded6..a35494f0e5ed4ba89ff92d3873ce33878676f22f 100644
--- a/dumux/material/fluidmatrixinteractions/mineralization/CMakeLists.txt
+++ b/dumux/material/fluidmatrixinteractions/mineralization/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
 install(FILES
 effectivesoliddensity.hh
 effectivesolidheatcapacity.hh
diff --git a/dumux/material/fluidmatrixinteractions/mp/CMakeLists.txt b/dumux/material/fluidmatrixinteractions/mp/CMakeLists.txt
index 6d920f7c34b26c7bbbd6740b5e190c9a80c33c6b..1e3eda3176ae69248539d6f629b3b4ac543f5cca 100644
--- a/dumux/material/fluidmatrixinteractions/mp/CMakeLists.txt
+++ b/dumux/material/fluidmatrixinteractions/mp/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
 install(FILES
 2padapter.hh
 2poftadapter.hh
diff --git a/dumux/material/fluidstates/CMakeLists.txt b/dumux/material/fluidstates/CMakeLists.txt
index 7dfb611501406a89820e10851ba2355477add6ce..e331e3367a1ddd4ed120a69cf95942a52e27b3a8 100644
--- a/dumux/material/fluidstates/CMakeLists.txt
+++ b/dumux/material/fluidstates/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
 install(FILES
 2p2c.hh
 compositional.hh
@@ -9,6 +7,7 @@ nonequilibrium.hh
 nonequilibriumenergy.hh
 nonequilibriummass.hh
 pressureoverlay.hh
+pseudo1p2c.hh
 saturationoverlay.hh
 temperatureoverlay.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/material/fluidstates)
diff --git a/dumux/material/fluidsystems/CMakeLists.txt b/dumux/material/fluidsystems/CMakeLists.txt
index 3b5f1e5c864d37c83eb13aa7fa7d8cdf2244e1d7..6a0a87ff75ffb8f54b20cc0f2ce0e336bdd86463 100644
--- a/dumux/material/fluidsystems/CMakeLists.txt
+++ b/dumux/material/fluidsystems/CMakeLists.txt
@@ -1,22 +1,22 @@
 install(FILES
-  1pgas.hh
-  1pliquid.hh
-  2p1c.hh
-  2pimmiscible.hh
-  3pimmiscible.hh
-  base.hh
-  brineair.hh
-  brineco2.hh
-  h2oair.hh
-  h2oairmesitylene.hh
-  h2oairxylene.hh
-  h2oheavyoil.hh
-  h2on2.hh
-  h2on2kinetic.hh
-  h2on2o2.hh
-  liquidphase2c.hh
-  nullparametercache.hh
-  parametercachebase.hh
-  spe5.hh
-  spe5parametercache.hh
-  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/material/fluidsystems)
+1pgas.hh
+1pliquid.hh
+2p1c.hh
+2pimmiscible.hh
+3pimmiscible.hh
+base.hh
+brineair.hh
+brineco2.hh
+h2oair.hh
+h2oairmesitylene.hh
+h2oairxylene.hh
+h2oheavyoil.hh
+h2on2.hh
+h2on2kinetic.hh
+h2on2o2.hh
+liquidphase2c.hh
+nullparametercache.hh
+parametercachebase.hh
+spe5.hh
+spe5parametercache.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/material/fluidsystems)
diff --git a/dumux/material/solidstates/CMakeLists.txt b/dumux/material/solidstates/CMakeLists.txt
index c8ae25cb3a7563d66cbcf4931dc4a7427706df19..6e1e0d51cb1bee9a38fb2471ddd7a64b8c038cef 100644
--- a/dumux/material/solidstates/CMakeLists.txt
+++ b/dumux/material/solidstates/CMakeLists.txt
@@ -1,6 +1,5 @@
-#install headers
 install(FILES
-updatesolidvolumefractions.hh
-inertsolidstate.hh
 compositionalsolidstate.hh
+inertsolidstate.hh
+updatesolidvolumefractions.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/material/solidstates)
diff --git a/dumux/material/solidsystems/CMakeLists.txt b/dumux/material/solidsystems/CMakeLists.txt
index 0e9afac55930f53f485b7711128c8e64af1e6d96..094b28793dc6e544a2480ef97d16a70a9f7c0589 100644
--- a/dumux/material/solidsystems/CMakeLists.txt
+++ b/dumux/material/solidsystems/CMakeLists.txt
@@ -1,4 +1,4 @@
 install(FILES
-  inertsolidphase.hh
-  compositionalsolidphase.hh
+compositionalsolidphase.hh
+inertsolidphase.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/material/solidsystems)
diff --git a/dumux/material/spatialparams/CMakeLists.txt b/dumux/material/spatialparams/CMakeLists.txt
index bd834d827b3a1dfb6bc85ce0ad2af95cf00cc76e..926f002d36772a0828245986e0fd320fac24e82a 100644
--- a/dumux/material/spatialparams/CMakeLists.txt
+++ b/dumux/material/spatialparams/CMakeLists.txt
@@ -1,8 +1,8 @@
-
-#install headers
 install(FILES
 fv.hh
 fv1p.hh
+fvelastic.hh
+fvporoelastic.hh
 gstatrandomfield.hh
 sequentialfv.hh
 sequentialfv1p.hh
diff --git a/dumux/nonlinear/CMakeLists.txt b/dumux/nonlinear/CMakeLists.txt
index 0bc9109ce18c7c9e323562815743f4ba860a1d37..ce718221685cb34e3c82a14a0b06b71f77481a39 100644
--- a/dumux/nonlinear/CMakeLists.txt
+++ b/dumux/nonlinear/CMakeLists.txt
@@ -1,6 +1,5 @@
-
-#install headers
 install(FILES
 newtonconvergencewriter.hh
 newtonsolver.hh
+privarswitchnewtonsolver.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/nonlinear)
diff --git a/dumux/parallel/CMakeLists.txt b/dumux/parallel/CMakeLists.txt
index 69ce00ec0d1b8a7f0d52597127372c25e1cb53bd..633c6f71b40fb1c33621b7ac863c8080d7c6a9d7 100644
--- a/dumux/parallel/CMakeLists.txt
+++ b/dumux/parallel/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
 install(FILES
 vertexhandles.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/parallel)
diff --git a/dumux/porousmediumflow/1p/CMakeLists.txt b/dumux/porousmediumflow/1p/CMakeLists.txt
index 4a13cee769daefd004f80e53ec75fd18e5a0ba02..edc499247242ec552b8183a8aedaa8a9262f39e1 100644
--- a/dumux/porousmediumflow/1p/CMakeLists.txt
+++ b/dumux/porousmediumflow/1p/CMakeLists.txt
@@ -1,9 +1,8 @@
-add_subdirectory("sequential")
+add_subdirectory(sequential)
 
-#install headers
 install(FILES
-indices.hh
 incompressiblelocalresidual.hh
+indices.hh
 model.hh
 volumevariables.hh
 vtkoutputfields.hh
diff --git a/dumux/porousmediumflow/1p/sequential/CMakeLists.txt b/dumux/porousmediumflow/1p/sequential/CMakeLists.txt
index f32fc9ec4dd01eb453f530db3a67665f145cc5d5..da8412d2548aa3844e71177befdcbfe8e68de29b 100644
--- a/dumux/porousmediumflow/1p/sequential/CMakeLists.txt
+++ b/dumux/porousmediumflow/1p/sequential/CMakeLists.txt
@@ -1,9 +1,8 @@
-add_subdirectory("diffusion")
+add_subdirectory(diffusion)
 
-#install headers
 install(FILES
-indices.hh
-properties.hh
 celldata.hh
 fluxdata.hh
+indices.hh
+properties.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/1p/sequential)
diff --git a/dumux/porousmediumflow/1p/sequential/diffusion/CMakeLists.txt b/dumux/porousmediumflow/1p/sequential/diffusion/CMakeLists.txt
index 0e54cefb8b43150371277e939c8cd94eb154d6f9..c7902d29ac294d2116cd31a0f6021395532da3a6 100644
--- a/dumux/porousmediumflow/1p/sequential/diffusion/CMakeLists.txt
+++ b/dumux/porousmediumflow/1p/sequential/diffusion/CMakeLists.txt
@@ -1,6 +1,5 @@
-add_subdirectory("cellcentered")
+add_subdirectory(cellcentered)
 
-#install headers
 install(FILES
 problem.hh
 properties.hh
diff --git a/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/CMakeLists.txt b/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/CMakeLists.txt
index e341057acd1012d640e52f2326d02d0b84f0a6bf..2b00d111985f689a19a3d3b52e2128ae479ff1b7 100644
--- a/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/CMakeLists.txt
+++ b/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
 install(FILES
 pressure.hh
 pressureproperties.hh
diff --git a/dumux/porousmediumflow/1pnc/CMakeLists.txt b/dumux/porousmediumflow/1pnc/CMakeLists.txt
index d184cbace706a99e238b24ebdaaf433ff00a18d1..f9c3797f29f344be3e0f1f4b145437479276e0b5 100644
--- a/dumux/porousmediumflow/1pnc/CMakeLists.txt
+++ b/dumux/porousmediumflow/1pnc/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
 install(FILES
 indices.hh
 model.hh
diff --git a/dumux/porousmediumflow/1pncmin/CMakeLists.txt b/dumux/porousmediumflow/1pncmin/CMakeLists.txt
index ab30ea48ad5fc66344119e28c62702c46398beac..8a820083622869430cf7fa9c4a838a6b583d4d77 100644
--- a/dumux/porousmediumflow/1pncmin/CMakeLists.txt
+++ b/dumux/porousmediumflow/1pncmin/CMakeLists.txt
@@ -1,4 +1,3 @@
-#install headers
 install(FILES
 model.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/1pncmin)
diff --git a/dumux/porousmediumflow/2p/CMakeLists.txt b/dumux/porousmediumflow/2p/CMakeLists.txt
index 10af09f9c6d455dd14cd55ea8f0f6abf95b74fa5..6811a958791d909d06dc6d1b9aab3305f7f213a3 100644
--- a/dumux/porousmediumflow/2p/CMakeLists.txt
+++ b/dumux/porousmediumflow/2p/CMakeLists.txt
@@ -1,6 +1,5 @@
-add_subdirectory("sequential")
+add_subdirectory(sequential)
 
-#install headers
 install(FILES
 boxmaterialinterfaceparams.hh
 formulation.hh
diff --git a/dumux/porousmediumflow/2p/sequential/CMakeLists.txt b/dumux/porousmediumflow/2p/sequential/CMakeLists.txt
index e45b9d4134c96f0457c3ad75028fb3531dfa7e7e..6629448f8ed7cf31060b46d4e034fafd4ad87fea 100644
--- a/dumux/porousmediumflow/2p/sequential/CMakeLists.txt
+++ b/dumux/porousmediumflow/2p/sequential/CMakeLists.txt
@@ -1,12 +1,11 @@
-add_subdirectory("diffusion")
-add_subdirectory("impes")
-add_subdirectory("transport")
+add_subdirectory(diffusion)
+add_subdirectory(impes)
+add_subdirectory(transport)
 
-#install headers
 install(FILES
-indices.hh
-properties.hh
-celldataadaptive.hh
 celldata.hh
+celldataadaptive.hh
 fluxdata.hh
+indices.hh
+properties.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2p/sequential)
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/CMakeLists.txt b/dumux/porousmediumflow/2p/sequential/diffusion/CMakeLists.txt
index 9e28061579da3af46d62594ad01ed94864fa33de..3cb85f0eacdc67824cae3cb78ea45c0f2874ce11 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/CMakeLists.txt
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/CMakeLists.txt
@@ -1,8 +1,7 @@
-add_subdirectory("cellcentered")
-add_subdirectory("mpfa")
-add_subdirectory("mimetic")
+add_subdirectory(cellcentered)
+add_subdirectory(mimetic)
+add_subdirectory(mpfa)
 
-#install headers
 install(FILES
 problem.hh
 properties.hh
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/CMakeLists.txt b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/CMakeLists.txt
index 7f5a27a05d2a629832239bb9eac751e9e37c3502..b8c863a236abdb774d32412768f74cde3b36b58c 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/CMakeLists.txt
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/CMakeLists.txt
@@ -1,11 +1,9 @@
-
-#install headers
 install(FILES
-pressureadaptive.hh
 pressure.hh
-pressurepropertiesadaptive.hh
+pressureadaptive.hh
 pressureproperties.hh
+pressurepropertiesadaptive.hh
 pressurevelocity.hh
-velocityadaptive.hh
 velocity.hh
+velocityadaptive.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered)
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/CMakeLists.txt b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/CMakeLists.txt
index 309c47d3c5ad96817d24e7cf3953221c3c5d41f3..9de8a6efba6eb71f46b7a721e60816c9e85ef762 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/CMakeLists.txt
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/CMakeLists.txt
@@ -1,15 +1,13 @@
-
-#install headers
 install(FILES
-croperatoradaptive.hh
 croperator.hh
+croperatoradaptive.hh
 localstiffness.hh
-mimeticadaptive.hh
 mimetic.hh
-operatoradaptive.hh
+mimeticadaptive.hh
 operator.hh
-pressureadaptive.hh
+operatoradaptive.hh
 pressure.hh
-pressurepropertiesadaptive.hh
+pressureadaptive.hh
 pressureproperties.hh
+pressurepropertiesadaptive.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2p/sequential/diffusion/mimetic)
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/CMakeLists.txt b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/CMakeLists.txt
index 6a6fefac95c4a57c9fccf7687efeb61d68cba6d3..32d2640c270dc7322e1e9f57edd5e2a9a14169c5 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/CMakeLists.txt
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/CMakeLists.txt
@@ -1,2 +1,2 @@
-add_subdirectory("lmethod")
-add_subdirectory("omethod")
+add_subdirectory(lmethod)
+add_subdirectory(omethod)
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/CMakeLists.txt b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/CMakeLists.txt
index fbaffbdc06175c2a2a2f732ef3cc0f7b9d63e769..15e47542004a24a1d34ec99e03637737e6f54185 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/CMakeLists.txt
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/CMakeLists.txt
@@ -1,24 +1,22 @@
-
-#install headers
 install(FILES
-2dpressureadaptive.hh
 2dpressure.hh
-2dpressurepropertiesadaptive.hh
+2dpressureadaptive.hh
 2dpressureproperties.hh
-2dpressurevelocityadaptive.hh
+2dpressurepropertiesadaptive.hh
 2dpressurevelocity.hh
+2dpressurevelocityadaptive.hh
 2dtransmissibilitycalculator.hh
-2dvelocityadaptive.hh
 2dvelocity.hh
-3dinteractionvolumecontaineradaptive.hh
+2dvelocityadaptive.hh
 3dinteractionvolumecontainer.hh
-3dpressureadaptive.hh
+3dinteractionvolumecontaineradaptive.hh
 3dpressure.hh
-3dpressurepropertiesadaptive.hh
+3dpressureadaptive.hh
 3dpressureproperties.hh
-3dpressurevelocityadaptive.hh
+3dpressurepropertiesadaptive.hh
 3dpressurevelocity.hh
+3dpressurevelocityadaptive.hh
 3dtransmissibilitycalculator.hh
-3dvelocityadaptive.hh
 3dvelocity.hh
+3dvelocityadaptive.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod)
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/CMakeLists.txt b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/CMakeLists.txt
index 68679f82278d1df865994a48b0693015bacbc953..520a0f412fd5f240e378dd0a76f7041d305af537 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/CMakeLists.txt
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
 install(FILES
 2dpressure.hh
 2dpressureproperties.hh
diff --git a/dumux/porousmediumflow/2p/sequential/impes/CMakeLists.txt b/dumux/porousmediumflow/2p/sequential/impes/CMakeLists.txt
index 40662e9bf206198788f794dd31ca69dd7a39c287..fe8706c5e368f65fcc5c1870c7020bd79cbb8be3 100644
--- a/dumux/porousmediumflow/2p/sequential/impes/CMakeLists.txt
+++ b/dumux/porousmediumflow/2p/sequential/impes/CMakeLists.txt
@@ -1,9 +1,7 @@
-
-#install headers
 install(FILES
 gridadaptionindicator.hh
 gridadaptionindicatorlocal.hh
 problem.hh
-propertiesadaptive.hh
 properties.hh
+propertiesadaptive.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2p/sequential/impes)
diff --git a/dumux/porousmediumflow/2p/sequential/transport/CMakeLists.txt b/dumux/porousmediumflow/2p/sequential/transport/CMakeLists.txt
index ce742a4fd6d66f19048994962df4a5d9a59b74e4..c24bf025845d08d13b9c83658ab8465d19b5be44 100644
--- a/dumux/porousmediumflow/2p/sequential/transport/CMakeLists.txt
+++ b/dumux/porousmediumflow/2p/sequential/transport/CMakeLists.txt
@@ -1,6 +1,5 @@
-add_subdirectory("cellcentered")
+add_subdirectory(cellcentered)
 
-#install headers
 install(FILES
 problem.hh
 properties.hh
diff --git a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/CMakeLists.txt b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/CMakeLists.txt
index a1c78599e6a80cfc8b7fc63809e359cc0981a745..67e8ace7667a9025422afd5846c38c19432f46a0 100644
--- a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/CMakeLists.txt
+++ b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/CMakeLists.txt
@@ -1,11 +1,11 @@
 install(FILES
-  capillarydiffusion.hh
-  convectivepart.hh
-  diffusivepart.hh
-  evalcflflux.hh
-  evalcflfluxcoats.hh
-  evalcflfluxdefault.hh
-  gravitypart.hh
-  properties.hh
-  saturation.hh
-  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2p/sequential/transport/cellcentered)
+capillarydiffusion.hh
+convectivepart.hh
+diffusivepart.hh
+evalcflflux.hh
+evalcflfluxcoats.hh
+evalcflfluxdefault.hh
+gravitypart.hh
+properties.hh
+saturation.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2p/sequential/transport/cellcentered)
diff --git a/dumux/porousmediumflow/2p1c/CMakeLists.txt b/dumux/porousmediumflow/2p1c/CMakeLists.txt
index 7c90527afb73730889ad083b2b5e08e5ec511adb..baeae729c0c5926792250d20cbba7f157d0f4d6f 100644
--- a/dumux/porousmediumflow/2p1c/CMakeLists.txt
+++ b/dumux/porousmediumflow/2p1c/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
 install(FILES
 darcyslaw.hh
 indices.hh
diff --git a/dumux/porousmediumflow/2p2c/CMakeLists.txt b/dumux/porousmediumflow/2p2c/CMakeLists.txt
index fafacd7528c269971f92f47edfb001c54c1a09c9..16a722b0858069e85968c6e7ece314d6144902fb 100644
--- a/dumux/porousmediumflow/2p2c/CMakeLists.txt
+++ b/dumux/porousmediumflow/2p2c/CMakeLists.txt
@@ -1,10 +1,9 @@
-add_subdirectory("sequential")
+add_subdirectory(sequential)
 
-#install headers
 install(FILES
 indices.hh
 model.hh
 primaryvariableswitch.hh
 volumevariables.hh
 vtkoutputfields.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2p2c/implicit)
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2p2c)
diff --git a/dumux/porousmediumflow/2p2c/sequential/CMakeLists.txt b/dumux/porousmediumflow/2p2c/sequential/CMakeLists.txt
index 2974d84e432d726f32735ea79c08b44106c368c4..404e8333fee25dbad4449445154a8b2f5bd0f1c8 100644
--- a/dumux/porousmediumflow/2p2c/sequential/CMakeLists.txt
+++ b/dumux/porousmediumflow/2p2c/sequential/CMakeLists.txt
@@ -1,11 +1,7 @@
-
-#install headers
 install(FILES
 adaptiveproperties.hh
-problem.hh
-properties.hh
-celldataadaptive.hh
 celldata.hh
+celldataadaptive.hh
 celldatamultiphysics.hh
 fluxdata.hh
 fv2dpressureadaptive.hh
@@ -14,9 +10,11 @@ fv3dpressureadaptive.hh
 fv3dtransportadaptive.hh
 fvmpfal3dinteractionvolumecontaineradaptive.hh
 fvpressure.hh
-fvpressuremultiphysics.hh
 fvpressurecompositional.hh
+fvpressuremultiphysics.hh
 fvtransport.hh
 fvtransportmultiphysics.hh
+problem.hh
+properties.hh
 variableclassadaptive.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2p2c/sequential)
diff --git a/dumux/porousmediumflow/2pnc/CMakeLists.txt b/dumux/porousmediumflow/2pnc/CMakeLists.txt
index 81352b781a2ad3666225b9df58ad757b10e5e3a1..755064a2a1aa484165d5f5c6d4d655d3aea80eff 100644
--- a/dumux/porousmediumflow/2pnc/CMakeLists.txt
+++ b/dumux/porousmediumflow/2pnc/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
 install(FILES
 model.hh
 primaryvariableswitch.hh
diff --git a/dumux/porousmediumflow/2pncmin/CMakeLists.txt b/dumux/porousmediumflow/2pncmin/CMakeLists.txt
index 674234de90d9bee139f781082d4146b623959128..93ab4fa2aaba436e15f1662e5f9a795d2434771a 100644
--- a/dumux/porousmediumflow/2pncmin/CMakeLists.txt
+++ b/dumux/porousmediumflow/2pncmin/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
 install(FILES
 model.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2pncmin)
diff --git a/dumux/porousmediumflow/3p/CMakeLists.txt b/dumux/porousmediumflow/3p/CMakeLists.txt
index 051356e5b04d2a83a737a24b4d7e10f8569a2eb6..60147e4f5f17e942d70e870045411fb729db9c46 100644
--- a/dumux/porousmediumflow/3p/CMakeLists.txt
+++ b/dumux/porousmediumflow/3p/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
 install(FILES
 indices.hh
 model.hh
diff --git a/dumux/porousmediumflow/3p3c/CMakeLists.txt b/dumux/porousmediumflow/3p3c/CMakeLists.txt
index 71205887e30c0b4dcc59f93310c9db5326160d67..5d933338f5ebae3aa5e71be1b5eefa974460f7e2 100644
--- a/dumux/porousmediumflow/3p3c/CMakeLists.txt
+++ b/dumux/porousmediumflow/3p3c/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
 install(FILES
 indices.hh
 localresidual.hh
diff --git a/dumux/porousmediumflow/3pwateroil/CMakeLists.txt b/dumux/porousmediumflow/3pwateroil/CMakeLists.txt
index a523daeb2002b78eef91dfb31c06bb4a49c57a9c..99c502d405d2ca33662541976b0dcdcdc40f2bef 100644
--- a/dumux/porousmediumflow/3pwateroil/CMakeLists.txt
+++ b/dumux/porousmediumflow/3pwateroil/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
 install(FILES
 indices.hh
 localresidual.hh
diff --git a/dumux/porousmediumflow/CMakeLists.txt b/dumux/porousmediumflow/CMakeLists.txt
index 47d61ae2f2dca3c190957b1a04a67fcafb754276..d4a462d01211313b384d67ec8a9a0e941c5ac661 100644
--- a/dumux/porousmediumflow/CMakeLists.txt
+++ b/dumux/porousmediumflow/CMakeLists.txt
@@ -1,23 +1,32 @@
-add_subdirectory("1p")
-add_subdirectory("1pnc")
-add_subdirectory("1pncmin")
-add_subdirectory("2p")
-add_subdirectory("2p1c")
-add_subdirectory("2p2c")
-add_subdirectory("2pnc")
-add_subdirectory("2pncmin")
-add_subdirectory("3p")
-add_subdirectory("3pwateroil")
-add_subdirectory("3p3c")
-add_subdirectory("boxdfm")
-add_subdirectory("co2")
-add_subdirectory("compositional")
-add_subdirectory("immiscible")
-add_subdirectory("mineralization")
-add_subdirectory("mpnc")
-add_subdirectory("nonisothermal")
-add_subdirectory("richards")
-add_subdirectory("richardsnc")
-add_subdirectory("sequential")
-add_subdirectory("tracer")
-add_subdirectory("nonequilibrium")
+add_subdirectory(1p)
+add_subdirectory(1pnc)
+add_subdirectory(1pncmin)
+add_subdirectory(2p)
+add_subdirectory(2p1c)
+add_subdirectory(2p2c)
+add_subdirectory(2pnc)
+add_subdirectory(2pncmin)
+add_subdirectory(3p)
+add_subdirectory(3p3c)
+add_subdirectory(3pwateroil)
+add_subdirectory(boxdfm)
+add_subdirectory(co2)
+add_subdirectory(compositional)
+add_subdirectory(immiscible)
+add_subdirectory(mineralization)
+add_subdirectory(mpnc)
+add_subdirectory(nonequilibrium)
+add_subdirectory(nonisothermal)
+add_subdirectory(richards)
+add_subdirectory(richardsnc)
+add_subdirectory(sequential)
+add_subdirectory(tracer)
+
+install(FILES
+fluxvariables.hh
+fluxvariablescache.hh
+problem.hh
+properties.hh
+velocityoutput.hh
+volumevariables.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow)
diff --git a/dumux/porousmediumflow/boxdfm/CMakeLists.txt b/dumux/porousmediumflow/boxdfm/CMakeLists.txt
index e85e576492f0497736bc187224620b0004341262..25b70289f4f978b14bdec4143664fd551487ca5e 100644
--- a/dumux/porousmediumflow/boxdfm/CMakeLists.txt
+++ b/dumux/porousmediumflow/boxdfm/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
 install(FILES
 fluxvariablescache.hh
 fvelementgeometry.hh
@@ -8,4 +6,5 @@ geometryhelper.hh
 model.hh
 subcontrolvolume.hh
 subcontrolvolumeface.hh
+vtkoutputmodule.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/boxdfm)
diff --git a/dumux/porousmediumflow/co2/CMakeLists.txt b/dumux/porousmediumflow/co2/CMakeLists.txt
index 80c94c2b9fed7dee8cf7adab93f35289a6949d58..6427604a775ba2e136face40897b4f98683ddc02 100644
--- a/dumux/porousmediumflow/co2/CMakeLists.txt
+++ b/dumux/porousmediumflow/co2/CMakeLists.txt
@@ -1,6 +1,5 @@
-
-#install headers
 install(FILES
 model.hh
+primaryvariableswitch.hh
 volumevariables.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/co2)
diff --git a/dumux/porousmediumflow/compositional/CMakeLists.txt b/dumux/porousmediumflow/compositional/CMakeLists.txt
index 11ccea79758a7e11bc29a757857692526eb62392..47480589f7e5093ac80e97fdd0bbddf16dc40782 100644
--- a/dumux/porousmediumflow/compositional/CMakeLists.txt
+++ b/dumux/porousmediumflow/compositional/CMakeLists.txt
@@ -1,4 +1,5 @@
-#install headers
 install(FILES
+localresidual.hh
 primaryvariableswitch.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/compositional)
\ No newline at end of file
+switchableprimaryvariables.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/compositional)
diff --git a/dumux/porousmediumflow/immiscible/CMakeLists.txt b/dumux/porousmediumflow/immiscible/CMakeLists.txt
index e135fd5d781ef28eb6a209d0d4ec0e008df6afdf..192e7955c6e66f742d5ccdee1718cbc1d9979069 100644
--- a/dumux/porousmediumflow/immiscible/CMakeLists.txt
+++ b/dumux/porousmediumflow/immiscible/CMakeLists.txt
@@ -1,4 +1,3 @@
-#install headers
 install(FILES
 localresidual.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/immiscible)
\ No newline at end of file
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/immiscible)
diff --git a/dumux/porousmediumflow/mineralization/CMakeLists.txt b/dumux/porousmediumflow/mineralization/CMakeLists.txt
index 783fba4a28003d783a5cbfcf732c6acf30a827f6..aa490332328de6c9afeebd821986c46eff7df476 100644
--- a/dumux/porousmediumflow/mineralization/CMakeLists.txt
+++ b/dumux/porousmediumflow/mineralization/CMakeLists.txt
@@ -1,7 +1,6 @@
-#install headers
 install(FILES
 localresidual.hh
 model.hh
 volumevariables.hh
 vtkoutputfields.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/mineralization)
\ No newline at end of file
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/mineralization)
diff --git a/dumux/porousmediumflow/mpnc/CMakeLists.txt b/dumux/porousmediumflow/mpnc/CMakeLists.txt
index b203874496406edbf408dfa4a6fe0f40c91f7ae7..5d5339c2d9a7eceb73dd14f28f263e0cb97eb282 100644
--- a/dumux/porousmediumflow/mpnc/CMakeLists.txt
+++ b/dumux/porousmediumflow/mpnc/CMakeLists.txt
@@ -1,4 +1,3 @@
-#install headers
 install(FILES
 indices.hh
 localresidual.hh
diff --git a/dumux/porousmediumflow/nonequilibrium/CMakeLists.txt b/dumux/porousmediumflow/nonequilibrium/CMakeLists.txt
index 09252e0484f9b439732e7a35f88ab9c56104cc24..8f7cd1ff2e10bf7aa1a4ccdbb0f0c8646f4c486f 100644
--- a/dumux/porousmediumflow/nonequilibrium/CMakeLists.txt
+++ b/dumux/porousmediumflow/nonequilibrium/CMakeLists.txt
@@ -1,11 +1,11 @@
-add_subdirectory("thermal")
-#install headers
+add_subdirectory(thermal)
+
 install(FILES
-localresidual.hh
 gridvariables.hh
 indices.hh
-volumevariables.hh
-vtkoutputfields.hh
+localresidual.hh
 model.hh
 newtonsolver.hh
+volumevariables.hh
+vtkoutputfields.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/nonequilibrium)
diff --git a/dumux/porousmediumflow/nonequilibrium/thermal/CMakeLists.txt b/dumux/porousmediumflow/nonequilibrium/thermal/CMakeLists.txt
index cc28c3018c1a84cfda4d63d8577ac8583a38f737..c471edbd661ff37b75a767a8919e5e22705da2db 100644
--- a/dumux/porousmediumflow/nonequilibrium/thermal/CMakeLists.txt
+++ b/dumux/porousmediumflow/nonequilibrium/thermal/CMakeLists.txt
@@ -1,3 +1,3 @@
 install(FILES
-  localresidual.hh
-  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/nonequilibrium)
+localresidual.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/nonequilibrium/thermal)
diff --git a/dumux/porousmediumflow/nonisothermal/CMakeLists.txt b/dumux/porousmediumflow/nonisothermal/CMakeLists.txt
index b290c6e10e5122085cdab1106b1e17b833e13fdf..32f9d315750050a91f385e85bf07e0036d837972 100644
--- a/dumux/porousmediumflow/nonisothermal/CMakeLists.txt
+++ b/dumux/porousmediumflow/nonisothermal/CMakeLists.txt
@@ -1,8 +1,7 @@
-#install headers
 install(FILES
 indices.hh
 localresidual.hh
 model.hh
 volumevariables.hh
 vtkoutputfields.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/nonisothermal/implicit)
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/nonisothermal)
diff --git a/dumux/porousmediumflow/richards/CMakeLists.txt b/dumux/porousmediumflow/richards/CMakeLists.txt
index 199fc1455f2ec91649605c0ee3ca855fedddc01e..6d50a09b65cbc1eba4034be5d0cbaaf5816f6b43 100644
--- a/dumux/porousmediumflow/richards/CMakeLists.txt
+++ b/dumux/porousmediumflow/richards/CMakeLists.txt
@@ -1,12 +1,10 @@
-
-#install headers
 install(FILES
 indices.hh
 localresidual.hh
 model.hh
 newtonsolver.hh
-privarswitchnewtonsolver.hh
 primaryvariableswitch.hh
+privarswitchnewtonsolver.hh
 volumevariables.hh
 vtkoutputfields.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/richards)
diff --git a/dumux/porousmediumflow/richardsnc/CMakeLists.txt b/dumux/porousmediumflow/richardsnc/CMakeLists.txt
index d0a0fa8cb184b1044d03b32cc419447d35557705..a8445ddb450e0b6338722506bb6da4fd0120abde 100644
--- a/dumux/porousmediumflow/richardsnc/CMakeLists.txt
+++ b/dumux/porousmediumflow/richardsnc/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
 install(FILES
 indices.hh
 model.hh
diff --git a/dumux/porousmediumflow/sequential/CMakeLists.txt b/dumux/porousmediumflow/sequential/CMakeLists.txt
index 166bfcc98d5a83f7f6c638d5169a5c363705d40c..cfa8da3536de936c6c69d0094e8a6975f9f5de57 100644
--- a/dumux/porousmediumflow/sequential/CMakeLists.txt
+++ b/dumux/porousmediumflow/sequential/CMakeLists.txt
@@ -1,11 +1,10 @@
-add_subdirectory("cellcentered")
-add_subdirectory("mimetic")
+add_subdirectory(cellcentered)
+add_subdirectory(mimetic)
 
-#install headers
 install(FILES
 gridadapt.hh
-gridadaptinitializationindicatordefault.hh
 gridadaptinitializationindicator.hh
+gridadaptinitializationindicatordefault.hh
 gridadaptproperties.hh
 impet.hh
 impetproblem.hh
@@ -14,6 +13,6 @@ onemodelproblem.hh
 pressureproperties.hh
 properties.hh
 transportproperties.hh
-variableclassadaptive.hh
 variableclass.hh
+variableclassadaptive.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/sequential)
diff --git a/dumux/porousmediumflow/sequential/cellcentered/CMakeLists.txt b/dumux/porousmediumflow/sequential/cellcentered/CMakeLists.txt
index cec886a2120ed94760f54ac281ce1a4fbdcd6462..6bc707769ebd28a8fa9f79f3f68fdf154801d62c 100644
--- a/dumux/porousmediumflow/sequential/cellcentered/CMakeLists.txt
+++ b/dumux/porousmediumflow/sequential/cellcentered/CMakeLists.txt
@@ -1,9 +1,8 @@
-add_subdirectory("mpfa")
+add_subdirectory(mpfa)
 
-#install headers
 install(FILES
 pressure.hh
 transport.hh
-velocitydefault.hh
 velocity.hh
+velocitydefault.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/sequential/cellcentered)
diff --git a/dumux/porousmediumflow/sequential/cellcentered/mpfa/CMakeLists.txt b/dumux/porousmediumflow/sequential/cellcentered/mpfa/CMakeLists.txt
index 5f9b5eece9d76f80dc3c580277f356a476da8574..437022c50a38463cf3c4e6a5724a18ecbdfd6d83 100644
--- a/dumux/porousmediumflow/sequential/cellcentered/mpfa/CMakeLists.txt
+++ b/dumux/porousmediumflow/sequential/cellcentered/mpfa/CMakeLists.txt
@@ -1,10 +1,8 @@
-
-#install headers
 install(FILES
-properties.hh
-velocityintransport.hh
-linteractionvolume3dadaptive.hh
-linteractionvolume3d.hh
 linteractionvolume.hh
+linteractionvolume3d.hh
+linteractionvolume3dadaptive.hh
 ointeractionvolume.hh
+properties.hh
+velocityintransport.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/sequential/cellcentered/mpfa)
diff --git a/dumux/porousmediumflow/sequential/mimetic/CMakeLists.txt b/dumux/porousmediumflow/sequential/mimetic/CMakeLists.txt
index 3bff03ce9bf3edbe7e6f664761d2cd98dc56eab6..8446f4a5e298b750b95214222022c5855a9e4b48 100644
--- a/dumux/porousmediumflow/sequential/mimetic/CMakeLists.txt
+++ b/dumux/porousmediumflow/sequential/mimetic/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
 install(FILES
 properties.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/sequential/mimetic)
diff --git a/dumux/porousmediumflow/tracer/CMakeLists.txt b/dumux/porousmediumflow/tracer/CMakeLists.txt
index d3e973487c186e6493c864c4df9e097fd8027623..0f17f09b77bae98d356040a38bbf420d7f373d45 100644
--- a/dumux/porousmediumflow/tracer/CMakeLists.txt
+++ b/dumux/porousmediumflow/tracer/CMakeLists.txt
@@ -1,9 +1,7 @@
-
-#install headers
 install(FILES
 indices.hh
-model.hh
 localresidual.hh
+model.hh
 volumevariables.hh
 vtkoutputfields.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/tracer)