diff --git a/etc/caseDicts/foamyHexMeshDict b/etc/caseDicts/mesh/generation/foamyHexMeshDict
similarity index 100%
rename from etc/caseDicts/foamyHexMeshDict
rename to etc/caseDicts/mesh/generation/foamyHexMeshDict
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/foamyHexMeshDict b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/foamyHexMeshDict
index d1b78f3df..7c0619339 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/foamyHexMeshDict
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/foamyHexMeshDict
@@ -14,14 +14,13 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#includeEtc "caseDicts/foamyHexMeshDict"
+#includeEtc "caseDicts/mesh/generation/foamyHexMeshDict"
 
 geometry
 {
     #include "meshDict.geometry"
 }
 
-
 surfaceConformation
 {
     locationInMesh (-0.078 0.02 0.0);
@@ -46,12 +45,12 @@ surfaceConformation
         boundaryAndFaceZones
         {
             featureMethod           extendedFeatureEdgeMesh;
-            extendedFeatureEdgeMesh "boundaryAndFaceZones.extendedFeatureEdgeMesh";
+            extendedFeatureEdgeMesh
+                "boundaryAndFaceZones.extendedFeatureEdgeMesh";
         }
     }
 }
 
-
 motionControl
 {
     defaultCellSize         0.0035;
@@ -74,7 +73,6 @@ motionControl
     printVertexInfo             off;
 }
 
-
 polyMeshFiltering
 {
     filterEdges                         false;
@@ -84,11 +82,9 @@ polyMeshFiltering
     writeBackgroundMeshDecomposition    false;
 }
 
-
 meshQualityControls
 {
     #include "meshQualityDict"
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/mesh/foamyHexMesh/blob/system/foamyHexMeshDict b/tutorials/mesh/foamyHexMesh/blob/system/foamyHexMeshDict
index 5f399eb98..d7ffcbac5 100644
--- a/tutorials/mesh/foamyHexMesh/blob/system/foamyHexMeshDict
+++ b/tutorials/mesh/foamyHexMesh/blob/system/foamyHexMeshDict
@@ -15,7 +15,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // Include defaults parameters from master dictionary
-#includeEtc "caseDicts/foamyHexMeshDict"
+#includeEtc "caseDicts/mesh/generation/foamyHexMeshDict"
 
 geometry
 {
@@ -33,7 +33,6 @@ geometry
     }
 }
 
-
 backgroundMeshDecomposition
 {
     minLevels           0;
@@ -42,7 +41,6 @@ backgroundMeshDecomposition
     maxCellWeightCoeff  20;
 }
 
-
 initialPoints
 {
     initialPointsMethod         autoDensity;
@@ -62,7 +60,6 @@ initialPoints
     }
 }
 
-
 surfaceConformation
 {
     locationInMesh              (0.1 0.1 0.2);
@@ -85,7 +82,6 @@ surfaceConformation
     }
 }
 
-
 motionControl
 {
     defaultCellSize             0.1;
@@ -121,11 +117,9 @@ motionControl
     timeChecks                  no;
 }
 
-
 meshQualityControls
 {
     #include "meshQualityDict"
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/mesh/foamyHexMesh/flange/system/foamyHexMeshDict b/tutorials/mesh/foamyHexMesh/flange/system/foamyHexMeshDict
index 5b3c0ba8a..7d6bdd631 100644
--- a/tutorials/mesh/foamyHexMesh/flange/system/foamyHexMeshDict
+++ b/tutorials/mesh/foamyHexMesh/flange/system/foamyHexMeshDict
@@ -15,7 +15,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // Include defaults parameters from master dictionary
-#includeEtc "caseDicts/foamyHexMeshDict"
+#includeEtc "caseDicts/mesh/generation/foamyHexMeshDict"
 
 // Any scalar with a name <name>Coeff specifies a value that will be implemented
 // as a faction of the target cell size
@@ -25,7 +25,6 @@ geometry
     #include "meshDict.geometry"
 }
 
-
 initialPoints
 {
     initialPointsMethod         autoDensity;
@@ -39,7 +38,6 @@ initialPoints
     }
 }
 
-
 surfaceConformation
 {
     locationInMesh      (0 0 0);
@@ -93,7 +91,6 @@ surfaceConformation
     }
 }
 
-
 motionControl
 {
     defaultCellSize             0.0008;
@@ -159,7 +156,6 @@ motionControl
     timeChecks                  no;
 }
 
-
 backgroundMeshDecomposition
 {
     minLevels           1;
@@ -168,11 +164,9 @@ backgroundMeshDecomposition
     maxCellWeightCoeff  10;
 }
 
-
 meshQualityControls
 {
     #include "meshQualityDict"
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/foamyHexMeshDict b/tutorials/mesh/foamyHexMesh/mixerVessel/system/foamyHexMeshDict
index 4afd37873..48e6795ff 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/foamyHexMeshDict
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/foamyHexMeshDict
@@ -14,14 +14,13 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#includeEtc "caseDicts/foamyHexMeshDict"
+#includeEtc "caseDicts/mesh/generation/foamyHexMeshDict"
 
 geometry
 {
     #include "meshDict.geometry"
 }
 
-
 initialPoints
 {
     // initialPointsMethod         pointFile;
@@ -44,7 +43,6 @@ initialPoints
     }
 }
 
-
 surfaceConformation
 {
     locationInMesh                      (0 0.1 1.0);
@@ -65,7 +63,6 @@ surfaceConformation
     }
 }
 
-
 motionControl
 {
     defaultCellSize             6e-3;
@@ -86,7 +83,6 @@ motionControl
     timeChecks                  no;
 }
 
-
 backgroundMeshDecomposition
 {
     minLevels           1;
@@ -95,7 +91,6 @@ backgroundMeshDecomposition
     maxCellWeightCoeff  20;
 }
 
-
 polyMeshFiltering
 {
     writeBackgroundMeshDecomposition    true;
@@ -105,5 +100,4 @@ polyMeshFiltering
     filterFaces                         off;
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/mesh/foamyHexMesh/simpleShapes/system/foamyHexMeshDict b/tutorials/mesh/foamyHexMesh/simpleShapes/system/foamyHexMeshDict
index 4eea925e0..4f3feae81 100644
--- a/tutorials/mesh/foamyHexMesh/simpleShapes/system/foamyHexMeshDict
+++ b/tutorials/mesh/foamyHexMesh/simpleShapes/system/foamyHexMeshDict
@@ -15,7 +15,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // Include defaults parameters from master dictionary
-#includeEtc "caseDicts/foamyHexMeshDict"
+#includeEtc "caseDicts/mesh/generation/foamyHexMeshDict"
 
 geometry
 {
@@ -41,7 +41,6 @@ geometry
 
 }
 
-
 surfaceConformation
 {
     locationInMesh (0 -0.5 0);
@@ -99,7 +98,6 @@ surfaceConformation
     }
 }
 
-
 initialPoints
 {
     initialPointsMethod         autoDensity;
@@ -114,7 +112,6 @@ initialPoints
     }
 }
 
-
 motionControl
 {
     defaultCellSize         0.1;
@@ -190,7 +187,6 @@ motionControl
     timeChecks                  no;
 }
 
-
 // After simulation, when converting to polyMesh, filter out small faces/edges.
 // Do not change. See cvControls.H
 polyMeshFiltering
@@ -200,11 +196,9 @@ polyMeshFiltering
     writeTetDualMesh            false;
 }
 
-
 meshQualityControls
 {
     #include "meshQualityDict"
 }
 
-
 // ************************************************************************* //