Changes to support new directory structure.

TODO:  Implement methods to handle more than one alternative with the
same F-Part