Updated readme to reflect recent refactorings