Move locator service from provider to Application
maybe