Reorganize the packages.