Made changes to names and added classes based on decisions made in the initial team meeting (forgot to add some files before)