a few more re-org changes.