Reorganize with resource links