diff --git a/src/meshTools/Make/files b/src/meshTools/Make/files
index 56dc286f3a..83d30309b7 100644
--- a/src/meshTools/Make/files
+++ b/src/meshTools/Make/files
@@ -56,18 +56,20 @@ cellDist/wallPoint/wallPoint.C
 
 cellFeatures/cellFeatures.C
 
-csys = coordinateSystems
+csys = coordinate/systems
 $(csys)/coordinateSystem.C
 $(csys)/coordinateSystemNew.C
 $(csys)/coordinateSystems.C
 $(csys)/cylindricalCS.C
 $(csys)/cartesianCS.C
-$(csys)/coordinateRotation/axesRotation.C
-$(csys)/coordinateRotation/coordinateRotation.C
-$(csys)/coordinateRotation/coordinateRotationNew.C
-$(csys)/coordinateRotation/EulerCoordinateRotation.C
-$(csys)/coordinateRotation/STARCDCoordinateRotation.C
-$(csys)/coordinateRotation/cylindrical.C
+
+crot = coordinate/rotation
+$(crot)/axesRotation.C
+$(crot)/coordinateRotation.C
+$(crot)/coordinateRotationNew.C
+$(crot)/EulerCoordinateRotation.C
+$(crot)/STARCDCoordinateRotation.C
+$(crot)/cylindrical.C
 
 polyMeshZipUpCells/polyMeshZipUpCells.C
 primitiveMeshGeometry/primitiveMeshGeometry.C
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.C b/src/meshTools/coordinate/rotation/EulerCoordinateRotation.C
similarity index 100%
rename from src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.C
rename to src/meshTools/coordinate/rotation/EulerCoordinateRotation.C
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.H b/src/meshTools/coordinate/rotation/EulerCoordinateRotation.H
similarity index 100%
rename from src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.H
rename to src/meshTools/coordinate/rotation/EulerCoordinateRotation.H
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.C b/src/meshTools/coordinate/rotation/STARCDCoordinateRotation.C
similarity index 100%
rename from src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.C
rename to src/meshTools/coordinate/rotation/STARCDCoordinateRotation.C
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.H b/src/meshTools/coordinate/rotation/STARCDCoordinateRotation.H
similarity index 100%
rename from src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.H
rename to src/meshTools/coordinate/rotation/STARCDCoordinateRotation.H
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.C b/src/meshTools/coordinate/rotation/axesRotation.C
similarity index 100%
rename from src/meshTools/coordinateSystems/coordinateRotation/axesRotation.C
rename to src/meshTools/coordinate/rotation/axesRotation.C
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.H b/src/meshTools/coordinate/rotation/axesRotation.H
similarity index 100%
rename from src/meshTools/coordinateSystems/coordinateRotation/axesRotation.H
rename to src/meshTools/coordinate/rotation/axesRotation.H
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.C b/src/meshTools/coordinate/rotation/coordinateRotation.C
similarity index 100%
rename from src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.C
rename to src/meshTools/coordinate/rotation/coordinateRotation.C
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.H b/src/meshTools/coordinate/rotation/coordinateRotation.H
similarity index 100%
rename from src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.H
rename to src/meshTools/coordinate/rotation/coordinateRotation.H
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotationNew.C b/src/meshTools/coordinate/rotation/coordinateRotationNew.C
similarity index 100%
rename from src/meshTools/coordinateSystems/coordinateRotation/coordinateRotationNew.C
rename to src/meshTools/coordinate/rotation/coordinateRotationNew.C
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.C b/src/meshTools/coordinate/rotation/cylindrical.C
similarity index 100%
rename from src/meshTools/coordinateSystems/coordinateRotation/cylindrical.C
rename to src/meshTools/coordinate/rotation/cylindrical.C
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.H b/src/meshTools/coordinate/rotation/cylindrical.H
similarity index 100%
rename from src/meshTools/coordinateSystems/coordinateRotation/cylindrical.H
rename to src/meshTools/coordinate/rotation/cylindrical.H
diff --git a/src/meshTools/coordinateSystems/cartesianCS.C b/src/meshTools/coordinate/systems/cartesianCS.C
similarity index 100%
rename from src/meshTools/coordinateSystems/cartesianCS.C
rename to src/meshTools/coordinate/systems/cartesianCS.C
diff --git a/src/meshTools/coordinateSystems/cartesianCS.H b/src/meshTools/coordinate/systems/cartesianCS.H
similarity index 100%
rename from src/meshTools/coordinateSystems/cartesianCS.H
rename to src/meshTools/coordinate/systems/cartesianCS.H
diff --git a/src/meshTools/coordinateSystems/coordinateSystem.C b/src/meshTools/coordinate/systems/coordinateSystem.C
similarity index 100%
rename from src/meshTools/coordinateSystems/coordinateSystem.C
rename to src/meshTools/coordinate/systems/coordinateSystem.C
diff --git a/src/meshTools/coordinateSystems/coordinateSystem.H b/src/meshTools/coordinate/systems/coordinateSystem.H
similarity index 100%
rename from src/meshTools/coordinateSystems/coordinateSystem.H
rename to src/meshTools/coordinate/systems/coordinateSystem.H
diff --git a/src/meshTools/coordinateSystems/coordinateSystemNew.C b/src/meshTools/coordinate/systems/coordinateSystemNew.C
similarity index 100%
rename from src/meshTools/coordinateSystems/coordinateSystemNew.C
rename to src/meshTools/coordinate/systems/coordinateSystemNew.C
diff --git a/src/meshTools/coordinateSystems/coordinateSystems.C b/src/meshTools/coordinate/systems/coordinateSystems.C
similarity index 100%
rename from src/meshTools/coordinateSystems/coordinateSystems.C
rename to src/meshTools/coordinate/systems/coordinateSystems.C
diff --git a/src/meshTools/coordinateSystems/coordinateSystems.H b/src/meshTools/coordinate/systems/coordinateSystems.H
similarity index 100%
rename from src/meshTools/coordinateSystems/coordinateSystems.H
rename to src/meshTools/coordinate/systems/coordinateSystems.H
diff --git a/src/meshTools/coordinateSystems/cylindricalCS.C b/src/meshTools/coordinate/systems/cylindricalCS.C
similarity index 100%
rename from src/meshTools/coordinateSystems/cylindricalCS.C
rename to src/meshTools/coordinate/systems/cylindricalCS.C
diff --git a/src/meshTools/coordinateSystems/cylindricalCS.H b/src/meshTools/coordinate/systems/cylindricalCS.H
similarity index 100%
rename from src/meshTools/coordinateSystems/cylindricalCS.H
rename to src/meshTools/coordinate/systems/cylindricalCS.H