Minor changes with new directories.