diff --git a/applications/solvers/compressible/rhoSimpleFoam/Allwclean b/applications/solvers/compressible/rhoSimpleFoam/Allwclean
new file mode 100755
index 0000000000..49e4b69482
--- /dev/null
+++ b/applications/solvers/compressible/rhoSimpleFoam/Allwclean
@@ -0,0 +1,9 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+set -x
+
+wclean
+wclean rhoPorousMRFSimpleFoam
+wclean rhoSimplecFoam
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/applications/solvers/compressible/rhoSimpleFoam/Allwmake b/applications/solvers/compressible/rhoSimpleFoam/Allwmake
index 33916c7b39..e0b621c253 100755
--- a/applications/solvers/compressible/rhoSimpleFoam/Allwmake
+++ b/applications/solvers/compressible/rhoSimpleFoam/Allwmake
@@ -4,5 +4,6 @@ set -x
 
 wmake
 wmake rhoPorousMRFSimpleFoam
+wmake rhoSimplecFoam
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/applications/solvers/compressible/rhoSimpleFoam/UEqn.H b/applications/solvers/compressible/rhoSimpleFoam/UEqn.H
index 21ec2646be..f1bed4d071 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/UEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/UEqn.H
@@ -3,6 +3,7 @@
     tmp<fvVectorMatrix> UEqn
     (
         fvm::div(phi, U)
+      - fvm::Sp(fvc::div(phi), U)
       + turbulence->divDevRhoReff(U)
     );
 
diff --git a/applications/solvers/compressible/rhoSimpleFoam/hEqn.H b/applications/solvers/compressible/rhoSimpleFoam/hEqn.H
index 8ff402a2b1..879578cf49 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/hEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/hEqn.H
@@ -1,11 +1,13 @@
 {
+    volScalarField K("K", 0.5*magSqr(U));
+
     fvScalarMatrix hEqn
     (
         fvm::div(phi, h)
       - fvm::Sp(fvc::div(phi), h)
       - fvm::laplacian(turbulence->alphaEff(), h)
      ==
-      - fvc::div(phi, 0.5*magSqr(U), "div(phi,K)")
+        fvc::div(phi)*K - fvc::div(phi, K)
     );
 
     hEqn.relax();
diff --git a/applications/solvers/compressible/rhoSimpleFoam/pEqn.H b/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
index 56c444cdab..cefee48969 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
@@ -28,7 +28,7 @@ if (simple.transonic())
         );
 
         // Relax the pressure equation to ensure diagonal-dominance
-        pEqn.relax(mesh.equationRelaxationFactor("pEqn"));
+        pEqn.relax();
 
         pEqn.setReference(pRefCell, pRefValue);
 
diff --git a/applications/solvers/compressible/rhoSimplecFoam/Make/files b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/Make/files
similarity index 100%
rename from applications/solvers/compressible/rhoSimplecFoam/Make/files
rename to applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/Make/files
diff --git a/applications/solvers/compressible/rhoSimplecFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/Make/options
similarity index 93%
rename from applications/solvers/compressible/rhoSimplecFoam/Make/options
rename to applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/Make/options
index 9d578f011a..30c1e55d31 100644
--- a/applications/solvers/compressible/rhoSimplecFoam/Make/options
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/Make/options
@@ -1,5 +1,5 @@
 EXE_INC = \
-    -I../rhoSimpleFoam \
+    -I.. \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/turbulenceModels \
     -I$(LIB_SRC)/turbulenceModels/compressible/RAS/RASModel \
diff --git a/applications/solvers/compressible/rhoSimplecFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/createFields.H
similarity index 100%
rename from applications/solvers/compressible/rhoSimplecFoam/createFields.H
rename to applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/createFields.H
diff --git a/applications/solvers/compressible/rhoSimplecFoam/pEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/pEqn.H
similarity index 88%
rename from applications/solvers/compressible/rhoSimplecFoam/pEqn.H
rename to applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/pEqn.H
index a4d9325522..379e720c04 100644
--- a/applications/solvers/compressible/rhoSimplecFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/pEqn.H
@@ -29,21 +29,17 @@ if (simple.transonic())
         (
             "phic",
             fvc::interpolate(rho/AtU - rho/AU)*fvc::snGrad(p)*mesh.magSf()
-          + phid*(fvc::interpolate(p) - fvc::interpolate(p, "UD"))
         );
 
-        //refCast<mixedFvPatchScalarField>(p.boundaryField()[1]).refValue()
-        //    = p.boundaryField()[1];
-
         fvScalarMatrix pEqn
         (
             fvm::div(phid, p)
           + fvc::div(phic)
-          - fvm::Sp(fvc::div(phid), p)
-          + fvc::div(phid)*p
           - fvm::laplacian(rho/AtU, p)
         );
-        //pEqn.relax();
+
+        // Relax the pressure equation to ensure diagonal-dominance
+        pEqn.relax();
 
         pEqn.setReference(pRefCell, pRefValue);
 
@@ -71,7 +67,6 @@ else
         fvScalarMatrix pEqn
         (
             fvc::div(phiHbyA)
-        //- fvm::laplacian(rho/AU, p)
           - fvm::laplacian(rho/AtU, p)
         );
 
diff --git a/applications/solvers/compressible/rhoSimplecFoam/rhoSimplecFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/rhoSimplecFoam.C
similarity index 100%
rename from applications/solvers/compressible/rhoSimplecFoam/rhoSimplecFoam.C
rename to applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/rhoSimplecFoam.C