Rename GameState to GameStateGeneral
Refactor Game struct