Add Glyph renderer, reorg a bit.