diff --git a/applications/utilities/mesh/cfMesh/FLMAToSurface/Make/options b/applications/utilities/mesh/cfMesh/FLMAToSurface/Make/options deleted file mode 100644 index b6ffdc112..000000000 --- a/applications/utilities/mesh/cfMesh/FLMAToSurface/Make/options +++ /dev/null @@ -1,6 +0,0 @@ -EXE_INC = \ - -I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude \ - -I$(FOAM_SRC)/triSurface/lnInclude - -EXE_LIBS = \ - -ltriSurface -lmeshLibrary -lmeshTools diff --git a/applications/utilities/mesh/cfMesh/copySurfaceParts/Make/options b/applications/utilities/mesh/cfMesh/copySurfaceParts/Make/options deleted file mode 100644 index dab4207d9..000000000 --- a/applications/utilities/mesh/cfMesh/copySurfaceParts/Make/options +++ /dev/null @@ -1,6 +0,0 @@ -EXE_INC = \ - -I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude - -EXE_LIBS = -ltriSurface -lmeshLibrary -lmeshTools diff --git a/applications/utilities/mesh/cfMesh/surfaceFeatureEdges/Make/options b/applications/utilities/mesh/cfMesh/surfaceFeatureEdges/Make/options deleted file mode 100644 index 10c8bef14..000000000 --- a/applications/utilities/mesh/cfMesh/surfaceFeatureEdges/Make/options +++ /dev/null @@ -1,5 +0,0 @@ -EXE_INC = -I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude - -EXE_LIBS = -ltriSurface -lmeshLibrary -lmeshTools diff --git a/applications/utilities/mesh/cfMesh/surfaceGenerateBoundingBox/Make/options b/applications/utilities/mesh/cfMesh/surfaceGenerateBoundingBox/Make/options deleted file mode 100644 index dab4207d9..000000000 --- a/applications/utilities/mesh/cfMesh/surfaceGenerateBoundingBox/Make/options +++ /dev/null @@ -1,6 +0,0 @@ -EXE_INC = \ - -I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude - -EXE_LIBS = -ltriSurface -lmeshLibrary -lmeshTools diff --git a/applications/utilities/mesh/cfMesh/FLMAToSurface/FLMAToSurface.C b/applications/utilities/mesh/generation/cfMesh/FLMAToSurface/FLMAToSurface.C similarity index 100% rename from applications/utilities/mesh/cfMesh/FLMAToSurface/FLMAToSurface.C rename to applications/utilities/mesh/generation/cfMesh/FLMAToSurface/FLMAToSurface.C diff --git a/applications/utilities/mesh/cfMesh/FLMAToSurface/Make/files b/applications/utilities/mesh/generation/cfMesh/FLMAToSurface/Make/files similarity index 100% rename from applications/utilities/mesh/cfMesh/FLMAToSurface/Make/files rename to applications/utilities/mesh/generation/cfMesh/FLMAToSurface/Make/files diff --git a/applications/utilities/mesh/generation/cfMesh/FLMAToSurface/Make/options b/applications/utilities/mesh/generation/cfMesh/FLMAToSurface/Make/options new file mode 100644 index 000000000..66a5c1fcb --- /dev/null +++ b/applications/utilities/mesh/generation/cfMesh/FLMAToSurface/Make/options @@ -0,0 +1,6 @@ +EXE_INC = \ + -I$(LIB_SRC)/mesh/cfMesh/lnInclude \ + -I$(FOAM_SRC)/triSurface/lnInclude + +EXE_LIBS = \ + -ltriSurface -lcfMesh -lmeshTools diff --git a/applications/utilities/mesh/cfMesh/FMSToSurface/FMSToSurface.C b/applications/utilities/mesh/generation/cfMesh/FMSToSurface/FMSToSurface.C similarity index 100% rename from applications/utilities/mesh/cfMesh/FMSToSurface/FMSToSurface.C rename to applications/utilities/mesh/generation/cfMesh/FMSToSurface/FMSToSurface.C diff --git a/applications/utilities/mesh/cfMesh/FMSToSurface/Make/files b/applications/utilities/mesh/generation/cfMesh/FMSToSurface/Make/files similarity index 100% rename from applications/utilities/mesh/cfMesh/FMSToSurface/Make/files rename to applications/utilities/mesh/generation/cfMesh/FMSToSurface/Make/files diff --git a/applications/utilities/mesh/cfMesh/FMSToSurface/Make/options b/applications/utilities/mesh/generation/cfMesh/FMSToSurface/Make/options similarity index 66% rename from applications/utilities/mesh/cfMesh/FMSToSurface/Make/options rename to applications/utilities/mesh/generation/cfMesh/FMSToSurface/Make/options index 7ef3582be..f1a680fcc 100644 --- a/applications/utilities/mesh/cfMesh/FMSToSurface/Make/options +++ b/applications/utilities/mesh/generation/cfMesh/FMSToSurface/Make/options @@ -1,9 +1,9 @@ EXE_INC = \ - -I$(FOAM_SRC)/mesh/cfMesh/meshLibrary/lnInclude \ + -I$(FOAM_SRC)/mesh/cfMesh/lnInclude \ -I$(FOAM_SRC)/meshTools/lnInclude \ -I$(FOAM_SRC)/triSurface/lnInclude EXE_LIBS = \ -ltriSurface \ -lmeshTools \ - -lmeshLibrary + -lcfMesh diff --git a/applications/utilities/mesh/cfMesh/FMSToVTK/FMSToVTK.C b/applications/utilities/mesh/generation/cfMesh/FMSToVTK/FMSToVTK.C similarity index 100% rename from applications/utilities/mesh/cfMesh/FMSToVTK/FMSToVTK.C rename to applications/utilities/mesh/generation/cfMesh/FMSToVTK/FMSToVTK.C diff --git a/applications/utilities/mesh/cfMesh/FMSToVTK/Make/files b/applications/utilities/mesh/generation/cfMesh/FMSToVTK/Make/files similarity index 100% rename from applications/utilities/mesh/cfMesh/FMSToVTK/Make/files rename to applications/utilities/mesh/generation/cfMesh/FMSToVTK/Make/files diff --git a/applications/utilities/mesh/cfMesh/FMSToVTK/Make/options b/applications/utilities/mesh/generation/cfMesh/FMSToVTK/Make/options similarity index 65% rename from applications/utilities/mesh/cfMesh/FMSToVTK/Make/options rename to applications/utilities/mesh/generation/cfMesh/FMSToVTK/Make/options index e78c57531..6a63c3f1e 100644 --- a/applications/utilities/mesh/cfMesh/FMSToVTK/Make/options +++ b/applications/utilities/mesh/generation/cfMesh/FMSToVTK/Make/options @@ -1,9 +1,9 @@ EXE_INC = \ - -I$(FOAM_SRC)/mesh/cfMesh/meshLibrary/lnInclude \ + -I$(FOAM_SRC)/mesh/cfMesh/lnInclude \ -I$(FOAM_SRC)/meshTools/lnInclude \ -I$(FOAM_SRC)/triSurface/lnInclude EXE_LIBS = \ -ltriSurface \ - -lmeshLibrary \ + -lcfMesh \ -lmeshTools diff --git a/applications/utilities/mesh/cfMesh/FMSToVTK/xmlTag.H b/applications/utilities/mesh/generation/cfMesh/FMSToVTK/xmlTag.H similarity index 100% rename from applications/utilities/mesh/cfMesh/FMSToVTK/xmlTag.H rename to applications/utilities/mesh/generation/cfMesh/FMSToVTK/xmlTag.H diff --git a/applications/utilities/mesh/cfMesh/FPMAToMesh/FPMAToMesh.C b/applications/utilities/mesh/generation/cfMesh/FPMAToMesh/FPMAToMesh.C similarity index 100% rename from applications/utilities/mesh/cfMesh/FPMAToMesh/FPMAToMesh.C rename to applications/utilities/mesh/generation/cfMesh/FPMAToMesh/FPMAToMesh.C diff --git a/applications/utilities/mesh/cfMesh/FPMAToMesh/Make/files b/applications/utilities/mesh/generation/cfMesh/FPMAToMesh/Make/files similarity index 100% rename from applications/utilities/mesh/cfMesh/FPMAToMesh/Make/files rename to applications/utilities/mesh/generation/cfMesh/FPMAToMesh/Make/files diff --git a/applications/utilities/mesh/cfMesh/meshToFPMA/Make/options b/applications/utilities/mesh/generation/cfMesh/FPMAToMesh/Make/options similarity index 51% rename from applications/utilities/mesh/cfMesh/meshToFPMA/Make/options rename to applications/utilities/mesh/generation/cfMesh/FPMAToMesh/Make/options index 4245517ba..b19b9239e 100644 --- a/applications/utilities/mesh/cfMesh/meshToFPMA/Make/options +++ b/applications/utilities/mesh/generation/cfMesh/FPMAToMesh/Make/options @@ -1,7 +1,7 @@ EXE_INC = \ - -I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude \ + -I$(LIB_SRC)/mesh/cfMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -lmeshLibrary \ + -lcfMesh \ -lmeshTools diff --git a/applications/utilities/mesh/cfMesh/cartesian2DMesh/Make/files b/applications/utilities/mesh/generation/cfMesh/cartesian2DMesh/Make/files similarity index 100% rename from applications/utilities/mesh/cfMesh/cartesian2DMesh/Make/files rename to applications/utilities/mesh/generation/cfMesh/cartesian2DMesh/Make/files diff --git a/applications/utilities/mesh/cfMesh/cartesian2DMesh/Make/options b/applications/utilities/mesh/generation/cfMesh/cartesian2DMesh/Make/options similarity index 51% rename from applications/utilities/mesh/cfMesh/cartesian2DMesh/Make/options rename to applications/utilities/mesh/generation/cfMesh/cartesian2DMesh/Make/options index eef47c802..ebf5f659f 100644 --- a/applications/utilities/mesh/cfMesh/cartesian2DMesh/Make/options +++ b/applications/utilities/mesh/generation/cfMesh/cartesian2DMesh/Make/options @@ -1,11 +1,9 @@ EXE_INC = \ -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude + -I$(LIB_SRC)/mesh/cfMesh/lnInclude EXE_LIBS = \ -lmeshTools \ -ltriSurface \ - -lfiniteVolume \ - -lmeshLibrary + -lcfMesh diff --git a/applications/utilities/mesh/cfMesh/cartesian2DMesh/cartesian2DMesh.C b/applications/utilities/mesh/generation/cfMesh/cartesian2DMesh/cartesian2DMesh.C similarity index 100% rename from applications/utilities/mesh/cfMesh/cartesian2DMesh/cartesian2DMesh.C rename to applications/utilities/mesh/generation/cfMesh/cartesian2DMesh/cartesian2DMesh.C diff --git a/applications/utilities/mesh/cfMesh/cartesianMesh/Make/files b/applications/utilities/mesh/generation/cfMesh/cartesianMesh/Make/files similarity index 100% rename from applications/utilities/mesh/cfMesh/cartesianMesh/Make/files rename to applications/utilities/mesh/generation/cfMesh/cartesianMesh/Make/files diff --git a/applications/utilities/mesh/cfMesh/tetMesh/Make/options b/applications/utilities/mesh/generation/cfMesh/cartesianMesh/Make/options similarity index 51% rename from applications/utilities/mesh/cfMesh/tetMesh/Make/options rename to applications/utilities/mesh/generation/cfMesh/cartesianMesh/Make/options index eef47c802..ebf5f659f 100644 --- a/applications/utilities/mesh/cfMesh/tetMesh/Make/options +++ b/applications/utilities/mesh/generation/cfMesh/cartesianMesh/Make/options @@ -1,11 +1,9 @@ EXE_INC = \ -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude + -I$(LIB_SRC)/mesh/cfMesh/lnInclude EXE_LIBS = \ -lmeshTools \ -ltriSurface \ - -lfiniteVolume \ - -lmeshLibrary + -lcfMesh diff --git a/applications/utilities/mesh/cfMesh/cartesianMesh/cartesianMesh.C b/applications/utilities/mesh/generation/cfMesh/cartesianMesh/cartesianMesh.C similarity index 100% rename from applications/utilities/mesh/cfMesh/cartesianMesh/cartesianMesh.C rename to applications/utilities/mesh/generation/cfMesh/cartesianMesh/cartesianMesh.C diff --git a/applications/utilities/mesh/cfMesh/copySurfaceParts/Make/files b/applications/utilities/mesh/generation/cfMesh/copySurfaceParts/Make/files similarity index 100% rename from applications/utilities/mesh/cfMesh/copySurfaceParts/Make/files rename to applications/utilities/mesh/generation/cfMesh/copySurfaceParts/Make/files diff --git a/applications/utilities/mesh/generation/cfMesh/copySurfaceParts/Make/options b/applications/utilities/mesh/generation/cfMesh/copySurfaceParts/Make/options new file mode 100644 index 000000000..e5b075d77 --- /dev/null +++ b/applications/utilities/mesh/generation/cfMesh/copySurfaceParts/Make/options @@ -0,0 +1,6 @@ +EXE_INC = \ + -I$(LIB_SRC)/mesh/cfMesh/lnInclude \ + -I$(LIB_SRC)/triSurface/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude + +EXE_LIBS = -ltriSurface -lcfMesh -lmeshTools diff --git a/applications/utilities/mesh/cfMesh/copySurfaceParts/copySurfaceParts.C b/applications/utilities/mesh/generation/cfMesh/copySurfaceParts/copySurfaceParts.C similarity index 100% rename from applications/utilities/mesh/cfMesh/copySurfaceParts/copySurfaceParts.C rename to applications/utilities/mesh/generation/cfMesh/copySurfaceParts/copySurfaceParts.C diff --git a/applications/utilities/mesh/cfMesh/extrudeEdgesInto2DSurface/Make/files b/applications/utilities/mesh/generation/cfMesh/extrudeEdgesInto2DSurface/Make/files similarity index 100% rename from applications/utilities/mesh/cfMesh/extrudeEdgesInto2DSurface/Make/files rename to applications/utilities/mesh/generation/cfMesh/extrudeEdgesInto2DSurface/Make/files diff --git a/applications/utilities/mesh/cfMesh/patchesToSubsets/Make/options b/applications/utilities/mesh/generation/cfMesh/extrudeEdgesInto2DSurface/Make/options similarity index 52% rename from applications/utilities/mesh/cfMesh/patchesToSubsets/Make/options rename to applications/utilities/mesh/generation/cfMesh/extrudeEdgesInto2DSurface/Make/options index d846c89b3..829de7b96 100644 --- a/applications/utilities/mesh/cfMesh/patchesToSubsets/Make/options +++ b/applications/utilities/mesh/generation/cfMesh/extrudeEdgesInto2DSurface/Make/options @@ -1,7 +1,7 @@ EXE_INC = \ - -I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude \ + -I$(LIB_SRC)/mesh/cfMesh/lnInclude \ -I$(FOAM_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -ltriSurface -lmeshLibrary -lmeshTools + -ltriSurface -lcfMesh -lmeshTools diff --git a/applications/utilities/mesh/cfMesh/extrudeEdgesInto2DSurface/extrudeEdgesInto2DSurface.C b/applications/utilities/mesh/generation/cfMesh/extrudeEdgesInto2DSurface/extrudeEdgesInto2DSurface.C similarity index 100% rename from applications/utilities/mesh/cfMesh/extrudeEdgesInto2DSurface/extrudeEdgesInto2DSurface.C rename to applications/utilities/mesh/generation/cfMesh/extrudeEdgesInto2DSurface/extrudeEdgesInto2DSurface.C diff --git a/applications/utilities/mesh/cfMesh/importSurfaceAsSubset/Make/files b/applications/utilities/mesh/generation/cfMesh/importSurfaceAsSubset/Make/files similarity index 100% rename from applications/utilities/mesh/cfMesh/importSurfaceAsSubset/Make/files rename to applications/utilities/mesh/generation/cfMesh/importSurfaceAsSubset/Make/files diff --git a/applications/utilities/mesh/cfMesh/importSurfaceAsSubset/Make/options b/applications/utilities/mesh/generation/cfMesh/importSurfaceAsSubset/Make/options similarity index 65% rename from applications/utilities/mesh/cfMesh/importSurfaceAsSubset/Make/options rename to applications/utilities/mesh/generation/cfMesh/importSurfaceAsSubset/Make/options index d1d7fe933..9f62277a5 100644 --- a/applications/utilities/mesh/cfMesh/importSurfaceAsSubset/Make/options +++ b/applications/utilities/mesh/generation/cfMesh/importSurfaceAsSubset/Make/options @@ -1,9 +1,9 @@ EXE_INC = \ - -I$(FOAM_SRC)/mesh/cfMesh/meshLibrary/lnInclude \ + -I$(FOAM_SRC)/mesh/cfMesh/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ -ltriSurface \ - -lmeshLibrary \ + -lcfMesh \ -lmeshTools diff --git a/applications/utilities/mesh/cfMesh/importSurfaceAsSubset/importSurfaceAsSubset.C b/applications/utilities/mesh/generation/cfMesh/importSurfaceAsSubset/importSurfaceAsSubset.C similarity index 100% rename from applications/utilities/mesh/cfMesh/importSurfaceAsSubset/importSurfaceAsSubset.C rename to applications/utilities/mesh/generation/cfMesh/importSurfaceAsSubset/importSurfaceAsSubset.C diff --git a/applications/utilities/mesh/cfMesh/improveSymmetryPlanes/Make/files b/applications/utilities/mesh/generation/cfMesh/improveSymmetryPlanes/Make/files similarity index 100% rename from applications/utilities/mesh/cfMesh/improveSymmetryPlanes/Make/files rename to applications/utilities/mesh/generation/cfMesh/improveSymmetryPlanes/Make/files diff --git a/applications/utilities/mesh/cfMesh/improveSymmetryPlanes/Make/options b/applications/utilities/mesh/generation/cfMesh/improveSymmetryPlanes/Make/options similarity index 52% rename from applications/utilities/mesh/cfMesh/improveSymmetryPlanes/Make/options rename to applications/utilities/mesh/generation/cfMesh/improveSymmetryPlanes/Make/options index ee95b041b..0d4ab9546 100644 --- a/applications/utilities/mesh/cfMesh/improveSymmetryPlanes/Make/options +++ b/applications/utilities/mesh/generation/cfMesh/improveSymmetryPlanes/Make/options @@ -1,7 +1,7 @@ EXE_INC = \ - -I$(FOAM_SRC)/mesh/cfMesh/meshLibrary/lnInclude \ + -I$(FOAM_SRC)/mesh/cfMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ -lmeshTools \ - -lmeshLibrary + -lcfMesh diff --git a/applications/utilities/mesh/cfMesh/improveSymmetryPlanes/improveSymmetryPlanes.C b/applications/utilities/mesh/generation/cfMesh/improveSymmetryPlanes/improveSymmetryPlanes.C similarity index 100% rename from applications/utilities/mesh/cfMesh/improveSymmetryPlanes/improveSymmetryPlanes.C rename to applications/utilities/mesh/generation/cfMesh/improveSymmetryPlanes/improveSymmetryPlanes.C diff --git a/applications/utilities/mesh/cfMesh/mergeSurfacePatches/Make/files b/applications/utilities/mesh/generation/cfMesh/mergeSurfacePatches/Make/files similarity index 100% rename from applications/utilities/mesh/cfMesh/mergeSurfacePatches/Make/files rename to applications/utilities/mesh/generation/cfMesh/mergeSurfacePatches/Make/files diff --git a/applications/utilities/mesh/cfMesh/mergeSurfacePatches/Make/options b/applications/utilities/mesh/generation/cfMesh/mergeSurfacePatches/Make/options similarity index 65% rename from applications/utilities/mesh/cfMesh/mergeSurfacePatches/Make/options rename to applications/utilities/mesh/generation/cfMesh/mergeSurfacePatches/Make/options index e78c57531..6a63c3f1e 100644 --- a/applications/utilities/mesh/cfMesh/mergeSurfacePatches/Make/options +++ b/applications/utilities/mesh/generation/cfMesh/mergeSurfacePatches/Make/options @@ -1,9 +1,9 @@ EXE_INC = \ - -I$(FOAM_SRC)/mesh/cfMesh/meshLibrary/lnInclude \ + -I$(FOAM_SRC)/mesh/cfMesh/lnInclude \ -I$(FOAM_SRC)/meshTools/lnInclude \ -I$(FOAM_SRC)/triSurface/lnInclude EXE_LIBS = \ -ltriSurface \ - -lmeshLibrary \ + -lcfMesh \ -lmeshTools diff --git a/applications/utilities/mesh/cfMesh/mergeSurfacePatches/mergeSurfacePatches.C b/applications/utilities/mesh/generation/cfMesh/mergeSurfacePatches/mergeSurfacePatches.C similarity index 100% rename from applications/utilities/mesh/cfMesh/mergeSurfacePatches/mergeSurfacePatches.C rename to applications/utilities/mesh/generation/cfMesh/mergeSurfacePatches/mergeSurfacePatches.C diff --git a/applications/utilities/mesh/cfMesh/meshToFPMA/Make/files b/applications/utilities/mesh/generation/cfMesh/meshToFPMA/Make/files similarity index 100% rename from applications/utilities/mesh/cfMesh/meshToFPMA/Make/files rename to applications/utilities/mesh/generation/cfMesh/meshToFPMA/Make/files diff --git a/applications/utilities/mesh/cfMesh/FPMAToMesh/Make/options b/applications/utilities/mesh/generation/cfMesh/meshToFPMA/Make/options similarity index 51% rename from applications/utilities/mesh/cfMesh/FPMAToMesh/Make/options rename to applications/utilities/mesh/generation/cfMesh/meshToFPMA/Make/options index 4245517ba..b19b9239e 100644 --- a/applications/utilities/mesh/cfMesh/FPMAToMesh/Make/options +++ b/applications/utilities/mesh/generation/cfMesh/meshToFPMA/Make/options @@ -1,7 +1,7 @@ EXE_INC = \ - -I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude \ + -I$(LIB_SRC)/mesh/cfMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -lmeshLibrary \ + -lcfMesh \ -lmeshTools diff --git a/applications/utilities/mesh/cfMesh/meshToFPMA/meshToFPMA.C b/applications/utilities/mesh/generation/cfMesh/meshToFPMA/meshToFPMA.C similarity index 100% rename from applications/utilities/mesh/cfMesh/meshToFPMA/meshToFPMA.C rename to applications/utilities/mesh/generation/cfMesh/meshToFPMA/meshToFPMA.C diff --git a/applications/utilities/mesh/cfMesh/patchesToSubsets/Make/files b/applications/utilities/mesh/generation/cfMesh/patchesToSubsets/Make/files similarity index 100% rename from applications/utilities/mesh/cfMesh/patchesToSubsets/Make/files rename to applications/utilities/mesh/generation/cfMesh/patchesToSubsets/Make/files diff --git a/applications/utilities/mesh/cfMesh/removeSurfaceFacets/Make/options b/applications/utilities/mesh/generation/cfMesh/patchesToSubsets/Make/options similarity index 52% rename from applications/utilities/mesh/cfMesh/removeSurfaceFacets/Make/options rename to applications/utilities/mesh/generation/cfMesh/patchesToSubsets/Make/options index d846c89b3..829de7b96 100644 --- a/applications/utilities/mesh/cfMesh/removeSurfaceFacets/Make/options +++ b/applications/utilities/mesh/generation/cfMesh/patchesToSubsets/Make/options @@ -1,7 +1,7 @@ EXE_INC = \ - -I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude \ + -I$(LIB_SRC)/mesh/cfMesh/lnInclude \ -I$(FOAM_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -ltriSurface -lmeshLibrary -lmeshTools + -ltriSurface -lcfMesh -lmeshTools diff --git a/applications/utilities/mesh/cfMesh/patchesToSubsets/patchesToSubsets.C b/applications/utilities/mesh/generation/cfMesh/patchesToSubsets/patchesToSubsets.C similarity index 100% rename from applications/utilities/mesh/cfMesh/patchesToSubsets/patchesToSubsets.C rename to applications/utilities/mesh/generation/cfMesh/patchesToSubsets/patchesToSubsets.C diff --git a/applications/utilities/mesh/cfMesh/preparePar/Make/files b/applications/utilities/mesh/generation/cfMesh/preparePar/Make/files similarity index 100% rename from applications/utilities/mesh/cfMesh/preparePar/Make/files rename to applications/utilities/mesh/generation/cfMesh/preparePar/Make/files diff --git a/applications/utilities/mesh/cfMesh/preparePar/Make/options b/applications/utilities/mesh/generation/cfMesh/preparePar/Make/options similarity index 52% rename from applications/utilities/mesh/cfMesh/preparePar/Make/options rename to applications/utilities/mesh/generation/cfMesh/preparePar/Make/options index aa208776a..49829e06f 100644 --- a/applications/utilities/mesh/cfMesh/preparePar/Make/options +++ b/applications/utilities/mesh/generation/cfMesh/preparePar/Make/options @@ -1,7 +1,7 @@ EXE_INC = \ - -I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude \ + -I$(LIB_SRC)/mesh/cfMesh/lnInclude \ -I$(FOAM_SRC)/meshTools/lnInclude \ -I$(FOAM_SRC)/triSurface/lnInclude EXE_LIBS = \ - -ltriSurface -lmeshTools -lmeshLibrary + -ltriSurface -lmeshTools -lcfMesh diff --git a/applications/utilities/mesh/cfMesh/preparePar/preparePar.C b/applications/utilities/mesh/generation/cfMesh/preparePar/preparePar.C similarity index 100% rename from applications/utilities/mesh/cfMesh/preparePar/preparePar.C rename to applications/utilities/mesh/generation/cfMesh/preparePar/preparePar.C diff --git a/applications/utilities/mesh/cfMesh/python/Salome/extractFeatureEdges.py b/applications/utilities/mesh/generation/cfMesh/python/Salome/extractFeatureEdges.py similarity index 100% rename from applications/utilities/mesh/cfMesh/python/Salome/extractFeatureEdges.py rename to applications/utilities/mesh/generation/cfMesh/python/Salome/extractFeatureEdges.py diff --git a/applications/utilities/mesh/cfMesh/python/Salome/salomeTriSurf.py b/applications/utilities/mesh/generation/cfMesh/python/Salome/salomeTriSurf.py similarity index 100% rename from applications/utilities/mesh/cfMesh/python/Salome/salomeTriSurf.py rename to applications/utilities/mesh/generation/cfMesh/python/Salome/salomeTriSurf.py diff --git a/applications/utilities/mesh/cfMesh/removeSurfaceFacets/Make/files b/applications/utilities/mesh/generation/cfMesh/removeSurfaceFacets/Make/files similarity index 100% rename from applications/utilities/mesh/cfMesh/removeSurfaceFacets/Make/files rename to applications/utilities/mesh/generation/cfMesh/removeSurfaceFacets/Make/files diff --git a/applications/utilities/mesh/cfMesh/extrudeEdgesInto2DSurface/Make/options b/applications/utilities/mesh/generation/cfMesh/removeSurfaceFacets/Make/options similarity index 52% rename from applications/utilities/mesh/cfMesh/extrudeEdgesInto2DSurface/Make/options rename to applications/utilities/mesh/generation/cfMesh/removeSurfaceFacets/Make/options index d846c89b3..829de7b96 100644 --- a/applications/utilities/mesh/cfMesh/extrudeEdgesInto2DSurface/Make/options +++ b/applications/utilities/mesh/generation/cfMesh/removeSurfaceFacets/Make/options @@ -1,7 +1,7 @@ EXE_INC = \ - -I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude \ + -I$(LIB_SRC)/mesh/cfMesh/lnInclude \ -I$(FOAM_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -ltriSurface -lmeshLibrary -lmeshTools + -ltriSurface -lcfMesh -lmeshTools diff --git a/applications/utilities/mesh/cfMesh/removeSurfaceFacets/removeSurfaceFacets.C b/applications/utilities/mesh/generation/cfMesh/removeSurfaceFacets/removeSurfaceFacets.C similarity index 100% rename from applications/utilities/mesh/cfMesh/removeSurfaceFacets/removeSurfaceFacets.C rename to applications/utilities/mesh/generation/cfMesh/removeSurfaceFacets/removeSurfaceFacets.C diff --git a/applications/utilities/mesh/cfMesh/subsetToPatch/Make/files b/applications/utilities/mesh/generation/cfMesh/subsetToPatch/Make/files similarity index 100% rename from applications/utilities/mesh/cfMesh/subsetToPatch/Make/files rename to applications/utilities/mesh/generation/cfMesh/subsetToPatch/Make/files diff --git a/applications/utilities/mesh/cfMesh/subsetToPatch/Make/options b/applications/utilities/mesh/generation/cfMesh/subsetToPatch/Make/options similarity index 52% rename from applications/utilities/mesh/cfMesh/subsetToPatch/Make/options rename to applications/utilities/mesh/generation/cfMesh/subsetToPatch/Make/options index aa208776a..49829e06f 100644 --- a/applications/utilities/mesh/cfMesh/subsetToPatch/Make/options +++ b/applications/utilities/mesh/generation/cfMesh/subsetToPatch/Make/options @@ -1,7 +1,7 @@ EXE_INC = \ - -I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude \ + -I$(LIB_SRC)/mesh/cfMesh/lnInclude \ -I$(FOAM_SRC)/meshTools/lnInclude \ -I$(FOAM_SRC)/triSurface/lnInclude EXE_LIBS = \ - -ltriSurface -lmeshTools -lmeshLibrary + -ltriSurface -lmeshTools -lcfMesh diff --git a/applications/utilities/mesh/cfMesh/subsetToPatch/subsetToPatch.C b/applications/utilities/mesh/generation/cfMesh/subsetToPatch/subsetToPatch.C similarity index 100% rename from applications/utilities/mesh/cfMesh/subsetToPatch/subsetToPatch.C rename to applications/utilities/mesh/generation/cfMesh/subsetToPatch/subsetToPatch.C diff --git a/applications/utilities/mesh/cfMesh/surfaceFeatureEdges/Make/files b/applications/utilities/mesh/generation/cfMesh/surfaceFeatureEdges/Make/files similarity index 100% rename from applications/utilities/mesh/cfMesh/surfaceFeatureEdges/Make/files rename to applications/utilities/mesh/generation/cfMesh/surfaceFeatureEdges/Make/files diff --git a/applications/utilities/mesh/generation/cfMesh/surfaceFeatureEdges/Make/options b/applications/utilities/mesh/generation/cfMesh/surfaceFeatureEdges/Make/options new file mode 100644 index 000000000..c50af6d81 --- /dev/null +++ b/applications/utilities/mesh/generation/cfMesh/surfaceFeatureEdges/Make/options @@ -0,0 +1,5 @@ +EXE_INC = -I$(LIB_SRC)/mesh/cfMesh/lnInclude \ + -I$(LIB_SRC)/triSurface/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude + +EXE_LIBS = -ltriSurface -lcfMesh -lmeshTools diff --git a/applications/utilities/mesh/cfMesh/surfaceFeatureEdges/surfaceFeatureEdges.C b/applications/utilities/mesh/generation/cfMesh/surfaceFeatureEdges/surfaceFeatureEdges.C similarity index 100% rename from applications/utilities/mesh/cfMesh/surfaceFeatureEdges/surfaceFeatureEdges.C rename to applications/utilities/mesh/generation/cfMesh/surfaceFeatureEdges/surfaceFeatureEdges.C diff --git a/applications/utilities/mesh/cfMesh/surfaceGenerateBoundingBox/Make/files b/applications/utilities/mesh/generation/cfMesh/surfaceGenerateBoundingBox/Make/files similarity index 100% rename from applications/utilities/mesh/cfMesh/surfaceGenerateBoundingBox/Make/files rename to applications/utilities/mesh/generation/cfMesh/surfaceGenerateBoundingBox/Make/files diff --git a/applications/utilities/mesh/generation/cfMesh/surfaceGenerateBoundingBox/Make/options b/applications/utilities/mesh/generation/cfMesh/surfaceGenerateBoundingBox/Make/options new file mode 100644 index 000000000..e5b075d77 --- /dev/null +++ b/applications/utilities/mesh/generation/cfMesh/surfaceGenerateBoundingBox/Make/options @@ -0,0 +1,6 @@ +EXE_INC = \ + -I$(LIB_SRC)/mesh/cfMesh/lnInclude \ + -I$(LIB_SRC)/triSurface/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude + +EXE_LIBS = -ltriSurface -lcfMesh -lmeshTools diff --git a/applications/utilities/mesh/cfMesh/surfaceGenerateBoundingBox/surfaceGenerateBoundingBox.C b/applications/utilities/mesh/generation/cfMesh/surfaceGenerateBoundingBox/surfaceGenerateBoundingBox.C similarity index 100% rename from applications/utilities/mesh/cfMesh/surfaceGenerateBoundingBox/surfaceGenerateBoundingBox.C rename to applications/utilities/mesh/generation/cfMesh/surfaceGenerateBoundingBox/surfaceGenerateBoundingBox.C diff --git a/applications/utilities/mesh/cfMesh/surfaceToFMS/Make/files b/applications/utilities/mesh/generation/cfMesh/surfaceToFMS/Make/files similarity index 100% rename from applications/utilities/mesh/cfMesh/surfaceToFMS/Make/files rename to applications/utilities/mesh/generation/cfMesh/surfaceToFMS/Make/files diff --git a/applications/utilities/mesh/cfMesh/surfaceToFMS/Make/options b/applications/utilities/mesh/generation/cfMesh/surfaceToFMS/Make/options similarity index 65% rename from applications/utilities/mesh/cfMesh/surfaceToFMS/Make/options rename to applications/utilities/mesh/generation/cfMesh/surfaceToFMS/Make/options index d1d7fe933..9f62277a5 100644 --- a/applications/utilities/mesh/cfMesh/surfaceToFMS/Make/options +++ b/applications/utilities/mesh/generation/cfMesh/surfaceToFMS/Make/options @@ -1,9 +1,9 @@ EXE_INC = \ - -I$(FOAM_SRC)/mesh/cfMesh/meshLibrary/lnInclude \ + -I$(FOAM_SRC)/mesh/cfMesh/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ -ltriSurface \ - -lmeshLibrary \ + -lcfMesh \ -lmeshTools diff --git a/applications/utilities/mesh/cfMesh/surfaceToFMS/surfaceToFMS.C b/applications/utilities/mesh/generation/cfMesh/surfaceToFMS/surfaceToFMS.C similarity index 100% rename from applications/utilities/mesh/cfMesh/surfaceToFMS/surfaceToFMS.C rename to applications/utilities/mesh/generation/cfMesh/surfaceToFMS/surfaceToFMS.C diff --git a/applications/utilities/mesh/cfMesh/tetMesh/Make/files b/applications/utilities/mesh/generation/cfMesh/tetMesh/Make/files similarity index 100% rename from applications/utilities/mesh/cfMesh/tetMesh/Make/files rename to applications/utilities/mesh/generation/cfMesh/tetMesh/Make/files diff --git a/applications/utilities/mesh/cfMesh/cartesianMesh/Make/options b/applications/utilities/mesh/generation/cfMesh/tetMesh/Make/options similarity index 51% rename from applications/utilities/mesh/cfMesh/cartesianMesh/Make/options rename to applications/utilities/mesh/generation/cfMesh/tetMesh/Make/options index eef47c802..ebf5f659f 100644 --- a/applications/utilities/mesh/cfMesh/cartesianMesh/Make/options +++ b/applications/utilities/mesh/generation/cfMesh/tetMesh/Make/options @@ -1,11 +1,9 @@ EXE_INC = \ -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude + -I$(LIB_SRC)/mesh/cfMesh/lnInclude EXE_LIBS = \ -lmeshTools \ -ltriSurface \ - -lfiniteVolume \ - -lmeshLibrary + -lcfMesh diff --git a/applications/utilities/mesh/cfMesh/tetMesh/tetMesh.C b/applications/utilities/mesh/generation/cfMesh/tetMesh/tetMesh.C similarity index 100% rename from applications/utilities/mesh/cfMesh/tetMesh/tetMesh.C rename to applications/utilities/mesh/generation/cfMesh/tetMesh/tetMesh.C diff --git a/src/mesh/Allwmake b/src/mesh/Allwmake index fc78200ee..3115ca3f3 100755 --- a/src/mesh/Allwmake +++ b/src/mesh/Allwmake @@ -1,11 +1,10 @@ #!/bin/sh cd ${0%/*} || exit 1 # run from this directory -makeType=${1:-libso} set -x -wmake $makeType autoMesh -wmake $makeType blockMesh -wmake $makeType extrudeModel -wmake $makeType cfMesh/meshLibrary +wmake libso autoMesh +wmake libso blockMesh +wmake libso extrudeModel +wmake libso cfMesh # ----------------------------------------------------------------- end-of-file diff --git a/src/mesh/cfMesh/meshLibrary/Make/files b/src/mesh/cfMesh/Make/files similarity index 99% rename from src/mesh/cfMesh/meshLibrary/Make/files rename to src/mesh/cfMesh/Make/files index 8cb282ffe..b2aeb7e8a 100644 --- a/src/mesh/cfMesh/meshLibrary/Make/files +++ b/src/mesh/cfMesh/Make/files @@ -404,4 +404,4 @@ $(tetMeshGenerator)/tetMeshGenerator.C $(writeAsFPMA)/writeMeshFPMA.C $(writeAsFPMA)/fpmaMesh.C -LIB = $(FOAM_LIBBIN)/libmeshLibrary +LIB = $(FOAM_LIBBIN)/libcfMesh diff --git a/src/mesh/cfMesh/meshLibrary/Make/options b/src/mesh/cfMesh/Make/options similarity index 100% rename from src/mesh/cfMesh/meshLibrary/Make/options rename to src/mesh/cfMesh/Make/options diff --git a/src/mesh/cfMesh/meshLibrary/cartesian2DMesh/cartesian2DMeshGenerator/cartesian2DMeshGenerator.C b/src/mesh/cfMesh/cartesian2DMesh/cartesian2DMeshGenerator/cartesian2DMeshGenerator.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/cartesian2DMesh/cartesian2DMeshGenerator/cartesian2DMeshGenerator.C rename to src/mesh/cfMesh/cartesian2DMesh/cartesian2DMeshGenerator/cartesian2DMeshGenerator.C diff --git a/src/mesh/cfMesh/meshLibrary/cartesian2DMesh/cartesian2DMeshGenerator/cartesian2DMeshGenerator.H b/src/mesh/cfMesh/cartesian2DMesh/cartesian2DMeshGenerator/cartesian2DMeshGenerator.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/cartesian2DMesh/cartesian2DMeshGenerator/cartesian2DMeshGenerator.H rename to src/mesh/cfMesh/cartesian2DMesh/cartesian2DMeshGenerator/cartesian2DMeshGenerator.H diff --git a/src/mesh/cfMesh/meshLibrary/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractor.C b/src/mesh/cfMesh/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractor.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractor.C rename to src/mesh/cfMesh/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractor.C diff --git a/src/mesh/cfMesh/meshLibrary/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractor.H b/src/mesh/cfMesh/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractor.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractor.H rename to src/mesh/cfMesh/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractor.H diff --git a/src/mesh/cfMesh/meshLibrary/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractorDecomposeSplitHexes.C b/src/mesh/cfMesh/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractorDecomposeSplitHexes.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractorDecomposeSplitHexes.C rename to src/mesh/cfMesh/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractorDecomposeSplitHexes.C diff --git a/src/mesh/cfMesh/meshLibrary/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractorPointsAndAddressing.C b/src/mesh/cfMesh/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractorPointsAndAddressing.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractorPointsAndAddressing.C rename to src/mesh/cfMesh/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractorPointsAndAddressing.C diff --git a/src/mesh/cfMesh/meshLibrary/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractorPolyMesh.C b/src/mesh/cfMesh/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractorPolyMesh.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractorPolyMesh.C rename to src/mesh/cfMesh/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractorPolyMesh.C diff --git a/src/mesh/cfMesh/meshLibrary/cartesianMesh/cartesianMeshGenerator/cartesianMeshGenerator.C b/src/mesh/cfMesh/cartesianMesh/cartesianMeshGenerator/cartesianMeshGenerator.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/cartesianMesh/cartesianMeshGenerator/cartesianMeshGenerator.C rename to src/mesh/cfMesh/cartesianMesh/cartesianMeshGenerator/cartesianMeshGenerator.C diff --git a/src/mesh/cfMesh/meshLibrary/cartesianMesh/cartesianMeshGenerator/cartesianMeshGenerator.H b/src/mesh/cfMesh/cartesianMesh/cartesianMeshGenerator/cartesianMeshGenerator.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/cartesianMesh/cartesianMeshGenerator/cartesianMeshGenerator.H rename to src/mesh/cfMesh/cartesianMesh/cartesianMeshGenerator/cartesianMeshGenerator.H diff --git a/src/mesh/cfMesh/meshLibrary/tetMesh/tetMeshExtractorOctree/tetMeshExtractorOctree.C b/src/mesh/cfMesh/tetMesh/tetMeshExtractorOctree/tetMeshExtractorOctree.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/tetMesh/tetMeshExtractorOctree/tetMeshExtractorOctree.C rename to src/mesh/cfMesh/tetMesh/tetMeshExtractorOctree/tetMeshExtractorOctree.C diff --git a/src/mesh/cfMesh/meshLibrary/tetMesh/tetMeshExtractorOctree/tetMeshExtractorOctree.H b/src/mesh/cfMesh/tetMesh/tetMeshExtractorOctree/tetMeshExtractorOctree.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/tetMesh/tetMeshExtractorOctree/tetMeshExtractorOctree.H rename to src/mesh/cfMesh/tetMesh/tetMeshExtractorOctree/tetMeshExtractorOctree.H diff --git a/src/mesh/cfMesh/meshLibrary/tetMesh/tetMeshGenerator/tetMeshGenerator.C b/src/mesh/cfMesh/tetMesh/tetMeshGenerator/tetMeshGenerator.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/tetMesh/tetMeshGenerator/tetMeshGenerator.C rename to src/mesh/cfMesh/tetMesh/tetMeshGenerator/tetMeshGenerator.C diff --git a/src/mesh/cfMesh/meshLibrary/tetMesh/tetMeshGenerator/tetMeshGenerator.H b/src/mesh/cfMesh/tetMesh/tetMeshGenerator/tetMeshGenerator.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/tetMesh/tetMeshGenerator/tetMeshGenerator.H rename to src/mesh/cfMesh/tetMesh/tetMeshGenerator/tetMeshGenerator.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/boundaryLayerCells.C b/src/mesh/cfMesh/utilities/boundaryLayers/boundaryLayerCells.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/boundaryLayerCells.C rename to src/mesh/cfMesh/utilities/boundaryLayers/boundaryLayerCells.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/boundaryLayers.C b/src/mesh/cfMesh/utilities/boundaryLayers/boundaryLayers.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/boundaryLayers.C rename to src/mesh/cfMesh/utilities/boundaryLayers/boundaryLayers.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/boundaryLayers.H b/src/mesh/cfMesh/utilities/boundaryLayers/boundaryLayers.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/boundaryLayers.H rename to src/mesh/cfMesh/utilities/boundaryLayers/boundaryLayers.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/boundaryLayersCheckTopologyOfBndFaces.C b/src/mesh/cfMesh/utilities/boundaryLayers/boundaryLayersCheckTopologyOfBndFaces.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/boundaryLayersCheckTopologyOfBndFaces.C rename to src/mesh/cfMesh/utilities/boundaryLayers/boundaryLayersCheckTopologyOfBndFaces.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/boundaryLayersCreateVertices.C b/src/mesh/cfMesh/utilities/boundaryLayers/boundaryLayersCreateVertices.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/boundaryLayersCreateVertices.C rename to src/mesh/cfMesh/utilities/boundaryLayers/boundaryLayersCreateVertices.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/boundaryLayersFacesAndCells.C b/src/mesh/cfMesh/utilities/boundaryLayers/boundaryLayersFacesAndCells.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/boundaryLayersFacesAndCells.C rename to src/mesh/cfMesh/utilities/boundaryLayers/boundaryLayersFacesAndCells.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/boundaryLayersI.H b/src/mesh/cfMesh/utilities/boundaryLayers/boundaryLayersI.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/boundaryLayersI.H rename to src/mesh/cfMesh/utilities/boundaryLayers/boundaryLayersI.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/boundaryLayersWrapperLayer.C b/src/mesh/cfMesh/utilities/boundaryLayers/boundaryLayersWrapperLayer.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/boundaryLayersWrapperLayer.C rename to src/mesh/cfMesh/utilities/boundaryLayers/boundaryLayersWrapperLayer.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/extrudeLayer.C b/src/mesh/cfMesh/utilities/boundaryLayers/extrudeLayer.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/extrudeLayer.C rename to src/mesh/cfMesh/utilities/boundaryLayers/extrudeLayer.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/extrudeLayer.H b/src/mesh/cfMesh/utilities/boundaryLayers/extrudeLayer.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/extrudeLayer.H rename to src/mesh/cfMesh/utilities/boundaryLayers/extrudeLayer.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/extrudeLayerI.H b/src/mesh/cfMesh/utilities/boundaryLayers/extrudeLayerI.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/extrudeLayerI.H rename to src/mesh/cfMesh/utilities/boundaryLayers/extrudeLayerI.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/refineBoundaryLayers.C b/src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayers.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/refineBoundaryLayers.C rename to src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayers.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/refineBoundaryLayers.H b/src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayers.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/refineBoundaryLayers.H rename to src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayers.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/refineBoundaryLayersCells.C b/src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayersCells.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/refineBoundaryLayersCells.C rename to src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayersCells.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/refineBoundaryLayersFaces.C b/src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayersFaces.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/refineBoundaryLayersFaces.C rename to src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayersFaces.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/refineBoundaryLayersFunctions.C b/src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayersFunctions.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/refineBoundaryLayersFunctions.C rename to src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayersFunctions.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/checkMeshDict/checkMeshDict.C b/src/mesh/cfMesh/utilities/checkMeshDict/checkMeshDict.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/checkMeshDict/checkMeshDict.C rename to src/mesh/cfMesh/utilities/checkMeshDict/checkMeshDict.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/checkMeshDict/checkMeshDict.H b/src/mesh/cfMesh/utilities/checkMeshDict/checkMeshDict.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/checkMeshDict/checkMeshDict.H rename to src/mesh/cfMesh/utilities/checkMeshDict/checkMeshDict.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/DynList/DynList.C b/src/mesh/cfMesh/utilities/containers/DynList/DynList.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/DynList/DynList.C rename to src/mesh/cfMesh/utilities/containers/DynList/DynList.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/DynList/DynList.H b/src/mesh/cfMesh/utilities/containers/DynList/DynList.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/DynList/DynList.H rename to src/mesh/cfMesh/utilities/containers/DynList/DynList.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/DynList/DynListI.H b/src/mesh/cfMesh/utilities/containers/DynList/DynListI.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/DynList/DynListI.H rename to src/mesh/cfMesh/utilities/containers/DynList/DynListI.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/FRWGraph/FRWGraph.C b/src/mesh/cfMesh/utilities/containers/FRWGraph/FRWGraph.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/FRWGraph/FRWGraph.C rename to src/mesh/cfMesh/utilities/containers/FRWGraph/FRWGraph.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/FRWGraph/FRWGraph.H b/src/mesh/cfMesh/utilities/containers/FRWGraph/FRWGraph.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/FRWGraph/FRWGraph.H rename to src/mesh/cfMesh/utilities/containers/FRWGraph/FRWGraph.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/FRWGraph/FRWGraphI.H b/src/mesh/cfMesh/utilities/containers/FRWGraph/FRWGraphI.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/FRWGraph/FRWGraphI.H rename to src/mesh/cfMesh/utilities/containers/FRWGraph/FRWGraphI.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/Graphs/cellIOGraph.C b/src/mesh/cfMesh/utilities/containers/Graphs/cellIOGraph.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/Graphs/cellIOGraph.C rename to src/mesh/cfMesh/utilities/containers/Graphs/cellIOGraph.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/Graphs/cellIOGraph.H b/src/mesh/cfMesh/utilities/containers/Graphs/cellIOGraph.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/Graphs/cellIOGraph.H rename to src/mesh/cfMesh/utilities/containers/Graphs/cellIOGraph.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/Graphs/faceIOGraph.C b/src/mesh/cfMesh/utilities/containers/Graphs/faceIOGraph.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/Graphs/faceIOGraph.C rename to src/mesh/cfMesh/utilities/containers/Graphs/faceIOGraph.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/Graphs/faceIOGraph.H b/src/mesh/cfMesh/utilities/containers/Graphs/faceIOGraph.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/Graphs/faceIOGraph.H rename to src/mesh/cfMesh/utilities/containers/Graphs/faceIOGraph.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/IODynList/IODynList.C b/src/mesh/cfMesh/utilities/containers/IODynList/IODynList.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/IODynList/IODynList.C rename to src/mesh/cfMesh/utilities/containers/IODynList/IODynList.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/IODynList/IODynList.H b/src/mesh/cfMesh/utilities/containers/IODynList/IODynList.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/IODynList/IODynList.H rename to src/mesh/cfMesh/utilities/containers/IODynList/IODynList.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/IOLongList/IOLongList.C b/src/mesh/cfMesh/utilities/containers/IOLongList/IOLongList.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/IOLongList/IOLongList.C rename to src/mesh/cfMesh/utilities/containers/IOLongList/IOLongList.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/IOLongList/IOLongList.H b/src/mesh/cfMesh/utilities/containers/IOLongList/IOLongList.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/IOLongList/IOLongList.H rename to src/mesh/cfMesh/utilities/containers/IOLongList/IOLongList.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/IOLongList/IOLongListInstances.C b/src/mesh/cfMesh/utilities/containers/IOLongList/IOLongListInstances.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/IOLongList/IOLongListInstances.C rename to src/mesh/cfMesh/utilities/containers/IOLongList/IOLongListInstances.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/IOLongList/IOLongListInstances.H b/src/mesh/cfMesh/utilities/containers/IOLongList/IOLongListInstances.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/IOLongList/IOLongListInstances.H rename to src/mesh/cfMesh/utilities/containers/IOLongList/IOLongListInstances.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/Lists/cellListPMG.H b/src/mesh/cfMesh/utilities/containers/Lists/cellListPMG.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/Lists/cellListPMG.H rename to src/mesh/cfMesh/utilities/containers/Lists/cellListPMG.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/Lists/cellListPMGI.H b/src/mesh/cfMesh/utilities/containers/Lists/cellListPMGI.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/Lists/cellListPMGI.H rename to src/mesh/cfMesh/utilities/containers/Lists/cellListPMGI.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/Lists/edgeLongList.H b/src/mesh/cfMesh/utilities/containers/Lists/edgeLongList.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/Lists/edgeLongList.H rename to src/mesh/cfMesh/utilities/containers/Lists/edgeLongList.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/Lists/faceListPMG.C b/src/mesh/cfMesh/utilities/containers/Lists/faceListPMG.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/Lists/faceListPMG.C rename to src/mesh/cfMesh/utilities/containers/Lists/faceListPMG.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/Lists/faceListPMG.H b/src/mesh/cfMesh/utilities/containers/Lists/faceListPMG.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/Lists/faceListPMG.H rename to src/mesh/cfMesh/utilities/containers/Lists/faceListPMG.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/Lists/faceListPMGI.H b/src/mesh/cfMesh/utilities/containers/Lists/faceListPMGI.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/Lists/faceListPMGI.H rename to src/mesh/cfMesh/utilities/containers/Lists/faceListPMGI.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/Lists/labelLongList.H b/src/mesh/cfMesh/utilities/containers/Lists/labelLongList.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/Lists/labelLongList.H rename to src/mesh/cfMesh/utilities/containers/Lists/labelLongList.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/Lists/pointFieldPMG.C b/src/mesh/cfMesh/utilities/containers/Lists/pointFieldPMG.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/Lists/pointFieldPMG.C rename to src/mesh/cfMesh/utilities/containers/Lists/pointFieldPMG.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/Lists/pointFieldPMG.H b/src/mesh/cfMesh/utilities/containers/Lists/pointFieldPMG.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/Lists/pointFieldPMG.H rename to src/mesh/cfMesh/utilities/containers/Lists/pointFieldPMG.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/Lists/pointFieldPMGI.H b/src/mesh/cfMesh/utilities/containers/Lists/pointFieldPMGI.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/Lists/pointFieldPMGI.H rename to src/mesh/cfMesh/utilities/containers/Lists/pointFieldPMGI.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/LongList/LongList.C b/src/mesh/cfMesh/utilities/containers/LongList/LongList.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/LongList/LongList.C rename to src/mesh/cfMesh/utilities/containers/LongList/LongList.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/LongList/LongList.H b/src/mesh/cfMesh/utilities/containers/LongList/LongList.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/LongList/LongList.H rename to src/mesh/cfMesh/utilities/containers/LongList/LongList.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/LongList/LongListI.H b/src/mesh/cfMesh/utilities/containers/LongList/LongListI.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/LongList/LongListI.H rename to src/mesh/cfMesh/utilities/containers/LongList/LongListI.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/VRWGraph/VRWGraph.C b/src/mesh/cfMesh/utilities/containers/VRWGraph/VRWGraph.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/VRWGraph/VRWGraph.C rename to src/mesh/cfMesh/utilities/containers/VRWGraph/VRWGraph.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/VRWGraph/VRWGraph.H b/src/mesh/cfMesh/utilities/containers/VRWGraph/VRWGraph.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/VRWGraph/VRWGraph.H rename to src/mesh/cfMesh/utilities/containers/VRWGraph/VRWGraph.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/VRWGraph/VRWGraphI.H b/src/mesh/cfMesh/utilities/containers/VRWGraph/VRWGraphI.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/VRWGraph/VRWGraphI.H rename to src/mesh/cfMesh/utilities/containers/VRWGraph/VRWGraphI.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/VRWGraph/VRWGraphSMPModifier.C b/src/mesh/cfMesh/utilities/containers/VRWGraph/VRWGraphSMPModifier.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/VRWGraph/VRWGraphSMPModifier.C rename to src/mesh/cfMesh/utilities/containers/VRWGraph/VRWGraphSMPModifier.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/VRWGraph/VRWGraphSMPModifier.H b/src/mesh/cfMesh/utilities/containers/VRWGraph/VRWGraphSMPModifier.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/VRWGraph/VRWGraphSMPModifier.H rename to src/mesh/cfMesh/utilities/containers/VRWGraph/VRWGraphSMPModifier.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/VRWGraph/VRWGraphSMPModifierTemplates.C b/src/mesh/cfMesh/utilities/containers/VRWGraph/VRWGraphSMPModifierTemplates.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/VRWGraph/VRWGraphSMPModifierTemplates.C rename to src/mesh/cfMesh/utilities/containers/VRWGraph/VRWGraphSMPModifierTemplates.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/VRWGraphList/VRWGraphList.C b/src/mesh/cfMesh/utilities/containers/VRWGraphList/VRWGraphList.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/VRWGraphList/VRWGraphList.C rename to src/mesh/cfMesh/utilities/containers/VRWGraphList/VRWGraphList.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/VRWGraphList/VRWGraphList.H b/src/mesh/cfMesh/utilities/containers/VRWGraphList/VRWGraphList.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/VRWGraphList/VRWGraphList.H rename to src/mesh/cfMesh/utilities/containers/VRWGraphList/VRWGraphList.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/VRWGraphList/VRWGraphListI.H b/src/mesh/cfMesh/utilities/containers/VRWGraphList/VRWGraphListI.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/VRWGraphList/VRWGraphListI.H rename to src/mesh/cfMesh/utilities/containers/VRWGraphList/VRWGraphListI.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/graphRow/graphRow.H b/src/mesh/cfMesh/utilities/containers/graphRow/graphRow.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/graphRow/graphRow.H rename to src/mesh/cfMesh/utilities/containers/graphRow/graphRow.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/graphRow/graphRowI.H b/src/mesh/cfMesh/utilities/containers/graphRow/graphRowI.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/graphRow/graphRowI.H rename to src/mesh/cfMesh/utilities/containers/graphRow/graphRowI.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/subGraph/subGraph.H b/src/mesh/cfMesh/utilities/containers/subGraph/subGraph.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/subGraph/subGraph.H rename to src/mesh/cfMesh/utilities/containers/subGraph/subGraph.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/subGraph/subGraphI.H b/src/mesh/cfMesh/utilities/containers/subGraph/subGraphI.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/containers/subGraph/subGraphI.H rename to src/mesh/cfMesh/utilities/containers/subGraph/subGraphI.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/dataConversion/foamToFPMA/fpmaMesh.C b/src/mesh/cfMesh/utilities/dataConversion/foamToFPMA/fpmaMesh.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/dataConversion/foamToFPMA/fpmaMesh.C rename to src/mesh/cfMesh/utilities/dataConversion/foamToFPMA/fpmaMesh.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/dataConversion/foamToFPMA/fpmaMesh.H b/src/mesh/cfMesh/utilities/dataConversion/foamToFPMA/fpmaMesh.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/dataConversion/foamToFPMA/fpmaMesh.H rename to src/mesh/cfMesh/utilities/dataConversion/foamToFPMA/fpmaMesh.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/dataConversion/foamToFPMA/writeMeshFPMA.C b/src/mesh/cfMesh/utilities/dataConversion/foamToFPMA/writeMeshFPMA.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/dataConversion/foamToFPMA/writeMeshFPMA.C rename to src/mesh/cfMesh/utilities/dataConversion/foamToFPMA/writeMeshFPMA.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/dataConversion/foamToFPMA/writeMeshFPMA.H b/src/mesh/cfMesh/utilities/dataConversion/foamToFPMA/writeMeshFPMA.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/dataConversion/foamToFPMA/writeMeshFPMA.H rename to src/mesh/cfMesh/utilities/dataConversion/foamToFPMA/writeMeshFPMA.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/decomposeCells/decomposeCells.C b/src/mesh/cfMesh/utilities/decomposeCells/decomposeCells.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/decomposeCells/decomposeCells.C rename to src/mesh/cfMesh/utilities/decomposeCells/decomposeCells.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/decomposeCells/decomposeCells.H b/src/mesh/cfMesh/utilities/decomposeCells/decomposeCells.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/decomposeCells/decomposeCells.H rename to src/mesh/cfMesh/utilities/decomposeCells/decomposeCells.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/decomposeCells/decomposeCellsDecomposition.C b/src/mesh/cfMesh/utilities/decomposeCells/decomposeCellsDecomposition.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/decomposeCells/decomposeCellsDecomposition.C rename to src/mesh/cfMesh/utilities/decomposeCells/decomposeCellsDecomposition.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/decomposeCells/decomposeCellsPyramids.C b/src/mesh/cfMesh/utilities/decomposeCells/decomposeCellsPyramids.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/decomposeCells/decomposeCellsPyramids.C rename to src/mesh/cfMesh/utilities/decomposeCells/decomposeCellsPyramids.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/faceDecomposition/decomposeFaces.C b/src/mesh/cfMesh/utilities/faceDecomposition/decomposeFaces.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/faceDecomposition/decomposeFaces.C rename to src/mesh/cfMesh/utilities/faceDecomposition/decomposeFaces.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/faceDecomposition/decomposeFaces.H b/src/mesh/cfMesh/utilities/faceDecomposition/decomposeFaces.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/faceDecomposition/decomposeFaces.H rename to src/mesh/cfMesh/utilities/faceDecomposition/decomposeFaces.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/faceDecomposition/faceDecomposition.C b/src/mesh/cfMesh/utilities/faceDecomposition/faceDecomposition.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/faceDecomposition/faceDecomposition.C rename to src/mesh/cfMesh/utilities/faceDecomposition/faceDecomposition.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/faceDecomposition/faceDecomposition.H b/src/mesh/cfMesh/utilities/faceDecomposition/faceDecomposition.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/faceDecomposition/faceDecomposition.H rename to src/mesh/cfMesh/utilities/faceDecomposition/faceDecomposition.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/helperClasses/geometry/quadricFitting/quadricFitting.H b/src/mesh/cfMesh/utilities/helperClasses/geometry/quadricFitting/quadricFitting.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/helperClasses/geometry/quadricFitting/quadricFitting.H rename to src/mesh/cfMesh/utilities/helperClasses/geometry/quadricFitting/quadricFitting.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/helperClasses/geometry/quadricFitting/quadricFittingI.H b/src/mesh/cfMesh/utilities/helperClasses/geometry/quadricFitting/quadricFittingI.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/helperClasses/geometry/quadricFitting/quadricFittingI.H rename to src/mesh/cfMesh/utilities/helperClasses/geometry/quadricFitting/quadricFittingI.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/helperClasses/matrices/matrix2D.H b/src/mesh/cfMesh/utilities/helperClasses/matrices/matrix2D.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/helperClasses/matrices/matrix2D.H rename to src/mesh/cfMesh/utilities/helperClasses/matrices/matrix2D.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/helperClasses/matrices/matrix2DI.H b/src/mesh/cfMesh/utilities/helperClasses/matrices/matrix2DI.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/helperClasses/matrices/matrix2DI.H rename to src/mesh/cfMesh/utilities/helperClasses/matrices/matrix2DI.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/helperClasses/matrices/matrix3D.H b/src/mesh/cfMesh/utilities/helperClasses/matrices/matrix3D.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/helperClasses/matrices/matrix3D.H rename to src/mesh/cfMesh/utilities/helperClasses/matrices/matrix3D.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/helperClasses/matrices/matrix3DI.H b/src/mesh/cfMesh/utilities/helperClasses/matrices/matrix3DI.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/helperClasses/matrices/matrix3DI.H rename to src/mesh/cfMesh/utilities/helperClasses/matrices/matrix3DI.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/helperClasses/parallelHelpers/labelledMeshOctreeCubeCoordinates/labelledMeshOctreeCubeCoordinates.H b/src/mesh/cfMesh/utilities/helperClasses/parallelHelpers/labelledMeshOctreeCubeCoordinates/labelledMeshOctreeCubeCoordinates.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/helperClasses/parallelHelpers/labelledMeshOctreeCubeCoordinates/labelledMeshOctreeCubeCoordinates.H rename to src/mesh/cfMesh/utilities/helperClasses/parallelHelpers/labelledMeshOctreeCubeCoordinates/labelledMeshOctreeCubeCoordinates.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/helperClasses/parallelHelpers/labelledPair/labelledPair.H b/src/mesh/cfMesh/utilities/helperClasses/parallelHelpers/labelledPair/labelledPair.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/helperClasses/parallelHelpers/labelledPair/labelledPair.H rename to src/mesh/cfMesh/utilities/helperClasses/parallelHelpers/labelledPair/labelledPair.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/helperClasses/parallelHelpers/labelledPoint/labelledPoint.H b/src/mesh/cfMesh/utilities/helperClasses/parallelHelpers/labelledPoint/labelledPoint.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/helperClasses/parallelHelpers/labelledPoint/labelledPoint.H rename to src/mesh/cfMesh/utilities/helperClasses/parallelHelpers/labelledPoint/labelledPoint.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/helperClasses/parallelHelpers/labelledPoint/refLabelledPoint.H b/src/mesh/cfMesh/utilities/helperClasses/parallelHelpers/labelledPoint/refLabelledPoint.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/helperClasses/parallelHelpers/labelledPoint/refLabelledPoint.H rename to src/mesh/cfMesh/utilities/helperClasses/parallelHelpers/labelledPoint/refLabelledPoint.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/helperClasses/parallelHelpers/labelledPointScalar/labelledPointScalar.H b/src/mesh/cfMesh/utilities/helperClasses/parallelHelpers/labelledPointScalar/labelledPointScalar.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/helperClasses/parallelHelpers/labelledPointScalar/labelledPointScalar.H rename to src/mesh/cfMesh/utilities/helperClasses/parallelHelpers/labelledPointScalar/labelledPointScalar.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/helperClasses/parallelHelpers/labelledPointScalar/refLabelledPointScalar.H b/src/mesh/cfMesh/utilities/helperClasses/parallelHelpers/labelledPointScalar/refLabelledPointScalar.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/helperClasses/parallelHelpers/labelledPointScalar/refLabelledPointScalar.H rename to src/mesh/cfMesh/utilities/helperClasses/parallelHelpers/labelledPointScalar/refLabelledPointScalar.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/helperClasses/parallelHelpers/labelledScalar/labelledScalar.H b/src/mesh/cfMesh/utilities/helperClasses/parallelHelpers/labelledScalar/labelledScalar.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/helperClasses/parallelHelpers/labelledScalar/labelledScalar.H rename to src/mesh/cfMesh/utilities/helperClasses/parallelHelpers/labelledScalar/labelledScalar.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/helperClasses/parallelHelpers/parPartTet/parPartTet.H b/src/mesh/cfMesh/utilities/helperClasses/parallelHelpers/parPartTet/parPartTet.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/helperClasses/parallelHelpers/parPartTet/parPartTet.H rename to src/mesh/cfMesh/utilities/helperClasses/parallelHelpers/parPartTet/parPartTet.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/helperClasses/parallelHelpers/parTriFace/parTriFace.H b/src/mesh/cfMesh/utilities/helperClasses/parallelHelpers/parTriFace/parTriFace.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/helperClasses/parallelHelpers/parTriFace/parTriFace.H rename to src/mesh/cfMesh/utilities/helperClasses/parallelHelpers/parTriFace/parTriFace.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/helperClasses/sortEdgesIntoChains/sortEdgesIntoChains.C b/src/mesh/cfMesh/utilities/helperClasses/sortEdgesIntoChains/sortEdgesIntoChains.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/helperClasses/sortEdgesIntoChains/sortEdgesIntoChains.C rename to src/mesh/cfMesh/utilities/helperClasses/sortEdgesIntoChains/sortEdgesIntoChains.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/helperClasses/sortEdgesIntoChains/sortEdgesIntoChains.H b/src/mesh/cfMesh/utilities/helperClasses/sortEdgesIntoChains/sortEdgesIntoChains.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/helperClasses/sortEdgesIntoChains/sortEdgesIntoChains.H rename to src/mesh/cfMesh/utilities/helperClasses/sortEdgesIntoChains/sortEdgesIntoChains.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/helperFunctions/helperFunctions.H b/src/mesh/cfMesh/utilities/helperFunctions/helperFunctions.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/helperFunctions/helperFunctions.H rename to src/mesh/cfMesh/utilities/helperFunctions/helperFunctions.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/helperFunctions/helperFunctionsFrontalMarking.C b/src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsFrontalMarking.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/helperFunctions/helperFunctionsFrontalMarking.C rename to src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsFrontalMarking.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/helperFunctions/helperFunctionsFrontalMarking.H b/src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsFrontalMarking.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/helperFunctions/helperFunctionsFrontalMarking.H rename to src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsFrontalMarking.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/helperFunctions/helperFunctionsGeometryQueries.H b/src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsGeometryQueries.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/helperFunctions/helperFunctionsGeometryQueries.H rename to src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsGeometryQueries.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/helperFunctions/helperFunctionsGeometryQueriesI.H b/src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsGeometryQueriesI.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/helperFunctions/helperFunctionsGeometryQueriesI.H rename to src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsGeometryQueriesI.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/helperFunctions/helperFunctionsPar.C b/src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsPar.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/helperFunctions/helperFunctionsPar.C rename to src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsPar.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/helperFunctions/helperFunctionsPar.H b/src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsPar.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/helperFunctions/helperFunctionsPar.H rename to src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsPar.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/helperFunctions/helperFunctionsStringConversion.C b/src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsStringConversion.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/helperFunctions/helperFunctionsStringConversion.C rename to src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsStringConversion.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/helperFunctions/helperFunctionsStringConversion.H b/src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsStringConversion.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/helperFunctions/helperFunctionsStringConversion.H rename to src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsStringConversion.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/helperFunctions/helperFunctionsTopologyManipulation.H b/src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsTopologyManipulation.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/helperFunctions/helperFunctionsTopologyManipulation.H rename to src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsTopologyManipulation.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/helperFunctions/helperFunctionsTopologyManipulationI.H b/src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsTopologyManipulationI.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/helperFunctions/helperFunctionsTopologyManipulationI.H rename to src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsTopologyManipulationI.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/intersectionTools/findCellsIntersectingSurface/findCellsIntersectingSurface.C b/src/mesh/cfMesh/utilities/intersectionTools/findCellsIntersectingSurface/findCellsIntersectingSurface.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/intersectionTools/findCellsIntersectingSurface/findCellsIntersectingSurface.C rename to src/mesh/cfMesh/utilities/intersectionTools/findCellsIntersectingSurface/findCellsIntersectingSurface.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/intersectionTools/findCellsIntersectingSurface/findCellsIntersectingSurface.H b/src/mesh/cfMesh/utilities/intersectionTools/findCellsIntersectingSurface/findCellsIntersectingSurface.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/intersectionTools/findCellsIntersectingSurface/findCellsIntersectingSurface.H rename to src/mesh/cfMesh/utilities/intersectionTools/findCellsIntersectingSurface/findCellsIntersectingSurface.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/partTetMesh/partTetMesh.C b/src/mesh/cfMesh/utilities/meshes/partTetMesh/partTetMesh.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/partTetMesh/partTetMesh.C rename to src/mesh/cfMesh/utilities/meshes/partTetMesh/partTetMesh.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/partTetMesh/partTetMesh.H b/src/mesh/cfMesh/utilities/meshes/partTetMesh/partTetMesh.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/partTetMesh/partTetMesh.H rename to src/mesh/cfMesh/utilities/meshes/partTetMesh/partTetMesh.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/partTetMesh/partTetMeshAddressing.C b/src/mesh/cfMesh/utilities/meshes/partTetMesh/partTetMeshAddressing.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/partTetMesh/partTetMeshAddressing.C rename to src/mesh/cfMesh/utilities/meshes/partTetMesh/partTetMeshAddressing.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/partTetMesh/partTetMeshParallelAddressing.C b/src/mesh/cfMesh/utilities/meshes/partTetMesh/partTetMeshParallelAddressing.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/partTetMesh/partTetMeshParallelAddressing.C rename to src/mesh/cfMesh/utilities/meshes/partTetMesh/partTetMeshParallelAddressing.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/partTetMesh/partTetMeshSimplex.C b/src/mesh/cfMesh/utilities/meshes/partTetMesh/partTetMeshSimplex.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/partTetMesh/partTetMeshSimplex.C rename to src/mesh/cfMesh/utilities/meshes/partTetMesh/partTetMeshSimplex.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/partTetMesh/partTetMeshSimplex.H b/src/mesh/cfMesh/utilities/meshes/partTetMesh/partTetMeshSimplex.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/partTetMesh/partTetMeshSimplex.H rename to src/mesh/cfMesh/utilities/meshes/partTetMesh/partTetMeshSimplex.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/partTriMesh/partTriMesh.C b/src/mesh/cfMesh/utilities/meshes/partTriMesh/partTriMesh.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/partTriMesh/partTriMesh.C rename to src/mesh/cfMesh/utilities/meshes/partTriMesh/partTriMesh.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/partTriMesh/partTriMesh.H b/src/mesh/cfMesh/utilities/meshes/partTriMesh/partTriMesh.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/partTriMesh/partTriMesh.H rename to src/mesh/cfMesh/utilities/meshes/partTriMesh/partTriMesh.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/partTriMesh/partTriMeshAddressing.C b/src/mesh/cfMesh/utilities/meshes/partTriMesh/partTriMeshAddressing.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/partTriMesh/partTriMeshAddressing.C rename to src/mesh/cfMesh/utilities/meshes/partTriMesh/partTriMeshAddressing.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/partTriMesh/partTriMeshParallelAddressing.C b/src/mesh/cfMesh/utilities/meshes/partTriMesh/partTriMeshParallelAddressing.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/partTriMesh/partTriMeshParallelAddressing.C rename to src/mesh/cfMesh/utilities/meshes/partTriMesh/partTriMeshParallelAddressing.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/partTriMesh/partTriMeshSimplex.C b/src/mesh/cfMesh/utilities/meshes/partTriMesh/partTriMeshSimplex.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/partTriMesh/partTriMeshSimplex.C rename to src/mesh/cfMesh/utilities/meshes/partTriMesh/partTriMeshSimplex.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/partTriMesh/partTriMeshSimplex.H b/src/mesh/cfMesh/utilities/meshes/partTriMesh/partTriMeshSimplex.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/partTriMesh/partTriMeshSimplex.H rename to src/mesh/cfMesh/utilities/meshes/partTriMesh/partTriMeshSimplex.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/boundaryPatch/boundaryPatch.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGen/boundaryPatch/boundaryPatch.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/boundaryPatch/boundaryPatch.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGen/boundaryPatch/boundaryPatch.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/boundaryPatch/boundaryPatch.H b/src/mesh/cfMesh/utilities/meshes/polyMeshGen/boundaryPatch/boundaryPatch.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/boundaryPatch/boundaryPatch.H rename to src/mesh/cfMesh/utilities/meshes/polyMeshGen/boundaryPatch/boundaryPatch.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/boundaryPatch/boundaryPatchBase.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGen/boundaryPatch/boundaryPatchBase.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/boundaryPatch/boundaryPatchBase.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGen/boundaryPatch/boundaryPatchBase.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/boundaryPatch/boundaryPatchBase.H b/src/mesh/cfMesh/utilities/meshes/polyMeshGen/boundaryPatch/boundaryPatchBase.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/boundaryPatch/boundaryPatchBase.H rename to src/mesh/cfMesh/utilities/meshes/polyMeshGen/boundaryPatch/boundaryPatchBase.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/boundaryPatch/processorBoundaryPatch.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGen/boundaryPatch/processorBoundaryPatch.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/boundaryPatch/processorBoundaryPatch.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGen/boundaryPatch/processorBoundaryPatch.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/boundaryPatch/processorBoundaryPatch.H b/src/mesh/cfMesh/utilities/meshes/polyMeshGen/boundaryPatch/processorBoundaryPatch.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/boundaryPatch/processorBoundaryPatch.H rename to src/mesh/cfMesh/utilities/meshes/polyMeshGen/boundaryPatch/processorBoundaryPatch.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGen.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGen/polyMeshGen.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGen.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGen/polyMeshGen.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGen.H b/src/mesh/cfMesh/utilities/meshes/polyMeshGen/polyMeshGen.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGen.H rename to src/mesh/cfMesh/utilities/meshes/polyMeshGen/polyMeshGen.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenCells.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGen/polyMeshGenCells.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenCells.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGen/polyMeshGenCells.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenCells.H b/src/mesh/cfMesh/utilities/meshes/polyMeshGen/polyMeshGenCells.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenCells.H rename to src/mesh/cfMesh/utilities/meshes/polyMeshGen/polyMeshGenCells.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenCellsI.H b/src/mesh/cfMesh/utilities/meshes/polyMeshGen/polyMeshGenCellsI.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenCellsI.H rename to src/mesh/cfMesh/utilities/meshes/polyMeshGen/polyMeshGenCellsI.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenFaces.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGen/polyMeshGenFaces.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenFaces.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGen/polyMeshGenFaces.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenFaces.H b/src/mesh/cfMesh/utilities/meshes/polyMeshGen/polyMeshGenFaces.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenFaces.H rename to src/mesh/cfMesh/utilities/meshes/polyMeshGen/polyMeshGenFaces.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenFacesI.H b/src/mesh/cfMesh/utilities/meshes/polyMeshGen/polyMeshGenFacesI.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenFacesI.H rename to src/mesh/cfMesh/utilities/meshes/polyMeshGen/polyMeshGenFacesI.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenPoints.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGen/polyMeshGenPoints.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenPoints.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGen/polyMeshGenPoints.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenPoints.H b/src/mesh/cfMesh/utilities/meshes/polyMeshGen/polyMeshGenPoints.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenPoints.H rename to src/mesh/cfMesh/utilities/meshes/polyMeshGen/polyMeshGenPoints.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenPointsI.H b/src/mesh/cfMesh/utilities/meshes/polyMeshGen/polyMeshGenPointsI.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenPointsI.H rename to src/mesh/cfMesh/utilities/meshes/polyMeshGen/polyMeshGenPointsI.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen2DEngine/polyMeshGen2DEngine.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGen2DEngine/polyMeshGen2DEngine.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen2DEngine/polyMeshGen2DEngine.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGen2DEngine/polyMeshGen2DEngine.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen2DEngine/polyMeshGen2DEngine.H b/src/mesh/cfMesh/utilities/meshes/polyMeshGen2DEngine/polyMeshGen2DEngine.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen2DEngine/polyMeshGen2DEngine.H rename to src/mesh/cfMesh/utilities/meshes/polyMeshGen2DEngine/polyMeshGen2DEngine.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen2DEngine/polyMeshGen2DEngineI.H b/src/mesh/cfMesh/utilities/meshes/polyMeshGen2DEngine/polyMeshGen2DEngineI.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen2DEngine/polyMeshGen2DEngineI.H rename to src/mesh/cfMesh/utilities/meshes/polyMeshGen2DEngine/polyMeshGen2DEngineI.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressing.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressing.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressing.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressing.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressing.H b/src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressing.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressing.H rename to src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressing.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingCellCells.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingCellCells.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingCellCells.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingCellCells.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingCellEdges.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingCellEdges.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingCellEdges.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingCellEdges.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingCellPoints.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingCellPoints.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingCellPoints.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingCellPoints.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingCentresAndAreas.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingCentresAndAreas.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingCentresAndAreas.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingCentresAndAreas.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingCentresAndVols.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingCentresAndVols.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingCentresAndVols.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingCentresAndVols.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingClear.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingClear.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingClear.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingClear.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingEdgeCells.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingEdgeCells.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingEdgeCells.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingEdgeCells.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingEdgeFaces.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingEdgeFaces.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingEdgeFaces.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingEdgeFaces.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingEdges.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingEdges.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingEdges.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingEdges.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingFaceEdges.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingFaceEdges.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingFaceEdges.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingFaceEdges.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingParallelAddressing.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingParallelAddressing.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingParallelAddressing.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingParallelAddressing.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingPointCells.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingPointCells.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingPointCells.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingPointCells.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingPointEdges.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingPointEdges.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingPointEdges.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingPointEdges.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingPointFaces.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingPointFaces.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingPointFaces.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingPointFaces.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingPointPoints.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingPointPoints.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingPointPoints.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingPointPoints.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingUpdateGeometry.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingUpdateGeometry.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingUpdateGeometry.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingUpdateGeometry.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenChecks/polyMeshGenChecks.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGenChecks/polyMeshGenChecks.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenChecks/polyMeshGenChecks.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGenChecks/polyMeshGenChecks.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenChecks/polyMeshGenChecks.H b/src/mesh/cfMesh/utilities/meshes/polyMeshGenChecks/polyMeshGenChecks.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenChecks/polyMeshGenChecks.H rename to src/mesh/cfMesh/utilities/meshes/polyMeshGenChecks/polyMeshGenChecks.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenChecks/polyMeshGenChecksGeometry.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGenChecks/polyMeshGenChecksGeometry.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenChecks/polyMeshGenChecksGeometry.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGenChecks/polyMeshGenChecksGeometry.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenChecks/polyMeshGenChecksTopology.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGenChecks/polyMeshGenChecksTopology.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenChecks/polyMeshGenChecksTopology.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGenChecks/polyMeshGenChecksTopology.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifier.H b/src/mesh/cfMesh/utilities/meshes/polyMeshGenModifier/polyMeshGenModifier.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifier.H rename to src/mesh/cfMesh/utilities/meshes/polyMeshGenModifier/polyMeshGenModifier.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddBufferCells.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddBufferCells.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddBufferCells.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddBufferCells.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddCellByCell.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddCellByCell.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddCellByCell.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddCellByCell.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddCellByCell.H b/src/mesh/cfMesh/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddCellByCell.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddCellByCell.H rename to src/mesh/cfMesh/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddCellByCell.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddCells.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddCells.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddCells.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddCells.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddProcessorFaces.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddProcessorFaces.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddProcessorFaces.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddProcessorFaces.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRemoveCells.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRemoveCells.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRemoveCells.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRemoveCells.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRemoveFaces.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRemoveFaces.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRemoveFaces.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRemoveFaces.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRemoveUnusedVertices.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRemoveUnusedVertices.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRemoveUnusedVertices.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRemoveUnusedVertices.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRenumberMesh.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRenumberMesh.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRenumberMesh.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRenumberMesh.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierReorderBoundaryFaces.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierReorderBoundaryFaces.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierReorderBoundaryFaces.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierReorderBoundaryFaces.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierReplaceBoundary.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierReplaceBoundary.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierReplaceBoundary.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierReplaceBoundary.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierZipUpCells.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierZipUpCells.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierZipUpCells.C rename to src/mesh/cfMesh/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierZipUpCells.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/primitives/meshSubsets/meshSubset.H b/src/mesh/cfMesh/utilities/meshes/primitives/meshSubsets/meshSubset.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/primitives/meshSubsets/meshSubset.H rename to src/mesh/cfMesh/utilities/meshes/primitives/meshSubsets/meshSubset.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/primitives/meshSubsets/meshSubsetI.H b/src/mesh/cfMesh/utilities/meshes/primitives/meshSubsets/meshSubsetI.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/primitives/meshSubsets/meshSubsetI.H rename to src/mesh/cfMesh/utilities/meshes/primitives/meshSubsets/meshSubsetI.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/primitives/partTet/partTet.H b/src/mesh/cfMesh/utilities/meshes/primitives/partTet/partTet.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/primitives/partTet/partTet.H rename to src/mesh/cfMesh/utilities/meshes/primitives/partTet/partTet.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/primitives/partTet/partTetI.H b/src/mesh/cfMesh/utilities/meshes/primitives/partTet/partTetI.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/primitives/partTet/partTetI.H rename to src/mesh/cfMesh/utilities/meshes/primitives/partTet/partTetI.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurf.C b/src/mesh/cfMesh/utilities/meshes/triSurf/triSurf.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurf.C rename to src/mesh/cfMesh/utilities/meshes/triSurf/triSurf.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurf.H b/src/mesh/cfMesh/utilities/meshes/triSurf/triSurf.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurf.H rename to src/mesh/cfMesh/utilities/meshes/triSurf/triSurf.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurfAddressing.C b/src/mesh/cfMesh/utilities/meshes/triSurf/triSurfAddressing.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurfAddressing.C rename to src/mesh/cfMesh/utilities/meshes/triSurf/triSurfAddressing.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurfAddressing.H b/src/mesh/cfMesh/utilities/meshes/triSurf/triSurfAddressing.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurfAddressing.H rename to src/mesh/cfMesh/utilities/meshes/triSurf/triSurfAddressing.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurfAddressingI.H b/src/mesh/cfMesh/utilities/meshes/triSurf/triSurfAddressingI.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurfAddressingI.H rename to src/mesh/cfMesh/utilities/meshes/triSurf/triSurfAddressingI.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurfFacets.C b/src/mesh/cfMesh/utilities/meshes/triSurf/triSurfFacets.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurfFacets.C rename to src/mesh/cfMesh/utilities/meshes/triSurf/triSurfFacets.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurfFacets.H b/src/mesh/cfMesh/utilities/meshes/triSurf/triSurfFacets.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurfFacets.H rename to src/mesh/cfMesh/utilities/meshes/triSurf/triSurfFacets.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurfFacetsI.H b/src/mesh/cfMesh/utilities/meshes/triSurf/triSurfFacetsI.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurfFacetsI.H rename to src/mesh/cfMesh/utilities/meshes/triSurf/triSurfFacetsI.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurfFeatureEdges.C b/src/mesh/cfMesh/utilities/meshes/triSurf/triSurfFeatureEdges.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurfFeatureEdges.C rename to src/mesh/cfMesh/utilities/meshes/triSurf/triSurfFeatureEdges.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurfFeatureEdges.H b/src/mesh/cfMesh/utilities/meshes/triSurf/triSurfFeatureEdges.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurfFeatureEdges.H rename to src/mesh/cfMesh/utilities/meshes/triSurf/triSurfFeatureEdges.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurfFeatureEdgesI.H b/src/mesh/cfMesh/utilities/meshes/triSurf/triSurfFeatureEdgesI.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurfFeatureEdgesI.H rename to src/mesh/cfMesh/utilities/meshes/triSurf/triSurfFeatureEdgesI.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurfI.H b/src/mesh/cfMesh/utilities/meshes/triSurf/triSurfI.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurfI.H rename to src/mesh/cfMesh/utilities/meshes/triSurf/triSurfI.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurfModifier.C b/src/mesh/cfMesh/utilities/meshes/triSurf/triSurfModifier.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurfModifier.C rename to src/mesh/cfMesh/utilities/meshes/triSurf/triSurfModifier.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurfModifier.H b/src/mesh/cfMesh/utilities/meshes/triSurf/triSurfModifier.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurfModifier.H rename to src/mesh/cfMesh/utilities/meshes/triSurf/triSurfModifier.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurfModifierI.H b/src/mesh/cfMesh/utilities/meshes/triSurf/triSurfModifierI.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurfModifierI.H rename to src/mesh/cfMesh/utilities/meshes/triSurf/triSurfModifierI.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurfPoints.C b/src/mesh/cfMesh/utilities/meshes/triSurf/triSurfPoints.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurfPoints.C rename to src/mesh/cfMesh/utilities/meshes/triSurf/triSurfPoints.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurfPoints.H b/src/mesh/cfMesh/utilities/meshes/triSurf/triSurfPoints.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurfPoints.H rename to src/mesh/cfMesh/utilities/meshes/triSurf/triSurfPoints.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurfPointsI.H b/src/mesh/cfMesh/utilities/meshes/triSurf/triSurfPointsI.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurfPointsI.H rename to src/mesh/cfMesh/utilities/meshes/triSurf/triSurfPointsI.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctree.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctree.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctree.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctree.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctree.H b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctree.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctree.H rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctree.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressing.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressing.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressing.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressing.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressing.H b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressing.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressing.H rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressing.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingCreation.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingCreation.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingCreation.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingCreation.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingGluedMesh.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingGluedMesh.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingGluedMesh.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingGluedMesh.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingI.H b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingI.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingI.H rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingI.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingIrregularConnections.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingIrregularConnections.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingIrregularConnections.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingIrregularConnections.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingParallelAddressing.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingParallelAddressing.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingParallelAddressing.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingParallelAddressing.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeAutomaticRefinement/meshOctreeAutomaticRefinement.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeAutomaticRefinement/meshOctreeAutomaticRefinement.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeAutomaticRefinement/meshOctreeAutomaticRefinement.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeAutomaticRefinement/meshOctreeAutomaticRefinement.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeAutomaticRefinement/meshOctreeAutomaticRefinement.H b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeAutomaticRefinement/meshOctreeAutomaticRefinement.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeAutomaticRefinement/meshOctreeAutomaticRefinement.H rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeAutomaticRefinement/meshOctreeAutomaticRefinement.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeAutomaticRefinement/meshOctreeAutomaticRefinementRef.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeAutomaticRefinement/meshOctreeAutomaticRefinementRef.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeAutomaticRefinement/meshOctreeAutomaticRefinementRef.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeAutomaticRefinement/meshOctreeAutomaticRefinementRef.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreator.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreator.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreator.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreator.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreator.H b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreator.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreator.H rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreator.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreatorAdjustOctreeToSurface.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreatorAdjustOctreeToSurface.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreatorAdjustOctreeToSurface.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreatorAdjustOctreeToSurface.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreatorCreateOctreeBoxes.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreatorCreateOctreeBoxes.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreatorCreateOctreeBoxes.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreatorCreateOctreeBoxes.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreatorFrontalMarking.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreatorFrontalMarking.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreatorFrontalMarking.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreatorFrontalMarking.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreatorLoadDistribution.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreatorLoadDistribution.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreatorLoadDistribution.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreatorLoadDistribution.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCube.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCube.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCube.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCube.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCube.H b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCube.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCube.H rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCube.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeBasic.H b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeBasic.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeBasic.H rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeBasic.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeBasicI.H b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeBasicI.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeBasicI.H rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeBasicI.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeCoordinates.H b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeCoordinates.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeCoordinates.H rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeCoordinates.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeCoordinatesI.H b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeCoordinatesI.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeCoordinatesI.H rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeCoordinatesI.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeCoordinatesIntersections.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeCoordinatesIntersections.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeCoordinatesIntersections.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeCoordinatesIntersections.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeI.H b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeI.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeI.H rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeI.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeIntersections.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeIntersections.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeIntersections.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeIntersections.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeRecursiveFunctions.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeRecursiveFunctions.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeRecursiveFunctions.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeRecursiveFunctions.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeRefine.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeRefine.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeRefine.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeRefine.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCubePatches.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCubePatches.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCubePatches.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCubePatches.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeFindNearestSurfacePoint.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeFindNearestSurfacePoint.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeFindNearestSurfacePoint.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeFindNearestSurfacePoint.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeI.H b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeI.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeI.H rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeI.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeInsideCalculations.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeInsideCalculations.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeInsideCalculations.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeInsideCalculations.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeInsideOutside/meshOctreeInsideOutside.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeInsideOutside/meshOctreeInsideOutside.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeInsideOutside/meshOctreeInsideOutside.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeInsideOutside/meshOctreeInsideOutside.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeInsideOutside/meshOctreeInsideOutside.H b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeInsideOutside/meshOctreeInsideOutside.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeInsideOutside/meshOctreeInsideOutside.H rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeInsideOutside/meshOctreeInsideOutside.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifier.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifier.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifier.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifier.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifier.H b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifier.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifier.H rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifier.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierDistributeLeavesToProcessors.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierDistributeLeavesToProcessors.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierDistributeLeavesToProcessors.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierDistributeLeavesToProcessors.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierEnsureCorrectRegularity.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierEnsureCorrectRegularity.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierEnsureCorrectRegularity.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierEnsureCorrectRegularity.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierI.H b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierI.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierI.H rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierI.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierLoadDistribution.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierLoadDistribution.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierLoadDistribution.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierLoadDistribution.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierParallelRefinement.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierParallelRefinement.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierParallelRefinement.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierParallelRefinement.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierReduceMemoryConsumption.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierReduceMemoryConsumption.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierReduceMemoryConsumption.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierReduceMemoryConsumption.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierRefineSelectedBoxes.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierRefineSelectedBoxes.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierRefineSelectedBoxes.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierRefineSelectedBoxes.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierUpdateCommunicationPattern.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierUpdateCommunicationPattern.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierUpdateCommunicationPattern.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierUpdateCommunicationPattern.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeNeighbourSearches.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeNeighbourSearches.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeNeighbourSearches.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeNeighbourSearches.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeParallelCommunication.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeParallelCommunication.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeParallelCommunication.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeParallelCommunication.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeSlot.H b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeSlot.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeSlot.H rename to src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeSlot.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/refinementControls/objectRefinement/boxRefinement.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/refinementControls/objectRefinement/boxRefinement.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/refinementControls/objectRefinement/boxRefinement.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/refinementControls/objectRefinement/boxRefinement.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/refinementControls/objectRefinement/boxRefinement.H b/src/mesh/cfMesh/utilities/octrees/meshOctree/refinementControls/objectRefinement/boxRefinement.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/refinementControls/objectRefinement/boxRefinement.H rename to src/mesh/cfMesh/utilities/octrees/meshOctree/refinementControls/objectRefinement/boxRefinement.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/refinementControls/objectRefinement/coneRefinement.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/refinementControls/objectRefinement/coneRefinement.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/refinementControls/objectRefinement/coneRefinement.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/refinementControls/objectRefinement/coneRefinement.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/refinementControls/objectRefinement/coneRefinement.H b/src/mesh/cfMesh/utilities/octrees/meshOctree/refinementControls/objectRefinement/coneRefinement.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/refinementControls/objectRefinement/coneRefinement.H rename to src/mesh/cfMesh/utilities/octrees/meshOctree/refinementControls/objectRefinement/coneRefinement.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/refinementControls/objectRefinement/lineRefinement.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/refinementControls/objectRefinement/lineRefinement.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/refinementControls/objectRefinement/lineRefinement.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/refinementControls/objectRefinement/lineRefinement.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/refinementControls/objectRefinement/lineRefinement.H b/src/mesh/cfMesh/utilities/octrees/meshOctree/refinementControls/objectRefinement/lineRefinement.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/refinementControls/objectRefinement/lineRefinement.H rename to src/mesh/cfMesh/utilities/octrees/meshOctree/refinementControls/objectRefinement/lineRefinement.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/refinementControls/objectRefinement/newObjectRefinement.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/refinementControls/objectRefinement/newObjectRefinement.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/refinementControls/objectRefinement/newObjectRefinement.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/refinementControls/objectRefinement/newObjectRefinement.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/refinementControls/objectRefinement/objectRefinement.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/refinementControls/objectRefinement/objectRefinement.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/refinementControls/objectRefinement/objectRefinement.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/refinementControls/objectRefinement/objectRefinement.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/refinementControls/objectRefinement/objectRefinement.H b/src/mesh/cfMesh/utilities/octrees/meshOctree/refinementControls/objectRefinement/objectRefinement.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/refinementControls/objectRefinement/objectRefinement.H rename to src/mesh/cfMesh/utilities/octrees/meshOctree/refinementControls/objectRefinement/objectRefinement.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/refinementControls/objectRefinement/objectRefinementList.H b/src/mesh/cfMesh/utilities/octrees/meshOctree/refinementControls/objectRefinement/objectRefinementList.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/refinementControls/objectRefinement/objectRefinementList.H rename to src/mesh/cfMesh/utilities/octrees/meshOctree/refinementControls/objectRefinement/objectRefinementList.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/refinementControls/objectRefinement/sphereRefinement.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/refinementControls/objectRefinement/sphereRefinement.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/refinementControls/objectRefinement/sphereRefinement.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/refinementControls/objectRefinement/sphereRefinement.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/refinementControls/objectRefinement/sphereRefinement.H b/src/mesh/cfMesh/utilities/octrees/meshOctree/refinementControls/objectRefinement/sphereRefinement.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/refinementControls/objectRefinement/sphereRefinement.H rename to src/mesh/cfMesh/utilities/octrees/meshOctree/refinementControls/objectRefinement/sphereRefinement.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/refinementControls/patchRefinement/patchRefinement.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/refinementControls/patchRefinement/patchRefinement.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/refinementControls/patchRefinement/patchRefinement.C rename to src/mesh/cfMesh/utilities/octrees/meshOctree/refinementControls/patchRefinement/patchRefinement.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/refinementControls/patchRefinement/patchRefinement.H b/src/mesh/cfMesh/utilities/octrees/meshOctree/refinementControls/patchRefinement/patchRefinement.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/refinementControls/patchRefinement/patchRefinement.H rename to src/mesh/cfMesh/utilities/octrees/meshOctree/refinementControls/patchRefinement/patchRefinement.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/refinementControls/patchRefinement/patchRefinementList.H b/src/mesh/cfMesh/utilities/octrees/meshOctree/refinementControls/patchRefinement/patchRefinementList.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/refinementControls/patchRefinement/patchRefinementList.H rename to src/mesh/cfMesh/utilities/octrees/meshOctree/refinementControls/patchRefinement/patchRefinementList.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizer.C b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/meshOptimizer.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizer.C rename to src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/meshOptimizer.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizer.H b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/meshOptimizer.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizer.H rename to src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/meshOptimizer.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizerOptimizePoint.C b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/meshOptimizerOptimizePoint.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizerOptimizePoint.C rename to src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/meshOptimizerOptimizePoint.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizerOptimizePointParallel.C b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/meshOptimizerOptimizePointParallel.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizerOptimizePointParallel.C rename to src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/meshOptimizerOptimizePointParallel.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizerOptimizeSurface.C b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/meshOptimizerOptimizeSurface.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizerOptimizeSurface.C rename to src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/meshOptimizerOptimizeSurface.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/optimizeMeshFV.C b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/optimizeMeshFV.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/optimizeMeshFV.C rename to src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/optimizeMeshFV.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/symmetryPlaneOptimisation/symmetryPlaneOptimisation.C b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/symmetryPlaneOptimisation/symmetryPlaneOptimisation.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/symmetryPlaneOptimisation/symmetryPlaneOptimisation.C rename to src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/symmetryPlaneOptimisation/symmetryPlaneOptimisation.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/symmetryPlaneOptimisation/symmetryPlaneOptimisation.H b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/symmetryPlaneOptimisation/symmetryPlaneOptimisation.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/symmetryPlaneOptimisation/symmetryPlaneOptimisation.H rename to src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/symmetryPlaneOptimisation/symmetryPlaneOptimisation.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/knuppMetric/knuppMetric.C b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/knuppMetric/knuppMetric.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/knuppMetric/knuppMetric.C rename to src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/knuppMetric/knuppMetric.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/knuppMetric/knuppMetric.H b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/knuppMetric/knuppMetric.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/knuppMetric/knuppMetric.H rename to src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/knuppMetric/knuppMetric.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntangler.C b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntangler.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntangler.C rename to src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntangler.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntangler.H b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntangler.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntangler.H rename to src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntangler.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegion.C b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegion.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegion.C rename to src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegion.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegionEdges.C b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegionEdges.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegionEdges.C rename to src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegionEdges.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegionFaces.C b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegionFaces.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegionFaces.C rename to src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegionFaces.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegionPoints.C b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegionPoints.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegionPoints.C rename to src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegionPoints.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegionTieBreak.C b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegionTieBreak.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegionTieBreak.C rename to src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegionTieBreak.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/quadricMetric/quadricMetric.C b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/quadricMetric/quadricMetric.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/quadricMetric/quadricMetric.C rename to src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/quadricMetric/quadricMetric.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/quadricMetric/quadricMetric.H b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/quadricMetric/quadricMetric.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/quadricMetric/quadricMetric.H rename to src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/quadricMetric/quadricMetric.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/simplexSmoother/simplexSmoother.C b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/simplexSmoother/simplexSmoother.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/simplexSmoother/simplexSmoother.C rename to src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/simplexSmoother/simplexSmoother.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/simplexSmoother/simplexSmoother.H b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/simplexSmoother/simplexSmoother.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/simplexSmoother/simplexSmoother.H rename to src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/simplexSmoother/simplexSmoother.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/volumeOptimizer/volumeOptimizer.C b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/volumeOptimizer/volumeOptimizer.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/volumeOptimizer/volumeOptimizer.C rename to src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/volumeOptimizer/volumeOptimizer.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/volumeOptimizer/volumeOptimizer.H b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/volumeOptimizer/volumeOptimizer.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/volumeOptimizer/volumeOptimizer.H rename to src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/volumeOptimizer/volumeOptimizer.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/volumeOptimizer/volumeOptimizerEvaluateGradients.C b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/volumeOptimizer/volumeOptimizerEvaluateGradients.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/volumeOptimizer/volumeOptimizerEvaluateGradients.C rename to src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/volumeOptimizer/volumeOptimizerEvaluateGradients.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/tetMeshOptimisation.C b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/tetMeshOptimisation.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/tetMeshOptimisation.C rename to src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/tetMeshOptimisation.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/tetMeshOptimisation.H b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/tetMeshOptimisation.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/tetMeshOptimisation.H rename to src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/tetMeshOptimisation.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/tetMeshOptimisationParallel.C b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/tetMeshOptimisationParallel.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/tetMeshOptimisationParallel.C rename to src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/tetMeshOptimisationParallel.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/advancedSurfaceSmoothers/surfaceOptimizer/surfaceOptimizer.C b/src/mesh/cfMesh/utilities/smoothers/geometry/meshSurfaceOptimizer/advancedSurfaceSmoothers/surfaceOptimizer/surfaceOptimizer.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/advancedSurfaceSmoothers/surfaceOptimizer/surfaceOptimizer.C rename to src/mesh/cfMesh/utilities/smoothers/geometry/meshSurfaceOptimizer/advancedSurfaceSmoothers/surfaceOptimizer/surfaceOptimizer.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/advancedSurfaceSmoothers/surfaceOptimizer/surfaceOptimizer.H b/src/mesh/cfMesh/utilities/smoothers/geometry/meshSurfaceOptimizer/advancedSurfaceSmoothers/surfaceOptimizer/surfaceOptimizer.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/advancedSurfaceSmoothers/surfaceOptimizer/surfaceOptimizer.H rename to src/mesh/cfMesh/utilities/smoothers/geometry/meshSurfaceOptimizer/advancedSurfaceSmoothers/surfaceOptimizer/surfaceOptimizer.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizer.C b/src/mesh/cfMesh/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizer.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizer.C rename to src/mesh/cfMesh/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizer.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizer.H b/src/mesh/cfMesh/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizer.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizer.H rename to src/mesh/cfMesh/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizer.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizerCalculateTrianglesAndAddressing.C b/src/mesh/cfMesh/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizerCalculateTrianglesAndAddressing.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizerCalculateTrianglesAndAddressing.C rename to src/mesh/cfMesh/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizerCalculateTrianglesAndAddressing.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizerI.H b/src/mesh/cfMesh/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizerI.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizerI.H rename to src/mesh/cfMesh/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizerI.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizerOptimizePoint.C b/src/mesh/cfMesh/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizerOptimizePoint.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizerOptimizePoint.C rename to src/mesh/cfMesh/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizerOptimizePoint.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizerOptimizePointParallel.C b/src/mesh/cfMesh/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizerOptimizePointParallel.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizerOptimizePointParallel.C rename to src/mesh/cfMesh/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizerOptimizePointParallel.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizerOptimizeSurface.C b/src/mesh/cfMesh/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizerOptimizeSurface.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizerOptimizeSurface.C rename to src/mesh/cfMesh/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizerOptimizeSurface.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/topology/checkBoundaryFacesSharingTwoEdges/checkBoundaryFacesSharingTwoEdges.C b/src/mesh/cfMesh/utilities/smoothers/topology/checkBoundaryFacesSharingTwoEdges/checkBoundaryFacesSharingTwoEdges.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/topology/checkBoundaryFacesSharingTwoEdges/checkBoundaryFacesSharingTwoEdges.C rename to src/mesh/cfMesh/utilities/smoothers/topology/checkBoundaryFacesSharingTwoEdges/checkBoundaryFacesSharingTwoEdges.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/topology/checkBoundaryFacesSharingTwoEdges/checkBoundaryFacesSharingTwoEdges.H b/src/mesh/cfMesh/utilities/smoothers/topology/checkBoundaryFacesSharingTwoEdges/checkBoundaryFacesSharingTwoEdges.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/topology/checkBoundaryFacesSharingTwoEdges/checkBoundaryFacesSharingTwoEdges.H rename to src/mesh/cfMesh/utilities/smoothers/topology/checkBoundaryFacesSharingTwoEdges/checkBoundaryFacesSharingTwoEdges.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/topology/checkCellConnectionsOverFaces/checkCellConnectionsOverFaces.C b/src/mesh/cfMesh/utilities/smoothers/topology/checkCellConnectionsOverFaces/checkCellConnectionsOverFaces.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/topology/checkCellConnectionsOverFaces/checkCellConnectionsOverFaces.C rename to src/mesh/cfMesh/utilities/smoothers/topology/checkCellConnectionsOverFaces/checkCellConnectionsOverFaces.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/topology/checkCellConnectionsOverFaces/checkCellConnectionsOverFaces.H b/src/mesh/cfMesh/utilities/smoothers/topology/checkCellConnectionsOverFaces/checkCellConnectionsOverFaces.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/topology/checkCellConnectionsOverFaces/checkCellConnectionsOverFaces.H rename to src/mesh/cfMesh/utilities/smoothers/topology/checkCellConnectionsOverFaces/checkCellConnectionsOverFaces.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/topology/checkIrregularSurfaceConnections/checkIrregularSurfaceConnections.C b/src/mesh/cfMesh/utilities/smoothers/topology/checkIrregularSurfaceConnections/checkIrregularSurfaceConnections.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/topology/checkIrregularSurfaceConnections/checkIrregularSurfaceConnections.C rename to src/mesh/cfMesh/utilities/smoothers/topology/checkIrregularSurfaceConnections/checkIrregularSurfaceConnections.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/topology/checkIrregularSurfaceConnections/checkIrregularSurfaceConnections.H b/src/mesh/cfMesh/utilities/smoothers/topology/checkIrregularSurfaceConnections/checkIrregularSurfaceConnections.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/topology/checkIrregularSurfaceConnections/checkIrregularSurfaceConnections.H rename to src/mesh/cfMesh/utilities/smoothers/topology/checkIrregularSurfaceConnections/checkIrregularSurfaceConnections.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/topology/checkIrregularSurfaceConnections/checkIrregularSurfaceConnectionsFunctions.C b/src/mesh/cfMesh/utilities/smoothers/topology/checkIrregularSurfaceConnections/checkIrregularSurfaceConnectionsFunctions.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/topology/checkIrregularSurfaceConnections/checkIrregularSurfaceConnectionsFunctions.C rename to src/mesh/cfMesh/utilities/smoothers/topology/checkIrregularSurfaceConnections/checkIrregularSurfaceConnectionsFunctions.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/topology/checkNonMappableCellConnections/checkNonMappableCellConnections.C b/src/mesh/cfMesh/utilities/smoothers/topology/checkNonMappableCellConnections/checkNonMappableCellConnections.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/topology/checkNonMappableCellConnections/checkNonMappableCellConnections.C rename to src/mesh/cfMesh/utilities/smoothers/topology/checkNonMappableCellConnections/checkNonMappableCellConnections.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/topology/checkNonMappableCellConnections/checkNonMappableCellConnections.H b/src/mesh/cfMesh/utilities/smoothers/topology/checkNonMappableCellConnections/checkNonMappableCellConnections.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/topology/checkNonMappableCellConnections/checkNonMappableCellConnections.H rename to src/mesh/cfMesh/utilities/smoothers/topology/checkNonMappableCellConnections/checkNonMappableCellConnections.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/topology/topologicalCleaner/topologicalCleaner.C b/src/mesh/cfMesh/utilities/smoothers/topology/topologicalCleaner/topologicalCleaner.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/topology/topologicalCleaner/topologicalCleaner.C rename to src/mesh/cfMesh/utilities/smoothers/topology/topologicalCleaner/topologicalCleaner.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/topology/topologicalCleaner/topologicalCleaner.H b/src/mesh/cfMesh/utilities/smoothers/topology/topologicalCleaner/topologicalCleaner.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/topology/topologicalCleaner/topologicalCleaner.H rename to src/mesh/cfMesh/utilities/smoothers/topology/topologicalCleaner/topologicalCleaner.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/topology/topologicalCleaner/topologicalCleanerInvalidVertices.C b/src/mesh/cfMesh/utilities/smoothers/topology/topologicalCleaner/topologicalCleanerInvalidVertices.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/topology/topologicalCleaner/topologicalCleanerInvalidVertices.C rename to src/mesh/cfMesh/utilities/smoothers/topology/topologicalCleaner/topologicalCleanerInvalidVertices.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/topology/topologicalCleaner/topologyCleanerNonConsecutiveBoundaryVertices.C b/src/mesh/cfMesh/utilities/smoothers/topology/topologicalCleaner/topologyCleanerNonConsecutiveBoundaryVertices.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/topology/topologicalCleaner/topologyCleanerNonConsecutiveBoundaryVertices.C rename to src/mesh/cfMesh/utilities/smoothers/topology/topologicalCleaner/topologyCleanerNonConsecutiveBoundaryVertices.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/smoothers/topology/topologicalCleaner/topologyCleanerNonMappableCells.C b/src/mesh/cfMesh/utilities/smoothers/topology/topologicalCleaner/topologyCleanerNonMappableCells.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/smoothers/topology/topologicalCleaner/topologyCleanerNonMappableCells.C rename to src/mesh/cfMesh/utilities/smoothers/topology/topologicalCleaner/topologyCleanerNonMappableCells.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/correctEdgesBetweenPatches/correctEdgesBetweenPatches.C b/src/mesh/cfMesh/utilities/surfaceTools/correctEdgesBetweenPatches/correctEdgesBetweenPatches.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/correctEdgesBetweenPatches/correctEdgesBetweenPatches.C rename to src/mesh/cfMesh/utilities/surfaceTools/correctEdgesBetweenPatches/correctEdgesBetweenPatches.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/correctEdgesBetweenPatches/correctEdgesBetweenPatches.H b/src/mesh/cfMesh/utilities/surfaceTools/correctEdgesBetweenPatches/correctEdgesBetweenPatches.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/correctEdgesBetweenPatches/correctEdgesBetweenPatches.H rename to src/mesh/cfMesh/utilities/surfaceTools/correctEdgesBetweenPatches/correctEdgesBetweenPatches.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/correctEdgesBetweenPatches/correctEdgesBetweenPatchesDistributeFaces.C b/src/mesh/cfMesh/utilities/surfaceTools/correctEdgesBetweenPatches/correctEdgesBetweenPatchesDistributeFaces.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/correctEdgesBetweenPatches/correctEdgesBetweenPatchesDistributeFaces.C rename to src/mesh/cfMesh/utilities/surfaceTools/correctEdgesBetweenPatches/correctEdgesBetweenPatchesDistributeFaces.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.C b/src/mesh/cfMesh/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.C rename to src/mesh/cfMesh/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.H b/src/mesh/cfMesh/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.H rename to src/mesh/cfMesh/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractorCorners.C b/src/mesh/cfMesh/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractorCorners.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractorCorners.C rename to src/mesh/cfMesh/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractorCorners.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceCheckEdgeTypes/meshSurfaceCheckEdgeTypes.C b/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceCheckEdgeTypes/meshSurfaceCheckEdgeTypes.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceCheckEdgeTypes/meshSurfaceCheckEdgeTypes.C rename to src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceCheckEdgeTypes/meshSurfaceCheckEdgeTypes.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceCheckEdgeTypes/meshSurfaceCheckEdgeTypes.H b/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceCheckEdgeTypes/meshSurfaceCheckEdgeTypes.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceCheckEdgeTypes/meshSurfaceCheckEdgeTypes.H rename to src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceCheckEdgeTypes/meshSurfaceCheckEdgeTypes.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceCheckInvertedVertices/meshSurfaceCheckInvertedVertices.C b/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceCheckInvertedVertices/meshSurfaceCheckInvertedVertices.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceCheckInvertedVertices/meshSurfaceCheckInvertedVertices.C rename to src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceCheckInvertedVertices/meshSurfaceCheckInvertedVertices.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceCheckInvertedVertices/meshSurfaceCheckInvertedVertices.H b/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceCheckInvertedVertices/meshSurfaceCheckInvertedVertices.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceCheckInvertedVertices/meshSurfaceCheckInvertedVertices.H rename to src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceCheckInvertedVertices/meshSurfaceCheckInvertedVertices.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEdgeExtractor/meshSurfaceEdgeCreateBoundaryFaces.C b/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEdgeExtractor/meshSurfaceEdgeCreateBoundaryFaces.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEdgeExtractor/meshSurfaceEdgeCreateBoundaryFaces.C rename to src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEdgeExtractor/meshSurfaceEdgeCreateBoundaryFaces.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEdgeExtractor/meshSurfaceEdgeCreateEdgeVertices.C b/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEdgeExtractor/meshSurfaceEdgeCreateEdgeVertices.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEdgeExtractor/meshSurfaceEdgeCreateEdgeVertices.C rename to src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEdgeExtractor/meshSurfaceEdgeCreateEdgeVertices.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEdgeExtractor/meshSurfaceEdgeExtractor.C b/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEdgeExtractor/meshSurfaceEdgeExtractor.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEdgeExtractor/meshSurfaceEdgeExtractor.C rename to src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEdgeExtractor/meshSurfaceEdgeExtractor.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEdgeExtractor/meshSurfaceEdgeExtractor.H b/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEdgeExtractor/meshSurfaceEdgeExtractor.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEdgeExtractor/meshSurfaceEdgeExtractor.H rename to src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEdgeExtractor/meshSurfaceEdgeExtractor.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEdgeExtractor2D/meshSurfaceEdgeExtractor2D.C b/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEdgeExtractor2D/meshSurfaceEdgeExtractor2D.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEdgeExtractor2D/meshSurfaceEdgeExtractor2D.C rename to src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEdgeExtractor2D/meshSurfaceEdgeExtractor2D.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEdgeExtractor2D/meshSurfaceEdgeExtractor2D.H b/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEdgeExtractor2D/meshSurfaceEdgeExtractor2D.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEdgeExtractor2D/meshSurfaceEdgeExtractor2D.H rename to src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEdgeExtractor2D/meshSurfaceEdgeExtractor2D.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEdgeExtractor2D/meshSurfaceEdgeExtractor2DDistributeFaces.C b/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEdgeExtractor2D/meshSurfaceEdgeExtractor2DDistributeFaces.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEdgeExtractor2D/meshSurfaceEdgeExtractor2DDistributeFaces.C rename to src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEdgeExtractor2D/meshSurfaceEdgeExtractor2DDistributeFaces.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEdgeExtractorNonTopo/meshSurfaceEdgeExtractorNonTopo.C b/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEdgeExtractorNonTopo/meshSurfaceEdgeExtractorNonTopo.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEdgeExtractorNonTopo/meshSurfaceEdgeExtractorNonTopo.C rename to src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEdgeExtractorNonTopo/meshSurfaceEdgeExtractorNonTopo.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEdgeExtractorNonTopo/meshSurfaceEdgeExtractorNonTopo.H b/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEdgeExtractorNonTopo/meshSurfaceEdgeExtractorNonTopo.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEdgeExtractorNonTopo/meshSurfaceEdgeExtractorNonTopo.H rename to src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEdgeExtractorNonTopo/meshSurfaceEdgeExtractorNonTopo.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEdgeExtractorNonTopo/meshSurfaceEdgeExtractorNonTopoDistributeFaces.C b/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEdgeExtractorNonTopo/meshSurfaceEdgeExtractorNonTopoDistributeFaces.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEdgeExtractorNonTopo/meshSurfaceEdgeExtractorNonTopoDistributeFaces.C rename to src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEdgeExtractorNonTopo/meshSurfaceEdgeExtractorNonTopoDistributeFaces.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngine.C b/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngine.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngine.C rename to src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngine.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngine.H b/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngine.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngine.H rename to src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngine.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineCalculateBoundaryNodesAndFaces.C b/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineCalculateBoundaryNodesAndFaces.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineCalculateBoundaryNodesAndFaces.C rename to src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineCalculateBoundaryNodesAndFaces.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineI.H b/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineI.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineI.H rename to src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineI.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineModifier.C b/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineModifier.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineModifier.C rename to src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineModifier.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineModifier.H b/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineModifier.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineModifier.H rename to src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineModifier.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineParallelAddressing.C b/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineParallelAddressing.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineParallelAddressing.C rename to src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineParallelAddressing.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceMapper/meshSurfaceMapper.C b/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceMapper/meshSurfaceMapper.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceMapper/meshSurfaceMapper.C rename to src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceMapper/meshSurfaceMapper.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceMapper/meshSurfaceMapper.H b/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceMapper/meshSurfaceMapper.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceMapper/meshSurfaceMapper.H rename to src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceMapper/meshSurfaceMapper.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceMapper/meshSurfaceMapperCornersAndEdges.C b/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceMapper/meshSurfaceMapperCornersAndEdges.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceMapper/meshSurfaceMapperCornersAndEdges.C rename to src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceMapper/meshSurfaceMapperCornersAndEdges.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceMapper/meshSurfaceMapperMapVertices.C b/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceMapper/meshSurfaceMapperMapVertices.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceMapper/meshSurfaceMapperMapVertices.C rename to src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceMapper/meshSurfaceMapperMapVertices.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceMapper/meshSurfaceMapperPremapVertices.C b/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceMapper/meshSurfaceMapperPremapVertices.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceMapper/meshSurfaceMapperPremapVertices.C rename to src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceMapper/meshSurfaceMapperPremapVertices.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceMapper/parMapperHelper.H b/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceMapper/parMapperHelper.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceMapper/parMapperHelper.H rename to src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceMapper/parMapperHelper.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceMapper2D/meshSurfaceMapper2D.C b/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceMapper2D/meshSurfaceMapper2D.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceMapper2D/meshSurfaceMapper2D.C rename to src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceMapper2D/meshSurfaceMapper2D.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceMapper2D/meshSurfaceMapper2D.H b/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceMapper2D/meshSurfaceMapper2D.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceMapper2D/meshSurfaceMapper2D.H rename to src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceMapper2D/meshSurfaceMapper2D.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceMapper2D/meshSurfaceMapper2DMapVertices.C b/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceMapper2D/meshSurfaceMapper2DMapVertices.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceMapper2D/meshSurfaceMapper2DMapVertices.C rename to src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceMapper2D/meshSurfaceMapper2DMapVertices.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceMapper2D/meshSurfaceMapper2DPremapVertices.C b/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceMapper2D/meshSurfaceMapper2DPremapVertices.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceMapper2D/meshSurfaceMapper2DPremapVertices.C rename to src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceMapper2D/meshSurfaceMapper2DPremapVertices.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfacePartitioner/meshSurfacePartitioner.C b/src/mesh/cfMesh/utilities/surfaceTools/meshSurfacePartitioner/meshSurfacePartitioner.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfacePartitioner/meshSurfacePartitioner.C rename to src/mesh/cfMesh/utilities/surfaceTools/meshSurfacePartitioner/meshSurfacePartitioner.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfacePartitioner/meshSurfacePartitioner.H b/src/mesh/cfMesh/utilities/surfaceTools/meshSurfacePartitioner/meshSurfacePartitioner.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfacePartitioner/meshSurfacePartitioner.H rename to src/mesh/cfMesh/utilities/surfaceTools/meshSurfacePartitioner/meshSurfacePartitioner.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfacePartitioner/meshSurfacePartitionerFunctions.C b/src/mesh/cfMesh/utilities/surfaceTools/meshSurfacePartitioner/meshSurfacePartitionerFunctions.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfacePartitioner/meshSurfacePartitionerFunctions.C rename to src/mesh/cfMesh/utilities/surfaceTools/meshSurfacePartitioner/meshSurfacePartitionerFunctions.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/renameBoundaryPatches/renameBoundaryPatches.C b/src/mesh/cfMesh/utilities/surfaceTools/renameBoundaryPatches/renameBoundaryPatches.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/renameBoundaryPatches/renameBoundaryPatches.C rename to src/mesh/cfMesh/utilities/surfaceTools/renameBoundaryPatches/renameBoundaryPatches.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/renameBoundaryPatches/renameBoundaryPatches.H b/src/mesh/cfMesh/utilities/surfaceTools/renameBoundaryPatches/renameBoundaryPatches.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/renameBoundaryPatches/renameBoundaryPatches.H rename to src/mesh/cfMesh/utilities/surfaceTools/renameBoundaryPatches/renameBoundaryPatches.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/surfaceMorpherCells/surfaceMorpherCells.C b/src/mesh/cfMesh/utilities/surfaceTools/surfaceMorpherCells/surfaceMorpherCells.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/surfaceMorpherCells/surfaceMorpherCells.C rename to src/mesh/cfMesh/utilities/surfaceTools/surfaceMorpherCells/surfaceMorpherCells.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/surfaceMorpherCells/surfaceMorpherCells.H b/src/mesh/cfMesh/utilities/surfaceTools/surfaceMorpherCells/surfaceMorpherCells.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/surfaceMorpherCells/surfaceMorpherCells.H rename to src/mesh/cfMesh/utilities/surfaceTools/surfaceMorpherCells/surfaceMorpherCells.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/surfaceMorpherCells/surfaceMorpherCellsCreateBoundaryFaces.C b/src/mesh/cfMesh/utilities/surfaceTools/surfaceMorpherCells/surfaceMorpherCellsCreateBoundaryFaces.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/surfaceMorpherCells/surfaceMorpherCellsCreateBoundaryFaces.C rename to src/mesh/cfMesh/utilities/surfaceTools/surfaceMorpherCells/surfaceMorpherCellsCreateBoundaryFaces.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/surfaceMorpherCells/surfaceMorpherCellsMorphInternalFaces.C b/src/mesh/cfMesh/utilities/surfaceTools/surfaceMorpherCells/surfaceMorpherCellsMorphInternalFaces.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/surfaceMorpherCells/surfaceMorpherCellsMorphInternalFaces.C rename to src/mesh/cfMesh/utilities/surfaceTools/surfaceMorpherCells/surfaceMorpherCellsMorphInternalFaces.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/tetrahedra/tetCreatorOctree/tetCreatorOctree.C b/src/mesh/cfMesh/utilities/tetrahedra/tetCreatorOctree/tetCreatorOctree.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/tetrahedra/tetCreatorOctree/tetCreatorOctree.C rename to src/mesh/cfMesh/utilities/tetrahedra/tetCreatorOctree/tetCreatorOctree.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/tetrahedra/tetCreatorOctree/tetCreatorOctree.H b/src/mesh/cfMesh/utilities/tetrahedra/tetCreatorOctree/tetCreatorOctree.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/tetrahedra/tetCreatorOctree/tetCreatorOctree.H rename to src/mesh/cfMesh/utilities/tetrahedra/tetCreatorOctree/tetCreatorOctree.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/tetrahedra/tetCreatorOctree/tetCreatorOctreeFromFacesWithCentreNode.C b/src/mesh/cfMesh/utilities/tetrahedra/tetCreatorOctree/tetCreatorOctreeFromFacesWithCentreNode.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/tetrahedra/tetCreatorOctree/tetCreatorOctreeFromFacesWithCentreNode.C rename to src/mesh/cfMesh/utilities/tetrahedra/tetCreatorOctree/tetCreatorOctreeFromFacesWithCentreNode.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/tetrahedra/tetCreatorOctree/tetCreatorOctreeI.H b/src/mesh/cfMesh/utilities/tetrahedra/tetCreatorOctree/tetCreatorOctreeI.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/tetrahedra/tetCreatorOctree/tetCreatorOctreeI.H rename to src/mesh/cfMesh/utilities/tetrahedra/tetCreatorOctree/tetCreatorOctreeI.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/tetrahedra/tetCreatorOctree/tetCreatorOctreePointsAndAddressing.C b/src/mesh/cfMesh/utilities/tetrahedra/tetCreatorOctree/tetCreatorOctreePointsAndAddressing.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/tetrahedra/tetCreatorOctree/tetCreatorOctreePointsAndAddressing.C rename to src/mesh/cfMesh/utilities/tetrahedra/tetCreatorOctree/tetCreatorOctreePointsAndAddressing.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/tetrahedra/tetCreatorOctree/tetCreatorOctreeTetsAroundEdges.C b/src/mesh/cfMesh/utilities/tetrahedra/tetCreatorOctree/tetCreatorOctreeTetsAroundEdges.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/tetrahedra/tetCreatorOctree/tetCreatorOctreeTetsAroundEdges.C rename to src/mesh/cfMesh/utilities/tetrahedra/tetCreatorOctree/tetCreatorOctreeTetsAroundEdges.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/tetrahedra/tetCreatorOctree/tetCreatorOctreeTetsAroundSplitEdges.C b/src/mesh/cfMesh/utilities/tetrahedra/tetCreatorOctree/tetCreatorOctreeTetsAroundSplitEdges.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/tetrahedra/tetCreatorOctree/tetCreatorOctreeTetsAroundSplitEdges.C rename to src/mesh/cfMesh/utilities/tetrahedra/tetCreatorOctree/tetCreatorOctreeTetsAroundSplitEdges.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/tetrahedra/tetCreatorOctree/tetCreatorOctreeTetsFromSplitFaces.C b/src/mesh/cfMesh/utilities/tetrahedra/tetCreatorOctree/tetCreatorOctreeTetsFromSplitFaces.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/tetrahedra/tetCreatorOctree/tetCreatorOctreeTetsFromSplitFaces.C rename to src/mesh/cfMesh/utilities/tetrahedra/tetCreatorOctree/tetCreatorOctreeTetsFromSplitFaces.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurface2DCheck/triSurface2DCheck.C b/src/mesh/cfMesh/utilities/triSurfaceTools/triSurface2DCheck/triSurface2DCheck.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurface2DCheck/triSurface2DCheck.C rename to src/mesh/cfMesh/utilities/triSurfaceTools/triSurface2DCheck/triSurface2DCheck.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurface2DCheck/triSurface2DCheck.H b/src/mesh/cfMesh/utilities/triSurfaceTools/triSurface2DCheck/triSurface2DCheck.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurface2DCheck/triSurface2DCheck.H rename to src/mesh/cfMesh/utilities/triSurfaceTools/triSurface2DCheck/triSurface2DCheck.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceClassifyEdges/triSurfaceClassifyEdges.C b/src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceClassifyEdges/triSurfaceClassifyEdges.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceClassifyEdges/triSurfaceClassifyEdges.C rename to src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceClassifyEdges/triSurfaceClassifyEdges.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceClassifyEdges/triSurfaceClassifyEdges.H b/src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceClassifyEdges/triSurfaceClassifyEdges.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceClassifyEdges/triSurfaceClassifyEdges.H rename to src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceClassifyEdges/triSurfaceClassifyEdges.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceClassifyEdges/triSurfaceClassifyEdgesFunctions.C b/src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceClassifyEdges/triSurfaceClassifyEdgesFunctions.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceClassifyEdges/triSurfaceClassifyEdgesFunctions.C rename to src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceClassifyEdges/triSurfaceClassifyEdgesFunctions.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceCleanupDuplicateTriangles/triSurfaceCleanupDuplicateTriangles.C b/src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceCleanupDuplicateTriangles/triSurfaceCleanupDuplicateTriangles.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceCleanupDuplicateTriangles/triSurfaceCleanupDuplicateTriangles.C rename to src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceCleanupDuplicateTriangles/triSurfaceCleanupDuplicateTriangles.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceCleanupDuplicateTriangles/triSurfaceCleanupDuplicateTriangles.H b/src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceCleanupDuplicateTriangles/triSurfaceCleanupDuplicateTriangles.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceCleanupDuplicateTriangles/triSurfaceCleanupDuplicateTriangles.H rename to src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceCleanupDuplicateTriangles/triSurfaceCleanupDuplicateTriangles.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceCleanupDuplicateTriangles/triSurfaceCleanupDuplicateTrianglesFunctions.C b/src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceCleanupDuplicateTriangles/triSurfaceCleanupDuplicateTrianglesFunctions.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceCleanupDuplicateTriangles/triSurfaceCleanupDuplicateTrianglesFunctions.C rename to src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceCleanupDuplicateTriangles/triSurfaceCleanupDuplicateTrianglesFunctions.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceCleanupDuplicates/triSurfaceCleanupDuplicates.C b/src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceCleanupDuplicates/triSurfaceCleanupDuplicates.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceCleanupDuplicates/triSurfaceCleanupDuplicates.C rename to src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceCleanupDuplicates/triSurfaceCleanupDuplicates.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceCleanupDuplicates/triSurfaceCleanupDuplicates.H b/src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceCleanupDuplicates/triSurfaceCleanupDuplicates.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceCleanupDuplicates/triSurfaceCleanupDuplicates.H rename to src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceCleanupDuplicates/triSurfaceCleanupDuplicates.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceCleanupDuplicates/triSurfaceCleanupDuplicatesFunctions.C b/src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceCleanupDuplicates/triSurfaceCleanupDuplicatesFunctions.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceCleanupDuplicates/triSurfaceCleanupDuplicatesFunctions.C rename to src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceCleanupDuplicates/triSurfaceCleanupDuplicatesFunctions.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceCopyParts/triSurfaceCopyParts.C b/src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceCopyParts/triSurfaceCopyParts.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceCopyParts/triSurfaceCopyParts.C rename to src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceCopyParts/triSurfaceCopyParts.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceCopyParts/triSurfaceCopyParts.H b/src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceCopyParts/triSurfaceCopyParts.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceCopyParts/triSurfaceCopyParts.H rename to src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceCopyParts/triSurfaceCopyParts.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceCurvatureEstimator/triSurfaceCurvatureEstimator.C b/src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceCurvatureEstimator/triSurfaceCurvatureEstimator.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceCurvatureEstimator/triSurfaceCurvatureEstimator.C rename to src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceCurvatureEstimator/triSurfaceCurvatureEstimator.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceCurvatureEstimator/triSurfaceCurvatureEstimator.H b/src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceCurvatureEstimator/triSurfaceCurvatureEstimator.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceCurvatureEstimator/triSurfaceCurvatureEstimator.H rename to src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceCurvatureEstimator/triSurfaceCurvatureEstimator.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceCurvatureEstimator/triSurfaceCurvatureEstimatorCalculate.C b/src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceCurvatureEstimator/triSurfaceCurvatureEstimatorCalculate.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceCurvatureEstimator/triSurfaceCurvatureEstimatorCalculate.C rename to src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceCurvatureEstimator/triSurfaceCurvatureEstimatorCalculate.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceDetectFeatureEdges/triSurfaceDetectFeatureEdges.C b/src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceDetectFeatureEdges/triSurfaceDetectFeatureEdges.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceDetectFeatureEdges/triSurfaceDetectFeatureEdges.C rename to src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceDetectFeatureEdges/triSurfaceDetectFeatureEdges.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceDetectFeatureEdges/triSurfaceDetectFeatureEdges.H b/src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceDetectFeatureEdges/triSurfaceDetectFeatureEdges.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceDetectFeatureEdges/triSurfaceDetectFeatureEdges.H rename to src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceDetectFeatureEdges/triSurfaceDetectFeatureEdges.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceDetectFeatureEdges/triSurfaceDetectFeatureEdgesFunctions.C b/src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceDetectFeatureEdges/triSurfaceDetectFeatureEdgesFunctions.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceDetectFeatureEdges/triSurfaceDetectFeatureEdgesFunctions.C rename to src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceDetectFeatureEdges/triSurfaceDetectFeatureEdgesFunctions.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceExtrude2DEdges/triSurfaceExtrude2DEdges.C b/src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceExtrude2DEdges/triSurfaceExtrude2DEdges.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceExtrude2DEdges/triSurfaceExtrude2DEdges.C rename to src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceExtrude2DEdges/triSurfaceExtrude2DEdges.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceExtrude2DEdges/triSurfaceExtrude2DEdges.H b/src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceExtrude2DEdges/triSurfaceExtrude2DEdges.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceExtrude2DEdges/triSurfaceExtrude2DEdges.H rename to src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceExtrude2DEdges/triSurfaceExtrude2DEdges.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceImportSurfaceAsSubset/triSurfaceImportSurfaceAsSubset.C b/src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceImportSurfaceAsSubset/triSurfaceImportSurfaceAsSubset.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceImportSurfaceAsSubset/triSurfaceImportSurfaceAsSubset.C rename to src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceImportSurfaceAsSubset/triSurfaceImportSurfaceAsSubset.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceImportSurfaceAsSubset/triSurfaceImportSurfaceAsSubset.H b/src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceImportSurfaceAsSubset/triSurfaceImportSurfaceAsSubset.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceImportSurfaceAsSubset/triSurfaceImportSurfaceAsSubset.H rename to src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceImportSurfaceAsSubset/triSurfaceImportSurfaceAsSubset.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceMetaData/triSurfaceMetaData.C b/src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceMetaData/triSurfaceMetaData.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceMetaData/triSurfaceMetaData.C rename to src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceMetaData/triSurfaceMetaData.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceMetaData/triSurfaceMetaData.H b/src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceMetaData/triSurfaceMetaData.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceMetaData/triSurfaceMetaData.H rename to src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceMetaData/triSurfaceMetaData.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfacePartitioner/triSurfacePartitioner.C b/src/mesh/cfMesh/utilities/triSurfaceTools/triSurfacePartitioner/triSurfacePartitioner.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfacePartitioner/triSurfacePartitioner.C rename to src/mesh/cfMesh/utilities/triSurfaceTools/triSurfacePartitioner/triSurfacePartitioner.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfacePartitioner/triSurfacePartitioner.H b/src/mesh/cfMesh/utilities/triSurfaceTools/triSurfacePartitioner/triSurfacePartitioner.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfacePartitioner/triSurfacePartitioner.H rename to src/mesh/cfMesh/utilities/triSurfaceTools/triSurfacePartitioner/triSurfacePartitioner.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfacePartitioner/triSurfacePartitionerCreateAddressing.C b/src/mesh/cfMesh/utilities/triSurfaceTools/triSurfacePartitioner/triSurfacePartitionerCreateAddressing.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfacePartitioner/triSurfacePartitionerCreateAddressing.C rename to src/mesh/cfMesh/utilities/triSurfaceTools/triSurfacePartitioner/triSurfacePartitionerCreateAddressing.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfacePatchManipulator/triSurfacePatchManipulator.C b/src/mesh/cfMesh/utilities/triSurfaceTools/triSurfacePatchManipulator/triSurfacePatchManipulator.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfacePatchManipulator/triSurfacePatchManipulator.C rename to src/mesh/cfMesh/utilities/triSurfaceTools/triSurfacePatchManipulator/triSurfacePatchManipulator.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfacePatchManipulator/triSurfacePatchManipulator.H b/src/mesh/cfMesh/utilities/triSurfaceTools/triSurfacePatchManipulator/triSurfacePatchManipulator.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfacePatchManipulator/triSurfacePatchManipulator.H rename to src/mesh/cfMesh/utilities/triSurfaceTools/triSurfacePatchManipulator/triSurfacePatchManipulator.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfacePatchManipulator/triSurfacePatchManipulatorFunctions.C b/src/mesh/cfMesh/utilities/triSurfaceTools/triSurfacePatchManipulator/triSurfacePatchManipulatorFunctions.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfacePatchManipulator/triSurfacePatchManipulatorFunctions.C rename to src/mesh/cfMesh/utilities/triSurfaceTools/triSurfacePatchManipulator/triSurfacePatchManipulatorFunctions.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceRemoveFacets/triSurfaceRemoveFacets.C b/src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceRemoveFacets/triSurfaceRemoveFacets.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceRemoveFacets/triSurfaceRemoveFacets.C rename to src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceRemoveFacets/triSurfaceRemoveFacets.C diff --git a/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceRemoveFacets/triSurfaceRemoveFacets.H b/src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceRemoveFacets/triSurfaceRemoveFacets.H similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceRemoveFacets/triSurfaceRemoveFacets.H rename to src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceRemoveFacets/triSurfaceRemoveFacets.H diff --git a/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceRemoveFacets/triSurfaceRemoveFacetsFunctions.C b/src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceRemoveFacets/triSurfaceRemoveFacetsFunctions.C similarity index 100% rename from src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceRemoveFacets/triSurfaceRemoveFacetsFunctions.C rename to src/mesh/cfMesh/utilities/triSurfaceTools/triSurfaceRemoveFacets/triSurfaceRemoveFacetsFunctions.C