Refactoring the packages.