Reformat data

Reformat the data. With this new structure countries now have a
collection of cities, and each has a population and can have multiple
diseases.