Refactor some game data structures.