More packaging refactor