Refactoring and restructuring
Renamed DummyState to GameState