Reorganize the package