moved stage and container to their own modules