Separate out model packaging