framework-res: rename and reshuffle