diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/0/U b/tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/U
similarity index 100%
rename from tutorials/incompressible/simpleFoam/windAroundBuildings/0/U
rename to tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/U
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/0/epsilon b/tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/epsilon
similarity index 100%
rename from tutorials/incompressible/simpleFoam/windAroundBuildings/0/epsilon
rename to tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/epsilon
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/0/k b/tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/k
similarity index 100%
rename from tutorials/incompressible/simpleFoam/windAroundBuildings/0/k
rename to tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/k
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/0/nut b/tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/nut
similarity index 100%
rename from tutorials/incompressible/simpleFoam/windAroundBuildings/0/nut
rename to tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/nut
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/0/p b/tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/p
similarity index 100%
rename from tutorials/incompressible/simpleFoam/windAroundBuildings/0/p
rename to tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/p
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/Allclean b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allclean
index 53afd7eaead4f95652b0abc5f78451e168a55318..98ff9b6209aad26096420b5fb01d29f3c6ab7625 100755
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/Allclean
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allclean
@@ -2,7 +2,7 @@
 cd ${0%/*} || exit 1                        # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions  # Tutorial clean functions
 
-cleanCase
+cleanCase0
 
 rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
 rm -f constant/triSurface/buildings.eMesh > /dev/null 2>&1
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun
index cc32f55043deddf9844861ef86ec686d32f75632..30cbfe82f6fd50547446fdbd00e5cd263659d686 100755
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun
@@ -2,10 +2,9 @@
 cd ${0%/*} || exit 1                        # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions
 
-runApplication surfaceFeatureExtract
+runApplication ./Allrun.pre
 
-runApplication blockMesh
-runApplication snappyHexMesh -overwrite
+restore0Dir
 
 runApplication $(getApplication)
 
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun-parallel b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun-parallel
index 444dc97cc96e17f0f4f92da7ad4b4befff57c704..87dec4ec716faa71b1c0d2fa34e6da3d4155ed93 100755
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun-parallel
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun-parallel
@@ -2,13 +2,12 @@
 cd ${0%/*} || exit 1                        # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions
 
-runApplication surfaceFeatureExtract
-
-runApplication blockMesh
-runApplication snappyHexMesh -overwrite
+runApplication ./Allrun.pre
 
 runApplication decomposePar
 
+restore0Dir -processor
+
 runParallel $(getApplication)
 
 runApplication reconstructPar
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun.pre b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun.pre
new file mode 100755
index 0000000000000000000000000000000000000000..162f1e5f74ab49650af1df9d5251cba1be562d96
--- /dev/null
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun.pre
@@ -0,0 +1,11 @@
+#!/bin/sh
+cd ${0%/*} || exit 1                        # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions
+
+runApplication surfaceFeatureExtract
+
+runApplication blockMesh
+
+runApplication snappyHexMesh -overwrite
+
+#------------------------------------------------------------------------------