Update to file structure