Refactor geolocation to prepare actor for uplifting
Merge pull request #805 from jryans/refactor-geolocation

Refactor geolocation to prepare actor for uplifting