Tidy top level directory

Making a pull request to bring changes to top level directory into joshkh:master.

Josh - partly I'm just practicisng with collaborating via github - I'm not that used to it. I find it can be a little bit confusing...

Feel free to make suggestions about how it should be used if you think I am doing it wrong