Refactored model packaging.