Fixed a number of references to removed directories.

3 files changed