Refactor class names; refactor GeolocService and Image