Restructuring of packages.