First step to integrate Address into Org model
Move address to organization model