refectoring packages