Rework the package listing and code.