diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/Make/files b/applications/solvers/multiphase/twoLiquidMixingFoam/Make/files
deleted file mode 100644
index bff0b5124d..0000000000
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-twoLiquidMixingFoam.C
-
-EXE = $(FOAM_APPBIN)/twoLiquidMixingFoam
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options b/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options
deleted file mode 100644
index 4002f3191f..0000000000
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options
+++ /dev/null
@@ -1,17 +0,0 @@
-EXE_INC = \
-    -I. \
-    -I$(LIB_SRC)/physicalProperties/lnInclude \
-    -I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude \
-    -I$(LIB_SRC)/twoPhaseModels/incompressibleTwoPhaseMixture/lnInclude \
-    -I$(LIB_SRC)/twoPhaseModels/interfaceProperties/lnInclude \
-    -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-    -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude
-
-EXE_LIBS = \
-    -lincompressibleTwoPhaseMixture \
-    -lmomentumTransportModels \
-    -lincompressibleMomentumTransportModels \
-    -lfiniteVolume \
-    -lmeshTools
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H b/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H
deleted file mode 100644
index dbc6043545..0000000000
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H
+++ /dev/null
@@ -1,24 +0,0 @@
-    fvVectorMatrix UEqn
-    (
-        fvm::ddt(rho, U)
-      + fvm::div(rhoPhi, U)
-      + turbulence->divDevTau(rho, U)
-    );
-
-    UEqn.relax();
-
-    if (pimple.momentumPredictor())
-    {
-        solve
-        (
-            UEqn
-         ==
-            fvc::reconstruct
-            (
-                (
-                  - ghf*fvc::snGrad(rho)
-                  - fvc::snGrad(p_rgh)
-                ) * mesh.magSf()
-            )
-        );
-    }
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/alphaControls.H b/applications/solvers/multiphase/twoLiquidMixingFoam/alphaControls.H
deleted file mode 100644
index 23859dafe6..0000000000
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/alphaControls.H
+++ /dev/null
@@ -1,3 +0,0 @@
-const dictionary& alphaControls = mesh.solution().solverDict(alpha1.name());
-
-label nAlphaSubCycles(alphaControls.lookup<label>("nAlphaSubCycles"));
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/alphaCourantNo.H b/applications/solvers/multiphase/twoLiquidMixingFoam/alphaCourantNo.H
deleted file mode 100644
index 31d12e1f14..0000000000
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/alphaCourantNo.H
+++ /dev/null
@@ -1,57 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Global
-    alphaCourantNo
-
-Description
-    Calculates and outputs the mean and maximum Courant Numbers.
-
-\*---------------------------------------------------------------------------*/
-
-scalar maxAlphaCo
-(
-    runTime.controlDict().lookup<scalar>("maxAlphaCo")
-);
-
-scalar alphaCoNum = 0.0;
-scalar meanAlphaCoNum = 0.0;
-
-if (mesh.nInternalFaces())
-{
-    scalarField sumPhi
-    (
-        pos0(alpha1 - 0.01)*pos0(0.99 - alpha1)
-       *fvc::surfaceSum(mag(phi))().primitiveField()
-    );
-
-    alphaCoNum = 0.5*gMax(sumPhi/mesh.V().field())*runTime.deltaTValue();
-
-    meanAlphaCoNum =
-        0.5*(gSum(sumPhi)/gSum(mesh.V().field()))*runTime.deltaTValue();
-}
-
-Info<< "Interface Courant Number mean: " << meanAlphaCoNum
-    << " max: " << alphaCoNum << endl;
-
-// ************************************************************************* //
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/alphaDiffusionEqn.H b/applications/solvers/multiphase/twoLiquidMixingFoam/alphaDiffusionEqn.H
deleted file mode 100644
index 6bc5953a4a..0000000000
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/alphaDiffusionEqn.H
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    fvScalarMatrix alpha1Eqn
-    (
-        fvm::ddt(alpha1)
-      - fvc::ddt(alpha1)
-      - fvm::laplacian
-        (
-            volScalarField("Dab", Dab + alphatab*turbulence->nut()),
-            alpha1
-        )
-    );
-
-    alpha1Eqn.solve();
-
-    alpha2 = 1.0 - alpha1;
-    rhoPhi += alpha1Eqn.flux()*(rho1 - rho2);
-}
-
-rho = alpha1*rho1 + alpha2*rho2;
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqn.H b/applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqn.H
deleted file mode 100644
index 6e9888c1c5..0000000000
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqn.H
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    word alphaScheme("div(phi,alpha)");
-
-    surfaceScalarField alphaPhi
-    (
-        phi.name() + alpha1.name(),
-        fvc::flux
-        (
-            phi,
-            alpha1,
-            alphaScheme
-        )
-    );
-
-    MULES::explicitSolve
-    (
-        geometricOneField(),
-        alpha1,
-        phi,
-        alphaPhi,
-        oneField(),
-        zeroField()
-    );
-
-    rhoPhi = alphaPhi*(rho1 - rho2) + phi*rho2;
-
-    Info<< "Phase-1 volume fraction = "
-        << alpha1.weightedAverage(mesh.Vsc()).value()
-        << "  Min(" << alpha1.name() << ") = " << min(alpha1).value()
-        << "  Max(" << alpha1.name() << ") = " << max(alpha1).value()
-        << endl;
-}
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqnSubCycle.H b/applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqnSubCycle.H
deleted file mode 100644
index 0756936b76..0000000000
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqnSubCycle.H
+++ /dev/null
@@ -1,35 +0,0 @@
-#include "alphaControls.H"
-
-if (nAlphaSubCycles > 1)
-{
-    dimensionedScalar totalDeltaT = runTime.deltaT();
-    surfaceScalarField rhoPhiSum
-    (
-        IOobject
-        (
-            "rhoPhiSum",
-            runTime.timeName(),
-            mesh
-        ),
-        mesh,
-        dimensionedScalar(rhoPhi.dimensions(), 0)
-    );
-
-    for
-    (
-        subCycle<volScalarField> alphaSubCycle(alpha1, nAlphaSubCycles);
-        !(++alphaSubCycle).end();
-    )
-    {
-        #include "alphaEqn.H"
-        rhoPhiSum += (runTime.deltaT()/totalDeltaT)*rhoPhi;
-    }
-
-    rhoPhi = rhoPhiSum;
-}
-else
-{
-    #include "alphaEqn.H"
-}
-
-rho == alpha1*rho1 + alpha2*rho2;
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H b/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H
deleted file mode 100644
index 5b5befacbc..0000000000
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H
+++ /dev/null
@@ -1,106 +0,0 @@
-Info<< "Reading field p_rgh\n" << endl;
-volScalarField p_rgh
-(
-    IOobject
-    (
-        "p_rgh",
-        runTime.timeName(),
-        mesh,
-        IOobject::MUST_READ,
-        IOobject::AUTO_WRITE
-    ),
-    mesh
-);
-
-Info<< "Reading field U\n" << endl;
-volVectorField U
-(
-    IOobject
-    (
-        "U",
-        runTime.timeName(),
-        mesh,
-        IOobject::MUST_READ,
-        IOobject::AUTO_WRITE
-    ),
-    mesh
-);
-
-#include "createPhi.H"
-
-Info<< "Reading phaseProperties\n" << endl;
-incompressibleTwoPhaseMixture mixture(U, phi);
-
-volScalarField& alpha1(mixture.alpha1());
-volScalarField& alpha2(mixture.alpha2());
-
-const dimensionedScalar& rho1 = mixture.rho1();
-const dimensionedScalar& rho2 = mixture.rho2();
-
-dimensionedScalar Dab("Dab", dimViscosity, mixture);
-
-// Read the reciprocal of the turbulent Schmidt number
-dimensionedScalar alphatab("alphatab", dimless, mixture);
-
-// Need to store rho for ddt(rho, U)
-volScalarField rho("rho", alpha1*rho1 + alpha2*rho2);
-rho.oldTime();
-
-
-// Mass flux
-// Initialisation does not matter because rhoPhi is reset after the
-// alpha1 solution before it is used in the U equation.
-surfaceScalarField rhoPhi
-(
-    IOobject
-    (
-        "rhoPhi",
-        runTime.timeName(),
-        mesh,
-        IOobject::NO_READ,
-        IOobject::NO_WRITE
-    ),
-    rho1*phi
-);
-
-// Construct incompressible turbulence model
-autoPtr<incompressible::momentumTransportModel> turbulence
-(
-    incompressible::momentumTransportModel::New(U, phi, mixture)
-);
-
-
-#include "readGravitationalAcceleration.H"
-#include "readhRef.H"
-#include "gh.H"
-
-
-volScalarField p
-(
-    IOobject
-    (
-        "p",
-        runTime.timeName(),
-        mesh,
-        IOobject::NO_READ,
-        IOobject::AUTO_WRITE
-    ),
-    p_rgh + rho*gh
-);
-
-pressureReference pressureReference(p, p_rgh, pimple.dict());
-
-if (p_rgh.needReference())
-{
-    p += dimensionedScalar
-    (
-        "p",
-        p.dimensions(),
-        pressureReference.refValue()
-      - getRefCellValue(p, pressureReference.refCell())
-    );
-    p_rgh = p - rho*gh;
-}
-
-mesh.schemes().setFluxRequired(p_rgh.name());
-mesh.schemes().setFluxRequired(alpha1.name());
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/pEqn.H b/applications/solvers/multiphase/twoLiquidMixingFoam/pEqn.H
deleted file mode 100644
index 1380429c4f..0000000000
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/pEqn.H
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-    volScalarField rAU("rAU", 1.0/UEqn.A());
-    surfaceScalarField rAUf("rAUf", fvc::interpolate(rAU));
-    volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p_rgh));
-    surfaceScalarField phiHbyA
-    (
-        "phiHbyA",
-        fvc::flux(HbyA)
-      + fvc::interpolate(rho*rAU)*fvc::ddtCorr(U, phi)
-    );
-    adjustPhi(phiHbyA, U, p_rgh);
-
-    surfaceScalarField phig
-    (
-        - ghf*fvc::snGrad(rho)*rAUf*mesh.magSf()
-    );
-
-    phiHbyA += phig;
-
-    // Update the pressure BCs to ensure flux consistency
-    constrainPressure(p_rgh, U, phiHbyA, rAUf);
-
-    while (pimple.correctNonOrthogonal())
-    {
-        fvScalarMatrix p_rghEqn
-        (
-            fvm::laplacian(rAUf, p_rgh) == fvc::div(phiHbyA)
-        );
-
-        p_rghEqn.setReference
-        (
-            pressureReference.refCell(),
-            getRefCellValue(p_rgh, pressureReference.refCell())
-        );
-
-        p_rghEqn.solve();
-
-        if (pimple.finalNonOrthogonalIter())
-        {
-            phi = phiHbyA - p_rghEqn.flux();
-
-            U = HbyA + rAU*fvc::reconstruct((phig - p_rghEqn.flux())/rAUf);
-            U.correctBoundaryConditions();
-        }
-    }
-
-    #include "continuityErrs.H"
-
-    p == p_rgh + rho*gh;
-
-    if (p_rgh.needReference())
-    {
-        p += dimensionedScalar
-        (
-            "p",
-            p.dimensions(),
-            pressureReference.refValue()
-          - getRefCellValue(p, pressureReference.refCell())
-        );
-        p_rgh = p - rho*gh;
-    }
-}
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/setDeltaT.H b/applications/solvers/multiphase/twoLiquidMixingFoam/setDeltaT.H
deleted file mode 100644
index 68cab748fd..0000000000
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/setDeltaT.H
+++ /dev/null
@@ -1,55 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Global
-    setDeltaT
-
-Description
-    Reset the timestep to maintain a constant maximum courant Number.
-    Reduction of time-step is immediate, but increase is damped to avoid
-    unstable oscillations.
-
-\*---------------------------------------------------------------------------*/
-
-if (adjustTimeStep)
-{
-    scalar deltaT = 1.2*runTime.deltaTValue();
-
-    if (CoNum > small)
-    {
-        deltaT = min(deltaT, runTime.deltaTValue()*maxCo/CoNum);
-    }
-
-    if (alphaCoNum > small)
-    {
-        deltaT = min(maxAlphaCo/alphaCoNum*runTime.deltaTValue(), deltaT);
-    }
-
-    deltaT = min(deltaT, maxDeltaT);
-
-    runTime.setDeltaT(deltaT);
-
-    Info<< "deltaT = " <<  runTime.deltaTValue() << endl;
-}
-
-// ************************************************************************* //
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
deleted file mode 100644
index f9b24dd18b..0000000000
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
+++ /dev/null
@@ -1,110 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Application
-    twoLiquidMixingFoam
-
-Description
-    Solver for mixing 2 incompressible fluids.
-
-    Turbulence modelling is generic, i.e. laminar, RAS or LES may be selected.
-
-\*---------------------------------------------------------------------------*/
-
-#include "fvCFD.H"
-#include "MULES.H"
-#include "subCycle.H"
-#include "incompressibleTwoPhaseMixture.H"
-#include "incompressibleMomentumTransportModels.H"
-#include "pimpleControl.H"
-#include "pressureReference.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main(int argc, char *argv[])
-{
-    #include "postProcess.H"
-
-    #include "setRootCaseLists.H"
-    #include "createTime.H"
-    #include "createMesh.H"
-    #include "createControl.H"
-    #include "initContinuityErrs.H"
-    #include "createFields.H"
-    #include "createTimeControls.H"
-    #include "CourantNo.H"
-    #include "setInitialDeltaT.H"
-
-    turbulence->validate();
-
-    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-    Info<< "\nStarting time loop\n" << endl;
-
-    while (pimple.run(runTime))
-    {
-        #include "readTimeControls.H"
-        #include "CourantNo.H"
-        #include "alphaCourantNo.H"
-        #include "setDeltaT.H"
-
-        runTime++;
-
-        Info<< "Time = " << runTime.userTimeName() << nl << endl;
-
-        mixture.correct();
-
-        #include "alphaEqnSubCycle.H"
-        #include "alphaDiffusionEqn.H"
-
-        // --- Pressure-velocity PIMPLE corrector loop
-        while (pimple.loop())
-        {
-            #include "UEqn.H"
-
-            // --- Pressure corrector loop
-            while (pimple.correct())
-            {
-                #include "pEqn.H"
-            }
-
-            if (pimple.turbCorr())
-            {
-                turbulence->correct();
-            }
-        }
-
-        runTime.write();
-
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
-    }
-
-    Info<< "End\n" << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/physicalProperties.water b/tutorials/modules/multicomponentFluid/lockExchange/0/T
similarity index 56%
rename from tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/physicalProperties.water
rename to tutorials/modules/multicomponentFluid/lockExchange/0/T
index 0f1ba76738..7a88781262 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/physicalProperties.water
+++ b/tutorials/modules/multicomponentFluid/lockExchange/0/T
@@ -8,16 +8,39 @@
 FoamFile
 {
     format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      physicalProperties.water;
+    class       volScalarField;
+    location    "0";
+    object      T;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-viscosityModel  constant;
+dimensions      [0 0 0 1 0 0 0];
 
-nu              1e-06;
-rho             990;
+internalField   uniform 300;
+
+boundaryField
+{
+    left
+    {
+        type            zeroGradient;
+    }
+    right
+    {
+        type            zeroGradient;
+    }
+    bottom
+    {
+        type            zeroGradient;
+    }
+    top
+    {
+        type            zeroGradient;
+    }
+    frontBack
+    {
+        type            empty;
+    }
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0/U b/tutorials/modules/multicomponentFluid/lockExchange/0/U
similarity index 100%
rename from tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0/U
rename to tutorials/modules/multicomponentFluid/lockExchange/0/U
diff --git a/tutorials/modules/multicomponentFluid/lockExchange/0/p b/tutorials/modules/multicomponentFluid/lockExchange/0/p
new file mode 100644
index 0000000000..400bfda89f
--- /dev/null
+++ b/tutorials/modules/multicomponentFluid/lockExchange/0/p
@@ -0,0 +1,50 @@
+/*--------------------------------*- 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;
+    location    "0";
+    object      p;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -2 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    left
+    {
+        type            calculated;
+        value           $internalField;
+    }
+    right
+    {
+        type            calculated;
+        value           $internalField;
+    }
+    bottom
+    {
+        type            calculated;
+        value           $internalField;
+    }
+    top
+    {
+        type            calculated;
+        value           $internalField;
+    }
+    frontBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0/p_rgh b/tutorials/modules/multicomponentFluid/lockExchange/0/p_rgh
similarity index 100%
rename from tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0/p_rgh
rename to tutorials/modules/multicomponentFluid/lockExchange/0/p_rgh
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0/alpha.sludge.orig b/tutorials/modules/multicomponentFluid/lockExchange/0/sludge.orig
similarity index 97%
rename from tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0/alpha.sludge.orig
rename to tutorials/modules/multicomponentFluid/lockExchange/0/sludge.orig
index 2da4ceb5bb..825ff1dba0 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0/alpha.sludge.orig
+++ b/tutorials/modules/multicomponentFluid/lockExchange/0/sludge.orig
@@ -10,7 +10,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      alpha.sludge;
+    object      sludge;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/physicalProperties.sludge b/tutorials/modules/multicomponentFluid/lockExchange/0/water.orig
similarity index 56%
rename from tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/physicalProperties.sludge
rename to tutorials/modules/multicomponentFluid/lockExchange/0/water.orig
index 5f0fc4afbb..0aa6b33e7e 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/physicalProperties.sludge
+++ b/tutorials/modules/multicomponentFluid/lockExchange/0/water.orig
@@ -8,15 +8,39 @@
 FoamFile
 {
     format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      physicalProperties.sludge;
+    class       volScalarField;
+    location    "0";
+    object      water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-viscosityModel  constant;
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 1;
+
+boundaryField
+{
+    left
+    {
+        type            zeroGradient;
+    }
+    right
+    {
+        type            zeroGradient;
+    }
+    bottom
+    {
+        type            zeroGradient;
+    }
+    top
+    {
+        type            zeroGradient;
+    }
+    frontBack
+    {
+        type            empty;
+    }
+}
 
-nu              1e-06;
-rho             1000;
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allrun b/tutorials/modules/multicomponentFluid/lockExchange/Allrun
similarity index 100%
rename from tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allrun
rename to tutorials/modules/multicomponentFluid/lockExchange/Allrun
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/g b/tutorials/modules/multicomponentFluid/lockExchange/constant/g
similarity index 100%
rename from tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/g
rename to tutorials/modules/multicomponentFluid/lockExchange/constant/g
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/momentumTransport b/tutorials/modules/multicomponentFluid/lockExchange/constant/momentumTransport
similarity index 100%
rename from tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/momentumTransport
rename to tutorials/modules/multicomponentFluid/lockExchange/constant/momentumTransport
diff --git a/tutorials/modules/multicomponentFluid/lockExchange/constant/physicalProperties b/tutorials/modules/multicomponentFluid/lockExchange/constant/physicalProperties
new file mode 100644
index 0000000000..c97029bf2c
--- /dev/null
+++ b/tutorials/modules/multicomponentFluid/lockExchange/constant/physicalProperties
@@ -0,0 +1,76 @@
+/*--------------------------------*- 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    "constant";
+    object      physicalProperties.sludge;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType
+{
+    type            heRhoThermo;
+    mixture         multiComponentMixture;
+    transport       const;
+    thermo          hConst;
+    equationOfState rhoConst;
+    specie          specie;
+    energy          sensibleInternalEnergy;
+}
+
+species (water sludge);
+
+defaultSpecie water;
+
+water
+{
+    specie
+    {
+        molWeight   18;
+    }
+    equationOfState
+    {
+        rho         990;
+    }
+    thermodynamics
+    {
+        Cp          4195;
+        Hf          0;
+    }
+    transport
+    {
+        mu          0.99e-3;
+        Pr          1.0;
+    }
+}
+
+sludge
+{
+    specie
+    {
+        molWeight   18;
+    }
+    equationOfState
+    {
+        rho         1000;
+    }
+    thermodynamics
+    {
+        Cp          4195;
+        Hf          0;
+    }
+    transport
+    {
+        mu          1e-3;
+        Pr          1.0;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/blockMeshDict b/tutorials/modules/multicomponentFluid/lockExchange/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/blockMeshDict
rename to tutorials/modules/multicomponentFluid/lockExchange/system/blockMeshDict
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/controlDict b/tutorials/modules/multicomponentFluid/lockExchange/system/controlDict
similarity index 94%
rename from tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/controlDict
rename to tutorials/modules/multicomponentFluid/lockExchange/system/controlDict
index 2ed161ed1f..804f86d314 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/controlDict
+++ b/tutorials/modules/multicomponentFluid/lockExchange/system/controlDict
@@ -14,7 +14,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     twoLiquidMixingFoam;
+application     foamRun;
+
+solver          multicomponentFluid;
 
 startFrom       startTime;
 
@@ -47,7 +49,7 @@ runTimeModifiable yes;
 adjustTimeStep  on;
 
 maxCo           0.5;
-maxAlphaCo      0.5;
+
 maxDeltaT       1;
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSchemes b/tutorials/modules/multicomponentFluid/lockExchange/system/fvSchemes
similarity index 80%
rename from tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSchemes
rename to tutorials/modules/multicomponentFluid/lockExchange/system/fvSchemes
index 80649b27e0..d023d0f44d 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSchemes
+++ b/tutorials/modules/multicomponentFluid/lockExchange/system/fvSchemes
@@ -17,7 +17,7 @@ FoamFile
 
 ddtSchemes
 {
-    default         Euler;
+    default         backward;
 }
 
 gradSchemes
@@ -29,9 +29,13 @@ divSchemes
 {
     default         none;
 
-    div(rhoPhi,U)  Gauss linear;
-    div(phi,alpha)  Gauss vanLeer;
-    div(phi,k)      Gauss limitedLinear 1;
+    div(phi,U)      Gauss linearUpwind grad(U);
+    div(phi,Yi_h)   Gauss multivariateIndependent
+    {
+        sludge          vanLeer;
+        ".*"            upwind;
+    };
+    div(phi,K)      Gauss limitedLinear 1;
     div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSolution b/tutorials/modules/multicomponentFluid/lockExchange/system/fvSolution
similarity index 77%
rename from tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSolution
rename to tutorials/modules/multicomponentFluid/lockExchange/system/fvSolution
index 359aea4211..5dccda39f8 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSolution
+++ b/tutorials/modules/multicomponentFluid/lockExchange/system/fvSolution
@@ -16,16 +16,9 @@ FoamFile
 
 solvers
 {
-    "alpha.sludge.*"
+    "rho.*"
     {
-        nAlphaSubCycles     2;
-        nAlphaCorr          1;
-
-        solver          smoothSolver;
-        smoother        GaussSeidel;
-        tolerance       1e-9;
-        relTol          0;
-        nSweeps         1;
+        solver          diagonal;
     }
 
     p_rgh
@@ -42,20 +35,24 @@ solvers
         relTol          0;
     }
 
-    U
+    "(U|e)"
     {
-        solver          smoothSolver;
-        smoother        GaussSeidel;
+        solver          PBiCGStab;
+        preconditioner  DILU;
         tolerance       1e-7;
         relTol          0.1;
-        nSweeps         1;
     }
 
-    UFinal
+    "(U|e)Final"
     {
         $U;
         relTol          0;
     }
+
+    "Yi.*"
+    {
+        $eFinal;
+    }
 }
 
 PIMPLE
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/setFieldsDict b/tutorials/modules/multicomponentFluid/lockExchange/system/setFieldsDict
similarity index 84%
rename from tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/setFieldsDict
rename to tutorials/modules/multicomponentFluid/lockExchange/system/setFieldsDict
index 139a13fe22..9ae2c246ef 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/setFieldsDict
+++ b/tutorials/modules/multicomponentFluid/lockExchange/system/setFieldsDict
@@ -15,7 +15,8 @@ FoamFile
 
 defaultFieldValues
 (
-    volScalarFieldValue alpha.sludge 0
+    volScalarFieldValue sludge 0
+    volScalarFieldValue water 1
 );
 
 regions
@@ -26,7 +27,8 @@ regions
 
         fieldValues
         (
-            volScalarFieldValue alpha.sludge 1
+            volScalarFieldValue sludge 1
+            volScalarFieldValue water 0
         );
     }
 );
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/phaseProperties b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/phaseProperties
deleted file mode 100644
index acdf76bfc8..0000000000
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/phaseProperties
+++ /dev/null
@@ -1,22 +0,0 @@
-/*--------------------------------*- 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    "constant";
-    object      phaseProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-phases          (sludge water);
-
-Dab             1e-06;
-alphatab        1;
-
-// ************************************************************************* //