Refactor geocoder
Add geolocator service