diff --git a/Source/OpenTK/GLControl.cs b/Source/OpenTK/GLControl.cs
index fe53dcca..cd022c42 100644
--- a/Source/OpenTK/GLControl.cs
+++ b/Source/OpenTK/GLControl.cs
@@ -13,6 +13,7 @@ using System.Text;
 using System.Windows.Forms;
 
 using OpenTK.Platform;
+using OpenTK.Graphics;
 
 namespace OpenTK
 {
diff --git a/Source/OpenTK/GLContext.cs b/Source/OpenTK/Graphics/GraphicsContext.cs
similarity index 97%
rename from Source/OpenTK/GLContext.cs
rename to Source/OpenTK/Graphics/GraphicsContext.cs
index f2e84a19..8189d397 100644
--- a/Source/OpenTK/GLContext.cs
+++ b/Source/OpenTK/Graphics/GraphicsContext.cs
@@ -10,7 +10,7 @@ using System.Text;
 
 using OpenTK.Platform;
 
-namespace OpenTK
+namespace OpenTK.Graphics
 {
     /// <summary>
     /// Represents and provides methods to manipulate an OpenGL render context.
diff --git a/Source/OpenTK/Platform/Windows/WinGLContext.cs b/Source/OpenTK/Platform/Windows/WinGLContext.cs
index b8176d04..3568f83e 100644
--- a/Source/OpenTK/Platform/Windows/WinGLContext.cs
+++ b/Source/OpenTK/Platform/Windows/WinGLContext.cs
@@ -14,6 +14,7 @@ using System.Runtime.InteropServices;
 using System.Diagnostics;
 
 using OpenTK.OpenGL;
+using OpenTK.Graphics;
 
 #endregion
 
diff --git a/Source/OpenTK/Platform/X11/X11GLContext.cs b/Source/OpenTK/Platform/X11/X11GLContext.cs
index 8e15f564..69227506 100644
--- a/Source/OpenTK/Platform/X11/X11GLContext.cs
+++ b/Source/OpenTK/Platform/X11/X11GLContext.cs
@@ -11,6 +11,7 @@ using System.Runtime.InteropServices;
 using System.Diagnostics;
 
 using OpenTK.OpenGL;
+using OpenTK.Graphics;
 
 namespace OpenTK.Platform.X11
 {