Packaging refactor