reorganize packeges