diff --git a/src/fileFormats/Make/files b/src/fileFormats/Make/files index a223cb09dd..e997a6cefb 100644 --- a/src/fileFormats/Make/files +++ b/src/fileFormats/Make/files @@ -71,18 +71,5 @@ vtk/write/foamVtkLineWriter.C vtk/write/foamVtkPolyWriter.C vtk/write/foamVtkSurfaceWriter.C -coordSet/coordSet.C - -setWriters = sampledSetWriters - -$(setWriters)/writers.C -$(setWriters)/csv/csvSetWriterRunTime.C -$(setWriters)/ensight/ensightSetWriterRunTime.C -$(setWriters)/gltf/gltfSetWriterRunTime.C -$(setWriters)/gnuplot/gnuplotSetWriterRunTime.C -$(setWriters)/nastran/nastranSetWriterRunTime.C -$(setWriters)/raw/rawSetWriterRunTime.C -$(setWriters)/vtk/vtkSetWriterRunTime.C -$(setWriters)/xmgrace/xmgraceSetWriterRunTime.C LIB = $(FOAM_LIBBIN)/libfileFormats diff --git a/src/meshTools/Make/files b/src/meshTools/Make/files index 3de09233f0..66a255ca91 100644 --- a/src/meshTools/Make/files +++ b/src/meshTools/Make/files @@ -132,7 +132,22 @@ searchableSurfaces/searchableSurfaceWithGaps/searchableSurfaceWithGaps.C searchableSurfaces/subTriSurfaceMesh/subTriSurfaceMesh.C searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C -topoSets = sets/topoSets +coordSet/coordSet.C + +setWriters = coordSet/writers + +$(setWriters)/common/writers.C +$(setWriters)/csv/csvSetWriterRunTime.C +$(setWriters)/ensight/ensightSetWriterRunTime.C +$(setWriters)/gltf/gltfSetWriterRunTime.C +$(setWriters)/gnuplot/gnuplotSetWriterRunTime.C +$(setWriters)/nastran/nastranSetWriterRunTime.C +$(setWriters)/raw/rawSetWriterRunTime.C +$(setWriters)/vtk/vtkSetWriterRunTime.C +$(setWriters)/xmgrace/xmgraceSetWriterRunTime.C + + +topoSets = topoSet/topoSets $(topoSets)/cellBitSet.C $(topoSets)/cellSet.C $(topoSets)/cellZoneSet.C @@ -147,9 +162,9 @@ $(topoSets)/topoBoolSet.C $(topoSets)/topoBitSet.C $(topoSets)/topoSet.C -sets/topoSetSource/topoSetSource.C +topoSet/topoSetSource/topoSetSource.C -cellSources = sets/cellSources +cellSources = topoSet/cellSources $(cellSources)/topoSetCellSource/topoSetCellSource.C $(cellSources)/boundaryToCell/boundaryToCell.C $(cellSources)/boxToCell/boxToCell.C @@ -174,7 +189,7 @@ $(cellSources)/surfaceToCell/surfaceToCell.C $(cellSources)/targetVolumeToCell/targetVolumeToCell.C $(cellSources)/zoneToCell/zoneToCell.C -faceSources = sets/faceSources +faceSources = topoSet/faceSources $(faceSources)/topoSetFaceSource/topoSetFaceSource.C $(faceSources)/boundaryToFace/boundaryToFace.C $(faceSources)/boxToFace/boxToFace.C @@ -191,7 +206,7 @@ $(faceSources)/searchableSurfaceToFace/searchableSurfaceToFace.C $(faceSources)/sphereToFace/sphereToFace.C $(faceSources)/zoneToFace/zoneToFace.C -pointSources = sets/pointSources +pointSources = topoSet/pointSources $(pointSources)/topoSetPointSource/topoSetPointSource.C $(pointSources)/boxToPoint/boxToPoint.C $(pointSources)/cellToPoint/cellToPoint.C @@ -205,7 +220,7 @@ $(pointSources)/sphereToPoint/sphereToPoint.C $(pointSources)/surfaceToPoint/surfaceToPoint.C $(pointSources)/zoneToPoint/zoneToPoint.C -faceZoneSources = sets/faceZoneSources +faceZoneSources = topoSet/faceZoneSources $(faceZoneSources)/topoSetFaceZoneSource/topoSetFaceZoneSource.C $(faceZoneSources)/faceZoneToFaceZone/faceZoneToFaceZone.C $(faceZoneSources)/setsToFaceZone/setsToFaceZone.C @@ -214,11 +229,11 @@ $(faceZoneSources)/setAndNormalToFaceZone/setAndNormalToFaceZone.C $(faceZoneSources)/searchableSurfaceToFaceZone/searchableSurfaceToFaceZone.C $(faceZoneSources)/planeToFaceZone/planeToFaceZone.C -cellZoneSources = sets/cellZoneSources +cellZoneSources = topoSet/cellZoneSources $(cellZoneSources)/topoSetCellZoneSource/topoSetCellZoneSource.C $(cellZoneSources)/setToCellZone/setToCellZone.C -pointZoneSources = sets/pointZoneSources +pointZoneSources = topoSet/pointZoneSources $(pointZoneSources)/topoSetPointZoneSource/topoSetPointZoneSource.C $(pointZoneSources)/setToPointZone/setToPointZone.C diff --git a/src/fileFormats/coordSet/coordSet.C b/src/meshTools/coordSet/coordSet.C similarity index 100% rename from src/fileFormats/coordSet/coordSet.C rename to src/meshTools/coordSet/coordSet.C diff --git a/src/fileFormats/coordSet/coordSet.H b/src/meshTools/coordSet/coordSet.H similarity index 100% rename from src/fileFormats/coordSet/coordSet.H rename to src/meshTools/coordSet/coordSet.H diff --git a/src/fileFormats/sampledSetWriters/writer.C b/src/meshTools/coordSet/writers/common/writer.C similarity index 100% rename from src/fileFormats/sampledSetWriters/writer.C rename to src/meshTools/coordSet/writers/common/writer.C diff --git a/src/fileFormats/sampledSetWriters/writer.H b/src/meshTools/coordSet/writers/common/writer.H similarity index 100% rename from src/fileFormats/sampledSetWriters/writer.H rename to src/meshTools/coordSet/writers/common/writer.H diff --git a/src/fileFormats/sampledSetWriters/writers.C b/src/meshTools/coordSet/writers/common/writers.C similarity index 100% rename from src/fileFormats/sampledSetWriters/writers.C rename to src/meshTools/coordSet/writers/common/writers.C diff --git a/src/fileFormats/sampledSetWriters/writers.H b/src/meshTools/coordSet/writers/common/writers.H similarity index 100% rename from src/fileFormats/sampledSetWriters/writers.H rename to src/meshTools/coordSet/writers/common/writers.H diff --git a/src/fileFormats/sampledSetWriters/csv/csvSetWriter.C b/src/meshTools/coordSet/writers/csv/csvCoordSetWriter.C similarity index 100% rename from src/fileFormats/sampledSetWriters/csv/csvSetWriter.C rename to src/meshTools/coordSet/writers/csv/csvCoordSetWriter.C diff --git a/src/fileFormats/sampledSetWriters/csv/csvSetWriter.H b/src/meshTools/coordSet/writers/csv/csvSetWriter.H similarity index 95% rename from src/fileFormats/sampledSetWriters/csv/csvSetWriter.H rename to src/meshTools/coordSet/writers/csv/csvSetWriter.H index 81026527ae..67c1f8e3bb 100644 --- a/src/fileFormats/sampledSetWriters/csv/csvSetWriter.H +++ b/src/meshTools/coordSet/writers/csv/csvSetWriter.H @@ -31,12 +31,12 @@ Description Write set in csv format SourceFiles - csvSetWriter.C + csvCoordSetWriter.C \*---------------------------------------------------------------------------*/ -#ifndef csvSetWriter_H -#define csvSetWriter_H +#ifndef Foam_coordSetWriters_csvWriter_H +#define Foam_coordSetWriters_csvWriter_H #include "writer.H" @@ -121,7 +121,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository - #include "csvSetWriter.C" + #include "csvCoordSetWriter.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/fileFormats/sampledSetWriters/csv/csvSetWriterRunTime.C b/src/meshTools/coordSet/writers/csv/csvSetWriterRunTime.C similarity index 100% rename from src/fileFormats/sampledSetWriters/csv/csvSetWriterRunTime.C rename to src/meshTools/coordSet/writers/csv/csvSetWriterRunTime.C diff --git a/src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.C b/src/meshTools/coordSet/writers/ensight/ensightCoordSetWriter.C similarity index 100% rename from src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.C rename to src/meshTools/coordSet/writers/ensight/ensightCoordSetWriter.C diff --git a/src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.H b/src/meshTools/coordSet/writers/ensight/ensightSetWriter.H similarity index 95% rename from src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.H rename to src/meshTools/coordSet/writers/ensight/ensightSetWriter.H index c0ebfd1e71..7718016a4c 100644 --- a/src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.H +++ b/src/meshTools/coordSet/writers/ensight/ensightSetWriter.H @@ -30,12 +30,12 @@ Class Description SourceFiles - ensightSetWriter.C + ensightCoordSetWriter.C \*---------------------------------------------------------------------------*/ -#ifndef ensightSetWriter_H -#define ensightSetWriter_H +#ifndef Foam_coordSetWriters_ensightWriter_H +#define Foam_coordSetWriters_ensightWriter_H #include "writer.H" @@ -108,7 +108,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository - #include "ensightSetWriter.C" + #include "ensightCoordSetWriter.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/fileFormats/sampledSetWriters/ensight/ensightSetWriterRunTime.C b/src/meshTools/coordSet/writers/ensight/ensightSetWriterRunTime.C similarity index 100% rename from src/fileFormats/sampledSetWriters/ensight/ensightSetWriterRunTime.C rename to src/meshTools/coordSet/writers/ensight/ensightSetWriterRunTime.C diff --git a/src/fileFormats/sampledSetWriters/gltf/gltfSetWriter.C b/src/meshTools/coordSet/writers/gltf/gltfCoordSetWriter.C similarity index 100% rename from src/fileFormats/sampledSetWriters/gltf/gltfSetWriter.C rename to src/meshTools/coordSet/writers/gltf/gltfCoordSetWriter.C diff --git a/src/fileFormats/sampledSetWriters/gltf/gltfSetWriter.H b/src/meshTools/coordSet/writers/gltf/gltfSetWriter.H similarity index 98% rename from src/fileFormats/sampledSetWriters/gltf/gltfSetWriter.H rename to src/meshTools/coordSet/writers/gltf/gltfSetWriter.H index b4936440f9..3d47397fce 100644 --- a/src/fileFormats/sampledSetWriters/gltf/gltfSetWriter.H +++ b/src/meshTools/coordSet/writers/gltf/gltfSetWriter.H @@ -122,12 +122,12 @@ Note https://www.khronos.org/registry/glTF/ SourceFiles - gltfSetWriter.C + gltfCoordSetWriter.C \*---------------------------------------------------------------------------*/ -#ifndef writers_gltfSetWriter_H -#define writers_gltfSetWriter_H +#ifndef Foam_coordSetWriters_gltfWriter_H +#define Foam_coordSetWriters_gltfWriter_H #include "writer.H" #include "colourTable.H" @@ -302,7 +302,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository - #include "gltfSetWriter.C" + #include "gltfCoordSetWriter.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/fileFormats/sampledSetWriters/gltf/gltfSetWriterRunTime.C b/src/meshTools/coordSet/writers/gltf/gltfSetWriterRunTime.C similarity index 100% rename from src/fileFormats/sampledSetWriters/gltf/gltfSetWriterRunTime.C rename to src/meshTools/coordSet/writers/gltf/gltfSetWriterRunTime.C diff --git a/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.C b/src/meshTools/coordSet/writers/gnuplot/gnuplotCoordSetWriter.C similarity index 100% rename from src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.C rename to src/meshTools/coordSet/writers/gnuplot/gnuplotCoordSetWriter.C diff --git a/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.H b/src/meshTools/coordSet/writers/gnuplot/gnuplotSetWriter.H similarity index 95% rename from src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.H rename to src/meshTools/coordSet/writers/gnuplot/gnuplotSetWriter.H index da88940954..d96d603677 100644 --- a/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.H +++ b/src/meshTools/coordSet/writers/gnuplot/gnuplotSetWriter.H @@ -30,12 +30,12 @@ Class Description SourceFiles - gnuplotSetWriter.C + gnuplotCoordSetWriter.C \*---------------------------------------------------------------------------*/ -#ifndef gnuplotSetWriter_H -#define gnuplotSetWriter_H +#ifndef Foam_coordSetWriters_gnuplotWriter_H +#define Foam_coordSetWriters_gnuplotWriter_H #include "writer.H" @@ -107,7 +107,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository - #include "gnuplotSetWriter.C" + #include "gnuplotCoordSetWriter.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriterRunTime.C b/src/meshTools/coordSet/writers/gnuplot/gnuplotSetWriterRunTime.C similarity index 100% rename from src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriterRunTime.C rename to src/meshTools/coordSet/writers/gnuplot/gnuplotSetWriterRunTime.C diff --git a/src/fileFormats/sampledSetWriters/nastran/nastranSetWriter.C b/src/meshTools/coordSet/writers/nastran/nastranCoordSetWriter.C similarity index 100% rename from src/fileFormats/sampledSetWriters/nastran/nastranSetWriter.C rename to src/meshTools/coordSet/writers/nastran/nastranCoordSetWriter.C diff --git a/src/fileFormats/sampledSetWriters/nastran/nastranSetWriter.H b/src/meshTools/coordSet/writers/nastran/nastranSetWriter.H similarity index 95% rename from src/fileFormats/sampledSetWriters/nastran/nastranSetWriter.H rename to src/meshTools/coordSet/writers/nastran/nastranSetWriter.H index 6cdb208c25..fef0f83c93 100644 --- a/src/fileFormats/sampledSetWriters/nastran/nastranSetWriter.H +++ b/src/meshTools/coordSet/writers/nastran/nastranSetWriter.H @@ -32,12 +32,12 @@ Description Does not do field data. SourceFiles - nastranSetWriter.C + nastranCoordSetWriter.C \*---------------------------------------------------------------------------*/ -#ifndef nastranSetWriter_H -#define nastranSetWriter_H +#ifndef Foam_coordSetWriters_nastranWriter_H +#define Foam_coordSetWriters_nastranWriter_H #include "writer.H" #include "NASCore.H" @@ -124,7 +124,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository - #include "nastranSetWriter.C" + #include "nastranCoordSetWriter.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/fileFormats/sampledSetWriters/nastran/nastranSetWriterRunTime.C b/src/meshTools/coordSet/writers/nastran/nastranSetWriterRunTime.C similarity index 100% rename from src/fileFormats/sampledSetWriters/nastran/nastranSetWriterRunTime.C rename to src/meshTools/coordSet/writers/nastran/nastranSetWriterRunTime.C diff --git a/src/fileFormats/sampledSetWriters/raw/rawSetWriter.C b/src/meshTools/coordSet/writers/raw/rawCoordSetWriter.C similarity index 100% rename from src/fileFormats/sampledSetWriters/raw/rawSetWriter.C rename to src/meshTools/coordSet/writers/raw/rawCoordSetWriter.C diff --git a/src/fileFormats/sampledSetWriters/raw/rawSetWriter.H b/src/meshTools/coordSet/writers/raw/rawSetWriter.H similarity index 95% rename from src/fileFormats/sampledSetWriters/raw/rawSetWriter.H rename to src/meshTools/coordSet/writers/raw/rawSetWriter.H index 87071a9285..627f98ef3c 100644 --- a/src/fileFormats/sampledSetWriters/raw/rawSetWriter.H +++ b/src/meshTools/coordSet/writers/raw/rawSetWriter.H @@ -30,12 +30,12 @@ Class Description SourceFiles - rawSetWriter.C + rawCoordSetWriter.C \*---------------------------------------------------------------------------*/ -#ifndef rawSetWriter_H -#define rawSetWriter_H +#ifndef Foam_coordSetWriters_rawWriter_H +#define Foam_coordSetWriters_rawWriter_H #include "writer.H" @@ -107,7 +107,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository - #include "rawSetWriter.C" + #include "rawCoordSetWriter.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/fileFormats/sampledSetWriters/raw/rawSetWriterRunTime.C b/src/meshTools/coordSet/writers/raw/rawSetWriterRunTime.C similarity index 100% rename from src/fileFormats/sampledSetWriters/raw/rawSetWriterRunTime.C rename to src/meshTools/coordSet/writers/raw/rawSetWriterRunTime.C diff --git a/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.C b/src/meshTools/coordSet/writers/vtk/vtkCoordSetWriter.C similarity index 100% rename from src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.C rename to src/meshTools/coordSet/writers/vtk/vtkCoordSetWriter.C diff --git a/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.H b/src/meshTools/coordSet/writers/vtk/vtkSetWriter.H similarity index 95% rename from src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.H rename to src/meshTools/coordSet/writers/vtk/vtkSetWriter.H index 7e2e9493a4..6a1cbb2485 100644 --- a/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.H +++ b/src/meshTools/coordSet/writers/vtk/vtkSetWriter.H @@ -33,12 +33,12 @@ Note The output order of symmTensor is incorrect. SourceFiles - vtkSetWriter.C + vtkCoordSetWriter.C \*---------------------------------------------------------------------------*/ -#ifndef vtkSetWriter_H -#define vtkSetWriter_H +#ifndef Foam_coordSetWriters_vtkWriter_H +#define Foam_coordSetWriters_vtkWriter_H #include "writer.H" @@ -110,7 +110,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository - #include "vtkSetWriter.C" + #include "vtkCoordSetWriter.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/fileFormats/sampledSetWriters/vtk/vtkSetWriterRunTime.C b/src/meshTools/coordSet/writers/vtk/vtkSetWriterRunTime.C similarity index 100% rename from src/fileFormats/sampledSetWriters/vtk/vtkSetWriterRunTime.C rename to src/meshTools/coordSet/writers/vtk/vtkSetWriterRunTime.C diff --git a/src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.C b/src/meshTools/coordSet/writers/xmgrace/xmgraceCoordSetWriter.C similarity index 100% rename from src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.C rename to src/meshTools/coordSet/writers/xmgrace/xmgraceCoordSetWriter.C diff --git a/src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.H b/src/meshTools/coordSet/writers/xmgrace/xmgraceSetWriter.H similarity index 95% rename from src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.H rename to src/meshTools/coordSet/writers/xmgrace/xmgraceSetWriter.H index d3f064106d..9213dd6a77 100644 --- a/src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.H +++ b/src/meshTools/coordSet/writers/xmgrace/xmgraceSetWriter.H @@ -30,12 +30,12 @@ Class Description SourceFiles - xmgraceSetWriter.C + xmgraceCoordSetWriter.C \*---------------------------------------------------------------------------*/ -#ifndef xmgraceSetWriter_H -#define xmgraceSetWriter_H +#ifndef Foam_coordSetWriters_xmgraceWriter_H +#define Foam_coordSetWriters_xmgraceWriter_H #include "writer.H" @@ -107,7 +107,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository - #include "xmgraceSetWriter.C" + #include "xmgraceCoordSetWriter.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriterRunTime.C b/src/meshTools/coordSet/writers/xmgrace/xmgraceSetWriterRunTime.C similarity index 100% rename from src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriterRunTime.C rename to src/meshTools/coordSet/writers/xmgrace/xmgraceSetWriterRunTime.C diff --git a/src/meshTools/sets/cellSources/boundaryToCell/boundaryToCell.C b/src/meshTools/topoSet/cellSources/boundaryToCell/boundaryToCell.C similarity index 100% rename from src/meshTools/sets/cellSources/boundaryToCell/boundaryToCell.C rename to src/meshTools/topoSet/cellSources/boundaryToCell/boundaryToCell.C diff --git a/src/meshTools/sets/cellSources/boundaryToCell/boundaryToCell.H b/src/meshTools/topoSet/cellSources/boundaryToCell/boundaryToCell.H similarity index 100% rename from src/meshTools/sets/cellSources/boundaryToCell/boundaryToCell.H rename to src/meshTools/topoSet/cellSources/boundaryToCell/boundaryToCell.H diff --git a/src/meshTools/sets/cellSources/boxToCell/boxToCell.C b/src/meshTools/topoSet/cellSources/boxToCell/boxToCell.C similarity index 100% rename from src/meshTools/sets/cellSources/boxToCell/boxToCell.C rename to src/meshTools/topoSet/cellSources/boxToCell/boxToCell.C diff --git a/src/meshTools/sets/cellSources/boxToCell/boxToCell.H b/src/meshTools/topoSet/cellSources/boxToCell/boxToCell.H similarity index 100% rename from src/meshTools/sets/cellSources/boxToCell/boxToCell.H rename to src/meshTools/topoSet/cellSources/boxToCell/boxToCell.H diff --git a/src/meshTools/sets/cellSources/cellToCell/cellToCell.C b/src/meshTools/topoSet/cellSources/cellToCell/cellToCell.C similarity index 100% rename from src/meshTools/sets/cellSources/cellToCell/cellToCell.C rename to src/meshTools/topoSet/cellSources/cellToCell/cellToCell.C diff --git a/src/meshTools/sets/cellSources/cellToCell/cellToCell.H b/src/meshTools/topoSet/cellSources/cellToCell/cellToCell.H similarity index 100% rename from src/meshTools/sets/cellSources/cellToCell/cellToCell.H rename to src/meshTools/topoSet/cellSources/cellToCell/cellToCell.H diff --git a/src/meshTools/sets/cellSources/cylinderAnnulusToCell/cylinderAnnulusToCell.C b/src/meshTools/topoSet/cellSources/cylinderAnnulusToCell/cylinderAnnulusToCell.C similarity index 100% rename from src/meshTools/sets/cellSources/cylinderAnnulusToCell/cylinderAnnulusToCell.C rename to src/meshTools/topoSet/cellSources/cylinderAnnulusToCell/cylinderAnnulusToCell.C diff --git a/src/meshTools/sets/cellSources/cylinderAnnulusToCell/cylinderAnnulusToCell.H b/src/meshTools/topoSet/cellSources/cylinderAnnulusToCell/cylinderAnnulusToCell.H similarity index 100% rename from src/meshTools/sets/cellSources/cylinderAnnulusToCell/cylinderAnnulusToCell.H rename to src/meshTools/topoSet/cellSources/cylinderAnnulusToCell/cylinderAnnulusToCell.H diff --git a/src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.C b/src/meshTools/topoSet/cellSources/cylinderToCell/cylinderToCell.C similarity index 100% rename from src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.C rename to src/meshTools/topoSet/cellSources/cylinderToCell/cylinderToCell.C diff --git a/src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.H b/src/meshTools/topoSet/cellSources/cylinderToCell/cylinderToCell.H similarity index 100% rename from src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.H rename to src/meshTools/topoSet/cellSources/cylinderToCell/cylinderToCell.H diff --git a/src/meshTools/sets/cellSources/faceToCell/faceToCell.C b/src/meshTools/topoSet/cellSources/faceToCell/faceToCell.C similarity index 100% rename from src/meshTools/sets/cellSources/faceToCell/faceToCell.C rename to src/meshTools/topoSet/cellSources/faceToCell/faceToCell.C diff --git a/src/meshTools/sets/cellSources/faceToCell/faceToCell.H b/src/meshTools/topoSet/cellSources/faceToCell/faceToCell.H similarity index 100% rename from src/meshTools/sets/cellSources/faceToCell/faceToCell.H rename to src/meshTools/topoSet/cellSources/faceToCell/faceToCell.H diff --git a/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.C b/src/meshTools/topoSet/cellSources/faceZoneToCell/faceZoneToCell.C similarity index 100% rename from src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.C rename to src/meshTools/topoSet/cellSources/faceZoneToCell/faceZoneToCell.C diff --git a/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.H b/src/meshTools/topoSet/cellSources/faceZoneToCell/faceZoneToCell.H similarity index 100% rename from src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.H rename to src/meshTools/topoSet/cellSources/faceZoneToCell/faceZoneToCell.H diff --git a/src/meshTools/sets/cellSources/fieldToCell/fieldDictionary.H b/src/meshTools/topoSet/cellSources/fieldToCell/fieldDictionary.H similarity index 100% rename from src/meshTools/sets/cellSources/fieldToCell/fieldDictionary.H rename to src/meshTools/topoSet/cellSources/fieldToCell/fieldDictionary.H diff --git a/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.C b/src/meshTools/topoSet/cellSources/fieldToCell/fieldToCell.C similarity index 100% rename from src/meshTools/sets/cellSources/fieldToCell/fieldToCell.C rename to src/meshTools/topoSet/cellSources/fieldToCell/fieldToCell.C diff --git a/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.H b/src/meshTools/topoSet/cellSources/fieldToCell/fieldToCell.H similarity index 100% rename from src/meshTools/sets/cellSources/fieldToCell/fieldToCell.H rename to src/meshTools/topoSet/cellSources/fieldToCell/fieldToCell.H diff --git a/src/meshTools/sets/cellSources/haloToCell/haloToCell.C b/src/meshTools/topoSet/cellSources/haloToCell/haloToCell.C similarity index 100% rename from src/meshTools/sets/cellSources/haloToCell/haloToCell.C rename to src/meshTools/topoSet/cellSources/haloToCell/haloToCell.C diff --git a/src/meshTools/sets/cellSources/haloToCell/haloToCell.H b/src/meshTools/topoSet/cellSources/haloToCell/haloToCell.H similarity index 100% rename from src/meshTools/sets/cellSources/haloToCell/haloToCell.H rename to src/meshTools/topoSet/cellSources/haloToCell/haloToCell.H diff --git a/src/meshTools/sets/cellSources/labelToCell/labelToCell.C b/src/meshTools/topoSet/cellSources/labelToCell/labelToCell.C similarity index 100% rename from src/meshTools/sets/cellSources/labelToCell/labelToCell.C rename to src/meshTools/topoSet/cellSources/labelToCell/labelToCell.C diff --git a/src/meshTools/sets/cellSources/labelToCell/labelToCell.H b/src/meshTools/topoSet/cellSources/labelToCell/labelToCell.H similarity index 100% rename from src/meshTools/sets/cellSources/labelToCell/labelToCell.H rename to src/meshTools/topoSet/cellSources/labelToCell/labelToCell.H diff --git a/src/meshTools/sets/cellSources/nbrToCell/nbrToCell.C b/src/meshTools/topoSet/cellSources/nbrToCell/nbrToCell.C similarity index 100% rename from src/meshTools/sets/cellSources/nbrToCell/nbrToCell.C rename to src/meshTools/topoSet/cellSources/nbrToCell/nbrToCell.C diff --git a/src/meshTools/sets/cellSources/nbrToCell/nbrToCell.H b/src/meshTools/topoSet/cellSources/nbrToCell/nbrToCell.H similarity index 100% rename from src/meshTools/sets/cellSources/nbrToCell/nbrToCell.H rename to src/meshTools/topoSet/cellSources/nbrToCell/nbrToCell.H diff --git a/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.C b/src/meshTools/topoSet/cellSources/nearestToCell/nearestToCell.C similarity index 100% rename from src/meshTools/sets/cellSources/nearestToCell/nearestToCell.C rename to src/meshTools/topoSet/cellSources/nearestToCell/nearestToCell.C diff --git a/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.H b/src/meshTools/topoSet/cellSources/nearestToCell/nearestToCell.H similarity index 100% rename from src/meshTools/sets/cellSources/nearestToCell/nearestToCell.H rename to src/meshTools/topoSet/cellSources/nearestToCell/nearestToCell.H diff --git a/src/meshTools/sets/cellSources/patchToCell/patchToCell.C b/src/meshTools/topoSet/cellSources/patchToCell/patchToCell.C similarity index 100% rename from src/meshTools/sets/cellSources/patchToCell/patchToCell.C rename to src/meshTools/topoSet/cellSources/patchToCell/patchToCell.C diff --git a/src/meshTools/sets/cellSources/patchToCell/patchToCell.H b/src/meshTools/topoSet/cellSources/patchToCell/patchToCell.H similarity index 100% rename from src/meshTools/sets/cellSources/patchToCell/patchToCell.H rename to src/meshTools/topoSet/cellSources/patchToCell/patchToCell.H diff --git a/src/meshTools/sets/cellSources/pointToCell/pointToCell.C b/src/meshTools/topoSet/cellSources/pointToCell/pointToCell.C similarity index 100% rename from src/meshTools/sets/cellSources/pointToCell/pointToCell.C rename to src/meshTools/topoSet/cellSources/pointToCell/pointToCell.C diff --git a/src/meshTools/sets/cellSources/pointToCell/pointToCell.H b/src/meshTools/topoSet/cellSources/pointToCell/pointToCell.H similarity index 100% rename from src/meshTools/sets/cellSources/pointToCell/pointToCell.H rename to src/meshTools/topoSet/cellSources/pointToCell/pointToCell.H diff --git a/src/meshTools/sets/cellSources/regionToCell/regionToCell.C b/src/meshTools/topoSet/cellSources/regionToCell/regionToCell.C similarity index 100% rename from src/meshTools/sets/cellSources/regionToCell/regionToCell.C rename to src/meshTools/topoSet/cellSources/regionToCell/regionToCell.C diff --git a/src/meshTools/sets/cellSources/regionToCell/regionToCell.H b/src/meshTools/topoSet/cellSources/regionToCell/regionToCell.H similarity index 100% rename from src/meshTools/sets/cellSources/regionToCell/regionToCell.H rename to src/meshTools/topoSet/cellSources/regionToCell/regionToCell.H diff --git a/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.C b/src/meshTools/topoSet/cellSources/rotatedBoxToCell/rotatedBoxToCell.C similarity index 100% rename from src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.C rename to src/meshTools/topoSet/cellSources/rotatedBoxToCell/rotatedBoxToCell.C diff --git a/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.H b/src/meshTools/topoSet/cellSources/rotatedBoxToCell/rotatedBoxToCell.H similarity index 100% rename from src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.H rename to src/meshTools/topoSet/cellSources/rotatedBoxToCell/rotatedBoxToCell.H diff --git a/src/meshTools/sets/cellSources/searchableSurfaceToCell/searchableSurfaceToCell.C b/src/meshTools/topoSet/cellSources/searchableSurfaceToCell/searchableSurfaceToCell.C similarity index 100% rename from src/meshTools/sets/cellSources/searchableSurfaceToCell/searchableSurfaceToCell.C rename to src/meshTools/topoSet/cellSources/searchableSurfaceToCell/searchableSurfaceToCell.C diff --git a/src/meshTools/sets/cellSources/searchableSurfaceToCell/searchableSurfaceToCell.H b/src/meshTools/topoSet/cellSources/searchableSurfaceToCell/searchableSurfaceToCell.H similarity index 100% rename from src/meshTools/sets/cellSources/searchableSurfaceToCell/searchableSurfaceToCell.H rename to src/meshTools/topoSet/cellSources/searchableSurfaceToCell/searchableSurfaceToCell.H diff --git a/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C b/src/meshTools/topoSet/cellSources/shapeToCell/shapeToCell.C similarity index 100% rename from src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C rename to src/meshTools/topoSet/cellSources/shapeToCell/shapeToCell.C diff --git a/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.H b/src/meshTools/topoSet/cellSources/shapeToCell/shapeToCell.H similarity index 100% rename from src/meshTools/sets/cellSources/shapeToCell/shapeToCell.H rename to src/meshTools/topoSet/cellSources/shapeToCell/shapeToCell.H diff --git a/src/meshTools/sets/cellSources/sphereToCell/sphereToCell.C b/src/meshTools/topoSet/cellSources/sphereToCell/sphereToCell.C similarity index 100% rename from src/meshTools/sets/cellSources/sphereToCell/sphereToCell.C rename to src/meshTools/topoSet/cellSources/sphereToCell/sphereToCell.C diff --git a/src/meshTools/sets/cellSources/sphereToCell/sphereToCell.H b/src/meshTools/topoSet/cellSources/sphereToCell/sphereToCell.H similarity index 100% rename from src/meshTools/sets/cellSources/sphereToCell/sphereToCell.H rename to src/meshTools/topoSet/cellSources/sphereToCell/sphereToCell.H diff --git a/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.C b/src/meshTools/topoSet/cellSources/surfaceToCell/surfaceToCell.C similarity index 100% rename from src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.C rename to src/meshTools/topoSet/cellSources/surfaceToCell/surfaceToCell.C diff --git a/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.H b/src/meshTools/topoSet/cellSources/surfaceToCell/surfaceToCell.H similarity index 100% rename from src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.H rename to src/meshTools/topoSet/cellSources/surfaceToCell/surfaceToCell.H diff --git a/src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.C b/src/meshTools/topoSet/cellSources/targetVolumeToCell/targetVolumeToCell.C similarity index 100% rename from src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.C rename to src/meshTools/topoSet/cellSources/targetVolumeToCell/targetVolumeToCell.C diff --git a/src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.H b/src/meshTools/topoSet/cellSources/targetVolumeToCell/targetVolumeToCell.H similarity index 100% rename from src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.H rename to src/meshTools/topoSet/cellSources/targetVolumeToCell/targetVolumeToCell.H diff --git a/src/meshTools/sets/cellSources/topoSetCellSource/topoSetCellSource.C b/src/meshTools/topoSet/cellSources/topoSetCellSource/topoSetCellSource.C similarity index 100% rename from src/meshTools/sets/cellSources/topoSetCellSource/topoSetCellSource.C rename to src/meshTools/topoSet/cellSources/topoSetCellSource/topoSetCellSource.C diff --git a/src/meshTools/sets/cellSources/topoSetCellSource/topoSetCellSource.H b/src/meshTools/topoSet/cellSources/topoSetCellSource/topoSetCellSource.H similarity index 100% rename from src/meshTools/sets/cellSources/topoSetCellSource/topoSetCellSource.H rename to src/meshTools/topoSet/cellSources/topoSetCellSource/topoSetCellSource.H diff --git a/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.C b/src/meshTools/topoSet/cellSources/zoneToCell/zoneToCell.C similarity index 100% rename from src/meshTools/sets/cellSources/zoneToCell/zoneToCell.C rename to src/meshTools/topoSet/cellSources/zoneToCell/zoneToCell.C diff --git a/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.H b/src/meshTools/topoSet/cellSources/zoneToCell/zoneToCell.H similarity index 100% rename from src/meshTools/sets/cellSources/zoneToCell/zoneToCell.H rename to src/meshTools/topoSet/cellSources/zoneToCell/zoneToCell.H diff --git a/src/meshTools/sets/cellZoneSources/setToCellZone/setToCellZone.C b/src/meshTools/topoSet/cellZoneSources/setToCellZone/setToCellZone.C similarity index 100% rename from src/meshTools/sets/cellZoneSources/setToCellZone/setToCellZone.C rename to src/meshTools/topoSet/cellZoneSources/setToCellZone/setToCellZone.C diff --git a/src/meshTools/sets/cellZoneSources/setToCellZone/setToCellZone.H b/src/meshTools/topoSet/cellZoneSources/setToCellZone/setToCellZone.H similarity index 100% rename from src/meshTools/sets/cellZoneSources/setToCellZone/setToCellZone.H rename to src/meshTools/topoSet/cellZoneSources/setToCellZone/setToCellZone.H diff --git a/src/meshTools/sets/cellZoneSources/topoSetCellZoneSource/topoSetCellZoneSource.C b/src/meshTools/topoSet/cellZoneSources/topoSetCellZoneSource/topoSetCellZoneSource.C similarity index 100% rename from src/meshTools/sets/cellZoneSources/topoSetCellZoneSource/topoSetCellZoneSource.C rename to src/meshTools/topoSet/cellZoneSources/topoSetCellZoneSource/topoSetCellZoneSource.C diff --git a/src/meshTools/sets/cellZoneSources/topoSetCellZoneSource/topoSetCellZoneSource.H b/src/meshTools/topoSet/cellZoneSources/topoSetCellZoneSource/topoSetCellZoneSource.H similarity index 100% rename from src/meshTools/sets/cellZoneSources/topoSetCellZoneSource/topoSetCellZoneSource.H rename to src/meshTools/topoSet/cellZoneSources/topoSetCellZoneSource/topoSetCellZoneSource.H diff --git a/src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.C b/src/meshTools/topoSet/faceSources/boundaryToFace/boundaryToFace.C similarity index 100% rename from src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.C rename to src/meshTools/topoSet/faceSources/boundaryToFace/boundaryToFace.C diff --git a/src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.H b/src/meshTools/topoSet/faceSources/boundaryToFace/boundaryToFace.H similarity index 100% rename from src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.H rename to src/meshTools/topoSet/faceSources/boundaryToFace/boundaryToFace.H diff --git a/src/meshTools/sets/faceSources/boxToFace/boxToFace.C b/src/meshTools/topoSet/faceSources/boxToFace/boxToFace.C similarity index 100% rename from src/meshTools/sets/faceSources/boxToFace/boxToFace.C rename to src/meshTools/topoSet/faceSources/boxToFace/boxToFace.C diff --git a/src/meshTools/sets/faceSources/boxToFace/boxToFace.H b/src/meshTools/topoSet/faceSources/boxToFace/boxToFace.H similarity index 100% rename from src/meshTools/sets/faceSources/boxToFace/boxToFace.H rename to src/meshTools/topoSet/faceSources/boxToFace/boxToFace.H diff --git a/src/meshTools/sets/faceSources/cellToFace/cellToFace.C b/src/meshTools/topoSet/faceSources/cellToFace/cellToFace.C similarity index 100% rename from src/meshTools/sets/faceSources/cellToFace/cellToFace.C rename to src/meshTools/topoSet/faceSources/cellToFace/cellToFace.C diff --git a/src/meshTools/sets/faceSources/cellToFace/cellToFace.H b/src/meshTools/topoSet/faceSources/cellToFace/cellToFace.H similarity index 100% rename from src/meshTools/sets/faceSources/cellToFace/cellToFace.H rename to src/meshTools/topoSet/faceSources/cellToFace/cellToFace.H diff --git a/src/meshTools/sets/faceSources/cylinderAnnulusToFace/cylinderAnnulusToFace.C b/src/meshTools/topoSet/faceSources/cylinderAnnulusToFace/cylinderAnnulusToFace.C similarity index 100% rename from src/meshTools/sets/faceSources/cylinderAnnulusToFace/cylinderAnnulusToFace.C rename to src/meshTools/topoSet/faceSources/cylinderAnnulusToFace/cylinderAnnulusToFace.C diff --git a/src/meshTools/sets/faceSources/cylinderAnnulusToFace/cylinderAnnulusToFace.H b/src/meshTools/topoSet/faceSources/cylinderAnnulusToFace/cylinderAnnulusToFace.H similarity index 100% rename from src/meshTools/sets/faceSources/cylinderAnnulusToFace/cylinderAnnulusToFace.H rename to src/meshTools/topoSet/faceSources/cylinderAnnulusToFace/cylinderAnnulusToFace.H diff --git a/src/meshTools/sets/faceSources/cylinderToFace/cylinderToFace.C b/src/meshTools/topoSet/faceSources/cylinderToFace/cylinderToFace.C similarity index 100% rename from src/meshTools/sets/faceSources/cylinderToFace/cylinderToFace.C rename to src/meshTools/topoSet/faceSources/cylinderToFace/cylinderToFace.C diff --git a/src/meshTools/sets/faceSources/cylinderToFace/cylinderToFace.H b/src/meshTools/topoSet/faceSources/cylinderToFace/cylinderToFace.H similarity index 100% rename from src/meshTools/sets/faceSources/cylinderToFace/cylinderToFace.H rename to src/meshTools/topoSet/faceSources/cylinderToFace/cylinderToFace.H diff --git a/src/meshTools/sets/faceSources/faceToFace/faceToFace.C b/src/meshTools/topoSet/faceSources/faceToFace/faceToFace.C similarity index 100% rename from src/meshTools/sets/faceSources/faceToFace/faceToFace.C rename to src/meshTools/topoSet/faceSources/faceToFace/faceToFace.C diff --git a/src/meshTools/sets/faceSources/faceToFace/faceToFace.H b/src/meshTools/topoSet/faceSources/faceToFace/faceToFace.H similarity index 100% rename from src/meshTools/sets/faceSources/faceToFace/faceToFace.H rename to src/meshTools/topoSet/faceSources/faceToFace/faceToFace.H diff --git a/src/meshTools/sets/faceSources/labelToFace/labelToFace.C b/src/meshTools/topoSet/faceSources/labelToFace/labelToFace.C similarity index 100% rename from src/meshTools/sets/faceSources/labelToFace/labelToFace.C rename to src/meshTools/topoSet/faceSources/labelToFace/labelToFace.C diff --git a/src/meshTools/sets/faceSources/labelToFace/labelToFace.H b/src/meshTools/topoSet/faceSources/labelToFace/labelToFace.H similarity index 100% rename from src/meshTools/sets/faceSources/labelToFace/labelToFace.H rename to src/meshTools/topoSet/faceSources/labelToFace/labelToFace.H diff --git a/src/meshTools/sets/faceSources/normalToFace/normalToFace.C b/src/meshTools/topoSet/faceSources/normalToFace/normalToFace.C similarity index 100% rename from src/meshTools/sets/faceSources/normalToFace/normalToFace.C rename to src/meshTools/topoSet/faceSources/normalToFace/normalToFace.C diff --git a/src/meshTools/sets/faceSources/normalToFace/normalToFace.H b/src/meshTools/topoSet/faceSources/normalToFace/normalToFace.H similarity index 100% rename from src/meshTools/sets/faceSources/normalToFace/normalToFace.H rename to src/meshTools/topoSet/faceSources/normalToFace/normalToFace.H diff --git a/src/meshTools/sets/faceSources/patchToFace/patchToFace.C b/src/meshTools/topoSet/faceSources/patchToFace/patchToFace.C similarity index 100% rename from src/meshTools/sets/faceSources/patchToFace/patchToFace.C rename to src/meshTools/topoSet/faceSources/patchToFace/patchToFace.C diff --git a/src/meshTools/sets/faceSources/patchToFace/patchToFace.H b/src/meshTools/topoSet/faceSources/patchToFace/patchToFace.H similarity index 100% rename from src/meshTools/sets/faceSources/patchToFace/patchToFace.H rename to src/meshTools/topoSet/faceSources/patchToFace/patchToFace.H diff --git a/src/meshTools/sets/faceSources/pointToFace/pointToFace.C b/src/meshTools/topoSet/faceSources/pointToFace/pointToFace.C similarity index 100% rename from src/meshTools/sets/faceSources/pointToFace/pointToFace.C rename to src/meshTools/topoSet/faceSources/pointToFace/pointToFace.C diff --git a/src/meshTools/sets/faceSources/pointToFace/pointToFace.H b/src/meshTools/topoSet/faceSources/pointToFace/pointToFace.H similarity index 100% rename from src/meshTools/sets/faceSources/pointToFace/pointToFace.H rename to src/meshTools/topoSet/faceSources/pointToFace/pointToFace.H diff --git a/src/meshTools/sets/faceSources/regionToFace/regionToFace.C b/src/meshTools/topoSet/faceSources/regionToFace/regionToFace.C similarity index 100% rename from src/meshTools/sets/faceSources/regionToFace/regionToFace.C rename to src/meshTools/topoSet/faceSources/regionToFace/regionToFace.C diff --git a/src/meshTools/sets/faceSources/regionToFace/regionToFace.H b/src/meshTools/topoSet/faceSources/regionToFace/regionToFace.H similarity index 100% rename from src/meshTools/sets/faceSources/regionToFace/regionToFace.H rename to src/meshTools/topoSet/faceSources/regionToFace/regionToFace.H diff --git a/src/meshTools/sets/faceSources/searchableSurfaceToFace/searchableSurfaceToFace.C b/src/meshTools/topoSet/faceSources/searchableSurfaceToFace/searchableSurfaceToFace.C similarity index 100% rename from src/meshTools/sets/faceSources/searchableSurfaceToFace/searchableSurfaceToFace.C rename to src/meshTools/topoSet/faceSources/searchableSurfaceToFace/searchableSurfaceToFace.C diff --git a/src/meshTools/sets/faceSources/searchableSurfaceToFace/searchableSurfaceToFace.H b/src/meshTools/topoSet/faceSources/searchableSurfaceToFace/searchableSurfaceToFace.H similarity index 100% rename from src/meshTools/sets/faceSources/searchableSurfaceToFace/searchableSurfaceToFace.H rename to src/meshTools/topoSet/faceSources/searchableSurfaceToFace/searchableSurfaceToFace.H diff --git a/src/meshTools/sets/faceSources/sphereToFace/sphereToFace.C b/src/meshTools/topoSet/faceSources/sphereToFace/sphereToFace.C similarity index 100% rename from src/meshTools/sets/faceSources/sphereToFace/sphereToFace.C rename to src/meshTools/topoSet/faceSources/sphereToFace/sphereToFace.C diff --git a/src/meshTools/sets/faceSources/sphereToFace/sphereToFace.H b/src/meshTools/topoSet/faceSources/sphereToFace/sphereToFace.H similarity index 100% rename from src/meshTools/sets/faceSources/sphereToFace/sphereToFace.H rename to src/meshTools/topoSet/faceSources/sphereToFace/sphereToFace.H diff --git a/src/meshTools/sets/faceSources/topoSetFaceSource/topoSetFaceSource.C b/src/meshTools/topoSet/faceSources/topoSetFaceSource/topoSetFaceSource.C similarity index 100% rename from src/meshTools/sets/faceSources/topoSetFaceSource/topoSetFaceSource.C rename to src/meshTools/topoSet/faceSources/topoSetFaceSource/topoSetFaceSource.C diff --git a/src/meshTools/sets/faceSources/topoSetFaceSource/topoSetFaceSource.H b/src/meshTools/topoSet/faceSources/topoSetFaceSource/topoSetFaceSource.H similarity index 100% rename from src/meshTools/sets/faceSources/topoSetFaceSource/topoSetFaceSource.H rename to src/meshTools/topoSet/faceSources/topoSetFaceSource/topoSetFaceSource.H diff --git a/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.C b/src/meshTools/topoSet/faceSources/zoneToFace/zoneToFace.C similarity index 100% rename from src/meshTools/sets/faceSources/zoneToFace/zoneToFace.C rename to src/meshTools/topoSet/faceSources/zoneToFace/zoneToFace.C diff --git a/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.H b/src/meshTools/topoSet/faceSources/zoneToFace/zoneToFace.H similarity index 100% rename from src/meshTools/sets/faceSources/zoneToFace/zoneToFace.H rename to src/meshTools/topoSet/faceSources/zoneToFace/zoneToFace.H diff --git a/src/meshTools/sets/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.C b/src/meshTools/topoSet/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.C similarity index 100% rename from src/meshTools/sets/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.C rename to src/meshTools/topoSet/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.C diff --git a/src/meshTools/sets/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.H b/src/meshTools/topoSet/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.H similarity index 100% rename from src/meshTools/sets/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.H rename to src/meshTools/topoSet/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.H diff --git a/src/meshTools/sets/faceZoneSources/planeToFaceZone/planeToFaceZone.C b/src/meshTools/topoSet/faceZoneSources/planeToFaceZone/planeToFaceZone.C similarity index 100% rename from src/meshTools/sets/faceZoneSources/planeToFaceZone/planeToFaceZone.C rename to src/meshTools/topoSet/faceZoneSources/planeToFaceZone/planeToFaceZone.C diff --git a/src/meshTools/sets/faceZoneSources/planeToFaceZone/planeToFaceZone.H b/src/meshTools/topoSet/faceZoneSources/planeToFaceZone/planeToFaceZone.H similarity index 100% rename from src/meshTools/sets/faceZoneSources/planeToFaceZone/planeToFaceZone.H rename to src/meshTools/topoSet/faceZoneSources/planeToFaceZone/planeToFaceZone.H diff --git a/src/meshTools/sets/faceZoneSources/searchableSurfaceToFaceZone/searchableSurfaceToFaceZone.C b/src/meshTools/topoSet/faceZoneSources/searchableSurfaceToFaceZone/searchableSurfaceToFaceZone.C similarity index 100% rename from src/meshTools/sets/faceZoneSources/searchableSurfaceToFaceZone/searchableSurfaceToFaceZone.C rename to src/meshTools/topoSet/faceZoneSources/searchableSurfaceToFaceZone/searchableSurfaceToFaceZone.C diff --git a/src/meshTools/sets/faceZoneSources/searchableSurfaceToFaceZone/searchableSurfaceToFaceZone.H b/src/meshTools/topoSet/faceZoneSources/searchableSurfaceToFaceZone/searchableSurfaceToFaceZone.H similarity index 100% rename from src/meshTools/sets/faceZoneSources/searchableSurfaceToFaceZone/searchableSurfaceToFaceZone.H rename to src/meshTools/topoSet/faceZoneSources/searchableSurfaceToFaceZone/searchableSurfaceToFaceZone.H diff --git a/src/meshTools/sets/faceZoneSources/setAndNormalToFaceZone/setAndNormalToFaceZone.C b/src/meshTools/topoSet/faceZoneSources/setAndNormalToFaceZone/setAndNormalToFaceZone.C similarity index 100% rename from src/meshTools/sets/faceZoneSources/setAndNormalToFaceZone/setAndNormalToFaceZone.C rename to src/meshTools/topoSet/faceZoneSources/setAndNormalToFaceZone/setAndNormalToFaceZone.C diff --git a/src/meshTools/sets/faceZoneSources/setAndNormalToFaceZone/setAndNormalToFaceZone.H b/src/meshTools/topoSet/faceZoneSources/setAndNormalToFaceZone/setAndNormalToFaceZone.H similarity index 100% rename from src/meshTools/sets/faceZoneSources/setAndNormalToFaceZone/setAndNormalToFaceZone.H rename to src/meshTools/topoSet/faceZoneSources/setAndNormalToFaceZone/setAndNormalToFaceZone.H diff --git a/src/meshTools/sets/faceZoneSources/setToFaceZone/setToFaceZone.C b/src/meshTools/topoSet/faceZoneSources/setToFaceZone/setToFaceZone.C similarity index 100% rename from src/meshTools/sets/faceZoneSources/setToFaceZone/setToFaceZone.C rename to src/meshTools/topoSet/faceZoneSources/setToFaceZone/setToFaceZone.C diff --git a/src/meshTools/sets/faceZoneSources/setToFaceZone/setToFaceZone.H b/src/meshTools/topoSet/faceZoneSources/setToFaceZone/setToFaceZone.H similarity index 100% rename from src/meshTools/sets/faceZoneSources/setToFaceZone/setToFaceZone.H rename to src/meshTools/topoSet/faceZoneSources/setToFaceZone/setToFaceZone.H diff --git a/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.C b/src/meshTools/topoSet/faceZoneSources/setsToFaceZone/setsToFaceZone.C similarity index 100% rename from src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.C rename to src/meshTools/topoSet/faceZoneSources/setsToFaceZone/setsToFaceZone.C diff --git a/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.H b/src/meshTools/topoSet/faceZoneSources/setsToFaceZone/setsToFaceZone.H similarity index 100% rename from src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.H rename to src/meshTools/topoSet/faceZoneSources/setsToFaceZone/setsToFaceZone.H diff --git a/src/meshTools/sets/faceZoneSources/topoSetFaceZoneSource/topoSetFaceZoneSource.C b/src/meshTools/topoSet/faceZoneSources/topoSetFaceZoneSource/topoSetFaceZoneSource.C similarity index 100% rename from src/meshTools/sets/faceZoneSources/topoSetFaceZoneSource/topoSetFaceZoneSource.C rename to src/meshTools/topoSet/faceZoneSources/topoSetFaceZoneSource/topoSetFaceZoneSource.C diff --git a/src/meshTools/sets/faceZoneSources/topoSetFaceZoneSource/topoSetFaceZoneSource.H b/src/meshTools/topoSet/faceZoneSources/topoSetFaceZoneSource/topoSetFaceZoneSource.H similarity index 100% rename from src/meshTools/sets/faceZoneSources/topoSetFaceZoneSource/topoSetFaceZoneSource.H rename to src/meshTools/topoSet/faceZoneSources/topoSetFaceZoneSource/topoSetFaceZoneSource.H diff --git a/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.C b/src/meshTools/topoSet/pointSources/boxToPoint/boxToPoint.C similarity index 100% rename from src/meshTools/sets/pointSources/boxToPoint/boxToPoint.C rename to src/meshTools/topoSet/pointSources/boxToPoint/boxToPoint.C diff --git a/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.H b/src/meshTools/topoSet/pointSources/boxToPoint/boxToPoint.H similarity index 100% rename from src/meshTools/sets/pointSources/boxToPoint/boxToPoint.H rename to src/meshTools/topoSet/pointSources/boxToPoint/boxToPoint.H diff --git a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C b/src/meshTools/topoSet/pointSources/cellToPoint/cellToPoint.C similarity index 100% rename from src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C rename to src/meshTools/topoSet/pointSources/cellToPoint/cellToPoint.C diff --git a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.H b/src/meshTools/topoSet/pointSources/cellToPoint/cellToPoint.H similarity index 100% rename from src/meshTools/sets/pointSources/cellToPoint/cellToPoint.H rename to src/meshTools/topoSet/pointSources/cellToPoint/cellToPoint.H diff --git a/src/meshTools/sets/pointSources/cylinderToPoint/cylinderToPoint.C b/src/meshTools/topoSet/pointSources/cylinderToPoint/cylinderToPoint.C similarity index 100% rename from src/meshTools/sets/pointSources/cylinderToPoint/cylinderToPoint.C rename to src/meshTools/topoSet/pointSources/cylinderToPoint/cylinderToPoint.C diff --git a/src/meshTools/sets/pointSources/cylinderToPoint/cylinderToPoint.H b/src/meshTools/topoSet/pointSources/cylinderToPoint/cylinderToPoint.H similarity index 100% rename from src/meshTools/sets/pointSources/cylinderToPoint/cylinderToPoint.H rename to src/meshTools/topoSet/pointSources/cylinderToPoint/cylinderToPoint.H diff --git a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C b/src/meshTools/topoSet/pointSources/faceToPoint/faceToPoint.C similarity index 100% rename from src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C rename to src/meshTools/topoSet/pointSources/faceToPoint/faceToPoint.C diff --git a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.H b/src/meshTools/topoSet/pointSources/faceToPoint/faceToPoint.H similarity index 100% rename from src/meshTools/sets/pointSources/faceToPoint/faceToPoint.H rename to src/meshTools/topoSet/pointSources/faceToPoint/faceToPoint.H diff --git a/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.C b/src/meshTools/topoSet/pointSources/labelToPoint/labelToPoint.C similarity index 100% rename from src/meshTools/sets/pointSources/labelToPoint/labelToPoint.C rename to src/meshTools/topoSet/pointSources/labelToPoint/labelToPoint.C diff --git a/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.H b/src/meshTools/topoSet/pointSources/labelToPoint/labelToPoint.H similarity index 100% rename from src/meshTools/sets/pointSources/labelToPoint/labelToPoint.H rename to src/meshTools/topoSet/pointSources/labelToPoint/labelToPoint.H diff --git a/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.C b/src/meshTools/topoSet/pointSources/nearestToPoint/nearestToPoint.C similarity index 100% rename from src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.C rename to src/meshTools/topoSet/pointSources/nearestToPoint/nearestToPoint.C diff --git a/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.H b/src/meshTools/topoSet/pointSources/nearestToPoint/nearestToPoint.H similarity index 100% rename from src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.H rename to src/meshTools/topoSet/pointSources/nearestToPoint/nearestToPoint.H diff --git a/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.C b/src/meshTools/topoSet/pointSources/pointToPoint/pointToPoint.C similarity index 100% rename from src/meshTools/sets/pointSources/pointToPoint/pointToPoint.C rename to src/meshTools/topoSet/pointSources/pointToPoint/pointToPoint.C diff --git a/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.H b/src/meshTools/topoSet/pointSources/pointToPoint/pointToPoint.H similarity index 100% rename from src/meshTools/sets/pointSources/pointToPoint/pointToPoint.H rename to src/meshTools/topoSet/pointSources/pointToPoint/pointToPoint.H diff --git a/src/meshTools/sets/pointSources/searchableSurfaceToPoint/searchableSurfaceToPoint.C b/src/meshTools/topoSet/pointSources/searchableSurfaceToPoint/searchableSurfaceToPoint.C similarity index 100% rename from src/meshTools/sets/pointSources/searchableSurfaceToPoint/searchableSurfaceToPoint.C rename to src/meshTools/topoSet/pointSources/searchableSurfaceToPoint/searchableSurfaceToPoint.C diff --git a/src/meshTools/sets/pointSources/searchableSurfaceToPoint/searchableSurfaceToPoint.H b/src/meshTools/topoSet/pointSources/searchableSurfaceToPoint/searchableSurfaceToPoint.H similarity index 100% rename from src/meshTools/sets/pointSources/searchableSurfaceToPoint/searchableSurfaceToPoint.H rename to src/meshTools/topoSet/pointSources/searchableSurfaceToPoint/searchableSurfaceToPoint.H diff --git a/src/meshTools/sets/pointSources/sphereToPoint/sphereToPoint.C b/src/meshTools/topoSet/pointSources/sphereToPoint/sphereToPoint.C similarity index 100% rename from src/meshTools/sets/pointSources/sphereToPoint/sphereToPoint.C rename to src/meshTools/topoSet/pointSources/sphereToPoint/sphereToPoint.C diff --git a/src/meshTools/sets/pointSources/sphereToPoint/sphereToPoint.H b/src/meshTools/topoSet/pointSources/sphereToPoint/sphereToPoint.H similarity index 100% rename from src/meshTools/sets/pointSources/sphereToPoint/sphereToPoint.H rename to src/meshTools/topoSet/pointSources/sphereToPoint/sphereToPoint.H diff --git a/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.C b/src/meshTools/topoSet/pointSources/surfaceToPoint/surfaceToPoint.C similarity index 100% rename from src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.C rename to src/meshTools/topoSet/pointSources/surfaceToPoint/surfaceToPoint.C diff --git a/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.H b/src/meshTools/topoSet/pointSources/surfaceToPoint/surfaceToPoint.H similarity index 100% rename from src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.H rename to src/meshTools/topoSet/pointSources/surfaceToPoint/surfaceToPoint.H diff --git a/src/meshTools/sets/pointSources/topoSetPointSource/topoSetPointSource.C b/src/meshTools/topoSet/pointSources/topoSetPointSource/topoSetPointSource.C similarity index 100% rename from src/meshTools/sets/pointSources/topoSetPointSource/topoSetPointSource.C rename to src/meshTools/topoSet/pointSources/topoSetPointSource/topoSetPointSource.C diff --git a/src/meshTools/sets/pointSources/topoSetPointSource/topoSetPointSource.H b/src/meshTools/topoSet/pointSources/topoSetPointSource/topoSetPointSource.H similarity index 100% rename from src/meshTools/sets/pointSources/topoSetPointSource/topoSetPointSource.H rename to src/meshTools/topoSet/pointSources/topoSetPointSource/topoSetPointSource.H diff --git a/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.C b/src/meshTools/topoSet/pointSources/zoneToPoint/zoneToPoint.C similarity index 100% rename from src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.C rename to src/meshTools/topoSet/pointSources/zoneToPoint/zoneToPoint.C diff --git a/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.H b/src/meshTools/topoSet/pointSources/zoneToPoint/zoneToPoint.H similarity index 100% rename from src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.H rename to src/meshTools/topoSet/pointSources/zoneToPoint/zoneToPoint.H diff --git a/src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.C b/src/meshTools/topoSet/pointZoneSources/setToPointZone/setToPointZone.C similarity index 100% rename from src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.C rename to src/meshTools/topoSet/pointZoneSources/setToPointZone/setToPointZone.C diff --git a/src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.H b/src/meshTools/topoSet/pointZoneSources/setToPointZone/setToPointZone.H similarity index 100% rename from src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.H rename to src/meshTools/topoSet/pointZoneSources/setToPointZone/setToPointZone.H diff --git a/src/meshTools/sets/pointZoneSources/topoSetPointZoneSource/topoSetPointZoneSource.C b/src/meshTools/topoSet/pointZoneSources/topoSetPointZoneSource/topoSetPointZoneSource.C similarity index 100% rename from src/meshTools/sets/pointZoneSources/topoSetPointZoneSource/topoSetPointZoneSource.C rename to src/meshTools/topoSet/pointZoneSources/topoSetPointZoneSource/topoSetPointZoneSource.C diff --git a/src/meshTools/sets/pointZoneSources/topoSetPointZoneSource/topoSetPointZoneSource.H b/src/meshTools/topoSet/pointZoneSources/topoSetPointZoneSource/topoSetPointZoneSource.H similarity index 100% rename from src/meshTools/sets/pointZoneSources/topoSetPointZoneSource/topoSetPointZoneSource.H rename to src/meshTools/topoSet/pointZoneSources/topoSetPointZoneSource/topoSetPointZoneSource.H diff --git a/src/meshTools/sets/topoSetSource/topoSetSource.C b/src/meshTools/topoSet/topoSetSource/topoSetSource.C similarity index 100% rename from src/meshTools/sets/topoSetSource/topoSetSource.C rename to src/meshTools/topoSet/topoSetSource/topoSetSource.C diff --git a/src/meshTools/sets/topoSetSource/topoSetSource.H b/src/meshTools/topoSet/topoSetSource/topoSetSource.H similarity index 100% rename from src/meshTools/sets/topoSetSource/topoSetSource.H rename to src/meshTools/topoSet/topoSetSource/topoSetSource.H diff --git a/src/meshTools/sets/topoSets/cellBitSet.C b/src/meshTools/topoSet/topoSets/cellBitSet.C similarity index 100% rename from src/meshTools/sets/topoSets/cellBitSet.C rename to src/meshTools/topoSet/topoSets/cellBitSet.C diff --git a/src/meshTools/sets/topoSets/cellBitSet.H b/src/meshTools/topoSet/topoSets/cellBitSet.H similarity index 100% rename from src/meshTools/sets/topoSets/cellBitSet.H rename to src/meshTools/topoSet/topoSets/cellBitSet.H diff --git a/src/meshTools/sets/topoSets/cellSet.C b/src/meshTools/topoSet/topoSets/cellSet.C similarity index 100% rename from src/meshTools/sets/topoSets/cellSet.C rename to src/meshTools/topoSet/topoSets/cellSet.C diff --git a/src/meshTools/sets/topoSets/cellSet.H b/src/meshTools/topoSet/topoSets/cellSet.H similarity index 100% rename from src/meshTools/sets/topoSets/cellSet.H rename to src/meshTools/topoSet/topoSets/cellSet.H diff --git a/src/meshTools/sets/topoSets/cellZoneSet.C b/src/meshTools/topoSet/topoSets/cellZoneSet.C similarity index 100% rename from src/meshTools/sets/topoSets/cellZoneSet.C rename to src/meshTools/topoSet/topoSets/cellZoneSet.C diff --git a/src/meshTools/sets/topoSets/cellZoneSet.H b/src/meshTools/topoSet/topoSets/cellZoneSet.H similarity index 100% rename from src/meshTools/sets/topoSets/cellZoneSet.H rename to src/meshTools/topoSet/topoSets/cellZoneSet.H diff --git a/src/meshTools/sets/topoSets/faceBitSet.C b/src/meshTools/topoSet/topoSets/faceBitSet.C similarity index 100% rename from src/meshTools/sets/topoSets/faceBitSet.C rename to src/meshTools/topoSet/topoSets/faceBitSet.C diff --git a/src/meshTools/sets/topoSets/faceBitSet.H b/src/meshTools/topoSet/topoSets/faceBitSet.H similarity index 100% rename from src/meshTools/sets/topoSets/faceBitSet.H rename to src/meshTools/topoSet/topoSets/faceBitSet.H diff --git a/src/meshTools/sets/topoSets/faceBoolSet.C b/src/meshTools/topoSet/topoSets/faceBoolSet.C similarity index 100% rename from src/meshTools/sets/topoSets/faceBoolSet.C rename to src/meshTools/topoSet/topoSets/faceBoolSet.C diff --git a/src/meshTools/sets/topoSets/faceBoolSet.H b/src/meshTools/topoSet/topoSets/faceBoolSet.H similarity index 100% rename from src/meshTools/sets/topoSets/faceBoolSet.H rename to src/meshTools/topoSet/topoSets/faceBoolSet.H diff --git a/src/meshTools/sets/topoSets/faceSet.C b/src/meshTools/topoSet/topoSets/faceSet.C similarity index 100% rename from src/meshTools/sets/topoSets/faceSet.C rename to src/meshTools/topoSet/topoSets/faceSet.C diff --git a/src/meshTools/sets/topoSets/faceSet.H b/src/meshTools/topoSet/topoSets/faceSet.H similarity index 100% rename from src/meshTools/sets/topoSets/faceSet.H rename to src/meshTools/topoSet/topoSets/faceSet.H diff --git a/src/meshTools/sets/topoSets/faceZoneSet.C b/src/meshTools/topoSet/topoSets/faceZoneSet.C similarity index 100% rename from src/meshTools/sets/topoSets/faceZoneSet.C rename to src/meshTools/topoSet/topoSets/faceZoneSet.C diff --git a/src/meshTools/sets/topoSets/faceZoneSet.H b/src/meshTools/topoSet/topoSets/faceZoneSet.H similarity index 100% rename from src/meshTools/sets/topoSets/faceZoneSet.H rename to src/meshTools/topoSet/topoSets/faceZoneSet.H diff --git a/src/meshTools/sets/topoSets/pointBitSet.C b/src/meshTools/topoSet/topoSets/pointBitSet.C similarity index 100% rename from src/meshTools/sets/topoSets/pointBitSet.C rename to src/meshTools/topoSet/topoSets/pointBitSet.C diff --git a/src/meshTools/sets/topoSets/pointBitSet.H b/src/meshTools/topoSet/topoSets/pointBitSet.H similarity index 100% rename from src/meshTools/sets/topoSets/pointBitSet.H rename to src/meshTools/topoSet/topoSets/pointBitSet.H diff --git a/src/meshTools/sets/topoSets/pointSet.C b/src/meshTools/topoSet/topoSets/pointSet.C similarity index 100% rename from src/meshTools/sets/topoSets/pointSet.C rename to src/meshTools/topoSet/topoSets/pointSet.C diff --git a/src/meshTools/sets/topoSets/pointSet.H b/src/meshTools/topoSet/topoSets/pointSet.H similarity index 100% rename from src/meshTools/sets/topoSets/pointSet.H rename to src/meshTools/topoSet/topoSets/pointSet.H diff --git a/src/meshTools/sets/topoSets/pointZoneSet.C b/src/meshTools/topoSet/topoSets/pointZoneSet.C similarity index 100% rename from src/meshTools/sets/topoSets/pointZoneSet.C rename to src/meshTools/topoSet/topoSets/pointZoneSet.C diff --git a/src/meshTools/sets/topoSets/pointZoneSet.H b/src/meshTools/topoSet/topoSets/pointZoneSet.H similarity index 100% rename from src/meshTools/sets/topoSets/pointZoneSet.H rename to src/meshTools/topoSet/topoSets/pointZoneSet.H diff --git a/src/meshTools/sets/topoSets/topoBitSet.C b/src/meshTools/topoSet/topoSets/topoBitSet.C similarity index 100% rename from src/meshTools/sets/topoSets/topoBitSet.C rename to src/meshTools/topoSet/topoSets/topoBitSet.C diff --git a/src/meshTools/sets/topoSets/topoBitSet.H b/src/meshTools/topoSet/topoSets/topoBitSet.H similarity index 100% rename from src/meshTools/sets/topoSets/topoBitSet.H rename to src/meshTools/topoSet/topoSets/topoBitSet.H diff --git a/src/meshTools/sets/topoSets/topoBoolSet.C b/src/meshTools/topoSet/topoSets/topoBoolSet.C similarity index 100% rename from src/meshTools/sets/topoSets/topoBoolSet.C rename to src/meshTools/topoSet/topoSets/topoBoolSet.C diff --git a/src/meshTools/sets/topoSets/topoBoolSet.H b/src/meshTools/topoSet/topoSets/topoBoolSet.H similarity index 100% rename from src/meshTools/sets/topoSets/topoBoolSet.H rename to src/meshTools/topoSet/topoSets/topoBoolSet.H diff --git a/src/meshTools/sets/topoSets/topoSet.C b/src/meshTools/topoSet/topoSets/topoSet.C similarity index 100% rename from src/meshTools/sets/topoSets/topoSet.C rename to src/meshTools/topoSet/topoSets/topoSet.C diff --git a/src/meshTools/sets/topoSets/topoSet.H b/src/meshTools/topoSet/topoSets/topoSet.H similarity index 100% rename from src/meshTools/sets/topoSets/topoSet.H rename to src/meshTools/topoSet/topoSets/topoSet.H diff --git a/src/meshTools/sets/topoSets/topoSetTemplates.C b/src/meshTools/topoSet/topoSets/topoSetTemplates.C similarity index 100% rename from src/meshTools/sets/topoSets/topoSetTemplates.C rename to src/meshTools/topoSet/topoSets/topoSetTemplates.C