Minor changes to the directory structure