restructuring the package