Refactor Gamestates into Scenes