Re-organize address information