Refactor classes into Game class