packag restructure