diff --git a/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C b/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C
similarity index 100%
rename from src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C
rename to src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C
diff --git a/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.H b/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.H
similarity index 100%
rename from src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.H
rename to src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.H
diff --git a/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshI.H b/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshI.H
similarity index 100%
rename from src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshI.H
rename to src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshI.H
diff --git a/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C b/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C
similarity index 100%
rename from src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C
rename to src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/polyMesh/boundary b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/polyMesh/boundary
deleted file mode 100644
index 2d2096ddc3..0000000000
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/polyMesh/boundary
+++ /dev/null
@@ -1,112 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-12
-(
-    innerInlet
-    {
-        type            patch;
-        inGroups        1(inlet);
-        nFaces          544;
-        startFace       245836;
-    }
-    outerInlet
-    {
-        type            patch;
-        inGroups        1(inlet);
-        nFaces          1404;
-        startFace       246380;
-    }
-    innerOutlet
-    {
-        type            patch;
-        inGroups        1(outlet);
-        nFaces          544;
-        startFace       247784;
-    }
-    outerOutlet
-    {
-        type            patch;
-        inGroups        1(outlet);
-        nFaces          1404;
-        startFace       248328;
-    }
-    rotorBlades
-    {
-        type            wall;
-        inGroups        1(movingWalls);
-        nFaces          540;
-        startFace       249732;
-    }
-    rotorBlades_slave
-    {
-        type            wall;
-        inGroups        1(movingWalls);
-        nFaces          540;
-        startFace       250272;
-    }
-    shaft
-    {
-        type            wall;
-        inGroups        1(movingWalls);
-        nFaces          1044;
-        startFace       250812;
-    }
-    statorBlades
-    {
-        type            wall;
-        inGroups        1(staticWalls);
-        nFaces          2128;
-        startFace       251856;
-    }
-    statorBlades_slave
-    {
-        type            wall;
-        inGroups        1(staticWalls);
-        nFaces          2128;
-        startFace       253984;
-    }
-    wall
-    {
-        type            wall;
-        inGroups        1(staticWalls);
-        nFaces          6165;
-        startFace       256112;
-    }
-    AMI1
-    {
-        type            cyclicAMI;
-        inGroups        1(cyclicAMI);
-        nFaces          10944;
-        startFace       262277;
-        matchTolerance  0.0001;
-        transform       noOrdering;
-        neighbourPatch  AMI2;
-    }
-    AMI2
-    {
-        type            cyclicAMI;
-        inGroups        1(cyclicAMI);
-        nFaces          10944;
-        startFace       273221;
-        matchTolerance  0.0001;
-        transform       noOrdering;
-        neighbourPatch  AMI1;
-    }
-)
-
-// ************************************************************************* //