jeffh: reorg