Renamed some classes
Removed some interfaces that provided no value
Removed some interfaces that provided no value