diff --git a/ProcessLib/CalculateSurfaceFlux/MapBulkElementPoint.cpp b/MeshLib/Elements/MapBulkElementPoint.cpp
similarity index 99%
rename from ProcessLib/CalculateSurfaceFlux/MapBulkElementPoint.cpp
rename to MeshLib/Elements/MapBulkElementPoint.cpp
index e04a36300711902f1667e46f3cf56cfebade4322..a8a1fb8c5bc6fd69a5e4568eea0b9fcaac20fd73 100644
--- a/ProcessLib/CalculateSurfaceFlux/MapBulkElementPoint.cpp
+++ b/MeshLib/Elements/MapBulkElementPoint.cpp
@@ -11,7 +11,7 @@
 
 #include "MapBulkElementPoint.h"
 
-namespace ProcessLib
+namespace MeshLib
 {
 MathLib::Point3d getBulkElementPoint(MeshLib::Quad const& /*quad*/,
                                      std::size_t const face_id,
diff --git a/ProcessLib/CalculateSurfaceFlux/MapBulkElementPoint.h b/MeshLib/Elements/MapBulkElementPoint.h
similarity index 98%
rename from ProcessLib/CalculateSurfaceFlux/MapBulkElementPoint.h
rename to MeshLib/Elements/MapBulkElementPoint.h
index a826d30b4a3838e0bae87ab5d51a2fe2e9b7fc5a..d9611589033eda0143cda5c248a499bf137c7cfd 100644
--- a/ProcessLib/CalculateSurfaceFlux/MapBulkElementPoint.h
+++ b/MeshLib/Elements/MapBulkElementPoint.h
@@ -9,14 +9,12 @@
 
 #pragma once
 
-#include <array>
-
 #include "MathLib/TemplateWeightedPoint.h"
 
 #include "MeshLib/Elements/FaceRule.h"
 #include "MeshLib/Elements/Elements.h"
 
-namespace ProcessLib
+namespace MeshLib
 {
 /// Maps the given lower dimensional boundary point \c wp of a line, i.e. the 1d
 /// gauss point given in local coordinates of a line, to higher dimensional
diff --git a/ProcessLib/CalculateSurfaceFlux/CalculateSurfaceFlux.cpp b/ProcessLib/CalculateSurfaceFlux/CalculateSurfaceFlux.cpp
index 2cc9389c659725ea7fde7e092712469f1ede3c9a..b28076ee3db5787663be59c045243de3b56758fc 100644
--- a/ProcessLib/CalculateSurfaceFlux/CalculateSurfaceFlux.cpp
+++ b/ProcessLib/CalculateSurfaceFlux/CalculateSurfaceFlux.cpp
@@ -54,14 +54,14 @@ CalculateSurfaceFlux::CalculateSurfaceFlux(
 }
 
 void CalculateSurfaceFlux::integrate(GlobalVector const& x,
-                               MeshLib::PropertyVector<double>& balance,
-                               Process const& bulk_process)
+                                     MeshLib::PropertyVector<double>& balance,
+                                     Process const& bulk_process)
 {
     DBUG("Integrate CalculateSurfaceFlux.");
 
     GlobalExecutor::executeMemberOnDereferenced(
-        &CalculateSurfaceFluxLocalAssemblerInterface::integrate, _local_assemblers, x,
-        balance, bulk_process);
+        &CalculateSurfaceFluxLocalAssemblerInterface::integrate,
+        _local_assemblers, x, balance, bulk_process);
 }
 
 }  // namespace ProcessLib
diff --git a/ProcessLib/CalculateSurfaceFlux/CalculateSurfaceFluxLocalAssembler.h b/ProcessLib/CalculateSurfaceFlux/CalculateSurfaceFluxLocalAssembler.h
index b463710650f693c1bcfca5a2fd97d28434f62bc4..2239a45ea2605c7c970f2c6163d12da521d53bd9 100644
--- a/ProcessLib/CalculateSurfaceFlux/CalculateSurfaceFluxLocalAssembler.h
+++ b/ProcessLib/CalculateSurfaceFlux/CalculateSurfaceFluxLocalAssembler.h
@@ -17,8 +17,7 @@
 #include "ProcessLib/Parameter/Parameter.h"
 #include "ProcessLib/Utils/InitShapeMatrices.h"
 
-#include "MapBulkElementPoint.h"
-
+#include "MeshLib/Elements/MapBulkElementPoint.h"
 #include "MeshLib/Elements/FaceRule.h"
 #include "MeshLib/Elements/Elements.h"
 
@@ -125,7 +124,7 @@ public:
         {
             auto const& wp = _integration_method.getWeightedPoint(ip);
 
-            auto const bulk_element_point = getBulkElementPoint(
+            auto const bulk_element_point = MeshLib::getBulkElementPoint(
                 bulk_process.getMesh(), _bulk_element_id, _bulk_face_id, wp);
             auto const bulk_flux =
                 bulk_process.getFlux(_bulk_element_id, bulk_element_point, x);