More refactoring on GameStates, Game, Player etc.