diff --git a/dumux/porousmediumflow/1p/implicit/model.hh b/dumux/porousmediumflow/1p/implicit/model.hh
index 108633625906728aa233a2f9b42243f247a45056..36034a04bba4c04567c1e5a452b464d6215e2552 100644
--- a/dumux/porousmediumflow/1p/implicit/model.hh
+++ b/dumux/porousmediumflow/1p/implicit/model.hh
@@ -50,7 +50,7 @@
 
 #include <dumux/porousmediumflow/properties.hh>
 #include <dumux/porousmediumflow/immiscible/localresidual.hh>
-#include <dumux/porousmediumflow/nonisothermal/implicit/model.hh>
+#include <dumux/porousmediumflow/nonisothermal/model.hh>
 
 #include "indices.hh"
 #include "volumevariables.hh"
diff --git a/dumux/porousmediumflow/1pnc/implicit/model.hh b/dumux/porousmediumflow/1pnc/implicit/model.hh
index 2fe92c3a2a9852f18f04081c3e8b486bff03f170..b270389cfcfa9f71bf12ff1317dae23e5857b602 100644
--- a/dumux/porousmediumflow/1pnc/implicit/model.hh
+++ b/dumux/porousmediumflow/1pnc/implicit/model.hh
@@ -72,7 +72,7 @@
 
 #include <dumux/porousmediumflow/properties.hh>
 #include <dumux/porousmediumflow/compositional/localresidual.hh>
-#include <dumux/porousmediumflow/nonisothermal/implicit/model.hh>
+#include <dumux/porousmediumflow/nonisothermal/model.hh>
 #include <dumux/material/fluidmatrixinteractions/diffusivitymillingtonquirk.hh>
 
 #include "indices.hh"
diff --git a/dumux/porousmediumflow/1pncmin/implicit/propertydefaults.hh b/dumux/porousmediumflow/1pncmin/implicit/propertydefaults.hh
index 09768c13c197edaa65fcdada27b5641db1ae43f5..d46e37cdd80de07f5c9e8b6b26a06378564e6fce 100644
--- a/dumux/porousmediumflow/1pncmin/implicit/propertydefaults.hh
+++ b/dumux/porousmediumflow/1pncmin/implicit/propertydefaults.hh
@@ -33,7 +33,7 @@
 #include "volumevariables.hh"
 #include "properties.hh"
 
-#include <dumux/porousmediumflow/nonisothermal/implicit/propertydefaults.hh>
+#include <dumux/porousmediumflow/nonisothermal/model.hh>
 #include <dumux/porousmediumflow/implicit/darcyfluxvariables.hh>
 #include <dumux/material/spatialparams/implicit1p.hh>
 #include <dumux/material/fluidmatrixinteractions/1p/thermalconductivityaverage.hh>
diff --git a/dumux/porousmediumflow/2p/model.hh b/dumux/porousmediumflow/2p/model.hh
index f33a34df802881a5c5c1b75809c11eb9991821bf..23a9bc3719662d2f26948a440e339531f33debe4 100644
--- a/dumux/porousmediumflow/2p/model.hh
+++ b/dumux/porousmediumflow/2p/model.hh
@@ -66,7 +66,7 @@
 
 #include <dumux/porousmediumflow/properties.hh>
 #include <dumux/porousmediumflow/immiscible/localresidual.hh>
-#include <dumux/porousmediumflow/nonisothermal/implicit/model.hh>
+#include <dumux/porousmediumflow/nonisothermal/model.hh>
 
 #include "indices.hh"
 #include "volumevariables.hh"
diff --git a/dumux/porousmediumflow/2p1c/model.hh b/dumux/porousmediumflow/2p1c/model.hh
index 7e0178d9c3ac186858d4d810d94e0f5b1514e8ce..7d2dda7b5fe601bf064637472e337bb47fb8721b 100644
--- a/dumux/porousmediumflow/2p1c/model.hh
+++ b/dumux/porousmediumflow/2p1c/model.hh
@@ -37,7 +37,7 @@
 #include <dumux/porousmediumflow/properties.hh>
 #include <dumux/porousmediumflow/immiscible/localresidual.hh>
 #include <dumux/porousmediumflow/compositional/switchableprimaryvariables.hh>
-#include <dumux/porousmediumflow/nonisothermal/implicit/model.hh>
+#include <dumux/porousmediumflow/nonisothermal/model.hh>
 
 #include <dumux/porousmediumflow/2p/implicit/vtkoutputfields.hh>
 
diff --git a/dumux/porousmediumflow/2p2c/implicit/model.hh b/dumux/porousmediumflow/2p2c/implicit/model.hh
index 6cbac8d576e750f7e44d26c0e3b4922a951bfdaa..7ddbb7e60555f44ed1883a5720ab3b7b5427048b 100644
--- a/dumux/porousmediumflow/2p2c/implicit/model.hh
+++ b/dumux/porousmediumflow/2p2c/implicit/model.hh
@@ -80,7 +80,7 @@
 // property forward declarations
 #include <dumux/common/properties.hh>
 #include <dumux/porousmediumflow/properties.hh>
-#include <dumux/porousmediumflow/nonisothermal/implicit/model.hh>
+#include <dumux/porousmediumflow/nonisothermal/model.hh>
 
 #include <dumux/material/spatialparams/implicit.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh>
diff --git a/dumux/porousmediumflow/2pnc/model.hh b/dumux/porousmediumflow/2pnc/model.hh
index 5bfcde8a4ef948374d0ae17c57be3d4b564dd0d9..348d08964f072640bdf291d698a2c51402edc1f9 100644
--- a/dumux/porousmediumflow/2pnc/model.hh
+++ b/dumux/porousmediumflow/2pnc/model.hh
@@ -95,7 +95,7 @@
 #include <dumux/porousmediumflow/properties.hh>
 #include <dumux/porousmediumflow/compositional/localresidual.hh>
 #include <dumux/porousmediumflow/compositional/switchableprimaryvariables.hh>
-#include <dumux/porousmediumflow/nonisothermal/implicit/model.hh>
+#include <dumux/porousmediumflow/nonisothermal/model.hh>
 
 #include "indices.hh"
 #include "volumevariables.hh"
diff --git a/dumux/porousmediumflow/3p/model.hh b/dumux/porousmediumflow/3p/model.hh
index f8797c3d8111bf0352af1f88c48467e85fd2fb7a..e5f85a106f0b7256c652ee91b14356f39e2c9388 100644
--- a/dumux/porousmediumflow/3p/model.hh
+++ b/dumux/porousmediumflow/3p/model.hh
@@ -62,7 +62,7 @@
 
 #include <dumux/porousmediumflow/properties.hh>
 #include <dumux/porousmediumflow/immiscible/localresidual.hh>
-#include <dumux/porousmediumflow/nonisothermal/implicit/model.hh>
+#include <dumux/porousmediumflow/nonisothermal/model.hh>
 
 #include "indices.hh"
 #include "volumevariables.hh"
diff --git a/dumux/porousmediumflow/3p3c/model.hh b/dumux/porousmediumflow/3p3c/model.hh
index 14c5b6f7903b552fae56e12df6fb2d0b65e49ad3..1d819b7c1310202dc431d2d0802a27e346e603d3 100644
--- a/dumux/porousmediumflow/3p3c/model.hh
+++ b/dumux/porousmediumflow/3p3c/model.hh
@@ -80,7 +80,7 @@
 
 #include <dumux/common/properties.hh>
 #include <dumux/porousmediumflow/properties.hh>
-#include <dumux/porousmediumflow/nonisothermal/implicit/model.hh>
+#include <dumux/porousmediumflow/nonisothermal/model.hh>
 
 #include <dumux/material/spatialparams/implicit.hh>
 #include <dumux/material/fluidstates/compositional.hh>
diff --git a/dumux/porousmediumflow/3pwateroil/properties.hh b/dumux/porousmediumflow/3pwateroil/properties.hh
index 192081d440ad3360ff5d5e92e3e7320e21799449..2f235ed929746b40c7974e3c986e5b0dad9bf5d9 100644
--- a/dumux/porousmediumflow/3pwateroil/properties.hh
+++ b/dumux/porousmediumflow/3pwateroil/properties.hh
@@ -31,7 +31,7 @@
 
 #include <dumux/implicit/box/properties.hh>
 #include <dumux/implicit/cellcentered/properties.hh>
-#include <dumux/porousmediumflow/nonisothermal/implicit/model.hh>
+#include <dumux/porousmediumflow/nonisothermal/model.hh>
 
 namespace Dumux
 {
diff --git a/dumux/porousmediumflow/3pwateroil/propertydefaults.hh b/dumux/porousmediumflow/3pwateroil/propertydefaults.hh
index fbd7da54bc4876397356c4f5e9052f0a8c60da7a..035d6181153032c8d8a739d19c7751af481dd18e 100644
--- a/dumux/porousmediumflow/3pwateroil/propertydefaults.hh
+++ b/dumux/porousmediumflow/3pwateroil/propertydefaults.hh
@@ -31,7 +31,7 @@
 #include <dumux/porousmediumflow/implicit/darcyfluxvariables.hh>
 #include <dumux/material/spatialparams/implicit.hh>
 #include <dumux/material/fluidmatrixinteractions/3p/thermalconductivitysomerton3p.hh>
-#include <dumux/porousmediumflow/nonisothermal/implicit/propertydefaults.hh>
+#include <dumux/porousmediumflow/nonisothermal/model.hh>
 #include <dumux/material/fluidmatrixinteractions/diffusivitymillingtonquirk.hh>
 
 #include "indices.hh"
diff --git a/dumux/porousmediumflow/nonisothermal/CMakeLists.txt b/dumux/porousmediumflow/nonisothermal/CMakeLists.txt
index ba8341c614f1a2c797c95f5402f602025f1087b1..9a0b200fe76ff5c435f847f4ff428dbc8811b515 100644
--- a/dumux/porousmediumflow/nonisothermal/CMakeLists.txt
+++ b/dumux/porousmediumflow/nonisothermal/CMakeLists.txt
@@ -1 +1,7 @@
-add_subdirectory("implicit")
+#install headers
+install(FILES
+indices.hh
+localresidual.hh
+model.hh
+vtkoutputfields.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/nonisothermal/implicit)
diff --git a/dumux/porousmediumflow/nonisothermal/implicit/CMakeLists.txt b/dumux/porousmediumflow/nonisothermal/implicit/CMakeLists.txt
deleted file mode 100644
index 9a0b200fe76ff5c435f847f4ff428dbc8811b515..0000000000000000000000000000000000000000
--- a/dumux/porousmediumflow/nonisothermal/implicit/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-#install headers
-install(FILES
-indices.hh
-localresidual.hh
-model.hh
-vtkoutputfields.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/nonisothermal/implicit)
diff --git a/dumux/porousmediumflow/nonisothermal/implicit/indices.hh b/dumux/porousmediumflow/nonisothermal/indices.hh
similarity index 100%
rename from dumux/porousmediumflow/nonisothermal/implicit/indices.hh
rename to dumux/porousmediumflow/nonisothermal/indices.hh
diff --git a/dumux/porousmediumflow/nonisothermal/implicit/localresidual.hh b/dumux/porousmediumflow/nonisothermal/localresidual.hh
similarity index 100%
rename from dumux/porousmediumflow/nonisothermal/implicit/localresidual.hh
rename to dumux/porousmediumflow/nonisothermal/localresidual.hh
diff --git a/dumux/porousmediumflow/nonisothermal/implicit/model.hh b/dumux/porousmediumflow/nonisothermal/model.hh
similarity index 100%
rename from dumux/porousmediumflow/nonisothermal/implicit/model.hh
rename to dumux/porousmediumflow/nonisothermal/model.hh
diff --git a/dumux/porousmediumflow/nonisothermal/implicit/vtkoutputfields.hh b/dumux/porousmediumflow/nonisothermal/vtkoutputfields.hh
similarity index 100%
rename from dumux/porousmediumflow/nonisothermal/implicit/vtkoutputfields.hh
rename to dumux/porousmediumflow/nonisothermal/vtkoutputfields.hh
diff --git a/dumux/porousmediumflow/properties.hh b/dumux/porousmediumflow/properties.hh
index 005f69413d1a8a9b2f0516b56a2b42b6de634acb..b9b9ccae2a0cc5175774a8bb918144eeedeab742 100644
--- a/dumux/porousmediumflow/properties.hh
+++ b/dumux/porousmediumflow/properties.hh
@@ -32,7 +32,7 @@
 
 #include <dumux/porousmediumflow/fluxvariables.hh>
 #include <dumux/porousmediumflow/fluxvariablescache.hh>
-#include <dumux/porousmediumflow/nonisothermal/implicit/localresidual.hh>
+#include <dumux/porousmediumflow/nonisothermal/localresidual.hh>
 #include <dumux/porousmediumflow/compositional/primaryvariableswitch.hh>
 #include <dumux/porousmediumflow/velocityoutput.hh>
 
diff --git a/dumux/porousmediumflow/richards/implicit/model.hh b/dumux/porousmediumflow/richards/implicit/model.hh
index 2225c4eafff97117327dbb5bf6b54982c6afd147..693b08f70c4ca7b7ad3ad743d78a6bd494d9523e 100644
--- a/dumux/porousmediumflow/richards/implicit/model.hh
+++ b/dumux/porousmediumflow/richards/implicit/model.hh
@@ -104,7 +104,7 @@
 #include <dumux/material/fluidstates/immiscible.hh>
 
 #include <dumux/porousmediumflow/properties.hh>
-#include <dumux/porousmediumflow/nonisothermal/implicit/model.hh>
+#include <dumux/porousmediumflow/nonisothermal/model.hh>
 
 #include "indices.hh"
 #include "volumevariables.hh"
diff --git a/dumux/porousmediumflow/richardsnc/implicit/model.hh b/dumux/porousmediumflow/richardsnc/implicit/model.hh
index de67e4db9550bc21f3e66d0b035fe7651c007b22..a3eeb808f4e5436b3199aaf581535bbc320b8a5f 100644
--- a/dumux/porousmediumflow/richardsnc/implicit/model.hh
+++ b/dumux/porousmediumflow/richardsnc/implicit/model.hh
@@ -40,7 +40,7 @@
 #include <dumux/material/fluidstates/compositional.hh>
 
 #include <dumux/porousmediumflow/properties.hh>
-#include <dumux/porousmediumflow/nonisothermal/implicit/model.hh>
+#include <dumux/porousmediumflow/nonisothermal/model.hh>
 
 #include "volumevariables.hh"
 #include "indices.hh"