Deleted unnecessary classes, refactoring of the code.