diff --git a/dumux/porousmediumflow/3p3c/CMakeLists.txt b/dumux/porousmediumflow/3p3c/CMakeLists.txt
index ba8341c614f1a2c797c95f5402f602025f1087b1..71205887e30c0b4dcc59f93310c9db5326160d67 100644
--- a/dumux/porousmediumflow/3p3c/CMakeLists.txt
+++ b/dumux/porousmediumflow/3p3c/CMakeLists.txt
@@ -1 +1,10 @@
-add_subdirectory("implicit")
+
+#install headers
+install(FILES
+indices.hh
+localresidual.hh
+model.hh
+primaryvariableswitch.hh
+volumevariables.hh
+vtkoutputfields.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/3p3c)
diff --git a/dumux/porousmediumflow/3p3c/implicit/CMakeLists.txt b/dumux/porousmediumflow/3p3c/implicit/CMakeLists.txt
deleted file mode 100644
index 296992e3c515c9f96e2cd8e20b48d28ebddff17c..0000000000000000000000000000000000000000
--- a/dumux/porousmediumflow/3p3c/implicit/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-
-#install headers
-install(FILES
-indices.hh
-localresidual.hh
-model.hh
-primaryvariableswitch.hh
-volumevariables.hh
-vtkoutputfields.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/3p3c/implicit)
diff --git a/dumux/porousmediumflow/3p3c/implicit/indices.hh b/dumux/porousmediumflow/3p3c/indices.hh
similarity index 100%
rename from dumux/porousmediumflow/3p3c/implicit/indices.hh
rename to dumux/porousmediumflow/3p3c/indices.hh
diff --git a/dumux/porousmediumflow/3p3c/implicit/localresidual.hh b/dumux/porousmediumflow/3p3c/localresidual.hh
similarity index 100%
rename from dumux/porousmediumflow/3p3c/implicit/localresidual.hh
rename to dumux/porousmediumflow/3p3c/localresidual.hh
diff --git a/dumux/porousmediumflow/3p3c/implicit/model.hh b/dumux/porousmediumflow/3p3c/model.hh
similarity index 100%
rename from dumux/porousmediumflow/3p3c/implicit/model.hh
rename to dumux/porousmediumflow/3p3c/model.hh
diff --git a/dumux/porousmediumflow/3p3c/implicit/primaryvariableswitch.hh b/dumux/porousmediumflow/3p3c/primaryvariableswitch.hh
similarity index 100%
rename from dumux/porousmediumflow/3p3c/implicit/primaryvariableswitch.hh
rename to dumux/porousmediumflow/3p3c/primaryvariableswitch.hh
diff --git a/dumux/porousmediumflow/3p3c/implicit/volumevariables.hh b/dumux/porousmediumflow/3p3c/volumevariables.hh
similarity index 100%
rename from dumux/porousmediumflow/3p3c/implicit/volumevariables.hh
rename to dumux/porousmediumflow/3p3c/volumevariables.hh
diff --git a/dumux/porousmediumflow/3p3c/implicit/vtkoutputfields.hh b/dumux/porousmediumflow/3p3c/vtkoutputfields.hh
similarity index 100%
rename from dumux/porousmediumflow/3p3c/implicit/vtkoutputfields.hh
rename to dumux/porousmediumflow/3p3c/vtkoutputfields.hh
diff --git a/dumux/porousmediumflow/3pwateroil/localresidual.hh b/dumux/porousmediumflow/3pwateroil/localresidual.hh
index 38453d6000c5fb77d06eee11a8ba9c7e191d6478..a105a2ea3e4004fe4a559d1c6b8d566a0e8f1339 100644
--- a/dumux/porousmediumflow/3pwateroil/localresidual.hh
+++ b/dumux/porousmediumflow/3pwateroil/localresidual.hh
@@ -26,7 +26,7 @@
 #define DUMUX_3P2CNI_LOCAL_RESIDUAL_HH
 
 #include "properties.hh"
-#include <dumux/porousmediumflow/3p3c/implicit/localresidual.hh>
+#include <dumux/porousmediumflow/3p3c/localresidual.hh>
 
 namespace Dumux
 {
diff --git a/test/porousmediumflow/3p3c/implicit/columnxylolproblem.hh b/test/porousmediumflow/3p3c/implicit/columnxylolproblem.hh
index 04d8d72321145acda774dde58e1e78f276cc0e72..59048496ef1cfda25b5001f8b57586c79d0bbaac 100644
--- a/test/porousmediumflow/3p3c/implicit/columnxylolproblem.hh
+++ b/test/porousmediumflow/3p3c/implicit/columnxylolproblem.hh
@@ -28,7 +28,7 @@
 #include <dumux/material/fluidsystems/h2oairxylene.hh>
 #include <dumux/discretization/cellcentered/tpfa/properties.hh>
 #include <dumux/discretization/box/properties.hh>
-#include <dumux/porousmediumflow/3p3c/implicit/model.hh>
+#include <dumux/porousmediumflow/3p3c/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 #include "columnxylolspatialparams.hh"
diff --git a/test/porousmediumflow/3p3c/implicit/infiltration3p3cproblem.hh b/test/porousmediumflow/3p3c/implicit/infiltration3p3cproblem.hh
index c0000696090a6aea9764a3aad5a1f9dbc9015f73..8ef587d804948330fde80becc80ee4f1b463738f 100644
--- a/test/porousmediumflow/3p3c/implicit/infiltration3p3cproblem.hh
+++ b/test/porousmediumflow/3p3c/implicit/infiltration3p3cproblem.hh
@@ -28,7 +28,7 @@
 #include <dumux/discretization/cellcentered/tpfa/properties.hh>
 #include <dumux/discretization/box/properties.hh>
 #include <dumux/porousmediumflow/problem.hh>
-#include <dumux/porousmediumflow/3p3c/implicit/model.hh>
+#include <dumux/porousmediumflow/3p3c/model.hh>
 #include <dumux/material/fluidsystems/h2oairmesitylene.hh>
 
 #include "infiltration3p3cspatialparams.hh"
diff --git a/test/porousmediumflow/3p3c/implicit/kuevetteproblem.hh b/test/porousmediumflow/3p3c/implicit/kuevetteproblem.hh
index 4d066889879515ad939e08689d2e3ff360f3780b..1a506398c00b1ef3f6d18d41cf026e36202ddfd7 100644
--- a/test/porousmediumflow/3p3c/implicit/kuevetteproblem.hh
+++ b/test/porousmediumflow/3p3c/implicit/kuevetteproblem.hh
@@ -31,7 +31,7 @@
 #include <dumux/material/fluidsystems/h2oairmesitylene.hh>
 #include <dumux/discretization/cellcentered/tpfa/properties.hh>
 #include <dumux/discretization/box/properties.hh>
-#include <dumux/porousmediumflow/3p3c/implicit/model.hh>
+#include <dumux/porousmediumflow/3p3c/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 #include "kuevettespatialparams.hh"
diff --git a/test/porousmediumflow/3p3c/implicit/kuevettespatialparams.hh b/test/porousmediumflow/3p3c/implicit/kuevettespatialparams.hh
index 316810e456ae7ed4f75bef42c4f62763cf2a724a..363ed8116183c24a9c9282d64848b5e7aa6d7455 100644
--- a/test/porousmediumflow/3p3c/implicit/kuevettespatialparams.hh
+++ b/test/porousmediumflow/3p3c/implicit/kuevettespatialparams.hh
@@ -26,7 +26,6 @@
 
 #include <dune/common/float_cmp.hh>
 
-#include <dumux/porousmediumflow/3p3c/implicit/indices.hh>
 #include <dumux/material/spatialparams/implicit.hh>
 #include <dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3p.hh>
 #include <dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3pparams.hh>