H2OHeavyOil and 3pImmiscible with minor fixes or restructuring of binary/diffusionCoefficient according to @bernd 's wishes.