diff --git a/src/functionObjects/field/streamLine/streamLineBase.C b/src/functionObjects/field/streamLine/streamLineBase.C
index 0c1616d16d..2a489fdc78 100644
--- a/src/functionObjects/field/streamLine/streamLineBase.C
+++ b/src/functionObjects/field/streamLine/streamLineBase.C
@@ -512,7 +512,7 @@ bool Foam::functionObjects::streamLineBase::read(const dictionary& dict)
     Info<< type() << " " << name() << ":" << nl;
 
     dict.lookup("fields") >> fields_;
-    dict.lookup("U") >> UName_;
+    UName_ = dict.lookupOrDefault<word>("U", "U");
 
     if (findIndex(fields_, UName_) == -1)
     {
diff --git a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
index 27980c1fb8..b0ecd8c43d 100644
--- a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
+++ b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -52,7 +52,18 @@ namespace fv
 
 void Foam::fv::effectivenessHeatExchangerSource::initialise()
 {
-    const faceZone& fZone = mesh_.faceZones()[zoneID_];
+    const label zoneID = mesh_.faceZones().findZoneID(faceZoneName_);
+
+    if (zoneID < 0)
+    {
+        FatalErrorInFunction
+            << type() << " " << this->name() << ": "
+            << "    Unknown face zone name: " << faceZoneName_
+            << ". Valid face zones are: " << mesh_.faceZones().names()
+            << nl << exit(FatalError);
+    }
+
+    const faceZone& fZone = mesh_.faceZones()[zoneID];
 
     faceId_.setSize(fZone.size());
     facePatchId_.setSize(fZone.size());
@@ -113,31 +124,6 @@ void Foam::fv::effectivenessHeatExchangerSource::initialise()
     faceId_.setSize(count);
     facePatchId_.setSize(count);
     faceSign_.setSize(count);
-
-    calculateTotalArea(faceZoneArea_);
-}
-
-
-void Foam::fv::effectivenessHeatExchangerSource::calculateTotalArea
-(
-    scalar& area
-)
-{
-    area = 0;
-    forAll(faceId_, i)
-    {
-        label facei = faceId_[i];
-        if (facePatchId_[i] != -1)
-        {
-            label patchi = facePatchId_[i];
-            area += mesh_.magSf().boundaryField()[patchi][facei];
-        }
-        else
-        {
-            area += mesh_.magSf()[facei];
-        }
-    }
-    reduce(area, sumOp<scalar>());
 }
 
 
@@ -152,28 +138,20 @@ Foam::fv::effectivenessHeatExchangerSource::effectivenessHeatExchangerSource
 )
 :
     cellSetOption(name, modelType, dict, mesh),
-    secondaryMassFlowRate_(readScalar(coeffs_.lookup("secondaryMassFlowRate"))),
-    secondaryInletT_(readScalar(coeffs_.lookup("secondaryInletT"))),
-    primaryInletT_(readScalar(coeffs_.lookup("primaryInletT"))),
+    secondaryMassFlowRate_(0),
+    secondaryInletT_(0),
+    primaryInletT_(0),
+    userPrimaryInletT_(false),
     eTable_(),
-    UName_(coeffs_.lookupOrDefault<word>("U", "U")),
-    TName_(coeffs_.lookupOrDefault<word>("T", "T")),
-    phiName_(coeffs_.lookupOrDefault<word>("phi", "phi")),
-    faceZoneName_(coeffs_.lookup("faceZone")),
-    zoneID_(mesh_.faceZones().findZoneID(faceZoneName_)),
+    UName_("U"),
+    TName_("T"),
+    phiName_("phi"),
+    faceZoneName_("unknown-faceZone"),
     faceId_(),
     facePatchId_(),
-    faceSign_(),
-    faceZoneArea_(0)
+    faceSign_()
 {
-    if (zoneID_ < 0)
-    {
-        FatalErrorInFunction
-            << type() << " " << this->name() << ": "
-            << "    Unknown face zone name: " << faceZoneName_
-            << ". Valid face zones are: " << mesh_.faceZones().names()
-            << nl << exit(FatalError);
-    }
+    read(dict);
 
     // Set the field name to that of the energy field from which the temperature
     // is obtained
@@ -208,35 +186,61 @@ void Foam::fv::effectivenessHeatExchangerSource::addSup
     const surfaceScalarField& phi =
         mesh_.lookupObject<surfaceScalarField>(phiName_);
 
-    scalar totalphi = 0;
+    const volScalarField& T = mesh_.lookupObject<volScalarField>(TName_);
+    const surfaceScalarField Tf(fvc::interpolate(T));
+
+    scalar sumPhi = 0;
+    scalar sumMagPhi = 0;
     scalar CpfMean = 0;
+    scalar primaryInletTfMean = 0;
     forAll(faceId_, i)
     {
         label facei = faceId_[i];
         if (facePatchId_[i] != -1)
         {
             label patchi = facePatchId_[i];
-            totalphi += phi.boundaryField()[patchi][facei]*faceSign_[i];
+            scalar phii = phi.boundaryField()[patchi][facei]*faceSign_[i];
 
-            CpfMean +=
-                Cpf.boundaryField()[patchi][facei]
-               *mesh_.magSf().boundaryField()[patchi][facei];
+            sumPhi += phii;
+
+            scalar Cpfi = Cpf.boundaryField()[patchi][facei];
+            scalar Tfi = Tf.boundaryField()[patchi][facei];
+            scalar magPhii = mag(phii);
+
+            sumMagPhi += magPhii;
+            CpfMean += Cpfi*magPhii;
+            primaryInletTfMean += Tfi*magPhii;
         }
         else
         {
-            totalphi += phi[facei]*faceSign_[i];
-            CpfMean += Cpf[facei]*mesh_.magSf()[facei];
+            scalar phii = phi[facei]*faceSign_[i];
+            scalar magPhii = mag(phii);
+
+            sumPhi += phii;
+            sumMagPhi += magPhii;
+            CpfMean += Cpf[facei]*magPhii;
+            primaryInletTfMean += Tf[facei]*magPhii;
         }
     }
     reduce(CpfMean, sumOp<scalar>());
-    reduce(totalphi, sumOp<scalar>());
+    reduce(sumPhi, sumOp<scalar>());
+    reduce(sumMagPhi, sumOp<scalar>());
+    reduce(primaryInletTfMean, sumOp<scalar>());
+
+    primaryInletTfMean /= sumMagPhi;
+    CpfMean /= sumMagPhi;
+
+    scalar primaryInletT = primaryInletT_;
+    if (!userPrimaryInletT_)
+    {
+        primaryInletT = primaryInletTfMean;
+    }
 
     scalar Qt =
-        eTable_()(mag(totalphi), secondaryMassFlowRate_)
-       *(secondaryInletT_ - primaryInletT_)
-       *(CpfMean/faceZoneArea_)*mag(totalphi);
+        eTable_()(mag(sumPhi), secondaryMassFlowRate_)
+       *(secondaryInletT_ - primaryInletT)
+       *CpfMean*mag(sumPhi);
 
-    const volScalarField& T = mesh_.lookupObject<volScalarField>(TName_);
     const scalarField TCells(T, cells_);
     scalar Tref = 0;
     if (Qt > 0)
@@ -268,7 +272,8 @@ void Foam::fv::effectivenessHeatExchangerSource::addSup
     scalar sumWeight = 0;
     forAll(cells_, i)
     {
-        sumWeight += V[cells_[i]]*mag(U[cells_[i]])*deltaTCells[i];
+        label celli = cells_[i];
+        sumWeight += V[celli]*mag(U[celli])*deltaTCells[i];
     }
     reduce(sumWeight, sumOp<scalar>());
 
@@ -278,18 +283,19 @@ void Foam::fv::effectivenessHeatExchangerSource::addSup
 
         forAll(cells_, i)
         {
-            heSource[cells_[i]] -=
-                Qt*V[cells_[i]]*mag(U[cells_[i]])*deltaTCells[i]/sumWeight;
+            label celli = cells_[i];
+            heSource[celli] -=
+                Qt*V[celli]*mag(U[celli])*deltaTCells[i]/sumWeight;
         }
     }
 
     if (debug && Pstream::master())
     {
-        Info<< indent << "Net mass flux [Kg/s] = " << totalphi << nl;
-        Info<< indent << "Total energy exchange [W] = " << Qt << nl;
-        Info<< indent << "Tref [K] = " << Tref << nl;
-        Info<< indent << "Efficiency : "
-            << eTable_()(mag(totalphi), secondaryMassFlowRate_) << endl;
+        Info<< indent << "Net mass flux [Kg/s]      : " << sumPhi << nl;
+        Info<< indent << "Total energy exchange [W] : " << Qt << nl;
+        Info<< indent << "Tref [K]                  : " << Tref << nl;
+        Info<< indent << "Efficiency                : "
+            << eTable_()(mag(sumPhi), secondaryMassFlowRate_) << endl;
     }
 }
 
@@ -298,9 +304,28 @@ bool Foam::fv::effectivenessHeatExchangerSource::read(const dictionary& dict)
 {
     if (cellSetOption::read(dict))
     {
+        UName_ = coeffs_.lookupOrDefault<word>("UName", "U");
+        TName_ = coeffs_.lookupOrDefault<word>("TName", "T");
+        phiName_ = coeffs_.lookupOrDefault<word>("phiName", "phi");
+        coeffs_.lookup("faceZone") >> faceZoneName_;
+
         coeffs_.lookup("secondaryMassFlowRate") >> secondaryMassFlowRate_;
         coeffs_.lookup("secondaryInletT") >> secondaryInletT_;
-        coeffs_.lookup("primaryInletT") >> primaryInletT_;
+
+        if (coeffs_.readIfPresent("primaryInletT", primaryInletT_))
+        {
+            Info<< type() << " " << this->name() << ": "
+                << "employing user-specified primary flow inlet temperature: "
+                << primaryInletT_ << endl;
+
+            userPrimaryInletT_ = true;
+        }
+        else
+        {
+            Info<< type() << " " << this->name() << ": "
+                << "employing flux-weighted primary flow inlet temperature"
+                << endl;
+        }
 
         return true;
     }
diff --git a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H
index ebb5206872..92831a8c1d 100644
--- a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H
+++ b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -77,7 +77,7 @@ Usage
 
             secondaryMassFlowRate   1.0;
             secondaryInletT         336;
-            primaryInletT           293;
+            // primaryInletT           293;  // Constrain to this T if present
             faceZone                facesZoneInletOriented;
             outOfBounds             clamp;
             fileName                "effTable";
@@ -88,16 +88,19 @@ Usage
     The effectiveness table is described in terms of the primary and secondary
     mass flow rates.  For example, the table:
 
+    \verbatim
                            secondary MFR
                        |  0.1   0.2   0.3
                   -----+-----------------
                   0.02 |   A     B     C
      primary MFR  0.04 |   D     E     F
                   0.06 |   G     H     I
+    \endverbatim
 
 
     Is specified by the following:
 
+    \verbatim
         (
             0.02
             (
@@ -118,7 +121,7 @@ Usage
                 (0.3    I)
             )
         );
-
+    \endverbatim
 
 Note
 - the table with name "fileName" should have the same units as the
@@ -169,6 +172,9 @@ protected:
         //- Primary air temperature at the heat exchanger inlet [K]
         scalar primaryInletT_;
 
+        //- Flag to use a user-specified primary inlet temperature
+        bool userPrimaryInletT_;
+
         //- 2D look up table efficiency = function of primary and secondary
         // mass flow rates [kg/s]
         autoPtr<interpolation2DTable<scalar>> eTable_;
@@ -185,9 +191,6 @@ protected:
         //- Name of the faceZone at the heat exchange inlet
         word faceZoneName_;
 
-        //- Id for the face zone
-        label zoneID_;
-
          //- Local list of face IDs
         labelList faceId_;
 
@@ -197,9 +200,6 @@ protected:
         //- List of +1/-1 representing face flip map (1 use as is, -1 negate)
         labelList faceSign_;
 
-        //- Area of the face zone
-        scalar faceZoneArea_;
-
 
 private:
 
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/0/C7H16 b/tutorials/combustion/fireFoam/LES/compartmentFire/0/C7H16
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/0/C7H16
rename to tutorials/combustion/fireFoam/LES/compartmentFire/0/C7H16
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/0/IDefault b/tutorials/combustion/fireFoam/LES/compartmentFire/0/IDefault
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/0/IDefault
rename to tutorials/combustion/fireFoam/LES/compartmentFire/0/IDefault
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/0/N2 b/tutorials/combustion/fireFoam/LES/compartmentFire/0/N2
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/0/N2
rename to tutorials/combustion/fireFoam/LES/compartmentFire/0/N2
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/0/O2 b/tutorials/combustion/fireFoam/LES/compartmentFire/0/O2
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/0/O2
rename to tutorials/combustion/fireFoam/LES/compartmentFire/0/O2
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/0/T b/tutorials/combustion/fireFoam/LES/compartmentFire/0/T
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/0/T
rename to tutorials/combustion/fireFoam/LES/compartmentFire/0/T
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/0/U b/tutorials/combustion/fireFoam/LES/compartmentFire/0/U
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/0/U
rename to tutorials/combustion/fireFoam/LES/compartmentFire/0/U
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/0/Ydefault b/tutorials/combustion/fireFoam/LES/compartmentFire/0/Ydefault
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/0/Ydefault
rename to tutorials/combustion/fireFoam/LES/compartmentFire/0/Ydefault
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/0/alphat b/tutorials/combustion/fireFoam/LES/compartmentFire/0/alphat
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/0/alphat
rename to tutorials/combustion/fireFoam/LES/compartmentFire/0/alphat
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/0/k b/tutorials/combustion/fireFoam/LES/compartmentFire/0/k
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/0/k
rename to tutorials/combustion/fireFoam/LES/compartmentFire/0/k
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/0/nut b/tutorials/combustion/fireFoam/LES/compartmentFire/0/nut
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/0/nut
rename to tutorials/combustion/fireFoam/LES/compartmentFire/0/nut
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/0/p b/tutorials/combustion/fireFoam/LES/compartmentFire/0/p
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/0/p
rename to tutorials/combustion/fireFoam/LES/compartmentFire/0/p
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/0/p_rgh b/tutorials/combustion/fireFoam/LES/compartmentFire/0/p_rgh
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/0/p_rgh
rename to tutorials/combustion/fireFoam/LES/compartmentFire/0/p_rgh
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/0/panelRegion/T b/tutorials/combustion/fireFoam/LES/compartmentFire/0/panelRegion/T
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/0/panelRegion/T
rename to tutorials/combustion/fireFoam/LES/compartmentFire/0/panelRegion/T
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/0/panelRegion/cellToRegion b/tutorials/combustion/fireFoam/LES/compartmentFire/0/panelRegion/cellToRegion
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/0/panelRegion/cellToRegion
rename to tutorials/combustion/fireFoam/LES/compartmentFire/0/panelRegion/cellToRegion
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/0/panelRegion/p b/tutorials/combustion/fireFoam/LES/compartmentFire/0/panelRegion/p
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/0/panelRegion/p
rename to tutorials/combustion/fireFoam/LES/compartmentFire/0/panelRegion/p
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/Allclean b/tutorials/combustion/fireFoam/LES/compartmentFire/Allclean
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/Allclean
rename to tutorials/combustion/fireFoam/LES/compartmentFire/Allclean
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/Allrun b/tutorials/combustion/fireFoam/LES/compartmentFire/Allrun
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/Allrun
rename to tutorials/combustion/fireFoam/LES/compartmentFire/Allrun
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/constant/additionalControls b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/additionalControls
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/constant/additionalControls
rename to tutorials/combustion/fireFoam/LES/compartmentFire/constant/additionalControls
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/constant/boundaryRadiationProperties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/boundaryRadiationProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/constant/boundaryRadiationProperties
rename to tutorials/combustion/fireFoam/LES/compartmentFire/constant/boundaryRadiationProperties
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/constant/combustionProperties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/combustionProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/constant/combustionProperties
rename to tutorials/combustion/fireFoam/LES/compartmentFire/constant/combustionProperties
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/constant/g b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/g
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/constant/g
rename to tutorials/combustion/fireFoam/LES/compartmentFire/constant/g
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/constant/hRef b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/hRef
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/constant/hRef
rename to tutorials/combustion/fireFoam/LES/compartmentFire/constant/hRef
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/constant/massLossRate b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/massLossRate
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/constant/massLossRate
rename to tutorials/combustion/fireFoam/LES/compartmentFire/constant/massLossRate
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/constant/panelRegion/radiationProperties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/panelRegion/radiationProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/constant/panelRegion/radiationProperties
rename to tutorials/combustion/fireFoam/LES/compartmentFire/constant/panelRegion/radiationProperties
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/constant/panelRegion/thermophysicalProperties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/panelRegion/thermophysicalProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/constant/panelRegion/thermophysicalProperties
rename to tutorials/combustion/fireFoam/LES/compartmentFire/constant/panelRegion/thermophysicalProperties
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/constant/pyrolysisZones b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/pyrolysisZones
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/constant/pyrolysisZones
rename to tutorials/combustion/fireFoam/LES/compartmentFire/constant/pyrolysisZones
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/constant/radiationProperties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/radiationProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/constant/radiationProperties
rename to tutorials/combustion/fireFoam/LES/compartmentFire/constant/radiationProperties
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/constant/reactingCloud1Properties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/reactingCloud1Properties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/constant/reactingCloud1Properties
rename to tutorials/combustion/fireFoam/LES/compartmentFire/constant/reactingCloud1Properties
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/constant/reactions b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/reactions
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/constant/reactions
rename to tutorials/combustion/fireFoam/LES/compartmentFire/constant/reactions
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/surfaceFilmProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/constant/surfaceFilmProperties
rename to tutorials/combustion/fireFoam/LES/compartmentFire/constant/surfaceFilmProperties
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/constant/thermo.compressibleGas b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/thermo.compressibleGas
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/constant/thermo.compressibleGas
rename to tutorials/combustion/fireFoam/LES/compartmentFire/constant/thermo.compressibleGas
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/thermophysicalProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/constant/thermophysicalProperties
rename to tutorials/combustion/fireFoam/LES/compartmentFire/constant/thermophysicalProperties
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/constant/turbulenceProperties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/turbulenceProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/constant/turbulenceProperties
rename to tutorials/combustion/fireFoam/LES/compartmentFire/constant/turbulenceProperties
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/system/blockMeshDict.m4 b/tutorials/combustion/fireFoam/LES/compartmentFire/system/blockMeshDict.m4
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/system/blockMeshDict.m4
rename to tutorials/combustion/fireFoam/LES/compartmentFire/system/blockMeshDict.m4
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/system/controlDict b/tutorials/combustion/fireFoam/LES/compartmentFire/system/controlDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/system/controlDict
rename to tutorials/combustion/fireFoam/LES/compartmentFire/system/controlDict
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/system/createPatchDict b/tutorials/combustion/fireFoam/LES/compartmentFire/system/createPatchDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/system/createPatchDict
rename to tutorials/combustion/fireFoam/LES/compartmentFire/system/createPatchDict
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/system/decomposeParDict b/tutorials/combustion/fireFoam/LES/compartmentFire/system/decomposeParDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/system/decomposeParDict
rename to tutorials/combustion/fireFoam/LES/compartmentFire/system/decomposeParDict
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/system/extrudeToRegionMeshDict b/tutorials/combustion/fireFoam/LES/compartmentFire/system/extrudeToRegionMeshDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/system/extrudeToRegionMeshDict
rename to tutorials/combustion/fireFoam/LES/compartmentFire/system/extrudeToRegionMeshDict
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/system/fvSchemes b/tutorials/combustion/fireFoam/LES/compartmentFire/system/fvSchemes
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/system/fvSchemes
rename to tutorials/combustion/fireFoam/LES/compartmentFire/system/fvSchemes
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/system/fvSolution b/tutorials/combustion/fireFoam/LES/compartmentFire/system/fvSolution
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/system/fvSolution
rename to tutorials/combustion/fireFoam/LES/compartmentFire/system/fvSolution
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/system/panelRegion/decomposeParDict b/tutorials/combustion/fireFoam/LES/compartmentFire/system/panelRegion/decomposeParDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/system/panelRegion/decomposeParDict
rename to tutorials/combustion/fireFoam/LES/compartmentFire/system/panelRegion/decomposeParDict
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/system/panelRegion/fvSchemes b/tutorials/combustion/fireFoam/LES/compartmentFire/system/panelRegion/fvSchemes
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/system/panelRegion/fvSchemes
rename to tutorials/combustion/fireFoam/LES/compartmentFire/system/panelRegion/fvSchemes
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/system/panelRegion/fvSolution b/tutorials/combustion/fireFoam/LES/compartmentFire/system/panelRegion/fvSolution
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/system/panelRegion/fvSolution
rename to tutorials/combustion/fireFoam/LES/compartmentFire/system/panelRegion/fvSolution
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/system/snappyHexMeshDict b/tutorials/combustion/fireFoam/LES/compartmentFire/system/snappyHexMeshDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/system/snappyHexMeshDict
rename to tutorials/combustion/fireFoam/LES/compartmentFire/system/snappyHexMeshDict
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/system/topoSetDict b/tutorials/combustion/fireFoam/LES/compartmentFire/system/topoSetDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/system/topoSetDict
rename to tutorials/combustion/fireFoam/LES/compartmentFire/system/topoSetDict
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/validation/Probes/Oxygen/oxygen.dat b/tutorials/combustion/fireFoam/LES/compartmentFire/validation/Probes/Oxygen/oxygen.dat
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/validation/Probes/Oxygen/oxygen.dat
rename to tutorials/combustion/fireFoam/LES/compartmentFire/validation/Probes/Oxygen/oxygen.dat
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/validation/Probes/Temperature/temperature.dat b/tutorials/combustion/fireFoam/LES/compartmentFire/validation/Probes/Temperature/temperature.dat
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/validation/Probes/Temperature/temperature.dat
rename to tutorials/combustion/fireFoam/LES/compartmentFire/validation/Probes/Temperature/temperature.dat
diff --git a/tutorials/combustion/fireFoam/les/compartmentFire/validation/createGraphs b/tutorials/combustion/fireFoam/LES/compartmentFire/validation/createGraphs
similarity index 100%
rename from tutorials/combustion/fireFoam/les/compartmentFire/validation/createGraphs
rename to tutorials/combustion/fireFoam/LES/compartmentFire/validation/createGraphs
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/.out.kate-swp b/tutorials/combustion/fireFoam/LES/simplePMMApanel/.out.kate-swp
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/.out.kate-swp
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/.out.kate-swp
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/0/CH4 b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0/CH4
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/0/CH4
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/0/CH4
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/0/G b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0/G
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/0/G
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/0/G
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/0/N2 b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0/N2
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/0/N2
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/0/N2
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/0/O2 b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0/O2
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/0/O2
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/0/O2
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/0/T b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0/T
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/0/T
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/0/T
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/0/U b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0/U
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/0/U
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/0/U
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/0/Ydefault b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0/Ydefault
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/0/Ydefault
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/0/Ydefault
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/0/alphat b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0/alphat
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/0/alphat
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/0/alphat
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/0/k b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0/k
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/0/k
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/0/k
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/0/nut b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0/nut
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/0/nut
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/0/nut
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/0/p b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0/p
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/0/p
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/0/p
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/0/p_rgh b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0/p_rgh
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/0/p_rgh
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/0/p_rgh
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/0/panelRegion/PMMA b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0/panelRegion/PMMA
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/0/panelRegion/PMMA
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/0/panelRegion/PMMA
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/0/panelRegion/Qr b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0/panelRegion/Qr
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/0/panelRegion/Qr
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/0/panelRegion/Qr
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/0/panelRegion/T b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0/panelRegion/T
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/0/panelRegion/T
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/0/panelRegion/T
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/0/panelRegion/Y0Default b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0/panelRegion/Y0Default
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/0/panelRegion/Y0Default
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/0/panelRegion/Y0Default
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/0/panelRegion/p b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0/panelRegion/p
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/0/panelRegion/p
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/0/panelRegion/p
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/Allclean b/tutorials/combustion/fireFoam/LES/simplePMMApanel/Allclean
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/Allclean
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/Allclean
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/Allrun b/tutorials/combustion/fireFoam/LES/simplePMMApanel/Allrun
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/Allrun
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/Allrun
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/constant/additionalControls b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/additionalControls
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/constant/additionalControls
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/additionalControls
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/constant/boundaryRadiationProperties b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/boundaryRadiationProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/constant/boundaryRadiationProperties
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/boundaryRadiationProperties
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/constant/combustionProperties b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/combustionProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/constant/combustionProperties
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/combustionProperties
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/constant/g b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/g
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/constant/g
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/g
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/constant/panelRegion/chemistryProperties b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/panelRegion/chemistryProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/constant/panelRegion/chemistryProperties
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/panelRegion/chemistryProperties
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/constant/panelRegion/radiationProperties b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/panelRegion/radiationProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/constant/panelRegion/radiationProperties
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/panelRegion/radiationProperties
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/constant/panelRegion/reactions b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/panelRegion/reactions
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/constant/panelRegion/reactions
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/panelRegion/reactions
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/constant/panelRegion/thermo.solid b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/panelRegion/thermo.solid
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/constant/panelRegion/thermo.solid
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/panelRegion/thermo.solid
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/constant/panelRegion/thermophysicalProperties b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/panelRegion/thermophysicalProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/constant/panelRegion/thermophysicalProperties
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/panelRegion/thermophysicalProperties
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/constant/polyMesh/blockMeshDict b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/constant/polyMesh/blockMeshDict
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/polyMesh/blockMeshDict
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/constant/pyrolysisZones b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/pyrolysisZones
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/constant/pyrolysisZones
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/pyrolysisZones
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/constant/radiationProperties b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/radiationProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/constant/radiationProperties
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/radiationProperties
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/constant/reactingCloud1Positions b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/reactingCloud1Positions
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/constant/reactingCloud1Positions
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/reactingCloud1Positions
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/constant/reactingCloud1Properties b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/reactingCloud1Properties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/constant/reactingCloud1Properties
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/reactingCloud1Properties
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/constant/reactions b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/reactions
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/constant/reactions
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/reactions
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/surfaceFilmProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/constant/surfaceFilmProperties
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/surfaceFilmProperties
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/constant/thermo.compressibleGas b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/thermo.compressibleGas
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/constant/thermo.compressibleGas
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/thermo.compressibleGas
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/thermophysicalProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/constant/thermophysicalProperties
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/thermophysicalProperties
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/constant/turbulenceProperties b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/turbulenceProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/constant/turbulenceProperties
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/turbulenceProperties
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/system/controlDict b/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/controlDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/system/controlDict
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/system/controlDict
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/system/extrudeToRegionMeshDict b/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/extrudeToRegionMeshDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/system/extrudeToRegionMeshDict
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/system/extrudeToRegionMeshDict
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/system/fvSchemes b/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/fvSchemes
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/system/fvSchemes
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/system/fvSchemes
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/system/fvSolution b/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/fvSolution
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/system/fvSolution
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/system/fvSolution
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/system/makeFaceSet.setSet b/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/makeFaceSet.setSet
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/system/makeFaceSet.setSet
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/system/makeFaceSet.setSet
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/system/panelRegion/fvSchemes b/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/panelRegion/fvSchemes
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/system/panelRegion/fvSchemes
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/system/panelRegion/fvSchemes
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/system/panelRegion/fvSolution b/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/panelRegion/fvSolution
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/system/panelRegion/fvSolution
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/system/panelRegion/fvSolution
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/system/topoSetDict b/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/topoSetDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/simplePMMApanel/system/topoSetDict
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/system/topoSetDict
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/boundaryRadiationProperties b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/boundaryRadiationProperties
deleted file mode 100644
index 530a06e550..0000000000
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/boundaryRadiationProperties
+++ /dev/null
@@ -1,33 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  plus                                  |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      boundaryRadiationProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
-region0_to_pyrolysisRegion_coupledWall
-{
-    mode            solidRadiation;
-}
-
-".*"
-{
-    mode            lookup;
-    emissivity      1.0;
-    absorptivity    1.0;
-    transmissivity  0.0;
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/boundaryRadiationProperties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/boundaryRadiationProperties
deleted file mode 100644
index d3a530f353..0000000000
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/boundaryRadiationProperties
+++ /dev/null
@@ -1,33 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  plus                                  |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      boundaryRadiationProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
-".*"
-{
-    type            boundaryRadiation;
-    mode            lookup;
-    emissivity      1.0;
-}
-
-"(region0_to.*)"
-{
-    type            boundaryRadiation;
-    mode            solidRadiation;
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/boundaryRadiationProperties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/boundaryRadiationProperties
deleted file mode 100644
index a4660c95b7..0000000000
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/boundaryRadiationProperties
+++ /dev/null
@@ -1,43 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  plus                                  |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      boundaryRadiationProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-base
-{
-    mode            lookup;
-    emissivity      1.0;
-}
-
-outlet
-{
-    mode            lookup;
-    emissivity      1.0;
-}
-
-sides
-{
-    mode            lookup;
-    emissivity      1.0;
-}
-
-inlet
-{
-    mode            lookup;
-    emissivity      1.0;
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/chemistryProperties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/chemistryProperties
deleted file mode 100644
index a91c50449c..0000000000
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/chemistryProperties
+++ /dev/null
@@ -1,29 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  plus                                  |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      chemistryProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-chemistryType
-{
-    chemistrySolver   noChemistrySolver;
-    chemistryThermo   psi;
-}
-
-chemistry           on;
-
-initialChemicalTimeStep 1e-07;
-
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/boundaryRadiationProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/boundaryRadiationProperties
deleted file mode 100644
index 474446378f..0000000000
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/boundaryRadiationProperties
+++ /dev/null
@@ -1,26 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  plus                                  |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      boundaryRadiationProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-".*"
-{
-    mode            lookup;
-    emissivity      1.0;
-    absorptivity    0.0;
-}
-
-
-// ************************************************************************* //