diff --git a/dumux/boxmodels/MpNc/MpNcpropertydefaults.hh b/dumux/boxmodels/MpNc/MpNcpropertydefaults.hh
index 00dc2a55e4efb703729c08584c7b384b84743989..1f358fc4953bb4be7e5ecea8de13979812112fdc 100644
--- a/dumux/boxmodels/MpNc/MpNcpropertydefaults.hh
+++ b/dumux/boxmodels/MpNc/MpNcpropertydefaults.hh
@@ -37,7 +37,7 @@
 #include "mass/MpNcvtkwritermass.hh"
 #include "energy/MpNcvtkwriterenergy.hh"
 
-#include <dumux/material/constraintsolvers/compositionfromfugacities.hh>
+#include <dumux/material/MpNcconstraintsolvers/compositionfromfugacities.hh>
 
 namespace Dumux
 {
diff --git a/dumux/boxmodels/MpNc/mass/MpNclocalresidualmass.hh b/dumux/boxmodels/MpNc/mass/MpNclocalresidualmass.hh
index 80047434e854a3345743e26ddc1d43c3ecb2ec4b..1bd60e7f165857ca37ec71bb4e74c920d5d442cd 100644
--- a/dumux/boxmodels/MpNc/mass/MpNclocalresidualmass.hh
+++ b/dumux/boxmodels/MpNc/mass/MpNclocalresidualmass.hh
@@ -22,7 +22,7 @@
 #define DUMUX_MPNC_LOCAL_RESIDUAL_MASS_HH
 
 #include <dune/common/fvector.hh>
-#include <dumux/material/constraintsolvers/compositionfromfugacities.hh>
+#include <dumux/material/MpNcconstraintsolvers/compositionfromfugacities.hh>
 
 #include "../diffusion/diffusion.hh"
 
diff --git a/dumux/boxmodels/MpNc/mass/MpNcvolumevariablesmass.hh b/dumux/boxmodels/MpNc/mass/MpNcvolumevariablesmass.hh
index e1775f476ff1f079a7d47a25bee40da5eac7b668..3887239dbfa4507219992b06f783cf57ae743822 100644
--- a/dumux/boxmodels/MpNc/mass/MpNcvolumevariablesmass.hh
+++ b/dumux/boxmodels/MpNc/mass/MpNcvolumevariablesmass.hh
@@ -25,8 +25,8 @@
 #ifndef DUMUX_MPNC_VOLUME_VARIABLES_MASS_HH
 #define DUMUX_MPNC_VOLUME_VARIABLES_MASS_HH
 
-#include <dumux/material/fluidstates/genericfluidstate.hh>
-#include <dumux/material/fluidstates/equilibriumfluidstate.hh>
+#include <dumux/material/MpNcfluidstates/genericfluidstate.hh>
+#include <dumux/material/MpNcfluidstates/equilibriumfluidstate.hh>
 
 namespace Dumux
 {
diff --git a/dumux/material/constraintsolvers/Makefile.am b/dumux/material/MpNcconstraintsolvers/Makefile.am
similarity index 100%
rename from dumux/material/constraintsolvers/Makefile.am
rename to dumux/material/MpNcconstraintsolvers/Makefile.am
diff --git a/dumux/material/constraintsolvers/compositionfromfugacities.hh b/dumux/material/MpNcconstraintsolvers/compositionfromfugacities.hh
similarity index 99%
rename from dumux/material/constraintsolvers/compositionfromfugacities.hh
rename to dumux/material/MpNcconstraintsolvers/compositionfromfugacities.hh
index 65716f9a6d2c12d27335a240804c591897c8e76d..3cb9bd312931cb82b9ecddd158b61d24a0c2b875 100644
--- a/dumux/material/constraintsolvers/compositionfromfugacities.hh
+++ b/dumux/material/MpNcconstraintsolvers/compositionfromfugacities.hh
@@ -26,7 +26,7 @@
 #ifndef DUMUX_COMPOSITION_FROM_FUGACITIES_HH
 #define DUMUX_COMPOSITION_FROM_FUGACITIES_HH
 
-#include "../fluidstates/genericfluidstate.hh"
+#include "../MpNcfluidstates/genericfluidstate.hh"
 
 namespace Dumux {
 
diff --git a/dumux/material/eos/Makefile.am b/dumux/material/MpNceos/Makefile.am
similarity index 100%
rename from dumux/material/eos/Makefile.am
rename to dumux/material/MpNceos/Makefile.am
diff --git a/dumux/material/eos/pengrobinson.hh b/dumux/material/MpNceos/pengrobinson.hh
similarity index 100%
rename from dumux/material/eos/pengrobinson.hh
rename to dumux/material/MpNceos/pengrobinson.hh
diff --git a/dumux/material/eos/pengrobinsonmixture.hh b/dumux/material/MpNceos/pengrobinsonmixture.hh
similarity index 100%
rename from dumux/material/eos/pengrobinsonmixture.hh
rename to dumux/material/MpNceos/pengrobinsonmixture.hh
diff --git a/dumux/material/eos/pengrobinsonparams.hh b/dumux/material/MpNceos/pengrobinsonparams.hh
similarity index 100%
rename from dumux/material/eos/pengrobinsonparams.hh
rename to dumux/material/MpNceos/pengrobinsonparams.hh
diff --git a/dumux/material/eos/pengrobinsonparamsmixture.hh b/dumux/material/MpNceos/pengrobinsonparamsmixture.hh
similarity index 100%
rename from dumux/material/eos/pengrobinsonparamsmixture.hh
rename to dumux/material/MpNceos/pengrobinsonparamsmixture.hh
diff --git a/dumux/material/eos/pengrobinsonparamspure.hh b/dumux/material/MpNceos/pengrobinsonparamspure.hh
similarity index 100%
rename from dumux/material/eos/pengrobinsonparamspure.hh
rename to dumux/material/MpNceos/pengrobinsonparamspure.hh
diff --git a/dumux/material/fluidstates/Makefile.am b/dumux/material/MpNcfluidstates/Makefile.am
similarity index 100%
rename from dumux/material/fluidstates/Makefile.am
rename to dumux/material/MpNcfluidstates/Makefile.am
diff --git a/dumux/material/fluidstates/equilibriumfluidstate.hh b/dumux/material/MpNcfluidstates/equilibriumfluidstate.hh
similarity index 100%
rename from dumux/material/fluidstates/equilibriumfluidstate.hh
rename to dumux/material/MpNcfluidstates/equilibriumfluidstate.hh
diff --git a/dumux/material/fluidstates/genericfluidstate.hh b/dumux/material/MpNcfluidstates/genericfluidstate.hh
similarity index 100%
rename from dumux/material/fluidstates/genericfluidstate.hh
rename to dumux/material/MpNcfluidstates/genericfluidstate.hh
diff --git a/dumux/material/fluidstates/immisciblefluidstate.hh b/dumux/material/MpNcfluidstates/immisciblefluidstate.hh
similarity index 100%
rename from dumux/material/fluidstates/immisciblefluidstate.hh
rename to dumux/material/MpNcfluidstates/immisciblefluidstate.hh
diff --git a/dumux/material/fluidstates/trackinggenericfluidstate.hh b/dumux/material/MpNcfluidstates/trackinggenericfluidstate.hh
similarity index 100%
rename from dumux/material/fluidstates/trackinggenericfluidstate.hh
rename to dumux/material/MpNcfluidstates/trackinggenericfluidstate.hh
diff --git a/dumux/material/new_fluidsystems/Makefile.am b/dumux/material/MpNcfluidsystems/Makefile.am
similarity index 100%
rename from dumux/material/new_fluidsystems/Makefile.am
rename to dumux/material/MpNcfluidsystems/Makefile.am
diff --git a/dumux/material/new_fluidsystems/h2on2fluidsystem.hh b/dumux/material/MpNcfluidsystems/h2on2fluidsystem.hh
similarity index 99%
rename from dumux/material/new_fluidsystems/h2on2fluidsystem.hh
rename to dumux/material/MpNcfluidsystems/h2on2fluidsystem.hh
index 7ef1e59a842d9ec746731ba9b37b1172535fbab2..ea0a33c700d8e54138a96bde3508951d0905bca8 100644
--- a/dumux/material/new_fluidsystems/h2on2fluidsystem.hh
+++ b/dumux/material/MpNcfluidsystems/h2on2fluidsystem.hh
@@ -25,7 +25,7 @@
 #ifndef DUMUX_H2O_N2_FLUID_SYSTEM_HH
 #define DUMUX_H2O_N2_FLUID_SYSTEM_HH
 
-#include <dumux/material/fluidstates/genericfluidstate.hh>
+#include <dumux/material/MpNcfluidstates/genericfluidstate.hh>
 
 #include <dumux/material/components/simpleh2o.hh>
 #include <dumux/material/components/h2o.hh>
@@ -34,7 +34,7 @@
 #include <dumux/material/idealgas.hh>
 
 #include <dumux/material/binarycoefficients/h2o_n2.hh>
-#include <dumux/material/fluidstates/genericfluidstate.hh>
+#include <dumux/material/MpNcfluidstates/genericfluidstate.hh>
 
 #include <dumux/common/exceptions.hh>
 
@@ -94,8 +94,7 @@ struct H2ON2StaticParameters {
     {
         static const char *name[] = {
             "l",
-            "g",
-            "s"
+            "g"
         };
 
         assert(0 <= phaseIdx && phaseIdx < numPhases + 1);
diff --git a/test/boxmodels/MpNc/obstacleproblem.hh b/test/boxmodels/MpNc/obstacleproblem.hh
index 7df0e1748df45a7a8ed352e111d8ed0937c879e1..9b463e708eb0fd26f75cbebfa3eb299897a13430 100644
--- a/test/boxmodels/MpNc/obstacleproblem.hh
+++ b/test/boxmodels/MpNc/obstacleproblem.hh
@@ -55,7 +55,7 @@
 #include <dumux/material/fluidsystems/h2o_h2_n2_o2_system.hh>
 */
 
-#include <dumux/material/new_fluidsystems/h2on2fluidsystem.hh>
+#include <dumux/material/MpNcfluidsystems/h2on2fluidsystem.hh>
 
 #include "obstaclespatialparameters.hh"