Re-organize phone numbers and addresses