diff --git a/applications/solvers/incompressible/pimpleFoam/Make/options b/applications/solvers/incompressible/pimpleFoam/Make/options
index 572e65531f..584c27112d 100644
--- a/applications/solvers/incompressible/pimpleFoam/Make/options
+++ b/applications/solvers/incompressible/pimpleFoam/Make/options
@@ -7,8 +7,7 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
-    -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-    -I$(LIB_SRC)/dynamicFvMesh/interfaceTrackingFvMesh/lnInclude
+    -I$(LIB_SRC)/dynamicFvMesh/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
@@ -21,5 +20,4 @@ EXE_LIBS = \
     -ldynamicMesh \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \
-    -latmosphericModels \
-    -linterfaceTrackingFvMesh
+    -latmosphericModels
diff --git a/applications/utilities/finiteArea/checkFaMesh/Make/options b/applications/utilities/finiteArea/checkFaMesh/Make/options
index 20ef292d27..b69f32d758 100644
--- a/applications/utilities/finiteArea/checkFaMesh/Make/options
+++ b/applications/utilities/finiteArea/checkFaMesh/Make/options
@@ -6,4 +6,4 @@ EXE_INC = \
 EXE_LIBS = \
     -lfiniteArea \
     -lfiniteVolume \
-    -lmeshTools \
+    -lmeshTools
diff --git a/src/Allwmake b/src/Allwmake
index 147c3c080a..9fa030779a 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -113,7 +113,7 @@ wmake $targetType optimisation/adjointOptimisation/adjoint
 
 
 # interfaceTracking libs
-wmake dynamicFvMesh/interfaceTrackingFvMesh
+dynamicFaMesh/Allwmake $targetType $*
 
 
 # Needs access to Turbulence
diff --git a/src/dynamicFaMesh/Allwmake b/src/dynamicFaMesh/Allwmake
new file mode 100755
index 0000000000..9ffed0e82d
--- /dev/null
+++ b/src/dynamicFaMesh/Allwmake
@@ -0,0 +1,9 @@
+#!/bin/sh
+cd "${0%/*}" || exit                                # Run from this directory
+. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments
+
+#------------------------------------------------------------------------------
+
+wmake $targetType interfaceTrackingFvMesh
+
+#------------------------------------------------------------------------------
diff --git a/src/dynamicFvMesh/interfaceTrackingFvMesh/Make/files b/src/dynamicFaMesh/interfaceTrackingFvMesh/Make/files
similarity index 100%
rename from src/dynamicFvMesh/interfaceTrackingFvMesh/Make/files
rename to src/dynamicFaMesh/interfaceTrackingFvMesh/Make/files
diff --git a/src/dynamicFvMesh/interfaceTrackingFvMesh/Make/options b/src/dynamicFaMesh/interfaceTrackingFvMesh/Make/options
similarity index 100%
rename from src/dynamicFvMesh/interfaceTrackingFvMesh/Make/options
rename to src/dynamicFaMesh/interfaceTrackingFvMesh/Make/options
diff --git a/src/dynamicFvMesh/interfaceTrackingFvMesh/boundaryProcessorFaPatchPoints.H b/src/dynamicFaMesh/interfaceTrackingFvMesh/boundaryProcessorFaPatchPoints.H
similarity index 100%
rename from src/dynamicFvMesh/interfaceTrackingFvMesh/boundaryProcessorFaPatchPoints.H
rename to src/dynamicFaMesh/interfaceTrackingFvMesh/boundaryProcessorFaPatchPoints.H
diff --git a/src/dynamicFvMesh/interfaceTrackingFvMesh/freeSurfacePointDisplacement.C b/src/dynamicFaMesh/interfaceTrackingFvMesh/freeSurfacePointDisplacement.C
similarity index 100%
rename from src/dynamicFvMesh/interfaceTrackingFvMesh/freeSurfacePointDisplacement.C
rename to src/dynamicFaMesh/interfaceTrackingFvMesh/freeSurfacePointDisplacement.C
diff --git a/src/dynamicFvMesh/interfaceTrackingFvMesh/functionObjects/pointHistory/pointHistory.C b/src/dynamicFaMesh/interfaceTrackingFvMesh/functionObjects/pointHistory/pointHistory.C
similarity index 100%
rename from src/dynamicFvMesh/interfaceTrackingFvMesh/functionObjects/pointHistory/pointHistory.C
rename to src/dynamicFaMesh/interfaceTrackingFvMesh/functionObjects/pointHistory/pointHistory.C
diff --git a/src/dynamicFvMesh/interfaceTrackingFvMesh/functionObjects/pointHistory/pointHistory.H b/src/dynamicFaMesh/interfaceTrackingFvMesh/functionObjects/pointHistory/pointHistory.H
similarity index 100%
rename from src/dynamicFvMesh/interfaceTrackingFvMesh/functionObjects/pointHistory/pointHistory.H
rename to src/dynamicFaMesh/interfaceTrackingFvMesh/functionObjects/pointHistory/pointHistory.H
diff --git a/src/dynamicFvMesh/interfaceTrackingFvMesh/functionObjects/writeFreeSurface/writeFreeSurface.C b/src/dynamicFaMesh/interfaceTrackingFvMesh/functionObjects/writeFreeSurface/writeFreeSurface.C
similarity index 100%
rename from src/dynamicFvMesh/interfaceTrackingFvMesh/functionObjects/writeFreeSurface/writeFreeSurface.C
rename to src/dynamicFaMesh/interfaceTrackingFvMesh/functionObjects/writeFreeSurface/writeFreeSurface.C
diff --git a/src/dynamicFvMesh/interfaceTrackingFvMesh/functionObjects/writeFreeSurface/writeFreeSurface.H b/src/dynamicFaMesh/interfaceTrackingFvMesh/functionObjects/writeFreeSurface/writeFreeSurface.H
similarity index 100%
rename from src/dynamicFvMesh/interfaceTrackingFvMesh/functionObjects/writeFreeSurface/writeFreeSurface.H
rename to src/dynamicFaMesh/interfaceTrackingFvMesh/functionObjects/writeFreeSurface/writeFreeSurface.H
diff --git a/src/dynamicFvMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfacePressure/freeSurfacePressureFvPatchScalarField.C b/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfacePressure/freeSurfacePressureFvPatchScalarField.C
similarity index 98%
rename from src/dynamicFvMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfacePressure/freeSurfacePressureFvPatchScalarField.C
rename to src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfacePressure/freeSurfacePressureFvPatchScalarField.C
index ede6ca8fd2..a0964ff720 100644
--- a/src/dynamicFvMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfacePressure/freeSurfacePressureFvPatchScalarField.C
+++ b/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfacePressure/freeSurfacePressureFvPatchScalarField.C
@@ -5,8 +5,6 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2013-2016 OpenFOAM Foundation
-    Copyright (C) 2018 OpenCFD Ltd.
     Copyright (C) 2019 Zeljko Tukovic, FSB Zagreb.
 -------------------------------------------------------------------------------
 License
diff --git a/src/dynamicFvMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfacePressure/freeSurfacePressureFvPatchScalarField.H b/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfacePressure/freeSurfacePressureFvPatchScalarField.H
similarity index 99%
rename from src/dynamicFvMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfacePressure/freeSurfacePressureFvPatchScalarField.H
rename to src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfacePressure/freeSurfacePressureFvPatchScalarField.H
index 022d834133..667a200308 100644
--- a/src/dynamicFvMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfacePressure/freeSurfacePressureFvPatchScalarField.H
+++ b/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfacePressure/freeSurfacePressureFvPatchScalarField.H
@@ -5,7 +5,6 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2013-2016 OpenFOAM Foundation
     Copyright (C) 2019 Zeljko Tukovic, FSB Zagreb.
 -------------------------------------------------------------------------------
 License
diff --git a/src/dynamicFvMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfaceVelocity/freeSurfaceVelocityFvPatchVectorField.C b/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfaceVelocity/freeSurfaceVelocityFvPatchVectorField.C
similarity index 100%
rename from src/dynamicFvMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfaceVelocity/freeSurfaceVelocityFvPatchVectorField.C
rename to src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfaceVelocity/freeSurfaceVelocityFvPatchVectorField.C
diff --git a/src/dynamicFvMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfaceVelocity/freeSurfaceVelocityFvPatchVectorField.H b/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfaceVelocity/freeSurfaceVelocityFvPatchVectorField.H
similarity index 100%
rename from src/dynamicFvMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfaceVelocity/freeSurfaceVelocityFvPatchVectorField.H
rename to src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfaceVelocity/freeSurfaceVelocityFvPatchVectorField.H
diff --git a/src/dynamicFvMesh/interfaceTrackingFvMesh/interfaceTrackingFvMesh.C b/src/dynamicFaMesh/interfaceTrackingFvMesh/interfaceTrackingFvMesh.C
similarity index 100%
rename from src/dynamicFvMesh/interfaceTrackingFvMesh/interfaceTrackingFvMesh.C
rename to src/dynamicFaMesh/interfaceTrackingFvMesh/interfaceTrackingFvMesh.C
diff --git a/src/dynamicFvMesh/interfaceTrackingFvMesh/interfaceTrackingFvMesh.H b/src/dynamicFaMesh/interfaceTrackingFvMesh/interfaceTrackingFvMesh.H
similarity index 100%
rename from src/dynamicFvMesh/interfaceTrackingFvMesh/interfaceTrackingFvMesh.H
rename to src/dynamicFaMesh/interfaceTrackingFvMesh/interfaceTrackingFvMesh.H
diff --git a/src/dynamicFvMesh/interfaceTrackingFvMesh/solveBulkSurfactant.H b/src/dynamicFaMesh/interfaceTrackingFvMesh/solveBulkSurfactant.H
similarity index 100%
rename from src/dynamicFvMesh/interfaceTrackingFvMesh/solveBulkSurfactant.H
rename to src/dynamicFaMesh/interfaceTrackingFvMesh/solveBulkSurfactant.H
diff --git a/src/dynamicFvMesh/interfaceTrackingFvMesh/surfactantProperties.H b/src/dynamicFaMesh/interfaceTrackingFvMesh/surfactantProperties.H
similarity index 100%
rename from src/dynamicFvMesh/interfaceTrackingFvMesh/surfactantProperties.H
rename to src/dynamicFaMesh/interfaceTrackingFvMesh/surfactantProperties.H
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/constant/dynamicMeshDict b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/constant/dynamicMeshDict
index f23267675e..b4a2dac592 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/constant/dynamicMeshDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/constant/dynamicMeshDict
@@ -15,9 +15,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dynamicFvMesh   interfaceTrackingFvMesh;
+motionSolverLibs (fvMotionSolvers interfaceTrackingFvMesh);
 
-motionSolverLibs (fvMotionSolvers);
+dynamicFvMesh   interfaceTrackingFvMesh;
 
 motionSolver    velocityLaplacian;
 
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/constant/faMesh/faMeshDefinition b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/constant/faMesh/faMeshDefinition
index 3f691b9297..514ee33a3c 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/constant/faMesh/faMeshDefinition
+++ b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/constant/faMesh/faMeshDefinition
@@ -32,7 +32,7 @@ boundary
     }
     frontAndBack
     {
-        type                patch;
+        type                empty;
         ownerPolyPatch      top;
         neighbourPolyPatch  frontAndBack;
     }
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/controlDict b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/controlDict
index f2582c9e40..243dc25ec0 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/controlDict
@@ -15,6 +15,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+// Currently optional dependency for pimpleFoam
+libs            (interfaceTrackingFvMesh);
+
 application     pimpleFoam;
 
 startFrom       startTime;
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/constant/dynamicMeshDict b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/constant/dynamicMeshDict
index 3dea5406d8..ae79a3a0e5 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/constant/dynamicMeshDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/constant/dynamicMeshDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+motionSolverLibs (fvMotionSolvers interfaceTrackingFvMesh);
+
 dynamicFvMesh   interfaceTrackingFvMesh;
 
 motionSolver    velocityLaplacian;
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/makePerturbation/Make/options b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/makePerturbation/Make/options
index 6cecabcd79..b5e6eaa1fd 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/makePerturbation/Make/options
+++ b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/makePerturbation/Make/options
@@ -5,7 +5,7 @@ EXE_INC = \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/dynamicFvMesh/interfaceTrackingFvMesh/lnInclude \
+    -I$(LIB_SRC)/dynamicFaMesh/interfaceTrackingFvMesh/lnInclude \
 
 EXE_LIBS = \
     -ldynamicFvMesh \
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/controlDict b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/controlDict
index 4ab07a672a..306bd3594a 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/controlDict
@@ -15,6 +15,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+// Currently optional dependency for pimpleFoam
+libs            (interfaceTrackingFvMesh);
+
 application     pimpleFoam;
 
 startFrom       startTime;
diff --git a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/constant/dynamicMeshDict b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/constant/dynamicMeshDict
index 502f20ab53..6ef5658427 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/constant/dynamicMeshDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/constant/dynamicMeshDict
@@ -15,9 +15,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dynamicFvMesh   interfaceTrackingFvMesh;
+motionSolverLibs (fvMotionSolvers interfaceTrackingFvMesh);
 
-motionSolverLibs (fvMotionSolvers);
+dynamicFvMesh   interfaceTrackingFvMesh;
 
 motionSolver    velocityLaplacian;
 
diff --git a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/makeWave/Make/options b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/makeWave/Make/options
index 6cecabcd79..b5e6eaa1fd 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/makeWave/Make/options
+++ b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/makeWave/Make/options
@@ -5,7 +5,7 @@ EXE_INC = \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/dynamicFvMesh/interfaceTrackingFvMesh/lnInclude \
+    -I$(LIB_SRC)/dynamicFaMesh/interfaceTrackingFvMesh/lnInclude \
 
 EXE_LIBS = \
     -ldynamicFvMesh \
diff --git a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/controlDict b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/controlDict
index 042a6f99f5..0ea70faea5 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/controlDict
@@ -15,6 +15,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+// Currently optional dependency for pimpleFoam
+libs            (interfaceTrackingFvMesh);
+
 application     pimpleFoam;
 
 startFrom       startTime;