Moved stage to separate package