Stage reorg

@helgemathee @andrewmacp