Remove orgs, and add the attributes to the required models.