Refactor packages.