Fixed issue when loading client app

Fixed error that was thrown when loading client application, introduced
due to the copy of the service locator class.

Adapted some namespaces