Stage reorg

@andrewmacp @helgemathee