Move Service Providers to Respective Namespaces

## Move Service Providers to Respective Namespaces