restructure packaging