Small refactoring of packages