Refactoring
Starts working on GLSLDrawing