Changed class names and deleted classes that are not being used from week 3