BRID-91:  Refactoring Services - Changed namespaces of services & repositories