crud-reorg: fixing more links