Refactor internal API for Services to match v1beta3

First commit is services (working unit and integration).
Collateral damage from the refactor.  I reverted my file to the previous version to restore this line break.