Rewrite geolocation to a service
Rename geolocation services