diff --git a/applications/solvers/multiphase/compressibleInterFoam/Allwclean b/applications/solvers/multiphase/compressibleInterFoam/Allwclean
index fff0fcd93a21b6e2bd83e469ecd6e7ce7d4f63ac..5a4d26d0d2296f8110d8cae78efddabbe3ab5af2 100755
--- a/applications/solvers/multiphase/compressibleInterFoam/Allwclean
+++ b/applications/solvers/multiphase/compressibleInterFoam/Allwclean
@@ -8,5 +8,6 @@ wclean libso VoFphaseCompressibleTurbulenceModels
 wclean
 wclean compressibleInterDyMFoam
 wclean compressibleInterFilmFoam
+wclean compressibleInterIsoFoam
 
 #------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/compressibleInterFoam/Allwmake b/applications/solvers/multiphase/compressibleInterFoam/Allwmake
index c606cfcb552c4275d4ed67317a502b35f08ef5c0..f226247da2e2fc7836c69d2861b309b6f9ce90c2 100755
--- a/applications/solvers/multiphase/compressibleInterFoam/Allwmake
+++ b/applications/solvers/multiphase/compressibleInterFoam/Allwmake
@@ -11,5 +11,6 @@ wmake $targetType VoFphaseCompressibleTurbulenceModels
 wmake $targetType
 wmake $targetType compressibleInterDyMFoam
 wmake $targetType compressibleInterFilmFoam
+wmake $targetType compressibleInterIsoFoam
 
 #------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/compressibleInterIsoFoam/Make/files b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/Make/files
similarity index 100%
rename from applications/solvers/multiphase/compressibleInterIsoFoam/Make/files
rename to applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/Make/files
diff --git a/applications/solvers/multiphase/compressibleInterIsoFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/Make/options
similarity index 83%
rename from applications/solvers/multiphase/compressibleInterIsoFoam/Make/options
rename to applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/Make/options
index 9a2c766179fb8e7af91a785db146d9556fecd15c..bb9d9dc559a0286f8a874811109eae7eebf054a1 100644
--- a/applications/solvers/multiphase/compressibleInterIsoFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/Make/options
@@ -1,10 +1,10 @@
 EXE_INC = \
-    -I. \
-    -I../VoF \
-    -I../compressibleInterFoam \
-    -I$(FOAM_SOLVERS)/multiphase/compressibleInterFoam/twoPhaseMixtureThermo \
-    -I$(FOAM_SOLVERS)/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels \
+    -I.. \
+    -I../../VoF \
+    -I../twoPhaseMixtureThermo \
+    -I../VoFphaseCompressibleTurbulenceModels \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
diff --git a/applications/solvers/multiphase/compressibleInterIsoFoam/alphaControls.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/alphaControls.H
similarity index 100%
rename from applications/solvers/multiphase/compressibleInterIsoFoam/alphaControls.H
rename to applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/alphaControls.H
diff --git a/applications/solvers/multiphase/compressibleInterIsoFoam/alphaEqn.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/alphaEqn.H
similarity index 100%
rename from applications/solvers/multiphase/compressibleInterIsoFoam/alphaEqn.H
rename to applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/alphaEqn.H
diff --git a/applications/solvers/multiphase/compressibleInterIsoFoam/alphaSuSp.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/alphaSuSp.H
similarity index 100%
rename from applications/solvers/multiphase/compressibleInterIsoFoam/alphaSuSp.H
rename to applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/alphaSuSp.H
diff --git a/applications/solvers/multiphase/compressibleInterIsoFoam/compressibleAlphaEqnSubCycle.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/compressibleAlphaEqnSubCycle.H
similarity index 100%
rename from applications/solvers/multiphase/compressibleInterIsoFoam/compressibleAlphaEqnSubCycle.H
rename to applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/compressibleAlphaEqnSubCycle.H
diff --git a/applications/solvers/multiphase/compressibleInterIsoFoam/compressibleInterIsoFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/compressibleInterIsoFoam.C
similarity index 100%
rename from applications/solvers/multiphase/compressibleInterIsoFoam/compressibleInterIsoFoam.C
rename to applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/compressibleInterIsoFoam.C
diff --git a/applications/solvers/multiphase/compressibleInterIsoFoam/correctPhi.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/correctPhi.H
similarity index 100%
rename from applications/solvers/multiphase/compressibleInterIsoFoam/correctPhi.H
rename to applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/correctPhi.H
diff --git a/applications/solvers/multiphase/compressibleInterIsoFoam/createFields.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/createFields.H
similarity index 100%
rename from applications/solvers/multiphase/compressibleInterIsoFoam/createFields.H
rename to applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/createFields.H
diff --git a/applications/solvers/multiphase/compressibleInterIsoFoam/pEqn.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/pEqn.H
similarity index 100%
rename from applications/solvers/multiphase/compressibleInterIsoFoam/pEqn.H
rename to applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/pEqn.H