Game: begin refactoring. Fix build error.