restucture package