More changes to support the new directory structure.