Merged Renderer and Base

As request in #11