refactor services to v1beta3
Merge pull request #2086 from markturansky/v1beta3_refactor

Refactor internal API for Services to match v1beta3