diff --git a/Source/Converter/CHeaderToXML/ESCLParser.cs b/Source/Converter/ESCLParser.cs
similarity index 100%
rename from Source/Converter/CHeaderToXML/ESCLParser.cs
rename to Source/Converter/ESCLParser.cs
diff --git a/Source/Converter/CHeaderToXML/Headers/CL10/cl.h b/Source/Converter/Headers/CL10/cl.h
similarity index 100%
rename from Source/Converter/CHeaderToXML/Headers/CL10/cl.h
rename to Source/Converter/Headers/CL10/cl.h
diff --git a/Source/Converter/CHeaderToXML/Headers/CL10/cl_gl.h b/Source/Converter/Headers/CL10/cl_gl.h
similarity index 100%
rename from Source/Converter/CHeaderToXML/Headers/CL10/cl_gl.h
rename to Source/Converter/Headers/CL10/cl_gl.h
diff --git a/Source/Converter/CHeaderToXML/Headers/EGL/egl.h b/Source/Converter/Headers/EGL/egl.h
similarity index 100%
rename from Source/Converter/CHeaderToXML/Headers/EGL/egl.h
rename to Source/Converter/Headers/EGL/egl.h
diff --git a/Source/Converter/CHeaderToXML/Headers/EGL/eglext.h b/Source/Converter/Headers/EGL/eglext.h
similarity index 100%
rename from Source/Converter/CHeaderToXML/Headers/EGL/eglext.h
rename to Source/Converter/Headers/EGL/eglext.h
diff --git a/Source/Converter/CHeaderToXML/Headers/ES10/gl.h b/Source/Converter/Headers/ES10/gl.h
similarity index 100%
rename from Source/Converter/CHeaderToXML/Headers/ES10/gl.h
rename to Source/Converter/Headers/ES10/gl.h
diff --git a/Source/Converter/CHeaderToXML/Headers/ES11/gl.h b/Source/Converter/Headers/ES11/gl.h
similarity index 100%
rename from Source/Converter/CHeaderToXML/Headers/ES11/gl.h
rename to Source/Converter/Headers/ES11/gl.h
diff --git a/Source/Converter/CHeaderToXML/Headers/ES11/glext.h b/Source/Converter/Headers/ES11/glext.h
similarity index 100%
rename from Source/Converter/CHeaderToXML/Headers/ES11/glext.h
rename to Source/Converter/Headers/ES11/glext.h
diff --git a/Source/Converter/CHeaderToXML/Headers/ES20/gl2.h b/Source/Converter/Headers/ES20/gl2.h
similarity index 100%
rename from Source/Converter/CHeaderToXML/Headers/ES20/gl2.h
rename to Source/Converter/Headers/ES20/gl2.h
diff --git a/Source/Converter/CHeaderToXML/Headers/ES20/gl2ext.h b/Source/Converter/Headers/ES20/gl2ext.h
similarity index 100%
rename from Source/Converter/CHeaderToXML/Headers/ES20/gl2ext.h
rename to Source/Converter/Headers/ES20/gl2ext.h
diff --git a/Source/Converter/CHeaderToXML/Main.cs b/Source/Converter/Main.cs
similarity index 100%
rename from Source/Converter/CHeaderToXML/Main.cs
rename to Source/Converter/Main.cs
diff --git a/Source/Converter/CHeaderToXML/Options.cs b/Source/Converter/Options.cs
similarity index 100%
rename from Source/Converter/CHeaderToXML/Options.cs
rename to Source/Converter/Options.cs
diff --git a/Source/Converter/CHeaderToXML/Parser.cs b/Source/Converter/Parser.cs
similarity index 100%
rename from Source/Converter/CHeaderToXML/Parser.cs
rename to Source/Converter/Parser.cs
diff --git a/Source/Converter/CHeaderToXML/Readme.txt b/Source/Converter/Readme.txt
similarity index 100%
rename from Source/Converter/CHeaderToXML/Readme.txt
rename to Source/Converter/Readme.txt
diff --git a/Source/Converter/CHeaderToXML/XML schema notes.txt b/Source/Converter/XML schema notes.txt
similarity index 100%
rename from Source/Converter/CHeaderToXML/XML schema notes.txt
rename to Source/Converter/XML schema notes.txt