package rename and reorganization