Started renaming things
Renamed data model
Update the README
Merge pull request #25 from rpwll/rename