restructure package