+ Namespacing, render classes and macro cleanups