Removed class files that are not in use from folder and imported new files into project