With a little reorg