diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/createPcorrTypes.H b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/createPcorrTypes.H
deleted file mode 100644
index a602fd4843..0000000000
--- a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/createPcorrTypes.H
+++ /dev/null
@@ -1,13 +0,0 @@
-    wordList pcorrTypes
-    (
-        p.boundaryField().size(),
-        zeroGradientFvPatchScalarField::typeName
-    );
-
-    for (label i=0; i<p.boundaryField().size(); i++)
-    {
-        if (p.boundaryField()[i].fixesValue())
-        {
-            pcorrTypes[i] = fixedValueFvPatchScalarField::typeName;
-        }
-    }
diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/createPcorrTypes.H b/applications/solvers/multiphase/interFoam/interDyMFoam/createPcorrTypes.H
deleted file mode 100644
index dfd4afb49b..0000000000
--- a/applications/solvers/multiphase/interFoam/interDyMFoam/createPcorrTypes.H
+++ /dev/null
@@ -1,13 +0,0 @@
-    wordList pcorrTypes
-    (
-        p_rgh.boundaryField().size(),
-        zeroGradientFvPatchScalarField::typeName
-    );
-
-    for (label i=0; i<p_rgh.boundaryField().size(); i++)
-    {
-        if (p_rgh.boundaryField()[i].fixesValue())
-        {
-            pcorrTypes[i] = fixedValueFvPatchScalarField::typeName;
-        }
-    }
diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/createUf.H b/applications/solvers/multiphase/interFoam/interDyMFoam/createUf.H
deleted file mode 100644
index aab92ce0e2..0000000000
--- a/applications/solvers/multiphase/interFoam/interDyMFoam/createUf.H
+++ /dev/null
@@ -1,56 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Global
-    createUf
-
-Description
-    Creates and initialises the velocity velocity field Uf.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef createUf_H
-#define createUf_H
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-Info<< "Reading/calculating face velocity Uf\n" << endl;
-
-surfaceVectorField Uf
-(
-    IOobject
-    (
-        "Uf",
-        runTime.timeName(),
-        mesh,
-        IOobject::READ_IF_PRESENT,
-        IOobject::AUTO_WRITE
-    ),
-    linearInterpolate(U)
-);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/createRhoUf.H b/src/finiteVolume/cfdTools/compressible/createRhoUf.H
similarity index 93%
rename from applications/solvers/compressible/sonicFoam/sonicDyMFoam/createRhoUf.H
rename to src/finiteVolume/cfdTools/compressible/createRhoUf.H
index bb05d10f66..e91115ae75 100644
--- a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/createRhoUf.H
+++ b/src/finiteVolume/cfdTools/compressible/createRhoUf.H
@@ -22,15 +22,15 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Global
-    createUf
+    createRhoUf
 
 Description
-    Creates and initialises the velocity velocity field Uf.
+    Creates and initialises the velocity velocity field rhoUf.
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef createUf_H
-#define createUf_H
+#ifndef createRhoUf_H
+#define createRhoUf_H
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/createPcorrTypes.H b/src/finiteVolume/cfdTools/general/include/createPcorrTypes.H
similarity index 100%
rename from applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/createPcorrTypes.H
rename to src/finiteVolume/cfdTools/general/include/createPcorrTypes.H
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/createPcorrTypes.H b/src/finiteVolume/cfdTools/general/include/createPrghCorrTypes.H
similarity index 100%
rename from applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/createPcorrTypes.H
rename to src/finiteVolume/cfdTools/general/include/createPrghCorrTypes.H
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/createUf.H b/src/finiteVolume/cfdTools/incompressible/createUf.H
similarity index 100%
rename from applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/createUf.H
rename to src/finiteVolume/cfdTools/incompressible/createUf.H