diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index d58a27f7ae37a7b52333f9edd121a26b55890c80..edd6b51add4cb43a8ce6131984e08c8887b79af0 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -666,6 +666,7 @@ $(mapPolyMesh)/mapDistribute/mapDistribute.C
 $(mapPolyMesh)/mapDistribute/mapDistributeBase.C
 $(mapPolyMesh)/mapDistribute/mapDistributePolyMesh.C
 $(mapPolyMesh)/mapDistribute/IOmapDistribute.C
+$(mapPolyMesh)/mapDistribute/IOmapDistributePolyMesh.C
 $(mapPolyMesh)/mapAddedPolyMesh.C
 
 PrimitivePatch = $(primitiveMesh)/PrimitivePatch
diff --git a/src/dynamicMesh/fvMeshDistribute/IOmapDistributePolyMesh.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/IOmapDistributePolyMesh.C
similarity index 100%
rename from src/dynamicMesh/fvMeshDistribute/IOmapDistributePolyMesh.C
rename to src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/IOmapDistributePolyMesh.C
diff --git a/src/dynamicMesh/fvMeshDistribute/IOmapDistributePolyMesh.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/IOmapDistributePolyMesh.H
similarity index 100%
rename from src/dynamicMesh/fvMeshDistribute/IOmapDistributePolyMesh.H
rename to src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/IOmapDistributePolyMesh.H
diff --git a/src/dynamicMesh/Make/files b/src/dynamicMesh/Make/files
index eedcd7fe8c788ea354289b3cda7208d8b2e5debf..8a5112229837739e42b841bfcf07434969320028 100644
--- a/src/dynamicMesh/Make/files
+++ b/src/dynamicMesh/Make/files
@@ -81,7 +81,6 @@ polyTopoChange/repatchPolyTopoChanger/repatchPolyTopoChanger.C
 
 fvMeshAdder/fvMeshAdder.C
 fvMeshDistribute/fvMeshDistribute.C
-fvMeshDistribute/IOmapDistributePolyMesh.C
 polyMeshAdder/faceCoupleInfo.C
 polyMeshAdder/polyMeshAdder.C
 
diff --git a/src/fvMotionSolver/Make/files b/src/fvMotionSolver/Make/files
index f9ba08367cce68fc86f94e43305b28202815d0a1..426e49f6b6c3feb75eedb70739a76026fa4b4dea 100644
--- a/src/fvMotionSolver/Make/files
+++ b/src/fvMotionSolver/Make/files
@@ -37,12 +37,10 @@ $(derivedPoint)/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorF
 $(derivedPoint)/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C
 $(derivedPoint)/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
 $(derivedPoint)/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
-$(derivedPoint)/uniformFixedValue/uniformFixedValuePointPatchFields.C
 $(derivedPoint)/waveDisplacement/waveDisplacementPointPatchVectorField.C
 
 $(derivedPoint)/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchFields.C
 $(derivedPoint)/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
 
 
-
 LIB = $(FOAM_LIBBIN)/libfvMotionSolvers
diff --git a/src/meshTools/Make/files b/src/meshTools/Make/files
index 449d275e07ad6a3a1c6de164c9e0d3c357fece26..cb48fb872d7d03158d2e54accabc402de0121f52 100644
--- a/src/meshTools/Make/files
+++ b/src/meshTools/Make/files
@@ -81,7 +81,8 @@ meshSearch/meshSearch.C
 meshSearch/meshSearchFACE_CENTRE_TRISMeshObject.C
 meshSearch/meshSearchMeshObject.C
 
-fields/polyMeshFields.C
+fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchFields.C
+fields/volume/polyMeshFields.C
 meshTools/meshTools.C
 
 algorithms = algorithms
diff --git a/src/fvMotionSolver/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C b/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.C
similarity index 100%
rename from src/fvMotionSolver/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C
rename to src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.C
diff --git a/src/fvMotionSolver/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.H b/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.H
similarity index 100%
rename from src/fvMotionSolver/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.H
rename to src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.H
diff --git a/src/fvMotionSolver/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchFields.C b/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchFields.C
similarity index 100%
rename from src/fvMotionSolver/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchFields.C
rename to src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchFields.C
diff --git a/src/fvMotionSolver/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchFields.H b/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchFields.H
similarity index 100%
rename from src/fvMotionSolver/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchFields.H
rename to src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchFields.H
diff --git a/src/meshTools/fields/polyGeoMesh.H b/src/meshTools/fields/volume/polyGeoMesh.H
similarity index 100%
rename from src/meshTools/fields/polyGeoMesh.H
rename to src/meshTools/fields/volume/polyGeoMesh.H
diff --git a/src/meshTools/fields/polyMeshFields.C b/src/meshTools/fields/volume/polyMeshFields.C
similarity index 100%
rename from src/meshTools/fields/polyMeshFields.C
rename to src/meshTools/fields/volume/polyMeshFields.C
diff --git a/src/meshTools/fields/polyMeshFields.H b/src/meshTools/fields/volume/polyMeshFields.H
similarity index 100%
rename from src/meshTools/fields/polyMeshFields.H
rename to src/meshTools/fields/volume/polyMeshFields.H
diff --git a/src/meshTools/fields/polyMeshFieldsFwd.H b/src/meshTools/fields/volume/polyMeshFieldsFwd.H
similarity index 100%
rename from src/meshTools/fields/polyMeshFieldsFwd.H
rename to src/meshTools/fields/volume/polyMeshFieldsFwd.H