diff --git a/opm/core/transport/reorder/DGBasis.cpp b/opm/core/tof/DGBasis.cpp
similarity index 99%
rename from opm/core/transport/reorder/DGBasis.cpp
rename to opm/core/tof/DGBasis.cpp
index 8ffb95ec4..b2ce5eaa7 100644
--- a/opm/core/transport/reorder/DGBasis.cpp
+++ b/opm/core/tof/DGBasis.cpp
@@ -17,7 +17,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <opm/core/transport/reorder/DGBasis.hpp>
+#include <opm/core/tof/DGBasis.hpp>
 #include <opm/core/grid.h>
 #include <opm/core/utility/ErrorMacros.hpp>
 #include <numeric>
diff --git a/opm/core/transport/reorder/DGBasis.hpp b/opm/core/tof/DGBasis.hpp
similarity index 100%
rename from opm/core/transport/reorder/DGBasis.hpp
rename to opm/core/tof/DGBasis.hpp
diff --git a/opm/core/transport/reorder/TofDiscGalReorder.cpp b/opm/core/tof/TofDiscGalReorder.cpp
similarity index 99%
rename from opm/core/transport/reorder/TofDiscGalReorder.cpp
rename to opm/core/tof/TofDiscGalReorder.cpp
index 10af155b5..589393aee 100644
--- a/opm/core/transport/reorder/TofDiscGalReorder.cpp
+++ b/opm/core/tof/TofDiscGalReorder.cpp
@@ -19,8 +19,8 @@
 
 #include <opm/core/grid/CellQuadrature.hpp>
 #include <opm/core/grid/FaceQuadrature.hpp>
-#include <opm/core/transport/reorder/TofDiscGalReorder.hpp>
-#include <opm/core/transport/reorder/DGBasis.hpp>
+#include <opm/core/tof/TofDiscGalReorder.hpp>
+#include <opm/core/tof/DGBasis.hpp>
 #include <opm/core/grid.h>
 #include <opm/core/utility/ErrorMacros.hpp>
 #include <opm/core/utility/VelocityInterpolation.hpp>
diff --git a/opm/core/transport/reorder/TofDiscGalReorder.hpp b/opm/core/tof/TofDiscGalReorder.hpp
similarity index 100%
rename from opm/core/transport/reorder/TofDiscGalReorder.hpp
rename to opm/core/tof/TofDiscGalReorder.hpp
diff --git a/opm/core/transport/reorder/TofReorder.cpp b/opm/core/tof/TofReorder.cpp
similarity index 99%
rename from opm/core/transport/reorder/TofReorder.cpp
rename to opm/core/tof/TofReorder.cpp
index 8002adc49..48359343a 100644
--- a/opm/core/transport/reorder/TofReorder.cpp
+++ b/opm/core/tof/TofReorder.cpp
@@ -17,7 +17,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <opm/core/transport/reorder/TofReorder.hpp>
+#include <opm/core/tof/TofReorder.hpp>
 #include <opm/core/grid.h>
 #include <opm/core/utility/ErrorMacros.hpp>
 #include <algorithm>
diff --git a/opm/core/transport/reorder/TofReorder.hpp b/opm/core/tof/TofReorder.hpp
similarity index 100%
rename from opm/core/transport/reorder/TofReorder.hpp
rename to opm/core/tof/TofReorder.hpp