Refactor internal API for Services to match v1beta3

First commit is services (working unit and integration).
Removed that comment line.  Check for "metadata" was removed previously during the "metadata" refactor.