removed some methods and created new classes. Also, changed name on some classes.