Minor updates to file structure