Remove shader.h
Rename shader types to be consistent with others
Merge shader and gles files