renaming classes and deleting unused