diff --git a/AMR_tidy/Make/files b/AMR_tidy/Make/files
deleted file mode 100644
index 66c8f4ce..00000000
--- a/AMR_tidy/Make/files
+++ /dev/null
@@ -1,14 +0,0 @@
-hexRef/hexRef.C
-hexRef/hexRefData.C
-hexRef/refinementHistory.C
-hexRef/hexRefNew.C
-
-hexRef/hexRef8/hexRef8.C
-hexRef/hexRef4/hexRef4.C
-hexRef/hexRef4Axi/hexRef4Axi.C
-hexRef/hexRef2/hexRef2.C
-
-dynamicRefineFvMeshNew/multiCritRefinement.C
-dynamicRefineFvMeshNew/dynamicRefineFvMeshNew.C
-
-LIB = $(FOAM_USER_LIBBIN)/libnewdynamicFvMesh
diff --git a/Allwmake b/Allwmake
index 923b8ec4..017ba567 100755
--- a/Allwmake
+++ b/Allwmake
@@ -12,6 +12,8 @@ wmake src/dfChemistryModel
 wmake src/TurbulenceModels/compressible
 wmake src/regionModels/surfaceFilmModels
 src/lagrangian/Allwmake $targetType $*
+wmake src/dynamicMesh
+wmake src/dynamicFvMesh
 
 wmake applications/solvers/df0DFoam
 wmake applications/solvers/dfLowMachFoam
diff --git a/src/dynamicFvMesh/Make/files b/src/dynamicFvMesh/Make/files
new file mode 100644
index 00000000..3666cae7
--- /dev/null
+++ b/src/dynamicFvMesh/Make/files
@@ -0,0 +1,4 @@
+dynamicRefineFvMeshNew/multiCritRefinement.C
+dynamicRefineFvMeshNew/dynamicRefineFvMeshNew.C
+
+LIB = $(FOAM_USER_LIBBIN)/libnewdynamicFvMesh
diff --git a/src/dynamicFvMesh/Make/options b/src/dynamicFvMesh/Make/options
new file mode 100644
index 00000000..e4f8715a
--- /dev/null
+++ b/src/dynamicFvMesh/Make/options
@@ -0,0 +1,21 @@
+EXE_INC = -std=c++14\
+    -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \
+    -I$(DF_SRC)/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude
+
+LIB_LIBS = \
+    -ltriSurface \
+    -lmeshTools \
+    -ldynamicMesh \
+    -ldynamicFvMesh \
+    -lfiniteVolume \
+    -lextrudeModel \
+    -ldecompositionMethods \
+    $(FOAM_USER_LIBBIN)/libnewdynamicMesh.so\
+    -L$(FOAM_LIBBIN)/dummy \
+    -lmetisDecomp -lptscotchDecomp -lscotchDecomp
+    
diff --git a/AMR_tidy/dynamicRefineFvMeshNew/dynamicMeshDict b/src/dynamicFvMesh/dynamicRefineFvMeshNew/dynamicMeshDict
similarity index 100%
rename from AMR_tidy/dynamicRefineFvMeshNew/dynamicMeshDict
rename to src/dynamicFvMesh/dynamicRefineFvMeshNew/dynamicMeshDict
diff --git a/AMR_tidy/dynamicRefineFvMeshNew/dynamicRefineFvMeshNew.C b/src/dynamicFvMesh/dynamicRefineFvMeshNew/dynamicRefineFvMeshNew.C
similarity index 100%
rename from AMR_tidy/dynamicRefineFvMeshNew/dynamicRefineFvMeshNew.C
rename to src/dynamicFvMesh/dynamicRefineFvMeshNew/dynamicRefineFvMeshNew.C
diff --git a/AMR_tidy/dynamicRefineFvMeshNew/dynamicRefineFvMeshNew.H b/src/dynamicFvMesh/dynamicRefineFvMeshNew/dynamicRefineFvMeshNew.H
similarity index 100%
rename from AMR_tidy/dynamicRefineFvMeshNew/dynamicRefineFvMeshNew.H
rename to src/dynamicFvMesh/dynamicRefineFvMeshNew/dynamicRefineFvMeshNew.H
diff --git a/AMR_tidy/dynamicRefineFvMeshNew/multiCritRefinement.C b/src/dynamicFvMesh/dynamicRefineFvMeshNew/multiCritRefinement.C
similarity index 100%
rename from AMR_tidy/dynamicRefineFvMeshNew/multiCritRefinement.C
rename to src/dynamicFvMesh/dynamicRefineFvMeshNew/multiCritRefinement.C
diff --git a/AMR_tidy/dynamicRefineFvMeshNew/multiCritRefinement.H b/src/dynamicFvMesh/dynamicRefineFvMeshNew/multiCritRefinement.H
similarity index 100%
rename from AMR_tidy/dynamicRefineFvMeshNew/multiCritRefinement.H
rename to src/dynamicFvMesh/dynamicRefineFvMeshNew/multiCritRefinement.H
diff --git a/src/dynamicMesh/Make/files b/src/dynamicMesh/Make/files
new file mode 100644
index 00000000..d634b9ed
--- /dev/null
+++ b/src/dynamicMesh/Make/files
@@ -0,0 +1,13 @@
+hexRef = polyTopoChange/polyTopoChange/hexRef
+
+$(hexRef)/hexRef.C
+$(hexRef)/hexRefData.C
+$(hexRef)/refinementHistory.C
+$(hexRef)/hexRefNew.C
+
+$(hexRef)/hexRef8/hexRef8.C
+$(hexRef)/hexRef4/hexRef4.C
+$(hexRef)/hexRef4Axi/hexRef4Axi.C
+$(hexRef)/hexRef2/hexRef2.C
+
+LIB = $(FOAM_USER_LIBBIN)/libnewdynamicMesh
diff --git a/AMR_tidy/Make/options b/src/dynamicMesh/Make/options
similarity index 100%
rename from AMR_tidy/Make/options
rename to src/dynamicMesh/Make/options
diff --git a/AMR_tidy/hexRef/hexRef.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef/hexRef.C
similarity index 100%
rename from AMR_tidy/hexRef/hexRef.C
rename to src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef/hexRef.C
diff --git a/AMR_tidy/hexRef/hexRef.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef/hexRef.H
similarity index 100%
rename from AMR_tidy/hexRef/hexRef.H
rename to src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef/hexRef.H
diff --git a/AMR_tidy/hexRef/hexRef2/hexRef2.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef/hexRef2/hexRef2.C
similarity index 100%
rename from AMR_tidy/hexRef/hexRef2/hexRef2.C
rename to src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef/hexRef2/hexRef2.C
diff --git a/AMR_tidy/hexRef/hexRef2/hexRef2.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef/hexRef2/hexRef2.H
similarity index 100%
rename from AMR_tidy/hexRef/hexRef2/hexRef2.H
rename to src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef/hexRef2/hexRef2.H
diff --git a/AMR_tidy/hexRef/hexRef4/hexRef4.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef/hexRef4/hexRef4.C
similarity index 100%
rename from AMR_tidy/hexRef/hexRef4/hexRef4.C
rename to src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef/hexRef4/hexRef4.C
diff --git a/AMR_tidy/hexRef/hexRef4/hexRef4.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef/hexRef4/hexRef4.H
similarity index 100%
rename from AMR_tidy/hexRef/hexRef4/hexRef4.H
rename to src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef/hexRef4/hexRef4.H
diff --git a/AMR_tidy/hexRef/hexRef4Axi/hexRef4Axi.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef/hexRef4Axi/hexRef4Axi.C
similarity index 100%
rename from AMR_tidy/hexRef/hexRef4Axi/hexRef4Axi.C
rename to src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef/hexRef4Axi/hexRef4Axi.C
diff --git a/AMR_tidy/hexRef/hexRef4Axi/hexRef4Axi.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef/hexRef4Axi/hexRef4Axi.H
similarity index 100%
rename from AMR_tidy/hexRef/hexRef4Axi/hexRef4Axi.H
rename to src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef/hexRef4Axi/hexRef4Axi.H
diff --git a/AMR_tidy/hexRef/hexRef8/hexRef8.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef/hexRef8/hexRef8.C
similarity index 100%
rename from AMR_tidy/hexRef/hexRef8/hexRef8.C
rename to src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef/hexRef8/hexRef8.C
diff --git a/AMR_tidy/hexRef/hexRef8/hexRef8.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef/hexRef8/hexRef8.H
similarity index 100%
rename from AMR_tidy/hexRef/hexRef8/hexRef8.H
rename to src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef/hexRef8/hexRef8.H
diff --git a/AMR_tidy/hexRef/hexRefData.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef/hexRefData.C
similarity index 100%
rename from AMR_tidy/hexRef/hexRefData.C
rename to src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef/hexRefData.C
diff --git a/AMR_tidy/hexRef/hexRefData.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef/hexRefData.H
similarity index 100%
rename from AMR_tidy/hexRef/hexRefData.H
rename to src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef/hexRefData.H
diff --git a/AMR_tidy/hexRef/hexRefNew.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef/hexRefNew.C
similarity index 100%
rename from AMR_tidy/hexRef/hexRefNew.C
rename to src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef/hexRefNew.C
diff --git a/AMR_tidy/hexRef/refinementHistory.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef/refinementHistory.C
similarity index 100%
rename from AMR_tidy/hexRef/refinementHistory.C
rename to src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef/refinementHistory.C
diff --git a/AMR_tidy/hexRef/refinementHistory.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef/refinementHistory.H
similarity index 100%
rename from AMR_tidy/hexRef/refinementHistory.H
rename to src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef/refinementHistory.H