tidy up a lot of the files