Restructuring of Game class