diff --git a/tutorials/incompressible/simpleFoam/motorBike/0/U b/tutorials/incompressible/simpleFoam/motorBike/0.org/U
similarity index 100%
rename from tutorials/incompressible/simpleFoam/motorBike/0/U
rename to tutorials/incompressible/simpleFoam/motorBike/0.org/U
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0/include/fixedInlet b/tutorials/incompressible/simpleFoam/motorBike/0.org/include/fixedInlet
similarity index 100%
rename from tutorials/incompressible/simpleFoam/motorBike/0/include/fixedInlet
rename to tutorials/incompressible/simpleFoam/motorBike/0.org/include/fixedInlet
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0/include/frontBackUpperPatches b/tutorials/incompressible/simpleFoam/motorBike/0.org/include/frontBackUpperPatches
similarity index 100%
rename from tutorials/incompressible/simpleFoam/motorBike/0/include/frontBackUpperPatches
rename to tutorials/incompressible/simpleFoam/motorBike/0.org/include/frontBackUpperPatches
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0/include/initialConditions b/tutorials/incompressible/simpleFoam/motorBike/0.org/include/initialConditions
similarity index 100%
rename from tutorials/incompressible/simpleFoam/motorBike/0/include/initialConditions
rename to tutorials/incompressible/simpleFoam/motorBike/0.org/include/initialConditions
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0/k b/tutorials/incompressible/simpleFoam/motorBike/0.org/k
similarity index 100%
rename from tutorials/incompressible/simpleFoam/motorBike/0/k
rename to tutorials/incompressible/simpleFoam/motorBike/0.org/k
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0/nut b/tutorials/incompressible/simpleFoam/motorBike/0.org/nut
similarity index 100%
rename from tutorials/incompressible/simpleFoam/motorBike/0/nut
rename to tutorials/incompressible/simpleFoam/motorBike/0.org/nut
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0/omega b/tutorials/incompressible/simpleFoam/motorBike/0.org/omega
similarity index 100%
rename from tutorials/incompressible/simpleFoam/motorBike/0/omega
rename to tutorials/incompressible/simpleFoam/motorBike/0.org/omega
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0/p b/tutorials/incompressible/simpleFoam/motorBike/0.org/p
similarity index 100%
rename from tutorials/incompressible/simpleFoam/motorBike/0/p
rename to tutorials/incompressible/simpleFoam/motorBike/0.org/p
diff --git a/tutorials/incompressible/simpleFoam/motorBike/Allclean b/tutorials/incompressible/simpleFoam/motorBike/Allclean
new file mode 100755
index 0000000000000000000000000000000000000000..5e817aa5338f49eb352855ea7202dd4035472a08
--- /dev/null
+++ b/tutorials/incompressible/simpleFoam/motorBike/Allclean
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+rm -f system/fvSolution
+rm -rf 0 > /dev/null 2>&1
+
+cleanCase
diff --git a/tutorials/incompressible/simpleFoam/motorBike/Allrun b/tutorials/incompressible/simpleFoam/motorBike/Allrun
index 802112d8b86983287e0868160767fd83f12274bc..ea47b0746d1955c4ca37eede81e84062c6dcf147 100755
--- a/tutorials/incompressible/simpleFoam/motorBike/Allrun
+++ b/tutorials/incompressible/simpleFoam/motorBike/Allrun
@@ -1,11 +1,15 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
-
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
+cp system/fvSolution.org system/fvSolution
+cp -r 0.org 0 > /dev/null 2>&1
+
 runApplication blockMesh
 runApplication snappyHexMesh -overwrite
-runApplication simpleFoam
 
-# ----------------------------------------------------------------- end-of-file
+sed -i 's/\(nNonOrthogonalCorrectors\).*;/\1 10;/g' system/fvSolution
+runApplication potentialFoam -writep
+sed -i 's/\(nNonOrthogonalCorrectors\).*;/\1 0;/g' system/fvSolution
+
+runApplication simpleFoam
diff --git a/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary b/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary
new file mode 100644
index 0000000000000000000000000000000000000000..359b377f0a8b8aff5c8dc551ece4ebd91194278a
--- /dev/null
+++ b/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary
@@ -0,0 +1,454 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       polyBoundaryMesh;
+    location    "constant/polyMesh";
+    object      boundary;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+72
+(
+    frontAndBack
+    {
+        type            patch;
+        nFaces          320;
+        startFace       1028304;
+    }
+    inlet
+    {
+        type            patch;
+        nFaces          64;
+        startFace       1028624;
+    }
+    outlet
+    {
+        type            patch;
+        nFaces          64;
+        startFace       1028688;
+    }
+    lowerWall
+    {
+        type            wall;
+        nFaces          5330;
+        startFace       1028752;
+    }
+    upperWall
+    {
+        type            patch;
+        nFaces          160;
+        startFace       1034082;
+    }
+    motorBike_frt-fairing:001%1
+    {
+        type            wall;
+        nFaces          5427;
+        startFace       1034242;
+    }
+    motorBike_windshield:002%2
+    {
+        type            wall;
+        nFaces          50;
+        startFace       1039669;
+    }
+    motorBike_rr-wh-rim:005%5
+    {
+        type            wall;
+        nFaces          136;
+        startFace       1039719;
+    }
+    motorBike_rr-wh-rim:010%10
+    {
+        type            wall;
+        nFaces          340;
+        startFace       1039855;
+    }
+    motorBike_fr-wh-rim:011%11
+    {
+        type            wall;
+        nFaces          473;
+        startFace       1040195;
+    }
+    motorBike_fr-wh-brake-disk:012%12
+    {
+        type            wall;
+        nFaces          54;
+        startFace       1040668;
+    }
+    motorBike_frame:016-shadow%13
+    {
+        type            wall;
+        nFaces          97;
+        startFace       1040722;
+    }
+    motorBike_rear-susp:014%14
+    {
+        type            wall;
+        nFaces          839;
+        startFace       1040819;
+    }
+    motorBike_rear-susp:014-shadow%15
+    {
+        type            wall;
+        nFaces          469;
+        startFace       1041658;
+    }
+    motorBike_frame:016%16
+    {
+        type            wall;
+        nFaces          68;
+        startFace       1042127;
+    }
+    motorBike_rr-wh-rim:005-shadow%17
+    {
+        type            wall;
+        nFaces          71;
+        startFace       1042195;
+    }
+    motorBike_rr-wh-chain-hub:022%22
+    {
+        type            wall;
+        nFaces          141;
+        startFace       1042266;
+    }
+    motorBike_rearseat%24
+    {
+        type            wall;
+        nFaces          430;
+        startFace       1042407;
+    }
+    motorBike_frt-fairing%25
+    {
+        type            wall;
+        nFaces          626;
+        startFace       1042837;
+    }
+    motorBike_windshield%26
+    {
+        type            wall;
+        nFaces          378;
+        startFace       1043463;
+    }
+    motorBike_headlights%27
+    {
+        type            wall;
+        nFaces          161;
+        startFace       1043841;
+    }
+    motorBike_driversseat%28
+    {
+        type            wall;
+        nFaces          368;
+        startFace       1044002;
+    }
+    motorBike_rear-body%29
+    {
+        type            wall;
+        nFaces          2077;
+        startFace       1044370;
+    }
+    motorBike_fuel-tank%30
+    {
+        type            wall;
+        nFaces          912;
+        startFace       1046447;
+    }
+    motorBike_exhaust%31
+    {
+        type            wall;
+        nFaces          2392;
+        startFace       1047359;
+    }
+    motorBike_rr-wh-rim%32
+    {
+        type            wall;
+        nFaces          1430;
+        startFace       1049751;
+    }
+    motorBike_fr-mud-guard%33
+    {
+        type            wall;
+        nFaces          639;
+        startFace       1051181;
+    }
+    motorBike_fr-wh-rim%34
+    {
+        type            wall;
+        nFaces          591;
+        startFace       1051820;
+    }
+    motorBike_fr-wh-brake-disk%35
+    {
+        type            wall;
+        nFaces          431;
+        startFace       1052411;
+    }
+    motorBike_fr-brake-caliper%36
+    {
+        type            wall;
+        nFaces          164;
+        startFace       1052842;
+    }
+    motorBike_fr-wh-tyre%37
+    {
+        type            wall;
+        nFaces          1116;
+        startFace       1053006;
+    }
+    motorBike_hbars%38
+    {
+        type            wall;
+        nFaces          535;
+        startFace       1054122;
+    }
+    motorBike_fr-forks%39
+    {
+        type            wall;
+        nFaces          1140;
+        startFace       1054657;
+    }
+    motorBike_chain%40
+    {
+        type            wall;
+        nFaces          474;
+        startFace       1055797;
+    }
+    motorBike_rr-wh-tyre%41
+    {
+        type            wall;
+        nFaces          1787;
+        startFace       1056271;
+    }
+    motorBike_square-dial%42
+    {
+        type            wall;
+        nFaces          6;
+        startFace       1058058;
+    }
+    motorBike_round-dial%43
+    {
+        type            wall;
+        nFaces          17;
+        startFace       1058064;
+    }
+    motorBike_dial-holder%44
+    {
+        type            wall;
+        nFaces          87;
+        startFace       1058081;
+    }
+    motorBike_rear-susp%45
+    {
+        type            wall;
+        nFaces          1786;
+        startFace       1058168;
+    }
+    motorBike_rear-brake-lights%46
+    {
+        type            wall;
+        nFaces          53;
+        startFace       1059954;
+    }
+    motorBike_rear-light-bracket%47
+    {
+        type            wall;
+        nFaces          163;
+        startFace       1060007;
+    }
+    motorBike_frame%48
+    {
+        type            wall;
+        nFaces          2040;
+        startFace       1060170;
+    }
+    motorBike_rear-mud-guard%49
+    {
+        type            wall;
+        nFaces          663;
+        startFace       1062210;
+    }
+    motorBike_rear-susp-spring-damp%50
+    {
+        type            wall;
+        nFaces          107;
+        startFace       1062873;
+    }
+    motorBike_fairing-inner-plate%51
+    {
+        type            wall;
+        nFaces          445;
+        startFace       1062980;
+    }
+    motorBike_clutch-housing%52
+    {
+        type            wall;
+        nFaces          970;
+        startFace       1063425;
+    }
+    motorBike_radiator%53
+    {
+        type            wall;
+        nFaces          40;
+        startFace       1064395;
+    }
+    motorBike_water-pipe%54
+    {
+        type            wall;
+        nFaces          104;
+        startFace       1064435;
+    }
+    motorBike_water-pump%55
+    {
+        type            wall;
+        nFaces          74;
+        startFace       1064539;
+    }
+    motorBike_engine%56
+    {
+        type            wall;
+        nFaces          2389;
+        startFace       1064613;
+    }
+    motorBike_rear-shock-link%57
+    {
+        type            wall;
+        nFaces          25;
+        startFace       1067002;
+    }
+    motorBike_rear-brake-fluid-pot-bracket%58
+    {
+        type            wall;
+        nFaces          44;
+        startFace       1067027;
+    }
+    motorBike_rear-brake-fluid-pot%59
+    {
+        type            wall;
+        nFaces          53;
+        startFace       1067071;
+    }
+    motorBike_footpeg%60
+    {
+        type            wall;
+        nFaces          86;
+        startFace       1067124;
+    }
+    motorBike_rr-wh-chain-hub%61
+    {
+        type            wall;
+        nFaces          122;
+        startFace       1067210;
+    }
+    motorBike_rear-brake-caliper%62
+    {
+        type            wall;
+        nFaces          142;
+        startFace       1067332;
+    }
+    motorBike_rider-helmet%65
+    {
+        type            wall;
+        nFaces          583;
+        startFace       1067474;
+    }
+    motorBike_rider-visor%66
+    {
+        type            wall;
+        nFaces          95;
+        startFace       1068057;
+    }
+    motorBike_rider-boots%67
+    {
+        type            wall;
+        nFaces          1025;
+        startFace       1068152;
+    }
+    motorBike_rider-gloves%68
+    {
+        type            wall;
+        nFaces          319;
+        startFace       1069177;
+    }
+    motorBike_rider-body%69
+    {
+        type            wall;
+        nFaces          4555;
+        startFace       1069496;
+    }
+    motorBike_frame:0%70
+    {
+        type            wall;
+        nFaces          37;
+        startFace       1074051;
+    }
+    motorBike_frt-fairing:001-shadow%74
+    {
+        type            wall;
+        nFaces          3306;
+        startFace       1074088;
+    }
+    motorBike_windshield-shadow%75
+    {
+        type            wall;
+        nFaces          239;
+        startFace       1077394;
+    }
+    motorBike_fr-mud-guard-shadow%81
+    {
+        type            wall;
+        nFaces          332;
+        startFace       1077633;
+    }
+    motorBike_fr-wh-brake-disk-shadow%83
+    {
+        type            wall;
+        nFaces          182;
+        startFace       1077965;
+    }
+    motorBike_rear-mud-guard-shadow%84
+    {
+        type            wall;
+        nFaces          387;
+        startFace       1078147;
+    }
+    motorBike_rear-susp-spring-damp-shadow%85
+    {
+        type            wall;
+        nFaces          41;
+        startFace       1078534;
+    }
+    motorBike_radiator-shadow%86
+    {
+        type            wall;
+        nFaces          21;
+        startFace       1078575;
+    }
+    motorBike_rear-shock-link-shadow%87
+    {
+        type            wall;
+        nFaces          10;
+        startFace       1078596;
+    }
+    motorBike_rear-brake-fluid-pot-bracket-shadow%88
+    {
+        type            wall;
+        nFaces          22;
+        startFace       1078606;
+    }
+    motorBike_rr-wh-chain-hub-shadow%89
+    {
+        type            wall;
+        nFaces          53;
+        startFace       1078628;
+    }
+)
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/controlDict b/tutorials/incompressible/simpleFoam/motorBike/system/controlDict
index 8d62c2cd9447e132970f9897451a4b7bf8044cd8..376080efff3e26165b72fd371977b90217d8c262 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/controlDict
@@ -22,7 +22,7 @@ startTime       0;
 
 stopAt          endTime;
 
-endTime         1000;
+endTime         500;
 
 deltaT          1;
 
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes b/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes
index 79fd21bad2ad9f2da99ca9878c3a1f6d396bf988..d0475c2bdde9e065ca019835f836d5848f22ad09 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes
@@ -16,14 +16,12 @@ FoamFile
 
 ddtSchemes
 {
-    default steadyState;
+    default         steadyState;
 }
 
 gradSchemes
 {
     default         Gauss linear;
-    grad(p)         Gauss linear;
-    grad(U)         Gauss linear;
 }
 
 divSchemes
@@ -37,7 +35,7 @@ divSchemes
 
 laplacianSchemes
 {
-    default         Gauss linear limited 0.333;
+    default         Gauss linear corrected;
 }
 
 interpolationSchemes
@@ -47,7 +45,7 @@ interpolationSchemes
 
 snGradSchemes
 {
-    default         limited 0.333;
+    default         corrected;
 }
 
 fluxRequired
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution b/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution.org
similarity index 100%
rename from tutorials/incompressible/simpleFoam/motorBike/system/fvSolution
rename to tutorials/incompressible/simpleFoam/motorBike/system/fvSolution.org