Reorg, basic editing