Reorganize the structure for Stage.