Metadata and CRU city data restructuring