diff --git a/Build/Prebuild.xml b/Build/Prebuild.xml
index ed750e4f..1fd920f6 100644
--- a/Build/Prebuild.xml
+++ b/Build/Prebuild.xml
@@ -150,6 +150,7 @@
       </Configuration>
 
       <Reference name="OpenTK"/>
+      <Reference name="OpenTK.Utilities"/>
       <Reference name="System"/>
       <Reference name="System.Drawing"/>
       <Reference name="System.Windows.Forms"/>
diff --git a/Source/OpenTK/Configuration.cs b/Source/OpenTK/Configuration.cs
index 9c993e9c..e28948f5 100644
--- a/Source/OpenTK/Configuration.cs
+++ b/Source/OpenTK/Configuration.cs
@@ -12,6 +12,9 @@ using System.Text;
 using System.Diagnostics;
 using System.IO;
 
+[assembly: CLSCompliant(true)]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("OpenTK.Utilities")]
+
 namespace OpenTK
 {
     /// <internal />
diff --git a/Source/OpenTK/GameWindow.cs b/Source/OpenTK/GameWindow.cs
index d076a1f8..2d6765de 100644
--- a/Source/OpenTK/GameWindow.cs
+++ b/Source/OpenTK/GameWindow.cs
@@ -18,8 +18,6 @@ using OpenTK.Graphics.OpenGL;
 using OpenTK.Graphics.OpenGL.Enums;
 using OpenTK.Graphics;
 
-[assembly: CLSCompliant(true)]
-
 namespace OpenTK
 {
     /// <summary>
diff --git a/Source/OpenTK/Fonts/DisplayListTextHandle.cs b/Source/Utilities/Fonts/DisplayListTextHandle.cs
similarity index 100%
rename from Source/OpenTK/Fonts/DisplayListTextHandle.cs
rename to Source/Utilities/Fonts/DisplayListTextHandle.cs
diff --git a/Source/OpenTK/Fonts/DisplayListTextPrinter.cs b/Source/Utilities/Fonts/DisplayListTextPrinter.cs
similarity index 100%
rename from Source/OpenTK/Fonts/DisplayListTextPrinter.cs
rename to Source/Utilities/Fonts/DisplayListTextPrinter.cs
diff --git a/Source/OpenTK/Fonts/Glyph.cs b/Source/Utilities/Fonts/Glyph.cs
similarity index 100%
rename from Source/OpenTK/Fonts/Glyph.cs
rename to Source/Utilities/Fonts/Glyph.cs
diff --git a/Source/OpenTK/Fonts/IFont.cs b/Source/Utilities/Fonts/IFont.cs
similarity index 100%
rename from Source/OpenTK/Fonts/IFont.cs
rename to Source/Utilities/Fonts/IFont.cs
diff --git a/Source/OpenTK/Fonts/IPrinterImplementation.cs b/Source/Utilities/Fonts/IPrinterImplementation.cs
similarity index 100%
rename from Source/OpenTK/Fonts/IPrinterImplementation.cs
rename to Source/Utilities/Fonts/IPrinterImplementation.cs
diff --git a/Source/OpenTK/Fonts/ITextPrinter.cs b/Source/Utilities/Fonts/ITextPrinter.cs
similarity index 100%
rename from Source/OpenTK/Fonts/ITextPrinter.cs
rename to Source/Utilities/Fonts/ITextPrinter.cs
diff --git a/Source/OpenTK/Fonts/TextHandle.cs b/Source/Utilities/Fonts/TextHandle.cs
similarity index 100%
rename from Source/OpenTK/Fonts/TextHandle.cs
rename to Source/Utilities/Fonts/TextHandle.cs
diff --git a/Source/OpenTK/Fonts/TextPrinter.cs b/Source/Utilities/Fonts/TextPrinter.cs
similarity index 100%
rename from Source/OpenTK/Fonts/TextPrinter.cs
rename to Source/Utilities/Fonts/TextPrinter.cs
diff --git a/Source/OpenTK/Fonts/TextureFont.cs b/Source/Utilities/Fonts/TextureFont.cs
similarity index 100%
rename from Source/OpenTK/Fonts/TextureFont.cs
rename to Source/Utilities/Fonts/TextureFont.cs
diff --git a/Source/OpenTK/Fonts/VboTextPrinter.cs b/Source/Utilities/Fonts/VboTextPrinter.cs
similarity index 100%
rename from Source/OpenTK/Fonts/VboTextPrinter.cs
rename to Source/Utilities/Fonts/VboTextPrinter.cs