Metadata and CRU city data restructuring
Metadata updates