diff --git a/dumux/porousmediumflow/richards/CMakeLists.txt b/dumux/porousmediumflow/richards/CMakeLists.txt
index ba8341c614f1a2c797c95f5402f602025f1087b1..2929d226a4f0d49ebe59f30739c2c4973dfaf5cf 100644
--- a/dumux/porousmediumflow/richards/CMakeLists.txt
+++ b/dumux/porousmediumflow/richards/CMakeLists.txt
@@ -1 +1,11 @@
-add_subdirectory("implicit")
+
+#install headers
+install(FILES
+indices.hh
+localresidual.hh
+model.hh
+newtoncontroller.hh
+primaryvariableswitch.hh
+volumevariables.hh
+vtkoutputfields.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/richards)
diff --git a/dumux/porousmediumflow/richards/implicit/CMakeLists.txt b/dumux/porousmediumflow/richards/implicit/CMakeLists.txt
deleted file mode 100644
index 97ca4f9733cde81d279fb492040c5bf2e29b35f6..0000000000000000000000000000000000000000
--- a/dumux/porousmediumflow/richards/implicit/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-
-#install headers
-install(FILES
-indices.hh
-localresidual.hh
-model.hh
-newtoncontroller.hh
-primaryvariableswitch.hh
-volumevariables.hh
-vtkoutputfields.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/richards/implicit)
diff --git a/dumux/porousmediumflow/richards/implicit/indices.hh b/dumux/porousmediumflow/richards/indices.hh
similarity index 100%
rename from dumux/porousmediumflow/richards/implicit/indices.hh
rename to dumux/porousmediumflow/richards/indices.hh
diff --git a/dumux/porousmediumflow/richards/implicit/localresidual.hh b/dumux/porousmediumflow/richards/localresidual.hh
similarity index 100%
rename from dumux/porousmediumflow/richards/implicit/localresidual.hh
rename to dumux/porousmediumflow/richards/localresidual.hh
diff --git a/dumux/porousmediumflow/richards/implicit/model.hh b/dumux/porousmediumflow/richards/model.hh
similarity index 100%
rename from dumux/porousmediumflow/richards/implicit/model.hh
rename to dumux/porousmediumflow/richards/model.hh
diff --git a/dumux/porousmediumflow/richards/implicit/newtoncontroller.hh b/dumux/porousmediumflow/richards/newtoncontroller.hh
similarity index 100%
rename from dumux/porousmediumflow/richards/implicit/newtoncontroller.hh
rename to dumux/porousmediumflow/richards/newtoncontroller.hh
diff --git a/dumux/porousmediumflow/richards/implicit/primaryvariableswitch.hh b/dumux/porousmediumflow/richards/primaryvariableswitch.hh
similarity index 100%
rename from dumux/porousmediumflow/richards/implicit/primaryvariableswitch.hh
rename to dumux/porousmediumflow/richards/primaryvariableswitch.hh
diff --git a/dumux/porousmediumflow/richards/implicit/volumevariables.hh b/dumux/porousmediumflow/richards/volumevariables.hh
similarity index 100%
rename from dumux/porousmediumflow/richards/implicit/volumevariables.hh
rename to dumux/porousmediumflow/richards/volumevariables.hh
diff --git a/dumux/porousmediumflow/richards/implicit/vtkoutputfields.hh b/dumux/porousmediumflow/richards/vtkoutputfields.hh
similarity index 100%
rename from dumux/porousmediumflow/richards/implicit/vtkoutputfields.hh
rename to dumux/porousmediumflow/richards/vtkoutputfields.hh
diff --git a/dumux/porousmediumflow/richardsnc/CMakeLists.txt b/dumux/porousmediumflow/richardsnc/CMakeLists.txt
index ba8341c614f1a2c797c95f5402f602025f1087b1..d0a0fa8cb184b1044d03b32cc419447d35557705 100644
--- a/dumux/porousmediumflow/richardsnc/CMakeLists.txt
+++ b/dumux/porousmediumflow/richardsnc/CMakeLists.txt
@@ -1 +1,8 @@
-add_subdirectory("implicit")
+
+#install headers
+install(FILES
+indices.hh
+model.hh
+volumevariables.hh
+vtkoutputfields.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/richardsnc)
diff --git a/dumux/porousmediumflow/richardsnc/implicit/CMakeLists.txt b/dumux/porousmediumflow/richardsnc/implicit/CMakeLists.txt
deleted file mode 100644
index 0736ab8991efb9ee12313aeb33b53bc71e08d4d2..0000000000000000000000000000000000000000
--- a/dumux/porousmediumflow/richardsnc/implicit/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-
-#install headers
-install(FILES
-indices.hh
-model.hh
-volumevariables.hh
-vtkoutputfields.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/richardsnc/implicit)
diff --git a/dumux/porousmediumflow/richardsnc/implicit/indices.hh b/dumux/porousmediumflow/richardsnc/indices.hh
similarity index 100%
rename from dumux/porousmediumflow/richardsnc/implicit/indices.hh
rename to dumux/porousmediumflow/richardsnc/indices.hh
diff --git a/dumux/porousmediumflow/richardsnc/implicit/model.hh b/dumux/porousmediumflow/richardsnc/model.hh
similarity index 98%
rename from dumux/porousmediumflow/richardsnc/implicit/model.hh
rename to dumux/porousmediumflow/richardsnc/model.hh
index a3eeb808f4e5436b3199aaf581535bbc320b8a5f..fc937af4c01faf14dc0a6bbdba3073c7c1e7a532 100644
--- a/dumux/porousmediumflow/richardsnc/implicit/model.hh
+++ b/dumux/porousmediumflow/richardsnc/model.hh
@@ -29,7 +29,7 @@
 #include <dumux/common/properties.hh>
 
 #include <dumux/porousmediumflow/compositional/localresidual.hh>
-#include <dumux/porousmediumflow/richards/implicit/newtoncontroller.hh>
+#include <dumux/porousmediumflow/richards/newtoncontroller.hh>
 
 #include <dumux/material/spatialparams/implicit1p.hh>
 #include <dumux/material/fluidmatrixinteractions/diffusivitymillingtonquirk.hh>
diff --git a/dumux/porousmediumflow/richardsnc/implicit/volumevariables.hh b/dumux/porousmediumflow/richardsnc/volumevariables.hh
similarity index 100%
rename from dumux/porousmediumflow/richardsnc/implicit/volumevariables.hh
rename to dumux/porousmediumflow/richardsnc/volumevariables.hh
diff --git a/dumux/porousmediumflow/richardsnc/implicit/vtkoutputfields.hh b/dumux/porousmediumflow/richardsnc/vtkoutputfields.hh
similarity index 98%
rename from dumux/porousmediumflow/richardsnc/implicit/vtkoutputfields.hh
rename to dumux/porousmediumflow/richardsnc/vtkoutputfields.hh
index 23fbb60ee71ff852a7b8479945c9e95baeb389e9..7ae3e0cb402e57e7ddbfdfa0c994f22175cd3ace 100644
--- a/dumux/porousmediumflow/richardsnc/implicit/vtkoutputfields.hh
+++ b/dumux/porousmediumflow/richardsnc/vtkoutputfields.hh
@@ -23,7 +23,7 @@
 #ifndef DUMUX_RICHARDSNC_VTK_OUTPUT_FIELDS_HH
 #define DUMUX_RICHARDSNC_VTK_OUTPUT_FIELDS_HH
 
-#include <dumux/porousmediumflow/richards/implicit/vtkoutputfields.hh>
+#include <dumux/porousmediumflow/richards/vtkoutputfields.hh>
 namespace Dumux
 {
 
diff --git a/test/mixeddimension/embedded/1p2c_richards2c/richardstestproblem.hh b/test/mixeddimension/embedded/1p2c_richards2c/richardstestproblem.hh
index 16f6bd7fc2accc70a19c273ad33bade238652c71..4d5fa12ae428902577891194e1ecfeceb1b135e2 100644
--- a/test/mixeddimension/embedded/1p2c_richards2c/richardstestproblem.hh
+++ b/test/mixeddimension/embedded/1p2c_richards2c/richardstestproblem.hh
@@ -28,7 +28,7 @@
 
 #include <dumux/implicit/cellcentered/tpfa/properties.hh>
 #include <dumux/porousmediumflow/implicit/problem.hh>
-#include <dumux/porousmediumflow/richardsnc/implicit/model.hh>
+#include <dumux/porousmediumflow/richardsnc/model.hh>
 #include <dumux/material/components/simpleh2o.hh>
 #include <dumux/material/components/constant.hh>
 #include <dumux/material/fluidsystems/liquidphase2c.hh>
diff --git a/test/mixeddimension/embedded/1p_richards/richardstestproblem.hh b/test/mixeddimension/embedded/1p_richards/richardstestproblem.hh
index 925c53e698310edbf907d417e862e4b6cf5923f7..2b8ecb0cb291396dac8c2f9147f92828af3f1138 100644
--- a/test/mixeddimension/embedded/1p_richards/richardstestproblem.hh
+++ b/test/mixeddimension/embedded/1p_richards/richardstestproblem.hh
@@ -28,7 +28,7 @@
 
 #include <dumux/implicit/cellcentered/tpfa/properties.hh>
 #include <dumux/porousmediumflow/implicit/problem.hh>
-#include <dumux/porousmediumflow/richards/implicit/model.hh>
+#include <dumux/porousmediumflow/richards/model.hh>
 #include <dumux/material/components/simpleh2o.hh>
 #include <dumux/material/fluidsystems/liquidphase.hh>
 
diff --git a/test/porousmediumflow/richards/implicit/richardsanalyticalproblem.hh b/test/porousmediumflow/richards/implicit/richardsanalyticalproblem.hh
index 51eccc7f85afb47e0274aa20397aa5099dbe2870..cef59cbc90a3f0bebd359d4b2c86a481f26e8c4a 100644
--- a/test/porousmediumflow/richards/implicit/richardsanalyticalproblem.hh
+++ b/test/porousmediumflow/richards/implicit/richardsanalyticalproblem.hh
@@ -34,7 +34,7 @@
 #include <dumux/discretization/box/properties.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
-#include <dumux/porousmediumflow/richards/implicit/model.hh>
+#include <dumux/porousmediumflow/richards/model.hh>
 #include <dumux/material/components/simpleh2o.hh>
 #include <dumux/material/fluidsystems/liquidphase.hh>
 
diff --git a/test/porousmediumflow/richards/implicit/richardsanalyticalspatialparams.hh b/test/porousmediumflow/richards/implicit/richardsanalyticalspatialparams.hh
index 57b34f956394642f15c24577616f1c55c59a868d..13f1289078923b95a858bf8db8230af518436ddb 100644
--- a/test/porousmediumflow/richards/implicit/richardsanalyticalspatialparams.hh
+++ b/test/porousmediumflow/richards/implicit/richardsanalyticalspatialparams.hh
@@ -31,7 +31,7 @@
 #include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
 
-#include <dumux/porousmediumflow/richards/implicit/model.hh>
+#include <dumux/porousmediumflow/richards/model.hh>
 
 namespace Dumux
 {
diff --git a/test/porousmediumflow/richards/implicit/richardslensproblem.hh b/test/porousmediumflow/richards/implicit/richardslensproblem.hh
index b40c3d31bb37dabc8cf9ee75a38305e473303996..559fb97e4a8ede186a9bc5c2ae9bc7e5dbe298ac 100644
--- a/test/porousmediumflow/richards/implicit/richardslensproblem.hh
+++ b/test/porousmediumflow/richards/implicit/richardslensproblem.hh
@@ -30,7 +30,7 @@
 #include <dumux/discretization/box/properties.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
-#include <dumux/porousmediumflow/richards/implicit/model.hh>
+#include <dumux/porousmediumflow/richards/model.hh>
 #include <dumux/material/components/simpleh2o.hh>
 #include <dumux/material/fluidsystems/liquidphase.hh>
 
diff --git a/test/porousmediumflow/richards/implicit/richardslensspatialparams.hh b/test/porousmediumflow/richards/implicit/richardslensspatialparams.hh
index f903bfac9952008eb16eebb8ea24c6ee1b81d7d5..94874ad73ccac3e4049915f706c72c72c7d44ae2 100644
--- a/test/porousmediumflow/richards/implicit/richardslensspatialparams.hh
+++ b/test/porousmediumflow/richards/implicit/richardslensspatialparams.hh
@@ -28,7 +28,7 @@
 #include <dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
 
-#include <dumux/porousmediumflow/richards/implicit/model.hh>
+#include <dumux/porousmediumflow/richards/model.hh>
 
 namespace Dumux
 {
diff --git a/test/porousmediumflow/richards/implicit/richardsniconductionproblem.hh b/test/porousmediumflow/richards/implicit/richardsniconductionproblem.hh
index b3c8ff08d2c2fe61cc768fea384727d5711a73e6..b47812c3ede2f5ec89084eb51158053eec4f7bac 100644
--- a/test/porousmediumflow/richards/implicit/richardsniconductionproblem.hh
+++ b/test/porousmediumflow/richards/implicit/richardsniconductionproblem.hh
@@ -31,7 +31,7 @@
 #include <dumux/discretization/box/properties.hh>
 
 #include <dumux/porousmediumflow/problem.hh>
-#include <dumux/porousmediumflow/richards/implicit/model.hh>
+#include <dumux/porousmediumflow/richards/model.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh>
 #include <dumux/material/fluidsystems/h2on2.hh>
 #include "richardsnispatialparams.hh"
diff --git a/test/porousmediumflow/richards/implicit/richardsniconvectionproblem.hh b/test/porousmediumflow/richards/implicit/richardsniconvectionproblem.hh
index 1472b7a585583d7c6b77c8a2dca260af91fa9e91..5bcd29111c1c23991e6ae38f6b15635079ce6943 100644
--- a/test/porousmediumflow/richards/implicit/richardsniconvectionproblem.hh
+++ b/test/porousmediumflow/richards/implicit/richardsniconvectionproblem.hh
@@ -32,7 +32,7 @@
 #include <dumux/discretization/box/properties.hh>
 
 #include <dumux/porousmediumflow/problem.hh>
-#include <dumux/porousmediumflow/richards/implicit/model.hh>
+#include <dumux/porousmediumflow/richards/model.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh>
 #include <dumux/material/fluidsystems/h2on2.hh>
 #include "richardsnispatialparams.hh"
diff --git a/test/porousmediumflow/richards/implicit/richardsnispatialparams.hh b/test/porousmediumflow/richards/implicit/richardsnispatialparams.hh
index 3986b00d0dc43408243089e2461dc6b8c6dea83f..a6290985000e581e126b9eeef2aeefc809fca5cf 100644
--- a/test/porousmediumflow/richards/implicit/richardsnispatialparams.hh
+++ b/test/porousmediumflow/richards/implicit/richardsnispatialparams.hh
@@ -24,7 +24,7 @@
 #ifndef DUMUX_RICHARDSNI_SPATIAL_PARAMS_HH
 #define DUMUX_RICHARDSNI_SPATIAL_PARAMS_HH
 
-#include <dumux/porousmediumflow/richards/implicit/model.hh>
+#include <dumux/porousmediumflow/richards/model.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh>
diff --git a/test/porousmediumflow/richards/implicit/test_ccrichardsanalytical.cc b/test/porousmediumflow/richards/implicit/test_ccrichardsanalytical.cc
index 40803b71e2ca04ee2943663fedfa4c2328712214..84cd68a11f8e3832151a2a39fd761c082572ff53 100644
--- a/test/porousmediumflow/richards/implicit/test_ccrichardsanalytical.cc
+++ b/test/porousmediumflow/richards/implicit/test_ccrichardsanalytical.cc
@@ -43,7 +43,7 @@
 #include <dumux/linear/amgbackend.hh>
 #include <dumux/nonlinear/newtonmethod.hh>
 #include <dumux/nonlinear/newtoncontroller.hh>
-#include <dumux/porousmediumflow/richards/implicit/newtoncontroller.hh>
+#include <dumux/porousmediumflow/richards/newtoncontroller.hh>
 
 #include <dumux/assembly/fvassembler.hh>
 
diff --git a/test/porousmediumflow/richards/implicit/test_richardslens_fv.cc b/test/porousmediumflow/richards/implicit/test_richardslens_fv.cc
index 5eb49893abfb979d8e3bf764305014cb6988d607..786d5c8b65fb0b4bf34b5000c4a5ec24fee60d27 100644
--- a/test/porousmediumflow/richards/implicit/test_richardslens_fv.cc
+++ b/test/porousmediumflow/richards/implicit/test_richardslens_fv.cc
@@ -43,7 +43,7 @@
 #include <dumux/linear/amgbackend.hh>
 #include <dumux/nonlinear/newtonmethod.hh>
 #include <dumux/nonlinear/newtoncontroller.hh>
-#include <dumux/porousmediumflow/richards/implicit/newtoncontroller.hh>
+#include <dumux/porousmediumflow/richards/newtoncontroller.hh>
 
 #include <dumux/assembly/fvassembler.hh>
 
diff --git a/test/porousmediumflow/richards/implicit/test_richardsniconduction_fv.cc b/test/porousmediumflow/richards/implicit/test_richardsniconduction_fv.cc
index b1919d3871b5f1a6f8b00ea88070cfdc6e48a882..8970db7557e3da675665520895fe51729f57f6af 100644
--- a/test/porousmediumflow/richards/implicit/test_richardsniconduction_fv.cc
+++ b/test/porousmediumflow/richards/implicit/test_richardsniconduction_fv.cc
@@ -43,7 +43,7 @@
 #include <dumux/linear/amgbackend.hh>
 #include <dumux/nonlinear/newtonmethod.hh>
 #include <dumux/nonlinear/newtoncontroller.hh>
-#include <dumux/porousmediumflow/richards/implicit/newtoncontroller.hh>
+#include <dumux/porousmediumflow/richards/newtoncontroller.hh>
 
 #include <dumux/assembly/fvassembler.hh>
 
diff --git a/test/porousmediumflow/richards/implicit/test_richardsniconvection_fv.cc b/test/porousmediumflow/richards/implicit/test_richardsniconvection_fv.cc
index 6b4cb7c5b078c0e5742f27197b00006beb52776f..6f42130c79e053e1d84712edadff6056f4bac2ca 100644
--- a/test/porousmediumflow/richards/implicit/test_richardsniconvection_fv.cc
+++ b/test/porousmediumflow/richards/implicit/test_richardsniconvection_fv.cc
@@ -43,7 +43,7 @@
 #include <dumux/linear/amgbackend.hh>
 #include <dumux/nonlinear/newtonmethod.hh>
 #include <dumux/nonlinear/newtoncontroller.hh>
-#include <dumux/porousmediumflow/richards/implicit/newtoncontroller.hh>
+#include <dumux/porousmediumflow/richards/newtoncontroller.hh>
 
 #include <dumux/assembly/fvassembler.hh>
 
diff --git a/test/porousmediumflow/richardsnc/implicit/richardswelltracerproblem.hh b/test/porousmediumflow/richardsnc/implicit/richardswelltracerproblem.hh
index ab6a5e7f8398190f30bffd14da1ccdb279f03fad..d792f33801d880d168368fbeabe8d4c525734e58 100644
--- a/test/porousmediumflow/richardsnc/implicit/richardswelltracerproblem.hh
+++ b/test/porousmediumflow/richardsnc/implicit/richardswelltracerproblem.hh
@@ -29,7 +29,7 @@
 #include <dumux/discretization/cellcentered/tpfa/properties.hh>
 #include <dumux/discretization/box/properties.hh>
 #include <dumux/porousmediumflow/problem.hh>
-#include <dumux/porousmediumflow/richardsnc/implicit/model.hh>
+#include <dumux/porousmediumflow/richardsnc/model.hh>
 
 #include "richardswelltracerspatialparams.hh"
 
diff --git a/test/porousmediumflow/richardsnc/implicit/richardswelltracerspatialparams.hh b/test/porousmediumflow/richardsnc/implicit/richardswelltracerspatialparams.hh
index 3fdda1d37e543a6e8db151e3ac255f1154e67655..3e02a16c3bf98b71c2cc2ec19194c5454e792069 100644
--- a/test/porousmediumflow/richardsnc/implicit/richardswelltracerspatialparams.hh
+++ b/test/porousmediumflow/richardsnc/implicit/richardswelltracerspatialparams.hh
@@ -28,7 +28,7 @@
 #include <dumux/material/fluidmatrixinteractions/2p/vangenuchten.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
 
-#include <dumux/porousmediumflow/richards/implicit/model.hh>
+#include <dumux/porousmediumflow/richards/model.hh>
 
 #include <dumux/io/gnuplotinterface.hh>
 #include <dumux/io/plotmateriallaw.hh>
diff --git a/test/porousmediumflow/richardsnc/implicit/test_richardsnc_fv.cc b/test/porousmediumflow/richardsnc/implicit/test_richardsnc_fv.cc
index dcfc91baf0c321b8dbb067a699a75f6ae21b8017..505905c13c032938e744d1689577ef78b2953034 100644
--- a/test/porousmediumflow/richardsnc/implicit/test_richardsnc_fv.cc
+++ b/test/porousmediumflow/richardsnc/implicit/test_richardsnc_fv.cc
@@ -43,7 +43,7 @@
 #include <dumux/linear/amgbackend.hh>
 #include <dumux/nonlinear/newtonmethod.hh>
 #include <dumux/nonlinear/newtoncontroller.hh>
-#include <dumux/porousmediumflow/richards/implicit/newtoncontroller.hh>
+#include <dumux/porousmediumflow/richards/newtoncontroller.hh>
 
 #include <dumux/assembly/fvassembler.hh>