major changes to file structure