rename and reorganize package