package rename and reorder