Updated README to reflect refactorings