diff --git a/dune/dorie/solver/util_boundary_condition.hh b/dune/dorie/common/boundary_condition.hh
similarity index 100%
rename from dune/dorie/solver/util_boundary_condition.hh
rename to dune/dorie/common/boundary_condition.hh
diff --git a/dune/dorie/solver/util_grid_creator.hh b/dune/dorie/common/grid_creator.hh
similarity index 100%
rename from dune/dorie/solver/util_grid_creator.hh
rename to dune/dorie/common/grid_creator.hh
diff --git a/dune/dorie/solver/util_writer.hh b/dune/dorie/common/grid_function_writer.hh
similarity index 100%
rename from dune/dorie/solver/util_writer.hh
rename to dune/dorie/common/grid_function_writer.hh
diff --git a/dune/dorie/solver/util_h5tools.hh b/dune/dorie/common/h5tools.hh
similarity index 100%
rename from dune/dorie/solver/util_h5tools.hh
rename to dune/dorie/common/h5tools.hh
diff --git a/dune/dorie/solver/util_interpolator.hh b/dune/dorie/common/interpolator.hh
similarity index 100%
rename from dune/dorie/solver/util_interpolator.hh
rename to dune/dorie/common/interpolator.hh
diff --git a/dune/dorie/interface/setup_inifile.hh b/dune/dorie/common/setup_inifile.hh
similarity index 100%
rename from dune/dorie/interface/setup_inifile.hh
rename to dune/dorie/common/setup_inifile.hh
diff --git a/dune/dorie/interface/simulation_base.hh b/dune/dorie/common/simulation_base.hh
similarity index 100%
rename from dune/dorie/interface/simulation_base.hh
rename to dune/dorie/common/simulation_base.hh
diff --git a/dune/dorie/solver/util_controller.hh b/dune/dorie/common/time_controller.hh
similarity index 100%
rename from dune/dorie/solver/util_controller.hh
rename to dune/dorie/common/time_controller.hh
diff --git a/dune/dorie/solver/util_typedefs.hh b/dune/dorie/common/typedefs.hh
similarity index 100%
rename from dune/dorie/solver/util_typedefs.hh
rename to dune/dorie/common/typedefs.hh
diff --git a/dune/dorie/interface/util.hh b/dune/dorie/common/util.hh
similarity index 100%
rename from dune/dorie/interface/util.hh
rename to dune/dorie/common/util.hh
diff --git a/dune/dorie/interface/CMakeLists.txt b/dune/dorie/interface/CMakeLists.txt
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/dune/dorie/interface/adaptivity.hh b/dune/dorie/model/richards/adaptativity/handler.hh
similarity index 100%
rename from dune/dorie/interface/adaptivity.hh
rename to dune/dorie/model/richards/adaptativity/handler.hh
diff --git a/dune/dorie/solver/operator_error_indicator.hh b/dune/dorie/model/richards/adaptativity/operator_error_indicator.hh
similarity index 100%
rename from dune/dorie/solver/operator_error_indicator.hh
rename to dune/dorie/model/richards/adaptativity/operator_error_indicator.hh
diff --git a/dune/dorie/solver/adapters/conductivity.hh b/dune/dorie/model/richards/adapters/conductivity.hh
similarity index 100%
rename from dune/dorie/solver/adapters/conductivity.hh
rename to dune/dorie/model/richards/adapters/conductivity.hh
diff --git a/dune/dorie/solver/adapters/discrete_grid_function_gradient.hh b/dune/dorie/model/richards/adapters/discrete_grid_function_gradient.hh
similarity index 100%
rename from dune/dorie/solver/adapters/discrete_grid_function_gradient.hh
rename to dune/dorie/model/richards/adapters/discrete_grid_function_gradient.hh
diff --git a/dune/dorie/solver/adapters/saturation.hh b/dune/dorie/model/richards/adapters/saturation.hh
similarity index 100%
rename from dune/dorie/solver/adapters/saturation.hh
rename to dune/dorie/model/richards/adapters/saturation.hh
diff --git a/dune/dorie/solver/adapters/water_content.hh b/dune/dorie/model/richards/adapters/water_content.hh
similarity index 100%
rename from dune/dorie/solver/adapters/water_content.hh
rename to dune/dorie/model/richards/adapters/water_content.hh
diff --git a/dune/dorie/solver/adapters/water_flux.hh b/dune/dorie/model/richards/adapters/water_flux.hh
similarity index 100%
rename from dune/dorie/solver/adapters/water_flux.hh
rename to dune/dorie/model/richards/adapters/water_flux.hh
diff --git a/dune/dorie/solver/richards_boundary.hh b/dune/dorie/model/richards/flow_boundary.hh
similarity index 100%
rename from dune/dorie/solver/richards_boundary.hh
rename to dune/dorie/model/richards/flow_boundary.hh
diff --git a/dune/dorie/solver/richards_initial.hh b/dune/dorie/model/richards/flow_initial.hh
similarity index 100%
rename from dune/dorie/solver/richards_initial.hh
rename to dune/dorie/model/richards/flow_initial.hh
diff --git a/dune/dorie/solver/richards_source.hh b/dune/dorie/model/richards/flow_source.hh
similarity index 100%
rename from dune/dorie/solver/richards_source.hh
rename to dune/dorie/model/richards/flow_source.hh
diff --git a/dune/dorie/interface/knofu.hh b/dune/dorie/model/richards/knofu.hh
similarity index 100%
rename from dune/dorie/interface/knofu.hh
rename to dune/dorie/model/richards/knofu.hh
diff --git a/dune/dorie/solver/operator_DG.hh b/dune/dorie/model/richards/local_operator.hh
similarity index 100%
rename from dune/dorie/solver/operator_DG.hh
rename to dune/dorie/model/richards/local_operator.hh
diff --git a/dune/dorie/solver/param_base.hh b/dune/dorie/model/richards/parametrization/base.hh
similarity index 100%
rename from dune/dorie/solver/param_base.hh
rename to dune/dorie/model/richards/parametrization/base.hh
diff --git a/dune/dorie/solver/param_factory.hh b/dune/dorie/model/richards/parametrization/factorty.hh
similarity index 100%
rename from dune/dorie/solver/param_factory.hh
rename to dune/dorie/model/richards/parametrization/factorty.hh
diff --git a/dune/dorie/solver/param_interface.hh b/dune/dorie/model/richards/parametrization/interface.hh
similarity index 100%
rename from dune/dorie/solver/param_interface.hh
rename to dune/dorie/model/richards/parametrization/interface.hh
diff --git a/dune/dorie/solver/param_mvg.hh b/dune/dorie/model/richards/parametrization/mualem_van_genuchten.hh
similarity index 100%
rename from dune/dorie/solver/param_mvg.hh
rename to dune/dorie/model/richards/parametrization/mualem_van_genuchten.hh
diff --git a/dune/dorie/solver/param_richards.hh b/dune/dorie/model/richards/parametrization/richards.hh
similarity index 100%
rename from dune/dorie/solver/param_richards.hh
rename to dune/dorie/model/richards/parametrization/richards.hh
diff --git a/dune/dorie/solver/param_van_genuchten.hh b/dune/dorie/model/richards/parametrization/van_genuchten.hh
similarity index 100%
rename from dune/dorie/solver/param_van_genuchten.hh
rename to dune/dorie/model/richards/parametrization/van_genuchten.hh
diff --git a/dune/dorie/interface/richards_simulation.cc b/dune/dorie/model/richards/richards.cc
similarity index 100%
rename from dune/dorie/interface/richards_simulation.cc
rename to dune/dorie/model/richards/richards.cc
diff --git a/dune/dorie/interface/richards_simulation.hh b/dune/dorie/model/richards/richards.hh
similarity index 100%
rename from dune/dorie/interface/richards_simulation.hh
rename to dune/dorie/model/richards/richards.hh
diff --git a/dune/dorie/solver/CMakeLists.txt b/dune/dorie/solver/CMakeLists.txt
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000