Move generic renderer components into library
Remove cruft