diff --git a/ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj b/ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj
index 46897b9135..9c0a97ad81 100644
--- a/ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj
+++ b/ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj
@@ -168,7 +168,6 @@
     <Compile Include="TypeSystem\Implementation\SimpleCompilation.cs" />
     <Compile Include="TypeSystem\Implementation\SimpleConstantValue.cs" />
     <Compile Include="TypeSystem\Implementation\SimpleInterningProvider.cs" />
-    <Compile Include="TypeSystem\Implementation\SimpleTypeResolveContext.cs" />
     <Compile Include="TypeSystem\Implementation\SpecializedEvent.cs" />
     <Compile Include="TypeSystem\Implementation\SpecializedField.cs" />
     <Compile Include="TypeSystem\Implementation\SpecializedMember.cs" />
@@ -200,6 +199,7 @@
     <Compile Include="TypeSystem\ParameterizedType.cs" />
     <Compile Include="TypeSystem\ParameterListComparer.cs" />
     <Compile Include="TypeSystem\ReflectionNameParseException.cs" />
+    <Compile Include="TypeSystem\SimpleTypeResolveContext.cs" />
     <Compile Include="TypeSystem\TypeKind.cs" />
     <Compile Include="TypeSystem\TypeVisitor.cs" />
     <Compile Include="TypeSystem\IVariable.cs" />
diff --git a/ICSharpCode.NRefactory/TypeSystem/IEvent.cs b/ICSharpCode.NRefactory/TypeSystem/IEvent.cs
index c8b6b9bf6c..21604068df 100644
--- a/ICSharpCode.NRefactory/TypeSystem/IEvent.cs
+++ b/ICSharpCode.NRefactory/TypeSystem/IEvent.cs
@@ -37,7 +37,7 @@ namespace ICSharpCode.NRefactory.TypeSystem
 		/// </summary>
 		/// <param name="context">
 		/// Context for looking up the member. The context must specify the current assembly.
-		/// A <see cref="Implementation.SimpleTypeResolveContext"/> that specifies the current assembly is sufficient.
+		/// A <see cref="SimpleTypeResolveContext"/> that specifies the current assembly is sufficient.
 		/// </param>
 		/// <returns>
 		/// Returns the resolved member, or <c>null</c> if the member could not be found.
diff --git a/ICSharpCode.NRefactory/TypeSystem/IField.cs b/ICSharpCode.NRefactory/TypeSystem/IField.cs
index 85c59812ec..95ed0f8437 100644
--- a/ICSharpCode.NRefactory/TypeSystem/IField.cs
+++ b/ICSharpCode.NRefactory/TypeSystem/IField.cs
@@ -48,7 +48,7 @@ namespace ICSharpCode.NRefactory.TypeSystem
 		/// </summary>
 		/// <param name="context">
 		/// Context for looking up the member. The context must specify the current assembly.
-		/// A <see cref="Implementation.SimpleTypeResolveContext"/> that specifies the current assembly is sufficient.
+		/// A <see cref="SimpleTypeResolveContext"/> that specifies the current assembly is sufficient.
 		/// </param>
 		/// <returns>
 		/// Returns the resolved member, or <c>null</c> if the member could not be found.
diff --git a/ICSharpCode.NRefactory/TypeSystem/IMember.cs b/ICSharpCode.NRefactory/TypeSystem/IMember.cs
index 2cd4ef2b19..f021f37e7d 100644
--- a/ICSharpCode.NRefactory/TypeSystem/IMember.cs
+++ b/ICSharpCode.NRefactory/TypeSystem/IMember.cs
@@ -67,7 +67,7 @@ namespace ICSharpCode.NRefactory.TypeSystem
 		/// </summary>
 		/// <param name="context">
 		/// Context for looking up the member. The context must specify the current assembly.
-		/// A <see cref="Implementation.SimpleTypeResolveContext"/> that specifies the current assembly is sufficient.
+		/// A <see cref="SimpleTypeResolveContext"/> that specifies the current assembly is sufficient.
 		/// </param>
 		/// <returns>
 		/// Returns the resolved member, or <c>null</c> if the member could not be found.
diff --git a/ICSharpCode.NRefactory/TypeSystem/IMethod.cs b/ICSharpCode.NRefactory/TypeSystem/IMethod.cs
index 74a7cc6b0b..b0cf9e1bf0 100644
--- a/ICSharpCode.NRefactory/TypeSystem/IMethod.cs
+++ b/ICSharpCode.NRefactory/TypeSystem/IMethod.cs
@@ -50,7 +50,7 @@ namespace ICSharpCode.NRefactory.TypeSystem
 		/// </summary>
 		/// <param name="context">
 		/// Context for looking up the member. The context must specify the current assembly.
-		/// A <see cref="Implementation.SimpleTypeResolveContext"/> that specifies the current assembly is sufficient.
+		/// A <see cref="SimpleTypeResolveContext"/> that specifies the current assembly is sufficient.
 		/// </param>
 		/// <returns>
 		/// Returns the resolved member, or <c>null</c> if the member could not be found.
diff --git a/ICSharpCode.NRefactory/TypeSystem/IProperty.cs b/ICSharpCode.NRefactory/TypeSystem/IProperty.cs
index 24e4bcbabd..935247fc38 100644
--- a/ICSharpCode.NRefactory/TypeSystem/IProperty.cs
+++ b/ICSharpCode.NRefactory/TypeSystem/IProperty.cs
@@ -38,7 +38,7 @@ namespace ICSharpCode.NRefactory.TypeSystem
 		/// </summary>
 		/// <param name="context">
 		/// Context for looking up the member. The context must specify the current assembly.
-		/// A <see cref="Implementation.SimpleTypeResolveContext"/> that specifies the current assembly is sufficient.
+		/// A <see cref="SimpleTypeResolveContext"/> that specifies the current assembly is sufficient.
 		/// </param>
 		/// <returns>
 		/// Returns the resolved member, or <c>null</c> if the member could not be found.
diff --git a/ICSharpCode.NRefactory/TypeSystem/ITypeDefinition.cs b/ICSharpCode.NRefactory/TypeSystem/ITypeDefinition.cs
index 116f4ee701..508f9ce810 100644
--- a/ICSharpCode.NRefactory/TypeSystem/ITypeDefinition.cs
+++ b/ICSharpCode.NRefactory/TypeSystem/ITypeDefinition.cs
@@ -54,7 +54,7 @@ namespace ICSharpCode.NRefactory.TypeSystem
 		/// </summary>
 		/// <param name="context">
 		/// Context for looking up the type. The context must specify the current assembly.
-		/// A <see cref="Implementation.SimpleTypeResolveContext"/> that specifies the current assembly is sufficient.
+		/// A <see cref="SimpleTypeResolveContext"/> that specifies the current assembly is sufficient.
 		/// </param>
 		/// <returns>
 		/// Returns the resolved type definition.
diff --git a/ICSharpCode.NRefactory/TypeSystem/Implementation/SimpleTypeResolveContext.cs b/ICSharpCode.NRefactory/TypeSystem/SimpleTypeResolveContext.cs
similarity index 98%
rename from ICSharpCode.NRefactory/TypeSystem/Implementation/SimpleTypeResolveContext.cs
rename to ICSharpCode.NRefactory/TypeSystem/SimpleTypeResolveContext.cs
index 292c02f593..afe4393626 100644
--- a/ICSharpCode.NRefactory/TypeSystem/Implementation/SimpleTypeResolveContext.cs
+++ b/ICSharpCode.NRefactory/TypeSystem/SimpleTypeResolveContext.cs
@@ -18,7 +18,7 @@
 
 using System;
 
-namespace ICSharpCode.NRefactory.TypeSystem.Implementation
+namespace ICSharpCode.NRefactory.TypeSystem
 {
 	/// <summary>
 	/// Default ITypeResolveContext implementation.