diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj
index 5a046c04be..cf7b253a5a 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj
@@ -315,37 +315,37 @@
     <Compile Include="Utils\ThrowUtil.cs" />
     <Compile Include="Utils\Win32.cs" />
     <CodeAnalysisDictionary Include="Properties\CodeAnalysisDictionary.xml" />
-    <Compile Include="XmlParser\AbstractAXmlVisitor.cs" />
-    <Compile Include="XmlParser\AXmlAttribute.cs" />
-    <Compile Include="XmlParser\AXmlAttributeCollection.cs" />
-    <Compile Include="XmlParser\AXmlContainer.cs" />
-    <Compile Include="XmlParser\AXmlDocument.cs" />
-    <Compile Include="XmlParser\AXmlElement.cs" />
-    <Compile Include="XmlParser\AXmlObject.cs" />
-    <Compile Include="XmlParser\AXmlObjectCollection.cs" />
-    <Compile Include="XmlParser\AXmlObjectEventArgs.cs" />
-    <Compile Include="XmlParser\AXmlParser.cs" />
-    <Compile Include="XmlParser\AXmlTag.cs" />
-    <Compile Include="XmlParser\AXmlText.cs" />
-    <Compile Include="XmlParser\Cache.cs">
+    <Compile Include="Xml\AbstractAXmlVisitor.cs" />
+    <Compile Include="Xml\AXmlAttribute.cs" />
+    <Compile Include="Xml\AXmlAttributeCollection.cs" />
+    <Compile Include="Xml\AXmlContainer.cs" />
+    <Compile Include="Xml\AXmlDocument.cs" />
+    <Compile Include="Xml\AXmlElement.cs" />
+    <Compile Include="Xml\AXmlObject.cs" />
+    <Compile Include="Xml\AXmlObjectCollection.cs" />
+    <Compile Include="Xml\AXmlObjectEventArgs.cs" />
+    <Compile Include="Xml\AXmlParser.cs" />
+    <Compile Include="Xml\AXmlTag.cs" />
+    <Compile Include="Xml\AXmlText.cs" />
+    <Compile Include="Xml\Cache.cs">
       <DependentUpon>AXmlParser.cs</DependentUpon>
     </Compile>
-    <Compile Include="XmlParser\ExtensionMethods.cs" />
-    <Compile Include="XmlParser\FilteredCollection.cs" />
-    <Compile Include="XmlParser\IAXmlVisitor.cs" />
-    <Compile Include="XmlParser\MergedCollection.cs" />
-    <Compile Include="XmlParser\PrettyPrintXmlVisitor.cs" />
-    <Compile Include="XmlParser\SyntaxError.cs" />
-    <Compile Include="XmlParser\TagMatchingHeuristics.cs">
+    <Compile Include="Xml\ExtensionMethods.cs" />
+    <Compile Include="Xml\FilteredCollection.cs" />
+    <Compile Include="Xml\IAXmlVisitor.cs" />
+    <Compile Include="Xml\MergedCollection.cs" />
+    <Compile Include="Xml\PrettyPrintXmlVisitor.cs" />
+    <Compile Include="Xml\SyntaxError.cs" />
+    <Compile Include="Xml\TagMatchingHeuristics.cs">
       <DependentUpon>AXmlParser.cs</DependentUpon>
     </Compile>
-    <Compile Include="XmlParser\TagReader.cs">
+    <Compile Include="Xml\TagReader.cs">
       <DependentUpon>AXmlParser.cs</DependentUpon>
     </Compile>
-    <Compile Include="XmlParser\TextType.cs">
+    <Compile Include="Xml\TextType.cs">
       <DependentUpon>AXmlText.cs</DependentUpon>
     </Compile>
-    <Compile Include="XmlParser\TokenReader.cs">
+    <Compile Include="Xml\TokenReader.cs">
       <DependentUpon>AXmlParser.cs</DependentUpon>
     </Compile>
     <Resource Include="themes\RightArrow.cur" />
@@ -387,7 +387,7 @@
     <Folder Include="Rendering" />
     <Folder Include="Utils" />
     <Folder Include="themes" />
-    <Folder Include="XmlParser" />
+    <Folder Include="Xml" />
     <Page Include="CodeCompletion\CompletionList.xaml" />
     <Page Include="CodeCompletion\InsightWindow.xaml" />
     <Page Include="TextEditor.xaml" />
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/AXmlAttribute.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/AXmlAttribute.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/AXmlAttribute.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/AXmlAttribute.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/AXmlAttributeCollection.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/AXmlAttributeCollection.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/AXmlAttributeCollection.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/AXmlAttributeCollection.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/AXmlContainer.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/AXmlContainer.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/AXmlContainer.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/AXmlContainer.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/AXmlDocument.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/AXmlDocument.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/AXmlDocument.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/AXmlDocument.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/AXmlElement.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/AXmlElement.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/AXmlElement.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/AXmlElement.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/AXmlObject.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/AXmlObject.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/AXmlObject.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/AXmlObject.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/AXmlObjectCollection.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/AXmlObjectCollection.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/AXmlObjectCollection.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/AXmlObjectCollection.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/AXmlObjectEventArgs.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/AXmlObjectEventArgs.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/AXmlObjectEventArgs.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/AXmlObjectEventArgs.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/AXmlParser.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/AXmlParser.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/AXmlParser.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/AXmlParser.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/AXmlTag.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/AXmlTag.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/AXmlTag.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/AXmlTag.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/AXmlText.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/AXmlText.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/AXmlText.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/AXmlText.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/AbstractAXmlVisitor.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/AbstractAXmlVisitor.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/AbstractAXmlVisitor.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/AbstractAXmlVisitor.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/Cache.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/Cache.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/Cache.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/Cache.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/ExtensionMethods.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/ExtensionMethods.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/ExtensionMethods.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/ExtensionMethods.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/FilteredCollection.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/FilteredCollection.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/FilteredCollection.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/FilteredCollection.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/IAXmlVisitor.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/IAXmlVisitor.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/IAXmlVisitor.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/IAXmlVisitor.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/MergedCollection.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/MergedCollection.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/MergedCollection.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/MergedCollection.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/PrettyPrintXmlVisitor.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/PrettyPrintXmlVisitor.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/PrettyPrintXmlVisitor.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/PrettyPrintXmlVisitor.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/SyntaxError.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/SyntaxError.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/SyntaxError.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/SyntaxError.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/TagMatchingHeuristics.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/TagMatchingHeuristics.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/TagMatchingHeuristics.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/TagMatchingHeuristics.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/TagReader.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/TagReader.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/TagReader.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/TagReader.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/TextType.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/TextType.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/TextType.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/TextType.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/TokenReader.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/TokenReader.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/XmlParser/TokenReader.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/TokenReader.cs