Removed unnecessary classes and renamed classes