Restructuring the package