Removing old comments, deleting unused files, changing names for some of the classes