Moved services and geocoded into own packages