Refactored namespaces of services.