renames: client->service (to be reused by server) and oauth->client