Some reshuffling to restructure the package more along the OpenGL 4.4 spec.