Renamed classes, added to README