Major refactor of rendering classes