Clean-up and re-org of the main GLSL object types.