Added Renderer and some reorg