Slight changes before testing

Organizing Game Main class + cleaning up