Organization.contact.address should really be Organization.contact.location as the address structure is a subset of the location model. This would enable consistency and reusing location ID's