Some re organization of code
Merge branch 'master' of https://github.com/thegreatpissant/opengl