diff --git a/src/sampling/Make/files b/src/sampling/Make/files
index 71b37d6771b22be05fb002e8508946eddcea2dfd..1ac57449f64626a26f14f11a997f97e0ab46c51c 100644
--- a/src/sampling/Make/files
+++ b/src/sampling/Make/files
@@ -17,14 +17,15 @@ sampledSet/triSurfaceMeshPointSet/triSurfaceMeshPointSet.C
 sampledSet/uniform/uniformSet.C
 sampledSet/array/arraySet.C
 
-cuttingPlane/cuttingPlane.C
+surface/cuttingPlane/cuttingPlane.C
+surface/isoSurface/isoSurface.C
+surface/isoSurface/isoSurfaceCell.C
+surface/thresholdCellFaces/thresholdCellFaces.C
 
 sampledSurface/sampledPatch/sampledPatch.C
 sampledSurface/sampledPatchInternalField/sampledPatchInternalField.C
 sampledSurface/sampledPlane/sampledPlane.C
-sampledSurface/isoSurface/isoSurface.C
 sampledSurface/isoSurface/sampledIsoSurface.C
-sampledSurface/isoSurface/isoSurfaceCell.C
 sampledSurface/isoSurface/sampledIsoSurfaceCell.C
 sampledSurface/distanceSurface/distanceSurface.C
 sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C
@@ -32,7 +33,6 @@ sampledSurface/sampledSurface/sampledSurface.C
 sampledSurface/sampledSurfaces/sampledSurfaces.C
 sampledSurface/sampledSurfaces/sampledSurfacesGrouping.C
 sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C
-sampledSurface/thresholdCellFaces/thresholdCellFaces.C
 sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.C
 
 surfWriters = sampledSurface/writers
diff --git a/src/sampling/cuttingPlane/cuttingPlane.C b/src/sampling/surface/cuttingPlane/cuttingPlane.C
similarity index 100%
rename from src/sampling/cuttingPlane/cuttingPlane.C
rename to src/sampling/surface/cuttingPlane/cuttingPlane.C
diff --git a/src/sampling/cuttingPlane/cuttingPlane.H b/src/sampling/surface/cuttingPlane/cuttingPlane.H
similarity index 100%
rename from src/sampling/cuttingPlane/cuttingPlane.H
rename to src/sampling/surface/cuttingPlane/cuttingPlane.H
diff --git a/src/sampling/cuttingPlane/cuttingPlaneTemplates.C b/src/sampling/surface/cuttingPlane/cuttingPlaneTemplates.C
similarity index 100%
rename from src/sampling/cuttingPlane/cuttingPlaneTemplates.C
rename to src/sampling/surface/cuttingPlane/cuttingPlaneTemplates.C
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurface.C b/src/sampling/surface/isoSurface/isoSurface.C
similarity index 100%
rename from src/sampling/sampledSurface/isoSurface/isoSurface.C
rename to src/sampling/surface/isoSurface/isoSurface.C
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurface.H b/src/sampling/surface/isoSurface/isoSurface.H
similarity index 100%
rename from src/sampling/sampledSurface/isoSurface/isoSurface.H
rename to src/sampling/surface/isoSurface/isoSurface.H
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C b/src/sampling/surface/isoSurface/isoSurfaceCell.C
similarity index 100%
rename from src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
rename to src/sampling/surface/isoSurface/isoSurfaceCell.C
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H b/src/sampling/surface/isoSurface/isoSurfaceCell.H
similarity index 100%
rename from src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H
rename to src/sampling/surface/isoSurface/isoSurfaceCell.H
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceCellTemplates.C b/src/sampling/surface/isoSurface/isoSurfaceCellTemplates.C
similarity index 100%
rename from src/sampling/sampledSurface/isoSurface/isoSurfaceCellTemplates.C
rename to src/sampling/surface/isoSurface/isoSurfaceCellTemplates.C
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C b/src/sampling/surface/isoSurface/isoSurfaceTemplates.C
similarity index 100%
rename from src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
rename to src/sampling/surface/isoSurface/isoSurfaceTemplates.C
diff --git a/src/sampling/sampledSurface/thresholdCellFaces/thresholdCellFaces.C b/src/sampling/surface/thresholdCellFaces/thresholdCellFaces.C
similarity index 100%
rename from src/sampling/sampledSurface/thresholdCellFaces/thresholdCellFaces.C
rename to src/sampling/surface/thresholdCellFaces/thresholdCellFaces.C
diff --git a/src/sampling/sampledSurface/thresholdCellFaces/thresholdCellFaces.H b/src/sampling/surface/thresholdCellFaces/thresholdCellFaces.H
similarity index 100%
rename from src/sampling/sampledSurface/thresholdCellFaces/thresholdCellFaces.H
rename to src/sampling/surface/thresholdCellFaces/thresholdCellFaces.H