Restructure package