diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake
index e9e1b45d..edd8c8b5 100644
--- a/CMakeLists_files.cmake
+++ b/CMakeLists_files.cmake
@@ -110,11 +110,11 @@ list (APPEND MAIN_SOURCE_FILES
 	opm/core/simulator/SimulatorReport.cpp
 	opm/core/simulator/SimulatorState.cpp
 	opm/core/simulator/SimulatorTimer.cpp
-	opm/core/tof/AnisotropicEikonal.cpp
-	opm/core/tof/DGBasis.cpp
-	opm/core/tof/FlowDiagnostics.cpp
-	opm/core/tof/TofReorder.cpp
-	opm/core/tof/TofDiscGalReorder.cpp
+	opm/core/flowdiagnostics/AnisotropicEikonal.cpp
+	opm/core/flowdiagnostics/DGBasis.cpp
+	opm/core/flowdiagnostics/FlowDiagnostics.cpp
+	opm/core/flowdiagnostics/TofReorder.cpp
+	opm/core/flowdiagnostics/TofDiscGalReorder.cpp
 	opm/core/transport/TransportSolverTwophaseInterface.cpp
 	opm/core/transport/implicit/TransportSolverTwophaseImplicit.cpp
 	opm/core/transport/implicit/transport_source.c
@@ -384,11 +384,11 @@ list (APPEND PUBLIC_HEADER_FILES
 	opm/core/simulator/initState_impl.hpp
 	opm/core/simulator/initStateEquil.hpp
 	opm/core/simulator/initStateEquil_impl.hpp
-	opm/core/tof/AnisotropicEikonal.hpp
-	opm/core/tof/DGBasis.hpp
-	opm/core/tof/FlowDiagnostics.hpp
-	opm/core/tof/TofReorder.hpp
-	opm/core/tof/TofDiscGalReorder.hpp
+	opm/core/flowdiagnostics/AnisotropicEikonal.hpp
+	opm/core/flowdiagnostics/DGBasis.hpp
+	opm/core/flowdiagnostics/FlowDiagnostics.hpp
+	opm/core/flowdiagnostics/TofReorder.hpp
+	opm/core/flowdiagnostics/TofDiscGalReorder.hpp
 	opm/core/transport/TransportSolverTwophaseInterface.hpp
 	opm/core/transport/implicit/CSRMatrixBlockAssembler.hpp
 	opm/core/transport/implicit/CSRMatrixUmfpackSolver.hpp
diff --git a/examples/compute_eikonal_from_files.cpp b/examples/compute_eikonal_from_files.cpp
index 47b5e3bb..8f25c25e 100644
--- a/examples/compute_eikonal_from_files.cpp
+++ b/examples/compute_eikonal_from_files.cpp
@@ -23,7 +23,7 @@
 #include "config.h"
 #endif // HAVE_CONFIG_H
 
-#include <opm/core/tof/AnisotropicEikonal.hpp>
+#include <opm/core/flowdiagnostics/AnisotropicEikonal.hpp>
 #include <opm/core/grid.h>
 #include <opm/core/grid/GridManager.hpp>
 #include <opm/core/utility/ErrorMacros.hpp>
diff --git a/examples/compute_tof.cpp b/examples/compute_tof.cpp
index 7dd20f8b..be465dec 100644
--- a/examples/compute_tof.cpp
+++ b/examples/compute_tof.cpp
@@ -39,8 +39,8 @@
 #include <opm/core/linalg/LinearSolverFactory.hpp>
 
 #include <opm/core/pressure/IncompTpfaSinglePhase.hpp>
-#include <opm/core/tof/TofReorder.hpp>
-#include <opm/core/tof/TofDiscGalReorder.hpp>
+#include <opm/core/flowdiagnostics/TofReorder.hpp>
+#include <opm/core/flowdiagnostics/TofDiscGalReorder.hpp>
 
 #include <opm/parser/eclipse/Parser/Parser.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
diff --git a/examples/compute_tof_from_files.cpp b/examples/compute_tof_from_files.cpp
index 29787139..a029eb62 100644
--- a/examples/compute_tof_from_files.cpp
+++ b/examples/compute_tof_from_files.cpp
@@ -43,8 +43,8 @@
 #include <opm/core/simulator/WellState.hpp>
 #include <opm/core/simulator/initState.hpp>
 #include <opm/core/pressure/IncompTpfa.hpp>
-#include <opm/core/tof/TofReorder.hpp>
-#include <opm/core/tof/TofDiscGalReorder.hpp>
+#include <opm/core/flowdiagnostics/TofReorder.hpp>
+#include <opm/core/flowdiagnostics/TofDiscGalReorder.hpp>
 
 #include <memory>
 #include <boost/filesystem.hpp>
diff --git a/opm/core/tof/AnisotropicEikonal.cpp b/opm/core/flowdiagnostics/AnisotropicEikonal.cpp
similarity index 99%
rename from opm/core/tof/AnisotropicEikonal.cpp
rename to opm/core/flowdiagnostics/AnisotropicEikonal.cpp
index 7a08ed56..6a18f806 100644
--- a/opm/core/tof/AnisotropicEikonal.cpp
+++ b/opm/core/flowdiagnostics/AnisotropicEikonal.cpp
@@ -17,7 +17,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <opm/core/tof/AnisotropicEikonal.hpp>
+#include <opm/core/flowdiagnostics/AnisotropicEikonal.hpp>
 #include <opm/core/grid/GridUtilities.hpp>
 #include <opm/core/grid.h>
 #include <opm/core/utility/RootFinders.hpp>
diff --git a/opm/core/tof/AnisotropicEikonal.hpp b/opm/core/flowdiagnostics/AnisotropicEikonal.hpp
similarity index 100%
rename from opm/core/tof/AnisotropicEikonal.hpp
rename to opm/core/flowdiagnostics/AnisotropicEikonal.hpp
diff --git a/opm/core/tof/DGBasis.cpp b/opm/core/flowdiagnostics/DGBasis.cpp
similarity index 99%
rename from opm/core/tof/DGBasis.cpp
rename to opm/core/flowdiagnostics/DGBasis.cpp
index fee8e96d..86210e24 100644
--- a/opm/core/tof/DGBasis.cpp
+++ b/opm/core/flowdiagnostics/DGBasis.cpp
@@ -18,7 +18,7 @@
 */
 
 #include "config.h"
-#include <opm/core/tof/DGBasis.hpp>
+#include <opm/core/flowdiagnostics/DGBasis.hpp>
 #include <opm/core/grid.h>
 #include <opm/core/utility/ErrorMacros.hpp>
 #include <numeric>
diff --git a/opm/core/tof/DGBasis.hpp b/opm/core/flowdiagnostics/DGBasis.hpp
similarity index 100%
rename from opm/core/tof/DGBasis.hpp
rename to opm/core/flowdiagnostics/DGBasis.hpp
diff --git a/opm/core/tof/FlowDiagnostics.cpp b/opm/core/flowdiagnostics/FlowDiagnostics.cpp
similarity index 99%
rename from opm/core/tof/FlowDiagnostics.cpp
rename to opm/core/flowdiagnostics/FlowDiagnostics.cpp
index a31ce498..9df570e6 100644
--- a/opm/core/tof/FlowDiagnostics.cpp
+++ b/opm/core/flowdiagnostics/FlowDiagnostics.cpp
@@ -17,7 +17,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <opm/core/tof/FlowDiagnostics.hpp>
+#include <opm/core/flowdiagnostics/FlowDiagnostics.hpp>
 
 #include <opm/core/utility/ErrorMacros.hpp>
 #include <algorithm>
diff --git a/opm/core/tof/FlowDiagnostics.hpp b/opm/core/flowdiagnostics/FlowDiagnostics.hpp
similarity index 100%
rename from opm/core/tof/FlowDiagnostics.hpp
rename to opm/core/flowdiagnostics/FlowDiagnostics.hpp
diff --git a/opm/core/tof/TofDiscGalReorder.cpp b/opm/core/flowdiagnostics/TofDiscGalReorder.cpp
similarity index 99%
rename from opm/core/tof/TofDiscGalReorder.cpp
rename to opm/core/flowdiagnostics/TofDiscGalReorder.cpp
index 5bfa5294..1173083c 100644
--- a/opm/core/tof/TofDiscGalReorder.cpp
+++ b/opm/core/flowdiagnostics/TofDiscGalReorder.cpp
@@ -20,8 +20,8 @@
 #include "config.h"
 #include <opm/core/grid/CellQuadrature.hpp>
 #include <opm/core/grid/FaceQuadrature.hpp>
-#include <opm/core/tof/TofDiscGalReorder.hpp>
-#include <opm/core/tof/DGBasis.hpp>
+#include <opm/core/flowdiagnostics/TofDiscGalReorder.hpp>
+#include <opm/core/flowdiagnostics/DGBasis.hpp>
 #include <opm/core/grid.h>
 #include <opm/core/utility/ErrorMacros.hpp>
 #include <opm/core/utility/SparseTable.hpp>
diff --git a/opm/core/tof/TofDiscGalReorder.hpp b/opm/core/flowdiagnostics/TofDiscGalReorder.hpp
similarity index 100%
rename from opm/core/tof/TofDiscGalReorder.hpp
rename to opm/core/flowdiagnostics/TofDiscGalReorder.hpp
diff --git a/opm/core/tof/TofReorder.cpp b/opm/core/flowdiagnostics/TofReorder.cpp
similarity index 99%
rename from opm/core/tof/TofReorder.cpp
rename to opm/core/flowdiagnostics/TofReorder.cpp
index d30ab2d7..6f605575 100644
--- a/opm/core/tof/TofReorder.cpp
+++ b/opm/core/flowdiagnostics/TofReorder.cpp
@@ -18,7 +18,7 @@
 */
 
 #include "config.h"
-#include <opm/core/tof/TofReorder.hpp>
+#include <opm/core/flowdiagnostics/TofReorder.hpp>
 #include <opm/core/grid.h>
 #include <opm/core/utility/ErrorMacros.hpp>
 #include <opm/core/utility/SparseTable.hpp>
diff --git a/opm/core/tof/TofReorder.hpp b/opm/core/flowdiagnostics/TofReorder.hpp
similarity index 100%
rename from opm/core/tof/TofReorder.hpp
rename to opm/core/flowdiagnostics/TofReorder.hpp
diff --git a/tests/test_anisotropiceikonal.cpp b/tests/test_anisotropiceikonal.cpp
index 3e3df53f..4a378642 100644
--- a/tests/test_anisotropiceikonal.cpp
+++ b/tests/test_anisotropiceikonal.cpp
@@ -27,7 +27,7 @@
 #define BOOST_TEST_MODULE AnisotropicEikonalTest
 #include <boost/test/unit_test.hpp>
 
-#include <opm/core/tof/AnisotropicEikonal.hpp>
+#include <opm/core/flowdiagnostics/AnisotropicEikonal.hpp>
 #include <opm/core/grid/GridManager.hpp>
 #include <opm/core/grid.h>
 #include <cmath>
diff --git a/tests/test_dgbasis.cpp b/tests/test_dgbasis.cpp
index 986e83e2..467310bd 100644
--- a/tests/test_dgbasis.cpp
+++ b/tests/test_dgbasis.cpp
@@ -27,7 +27,7 @@
 #define BOOST_TEST_MODULE DGBasisTest
 #include <boost/test/unit_test.hpp>
 
-#include <opm/core/tof/DGBasis.hpp>
+#include <opm/core/flowdiagnostics/DGBasis.hpp>
 #include <opm/core/grid/GridManager.hpp>
 #include <opm/core/grid.h>
 #include <cmath>
diff --git a/tests/test_flowdiagnostics.cpp b/tests/test_flowdiagnostics.cpp
index a3d700e3..a98cd33b 100644
--- a/tests/test_flowdiagnostics.cpp
+++ b/tests/test_flowdiagnostics.cpp
@@ -27,7 +27,7 @@
 
 #define BOOST_TEST_MODULE FlowDiagnosticsTests
 #include <boost/test/unit_test.hpp>
-#include <opm/core/tof/FlowDiagnostics.hpp>
+#include <opm/core/flowdiagnostics/FlowDiagnostics.hpp>
 
 const std::vector<double> pv(16, 18750.0);