Packaging refactor.