Cleaned Project

- Removed/Deprecated many of the interfaces and abstractions that were
unecessary.
- Cleaned up classes.