client: more merging and adding on the renderer, refs #139
client: quick structure fix, refs #139