Renamed 'City' to 'CityInfo' to clarify some namespace stuff