diff --git a/src/postProcessing/functionObjects/Allwmake b/src/postProcessing/functionObjects/Allwmake
index 2110ced87340ba50b6967960565954938436fcbc..9eaf5762e82cc4143348ac3984800ba85f091159 100755
--- a/src/postProcessing/functionObjects/Allwmake
+++ b/src/postProcessing/functionObjects/Allwmake
@@ -6,13 +6,9 @@ targetType=libso
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
-wmake $targetType cloud
 wmake $targetType field
 wmake $targetType forces
-wmake $targetType fvTools
-wmake $targetType IO
-wmake $targetType jobControl
-wmake $targetType systemCall
+wmake $targetType lagrangian
 wmake $targetType utilities
 
 #------------------------------------------------------------------------------
diff --git a/src/postProcessing/functionObjects/IO/IOFunctionObjectsDoc.H b/src/postProcessing/functionObjects/IO/IOFunctionObjectsDoc.H
deleted file mode 100644
index 9071ce5b5e228f2ee485be7a7ab55adcb07ccaa0..0000000000000000000000000000000000000000
--- a/src/postProcessing/functionObjects/IO/IOFunctionObjectsDoc.H
+++ /dev/null
@@ -1,30 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-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/>.
-
-\defgroup grpIOFunctionObjects Input/output function objects
-@{
-    \ingroup grpFunctionObjects
-    This group contains input/output-based function objects
-@}
-
-\*---------------------------------------------------------------------------*/
diff --git a/src/postProcessing/functionObjects/IO/Make/files b/src/postProcessing/functionObjects/IO/Make/files
deleted file mode 100644
index 95065c4b3f863d798f70ba46038e15621990ad98..0000000000000000000000000000000000000000
--- a/src/postProcessing/functionObjects/IO/Make/files
+++ /dev/null
@@ -1,13 +0,0 @@
-partialWrite/partialWrite.C
-partialWrite/partialWriteFunctionObject.C
-
-removeRegisteredObject/removeRegisteredObject.C
-removeRegisteredObject/removeRegisteredObjectFunctionObject.C
-
-writeDictionary/writeDictionary.C
-writeDictionary/writeDictionaryFunctionObject.C
-
-writeRegisteredObject/writeRegisteredObject.C
-writeRegisteredObject/writeRegisteredObjectFunctionObject.C
-
-LIB = $(FOAM_LIBBIN)/libIOFunctionObjects
diff --git a/src/postProcessing/functionObjects/IO/Make/options b/src/postProcessing/functionObjects/IO/Make/options
deleted file mode 100644
index a3ae8da833177387e9eecf75b5e2675fc7b481f5..0000000000000000000000000000000000000000
--- a/src/postProcessing/functionObjects/IO/Make/options
+++ /dev/null
@@ -1,7 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude
-
-LIB_LIBS = \
-    -lfiniteVolume \
-    -lmeshTools
diff --git a/src/postProcessing/functionObjects/field/Make/files b/src/postProcessing/functionObjects/field/Make/files
index 24a3e5b5996697409bc557f41a12d3ebd647b38f..0aa4a5184d701c4cab6288a8311d6cf2f8d701b6 100644
--- a/src/postProcessing/functionObjects/field/Make/files
+++ b/src/postProcessing/functionObjects/field/Make/files
@@ -49,4 +49,13 @@ regionSizeDistribution/regionSizeDistributionFunctionObject.C
 histogram/histogram.C
 histogram/histogramFunctionObject.C
 
+div/div.C
+div/divFunctionObject.C
+
+grad/grad.C
+grad/gradFunctionObject.C
+
+mag/mag.C
+mag/magFunctionObject.C
+
 LIB = $(FOAM_LIBBIN)/libfieldFunctionObjects
diff --git a/src/postProcessing/functionObjects/fvTools/calcMag/IOcalcMag.H b/src/postProcessing/functionObjects/field/div/IOdiv.H
similarity index 84%
rename from src/postProcessing/functionObjects/fvTools/calcMag/IOcalcMag.H
rename to src/postProcessing/functionObjects/field/div/IOdiv.H
index 3f0a584d14959a980fa8ad47111b4d362d6c21b4..10ca5a867064691669b7cafbede2b7a1d67211f0 100644
--- a/src/postProcessing/functionObjects/fvTools/calcMag/IOcalcMag.H
+++ b/src/postProcessing/functionObjects/field/div/IOdiv.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,24 +22,24 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Typedef
-    Foam::IOcalcMag
+    Foam::IOdiv
 
 Description
-    Instance of the generic IOOutputFilter for calcMag.
+    Instance of the generic IOOutputFilter for div.
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef IOcalcMag_H
-#define IOcalcMag_H
+#ifndef IOdiv_H
+#define IOdiv_H
 
-#include "calcMag.H"
+#include "div.H"
 #include "IOOutputFilter.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    typedef IOOutputFilter<calcMag> IOcalcMag;
+    typedef IOOutputFilter<div> IOdiv;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDiv.C b/src/postProcessing/functionObjects/field/div/div.C
similarity index 87%
rename from src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDiv.C
rename to src/postProcessing/functionObjects/field/div/div.C
index 9cb0229d4dd231af3756f91785b3b43108297cf3..cf5405659ac38362ec563738974b3c27012b98c9 100644
--- a/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDiv.C
+++ b/src/postProcessing/functionObjects/field/div/div.C
@@ -23,10 +23,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "calcFvcDiv.H"
+#include "div.H"
 #include "volFields.H"
 #include "dictionary.H"
-#include "calcFvcDiv.H"
+#include "div.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -34,14 +34,14 @@ namespace Foam
 {
 namespace functionObjects
 {
-    defineTypeNameAndDebug(calcFvcDiv, 0);
+    defineTypeNameAndDebug(div, 0);
 }
 }
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-Foam::volScalarField& Foam::functionObjects::calcFvcDiv::divField
+Foam::volScalarField& Foam::functionObjects::div::divField
 (
     const word& divName,
     const dimensionSet& dims
@@ -79,7 +79,7 @@ Foam::volScalarField& Foam::functionObjects::calcFvcDiv::divField
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::functionObjects::calcFvcDiv::calcFvcDiv
+Foam::functionObjects::div::div
 (
     const word& name,
     const objectRegistry& obr,
@@ -96,7 +96,7 @@ Foam::functionObjects::calcFvcDiv::calcFvcDiv
 }
 
 
-bool Foam::functionObjects::calcFvcDiv::viable
+bool Foam::functionObjects::div::viable
 (
     const word& name,
     const objectRegistry& obr,
@@ -111,13 +111,13 @@ bool Foam::functionObjects::calcFvcDiv::viable
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::functionObjects::calcFvcDiv::~calcFvcDiv()
+Foam::functionObjects::div::~div()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::functionObjects::calcFvcDiv::read(const dictionary& dict)
+void Foam::functionObjects::div::read(const dictionary& dict)
 {
     dict.lookup("fieldName") >> fieldName_;
     dict.lookup("resultName") >> resultName_;
@@ -129,7 +129,7 @@ void Foam::functionObjects::calcFvcDiv::read(const dictionary& dict)
 }
 
 
-void Foam::functionObjects::calcFvcDiv::execute()
+void Foam::functionObjects::div::execute()
 {
     bool processed = false;
 
@@ -144,17 +144,17 @@ void Foam::functionObjects::calcFvcDiv::execute()
 }
 
 
-void Foam::functionObjects::calcFvcDiv::end()
+void Foam::functionObjects::div::end()
 {
     execute();
 }
 
 
-void Foam::functionObjects::calcFvcDiv::timeSet()
+void Foam::functionObjects::div::timeSet()
 {}
 
 
-void Foam::functionObjects::calcFvcDiv::write()
+void Foam::functionObjects::div::write()
 {
     if (obr_.foundObject<regIOobject>(resultName_))
     {
diff --git a/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDiv.H b/src/postProcessing/functionObjects/field/div/div.H
similarity index 89%
rename from src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDiv.H
rename to src/postProcessing/functionObjects/field/div/div.H
index bc96f8ffb094697886f4281f7e4679c202f96c39..8fe81600fe04f15c5b454e64cda366f15b3f8d7d 100644
--- a/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDiv.H
+++ b/src/postProcessing/functionObjects/field/div/div.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::functionObjects::calcFvcDiv
+    Foam::functionObjects::div
 
 Group
     grpFVFunctionObjects
@@ -33,13 +33,13 @@ Description
     volume scalar field.
 
 SourceFiles
-    calcFvcDiv.C
-    IOcalcFvcDiv.H
+    div.C
+    IOdiv.H
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef calcFvcDiv_H
-#define calcFvcDiv_H
+#ifndef functionObjects_div_H
+#define functionObjects_div_H
 
 #include "volFieldsFwd.H"
 #include "surfaceFieldsFwd.H"
@@ -63,14 +63,14 @@ namespace functionObjects
 {
 
 /*---------------------------------------------------------------------------*\
-                         Class calcFvcDiv Declaration
+                         Class div Declaration
 \*---------------------------------------------------------------------------*/
 
-class calcFvcDiv
+class div
 {
     // Private data
 
-        //- Name of this calcFvcDiv object
+        //- Name of this div object
         word name_;
 
         //- Reference to the database
@@ -102,23 +102,23 @@ class calcFvcDiv
         );
 
         //- Disallow default bitwise copy construct
-        calcFvcDiv(const calcFvcDiv&);
+        div(const div&);
 
         //- Disallow default bitwise assignment
-        void operator=(const calcFvcDiv&);
+        void operator=(const div&);
 
 
 public:
 
     //- Runtime type information
-    TypeName("calcFvcDiv");
+    TypeName("div");
 
 
     // Constructors
 
         //- Construct for given objectRegistry and dictionary.
         //  Allow the possibility to load fields from files
-        calcFvcDiv
+        div
         (
             const word& name,
             const objectRegistry&,
@@ -138,18 +138,18 @@ public:
 
 
     //- Destructor
-    virtual ~calcFvcDiv();
+    virtual ~div();
 
 
     // Member Functions
 
-        //- Return name of the set of calcFvcDiv
+        //- Return name of the set of div
         virtual const word& name() const
         {
             return name_;
         }
 
-        //- Read the calcFvcDiv data
+        //- Read the div data
         virtual void read(const dictionary&);
 
         //- Execute, currently does nothing
@@ -161,7 +161,7 @@ public:
         //- Called when time was set at the end of the Time::operator++
         virtual void timeSet();
 
-        //- Calculate the calcFvcDiv and write
+        //- Calculate the div and write
         virtual void write();
 
         //- Update for changes of mesh
@@ -182,7 +182,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "calcFvcDivTemplates.C"
+    #include "divTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/fvTools/calcMag/calcMagFunctionObject.C b/src/postProcessing/functionObjects/field/div/divFunctionObject.C
similarity index 87%
rename from src/postProcessing/functionObjects/fvTools/calcMag/calcMagFunctionObject.C
rename to src/postProcessing/functionObjects/field/div/divFunctionObject.C
index 61aded1e61fbe58fc97e1149b750c1066f629afa..33c4d507a1d03a6ec71c10f56d11a99d37a770c3 100644
--- a/src/postProcessing/functionObjects/fvTools/calcMag/calcMagFunctionObject.C
+++ b/src/postProcessing/functionObjects/field/div/divFunctionObject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,18 +23,18 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "calcMagFunctionObject.H"
+#include "divFunctionObject.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    defineNamedTemplateTypeNameAndDebug(calcMagFunctionObject, 0);
+    defineNamedTemplateTypeNameAndDebug(divFunctionObject, 0);
 
     addToRunTimeSelectionTable
     (
         functionObject,
-        calcMagFunctionObject,
+        divFunctionObject,
         dictionary
     );
 }
diff --git a/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDivFunctionObject.H b/src/postProcessing/functionObjects/field/div/divFunctionObject.H
similarity index 82%
rename from src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDivFunctionObject.H
rename to src/postProcessing/functionObjects/field/div/divFunctionObject.H
index 5446371ec0131b1813cc530d3df92a4339c4f544..4ca010f8473d5d3f1c4e20765a2e4b76cd5c8fab 100644
--- a/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDivFunctionObject.H
+++ b/src/postProcessing/functionObjects/field/div/divFunctionObject.H
@@ -22,29 +22,29 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Typedef
-    Foam::calcFvcDivFunctionObject
+    Foam::divFunctionObject
 
 Description
-    FunctionObject wrapper around calcFvcDiv to allow it to be created
+    FunctionObject wrapper around div to allow it to be created
     via the functions entry within controlDict.
 
 SourceFiles
-    calcFvcDivFunctionObject.C
+    divFunctionObject.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef calcFvcDivFunctionObject_H
-#define calcFvcDivFunctionObject_H
+#ifndef divFunctionObject_H
+#define divFunctionObject_H
 
-#include "calcFvcDiv.H"
+#include "div.H"
 #include "OutputFilterFunctionObject.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    typedef OutputFilterFunctionObject<functionObjects::calcFvcDiv>
-        calcFvcDivFunctionObject;
+    typedef OutputFilterFunctionObject<functionObjects::div>
+        divFunctionObject;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDivTemplates.C b/src/postProcessing/functionObjects/field/div/divTemplates.C
similarity index 97%
rename from src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDivTemplates.C
rename to src/postProcessing/functionObjects/field/div/divTemplates.C
index 6659dccbfb79d516f3026aa915c4464db6795667..8cae12aa605f795285ae60149a7533623acc7d04 100644
--- a/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDivTemplates.C
+++ b/src/postProcessing/functionObjects/field/div/divTemplates.C
@@ -29,7 +29,7 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class FieldType>
-void Foam::functionObjects::calcFvcDiv::calcDiv
+void Foam::functionObjects::div::calcDiv
 (
     const word& fieldName,
     const word& resultName,
diff --git a/src/postProcessing/functionObjects/field/fieldFunctionObjectsDoc.H b/src/postProcessing/functionObjects/field/doc/fieldFunctionObjectsDoc.H
similarity index 94%
rename from src/postProcessing/functionObjects/field/fieldFunctionObjectsDoc.H
rename to src/postProcessing/functionObjects/field/doc/fieldFunctionObjectsDoc.H
index 6c934be48ecefb962b4dcbebfbdf67753387a27a..4de0a4a07758dde12591fba57909a40ffd0c969a 100644
--- a/src/postProcessing/functionObjects/field/fieldFunctionObjectsDoc.H
+++ b/src/postProcessing/functionObjects/field/doc/fieldFunctionObjectsDoc.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
index 34e03e462c132b74dc6845a9d333639e06e08fc4..2fbbe0e2ea28fe981e46f2aed00ddc46cc66614d 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
@@ -119,8 +119,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef fieldAverage_H
-#define fieldAverage_H
+#ifndef functionObjects_fieldAverage_H
+#define functionObjects_fieldAverage_H
 
 #include "volFieldsFwd.H"
 #include "Switch.H"
diff --git a/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H b/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H
index ceea83e7ee4a7bfb0f4f480867fc10901fe6667c..fa6488068fe6e3c464a8624de072eac64d5ae145 100644
--- a/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H
+++ b/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H
@@ -74,8 +74,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef fieldCoordinateSystemTransform_H
-#define fieldCoordinateSystemTransform_H
+#ifndef functionObjects_fieldCoordinateSystemTransform_H
+#define functionObjects_fieldCoordinateSystemTransform_H
 
 #include "OFstream.H"
 #include "volFields.H"
diff --git a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H
index b28e9433d8c99cc73551ec700f1e64847c7ba82e..1583c735441c5340baddd31eca25b0919f4ec3f9 100644
--- a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H
+++ b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H
@@ -75,8 +75,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef fieldMinMax_H
-#define fieldMinMax_H
+#ifndef functionObjects_fieldMinMax_H
+#define functionObjects_fieldMinMax_H
 
 #include "functionObjectFiles.H"
 #include "Switch.H"
diff --git a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H
index 7de7069c7d6326cc68a73f6a62b23fd19d33b97d..15bf465e62762ab7ffcf0cbcbd7a0a3f2896ead1 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H
+++ b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H
@@ -102,8 +102,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef cellSource_H
-#define cellSource_H
+#ifndef functionObjects_cellSource_H
+#define functionObjects_cellSource_H
 
 #include "NamedEnum.H"
 #include "fieldValue.H"
diff --git a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H
index ec72bd868ffd9409d7e3eab4912b707098dc4b81..ec7c6a96d798aa6eb88cfc4eead4734121f8cba9 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H
+++ b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H
@@ -136,8 +136,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef faceSource_H
-#define faceSource_H
+#ifndef functionObjects_faceSource_H
+#define functionObjects_faceSource_H
 
 #include "NamedEnum.H"
 #include "fieldValue.H"
diff --git a/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.H b/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.H
index 5446f003f72891db79f154e4dd1e2b93d5e89c39..399a2574e744dab203e0b76a521180f62ee396ed 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.H
+++ b/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.H
@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef fieldValue_H
-#define fieldValue_H
+#ifndef functionObjects_fieldValue_H
+#define functionObjects_fieldValue_H
 
 #include "functionObjectFiles.H"
 #include "Switch.H"
diff --git a/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H b/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H
index cd68f47746603acb4f03877032d0c225d7438a2a..abaf609c7fd3d2f19e380bc52a7fafccbe730d3a 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H
+++ b/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H
@@ -73,8 +73,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef fieldValueDelta_H
-#define fieldValueDelta_H
+#ifndef functionObjects_fieldValueDelta_H
+#define functionObjects_fieldValueDelta_H
 
 #include "functionObjectFiles.H"
 #include "fieldValue.H"
diff --git a/src/postProcessing/functionObjects/fvTools/calcFvcDiv/IOcalcFvcDiv.H b/src/postProcessing/functionObjects/field/grad/IOgrad.H
similarity index 83%
rename from src/postProcessing/functionObjects/fvTools/calcFvcDiv/IOcalcFvcDiv.H
rename to src/postProcessing/functionObjects/field/grad/IOgrad.H
index 245aae6e2bf89adc3b50197cd94687d2cdeac8ad..2af56a03578709f5960d5f599b417bddae7eb890 100644
--- a/src/postProcessing/functionObjects/fvTools/calcFvcDiv/IOcalcFvcDiv.H
+++ b/src/postProcessing/functionObjects/field/grad/IOgrad.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,24 +22,24 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Typedef
-    Foam::IOcalcFvcDiv
+    Foam::IOgrad
 
 Description
-    Instance of the generic IOOutputFilter for calcFvcDiv.
+    Instance of the generic IOOutputFilter for grad.
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef IOcalcFvcDiv_H
-#define IOcalcFvcDiv_H
+#ifndef IOgrad_H
+#define IOgrad_H
 
-#include "calcFvcDiv.H"
+#include "grad.H"
 #include "IOOutputFilter.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    typedef IOOutputFilter<calcFvcDiv> IOcalcFvcDiv;
+    typedef IOOutputFilter<grad> IOgrad;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGrad.C b/src/postProcessing/functionObjects/field/grad/grad.C
similarity index 85%
rename from src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGrad.C
rename to src/postProcessing/functionObjects/field/grad/grad.C
index 31b17b9e0a87321b384a0f584cb89b94376455ee..d304ee53f4bd509eb329ca32e03213b8e50f7e16 100644
--- a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGrad.C
+++ b/src/postProcessing/functionObjects/field/grad/grad.C
@@ -23,10 +23,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "calcFvcGrad.H"
+#include "grad.H"
 #include "volFields.H"
 #include "dictionary.H"
-#include "calcFvcGrad.H"
+#include "grad.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -34,14 +34,14 @@ namespace Foam
 {
 namespace functionObjects
 {
-    defineTypeNameAndDebug(calcFvcGrad, 0);
+    defineTypeNameAndDebug(grad, 0);
 }
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::functionObjects::calcFvcGrad::calcFvcGrad
+Foam::functionObjects::grad::grad
 (
     const word& name,
     const objectRegistry& obr,
@@ -58,7 +58,7 @@ Foam::functionObjects::calcFvcGrad::calcFvcGrad
 }
 
 
-bool Foam::functionObjects::calcFvcGrad::viable
+bool Foam::functionObjects::grad::viable
 (
     const word& name,
     const objectRegistry& obr,
@@ -73,13 +73,13 @@ bool Foam::functionObjects::calcFvcGrad::viable
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::functionObjects::calcFvcGrad::~calcFvcGrad()
+Foam::functionObjects::grad::~grad()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::functionObjects::calcFvcGrad::read(const dictionary& dict)
+void Foam::functionObjects::grad::read(const dictionary& dict)
 {
     dict.lookup("fieldName") >> fieldName_;
     dict.lookup("resultName") >> resultName_;
@@ -91,7 +91,7 @@ void Foam::functionObjects::calcFvcGrad::read(const dictionary& dict)
 }
 
 
-void Foam::functionObjects::calcFvcGrad::execute()
+void Foam::functionObjects::grad::execute()
 {
     bool processed = false;
 
@@ -106,17 +106,17 @@ void Foam::functionObjects::calcFvcGrad::execute()
 }
 
 
-void Foam::functionObjects::calcFvcGrad::end()
+void Foam::functionObjects::grad::end()
 {
     execute();
 }
 
 
-void Foam::functionObjects::calcFvcGrad::timeSet()
+void Foam::functionObjects::grad::timeSet()
 {}
 
 
-void Foam::functionObjects::calcFvcGrad::write()
+void Foam::functionObjects::grad::write()
 {
     if (obr_.foundObject<regIOobject>(resultName_))
     {
diff --git a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGrad.H b/src/postProcessing/functionObjects/field/grad/grad.H
similarity index 89%
rename from src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGrad.H
rename to src/postProcessing/functionObjects/field/grad/grad.H
index f1b67ae08b5812583c57bca9f159f9593a8af65c..d017c57f48ccdd57f877a9889684c8f84adeac81 100644
--- a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGrad.H
+++ b/src/postProcessing/functionObjects/field/grad/grad.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::functionObjects::calcFvcGrad
+    Foam::functionObjects::grad
 
 Group
     grpFVFunctionObjects
@@ -33,13 +33,13 @@ Description
     volume vector or tensor field.
 
 SourceFiles
-    calcFvcGrad.C
-    IOcalcFvcGrad.H
+    grad.C
+    IOgrad.H
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef calcFvcGrad_H
-#define calcFvcGrad_H
+#ifndef functionObjects_grad_H
+#define functionObjects_grad_H
 
 #include "volFieldsFwd.H"
 #include "surfaceFieldsFwd.H"
@@ -63,14 +63,14 @@ namespace functionObjects
 {
 
 /*---------------------------------------------------------------------------*\
-                         Class calcFvcGrad Declaration
+                         Class grad Declaration
 \*---------------------------------------------------------------------------*/
 
-class calcFvcGrad
+class grad
 {
     // Private data
 
-        //- Name of this calcFvcGrad object
+        //- Name of this grad object
         word name_;
 
         //- Reference to the database
@@ -105,23 +105,23 @@ class calcFvcGrad
         );
 
         //- Disallow default bitwise copy construct
-        calcFvcGrad(const calcFvcGrad&);
+        grad(const grad&);
 
         //- Disallow default bitwise assignment
-        void operator=(const calcFvcGrad&);
+        void operator=(const grad&);
 
 
 public:
 
     //- Runtime type information
-    TypeName("calcFvcGrad");
+    TypeName("grad");
 
 
     // Constructors
 
         //- Construct for given objectRegistry and dictionary.
         //  Allow the possibility to load fields from files
-        calcFvcGrad
+        grad
         (
             const word& name,
             const objectRegistry&,
@@ -141,18 +141,18 @@ public:
 
 
     //- Destructor
-    virtual ~calcFvcGrad();
+    virtual ~grad();
 
 
     // Member Functions
 
-        //- Return name of the set of calcFvcGrad
+        //- Return name of the set of grad
         virtual const word& name() const
         {
             return name_;
         }
 
-        //- Read the calcFvcGrad data
+        //- Read the grad data
         virtual void read(const dictionary&);
 
         //- Execute, currently does nothing
@@ -164,7 +164,7 @@ public:
         //- Called when time was set at the end of the Time::operator++
         virtual void timeSet();
 
-        //- Calculate the calcFvcGrad and write
+        //- Calculate the grad and write
         virtual void write();
 
         //- Update for changes of mesh
@@ -185,7 +185,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "calcFvcGradTemplates.C"
+    #include "gradTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDivFunctionObject.C b/src/postProcessing/functionObjects/field/grad/gradFunctionObject.C
similarity index 86%
rename from src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDivFunctionObject.C
rename to src/postProcessing/functionObjects/field/grad/gradFunctionObject.C
index 32f990ec09f6f7e54596d0efe261727e66f2ca5e..9a04d491331c254912c5591363343c76cd1a270c 100644
--- a/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDivFunctionObject.C
+++ b/src/postProcessing/functionObjects/field/grad/gradFunctionObject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,18 +23,18 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "calcFvcDivFunctionObject.H"
+#include "gradFunctionObject.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    defineNamedTemplateTypeNameAndDebug(calcFvcDivFunctionObject, 0);
+    defineNamedTemplateTypeNameAndDebug(gradFunctionObject, 0);
 
     addToRunTimeSelectionTable
     (
         functionObject,
-        calcFvcDivFunctionObject,
+        gradFunctionObject,
         dictionary
     );
 }
diff --git a/src/postProcessing/functionObjects/fvTools/calcMag/calcMagFunctionObject.H b/src/postProcessing/functionObjects/field/grad/gradFunctionObject.H
similarity index 83%
rename from src/postProcessing/functionObjects/fvTools/calcMag/calcMagFunctionObject.H
rename to src/postProcessing/functionObjects/field/grad/gradFunctionObject.H
index b83e6817a519e185cd04c4b32d99245fb77e40ac..776051bebc8f591d6d51d1e98375b646fa4ea021 100644
--- a/src/postProcessing/functionObjects/fvTools/calcMag/calcMagFunctionObject.H
+++ b/src/postProcessing/functionObjects/field/grad/gradFunctionObject.H
@@ -22,29 +22,29 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Typedef
-    Foam::calcMagFunctionObject
+    Foam::gradFunctionObject
 
 Description
-    FunctionObject wrapper around calcMag to allow it to be created
+    FunctionObject wrapper around grad to allow it to be created
     via the functions entry within controlDict.
 
 SourceFiles
-    calcMagFunctionObject.C
+    gradFunctionObject.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef calcMagFunctionObject_H
-#define calcMagFunctionObject_H
+#ifndef gradFunctionObject_H
+#define gradFunctionObject_H
 
-#include "calcMag.H"
+#include "grad.H"
 #include "OutputFilterFunctionObject.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    typedef OutputFilterFunctionObject<functionObjects::calcMag>
-        calcMagFunctionObject;
+    typedef OutputFilterFunctionObject<functionObjects::grad>
+        gradFunctionObject;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGradTemplates.C b/src/postProcessing/functionObjects/field/grad/gradTemplates.C
similarity index 97%
rename from src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGradTemplates.C
rename to src/postProcessing/functionObjects/field/grad/gradTemplates.C
index 3f20974adffc9afdafbc77efecdef0cca6bb38da..c54c0a490c428f5734fe782c6d25d940b70c2b2b 100644
--- a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGradTemplates.C
+++ b/src/postProcessing/functionObjects/field/grad/gradTemplates.C
@@ -35,7 +35,7 @@ Foam::GeometricField
     Foam::fvPatchField,
     Foam::volMesh
 >&
-Foam::functionObjects::calcFvcGrad::gradField
+Foam::functionObjects::grad::gradField
 (
     const word& gradName,
     const dimensionSet& dims
@@ -82,7 +82,7 @@ Foam::functionObjects::calcFvcGrad::gradField
 
 
 template<class Type>
-void Foam::functionObjects::calcFvcGrad::calcGrad
+void Foam::functionObjects::grad::calcGrad
 (
     const word& fieldName,
     const word& resultName,
diff --git a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/IOcalcFvcGrad.H b/src/postProcessing/functionObjects/field/mag/IOmag.H
similarity index 83%
rename from src/postProcessing/functionObjects/fvTools/calcFvcGrad/IOcalcFvcGrad.H
rename to src/postProcessing/functionObjects/field/mag/IOmag.H
index 2e97ac645958b8bbd106f91ad3826df47e6c79b0..33ba658f8a8c07f89e21dfcc3517647760b82ce1 100644
--- a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/IOcalcFvcGrad.H
+++ b/src/postProcessing/functionObjects/field/mag/IOmag.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,24 +22,24 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Typedef
-    Foam::IOcalcFvcGrad
+    Foam::IOmag
 
 Description
-    Instance of the generic IOOutputFilter for calcFvcGrad.
+    Instance of the generic IOOutputFilter for mag.
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef IOcalcFvcGrad_H
-#define IOcalcFvcGrad_H
+#ifndef IOmag_H
+#define IOmag_H
 
-#include "calcFvcGrad.H"
+#include "mag.H"
 #include "IOOutputFilter.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    typedef IOOutputFilter<calcFvcGrad> IOcalcFvcGrad;
+    typedef IOOutputFilter<mag> IOmag;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/fvTools/calcMag/calcMag.C b/src/postProcessing/functionObjects/field/mag/mag.C
similarity index 87%
rename from src/postProcessing/functionObjects/fvTools/calcMag/calcMag.C
rename to src/postProcessing/functionObjects/field/mag/mag.C
index 73e0b8b28687719ef31afa178f6cdc45affbce69..fa0fa725e1f85fc729d6be1813254c6fe5230a4f 100644
--- a/src/postProcessing/functionObjects/fvTools/calcMag/calcMag.C
+++ b/src/postProcessing/functionObjects/field/mag/mag.C
@@ -23,10 +23,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "calcMag.H"
+#include "mag.H"
 #include "volFields.H"
 #include "dictionary.H"
-#include "calcMag.H"
+#include "mag.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -34,14 +34,14 @@ namespace Foam
 {
 namespace functionObjects
 {
-    defineTypeNameAndDebug(calcMag, 0);
+    defineTypeNameAndDebug(mag, 0);
 }
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::functionObjects::calcMag::calcMag
+Foam::functionObjects::mag::mag
 (
     const word& name,
     const objectRegistry& obr,
@@ -58,7 +58,7 @@ Foam::functionObjects::calcMag::calcMag
 }
 
 
-bool Foam::functionObjects::calcMag::viable
+bool Foam::functionObjects::mag::viable
 (
     const word& name,
     const objectRegistry& obr,
@@ -73,13 +73,13 @@ bool Foam::functionObjects::calcMag::viable
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::functionObjects::calcMag::~calcMag()
+Foam::functionObjects::mag::~mag()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::functionObjects::calcMag::read(const dictionary& dict)
+void Foam::functionObjects::mag::read(const dictionary& dict)
 {
     dict.lookup("fieldName") >> fieldName_;
     dict.lookup("resultName") >> resultName_;
@@ -91,7 +91,7 @@ void Foam::functionObjects::calcMag::read(const dictionary& dict)
 }
 
 
-void Foam::functionObjects::calcMag::execute()
+void Foam::functionObjects::mag::execute()
 {
     bool processed = false;
 
@@ -109,17 +109,17 @@ void Foam::functionObjects::calcMag::execute()
 }
 
 
-void Foam::functionObjects::calcMag::end()
+void Foam::functionObjects::mag::end()
 {
     execute();
 }
 
 
-void Foam::functionObjects::calcMag::timeSet()
+void Foam::functionObjects::mag::timeSet()
 {}
 
 
-void Foam::functionObjects::calcMag::write()
+void Foam::functionObjects::mag::write()
 {
     if (obr_.foundObject<regIOobject>(resultName_))
     {
diff --git a/src/postProcessing/functionObjects/fvTools/calcMag/calcMag.H b/src/postProcessing/functionObjects/field/mag/mag.H
similarity index 90%
rename from src/postProcessing/functionObjects/fvTools/calcMag/calcMag.H
rename to src/postProcessing/functionObjects/field/mag/mag.H
index d8cb5ca3d50ce001768d27fa125982c1587f9d6c..13de0cc0745487db98b65e67e3d8c93901c2b142 100644
--- a/src/postProcessing/functionObjects/fvTools/calcMag/calcMag.H
+++ b/src/postProcessing/functionObjects/field/mag/mag.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::functionObjects::calcMag
+    Foam::functionObjects::mag
 
 Group
     grpFVFunctionObjects
@@ -33,13 +33,13 @@ Description
     volume or surface scalar field.
 
 SourceFiles
-    calcMag.C
-    IOcalcMag.H
+    mag.C
+    IOmag.H
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef calcMag_H
-#define calcMag_H
+#ifndef functionObjects_mag_H
+#define functionObjects_mag_H
 
 #include "volFieldsFwd.H"
 #include "surfaceFieldsFwd.H"
@@ -63,14 +63,14 @@ namespace functionObjects
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class calcMag Declaration
+                           Class mag Declaration
 \*---------------------------------------------------------------------------*/
 
-class calcMag
+class mag
 {
     // Private data
 
-        //- Name of this calcMag object
+        //- Name of this mag object
         word name_;
 
         //- Reference to the database
@@ -99,23 +99,23 @@ class calcMag
         );
 
         //- Disallow default bitwise copy construct
-        calcMag(const calcMag&);
+        mag(const mag&);
 
         //- Disallow default bitwise assignment
-        void operator=(const calcMag&);
+        void operator=(const mag&);
 
 
 public:
 
     //- Runtime type information
-    TypeName("calcMag");
+    TypeName("mag");
 
 
     // Constructors
 
         //- Construct for given objectRegistry and dictionary.
         //  Allow the possibility to load fields from files
-        calcMag
+        mag
         (
             const word& name,
             const objectRegistry&,
@@ -135,18 +135,18 @@ public:
 
 
     //- Destructor
-    virtual ~calcMag();
+    virtual ~mag();
 
 
     // Member Functions
 
-        //- Return name of the set of calcMag
+        //- Return name of the set of mag
         virtual const word& name() const
         {
             return name_;
         }
 
-        //- Read the calcMag data
+        //- Read the mag data
         virtual void read(const dictionary&);
 
         //- Execute, currently does nothing
@@ -158,7 +158,7 @@ public:
         //- Called when time was set at the end of the Time::operator++
         virtual void timeSet();
 
-        //- Calculate the calcMag and write
+        //- Calculate the mag and write
         virtual void write();
 
         //- Update for changes of mesh
@@ -179,7 +179,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "calcMagTemplates.C"
+    #include "magTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGradFunctionObject.C b/src/postProcessing/functionObjects/field/mag/magFunctionObject.C
similarity index 86%
rename from src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGradFunctionObject.C
rename to src/postProcessing/functionObjects/field/mag/magFunctionObject.C
index 3e2d1e669858928dd84dd49e7f4e4db3c7aa4edc..b615fb89750ee4880fd6c38cc65960a46f7eba34 100644
--- a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGradFunctionObject.C
+++ b/src/postProcessing/functionObjects/field/mag/magFunctionObject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,18 +23,18 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "calcFvcGradFunctionObject.H"
+#include "magFunctionObject.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    defineNamedTemplateTypeNameAndDebug(calcFvcGradFunctionObject, 0);
+    defineNamedTemplateTypeNameAndDebug(magFunctionObject, 0);
 
     addToRunTimeSelectionTable
     (
         functionObject,
-        calcFvcGradFunctionObject,
+        magFunctionObject,
         dictionary
     );
 }
diff --git a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGradFunctionObject.H b/src/postProcessing/functionObjects/field/mag/magFunctionObject.H
similarity index 81%
rename from src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGradFunctionObject.H
rename to src/postProcessing/functionObjects/field/mag/magFunctionObject.H
index a36516740d21e5d67d437bcb9ed5b2a4b950c344..f518dd5130ec7e881d535ef6be70561474612952 100644
--- a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGradFunctionObject.H
+++ b/src/postProcessing/functionObjects/field/mag/magFunctionObject.H
@@ -22,29 +22,29 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Typedef
-    Foam::calcFvcGradFunctionObject
+    Foam::magFunctionObject
 
 Description
-    FunctionObject wrapper around calcFvcGrad to allow it to be created
+    FunctionObject wrapper around mag to allow it to be created
     via the functions entry within controlDict.
 
 SourceFiles
-    calcFvcGradFunctionObject.C
+    magFunctionObject.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef calcFvcGradFunctionObject_H
-#define calcFvcGradFunctionObject_H
+#ifndef magFunctionObject_H
+#define magFunctionObject_H
 
-#include "calcFvcGrad.H"
+#include "mag.H"
 #include "OutputFilterFunctionObject.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    typedef OutputFilterFunctionObject<functionObjects::calcFvcGrad>
-        calcFvcGradFunctionObject;
+    typedef OutputFilterFunctionObject<functionObjects::mag>
+        magFunctionObject;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/fvTools/calcMag/calcMagTemplates.C b/src/postProcessing/functionObjects/field/mag/magTemplates.C
similarity index 95%
rename from src/postProcessing/functionObjects/fvTools/calcMag/calcMagTemplates.C
rename to src/postProcessing/functionObjects/field/mag/magTemplates.C
index 8b942e95a6fb3840fb76d1eaec7138d5d60636c3..1a2e107b7338a6b6343f7ce01d7390d4f6ef88e4 100644
--- a/src/postProcessing/functionObjects/fvTools/calcMag/calcMagTemplates.C
+++ b/src/postProcessing/functionObjects/field/mag/magTemplates.C
@@ -29,7 +29,7 @@ License
 #include "surfaceFields.H"
 
 template<class FieldType>
-FieldType& Foam::functionObjects::calcMag::magField
+FieldType& Foam::functionObjects::mag::magField
 (
     const word& magName,
     const dimensionSet& dims
@@ -68,7 +68,7 @@ FieldType& Foam::functionObjects::calcMag::magField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::functionObjects::calcMag::calc
+void Foam::functionObjects::mag::calc
 (
     const word& fieldName,
     const word& resultName,
@@ -87,7 +87,7 @@ void Foam::functionObjects::calcMag::calc
         volScalarField& field =
             magField<volScalarField>(resultName_, vf.dimensions());
 
-        field = mag(vf);
+        field = Foam::mag(vf);
 
         processed = true;
     }
@@ -98,7 +98,7 @@ void Foam::functionObjects::calcMag::calc
         surfaceScalarField& field =
             magField<surfaceScalarField>(resultName_, sf.dimensions());
 
-        field = mag(sf);
+        field = Foam::mag(sf);
 
         processed = true;
     }
diff --git a/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.H b/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.H
index a063ebf15b811d57c3f1cd3a135fc9c1187a057e..f3edeaa70591b5415251ff8ec6b0b2b480c83e95 100644
--- a/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.H
+++ b/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.H
@@ -70,8 +70,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef nearWallFields_H
-#define nearWallFields_H
+#ifndef functionObjects_nearWallFields_H
+#define functionObjects_nearWallFields_H
 
 #include "OFstream.H"
 #include "volFields.H"
diff --git a/src/postProcessing/functionObjects/field/processorField/processorField.H b/src/postProcessing/functionObjects/field/processorField/processorField.H
index aeec8f8117266b03d5533a4e88652f906c6f068f..8b1a714167988e819390599710719131cc94a6bf 100644
--- a/src/postProcessing/functionObjects/field/processorField/processorField.H
+++ b/src/postProcessing/functionObjects/field/processorField/processorField.H
@@ -57,8 +57,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef processorField_H
-#define processorField_H
+#ifndef functionObjects_processorField_H
+#define functionObjects_processorField_H
 
 #include "OFstream.H"
 #include "pointFieldFwd.H"
diff --git a/src/postProcessing/functionObjects/field/readFields/readFields.H b/src/postProcessing/functionObjects/field/readFields/readFields.H
index c4500f4f4ab4647d2f2fc934ddf6529a1aebaf47..d0669ebe335587699e5004624bef413140230749 100644
--- a/src/postProcessing/functionObjects/field/readFields/readFields.H
+++ b/src/postProcessing/functionObjects/field/readFields/readFields.H
@@ -63,8 +63,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef readFields_H
-#define readFields_H
+#ifndef functionObjects_readFields_H
+#define functionObjects_readFields_H
 
 #include "OFstream.H"
 #include "pointFieldFwd.H"
diff --git a/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H b/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H
index 108c17ad8bb09d38a63d8629168db9cb9efec511..0a686dacaf7576f168b640d4c59c3fd63e612078 100644
--- a/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H
+++ b/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H
@@ -103,8 +103,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef regionSizeDistribution_H
-#define regionSizeDistribution_H
+#ifndef functionObjects_regionSizeDistribution_H
+#define functionObjects_regionSizeDistribution_H
 
 #include "functionObjectFiles.H"
 #include "pointFieldFwd.H"
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLine.H b/src/postProcessing/functionObjects/field/streamLine/streamLine.H
index c0f280544d358bbf8a0ffdb05042c6be4d59b7d7..ede9683fafbc0e62e29cbce03e3ca65d42d43212 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLine.H
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLine.H
@@ -100,8 +100,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef streamLine_H
-#define streamLine_H
+#ifndef functionObjects_streamLine_H
+#define functionObjects_streamLine_H
 
 #include "volFieldsFwd.H"
 #include "pointFieldFwd.H"
diff --git a/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H
index aed3e2aaa00686ddd603ebfd811ed0bd45a382f6..831a564352f7a3bdd08fdc22acb7cbcdd6ac709e 100644
--- a/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H
+++ b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H
@@ -67,8 +67,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef surfaceInterpolateFields_H
-#define surfaceInterpolateFields_H
+#ifndef functionObjects_surfaceInterpolateFields_H
+#define functionObjects_surfaceInterpolateFields_H
 
 #include "OFstream.H"
 #include "surfaceFields.H"
diff --git a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H
index 84c566be8350097628398f9b5b2f5f65377ef1ae..b8e2697178dc6e1d441e6d03d816c2d7716f6da6 100644
--- a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H
+++ b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H
@@ -100,8 +100,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef wallBoundedStreamLine_H
-#define wallBoundedStreamLine_H
+#ifndef functionObjects_wallBoundedStreamLine_H
+#define functionObjects_wallBoundedStreamLine_H
 
 #include "volFieldsFwd.H"
 #include "pointFieldFwd.H"
diff --git a/src/postProcessing/functionObjects/forces/Make/files b/src/postProcessing/functionObjects/forces/Make/files
index 8b91d9092221ed12c0192c7afb0aa1a042d661e5..f1384ada7c639a1e71b61d4d6f5d6b1674d624d1 100644
--- a/src/postProcessing/functionObjects/forces/Make/files
+++ b/src/postProcessing/functionObjects/forces/Make/files
@@ -1,3 +1,9 @@
+pressureTools/pressureTools.C
+pressureTools/pressureToolsFunctionObject.C
+
+wallShearStress/wallShearStress.C
+wallShearStress/wallShearStressFunctionObject.C
+
 forces/forces.C
 forces/forcesFunctionObject.C
 
diff --git a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H
index cca8e312e1e66f4e3c216da3703f335b6ee6cc6f..40ad36728b521a311bc511606aaa6dbf139965c7 100644
--- a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H
+++ b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H
@@ -90,8 +90,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef forceCoeffs_H
-#define forceCoeffs_H
+#ifndef functionObjects_forceCoeffs_H
+#define functionObjects_forceCoeffs_H
 
 #include "forces.H"
 
diff --git a/src/postProcessing/functionObjects/forces/forces/forces.H b/src/postProcessing/functionObjects/forces/forces/forces.H
index e6a85853c771931e9be6c12683db88afebd93d49..c71881806aed1954ea1c9ee412adc78fe8074691 100644
--- a/src/postProcessing/functionObjects/forces/forces/forces.H
+++ b/src/postProcessing/functionObjects/forces/forces/forces.H
@@ -110,8 +110,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef forces_H
-#define forces_H
+#ifndef functionObjects_forces_H
+#define functionObjects_forces_H
 
 #include "functionObjectFiles.H"
 #include "coordinateSystem.H"
diff --git a/src/postProcessing/functionObjects/utilities/pressureTools/IOpressureTools.H b/src/postProcessing/functionObjects/forces/pressureTools/IOpressureTools.H
similarity index 100%
rename from src/postProcessing/functionObjects/utilities/pressureTools/IOpressureTools.H
rename to src/postProcessing/functionObjects/forces/pressureTools/IOpressureTools.H
diff --git a/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C b/src/postProcessing/functionObjects/forces/pressureTools/pressureTools.C
similarity index 100%
rename from src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C
rename to src/postProcessing/functionObjects/forces/pressureTools/pressureTools.C
diff --git a/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.H b/src/postProcessing/functionObjects/forces/pressureTools/pressureTools.H
similarity index 99%
rename from src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.H
rename to src/postProcessing/functionObjects/forces/pressureTools/pressureTools.H
index d06fb776ab34aaeb6a363877378b9c61e1888152..67a04f8466a79ce6fa16a3312afe8e8f1b8f589b 100644
--- a/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.H
+++ b/src/postProcessing/functionObjects/forces/pressureTools/pressureTools.H
@@ -106,8 +106,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef pressureTools_H
-#define pressureTools_H
+#ifndef functionObjects_pressureTools_H
+#define functionObjects_pressureTools_H
 
 #include "volFieldsFwd.H"
 #include "dimensionedScalar.H"
diff --git a/src/postProcessing/functionObjects/utilities/pressureTools/pressureToolsFunctionObject.C b/src/postProcessing/functionObjects/forces/pressureTools/pressureToolsFunctionObject.C
similarity index 95%
rename from src/postProcessing/functionObjects/utilities/pressureTools/pressureToolsFunctionObject.C
rename to src/postProcessing/functionObjects/forces/pressureTools/pressureToolsFunctionObject.C
index a512c193c8119a963e1095547007ed70a869a23c..e4dedce24a722a686f3d7dd118513e18b03b10fb 100644
--- a/src/postProcessing/functionObjects/utilities/pressureTools/pressureToolsFunctionObject.C
+++ b/src/postProcessing/functionObjects/forces/pressureTools/pressureToolsFunctionObject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/utilities/pressureTools/pressureToolsFunctionObject.H b/src/postProcessing/functionObjects/forces/pressureTools/pressureToolsFunctionObject.H
similarity index 100%
rename from src/postProcessing/functionObjects/utilities/pressureTools/pressureToolsFunctionObject.H
rename to src/postProcessing/functionObjects/forces/pressureTools/pressureToolsFunctionObject.H
diff --git a/src/postProcessing/functionObjects/utilities/wallShearStress/IOwallShearStress.H b/src/postProcessing/functionObjects/forces/wallShearStress/IOwallShearStress.H
similarity index 100%
rename from src/postProcessing/functionObjects/utilities/wallShearStress/IOwallShearStress.H
rename to src/postProcessing/functionObjects/forces/wallShearStress/IOwallShearStress.H
diff --git a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C b/src/postProcessing/functionObjects/forces/wallShearStress/wallShearStress.C
similarity index 100%
rename from src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C
rename to src/postProcessing/functionObjects/forces/wallShearStress/wallShearStress.C
diff --git a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.H b/src/postProcessing/functionObjects/forces/wallShearStress/wallShearStress.H
similarity index 98%
rename from src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.H
rename to src/postProcessing/functionObjects/forces/wallShearStress/wallShearStress.H
index 519851b4a4a0a13e1a1156da36dca492372775b0..cd00e7246604e6ecf8732911b7a86eeb2b656c1a 100644
--- a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.H
+++ b/src/postProcessing/functionObjects/forces/wallShearStress/wallShearStress.H
@@ -70,8 +70,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef wallShearStress_H
-#define wallShearStress_H
+#ifndef functionObjects_wallShearStress_H
+#define functionObjects_wallShearStress_H
 
 #include "functionObjectFiles.H"
 #include "volFieldsFwd.H"
diff --git a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStressFunctionObject.C b/src/postProcessing/functionObjects/forces/wallShearStress/wallShearStressFunctionObject.C
similarity index 95%
rename from src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStressFunctionObject.C
rename to src/postProcessing/functionObjects/forces/wallShearStress/wallShearStressFunctionObject.C
index 871e6b0373a84d9a3d6ccaf39a3561f97e3f6f60..a8a05500e18b071c1d67913cc9740b2ab0901c67 100644
--- a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStressFunctionObject.C
+++ b/src/postProcessing/functionObjects/forces/wallShearStress/wallShearStressFunctionObject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStressFunctionObject.H b/src/postProcessing/functionObjects/forces/wallShearStress/wallShearStressFunctionObject.H
similarity index 100%
rename from src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStressFunctionObject.H
rename to src/postProcessing/functionObjects/forces/wallShearStress/wallShearStressFunctionObject.H
diff --git a/src/postProcessing/functionObjects/fvTools/Make/files b/src/postProcessing/functionObjects/fvTools/Make/files
deleted file mode 100644
index f5940e8ce3bc4928c8cef7f60d9666f5576f370d..0000000000000000000000000000000000000000
--- a/src/postProcessing/functionObjects/fvTools/Make/files
+++ /dev/null
@@ -1,10 +0,0 @@
-calcFvcDiv/calcFvcDiv.C
-calcFvcDiv/calcFvcDivFunctionObject.C
-
-calcFvcGrad/calcFvcGrad.C
-calcFvcGrad/calcFvcGradFunctionObject.C
-
-calcMag/calcMag.C
-calcMag/calcMagFunctionObject.C
-
-LIB = $(FOAM_LIBBIN)/libFVFunctionObjects
diff --git a/src/postProcessing/functionObjects/fvTools/Make/options b/src/postProcessing/functionObjects/fvTools/Make/options
deleted file mode 100644
index 71b7873964d544eddf96d22aa40f4c3372c23c9c..0000000000000000000000000000000000000000
--- a/src/postProcessing/functionObjects/fvTools/Make/options
+++ /dev/null
@@ -1,5 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
-
-LIB_LIBS = \
-    -lfiniteVolume
diff --git a/src/postProcessing/functionObjects/fvTools/doc/fvToolsFunctionObjectsDoc.H b/src/postProcessing/functionObjects/fvTools/doc/fvToolsFunctionObjectsDoc.H
deleted file mode 100644
index 8d403604a5df338dce3bc44e8dd230c865599a39..0000000000000000000000000000000000000000
--- a/src/postProcessing/functionObjects/fvTools/doc/fvToolsFunctionObjectsDoc.H
+++ /dev/null
@@ -1,30 +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/>.
-
-\defgroup grpFVFunctionObjects Finite volume tools function objects
-@{
-    \ingroup grpFunctionObjects
-    This group contains finite-volume tools-based function objects
-@}
-
-\*---------------------------------------------------------------------------*/
diff --git a/src/postProcessing/functionObjects/jobControl/Make/files b/src/postProcessing/functionObjects/jobControl/Make/files
deleted file mode 100644
index 043b5dc029e71be1225a553fe230a4c083e8afe8..0000000000000000000000000000000000000000
--- a/src/postProcessing/functionObjects/jobControl/Make/files
+++ /dev/null
@@ -1,4 +0,0 @@
-abort/abort.C
-abort/abortFunctionObject.C
-
-LIB = $(FOAM_LIBBIN)/libjobControl
diff --git a/src/postProcessing/functionObjects/jobControl/jobControlFunctionObjectsDoc.H b/src/postProcessing/functionObjects/jobControl/jobControlFunctionObjectsDoc.H
deleted file mode 100644
index 34a586b2077d907aa06231a7f364ce8a026c1a42..0000000000000000000000000000000000000000
--- a/src/postProcessing/functionObjects/jobControl/jobControlFunctionObjectsDoc.H
+++ /dev/null
@@ -1,30 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 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/>.
-
-\defgroup grpJobControlFunctionObjects Job control function objects
-@{
-    \ingroup grpFunctionObjects
-    This group contains job control-based function objects
-@}
-
-\*---------------------------------------------------------------------------*/
diff --git a/src/postProcessing/functionObjects/cloud/Make/files b/src/postProcessing/functionObjects/lagrangian/Make/files
similarity index 54%
rename from src/postProcessing/functionObjects/cloud/Make/files
rename to src/postProcessing/functionObjects/lagrangian/Make/files
index e8515a0937acb1256b26696bbae4fd16aee6eef5..3445d2f6288df79f71c8cec490e5b2f1f9c0464a 100644
--- a/src/postProcessing/functionObjects/cloud/Make/files
+++ b/src/postProcessing/functionObjects/lagrangian/Make/files
@@ -1,4 +1,4 @@
 cloudInfo/cloudInfo.C
 cloudInfo/cloudInfoFunctionObject.C
 
-LIB = $(FOAM_LIBBIN)/libcloudFunctionObjects
+LIB = $(FOAM_LIBBIN)/liblagrangianFunctionObjects
diff --git a/src/postProcessing/functionObjects/cloud/Make/options b/src/postProcessing/functionObjects/lagrangian/Make/options
similarity index 100%
rename from src/postProcessing/functionObjects/cloud/Make/options
rename to src/postProcessing/functionObjects/lagrangian/Make/options
diff --git a/src/postProcessing/functionObjects/cloud/cloudInfo/IOcloudInfo.H b/src/postProcessing/functionObjects/lagrangian/cloudInfo/IOcloudInfo.H
similarity index 95%
rename from src/postProcessing/functionObjects/cloud/cloudInfo/IOcloudInfo.H
rename to src/postProcessing/functionObjects/lagrangian/cloudInfo/IOcloudInfo.H
index 6e0eda072a8b3f03951f5dd7f09591c561646c1c..4d1740ad79435a82146df940eedbf6861cbbcea9 100644
--- a/src/postProcessing/functionObjects/cloud/cloudInfo/IOcloudInfo.H
+++ b/src/postProcessing/functionObjects/lagrangian/cloudInfo/IOcloudInfo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.C b/src/postProcessing/functionObjects/lagrangian/cloudInfo/cloudInfo.C
similarity index 100%
rename from src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.C
rename to src/postProcessing/functionObjects/lagrangian/cloudInfo/cloudInfo.C
diff --git a/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.H b/src/postProcessing/functionObjects/lagrangian/cloudInfo/cloudInfo.H
similarity index 98%
rename from src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.H
rename to src/postProcessing/functionObjects/lagrangian/cloudInfo/cloudInfo.H
index 895dd4a2a8bcbd3aebab07d2d741b6253dd14ef1..54c119cb2b55730a56b7b17bff217b72f12cfa7c 100644
--- a/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.H
+++ b/src/postProcessing/functionObjects/lagrangian/cloudInfo/cloudInfo.H
@@ -69,8 +69,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef cloudInfo_H
-#define cloudInfo_H
+#ifndef functionObjects_cloudInfo_H
+#define functionObjects_cloudInfo_H
 
 #include "functionObjectFiles.H"
 #include "PtrList.H"
diff --git a/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfoFunctionObject.C b/src/postProcessing/functionObjects/lagrangian/cloudInfo/cloudInfoFunctionObject.C
similarity index 95%
rename from src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfoFunctionObject.C
rename to src/postProcessing/functionObjects/lagrangian/cloudInfo/cloudInfoFunctionObject.C
index 8197da4ec8037cbfcea805511aa58ec59c41a94b..4ac835ec9dbb41f30faf94ce8945e46f6b54ffed 100644
--- a/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfoFunctionObject.C
+++ b/src/postProcessing/functionObjects/lagrangian/cloudInfo/cloudInfoFunctionObject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfoFunctionObject.H b/src/postProcessing/functionObjects/lagrangian/cloudInfo/cloudInfoFunctionObject.H
similarity index 100%
rename from src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfoFunctionObject.H
rename to src/postProcessing/functionObjects/lagrangian/cloudInfo/cloudInfoFunctionObject.H
diff --git a/src/postProcessing/functionObjects/cloud/cloudInfo/postProcessingDict b/src/postProcessing/functionObjects/lagrangian/cloudInfo/postProcessingDict
similarity index 100%
rename from src/postProcessing/functionObjects/cloud/cloudInfo/postProcessingDict
rename to src/postProcessing/functionObjects/lagrangian/cloudInfo/postProcessingDict
diff --git a/src/postProcessing/functionObjects/cloud/cloudFunctionObjectsDoc.H b/src/postProcessing/functionObjects/lagrangian/lagrangianFunctionObjectsDoc.H
similarity index 82%
rename from src/postProcessing/functionObjects/cloud/cloudFunctionObjectsDoc.H
rename to src/postProcessing/functionObjects/lagrangian/lagrangianFunctionObjectsDoc.H
index 2ac4b66db489ed419625a7eae35a2d792b4a86b0..591738965742c4e64191dacb2d57404ddd3fc503 100644
--- a/src/postProcessing/functionObjects/cloud/cloudFunctionObjectsDoc.H
+++ b/src/postProcessing/functionObjects/lagrangian/lagrangianFunctionObjectsDoc.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -21,13 +21,13 @@ License
     You should have received a copy of the GNU General Public License along with
     OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-\defgroup grpCloudFunctionObjects Cloud function objects
+\defgroup grpLagrangianFunctionObjects Lagrangian function objects
 @{
     \ingroup grpFunctionObjects
-    This group contains cloud-based function objects.
+    This group contains lagrangian-based function objects.
 
     Function objects in this group are packaged into the
-    libcloudFunctionObjects.so library.
+    liblagrangianFunctionObjects.so library.
 @}
 
 \*---------------------------------------------------------------------------*/
diff --git a/src/postProcessing/functionObjects/systemCall/Make/options b/src/postProcessing/functionObjects/systemCall/Make/options
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.H b/src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.H
index a0796ea7a07712e0007befd3bb7255d3e6815c5e..4f5bd2cc182b4fde4da434806687d94fde9f3215 100644
--- a/src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.H
+++ b/src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.H
@@ -38,8 +38,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef CourantNo_H
-#define CourantNo_H
+#ifndef functionObjects_CourantNo_H
+#define functionObjects_CourantNo_H
 
 #include "volFields.H"
 
diff --git a/src/postProcessing/functionObjects/utilities/Lambda2/Lambda2.H b/src/postProcessing/functionObjects/utilities/Lambda2/Lambda2.H
index a394b9b5a815205294425594df0c1999aa61710e..42a81089530a1a6b71ba028e8c4f97f0fed61c5a 100644
--- a/src/postProcessing/functionObjects/utilities/Lambda2/Lambda2.H
+++ b/src/postProcessing/functionObjects/utilities/Lambda2/Lambda2.H
@@ -38,8 +38,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Lambda2_H
-#define Lambda2_H
+#ifndef functionObjects_Lambda2_H
+#define functionObjects_Lambda2_H
 
 #include "volFieldsFwd.H"
 #include "surfaceFieldsFwd.H"
diff --git a/src/postProcessing/functionObjects/utilities/Make/files b/src/postProcessing/functionObjects/utilities/Make/files
index 4c38b4ba67926fff719b85b654a6782259ecff51..b9601ff78e58872bab37d6ad8815570e58c12781 100644
--- a/src/postProcessing/functionObjects/utilities/Make/files
+++ b/src/postProcessing/functionObjects/utilities/Make/files
@@ -18,9 +18,6 @@ blendingFactor/blendingFactorFunctionObject.C
 dsmcFields/dsmcFields.C
 dsmcFields/dsmcFieldsFunctionObject.C
 
-pressureTools/pressureTools.C
-pressureTools/pressureToolsFunctionObject.C
-
 residuals/residuals.C
 residuals/residualsFunctionObject.C
 
@@ -36,12 +33,26 @@ turbulenceFields/turbulenceFieldsFunctionObject.C
 vorticity/vorticity.C
 vorticity/vorticityFunctionObject.C
 
-wallShearStress/wallShearStress.C
-wallShearStress/wallShearStressFunctionObject.C
-
 yPlus/yPlus.C
 yPlus/yPlusFunctionObject.C
 
 setTimeStep/setTimeStepFunctionObject.C
 
+systemCall/systemCall.C
+systemCall/systemCallFunctionObject.C
+
+abort/abort.C
+
+partialWrite/partialWrite.C
+partialWrite/partialWriteFunctionObject.C
+
+removeRegisteredObject/removeRegisteredObject.C
+removeRegisteredObject/removeRegisteredObjectFunctionObject.C
+
+writeDictionary/writeDictionary.C
+writeDictionary/writeDictionaryFunctionObject.C
+
+writeRegisteredObject/writeRegisteredObject.C
+writeRegisteredObject/writeRegisteredObjectFunctionObject.C
+
 LIB = $(FOAM_LIBBIN)/libutilityFunctionObjects
diff --git a/src/postProcessing/functionObjects/utilities/Make/options b/src/postProcessing/functionObjects/utilities/Make/options
index ad4e27c1967426d1d3fdfdeb9b45fa67744396d6..6ff1c14f347e550c372f91475c551e4468aa1a98 100644
--- a/src/postProcessing/functionObjects/utilities/Make/options
+++ b/src/postProcessing/functionObjects/utilities/Make/options
@@ -21,8 +21,6 @@ LIB_LIBS = \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lspecie \
-    -llagrangian \
-    -lDSMC \
     -lfiniteVolume \
     -lmeshTools \
     -lsampling
diff --git a/src/postProcessing/functionObjects/utilities/Peclet/Peclet.H b/src/postProcessing/functionObjects/utilities/Peclet/Peclet.H
index dba87188aba491df33b948a75105e6b3cef46965..a47e2236ab6ea76b3e23b16f6aeab352e0d5ca22 100644
--- a/src/postProcessing/functionObjects/utilities/Peclet/Peclet.H
+++ b/src/postProcessing/functionObjects/utilities/Peclet/Peclet.H
@@ -37,8 +37,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Peclet_H
-#define Peclet_H
+#ifndef functionObjects_Peclet_H
+#define functionObjects_Peclet_H
 
 #include "volFieldsFwd.H"
 #include "surfaceFieldsFwd.H"
diff --git a/src/postProcessing/functionObjects/utilities/Q/Q.H b/src/postProcessing/functionObjects/utilities/Q/Q.H
index 56e00833c3642f5f64fe254eeec38196e26ec0e7..63ae36d7760c968680fbb0179d5704c38dfd543f 100644
--- a/src/postProcessing/functionObjects/utilities/Q/Q.H
+++ b/src/postProcessing/functionObjects/utilities/Q/Q.H
@@ -41,8 +41,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Q_H
-#define Q_H
+#ifndef functionObjects_Q_H
+#define functionObjects_Q_H
 
 #include "volFieldsFwd.H"
 #include "surfaceFieldsFwd.H"
diff --git a/src/postProcessing/functionObjects/jobControl/abort/IOabort.H b/src/postProcessing/functionObjects/utilities/abort/IOabort.H
similarity index 100%
rename from src/postProcessing/functionObjects/jobControl/abort/IOabort.H
rename to src/postProcessing/functionObjects/utilities/abort/IOabort.H
diff --git a/src/postProcessing/functionObjects/jobControl/abort/abort.C b/src/postProcessing/functionObjects/utilities/abort/abort.C
similarity index 100%
rename from src/postProcessing/functionObjects/jobControl/abort/abort.C
rename to src/postProcessing/functionObjects/utilities/abort/abort.C
diff --git a/src/postProcessing/functionObjects/jobControl/abort/abort.H b/src/postProcessing/functionObjects/utilities/abort/abort.H
similarity index 98%
rename from src/postProcessing/functionObjects/jobControl/abort/abort.H
rename to src/postProcessing/functionObjects/utilities/abort/abort.H
index 29dc9c22c937c5a83dc09fb62ebebce2d8a29802..4224d980bbeb05dbaf5c398d2bcf19c076e32a1f 100644
--- a/src/postProcessing/functionObjects/jobControl/abort/abort.H
+++ b/src/postProcessing/functionObjects/utilities/abort/abort.H
@@ -42,8 +42,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef abort_H
-#define abort_H
+#ifndef functionObjects_abort_H
+#define functionObjects_abort_H
 
 #include "NamedEnum.H"
 
diff --git a/src/postProcessing/functionObjects/jobControl/abort/abortFunctionObject.C b/src/postProcessing/functionObjects/utilities/abort/abortFunctionObject.C
similarity index 100%
rename from src/postProcessing/functionObjects/jobControl/abort/abortFunctionObject.C
rename to src/postProcessing/functionObjects/utilities/abort/abortFunctionObject.C
diff --git a/src/postProcessing/functionObjects/jobControl/abort/abortFunctionObject.H b/src/postProcessing/functionObjects/utilities/abort/abortFunctionObject.H
similarity index 100%
rename from src/postProcessing/functionObjects/jobControl/abort/abortFunctionObject.H
rename to src/postProcessing/functionObjects/utilities/abort/abortFunctionObject.H
diff --git a/src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactor.H b/src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactor.H
index 8e739442ccc4ca52ce0f93dcbec02d07d6661a78..72e355159b3e1870cfc9e71db81859225a53475c 100644
--- a/src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactor.H
+++ b/src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactor.H
@@ -39,8 +39,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef blendingFactor_H
-#define blendingFactor_H
+#ifndef functionObjects_blendingFactor_H
+#define functionObjects_blendingFactor_H
 
 #include "volFieldsFwd.H"
 #include "surfaceFieldsFwd.H"
diff --git a/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H b/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H
index ae07bb0340e8c80d3afbd27c40ca762824645c09..bd3bf8107b314bbaf621d5dce17bfb9039c606ef 100644
--- a/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H
+++ b/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,8 +74,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef codedFunctionObject_H
-#define codedFunctionObject_H
+#ifndef functionObjects_codedFunctionObject_H
+#define functionObjects_codedFunctionObject_H
 
 #include "functionObject.H"
 #include "codedBase.H"
diff --git a/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.H b/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.H
index e702a01abde5d5a30801dd62f18cb45737de5b8d..040b02c8b712701da567b4ae11b96d979f7babf0 100644
--- a/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.H
+++ b/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.H
@@ -41,8 +41,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef dsmcFields_H
-#define dsmcFields_H
+#ifndef functionObjects_dsmcFields_H
+#define functionObjects_dsmcFields_H
 
 #include "typeInfo.H"
 #include "autoPtr.H"
diff --git a/src/postProcessing/functionObjects/IO/partialWrite/IOpartialWrite.H b/src/postProcessing/functionObjects/utilities/partialWrite/IOpartialWrite.H
similarity index 95%
rename from src/postProcessing/functionObjects/IO/partialWrite/IOpartialWrite.H
rename to src/postProcessing/functionObjects/utilities/partialWrite/IOpartialWrite.H
index a9d40914cbf08ad51a985fcad1ee6bccfaf4ac68..a3e8842e479aeeb2956443b43d0242a95e0045d4 100644
--- a/src/postProcessing/functionObjects/IO/partialWrite/IOpartialWrite.H
+++ b/src/postProcessing/functionObjects/utilities/partialWrite/IOpartialWrite.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/IO/controlDict b/src/postProcessing/functionObjects/utilities/partialWrite/controlDict
similarity index 100%
rename from src/postProcessing/functionObjects/IO/controlDict
rename to src/postProcessing/functionObjects/utilities/partialWrite/controlDict
diff --git a/src/postProcessing/functionObjects/IO/partialWrite/partialWrite.C b/src/postProcessing/functionObjects/utilities/partialWrite/partialWrite.C
similarity index 100%
rename from src/postProcessing/functionObjects/IO/partialWrite/partialWrite.C
rename to src/postProcessing/functionObjects/utilities/partialWrite/partialWrite.C
diff --git a/src/postProcessing/functionObjects/IO/partialWrite/partialWrite.H b/src/postProcessing/functionObjects/utilities/partialWrite/partialWrite.H
similarity index 98%
rename from src/postProcessing/functionObjects/IO/partialWrite/partialWrite.H
rename to src/postProcessing/functionObjects/utilities/partialWrite/partialWrite.H
index 76a18f5fbced8218b2673e9c973ab3eca3441a02..e5ba6ff936274471c9c73afb424a28ddd4b1bb79 100644
--- a/src/postProcessing/functionObjects/IO/partialWrite/partialWrite.H
+++ b/src/postProcessing/functionObjects/utilities/partialWrite/partialWrite.H
@@ -62,8 +62,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef partialWrite_H
-#define partialWrite_H
+#ifndef functionObjects_partialWrite_H
+#define functionObjects_partialWrite_H
 
 #include "HashSet.H"
 #include "runTimeSelectionTables.H"
diff --git a/src/postProcessing/functionObjects/IO/partialWrite/partialWriteFunctionObject.C b/src/postProcessing/functionObjects/utilities/partialWrite/partialWriteFunctionObject.C
similarity index 95%
rename from src/postProcessing/functionObjects/IO/partialWrite/partialWriteFunctionObject.C
rename to src/postProcessing/functionObjects/utilities/partialWrite/partialWriteFunctionObject.C
index 89166fbbf310b6e62036c4de86100f9dc54868b4..9938388787cf0437b88d1ac1c1781ab23e97ad80 100644
--- a/src/postProcessing/functionObjects/IO/partialWrite/partialWriteFunctionObject.C
+++ b/src/postProcessing/functionObjects/utilities/partialWrite/partialWriteFunctionObject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/IO/partialWrite/partialWriteFunctionObject.H b/src/postProcessing/functionObjects/utilities/partialWrite/partialWriteFunctionObject.H
similarity index 100%
rename from src/postProcessing/functionObjects/IO/partialWrite/partialWriteFunctionObject.H
rename to src/postProcessing/functionObjects/utilities/partialWrite/partialWriteFunctionObject.H
diff --git a/src/postProcessing/functionObjects/IO/partialWrite/partialWriteTemplates.C b/src/postProcessing/functionObjects/utilities/partialWrite/partialWriteTemplates.C
similarity index 100%
rename from src/postProcessing/functionObjects/IO/partialWrite/partialWriteTemplates.C
rename to src/postProcessing/functionObjects/utilities/partialWrite/partialWriteTemplates.C
diff --git a/src/postProcessing/functionObjects/IO/removeRegisteredObject/IOremoveRegisteredObject.H b/src/postProcessing/functionObjects/utilities/removeRegisteredObject/IOremoveRegisteredObject.H
similarity index 95%
rename from src/postProcessing/functionObjects/IO/removeRegisteredObject/IOremoveRegisteredObject.H
rename to src/postProcessing/functionObjects/utilities/removeRegisteredObject/IOremoveRegisteredObject.H
index d786378ed234e68d1d034b06cf5ffafbcc72b583..66444807abbbcd767e4c8c7742bbbeebd7914be2 100644
--- a/src/postProcessing/functionObjects/IO/removeRegisteredObject/IOremoveRegisteredObject.H
+++ b/src/postProcessing/functionObjects/utilities/removeRegisteredObject/IOremoveRegisteredObject.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObject.C b/src/postProcessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.C
similarity index 100%
rename from src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObject.C
rename to src/postProcessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.C
diff --git a/src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObject.H b/src/postProcessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H
similarity index 98%
rename from src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObject.H
rename to src/postProcessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H
index 5bbb16d923c38252989f09a917141bc5e4833ebb..b8a7da75bba30c69570dd6c820c665f5cdea7a2e 100644
--- a/src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObject.H
+++ b/src/postProcessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H
@@ -58,8 +58,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef removeRegisteredObject_H
-#define removeRegisteredObject_H
+#ifndef functionObjects_removeRegisteredObject_H
+#define functionObjects_removeRegisteredObject_H
 
 #include "wordList.H"
 #include "runTimeSelectionTables.H"
diff --git a/src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObjectFunctionObject.C b/src/postProcessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObjectFunctionObject.C
similarity index 95%
rename from src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObjectFunctionObject.C
rename to src/postProcessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObjectFunctionObject.C
index 652e60e87d5db8b2eb53e0a7c1ca5435714b5777..698b25d7c56cc93c883300af5c5a65e92b116bf9 100644
--- a/src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObjectFunctionObject.C
+++ b/src/postProcessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObjectFunctionObject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObjectFunctionObject.H b/src/postProcessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObjectFunctionObject.H
similarity index 100%
rename from src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObjectFunctionObject.H
rename to src/postProcessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObjectFunctionObject.H
diff --git a/src/postProcessing/functionObjects/utilities/residuals/residuals.H b/src/postProcessing/functionObjects/utilities/residuals/residuals.H
index 01a44e0c3e0ec0712e12ca1d44e5cc401413623d..f3ee3c5c4c6a2bc5da0369a069a55ed93bbec878 100644
--- a/src/postProcessing/functionObjects/utilities/residuals/residuals.H
+++ b/src/postProcessing/functionObjects/utilities/residuals/residuals.H
@@ -59,8 +59,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef residuals_H
-#define residuals_H
+#ifndef functionObjects_residuals_H
+#define functionObjects_residuals_H
 
 #include "functionObjectFiles.H"
 #include "primitiveFieldsFwd.H"
diff --git a/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.H b/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.H
index 21724bfb3d6fdb2c298e5df261f35c1492bbd3b3..a1434b01c2f0e70e5cc5bf319c0eef17f6106b26 100644
--- a/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.H
+++ b/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.H
@@ -45,8 +45,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef scalarTransport_H
-#define scalarTransport_H
+#ifndef functionObjects_scalarTransport_H
+#define functionObjects_scalarTransport_H
 
 #include "volFields.H"
 #include "surfaceFieldsFwd.H"
diff --git a/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C b/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C
index 36cef8238563880c4e9984020ced6403120efca2..6ea307928d2db573e6cf488bbf0a156104ef3134 100644
--- a/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C
+++ b/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C
@@ -29,6 +29,8 @@ License
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
+{
+namespace functionObjects
 {
     defineTypeNameAndDebug(setTimeStepFunctionObject, 0);
 
@@ -39,11 +41,12 @@ namespace Foam
         dictionary
     );
 }
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::setTimeStepFunctionObject::setTimeStepFunctionObject
+Foam::functionObjects::setTimeStepFunctionObject::setTimeStepFunctionObject
 (
     const word& name,
     const Time& runTime,
@@ -60,43 +63,46 @@ Foam::setTimeStepFunctionObject::setTimeStepFunctionObject
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::setTimeStepFunctionObject::on()
+void Foam::functionObjects::setTimeStepFunctionObject::on()
 {
     enabled_ = true;
 }
 
 
-void Foam::setTimeStepFunctionObject::off()
+void Foam::functionObjects::setTimeStepFunctionObject::off()
 {
     enabled_ = false;
 }
 
 
-bool Foam::setTimeStepFunctionObject::start()
+bool Foam::functionObjects::setTimeStepFunctionObject::start()
 {
     return true;
 }
 
 
-bool Foam::setTimeStepFunctionObject::execute(const bool forceWrite)
+bool Foam::functionObjects::setTimeStepFunctionObject::execute
+(
+    const bool forceWrite
+)
 {
     return true;
 }
 
 
-bool Foam::setTimeStepFunctionObject::end()
+bool Foam::functionObjects::setTimeStepFunctionObject::end()
 {
     return true;
 }
 
 
-bool Foam::setTimeStepFunctionObject::timeSet()
+bool Foam::functionObjects::setTimeStepFunctionObject::timeSet()
 {
     return true;
 }
 
 
-bool Foam::setTimeStepFunctionObject::adjustTimeStep()
+bool Foam::functionObjects::setTimeStepFunctionObject::adjustTimeStep()
 {
     if (enabled())
     {
@@ -114,7 +120,10 @@ bool Foam::setTimeStepFunctionObject::adjustTimeStep()
 }
 
 
-bool Foam::setTimeStepFunctionObject::read(const dictionary& dict)
+bool Foam::functionObjects::setTimeStepFunctionObject::read
+(
+    const dictionary& dict
+)
 {
     enabled_ = dict.lookupOrDefault("enabled", true);
 
@@ -141,11 +150,17 @@ bool Foam::setTimeStepFunctionObject::read(const dictionary& dict)
 }
 
 
-void Foam::setTimeStepFunctionObject::updateMesh(const mapPolyMesh& mpm)
+void Foam::functionObjects::setTimeStepFunctionObject::updateMesh
+(
+    const mapPolyMesh& mpm
+)
 {}
 
 
-void Foam::setTimeStepFunctionObject::movePoints(const polyMesh& mesh)
+void Foam::functionObjects::setTimeStepFunctionObject::movePoints
+(
+    const polyMesh& mesh
+)
 {}
 
 
diff --git a/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H b/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H
index 1749d3d4a74f71c5c2a05a98c09caba5750f226d..55a0a06d4b9f531ea5f528629a6a7889cfde78aa 100644
--- a/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H
+++ b/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H
@@ -39,8 +39,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef setTimeStepFunctionObject_H
-#define setTimeStepFunctionObject_H
+#ifndef functionObjects_setTimeStepFunctionObject_H
+#define functionObjects_setTimeStepFunctionObject_H
 
 #include "functionObject.H"
 #include "dictionary.H"
@@ -50,6 +50,8 @@ SourceFiles
 
 namespace Foam
 {
+namespace functionObjects
+{
 
 /*---------------------------------------------------------------------------*\
                     Class setTimeStepFunctionObject Declaration
@@ -150,6 +152,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace functionObjects
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/systemCall/IOsystemCall.H b/src/postProcessing/functionObjects/utilities/systemCall/IOsystemCall.H
similarity index 95%
rename from src/postProcessing/functionObjects/systemCall/IOsystemCall.H
rename to src/postProcessing/functionObjects/utilities/systemCall/IOsystemCall.H
index cb823adbd9c22d66f2cc53631353c09f033c5eb1..ef39f2ace89117055396da1bb70c5c58cff84804 100644
--- a/src/postProcessing/functionObjects/systemCall/IOsystemCall.H
+++ b/src/postProcessing/functionObjects/utilities/systemCall/IOsystemCall.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/systemCall/Make/files b/src/postProcessing/functionObjects/utilities/systemCall/Make/files
similarity index 100%
rename from src/postProcessing/functionObjects/systemCall/Make/files
rename to src/postProcessing/functionObjects/utilities/systemCall/Make/files
diff --git a/src/postProcessing/functionObjects/jobControl/Make/options b/src/postProcessing/functionObjects/utilities/systemCall/Make/options
similarity index 100%
rename from src/postProcessing/functionObjects/jobControl/Make/options
rename to src/postProcessing/functionObjects/utilities/systemCall/Make/options
diff --git a/src/postProcessing/functionObjects/systemCall/controlDict b/src/postProcessing/functionObjects/utilities/systemCall/controlDict
similarity index 100%
rename from src/postProcessing/functionObjects/systemCall/controlDict
rename to src/postProcessing/functionObjects/utilities/systemCall/controlDict
diff --git a/src/postProcessing/functionObjects/systemCall/systemCall.C b/src/postProcessing/functionObjects/utilities/systemCall/systemCall.C
similarity index 100%
rename from src/postProcessing/functionObjects/systemCall/systemCall.C
rename to src/postProcessing/functionObjects/utilities/systemCall/systemCall.C
diff --git a/src/postProcessing/functionObjects/systemCall/systemCall.H b/src/postProcessing/functionObjects/utilities/systemCall/systemCall.H
similarity index 98%
rename from src/postProcessing/functionObjects/systemCall/systemCall.H
rename to src/postProcessing/functionObjects/utilities/systemCall/systemCall.H
index 38ec3deff43a60d950d7603c5175fd033aa62297..3219fe22d8149ca565ec6fae31739244e27e820b 100644
--- a/src/postProcessing/functionObjects/systemCall/systemCall.H
+++ b/src/postProcessing/functionObjects/utilities/systemCall/systemCall.H
@@ -84,8 +84,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef systemCall_H
-#define systemCall_H
+#ifndef functionObjects_systemCall_H
+#define functionObjects_systemCall_H
 
 #include "stringList.H"
 
diff --git a/src/postProcessing/functionObjects/systemCall/systemCallFunctionObject.C b/src/postProcessing/functionObjects/utilities/systemCall/systemCallFunctionObject.C
similarity index 95%
rename from src/postProcessing/functionObjects/systemCall/systemCallFunctionObject.C
rename to src/postProcessing/functionObjects/utilities/systemCall/systemCallFunctionObject.C
index f9855ecb0df6bd13056ff5eb72346b5960cfe2b1..0dfd7b6b06921e5222ee10da5c35a1d49697338c 100644
--- a/src/postProcessing/functionObjects/systemCall/systemCallFunctionObject.C
+++ b/src/postProcessing/functionObjects/utilities/systemCall/systemCallFunctionObject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/systemCall/systemCallFunctionObject.H b/src/postProcessing/functionObjects/utilities/systemCall/systemCallFunctionObject.H
similarity index 100%
rename from src/postProcessing/functionObjects/systemCall/systemCallFunctionObject.H
rename to src/postProcessing/functionObjects/utilities/systemCall/systemCallFunctionObject.H
diff --git a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H
index 40d6ae37b413637946ec4d23e7eeec5ac6c01141..9a34d4a9c9e913576d1747873420b921bd6f6750 100644
--- a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H
+++ b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H
@@ -57,8 +57,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef timeActivatedFileUpdate_H
-#define timeActivatedFileUpdate_H
+#ifndef functionObjects_timeActivatedFileUpdate_H
+#define functionObjects_timeActivatedFileUpdate_H
 
 #include "Tuple2.H"
 
diff --git a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H
index c31eaceca40f156f7afec5bd5441ed90eb1022cf..f3d98cfa12947c50c73a5e335b0e2de405b693a0 100644
--- a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H
+++ b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H
@@ -84,8 +84,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef turbulenceFields_H
-#define turbulenceFields_H
+#ifndef functionObjects_turbulenceFields_H
+#define functionObjects_turbulenceFields_H
 
 #include "HashSet.H"
 #include "IOobject.H"
diff --git a/src/postProcessing/functionObjects/utilities/vorticity/vorticity.H b/src/postProcessing/functionObjects/utilities/vorticity/vorticity.H
index dd6a7dff0744240f91bb3ffa2ffcc28e0683d1f6..0b4094f12dafaf865bca888e46306038a7bc70d2 100644
--- a/src/postProcessing/functionObjects/utilities/vorticity/vorticity.H
+++ b/src/postProcessing/functionObjects/utilities/vorticity/vorticity.H
@@ -36,8 +36,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef vorticity_H
-#define vorticity_H
+#ifndef functionObjects_vorticity_H
+#define functionObjects_vorticity_H
 
 #include "volFieldsFwd.H"
 
diff --git a/src/postProcessing/functionObjects/IO/writeDictionary/IOwriteDictionary.H b/src/postProcessing/functionObjects/utilities/writeDictionary/IOwriteDictionary.H
similarity index 95%
rename from src/postProcessing/functionObjects/IO/writeDictionary/IOwriteDictionary.H
rename to src/postProcessing/functionObjects/utilities/writeDictionary/IOwriteDictionary.H
index 87718cd6dcbbf55f229586dd68bdffbf5e2155c2..d7fbe3b914bf489dfd1e144a8dbc6f9c658b2000 100644
--- a/src/postProcessing/functionObjects/IO/writeDictionary/IOwriteDictionary.H
+++ b/src/postProcessing/functionObjects/utilities/writeDictionary/IOwriteDictionary.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.C b/src/postProcessing/functionObjects/utilities/writeDictionary/writeDictionary.C
similarity index 100%
rename from src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.C
rename to src/postProcessing/functionObjects/utilities/writeDictionary/writeDictionary.C
diff --git a/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.H b/src/postProcessing/functionObjects/utilities/writeDictionary/writeDictionary.H
similarity index 98%
rename from src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.H
rename to src/postProcessing/functionObjects/utilities/writeDictionary/writeDictionary.H
index 3f822fa89ac381cc76ca6c7064379b3c12235987..42e381832db84054a95bc425a2c1c7a09c934b50 100644
--- a/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.H
+++ b/src/postProcessing/functionObjects/utilities/writeDictionary/writeDictionary.H
@@ -36,8 +36,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef writeDictionary_H
-#define writeDictionary_H
+#ifndef functionObjects_writeDictionary_H
+#define functionObjects_writeDictionary_H
 
 #include "wordList.H"
 #include "runTimeSelectionTables.H"
diff --git a/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionaryFunctionObject.C b/src/postProcessing/functionObjects/utilities/writeDictionary/writeDictionaryFunctionObject.C
similarity index 95%
rename from src/postProcessing/functionObjects/IO/writeDictionary/writeDictionaryFunctionObject.C
rename to src/postProcessing/functionObjects/utilities/writeDictionary/writeDictionaryFunctionObject.C
index 712e7d9b39704b5d83bca4fe22931ea0e2497527..f16f5921b1291220b158909e2c31ca2713eb7aae 100644
--- a/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionaryFunctionObject.C
+++ b/src/postProcessing/functionObjects/utilities/writeDictionary/writeDictionaryFunctionObject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionaryFunctionObject.H b/src/postProcessing/functionObjects/utilities/writeDictionary/writeDictionaryFunctionObject.H
similarity index 100%
rename from src/postProcessing/functionObjects/IO/writeDictionary/writeDictionaryFunctionObject.H
rename to src/postProcessing/functionObjects/utilities/writeDictionary/writeDictionaryFunctionObject.H
diff --git a/src/postProcessing/functionObjects/IO/writeRegisteredObject/IOwriteRegisteredObject.H b/src/postProcessing/functionObjects/utilities/writeRegisteredObject/IOwriteRegisteredObject.H
similarity index 95%
rename from src/postProcessing/functionObjects/IO/writeRegisteredObject/IOwriteRegisteredObject.H
rename to src/postProcessing/functionObjects/utilities/writeRegisteredObject/IOwriteRegisteredObject.H
index d5741654824111dcbe630eb6d355a22b896bec64..727cae7ab31ca8497d73ff2e276573b08a038f9b 100644
--- a/src/postProcessing/functionObjects/IO/writeRegisteredObject/IOwriteRegisteredObject.H
+++ b/src/postProcessing/functionObjects/utilities/writeRegisteredObject/IOwriteRegisteredObject.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/utilities/writeRegisteredObject/controlDict b/src/postProcessing/functionObjects/utilities/writeRegisteredObject/controlDict
new file mode 100644
index 0000000000000000000000000000000000000000..a9e0fb2fe35ad3240452f2f2a9ee33258bb736dd
--- /dev/null
+++ b/src/postProcessing/functionObjects/utilities/writeRegisteredObject/controlDict
@@ -0,0 +1,122 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// So we get a decent warning if we have multiple functionObject entries
+// with the same name.
+#inputMode error;
+
+application     icoFoam;
+
+startFrom       startTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         0.5;
+
+deltaT          0.005;
+
+writeControl    timeStep;
+
+writeInterval   20;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  6;
+
+writeCompression uncompressed;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable yes;
+
+functions
+{
+    partialWrite
+    {
+        // Write some registered objects more often than others.
+        // Above writeControl determines most frequent dump.
+
+        type            partialWrite;
+
+        // Where to load it from
+        functionObjectLibs ("libIOFunctionObjects.so");
+
+        // Optional mesh region to operate on. Only one partialWrite per
+        // region allowed.
+        region wallFilmRegion;
+
+        // Execute upon options:
+        //  timeStep
+        //  outputTime
+        //  adjustableTime
+        //  runTime
+        //  clockTime
+        //  cpuTime
+        outputControl   outputTime;
+
+        // Objects (fields or lagrangian fields in any of the clouds)
+        // to write every outputTime
+        objectNames    (p positions nParticle);
+
+        // Write as normal every writeInterval'th outputTime.
+        outputInterval  1; // (timeStep, outputTime)
+
+        // Interval of time (sec) to write down(
+        writeInterval   10.5 //(adjustableTime, runTime, clockTime, cpuTime)
+    }
+
+    dumpObjects
+    {
+        // Forcibly write registered objects
+
+        type            writeRegisteredObject;
+
+        // Where to load it from
+        functionObjectLibs ("libIOFunctionObjects.so");
+
+        // When to write:
+        //  timeStep            (with optional outputInterval)
+        //  outputTime          (with optional outputInterval)
+        //  adjustableTime
+        //  runTime
+        //  clockTime
+        //  cpuTime
+        outputControl   outputTime;
+
+         // Write every writeInterval (only valid for timeStemp, outputTime)
+        outputInterval  1;
+
+         // Interval of time (valid for adjustableTime, runTime, clockTime,
+        //  cpuTime)
+        writeInterval   10.5;
+
+        // Objects to write
+        objectNames    ();
+
+
+        // Is the object written by this function Object alone
+        // (default is false)
+        //exclusiveWriting       true;
+    }
+}
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C b/src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObject.C
similarity index 100%
rename from src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C
rename to src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObject.C
diff --git a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.H b/src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObject.H
similarity index 98%
rename from src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.H
rename to src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObject.H
index 8fb674a8831c01198256c28fa935cd346fa2cee6..efae29d0459bdf09fde6adc4d8221b4bcb0bfbbc 100644
--- a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.H
+++ b/src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObject.H
@@ -72,8 +72,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef writeRegisteredObject_H
-#define writeRegisteredObject_H
+#ifndef functionObjects_writeRegisteredObject_H
+#define functionObjects_writeRegisteredObject_H
 
 #include "wordReList.H"
 #include "runTimeSelectionTables.H"
diff --git a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObjectFunctionObject.C b/src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObjectFunctionObject.C
similarity index 95%
rename from src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObjectFunctionObject.C
rename to src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObjectFunctionObject.C
index 80e9280f0bb57de89dc0d02328c5e545481dc37f..1eebe9cefaf014c9920379a503b139ec3d3fa37e 100644
--- a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObjectFunctionObject.C
+++ b/src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObjectFunctionObject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObjectFunctionObject.H b/src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObjectFunctionObject.H
similarity index 100%
rename from src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObjectFunctionObject.H
rename to src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObjectFunctionObject.H
diff --git a/src/postProcessing/functionObjects/utilities/yPlus/yPlus.H b/src/postProcessing/functionObjects/utilities/yPlus/yPlus.H
index 7b026d977135387bf0f5caea98173d4c5ad61ee7..cde61ec39be993918ae8a43c8b8f0c090bff9d8d 100644
--- a/src/postProcessing/functionObjects/utilities/yPlus/yPlus.H
+++ b/src/postProcessing/functionObjects/utilities/yPlus/yPlus.H
@@ -37,8 +37,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef yPlus_H
-#define yPlus_H
+#ifndef functionObjects_yPlus_H
+#define functionObjects_yPlus_H
 
 #include "functionObjectFiles.H"
 #include "volFieldsFwd.H"