Refactoring Geocoder POJOs for JSON-Mapping