reorg, doc updates