diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMeshDict b/applications/utilities/mesh/manipulation/renumberMesh/renumberMeshDict
index 229a250352..15547e985e 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMeshDict
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMeshDict
@@ -40,8 +40,8 @@ method          CuthillMcKee;
 //method          Sloan;
 //method          manual;
 //method          random;
+//method          structured;
 //method          spring;
-//method          boundaryFirst;
 //method          zoltan;             // only if compiled with zoltan support
 
 //CuthillMcKeeCoeffs
@@ -57,6 +57,23 @@ manualCoeffs
 }
 
 
+// For extruded (i.e. structured in one direction) meshes
+structuredCoeffs
+{
+    // Patches that mesh was extruded from. These determine the starting
+    // layer of cells
+    patches (movingWall);
+    // Method to renumber the starting layer of cells
+    method  random;
+
+    // Renumber in columns (depthFirst) or in layers
+    depthFirst true;
+
+    // Optional: reverse ordering
+    //reverse false;
+}
+
+
 springCoeffs
 {
     // Maximum jump of cell indices. Is fraction of number of cells
@@ -90,10 +107,4 @@ zoltanCoeffs
 }
 
 
-//boundaryFirstCoeffs
-//{
-//    reverse true;
-//}
-
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H b/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H
index e33acfa464..56121a22ef 100644
--- a/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H
+++ b/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H
@@ -29,6 +29,10 @@ Description
 
     Like IndirectList but does not store addressing.
 
+    Note the const_cast of the completeList. This is so we can use it both
+    on const and non-const lists. Alternative would be to have a const_
+    variant etc.
+
 SourceFiles
     UIndirectListI.H
 
diff --git a/src/renumber/renumberMethods/Make/files b/src/renumber/renumberMethods/Make/files
index c19f1e6b6d..4fe9cd69fb 100644
--- a/src/renumber/renumberMethods/Make/files
+++ b/src/renumber/renumberMethods/Make/files
@@ -3,6 +3,6 @@ manualRenumber/manualRenumber.C
 CuthillMcKeeRenumber/CuthillMcKeeRenumber.C
 randomRenumber/randomRenumber.C
 springRenumber/springRenumber.C
-boundaryFirstRenumber/boundaryFirstRenumber.C
+structuredRenumber/structuredRenumber.C
 
 LIB = $(FOAM_LIBBIN)/librenumberMethods
diff --git a/src/renumber/renumberMethods/Make/options b/src/renumber/renumberMethods/Make/options
index 03cb68d946..cc28bc2f00 100644
--- a/src/renumber/renumberMethods/Make/options
+++ b/src/renumber/renumberMethods/Make/options
@@ -1,7 +1,9 @@
 EXE_INC = \
     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
 LIB_LIBS = \
     -ldecompositionMethods \
+    -lfiniteVolume \
     -lmeshTools
diff --git a/src/renumber/renumberMethods/boundaryFirstRenumber/boundaryFirstRenumber.C b/src/renumber/renumberMethods/boundaryFirstRenumber/boundaryFirstRenumber.C
deleted file mode 100644
index a68084c327..0000000000
--- a/src/renumber/renumberMethods/boundaryFirstRenumber/boundaryFirstRenumber.C
+++ /dev/null
@@ -1,258 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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 "boundaryFirstRenumber.H"
-#include "addToRunTimeSelectionTable.H"
-#include "bandCompression.H"
-#include "decompositionMethod.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    defineTypeNameAndDebug(boundaryFirstRenumber, 0);
-
-    addToRunTimeSelectionTable
-    (
-        renumberMethod,
-        boundaryFirstRenumber,
-        dictionary
-    );
-}
-
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-Foam::label Foam::boundaryFirstRenumber::countInternalFaces
-(
-    const primitiveMesh& mesh,
-    const label cellI
-) const
-{
-    const cell& cFaces = mesh.cells()[cellI];
-
-    label nInt = 0;
-
-    forAll(cFaces, i)
-    {
-        label faceI = cFaces[i];
-        if (mesh.isInternalFace(faceI))
-        {
-            nInt++;
-        }
-    }
-    return nInt;
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::boundaryFirstRenumber::boundaryFirstRenumber
-(
-    const dictionary& renumberDict
-)
-:
-    renumberMethod(renumberDict),
-    reverse_
-    (
-        renumberDict.found(typeName + "Coeffs")
-      ? Switch(renumberDict.subDict(typeName + "Coeffs").lookup("reverse"))
-      : Switch(true)
-    )
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-Foam::labelList Foam::boundaryFirstRenumber::renumber
-(
-    const polyMesh& mesh,
-    const pointField& points
-) const
-{
-    const labelList& own = mesh.faceOwner();
-    const labelList& nei = mesh.faceNeighbour();
-
-    // Distance to boundary. Minimum of neighbours.
-    labelList distance(mesh.nCells(), -1);
-
-    // New order
-    labelList newOrder(mesh.nCells());
-    label cellInOrder = 0;
-
-
-    // Starting faces for walk. These are the zero distance faces.
-    DynamicList<label> frontFaces(mesh.nFaces()-mesh.nInternalFaces());
-
-    const polyBoundaryMesh& patches = mesh.boundaryMesh();
-
-    forAll(patches, patchI)
-    {
-        const polyPatch& pp = patches[patchI];
-
-        //- Note: cannot check for empty since these are introduced by
-        //  fvMeshSubset. Also most loops don't care about patch type.
-        //if (!isA<emptyPolyPatch>(pp))
-        {
-            forAll(pp, i)
-            {
-                frontFaces.append(pp.start()+i);
-            }
-        }
-    }
-
-
-    DynamicList<label> frontCells(frontFaces.size());
-    DynamicList<label> frontCellWeights(frontFaces.size());
-
-    // - ordering
-    labelList order;
-
-    // Loop over all frontFaces
-    label currentDistance = 0;
-    while (frontFaces.size() > 0)
-    {
-        frontCells.clear();
-        frontCellWeights.clear();
-
-        // Set all of frontFaces' neighbours to current distance
-
-        forAll(frontFaces, i)
-        {
-            label faceI = frontFaces[i];
-
-            if (mesh.isInternalFace(faceI))
-            {
-                label ownCellI = own[faceI];
-                if (distance[ownCellI] == -1)
-                {
-                    distance[ownCellI] = currentDistance;
-                    frontCells.append(ownCellI);
-                    frontCellWeights.append
-                    (
-                        countInternalFaces
-                        (
-                            mesh,
-                            ownCellI
-                        )
-                    );
-                }
-                label neiCellI = nei[faceI];
-                if (distance[neiCellI] == -1)
-                {
-                    distance[neiCellI] = currentDistance;
-                    frontCells.append(neiCellI);
-                    frontCellWeights.append
-                    (
-                        countInternalFaces
-                        (
-                            mesh,
-                            neiCellI
-                        )
-                    );
-                }
-            }
-            else
-            {
-                label ownCellI = own[faceI];
-                if (distance[ownCellI] == -1)
-                {
-                    distance[ownCellI] = currentDistance;
-                    frontCells.append(ownCellI);
-                    frontCellWeights.append
-                    (
-                        countInternalFaces
-                        (
-                            mesh,
-                            ownCellI
-                        )
-                    );
-                }
-            }
-        }
-
-        //Pout<< "For distance:" << currentDistance
-        //    << " from " << frontFaces.size() << " faces to "
-        //    << frontCells.size() << " cells." << endl;
-
-
-        // Determine order within current shell (frontCells) and add them
-        sortedOrder(frontCellWeights, order);
-        // 3. Add in sorted order
-        forAll(order, i)
-        {
-            newOrder[cellInOrder] = frontCells[order[i]];
-            cellInOrder++;
-        }
-
-        // From cells to faces
-        frontFaces.clear();
-        forAll(frontCells, i)
-        {
-            label cellI = frontCells[i];
-            const cell& cFaces = mesh.cells()[cellI];
-
-            forAll(cFaces, i)
-            {
-                label faceI = cFaces[i];
-                if (mesh.isInternalFace(faceI))
-                {
-                    label nbrCellI =
-                    (
-                        mesh.faceOwner()[faceI] == cellI
-                      ? mesh.faceNeighbour()[faceI]
-                      : mesh.faceOwner()[faceI]
-                    );
-                    if (distance[nbrCellI] == -1)
-                    {
-                        frontFaces.append(faceI);
-                    }
-                }
-            }
-        }
-
-        currentDistance++;
-    }
-
-    // Return furthest away cell first
-    if (reverse_)
-    {
-        reverse(newOrder);
-    }
-
-    //forAll(newOrder, i)
-    //{
-    //    label cellI = newOrder[i];
-    //
-    //    Pout<< "cell:" << cellI << endl;
-    //    Pout<< " at distance:" << distance[cellI]
-    //        << endl;
-    //}
-
-    return newOrder;
-}
-
-
-// ************************************************************************* //
diff --git a/src/renumber/renumberMethods/structuredRenumber/structuredRenumber.C b/src/renumber/renumberMethods/structuredRenumber/structuredRenumber.C
new file mode 100644
index 0000000000..0593e2d49f
--- /dev/null
+++ b/src/renumber/renumberMethods/structuredRenumber/structuredRenumber.C
@@ -0,0 +1,223 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 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 "structuredRenumber.H"
+#include "addToRunTimeSelectionTable.H"
+#include "topoDistanceData.H"
+#include "fvMeshSubset.H"
+#include "FaceCellWave.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(structuredRenumber, 0);
+
+    addToRunTimeSelectionTable
+    (
+        renumberMethod,
+        structuredRenumber,
+        dictionary
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::structuredRenumber::structuredRenumber
+(
+    const dictionary& renumberDict
+)
+:
+    renumberMethod(renumberDict),
+    methodDict_(renumberDict.subDict(typeName + "Coeffs")),
+    patches_(methodDict_.lookup("patches")),
+    //nLayers_(readLabel(methodDict_.lookup("nLayers"))),
+    depthFirst_(methodDict_.lookup("depthFirst")),
+    method_(renumberMethod::New(methodDict_)),
+    reverse_(methodDict_.lookup("reverse"))
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::labelList Foam::structuredRenumber::renumber
+(
+    const polyMesh& mesh,
+    const pointField& points
+) const
+{
+    if (points.size() != mesh.nCells())
+    {
+        FatalErrorIn
+        (
+            "structuredDecomp::renumber(const polyMesh&, const pointField&)"
+        )   << "Number of points " << points.size()
+            << " should equal the number of cells " << mesh.nCells()
+            << exit(FatalError);
+    }
+
+    const polyBoundaryMesh& pbm = mesh.boundaryMesh();
+    const labelHashSet patchIDs(pbm.patchSet(patches_));
+
+    label nFaces = 0;
+    forAllConstIter(labelHashSet, patchIDs, iter)
+    {
+        nFaces += pbm[iter.key()].size();
+    }
+
+
+    // Extract a submesh.
+    labelHashSet patchCells(2*nFaces);
+    forAllConstIter(labelHashSet, patchIDs, iter)
+    {
+        const labelUList& fc = pbm[iter.key()].faceCells();
+        forAll(fc, i)
+        {
+            patchCells.insert(fc[i]);
+        }
+    }
+
+    label nTotalSeeds = returnReduce(patchCells.size(), sumOp<label>());
+
+    label nTotalCells = mesh.globalData().nTotalCells();
+    const label nLayers = nTotalCells/nTotalSeeds;
+
+    Info<< type() << " : seeding " << nTotalSeeds
+        << " cells on " << nLayers << " layers" << nl
+        << endl;
+
+
+    // Avoid subsetMesh, FaceCellWave going through proc boundaries
+    bool oldParRun = Pstream::parRun();
+    Pstream::parRun() = false;
+
+
+    // Work array. Used here to temporarily store the original-to-ordered
+    // index. Later on used to store the ordered-to-original.
+    labelList orderedToOld(points.size(), -1);
+
+    // Subset the layer of cells next to the patch
+    {
+        fvMeshSubset subsetter(dynamic_cast<const fvMesh&>(mesh));
+        subsetter.setLargeCellSubset(patchCells);
+        const fvMesh& subMesh = subsetter.subMesh();
+
+        pointField subPoints(points, subsetter.cellMap());
+
+        // Decompose the layer of cells
+        labelList subOrder(method_().renumber(subMesh, subPoints));
+
+        labelList subOrigToOrdered(invert(subOrder.size(), subOrder));
+
+        // Transfer to final decomposition
+        forAll(subOrder, i)
+        {
+            orderedToOld[subsetter.cellMap()[i]] = subOrigToOrdered[i];
+        }
+    }
+
+
+    // Walk out.
+    labelList patchFaces(nFaces);
+    List<topoDistanceData> patchData(nFaces);
+    nFaces = 0;
+    forAllConstIter(labelHashSet, patchIDs, iter)
+    {
+        const polyPatch& pp = pbm[iter.key()];
+        const labelUList& fc = pp.faceCells();
+        forAll(fc, i)
+        {
+            patchFaces[nFaces] = pp.start()+i;
+            patchData[nFaces] = topoDistanceData
+            (
+                orderedToOld[fc[i]],// passive data: order of originating face
+                0                   // distance: layer
+            );
+            nFaces++;
+        }
+    }
+
+    // Field on cells and faces.
+    List<topoDistanceData> cellData(mesh.nCells());
+    List<topoDistanceData> faceData(mesh.nFaces());
+
+    // Propagate information inwards
+    FaceCellWave<topoDistanceData> deltaCalc
+    (
+        mesh,
+        patchFaces,
+        patchData,
+        faceData,
+        cellData,
+        nTotalCells+1
+    );
+
+
+    Pstream::parRun() = oldParRun;
+
+
+    // And extract.
+    // Note that distance is distance from face so starts at 1.
+    bool haveWarned = false;
+    forAll(orderedToOld, cellI)
+    {
+        if (!cellData[cellI].valid(deltaCalc.data()))
+        {
+            if (!haveWarned)
+            {
+                WarningIn("structuredDecomp::renumber(..)")
+                    << "Did not visit some cells, e.g. cell " << cellI
+                    << " at " << mesh.cellCentres()[cellI] << endl
+                    << "Assigning these cells to domain 0." << endl;
+                haveWarned = true;
+            }
+            orderedToOld[cellI] = 0;
+        }
+        else
+        {
+            label layerI = cellData[cellI].distance()-1;
+            if (depthFirst_)
+            {
+                orderedToOld[nLayers*cellData[cellI].data()+layerI] = cellI;
+                                }
+            else
+            {
+                orderedToOld[cellData[cellI].data()+nLayers*layerI] = cellI;
+            }
+        }
+    }
+
+    // Return furthest away cell first
+    if (reverse_)
+    {
+        reverse(orderedToOld);
+    }
+
+    return orderedToOld;
+}
+
+
+// ************************************************************************* //
diff --git a/src/renumber/renumberMethods/boundaryFirstRenumber/boundaryFirstRenumber.H b/src/renumber/renumberMethods/structuredRenumber/structuredRenumber.H
similarity index 76%
rename from src/renumber/renumberMethods/boundaryFirstRenumber/boundaryFirstRenumber.H
rename to src/renumber/renumberMethods/structuredRenumber/structuredRenumber.H
index a33a122bbb..be638e307b 100644
--- a/src/renumber/renumberMethods/boundaryFirstRenumber/boundaryFirstRenumber.H
+++ b/src/renumber/renumberMethods/structuredRenumber/structuredRenumber.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,18 +22,23 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::boundaryFirstRenumber
+    Foam::structuredRenumber
 
 Description
-    Cuthill-McKee renumbering
+    Renumbering according to mesh layers.
+    depthFirst = true:
+        first column gets ids 0..nLayer-1,
+        second nLayers..2*nLayers-1 etc.
+    depthFirst = false:
+        first layer gets ids 0,1,2 etc.
 
 SourceFiles
-    boundaryFirstRenumber.C
+    structuredRenumber.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef boundaryFirstRenumber_H
-#define boundaryFirstRenumber_H
+#ifndef structuredRenumber_H
+#define structuredRenumber_H
 
 #include "renumberMethod.H"
 #include "Switch.H"
@@ -42,43 +47,47 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                   Class boundaryFirstRenumber Declaration
+                   Class structuredRenumber Declaration
 \*---------------------------------------------------------------------------*/
 
-class boundaryFirstRenumber
+class structuredRenumber
 :
     public renumberMethod
 {
     // Private data
 
+        const dictionary methodDict_;
+
+        const wordReList patches_;
+
+        const Switch depthFirst_;
+
+        const autoPtr<renumberMethod> method_;
+
         const Switch reverse_;
 
 
     // Private Member Functions
 
-        //- Count the number of internal faces of a cell
-        label countInternalFaces(const primitiveMesh&, const label) const;
-
-
         //- Disallow default bitwise copy construct and assignment
-        void operator=(const boundaryFirstRenumber&);
-        boundaryFirstRenumber(const boundaryFirstRenumber&);
+        void operator=(const structuredRenumber&);
+        structuredRenumber(const structuredRenumber&);
 
 
 public:
 
     //- Runtime type information
-    TypeName("boundaryFirst");
+    TypeName("structured");
 
 
     // Constructors
 
         //- Construct given the renumber dictionary
-        boundaryFirstRenumber(const dictionary& renumberDict);
+        structuredRenumber(const dictionary& renumberDict);
 
 
     //- Destructor
-    virtual ~boundaryFirstRenumber()
+    virtual ~structuredRenumber()
     {}
 
 
@@ -91,7 +100,7 @@ public:
         {
             notImplemented
             (
-                "boundaryFirstRenumber::renumber(const pointField&)"
+                "structuredRenumber::renumber(const pointField&)"
             );
             return labelList(0);
         }
@@ -117,7 +126,7 @@ public:
         {
             notImplemented
             (
-                "boundaryFirstRenumber::renumber"
+                "structuredRenumber::renumber"
                 "(const labelListList&, const pointField&)"
             );
             return labelList(0);