diff --git a/src/postProcessing/functionObjects/field/Make/files b/src/postProcessing/functionObjects/field/Make/files
index e950e4d4d5d50e162e74db3535bfb5764db6e0bc..6195b98a41140e7ae2da1b28c53aecf338ae50b0 100644
--- a/src/postProcessing/functionObjects/field/Make/files
+++ b/src/postProcessing/functionObjects/field/Make/files
@@ -7,10 +7,10 @@ fieldMinMax/fieldMinMax.C
 fieldMinMax/fieldMinMaxFunctionObject.C
 
 fieldValues/fieldValue/fieldValue.C
-fieldValues/face/faceSource.C
-fieldValues/face/faceSourceFunctionObject.C
-fieldValues/cell/cellSource.C
-fieldValues/cell/cellSourceFunctionObject.C
+fieldValues/faceSource/faceSource.C
+fieldValues/faceSource/faceSourceFunctionObject.C
+fieldValues/cellSource/cellSource.C
+fieldValues/cellSource/cellSourceFunctionObject.C
 
 streamLine/streamLine.C
 streamLine/streamLineParticle.C
diff --git a/src/postProcessing/functionObjects/field/fieldValues/cell/IOcellSource.H b/src/postProcessing/functionObjects/field/fieldValues/cellSource/IOcellSource.H
similarity index 100%
rename from src/postProcessing/functionObjects/field/fieldValues/cell/IOcellSource.H
rename to src/postProcessing/functionObjects/field/fieldValues/cellSource/IOcellSource.H
diff --git a/src/postProcessing/functionObjects/field/fieldValues/cell/cellSource.C b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C
similarity index 100%
rename from src/postProcessing/functionObjects/field/fieldValues/cell/cellSource.C
rename to src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C
diff --git a/src/postProcessing/functionObjects/field/fieldValues/cell/cellSource.H b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H
similarity index 100%
rename from src/postProcessing/functionObjects/field/fieldValues/cell/cellSource.H
rename to src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H
diff --git a/src/postProcessing/functionObjects/field/fieldValues/cell/cellSourceFunctionObject.C b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceFunctionObject.C
similarity index 100%
rename from src/postProcessing/functionObjects/field/fieldValues/cell/cellSourceFunctionObject.C
rename to src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceFunctionObject.C
diff --git a/src/postProcessing/functionObjects/field/fieldValues/cell/cellSourceFunctionObject.H b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceFunctionObject.H
similarity index 100%
rename from src/postProcessing/functionObjects/field/fieldValues/cell/cellSourceFunctionObject.H
rename to src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceFunctionObject.H
diff --git a/src/postProcessing/functionObjects/field/fieldValues/cell/cellSourceI.H b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceI.H
similarity index 100%
rename from src/postProcessing/functionObjects/field/fieldValues/cell/cellSourceI.H
rename to src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceI.H
diff --git a/src/postProcessing/functionObjects/field/fieldValues/cell/cellSourceTemplates.C b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceTemplates.C
similarity index 100%
rename from src/postProcessing/functionObjects/field/fieldValues/cell/cellSourceTemplates.C
rename to src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceTemplates.C
diff --git a/src/postProcessing/functionObjects/field/fieldValues/face/IOfaceSource.H b/src/postProcessing/functionObjects/field/fieldValues/faceSource/IOfaceSource.H
similarity index 100%
rename from src/postProcessing/functionObjects/field/fieldValues/face/IOfaceSource.H
rename to src/postProcessing/functionObjects/field/fieldValues/faceSource/IOfaceSource.H
diff --git a/src/postProcessing/functionObjects/field/fieldValues/face/faceSource.C b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
similarity index 100%
rename from src/postProcessing/functionObjects/field/fieldValues/face/faceSource.C
rename to src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
diff --git a/src/postProcessing/functionObjects/field/fieldValues/face/faceSource.H b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H
similarity index 100%
rename from src/postProcessing/functionObjects/field/fieldValues/face/faceSource.H
rename to src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H
diff --git a/src/postProcessing/functionObjects/field/fieldValues/face/faceSourceFunctionObject.C b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceFunctionObject.C
similarity index 100%
rename from src/postProcessing/functionObjects/field/fieldValues/face/faceSourceFunctionObject.C
rename to src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceFunctionObject.C
diff --git a/src/postProcessing/functionObjects/field/fieldValues/face/faceSourceFunctionObject.H b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceFunctionObject.H
similarity index 100%
rename from src/postProcessing/functionObjects/field/fieldValues/face/faceSourceFunctionObject.H
rename to src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceFunctionObject.H
diff --git a/src/postProcessing/functionObjects/field/fieldValues/face/faceSourceI.H b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceI.H
similarity index 100%
rename from src/postProcessing/functionObjects/field/fieldValues/face/faceSourceI.H
rename to src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceI.H
diff --git a/src/postProcessing/functionObjects/field/fieldValues/face/faceSourceTemplates.C b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C
similarity index 100%
rename from src/postProcessing/functionObjects/field/fieldValues/face/faceSourceTemplates.C
rename to src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C