Lots of changes to file structure