reorg first pass