NS: Reorg a bit.