diff --git a/dumux/implicit/tpfa/fvelementgeometryvector.hh b/dumux/implicit/cellcentered/tpfa/fvelementgeometryvector.hh
similarity index 100%
rename from dumux/implicit/tpfa/fvelementgeometryvector.hh
rename to dumux/implicit/cellcentered/tpfa/fvelementgeometryvector.hh
diff --git a/dumux/implicit/tpfa/properties.hh b/dumux/implicit/cellcentered/tpfa/properties.hh
similarity index 96%
rename from dumux/implicit/tpfa/properties.hh
rename to dumux/implicit/cellcentered/tpfa/properties.hh
index 3c0803c107754417b9c983f03bc70fed0985c289..1337941e096873f35ed1c78625f8601a9d8d74e3 100644
--- a/dumux/implicit/tpfa/properties.hh
+++ b/dumux/implicit/cellcentered/tpfa/properties.hh
@@ -47,6 +47,6 @@ NEW_TYPE_TAG(CCTpfaModel, INHERITS_FROM(ImplicitBase));
 
 // \}
 
-#include <dumux/implicit/tpfa/propertydefaults.hh>
+#include <dumux/implicit/cellcentered/tpfa/propertydefaults.hh>
 
 #endif
diff --git a/dumux/implicit/tpfa/propertydefaults.hh b/dumux/implicit/cellcentered/tpfa/propertydefaults.hh
similarity index 98%
rename from dumux/implicit/tpfa/propertydefaults.hh
rename to dumux/implicit/cellcentered/tpfa/propertydefaults.hh
index 9aefd14d48436498ad3127716d6b1b4fb410d68f..2cdf998e8e03f79a98192a0c8e63f66644d43775 100644
--- a/dumux/implicit/tpfa/propertydefaults.hh
+++ b/dumux/implicit/cellcentered/tpfa/propertydefaults.hh
@@ -30,7 +30,7 @@
 #include <dumux/implicit/propertydefaults.hh>
 #include <dumux/implicit/cellcentered/assembler.hh>
 #include <dumux/implicit/fvelementgeometry.hh>
-#include <dumux/implicit/tpfa/fvelementgeometryvector.hh>
+#include <dumux/implicit/cellcentered/tpfa/fvelementgeometryvector.hh>
 #include <dumux/implicit/cellcentered/elementboundarytypes.hh>
 #include <dumux/implicit/cellcentered/localresidual.hh>
 #include <dumux/implicit/cellcentered/properties.hh>
diff --git a/test/implicit/test_fvelementgeometry.cc b/test/implicit/test_fvelementgeometry.cc
index 76778d9835014ea354a32b4c556b5547e700e863..3b68be126a81dd70c0e3984fdb795ea5da95171a 100644
--- a/test/implicit/test_fvelementgeometry.cc
+++ b/test/implicit/test_fvelementgeometry.cc
@@ -31,8 +31,8 @@
 #include <dune/grid/yaspgrid.hh>
 #include <dune/grid/common/mcmgmapper.hh>
 
-#include <dumux/implicit/tpfa/properties.hh>
-#include <dumux/implicit/tpfa/fvelementgeometryvector.hh>
+#include <dumux/implicit/cellcentered/tpfa/properties.hh>
+#include <dumux/implicit/cellcentered/tpfa/fvelementgeometryvector.hh>
 #include <dumux/implicit/fvelementgeometry.hh>
 #include <dumux/implicit/subcontrolvolume.hh>
 #include <dumux/implicit/subcontrolvolumeface.hh>