changed dir structure to enable calling OpenFOAM 2 and later