First pass at reorg