Updates to enable more flexible directory structure with respect to SVF
and BFMs