Rename and reorganize the structure