diff --git a/dumux/material/fluidmatrixinteractions/CMakeLists.txt b/dumux/material/fluidmatrixinteractions/CMakeLists.txt
index 5c00e429803c3670bc0af7ff878f28d98f46b966..4433adc21cb906b3fe965a0f042e0485e9cd55ee 100644
--- a/dumux/material/fluidmatrixinteractions/CMakeLists.txt
+++ b/dumux/material/fluidmatrixinteractions/CMakeLists.txt
@@ -2,8 +2,8 @@ add_subdirectory(1p)
 add_subdirectory(1pia)
 add_subdirectory(2p)
 add_subdirectory(3p)
-add_subdirectory(frictionlaws)
 add_subdirectory(dispersiontensors)
+add_subdirectory(frictionlaws)
 add_subdirectory(mp)
 add_subdirectory(porenetwork)
 
diff --git a/dumux/multidomain/boundary/CMakeLists.txt b/dumux/multidomain/boundary/CMakeLists.txt
index 5ffc5873b26785265ec0c9ad64e4cc7aa93cce1b..d7ca06c78d6acedb6d85a03256c88d88d7b8b2cc 100644
--- a/dumux/multidomain/boundary/CMakeLists.txt
+++ b/dumux/multidomain/boundary/CMakeLists.txt
@@ -1,3 +1,4 @@
 add_subdirectory(darcydarcy)
+add_subdirectory(freeflowporenetwork)
 add_subdirectory(freeflowporousmedium)
 add_subdirectory(stokesdarcy)
diff --git a/dumux/multidomain/boundary/freeflowporenetwork/ffmassporenetwork/CMakeLists.txt b/dumux/multidomain/boundary/freeflowporenetwork/ffmassporenetwork/CMakeLists.txt
index ba651ef8b7bbb5e5ed8f69b6d2a172683314727f..480b5b70b98139b071d3b1695a69fbf2f8b65a0a 100644
--- a/dumux/multidomain/boundary/freeflowporenetwork/ffmassporenetwork/CMakeLists.txt
+++ b/dumux/multidomain/boundary/freeflowporenetwork/ffmassporenetwork/CMakeLists.txt
@@ -1,3 +1,3 @@
-file(GLOB DUMUX_DUMUX_MULTIDOMAIN_BOUNDARY_FREEFLOWPORENETWORK_FFMASSPORENETWORK_HEADERS *.hh *.inc)
-install(FILES ${DUMUX_DUMUX_MULTIDOMAIN_BOUNDARY_FREEFLOWPORENETWORK_FFMASSPORENETWORK_HEADERS}
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/dumux/multidomain/boundary/freeflowporenetwork/ffmassporenetwork)
+file(GLOB DUMUX_MULTIDOMAIN_BOUNDARY_FREEFLOWPORENETWORK_FFMASSPORENETWORK_HEADERS *.hh *.inc)
+install(FILES ${DUMUX_MULTIDOMAIN_BOUNDARY_FREEFLOWPORENETWORK_FFMASSPORENETWORK_HEADERS}
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/multidomain/boundary/freeflowporenetwork/ffmassporenetwork)
diff --git a/dumux/multidomain/boundary/freeflowporenetwork/ffmomentumporenetwork/CMakeLists.txt b/dumux/multidomain/boundary/freeflowporenetwork/ffmomentumporenetwork/CMakeLists.txt
index c97b9b570aab1617c1b79103102141f9417e358e..b2a33b2f9831b42dac97b8d691570d21852929ed 100644
--- a/dumux/multidomain/boundary/freeflowporenetwork/ffmomentumporenetwork/CMakeLists.txt
+++ b/dumux/multidomain/boundary/freeflowporenetwork/ffmomentumporenetwork/CMakeLists.txt
@@ -1,3 +1,3 @@
-file(GLOB DUMUX_DUMUX_MULTIDOMAIN_BOUNDARY_FREEFLOWPORENETWORK_FFMOMENTUMPORENETWORK_HEADERS *.hh *.inc)
-install(FILES ${DUMUX_DUMUX_MULTIDOMAIN_BOUNDARY_FREEFLOWPORENETWORK_FFMOMENTUMPORENETWORK_HEADERS}
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/dumux/multidomain/boundary/freeflowporenetwork/ffmomentumporenetwork)
+file(GLOB DUMUX_MULTIDOMAIN_BOUNDARY_FREEFLOWPORENETWORK_FFMOMENTUMPORENETWORK_HEADERS *.hh *.inc)
+install(FILES ${DUMUX_MULTIDOMAIN_BOUNDARY_FREEFLOWPORENETWORK_FFMOMENTUMPORENETWORK_HEADERS}
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/multidomain/boundary/freeflowporenetwork/ffmomentumporenetwork)
diff --git a/dumux/porenetwork/CMakeLists.txt b/dumux/porenetwork/CMakeLists.txt
index 940dab9ca1bb4463f32af626ce22616ffc792a06..7465c1874fffd8d3087dc243b9a3a0da4fb380e1 100644
--- a/dumux/porenetwork/CMakeLists.txt
+++ b/dumux/porenetwork/CMakeLists.txt
@@ -2,6 +2,7 @@ add_subdirectory(1p)
 add_subdirectory(1pnc)
 add_subdirectory(2p)
 add_subdirectory(common)
+add_subdirectory(util)
 
 file(GLOB DUMUX_PORENETWORK_HEADERS *.hh *.inc)
 install(FILES ${DUMUX_PORENETWORK_HEADERS}
diff --git a/dumux/porenetwork/util/CMakeLists.txt b/dumux/porenetwork/util/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391