diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/T.org b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.org/T
similarity index 100%
rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/T.org
rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.org/T
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/U b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.org/U
similarity index 100%
rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/U
rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.org/U
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/alpha.water.org b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.org/alpha.water
similarity index 100%
rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/alpha.water.org
rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.org/alpha.water
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/p.org b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.org/p
similarity index 100%
rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/p.org
rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.org/p
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/p_rgh.org b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.org/p_rgh
similarity index 100%
rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/p_rgh.org
rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.org/p_rgh
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean
index 0240735b4..7ac804187 100755
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean
@@ -1,6 +1,11 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-foamCleanTutorials cases
-rm -rf processor*
-rm -rf 0/p_rgh.gz 0/p.gz 0/alpha.water.gz 0/T*.gz
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+cleanCase
+
+\rm -rf 0
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun
index f6263628f..c481d2eff 100755
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun
@@ -4,15 +4,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Get application name
-application=`getApplication`
-
 runApplication blockMesh
-cp 0/alpha.water.org 0/alpha.water
-cp 0/p_rgh.org 0/p_rgh
-cp 0/p.org 0/p
-cp 0/T.org 0/T
+cp -r 0.org 0
 runApplication setFields
-runApplication $application
+runApplication $(getApplication)
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/T.org b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.org/T
similarity index 100%
rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/T.org
rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.org/T
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/U b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.org/U
similarity index 100%
rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/U
rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.org/U
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/alpha.water.org b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.org/alpha.water
similarity index 100%
rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/alpha.water.org
rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.org/alpha.water
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/p.org b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.org/p
similarity index 100%
rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/p.org
rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.org/p
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/p_rgh.org b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.org/p_rgh
similarity index 100%
rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/p_rgh.org
rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.org/p_rgh
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean
index 76a62e8cd..61b2d9ae0 100755
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean
@@ -1,8 +1,12 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-foamCleanTutorials cases
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+cleanCase
+
+\rm -rf 0
 rm -rf processor*
-rm -rf 0/p_rgh 0/p 0/alpha.water 0/T 0/T.air 0/T.water
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun
index 49bc5fe5a..aadf250ea 100755
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun
@@ -4,17 +4,11 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Get application name
-application=`getApplication`
-
 runApplication blockMesh
-cp 0/alpha.water.org 0/alpha.water
-cp 0/p_rgh.org 0/p_rgh
-cp 0/p.org 0/p
-cp 0/T.org 0/T
+cp -r 0.org 0
 runApplication setFields
 runApplication decomposePar
-runParallel $application 4
+runParallel $(getApplication) 4
 runApplication reconstructPar
 
 # ----------------------------------------------------------------- end-of-file