diff --git a/configure.ac b/configure.ac
index c37aa42ad8426de14ee25b83242cd9473cf53efd..84986fa0c3086d90f7722c6472f5a41a41564f94 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,6 +23,9 @@ AC_CONFIG_FILES([dumux.pc
     dumux/boxmodels/2pni/Makefile 
     dumux/boxmodels/common/Makefile 
     dumux/boxmodels/MpNc/Makefile 
+    dumux/boxmodels/MpNc/diffusion/Makefile
+    dumux/boxmodels/MpNc/energy/Makefile
+    dumux/boxmodels/MpNc/mass/Makefile
     dumux/boxmodels/richards/Makefile 
     dumux/common/Makefile 
     dumux/decoupled/Makefile
@@ -38,7 +41,8 @@ AC_CONFIG_FILES([dumux.pc
     dumux/decoupled/2p/transport/Makefile 
     dumux/decoupled/2p/transport/fv/Makefile
     dumux/decoupled/2p2c/Makefile 
-    dumux/decoupled/common/Makefile 
+    dumux/decoupled/common/Makefile
+    dumux/decoupled/common/fv/Makefile 
     dumux/io/Makefile
     dumux/linear/Makefile
     dumux/material/Makefile 
diff --git a/dumux/boxmodels/MpNc/Makefile.am b/dumux/boxmodels/MpNc/Makefile.am
index 0df2b8036be53697cb070f10d551abc9c0e6399f..8081f4cc72aff215a3a2d266c28887f26c7c9895 100644
--- a/dumux/boxmodels/MpNc/Makefile.am
+++ b/dumux/boxmodels/MpNc/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = diffusion energy mass 
+
 MpNcdir = $(includedir)/dumux/boxmodels/MpNc
 MpNc_HEADERS = *.hh
 
diff --git a/dumux/boxmodels/MpNc/diffusion/Makefile.am b/dumux/boxmodels/MpNc/diffusion/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..b83ffaae5fa01441cf91b96434567b0c4bd7b6f8
--- /dev/null
+++ b/dumux/boxmodels/MpNc/diffusion/Makefile.am
@@ -0,0 +1,4 @@
+diffusiondir = $(includedir)/dumux/boxmodels/MpNc/diffusion
+diffusion_HEADERS = *.hh
+
+include $(top_srcdir)/am/global-rules
diff --git a/dumux/boxmodels/MpNc/energy/Makefile.am b/dumux/boxmodels/MpNc/energy/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..72e0ab5b155ef5f86769e3198b7df81025130afc
--- /dev/null
+++ b/dumux/boxmodels/MpNc/energy/Makefile.am
@@ -0,0 +1,4 @@
+energydir = $(includedir)/dumux/boxmodels/MpNc/energy
+energy_HEADERS = *.hh
+
+include $(top_srcdir)/am/global-rules
diff --git a/dumux/boxmodels/MpNc/mass/Makefile.am b/dumux/boxmodels/MpNc/mass/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..36ca38efb940c565254779162f6ed659f85b5df4
--- /dev/null
+++ b/dumux/boxmodels/MpNc/mass/Makefile.am
@@ -0,0 +1,4 @@
+massdir = $(includedir)/dumux/boxmodels/MpNc/mass
+mass_HEADERS = *.hh
+
+include $(top_srcdir)/am/global-rules
diff --git a/dumux/boxmodels/common/Makefile.am b/dumux/boxmodels/common/Makefile.am
index 2bec4f1c980d358aa4b2c8c84a64eac62d9d0be3..2fd0a582d6da6e6c057281cb08c4412ae2a54b24 100644
--- a/dumux/boxmodels/common/Makefile.am
+++ b/dumux/boxmodels/common/Makefile.am
@@ -1,4 +1,4 @@
-commondir = $(includedir)/dumux/boxmodels/2p
+commondir = $(includedir)/dumux/boxmodels/common
 common_HEADERS = *.hh
 
 include $(top_srcdir)/am/global-rules
diff --git a/dumux/decoupled/common/Makefile.am b/dumux/decoupled/common/Makefile.am
index d9f45519fd79feeed9357307da3ea358e3d0f117..7a7b9ad9f5c5da4337194e156fa352485b9dacd7 100644
--- a/dumux/decoupled/common/Makefile.am
+++ b/dumux/decoupled/common/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = fv
+
 commondir = $(includedir)/dumux/decoupled/common
 common_HEADERS = *.hh
 
diff --git a/dumux/decoupled/common/fv/Makefile.am b/dumux/decoupled/common/fv/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..70d3683b952b896d9d5d4317741d68103ee3d8eb
--- /dev/null
+++ b/dumux/decoupled/common/fv/Makefile.am
@@ -0,0 +1,4 @@
+fvdir = $(includedir)/dumux/decoupled/common/fv
+fv_HEADERS = *.hh
+
+include $(top_srcdir)/am/global-rules
diff --git a/dumux/material/components/iapws/Makefile.am b/dumux/material/components/iapws/Makefile.am
index 3b67e0690ee14ce878a726431ae4144aacb8d22a..f3ea40c469183f7fd3e3fbfeb201f962d0c06553 100644
--- a/dumux/material/components/iapws/Makefile.am
+++ b/dumux/material/components/iapws/Makefile.am
@@ -1,4 +1,4 @@
-iapwsdir = $(includedir)/dumux/material/iapws
+iapwsdir = $(includedir)/dumux/material/components/iapws
 iapws_HEADERS = *.hh
 
 include $(top_srcdir)/am/global-rules
diff --git a/dumux/material/constraintsolvers/Makefile.am b/dumux/material/constraintsolvers/Makefile.am
index 70f8f174617e3dd8488fc44a23ad1680eef4c247..fbcaa287aaa3172a3f11dd1c390372b5a529b180 100644
--- a/dumux/material/constraintsolvers/Makefile.am
+++ b/dumux/material/constraintsolvers/Makefile.am
@@ -1 +1,4 @@
+constraintsolversdir = $(includedir)/dumux/material/constraintsolvers
+constraintsolvers_HEADERS = *.hh
+
 include $(top_srcdir)/am/global-rules
diff --git a/dumux/material/eos/Makefile.am b/dumux/material/eos/Makefile.am
index 70f8f174617e3dd8488fc44a23ad1680eef4c247..4b728c1730572686a49678183ad45201030be186 100644
--- a/dumux/material/eos/Makefile.am
+++ b/dumux/material/eos/Makefile.am
@@ -1 +1,4 @@
+eosdir = $(includedir)/dumux/material/eos
+eos_HEADERS = *.hh
+
 include $(top_srcdir)/am/global-rules
diff --git a/dumux/material/fluidmatrixinteractions/Mp/Makefile.am b/dumux/material/fluidmatrixinteractions/Mp/Makefile.am
index 70f8f174617e3dd8488fc44a23ad1680eef4c247..bb1d1376be8e0af049dc53b328a9d608483ceff3 100644
--- a/dumux/material/fluidmatrixinteractions/Mp/Makefile.am
+++ b/dumux/material/fluidmatrixinteractions/Mp/Makefile.am
@@ -1 +1,4 @@
+mpdir = $(includedir)/dumux/material/fluidmatrixinteractions/Mp
+mp_HEADERS = *.hh
+
 include $(top_srcdir)/am/global-rules
diff --git a/dumux/material/fluidstates/Makefile.am b/dumux/material/fluidstates/Makefile.am
index 70f8f174617e3dd8488fc44a23ad1680eef4c247..46d4e003b7842737ad5cd1c2f750a12f1204affb 100644
--- a/dumux/material/fluidstates/Makefile.am
+++ b/dumux/material/fluidstates/Makefile.am
@@ -1 +1,4 @@
+fluidstatesdir = $(includedir)/dumux/material/fluidstates
+fluidstates_HEADERS = *.hh
+
 include $(top_srcdir)/am/global-rules
diff --git a/dumux/material/fluidsystems/Makefile.am b/dumux/material/fluidsystems/Makefile.am
index 70f8f174617e3dd8488fc44a23ad1680eef4c247..fc6f9a87b53597ca8d43ffc3e7a8920c358a5611 100644
--- a/dumux/material/fluidsystems/Makefile.am
+++ b/dumux/material/fluidsystems/Makefile.am
@@ -1 +1,4 @@
+fluidsystemsdir = $(includedir)/dumux/material/fluidsystems
+fluidsystems_HEADERS = *.hh
+
 include $(top_srcdir)/am/global-rules
diff --git a/dumux/material/old_fluidsystems/Makefile.am b/dumux/material/old_fluidsystems/Makefile.am
index fc6f9a87b53597ca8d43ffc3e7a8920c358a5611..7001e9d90898fbe1bcc2fd7eb7abe9dbf835f1b7 100644
--- a/dumux/material/old_fluidsystems/Makefile.am
+++ b/dumux/material/old_fluidsystems/Makefile.am
@@ -1,4 +1,4 @@
-fluidsystemsdir = $(includedir)/dumux/material/fluidsystems
-fluidsystems_HEADERS = *.hh
+oldfluidsystemsdir = $(includedir)/dumux/material/old_fluidsystems
+oldfluidsystems_HEADERS = *.hh
 
 include $(top_srcdir)/am/global-rules