Restructured Window and Renderer a bit.