diff --git a/src/GLES2/common/debug.cpp b/src/OpenGL/common/debug.cpp
similarity index 100%
rename from src/GLES2/common/debug.cpp
rename to src/OpenGL/common/debug.cpp
diff --git a/src/GLES2/common/debug.h b/src/OpenGL/common/debug.h
similarity index 100%
rename from src/GLES2/common/debug.h
rename to src/OpenGL/common/debug.h
diff --git a/src/GLES2/compiler/AnalyzeCallDepth.cpp b/src/OpenGL/compiler/AnalyzeCallDepth.cpp
similarity index 100%
rename from src/GLES2/compiler/AnalyzeCallDepth.cpp
rename to src/OpenGL/compiler/AnalyzeCallDepth.cpp
diff --git a/src/GLES2/compiler/AnalyzeCallDepth.h b/src/OpenGL/compiler/AnalyzeCallDepth.h
similarity index 100%
rename from src/GLES2/compiler/AnalyzeCallDepth.h
rename to src/OpenGL/compiler/AnalyzeCallDepth.h
diff --git a/src/GLES2/compiler/BaseTypes.h b/src/OpenGL/compiler/BaseTypes.h
similarity index 100%
rename from src/GLES2/compiler/BaseTypes.h
rename to src/OpenGL/compiler/BaseTypes.h
diff --git a/src/GLES2/compiler/Common.h b/src/OpenGL/compiler/Common.h
similarity index 100%
rename from src/GLES2/compiler/Common.h
rename to src/OpenGL/compiler/Common.h
diff --git a/src/GLES2/compiler/Compiler.cpp b/src/OpenGL/compiler/Compiler.cpp
similarity index 100%
rename from src/GLES2/compiler/Compiler.cpp
rename to src/OpenGL/compiler/Compiler.cpp
diff --git a/src/GLES2/compiler/Compiler.vcxproj b/src/OpenGL/compiler/Compiler.vcxproj
similarity index 100%
rename from src/GLES2/compiler/Compiler.vcxproj
rename to src/OpenGL/compiler/Compiler.vcxproj
diff --git a/src/GLES2/compiler/Compiler.vcxproj.filters b/src/OpenGL/compiler/Compiler.vcxproj.filters
similarity index 100%
rename from src/GLES2/compiler/Compiler.vcxproj.filters
rename to src/OpenGL/compiler/Compiler.vcxproj.filters
diff --git a/src/GLES2/compiler/ConstantUnion.h b/src/OpenGL/compiler/ConstantUnion.h
similarity index 100%
rename from src/GLES2/compiler/ConstantUnion.h
rename to src/OpenGL/compiler/ConstantUnion.h
diff --git a/src/GLES2/compiler/Diagnostics.cpp b/src/OpenGL/compiler/Diagnostics.cpp
similarity index 100%
rename from src/GLES2/compiler/Diagnostics.cpp
rename to src/OpenGL/compiler/Diagnostics.cpp
diff --git a/src/GLES2/compiler/Diagnostics.h b/src/OpenGL/compiler/Diagnostics.h
similarity index 100%
rename from src/GLES2/compiler/Diagnostics.h
rename to src/OpenGL/compiler/Diagnostics.h
diff --git a/src/GLES2/compiler/DirectiveHandler.cpp b/src/OpenGL/compiler/DirectiveHandler.cpp
similarity index 100%
rename from src/GLES2/compiler/DirectiveHandler.cpp
rename to src/OpenGL/compiler/DirectiveHandler.cpp
diff --git a/src/GLES2/compiler/DirectiveHandler.h b/src/OpenGL/compiler/DirectiveHandler.h
similarity index 100%
rename from src/GLES2/compiler/DirectiveHandler.h
rename to src/OpenGL/compiler/DirectiveHandler.h
diff --git a/src/GLES2/compiler/ExtensionBehavior.h b/src/OpenGL/compiler/ExtensionBehavior.h
similarity index 100%
rename from src/GLES2/compiler/ExtensionBehavior.h
rename to src/OpenGL/compiler/ExtensionBehavior.h
diff --git a/src/GLES2/compiler/InfoSink.cpp b/src/OpenGL/compiler/InfoSink.cpp
similarity index 100%
rename from src/GLES2/compiler/InfoSink.cpp
rename to src/OpenGL/compiler/InfoSink.cpp
diff --git a/src/GLES2/compiler/InfoSink.h b/src/OpenGL/compiler/InfoSink.h
similarity index 100%
rename from src/GLES2/compiler/InfoSink.h
rename to src/OpenGL/compiler/InfoSink.h
diff --git a/src/GLES2/compiler/Initialize.cpp b/src/OpenGL/compiler/Initialize.cpp
similarity index 100%
rename from src/GLES2/compiler/Initialize.cpp
rename to src/OpenGL/compiler/Initialize.cpp
diff --git a/src/GLES2/compiler/Initialize.h b/src/OpenGL/compiler/Initialize.h
similarity index 100%
rename from src/GLES2/compiler/Initialize.h
rename to src/OpenGL/compiler/Initialize.h
diff --git a/src/GLES2/compiler/InitializeDll.cpp b/src/OpenGL/compiler/InitializeDll.cpp
similarity index 100%
rename from src/GLES2/compiler/InitializeDll.cpp
rename to src/OpenGL/compiler/InitializeDll.cpp
diff --git a/src/GLES2/compiler/InitializeDll.h b/src/OpenGL/compiler/InitializeDll.h
similarity index 100%
rename from src/GLES2/compiler/InitializeDll.h
rename to src/OpenGL/compiler/InitializeDll.h
diff --git a/src/GLES2/compiler/InitializeGlobals.h b/src/OpenGL/compiler/InitializeGlobals.h
similarity index 100%
rename from src/GLES2/compiler/InitializeGlobals.h
rename to src/OpenGL/compiler/InitializeGlobals.h
diff --git a/src/GLES2/compiler/InitializeParseContext.cpp b/src/OpenGL/compiler/InitializeParseContext.cpp
similarity index 100%
rename from src/GLES2/compiler/InitializeParseContext.cpp
rename to src/OpenGL/compiler/InitializeParseContext.cpp
diff --git a/src/GLES2/compiler/InitializeParseContext.h b/src/OpenGL/compiler/InitializeParseContext.h
similarity index 100%
rename from src/GLES2/compiler/InitializeParseContext.h
rename to src/OpenGL/compiler/InitializeParseContext.h
diff --git a/src/GLES2/compiler/IntermTraverse.cpp b/src/OpenGL/compiler/IntermTraverse.cpp
similarity index 100%
rename from src/GLES2/compiler/IntermTraverse.cpp
rename to src/OpenGL/compiler/IntermTraverse.cpp
diff --git a/src/GLES2/compiler/Intermediate.cpp b/src/OpenGL/compiler/Intermediate.cpp
similarity index 100%
rename from src/GLES2/compiler/Intermediate.cpp
rename to src/OpenGL/compiler/Intermediate.cpp
diff --git a/src/GLES2/compiler/MMap.h b/src/OpenGL/compiler/MMap.h
similarity index 100%
rename from src/GLES2/compiler/MMap.h
rename to src/OpenGL/compiler/MMap.h
diff --git a/src/GLES2/compiler/OutputASM.cpp b/src/OpenGL/compiler/OutputASM.cpp
similarity index 100%
rename from src/GLES2/compiler/OutputASM.cpp
rename to src/OpenGL/compiler/OutputASM.cpp
diff --git a/src/GLES2/compiler/OutputASM.h b/src/OpenGL/compiler/OutputASM.h
similarity index 100%
rename from src/GLES2/compiler/OutputASM.h
rename to src/OpenGL/compiler/OutputASM.h
diff --git a/src/GLES2/compiler/ParseHelper.cpp b/src/OpenGL/compiler/ParseHelper.cpp
similarity index 100%
rename from src/GLES2/compiler/ParseHelper.cpp
rename to src/OpenGL/compiler/ParseHelper.cpp
diff --git a/src/GLES2/compiler/ParseHelper.h b/src/OpenGL/compiler/ParseHelper.h
similarity index 100%
rename from src/GLES2/compiler/ParseHelper.h
rename to src/OpenGL/compiler/ParseHelper.h
diff --git a/src/GLES2/compiler/PoolAlloc.cpp b/src/OpenGL/compiler/PoolAlloc.cpp
similarity index 100%
rename from src/GLES2/compiler/PoolAlloc.cpp
rename to src/OpenGL/compiler/PoolAlloc.cpp
diff --git a/src/GLES2/compiler/PoolAlloc.h b/src/OpenGL/compiler/PoolAlloc.h
similarity index 100%
rename from src/GLES2/compiler/PoolAlloc.h
rename to src/OpenGL/compiler/PoolAlloc.h
diff --git a/src/GLES2/compiler/Pragma.h b/src/OpenGL/compiler/Pragma.h
similarity index 100%
rename from src/GLES2/compiler/Pragma.h
rename to src/OpenGL/compiler/Pragma.h
diff --git a/src/GLES2/compiler/RemoveTree.cpp b/src/OpenGL/compiler/RemoveTree.cpp
similarity index 100%
rename from src/GLES2/compiler/RemoveTree.cpp
rename to src/OpenGL/compiler/RemoveTree.cpp
diff --git a/src/GLES2/compiler/RemoveTree.h b/src/OpenGL/compiler/RemoveTree.h
similarity index 100%
rename from src/GLES2/compiler/RemoveTree.h
rename to src/OpenGL/compiler/RemoveTree.h
diff --git a/src/GLES2/compiler/ShHandle.h b/src/OpenGL/compiler/ShHandle.h
similarity index 100%
rename from src/GLES2/compiler/ShHandle.h
rename to src/OpenGL/compiler/ShHandle.h
diff --git a/src/GLES2/compiler/ShaderLang.cpp b/src/OpenGL/compiler/ShaderLang.cpp
similarity index 100%
rename from src/GLES2/compiler/ShaderLang.cpp
rename to src/OpenGL/compiler/ShaderLang.cpp
diff --git a/src/GLES2/compiler/SymbolTable.cpp b/src/OpenGL/compiler/SymbolTable.cpp
similarity index 100%
rename from src/GLES2/compiler/SymbolTable.cpp
rename to src/OpenGL/compiler/SymbolTable.cpp
diff --git a/src/GLES2/compiler/SymbolTable.h b/src/OpenGL/compiler/SymbolTable.h
similarity index 100%
rename from src/GLES2/compiler/SymbolTable.h
rename to src/OpenGL/compiler/SymbolTable.h
diff --git a/src/GLES2/compiler/TranslatorASM.cpp b/src/OpenGL/compiler/TranslatorASM.cpp
similarity index 100%
rename from src/GLES2/compiler/TranslatorASM.cpp
rename to src/OpenGL/compiler/TranslatorASM.cpp
diff --git a/src/GLES2/compiler/TranslatorASM.h b/src/OpenGL/compiler/TranslatorASM.h
similarity index 100%
rename from src/GLES2/compiler/TranslatorASM.h
rename to src/OpenGL/compiler/TranslatorASM.h
diff --git a/src/GLES2/compiler/Types.h b/src/OpenGL/compiler/Types.h
similarity index 100%
rename from src/GLES2/compiler/Types.h
rename to src/OpenGL/compiler/Types.h
diff --git a/src/GLES2/compiler/ValidateLimitations.cpp b/src/OpenGL/compiler/ValidateLimitations.cpp
similarity index 100%
rename from src/GLES2/compiler/ValidateLimitations.cpp
rename to src/OpenGL/compiler/ValidateLimitations.cpp
diff --git a/src/GLES2/compiler/ValidateLimitations.h b/src/OpenGL/compiler/ValidateLimitations.h
similarity index 100%
rename from src/GLES2/compiler/ValidateLimitations.h
rename to src/OpenGL/compiler/ValidateLimitations.h
diff --git a/src/GLES2/compiler/debug.cpp b/src/OpenGL/compiler/debug.cpp
similarity index 100%
rename from src/GLES2/compiler/debug.cpp
rename to src/OpenGL/compiler/debug.cpp
diff --git a/src/GLES2/compiler/debug.h b/src/OpenGL/compiler/debug.h
similarity index 100%
rename from src/GLES2/compiler/debug.h
rename to src/OpenGL/compiler/debug.h
diff --git a/src/GLES2/compiler/generate_parser.sh b/src/OpenGL/compiler/generate_parser.sh
similarity index 100%
rename from src/GLES2/compiler/generate_parser.sh
rename to src/OpenGL/compiler/generate_parser.sh
diff --git a/src/GLES2/compiler/glslang.h b/src/OpenGL/compiler/glslang.h
similarity index 100%
rename from src/GLES2/compiler/glslang.h
rename to src/OpenGL/compiler/glslang.h
diff --git a/src/GLES2/compiler/glslang.l b/src/OpenGL/compiler/glslang.l
similarity index 100%
rename from src/GLES2/compiler/glslang.l
rename to src/OpenGL/compiler/glslang.l
diff --git a/src/GLES2/compiler/glslang.y b/src/OpenGL/compiler/glslang.y
similarity index 100%
rename from src/GLES2/compiler/glslang.y
rename to src/OpenGL/compiler/glslang.y
diff --git a/src/GLES2/compiler/glslang_lex.cpp b/src/OpenGL/compiler/glslang_lex.cpp
similarity index 100%
rename from src/GLES2/compiler/glslang_lex.cpp
rename to src/OpenGL/compiler/glslang_lex.cpp
diff --git a/src/GLES2/compiler/glslang_tab.cpp b/src/OpenGL/compiler/glslang_tab.cpp
similarity index 100%
rename from src/GLES2/compiler/glslang_tab.cpp
rename to src/OpenGL/compiler/glslang_tab.cpp
diff --git a/src/GLES2/compiler/glslang_tab.h b/src/OpenGL/compiler/glslang_tab.h
similarity index 100%
rename from src/GLES2/compiler/glslang_tab.h
rename to src/OpenGL/compiler/glslang_tab.h
diff --git a/src/GLES2/compiler/intermOut.cpp b/src/OpenGL/compiler/intermOut.cpp
similarity index 100%
rename from src/GLES2/compiler/intermOut.cpp
rename to src/OpenGL/compiler/intermOut.cpp
diff --git a/src/GLES2/compiler/intermediate.h b/src/OpenGL/compiler/intermediate.h
similarity index 100%
rename from src/GLES2/compiler/intermediate.h
rename to src/OpenGL/compiler/intermediate.h
diff --git a/src/GLES2/compiler/localintermediate.h b/src/OpenGL/compiler/localintermediate.h
similarity index 100%
rename from src/GLES2/compiler/localintermediate.h
rename to src/OpenGL/compiler/localintermediate.h
diff --git a/src/GLES2/compiler/osinclude.h b/src/OpenGL/compiler/osinclude.h
similarity index 100%
rename from src/GLES2/compiler/osinclude.h
rename to src/OpenGL/compiler/osinclude.h
diff --git a/src/GLES2/compiler/ossource_posix.cpp b/src/OpenGL/compiler/ossource_posix.cpp
similarity index 100%
rename from src/GLES2/compiler/ossource_posix.cpp
rename to src/OpenGL/compiler/ossource_posix.cpp
diff --git a/src/GLES2/compiler/ossource_win.cpp b/src/OpenGL/compiler/ossource_win.cpp
similarity index 100%
rename from src/GLES2/compiler/ossource_win.cpp
rename to src/OpenGL/compiler/ossource_win.cpp
diff --git a/src/GLES2/compiler/parseConst.cpp b/src/OpenGL/compiler/parseConst.cpp
similarity index 100%
rename from src/GLES2/compiler/parseConst.cpp
rename to src/OpenGL/compiler/parseConst.cpp
diff --git a/src/GLES2/compiler/preprocessor/Diagnostics.cpp b/src/OpenGL/compiler/preprocessor/Diagnostics.cpp
similarity index 100%
rename from src/GLES2/compiler/preprocessor/Diagnostics.cpp
rename to src/OpenGL/compiler/preprocessor/Diagnostics.cpp
diff --git a/src/GLES2/compiler/preprocessor/Diagnostics.h b/src/OpenGL/compiler/preprocessor/Diagnostics.h
similarity index 100%
rename from src/GLES2/compiler/preprocessor/Diagnostics.h
rename to src/OpenGL/compiler/preprocessor/Diagnostics.h
diff --git a/src/GLES2/compiler/preprocessor/DirectiveHandler.cpp b/src/OpenGL/compiler/preprocessor/DirectiveHandler.cpp
similarity index 100%
rename from src/GLES2/compiler/preprocessor/DirectiveHandler.cpp
rename to src/OpenGL/compiler/preprocessor/DirectiveHandler.cpp
diff --git a/src/GLES2/compiler/preprocessor/DirectiveHandler.h b/src/OpenGL/compiler/preprocessor/DirectiveHandler.h
similarity index 100%
rename from src/GLES2/compiler/preprocessor/DirectiveHandler.h
rename to src/OpenGL/compiler/preprocessor/DirectiveHandler.h
diff --git a/src/GLES2/compiler/preprocessor/DirectiveParser.cpp b/src/OpenGL/compiler/preprocessor/DirectiveParser.cpp
similarity index 100%
rename from src/GLES2/compiler/preprocessor/DirectiveParser.cpp
rename to src/OpenGL/compiler/preprocessor/DirectiveParser.cpp
diff --git a/src/GLES2/compiler/preprocessor/DirectiveParser.h b/src/OpenGL/compiler/preprocessor/DirectiveParser.h
similarity index 100%
rename from src/GLES2/compiler/preprocessor/DirectiveParser.h
rename to src/OpenGL/compiler/preprocessor/DirectiveParser.h
diff --git a/src/GLES2/compiler/preprocessor/ExpressionParser.cpp b/src/OpenGL/compiler/preprocessor/ExpressionParser.cpp
similarity index 100%
rename from src/GLES2/compiler/preprocessor/ExpressionParser.cpp
rename to src/OpenGL/compiler/preprocessor/ExpressionParser.cpp
diff --git a/src/GLES2/compiler/preprocessor/ExpressionParser.h b/src/OpenGL/compiler/preprocessor/ExpressionParser.h
similarity index 100%
rename from src/GLES2/compiler/preprocessor/ExpressionParser.h
rename to src/OpenGL/compiler/preprocessor/ExpressionParser.h
diff --git a/src/GLES2/compiler/preprocessor/ExpressionParser.y b/src/OpenGL/compiler/preprocessor/ExpressionParser.y
similarity index 100%
rename from src/GLES2/compiler/preprocessor/ExpressionParser.y
rename to src/OpenGL/compiler/preprocessor/ExpressionParser.y
diff --git a/src/GLES2/compiler/preprocessor/Input.cpp b/src/OpenGL/compiler/preprocessor/Input.cpp
similarity index 100%
rename from src/GLES2/compiler/preprocessor/Input.cpp
rename to src/OpenGL/compiler/preprocessor/Input.cpp
diff --git a/src/GLES2/compiler/preprocessor/Input.h b/src/OpenGL/compiler/preprocessor/Input.h
similarity index 100%
rename from src/GLES2/compiler/preprocessor/Input.h
rename to src/OpenGL/compiler/preprocessor/Input.h
diff --git a/src/GLES2/compiler/preprocessor/Lexer.cpp b/src/OpenGL/compiler/preprocessor/Lexer.cpp
similarity index 100%
rename from src/GLES2/compiler/preprocessor/Lexer.cpp
rename to src/OpenGL/compiler/preprocessor/Lexer.cpp
diff --git a/src/GLES2/compiler/preprocessor/Lexer.h b/src/OpenGL/compiler/preprocessor/Lexer.h
similarity index 100%
rename from src/GLES2/compiler/preprocessor/Lexer.h
rename to src/OpenGL/compiler/preprocessor/Lexer.h
diff --git a/src/GLES2/compiler/preprocessor/Macro.cpp b/src/OpenGL/compiler/preprocessor/Macro.cpp
similarity index 100%
rename from src/GLES2/compiler/preprocessor/Macro.cpp
rename to src/OpenGL/compiler/preprocessor/Macro.cpp
diff --git a/src/GLES2/compiler/preprocessor/Macro.h b/src/OpenGL/compiler/preprocessor/Macro.h
similarity index 100%
rename from src/GLES2/compiler/preprocessor/Macro.h
rename to src/OpenGL/compiler/preprocessor/Macro.h
diff --git a/src/GLES2/compiler/preprocessor/MacroExpander.cpp b/src/OpenGL/compiler/preprocessor/MacroExpander.cpp
similarity index 100%
rename from src/GLES2/compiler/preprocessor/MacroExpander.cpp
rename to src/OpenGL/compiler/preprocessor/MacroExpander.cpp
diff --git a/src/GLES2/compiler/preprocessor/MacroExpander.h b/src/OpenGL/compiler/preprocessor/MacroExpander.h
similarity index 100%
rename from src/GLES2/compiler/preprocessor/MacroExpander.h
rename to src/OpenGL/compiler/preprocessor/MacroExpander.h
diff --git a/src/GLES2/compiler/preprocessor/Preprocessor.cpp b/src/OpenGL/compiler/preprocessor/Preprocessor.cpp
similarity index 100%
rename from src/GLES2/compiler/preprocessor/Preprocessor.cpp
rename to src/OpenGL/compiler/preprocessor/Preprocessor.cpp
diff --git a/src/GLES2/compiler/preprocessor/Preprocessor.h b/src/OpenGL/compiler/preprocessor/Preprocessor.h
similarity index 100%
rename from src/GLES2/compiler/preprocessor/Preprocessor.h
rename to src/OpenGL/compiler/preprocessor/Preprocessor.h
diff --git a/src/GLES2/compiler/preprocessor/SourceLocation.h b/src/OpenGL/compiler/preprocessor/SourceLocation.h
similarity index 100%
rename from src/GLES2/compiler/preprocessor/SourceLocation.h
rename to src/OpenGL/compiler/preprocessor/SourceLocation.h
diff --git a/src/GLES2/compiler/preprocessor/Token.cpp b/src/OpenGL/compiler/preprocessor/Token.cpp
similarity index 100%
rename from src/GLES2/compiler/preprocessor/Token.cpp
rename to src/OpenGL/compiler/preprocessor/Token.cpp
diff --git a/src/GLES2/compiler/preprocessor/Token.h b/src/OpenGL/compiler/preprocessor/Token.h
similarity index 100%
rename from src/GLES2/compiler/preprocessor/Token.h
rename to src/OpenGL/compiler/preprocessor/Token.h
diff --git a/src/GLES2/compiler/preprocessor/Tokenizer.cpp b/src/OpenGL/compiler/preprocessor/Tokenizer.cpp
similarity index 100%
rename from src/GLES2/compiler/preprocessor/Tokenizer.cpp
rename to src/OpenGL/compiler/preprocessor/Tokenizer.cpp
diff --git a/src/GLES2/compiler/preprocessor/Tokenizer.h b/src/OpenGL/compiler/preprocessor/Tokenizer.h
similarity index 100%
rename from src/GLES2/compiler/preprocessor/Tokenizer.h
rename to src/OpenGL/compiler/preprocessor/Tokenizer.h
diff --git a/src/GLES2/compiler/preprocessor/Tokenizer.l b/src/OpenGL/compiler/preprocessor/Tokenizer.l
similarity index 100%
rename from src/GLES2/compiler/preprocessor/Tokenizer.l
rename to src/OpenGL/compiler/preprocessor/Tokenizer.l
diff --git a/src/GLES2/compiler/preprocessor/generate_parser.sh b/src/OpenGL/compiler/preprocessor/generate_parser.sh
similarity index 100%
rename from src/GLES2/compiler/preprocessor/generate_parser.sh
rename to src/OpenGL/compiler/preprocessor/generate_parser.sh
diff --git a/src/GLES2/compiler/preprocessor/length_limits.h b/src/OpenGL/compiler/preprocessor/length_limits.h
similarity index 100%
rename from src/GLES2/compiler/preprocessor/length_limits.h
rename to src/OpenGL/compiler/preprocessor/length_limits.h
diff --git a/src/GLES2/compiler/preprocessor/numeric_lex.h b/src/OpenGL/compiler/preprocessor/numeric_lex.h
similarity index 100%
rename from src/GLES2/compiler/preprocessor/numeric_lex.h
rename to src/OpenGL/compiler/preprocessor/numeric_lex.h
diff --git a/src/GLES2/compiler/preprocessor/pp_utils.h b/src/OpenGL/compiler/preprocessor/pp_utils.h
similarity index 100%
rename from src/GLES2/compiler/preprocessor/pp_utils.h
rename to src/OpenGL/compiler/preprocessor/pp_utils.h
diff --git a/src/GLES2/compiler/preprocessor/preprocessor.vcxproj b/src/OpenGL/compiler/preprocessor/preprocessor.vcxproj
similarity index 100%
rename from src/GLES2/compiler/preprocessor/preprocessor.vcxproj
rename to src/OpenGL/compiler/preprocessor/preprocessor.vcxproj
diff --git a/src/GLES2/compiler/preprocessor/preprocessor.vcxproj.filters b/src/OpenGL/compiler/preprocessor/preprocessor.vcxproj.filters
similarity index 100%
rename from src/GLES2/compiler/preprocessor/preprocessor.vcxproj.filters
rename to src/OpenGL/compiler/preprocessor/preprocessor.vcxproj.filters
diff --git a/src/GLES2/compiler/util.cpp b/src/OpenGL/compiler/util.cpp
similarity index 100%
rename from src/GLES2/compiler/util.cpp
rename to src/OpenGL/compiler/util.cpp
diff --git a/src/GLES2/compiler/util.h b/src/OpenGL/compiler/util.h
similarity index 100%
rename from src/GLES2/compiler/util.h
rename to src/OpenGL/compiler/util.h
diff --git a/src/GLES2/include/EGL/egl.h b/src/OpenGL/include/EGL/egl.h
similarity index 100%
rename from src/GLES2/include/EGL/egl.h
rename to src/OpenGL/include/EGL/egl.h
diff --git a/src/GLES2/include/EGL/eglext.h b/src/OpenGL/include/EGL/eglext.h
similarity index 100%
rename from src/GLES2/include/EGL/eglext.h
rename to src/OpenGL/include/EGL/eglext.h
diff --git a/src/GLES2/include/EGL/eglplatform.h b/src/OpenGL/include/EGL/eglplatform.h
similarity index 100%
rename from src/GLES2/include/EGL/eglplatform.h
rename to src/OpenGL/include/EGL/eglplatform.h
diff --git a/src/GLES2/include/GLES/egl.h b/src/OpenGL/include/GLES/egl.h
similarity index 100%
rename from src/GLES2/include/GLES/egl.h
rename to src/OpenGL/include/GLES/egl.h
diff --git a/src/GLES2/include/GLES/gl.h b/src/OpenGL/include/GLES/gl.h
similarity index 100%
rename from src/GLES2/include/GLES/gl.h
rename to src/OpenGL/include/GLES/gl.h
diff --git a/src/GLES2/include/GLES/glext.h b/src/OpenGL/include/GLES/glext.h
similarity index 100%
rename from src/GLES2/include/GLES/glext.h
rename to src/OpenGL/include/GLES/glext.h
diff --git a/src/GLES2/include/GLES/glplatform.h b/src/OpenGL/include/GLES/glplatform.h
similarity index 100%
rename from src/GLES2/include/GLES/glplatform.h
rename to src/OpenGL/include/GLES/glplatform.h
diff --git a/src/GLES2/include/GLES2/gl2.h b/src/OpenGL/include/GLES2/gl2.h
similarity index 100%
rename from src/GLES2/include/GLES2/gl2.h
rename to src/OpenGL/include/GLES2/gl2.h
diff --git a/src/GLES2/include/GLES2/gl2ext.h b/src/OpenGL/include/GLES2/gl2ext.h
similarity index 100%
rename from src/GLES2/include/GLES2/gl2ext.h
rename to src/OpenGL/include/GLES2/gl2ext.h
diff --git a/src/GLES2/include/GLES2/gl2platform.h b/src/OpenGL/include/GLES2/gl2platform.h
similarity index 100%
rename from src/GLES2/include/GLES2/gl2platform.h
rename to src/OpenGL/include/GLES2/gl2platform.h
diff --git a/src/GLES2/include/GLSLANG/ShaderLang.h b/src/OpenGL/include/GLSLANG/ShaderLang.h
similarity index 100%
rename from src/GLES2/include/GLSLANG/ShaderLang.h
rename to src/OpenGL/include/GLSLANG/ShaderLang.h
diff --git a/src/GLES2/include/KHR/khrplatform.h b/src/OpenGL/include/KHR/khrplatform.h
similarity index 100%
rename from src/GLES2/include/KHR/khrplatform.h
rename to src/OpenGL/include/KHR/khrplatform.h
diff --git a/src/GLES2/libEGL/Config.cpp b/src/OpenGL/libEGL/Config.cpp
similarity index 100%
rename from src/GLES2/libEGL/Config.cpp
rename to src/OpenGL/libEGL/Config.cpp
diff --git a/src/GLES2/libEGL/Config.h b/src/OpenGL/libEGL/Config.h
similarity index 100%
rename from src/GLES2/libEGL/Config.h
rename to src/OpenGL/libEGL/Config.h
diff --git a/src/GLES2/libEGL/Context.hpp b/src/OpenGL/libEGL/Context.hpp
similarity index 100%
rename from src/GLES2/libEGL/Context.hpp
rename to src/OpenGL/libEGL/Context.hpp
diff --git a/src/GLES2/libEGL/Display.cpp b/src/OpenGL/libEGL/Display.cpp
similarity index 100%
rename from src/GLES2/libEGL/Display.cpp
rename to src/OpenGL/libEGL/Display.cpp
diff --git a/src/GLES2/libEGL/Display.h b/src/OpenGL/libEGL/Display.h
similarity index 100%
rename from src/GLES2/libEGL/Display.h
rename to src/OpenGL/libEGL/Display.h
diff --git a/src/GLES2/libEGL/Image.hpp b/src/OpenGL/libEGL/Image.hpp
similarity index 100%
rename from src/GLES2/libEGL/Image.hpp
rename to src/OpenGL/libEGL/Image.hpp
diff --git a/src/GLES2/libEGL/Surface.cpp b/src/OpenGL/libEGL/Surface.cpp
similarity index 100%
rename from src/GLES2/libEGL/Surface.cpp
rename to src/OpenGL/libEGL/Surface.cpp
diff --git a/src/GLES2/libEGL/Surface.h b/src/OpenGL/libEGL/Surface.h
similarity index 100%
rename from src/GLES2/libEGL/Surface.h
rename to src/OpenGL/libEGL/Surface.h
diff --git a/src/GLES2/libEGL/Texture2D.hpp b/src/OpenGL/libEGL/Texture2D.hpp
similarity index 100%
rename from src/GLES2/libEGL/Texture2D.hpp
rename to src/OpenGL/libEGL/Texture2D.hpp
diff --git a/src/GLES2/libEGL/libEGL.cbp b/src/OpenGL/libEGL/libEGL.cbp
similarity index 100%
rename from src/GLES2/libEGL/libEGL.cbp
rename to src/OpenGL/libEGL/libEGL.cbp
diff --git a/src/GLES2/libEGL/libEGL.cpp b/src/OpenGL/libEGL/libEGL.cpp
similarity index 100%
rename from src/GLES2/libEGL/libEGL.cpp
rename to src/OpenGL/libEGL/libEGL.cpp
diff --git a/src/GLES2/libEGL/libEGL.def b/src/OpenGL/libEGL/libEGL.def
similarity index 100%
rename from src/GLES2/libEGL/libEGL.def
rename to src/OpenGL/libEGL/libEGL.def
diff --git a/src/GLES2/libEGL/libEGL.rc b/src/OpenGL/libEGL/libEGL.rc
similarity index 100%
rename from src/GLES2/libEGL/libEGL.rc
rename to src/OpenGL/libEGL/libEGL.rc
diff --git a/src/GLES2/libEGL/libEGL.vcxproj b/src/OpenGL/libEGL/libEGL.vcxproj
similarity index 100%
rename from src/GLES2/libEGL/libEGL.vcxproj
rename to src/OpenGL/libEGL/libEGL.vcxproj
diff --git a/src/GLES2/libEGL/libEGL.vcxproj.filters b/src/OpenGL/libEGL/libEGL.vcxproj.filters
similarity index 100%
rename from src/GLES2/libEGL/libEGL.vcxproj.filters
rename to src/OpenGL/libEGL/libEGL.vcxproj.filters
diff --git a/src/GLES2/libEGL/main.cpp b/src/OpenGL/libEGL/main.cpp
similarity index 100%
rename from src/GLES2/libEGL/main.cpp
rename to src/OpenGL/libEGL/main.cpp
diff --git a/src/GLES2/libEGL/main.h b/src/OpenGL/libEGL/main.h
similarity index 100%
rename from src/GLES2/libEGL/main.h
rename to src/OpenGL/libEGL/main.h
diff --git a/src/GLES2/libEGL/resource.h b/src/OpenGL/libEGL/resource.h
similarity index 100%
rename from src/GLES2/libEGL/resource.h
rename to src/OpenGL/libEGL/resource.h
diff --git a/src/GLES2/libGLES_CM/Buffer.cpp b/src/OpenGL/libGLES_CM/Buffer.cpp
similarity index 100%
rename from src/GLES2/libGLES_CM/Buffer.cpp
rename to src/OpenGL/libGLES_CM/Buffer.cpp
diff --git a/src/GLES2/libGLES_CM/Buffer.h b/src/OpenGL/libGLES_CM/Buffer.h
similarity index 100%
rename from src/GLES2/libGLES_CM/Buffer.h
rename to src/OpenGL/libGLES_CM/Buffer.h
diff --git a/src/GLES2/libGLES_CM/Context.cpp b/src/OpenGL/libGLES_CM/Context.cpp
similarity index 100%
rename from src/GLES2/libGLES_CM/Context.cpp
rename to src/OpenGL/libGLES_CM/Context.cpp
diff --git a/src/GLES2/libGLES_CM/Context.h b/src/OpenGL/libGLES_CM/Context.h
similarity index 100%
rename from src/GLES2/libGLES_CM/Context.h
rename to src/OpenGL/libGLES_CM/Context.h
diff --git a/src/GLES2/libGLES_CM/Device.cpp b/src/OpenGL/libGLES_CM/Device.cpp
similarity index 100%
rename from src/GLES2/libGLES_CM/Device.cpp
rename to src/OpenGL/libGLES_CM/Device.cpp
diff --git a/src/GLES2/libGLES_CM/Device.hpp b/src/OpenGL/libGLES_CM/Device.hpp
similarity index 100%
rename from src/GLES2/libGLES_CM/Device.hpp
rename to src/OpenGL/libGLES_CM/Device.hpp
diff --git a/src/GLES2/libGLES_CM/Framebuffer.cpp b/src/OpenGL/libGLES_CM/Framebuffer.cpp
similarity index 100%
rename from src/GLES2/libGLES_CM/Framebuffer.cpp
rename to src/OpenGL/libGLES_CM/Framebuffer.cpp
diff --git a/src/GLES2/libGLES_CM/Framebuffer.h b/src/OpenGL/libGLES_CM/Framebuffer.h
similarity index 100%
rename from src/GLES2/libGLES_CM/Framebuffer.h
rename to src/OpenGL/libGLES_CM/Framebuffer.h
diff --git a/src/GLES2/libGLES_CM/HandleAllocator.cpp b/src/OpenGL/libGLES_CM/HandleAllocator.cpp
similarity index 100%
rename from src/GLES2/libGLES_CM/HandleAllocator.cpp
rename to src/OpenGL/libGLES_CM/HandleAllocator.cpp
diff --git a/src/GLES2/libGLES_CM/HandleAllocator.h b/src/OpenGL/libGLES_CM/HandleAllocator.h
similarity index 100%
rename from src/GLES2/libGLES_CM/HandleAllocator.h
rename to src/OpenGL/libGLES_CM/HandleAllocator.h
diff --git a/src/GLES2/libGLES_CM/Image.cpp b/src/OpenGL/libGLES_CM/Image.cpp
similarity index 100%
rename from src/GLES2/libGLES_CM/Image.cpp
rename to src/OpenGL/libGLES_CM/Image.cpp
diff --git a/src/GLES2/libGLES_CM/Image.hpp b/src/OpenGL/libGLES_CM/Image.hpp
similarity index 100%
rename from src/GLES2/libGLES_CM/Image.hpp
rename to src/OpenGL/libGLES_CM/Image.hpp
diff --git a/src/GLES2/libGLES_CM/IndexDataManager.cpp b/src/OpenGL/libGLES_CM/IndexDataManager.cpp
similarity index 100%
rename from src/GLES2/libGLES_CM/IndexDataManager.cpp
rename to src/OpenGL/libGLES_CM/IndexDataManager.cpp
diff --git a/src/GLES2/libGLES_CM/IndexDataManager.h b/src/OpenGL/libGLES_CM/IndexDataManager.h
similarity index 100%
rename from src/GLES2/libGLES_CM/IndexDataManager.h
rename to src/OpenGL/libGLES_CM/IndexDataManager.h
diff --git a/src/GLES2/libGLES_CM/MatrixStack.cpp b/src/OpenGL/libGLES_CM/MatrixStack.cpp
similarity index 100%
rename from src/GLES2/libGLES_CM/MatrixStack.cpp
rename to src/OpenGL/libGLES_CM/MatrixStack.cpp
diff --git a/src/GLES2/libGLES_CM/MatrixStack.hpp b/src/OpenGL/libGLES_CM/MatrixStack.hpp
similarity index 100%
rename from src/GLES2/libGLES_CM/MatrixStack.hpp
rename to src/OpenGL/libGLES_CM/MatrixStack.hpp
diff --git a/src/GLES2/libGLES_CM/RefCountObject.cpp b/src/OpenGL/libGLES_CM/RefCountObject.cpp
similarity index 100%
rename from src/GLES2/libGLES_CM/RefCountObject.cpp
rename to src/OpenGL/libGLES_CM/RefCountObject.cpp
diff --git a/src/GLES2/libGLES_CM/RefCountObject.h b/src/OpenGL/libGLES_CM/RefCountObject.h
similarity index 100%
rename from src/GLES2/libGLES_CM/RefCountObject.h
rename to src/OpenGL/libGLES_CM/RefCountObject.h
diff --git a/src/GLES2/libGLES_CM/Renderbuffer.cpp b/src/OpenGL/libGLES_CM/Renderbuffer.cpp
similarity index 100%
rename from src/GLES2/libGLES_CM/Renderbuffer.cpp
rename to src/OpenGL/libGLES_CM/Renderbuffer.cpp
diff --git a/src/GLES2/libGLES_CM/Renderbuffer.h b/src/OpenGL/libGLES_CM/Renderbuffer.h
similarity index 100%
rename from src/GLES2/libGLES_CM/Renderbuffer.h
rename to src/OpenGL/libGLES_CM/Renderbuffer.h
diff --git a/src/GLES2/libGLES_CM/ResourceManager.cpp b/src/OpenGL/libGLES_CM/ResourceManager.cpp
similarity index 100%
rename from src/GLES2/libGLES_CM/ResourceManager.cpp
rename to src/OpenGL/libGLES_CM/ResourceManager.cpp
diff --git a/src/GLES2/libGLES_CM/ResourceManager.h b/src/OpenGL/libGLES_CM/ResourceManager.h
similarity index 100%
rename from src/GLES2/libGLES_CM/ResourceManager.h
rename to src/OpenGL/libGLES_CM/ResourceManager.h
diff --git a/src/GLES2/libGLES_CM/Texture.cpp b/src/OpenGL/libGLES_CM/Texture.cpp
similarity index 100%
rename from src/GLES2/libGLES_CM/Texture.cpp
rename to src/OpenGL/libGLES_CM/Texture.cpp
diff --git a/src/GLES2/libGLES_CM/Texture.h b/src/OpenGL/libGLES_CM/Texture.h
similarity index 100%
rename from src/GLES2/libGLES_CM/Texture.h
rename to src/OpenGL/libGLES_CM/Texture.h
diff --git a/src/GLES2/libGLES_CM/VertexDataManager.cpp b/src/OpenGL/libGLES_CM/VertexDataManager.cpp
similarity index 100%
rename from src/GLES2/libGLES_CM/VertexDataManager.cpp
rename to src/OpenGL/libGLES_CM/VertexDataManager.cpp
diff --git a/src/GLES2/libGLES_CM/VertexDataManager.h b/src/OpenGL/libGLES_CM/VertexDataManager.h
similarity index 100%
rename from src/GLES2/libGLES_CM/VertexDataManager.h
rename to src/OpenGL/libGLES_CM/VertexDataManager.h
diff --git a/src/GLES2/libGLES_CM/exports.map b/src/OpenGL/libGLES_CM/exports.map
similarity index 100%
rename from src/GLES2/libGLES_CM/exports.map
rename to src/OpenGL/libGLES_CM/exports.map
diff --git a/src/GLES2/libGLES_CM/libGLES_CM.cpp b/src/OpenGL/libGLES_CM/libGLES_CM.cpp
similarity index 100%
rename from src/GLES2/libGLES_CM/libGLES_CM.cpp
rename to src/OpenGL/libGLES_CM/libGLES_CM.cpp
diff --git a/src/GLES2/libGLES_CM/libGLES_CM.def b/src/OpenGL/libGLES_CM/libGLES_CM.def
similarity index 100%
rename from src/GLES2/libGLES_CM/libGLES_CM.def
rename to src/OpenGL/libGLES_CM/libGLES_CM.def
diff --git a/src/GLES2/libGLES_CM/libGLES_CM.rc b/src/OpenGL/libGLES_CM/libGLES_CM.rc
similarity index 100%
rename from src/GLES2/libGLES_CM/libGLES_CM.rc
rename to src/OpenGL/libGLES_CM/libGLES_CM.rc
diff --git a/src/GLES2/libGLES_CM/libGLES_CM.vcxproj b/src/OpenGL/libGLES_CM/libGLES_CM.vcxproj
similarity index 100%
rename from src/GLES2/libGLES_CM/libGLES_CM.vcxproj
rename to src/OpenGL/libGLES_CM/libGLES_CM.vcxproj
diff --git a/src/GLES2/libGLES_CM/libGLES_CM.vcxproj.filters b/src/OpenGL/libGLES_CM/libGLES_CM.vcxproj.filters
similarity index 100%
rename from src/GLES2/libGLES_CM/libGLES_CM.vcxproj.filters
rename to src/OpenGL/libGLES_CM/libGLES_CM.vcxproj.filters
diff --git a/src/GLES2/libGLES_CM/main.cpp b/src/OpenGL/libGLES_CM/main.cpp
similarity index 100%
rename from src/GLES2/libGLES_CM/main.cpp
rename to src/OpenGL/libGLES_CM/main.cpp
diff --git a/src/GLES2/libGLES_CM/main.h b/src/OpenGL/libGLES_CM/main.h
similarity index 100%
rename from src/GLES2/libGLES_CM/main.h
rename to src/OpenGL/libGLES_CM/main.h
diff --git a/src/GLES2/libGLES_CM/mathutil.h b/src/OpenGL/libGLES_CM/mathutil.h
similarity index 100%
rename from src/GLES2/libGLES_CM/mathutil.h
rename to src/OpenGL/libGLES_CM/mathutil.h
diff --git a/src/GLES2/libGLES_CM/resource.h b/src/OpenGL/libGLES_CM/resource.h
similarity index 100%
rename from src/GLES2/libGLES_CM/resource.h
rename to src/OpenGL/libGLES_CM/resource.h
diff --git a/src/GLES2/libGLES_CM/utilities.cpp b/src/OpenGL/libGLES_CM/utilities.cpp
similarity index 100%
rename from src/GLES2/libGLES_CM/utilities.cpp
rename to src/OpenGL/libGLES_CM/utilities.cpp
diff --git a/src/GLES2/libGLES_CM/utilities.h b/src/OpenGL/libGLES_CM/utilities.h
similarity index 100%
rename from src/GLES2/libGLES_CM/utilities.h
rename to src/OpenGL/libGLES_CM/utilities.h
diff --git a/src/GLES2/libGLESv2/Buffer.cpp b/src/OpenGL/libGLESv2/Buffer.cpp
similarity index 100%
rename from src/GLES2/libGLESv2/Buffer.cpp
rename to src/OpenGL/libGLESv2/Buffer.cpp
diff --git a/src/GLES2/libGLESv2/Buffer.h b/src/OpenGL/libGLESv2/Buffer.h
similarity index 100%
rename from src/GLES2/libGLESv2/Buffer.h
rename to src/OpenGL/libGLESv2/Buffer.h
diff --git a/src/GLES2/libGLESv2/Context.cpp b/src/OpenGL/libGLESv2/Context.cpp
similarity index 100%
rename from src/GLES2/libGLESv2/Context.cpp
rename to src/OpenGL/libGLESv2/Context.cpp
diff --git a/src/GLES2/libGLESv2/Context.h b/src/OpenGL/libGLESv2/Context.h
similarity index 100%
rename from src/GLES2/libGLESv2/Context.h
rename to src/OpenGL/libGLESv2/Context.h
diff --git a/src/GLES2/libGLESv2/Device.cpp b/src/OpenGL/libGLESv2/Device.cpp
similarity index 100%
rename from src/GLES2/libGLESv2/Device.cpp
rename to src/OpenGL/libGLESv2/Device.cpp
diff --git a/src/GLES2/libGLESv2/Device.hpp b/src/OpenGL/libGLESv2/Device.hpp
similarity index 100%
rename from src/GLES2/libGLESv2/Device.hpp
rename to src/OpenGL/libGLESv2/Device.hpp
diff --git a/src/GLES2/libGLESv2/Fence.cpp b/src/OpenGL/libGLESv2/Fence.cpp
similarity index 100%
rename from src/GLES2/libGLESv2/Fence.cpp
rename to src/OpenGL/libGLESv2/Fence.cpp
diff --git a/src/GLES2/libGLESv2/Fence.h b/src/OpenGL/libGLESv2/Fence.h
similarity index 100%
rename from src/GLES2/libGLESv2/Fence.h
rename to src/OpenGL/libGLESv2/Fence.h
diff --git a/src/GLES2/libGLESv2/Framebuffer.cpp b/src/OpenGL/libGLESv2/Framebuffer.cpp
similarity index 100%
rename from src/GLES2/libGLESv2/Framebuffer.cpp
rename to src/OpenGL/libGLESv2/Framebuffer.cpp
diff --git a/src/GLES2/libGLESv2/Framebuffer.h b/src/OpenGL/libGLESv2/Framebuffer.h
similarity index 100%
rename from src/GLES2/libGLESv2/Framebuffer.h
rename to src/OpenGL/libGLESv2/Framebuffer.h
diff --git a/src/GLES2/libGLESv2/HandleAllocator.cpp b/src/OpenGL/libGLESv2/HandleAllocator.cpp
similarity index 100%
rename from src/GLES2/libGLESv2/HandleAllocator.cpp
rename to src/OpenGL/libGLESv2/HandleAllocator.cpp
diff --git a/src/GLES2/libGLESv2/HandleAllocator.h b/src/OpenGL/libGLESv2/HandleAllocator.h
similarity index 100%
rename from src/GLES2/libGLESv2/HandleAllocator.h
rename to src/OpenGL/libGLESv2/HandleAllocator.h
diff --git a/src/GLES2/libGLESv2/Image.cpp b/src/OpenGL/libGLESv2/Image.cpp
similarity index 100%
rename from src/GLES2/libGLESv2/Image.cpp
rename to src/OpenGL/libGLESv2/Image.cpp
diff --git a/src/GLES2/libGLESv2/Image.hpp b/src/OpenGL/libGLESv2/Image.hpp
similarity index 100%
rename from src/GLES2/libGLESv2/Image.hpp
rename to src/OpenGL/libGLESv2/Image.hpp
diff --git a/src/GLES2/libGLESv2/IndexDataManager.cpp b/src/OpenGL/libGLESv2/IndexDataManager.cpp
similarity index 100%
rename from src/GLES2/libGLESv2/IndexDataManager.cpp
rename to src/OpenGL/libGLESv2/IndexDataManager.cpp
diff --git a/src/GLES2/libGLESv2/IndexDataManager.h b/src/OpenGL/libGLESv2/IndexDataManager.h
similarity index 100%
rename from src/GLES2/libGLESv2/IndexDataManager.h
rename to src/OpenGL/libGLESv2/IndexDataManager.h
diff --git a/src/GLES2/libGLESv2/Program.cpp b/src/OpenGL/libGLESv2/Program.cpp
similarity index 100%
rename from src/GLES2/libGLESv2/Program.cpp
rename to src/OpenGL/libGLESv2/Program.cpp
diff --git a/src/GLES2/libGLESv2/Program.h b/src/OpenGL/libGLESv2/Program.h
similarity index 100%
rename from src/GLES2/libGLESv2/Program.h
rename to src/OpenGL/libGLESv2/Program.h
diff --git a/src/GLES2/libGLESv2/Query.cpp b/src/OpenGL/libGLESv2/Query.cpp
similarity index 100%
rename from src/GLES2/libGLESv2/Query.cpp
rename to src/OpenGL/libGLESv2/Query.cpp
diff --git a/src/GLES2/libGLESv2/Query.h b/src/OpenGL/libGLESv2/Query.h
similarity index 100%
rename from src/GLES2/libGLESv2/Query.h
rename to src/OpenGL/libGLESv2/Query.h
diff --git a/src/GLES2/libGLESv2/RefCountObject.cpp b/src/OpenGL/libGLESv2/RefCountObject.cpp
similarity index 100%
rename from src/GLES2/libGLESv2/RefCountObject.cpp
rename to src/OpenGL/libGLESv2/RefCountObject.cpp
diff --git a/src/GLES2/libGLESv2/RefCountObject.h b/src/OpenGL/libGLESv2/RefCountObject.h
similarity index 100%
rename from src/GLES2/libGLESv2/RefCountObject.h
rename to src/OpenGL/libGLESv2/RefCountObject.h
diff --git a/src/GLES2/libGLESv2/Renderbuffer.cpp b/src/OpenGL/libGLESv2/Renderbuffer.cpp
similarity index 100%
rename from src/GLES2/libGLESv2/Renderbuffer.cpp
rename to src/OpenGL/libGLESv2/Renderbuffer.cpp
diff --git a/src/GLES2/libGLESv2/Renderbuffer.h b/src/OpenGL/libGLESv2/Renderbuffer.h
similarity index 100%
rename from src/GLES2/libGLESv2/Renderbuffer.h
rename to src/OpenGL/libGLESv2/Renderbuffer.h
diff --git a/src/GLES2/libGLESv2/ResourceManager.cpp b/src/OpenGL/libGLESv2/ResourceManager.cpp
similarity index 100%
rename from src/GLES2/libGLESv2/ResourceManager.cpp
rename to src/OpenGL/libGLESv2/ResourceManager.cpp
diff --git a/src/GLES2/libGLESv2/ResourceManager.h b/src/OpenGL/libGLESv2/ResourceManager.h
similarity index 100%
rename from src/GLES2/libGLESv2/ResourceManager.h
rename to src/OpenGL/libGLESv2/ResourceManager.h
diff --git a/src/GLES2/libGLESv2/Shader.cpp b/src/OpenGL/libGLESv2/Shader.cpp
similarity index 100%
rename from src/GLES2/libGLESv2/Shader.cpp
rename to src/OpenGL/libGLESv2/Shader.cpp
diff --git a/src/GLES2/libGLESv2/Shader.h b/src/OpenGL/libGLESv2/Shader.h
similarity index 100%
rename from src/GLES2/libGLESv2/Shader.h
rename to src/OpenGL/libGLESv2/Shader.h
diff --git a/src/GLES2/libGLESv2/Texture.cpp b/src/OpenGL/libGLESv2/Texture.cpp
similarity index 100%
rename from src/GLES2/libGLESv2/Texture.cpp
rename to src/OpenGL/libGLESv2/Texture.cpp
diff --git a/src/GLES2/libGLESv2/Texture.h b/src/OpenGL/libGLESv2/Texture.h
similarity index 100%
rename from src/GLES2/libGLESv2/Texture.h
rename to src/OpenGL/libGLESv2/Texture.h
diff --git a/src/GLES2/libGLESv2/VertexDataManager.cpp b/src/OpenGL/libGLESv2/VertexDataManager.cpp
similarity index 100%
rename from src/GLES2/libGLESv2/VertexDataManager.cpp
rename to src/OpenGL/libGLESv2/VertexDataManager.cpp
diff --git a/src/GLES2/libGLESv2/VertexDataManager.h b/src/OpenGL/libGLESv2/VertexDataManager.h
similarity index 100%
rename from src/GLES2/libGLESv2/VertexDataManager.h
rename to src/OpenGL/libGLESv2/VertexDataManager.h
diff --git a/src/GLES2/libGLESv2/exports.map b/src/OpenGL/libGLESv2/exports.map
similarity index 100%
rename from src/GLES2/libGLESv2/exports.map
rename to src/OpenGL/libGLESv2/exports.map
diff --git a/src/GLES2/libGLESv2/libGLESv2.cbp b/src/OpenGL/libGLESv2/libGLESv2.cbp
similarity index 100%
rename from src/GLES2/libGLESv2/libGLESv2.cbp
rename to src/OpenGL/libGLESv2/libGLESv2.cbp
diff --git a/src/GLES2/libGLESv2/libGLESv2.cpp b/src/OpenGL/libGLESv2/libGLESv2.cpp
similarity index 100%
rename from src/GLES2/libGLESv2/libGLESv2.cpp
rename to src/OpenGL/libGLESv2/libGLESv2.cpp
diff --git a/src/GLES2/libGLESv2/libGLESv2.def b/src/OpenGL/libGLESv2/libGLESv2.def
similarity index 100%
rename from src/GLES2/libGLESv2/libGLESv2.def
rename to src/OpenGL/libGLESv2/libGLESv2.def
diff --git a/src/GLES2/libGLESv2/libGLESv2.rc b/src/OpenGL/libGLESv2/libGLESv2.rc
similarity index 100%
rename from src/GLES2/libGLESv2/libGLESv2.rc
rename to src/OpenGL/libGLESv2/libGLESv2.rc
diff --git a/src/GLES2/libGLESv2/libGLESv2.vcxproj b/src/OpenGL/libGLESv2/libGLESv2.vcxproj
similarity index 100%
rename from src/GLES2/libGLESv2/libGLESv2.vcxproj
rename to src/OpenGL/libGLESv2/libGLESv2.vcxproj
diff --git a/src/GLES2/libGLESv2/libGLESv2.vcxproj.filters b/src/OpenGL/libGLESv2/libGLESv2.vcxproj.filters
similarity index 100%
rename from src/GLES2/libGLESv2/libGLESv2.vcxproj.filters
rename to src/OpenGL/libGLESv2/libGLESv2.vcxproj.filters
diff --git a/src/GLES2/libGLESv2/main.cpp b/src/OpenGL/libGLESv2/main.cpp
similarity index 100%
rename from src/GLES2/libGLESv2/main.cpp
rename to src/OpenGL/libGLESv2/main.cpp
diff --git a/src/GLES2/libGLESv2/main.h b/src/OpenGL/libGLESv2/main.h
similarity index 100%
rename from src/GLES2/libGLESv2/main.h
rename to src/OpenGL/libGLESv2/main.h
diff --git a/src/GLES2/libGLESv2/mathutil.h b/src/OpenGL/libGLESv2/mathutil.h
similarity index 100%
rename from src/GLES2/libGLESv2/mathutil.h
rename to src/OpenGL/libGLESv2/mathutil.h
diff --git a/src/GLES2/libGLESv2/resource.h b/src/OpenGL/libGLESv2/resource.h
similarity index 100%
rename from src/GLES2/libGLESv2/resource.h
rename to src/OpenGL/libGLESv2/resource.h
diff --git a/src/GLES2/libGLESv2/utilities.cpp b/src/OpenGL/libGLESv2/utilities.cpp
similarity index 100%
rename from src/GLES2/libGLESv2/utilities.cpp
rename to src/OpenGL/libGLESv2/utilities.cpp
diff --git a/src/GLES2/libGLESv2/utilities.h b/src/OpenGL/libGLESv2/utilities.h
similarity index 100%
rename from src/GLES2/libGLESv2/utilities.h
rename to src/OpenGL/libGLESv2/utilities.h
diff --git a/src/SwiftShader.sln b/src/SwiftShader.sln
index 105f22e..087aa9a 100644
--- a/src/SwiftShader.sln
+++ b/src/SwiftShader.sln
@@ -11,17 +11,17 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Reactor", "Reactor\Reactor.vcxproj", "{28FD076D-10B5-4BD8-A4CF-F44C7002A803}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GLES2", "GLES2", "{D33114D7-E582-4D61-B27D-FAB0297C43FF}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OpenGL", "OpenGL", "{D33114D7-E582-4D61-B27D-FAB0297C43FF}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{ED25C308-5BDB-43A7-BED6-C2C059FC2D7D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "GLES2\libGLESv2\libGLESv2.vcxproj", "{B5871A7A-968C-42E3-A33B-981E6F448E78}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "OpenGL\libGLESv2\libGLESv2.vcxproj", "{B5871A7A-968C-42E3-A33B-981E6F448E78}"
 	ProjectSection(ProjectDependencies) = postProject
 		{7B02CB19-4CDF-4F79-BC9B-7F3F6164A003} = {7B02CB19-4CDF-4F79-BC9B-7F3F6164A003}
 		{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6} = {E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "GLES2\libEGL\libEGL.vcxproj", "{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "OpenGL\libEGL\libEGL.vcxproj", "{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}"
 	ProjectSection(ProjectDependencies) = postProject
 		{7B02CB19-4CDF-4F79-BC9B-7F3F6164A003} = {7B02CB19-4CDF-4F79-BC9B-7F3F6164A003}
 	EndProjectSection
@@ -201,9 +201,9 @@
 		{BD8EE868-0D68-4A92-B277-3C9EBDC5EC3C} = {BD8EE868-0D68-4A92-B277-3C9EBDC5EC3C}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Compiler", "GLES2\compiler\Compiler.vcxproj", "{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Compiler", "OpenGL\compiler\Compiler.vcxproj", "{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "preprocessor", "GLES2\compiler\preprocessor\preprocessor.vcxproj", "{92940255-AB4B-42FB-A2C4-0FAB19C3C48A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "preprocessor", "OpenGL\compiler\preprocessor\preprocessor.vcxproj", "{92940255-AB4B-42FB-A2C4-0FAB19C3C48A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OGLES2HelloAPI", "..\tests\third_party\PowerVR\Examples\Beginner\01_HelloAPI\OGLES2\Build\WindowsVC2010\OGLES2HelloAPI.vcxproj", "{9DAFEE32-19F6-4410-AA09-2B564FB86F62}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -225,7 +225,7 @@
 		{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6} = {E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLES_CM", "GLES2\libGLES_CM\libGLES_CM.vcxproj", "{235B1D85-E6B6-45E2-BA5D-5C60396428FF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLES_CM", "OpenGL\libGLES_CM\libGLES_CM.vcxproj", "{235B1D85-E6B6-45E2-BA5D-5C60396428FF}"
 	ProjectSection(ProjectDependencies) = postProject
 		{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6} = {E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}
 	EndProjectSection