diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index 446b64460a033bb4f0c04ebe953614cd0d4a6656..854c89211b42cb1a94c0772af9309573bd49c2b6 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -349,9 +349,11 @@ general = cfdTools/general
 $(general)/findRefCell/findRefCell.C
 $(general)/adjustPhi/adjustPhi.C
 $(general)/bound/bound.C
-$(general)/solutionControl/solutionControl.C
-$(general)/simpleControl/simpleControl.C
-$(general)/pimpleControl/pimpleControl.C
+
+solutionControl = $(general)/solutionControl
+$(solutionControl)/solutionControl/solutionControl.C
+$(solutionControl)/simpleControl/simpleControl.C
+$(solutionControl)/pimpleControl/pimpleControl.C
 
 porousMedia = $(general)/porousMedia
 $(porousMedia)/porousZone.C
diff --git a/src/finiteVolume/cfdTools/general/pimpleControl/pimpleControl.C b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.C
similarity index 100%
rename from src/finiteVolume/cfdTools/general/pimpleControl/pimpleControl.C
rename to src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.C
diff --git a/src/finiteVolume/cfdTools/general/pimpleControl/pimpleControl.H b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.H
similarity index 100%
rename from src/finiteVolume/cfdTools/general/pimpleControl/pimpleControl.H
rename to src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.H
diff --git a/src/finiteVolume/cfdTools/general/pimpleControl/pimpleControlI.H b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControlI.H
similarity index 100%
rename from src/finiteVolume/cfdTools/general/pimpleControl/pimpleControlI.H
rename to src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControlI.H
diff --git a/src/finiteVolume/cfdTools/general/simpleControl/simpleControl.C b/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.C
similarity index 100%
rename from src/finiteVolume/cfdTools/general/simpleControl/simpleControl.C
rename to src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.C
diff --git a/src/finiteVolume/cfdTools/general/simpleControl/simpleControl.H b/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.H
similarity index 100%
rename from src/finiteVolume/cfdTools/general/simpleControl/simpleControl.H
rename to src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.H
diff --git a/src/finiteVolume/cfdTools/general/simpleControl/simpleControlI.H b/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControlI.H
similarity index 100%
rename from src/finiteVolume/cfdTools/general/simpleControl/simpleControlI.H
rename to src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControlI.H
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl.C b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C
similarity index 100%
rename from src/finiteVolume/cfdTools/general/solutionControl/solutionControl.C
rename to src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl.H b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.H
similarity index 100%
rename from src/finiteVolume/cfdTools/general/solutionControl/solutionControl.H
rename to src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.H
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/solutionControlI.H b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControlI.H
similarity index 100%
rename from src/finiteVolume/cfdTools/general/solutionControl/solutionControlI.H
rename to src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControlI.H