Refactoring of packages