Rename and devide package