Packages refactoring.