diff --git a/configure.ac b/configure.ac
index 4a22e14aefb9d920a7c7af7b25a8552da1b3ba02..3f08f975a4bac04bf84b8c09e1a53f8bac2562fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,15 +51,15 @@ AC_CONFIG_FILES([dumux.pc
     dumux/material/binarycoefficients/Makefile 
     dumux/material/components/Makefile 
     dumux/material/components/iapws/Makefile 
-    dumux/material/constraintsolvers/Makefile 
-    dumux/material/eos/Makefile 
     dumux/material/fluidmatrixinteractions/Makefile 
     dumux/material/fluidmatrixinteractions/2p/Makefile 
     dumux/material/fluidmatrixinteractions/Mp/Makefile 
-    dumux/material/fluidstates/Makefile 
-    dumux/material/fluidsystems/Makefile 
-    dumux/material/new_fluidsystems/Makefile 
     dumux/material/spatialparameters/Makefile 
+    dumux/material/fluidsystems/Makefile 
+    dumux/material/MpNcfluidstates/Makefile 
+    dumux/material/MpNcfluidsystems/Makefile 
+    dumux/material/MpNcconstraintsolvers/Makefile 
+    dumux/material/MpNceos/Makefile 
     dumux/nonlinear/Makefile 
     m4/Makefile
     test/Makefile
diff --git a/dumux/material/Makefile.am b/dumux/material/Makefile.am
index a2cd979ad1ac84015517b30cd87167800818fc43..373750068f775bd3ee1b10d4876dd32e24bb59cd 100644
--- a/dumux/material/Makefile.am
+++ b/dumux/material/Makefile.am
@@ -1,4 +1,13 @@
-SUBDIRS = binarycoefficients components fluidmatrixinteractions fluidsystems spatialparameters
+SUBDIRS = \
+	  MpNcconstraintsolvers \
+	  MpNceos \
+	  MpNcfluidstates \
+	  MpNcfluidsystems \
+	  binarycoefficients \
+	  components \
+	  fluidmatrixinteractions \
+	  fluidsystems \
+	  spatialparameters
 
 materialdir = $(includedir)/dumux/material
 material_HEADERS = *.hh