Move geolocation to be internal