Refactoring of the Package representation