diff --git a/applications/solvers/lagrangian/denseParticleFoam/Make/options b/applications/solvers/lagrangian/denseParticleFoam/Make/options
index 41dc1c5010..f10997c7e6 100644
--- a/applications/solvers/lagrangian/denseParticleFoam/Make/options
+++ b/applications/solvers/lagrangian/denseParticleFoam/Make/options
@@ -8,8 +8,7 @@ EXE_INC = \
     -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/phaseIncompressible/lnInclude \
-    -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-    -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
+    -I$(LIB_SRC)/surfaceFilmModels/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
diff --git a/applications/solvers/lagrangian/particleFoam/Make/options b/applications/solvers/lagrangian/particleFoam/Make/options
index 0b63a23dcd..b90a6be544 100644
--- a/applications/solvers/lagrangian/particleFoam/Make/options
+++ b/applications/solvers/lagrangian/particleFoam/Make/options
@@ -5,8 +5,7 @@ EXE_INC = \
     -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \
     -I$(LIB_SRC)/physicalProperties/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-    -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
+    -I$(LIB_SRC)/surfaceFilmModels/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
@@ -17,6 +16,5 @@ EXE_LIBS = \
     -lincompressibleMomentumTransportModels \
     -lphysicalProperties \
     -lfiniteVolume \
-    -lregionModels \
     -lsurfaceFilmModels \
     -lmeshTools
diff --git a/applications/solvers/lagrangian/rhoParticleFoam/Make/options b/applications/solvers/lagrangian/rhoParticleFoam/Make/options
index 66818faab7..0f9e69a699 100644
--- a/applications/solvers/lagrangian/rhoParticleFoam/Make/options
+++ b/applications/solvers/lagrangian/rhoParticleFoam/Make/options
@@ -9,8 +9,7 @@ EXE_INC = \
     -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-    -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude
+    -I$(LIB_SRC)/surfaceFilmModels/lnInclude
 
 EXE_LIBS = \
     -llagrangian \
@@ -24,5 +23,4 @@ EXE_LIBS = \
     -lfvModels \
     -lfvConstraints \
     -lmeshTools \
-    -lregionModels \
     -lsurfaceFilmModels
diff --git a/applications/solvers/modules/compressibleVoF/fvModels/VoFSurfaceFilm/Make/options b/applications/solvers/modules/compressibleVoF/fvModels/VoFSurfaceFilm/Make/options
index ca87abba16..19f08c41fb 100644
--- a/applications/solvers/modules/compressibleVoF/fvModels/VoFSurfaceFilm/Make/options
+++ b/applications/solvers/modules/compressibleVoF/fvModels/VoFSurfaceFilm/Make/options
@@ -4,8 +4,7 @@ EXE_INC = \
     -I$(LIB_SRC)/twoPhaseModels/interfaceProperties/lnInclude \
     -I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude \
     -I$(LIB_SRC)/twoPhaseModels/compressibleTwoPhaseMixture/lnInclude \
-    -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-    -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
+    -I$(LIB_SRC)/surfaceFilmModels/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
diff --git a/applications/utilities/mesh/manipulation/transformPoints/Make/options b/applications/utilities/mesh/manipulation/transformPoints/Make/options
index 568bd4c3d9..7d0cd4e3e1 100644
--- a/applications/utilities/mesh/manipulation/transformPoints/Make/options
+++ b/applications/utilities/mesh/manipulation/transformPoints/Make/options
@@ -1,10 +1,8 @@
 EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/regionModels/regionModel/lnInclude
+    -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
     -lmeshTools \
     -lfiniteVolume \
-    -lgenericPatchFields \
-    -lregionModels
+    -lgenericPatchFields
diff --git a/applications/utilities/parallelProcessing/decomposePar/Make/options b/applications/utilities/parallelProcessing/decomposePar/Make/options
index 75d78ebfd1..c2ef088ccb 100644
--- a/applications/utilities/parallelProcessing/decomposePar/Make/options
+++ b/applications/utilities/parallelProcessing/decomposePar/Make/options
@@ -3,8 +3,7 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/parallel/parallel/lnInclude \
     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-    -I$(LIB_SRC)/lagrangian/basic/lnInclude \
-    -I$(LIB_SRC)/regionModels/regionModel/lnInclude
+    -I$(LIB_SRC)/lagrangian/basic/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
@@ -12,5 +11,4 @@ EXE_LIBS = \
     -lparallel \
     -ldecompositionMethods \
     -llagrangian \
-    -lregionModels \
     -lgenericPatchFields
diff --git a/applications/utilities/parallelProcessing/reconstructPar/Make/options b/applications/utilities/parallelProcessing/reconstructPar/Make/options
index 40c6a86df5..69e39c6160 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/Make/options
+++ b/applications/utilities/parallelProcessing/reconstructPar/Make/options
@@ -2,13 +2,11 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/parallel/parallel/lnInclude \
-    -I$(LIB_SRC)/lagrangian/basic/lnInclude \
-    -I$(LIB_SRC)/regionModels/regionModel/lnInclude
+    -I$(LIB_SRC)/lagrangian/basic/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
     -lparallel \
     -llagrangian \
-    -lregionModels \
     -lgenericPatchFields
diff --git a/src/Allwmake b/src/Allwmake
index bcc574e2d5..8bd5e628d1 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -66,7 +66,7 @@ MomentumTransportModels/Allwmake $targetType $*
 ThermophysicalTransportModels/Allwmake $targetType $*
 wmake $targetType radiationModels
 wmake $targetType combustionModels
-regionModels/Allwmake $targetType $*
+wmake $targetType surfaceFilmModels
 lagrangian/Allwmake $targetType $*
 mesh/Allwmake $targetType $*
 renumber/Allwmake $targetType $*
diff --git a/src/functionObjects/lagrangian/Make/options b/src/functionObjects/lagrangian/Make/options
index d4f85e14d4..4ab6226a04 100644
--- a/src/functionObjects/lagrangian/Make/options
+++ b/src/functionObjects/lagrangian/Make/options
@@ -5,8 +5,7 @@ EXE_INC = \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/lagrangian/parcel/lnInclude \
     -I$(LIB_SRC)/lagrangian/DSMC/lnInclude \
-    -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-    -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude
+    -I$(LIB_SRC)/surfaceFilmModels/lnInclude
 
 LIB_LIBS = \
     -lfiniteVolume \
@@ -15,5 +14,4 @@ LIB_LIBS = \
     -llagrangian \
     -llagrangianParcel \
     -llagrangianParcelTurbulence \
-    -lregionModels \
     -lsurfaceFilmModels
diff --git a/src/lagrangian/parcel/Make/options b/src/lagrangian/parcel/Make/options
index da5e9a09a1..61df748e55 100644
--- a/src/lagrangian/parcel/Make/options
+++ b/src/lagrangian/parcel/Make/options
@@ -7,8 +7,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \
     -I$(LIB_SRC)/radiationModels/lnInclude \
-    -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-    -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
+    -I$(LIB_SRC)/surfaceFilmModels/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
@@ -22,7 +21,6 @@ LIB_LIBS = \
     -lmulticomponentThermophysicalModels \
     -lradiationModels \
     -lphysicalProperties \
-    -lregionModels \
     -lsurfaceFilmModels \
     -lsampling \
     -lfiniteVolume \
diff --git a/src/lagrangian/parcelTurbulence/Make/options b/src/lagrangian/parcelTurbulence/Make/options
index 39360da895..c390bddfe7 100644
--- a/src/lagrangian/parcelTurbulence/Make/options
+++ b/src/lagrangian/parcelTurbulence/Make/options
@@ -10,8 +10,7 @@ EXE_INC = \
     -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
-    -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-    -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
+    -I$(LIB_SRC)/surfaceFilmModels/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
@@ -29,7 +28,6 @@ LIB_LIBS = \
     -lincompressibleMomentumTransportModels \
     -lcompressibleMomentumTransportModels \
     -lphysicalProperties \
-    -lregionModels \
     -lsurfaceFilmModels \
     -lsampling \
     -lfiniteVolume \
diff --git a/src/regionModels/Allwclean b/src/regionModels/Allwclean
deleted file mode 100755
index 5be3d3a625..0000000000
--- a/src/regionModels/Allwclean
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-makeType=${1:-libso}
-
-wclean $makeType regionModel
-wclean $makeType surfaceFilmModels
-wclean $makeType thermalBaffle
-
-#------------------------------------------------------------------------------
diff --git a/src/regionModels/Allwmake b/src/regionModels/Allwmake
deleted file mode 100755
index 23978b3b4c..0000000000
--- a/src/regionModels/Allwmake
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-# Parse arguments for library compilation
-. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-
-wmake $targetType regionModel
-wmake $targetType surfaceFilmModels
-wmake $targetType thermalBaffle
-
-#------------------------------------------------------------------------------
diff --git a/src/regionModels/regionModel/Make/files b/src/regionModels/regionModel/Make/files
deleted file mode 100644
index c0dc3c8404..0000000000
--- a/src/regionModels/regionModel/Make/files
+++ /dev/null
@@ -1,4 +0,0 @@
-regionModel/regionModel.C
-singleLayerRegionModel/singleLayerRegionModel.C
-
-LIB = $(FOAM_LIBBIN)/libregionModels
diff --git a/src/regionModels/regionModel/Make/options b/src/regionModels/regionModel/Make/options
deleted file mode 100644
index a3ae8da833..0000000000
--- a/src/regionModels/regionModel/Make/options
+++ /dev/null
@@ -1,7 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude
-
-LIB_LIBS = \
-    -lfiniteVolume \
-    -lmeshTools
diff --git a/src/regionModels/regionModel/singleLayerRegionModel/singleLayerRegionModel.C b/src/regionModels/regionModel/singleLayerRegionModel/singleLayerRegionModel.C
deleted file mode 100644
index 0e5b7c6fd3..0000000000
--- a/src/regionModels/regionModel/singleLayerRegionModel/singleLayerRegionModel.C
+++ /dev/null
@@ -1,180 +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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "singleLayerRegionModel.H"
-#include "fvMesh.H"
-#include "surfaceFields.H"
-#include "Time.H"
-#include "zeroGradientFvPatchFields.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace regionModels
-{
-    defineTypeNameAndDebug(singleLayerRegionModel, 0);
-}
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::regionModels::singleLayerRegionModel::singleLayerRegionModel
-(
-    const fvMesh& mesh,
-    const word& regionType,
-    const word& modelName,
-    bool readFields
-)
-:
-    regionModel(mesh, regionType, modelName, false),
-    nHat_
-    (
-        IOobject
-        (
-            "nHat",
-            time_.timeName(),
-            regionMesh()
-        ),
-        regionMesh(),
-        dimensionedVector(dimless, Zero),
-        zeroGradientFvPatchField<vector>::typeName
-    ),
-    magSf_
-    (
-        IOobject
-        (
-            "magSf",
-            time_.timeName(),
-            regionMesh()
-        ),
-        regionMesh(),
-        dimensionedScalar(dimArea, 0)
-    ),
-    VbyA_
-    (
-        IOobject
-        (
-            "VbyA",
-            time_.timeName(),
-            regionMesh()
-        ),
-        regionMesh(),
-        dimensionedScalar(dimLength, 0),
-        zeroGradientFvPatchField<vector>::typeName
-    ),
-    passivePatchIDs_()
-{
-    label nBoundaryFaces = 0;
-    const polyBoundaryMesh& rbm = regionMesh().boundaryMesh();
-    forAll(intCoupledPatchIDs_, i)
-    {
-        const label patchi = intCoupledPatchIDs_[i];
-        const polyPatch& pp = rbm[patchi];
-        const labelList& fCells = pp.faceCells();
-
-        nBoundaryFaces += fCells.size();
-
-        UIndirectList<vector>(nHat_, fCells) = pp.faceNormals();
-        UIndirectList<scalar>(magSf_, fCells) = pp.magFaceAreas();
-    }
-    nHat_.correctBoundaryConditions();
-
-    if (nBoundaryFaces != regionMesh().nCells())
-    {
-        FatalErrorInFunction
-            << "Number of primary region coupled boundary faces not equal to "
-            << "the number of cells in the local region" << nl << nl
-            << "Number of cells = " << regionMesh().nCells() << nl
-            << "Boundary faces  = " << nBoundaryFaces << nl
-            << abort(FatalError);
-    }
-
-    passivePatchIDs_.setSize(intCoupledPatchIDs_.size(), -1);
-    forAll(intCoupledPatchIDs_, i)
-    {
-        const label patchi = intCoupledPatchIDs_[i];
-        const polyPatch& ppIntCoupled = rbm[patchi];
-        if (ppIntCoupled.size() > 0)
-        {
-            const label cellId = rbm[patchi].faceCells()[0];
-            const cell& cFaces = regionMesh().cells()[cellId];
-            const label faceO
-            (
-                cFaces.opposingFaceLabel
-                (
-                    ppIntCoupled.start(), regionMesh().faces()
-                )
-            );
-            passivePatchIDs_[i] = rbm.whichPatch(faceO);
-        }
-    }
-
-    Pstream::listCombineGather(passivePatchIDs_, maxEqOp<label>());
-    Pstream::listCombineScatter(passivePatchIDs_);
-
-    VbyA_.primitiveFieldRef() = regionMesh().V()/magSf_;
-    VbyA_.correctBoundaryConditions();
-}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::regionModels::singleLayerRegionModel::~singleLayerRegionModel()
-{}
-
-
-// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
-
-const Foam::volVectorField&
-Foam::regionModels::singleLayerRegionModel::nHat() const
-{
-    return nHat_;
-}
-
-
-const Foam::volScalarField::Internal&
-Foam::regionModels::singleLayerRegionModel::magSf() const
-{
-    return magSf_;
-}
-
-
-const Foam::volScalarField&
-Foam::regionModels::singleLayerRegionModel::VbyA() const
-{
-    return VbyA_;
-}
-
-
-const Foam::labelList&
-Foam::regionModels::singleLayerRegionModel::passivePatchIDs() const
-{
-    return passivePatchIDs_;
-}
-
-
-// ************************************************************************* //
diff --git a/src/regionModels/regionModel/singleLayerRegionModel/singleLayerRegionModel.H b/src/regionModels/regionModel/singleLayerRegionModel/singleLayerRegionModel.H
deleted file mode 100644
index e7d02eaf2f..0000000000
--- a/src/regionModels/regionModel/singleLayerRegionModel/singleLayerRegionModel.H
+++ /dev/null
@@ -1,155 +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/>.
-
-Class
-    Foam::regionModels::singleLayerRegionModel
-
-Description
-    Base class for single layer region models
-
-SourceFiles
-    singleLayerRegionModel.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef singleLayerRegionModel_H
-#define singleLayerRegionModel_H
-
-#include "regionModel.H"
-#include "volFields.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace regionModels
-{
-
-/*---------------------------------------------------------------------------*\
-                      Class singleLayerRegionModel Declaration
-\*---------------------------------------------------------------------------*/
-
-class singleLayerRegionModel
-:
-    public regionModel
-{
-    // Private member data
-
-        // Region addressing
-
-            //- Patch normal vectors
-            volVectorField nHat_;
-
-            //- Cell cross-sectional area magnitude [m^2]
-            volScalarField::Internal magSf_;
-
-            //- Cell layer volume/area [m]
-            volScalarField VbyA_;
-
-
-        // Addressing
-
-            //- List of patch IDs opposite to internally coupled patches
-            labelList passivePatchIDs_;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("regionModel");
-
-
-    // Constructors
-
-        //- Construct from mesh, region type and name
-        singleLayerRegionModel
-        (
-            const fvMesh& mesh,
-            const word& regionType,
-            const word& modelName,
-            bool readFields = true
-        );
-
-        //- Disallow default bitwise copy construction
-        singleLayerRegionModel(const singleLayerRegionModel&) = delete;
-
-
-    //- Destructor
-    virtual ~singleLayerRegionModel();
-
-
-    // Member Functions
-
-        // Access
-
-            // Region geometry
-
-                //- Return the patch normal vectors
-                const volVectorField& nHat() const;
-
-                //- Return the face area magnitudes [m^2]
-                const volScalarField::Internal& magSf() const;
-
-                //- Return the cell layer volume/area [m]
-                const volScalarField& VbyA() const;
-
-
-            // Addressing
-
-                //- Return the list of patch IDs opposite to internally
-                //  coupled patches
-                const labelList& passivePatchIDs() const;
-
-
-        // Patch type information
-
-            //- Return boundary types for mapped field patches
-            //  Also maps internal field value
-            //  Mapping region prescribed by underlying mapped poly patch
-            template<class Type>
-            wordList mappedFieldAndInternalPatchTypes() const;
-
-
-    // Member Operators
-
-        //- Disallow default bitwise assignment
-        void operator=(const singleLayerRegionModel&) = delete;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace regionModels
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-    #include "singleLayerRegionModelTemplates.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/regionModels/regionModel/singleLayerRegionModel/singleLayerRegionModelTemplates.C b/src/regionModels/regionModel/singleLayerRegionModel/singleLayerRegionModelTemplates.C
deleted file mode 100644
index d942fff7ae..0000000000
--- a/src/regionModels/regionModel/singleLayerRegionModel/singleLayerRegionModelTemplates.C
+++ /dev/null
@@ -1,50 +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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "singleLayerRegionModel.H"
-#include "zeroGradientFvPatchFields.H"
-#include "mappedValueAndPatchInternalValueFvPatchFields.H"
-
-// * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * * //
-
-template<class Type>
-Foam::wordList Foam::regionModels::singleLayerRegionModel::
-mappedFieldAndInternalPatchTypes() const
-{
-    wordList bTypes(regionMesh().boundaryMesh().size());
-
-    bTypes = zeroGradientFvPatchField<Type>::typeName;
-
-    forAll(intCoupledPatchIDs_, i)
-    {
-        bTypes[intCoupledPatchIDs_[i]] =
-            mappedValueAndPatchInternalValueFvPatchField<Type>::typeName;
-    }
-
-    return bTypes;
-}
-
-
-// ************************************************************************* //
diff --git a/src/regionModels/surfaceFilmModels/Make/files b/src/surfaceFilmModels/Make/files
similarity index 98%
rename from src/regionModels/surfaceFilmModels/Make/files
rename to src/surfaceFilmModels/Make/files
index 1a174167e5..326047f72b 100644
--- a/src/regionModels/surfaceFilmModels/Make/files
+++ b/src/surfaceFilmModels/Make/files
@@ -1,3 +1,5 @@
+singleLayerRegionModel/singleLayerRegionModel.C
+
 # Surface film models
 surfaceFilm/surfaceFilm.C
 momentumSurfaceFilm/momentumSurfaceFilm.C
diff --git a/src/regionModels/surfaceFilmModels/Make/options b/src/surfaceFilmModels/Make/options
similarity index 93%
rename from src/regionModels/surfaceFilmModels/Make/options
rename to src/surfaceFilmModels/Make/options
index 8eeca04b82..b198cfee5e 100644
--- a/src/regionModels/surfaceFilmModels/Make/options
+++ b/src/surfaceFilmModels/Make/options
@@ -9,7 +9,6 @@ EXE_INC = \
     -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
     -I$(LIB_SRC)/ThermophysicalTransportModels/thermophysicalTransportModel/lnInclude \
     -I$(LIB_SRC)/ThermophysicalTransportModels/fluid/lnInclude \
-    -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
@@ -22,6 +21,5 @@ LIB_LIBS = \
     -lmomentumTransportModels \
     -lcompressibleMomentumTransportModels \
     -lfluidThermoThermophysicalTransportModels \
-    -lregionModels \
     -lfiniteVolume \
     -lmeshTools
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C b/src/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C
rename to src/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.H b/src/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.H
rename to src/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.H
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C b/src/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C
rename to src/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.H b/src/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.H
rename to src/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.H
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C b/src/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C
rename to src/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.H b/src/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.H
rename to src/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.H
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C b/src/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
rename to src/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.H b/src/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.H
rename to src/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.H
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C b/src/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C
rename to src/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.H b/src/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.H
rename to src/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.H
diff --git a/src/regionModels/surfaceFilmModels/fvModels/surfaceFilms/surfaceFilms.C b/src/surfaceFilmModels/fvModels/surfaceFilms/surfaceFilms.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/fvModels/surfaceFilms/surfaceFilms.C
rename to src/surfaceFilmModels/fvModels/surfaceFilms/surfaceFilms.C
diff --git a/src/regionModels/surfaceFilmModels/fvModels/surfaceFilms/surfaceFilms.H b/src/surfaceFilmModels/fvModels/surfaceFilms/surfaceFilms.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/fvModels/surfaceFilms/surfaceFilms.H
rename to src/surfaceFilmModels/fvModels/surfaceFilms/surfaceFilms.H
diff --git a/src/regionModels/surfaceFilmModels/momentumSurfaceFilm/momentumSurfaceFilm.C b/src/surfaceFilmModels/momentumSurfaceFilm/momentumSurfaceFilm.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/momentumSurfaceFilm/momentumSurfaceFilm.C
rename to src/surfaceFilmModels/momentumSurfaceFilm/momentumSurfaceFilm.C
diff --git a/src/regionModels/surfaceFilmModels/momentumSurfaceFilm/momentumSurfaceFilm.H b/src/surfaceFilmModels/momentumSurfaceFilm/momentumSurfaceFilm.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/momentumSurfaceFilm/momentumSurfaceFilm.H
rename to src/surfaceFilmModels/momentumSurfaceFilm/momentumSurfaceFilm.H
diff --git a/src/regionModels/surfaceFilmModels/momentumSurfaceFilm/momentumSurfaceFilmI.H b/src/surfaceFilmModels/momentumSurfaceFilm/momentumSurfaceFilmI.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/momentumSurfaceFilm/momentumSurfaceFilmI.H
rename to src/surfaceFilmModels/momentumSurfaceFilm/momentumSurfaceFilmI.H
diff --git a/src/regionModels/surfaceFilmModels/momentumSurfaceFilm/momentumSurfaceFilmTemplates.C b/src/surfaceFilmModels/momentumSurfaceFilm/momentumSurfaceFilmTemplates.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/momentumSurfaceFilm/momentumSurfaceFilmTemplates.C
rename to src/surfaceFilmModels/momentumSurfaceFilm/momentumSurfaceFilmTemplates.C
diff --git a/src/regionModels/regionModel/regionModel/regionModel.C b/src/surfaceFilmModels/singleLayerRegionModel/singleLayerRegionModel.C
similarity index 66%
rename from src/regionModels/regionModel/regionModel/regionModel.C
rename to src/surfaceFilmModels/singleLayerRegionModel/singleLayerRegionModel.C
index c63e337214..7c01638bb0 100644
--- a/src/regionModels/regionModel/regionModel/regionModel.C
+++ b/src/surfaceFilmModels/singleLayerRegionModel/singleLayerRegionModel.C
@@ -23,11 +23,12 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "regionModel.H"
+#include "singleLayerRegionModel.H"
 #include "fvMesh.H"
+#include "surfaceFields.H"
 #include "Time.H"
-#include "mappedWallPolyPatch.H"
 #include "zeroGradientFvPatchFields.H"
+#include "mappedWallPolyPatch.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -35,111 +36,14 @@ namespace Foam
 {
 namespace regionModels
 {
-    defineTypeNameAndDebug(regionModel, 0);
+    defineTypeNameAndDebug(singleLayerRegionModel, 0);
 }
 }
 
-// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
-
-void Foam::regionModels::regionModel::constructMeshObjects()
-{
-    // construct region mesh
-    if (!time_.foundObject<fvMesh>(regionName_))
-    {
-        regionMeshPtr_.reset
-        (
-            new fvMesh
-            (
-                IOobject
-                (
-                    regionName_,
-                    time_.timeName(),
-                    time_,
-                    IOobject::MUST_READ
-                )
-            )
-        );
-    }
-}
-
-
-void Foam::regionModels::regionModel::initialise()
-{
-    DebugInFunction << endl;
-
-    label nBoundaryFaces = 0;
-    DynamicList<label> primaryPatchIDs;
-    DynamicList<label> intCoupledPatchIDs;
-    const polyBoundaryMesh& rbm = regionMesh().boundaryMesh();
-
-    forAll(rbm, patchi)
-    {
-        const polyPatch& regionPatch = rbm[patchi];
-
-        if (isA<mappedPatchBase>(regionPatch))
-        {
-            DebugInFunction
-                << "found " << mappedWallPolyPatch::typeName
-                <<  " " << regionPatch.name() << endl;
-
-            intCoupledPatchIDs.append(patchi);
-
-            nBoundaryFaces += regionPatch.faceCells().size();
-
-            const mappedPatchBase& mapPatch =
-                refCast<const mappedPatchBase>(regionPatch);
-
-            if
-            (
-                primaryMesh_.time().foundObject<polyMesh>
-                (
-                    mapPatch.nbrRegionName()
-                )
-            )
-            {
-
-                const label primaryPatchi = mapPatch.nbrPolyPatch().index();
-                primaryPatchIDs.append(primaryPatchi);
-            }
-        }
-    }
-
-    primaryPatchIDs_.transfer(primaryPatchIDs);
-    intCoupledPatchIDs_.transfer(intCoupledPatchIDs);
-
-    if (returnReduce(nBoundaryFaces, sumOp<label>()) == 0)
-    {
-        WarningInFunction
-            << "Region model has no mapped boundary conditions - transfer "
-            << "between regions will not be possible" << endl;
-    }
-
-    if (!outputPropertiesPtr_.valid())
-    {
-        const fileName uniformPath(word("uniform")/"regionModels");
-
-        outputPropertiesPtr_.reset
-        (
-            new timeIOdictionary
-            (
-                IOobject
-                (
-                    regionName_ + "OutputProperties",
-                    time_.timeName(),
-                    uniformPath/regionName_,
-                    primaryMesh_,
-                    IOobject::READ_IF_PRESENT,
-                    IOobject::NO_WRITE
-                )
-            )
-        );
-    }
-}
-
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
-bool Foam::regionModels::regionModel::read()
+bool Foam::regionModels::singleLayerRegionModel::read()
 {
     if (regIOobject::read())
     {
@@ -159,7 +63,7 @@ bool Foam::regionModels::regionModel::read()
 }
 
 
-bool Foam::regionModels::regionModel::read(const dictionary& dict)
+bool Foam::regionModels::singleLayerRegionModel::read(const dictionary& dict)
 {
     if (const dictionary* dictPtr = dict.subDictPtr(modelName_ + "Coeffs"))
     {
@@ -172,9 +76,9 @@ bool Foam::regionModels::regionModel::read(const dictionary& dict)
 }
 
 
-Foam::label Foam::regionModels::regionModel::nbrCoupledPatchID
+Foam::label Foam::regionModels::singleLayerRegionModel::nbrCoupledPatchID
 (
-    const regionModel& nbrRegion,
+    const singleLayerRegionModel& nbrRegion,
     const label regionPatchi
 ) const
 {
@@ -242,37 +146,7 @@ Foam::label Foam::regionModels::regionModel::nbrCoupledPatchID
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::regionModels::regionModel::regionModel
-(
-    const fvMesh& mesh,
-    const word& regionType
-)
-:
-    IOdictionary
-    (
-        IOobject
-        (
-            regionType + "Properties",
-            mesh.time().constant(),
-            mesh.time(),
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        )
-    ),
-    primaryMesh_(mesh),
-    time_(mesh.time()),
-    infoOutput_(false),
-    modelName_("none"),
-    regionMeshPtr_(nullptr),
-    coeffs_(dictionary::null),
-    outputPropertiesPtr_(nullptr),
-    primaryPatchIDs_(),
-    intCoupledPatchIDs_(),
-    regionName_("none")
-{}
-
-
-Foam::regionModels::regionModel::regionModel
+Foam::regionModels::singleLayerRegionModel::singleLayerRegionModel
 (
     const fvMesh& mesh,
     const word& regionType,
@@ -295,75 +169,221 @@ Foam::regionModels::regionModel::regionModel
     time_(mesh.time()),
     infoOutput_(true),
     modelName_(modelName),
-    regionMeshPtr_(nullptr),
+    regionName_(lookup("regionName")),
+    mesh_
+    (
+        IOobject
+        (
+            regionName_,
+            time_.timeName(),
+            time_,
+            IOobject::MUST_READ
+        )
+    ),
     coeffs_(optionalSubDict(modelName + "Coeffs")),
     outputPropertiesPtr_(nullptr),
     primaryPatchIDs_(),
     intCoupledPatchIDs_(),
-    regionName_(lookup("regionName"))
+    passivePatchIDs_(),
+    nHat_
+    (
+        IOobject
+        (
+            "nHat",
+            time_.timeName(),
+            regionMesh()
+        ),
+        regionMesh(),
+        dimensionedVector(dimless, Zero),
+        zeroGradientFvPatchField<vector>::typeName
+    ),
+    magSf_
+    (
+        IOobject
+        (
+            "magSf",
+            time_.timeName(),
+            regionMesh()
+        ),
+        regionMesh(),
+        dimensionedScalar(dimArea, 0)
+    ),
+    VbyA_
+    (
+        IOobject
+        (
+            "VbyA",
+            time_.timeName(),
+            regionMesh()
+        ),
+        regionMesh(),
+        dimensionedScalar(dimLength, 0),
+        zeroGradientFvPatchField<vector>::typeName
+    )
 {
-    constructMeshObjects();
-    initialise();
+    label nBoundaryFaces = 0;
+    DynamicList<label> primaryPatchIDs;
+    DynamicList<label> intCoupledPatchIDs;
+    const polyBoundaryMesh& rbm = regionMesh().boundaryMesh();
+
+    forAll(rbm, patchi)
+    {
+        const polyPatch& regionPatch = rbm[patchi];
+
+        if (isA<mappedPatchBase>(regionPatch))
+        {
+            DebugInFunction
+                << "found " << mappedWallPolyPatch::typeName
+                <<  " " << regionPatch.name() << endl;
+
+            intCoupledPatchIDs.append(patchi);
+
+            nBoundaryFaces += regionPatch.faceCells().size();
+
+            const mappedPatchBase& mapPatch =
+                refCast<const mappedPatchBase>(regionPatch);
+
+            if
+            (
+                primaryMesh_.time().foundObject<polyMesh>
+                (
+                    mapPatch.nbrRegionName()
+                )
+            )
+            {
+
+                const label primaryPatchi = mapPatch.nbrPolyPatch().index();
+                primaryPatchIDs.append(primaryPatchi);
+            }
+        }
+    }
+
+    primaryPatchIDs_.transfer(primaryPatchIDs);
+    intCoupledPatchIDs_.transfer(intCoupledPatchIDs);
+
+    if (returnReduce(nBoundaryFaces, sumOp<label>()) == 0)
+    {
+        WarningInFunction
+            << "Region model has no mapped boundary conditions - transfer "
+            << "between regions will not be possible" << endl;
+    }
+
+    if (!outputPropertiesPtr_.valid())
+    {
+        const fileName uniformPath(word("uniform")/"regionModels");
+
+        outputPropertiesPtr_.reset
+        (
+            new timeIOdictionary
+            (
+                IOobject
+                (
+                    regionName_ + "OutputProperties",
+                    time_.timeName(),
+                    uniformPath/regionName_,
+                    primaryMesh_,
+                    IOobject::READ_IF_PRESENT,
+                    IOobject::NO_WRITE
+                )
+            )
+        );
+    }
 
     if (readFields)
     {
         read();
     }
-}
 
+    nBoundaryFaces = 0;
 
-Foam::regionModels::regionModel::regionModel
-(
-    const fvMesh& mesh,
-    const word& regionType,
-    const word& modelName,
-    const dictionary& dict,
-    bool readFields
-)
-:
-    IOdictionary
-    (
-        IOobject
-        (
-            regionType + "Properties",
-            mesh.time().constant(),
-            mesh.time(),
-            IOobject::NO_READ,
-            IOobject::NO_WRITE,
-            true
-        ),
-        dict
-    ),
-    primaryMesh_(mesh),
-    time_(mesh.time()),
-    infoOutput_(false),
-    modelName_(modelName),
-    regionMeshPtr_(nullptr),
-    coeffs_(dict.optionalSubDict(modelName + "Coeffs")),
-    outputPropertiesPtr_(nullptr),
-    primaryPatchIDs_(),
-    intCoupledPatchIDs_(),
-    regionName_(dict.lookup("regionName"))
-{
-    constructMeshObjects();
-    initialise();
-
-    if (readFields)
+    forAll(intCoupledPatchIDs_, i)
     {
-        read(dict);
+        const label patchi = intCoupledPatchIDs_[i];
+        const polyPatch& pp = rbm[patchi];
+        const labelList& fCells = pp.faceCells();
+
+        nBoundaryFaces += fCells.size();
+
+        UIndirectList<vector>(nHat_, fCells) = pp.faceNormals();
+        UIndirectList<scalar>(magSf_, fCells) = pp.magFaceAreas();
     }
+    nHat_.correctBoundaryConditions();
+
+    if (nBoundaryFaces != regionMesh().nCells())
+    {
+        FatalErrorInFunction
+            << "Number of primary region coupled boundary faces not equal to "
+            << "the number of cells in the local region" << nl << nl
+            << "Number of cells = " << regionMesh().nCells() << nl
+            << "Boundary faces  = " << nBoundaryFaces << nl
+            << abort(FatalError);
+    }
+
+    passivePatchIDs_.setSize(intCoupledPatchIDs_.size(), -1);
+    forAll(intCoupledPatchIDs_, i)
+    {
+        const label patchi = intCoupledPatchIDs_[i];
+        const polyPatch& ppIntCoupled = rbm[patchi];
+        if (ppIntCoupled.size() > 0)
+        {
+            const label cellId = rbm[patchi].faceCells()[0];
+            const cell& cFaces = regionMesh().cells()[cellId];
+            const label faceO
+            (
+                cFaces.opposingFaceLabel
+                (
+                    ppIntCoupled.start(), regionMesh().faces()
+                )
+            );
+            passivePatchIDs_[i] = rbm.whichPatch(faceO);
+        }
+    }
+
+    Pstream::listCombineGather(passivePatchIDs_, maxEqOp<label>());
+    Pstream::listCombineScatter(passivePatchIDs_);
+
+    VbyA_.primitiveFieldRef() = regionMesh().V()/magSf_;
+    VbyA_.correctBoundaryConditions();
 }
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::regionModels::regionModel::~regionModel()
+Foam::regionModels::singleLayerRegionModel::~singleLayerRegionModel()
 {}
 
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-void Foam::regionModels::regionModel::evolve()
+const Foam::volVectorField&
+Foam::regionModels::singleLayerRegionModel::nHat() const
+{
+    return nHat_;
+}
+
+
+const Foam::volScalarField::Internal&
+Foam::regionModels::singleLayerRegionModel::magSf() const
+{
+    return magSf_;
+}
+
+
+const Foam::volScalarField&
+Foam::regionModels::singleLayerRegionModel::VbyA() const
+{
+    return VbyA_;
+}
+
+
+const Foam::labelList&
+Foam::regionModels::singleLayerRegionModel::passivePatchIDs() const
+{
+    return passivePatchIDs_;
+}
+
+
+void Foam::regionModels::singleLayerRegionModel::evolve()
 {
     Info<< "\nEvolving " << modelName_ << " for region "
         << regionMesh().name() << endl;
@@ -395,19 +415,19 @@ void Foam::regionModels::regionModel::evolve()
 }
 
 
-void Foam::regionModels::regionModel::preEvolveRegion()
+void Foam::regionModels::singleLayerRegionModel::preEvolveRegion()
 {}
 
 
-void Foam::regionModels::regionModel::evolveRegion()
+void Foam::regionModels::singleLayerRegionModel::evolveRegion()
 {}
 
 
-void Foam::regionModels::regionModel::postEvolveRegion()
+void Foam::regionModels::singleLayerRegionModel::postEvolveRegion()
 {}
 
 
-void Foam::regionModels::regionModel::info()
+void Foam::regionModels::singleLayerRegionModel::info()
 {}
 
 
diff --git a/src/regionModels/regionModel/regionModel/regionModel.H b/src/surfaceFilmModels/singleLayerRegionModel/singleLayerRegionModel.H
similarity index 78%
rename from src/regionModels/regionModel/regionModel/regionModel.H
rename to src/surfaceFilmModels/singleLayerRegionModel/singleLayerRegionModel.H
index 683eb23481..995de2f315 100644
--- a/src/regionModels/regionModel/regionModel/regionModel.H
+++ b/src/surfaceFilmModels/singleLayerRegionModel/singleLayerRegionModel.H
@@ -22,23 +22,22 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::regionModels::regionModel
+    Foam::regionModels::singleLayerRegionModel
 
 Description
-    Base class for region models
+    Base class for single layer region models
 
 SourceFiles
-    regionModelI.H
-    regionModel.C
-    regionModelTemplates.C
+    singleLayerRegionModel.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef regionModel_H
-#define regionModel_H
+#ifndef singleLayerRegionModel_H
+#define singleLayerRegionModel_H
 
 #include "fvMesh.H"
 #include "timeIOdictionary.H"
+#include "volFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -48,27 +47,13 @@ namespace regionModels
 {
 
 /*---------------------------------------------------------------------------*\
-                         Class regionModel Declaration
+                    Class singleLayerRegionModel Declaration
 \*---------------------------------------------------------------------------*/
 
-class regionModel
+class singleLayerRegionModel
 :
     public IOdictionary
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construction
-        regionModel(const regionModel&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const regionModel&) = delete;
-
-        //- Construct region mesh and fields
-        void constructMeshObjects();
-
-        //- Initialise the region
-        void initialise();
-
 
 protected:
 
@@ -86,8 +71,11 @@ protected:
         //- Model name
         const word modelName_;
 
-        //- Pointer to the region mesh database
-        autoPtr<fvMesh> regionMeshPtr_;
+        //- Region name
+        word regionName_;
+
+        //- Region mesh
+        fvMesh mesh_;
 
         //- Model coefficients dictionary
         dictionary coeffs_;
@@ -104,9 +92,18 @@ protected:
             //- List of patch IDs internally coupled with the primary region
             labelList intCoupledPatchIDs_;
 
+            //- List of patch IDs opposite to internally coupled patches
+            labelList passivePatchIDs_;
 
-        //- Region name
-        word regionName_;
+
+        //- Patch normal vectors
+        volVectorField nHat_;
+
+        //- Cell cross-sectional area magnitude [m^2]
+        volScalarField::Internal magSf_;
+
+        //- Cell layer volume/area [m]
+        volScalarField VbyA_;
 
 
     // Protected member functions
@@ -126,11 +123,8 @@ public:
 
     // Constructors
 
-        //- Construct null
-        regionModel(const fvMesh& mesh, const word& regionType);
-
         //- Construct from mesh, region type and name
-        regionModel
+        singleLayerRegionModel
         (
             const fvMesh& mesh,
             const word& regionType,
@@ -138,19 +132,12 @@ public:
             bool readFields = true
         );
 
-        //- Construct from mesh and name and dict
-        regionModel
-        (
-            const fvMesh& mesh,
-            const word& regionType,
-            const word& modelName,
-            const dictionary& dict,
-            bool readFields = true
-        );
+        //- Disallow default bitwise copy construction
+        singleLayerRegionModel(const singleLayerRegionModel&) = delete;
 
 
     //- Destructor
-    virtual ~regionModel();
+    virtual ~singleLayerRegionModel();
 
 
     // Member Functions
@@ -188,6 +175,18 @@ public:
             inline IOdictionary& outputProperties();
 
 
+            // Region geometry
+
+                //- Return the patch normal vectors
+                const volVectorField& nHat() const;
+
+                //- Return the face area magnitudes [m^2]
+                const volScalarField::Internal& magSf() const;
+
+                //- Return the cell layer volume/area [m]
+                const volScalarField& VbyA() const;
+
+
             // Addressing
 
                 //- Return true if patchi on the local region is a coupled
@@ -209,6 +208,19 @@ public:
                 //- Return region ID corresponding to primaryPatchID
                 inline label regionPatchID(const label primaryPatchID) const;
 
+                //- Return the list of patch IDs opposite to internally
+                //  coupled patches
+                const labelList& passivePatchIDs() const;
+
+
+        // Patch type information
+
+            //- Return boundary types for mapped field patches
+            //  Also maps internal field value
+            //  Mapping region prescribed by underlying mapped poly patch
+            template<class Type>
+            wordList mappedFieldAndInternalPatchTypes() const;
+
 
         // Helper
 
@@ -216,7 +228,7 @@ public:
             //  regionPatchi
             label nbrCoupledPatchID
             (
-                const regionModel& nbrRegion,
+                const singleLayerRegionModel& nbrRegion,
                 const label regionPatchi
             ) const;
 
@@ -269,6 +281,12 @@ public:
 
             //- Provide some feedback
             virtual void info();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const singleLayerRegionModel&) = delete;
 };
 
 
@@ -277,14 +295,15 @@ public:
 } // End namespace regionModels
 } // End namespace Foam
 
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "regionModelI.H"
+#include "singleLayerRegionModelI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "regionModelTemplates.C"
+    #include "singleLayerRegionModelTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/regionModels/regionModel/regionModel/regionModelI.H b/src/surfaceFilmModels/singleLayerRegionModel/singleLayerRegionModelI.H
similarity index 64%
rename from src/regionModels/regionModel/regionModel/regionModelI.H
rename to src/surfaceFilmModels/singleLayerRegionModel/singleLayerRegionModelI.H
index 987f19b55a..e29dad4712 100644
--- a/src/regionModels/regionModel/regionModel/regionModelI.H
+++ b/src/surfaceFilmModels/singleLayerRegionModel/singleLayerRegionModelI.H
@@ -23,85 +23,65 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "regionModel.H"
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 inline const Foam::fvMesh&
-Foam::regionModels::regionModel::primaryMesh() const
+Foam::regionModels::singleLayerRegionModel::primaryMesh() const
 {
     return primaryMesh_;
 }
 
 
-inline const Foam::Time& Foam::regionModels::regionModel::time() const
+inline const Foam::Time&
+Foam::regionModels::singleLayerRegionModel::time() const
 {
     return time_;
 }
 
 
-inline const Foam::Switch& Foam::regionModels::regionModel::infoOutput() const
+inline const Foam::Switch&
+Foam::regionModels::singleLayerRegionModel::infoOutput() const
 {
     return infoOutput_;
 }
 
 
-inline const Foam::word& Foam::regionModels::regionModel::modelName() const
+inline const Foam::word&
+Foam::regionModels::singleLayerRegionModel::modelName() const
 {
     return modelName_;
 }
 
 
-inline const Foam::fvMesh& Foam::regionModels::regionModel::regionMesh() const
+inline const Foam::fvMesh&
+Foam::regionModels::singleLayerRegionModel::regionMesh() const
 {
-    if (time_.foundObject<fvMesh>(regionName_))
-    {
-        return time_.lookupObject<fvMesh>(regionName_);
-    }
-    else if (!regionMeshPtr_.valid())
-    {
-        FatalErrorInFunction
-         << "Region mesh not available" << abort(FatalError);
-    }
-
-    return regionMeshPtr_();
+    return mesh_;
 }
 
 
-inline Foam::fvMesh& Foam::regionModels::regionModel::regionMesh()
+inline Foam::fvMesh& Foam::regionModels::singleLayerRegionModel::regionMesh()
 {
-    if (time_.foundObject<fvMesh>(regionName_))
-    {
-        return const_cast<fvMesh&>
-        (
-            time_.lookupObject<fvMesh>(regionName_)
-        );
-    }
-    else if (!regionMeshPtr_.valid())
-    {
-        FatalErrorInFunction
-         << "Region mesh not available" << abort(FatalError);
-    }
-
-    return regionMeshPtr_();
+    return mesh_;
 }
 
 
-inline const Foam::dictionary& Foam::regionModels::regionModel::coeffs() const
+inline const Foam::dictionary&
+Foam::regionModels::singleLayerRegionModel::coeffs() const
 {
     return coeffs_;
 }
 
 
 inline const Foam::dictionary&
-Foam::regionModels::regionModel::solution() const
+Foam::regionModels::singleLayerRegionModel::solution() const
 {
     return regionMesh().solution().dict();
 }
 
 
 inline const Foam::IOdictionary&
-Foam::regionModels::regionModel::outputProperties() const
+Foam::regionModels::singleLayerRegionModel::outputProperties() const
 {
     if (!outputPropertiesPtr_.valid())
     {
@@ -115,7 +95,7 @@ Foam::regionModels::regionModel::outputProperties() const
 
 
 inline Foam::IOdictionary&
-Foam::regionModels::regionModel::outputProperties()
+Foam::regionModels::singleLayerRegionModel::outputProperties()
 {
     if (!outputPropertiesPtr_.valid())
     {
@@ -128,7 +108,7 @@ Foam::regionModels::regionModel::outputProperties()
 }
 
 
-inline bool Foam::regionModels::regionModel::isCoupledPatch
+inline bool Foam::regionModels::singleLayerRegionModel::isCoupledPatch
 (
     const label regionPatchi
 ) const
@@ -145,7 +125,7 @@ inline bool Foam::regionModels::regionModel::isCoupledPatch
 }
 
 
-inline bool Foam::regionModels::regionModel::isRegionPatch
+inline bool Foam::regionModels::singleLayerRegionModel::isRegionPatch
 (
     const label primaryPatchi
 ) const
@@ -163,20 +143,20 @@ inline bool Foam::regionModels::regionModel::isRegionPatch
 
 
 inline const Foam::labelList&
-Foam::regionModels::regionModel::primaryPatchIDs() const
+Foam::regionModels::singleLayerRegionModel::primaryPatchIDs() const
 {
     return primaryPatchIDs_;
 }
 
 
 inline const Foam::labelList&
-Foam::regionModels::regionModel::intCoupledPatchIDs() const
+Foam::regionModels::singleLayerRegionModel::intCoupledPatchIDs() const
 {
     return intCoupledPatchIDs_;
 }
 
 
-inline Foam::label Foam::regionModels::regionModel::regionPatchID
+inline Foam::label Foam::regionModels::singleLayerRegionModel::regionPatchID
 (
     const label primaryPatchID
 ) const
diff --git a/src/regionModels/regionModel/regionModel/regionModelTemplates.C b/src/surfaceFilmModels/singleLayerRegionModel/singleLayerRegionModelTemplates.C
similarity index 79%
rename from src/regionModels/regionModel/regionModel/regionModelTemplates.C
rename to src/surfaceFilmModels/singleLayerRegionModel/singleLayerRegionModelTemplates.C
index 0f126a6c41..a8f930f8de 100644
--- a/src/regionModels/regionModel/regionModel/regionModelTemplates.C
+++ b/src/surfaceFilmModels/singleLayerRegionModel/singleLayerRegionModelTemplates.C
@@ -23,13 +23,14 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "regionModel.H"
-#include "mappedPatchBase.H"
+#include "singleLayerRegionModel.H"
+#include "zeroGradientFvPatchFields.H"
+#include "mappedValueAndPatchInternalValueFvPatchFields.H"
 
-// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+// * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::regionModels::regionModel::toPrimary
+void Foam::regionModels::singleLayerRegionModel::toPrimary
 (
     const label regionPatchi,
     Field<Type>& regionField
@@ -56,7 +57,7 @@ void Foam::regionModels::regionModel::toPrimary
 
 
 template<class Type>
-void Foam::regionModels::regionModel::toRegion
+void Foam::regionModels::singleLayerRegionModel::toRegion
 (
     const label regionPatchi,
     Field<Type>& primaryField
@@ -83,7 +84,7 @@ void Foam::regionModels::regionModel::toRegion
 
 
 template<class Type>
-void Foam::regionModels::regionModel::toRegion
+void Foam::regionModels::singleLayerRegionModel::toRegion
 (
     Field<Type>& rf,
     const typename GeometricField<Type, fvPatchField, volMesh>::Boundary& pBf
@@ -106,4 +107,22 @@ void Foam::regionModels::regionModel::toRegion
 }
 
 
+template<class Type>
+Foam::wordList Foam::regionModels::singleLayerRegionModel::
+mappedFieldAndInternalPatchTypes() const
+{
+    wordList bTypes(regionMesh().boundaryMesh().size());
+
+    bTypes = zeroGradientFvPatchField<Type>::typeName;
+
+    forAll(intCoupledPatchIDs_, i)
+    {
+        bTypes[intCoupledPatchIDs_[i]] =
+            mappedValueAndPatchInternalValueFvPatchField<Type>::typeName;
+    }
+
+    return bTypes;
+}
+
+
 // ************************************************************************* //
diff --git a/src/regionModels/surfaceFilmModels/submodels/filmSubModelBase.C b/src/surfaceFilmModels/submodels/filmSubModelBase.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/filmSubModelBase.C
rename to src/surfaceFilmModels/submodels/filmSubModelBase.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/filmSubModelBase.H b/src/surfaceFilmModels/submodels/filmSubModelBase.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/filmSubModelBase.H
rename to src/surfaceFilmModels/submodels/filmSubModelBase.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/filmSubModelBaseI.H b/src/surfaceFilmModels/submodels/filmSubModelBaseI.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/filmSubModelBaseI.H
rename to src/surfaceFilmModels/submodels/filmSubModelBaseI.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/filmSubModelBaseTemplates.C b/src/surfaceFilmModels/submodels/filmSubModelBaseTemplates.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/filmSubModelBaseTemplates.C
rename to src/surfaceFilmModels/submodels/filmSubModelBaseTemplates.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/BrunDrippingEjection/BrunDrippingEjection.C b/src/surfaceFilmModels/submodels/momentum/ejectionModel/BrunDrippingEjection/BrunDrippingEjection.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/BrunDrippingEjection/BrunDrippingEjection.C
rename to src/surfaceFilmModels/submodels/momentum/ejectionModel/BrunDrippingEjection/BrunDrippingEjection.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/BrunDrippingEjection/BrunDrippingEjection.H b/src/surfaceFilmModels/submodels/momentum/ejectionModel/BrunDrippingEjection/BrunDrippingEjection.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/BrunDrippingEjection/BrunDrippingEjection.H
rename to src/surfaceFilmModels/submodels/momentum/ejectionModel/BrunDrippingEjection/BrunDrippingEjection.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/curvatureSeparation/curvatureSeparation.C b/src/surfaceFilmModels/submodels/momentum/ejectionModel/curvatureSeparation/curvatureSeparation.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/curvatureSeparation/curvatureSeparation.C
rename to src/surfaceFilmModels/submodels/momentum/ejectionModel/curvatureSeparation/curvatureSeparation.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/curvatureSeparation/curvatureSeparation.H b/src/surfaceFilmModels/submodels/momentum/ejectionModel/curvatureSeparation/curvatureSeparation.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/curvatureSeparation/curvatureSeparation.H
rename to src/surfaceFilmModels/submodels/momentum/ejectionModel/curvatureSeparation/curvatureSeparation.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/drippingEjection/drippingEjection.C b/src/surfaceFilmModels/submodels/momentum/ejectionModel/drippingEjection/drippingEjection.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/drippingEjection/drippingEjection.C
rename to src/surfaceFilmModels/submodels/momentum/ejectionModel/drippingEjection/drippingEjection.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/drippingEjection/drippingEjection.H b/src/surfaceFilmModels/submodels/momentum/ejectionModel/drippingEjection/drippingEjection.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/drippingEjection/drippingEjection.H
rename to src/surfaceFilmModels/submodels/momentum/ejectionModel/drippingEjection/drippingEjection.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/ejectionModel/ejectionModel.C b/src/surfaceFilmModels/submodels/momentum/ejectionModel/ejectionModel/ejectionModel.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/ejectionModel/ejectionModel.C
rename to src/surfaceFilmModels/submodels/momentum/ejectionModel/ejectionModel/ejectionModel.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/ejectionModel/ejectionModel.H b/src/surfaceFilmModels/submodels/momentum/ejectionModel/ejectionModel/ejectionModel.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/ejectionModel/ejectionModel.H
rename to src/surfaceFilmModels/submodels/momentum/ejectionModel/ejectionModel/ejectionModel.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/ejectionModel/ejectionModelNew.C b/src/surfaceFilmModels/submodels/momentum/ejectionModel/ejectionModel/ejectionModelNew.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/ejectionModel/ejectionModelNew.C
rename to src/surfaceFilmModels/submodels/momentum/ejectionModel/ejectionModel/ejectionModelNew.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/ejectionModelList/ejectionModelList.C b/src/surfaceFilmModels/submodels/momentum/ejectionModel/ejectionModelList/ejectionModelList.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/ejectionModelList/ejectionModelList.C
rename to src/surfaceFilmModels/submodels/momentum/ejectionModel/ejectionModelList/ejectionModelList.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/ejectionModelList/ejectionModelList.H b/src/surfaceFilmModels/submodels/momentum/ejectionModel/ejectionModelList/ejectionModelList.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/ejectionModelList/ejectionModelList.H
rename to src/surfaceFilmModels/submodels/momentum/ejectionModel/ejectionModelList/ejectionModelList.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/patchEjection/patchEjection.C b/src/surfaceFilmModels/submodels/momentum/ejectionModel/patchEjection/patchEjection.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/patchEjection/patchEjection.C
rename to src/surfaceFilmModels/submodels/momentum/ejectionModel/patchEjection/patchEjection.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/patchEjection/patchEjection.H b/src/surfaceFilmModels/submodels/momentum/ejectionModel/patchEjection/patchEjection.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/patchEjection/patchEjection.H
rename to src/surfaceFilmModels/submodels/momentum/ejectionModel/patchEjection/patchEjection.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModel.C b/src/surfaceFilmModels/submodels/momentum/filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModel.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModel.C
rename to src/surfaceFilmModels/submodels/momentum/filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModel.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModel.H b/src/surfaceFilmModels/submodels/momentum/filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModel.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModel.H
rename to src/surfaceFilmModels/submodels/momentum/filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModel.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModelNew.C b/src/surfaceFilmModels/submodels/momentum/filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModelNew.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModelNew.C
rename to src/surfaceFilmModels/submodels/momentum/filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModelNew.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/filmMomentumTransportModel/laminar/laminar.C b/src/surfaceFilmModels/submodels/momentum/filmMomentumTransportModel/laminar/laminar.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/filmMomentumTransportModel/laminar/laminar.C
rename to src/surfaceFilmModels/submodels/momentum/filmMomentumTransportModel/laminar/laminar.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/filmMomentumTransportModel/laminar/laminar.H b/src/surfaceFilmModels/submodels/momentum/filmMomentumTransportModel/laminar/laminar.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/filmMomentumTransportModel/laminar/laminar.H
rename to src/surfaceFilmModels/submodels/momentum/filmMomentumTransportModel/laminar/laminar.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/Arrhenius/ArrheniusViscosity.C b/src/surfaceFilmModels/submodels/momentum/filmViscosityModel/Arrhenius/ArrheniusViscosity.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/Arrhenius/ArrheniusViscosity.C
rename to src/surfaceFilmModels/submodels/momentum/filmViscosityModel/Arrhenius/ArrheniusViscosity.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/Arrhenius/ArrheniusViscosity.H b/src/surfaceFilmModels/submodels/momentum/filmViscosityModel/Arrhenius/ArrheniusViscosity.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/Arrhenius/ArrheniusViscosity.H
rename to src/surfaceFilmModels/submodels/momentum/filmViscosityModel/Arrhenius/ArrheniusViscosity.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/Newtonian/NewtonianViscosity.C b/src/surfaceFilmModels/submodels/momentum/filmViscosityModel/Newtonian/NewtonianViscosity.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/Newtonian/NewtonianViscosity.C
rename to src/surfaceFilmModels/submodels/momentum/filmViscosityModel/Newtonian/NewtonianViscosity.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/Newtonian/NewtonianViscosity.H b/src/surfaceFilmModels/submodels/momentum/filmViscosityModel/Newtonian/NewtonianViscosity.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/Newtonian/NewtonianViscosity.H
rename to src/surfaceFilmModels/submodels/momentum/filmViscosityModel/Newtonian/NewtonianViscosity.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/constant/constantViscosity.C b/src/surfaceFilmModels/submodels/momentum/filmViscosityModel/constant/constantViscosity.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/constant/constantViscosity.C
rename to src/surfaceFilmModels/submodels/momentum/filmViscosityModel/constant/constantViscosity.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/constant/constantViscosity.H b/src/surfaceFilmModels/submodels/momentum/filmViscosityModel/constant/constantViscosity.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/constant/constantViscosity.H
rename to src/surfaceFilmModels/submodels/momentum/filmViscosityModel/constant/constantViscosity.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/filmViscosityModel/filmViscosityModel.C b/src/surfaceFilmModels/submodels/momentum/filmViscosityModel/filmViscosityModel/filmViscosityModel.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/filmViscosityModel/filmViscosityModel.C
rename to src/surfaceFilmModels/submodels/momentum/filmViscosityModel/filmViscosityModel/filmViscosityModel.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/filmViscosityModel/filmViscosityModel.H b/src/surfaceFilmModels/submodels/momentum/filmViscosityModel/filmViscosityModel/filmViscosityModel.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/filmViscosityModel/filmViscosityModel.H
rename to src/surfaceFilmModels/submodels/momentum/filmViscosityModel/filmViscosityModel/filmViscosityModel.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.C b/src/surfaceFilmModels/submodels/momentum/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.C
rename to src/surfaceFilmModels/submodels/momentum/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/function1/function1Viscosity.C b/src/surfaceFilmModels/submodels/momentum/filmViscosityModel/function1/function1Viscosity.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/function1/function1Viscosity.C
rename to src/surfaceFilmModels/submodels/momentum/filmViscosityModel/function1/function1Viscosity.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/function1/function1Viscosity.H b/src/surfaceFilmModels/submodels/momentum/filmViscosityModel/function1/function1Viscosity.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/function1/function1Viscosity.H
rename to src/surfaceFilmModels/submodels/momentum/filmViscosityModel/function1/function1Viscosity.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/thixotropic/thixotropicViscosity.C b/src/surfaceFilmModels/submodels/momentum/filmViscosityModel/thixotropic/thixotropicViscosity.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/thixotropic/thixotropicViscosity.C
rename to src/surfaceFilmModels/submodels/momentum/filmViscosityModel/thixotropic/thixotropicViscosity.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/thixotropic/thixotropicViscosity.H b/src/surfaceFilmModels/submodels/momentum/filmViscosityModel/thixotropic/thixotropicViscosity.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/thixotropic/thixotropicViscosity.H
rename to src/surfaceFilmModels/submodels/momentum/filmViscosityModel/thixotropic/thixotropicViscosity.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/waxSolvent/waxSolventViscosity.C b/src/surfaceFilmModels/submodels/momentum/filmViscosityModel/waxSolvent/waxSolventViscosity.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/waxSolvent/waxSolventViscosity.C
rename to src/surfaceFilmModels/submodels/momentum/filmViscosityModel/waxSolvent/waxSolventViscosity.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/waxSolvent/waxSolventViscosity.H b/src/surfaceFilmModels/submodels/momentum/filmViscosityModel/waxSolvent/waxSolventViscosity.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/waxSolvent/waxSolventViscosity.H
rename to src/surfaceFilmModels/submodels/momentum/filmViscosityModel/waxSolvent/waxSolventViscosity.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/contactAngleForce/contactAngleForce.C b/src/surfaceFilmModels/submodels/momentum/force/contactAngleForces/contactAngleForce/contactAngleForce.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/contactAngleForce/contactAngleForce.C
rename to src/surfaceFilmModels/submodels/momentum/force/contactAngleForces/contactAngleForce/contactAngleForce.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/contactAngleForce/contactAngleForce.H b/src/surfaceFilmModels/submodels/momentum/force/contactAngleForces/contactAngleForce/contactAngleForce.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/contactAngleForce/contactAngleForce.H
rename to src/surfaceFilmModels/submodels/momentum/force/contactAngleForces/contactAngleForce/contactAngleForce.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/distribution/distributionContactAngleForce.C b/src/surfaceFilmModels/submodels/momentum/force/contactAngleForces/distribution/distributionContactAngleForce.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/distribution/distributionContactAngleForce.C
rename to src/surfaceFilmModels/submodels/momentum/force/contactAngleForces/distribution/distributionContactAngleForce.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/distribution/distributionContactAngleForce.H b/src/surfaceFilmModels/submodels/momentum/force/contactAngleForces/distribution/distributionContactAngleForce.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/distribution/distributionContactAngleForce.H
rename to src/surfaceFilmModels/submodels/momentum/force/contactAngleForces/distribution/distributionContactAngleForce.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.C b/src/surfaceFilmModels/submodels/momentum/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.C
rename to src/surfaceFilmModels/submodels/momentum/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.H b/src/surfaceFilmModels/submodels/momentum/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.H
rename to src/surfaceFilmModels/submodels/momentum/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.C b/src/surfaceFilmModels/submodels/momentum/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.C
rename to src/surfaceFilmModels/submodels/momentum/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.H b/src/surfaceFilmModels/submodels/momentum/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.H
rename to src/surfaceFilmModels/submodels/momentum/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/force/force/force.C b/src/surfaceFilmModels/submodels/momentum/force/force/force.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/force/force/force.C
rename to src/surfaceFilmModels/submodels/momentum/force/force/force.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/force/force/force.H b/src/surfaceFilmModels/submodels/momentum/force/force/force.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/force/force/force.H
rename to src/surfaceFilmModels/submodels/momentum/force/force/force.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/force/force/forceNew.C b/src/surfaceFilmModels/submodels/momentum/force/force/forceNew.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/force/force/forceNew.C
rename to src/surfaceFilmModels/submodels/momentum/force/force/forceNew.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/force/forceList/forceList.C b/src/surfaceFilmModels/submodels/momentum/force/forceList/forceList.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/force/forceList/forceList.C
rename to src/surfaceFilmModels/submodels/momentum/force/forceList/forceList.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/force/forceList/forceList.H b/src/surfaceFilmModels/submodels/momentum/force/forceList/forceList.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/force/forceList/forceList.H
rename to src/surfaceFilmModels/submodels/momentum/force/forceList/forceList.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/force/thermocapillaryForce/thermocapillaryForce.C b/src/surfaceFilmModels/submodels/momentum/force/thermocapillaryForce/thermocapillaryForce.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/force/thermocapillaryForce/thermocapillaryForce.C
rename to src/surfaceFilmModels/submodels/momentum/force/thermocapillaryForce/thermocapillaryForce.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/force/thermocapillaryForce/thermocapillaryForce.H b/src/surfaceFilmModels/submodels/momentum/force/thermocapillaryForce/thermocapillaryForce.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/force/thermocapillaryForce/thermocapillaryForce.H
rename to src/surfaceFilmModels/submodels/momentum/force/thermocapillaryForce/thermocapillaryForce.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/transferModels/transferModel/transferModel.C b/src/surfaceFilmModels/submodels/momentum/transferModels/transferModel/transferModel.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/transferModels/transferModel/transferModel.C
rename to src/surfaceFilmModels/submodels/momentum/transferModels/transferModel/transferModel.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/transferModels/transferModel/transferModel.H b/src/surfaceFilmModels/submodels/momentum/transferModels/transferModel/transferModel.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/transferModels/transferModel/transferModel.H
rename to src/surfaceFilmModels/submodels/momentum/transferModels/transferModel/transferModel.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/transferModels/transferModel/transferModelNew.C b/src/surfaceFilmModels/submodels/momentum/transferModels/transferModel/transferModelNew.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/transferModels/transferModel/transferModelNew.C
rename to src/surfaceFilmModels/submodels/momentum/transferModels/transferModel/transferModelNew.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/transferModels/transferModelList/transferModelList.C b/src/surfaceFilmModels/submodels/momentum/transferModels/transferModelList/transferModelList.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/transferModels/transferModelList/transferModelList.C
rename to src/surfaceFilmModels/submodels/momentum/transferModels/transferModelList/transferModelList.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/momentum/transferModels/transferModelList/transferModelList.H b/src/surfaceFilmModels/submodels/momentum/transferModels/transferModelList/transferModelList.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/momentum/transferModels/transferModelList/transferModelList.H
rename to src/surfaceFilmModels/submodels/momentum/transferModels/transferModelList/transferModelList.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C b/src/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C
rename to src/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.H b/src/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.H
rename to src/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.C b/src/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.C
rename to src/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.H b/src/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.H
rename to src/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModelNew.C b/src/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModelNew.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModelNew.C
rename to src/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModelNew.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C b/src/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C
rename to src/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.H b/src/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.H
rename to src/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C b/src/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C
rename to src/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.H b/src/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.H
rename to src/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C b/src/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C
rename to src/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.H b/src/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.H
rename to src/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.C b/src/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.C
rename to src/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.H b/src/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.H
rename to src/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.C b/src/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.C
rename to src/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.H b/src/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.H
rename to src/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModelNew.C b/src/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModelNew.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModelNew.C
rename to src/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModelNew.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.C b/src/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.C
rename to src/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.H b/src/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.H
rename to src/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.C b/src/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.C
rename to src/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.H b/src/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.H
rename to src/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.C b/src/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.C
rename to src/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.H b/src/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.H
rename to src/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C b/src/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C
rename to src/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.C b/src/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.C
rename to src/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.H b/src/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.H
rename to src/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/speciePhaseChange/speciePhaseChange.C b/src/surfaceFilmModels/submodels/thermo/phaseChangeModel/speciePhaseChange/speciePhaseChange.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/speciePhaseChange/speciePhaseChange.C
rename to src/surfaceFilmModels/submodels/thermo/phaseChangeModel/speciePhaseChange/speciePhaseChange.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/speciePhaseChange/speciePhaseChange.H b/src/surfaceFilmModels/submodels/thermo/phaseChangeModel/speciePhaseChange/speciePhaseChange.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/speciePhaseChange/speciePhaseChange.H
rename to src/surfaceFilmModels/submodels/thermo/phaseChangeModel/speciePhaseChange/speciePhaseChange.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C b/src/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C
rename to src/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.H b/src/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.H
rename to src/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.H
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C b/src/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C
rename to src/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.H b/src/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.H
rename to src/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.H
diff --git a/src/regionModels/surfaceFilmModels/surfaceFilm/surfaceFilm.C b/src/surfaceFilmModels/surfaceFilm/surfaceFilm.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/surfaceFilm/surfaceFilm.C
rename to src/surfaceFilmModels/surfaceFilm/surfaceFilm.C
diff --git a/src/regionModels/surfaceFilmModels/surfaceFilm/surfaceFilm.H b/src/surfaceFilmModels/surfaceFilm/surfaceFilm.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/surfaceFilm/surfaceFilm.H
rename to src/surfaceFilmModels/surfaceFilm/surfaceFilm.H
diff --git a/src/regionModels/surfaceFilmModels/surfaceFilm/surfaceFilmI.H b/src/surfaceFilmModels/surfaceFilm/surfaceFilmI.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/surfaceFilm/surfaceFilmI.H
rename to src/surfaceFilmModels/surfaceFilm/surfaceFilmI.H
diff --git a/src/regionModels/surfaceFilmModels/thermoSurfaceFilm/thermoSurfaceFilm.C b/src/surfaceFilmModels/thermoSurfaceFilm/thermoSurfaceFilm.C
similarity index 100%
rename from src/regionModels/surfaceFilmModels/thermoSurfaceFilm/thermoSurfaceFilm.C
rename to src/surfaceFilmModels/thermoSurfaceFilm/thermoSurfaceFilm.C
diff --git a/src/regionModels/surfaceFilmModels/thermoSurfaceFilm/thermoSurfaceFilm.H b/src/surfaceFilmModels/thermoSurfaceFilm/thermoSurfaceFilm.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/thermoSurfaceFilm/thermoSurfaceFilm.H
rename to src/surfaceFilmModels/thermoSurfaceFilm/thermoSurfaceFilm.H
diff --git a/src/regionModels/surfaceFilmModels/thermoSurfaceFilm/thermoSurfaceFilmI.H b/src/surfaceFilmModels/thermoSurfaceFilm/thermoSurfaceFilmI.H
similarity index 100%
rename from src/regionModels/surfaceFilmModels/thermoSurfaceFilm/thermoSurfaceFilmI.H
rename to src/surfaceFilmModels/thermoSurfaceFilm/thermoSurfaceFilmI.H