No meaningful code changes, just lots of namespace shuffling to have fewer namespaces and to put things in better namespaces.