diff --git a/tutorials/entrainment/0.orig/Us b/tutorials/entrainment/0.orig/Us
index 020f1cd070150fdf8e3f5c3557ade779ff14ca2a..bc8ad431aa56d0471ce29a2efe336b67c840c038 100644
--- a/tutorials/entrainment/0.orig/Us
+++ b/tutorials/entrainment/0.orig/Us
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -29,5 +29,4 @@ boundaryField
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/entrainment/0.orig/h b/tutorials/entrainment/0.orig/h
index ac00fead36c8bddd90775d37863f044d3cdd8f4a..23ef742474834fd0b21e1f785d0cface4d95ff24 100644
--- a/tutorials/entrainment/0.orig/h
+++ b/tutorials/entrainment/0.orig/h
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -29,5 +29,4 @@ boundaryField
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/entrainment/0.orig/hentrain b/tutorials/entrainment/0.orig/hentrain
index a293eda4394b043d0057ea6e236f531aa12e6a51..b4176b2b55619134b1e3b3d0fa006cea1cc6d674 100644
--- a/tutorials/entrainment/0.orig/hentrain
+++ b/tutorials/entrainment/0.orig/hentrain
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -29,5 +29,4 @@ boundaryField
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/entrainment/constant/faMesh/faMeshDefinition b/tutorials/entrainment/constant/faMesh/faMeshDefinition
index 01d9e2c944f8b91cf2abc853913ef475c19ebe96..6eae65dfb9130c3c05c6b5f891a81d7d2d8621e8 100644
--- a/tutorials/entrainment/constant/faMesh/faMeshDefinition
+++ b/tutorials/entrainment/constant/faMesh/faMeshDefinition
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant/faMesh";
     object      faMeshDefinition;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/entrainment/constant/g b/tutorials/entrainment/constant/g
index 28a9bf973826c2a2ea72bb9e3cdca73337df0132..3070ab7a14c8dfd009928d77c157e0bca0c4faee 100644
--- a/tutorials/entrainment/constant/g
+++ b/tutorials/entrainment/constant/g
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/entrainment/constant/releaseArea b/tutorials/entrainment/constant/releaseArea
index 446bfce75b4b94c853c48f6e4219ef93b0552fa4..421b9ecd92b3614c6b1f9e8bb1259b69d3906053 100644
--- a/tutorials/entrainment/constant/releaseArea
+++ b/tutorials/entrainment/constant/releaseArea
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,12 +10,10 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      releaseArea;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
 fields
 (
     h
diff --git a/tutorials/entrainment/constant/slopeMeshDict b/tutorials/entrainment/constant/slopeMeshDict
index 9e85103012b1a863ed6430f1c17bc68eb14632c7..89f3c7c7f97e6016440d2b30c76cbeca917d3913 100644
--- a/tutorials/entrainment/constant/slopeMeshDict
+++ b/tutorials/entrainment/constant/slopeMeshDict
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -12,7 +12,6 @@ FoamFile
     class       dictionary;
     object      demMeshDict;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 minX 0.;
diff --git a/tutorials/entrainment/constant/transportProperties b/tutorials/entrainment/constant/transportProperties
index 6e33cd931de455513a5a95360e88629b3d669f20..f3ffdd3b7c267101474c439fe42413bfd6489749 100644
--- a/tutorials/entrainment/constant/transportProperties
+++ b/tutorials/entrainment/constant/transportProperties
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -19,7 +18,6 @@ pressureFeedback    off;
 
 explicitDryAreas    on;
 
-
 xi                  xi     [ 0 0 0 0 0 0 0]     1;
 
 hmin                hmin   [ 0 1 0 0 0 0 0]     0; 
diff --git a/tutorials/entrainment/system/controlDict b/tutorials/entrainment/system/controlDict
index e05834bf8d3524a8532fb8129ede95dcc13679ae..705064e3c26ab4050fcc60ce8f14df7c5b5affc8 100644
--- a/tutorials/entrainment/system/controlDict
+++ b/tutorials/entrainment/system/controlDict
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -51,5 +50,4 @@ initDeltaT          yes;
 
 maxCo               1.0;
 
-
 // ************************************************************************* //
diff --git a/tutorials/entrainment/system/decomposeParDict b/tutorials/entrainment/system/decomposeParDict
index 9be5bf157af0abd6b4fce4c304dfd7eaf31ba0ea..b0111400ba2cf8151e57268099b0ef41250977d9 100644
--- a/tutorials/entrainment/system/decomposeParDict
+++ b/tutorials/entrainment/system/decomposeParDict
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  plus                                  |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -22,5 +22,4 @@ coeffs
     n           (2 2 1);
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/entrainment/system/faSchemes b/tutorials/entrainment/system/faSchemes
index b4774797718c77f7ac216cf1e8875a222e371229..d8cde38243daa9a8387f338e5b16a507235c9432 100644
--- a/tutorials/entrainment/system/faSchemes
+++ b/tutorials/entrainment/system/faSchemes
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      faSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -56,5 +55,4 @@ fluxRequired
     h;
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/entrainment/system/faSolution b/tutorials/entrainment/system/faSolution
index 1e7de07db8d5cc57b63ee96d0355bf013ad51ada..bb5290119db8e73ef45abe0c008086dad6a37cf6 100644
--- a/tutorials/entrainment/system/faSolution
+++ b/tutorials/entrainment/system/faSolution
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      faSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/entrainment/system/fvSchemes b/tutorials/entrainment/system/fvSchemes
index 3e3676bea7886f691223e18bf1e0a20f596b4382..0f06cb3d920279916eb8e6761c11de5987781ba3 100644
--- a/tutorials/entrainment/system/fvSchemes
+++ b/tutorials/entrainment/system/fvSchemes
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/entrainment/system/fvSolution b/tutorials/entrainment/system/fvSolution
index 9b9a8d7922b900f7932a2d5782139174ad14e6ef..7d70a0b3ffd82770a161675727fd8ac814c3f155 100644
--- a/tutorials/entrainment/system/fvSolution
+++ b/tutorials/entrainment/system/fvSolution
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/simpleslope/0.orig/Us b/tutorials/simpleslope/0.orig/Us
index 020f1cd070150fdf8e3f5c3557ade779ff14ca2a..bc8ad431aa56d0471ce29a2efe336b67c840c038 100644
--- a/tutorials/simpleslope/0.orig/Us
+++ b/tutorials/simpleslope/0.orig/Us
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -29,5 +29,4 @@ boundaryField
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/simpleslope/0.orig/h b/tutorials/simpleslope/0.orig/h
index ac00fead36c8bddd90775d37863f044d3cdd8f4a..23ef742474834fd0b21e1f785d0cface4d95ff24 100644
--- a/tutorials/simpleslope/0.orig/h
+++ b/tutorials/simpleslope/0.orig/h
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -29,5 +29,4 @@ boundaryField
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/simpleslope/0.orig/hentrain b/tutorials/simpleslope/0.orig/hentrain
index a293eda4394b043d0057ea6e236f531aa12e6a51..b4176b2b55619134b1e3b3d0fa006cea1cc6d674 100644
--- a/tutorials/simpleslope/0.orig/hentrain
+++ b/tutorials/simpleslope/0.orig/hentrain
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -29,5 +29,4 @@ boundaryField
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/simpleslope/constant/faMesh/faMeshDefinition b/tutorials/simpleslope/constant/faMesh/faMeshDefinition
index 01d9e2c944f8b91cf2abc853913ef475c19ebe96..6eae65dfb9130c3c05c6b5f891a81d7d2d8621e8 100644
--- a/tutorials/simpleslope/constant/faMesh/faMeshDefinition
+++ b/tutorials/simpleslope/constant/faMesh/faMeshDefinition
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant/faMesh";
     object      faMeshDefinition;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/simpleslope/constant/g b/tutorials/simpleslope/constant/g
index 28a9bf973826c2a2ea72bb9e3cdca73337df0132..3070ab7a14c8dfd009928d77c157e0bca0c4faee 100644
--- a/tutorials/simpleslope/constant/g
+++ b/tutorials/simpleslope/constant/g
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/simpleslope/constant/releaseArea b/tutorials/simpleslope/constant/releaseArea
index 2139fde3bfbdee21ff10a74a3fdf86b0cd84d8ee..7c1380cd36d429c186813bd7bdff4a930bcf0aa5 100644
--- a/tutorials/simpleslope/constant/releaseArea
+++ b/tutorials/simpleslope/constant/releaseArea
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,12 +10,10 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      releaseArea;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
 fields
 (
     h
diff --git a/tutorials/simpleslope/constant/slopeMeshDict b/tutorials/simpleslope/constant/slopeMeshDict
index 9e85103012b1a863ed6430f1c17bc68eb14632c7..89f3c7c7f97e6016440d2b30c76cbeca917d3913 100644
--- a/tutorials/simpleslope/constant/slopeMeshDict
+++ b/tutorials/simpleslope/constant/slopeMeshDict
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -12,7 +12,6 @@ FoamFile
     class       dictionary;
     object      demMeshDict;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 minX 0.;
diff --git a/tutorials/simpleslope/constant/transportProperties b/tutorials/simpleslope/constant/transportProperties
index 3d5b0aef78a1ff09ec4176a28eddbcc1b21293f3..562c97e7662949ee310a2b664770eea29c30cfaf 100644
--- a/tutorials/simpleslope/constant/transportProperties
+++ b/tutorials/simpleslope/constant/transportProperties
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -19,7 +18,6 @@ pressureFeedback    off;
 
 explicitDryAreas    on;
 
-
 xi                  xi     [ 0 0 0 0 0 0 0]     1;
 
 hmin                hmin   [ 0 1 0 0 0 0 0]     0; 
diff --git a/tutorials/simpleslope/system/controlDict b/tutorials/simpleslope/system/controlDict
index e05834bf8d3524a8532fb8129ede95dcc13679ae..705064e3c26ab4050fcc60ce8f14df7c5b5affc8 100644
--- a/tutorials/simpleslope/system/controlDict
+++ b/tutorials/simpleslope/system/controlDict
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -51,5 +50,4 @@ initDeltaT          yes;
 
 maxCo               1.0;
 
-
 // ************************************************************************* //
diff --git a/tutorials/simpleslope/system/decomposeParDict b/tutorials/simpleslope/system/decomposeParDict
index 9be5bf157af0abd6b4fce4c304dfd7eaf31ba0ea..b0111400ba2cf8151e57268099b0ef41250977d9 100644
--- a/tutorials/simpleslope/system/decomposeParDict
+++ b/tutorials/simpleslope/system/decomposeParDict
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  plus                                  |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -22,5 +22,4 @@ coeffs
     n           (2 2 1);
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/simpleslope/system/faSchemes b/tutorials/simpleslope/system/faSchemes
index b4774797718c77f7ac216cf1e8875a222e371229..d8cde38243daa9a8387f338e5b16a507235c9432 100644
--- a/tutorials/simpleslope/system/faSchemes
+++ b/tutorials/simpleslope/system/faSchemes
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      faSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -56,5 +55,4 @@ fluxRequired
     h;
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/simpleslope/system/faSolution b/tutorials/simpleslope/system/faSolution
index 1e7de07db8d5cc57b63ee96d0355bf013ad51ada..bb5290119db8e73ef45abe0c008086dad6a37cf6 100644
--- a/tutorials/simpleslope/system/faSolution
+++ b/tutorials/simpleslope/system/faSolution
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      faSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/simpleslope/system/fvSchemes b/tutorials/simpleslope/system/fvSchemes
index 3e3676bea7886f691223e18bf1e0a20f596b4382..0f06cb3d920279916eb8e6761c11de5987781ba3 100644
--- a/tutorials/simpleslope/system/fvSchemes
+++ b/tutorials/simpleslope/system/fvSchemes
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/simpleslope/system/fvSolution b/tutorials/simpleslope/system/fvSolution
index 9b9a8d7922b900f7932a2d5782139174ad14e6ef..7d70a0b3ffd82770a161675727fd8ac814c3f155 100644
--- a/tutorials/simpleslope/system/fvSolution
+++ b/tutorials/simpleslope/system/fvSolution
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/wolfsgrube/0.orig/Us b/tutorials/wolfsgrube/0.orig/Us
index 5bea382db79603db9af387452b74104fa4cd7234..edfec65b64a6ca6a26242f7ec8e2da60a5745eca 100644
--- a/tutorials/wolfsgrube/0.orig/Us
+++ b/tutorials/wolfsgrube/0.orig/Us
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -29,5 +29,4 @@ boundaryField
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/wolfsgrube/0.orig/h b/tutorials/wolfsgrube/0.orig/h
index e3cc1b6094b700c8b96e2c17aa8e49d9fe761b1d..94e4e5a4e6dff49b801d68f8dd5e68b7cce9c914 100644
--- a/tutorials/wolfsgrube/0.orig/h
+++ b/tutorials/wolfsgrube/0.orig/h
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -29,5 +29,4 @@ boundaryField
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/wolfsgrube/0.orig/hentrain b/tutorials/wolfsgrube/0.orig/hentrain
index e6d0c28406fb4af0a0bf97f45ddf6ad8bfcd4ab0..fb0b3320f739381a07fab570d37a98a2fb6e65ea 100644
--- a/tutorials/wolfsgrube/0.orig/hentrain
+++ b/tutorials/wolfsgrube/0.orig/hentrain
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -29,5 +29,4 @@ boundaryField
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/wolfsgrube/Allrun b/tutorials/wolfsgrube/Allrun
deleted file mode 100755
index 4ae91a8d615c988537521cdb0204acbcc72cc2a7..0000000000000000000000000000000000000000
--- a/tutorials/wolfsgrube/Allrun
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1                        # Run from this directory
-. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions
-
-if command -v pMesh > /dev/null
-then
-    runApplication pMesh
-else
-    echo "Skip tutorial - no pMesh found"
-    echo End
-    exit 0
-fi
-
-runApplication makeFaMesh
-
-# Restore initial fields
-restore0Dir
-
-runApplication releaseAreaMapping
-
-runApplication $(getApplication)
-
-#------------------------------------------------------------------------------
diff --git a/tutorials/wolfsgrube/Allrun b/tutorials/wolfsgrube/Allrun
new file mode 120000
index 0000000000000000000000000000000000000000..f8f6fb52273fc4261c74c5bfbaf71e49adfcb80f
--- /dev/null
+++ b/tutorials/wolfsgrube/Allrun
@@ -0,0 +1 @@
+Allrun-parallel
\ No newline at end of file
diff --git a/tutorials/wolfsgrube/Allrun-parallel b/tutorials/wolfsgrube/Allrun-parallel
index a49185e4db0250fe7db35da0ceb690f78c96a792..d8e6295b2ce30bd26afa950cf2da9f5ecef30b7e 100755
--- a/tutorials/wolfsgrube/Allrun-parallel
+++ b/tutorials/wolfsgrube/Allrun-parallel
@@ -2,7 +2,12 @@
 cd ${0%/*} || exit 1                        # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions
 
-if command -v pMesh > /dev/null
+if [ "$WM_LABEL_SIZE" = 64 ]
+then
+    echo "Skip tutorial - known issues with pMesh and 64-bit labels"
+    echo End
+    exit 0
+elif command -v pMesh > /dev/null
 then
     runApplication pMesh
 else
@@ -16,10 +21,16 @@ runApplication makeFaMesh
 # Restore initial fields (prior to decompose)
 restore0Dir
 
-runApplication decomposePar
+# Use alternative decomposeParDict
+decompDict="-decomposeParDict system/decomposeParDict.16"
+
+# Or unset to use default system/decomposeParDict
+#unset decompDict
+
+runApplication $decompDict decomposePar
 
-runParallel releaseAreaMapping
+runParallel $decompDict releaseAreaMapping
 
-runParallel $(getApplication)
+runParallel $decompDict $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/wolfsgrube/Allrun-redistribute b/tutorials/wolfsgrube/Allrun-redistribute
new file mode 100755
index 0000000000000000000000000000000000000000..738fae9e5f41cf05c8a1dce96126cf26490759d8
--- /dev/null
+++ b/tutorials/wolfsgrube/Allrun-redistribute
@@ -0,0 +1,37 @@
+#!/bin/sh
+cd ${0%/*} || exit 1                        # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions
+
+if [ "$WM_LABEL_SIZE" = 64 ]
+then
+    echo "Skip tutorial - known issues with pMesh and 64-bit labels"
+    echo End
+    exit 0
+elif command -v pMesh > /dev/null
+then
+    runApplication pMesh
+else
+    echo "Skip tutorial - no pMesh found"
+    echo End
+    exit 0
+fi
+
+runApplication makeFaMesh
+
+# Restore initial fields (prior to decompose)
+restore0Dir
+
+runApplication decomposePar
+
+runParallel releaseAreaMapping
+
+# Redistribute onto more cpus - currently not working for faMesh
+# These are unnecessary intermediate steps, but checks that everything works
+
+decompDict="-decomposeParDict system/decomposeParDict.16"
+
+runParallel $decompDict redistributePar -overwrite
+
+runParallel $decompDict $(getApplication)
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/wolfsgrube/Allrun-serial b/tutorials/wolfsgrube/Allrun-serial
new file mode 100755
index 0000000000000000000000000000000000000000..90ada1d2a75a1a7621241676ead847dfac74c45b
--- /dev/null
+++ b/tutorials/wolfsgrube/Allrun-serial
@@ -0,0 +1,28 @@
+#!/bin/sh
+cd ${0%/*} || exit 1                        # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions
+
+if [ "$WM_LABEL_SIZE" = 64 ]
+then
+    echo "Skip tutorial - known issues with pMesh and 64-bit labels"
+    echo End
+    exit 0
+elif command -v pMesh > /dev/null
+then
+    runApplication pMesh
+else
+    echo "Skip tutorial - no pMesh found"
+    echo End
+    exit 0
+fi
+
+runApplication makeFaMesh
+
+# Restore initial fields
+restore0Dir
+
+runApplication releaseAreaMapping
+
+runApplication $(getApplication)
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/wolfsgrube/constant/faMesh/faMeshDefinition b/tutorials/wolfsgrube/constant/faMesh/faMeshDefinition
index 3fa4cad3adec59b4339f7376bed22e36243b15a9..61bd0c142dec1f4eb021c46832d7f93c86d91af3 100755
--- a/tutorials/wolfsgrube/constant/faMesh/faMeshDefinition
+++ b/tutorials/wolfsgrube/constant/faMesh/faMeshDefinition
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant/faMesh";
     object      faMeshDefinition;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/wolfsgrube/constant/g b/tutorials/wolfsgrube/constant/g
index 28a9bf973826c2a2ea72bb9e3cdca73337df0132..3070ab7a14c8dfd009928d77c157e0bca0c4faee 100644
--- a/tutorials/wolfsgrube/constant/g
+++ b/tutorials/wolfsgrube/constant/g
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/wolfsgrube/constant/releaseArea b/tutorials/wolfsgrube/constant/releaseArea
index 1d197eb80ce4e6d67d4109da8c3b00570a1b433f..a4068f9eded0db2f8ce0c67f96e700264f97bdcb 100644
--- a/tutorials/wolfsgrube/constant/releaseArea
+++ b/tutorials/wolfsgrube/constant/releaseArea
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,12 +10,10 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      releaseArea;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
 fields
 (
     hentrain
diff --git a/tutorials/wolfsgrube/constant/transportProperties b/tutorials/wolfsgrube/constant/transportProperties
index 103f7f555794905ed563456b775ce64965cda091..d1604f662cc15b2bf9de0020b776e78e73d357eb 100644
--- a/tutorials/wolfsgrube/constant/transportProperties
+++ b/tutorials/wolfsgrube/constant/transportProperties
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -19,7 +18,6 @@ pressureFeedback    off;
 
 explicitDryAreas    on;
 
-
 hmin                hmin [ 0 1 0 0 0 0 0]    1e-5;    
 
 rho                 rho [ 1 -3  0 0 0 0 0 ]  200.;  
@@ -30,14 +28,12 @@ h0                  h0 [ 0 1 0 0 0 0 0]      1e-4;
 
 xi                  xi [ 0 0 0 0 0 0 0]      1;
 
-
 frictionModel       Voellmy;
 
 entrainmentModel    Erosionenergy;
 
 depositionModel     depositionOff;
 
-
 VoellmyCoeffs
 {
     mu              mu [0 0 0 0 0 0 0]       0.26; 
diff --git a/tutorials/wolfsgrube/system/controlDict b/tutorials/wolfsgrube/system/controlDict
index 051ce6703f81c4c35da753b3b99ba307211f3259..b66fd096650fa9b15d5cf0a765f7fd98008b17ec 100644
--- a/tutorials/wolfsgrube/system/controlDict
+++ b/tutorials/wolfsgrube/system/controlDict
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -51,5 +50,4 @@ initDeltaT          no;
 
 maxCo               1.0;
 
-
 // ************************************************************************* //
diff --git a/tutorials/wolfsgrube/system/decomposeParDict b/tutorials/wolfsgrube/system/decomposeParDict
index 38acc52c315c7499e843fed3b5b4faa8198a1c63..532cc8e28503faa8c612668d1e648b32c63768ff 100644
--- a/tutorials/wolfsgrube/system/decomposeParDict
+++ b/tutorials/wolfsgrube/system/decomposeParDict
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -15,12 +15,12 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 numberOfSubdomains  4;
+
 method      simple;
 
 coeffs
 {
-    n           (2 2 1);
+    n       (2 2 1);
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/wolfsgrube/system/decomposeParDict.16 b/tutorials/wolfsgrube/system/decomposeParDict.16
new file mode 100644
index 0000000000000000000000000000000000000000..fecf156719b9663fdd0392f0746f45b2733d7700
--- /dev/null
+++ b/tutorials/wolfsgrube/system/decomposeParDict.16
@@ -0,0 +1,27 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains  16;
+
+method      hierarchical;
+
+coeffs
+{
+    n       (4 4 1);
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/wolfsgrube/system/decomposeParDict.8 b/tutorials/wolfsgrube/system/decomposeParDict.8
new file mode 100644
index 0000000000000000000000000000000000000000..c81ae08b73accdcdf88f5dbfb3447077b2db1d51
--- /dev/null
+++ b/tutorials/wolfsgrube/system/decomposeParDict.8
@@ -0,0 +1,27 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains  8;
+
+method      hierarchical;
+
+coeffs
+{
+    n       (8 1 1);
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/wolfsgrube/system/faSchemes b/tutorials/wolfsgrube/system/faSchemes
index 45b11620e2f21e5c122b4749ee774b0bacf97ca1..fbecfff420fcecbc97cc15f3f4fec80d522b2636 100644
--- a/tutorials/wolfsgrube/system/faSchemes
+++ b/tutorials/wolfsgrube/system/faSchemes
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      faSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -55,5 +54,4 @@ fluxRequired
     h;
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/wolfsgrube/system/faSolution b/tutorials/wolfsgrube/system/faSolution
index f8b491c6aafa132d097962edeb3b93998f5e3de3..421afd39f10359f4713f69c2577f1b8757a10e7a 100644
--- a/tutorials/wolfsgrube/system/faSolution
+++ b/tutorials/wolfsgrube/system/faSolution
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      faSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/wolfsgrube/system/fvSchemes b/tutorials/wolfsgrube/system/fvSchemes
index 3e3676bea7886f691223e18bf1e0a20f596b4382..0f06cb3d920279916eb8e6761c11de5987781ba3 100644
--- a/tutorials/wolfsgrube/system/fvSchemes
+++ b/tutorials/wolfsgrube/system/fvSchemes
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/wolfsgrube/system/fvSolution b/tutorials/wolfsgrube/system/fvSolution
index 9b9a8d7922b900f7932a2d5782139174ad14e6ef..7d70a0b3ffd82770a161675727fd8ac814c3f155 100644
--- a/tutorials/wolfsgrube/system/fvSolution
+++ b/tutorials/wolfsgrube/system/fvSolution
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/wolfsgrube/system/meshDict b/tutorials/wolfsgrube/system/meshDict
index ecdb930d52559465bcd7e5934e8d94c98c9c2718..01e025e0d74da1e03fc52ae5e561e780dff5b0b7 100644
--- a/tutorials/wolfsgrube/system/meshDict
+++ b/tutorials/wolfsgrube/system/meshDict
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | faSavageHutterFOAM                              |
-|   \\  /    A nd           | Copyright (C) 2017 Matthias Rauter              |
+|  \\    /   O peration     | Version:  avalanche                             |
+|   \\  /    A nd           | https://develop.openfoam.com/Community/avalanche|
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      meshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //