diff --git a/doc/handbook/3_tutorialimplicit.tex b/doc/handbook/3_tutorialimplicit.tex
index 4f44a11691c0d5e82c7163a56b12af275597d739..d37201e9aaedc4a35b76543fc2951a9316b33086 100644
--- a/doc/handbook/3_tutorialimplicit.tex
+++ b/doc/handbook/3_tutorialimplicit.tex
@@ -389,11 +389,7 @@ For the visualization of the results using ParaView, please refer to section \re
   simplex grids, like \texttt{ALUGrid} or \texttt{UGGrid}. If this is not the case,
   please skip this exercise.
   Change the types of elements used for discretizing the domain. In line
-  \ref{tutorial-implicit:set-gridcreator} of the problem
-  file  the type of gridcreator is chosen. By choosing a different grid creator
-  you can discretize the domain with different elements.
-  Hint: You can find gridcreators in \texttt{dumux/io/}, change for example from
-  \texttt{cubegridcreator.hh} to \texttt{simplexgridcreator.hh}.
+  \ref{tutorial-implicit:set-grid} of the problem file the grid is chosen.
   For ALUGrid you have to change the ALUGrid type in line \ref{tutorial-implicit:set-grid-ALU} from \texttt{Dune::cube}
   to \texttt{Dune::simplex}.
   The shape of the employed elements can be visualized in ParaView by choosing \texttt{Surface with Edges}.
diff --git a/tutorial/solutions_implicit/ex1b_tutorial_implicit.input.diff b/tutorial/solutions_implicit/ex1b_tutorial_implicit.input.diff
index 1f6f7ca2b1c1591c889238e59fe5c39134b24c09..2a7f9a3e8d7fc62e17704da1818daa4c091e7ca3 100644
--- a/tutorial/solutions_implicit/ex1b_tutorial_implicit.input.diff
+++ b/tutorial/solutions_implicit/ex1b_tutorial_implicit.input.diff
@@ -1,16 +1,12 @@
-Index: tutorial_implicit.input
-===================================================================
---- tutorial_implicit.input	(revision 15171)
-+++ tutorial_implicit.input	(working copy)
-@@ -3,7 +3,7 @@
+diff --git a/tutorial/tutorial_implicit.input b/tutorial/tutorial_implicit.input
+index 13a5c94..1780803 100644
+--- a/tutorial/tutorial_implicit.input
++++ b/tutorial/tutorial_implicit.input
+@@ -3,5 +3,5 @@ TEnd = 500000 # duration of the simulation [s]
  DtInitial = 10 # initial time step size [s]
  
  [Grid]
--UpperRightX = 300 # x-coordinate of the upper-right corner of the grid [m]
--UpperRightY = 60 # y-coordinate of the upper-right corner of the grid [m]
--NumberOfCellsX = 100 # x-resolution of the grid
--NumberOfCellsY = 1 # y-resolution of the grid
-+UpperRightX = 400 # x-coordinate of the upper-right corner of the grid [m]
-+UpperRightY = 500 # y-coordinate of the upper-right corner of the grid [m]
-+NumberOfCellsX = 20 # x-resolution of the grid
-+NumberOfCellsY = 25 # y-resolution of the grid
+-UpperRight = 300 60 # x-/y-coordinates of the upper-right corner of the grid [m]
+-Cells = 100 1 # x-/y-resolution of the grid
++UpperRight = 400 500 # x-/y-coordinates of the upper-right corner of the grid [m]
++Cells = 20 25 # x-/y-resolution of the grid
diff --git a/tutorial/solutions_implicit/ex1c_tutorialproblem_implicit.diff b/tutorial/solutions_implicit/ex1c_tutorialproblem_implicit.diff
index 2ebda752d63b17fd45b340a8a6902dcf4bdfb92e..a2590cfb9d784b0ae788f547a29d5f3f2bfd5c7d 100644
--- a/tutorial/solutions_implicit/ex1c_tutorialproblem_implicit.diff
+++ b/tutorial/solutions_implicit/ex1c_tutorialproblem_implicit.diff
@@ -1,17 +1,8 @@
-Index: tutorialproblem_implicit.hh
-===================================================================
---- tutorialproblem_implicit.hh	(revision 15068)
-+++ tutorialproblem_implicit.hh	(working copy)
-@@ -47,7 +47,7 @@
- // The components that are used
- #include <dumux/material/components/h2o.hh>
- #include <dumux/material/components/lnapl.hh>
--#include <dumux/io/cubegridcreator.hh>
-+#include <dumux/io/simplexgridcreator.hh>
- 
- namespace Dumux{
- // Forward declaration of the problem class
-@@ -64,13 +64,13 @@
+diff --git a/tutorial/tutorialproblem_implicit.hh b/tutorial/tutorialproblem_implicit.hh
+index c2d5b13..190efa3 100644
+--- a/tutorial/tutorialproblem_implicit.hh
++++ b/tutorial/tutorialproblem_implicit.hh
+@@ -52,7 +52,7 @@ SET_PROP(TutorialProblemImplicit, Problem) /*@\label{tutorial-implicit:set-probl
  
  // Set grid and the grid creator to be used
  #if HAVE_DUNE_ALUGRID /*@\label{tutorial-implicit:set-grid}@*/
@@ -20,10 +11,3 @@ Index: tutorialproblem_implicit.hh
  #elif HAVE_UG
  SET_TYPE_PROP(TutorialProblemImplicit, Grid, Dune::UGGrid<2>);
  #else
- SET_TYPE_PROP(TutorialProblemImplicit, Grid, Dune::YaspGrid<2>);
- #endif // HAVE_DUNE_ALUGRID
--SET_TYPE_PROP(TutorialProblemImplicit, GridCreator, Dumux::CubeGridCreator<TypeTag>); /*@\label{tutorial-implicit:set-gridcreator}@*/
-+SET_TYPE_PROP(TutorialProblemImplicit, GridCreator, Dumux::SimplexGridCreator<TypeTag>); /*@\label{tutorial-implicit:set-gridcreator}@*/
- 
- // Set the wetting phase
- SET_PROP(TutorialProblemImplicit, WettingPhase) /*@\label{tutorial-implicit:2p-system-start}@*/
diff --git a/tutorial/solutions_implicit/ex1d_tutorialproblem_implicit.diff b/tutorial/solutions_implicit/ex1d_tutorialproblem_implicit.diff
index 569b1767510966f4ea0e28265eacc21783d4a0ee..838524bfbfca0fc3736abe641e17c531d24457da 100644
--- a/tutorial/solutions_implicit/ex1d_tutorialproblem_implicit.diff
+++ b/tutorial/solutions_implicit/ex1d_tutorialproblem_implicit.diff
@@ -1,32 +1,31 @@
-Index: tutorialproblem_implicit.hh
-===================================================================
---- tutorialproblem_implicit.hh	(revision 15068)
-+++ tutorialproblem_implicit.hh	(working copy)
-@@ -46,7 +46,8 @@
+diff --git a/tutorial/tutorialproblem_implicit.hh b/tutorial/tutorialproblem_implicit.hh
+index c2d5b13..ebd73a3 100644
+--- a/tutorial/tutorialproblem_implicit.hh
++++ b/tutorial/tutorialproblem_implicit.hh
+@@ -35,7 +35,8 @@
  
  // The components that are used
  #include <dumux/material/components/h2o.hh>
 -#include <dumux/material/components/lnapl.hh>
 +#include <dumux/material/components/brine.hh>
 +#include <dumux/material/components/dnapl.hh>
- #include <dumux/io/cubegridcreator.hh>
  
  namespace Dumux{
-@@ -76,7 +77,7 @@
+ // Forward declaration of the problem class
+@@ -63,14 +64,14 @@ SET_TYPE_PROP(TutorialProblemImplicit, Grid, Dune::YaspGrid<2>);
  SET_PROP(TutorialProblemImplicit, WettingPhase) /*@\label{tutorial-implicit:2p-system-start}@*/
  {
  private: typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
--public: typedef Dumux::LiquidPhase<Scalar, Dumux::H2O<Scalar> > type; /*@\label{tutorial-implicit:wettingPhase}@*/
-+public: typedef Dumux::LiquidPhase<Scalar, Dumux::Brine<Scalar, Dumux::H2O<Scalar> > >type; /*@\label{tutorial-implicit:wettingPhase}@*/
+-public: typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::H2O<Scalar> > type; /*@\label{tutorial-implicit:wettingPhase}@*/
++public: typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::Brine<Scalar, Dumux::H2O<Scalar> > >type; /*@\label{tutorial-implicit:wettingPhase}@*/
  };
  
  // Set the non-wetting phase
-@@ -83,7 +84,7 @@
  SET_PROP(TutorialProblemImplicit, NonwettingPhase)
  {
  private: typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
--public: typedef Dumux::LiquidPhase<Scalar, Dumux::LNAPL<Scalar> > type; /*@\label{tutorial-implicit:nonwettingPhase}@*/
-+public: typedef Dumux::LiquidPhase<Scalar, Dumux::DNAPL<Scalar> > type; /*@\label{tutorial-implicit:nonwettingPhase}@*/
+-public: typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::LNAPL<Scalar> > type; /*@\label{tutorial-implicit:nonwettingPhase}@*/
++public: typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::DNAPL<Scalar> > type; /*@\label{tutorial-implicit:nonwettingPhase}@*/
  }; /*@\label{tutorial-implicit:2p-system-end}@*/
  
  SET_TYPE_PROP(TutorialProblemImplicit, FluidSystem, Dumux::TwoPImmiscibleFluidSystem<TypeTag>);/*@\label{tutorial-implicit:set-fluidsystem}@*/
diff --git a/tutorial/solutions_implicit/ex1e_tutorialproblem_implicit.diff b/tutorial/solutions_implicit/ex1e_tutorialproblem_implicit.diff
index 05c16bc5c06980c480493ba74024f131a410b976..2e79eeddedff1b594ca7d2519ab4c5806296263d 100644
--- a/tutorial/solutions_implicit/ex1e_tutorialproblem_implicit.diff
+++ b/tutorial/solutions_implicit/ex1e_tutorialproblem_implicit.diff
@@ -1,56 +1,48 @@
-Index: tutorialproblem_implicit.hh
-===================================================================
---- tutorialproblem_implicit.hh	(revision 15068)
-+++ tutorialproblem_implicit.hh	(working copy)
-@@ -44,6 +44,9 @@
+diff --git a/tutorial/tutorialproblem_implicit.hh b/tutorial/tutorialproblem_implicit.hh
+index c2d5b13..b3a7347 100644
+--- a/tutorial/tutorialproblem_implicit.hh
++++ b/tutorial/tutorialproblem_implicit.hh
+@@ -33,9 +33,8 @@
  // Spatially dependent parameters
  #include "tutorialspatialparams_implicit.hh"
  
+-// The components that are used
+-#include <dumux/material/components/h2o.hh>
+-#include <dumux/material/components/lnapl.hh>
 +// The fluidsystem
 +#include <dumux/material/fluidsystems/h2oair.hh>
-+
- // The components that are used
- #include <dumux/material/components/h2o.hh>
- #include <dumux/material/components/lnapl.hh>
-@@ -73,20 +76,20 @@
- SET_TYPE_PROP(TutorialProblemImplicit, GridCreator, Dumux::CubeGridCreator<TypeTag>); /*@\label{tutorial-implicit:set-gridcreator}@*/
  
- // Set the wetting phase
+ namespace Dumux{
+ // Forward declaration of the problem class
+@@ -59,21 +58,9 @@ SET_TYPE_PROP(TutorialProblemImplicit, Grid, Dune::UGGrid<2>);
+ SET_TYPE_PROP(TutorialProblemImplicit, Grid, Dune::YaspGrid<2>);
+ #endif // HAVE_DUNE_ALUGRID
+ 
+-// Set the wetting phase
 -SET_PROP(TutorialProblemImplicit, WettingPhase) /*@\label{tutorial-implicit:2p-system-start}@*/
 -{
 -private: typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
--public: typedef Dumux::LiquidPhase<Scalar, Dumux::H2O<Scalar> > type; /*@\label{tutorial-implicit:wettingPhase}@*/
+-public: typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::H2O<Scalar> > type; /*@\label{tutorial-implicit:wettingPhase}@*/
 -};
-+// SET_PROP(TutorialProblemImplicit, WettingPhase) /*@\label{tutorial-implicit:2p-system-start}@*/
-+// {
-+// private: typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-+// public: typedef Dumux::LiquidPhase<Scalar, Dumux::H2O<Scalar> > type; /*@\label{tutorial-implicit:wettingPhase}@*/
-+// };
-+// 
-+// // Set the non-wetting phase
-+// SET_PROP(TutorialProblemImplicit, NonwettingPhase)
-+// {
-+// private: typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-+// public: typedef Dumux::LiquidPhase<Scalar, Dumux::LNAPL<Scalar> > type; /*@\label{tutorial-implicit:nonwettingPhase}@*/
-+// }; /*@\label{tutorial-implicit:2p-system-end}@*/
- 
+-
 -// Set the non-wetting phase
 -SET_PROP(TutorialProblemImplicit, NonwettingPhase)
 -{
 -private: typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
--public: typedef Dumux::LiquidPhase<Scalar, Dumux::LNAPL<Scalar> > type; /*@\label{tutorial-implicit:nonwettingPhase}@*/
+-public: typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::LNAPL<Scalar> > type; /*@\label{tutorial-implicit:nonwettingPhase}@*/
 -}; /*@\label{tutorial-implicit:2p-system-end}@*/
--
--SET_TYPE_PROP(TutorialProblemImplicit, FluidSystem, Dumux::TwoPImmiscibleFluidSystem<TypeTag>);/*@\label{tutorial-implicit:set-fluidsystem}@*/
++// Set the fluidsystem
 +SET_TYPE_PROP(TutorialProblemImplicit, FluidSystem, Dumux::FluidSystems::H2OAir<typename GET_PROP_TYPE(TypeTag, Scalar)>);/*@\label{tutorial-implicit:set-fluidsystem}@*/
+ 
+-SET_TYPE_PROP(TutorialProblemImplicit, FluidSystem, Dumux::TwoPImmiscibleFluidSystem<TypeTag>);/*@\label{tutorial-implicit:set-fluidsystem}@*/
  // Disable gravity
  SET_BOOL_PROP(TutorialProblemImplicit, ProblemEnableGravity, false); /*@\label{tutorial-implicit:gravity}@*/
  }
-@@ -127,6 +130,7 @@
-         : ParentType(timeManager, gridView)
-         , eps_(3e-6)
-     {
-+      GET_PROP_TYPE(TypeTag, FluidSystem)::init();
+@@ -117,6 +104,7 @@ public:
  #if !(HAVE_DUNE_ALUGRID || HAVE_UG)
        std::cout << "If you want to use simplices instead of cubes, install and use dune-ALUGrid or UGGrid." << std::endl;
  #endif // !(HAVE_DUNE_ALUGRID || HAVE_UG)
++      GET_PROP_TYPE(TypeTag, FluidSystem)::init();
+     }
+ 
+     //! Specifies the problem name. This is used as a prefix for files
diff --git a/tutorial/solutions_implicit/ex2_tutorial_implicit_input.diff b/tutorial/solutions_implicit/ex2_tutorial_implicit_input.diff
index 564270070b28dfeccd183ecc5dca423c79217823..c0dd0196149a99f26da96afe29e3223b9c224995 100644
--- a/tutorial/solutions_implicit/ex2_tutorial_implicit_input.diff
+++ b/tutorial/solutions_implicit/ex2_tutorial_implicit_input.diff
@@ -1,20 +1,16 @@
-Index: tutorial_implicit.input
-===================================================================
---- tutorial_implicit.input	(revision 15171)
-+++ tutorial_implicit.input	(working copy)
-@@ -1,9 +1,9 @@
+diff --git a/tutorial/tutorial_implicit.input b/tutorial/tutorial_implicit.input
+index 13a5c94..37d6286 100644
+--- a/tutorial/tutorial_implicit.input
++++ b/tutorial/tutorial_implicit.input
+@@ -1,7 +1,7 @@
  [TimeManager]
 -TEnd = 500000 # duration of the simulation [s]
 -DtInitial = 10 # initial time step size [s]
-+TTEnd = 1e6 # duration of the simulation [s]
++TEnd = 1e6 # duration of the simulation [s]
 +DtInitial = 100 # initial time step size [s]
  
  [Grid]
--UpperRightX = 300 # x-coordinate of the upper-right corner of the grid [m]
--UpperRightY = 60 # y-coordinate of the upper-right corner of the grid [m]
--NumberOfCellsX = 100 # x-resolution of the grid
--NumberOfCellsY = 1 # y-resolution of the grid
-+UpperRightX = 100 # x-coordinate of the upper-right corner of the grid [m]
-+UpperRightY = 50 # y-coordinate of the upper-right corner of the grid [m]
-+NumberOfCellsX = 20 # x-resolution of the grid
-+NumberOfCellsY = 10 # y-resolution of the grid
+-UpperRight = 300 60 # x-/y-coordinates of the upper-right corner of the grid [m]
+-Cells = 100 1 # x-/y-resolution of the grid
++UpperRight = 100 50 # x-/y-coordinates of the upper-right corner of the grid [m]
++Cells = 20 10 # x-/y-resolution of the grid
diff --git a/tutorial/solutions_implicit/ex2_tutorialproblem_implicit.hh b/tutorial/solutions_implicit/ex2_tutorialproblem_implicit.hh
index f9a4fb95393d7fee0a625084766ab48d2804c6c7..c5ed85d7b74cc42ad94dba9c1c8387333a1eaeca 100644
--- a/tutorial/solutions_implicit/ex2_tutorialproblem_implicit.hh
+++ b/tutorial/solutions_implicit/ex2_tutorialproblem_implicit.hh
@@ -30,22 +30,12 @@
 // The base porous media box problem
 #include <dumux/porousmediumflow/implicit/problem.hh>
 
-// The DUNE grid used
-#if HAVE_DUNE_ALUGRID
-#include <dune/alugrid/grid.hh>
-#elif HAVE_UG
-#include <dune/grid/uggrid.hh>
-#else
-#include <dune/grid/yaspgrid.hh>
-#endif // HAVE_DUNE_ALUGRID, HAVE_UG
-
 // Spatially dependent parameters
 #include "ex2_tutorialspatialparams_implicit.hh"
 
 // The components that are used
 #include <dumux/material/components/h2o.hh>
 #include <dumux/material/components/lnapl.hh>
-#include <dumux/io/cubegridcreator.hh>
 
 namespace Dumux{
 // Forward declaration of the problem class
@@ -68,7 +58,6 @@ SET_TYPE_PROP(Ex2TutorialProblemImplicit, Grid, Dune::UGGrid<2>);
 #else
 SET_TYPE_PROP(Ex2TutorialProblemImplicit, Grid, Dune::YaspGrid<2>);
 #endif // HAVE_DUNE_ALUGRID
-SET_TYPE_PROP(Ex2TutorialProblemImplicit, GridCreator, Dumux::CubeGridCreator<TypeTag>); /*@\label{tutorial-implicit:set-gridcreator}@*/
 
 // Set the wetting phase
 SET_PROP(Ex2TutorialProblemImplicit, WettingPhase) /*@\label{tutorial-implicit:2p-system-start}@*/
diff --git a/tutorial/solutions_implicit/ex4_tutorialproblem_implicit.diff b/tutorial/solutions_implicit/ex4_tutorialproblem_implicit.diff
index b7737ac2d54eba5ef9a985ac4f9398520fc84d2c..fface776a265335de25b1a6ff4295f5bd488865f 100644
--- a/tutorial/solutions_implicit/ex4_tutorialproblem_implicit.diff
+++ b/tutorial/solutions_implicit/ex4_tutorialproblem_implicit.diff
@@ -15,8 +15,8 @@ Index: tutorialproblem_implicit.hh
  SET_PROP(TutorialProblemImplicit, NonwettingPhase)
  {
  private: typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
--public: typedef Dumux::LiquidPhase<Scalar, Dumux::LNAPL<Scalar> > type; /*@\label{tutorial-implicit:nonwettingPhase}@*/
-+public: typedef Dumux::LiquidPhase<Scalar, Dumux::Benzene<Scalar> > type; /*@\label{tutorial-implicit:nonwettingPhase}@*/
+-public: typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::LNAPL<Scalar> > type; /*@\label{tutorial-implicit:nonwettingPhase}@*/
++public: typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::Benzene<Scalar> > type; /*@\label{tutorial-implicit:nonwettingPhase}@*/
  }; /*@\label{tutorial-implicit:2p-system-end}@*/
  
  SET_TYPE_PROP(TutorialProblemImplicit, FluidSystem, Dumux::TwoPImmiscibleFluidSystem<TypeTag>);/*@\label{tutorial-implicit:set-fluidsystem}@*/
diff --git a/tutorial/solutions_implicit/ex5_tutorial_implicit.input b/tutorial/solutions_implicit/ex5_tutorial_implicit.input
index 909a758cef55e4d21b5946e0d515501acdba2f31..f5d92c39fa6cb27d04cba830c6ad8aed4af9d103 100644
--- a/tutorial/solutions_implicit/ex5_tutorial_implicit.input
+++ b/tutorial/solutions_implicit/ex5_tutorial_implicit.input
@@ -4,7 +4,5 @@ DtInitial = 10 # initial time step size [s]
 MaxTimeStepSize = 1000
 
 [Grid]
-UpperRightX = 100 # x-coordinate of the upper-right corner of the grid [m]
-UpperRightY = 50 # y-coordinate of the upper-right corner of the grid [m]
-NumberOfCellsX = 100 # x-resolution of the grid
-NumberOfCellsY = 10 # y-resolution of the grid
+UpperRight = 100 50 # x-/y-coordinates of the upper-right corner of the grid [m]
+NumberOfCellsX = 100 10 # x-/y-resolution of the grid
\ No newline at end of file
diff --git a/tutorial/solutions_implicit/ex5_tutorialproblem_implicit.hh b/tutorial/solutions_implicit/ex5_tutorialproblem_implicit.hh
index 05992aa396cd055966bf2a0ce361d7c84d92fb60..97d6861634339e297b3650d7af5f288f58b690b9 100644
--- a/tutorial/solutions_implicit/ex5_tutorialproblem_implicit.hh
+++ b/tutorial/solutions_implicit/ex5_tutorialproblem_implicit.hh
@@ -30,22 +30,12 @@
 // The base porous media box problem
 #include <dumux/porousmediumflow/implicit/problem.hh>
 
-// The DUNE grid used
-#if HAVE_DUNE_ALUGRID
-#include <dune/alugrid/grid.hh>
-#elif HAVE_UG
-#include <dune/grid/uggrid.hh>
-#else
-#include <dune/grid/yaspgrid.hh>
-#endif // HAVE_DUNE_ALUGRID, HAVE_UG
-
 // Spatially dependent parameters
 #include "ex5_tutorialspatialparams_implicit.hh"
 
 // The components that are used
 #include <dumux/material/components/h2o.hh>
 #include <dumux/material/components/lnapl.hh>
-#include <dumux/io/cubegridcreator.hh>
 
 namespace Dumux{
 // Forward declaration of the problem class
@@ -67,9 +57,7 @@ SET_TYPE_PROP(Ex5TutorialProblemImplicit, Grid, Dune::ALUGrid</*dim=*/2, 2, Dune
 SET_TYPE_PROP(Ex5TutorialProblemImplicit, Grid, Dune::UGGrid<2>);
 #else
 SET_TYPE_PROP(Ex5TutorialProblemImplicit, Grid, Dune::YaspGrid<2>);
-#warning If you want to use adaptivity, install and use dune-ALUGrid.
 #endif // HAVE_DUNE_ALUGRID
-SET_TYPE_PROP(Ex5TutorialProblemImplicit, GridCreator, Dumux::CubeGridCreator<TypeTag>); /*@\label{tutorial-implicit:set-gridcreator}@*/
 
 // Set the wetting phase
 SET_PROP(Ex5TutorialProblemImplicit, WettingPhase) /*@\label{tutorial-implicit:2p-system-start}@*/
diff --git a/tutorial/solutions_sequential/Ex1_b_input.diff b/tutorial/solutions_sequential/Ex1_b_input.diff
index a336cba9022014eb214f7d0bfe4f40ff910bb303..9b29e56da4025db68b80f431863361e69fa3b823 100644
--- a/tutorial/solutions_sequential/Ex1_b_input.diff
+++ b/tutorial/solutions_sequential/Ex1_b_input.diff
@@ -1,18 +1,15 @@
-Index: tutorial_sequential.input
-===================================================================
---- tutorial_sequential.input	(revision 15171)
-+++ tutorial_sequential.input	(working copy)
-@@ -1,9 +1,9 @@
+diff --git a/tutorial/tutorial_sequential.input b/tutorial/tutorial_sequential.input
+index c435ae2..ca09bb4 100644
+--- a/tutorial/tutorial_sequential.input
++++ b/tutorial/tutorial_sequential.input
+@@ -1,7 +1,7 @@
  [TimeManager]
 -TEnd = 100000 # duration of the simulation [s]
 +TEnd = 500000 # duration of the simulation [s]
  DtInitial = 10 # initial time step size [s]
  
  [Grid]
- UpperRightX = 300 # x-coordinate of the upper-right corner of the grid [m]
--UpperRightY = 60 # y-coordinate of the upper-right corner of the grid [m]
--NumberOfCellsX = 100 # x-resolution of the grid
--NumberOfCellsY = 1 # y-resolution of the grid
-+UpperRightY = 300 # y-coordinate of the upper-right corner of the grid [m]
-+NumberOfCellsX = 20 # x-resolution of the grid
-+NumberOfCellsY = 10 # y-resolution of the grid
+-UpperRight = 300 60 # x-/y-coordinate of the upper-right corner of the grid [m]
+-Cells = 100 1 # x-/y-resolution of the grid
++UpperRight = 300 300 # x-/y-coordinate of the upper-right corner of the grid [m]
++Cells = 20 10 # x-/y-resolution of the grid
diff --git a/tutorial/solutions_sequential/Ex1_c_problem.diff b/tutorial/solutions_sequential/Ex1_c_problem.diff
index c9d3cda131836fb9b5d25d23db031b42a67437a9..568a037780e3afa8eda01ad45698fc9797900675 100644
--- a/tutorial/solutions_sequential/Ex1_c_problem.diff
+++ b/tutorial/solutions_sequential/Ex1_c_problem.diff
@@ -16,8 +16,8 @@ Index: tutorialproblem_sequential.hh
  private:
      typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
  public:
--    typedef Dumux::LiquidPhase<Scalar, Dumux::H2O<Scalar> > type; /*@\label{tutorial-sequential:wettingPhase}@*/
-+    typedef Dumux::LiquidPhase<Scalar, Dumux::Brine<Scalar, H2O<Scalar> > > type; /*@\label{tutorial-sequential:wettingPhase}@*/
+-    typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::H2O<Scalar> > type; /*@\label{tutorial-sequential:wettingPhase}@*/
++    typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::Brine<Scalar, H2O<Scalar> > > type; /*@\label{tutorial-sequential:wettingPhase}@*/
  };
  
  // Set the non-wetting phase
@@ -25,8 +25,8 @@ Index: tutorialproblem_sequential.hh
  private:
      typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
  public:
--    typedef Dumux::LiquidPhase<Scalar, Dumux::LNAPL<Scalar> > type; /*@\label{tutorial-sequential:nonwettingPhase}@*/
-+    typedef Dumux::LiquidPhase<Scalar, Dumux::DNAPL<Scalar> > type; /*@\label{tutorial-sequential:nonwettingPhase}@*/
+-    typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::LNAPL<Scalar> > type; /*@\label{tutorial-sequential:nonwettingPhase}@*/
++    typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::DNAPL<Scalar> > type; /*@\label{tutorial-sequential:nonwettingPhase}@*/
  }; /*@\label{tutorial-sequential:2p-system-end}@*/
  
  SET_TYPE_PROP(TutorialProblemSequential, EvalCflFluxFunction, Dumux::EvalCflFluxCoats<TypeTag>); /*@\label{tutorial-sequential:cflflux}@*/
diff --git a/tutorial/solutions_sequential/Ex1_d_input.diff b/tutorial/solutions_sequential/Ex1_d_input.diff
index f865155e9c07fa21f65ecea47302633188f3b70a..c85cede1d91a9912a4f8b44c6c25ce06f0fd5445 100644
--- a/tutorial/solutions_sequential/Ex1_d_input.diff
+++ b/tutorial/solutions_sequential/Ex1_d_input.diff
@@ -1,18 +1,15 @@
-Index: tutorial_sequential.input
-===================================================================
---- tutorial_sequential.input	(revision 15171)
-+++ tutorial_sequential.input	(working copy)
-@@ -1,9 +1,9 @@
+diff --git a/tutorial/tutorial_sequential.input b/tutorial/tutorial_sequential.input
+index c435ae2..ec1abf2 100644
+--- a/tutorial/tutorial_sequential.input
++++ b/tutorial/tutorial_sequential.input
+@@ -1,7 +1,7 @@
  [TimeManager]
 -TEnd = 100000 # duration of the simulation [s]
 +TEnd = 20000 # duration of the simulation [s]
  DtInitial = 10 # initial time step size [s]
  
  [Grid]
- UpperRightX = 300 # x-coordinate of the upper-right corner of the grid [m]
--UpperRightY = 60 # y-coordinate of the upper-right corner of the grid [m]
--NumberOfCellsX = 100 # x-resolution of the grid
--NumberOfCellsY = 1 # y-resolution of the grid
-+UpperRightY = 300 # y-coordinate of the upper-right corner of the grid [m]
-+NumberOfCellsX = 15 # x-resolution of the grid
-+NumberOfCellsY = 30 # y-resolution of the grid
+-UpperRight = 300 60 # x-/y-coordinate of the upper-right corner of the grid [m]
+-Cells = 100 1 # x-/y-resolution of the grid
++UpperRight = 300 300 # x-/y-coordinate of the upper-right corner of the grid [m]
++Cells = 15 30 # x-/y-resolution of the grid
diff --git a/tutorial/solutions_sequential/Ex1_d_problem.diff b/tutorial/solutions_sequential/Ex1_d_problem.diff
index a2d1e1a25f88087857adf442971cc03001836923..4f08cf29f3d161b3ccac8cd7b03959f3ed58b48d 100644
--- a/tutorial/solutions_sequential/Ex1_d_problem.diff
+++ b/tutorial/solutions_sequential/Ex1_d_problem.diff
@@ -22,7 +22,7 @@ Index: tutorialproblem_sequential.hh
 -private:
 -    typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
 -public:
--    typedef Dumux::LiquidPhase<Scalar, Dumux::H2O<Scalar> > type; /*@\label{tutorial-sequential:wettingPhase}@*/
+-    typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::H2O<Scalar> > type; /*@\label{tutorial-sequential:wettingPhase}@*/
 -};
 +SET_TYPE_PROP(TutorialProblemSequential, FluidSystem, Dumux::H2OAirFluidSystem<TypeTag>);
 +// // Set the wetting phase
@@ -31,7 +31,7 @@ Index: tutorialproblem_sequential.hh
 +// private:
 +//     typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
 +// public:
-+//     typedef Dumux::LiquidPhase<Scalar, Dumux::H2O<Scalar> > type; /*@\label{tutorial-sequential:wettingPhase}@*/
++//     typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::H2O<Scalar> > type; /*@\label{tutorial-sequential:wettingPhase}@*/
 +// };
 +// 
 +// // Set the non-wetting phase
@@ -40,7 +40,7 @@ Index: tutorialproblem_sequential.hh
 +// private:
 +//     typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
 +// public:
-+//     typedef Dumux::LiquidPhase<Scalar, Dumux::LNAPL<Scalar> > type; /*@\label{tutorial-sequential:nonwettingPhase}@*/
++//     typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::LNAPL<Scalar> > type; /*@\label{tutorial-sequential:nonwettingPhase}@*/
 +// }; /*@\label{tutorial-sequential:2p-system-end}@*/
  
 -// Set the non-wetting phase
@@ -49,7 +49,7 @@ Index: tutorialproblem_sequential.hh
 -private:
 -    typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
 -public:
--    typedef Dumux::LiquidPhase<Scalar, Dumux::LNAPL<Scalar> > type; /*@\label{tutorial-sequential:nonwettingPhase}@*/
+-    typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::LNAPL<Scalar> > type; /*@\label{tutorial-sequential:nonwettingPhase}@*/
 -}; /*@\label{tutorial-sequential:2p-system-end}@*/
 -
  SET_TYPE_PROP(TutorialProblemSequential, EvalCflFluxFunction, Dumux::EvalCflFluxCoats<TypeTag>); /*@\label{tutorial-sequential:cflflux}@*/
diff --git a/tutorial/solutions_sequential/Ex1_e_input.diff b/tutorial/solutions_sequential/Ex1_e_input.diff
index ed85c4f3530e4d599995337a31a7a7bea7e05943..b5ace8f454b50cd740ef472cc9f5c9b636033cec 100644
--- a/tutorial/solutions_sequential/Ex1_e_input.diff
+++ b/tutorial/solutions_sequential/Ex1_e_input.diff
@@ -1,19 +1,15 @@
-Index: tutorial_sequential.input
-===================================================================
---- tutorial_sequential.input	(revision 15171)
-+++ tutorial_sequential.input	(working copy)
-@@ -1,9 +1,9 @@
+diff --git a/tutorial/tutorial_sequential.input b/tutorial/tutorial_sequential.input
+index c435ae2..ab2c025 100644
+--- a/tutorial/tutorial_sequential.input
++++ b/tutorial/tutorial_sequential.input
+@@ -1,7 +1,7 @@
  [TimeManager]
 -TEnd = 100000 # duration of the simulation [s]
 +TEnd = 200000 # duration of the simulation [s]
  DtInitial = 10 # initial time step size [s]
  
  [Grid]
--UpperRightX = 300 # x-coordinate of the upper-right corner of the grid [m]
--UpperRightY = 60 # y-coordinate of the upper-right corner of the grid [m]
--NumberOfCellsX = 100 # x-resolution of the grid
--NumberOfCellsY = 1 # y-resolution of the grid
-+UpperRightX = 600 # x-coordinate of the upper-right corner of the grid [m]
-+UpperRightY = 300 # y-coordinate of the upper-right corner of the grid [m]
-+NumberOfCellsX = 30 # x-resolution of the grid
-+NumberOfCellsY = 15 # y-resolution of the grid
+-UpperRight = 300 60 # x-/y-coordinate of the upper-right corner of the grid [m]
+-Cells = 100 1 # x-/y-resolution of the grid
++UpperRight = 600 300 # x-/y-coordinate of the upper-right corner of the grid [m]
++Cells = 30 15 # x-/y-resolution of the grid
diff --git a/tutorial/solutions_sequential/Ex2_tutorial_sequential.input.diff b/tutorial/solutions_sequential/Ex2_tutorial_sequential.input.diff
index 1fe26c9b02c6ef226317229ac3a3f49976670ca0..3450f41f079301f128a2dfec4e460e9cfa3ff1e7 100644
--- a/tutorial/solutions_sequential/Ex2_tutorial_sequential.input.diff
+++ b/tutorial/solutions_sequential/Ex2_tutorial_sequential.input.diff
@@ -1,18 +1,15 @@
-Index: tutorial_sequential.input
-===================================================================
---- tutorial_sequential.input	(revision 15171)
-+++ tutorial_sequential.input	(working copy)
-@@ -1,9 +1,9 @@
+diff --git a/tutorial/tutorial_sequential.input b/tutorial/tutorial_sequential.input
+index c435ae2..02f6ec3 100644
+--- a/tutorial/tutorial_sequential.input
++++ b/tutorial/tutorial_sequential.input
+@@ -1,7 +1,7 @@
  [TimeManager]
 -TEnd = 100000 # duration of the simulation [s]
 +TEnd = 1e6 # duration of the simulation [s]
  DtInitial = 10 # initial time step size [s]
- 
+
  [Grid]
- UpperRightX = 300 # x-coordinate of the upper-right corner of the grid [m]
--UpperRightY = 60 # y-coordinate of the upper-right corner of the grid [m]
--NumberOfCellsX = 100 # x-resolution of the grid
--NumberOfCellsY = 1 # y-resolution of the grid
-+UpperRightY = 50 # y-coordinate of the upper-right corner of the grid [m]
-+NumberOfCellsX = 20 # x-resolution of the grid
-+NumberOfCellsY = 10 # y-resolution of the grid
+-UpperRight = 300 60 # x-/y-coordinate of the upper-right corner of the grid [m]
+-Cells = 100 1 # x-/y-resolution of the grid
++UpperRight = 300 50 # x-/y-coordinate of the upper-right corner of the grid [m]
++Cells = 20 10 # x-/y-resolution of the grid
diff --git a/tutorial/solutions_sequential/Ex3tutorial_sequential.input.diff b/tutorial/solutions_sequential/Ex3tutorial_sequential.input.diff
index ea65e2362a19315ee8e264745f252997a3b248e9..21de8b1207d9a883ae5f78d1ef6df0270d73021d 100644
--- a/tutorial/solutions_sequential/Ex3tutorial_sequential.input.diff
+++ b/tutorial/solutions_sequential/Ex3tutorial_sequential.input.diff
@@ -1,27 +1,28 @@
-Index: tutorial_sequential.input
-===================================================================
---- tutorial_sequential.input	(revision 15171)
-+++ tutorial_sequential.input	(working copy)
-@@ -1,3 +1,10 @@
+diff --git a/tutorial/tutorial_sequential.input b/tutorial/tutorial_sequential.input
+index c435ae2..50b982d 100644
+--- a/tutorial/tutorial_sequential.input
++++ b/tutorial/tutorial_sequential.input
+@@ -2,6 +2,23 @@
+ TEnd = 100000 # duration of the simulation [s]
+ DtInitial = 10 # initial time step size [s]
+ 
 +[Problem]
 +OutflowRateOil = 3e-2 # Rate of oil outflow for the Neumann boundary
 +OutputInterval = 5
-+ 
++
 +[SpatialParams]
 +Perm = 1e-8 # Peremeability
 +Porosity = 0.15
- [TimeManager]
- TEnd = 100000 # duration of the simulation [s]
- DtInitial = 10 # initial time step size [s]
-@@ -7,3 +14,11 @@
- UpperRightY = 60 # y-coordinate of the upper-right corner of the grid [m]
- NumberOfCellsX = 100 # x-resolution of the grid
- NumberOfCellsY = 1 # y-resolution of the grid
++
+ [Grid]
+ UpperRight = 300 60 # x-/y-coordinate of the upper-right corner of the grid [m]
+ Cells = 100 1 # x-/y-resolution of the grid
++
 +##########
 +# Tweaks
 +##########
 +[Impet]
 +CFLFactor = 0.8
-+ 
++
 +[Vtk]
 +OutputLevel = 3
diff --git a/tutorial/solutions_sequential/ex2tutorialproblem_sequential.hh b/tutorial/solutions_sequential/ex2tutorialproblem_sequential.hh
index 4208f100ad29709aa4c4109c78d2ae6627f3aaca..fd8e2a3714e5730b9c91995517b0fc52e8e18846 100644
--- a/tutorial/solutions_sequential/ex2tutorialproblem_sequential.hh
+++ b/tutorial/solutions_sequential/ex2tutorialproblem_sequential.hh
@@ -24,10 +24,6 @@
 #ifndef DUMUX_EX2TUTORIALPROBLEM_SEQUENTIAL_HH // guardian macro /*@\label{tutorial-sequential:guardian1}@*/
 #define DUMUX_EX2TUTORIALPROBLEM_SEQUENTIAL_HH // guardian macro /*@\label{tutorial-sequential:guardian2}@*/
 
-// the grid includes
-#include <dune/grid/yaspgrid.hh>
-#include <dumux/io/cubegridcreator.hh>
-
 // dumux 2p-sequential environment
 #include <dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressureproperties.hh>
 #include <dumux/porousmediumflow/2p/sequential/transport/cellcentered/properties.hh>
@@ -67,9 +63,6 @@ SET_PROP(Ex2TutorialProblemSequential, Problem) /*@\label{tutorial-sequential:se
 // Set the grid type
 SET_TYPE_PROP(Ex2TutorialProblemSequential, Grid, Dune::YaspGrid<2>); /*@\label{tutorial-sequential:set-grid-type}@*/
 
-//Set the grid creator
-SET_TYPE_PROP(Ex2TutorialProblemSequential, GridCreator, Dumux::CubeGridCreator<TypeTag>); /*@\label{tutorial-sequential:set-gridcreator}@*/
-
 // Set the wetting phase
 SET_PROP(Ex2TutorialProblemSequential, WettingPhase) /*@\label{tutorial-sequential:2p-system-start}@*/
 {
diff --git a/tutorial/solutions_sequential/ex5_tutorial_sequential.input b/tutorial/solutions_sequential/ex5_tutorial_sequential.input
index 9c90741fe3c67dc62fc3e05544a32155768ab384..b9cbaf492c29b171160cf5764841c7cd860cd6b4 100644
--- a/tutorial/solutions_sequential/ex5_tutorial_sequential.input
+++ b/tutorial/solutions_sequential/ex5_tutorial_sequential.input
@@ -4,10 +4,8 @@ DtInitial = 10 # initial time step size [s]
 MaxTimeStepSize = 100
 
 [Grid]
-UpperRightX = 100 # x-coordinate of the upper-right corner of the grid [m]
-UpperRightY = 50 # y-coordinate of the upper-right corner of the grid [m]
-NumberOfCellsX = 100 # x-resolution of the grid
-NumberOfCellsY = 10 # y-resolution of the grid
+UpperRightX = 100 50 # x-/y-coordinate of the upper-right corner of the grid [m]
+NumberOfCellsX = 100 10  # x-/y-resolution of the grid
 
 [Vtk]
 OutputLevel = 2
diff --git a/tutorial/solutions_sequential/ex5_tutorialproblem_sequential.hh b/tutorial/solutions_sequential/ex5_tutorialproblem_sequential.hh
index 422a3755875f0ce4649f638cb7bf364ba7fddb95..3e1aff7e0316d6fb231daf88d3b82866681cddc2 100644
--- a/tutorial/solutions_sequential/ex5_tutorialproblem_sequential.hh
+++ b/tutorial/solutions_sequential/ex5_tutorialproblem_sequential.hh
@@ -24,10 +24,6 @@
 #ifndef DUMUX_EX5_TUTORIALPROBLEM_SEQUENTIAL_HH // guardian macro /*@\label{tutorial-sequential:guardian1}@*/
 #define DUMUX_EX5_TUTORIALPROBLEM_SEQUENTIAL_HH // guardian macro /*@\label{tutorial-sequential:guardian2}@*/
 
-// the grid includes
-#include <dune/grid/yaspgrid.hh>
-#include <dumux/io/cubegridcreator.hh>
-
 // dumux 2p-sequential environment
 #include <dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressureproperties.hh>
 #include <dumux/porousmediumflow/2p/sequential/transport/cellcentered/properties.hh>
@@ -68,9 +64,6 @@ SET_PROP(Ex5TutorialProblemSequential, Problem) /*@\label{tutorial-sequential:se
 // Set the grid type
 SET_TYPE_PROP(Ex5TutorialProblemSequential, Grid, Dune::YaspGrid<2>); /*@\label{tutorial-sequential:set-grid-type}@*/
 
-//Set the grid creator
-SET_TYPE_PROP(Ex5TutorialProblemSequential, GridCreator, Dumux::CubeGridCreator<TypeTag>); /*@\label{tutorial-sequential:set-gridcreator}@*/
-
 // Set the wetting phase
 SET_PROP(Ex5TutorialProblemSequential, WettingPhase) /*@\label{tutorial-sequential:2p-system-start}@*/
 {