New GameStage and some refactoring