Rename and update folder structures.