Minor changes to file structure