Reorganization of the packages.