Updates to file structure