Update README to reflect latest refactorings