Move location service to DI instead of singleton