More changes to file structure