Refactor package.