Moved Grid and GameState to logic