More refactoring of packages