diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/0/T.gas b/tutorials/modules/CHT/wallBoiling/0/fluid/T.gas
similarity index 92%
rename from tutorials/modules/multiphaseEuler/wallBoiling/0/T.gas
rename to tutorials/modules/CHT/wallBoiling/0/fluid/T.gas
index 16e1e9a4bc..7dfc5efa1c 100644
--- a/tutorials/modules/multiphaseEuler/wallBoiling/0/T.gas
+++ b/tutorials/modules/CHT/wallBoiling/0/fluid/T.gas
@@ -9,7 +9,6 @@ FoamFile
 {
     format      ascii;
     class       volScalarField;
-    location    "5";
     object      T.gas;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -34,8 +33,7 @@ boundaryField
     }
     wall
     {
-        type            copiedFixedValue;
-        sourceFieldName T.liquid;
+        type            coupledMultiphaseTemperature;
         value           $internalField;
     }
     front
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/0/T.liquid b/tutorials/modules/CHT/wallBoiling/0/fluid/T.liquid
similarity index 87%
rename from tutorials/modules/multiphaseEuler/wallBoiling/0/T.liquid
rename to tutorials/modules/CHT/wallBoiling/0/fluid/T.liquid
index 05ce63a7b9..c9b7901e38 100644
--- a/tutorials/modules/multiphaseEuler/wallBoiling/0/T.liquid
+++ b/tutorials/modules/CHT/wallBoiling/0/fluid/T.liquid
@@ -9,7 +9,6 @@ FoamFile
 {
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      T.liquid;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -34,10 +33,7 @@ boundaryField
     }
     wall
     {
-        type            fixedMultiphaseHeatFlux;
-        relax           0.6;
-        q               uniform 0;
-        phase           "liquid";
+        type            coupledMultiphaseTemperature;
         value           $internalField;
     }
     front
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/0/U.gas b/tutorials/modules/CHT/wallBoiling/0/fluid/U.gas
similarity index 98%
rename from tutorials/modules/multiphaseEuler/wallBoiling/0/U.gas
rename to tutorials/modules/CHT/wallBoiling/0/fluid/U.gas
index 284cc88317..faebf70d78 100644
--- a/tutorials/modules/multiphaseEuler/wallBoiling/0/U.gas
+++ b/tutorials/modules/CHT/wallBoiling/0/fluid/U.gas
@@ -9,7 +9,6 @@ FoamFile
 {
     format      ascii;
     class       volVectorField;
-    location    "0";
     object      U.gas;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/0/U.liquid b/tutorials/modules/CHT/wallBoiling/0/fluid/U.liquid
similarity index 98%
rename from tutorials/modules/multiphaseEuler/wallBoiling/0/U.liquid
rename to tutorials/modules/CHT/wallBoiling/0/fluid/U.liquid
index 7f580af892..12bd4a6698 100644
--- a/tutorials/modules/multiphaseEuler/wallBoiling/0/U.liquid
+++ b/tutorials/modules/CHT/wallBoiling/0/fluid/U.liquid
@@ -9,7 +9,6 @@ FoamFile
 {
     format      ascii;
     class       volVectorField;
-    location    "0";
     object      U.liquid;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/0/alpha.gas b/tutorials/modules/CHT/wallBoiling/0/fluid/alpha.gas
similarity index 98%
rename from tutorials/modules/multiphaseEuler/wallBoiling/0/alpha.gas
rename to tutorials/modules/CHT/wallBoiling/0/fluid/alpha.gas
index c88dd1d3c1..7ef50d523c 100644
--- a/tutorials/modules/multiphaseEuler/wallBoiling/0/alpha.gas
+++ b/tutorials/modules/CHT/wallBoiling/0/fluid/alpha.gas
@@ -9,7 +9,6 @@ FoamFile
 {
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      alpha.gas;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/0/alpha.liquid b/tutorials/modules/CHT/wallBoiling/0/fluid/alpha.liquid
similarity index 98%
rename from tutorials/modules/multiphaseEuler/wallBoiling/0/alpha.liquid
rename to tutorials/modules/CHT/wallBoiling/0/fluid/alpha.liquid
index 317bcf43ba..b4ef3d6bf2 100644
--- a/tutorials/modules/multiphaseEuler/wallBoiling/0/alpha.liquid
+++ b/tutorials/modules/CHT/wallBoiling/0/fluid/alpha.liquid
@@ -9,7 +9,6 @@ FoamFile
 {
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      alpha.liquid;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/0/alphat.gas b/tutorials/modules/CHT/wallBoiling/0/fluid/alphat.gas
similarity index 98%
rename from tutorials/modules/multiphaseEuler/wallBoiling/0/alphat.gas
rename to tutorials/modules/CHT/wallBoiling/0/fluid/alphat.gas
index fd4ce93354..248d4e028c 100644
--- a/tutorials/modules/multiphaseEuler/wallBoiling/0/alphat.gas
+++ b/tutorials/modules/CHT/wallBoiling/0/fluid/alphat.gas
@@ -9,7 +9,6 @@ FoamFile
 {
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      alphat.gas;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/0/alphat.liquid b/tutorials/modules/CHT/wallBoiling/0/fluid/alphat.liquid
similarity index 97%
rename from tutorials/modules/multiphaseEuler/wallBoiling/0/alphat.liquid
rename to tutorials/modules/CHT/wallBoiling/0/fluid/alphat.liquid
index 3e00ea7cd1..ed9dd4682f 100644
--- a/tutorials/modules/multiphaseEuler/wallBoiling/0/alphat.liquid
+++ b/tutorials/modules/CHT/wallBoiling/0/fluid/alphat.liquid
@@ -9,7 +9,6 @@ FoamFile
 {
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      alphat.liquid;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -37,7 +36,7 @@ boundaryField
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
-        relax           0.6;
+        relax           1.0;
         otherPhase      gas;
         phaseType       liquid;
         partitioningModel
diff --git a/tutorials/modules/CHT/wallBoiling/0/fluid/dDeparture.liquid b/tutorials/modules/CHT/wallBoiling/0/fluid/dDeparture.liquid
new file mode 100644
index 0000000000..19feddd54a
--- /dev/null
+++ b/tutorials/modules/CHT/wallBoiling/0/fluid/dDeparture.liquid
@@ -0,0 +1,48 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Version:  dev
+     \\/     M anipulation  |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    format      ascii;
+    class       volScalarField;
+    object      dDeparture.liquid;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    outlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    front
+    {
+        type            wedge;
+    }
+    back
+    {
+        type            wedge;
+    }
+    wall
+    {
+        type            calculated;
+        value           uniform 1e-05;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/0/epsilon.gas b/tutorials/modules/CHT/wallBoiling/0/fluid/epsilon.gas
similarity index 98%
rename from tutorials/modules/multiphaseEuler/wallBoiling/0/epsilon.gas
rename to tutorials/modules/CHT/wallBoiling/0/fluid/epsilon.gas
index 6335afe787..acc86a3ace 100644
--- a/tutorials/modules/multiphaseEuler/wallBoiling/0/epsilon.gas
+++ b/tutorials/modules/CHT/wallBoiling/0/fluid/epsilon.gas
@@ -9,7 +9,6 @@ FoamFile
 {
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      epsilon.gas;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/0/epsilon.liquid b/tutorials/modules/CHT/wallBoiling/0/fluid/epsilon.liquid
similarity index 98%
rename from tutorials/modules/multiphaseEuler/wallBoiling/0/epsilon.liquid
rename to tutorials/modules/CHT/wallBoiling/0/fluid/epsilon.liquid
index de3d110197..a4cd79a15d 100644
--- a/tutorials/modules/multiphaseEuler/wallBoiling/0/epsilon.liquid
+++ b/tutorials/modules/CHT/wallBoiling/0/fluid/epsilon.liquid
@@ -9,7 +9,6 @@ FoamFile
 {
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      epsilon.liquid;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/modules/CHT/wallBoiling/0/fluid/fDeparture.liquid b/tutorials/modules/CHT/wallBoiling/0/fluid/fDeparture.liquid
new file mode 100644
index 0000000000..3c0a3d2ea3
--- /dev/null
+++ b/tutorials/modules/CHT/wallBoiling/0/fluid/fDeparture.liquid
@@ -0,0 +1,48 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Version:  dev
+     \\/     M anipulation  |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    format      ascii;
+    class       volScalarField;
+    object      fDeparture.liquid;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    outlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    front
+    {
+        type            wedge;
+    }
+    back
+    {
+        type            wedge;
+    }
+    wall
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/0/k.gas b/tutorials/modules/CHT/wallBoiling/0/fluid/k.gas
similarity index 98%
rename from tutorials/modules/multiphaseEuler/wallBoiling/0/k.gas
rename to tutorials/modules/CHT/wallBoiling/0/fluid/k.gas
index 6c98180331..5b9358102f 100644
--- a/tutorials/modules/multiphaseEuler/wallBoiling/0/k.gas
+++ b/tutorials/modules/CHT/wallBoiling/0/fluid/k.gas
@@ -9,7 +9,6 @@ FoamFile
 {
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      k.gas;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/0/k.liquid b/tutorials/modules/CHT/wallBoiling/0/fluid/k.liquid
similarity index 98%
rename from tutorials/modules/multiphaseEuler/wallBoiling/0/k.liquid
rename to tutorials/modules/CHT/wallBoiling/0/fluid/k.liquid
index 11a8423f26..5bd9cddb5c 100644
--- a/tutorials/modules/multiphaseEuler/wallBoiling/0/k.liquid
+++ b/tutorials/modules/CHT/wallBoiling/0/fluid/k.liquid
@@ -9,7 +9,6 @@ FoamFile
 {
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      k.liquid;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/modules/CHT/wallBoiling/0/fluid/nucleationSiteDensity.liquid b/tutorials/modules/CHT/wallBoiling/0/fluid/nucleationSiteDensity.liquid
new file mode 100644
index 0000000000..7183b2e6c5
--- /dev/null
+++ b/tutorials/modules/CHT/wallBoiling/0/fluid/nucleationSiteDensity.liquid
@@ -0,0 +1,48 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Version:  dev
+     \\/     M anipulation  |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    format      ascii;
+    class       volScalarField;
+    object      nucleationSiteDensity.liquid;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 -2 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    outlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    front
+    {
+        type            wedge;
+    }
+    back
+    {
+        type            wedge;
+    }
+    wall
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/0/nut.gas b/tutorials/modules/CHT/wallBoiling/0/fluid/nut.gas
similarity index 98%
rename from tutorials/modules/multiphaseEuler/wallBoiling/0/nut.gas
rename to tutorials/modules/CHT/wallBoiling/0/fluid/nut.gas
index efbbb04cf4..0f9d544657 100644
--- a/tutorials/modules/multiphaseEuler/wallBoiling/0/nut.gas
+++ b/tutorials/modules/CHT/wallBoiling/0/fluid/nut.gas
@@ -9,7 +9,6 @@ FoamFile
 {
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      nut.gas;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/0/nut.liquid b/tutorials/modules/CHT/wallBoiling/0/fluid/nut.liquid
similarity index 98%
rename from tutorials/modules/multiphaseEuler/wallBoiling/0/nut.liquid
rename to tutorials/modules/CHT/wallBoiling/0/fluid/nut.liquid
index ad4f0da1d7..87993ff490 100644
--- a/tutorials/modules/multiphaseEuler/wallBoiling/0/nut.liquid
+++ b/tutorials/modules/CHT/wallBoiling/0/fluid/nut.liquid
@@ -9,7 +9,6 @@ FoamFile
 {
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      nut.liquid;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/0/omega.gas b/tutorials/modules/CHT/wallBoiling/0/fluid/omega.gas
similarity index 98%
rename from tutorials/modules/multiphaseEuler/wallBoiling/0/omega.gas
rename to tutorials/modules/CHT/wallBoiling/0/fluid/omega.gas
index 52493f420f..125db2c412 100644
--- a/tutorials/modules/multiphaseEuler/wallBoiling/0/omega.gas
+++ b/tutorials/modules/CHT/wallBoiling/0/fluid/omega.gas
@@ -9,7 +9,6 @@ FoamFile
 {
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      omega.gas;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/0/omega.liquid b/tutorials/modules/CHT/wallBoiling/0/fluid/omega.liquid
similarity index 98%
rename from tutorials/modules/multiphaseEuler/wallBoiling/0/omega.liquid
rename to tutorials/modules/CHT/wallBoiling/0/fluid/omega.liquid
index 840b72f0c8..09444fa332 100644
--- a/tutorials/modules/multiphaseEuler/wallBoiling/0/omega.liquid
+++ b/tutorials/modules/CHT/wallBoiling/0/fluid/omega.liquid
@@ -9,7 +9,6 @@ FoamFile
 {
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      omega.liquid;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/0/p b/tutorials/modules/CHT/wallBoiling/0/fluid/p
similarity index 98%
rename from tutorials/modules/multiphaseEuler/wallBoiling/0/p
rename to tutorials/modules/CHT/wallBoiling/0/fluid/p
index a99dacf555..f1d5931155 100644
--- a/tutorials/modules/multiphaseEuler/wallBoiling/0/p
+++ b/tutorials/modules/CHT/wallBoiling/0/fluid/p
@@ -9,7 +9,6 @@ FoamFile
 {
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/0/p_rgh b/tutorials/modules/CHT/wallBoiling/0/fluid/p_rgh
similarity index 98%
rename from tutorials/modules/multiphaseEuler/wallBoiling/0/p_rgh
rename to tutorials/modules/CHT/wallBoiling/0/fluid/p_rgh
index 682b3c45e3..5390b779a8 100644
--- a/tutorials/modules/multiphaseEuler/wallBoiling/0/p_rgh
+++ b/tutorials/modules/CHT/wallBoiling/0/fluid/p_rgh
@@ -9,7 +9,6 @@ FoamFile
 {
     format      ascii;
     class       volScalarField;
-    location    "5";
     object      p_rgh;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/modules/CHT/wallBoiling/0/fluid/qEvaporative.liquid b/tutorials/modules/CHT/wallBoiling/0/fluid/qEvaporative.liquid
new file mode 100644
index 0000000000..76b2a9d7c8
--- /dev/null
+++ b/tutorials/modules/CHT/wallBoiling/0/fluid/qEvaporative.liquid
@@ -0,0 +1,48 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Version:  dev
+     \\/     M anipulation  |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    format      ascii;
+    class       volScalarField;
+    object      qEvaporative.liquid;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 0 -3 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    outlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    front
+    {
+        type            wedge;
+    }
+    back
+    {
+        type            wedge;
+    }
+    wall
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/modules/CHT/wallBoiling/0/fluid/qQuenching.liquid b/tutorials/modules/CHT/wallBoiling/0/fluid/qQuenching.liquid
new file mode 100644
index 0000000000..510fb2dead
--- /dev/null
+++ b/tutorials/modules/CHT/wallBoiling/0/fluid/qQuenching.liquid
@@ -0,0 +1,48 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Version:  dev
+     \\/     M anipulation  |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    format      ascii;
+    class       volScalarField;
+    object      qQuenching.liquid;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 0 -3 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    outlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    front
+    {
+        type            wedge;
+    }
+    back
+    {
+        type            wedge;
+    }
+    wall
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/modules/CHT/wallBoiling/0/fluid/wetFraction.liquid b/tutorials/modules/CHT/wallBoiling/0/fluid/wetFraction.liquid
new file mode 100644
index 0000000000..c0fb6b4b46
--- /dev/null
+++ b/tutorials/modules/CHT/wallBoiling/0/fluid/wetFraction.liquid
@@ -0,0 +1,48 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Version:  dev
+     \\/     M anipulation  |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    format      ascii;
+    class       volScalarField;
+    object      wetFraction.liquid;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    outlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    front
+    {
+        type            wedge;
+    }
+    back
+    {
+        type            wedge;
+    }
+    wall
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/modules/CHT/wallBoiling/0/solid/T b/tutorials/modules/CHT/wallBoiling/0/solid/T
new file mode 100644
index 0000000000..12052db579
--- /dev/null
+++ b/tutorials/modules/CHT/wallBoiling/0/solid/T
@@ -0,0 +1,52 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Version:  dev
+     \\/     M anipulation  |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    format      ascii;
+    class       volScalarField;
+    object      T;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [ 0 0 0 1 0 0 0 ];
+
+internalField   uniform 350;
+
+boundaryField
+{
+    wall_inner
+    {
+        type            coupledTemperature;
+        Tnbr            T.liquid;
+        value           $internalField;
+    }
+    wall_outer
+    {
+        type            externalTemperature;
+        q               uniform 61150.34;
+        value           $internalField;
+    }
+    top
+    {
+        type            zeroGradient;
+    }
+    bottom
+    {
+        type            zeroGradient;
+    }
+    front
+    {
+        type            wedge;
+    }
+    back
+    {
+        type            wedge;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/Allclean b/tutorials/modules/CHT/wallBoiling/Allclean
similarity index 100%
rename from tutorials/modules/multiphaseEuler/wallBoiling/Allclean
rename to tutorials/modules/CHT/wallBoiling/Allclean
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/Allrun b/tutorials/modules/CHT/wallBoiling/Allrun
similarity index 57%
rename from tutorials/modules/multiphaseEuler/wallBoiling/Allrun
rename to tutorials/modules/CHT/wallBoiling/Allrun
index fb8223cca5..4ff27e983a 100755
--- a/tutorials/modules/multiphaseEuler/wallBoiling/Allrun
+++ b/tutorials/modules/CHT/wallBoiling/Allrun
@@ -6,21 +6,17 @@ cd ${0%/*} || exit 1    # run from this directory
 
 runApplication blockMesh
 runApplication extrudeMesh
-runApplication decomposePar
+runApplication splitMeshRegions -cellZones -overwrite
+runApplication foamDictionary constant/fluid/polyMesh/boundary -entry entry0/inlet/neighbourRegion -set "fluid"
+paraFoam -region fluid -touch
+paraFoam -region solid -touch
+
+runApplication decomposePar -allRegions
 
 runParallel $(getApplication)
 
-if ! isTest "$@"
-then
-    runApplication -a foamDictionary system/controlDict -entry endTime -set 4
-    runApplication -a foamDictionary system/controlDict -entry startTime -set 0.5
-    runParallel -a foamDictionary 0.5/T.liquid -entry boundaryField/wall/q -set "uniform 73890"
-    runParallel -a foamDictionary 0.5/U.liquid -entry boundaryField/inlet/type -set "fixedValue"
-    runParallel -a $(getApplication)
-fi
-
-runApplication reconstructPar -latestTime
-runApplication foamPostProcess -latestTime -func "
+runApplication reconstructPar -latestTime -allRegions
+runApplication foamPostProcess -latestTime -region fluid -func "
     graphCell
     (
         funcName=graph,
@@ -31,7 +27,7 @@ runApplication foamPostProcess -latestTime -func "
 
 ./validation/createGraphs
 
-runApplication -append foamPostProcess -latestTime -func "
+runApplication -append foamPostProcess  -region fluid -latestTime -func "
     patchSurface
     (
         funcName=patchWallBoilingProperties,
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/constant/fvModels b/tutorials/modules/CHT/wallBoiling/constant/fluid/fvModels
similarity index 100%
rename from tutorials/modules/multiphaseEuler/wallBoiling/constant/fvModels
rename to tutorials/modules/CHT/wallBoiling/constant/fluid/fvModels
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/constant/g b/tutorials/modules/CHT/wallBoiling/constant/fluid/g
similarity index 100%
rename from tutorials/modules/multiphaseEuler/wallBoiling/constant/g
rename to tutorials/modules/CHT/wallBoiling/constant/fluid/g
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/constant/momentumTransport.gas b/tutorials/modules/CHT/wallBoiling/constant/fluid/momentumTransport.gas
similarity index 100%
rename from tutorials/modules/multiphaseEuler/wallBoiling/constant/momentumTransport.gas
rename to tutorials/modules/CHT/wallBoiling/constant/fluid/momentumTransport.gas
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/constant/momentumTransport.liquid b/tutorials/modules/CHT/wallBoiling/constant/fluid/momentumTransport.liquid
similarity index 100%
rename from tutorials/modules/multiphaseEuler/wallBoiling/constant/momentumTransport.liquid
rename to tutorials/modules/CHT/wallBoiling/constant/fluid/momentumTransport.liquid
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/constant/phaseProperties b/tutorials/modules/CHT/wallBoiling/constant/fluid/phaseProperties
similarity index 100%
rename from tutorials/modules/multiphaseEuler/wallBoiling/constant/phaseProperties
rename to tutorials/modules/CHT/wallBoiling/constant/fluid/phaseProperties
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/constant/physicalProperties.gas b/tutorials/modules/CHT/wallBoiling/constant/fluid/physicalProperties.gas
similarity index 100%
rename from tutorials/modules/multiphaseEuler/wallBoiling/constant/physicalProperties.gas
rename to tutorials/modules/CHT/wallBoiling/constant/fluid/physicalProperties.gas
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/constant/physicalProperties.liquid b/tutorials/modules/CHT/wallBoiling/constant/fluid/physicalProperties.liquid
similarity index 100%
rename from tutorials/modules/multiphaseEuler/wallBoiling/constant/physicalProperties.liquid
rename to tutorials/modules/CHT/wallBoiling/constant/fluid/physicalProperties.liquid
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/constant/thermophysicalTransport.gas b/tutorials/modules/CHT/wallBoiling/constant/fluid/thermophysicalTransport.gas
similarity index 100%
rename from tutorials/modules/multiphaseEuler/wallBoiling/constant/thermophysicalTransport.gas
rename to tutorials/modules/CHT/wallBoiling/constant/fluid/thermophysicalTransport.gas
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/constant/thermophysicalTransport.liquid b/tutorials/modules/CHT/wallBoiling/constant/fluid/thermophysicalTransport.liquid
similarity index 100%
rename from tutorials/modules/multiphaseEuler/wallBoiling/constant/thermophysicalTransport.liquid
rename to tutorials/modules/CHT/wallBoiling/constant/fluid/thermophysicalTransport.liquid
diff --git a/tutorials/modules/CHT/wallBoiling/constant/solid/physicalProperties b/tutorials/modules/CHT/wallBoiling/constant/solid/physicalProperties
new file mode 100644
index 0000000000..5171575f26
--- /dev/null
+++ b/tutorials/modules/CHT/wallBoiling/constant/solid/physicalProperties
@@ -0,0 +1,37 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Version:  dev
+     \\/     M anipulation  |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    format      ascii;
+    class       dictionary;
+    object      physicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType          constSolidThermo;
+
+rho
+{
+    type        uniform;
+    value       8000;
+}
+
+Cv
+{
+    type        uniform;
+    value       500;
+}
+
+kappa
+{
+    type        uniform;
+    value       16.3;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/system/blockMeshDict b/tutorials/modules/CHT/wallBoiling/system/blockMeshDict
similarity index 54%
rename from tutorials/modules/multiphaseEuler/wallBoiling/system/blockMeshDict
rename to tutorials/modules/CHT/wallBoiling/system/blockMeshDict
index c86dcfa03a..afc6034457 100644
--- a/tutorials/modules/multiphaseEuler/wallBoiling/system/blockMeshDict
+++ b/tutorials/modules/CHT/wallBoiling/system/blockMeshDict
@@ -17,8 +17,10 @@ backgroundMesh
 {
     length  3.5;
     rA     0.0096;
+    rB     0.0116;
     lengthCells 350;
     rAcells 40;
+    rBcells 10;
 }
 
 convertToMeters 1;
@@ -34,14 +36,22 @@ vertices
     ($!backgroundMesh/length                   0  0)
     (                      0 $!backgroundMesh/rA  0)
     ($!backgroundMesh/length $!backgroundMesh/rA  0)
+
+    (                      0 $!backgroundMesh/rA -1)
+    ($!backgroundMesh/length $!backgroundMesh/rA -1)
+    (                      0 $!backgroundMesh/rB -1)
+    ($!backgroundMesh/length $!backgroundMesh/rB -1)
+
+    (                      0 $!backgroundMesh/rA  0)
+    ($!backgroundMesh/length $!backgroundMesh/rA  0)
+    (                      0 $!backgroundMesh/rB  0)
+    ($!backgroundMesh/length $!backgroundMesh/rB  0)
 );
 
 blocks
 (
-    hex (0 1 3 2 4 5 7 6)
-    ($!backgroundMesh/lengthCells $!backgroundMesh/rAcells 1)
-    simpleGrading (1 0.5 1)
-
+    hex (0 1  3  2  4  5  7  6) fluid ($!backgroundMesh/lengthCells $!backgroundMesh/rAcells 1) simpleGrading (1 0.5 1)
+    hex (8 9 11 10 12 13 15 14) solid ($!backgroundMesh/lengthCells $!backgroundMesh/rBcells 1) simpleGrading (1 2 1)
 );
 
 boundary
@@ -49,6 +59,7 @@ boundary
     inlet
     {
         type mappedInternal;
+        neighbourRegion fluid;
         offset (0.05 0 0);
         faces
         (
@@ -68,7 +79,8 @@ boundary
         type symmetry;
         faces
         (
-            (4 5  7 6)
+            (4 5 7 6)
+            (12 13 15 14)
         );
     }
 
@@ -78,16 +90,55 @@ boundary
         faces
         (
             (0 1 3 2)
+            (8 9 11 10)
         );
     }
 
     wall
+    {
+        type mappedWall;
+        neighbourRegion solid;
+        neighbourPatch  wall_inner
+        transformType   none;
+        faces
+        (
+            (3 2 6 7)
+            (1 0 4 5)
+        );
+    }
+    bottom
     {
         type wall;
         faces
         (
-            (3 2  6  7)
-            (1 0  4  5)
+            (8 12 14 10)
+        );
+    }
+    top
+    {
+        type wall;
+        faces
+        (
+            (9 13 15 11)
+        );
+    }
+    wall_inner
+    {
+        type mappedWall;
+        neighbourRegion fluid;
+        neighbourPatch  wall
+        transformType   none;
+        faces
+        (
+            (9 8 12 13)
+        );
+    }
+    wall_outer
+    {
+        type wall;
+        faces
+        (
+            (11 10 14 15)
         );
     }
 );
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/system/controlDict.orig b/tutorials/modules/CHT/wallBoiling/system/controlDict.orig
similarity index 84%
rename from tutorials/modules/multiphaseEuler/wallBoiling/system/controlDict.orig
rename to tutorials/modules/CHT/wallBoiling/system/controlDict.orig
index 284437de28..eea5545bc7 100644
--- a/tutorials/modules/multiphaseEuler/wallBoiling/system/controlDict.orig
+++ b/tutorials/modules/CHT/wallBoiling/system/controlDict.orig
@@ -14,9 +14,13 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     foamRun;
+application     foamMultiRun;
 
-solver          multiphaseEuler;
+regionSolvers
+{
+    fluid           multiphaseEuler;
+    solid           solid;
+}
 
 startFrom       startTime;
 
@@ -24,7 +28,7 @@ startTime       0;
 
 stopAt          endTime;
 
-endTime         0.5;
+endTime         10;
 
 deltaT          0.0001;
 
@@ -50,15 +54,22 @@ adjustTimeStep  yes;
 
 maxCo           0.5;
 
-maxDeltaT       0.001;
+maxDi           200;
+
+maxDeltaT       0.005;
 
 functions
 {
+    #includeFunc wallHeatFlux(funcName=WHFliquid, writeFields=false, phase=liquid, region=fluid)
+    #includeFunc wallHeatFlux(funcName=WHFgas, writeFields=false, phase=gas, region=fluid)
+    #includeFunc wallHeatFlux(funcName=WHFsolid, writeFields=false, region=solid, log=yes)
+
     writeWallBoilingProperties
     {
         type            wallBoilingProperties;
         functionObjectLibs ( "libmultiphaseEulerFoamFunctionObjects.so" );
         writeControl    writeTime;
+        region          fluid;
         phase           liquid;
     }
     outflow
@@ -67,6 +78,7 @@ functions
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         log             yes;
         writeFields     false;
+        region          fluid;
         regionType      patch;
         name            outlet;
         operation       sum;
@@ -78,6 +90,7 @@ functions
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         log             yes;
         writeFields     false;
+        region          fluid;
         regionType      patch;
         name            inlet;
         operation       sum;
@@ -89,6 +102,7 @@ functions
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         log             yes;
         writeFields     false;
+        region          fluid;
         regionType      patch;
         name            outlet;
         operation       sum;
@@ -101,6 +115,7 @@ functions
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         log             yes;
         writeFields     false;
+        region          fluid;
         regionType      patch;
         name            outlet;
         operation       sum;
@@ -113,6 +128,7 @@ functions
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         log             yes;
         writeFields     false;
+        region          fluid;
         regionType      patch;
         name            inlet;
         operation       sum;
@@ -125,6 +141,7 @@ functions
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         log             yes;
         writeFields     false;
+        region          fluid;
         regionType      patch;
         name            inlet;
         operation       sum;
@@ -135,6 +152,7 @@ functions
     {
         type        writeObjects;
         libs        ("libutilityFunctionObjects.so");
+        region          fluid;
 
         objects
         (
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/system/decomposeParDict b/tutorials/modules/CHT/wallBoiling/system/decomposeParDict
similarity index 100%
rename from tutorials/modules/multiphaseEuler/wallBoiling/system/decomposeParDict
rename to tutorials/modules/CHT/wallBoiling/system/decomposeParDict
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/system/extrudeMeshDict b/tutorials/modules/CHT/wallBoiling/system/extrudeMeshDict
similarity index 100%
rename from tutorials/modules/multiphaseEuler/wallBoiling/system/extrudeMeshDict
rename to tutorials/modules/CHT/wallBoiling/system/extrudeMeshDict
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/system/fvConstraints b/tutorials/modules/CHT/wallBoiling/system/fluid/fvConstraints
similarity index 100%
rename from tutorials/modules/multiphaseEuler/wallBoiling/system/fvConstraints
rename to tutorials/modules/CHT/wallBoiling/system/fluid/fvConstraints
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/system/fvSchemes b/tutorials/modules/CHT/wallBoiling/system/fluid/fvSchemes
similarity index 100%
rename from tutorials/modules/multiphaseEuler/wallBoiling/system/fvSchemes
rename to tutorials/modules/CHT/wallBoiling/system/fluid/fvSchemes
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/system/fvSolution b/tutorials/modules/CHT/wallBoiling/system/fluid/fvSolution
similarity index 100%
rename from tutorials/modules/multiphaseEuler/wallBoiling/system/fvSolution
rename to tutorials/modules/CHT/wallBoiling/system/fluid/fvSolution
diff --git a/tutorials/modules/CHT/wallBoiling/system/fvSchemes b/tutorials/modules/CHT/wallBoiling/system/fvSchemes
new file mode 100644
index 0000000000..efe3ba5926
--- /dev/null
+++ b/tutorials/modules/CHT/wallBoiling/system/fvSchemes
@@ -0,0 +1,75 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Version:  dev
+     \\/     M anipulation  |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+    limited         cellLimited Gauss linear 1;
+}
+
+divSchemes
+{
+    default                         none;
+
+    div(phi,alpha)            Gauss vanLeer;
+    div(phir,alpha)           Gauss vanLeer;
+
+    div(alphaRhoPhi,U)      Gauss linearUpwind limited;
+    div(phi,U)              Gauss linearUpwind limited;
+
+    div(alphaRhoPhi,Yi)       Gauss linearUpwind limited;
+    "div\(alphaRhoPhi,(h|e)\)"  Gauss linearUpwind limited;
+    div(alphaRhoPhi,K)      Gauss linearUpwind limited;
+    div(alphaRhoPhi,(p|rho)) Gauss linearUpwind limited;
+    "div\(alphaRhoPhi,(k|epsilon|omega)\)"  Gauss linearUpwind limited;
+    "div\(phim,(k|epsilon)m\)"      Gauss linearUpwind limited;
+
+    div((((alpha*rho)*nuEff)*dev2(T(grad(U))))) Gauss linear;
+}
+
+laplacianSchemes
+{
+    default         Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         corrected;
+}
+
+fluxRequired
+{
+    default         no;
+}
+
+wallDist
+{
+    method          meshWave;
+    nRequired       yes;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/modules/CHT/wallBoiling/system/fvSolution b/tutorials/modules/CHT/wallBoiling/system/fvSolution
new file mode 100644
index 0000000000..c4a1580136
--- /dev/null
+++ b/tutorials/modules/CHT/wallBoiling/system/fvSolution
@@ -0,0 +1,87 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Version:  dev
+     \\/     M anipulation  |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    "alpha.*"
+    {
+        nAlphaCorr      1;
+        nAlphaSubCycles 1;
+    }
+
+    p_rgh
+    {
+        solver          GAMG;
+        smoother        DIC;
+        tolerance       1e-8;
+        relTol          0.01;
+        maxIter         20;
+        minIter         2;
+    }
+
+    p_rghFinal
+    {
+        $p_rgh;
+        relTol          0;
+    }
+
+    "(e|h).*"
+    {
+        solver          PBiCGStab;
+        preconditioner  DILU;
+        tolerance       1e-12;
+        relTol          0.001;
+        minIter         1;
+        maxIter         20;
+    }
+
+    "(k|epsilon|omega).*"
+    {
+        solver          PBiCGStab;
+        preconditioner  DILU;
+        tolerance       1e-8;
+        relTol          0;
+        minIter         1;
+    }
+}
+
+PIMPLE
+{
+    nOuterCorrectors    1;
+    nCorrectors         1;
+    nNonOrthogonalCorrectors 0;
+    nEnergyCorrectors   1;
+
+    faceMomentum        yes;
+
+}
+
+relaxationFactors
+{
+    fields
+    {
+        thermalPhaseChange:dmdtf 1.0;
+    }
+
+    equations
+    {
+        ".*"            1;
+        "h\..*"         1;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/modules/CHT/wallBoiling/system/solid/fvSchemes b/tutorials/modules/CHT/wallBoiling/system/solid/fvSchemes
new file mode 100644
index 0000000000..f289fefcef
--- /dev/null
+++ b/tutorials/modules/CHT/wallBoiling/system/solid/fvSchemes
@@ -0,0 +1,46 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Version:  dev
+     \\/     M anipulation  |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    format      ascii;
+    class       dictionary;
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    default         none;
+}
+
+laplacianSchemes
+{
+    default         Gauss linear uncorrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         uncorrected;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/modules/CHT/wallBoiling/system/solid/fvSolution b/tutorials/modules/CHT/wallBoiling/system/solid/fvSolution
new file mode 100644
index 0000000000..bfdb4e16d4
--- /dev/null
+++ b/tutorials/modules/CHT/wallBoiling/system/solid/fvSolution
@@ -0,0 +1,46 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Version:  dev
+     \\/     M anipulation  |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    format      ascii;
+    class       dictionary;
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    e
+    {
+        solver           PCG;
+        preconditioner   DIC;
+        tolerance        1e-06;
+        relTol           0.1;
+    }
+
+    eFinal
+    {
+        $e;
+        relTol           0;
+    }
+}
+
+PIMPLE
+{
+    nNonOrthogonalCorrectors 0;
+}
+
+relaxationFactors
+{
+    equations
+    {
+        ".*" 1;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/validation/createGraphs b/tutorials/modules/CHT/wallBoiling/validation/createGraphs
similarity index 55%
rename from tutorials/modules/multiphaseEuler/wallBoiling/validation/createGraphs
rename to tutorials/modules/CHT/wallBoiling/validation/createGraphs
index a33e21dece..fb4607dad7 100755
--- a/tutorials/modules/multiphaseEuler/wallBoiling/validation/createGraphs
+++ b/tutorials/modules/CHT/wallBoiling/validation/createGraphs
@@ -7,7 +7,7 @@ then
 fi
 
 graphFile=$(foamListTimes -latestTime)/line.xy
-surfaceFile=$(cd postProcessing/inflow && ls -1tr */* | tail -n 1)
+surfaceFile=$(cd postProcessing/fluid/inflow && ls -1tr */* | tail -n 1)
 
 gnuplot<<EOF
 
@@ -26,45 +26,45 @@ gnuplot<<EOF
 
     set ylabel 'Void fraction (-)'
     plot \
-        "postProcessing/graph/$graphFile" \
+        "postProcessing/fluid/graph/$graphFile" \
         u (\$1/0.0096):2 w lp lt 1 t 'Simulation', \
         './validation/exptData/vof_deb1.txt' \
         u 1:2 w p lt rgb "black" pt 4 t 'Experiment'
 
     set ylabel 'Liquid temperature (K)'
     plot \
-        "postProcessing/graph/$graphFile" \
+        "postProcessing/fluid/graph/$graphFile" \
         u (\$1/0.0096):3 w lp lt 1 t 'Simulation', \
         './validation/exptData/T_deb1.txt' \
         u 1:2 w p lt rgb "black" pt 4 t 'Experiment'
 
     set key at graph 0.99,0.95
     set xlabel 'Time (s)'
-    set xrange [0.5:4]
+    set xrange [0.5:10]
 
     set ylabel 'Mass in- and outflow (kg/s)'
     set yrange [0.5:0.8]
     plot \
-        './postProcessing/inflow/$surfaceFile' \
-        every ::4::10000 u 1:(-1*360*\$3) w l lt 1 t 'liquid inflow', \
-        './postProcessing/outflow/$surfaceFile' \
-        every ::4::10000 u 1:(360*\$3) w l lt 3 t 'liquid outflow', \
-        './postProcessing/outflow/$surfaceFile' \
-        every ::4::10000 u 1:(360*\$2+360*\$3) w l lt 4 t 'liquid + vapor outflow'
+        './postProcessing/fluid/inflow/$surfaceFile' \
+        every ::4::20000 u 1:(-1*360*\$3) w l lt 1 t 'liquid inflow', \
+        './postProcessing/fluid/outflow/$surfaceFile' \
+        every ::4::20000 u 1:(360*\$3) w l lt 3 t 'liquid outflow', \
+        './postProcessing/fluid/outflow/$surfaceFile' \
+        every ::4::20000 u 1:(360*\$2+360*\$3) w l lt 4 t 'liquid + vapor outflow'
 
     set ylabel 'Enthalpy in- and outflow (J/s)'
     set yrange [1.5e5:2.0e5]
     plot \
-        './postProcessing/inletLiquid/$surfaceFile' \
-        every ::4::10000 u 1:(-1*360*\$2) w l lt 1 t 'liquid inflow', \
-        './postProcessing/inletLiquid/$surfaceFile' \
-        every ::4::10000 u 1:(-1*360*\$2+360*A*q) w l lt 8 t 'liquid inflow + wall heat flux', \
-        './postProcessing/outletLiquid/$surfaceFile' \
-        every ::4::10000 u 1:(360*\$2) w l lt 3 t 'liquid outflow', \
+        './postProcessing/fluid/inletLiquid/$surfaceFile' \
+        every ::4::20000 u 1:(-1*360*\$2) w l lt 1 t 'liquid inflow', \
+        './postProcessing/fluid/inletLiquid/$surfaceFile' \
+        every ::4::20000 u 1:(-1*360*\$2+360*A*q) w l lt 8 t 'liquid inflow + wall heat flux', \
+        './postProcessing/fluid/outletLiquid/$surfaceFile' \
+        every ::4::20000 u 1:(360*\$2) w l lt 3 t 'liquid outflow', \
         "<paste \
-        ./postProcessing/outletLiquid/$surfaceFile \
-        ./postProcessing/outletGas/$surfaceFile" \
-        every ::4::10000 u 1:(360*\$2+360*\$4) w l lt 4 t 'liquid + vapor outflow'
+        ./postProcessing/fluid/outletLiquid/$surfaceFile \
+        ./postProcessing/fluid/outletGas/$surfaceFile" \
+        every ::4::20000 u 1:(360*\$2+360*\$4) w l lt 4 t 'liquid + vapor outflow'
 
     unset multiplot
 
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/validation/createWallBoilingPropertiesGraphs b/tutorials/modules/CHT/wallBoiling/validation/createWallBoilingPropertiesGraphs
similarity index 78%
rename from tutorials/modules/multiphaseEuler/wallBoiling/validation/createWallBoilingPropertiesGraphs
rename to tutorials/modules/CHT/wallBoiling/validation/createWallBoilingPropertiesGraphs
index dcb8b8e97f..181b4f02e1 100755
--- a/tutorials/modules/multiphaseEuler/wallBoiling/validation/createWallBoilingPropertiesGraphs
+++ b/tutorials/modules/CHT/wallBoiling/validation/createWallBoilingPropertiesGraphs
@@ -22,22 +22,22 @@ gnuplot<<EOF
 
     set xlabel 'Departure diameter (mm)'
     plot \
-        "postProcessing/patchWallBoilingProperties/$graphFile" \
+        "postProcessing/fluid/patchWallBoilingProperties/$graphFile" \
         u (\$4*1000):1 w lp lt 1 t 'Simulation' \
 
     set xlabel 'Departure frequency (Hz)'
     plot \
-        "postProcessing/patchWallBoilingProperties/$graphFile" \
+        "postProcessing/fluid/patchWallBoilingProperties/$graphFile" \
         u 5:1 w lp lt 1 t 'Simulation' \
 
     set xlabel 'Nucleation Site Density (1/m^2)'
     plot \
-        "postProcessing/patchWallBoilingProperties/$graphFile" \
+        "postProcessing/fluid/patchWallBoilingProperties/$graphFile" \
         u 5:1 w lp lt 1 t 'Simulation' \
 
     set xlabel 'Heat flux partitioning function, liquid (-)'
     plot \
-        "postProcessing/patchWallBoilingProperties/$graphFile" \
+        "postProcessing/fluid/patchWallBoilingProperties/$graphFile" \
         u 7:1 w lp lt 1 t 'Simulation' \
 
     set key at graph 0.99,0.95
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/validation/exptData/T_deb1.txt b/tutorials/modules/CHT/wallBoiling/validation/exptData/T_deb1.txt
similarity index 100%
rename from tutorials/modules/multiphaseEuler/wallBoiling/validation/exptData/T_deb1.txt
rename to tutorials/modules/CHT/wallBoiling/validation/exptData/T_deb1.txt
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/validation/exptData/d_deb1.txt b/tutorials/modules/CHT/wallBoiling/validation/exptData/d_deb1.txt
similarity index 100%
rename from tutorials/modules/multiphaseEuler/wallBoiling/validation/exptData/d_deb1.txt
rename to tutorials/modules/CHT/wallBoiling/validation/exptData/d_deb1.txt
diff --git a/tutorials/modules/multiphaseEuler/wallBoiling/validation/exptData/vof_deb1.txt b/tutorials/modules/CHT/wallBoiling/validation/exptData/vof_deb1.txt
similarity index 100%
rename from tutorials/modules/multiphaseEuler/wallBoiling/validation/exptData/vof_deb1.txt
rename to tutorials/modules/CHT/wallBoiling/validation/exptData/vof_deb1.txt