rename and reorganize