diff --git a/applications/utilities/mesh/generation/cvMesh/Make/options b/applications/utilities/mesh/generation/cvMesh/Make/options
index 5928c49081..529425600e 100644
--- a/applications/utilities/mesh/generation/cvMesh/Make/options
+++ b/applications/utilities/mesh/generation/cvMesh/Make/options
@@ -9,7 +9,7 @@ EXE_INC = \
     ${EXE_NDEBUG} \
     ${CGAL_INC} \
     -I$(WM_THIRD_PARTY_DIR)/mpfr-2.4.1 \
-    -I$(LIB_SRC)/conformalVoronoiMesh/lnInclude \
+    -I$(LIB_SRC)/mesh/conformalVoronoiMesh/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \
diff --git a/src/Allwmake b/src/Allwmake
index 54928685c9..668065e439 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -53,8 +53,6 @@ mesh/Allwmake
 
 wmake libso errorEstimation
 
-wmake libso conformalVoronoiMesh
-
 fvAgglomerationMethods/Allwmake
 
 wmake libso fvMotionSolver
diff --git a/src/mesh/Allwmake b/src/mesh/Allwmake
index f967335db3..69bf9f052a 100755
--- a/src/mesh/Allwmake
+++ b/src/mesh/Allwmake
@@ -4,5 +4,6 @@ set -x
 
 wmake libso autoMesh
 wmake libso blockMesh
+wmake libso conformalVoronoiMesh
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/conformalVoronoiMesh/Make/files b/src/mesh/conformalVoronoiMesh/Make/files
similarity index 100%
rename from src/conformalVoronoiMesh/Make/files
rename to src/mesh/conformalVoronoiMesh/Make/files
diff --git a/src/conformalVoronoiMesh/Make/options b/src/mesh/conformalVoronoiMesh/Make/options
similarity index 100%
rename from src/conformalVoronoiMesh/Make/options
rename to src/mesh/conformalVoronoiMesh/Make/options
diff --git a/src/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfaces.C b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfaces.C
similarity index 100%
rename from src/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfaces.C
rename to src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfaces.C
diff --git a/src/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfaces.H b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfaces.H
similarity index 100%
rename from src/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfaces.H
rename to src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfaces.H
diff --git a/src/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfacesI.H b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfacesI.H
similarity index 100%
rename from src/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfacesI.H
rename to src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfacesI.H
diff --git a/src/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C
similarity index 100%
rename from src/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C
rename to src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C
diff --git a/src/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H
similarity index 100%
rename from src/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H
rename to src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H
diff --git a/src/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.C b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.C
similarity index 100%
rename from src/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.C
rename to src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.C
diff --git a/src/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.H b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.H
similarity index 100%
rename from src/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.H
rename to src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.H
diff --git a/src/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.C b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.C
similarity index 100%
rename from src/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.C
rename to src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.C
diff --git a/src/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.H b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.H
similarity index 100%
rename from src/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.H
rename to src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.H
diff --git a/src/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C
similarity index 100%
rename from src/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C
rename to src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C
diff --git a/src/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.H b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.H
similarity index 100%
rename from src/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.H
rename to src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.H
diff --git a/src/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.C b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.C
similarity index 100%
rename from src/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.C
rename to src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.C
diff --git a/src/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.H b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.H
similarity index 100%
rename from src/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.H
rename to src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.H
diff --git a/src/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.C b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.C
similarity index 100%
rename from src/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.C
rename to src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.C
diff --git a/src/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.H b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.H
similarity index 100%
rename from src/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.H
rename to src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.H
diff --git a/src/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3Ddefs.H b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3Ddefs.H
similarity index 100%
rename from src/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3Ddefs.H
rename to src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3Ddefs.H
diff --git a/src/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
similarity index 100%
rename from src/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
rename to src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
diff --git a/src/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
similarity index 99%
rename from src/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
rename to src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
index 9b84aafabe..d27bb2b2cc 100644
--- a/src/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
@@ -57,7 +57,7 @@ SourceFiles
 #include "triSurfaceTools.H"
 #include "indexedOctree.H"
 #include "treeDataPoint.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
 #include "transform.H"
 #include "volFields.H"
 #include "fvMesh.H"
diff --git a/src/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
similarity index 100%
rename from src/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
rename to src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
diff --git a/src/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
similarity index 100%
rename from src/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
rename to src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
diff --git a/src/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell.H b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell.H
similarity index 100%
rename from src/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell.H
rename to src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell.H
diff --git a/src/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex.H b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex.H
similarity index 100%
rename from src/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex.H
rename to src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex.H
diff --git a/src/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C b/src/mesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
similarity index 100%
rename from src/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
rename to src/mesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
diff --git a/src/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H b/src/mesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H
similarity index 100%
rename from src/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H
rename to src/mesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H
diff --git a/src/conformalVoronoiMesh/conformationSurfaces/conformationSurfacesI.H b/src/mesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfacesI.H
similarity index 100%
rename from src/conformalVoronoiMesh/conformationSurfaces/conformationSurfacesI.H
rename to src/mesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfacesI.H
diff --git a/src/conformalVoronoiMesh/cvControls/cvControls.C b/src/mesh/conformalVoronoiMesh/cvControls/cvControls.C
similarity index 100%
rename from src/conformalVoronoiMesh/cvControls/cvControls.C
rename to src/mesh/conformalVoronoiMesh/cvControls/cvControls.C
diff --git a/src/conformalVoronoiMesh/cvControls/cvControls.H b/src/mesh/conformalVoronoiMesh/cvControls/cvControls.H
similarity index 100%
rename from src/conformalVoronoiMesh/cvControls/cvControls.H
rename to src/mesh/conformalVoronoiMesh/cvControls/cvControls.H
diff --git a/src/conformalVoronoiMesh/cvControls/cvControlsI.H b/src/mesh/conformalVoronoiMesh/cvControls/cvControlsI.H
similarity index 100%
rename from src/conformalVoronoiMesh/cvControls/cvControlsI.H
rename to src/mesh/conformalVoronoiMesh/cvControls/cvControlsI.H
diff --git a/src/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.C b/src/mesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.C
similarity index 100%
rename from src/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.C
rename to src/mesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.C
diff --git a/src/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.H b/src/mesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.H
similarity index 100%
rename from src/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.H
rename to src/mesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.H
diff --git a/src/conformalVoronoiMesh/faceAreaWeightModel/piecewiseLinearRamp/piecewiseLinearRamp.C b/src/mesh/conformalVoronoiMesh/faceAreaWeightModel/piecewiseLinearRamp/piecewiseLinearRamp.C
similarity index 100%
rename from src/conformalVoronoiMesh/faceAreaWeightModel/piecewiseLinearRamp/piecewiseLinearRamp.C
rename to src/mesh/conformalVoronoiMesh/faceAreaWeightModel/piecewiseLinearRamp/piecewiseLinearRamp.C
diff --git a/src/conformalVoronoiMesh/faceAreaWeightModel/piecewiseLinearRamp/piecewiseLinearRamp.H b/src/mesh/conformalVoronoiMesh/faceAreaWeightModel/piecewiseLinearRamp/piecewiseLinearRamp.H
similarity index 100%
rename from src/conformalVoronoiMesh/faceAreaWeightModel/piecewiseLinearRamp/piecewiseLinearRamp.H
rename to src/mesh/conformalVoronoiMesh/faceAreaWeightModel/piecewiseLinearRamp/piecewiseLinearRamp.H
diff --git a/src/conformalVoronoiMesh/initialPointsMethod/densityWeightedStochastic/densityWeightedStochastic.C b/src/mesh/conformalVoronoiMesh/initialPointsMethod/densityWeightedStochastic/densityWeightedStochastic.C
similarity index 100%
rename from src/conformalVoronoiMesh/initialPointsMethod/densityWeightedStochastic/densityWeightedStochastic.C
rename to src/mesh/conformalVoronoiMesh/initialPointsMethod/densityWeightedStochastic/densityWeightedStochastic.C
diff --git a/src/conformalVoronoiMesh/initialPointsMethod/densityWeightedStochastic/densityWeightedStochastic.H b/src/mesh/conformalVoronoiMesh/initialPointsMethod/densityWeightedStochastic/densityWeightedStochastic.H
similarity index 100%
rename from src/conformalVoronoiMesh/initialPointsMethod/densityWeightedStochastic/densityWeightedStochastic.H
rename to src/mesh/conformalVoronoiMesh/initialPointsMethod/densityWeightedStochastic/densityWeightedStochastic.H
diff --git a/src/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C b/src/mesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C
similarity index 100%
rename from src/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C
rename to src/mesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C
diff --git a/src/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.H b/src/mesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.H
similarity index 100%
rename from src/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.H
rename to src/mesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.H
diff --git a/src/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C b/src/mesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C
similarity index 100%
rename from src/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C
rename to src/mesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C
diff --git a/src/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.H b/src/mesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.H
similarity index 100%
rename from src/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.H
rename to src/mesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.H
diff --git a/src/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.C b/src/mesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.C
similarity index 100%
rename from src/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.C
rename to src/mesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.C
diff --git a/src/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.H b/src/mesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.H
similarity index 100%
rename from src/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.H
rename to src/mesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.H
diff --git a/src/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.C b/src/mesh/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.C
similarity index 100%
rename from src/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.C
rename to src/mesh/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.C
diff --git a/src/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.H b/src/mesh/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.H
similarity index 100%
rename from src/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.H
rename to src/mesh/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.H
diff --git a/src/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.C b/src/mesh/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.C
similarity index 100%
rename from src/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.C
rename to src/mesh/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.C
diff --git a/src/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.H b/src/mesh/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.H
similarity index 100%
rename from src/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.H
rename to src/mesh/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.H
diff --git a/src/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.C b/src/mesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.C
similarity index 100%
rename from src/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.C
rename to src/mesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.C
diff --git a/src/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.H b/src/mesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.H
similarity index 100%
rename from src/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.H
rename to src/mesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.H