diff --git a/dumux/CMakeLists.txt b/dumux/CMakeLists.txt
index a92131ff57c90861e0de0de7d22028c350ac3dcf..696feee855797e07d660154970618c81379ec199 100644
--- a/dumux/CMakeLists.txt
+++ b/dumux/CMakeLists.txt
@@ -6,7 +6,7 @@ add_subdirectory("freeflow")
 add_subdirectory("io")
 add_subdirectory("linear")
 add_subdirectory("material")
-add_subdirectory("mixeddimension")
+#add_subdirectory("mixeddimension")
 add_subdirectory("nonlinear")
 add_subdirectory("parallel")
 add_subdirectory("porousmediumflow")
diff --git a/dumux/discretization/CMakeLists.txt b/dumux/discretization/CMakeLists.txt
index bc24ced4363d90d6e19666e96965d19da06e6e26..b1a9c0506d054d2a397425202257ef24225f4463 100644
--- a/dumux/discretization/CMakeLists.txt
+++ b/dumux/discretization/CMakeLists.txt
@@ -1,5 +1,6 @@
 add_subdirectory("box")
 add_subdirectory("cellcentered")
+add_subdirectory("staggered")
 
 install(FILES
 basefvgridgeometry.hh
diff --git a/dumux/discretization/staggered/CMakeLists.txt b/dumux/discretization/staggered/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..2c9c80e3c932f0d78a35a8cf9d87d07f6b201216
--- /dev/null
+++ b/dumux/discretization/staggered/CMakeLists.txt
@@ -0,0 +1,17 @@
+add_subdirectory("freeflow")
+
+install(FILES
+connectivitymap.hh
+elementfacevariables.hh
+elementfluxvariables.hh
+elementvolumevariables.hh
+facesolution.hh
+fvelementgeometry.hh
+fvgridgeometry.hh
+globalfacevariables.hh
+gridfluxvariables.hh
+gridvariables.hh
+gridvolumevariables.hh
+properties.hh
+subcontrolvolumeface.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/discretization/staggered)
diff --git a/dumux/discretization/staggered/freeflow/CMakeLists.txt b/dumux/discretization/staggered/freeflow/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..e8636acf2356a1706d357d91b477d45943b0b550
--- /dev/null
+++ b/dumux/discretization/staggered/freeflow/CMakeLists.txt
@@ -0,0 +1,12 @@
+
+install(FILES
+boundarytypes.hh
+facevariables.hh
+fickslaw.hh
+fourierslaw.hh
+maxwellstefanslaw.hh
+properties.hh
+staggeredgeometryhelper.hh
+subcontrolvolumeface.hh
+velocityoutput.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/discretization/freeflow)
diff --git a/dumux/freeflow/navierstokes/CMakeLists.txt b/dumux/freeflow/navierstokes/CMakeLists.txt
index c9107fbd1b0dfa47847116bea0b7c3267c2ef276..a00d0a700888f72e9ceeee56a25ce1b721f44638 100644
--- a/dumux/freeflow/navierstokes/CMakeLists.txt
+++ b/dumux/freeflow/navierstokes/CMakeLists.txt
@@ -1,3 +1,4 @@
+add_subdirectory("staggered")
 
 #install headers
 install(FILES
@@ -7,8 +8,6 @@ indices.hh
 localresidual.hh
 model.hh
 problem.hh
-staggered/fluxvariables.hh
-staggered/localresidual.hh
 volumevariables.hh
 vtkoutputfields.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/freeflow/navierstokes)
diff --git a/dumux/freeflow/navierstokes/staggered/CMakeLists.txt b/dumux/freeflow/navierstokes/staggered/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..4e0e1f7ca324ec44abdd3a925848802768348a6e
--- /dev/null
+++ b/dumux/freeflow/navierstokes/staggered/CMakeLists.txt
@@ -0,0 +1,7 @@
+
+#install headers
+install(FILES
+fluxoverplane.hh
+fluxvariables.hh
+localresidual.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/freeflow/navierstokes/staggered)
diff --git a/dumux/freeflow/navierstokesnc/CMakeLists.txt b/dumux/freeflow/navierstokesnc/CMakeLists.txt
index 3b3b896409d559ec33d245152d1cab443060d940..f10d052d18da5005326481427bc4a1b5be50d89f 100644
--- a/dumux/freeflow/navierstokesnc/CMakeLists.txt
+++ b/dumux/freeflow/navierstokesnc/CMakeLists.txt
@@ -1,3 +1,4 @@
+add_subdirectory("staggered")
 
 #install headers
 install(FILES
@@ -7,6 +8,4 @@ localresidual.hh
 model.hh
 volumevariables.hh
 vtkoutputfields.hh
-staggered/fluxvariables.hh
-staggered/localresidual.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/freeflow/navierstokesnc)
diff --git a/dumux/freeflow/navierstokesnc/staggered/CMakeLists.txt b/dumux/freeflow/navierstokesnc/staggered/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..105521ca0a3a13e4d0d72007ea8b60393cb5ae6a
--- /dev/null
+++ b/dumux/freeflow/navierstokesnc/staggered/CMakeLists.txt
@@ -0,0 +1,6 @@
+
+#install headers
+install(FILES
+fluxvariables.hh
+localresidual.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/freeflow/navierstokesnc/staggered)