Update README

Updating the readme to reflect some refactoring done a while back.