File naming tidy up, update README.md