Some refactoring within classes

Game1 class: integrated several new classes that were added to the project