Got rid of redundant classes.
Renamed classes to proper names.