Major restructuring of packages.