Removed some unnecessary classes, renamed others