Organizing code and removed unnecessary classes.