Major changes to file structure