Rafactoring of packages