Add all services to the Service namespace

Previously there was a split where some of the services were in the
Service namespace and others were not.