Packaging refactoring