diff --git a/dumux/porousmediumflow/co2/CMakeLists.txt b/dumux/porousmediumflow/co2/CMakeLists.txt
index ba8341c614f1a2c797c95f5402f602025f1087b1..80c94c2b9fed7dee8cf7adab93f35289a6949d58 100644
--- a/dumux/porousmediumflow/co2/CMakeLists.txt
+++ b/dumux/porousmediumflow/co2/CMakeLists.txt
@@ -1 +1,6 @@
-add_subdirectory("implicit")
+
+#install headers
+install(FILES
+model.hh
+volumevariables.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/co2)
diff --git a/dumux/porousmediumflow/co2/implicit/CMakeLists.txt b/dumux/porousmediumflow/co2/implicit/CMakeLists.txt
deleted file mode 100644
index ead35fb69d8477400c3b34dc3dbf25cac704eb90..0000000000000000000000000000000000000000
--- a/dumux/porousmediumflow/co2/implicit/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-#install headers
-install(FILES
-model.hh
-volumevariables.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/co2/implicit)
diff --git a/dumux/porousmediumflow/co2/implicit/model.hh b/dumux/porousmediumflow/co2/model.hh
similarity index 100%
rename from dumux/porousmediumflow/co2/implicit/model.hh
rename to dumux/porousmediumflow/co2/model.hh
diff --git a/dumux/porousmediumflow/co2/implicit/primaryvariableswitch.hh b/dumux/porousmediumflow/co2/primaryvariableswitch.hh
similarity index 100%
rename from dumux/porousmediumflow/co2/implicit/primaryvariableswitch.hh
rename to dumux/porousmediumflow/co2/primaryvariableswitch.hh
diff --git a/dumux/porousmediumflow/co2/implicit/volumevariables.hh b/dumux/porousmediumflow/co2/volumevariables.hh
similarity index 100%
rename from dumux/porousmediumflow/co2/implicit/volumevariables.hh
rename to dumux/porousmediumflow/co2/volumevariables.hh
diff --git a/test/porousmediumflow/co2/implicit/heterogeneousproblem.hh b/test/porousmediumflow/co2/implicit/heterogeneousproblem.hh
index ee39c4abbdca4a7cc9f9cdf778873d3ca8290e39..a691137e090c41fc0e490ac69d1dd0d37d36fe86 100644
--- a/test/porousmediumflow/co2/implicit/heterogeneousproblem.hh
+++ b/test/porousmediumflow/co2/implicit/heterogeneousproblem.hh
@@ -28,7 +28,7 @@
 #include <dumux/discretization/box/properties.hh>
 
 #include <dumux/porousmediumflow/problem.hh>
-#include <dumux/porousmediumflow/co2/implicit/model.hh>
+#include <dumux/porousmediumflow/co2/model.hh>
 
 #include <dumux/material/fluidsystems/brineco2.hh>
 #include <dumux/discretization/box/scvftoscvboundarytypes.hh>
diff --git a/test/porousmediumflow/co2/implicit/heterogeneousspatialparameters.hh b/test/porousmediumflow/co2/implicit/heterogeneousspatialparameters.hh
index a56a9389a8b0619d5ff291c092a14290cc6e8ebf..850c8c52239dd6bf597b6a71b22a7070dc179d94 100644
--- a/test/porousmediumflow/co2/implicit/heterogeneousspatialparameters.hh
+++ b/test/porousmediumflow/co2/implicit/heterogeneousspatialparameters.hh
@@ -31,7 +31,7 @@
 #include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
 
-#include <dumux/porousmediumflow/co2/implicit/model.hh>
+#include <dumux/porousmediumflow/co2/model.hh>
 
 namespace Dumux
 {