diff --git a/applications/utilities/preProcessing/PDRsetFields/Allwclean b/applications/utilities/preProcessing/PDRsetFields/Allwclean
new file mode 100755
index 0000000000000000000000000000000000000000..9f1e7393322b44da5d6fd2253a86c4817c61fbff
--- /dev/null
+++ b/applications/utilities/preProcessing/PDRsetFields/Allwclean
@@ -0,0 +1,7 @@
+#!/bin/sh
+cd "${0%/*}" || exit    # Run from this directory
+
+wclean libso pdrFields
+wclean PDRsetFields
+
+#------------------------------------------------------------------------------
diff --git a/applications/utilities/preProcessing/PDRsetFields/Allwmake b/applications/utilities/preProcessing/PDRsetFields/Allwmake
new file mode 100755
index 0000000000000000000000000000000000000000..4fda1690cdf38ad9cc16567d0876770170dc51d7
--- /dev/null
+++ b/applications/utilities/preProcessing/PDRsetFields/Allwmake
@@ -0,0 +1,10 @@
+#!/bin/sh
+cd "${0%/*}" || exit                                # Run from this directory
+. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments
+
+#------------------------------------------------------------------------------
+
+wmake $targetType pdrFields
+wmake PDRsetFields
+
+#------------------------------------------------------------------------------
diff --git a/applications/utilities/preProcessing/PDRsetFields/PDRsetFields/Make/files b/applications/utilities/preProcessing/PDRsetFields/PDRsetFields/Make/files
new file mode 100644
index 0000000000000000000000000000000000000000..2a133df0d3a41183630af24fd9df5412ddf4ff8b
--- /dev/null
+++ b/applications/utilities/preProcessing/PDRsetFields/PDRsetFields/Make/files
@@ -0,0 +1,3 @@
+PDRsetFields.C
+
+EXE = $(FOAM_APPBIN)/PDRsetFields
diff --git a/applications/utilities/preProcessing/PDRsetFields/PDRsetFields/Make/options b/applications/utilities/preProcessing/PDRsetFields/PDRsetFields/Make/options
new file mode 100644
index 0000000000000000000000000000000000000000..64d6ba56258273f7da3b85ec0dfa36f3afa5f51d
--- /dev/null
+++ b/applications/utilities/preProcessing/PDRsetFields/PDRsetFields/Make/options
@@ -0,0 +1,15 @@
+EXE_INC = \
+    -I../pdrFields/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/mesh/blockMesh/lnInclude
+
+EXE_LIBS = \
+    -lfiniteVolume \
+    -lfileFormats \
+    -lsurfMesh \
+    -lmeshTools \
+    -lblockMesh \
+    -lpdrFields
diff --git a/applications/utilities/preProcessing/PDRsetFields/PDRsetFields.C b/applications/utilities/preProcessing/PDRsetFields/PDRsetFields/PDRsetFields.C
similarity index 100%
rename from applications/utilities/preProcessing/PDRsetFields/PDRsetFields.C
rename to applications/utilities/preProcessing/PDRsetFields/PDRsetFields/PDRsetFields.C
diff --git a/applications/utilities/preProcessing/PDRsetFields/Make/files b/applications/utilities/preProcessing/PDRsetFields/pdrFields/Make/files
similarity index 85%
rename from applications/utilities/preProcessing/PDRsetFields/Make/files
rename to applications/utilities/preProcessing/PDRsetFields/pdrFields/Make/files
index af1c28d4cac7137de05c3721a97c34bd8eb45ed3..3a1cc22df3aaa4a477cb2f18d010142b7c6844dd 100644
--- a/applications/utilities/preProcessing/PDRsetFields/Make/files
+++ b/applications/utilities/preProcessing/PDRsetFields/pdrFields/Make/files
@@ -1,5 +1,3 @@
-PDRsetFields.C
-
 PDRarrays.C
 PDRarraysAnalyse.C
 PDRarraysCalc.C
@@ -16,4 +14,4 @@ obstacles/PDRobstacleTypes.C
 obstacles/PDRobstacleLegacyIO.C
 obstacles/PDRobstacleLegacyRead.C
 
-EXE = $(FOAM_APPBIN)/PDRsetFields
+LIB = $(FOAM_LIBBIN)/libpdrFields
diff --git a/applications/utilities/preProcessing/PDRsetFields/Make/options b/applications/utilities/preProcessing/PDRsetFields/pdrFields/Make/options
similarity index 100%
rename from applications/utilities/preProcessing/PDRsetFields/Make/options
rename to applications/utilities/preProcessing/PDRsetFields/pdrFields/Make/options
diff --git a/applications/utilities/preProcessing/PDRsetFields/PDRarrays.C b/applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRarrays.C
similarity index 100%
rename from applications/utilities/preProcessing/PDRsetFields/PDRarrays.C
rename to applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRarrays.C
diff --git a/applications/utilities/preProcessing/PDRsetFields/PDRarrays.H b/applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRarrays.H
similarity index 100%
rename from applications/utilities/preProcessing/PDRsetFields/PDRarrays.H
rename to applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRarrays.H
diff --git a/applications/utilities/preProcessing/PDRsetFields/PDRarraysAnalyse.C b/applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRarraysAnalyse.C
similarity index 100%
rename from applications/utilities/preProcessing/PDRsetFields/PDRarraysAnalyse.C
rename to applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRarraysAnalyse.C
diff --git a/applications/utilities/preProcessing/PDRsetFields/PDRarraysCalc.C b/applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRarraysCalc.C
similarity index 100%
rename from applications/utilities/preProcessing/PDRsetFields/PDRarraysCalc.C
rename to applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRarraysCalc.C
diff --git a/applications/utilities/preProcessing/PDRsetFields/PDRlegacy.H b/applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRlegacy.H
similarity index 100%
rename from applications/utilities/preProcessing/PDRsetFields/PDRlegacy.H
rename to applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRlegacy.H
diff --git a/applications/utilities/preProcessing/PDRsetFields/PDRlegacyMeshSpec.C b/applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRlegacyMeshSpec.C
similarity index 100%
rename from applications/utilities/preProcessing/PDRsetFields/PDRlegacyMeshSpec.C
rename to applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRlegacyMeshSpec.C
diff --git a/applications/utilities/preProcessing/PDRsetFields/PDRmeshArrays.C b/applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRmeshArrays.C
similarity index 100%
rename from applications/utilities/preProcessing/PDRsetFields/PDRmeshArrays.C
rename to applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRmeshArrays.C
diff --git a/applications/utilities/preProcessing/PDRsetFields/PDRmeshArrays.H b/applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRmeshArrays.H
similarity index 100%
rename from applications/utilities/preProcessing/PDRsetFields/PDRmeshArrays.H
rename to applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRmeshArrays.H
diff --git a/applications/utilities/preProcessing/PDRsetFields/PDRparams.C b/applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRparams.C
similarity index 100%
rename from applications/utilities/preProcessing/PDRsetFields/PDRparams.C
rename to applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRparams.C
diff --git a/applications/utilities/preProcessing/PDRsetFields/PDRparams.H b/applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRparams.H
similarity index 100%
rename from applications/utilities/preProcessing/PDRsetFields/PDRparams.H
rename to applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRparams.H
diff --git a/applications/utilities/preProcessing/PDRsetFields/PDRpatchDef.C b/applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRpatchDef.C
similarity index 100%
rename from applications/utilities/preProcessing/PDRsetFields/PDRpatchDef.C
rename to applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRpatchDef.C
diff --git a/applications/utilities/preProcessing/PDRsetFields/PDRpatchDef.H b/applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRpatchDef.H
similarity index 100%
rename from applications/utilities/preProcessing/PDRsetFields/PDRpatchDef.H
rename to applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRpatchDef.H
diff --git a/applications/utilities/preProcessing/PDRsetFields/PDRsetFields.H b/applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRsetFields.H
similarity index 100%
rename from applications/utilities/preProcessing/PDRsetFields/PDRsetFields.H
rename to applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRsetFields.H
diff --git a/applications/utilities/preProcessing/PDRsetFields/PDRutils.H b/applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRutils.H
similarity index 100%
rename from applications/utilities/preProcessing/PDRsetFields/PDRutils.H
rename to applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRutils.H
diff --git a/applications/utilities/preProcessing/PDRsetFields/PDRutilsInternal.H b/applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRutilsInternal.H
similarity index 100%
rename from applications/utilities/preProcessing/PDRsetFields/PDRutilsInternal.H
rename to applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRutilsInternal.H
diff --git a/applications/utilities/preProcessing/PDRsetFields/PDRutilsIntersect.C b/applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRutilsIntersect.C
similarity index 100%
rename from applications/utilities/preProcessing/PDRsetFields/PDRutilsIntersect.C
rename to applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRutilsIntersect.C
diff --git a/applications/utilities/preProcessing/PDRsetFields/PDRutilsOverlap.C b/applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRutilsOverlap.C
similarity index 100%
rename from applications/utilities/preProcessing/PDRsetFields/PDRutilsOverlap.C
rename to applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRutilsOverlap.C
diff --git a/applications/utilities/preProcessing/PDRsetFields/obstacles/ObstaclesDict b/applications/utilities/preProcessing/PDRsetFields/pdrFields/obstacles/ObstaclesDict
similarity index 100%
rename from applications/utilities/preProcessing/PDRsetFields/obstacles/ObstaclesDict
rename to applications/utilities/preProcessing/PDRsetFields/pdrFields/obstacles/ObstaclesDict
diff --git a/applications/utilities/preProcessing/PDRsetFields/obstacles/PDRobstacle.C b/applications/utilities/preProcessing/PDRsetFields/pdrFields/obstacles/PDRobstacle.C
similarity index 100%
rename from applications/utilities/preProcessing/PDRsetFields/obstacles/PDRobstacle.C
rename to applications/utilities/preProcessing/PDRsetFields/pdrFields/obstacles/PDRobstacle.C
diff --git a/applications/utilities/preProcessing/PDRsetFields/obstacles/PDRobstacle.H b/applications/utilities/preProcessing/PDRsetFields/pdrFields/obstacles/PDRobstacle.H
similarity index 100%
rename from applications/utilities/preProcessing/PDRsetFields/obstacles/PDRobstacle.H
rename to applications/utilities/preProcessing/PDRsetFields/pdrFields/obstacles/PDRobstacle.H
diff --git a/applications/utilities/preProcessing/PDRsetFields/obstacles/PDRobstacleI.H b/applications/utilities/preProcessing/PDRsetFields/pdrFields/obstacles/PDRobstacleI.H
similarity index 100%
rename from applications/utilities/preProcessing/PDRsetFields/obstacles/PDRobstacleI.H
rename to applications/utilities/preProcessing/PDRsetFields/pdrFields/obstacles/PDRobstacleI.H
diff --git a/applications/utilities/preProcessing/PDRsetFields/obstacles/PDRobstacleIO.C b/applications/utilities/preProcessing/PDRsetFields/pdrFields/obstacles/PDRobstacleIO.C
similarity index 100%
rename from applications/utilities/preProcessing/PDRsetFields/obstacles/PDRobstacleIO.C
rename to applications/utilities/preProcessing/PDRsetFields/pdrFields/obstacles/PDRobstacleIO.C
diff --git a/applications/utilities/preProcessing/PDRsetFields/obstacles/PDRobstacleLegacyIO.C b/applications/utilities/preProcessing/PDRsetFields/pdrFields/obstacles/PDRobstacleLegacyIO.C
similarity index 100%
rename from applications/utilities/preProcessing/PDRsetFields/obstacles/PDRobstacleLegacyIO.C
rename to applications/utilities/preProcessing/PDRsetFields/pdrFields/obstacles/PDRobstacleLegacyIO.C
diff --git a/applications/utilities/preProcessing/PDRsetFields/obstacles/PDRobstacleLegacyRead.C b/applications/utilities/preProcessing/PDRsetFields/pdrFields/obstacles/PDRobstacleLegacyRead.C
similarity index 100%
rename from applications/utilities/preProcessing/PDRsetFields/obstacles/PDRobstacleLegacyRead.C
rename to applications/utilities/preProcessing/PDRsetFields/pdrFields/obstacles/PDRobstacleLegacyRead.C
diff --git a/applications/utilities/preProcessing/PDRsetFields/obstacles/PDRobstacleTypes.C b/applications/utilities/preProcessing/PDRsetFields/pdrFields/obstacles/PDRobstacleTypes.C
similarity index 100%
rename from applications/utilities/preProcessing/PDRsetFields/obstacles/PDRobstacleTypes.C
rename to applications/utilities/preProcessing/PDRsetFields/pdrFields/obstacles/PDRobstacleTypes.C
diff --git a/applications/utilities/preProcessing/PDRsetFields/obstacles/PDRobstacleTypes.H b/applications/utilities/preProcessing/PDRsetFields/pdrFields/obstacles/PDRobstacleTypes.H
similarity index 100%
rename from applications/utilities/preProcessing/PDRsetFields/obstacles/PDRobstacleTypes.H
rename to applications/utilities/preProcessing/PDRsetFields/pdrFields/obstacles/PDRobstacleTypes.H