Refactor GameScene/GameMap