Cleanup
Refactor: Moved MaterialVariantSpec into namespace de

Plus various other minor cleanup refactorings.