Reorganize the package.