More changes to directory structure.