Minor refactoring of first demo/base demo, started on second demo, started on a renderer class