Packages refactor.