Reorganized file + namespace layout of ...everything

So basically Git now thinks everything is about 100% different thanks
to namespace nesting and the deeper indents that go along with it and
whatnot.  Fun!