Add city database

Add city database, reformat code for country database to make defined
objects more clear which part of the code they refer to