Nuke incorrect inheritance relationship

* Must’ve overlooked that during previous refactoring cycles
* Should open up a few structural refactorings & renamings
Simplify Schema namespace class layout