Refactor renderer -> shaderprogram
Refactor shapes