Move rest of organization fields to separate model