I think re-structuring can be done once migration is all over but domain change should be held back; we are TMO and I don't see why it should be changed when welcoming new OSes just for political correctness...