Restructuring the package.