diff --git a/apps/benchmarks/ComplexGeometry/ComplexGeometry.cpp b/apps/benchmarks/ComplexGeometry/ComplexGeometry.cpp
index e8d56f6c3af993167745bf4e0763f750ad35d408..95678fab1449cf155d21063374f449c2291ee7b1 100644
--- a/apps/benchmarks/ComplexGeometry/ComplexGeometry.cpp
+++ b/apps/benchmarks/ComplexGeometry/ComplexGeometry.cpp
@@ -54,25 +54,25 @@
 #include "geometry/mesh/TriangleMeshIO.h"
 #include "geometry/InitBoundaryHandling.h"
 
-#include "mesh/TriangleMeshes.h"
-#include "mesh/MeshOperations.h"
-#include "mesh/DistanceComputations.h"
-#include "mesh/DistanceFunction.h"
-#include "mesh/MeshIO.h"
-#include "mesh/MatrixVectorOperations.h"
+#include "mesh_common/TriangleMeshes.h"
+#include "mesh_common/MeshOperations.h"
+#include "mesh_common/DistanceComputations.h"
+#include "mesh_common/DistanceFunction.h"
+#include "mesh_common/MeshIO.h"
+#include "mesh_common/MatrixVectorOperations.h"
+#include "mesh_common/distance_octree/DistanceOctree.h"
+#include "mesh_common/vtk/VTKMeshWriter.h"
+#include "mesh_common/vtk/CommonDataSources.h"
 #include "mesh/blockforest/BlockForestInitialization.h"
 #include "mesh/blockforest/BlockWorkloadMemory.h"
 #include "mesh/blockforest/BlockExclusion.h"
 #include "mesh/blockforest/RefinementSelection.h"
-#include "mesh/distance_octree/DistanceOctree.h"
 #include "mesh/boundary/BoundarySetup.h"
 #include "mesh/boundary/BoundaryInfo.h"
 #include "mesh/boundary/BoundaryLocation.h"
 #include "mesh/boundary/BoundaryLocationFunction.h"
 #include "mesh/boundary/BoundaryUIDFaceDataSource.h"
 #include "mesh/boundary/ColorToBoundaryMapper.h"
-#include "mesh/vtk/VTKMeshWriter.h"
-#include "mesh/vtk/CommonDataSources.h"
 
 #include "stencil/D3Q19.h"
 
diff --git a/apps/benchmarks/MeshDistance/MeshDistanceBenchmark.cpp b/apps/benchmarks/MeshDistance/MeshDistanceBenchmark.cpp
index ec2212242422eade37e6a5c22171e6852b610e83..5d2f225f4559cd1ccc7471817226ac18201855d2 100644
--- a/apps/benchmarks/MeshDistance/MeshDistanceBenchmark.cpp
+++ b/apps/benchmarks/MeshDistance/MeshDistanceBenchmark.cpp
@@ -28,11 +28,11 @@
 #include "geometry/mesh/TriangleMesh.h"
 #include "geometry/mesh/TriangleMeshIO.h"
 
-#include "mesh/TriangleMeshes.h"
-#include "mesh/MeshOperations.h"
-#include "mesh/DistanceComputations.h"
-#include "mesh/distance_octree/DistanceOctree.h"
-#include "mesh/MeshIO.h"
+#include "mesh_common/TriangleMeshes.h"
+#include "mesh_common/MeshOperations.h"
+#include "mesh_common/DistanceComputations.h"
+#include "mesh_common/distance_octree/DistanceOctree.h"
+#include "mesh_common/MeshIO.h"
 
 #include <random>
 
diff --git a/apps/tutorials/lbm/04_LBComplexGeometry.cpp b/apps/tutorials/lbm/04_LBComplexGeometry.cpp
index fdab4509e2256b1d09030ed9c08376d10d0af674..9b02de05a655bd46b3f45ac0d3f3811501128b6e 100644
--- a/apps/tutorials/lbm/04_LBComplexGeometry.cpp
+++ b/apps/tutorials/lbm/04_LBComplexGeometry.cpp
@@ -33,12 +33,15 @@
 
 #include "lbm/all.h"
 
-#include "mesh/DistanceComputations.h"
-#include "mesh/DistanceFunction.h"
-#include "mesh/MatrixVectorOperations.h"
-#include "mesh/MeshIO.h"
-#include "mesh/MeshOperations.h"
-#include "mesh/TriangleMeshes.h"
+#include "mesh_common/DistanceComputations.h"
+#include "mesh_common/DistanceFunction.h"
+#include "mesh_common/MatrixVectorOperations.h"
+#include "mesh_common/MeshIO.h"
+#include "mesh_common/MeshOperations.h"
+#include "mesh_common/TriangleMeshes.h"
+#include "mesh_common/distance_octree/DistanceOctree.h"
+#include "mesh_common/vtk/CommonDataSources.h"
+#include "mesh_common/vtk/VTKMeshWriter.h"
 #include "mesh/blockforest/BlockExclusion.h"
 #include "mesh/blockforest/BlockForestInitialization.h"
 #include "mesh/boundary/BoundaryInfo.h"
@@ -47,9 +50,6 @@
 #include "mesh/boundary/BoundarySetup.h"
 #include "mesh/boundary/BoundaryUIDFaceDataSource.h"
 #include "mesh/boundary/ColorToBoundaryMapper.h"
-#include "mesh/distance_octree/DistanceOctree.h"
-#include "mesh/vtk/CommonDataSources.h"
-#include "mesh/vtk/VTKMeshWriter.h"
 
 #include "timeloop/all.h"
 
diff --git a/src/mesh/CMakeLists.txt b/src/mesh/CMakeLists.txt
index b91e3a28bd09ae372d73fe76ce996759b2ffab3d..87241c4af77bca95d4c0d40dc89a2d993a361281 100644
--- a/src/mesh/CMakeLists.txt
+++ b/src/mesh/CMakeLists.txt
@@ -5,6 +5,6 @@
 ###################################################################################################
 
 waLBerla_add_module( DEPENDS blockforest boundary core domain_decomposition
-                             python_coupling field geometry pe stencil vtk BUILD_ONLY_IF_FOUND OpenMesh )
+                             python_coupling field geometry pe stencil ../mesh_common/vtk mesa_pd mesh_common )
 
 ###################################################################################################
diff --git a/src/mesh/MeshConversion.h b/src/mesh/MeshConversion.h
index af2fd73d6dcf2a78a5b39e0c5729597beac5720f..99aba1e6222031d9fcd3b3fa611efbaa58b4e112 100644
--- a/src/mesh/MeshConversion.h
+++ b/src/mesh/MeshConversion.h
@@ -20,8 +20,8 @@
 //======================================================================================================================
 #pragma once
 
-#include "TriangleMeshes.h"
-#include "MatrixVectorOperations.h"
+#include "mesh_common/TriangleMeshes.h"
+#include "mesh_common/MatrixVectorOperations.h"
 
 #include "geometry/mesh/TriangleMesh.h"
 
diff --git a/src/mesh/blockforest/BlockExclusion.h b/src/mesh/blockforest/BlockExclusion.h
index 03c4cadac3596755484dff3603ffe47dfc9ff724..a15acfb85e044447294feea69c2034b917641ab3 100644
--- a/src/mesh/blockforest/BlockExclusion.h
+++ b/src/mesh/blockforest/BlockExclusion.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "mesh/MeshOperations.h"
+#include "mesh_common/MeshOperations.h"
 
 #include "blockforest/SetupBlockForest.h"
 
diff --git a/src/mesh/blockforest/BlockForestInitialization.h b/src/mesh/blockforest/BlockForestInitialization.h
index 1c39d1c2ec8c340e53647e36a20577c131fdbcd4..12e9a2e23b48a694d5d8bc4e650c89e7b943a790 100644
--- a/src/mesh/blockforest/BlockForestInitialization.h
+++ b/src/mesh/blockforest/BlockForestInitialization.h
@@ -22,8 +22,8 @@
 #pragma once
 
 #include "BlockExclusion.h"
-#include "mesh/MeshOperations.h"
-#include "mesh/distance_octree/DistanceOctree.h"
+#include "mesh_common/MeshOperations.h"
+#include "mesh_common/distance_octree/DistanceOctree.h"
 
 #include "blockforest/StructuredBlockForest.h"
 #include "blockforest/SetupBlockForest.h"
diff --git a/src/mesh/blockforest/RefinementSelection.h b/src/mesh/blockforest/RefinementSelection.h
index 1055d203f233f0c0b69780c9f9095d34a4901c66..13bd0a3dbf8f9ab4ed260945274e0d8a8770648b 100644
--- a/src/mesh/blockforest/RefinementSelection.h
+++ b/src/mesh/blockforest/RefinementSelection.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "mesh/MeshOperations.h"
+#include "mesh_common/MeshOperations.h"
 
 #include "blockforest/SetupBlockForest.h"
 #include "blockforest/Types.h"
diff --git a/src/mesh/boundary/BoundaryUIDFaceDataSource.h b/src/mesh/boundary/BoundaryUIDFaceDataSource.h
index cdcbc0182501c57fdee7bc3bffefc00805f8ebdb..e3159c841d11a43ce5ce6b70d42d72b83d9fb7e6 100644
--- a/src/mesh/boundary/BoundaryUIDFaceDataSource.h
+++ b/src/mesh/boundary/BoundaryUIDFaceDataSource.h
@@ -26,7 +26,7 @@
 #include "core/DataTypes.h"
 #include "core/debug/CheckFunctions.h"
 
-#include "mesh/vtk/VTKMeshWriter.h"
+#include "mesh_common/vtk/VTKMeshWriter.h"
 
 namespace walberla {
 namespace mesh {
diff --git a/src/mesh/mesh_module.dox b/src/mesh/mesh_module.dox
index 2c83c8a5091d2a27771f5c512c74e37f61f0548d..830bfc633c4e160aa9d632f07c745927d6b51228 100644
--- a/src/mesh/mesh_module.dox
+++ b/src/mesh/mesh_module.dox
@@ -25,6 +25,19 @@ namespace mesh {
 /**
 \defgroup mesh mesh - surface meshes in waLBerla
 
+\section meshmodulelayout How is the mesh module laid out?
+
+More precisely, the mesh module consists of two modules - the mesh_common module, providing basic mesh support, and the mesh module, which includes
+deep integration of meshes into waLBerla. Both operate in the same "mesh" namespace.
+
+\subsection mesh_common mesh_common - Essentials
+The mesh_common module consists of an OpenMesh wrapper (detailed further down), VTK output, distance octree,
+IO handling, arithmetic operations (i.e. calculation of inertia tensor), and MPI extensions.
+
+\subsection mesh mesh - waLBerla integrations
+To enable the usage of meshes in certain parts of waLBerla, the more waLBerla-specific "mesh" module contains extensions
+for the BlockForest, boundaries, the Physics engine, python and conversion to the waLBerla-own TriangleMesh geometry.
+
 \section meshhandling How are meshes handled in the mesh module?
 
 \subsection openmesh OpenMesh
diff --git a/src/mesh/pe/communication/ConvexPolyhedron.cpp b/src/mesh/pe/communication/ConvexPolyhedron.cpp
index 1709c495f2bdfbb228b2a16f0eaa735344377d54..e7b81879b6f0f09192febdd7ce3a171296ed2710 100644
--- a/src/mesh/pe/communication/ConvexPolyhedron.cpp
+++ b/src/mesh/pe/communication/ConvexPolyhedron.cpp
@@ -23,7 +23,7 @@
 
 #include "core/mpi/BufferDataTypeExtensions.h"
 
-#include "mesh/OpenMeshBufferTypeExtensions.h"
+#include "mesh_common/OpenMeshBufferTypeExtensions.h"
 
 #include "pe/communication/Marshalling.h"
 
diff --git a/src/mesh/pe/raytracing/Intersects.h b/src/mesh/pe/raytracing/Intersects.h
index 52761d65ef6be955d2d505ef6e4e114e2b9fec54..f9c772ff4d7dd10abb78df1cee97ba923e742b44 100644
--- a/src/mesh/pe/raytracing/Intersects.h
+++ b/src/mesh/pe/raytracing/Intersects.h
@@ -20,9 +20,9 @@
 
 #pragma once
 
-#include <mesh/MatrixVectorOperations.h>
+#include <mesh_common/MatrixVectorOperations.h>
 #include <mesh/pe/rigid_body/ConvexPolyhedron.h>
-#include <mesh/TriangleMeshes.h>
+#include <mesh_common/TriangleMeshes.h>
 #include <pe/raytracing/Intersects.h>
 
 namespace walberla {
diff --git a/src/mesh/pe/rigid_body/ConvexPolyhedron.cpp b/src/mesh/pe/rigid_body/ConvexPolyhedron.cpp
index 62ce1d1c5a11125d9af4f939c35a4c2d51b86c8f..ed500565e0281fed065d40c96126e85dfa0c6cb6 100644
--- a/src/mesh/pe/rigid_body/ConvexPolyhedron.cpp
+++ b/src/mesh/pe/rigid_body/ConvexPolyhedron.cpp
@@ -27,8 +27,8 @@
 #include "core/math/Matrix3.h"
 #include "core/debug/Debug.h"
 
-#include "mesh/MeshOperations.h"
-#include "mesh/QHull.h"
+#include "mesh_common/MeshOperations.h"
+#include "mesh_common/QHull.h"
 
 #include "pe/Materials.h"
 
diff --git a/src/mesh/pe/rigid_body/ConvexPolyhedron.h b/src/mesh/pe/rigid_body/ConvexPolyhedron.h
index 10e6f62a7fd629aae1727eb86e1c402753487ae9..fcd74b627b18dae077c55132df54810e4d000b1c 100644
--- a/src/mesh/pe/rigid_body/ConvexPolyhedron.h
+++ b/src/mesh/pe/rigid_body/ConvexPolyhedron.h
@@ -25,7 +25,7 @@
 // Includes
 //*************************************************************************************************
 
-#include "mesh/TriangleMeshes.h"
+#include "mesh_common/TriangleMeshes.h"
 #include "mesh/pe/Types.h"
 
 #include "core/DataTypes.h"
diff --git a/src/mesh/pe/rigid_body/ConvexPolyhedronFactory.cpp b/src/mesh/pe/rigid_body/ConvexPolyhedronFactory.cpp
index 4229a58f11e3a07edee85fbb7ca33c7de3345f17..eb8fdfa7c0402d71b247272320a30782d328f6e2 100644
--- a/src/mesh/pe/rigid_body/ConvexPolyhedronFactory.cpp
+++ b/src/mesh/pe/rigid_body/ConvexPolyhedronFactory.cpp
@@ -27,9 +27,9 @@
 #include "core/debug/Debug.h"
 
 #include "mesh/pe/rigid_body/ConvexPolyhedron.h"
-#include "mesh/MeshOperations.h"
-#include "mesh/QHull.h"
-#include "mesh/TriangleMeshes.h"
+#include "mesh_common/MeshOperations.h"
+#include "mesh_common/QHull.h"
+#include "mesh_common/TriangleMeshes.h"
 
 
 #include <vector>
diff --git a/src/mesh/pe/tesselation/Box.h b/src/mesh/pe/tesselation/Box.h
index 242e52a925f6308bb7f28d9892bbdaa3f15c8f42..1ac2182e4ccb71a729c67407c8c665eda989eb66 100644
--- a/src/mesh/pe/tesselation/Box.h
+++ b/src/mesh/pe/tesselation/Box.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "mesh/MatrixVectorOperations.h"
+#include "mesh_common/MatrixVectorOperations.h"
 
 #include "pe/rigidbody/Box.h"
 
diff --git a/src/mesh/pe/tesselation/ConvexPolyhedron.h b/src/mesh/pe/tesselation/ConvexPolyhedron.h
index 1d8a44b97ce4c5c6fef8d795a7de11abd4e21de4..347eebbbafbe65e19d589cd170dbbdc8a7abeb3f 100644
--- a/src/mesh/pe/tesselation/ConvexPolyhedron.h
+++ b/src/mesh/pe/tesselation/ConvexPolyhedron.h
@@ -22,8 +22,8 @@
 #pragma once
 
 #include "mesh/pe/rigid_body/ConvexPolyhedron.h"
-#include "mesh/MatrixVectorOperations.h"
-#include "mesh/TriangleMeshes.h"
+#include "mesh_common/MatrixVectorOperations.h"
+#include "mesh_common/TriangleMeshes.h"
 
 namespace walberla {
 namespace mesh {
diff --git a/src/mesh/pe/vtk/CommonDataSources.h b/src/mesh/pe/vtk/CommonDataSources.h
index bf86f2cddcde9b3283cf454cab882896212f0c42..0cdb62a23ec882c6b2dc4706b093da976a38e203 100644
--- a/src/mesh/pe/vtk/CommonDataSources.h
+++ b/src/mesh/pe/vtk/CommonDataSources.h
@@ -26,7 +26,7 @@
 #include "core/debug/CheckFunctions.h"
 #include "core/mpi/MPIManager.h"
 
-#include "mesh/MatrixVectorOperations.h"
+#include "mesh_common/MatrixVectorOperations.h"
 
 #include <OpenMesh/Core/Mesh/Status.hh>
 
diff --git a/src/mesh/pe/vtk/PeVTKMeshWriter.h b/src/mesh/pe/vtk/PeVTKMeshWriter.h
index 72685c362bbd486418b9edd1002db50347f1c712..9c414c8b9610e0a767d4ca0fc02ff94c3ad483d7 100644
--- a/src/mesh/pe/vtk/PeVTKMeshWriter.h
+++ b/src/mesh/pe/vtk/PeVTKMeshWriter.h
@@ -25,8 +25,8 @@
 
 #include "domain_decomposition/BlockStorage.h"
 
-#include "mesh/vtk/DistributedVTKMeshWriter.h"
-#include "mesh/vtk/CommonDataSources.h"
+#include "mesh_common/vtk/DistributedVTKMeshWriter.h"
+#include "mesh_common/vtk/CommonDataSources.h"
 
 #include "pe/rigidbody/BodyStorage.h"
 #include "pe/rigidbody/RigidBody.h"
diff --git a/src/mesh/python/Exports.impl.h b/src/mesh/python/Exports.impl.h
index 7b1fcba05e116a55c4f3b15d66b39d806c315b44..4c68eb8505252f9420e6fa3e5df9de8e8ed1571f 100644
--- a/src/mesh/python/Exports.impl.h
+++ b/src/mesh/python/Exports.impl.h
@@ -44,14 +44,14 @@
 #  pragma warning( pop )
 #endif
 
-#include "mesh/MeshIO.h"
-#include "mesh/distance_octree/DistanceOctree.h"
-#include "mesh/DistanceComputations.h"
-#include "mesh/DistanceFunction.h"
-#include "mesh/MeshOperations.h"
-#include "mesh/TriangleMeshes.h"
+#include "mesh_common/MeshIO.h"
+#include "mesh_common/distance_octree/DistanceOctree.h"
+#include "mesh_common/DistanceComputations.h"
+#include "mesh_common/DistanceFunction.h"
+#include "mesh_common/MeshOperations.h"
+#include "mesh_common/TriangleMeshes.h"
 #include "mesh/boundary/BoundarySetup.h"
-#include "mesh/vtk/VTKMeshWriter.h"
+#include "mesh_common/vtk/VTKMeshWriter.h"
 
 using namespace boost::python;
 
diff --git a/src/mesh_common/CMakeLists.txt b/src/mesh_common/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..de3b9e33c2fc793fb0d68066aa4ff93a61376371
--- /dev/null
+++ b/src/mesh_common/CMakeLists.txt
@@ -0,0 +1,9 @@
+###################################################################################################
+#
+# Module mesh_common
+#
+###################################################################################################
+
+waLBerla_add_module( DEPENDS core vtk BUILD_ONLY_IF_FOUND OpenMesh )
+
+###################################################################################################
diff --git a/src/mesh/DistanceComputations.h b/src/mesh_common/DistanceComputations.h
similarity index 99%
rename from src/mesh/DistanceComputations.h
rename to src/mesh_common/DistanceComputations.h
index 6df23c07839cc6a5b842b07350349d0be6883052..997546f1e7836fc81e56092e5aef20ac86b44d29 100644
--- a/src/mesh/DistanceComputations.h
+++ b/src/mesh_common/DistanceComputations.h
@@ -26,8 +26,8 @@
 #include "core/math/GenericAABB.h"
 #include "core/math/Matrix3.h"
 
-#include "mesh/MatrixVectorOperations.h"
-#include "mesh/TriangleMeshes.h"
+#include "mesh_common/MatrixVectorOperations.h"
+#include "mesh_common/TriangleMeshes.h"
 
 #include <OpenMesh/Core/Utils/PropertyManager.hh>
 
@@ -200,8 +200,8 @@ protected:
 template< typename MeshType >
 void TriangleDistance<MeshType>::computeNormals()
 {
-   // J. Bærentzen and H. Aanæs. Signed distance computation using the angle weighted pseudonormal.
-   // Visualization and Computer Graphics, IEEE Transactions on, 11(3):243–253, 2005.
+   // J. B�rentzen and H. Aan�s. Signed distance computation using the angle weighted pseudonormal.
+   // Visualization and Computer Graphics, IEEE Transactions on, 11(3):243�253, 2005.
 
    static_assert( MeshType::IsTriMesh == 1, "computeNormals only works with triangular meshes!" );
 
diff --git a/src/mesh/DistanceFunction.h b/src/mesh_common/DistanceFunction.h
similarity index 97%
rename from src/mesh/DistanceFunction.h
rename to src/mesh_common/DistanceFunction.h
index 3ad98451cd728b6086370583132a42574db7149b..86691cdf408cf90fb833b61ca170c5ff6f0a6dab 100644
--- a/src/mesh/DistanceFunction.h
+++ b/src/mesh_common/DistanceFunction.h
@@ -21,7 +21,7 @@
 //======================================================================================================================
 
 #include "core/math/Vector3.h"
-#include "mesh/MatrixVectorOperations.h"
+#include "mesh_common/MatrixVectorOperations.h"
 
 namespace walberla {
 
diff --git a/src/mesh/MatrixVectorOperations.h b/src/mesh_common/MatrixVectorOperations.h
similarity index 100%
rename from src/mesh/MatrixVectorOperations.h
rename to src/mesh_common/MatrixVectorOperations.h
diff --git a/src/mesh/MeshIO.h b/src/mesh_common/MeshIO.h
similarity index 100%
rename from src/mesh/MeshIO.h
rename to src/mesh_common/MeshIO.h
diff --git a/src/mesh/MeshOperations.h b/src/mesh_common/MeshOperations.h
similarity index 99%
rename from src/mesh/MeshOperations.h
rename to src/mesh_common/MeshOperations.h
index 03a00f219d1f4ae325ed8094c956c26545495a30..d659d0d48a3b9a8b3a9a454861b8be2855f49381 100644
--- a/src/mesh/MeshOperations.h
+++ b/src/mesh_common/MeshOperations.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #include "MatrixVectorOperations.h"
-#include "TriangleMeshes.h"
+#include "mesh_common/TriangleMeshes.h"
 
 #include "core/math/GenericAABB.h"
 #include "core/Optional.h"
diff --git a/src/mesh/OpenMeshBufferTypeExtensions.h b/src/mesh_common/OpenMeshBufferTypeExtensions.h
similarity index 100%
rename from src/mesh/OpenMeshBufferTypeExtensions.h
rename to src/mesh_common/OpenMeshBufferTypeExtensions.h
diff --git a/src/mesh/PolyMeshes.h b/src/mesh_common/PolyMeshes.h
similarity index 97%
rename from src/mesh/PolyMeshes.h
rename to src/mesh_common/PolyMeshes.h
index 414320e32ae5c7fa67a337e632428324304840d8..dc2e1f3f7abb8b7c9891be2083f58c0f7d29215f 100644
--- a/src/mesh/PolyMeshes.h
+++ b/src/mesh_common/PolyMeshes.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "TriangleMeshes.h"
+#include "mesh_common/TriangleMeshes.h"
 
 #include <OpenMesh/Core/Mesh/PolyMesh_ArrayKernelT.hh>
 
diff --git a/src/mesh/QHull.h b/src/mesh_common/QHull.h
similarity index 98%
rename from src/mesh/QHull.h
rename to src/mesh_common/QHull.h
index 81c4d0b098e8a7f9549fc5d612b81dcbac13662b..160d3e8a01ae304138dfee39e2da58656af2c73a 100644
--- a/src/mesh/QHull.h
+++ b/src/mesh_common/QHull.h
@@ -24,10 +24,10 @@
 #include "core/DataTypes.h"
 #include "core/math/Vector3.h"
 
-#include "mesh/TriangleMeshes.h"
-#include "mesh/MatrixVectorOperations.h"
-#include "mesh/vtk/VTKMeshWriter.h"
-#include "mesh/vtk/CommonDataSources.h"
+#include "mesh_common/TriangleMeshes.h"
+#include "mesh_common/MatrixVectorOperations.h"
+#include "mesh_common/vtk/VTKMeshWriter.h"
+#include "mesh_common/vtk/CommonDataSources.h"
 
 #include "vtk/VTKOutput.h"
 #include "vtk/PointDataSource.h"
diff --git a/src/mesh/TriangleMeshes.h b/src/mesh_common/TriangleMeshes.h
similarity index 100%
rename from src/mesh/TriangleMeshes.h
rename to src/mesh_common/TriangleMeshes.h
diff --git a/src/mesh/distance_octree/BranchNode.h b/src/mesh_common/distance_octree/BranchNode.h
similarity index 99%
rename from src/mesh/distance_octree/BranchNode.h
rename to src/mesh_common/distance_octree/BranchNode.h
index 90004dd7303bcc694940b0e8bfec6d3efde3e0f9..cf2c2b1920504e7823bc33e5728a3dd087e51f9d 100644
--- a/src/mesh/distance_octree/BranchNode.h
+++ b/src/mesh_common/distance_octree/BranchNode.h
@@ -25,9 +25,9 @@
 
 #include "core/debug/Debug.h"
 
-#include "mesh/DistanceComputations.h"
-#include "mesh/MatrixVectorOperations.h"
-#include "mesh/MeshOperations.h"
+#include "mesh_common/DistanceComputations.h"
+#include "mesh_common/MatrixVectorOperations.h"
+#include "mesh_common/MeshOperations.h"
 
 #include <algorithm>
 #include <iterator>
diff --git a/src/mesh/distance_octree/DistanceOctree.h b/src/mesh_common/distance_octree/DistanceOctree.h
similarity index 99%
rename from src/mesh/distance_octree/DistanceOctree.h
rename to src/mesh_common/distance_octree/DistanceOctree.h
index 4a0a8fd6d56561243fd3fbadf68cb513aa53c43f..2c34b9c6c620e76b84568f710367459f20286809 100644
--- a/src/mesh/distance_octree/DistanceOctree.h
+++ b/src/mesh_common/distance_octree/DistanceOctree.h
@@ -25,7 +25,7 @@
 #include "LeafNode.h"
 #include "BranchNode.h"
 
-#include "mesh/DistanceComputations.h"
+#include "mesh_common/DistanceComputations.h"
 
 #include "core/DataTypes.h"
 #include "core/Abort.h"
diff --git a/src/mesh/distance_octree/LeafNode.h b/src/mesh_common/distance_octree/LeafNode.h
similarity index 99%
rename from src/mesh/distance_octree/LeafNode.h
rename to src/mesh_common/distance_octree/LeafNode.h
index fc18d25673ebe866308c6df5496ad55ecd7482cd..c5a65277501cffdc79422ee6eed6ec2a3ffbe222 100644
--- a/src/mesh/distance_octree/LeafNode.h
+++ b/src/mesh_common/distance_octree/LeafNode.h
@@ -23,7 +23,7 @@
 
 #include "Node.h"
 
-#include "mesh/DistanceComputations.h"
+#include "mesh_common/DistanceComputations.h"
 
 namespace walberla {
 namespace mesh {
diff --git a/src/mesh/distance_octree/Node.h b/src/mesh_common/distance_octree/Node.h
similarity index 98%
rename from src/mesh/distance_octree/Node.h
rename to src/mesh_common/distance_octree/Node.h
index 6a7b918dab3493cdf895e9cfec56bdf93fbb63d8..5ba5f4ee00b638b70cedb6887591e6f6bcca9c51 100644
--- a/src/mesh/distance_octree/Node.h
+++ b/src/mesh_common/distance_octree/Node.h
@@ -23,7 +23,7 @@
 
 #include "core/math/GenericAABB.h"
 
-#include "mesh/MeshOperations.h"
+#include "mesh_common/MeshOperations.h"
 
 namespace walberla {
 namespace mesh {
diff --git a/src/mesh/vtk/CommonDataSources.h b/src/mesh_common/vtk/CommonDataSources.h
similarity index 100%
rename from src/mesh/vtk/CommonDataSources.h
rename to src/mesh_common/vtk/CommonDataSources.h
diff --git a/src/mesh/vtk/CommonFilters.h b/src/mesh_common/vtk/CommonFilters.h
similarity index 100%
rename from src/mesh/vtk/CommonFilters.h
rename to src/mesh_common/vtk/CommonFilters.h
diff --git a/src/mesh/vtk/DistributedVTKMeshWriter.h b/src/mesh_common/vtk/DistributedVTKMeshWriter.h
similarity index 100%
rename from src/mesh/vtk/DistributedVTKMeshWriter.h
rename to src/mesh_common/vtk/DistributedVTKMeshWriter.h
diff --git a/src/mesh/vtk/VTKMeshWriter.h b/src/mesh_common/vtk/VTKMeshWriter.h
similarity index 99%
rename from src/mesh/vtk/VTKMeshWriter.h
rename to src/mesh_common/vtk/VTKMeshWriter.h
index 129c456a1696a408484a67fb6b26a6933bfa6c6a..1cbac3eed354218aaef69cf9882647a9e19cde69 100644
--- a/src/mesh/vtk/VTKMeshWriter.h
+++ b/src/mesh_common/vtk/VTKMeshWriter.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "mesh/MeshOperations.h"
+#include "mesh_common/MeshOperations.h"
 
 #include "core/math/Vector3.h"
 #include "core/mpi/MPIManager.h"
diff --git a/tests/mesh/DistributedMeshVTKTest.cpp b/tests/mesh/DistributedMeshVTKTest.cpp
index e69aad05e39b930621e96cad07bb49090316f724..ac3e1cc28375765f96909de422794b5e65e70a1b 100644
--- a/tests/mesh/DistributedMeshVTKTest.cpp
+++ b/tests/mesh/DistributedMeshVTKTest.cpp
@@ -23,12 +23,12 @@
 #include "core/logging/Logging.h"
 #include "core/mpi/Environment.h"
 
-#include "mesh/TriangleMeshes.h"
-#include "mesh/MeshOperations.h"
-#include "mesh/MeshIO.h"
-#include "mesh/vtk/DistributedVTKMeshWriter.h"
-#include "mesh/vtk/CommonDataSources.h"
-#include "mesh/vtk/CommonFilters.h"
+#include "mesh_common/TriangleMeshes.h"
+#include "mesh_common/MeshOperations.h"
+#include "mesh_common/MeshIO.h"
+#include "mesh_common/vtk/DistributedVTKMeshWriter.h"
+#include "mesh_common/vtk/CommonDataSources.h"
+#include "mesh_common/vtk/CommonFilters.h"
 
 
 namespace walberla {
diff --git a/tests/mesh/MatrixVectorOperationsTest.cpp b/tests/mesh/MatrixVectorOperationsTest.cpp
index 6c9ae6977aaf242ea4197246c4c8904ab6715651..d7b7ced1c7abeb966dbc6fbf774c4fddafb1cb9b 100644
--- a/tests/mesh/MatrixVectorOperationsTest.cpp
+++ b/tests/mesh/MatrixVectorOperationsTest.cpp
@@ -22,7 +22,7 @@
 #include "core/debug/TestSubsystem.h"
 #include "core/mpi/Environment.h"
 
-#include "mesh/MatrixVectorOperations.h"
+#include "mesh_common/MatrixVectorOperations.h"
 
 namespace walberla {
 namespace mesh {
diff --git a/tests/mesh/MeshAABBIntersectionTest.cpp b/tests/mesh/MeshAABBIntersectionTest.cpp
index 2ae15e994d701342dd0887c2475d8627ecfdf6d6..45f38ecc66a5beb721cf72312b500f8b97350a94 100644
--- a/tests/mesh/MeshAABBIntersectionTest.cpp
+++ b/tests/mesh/MeshAABBIntersectionTest.cpp
@@ -25,10 +25,10 @@
 #include "core/mpi/Environment.h"
 #include "core/Optional.h"
 
-#include "mesh/MeshIO.h"
-#include "mesh/MeshOperations.h"
-#include "mesh/DistanceComputations.h"
-#include "mesh/TriangleMeshes.h"
+#include "mesh_common/MeshIO.h"
+#include "mesh_common/MeshOperations.h"
+#include "mesh_common/DistanceComputations.h"
+#include "mesh_common/TriangleMeshes.h"
 
 #include <random>
 
diff --git a/tests/mesh/MeshAABBSelectionTest.cpp b/tests/mesh/MeshAABBSelectionTest.cpp
index df5b67b5343964f17da3d5c771227029b2e68aca..94bdad9a2e27f6ada67c9c7d839c397943bab322 100644
--- a/tests/mesh/MeshAABBSelectionTest.cpp
+++ b/tests/mesh/MeshAABBSelectionTest.cpp
@@ -26,10 +26,10 @@
 #include "geometry/mesh/TriangleMesh.h"
 #include "geometry/mesh/TriangleMeshIO.h"
 
-#include "mesh/TriangleMeshes.h"
-#include "mesh/DistanceComputations.h"
-#include "mesh/MeshIO.h"
-#include "mesh/MeshOperations.h"
+#include "mesh_common/TriangleMeshes.h"
+#include "mesh_common/DistanceComputations.h"
+#include "mesh_common/MeshIO.h"
+#include "mesh_common/MeshOperations.h"
 
 #include <random>
 
diff --git a/tests/mesh/MeshBlockExclusionTest.cpp b/tests/mesh/MeshBlockExclusionTest.cpp
index 996fdb877a20c6855f50f557426f72df73f39bf2..d3cb21efb9ec2a03c051d369d398d5c76d958c07 100644
--- a/tests/mesh/MeshBlockExclusionTest.cpp
+++ b/tests/mesh/MeshBlockExclusionTest.cpp
@@ -30,14 +30,14 @@
 #include "geometry/mesh/TriangleMesh.h"
 #include "geometry/mesh/TriangleMeshIO.h"
 
-#include "mesh/TriangleMeshes.h"
-#include "mesh/MeshOperations.h"
-#include "mesh/DistanceComputations.h"
-#include "mesh/MeshIO.h"
+#include "mesh_common/TriangleMeshes.h"
+#include "mesh_common/MeshOperations.h"
+#include "mesh_common/DistanceComputations.h"
+#include "mesh_common/MeshIO.h"
 
 #include "mesh/blockforest/BlockExclusion.h"
 
-#include "mesh/distance_octree/DistanceOctree.h"
+#include "mesh_common/distance_octree/DistanceOctree.h"
 
 #include <vector>
 #include <string>
diff --git a/tests/mesh/MeshContainmentOctreeTest.cpp b/tests/mesh/MeshContainmentOctreeTest.cpp
index 40f542ddbfa20cc3afae192c5b70e9f875938af6..ff656b25a2b2c428581c4454836058cd0ff8b060 100644
--- a/tests/mesh/MeshContainmentOctreeTest.cpp
+++ b/tests/mesh/MeshContainmentOctreeTest.cpp
@@ -27,13 +27,13 @@
 #include "geometry/mesh/TriangleMesh.h"
 #include "geometry/mesh/TriangleMeshIO.h"
 
-#include "mesh/TriangleMeshes.h"
-#include "mesh/MeshOperations.h"
-#include "mesh/DistanceComputations.h"
-#include "mesh/MeshIO.h"
-#include "mesh/distance_octree/DistanceOctree.h"
-#include "mesh/vtk/VTKMeshWriter.h"
-#include "mesh/vtk/CommonDataSources.h"
+#include "mesh_common/TriangleMeshes.h"
+#include "mesh_common/MeshOperations.h"
+#include "mesh_common/DistanceComputations.h"
+#include "mesh_common/MeshIO.h"
+#include "mesh_common/distance_octree/DistanceOctree.h"
+#include "mesh_common/vtk/VTKMeshWriter.h"
+#include "mesh_common/vtk/CommonDataSources.h"
 
 #include <random>
 
diff --git a/tests/mesh/MeshConversionTest.cpp b/tests/mesh/MeshConversionTest.cpp
index 718f46f75d64ce0e2880cb1bf625266f3d2079f0..38f0bcca145f2bd7ecb2f269e96acac8381bdeba 100644
--- a/tests/mesh/MeshConversionTest.cpp
+++ b/tests/mesh/MeshConversionTest.cpp
@@ -26,7 +26,7 @@
 #include "geometry/mesh/TriangleMeshIO.h"
 
 #include "mesh/MeshConversion.h"
-#include "mesh/MeshIO.h"
+#include "mesh_common/MeshIO.h"
 
 namespace walberla {
 namespace mesh {
diff --git a/tests/mesh/MeshDistanceCompareTest.cpp b/tests/mesh/MeshDistanceCompareTest.cpp
index 4067a28e853b3e24ca8f6b84bff7883e013e635e..d565f87ca427f6a554975efc3547744825fb373e 100644
--- a/tests/mesh/MeshDistanceCompareTest.cpp
+++ b/tests/mesh/MeshDistanceCompareTest.cpp
@@ -27,10 +27,10 @@
 #include "geometry/mesh/TriangleMesh.h"
 #include "geometry/mesh/TriangleMeshIO.h"
 
-#include "mesh/TriangleMeshes.h"
-#include "mesh/MeshOperations.h"
-#include "mesh/DistanceComputations.h"
-#include "mesh/MeshIO.h"
+#include "mesh_common/TriangleMeshes.h"
+#include "mesh_common/MeshOperations.h"
+#include "mesh_common/DistanceComputations.h"
+#include "mesh_common/MeshIO.h"
 
 #include <random>
 
diff --git a/tests/mesh/MeshDistanceOctreeTest.cpp b/tests/mesh/MeshDistanceOctreeTest.cpp
index 3d849c3f6b71909f9f30dd60a748ba03d26e4c25..00e597fafec090b1f70a6b661954af8db62e453e 100644
--- a/tests/mesh/MeshDistanceOctreeTest.cpp
+++ b/tests/mesh/MeshDistanceOctreeTest.cpp
@@ -26,11 +26,11 @@
 #include "geometry/mesh/TriangleMesh.h"
 #include "geometry/mesh/TriangleMeshIO.h"
 
-#include "mesh/TriangleMeshes.h"
-#include "mesh/MeshOperations.h"
-#include "mesh/DistanceComputations.h"
-#include "mesh/distance_octree/DistanceOctree.h"
-#include "mesh/MeshIO.h"
+#include "mesh_common/TriangleMeshes.h"
+#include "mesh_common/MeshOperations.h"
+#include "mesh_common/DistanceComputations.h"
+#include "mesh_common/distance_octree/DistanceOctree.h"
+#include "mesh_common/MeshIO.h"
 
 #include <random>
 
diff --git a/tests/mesh/MeshDistancePlausibilityTest.cpp b/tests/mesh/MeshDistancePlausibilityTest.cpp
index e0fd1a276206c92c007119ea12c8a098bfe89502..8b7ccb5858d9a488ceb82e09026ee357c87f1001 100644
--- a/tests/mesh/MeshDistancePlausibilityTest.cpp
+++ b/tests/mesh/MeshDistancePlausibilityTest.cpp
@@ -33,14 +33,14 @@
 #include "geometry/mesh/TriangleMesh.h"
 #include "geometry/mesh/TriangleMeshIO.h"
 
-#include "mesh/TriangleMeshes.h"
-#include "mesh/MeshOperations.h"
-#include "mesh/DistanceComputations.h"
-#include "mesh/distance_octree/DistanceOctree.h"
-#include "mesh/MeshIO.h"
-#include "mesh/vtk/VTKMeshWriter.h"
-#include "mesh/vtk/CommonDataSources.h"
-#include "mesh/vtk/CommonFilters.h"
+#include "mesh_common/TriangleMeshes.h"
+#include "mesh_common/MeshOperations.h"
+#include "mesh_common/DistanceComputations.h"
+#include "mesh_common/distance_octree/DistanceOctree.h"
+#include "mesh_common/MeshIO.h"
+#include "mesh_common/vtk/VTKMeshWriter.h"
+#include "mesh_common/vtk/CommonDataSources.h"
+#include "mesh_common/vtk/CommonFilters.h"
 
 #include "stencil/D3Q27.h"
 
diff --git a/tests/mesh/MeshInitilizationTest.cpp b/tests/mesh/MeshInitilizationTest.cpp
index 7deeee2530e65abefb69440fe0c80e79d347e1c2..e3460d3ce38d65c89a29df0c164a647d6deab602 100644
--- a/tests/mesh/MeshInitilizationTest.cpp
+++ b/tests/mesh/MeshInitilizationTest.cpp
@@ -31,17 +31,17 @@
 #include "geometry/mesh/TriangleMesh.h"
 #include "geometry/mesh/TriangleMeshIO.h"
 
-#include "mesh/TriangleMeshes.h"
-#include "mesh/MeshOperations.h"
-#include "mesh/DistanceComputations.h"
-#include "mesh/MeshIO.h"
+#include "mesh_common/TriangleMeshes.h"
+#include "mesh_common/MeshOperations.h"
+#include "mesh_common/DistanceComputations.h"
+#include "mesh_common/MeshIO.h"
 #include "mesh/blockforest/BlockForestInitialization.h"
 #include "mesh/blockforest/BlockWorkloadMemory.h"
 #include "mesh/blockforest/BlockExclusion.h"
 #include "mesh/blockforest/RefinementSelection.h"
 
 
-#include "mesh/distance_octree/DistanceOctree.h"
+#include "mesh_common/distance_octree/DistanceOctree.h"
 
 #include <cmath>
 #include <vector>
diff --git a/tests/mesh/MeshMarshalling.cpp b/tests/mesh/MeshMarshalling.cpp
index cc62c6a6325025599493cfbc88291bc58ec704e1..53977eb965c1f288fa5d22da77ec8e94654516a6 100644
--- a/tests/mesh/MeshMarshalling.cpp
+++ b/tests/mesh/MeshMarshalling.cpp
@@ -22,8 +22,8 @@
 
 #include "mesh/pe/rigid_body/ConvexPolyhedron.h"
 #include "mesh/pe/rigid_body/ConvexPolyhedronFactory.h"
-#include "mesh/TriangleMeshes.h"
-#include "mesh/QHull.h"
+#include "mesh_common/TriangleMeshes.h"
+#include "mesh_common/QHull.h"
 #include "mesh/pe/Types.h"
 #include "pe/rigidbody/Squirmer.h"
 #include "pe/rigidbody/UnionFactory.h"
diff --git a/tests/mesh/MeshOperationsTest.cpp b/tests/mesh/MeshOperationsTest.cpp
index 91af5d0bf97f4139958dbab6adc10def7b48e743..6cceae10e9a75ee79a88aa3b2b80737df68a3d94 100644
--- a/tests/mesh/MeshOperationsTest.cpp
+++ b/tests/mesh/MeshOperationsTest.cpp
@@ -31,11 +31,11 @@
 #include "geometry/mesh/TriangleMesh.h"
 #include "geometry/mesh/TriangleMeshIO.h"
 
-#include "mesh/MeshOperations.h"
-#include "mesh/TriangleMeshes.h"
-#include "mesh/DistanceComputations.h"
-#include "mesh/MeshIO.h"
-#include "mesh/distance_octree/DistanceOctree.h"
+#include "mesh_common/MeshOperations.h"
+#include "mesh_common/TriangleMeshes.h"
+#include "mesh_common/DistanceComputations.h"
+#include "mesh_common/MeshIO.h"
+#include "mesh_common/distance_octree/DistanceOctree.h"
 
 
 namespace walberla {
diff --git a/tests/mesh/MeshPeRaytracing.cpp b/tests/mesh/MeshPeRaytracing.cpp
index 038c78a34cbfb0f9b6d405851ecc020c18dc8563..e1cdc6598fb22d30d1ec47e6f79a1abda75fc659 100644
--- a/tests/mesh/MeshPeRaytracing.cpp
+++ b/tests/mesh/MeshPeRaytracing.cpp
@@ -26,7 +26,7 @@
 #include <core/math/Vector3.h>
 #include <mesh/pe/raytracing/Intersects.h>
 #include <mesh/pe/rigid_body/ConvexPolyhedron.h>
-#include <mesh/QHull.h>
+#include <mesh_common/QHull.h>
 #include <pe/Materials.h>
 #include <pe/raytracing/Intersects.h>
 #include <pe/rigidbody/Box.h>
diff --git a/tests/mesh/MeshVTKTest.cpp b/tests/mesh/MeshVTKTest.cpp
index ce69aa0dfac5600ea5680ff26e3da9422bf4a665..c602adc9d29728b6a5404d03081f484e2c24e0c9 100644
--- a/tests/mesh/MeshVTKTest.cpp
+++ b/tests/mesh/MeshVTKTest.cpp
@@ -23,12 +23,12 @@
 #include "core/logging/Logging.h"
 #include "core/mpi/Environment.h"
 
-#include "mesh/TriangleMeshes.h"
-#include "mesh/MeshOperations.h"
-#include "mesh/MeshIO.h"
-#include "mesh/vtk/VTKMeshWriter.h"
-#include "mesh/vtk/CommonDataSources.h"
-#include "mesh/vtk/CommonFilters.h"
+#include "mesh_common/TriangleMeshes.h"
+#include "mesh_common/MeshOperations.h"
+#include "mesh_common/MeshIO.h"
+#include "mesh_common/vtk/VTKMeshWriter.h"
+#include "mesh_common/vtk/CommonDataSources.h"
+#include "mesh_common/vtk/CommonFilters.h"
 
 #include <vector>
 #include <string>
diff --git a/tests/mesh/NumericIntegrationTest.cpp b/tests/mesh/NumericIntegrationTest.cpp
index fe706b7439a48900da9436c56e239febbf9e801d..7f393ee0c90666125a705eef36e6d8b3314bcaba 100644
--- a/tests/mesh/NumericIntegrationTest.cpp
+++ b/tests/mesh/NumericIntegrationTest.cpp
@@ -31,11 +31,11 @@
 #include "geometry/mesh/TriangleMesh.h"
 #include "geometry/mesh/TriangleMeshIO.h"
 
-#include "mesh/MeshOperations.h"
-#include "mesh/TriangleMeshes.h"
-#include "mesh/DistanceComputations.h"
-#include "mesh/MeshIO.h"
-#include "mesh/distance_octree/DistanceOctree.h"
+#include "mesh_common/MeshOperations.h"
+#include "mesh_common/TriangleMeshes.h"
+#include "mesh_common/DistanceComputations.h"
+#include "mesh_common/MeshIO.h"
+#include "mesh_common/distance_octree/DistanceOctree.h"
 
 
 namespace walberla {
diff --git a/tests/mesh/OpenMeshBufferTypeExtensionsTest.cpp b/tests/mesh/OpenMeshBufferTypeExtensionsTest.cpp
index 69bde20ba8724745fe79fd96f661f83424a95798..06b9b25e8616855df40598849751d1b6e58cd379 100644
--- a/tests/mesh/OpenMeshBufferTypeExtensionsTest.cpp
+++ b/tests/mesh/OpenMeshBufferTypeExtensionsTest.cpp
@@ -24,7 +24,7 @@
 #include "core/mpi/SendBuffer.h"
 #include "core/mpi/RecvBuffer.h"
 
-#include "mesh/OpenMeshBufferTypeExtensions.h"
+#include "mesh_common/OpenMeshBufferTypeExtensions.h"
 
 #include <OpenMesh/Core/Mesh/Handles.hh>
 #include <OpenMesh/Core/Geometry/VectorT.hh>
diff --git a/tests/mesh/PeVTKMeshWriterTest.cpp b/tests/mesh/PeVTKMeshWriterTest.cpp
index 7e7b26e13360f9917b15701bd6b55e1ae8709fb3..07a288a53db005e2257da1d74cca977b68807bed 100644
--- a/tests/mesh/PeVTKMeshWriterTest.cpp
+++ b/tests/mesh/PeVTKMeshWriterTest.cpp
@@ -29,7 +29,7 @@
 #include <mesh/pe/DefaultTesselation.h>
 #include <mesh/pe/rigid_body/ConvexPolyhedronFactory.h>
 #include <mesh/pe/communication/ConvexPolyhedron.h>
-#include <mesh/PolyMeshes.h>
+#include <mesh_common/PolyMeshes.h>
 
 #include <blockforest/Initialization.h>
 #include <core/Abort.h>
diff --git a/tests/mesh/QHullTest.cpp b/tests/mesh/QHullTest.cpp
index 5e17b97e844d3b0523c52c410e6649134ac6b7c8..f78677d80741f9c4bc87bada4d66e77afc57b09f 100644
--- a/tests/mesh/QHullTest.cpp
+++ b/tests/mesh/QHullTest.cpp
@@ -26,10 +26,10 @@
 #include "core/math/Constants.h"
 #include "core/math/Utility.h"
 
-#include "mesh/TriangleMeshes.h"
-#include "mesh/QHull.h"
-#include "mesh/vtk/VTKMeshWriter.h"
-#include "mesh/vtk/CommonDataSources.h"
+#include "mesh_common/TriangleMeshes.h"
+#include "mesh_common/QHull.h"
+#include "mesh_common/vtk/VTKMeshWriter.h"
+#include "mesh_common/vtk/CommonDataSources.h"
 
 #include "vtk/VTKOutput.h"
 #include "vtk/PointDataSource.h"