get rid of organization reference, add domain reference to host