OpenGL state storage & changes and some file renaming