Getting things a bit cleaned up, renaming a few classes and updating the README.