More changes to build directories.