Continued restructuring of ooc-draw-gpu modules, now working on PC