Moving some re-org changes upstream

I think this is all of is, but I want to look for more easy changes.

Let me know if you see any other changes I should pull into this one.