Refactor the package.