diff --git a/dumux/porousmediumflow/2p/CMakeLists.txt b/dumux/porousmediumflow/2p/CMakeLists.txt
index fffa571735a25e9bb52347bd7e142ac034ac7c5d..eb9ba57fa2499e22326c082e90c12f420ea882fc 100644
--- a/dumux/porousmediumflow/2p/CMakeLists.txt
+++ b/dumux/porousmediumflow/2p/CMakeLists.txt
@@ -1,2 +1,12 @@
-add_subdirectory("implicit")
 add_subdirectory("sequential")
+
+#install headers
+install(FILES
+adaptionhelper.hh
+gridadaptindicator.hh
+indices.hh
+incompressiblelocalresidual.hh
+model.hh
+volumevariables.hh
+vtkoutputfields.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2p/implicit)
diff --git a/dumux/porousmediumflow/2p/implicit/gridadaptindicator.hh b/dumux/porousmediumflow/2p/gridadaptindicator.hh
similarity index 100%
rename from dumux/porousmediumflow/2p/implicit/gridadaptindicator.hh
rename to dumux/porousmediumflow/2p/gridadaptindicator.hh
diff --git a/dumux/porousmediumflow/2p/implicit/griddatatransfer.hh b/dumux/porousmediumflow/2p/griddatatransfer.hh
similarity index 100%
rename from dumux/porousmediumflow/2p/implicit/griddatatransfer.hh
rename to dumux/porousmediumflow/2p/griddatatransfer.hh
diff --git a/dumux/porousmediumflow/2p/implicit/CMakeLists.txt b/dumux/porousmediumflow/2p/implicit/CMakeLists.txt
deleted file mode 100644
index b2016e5eafa3b6a665146aa035fd108fdee33f48..0000000000000000000000000000000000000000
--- a/dumux/porousmediumflow/2p/implicit/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-
-#install headers
-install(FILES
-adaptionhelper.hh
-gridadaptindicator.hh
-indices.hh
-incompressiblelocalresidual.hh
-model.hh
-volumevariables.hh
-vtkoutputfields.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2p/implicit)
diff --git a/dumux/porousmediumflow/2p/implicit/incompressiblelocalresidual.hh b/dumux/porousmediumflow/2p/incompressiblelocalresidual.hh
similarity index 100%
rename from dumux/porousmediumflow/2p/implicit/incompressiblelocalresidual.hh
rename to dumux/porousmediumflow/2p/incompressiblelocalresidual.hh
diff --git a/dumux/porousmediumflow/2p/implicit/indices.hh b/dumux/porousmediumflow/2p/indices.hh
similarity index 100%
rename from dumux/porousmediumflow/2p/implicit/indices.hh
rename to dumux/porousmediumflow/2p/indices.hh
diff --git a/dumux/porousmediumflow/2p/implicit/model.hh b/dumux/porousmediumflow/2p/model.hh
similarity index 100%
rename from dumux/porousmediumflow/2p/implicit/model.hh
rename to dumux/porousmediumflow/2p/model.hh
diff --git a/dumux/porousmediumflow/2p/implicit/volumevariables.hh b/dumux/porousmediumflow/2p/volumevariables.hh
similarity index 100%
rename from dumux/porousmediumflow/2p/implicit/volumevariables.hh
rename to dumux/porousmediumflow/2p/volumevariables.hh
diff --git a/dumux/porousmediumflow/2p/implicit/vtkoutputfields.hh b/dumux/porousmediumflow/2p/vtkoutputfields.hh
similarity index 100%
rename from dumux/porousmediumflow/2p/implicit/vtkoutputfields.hh
rename to dumux/porousmediumflow/2p/vtkoutputfields.hh
diff --git a/test/porousmediumflow/2p/implicit/adaptive/test_2p_adaptive_fv.cc b/test/porousmediumflow/2p/implicit/adaptive/test_2p_adaptive_fv.cc
index c4cdb0d485f1c71ae304ae5f31c5d9c1ebf46f12..647253bb607ea0e4ff7dd73e06ab75a297c662fe 100644
--- a/test/porousmediumflow/2p/implicit/adaptive/test_2p_adaptive_fv.cc
+++ b/test/porousmediumflow/2p/implicit/adaptive/test_2p_adaptive_fv.cc
@@ -51,8 +51,8 @@
 #include <dumux/adaptive/adapt.hh>
 #include <dumux/adaptive/markelements.hh>
 #include <dumux/adaptive/initializationindicator.hh>
-#include <dumux/porousmediumflow/2p/implicit/griddatatransfer.hh>
-#include <dumux/porousmediumflow/2p/implicit/gridadaptindicator.hh>
+#include <dumux/porousmediumflow/2p/griddatatransfer.hh>
+#include <dumux/porousmediumflow/2p/gridadaptindicator.hh>
 
 //! Use the incompressible or point source problem for this adaptive test
 #include <test/porousmediumflow/2p/implicit/incompressible/problem.hh>
diff --git a/test/porousmediumflow/2p/implicit/fracture/problem.hh b/test/porousmediumflow/2p/implicit/fracture/problem.hh
index 4cb0083d8086a210db733e064a1b7aa792380a10..465f7b9266adf5e97d18c5db949f9ef1a99d5ff6 100644
--- a/test/porousmediumflow/2p/implicit/fracture/problem.hh
+++ b/test/porousmediumflow/2p/implicit/fracture/problem.hh
@@ -30,7 +30,7 @@
 #include <dumux/material/fluidsystems/2pimmiscible.hh>
 #include <dumux/material/fluidsystems/liquidphase.hh>
 
-#include <dumux/porousmediumflow/2p/implicit/model.hh>
+#include <dumux/porousmediumflow/2p/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 #include <dumux/discretization/cellcentered/tpfa/properties.hh>
diff --git a/test/porousmediumflow/2p/implicit/fracture/spatialparams.hh b/test/porousmediumflow/2p/implicit/fracture/spatialparams.hh
index 18d8a3122c27d8e6bf187f1902e679358dad48eb..7c74e7e57876e6cf281d74175cd88776beab4843 100644
--- a/test/porousmediumflow/2p/implicit/fracture/spatialparams.hh
+++ b/test/porousmediumflow/2p/implicit/fracture/spatialparams.hh
@@ -30,7 +30,7 @@
 #include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
 
-#include <dumux/porousmediumflow/2p/implicit/model.hh>
+#include <dumux/porousmediumflow/2p/model.hh>
 
 namespace Dumux
 {
diff --git a/test/porousmediumflow/2p/implicit/incompressible/problem.hh b/test/porousmediumflow/2p/implicit/incompressible/problem.hh
index 5acd0b3f31ffef9bcaf7ab55b1cc8cb560f90821..37e3b3f7c7f8fb0fdee5236814371f633a4d9225 100644
--- a/test/porousmediumflow/2p/implicit/incompressible/problem.hh
+++ b/test/porousmediumflow/2p/implicit/incompressible/problem.hh
@@ -33,8 +33,8 @@
 #include <dumux/material/fluidsystems/2pimmiscible.hh>
 
 #include <dumux/porousmediumflow/problem.hh>
-#include <dumux/porousmediumflow/2p/implicit/model.hh>
-#include <dumux/porousmediumflow/2p/implicit/incompressiblelocalresidual.hh>
+#include <dumux/porousmediumflow/2p/model.hh>
+#include <dumux/porousmediumflow/2p/incompressiblelocalresidual.hh>
 
 #include "spatialparams.hh"
 
diff --git a/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh b/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh
index 36684c445f0c51c6c7e713ed1c0e1d8383de3b70..2c96922741b9855afc246c288b4655e9d0b4f815 100644
--- a/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh
+++ b/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh
@@ -28,7 +28,7 @@
 #define DUMUX_INJECTION_PROBLEM_2PNI_HH
 
 #include <dumux/common/properties.hh>
-#include <dumux/porousmediumflow/2p/implicit/model.hh>
+#include <dumux/porousmediumflow/2p/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 #include <dumux/discretization/box/properties.hh>