diff --git a/tutorials/basic/potentialFoam/cylinder/0/U b/tutorials/basic/potentialFoam/cylinder/0/U
deleted file mode 100644
index 208d5f1588..0000000000
--- a/tutorials/basic/potentialFoam/cylinder/0/U
+++ /dev/null
@@ -1,55 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v1806                                 |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volVectorField;
-    object      U;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 1 -1 0 0 0 0];
-
-internalField   uniform (0 0 0);
-
-boundaryField
-{
-    down
-    {
-        type            symmetryPlane;
-    }
-
-    right
-    {
-        type            zeroGradient;
-    }
-
-    up
-    {
-        type            symmetryPlane;
-    }
-
-    left
-    {
-        type            uniformFixedValue;
-        uniformValue    constant (1 0 0);
-    }
-
-    cylinder
-    {
-        type            symmetry;
-    }
-
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/basic/potentialFoam/cylinder/0/p b/tutorials/basic/potentialFoam/cylinder/0/p
deleted file mode 100644
index 0c7faf69a3..0000000000
--- a/tutorials/basic/potentialFoam/cylinder/0/p
+++ /dev/null
@@ -1,55 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v1806                                 |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    object      p;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 2 -2 0 0 0 0];
-
-internalField   uniform 0;
-
-boundaryField
-{
-    down
-    {
-        type            symmetryPlane;
-    }
-
-    right
-    {
-        type            fixedValue;
-        value           uniform 0;
-    }
-
-    up
-    {
-        type            symmetryPlane;
-    }
-
-    left
-    {
-        type            zeroGradient;
-    }
-
-    cylinder
-    {
-        type            symmetry;
-    }
-
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/CH4 b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/CH4
index 286d1f3d06..f39d4bf1bb 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/CH4
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/CH4
@@ -51,7 +51,9 @@ boundaryField
 
     outlet
     {
-        type            zeroGradient;
+        type            inletOutlet;
+        inletValue      uniform 0;
+        value           uniform 0;
     }
 
     frontAndBack_pos
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/CO b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/CO
index c04633fb6f..9663df2625 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/CO
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/CO
@@ -28,7 +28,9 @@ boundaryField
 
     outlet
     {
-        type            zeroGradient;
+        type            inletOutlet;
+        inletValue      uniform 0;
+        value           uniform 0;
     }
 
     inletPilot
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/CO2 b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/CO2
index 8da5bb200e..a1fbd96c58 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/CO2
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/CO2
@@ -28,7 +28,9 @@ boundaryField
 
     outlet
     {
-        type            zeroGradient;
+        type            inletOutlet;
+        inletValue      uniform 0;
+        value           uniform 0;
     }
 
     inletPilot
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/H b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/H
index 9a758d6369..38b22bb62f 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/H
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/H
@@ -28,7 +28,9 @@ boundaryField
 
     outlet
     {
-        type            zeroGradient;
+        type            inletOutlet;
+        inletValue      uniform 0;
+        value           uniform 0;
     }
 
     inletPilot
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/H2 b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/H2
index cc057e475e..621a497c4f 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/H2
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/H2
@@ -28,7 +28,9 @@ boundaryField
 
     outlet
     {
-        type            zeroGradient;
+        type            inletOutlet;
+        inletValue      uniform 0;
+        value           uniform 0;
     }
 
     inletPilot
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/H2O b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/H2O
index 9a08e6c648..6b5843ca24 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/H2O
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/H2O
@@ -28,7 +28,9 @@ boundaryField
 
     outlet
     {
-        type            zeroGradient;
+        type            inletOutlet;
+        inletValue      uniform 0;
+        value           uniform 0;
     }
 
     inletPilot
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/N2 b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/N2
index 0050d9a4b1..d20cf29841 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/N2
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/N2
@@ -29,7 +29,9 @@ boundaryField
 
     wallOutside
     {
-        type            zeroGradient;
+        type            inletOutlet;
+        inletValue      uniform 0.77;
+        value           uniform 0.77;
     }
 
     wallTube
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/O b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/O
index 43fa7627b6..ca75e34b4d 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/O
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/O
@@ -28,7 +28,9 @@ boundaryField
 
     outlet
     {
-        type            zeroGradient;
+        type            inletOutlet;
+        inletValue      uniform 0;
+        value           uniform 0;
     }
 
     inletPilot
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/O2 b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/O2
index 2973ba9926..607aa81d4c 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/O2
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/O2
@@ -51,7 +51,9 @@ boundaryField
 
     outlet
     {
-        type            zeroGradient;
+        type            inletOutlet;
+        inletValue      uniform 0.23;
+        value           uniform 0.23;
     }
 
     frontAndBack_pos
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/OH b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/OH
index 24c80ceb90..9f7010142a 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/OH
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/OH
@@ -28,7 +28,9 @@ boundaryField
 
     outlet
     {
-        type            zeroGradient;
+         type            inletOutlet;
+        inletValue      uniform 0;
+        value           uniform 0;
     }
 
     inletPilot
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/T b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/T
index 187ed8c33c..fa59316596 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/T
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/T
@@ -51,7 +51,9 @@ boundaryField
 
     outlet
     {
-        type            zeroGradient;
+         type            inletOutlet;
+        inletValue      uniform 300;
+        value           uniform 300;
     }
 
     frontAndBack_pos
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/Ydefault b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/Ydefault
index 103edd096e..15d28fea56 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/Ydefault
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/Ydefault
@@ -28,7 +28,9 @@ boundaryField
 
     outlet
     {
-        type            zeroGradient;
+        type            inletOutlet;
+        inletValue      uniform 0;
+        value           uniform 0;
     }
 
     inletPilot
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/epsilon b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/epsilon
index d688a4c97a..735887db6c 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/epsilon
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/epsilon
@@ -32,7 +32,9 @@ boundaryField
 
     outlet
     {
-        type            zeroGradient;
+        type            inletOutlet;
+        inletValue      uniform 30000;
+        value           uniform 30000;
     }
 
     inletPilot
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/k b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/k
index 32ef5630f7..258809da25 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/k
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/k
@@ -29,7 +29,9 @@ boundaryField
 
     outlet
     {
-        type            zeroGradient;
+        type            inletOutlet;
+        inletValue      uniform 30;
+        value           uniform 30;
     }
 
     inletPilot
diff --git a/tutorials/heatTransfer/overBuoyantPimpleFoam/0.orig/T b/tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/0.orig/T
similarity index 95%
rename from tutorials/heatTransfer/overBuoyantPimpleFoam/0.orig/T
rename to tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/0.orig/T
index 476b66adb6..20a00d3b71 100755
--- a/tutorials/heatTransfer/overBuoyantPimpleFoam/0.orig/T
+++ b/tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/0.orig/T
@@ -22,10 +22,8 @@ internalField   uniform 300;
 
 boundaryField
 {
-    overset1
-    {
-        type            overset;
-    }
+    #includeEtc "caseDicts/setConstraintTypes"
+
     walls
     {
         type            zeroGradient;
diff --git a/tutorials/heatTransfer/overBuoyantPimpleFoam/0.orig/U b/tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/0.orig/U
similarity index 96%
rename from tutorials/heatTransfer/overBuoyantPimpleFoam/0.orig/U
rename to tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/0.orig/U
index 57a41f946f..84ea2942cf 100755
--- a/tutorials/heatTransfer/overBuoyantPimpleFoam/0.orig/U
+++ b/tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/0.orig/U
@@ -22,10 +22,8 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
-    overset1
-    {
-        type            overset;
-    }
+    #includeEtc "caseDicts/setConstraintTypes"
+
     walls
     {
         type            uniformFixedValue;
diff --git a/tutorials/heatTransfer/overBuoyantPimpleFoam/0.orig/alphat b/tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/0.orig/alphat
similarity index 94%
rename from tutorials/heatTransfer/overBuoyantPimpleFoam/0.orig/alphat
rename to tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/0.orig/alphat
index ab6b28d14f..e3f2055401 100755
--- a/tutorials/heatTransfer/overBuoyantPimpleFoam/0.orig/alphat
+++ b/tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/0.orig/alphat
@@ -22,11 +22,8 @@ internalField   uniform 0;
 
 boundaryField
 {
-    overset1
-    {
-        type            overset;
-        value           uniform 0;
-    }
+    #includeEtc "caseDicts/setConstraintTypes"
+
     walls
     {
         type            compressible::alphatWallFunction;
diff --git a/tutorials/heatTransfer/overBuoyantPimpleFoam/0.orig/epsilon b/tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/0.orig/epsilon
similarity index 93%
rename from tutorials/heatTransfer/overBuoyantPimpleFoam/0.orig/epsilon
rename to tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/0.orig/epsilon
index 62b26d4b23..22ec2143b6 100755
--- a/tutorials/heatTransfer/overBuoyantPimpleFoam/0.orig/epsilon
+++ b/tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/0.orig/epsilon
@@ -22,11 +22,7 @@ internalField   uniform 0.1;
 
 boundaryField
 {
-    overset1
-    {
-        type            overset;
-        value           uniform 0.1;
-    }
+    #includeEtc "caseDicts/setConstraintTypes"
     walls
     {
         type            epsilonWallFunction;
diff --git a/tutorials/heatTransfer/overBuoyantPimpleFoam/0.orig/k b/tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/0.orig/k
similarity index 93%
rename from tutorials/heatTransfer/overBuoyantPimpleFoam/0.orig/k
rename to tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/0.orig/k
index 3fbc2d9b89..efe38df3a1 100755
--- a/tutorials/heatTransfer/overBuoyantPimpleFoam/0.orig/k
+++ b/tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/0.orig/k
@@ -22,11 +22,7 @@ internalField   uniform 0.01;
 
 boundaryField
 {
-    overset1
-    {
-        type            overset;
-        value           uniform 0.01;
-    }
+    #includeEtc "caseDicts/setConstraintTypes"
     walls
     {
         type            kqRWallFunction;
diff --git a/tutorials/heatTransfer/overBuoyantPimpleFoam/0.orig/nut b/tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/0.orig/nut
similarity index 93%
rename from tutorials/heatTransfer/overBuoyantPimpleFoam/0.orig/nut
rename to tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/0.orig/nut
index b76fdda7af..4fb8612e6b 100755
--- a/tutorials/heatTransfer/overBuoyantPimpleFoam/0.orig/nut
+++ b/tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/0.orig/nut
@@ -22,11 +22,8 @@ internalField   uniform 0;
 
 boundaryField
 {
-    overset1
-    {
-        type            overset;
-        value           uniform 0;
-    }
+    #includeEtc "caseDicts/setConstraintTypes"
+
     walls
     {
         type            nutkWallFunction;
diff --git a/tutorials/heatTransfer/overBuoyantPimpleFoam/0.orig/p b/tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/0.orig/p
similarity index 96%
rename from tutorials/heatTransfer/overBuoyantPimpleFoam/0.orig/p
rename to tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/0.orig/p
index 4da4707882..9e876a3d43 100755
--- a/tutorials/heatTransfer/overBuoyantPimpleFoam/0.orig/p
+++ b/tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/0.orig/p
@@ -22,10 +22,8 @@ internalField   uniform 100000;
 
 boundaryField
 {
-    overset1
-    {
-        type            overset;
-    }
+    #includeEtc "caseDicts/setConstraintTypes"
+
     walls
     {
         type            calculated;
diff --git a/tutorials/heatTransfer/overBuoyantPimpleFoam/0.orig/p_rgh b/tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/0.orig/p_rgh
similarity index 93%
rename from tutorials/heatTransfer/overBuoyantPimpleFoam/0.orig/p_rgh
rename to tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/0.orig/p_rgh
index ffb7949e83..307e52e1d8 100755
--- a/tutorials/heatTransfer/overBuoyantPimpleFoam/0.orig/p_rgh
+++ b/tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/0.orig/p_rgh
@@ -22,11 +22,8 @@ internalField   uniform 100000;
 
 boundaryField
 {
-    overset1
-    {
-        type            overset;
-        value           uniform 100000;
-    }
+    #includeEtc "caseDicts/setConstraintTypes"
+
     walls
     {
         type            fixedFluxPressure;
diff --git a/tutorials/heatTransfer/overBuoyantPimpleFoam/0.orig/pointDisplacement b/tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/0.orig/pointDisplacement
similarity index 100%
rename from tutorials/heatTransfer/overBuoyantPimpleFoam/0.orig/pointDisplacement
rename to tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/0.orig/pointDisplacement
diff --git a/tutorials/heatTransfer/overBuoyantPimpleFoam/0.orig/zoneID b/tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/0.orig/zoneID
similarity index 91%
rename from tutorials/heatTransfer/overBuoyantPimpleFoam/0.orig/zoneID
rename to tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/0.orig/zoneID
index 374c2ca457..686702ad67 100755
--- a/tutorials/heatTransfer/overBuoyantPimpleFoam/0.orig/zoneID
+++ b/tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/0.orig/zoneID
@@ -18,15 +18,12 @@ FoamFile
 dimensions      [0 0 0 0 0 0 0];
 
 
-internalField   uniform 0; 
+internalField   uniform 0;
 
 boundaryField
 {
-    overset1
-    {
-        type            overset;
-        value           uniform 1;
-    }
+     #includeEtc "caseDicts/setConstraintTypes"
+
     walls
     {
         type            zeroGradient;
diff --git a/tutorials/heatTransfer/overBuoyantPimpleFoam/Allclean b/tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/Allclean
similarity index 100%
rename from tutorials/heatTransfer/overBuoyantPimpleFoam/Allclean
rename to tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/Allclean
diff --git a/tutorials/heatTransfer/overBuoyantPimpleFoam/Allrun b/tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/Allrun
similarity index 100%
rename from tutorials/heatTransfer/overBuoyantPimpleFoam/Allrun
rename to tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/Allrun
diff --git a/tutorials/heatTransfer/overBuoyantPimpleFoam/Allrun.pre b/tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/Allrun.pre
similarity index 100%
rename from tutorials/heatTransfer/overBuoyantPimpleFoam/Allrun.pre
rename to tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/Allrun.pre
diff --git a/tutorials/heatTransfer/overBuoyantPimpleFoam/constant/dynamicMeshDict b/tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/constant/dynamicMeshDict
similarity index 100%
rename from tutorials/heatTransfer/overBuoyantPimpleFoam/constant/dynamicMeshDict
rename to tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/constant/dynamicMeshDict
diff --git a/tutorials/heatTransfer/overBuoyantPimpleFoam/constant/g b/tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/constant/g
similarity index 100%
rename from tutorials/heatTransfer/overBuoyantPimpleFoam/constant/g
rename to tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/constant/g
diff --git a/tutorials/heatTransfer/overBuoyantPimpleFoam/constant/thermophysicalProperties b/tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/constant/thermophysicalProperties
similarity index 100%
rename from tutorials/heatTransfer/overBuoyantPimpleFoam/constant/thermophysicalProperties
rename to tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/constant/thermophysicalProperties
diff --git a/tutorials/heatTransfer/overBuoyantPimpleFoam/constant/turbulenceProperties b/tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/constant/turbulenceProperties
similarity index 100%
rename from tutorials/heatTransfer/overBuoyantPimpleFoam/constant/turbulenceProperties
rename to tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/constant/turbulenceProperties
diff --git a/tutorials/heatTransfer/overBuoyantPimpleFoam/system/blockMeshDict b/tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/system/blockMeshDict
similarity index 100%
rename from tutorials/heatTransfer/overBuoyantPimpleFoam/system/blockMeshDict
rename to tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/system/blockMeshDict
diff --git a/tutorials/heatTransfer/overBuoyantPimpleFoam/system/controlDict b/tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/system/controlDict
similarity index 91%
rename from tutorials/heatTransfer/overBuoyantPimpleFoam/system/controlDict
rename to tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/system/controlDict
index da8c0a38d4..958049b7cb 100755
--- a/tutorials/heatTransfer/overBuoyantPimpleFoam/system/controlDict
+++ b/tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/system/controlDict
@@ -14,6 +14,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+libs            ("liboverset.so" "libfvMotionSolvers.so");
+
 DebugSwitches
 {
     overset                 0;
@@ -35,7 +37,7 @@ deltaT          0.001;
 
 writeControl    adjustableRunTime;
 
-writeInterval   0.05;
+writeInterval   0.02;
 
 purgeWrite      0;
 
@@ -51,8 +53,8 @@ timePrecision   6;
 
 runTimeModifiable true;
 
-adjustTimeStep  no;
+adjustTimeStep  yes;
 
-maxCo          1;
+maxCo          0.5;
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/overBuoyantPimpleFoam/system/decomposeParDict b/tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/system/decomposeParDict
similarity index 100%
rename from tutorials/heatTransfer/overBuoyantPimpleFoam/system/decomposeParDict
rename to tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/system/decomposeParDict
diff --git a/tutorials/heatTransfer/overBuoyantPimpleFoam/system/fvSchemes b/tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/system/fvSchemes
similarity index 90%
rename from tutorials/heatTransfer/overBuoyantPimpleFoam/system/fvSchemes
rename to tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/system/fvSchemes
index 322d3343c6..ee8830d3c3 100755
--- a/tutorials/heatTransfer/overBuoyantPimpleFoam/system/fvSchemes
+++ b/tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/system/fvSchemes
@@ -56,11 +56,11 @@ snGradSchemes
 
 oversetInterpolation
 {
-    method          cellVolumeWeight;
-    //method inverseDistance;
+    //method          cellVolumeWeight;
+    method            inverseDistance;
 
-    searchBox           (-0.002 0 0)(0.107 0.5 0.01);
-    searchBoxDivisions  (200 200 1);
+    searchBox           (-0.002 0 0)(0.107 0.05 0.01);
+    searchBoxDivisions  (300 200 1);
 }
 
 fluxRequired
diff --git a/tutorials/heatTransfer/overBuoyantPimpleFoam/system/fvSolution b/tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/system/fvSolution
similarity index 100%
rename from tutorials/heatTransfer/overBuoyantPimpleFoam/system/fvSolution
rename to tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/system/fvSolution
diff --git a/tutorials/heatTransfer/overBuoyantPimpleFoam/system/setFieldsDict b/tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/system/setFieldsDict
similarity index 100%
rename from tutorials/heatTransfer/overBuoyantPimpleFoam/system/setFieldsDict
rename to tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/system/setFieldsDict
diff --git a/tutorials/heatTransfer/overBuoyantPimpleFoam/system/topoSetDict b/tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/system/topoSetDict
similarity index 100%
rename from tutorials/heatTransfer/overBuoyantPimpleFoam/system/topoSetDict
rename to tutorials/heatTransfer/overBuoyantPimpleFoam/movingBox/system/topoSetDict