Also change namespace definitions to nested ones.
Now's a good time as any, I guess.
This is a big one. Namespacing, general formatting updates, and renaming, among others.