README.md

Updated following new features and structure.