*Changes to file structure