rs-reorg: edits