Renamed Classes, Updated code to match

- Renamed classes
- Updated README.md to reflect changes
- Implemented correct inheretance tree in all classes