WBL: Rename and reorganize images