diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockOpenedFile.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockOpenedFile.cs
index cf87d04384..cbd50d21c4 100644
--- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockOpenedFile.cs
+++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockOpenedFile.cs
@@ -39,5 +39,7 @@ namespace PythonBinding.Tests.Utils
 		public override void UnregisterView(IViewContent view)
 		{
 		}
+		
+		public override event EventHandler FileClosed;
 	}
 }
diff --git a/src/AddIns/BackendBindings/WixBinding/Project/WixBinding.csproj b/src/AddIns/BackendBindings/WixBinding/Project/WixBinding.csproj
index 5dae6c4952..aa490e7754 100644
--- a/src/AddIns/BackendBindings/WixBinding/Project/WixBinding.csproj
+++ b/src/AddIns/BackendBindings/WixBinding/Project/WixBinding.csproj
@@ -229,7 +229,7 @@
       <Name>ICSharpCode.Core.WinForms</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\XmlBinding\XmlEditor.csproj">
+    <ProjectReference Include="..\..\XmlBinding\Project\XmlEditor.csproj">
       <Project>{DCA2703D-250A-463E-A68A-07ED105AE6BD}</Project>
       <Name>XmlEditor</Name>
       <Private>False</Private>
diff --git a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.csproj b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.csproj
index 6539f5a47b..caa8259902 100644
--- a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.csproj
+++ b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.csproj
@@ -120,7 +120,7 @@
       <Project>{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}</Project>
       <Name>ICSharpCode.AvalonEdit</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\XmlBinding\XmlEditor.csproj">
+    <ProjectReference Include="..\..\XmlBinding\Project\XmlEditor.csproj">
       <Project>{DCA2703D-250A-463E-A68A-07ED105AE6BD}</Project>
       <Name>XmlEditor</Name>
       <Private>False</Private>
diff --git a/src/AddIns/BackendBindings/XmlBinding/Configuration/AssemblyInfo.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Configuration/AssemblyInfo.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Configuration/AssemblyInfo.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Configuration/AssemblyInfo.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Resources/XmlCommentTreeNodeIcon.png b/src/AddIns/BackendBindings/XmlBinding/Project/Resources/XmlCommentTreeNodeIcon.png
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Resources/XmlCommentTreeNodeIcon.png
rename to src/AddIns/BackendBindings/XmlBinding/Project/Resources/XmlCommentTreeNodeIcon.png
diff --git a/src/AddIns/BackendBindings/XmlBinding/Resources/XmlElementTreeNodeIcon.png b/src/AddIns/BackendBindings/XmlBinding/Project/Resources/XmlElementTreeNodeIcon.png
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Resources/XmlElementTreeNodeIcon.png
rename to src/AddIns/BackendBindings/XmlBinding/Project/Resources/XmlElementTreeNodeIcon.png
diff --git a/src/AddIns/BackendBindings/XmlBinding/Resources/XmlTextTreeNodeIcon.png b/src/AddIns/BackendBindings/XmlBinding/Project/Resources/XmlTextTreeNodeIcon.png
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Resources/XmlTextTreeNodeIcon.png
rename to src/AddIns/BackendBindings/XmlBinding/Project/Resources/XmlTextTreeNodeIcon.png
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Commands/AddAttributeCommand.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/AddAttributeCommand.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Commands/AddAttributeCommand.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/AddAttributeCommand.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Commands/AddChildCommentCommand.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/AddChildCommentCommand.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Commands/AddChildCommentCommand.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/AddChildCommentCommand.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Commands/AddChildElementCommand.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/AddChildElementCommand.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Commands/AddChildElementCommand.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/AddChildElementCommand.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Commands/AddChildTextNodeCommand.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/AddChildTextNodeCommand.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Commands/AddChildTextNodeCommand.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/AddChildTextNodeCommand.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Gui/AddXmlNodeDialog.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/AddXmlNodeDialog.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Gui/AddXmlNodeDialog.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/AddXmlNodeDialog.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Commands/AssignStylesheetCommand.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/AssignStylesheetCommand.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Commands/AssignStylesheetCommand.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/AssignStylesheetCommand.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Commands/CodeCompletionPopupCommand.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/CodeCompletionPopupCommand.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Commands/CodeCompletionPopupCommand.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/CodeCompletionPopupCommand.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Commands/CreateSchemaCommand.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/CreateSchemaCommand.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Commands/CreateSchemaCommand.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/CreateSchemaCommand.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Xml/EncodedStringWriter.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/EncodedStringWriter.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Xml/EncodedStringWriter.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/EncodedStringWriter.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Commands/FormatXmlCommand.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/FormatXmlCommand.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Commands/FormatXmlCommand.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/FormatXmlCommand.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Commands/GoToSchemaDefinitionCommand.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/GoToSchemaDefinitionCommand.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Commands/GoToSchemaDefinitionCommand.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/GoToSchemaDefinitionCommand.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Gui/GoToSchemaDefinitionEditAction.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/GoToSchemaDefinitionEditAction.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Gui/GoToSchemaDefinitionEditAction.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/GoToSchemaDefinitionEditAction.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Gui/IAddXmlNodeDialog.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/IAddXmlNodeDialog.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Gui/IAddXmlNodeDialog.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/IAddXmlNodeDialog.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Gui/IXmlTreeView.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/IXmlTreeView.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Gui/IXmlTreeView.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/IXmlTreeView.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Commands/InsertCommentAfterCommand.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/InsertCommentAfterCommand.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Commands/InsertCommentAfterCommand.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/InsertCommentAfterCommand.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Commands/InsertCommentBeforeCommand.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/InsertCommentBeforeCommand.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Commands/InsertCommentBeforeCommand.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/InsertCommentBeforeCommand.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Commands/InsertElementAfterCommand.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/InsertElementAfterCommand.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Commands/InsertElementAfterCommand.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/InsertElementAfterCommand.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Commands/InsertElementBeforeCommand.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/InsertElementBeforeCommand.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Commands/InsertElementBeforeCommand.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/InsertElementBeforeCommand.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Commands/InsertTextNodeAfterCommand.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/InsertTextNodeAfterCommand.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Commands/InsertTextNodeAfterCommand.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/InsertTextNodeAfterCommand.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Commands/InsertTextNodeBeforeCommand.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/InsertTextNodeBeforeCommand.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Commands/InsertTextNodeBeforeCommand.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/InsertTextNodeBeforeCommand.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Commands/OpenStylesheetCommand.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/OpenStylesheetCommand.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Commands/OpenStylesheetCommand.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/OpenStylesheetCommand.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Parser/Parser.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/Parser.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Parser/Parser.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/Parser.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Parser/QualifiedName.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/QualifiedName.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Parser/QualifiedName.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/QualifiedName.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Parser/QualifiedNameCollection.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/QualifiedNameCollection.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Parser/QualifiedNameCollection.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/QualifiedNameCollection.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Commands/RemoveAttributeCommand.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/RemoveAttributeCommand.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Commands/RemoveAttributeCommand.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/RemoveAttributeCommand.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Commands/RemoveXPathHighlightingCommand.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/RemoveXPathHighlightingCommand.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Commands/RemoveXPathHighlightingCommand.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/RemoveXPathHighlightingCommand.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Commands/RunXslTransformCommand.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/RunXslTransformCommand.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Commands/RunXslTransformCommand.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/RunXslTransformCommand.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Gui/Dialogs/SelectXmlSchema.xaml b/src/AddIns/BackendBindings/XmlBinding/Project/Src/SelectXmlSchema.xaml
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Gui/Dialogs/SelectXmlSchema.xaml
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/SelectXmlSchema.xaml
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Gui/Dialogs/SelectXmlSchema.xaml.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/SelectXmlSchema.xaml.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Gui/Dialogs/SelectXmlSchema.xaml.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/SelectXmlSchema.xaml.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Src/XPathNodeMatch.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/Src/XPathNodeMatch.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Src/XPathNodeMatch.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/Src/XPathNodeMatch.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Gui/XPathNodeTextMarker.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/Src/XPathNodeTextMarker.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Gui/XPathNodeTextMarker.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/Src/XPathNodeTextMarker.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Gui/XmlAttributePropertyDescriptor.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/Src/XmlAttributePropertyDescriptor.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Gui/XmlAttributePropertyDescriptor.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/Src/XmlAttributePropertyDescriptor.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Gui/XmlAttributeTypeDescriptor.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/Src/XmlAttributeTypeDescriptor.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Gui/XmlAttributeTypeDescriptor.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/Src/XmlAttributeTypeDescriptor.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Src/XmlCharacterDataTreeNode.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/Src/XmlCharacterDataTreeNode.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Src/XmlCharacterDataTreeNode.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/Src/XmlCharacterDataTreeNode.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Gui/XmlCommentTreeNode.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/Src/XmlCommentTreeNode.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Gui/XmlCommentTreeNode.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/Src/XmlCommentTreeNode.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Src/XmlEditorAddInOptions.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/Src/XmlEditorAddInOptions.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Src/XmlEditorAddInOptions.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/Src/XmlEditorAddInOptions.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Src/XmlElementTreeNode.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/Src/XmlElementTreeNode.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Src/XmlElementTreeNode.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/Src/XmlElementTreeNode.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Src/XmlSchemaAssociation.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/Src/XmlSchemaAssociation.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Src/XmlSchemaAssociation.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/Src/XmlSchemaAssociation.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Src/XmlSchemaAssociationListBoxItem.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/Src/XmlSchemaAssociationListBoxItem.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Src/XmlSchemaAssociationListBoxItem.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/Src/XmlSchemaAssociationListBoxItem.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Src/XmlSchemaCompletionData.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/Src/XmlSchemaCompletionData.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Src/XmlSchemaCompletionData.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/Src/XmlSchemaCompletionData.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Src/XmlSchemaCompletionDataCollection.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/Src/XmlSchemaCompletionDataCollection.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Src/XmlSchemaCompletionDataCollection.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/Src/XmlSchemaCompletionDataCollection.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Src/XmlSchemaListBoxItem.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/Src/XmlSchemaListBoxItem.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Src/XmlSchemaListBoxItem.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/Src/XmlSchemaListBoxItem.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Src/XmlSchemaManager.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/Src/XmlSchemaManager.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Src/XmlSchemaManager.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/Src/XmlSchemaManager.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Gui/XmlTextTreeNode.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/Src/XmlTextTreeNode.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Gui/XmlTextTreeNode.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/Src/XmlTextTreeNode.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Src/XmlTreeEditor.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/Src/XmlTreeEditor.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Src/XmlTreeEditor.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/Src/XmlTreeEditor.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Src/XmlTreeViewContainerControl.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/Src/XmlTreeViewContainerControl.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Src/XmlTreeViewContainerControl.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/Src/XmlTreeViewContainerControl.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Src/XmlTreeViewControl.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/Src/XmlTreeViewControl.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Src/XmlTreeViewControl.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/Src/XmlTreeViewControl.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/StylesheetAssignedCondition.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/StylesheetAssignedCondition.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/StylesheetAssignedCondition.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/StylesheetAssignedCondition.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Commands/ValidateXmlCommand.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/ValidateXmlCommand.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Commands/ValidateXmlCommand.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/ValidateXmlCommand.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Gui/XPathNodeMatch.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XPathNodeMatch.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Gui/XPathNodeMatch.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XPathNodeMatch.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Src/XPathNodeTextMarker.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XPathNodeTextMarker.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Src/XPathNodeTextMarker.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XPathNodeTextMarker.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Gui/XPathQueryControl.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XPathQueryControl.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Gui/XPathQueryControl.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XPathQueryControl.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Gui/XPathQueryPad.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XPathQueryPad.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Gui/XPathQueryPad.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XPathQueryPad.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Src/XmlAttributePropertyDescriptor.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlAttributePropertyDescriptor.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Src/XmlAttributePropertyDescriptor.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlAttributePropertyDescriptor.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Src/XmlAttributeTypeDescriptor.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlAttributeTypeDescriptor.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Src/XmlAttributeTypeDescriptor.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlAttributeTypeDescriptor.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Gui/XmlCharacterDataTreeNode.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlCharacterDataTreeNode.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Gui/XmlCharacterDataTreeNode.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlCharacterDataTreeNode.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/CodeCompletion/XmlCodeCompletionBinding.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlCodeCompletionBinding.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/CodeCompletion/XmlCodeCompletionBinding.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlCodeCompletionBinding.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Src/XmlCommentTreeNode.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlCommentTreeNode.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Src/XmlCommentTreeNode.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlCommentTreeNode.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/CodeCompletion/XmlCompletionDataProvider.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlCompletionDataProvider.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/CodeCompletion/XmlCompletionDataProvider.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlCompletionDataProvider.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/CodeCompletion/XmlCompletionItem.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlCompletionItem.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/CodeCompletion/XmlCompletionItem.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlCompletionItem.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/CodeCompletion/XmlCompletionItemCollection.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlCompletionItemCollection.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/CodeCompletion/XmlCompletionItemCollection.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlCompletionItemCollection.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/CodeCompletion/XmlCompletionItemList.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlCompletionItemList.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/CodeCompletion/XmlCompletionItemList.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlCompletionItemList.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Gui/XmlDisplayBinding.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlDisplayBinding.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Gui/XmlDisplayBinding.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlDisplayBinding.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Gui/XmlEditorAddInOptions.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlEditorAddInOptions.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Gui/XmlEditorAddInOptions.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlEditorAddInOptions.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Gui/Dialogs/XmlEditorOptionsPanel.xaml b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlEditorOptionsPanel.xaml
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Gui/Dialogs/XmlEditorOptionsPanel.xaml
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlEditorOptionsPanel.xaml
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Gui/Dialogs/XmlEditorOptionsPanel.xaml.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlEditorOptionsPanel.xaml.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Gui/Dialogs/XmlEditorOptionsPanel.xaml.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlEditorOptionsPanel.xaml.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Parser/XmlElementPath.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlElementPath.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Parser/XmlElementPath.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlElementPath.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Gui/XmlElementTreeNode.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlElementTreeNode.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Gui/XmlElementTreeNode.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlElementTreeNode.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Xml/XmlEncoder.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlEncoder.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Xml/XmlEncoder.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlEncoder.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/XmlFoldingStrategy.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlFoldingStrategy.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/XmlFoldingStrategy.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlFoldingStrategy.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/XmlFormattingStrategy.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlFormattingStrategy.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/XmlFormattingStrategy.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlFormattingStrategy.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Xml/XmlNamespace.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlNamespace.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Xml/XmlNamespace.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlNamespace.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Parser/XmlParser.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlParser.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Parser/XmlParser.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlParser.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Gui/XmlSchemaAssociation.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlSchemaAssociation.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Gui/XmlSchemaAssociation.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlSchemaAssociation.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Gui/XmlSchemaAssociationListBoxItem.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlSchemaAssociationListBoxItem.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Gui/XmlSchemaAssociationListBoxItem.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlSchemaAssociationListBoxItem.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/CodeCompletion/XmlSchemaCompletionData.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlSchemaCompletionData.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/CodeCompletion/XmlSchemaCompletionData.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlSchemaCompletionData.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/CodeCompletion/XmlSchemaCompletionDataCollection.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlSchemaCompletionDataCollection.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/CodeCompletion/XmlSchemaCompletionDataCollection.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlSchemaCompletionDataCollection.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Gui/XmlSchemaListBoxItem.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlSchemaListBoxItem.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Gui/XmlSchemaListBoxItem.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlSchemaListBoxItem.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/XmlSchemaManager.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlSchemaManager.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/XmlSchemaManager.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlSchemaManager.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Gui/Dialogs/XmlSchemasPanel.xaml b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlSchemasPanel.xaml
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Gui/Dialogs/XmlSchemasPanel.xaml
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlSchemasPanel.xaml
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Gui/Dialogs/XmlSchemasPanel.xaml.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlSchemasPanel.xaml.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Gui/Dialogs/XmlSchemasPanel.xaml.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlSchemasPanel.xaml.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Src/XmlTextTreeNode.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlTextTreeNode.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Src/XmlTextTreeNode.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlTextTreeNode.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Gui/XmlTreeEditor.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlTreeEditor.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Gui/XmlTreeEditor.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlTreeEditor.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Gui/XmlTreeView.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlTreeView.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Gui/XmlTreeView.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlTreeView.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Gui/XmlTreeViewContainerControl.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlTreeViewContainerControl.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Gui/XmlTreeViewContainerControl.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlTreeViewContainerControl.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Gui/XmlTreeViewControl.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlTreeViewControl.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Gui/XmlTreeViewControl.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlTreeViewControl.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Gui/XmlView.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlView.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Gui/XmlView.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XmlView.cs
diff --git a/src/AddIns/BackendBindings/XmlBinding/Src/Gui/XslOutputView.cs b/src/AddIns/BackendBindings/XmlBinding/Project/Src/XslOutputView.cs
similarity index 100%
rename from src/AddIns/BackendBindings/XmlBinding/Src/Gui/XslOutputView.cs
rename to src/AddIns/BackendBindings/XmlBinding/Project/Src/XslOutputView.cs
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.addin b/src/AddIns/BackendBindings/XmlBinding/Project/XmlEditor.addin
similarity index 69%
rename from src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.addin
rename to src/AddIns/BackendBindings/XmlBinding/Project/XmlEditor.addin
index 4ffc28ff04..86479c032c 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.addin
+++ b/src/AddIns/BackendBindings/XmlBinding/Project/XmlEditor.addin
@@ -1,44 +1,55 @@
-<AddIn name        = "Xml Editor"
+<AddIn name        = "Xml Editor"
        author      = "Matt Ward"
        copyright   = "prj:///doc/copyright.txt"
-       description = "Xml Editor"
+       description = "Adds XML completion and formatting support"
        addInManagerHidden = "preinstalled">
 	
-	<Manifest>
-		<Identity name = "ICSharpCode.XmlEditor"/>
-	</Manifest>
-	
-<!--	<Runtime>
+	<Runtime>
 		<Import assembly = "XmlEditor.dll">
 			<ConditionEvaluator name = "StylesheetAssigned" class = "ICSharpCode.XmlEditor.StylesheetAssignedCondition"/>
 		</Import>
 		<Import assembly = ":ICSharpCode.SharpDevelop"/>
-	</Runtime>-->
+	</Runtime>
 	
-	<!-- Xml Editor View -->
-<!--	<Path name = "/SharpDevelop/Workbench/DisplayBindings">
-		<DisplayBinding id = "XmlEditor"
-		                insertbefore = "Text"
-		                title = "${res:Gui.ProjectBrowser.OpenWith.Bindings.XmlEditor}"
-		                class = "ICSharpCode.XmlEditor.XmlDisplayBinding"/>
-	</Path>-->
+	<Manifest>
+		<Identity name = "ICSharpCode.XmlEditor"/>
+	</Manifest>
+	
+	<Path name = "/AddIns/DefaultTextEditor/Formatter/XML">
+		<Class id ="XmlFormatter" class = "ICSharpCode.XmlEditor.XmlFormattingStrategy"/>
+	</Path>
+	
+	<Path name = "/AddIns/DefaultTextEditor/CodeCompletion">
+		<CodeCompletionBinding
+			id = "Xml"
+			extensions  = ".xml;.xsl;.xslt;.xsd;.manifest;.config;.addin;.xshd;.wxs;.wxi;.wxl;.proj;.csproj;.vbproj;.ilproj;.build;.xfrm;.targets;.xpt;.xft;.map;.wsdl;.disco"
+			class = "ICSharpCode.XmlEditor.XmlCodeCompletionBinding"
+		/>
+	</Path>
+	
+	<Path name = "/SharpDevelop/Workbench/DisplayBindings">
+		<DisplayBinding id               = "XmlTreeView"
+		                type             = "Secondary"
+		                insertbefore     = "Text"
+		                class            = "ICSharpCode.XmlEditor.XmlDisplayBinding"/>
+	</Path>
 	
 	<!-- Xml parser used to initiate the folding update -->
-<!--	<Path name = "/Workspace/Parser">
+	<Path name = "/Workspace/Parser">
 		<Parser id = "XmlFoldingParser"
 		        supportedextensions  = ".xml;.xsl;.xslt;.xsd;.manifest;.config;.addin;.xshd;.wxs;.wxi;.wxl;.proj;.csproj;.vbproj;.ilproj;.build;.xfrm;.targets;.xpt;.xft;.map;.wsdl;.disco"
 		        class = "ICSharpCode.XmlEditor.Parser"/>
-	</Path>-->
+	</Path>
 	
 	<!-- Extra project browser icons -->
-<!--	<Path name = "/Workspace/Icons">
+	<Path name = "/Workspace/Icons">
 		<Icon id         = "ExtraXmlFileIcon"
-		      extensions = ".manifest;.config;.xshd;.wxs;.wxi;.wxl;.proj;.csproj;.vbproj;.ilproj;.xfrm;.targets;.xpt;.xft;.map;.wsdl;.disco"
+		      extensions = ".manifest;.config;.xshd;.wxs;.wxi;.wxl;.proj;.csproj;.vbproj;.ilproj;.xfrm;.targets;.xpt;.xft;.map;.wsdl;.disco;.xaml"
 		      resource   = "FileIcons.XmlIcon" />
-	</Path>-->
+	</Path>
 	
 	<!-- Xml file filter -->
-<!--	<Path name = "/SharpDevelop/Workbench/FileFilter">
+	<Path name = "/SharpDevelop/Workbench/FileFilter">
 		<FileFilter id = "Xml"
 		            insertbefore="AllFiles"
 		            name = "${res:SharpDevelop.FileFilter.XmlFiles}"
@@ -47,11 +58,19 @@
 		            insertbefore="AllFiles"
 		            name = "${res:SharpDevelop.FileFilter.XslFiles} (*.xsl;*.xslt)"
 		            extensions = "*.xsl;*.xslt"/>
-	</Path>-->
+	</Path>
 	
 	<!-- XML menu -->
-	<!--<Path name = "/SharpDevelop/Workbench/MainMenu">
-		<Condition name = "WindowActive" activewindow="ICSharpCode.XmlEditor.XmlView">
+	<Path name = "/SharpDevelop/Workbench/MainMenu">
+		<ComplexCondition>
+			<Or>
+				<Condition name = "WindowActive" activewindow="ICSharpCode.XmlEditor.XmlTreeView" />
+				<And>
+					<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditorProvider" />
+					<Condition name = "TextContent" textcontent="XML" />
+				</And>
+			</Or>
+			
 			<MenuItem id = "Xml" insertafter="View" insertbefore="Tools" label="&amp;XML" type = "Menu">
 				<MenuItem id = "CreateSchema"
 				          label = "${res:ICSharpCode.XmlEditor.CreateSchemaMenuLabel}"
@@ -69,6 +88,7 @@
 					          label="${res:ICSharpCode.XmlEditor.AssignXSLT}"
 					          class="ICSharpCode.XmlEditor.AssignStylesheetCommand"/>
 					<ComplexCondition action="Disable">
+						<!-- evaluate StylesheetAssigned only when XmlView is active - important for lazy loading! -->
 						<And>
 							<Condition name = "WindowActive" activewindow = "ICSharpCode.XmlEditor.XmlView"/>
 							<Condition name = "StylesheetAssigned" action="Disable"/>
@@ -87,11 +107,11 @@
 				          label = "${res:XML.MainMenu.EditMenu.FormatMenu}"
 				          class = "ICSharpCode.XmlEditor.FormatXmlCommand" />
 			</MenuItem>
-		</Condition>
-	</Path>-->
+		</ComplexCondition>
+	</Path>
 	
 	<!-- Right click menu -->
-	<!--<Path name = "/SharpDevelop/ViewContent/XmlEditor/ContextMenu">
+	<Path name = "/SharpDevelop/ViewContent/XmlEditor/ContextMenu">
 		<MenuItem id = "Cut"
 		          label = "${res:XML.TextAreaContextMenu.Cut}"
 		          icon = "Icons.16x16.CutIcon"
@@ -129,11 +149,11 @@
 		          shortcut = "Control|I"
 		          class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.IndentSelection" />
 		<MenuItem id = "HideXPathResults"
-			      label = "${res:ICSharpCode.XmlEditor.HideXPathResults}"
-			      class = "ICSharpCode.XmlEditor.RemoveXPathHighlightingCommand"/>
+		          label = "${res:ICSharpCode.XmlEditor.HideXPathResults}"
+		          class = "ICSharpCode.XmlEditor.RemoveXPathHighlightingCommand"/>
 		<MenuItem id = "GoToDefinition"
-			      label = "${res:ICSharpCode.NAntAddIn.GotoDefinitionMenuLabel}"
-			      class = "ICSharpCode.XmlEditor.GoToSchemaDefinitionCommand"/>
+		          label = "${res:ICSharpCode.NAntAddIn.GotoDefinitionMenuLabel}"
+		          class = "ICSharpCode.XmlEditor.GoToSchemaDefinitionCommand"/>
 		<MenuItem id = "FileMode" label = "${res:XML.TextAreaContextMenu.FileMode}" type="Menu">
 			<MenuItem id = "HighlightBuilder" type="Builder" class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.HighlightingTypeBuilder" />
 		</MenuItem>
@@ -142,10 +162,10 @@
 		          label = "${res:XML.TextAreaContextMenu.BufferOptions}"
 		          icon = "Icons.16x16.PropertiesIcon"
 		          class ="ICSharpCode.SharpDevelop.DefaultEditor.Commands.ShowBufferOptions"/>
-	</Path>-->
+	</Path>
 	
 	<!-- Options panel -->
-<!--	<Path path = "/SharpDevelop/Dialogs/OptionsDialog/TextEditorOptions">
+	<Path path = "/SharpDevelop/Dialogs/OptionsDialog/TextEditorOptions">
 		<OptionPanel id = "XmlSchemasPanel"
 		             insertafter = "Markers"
 		             label = "${res:ICSharpCode.XmlEditor.XmlSchemasPanel.Title}"
@@ -155,50 +175,50 @@
 		             insertbefore = "XmlSchemasPanel"
 		             label = "${res:ICSharpCode.XmlEditor.XmlEditorOptionsPanel.Title}"
 		             class = "ICSharpCode.XmlEditor.XmlEditorOptionsPanel" />
-	</Path>-->
+	</Path>
 	
-<!--	<Path path = "/AddIns/XmlEditor/EditActions">
+	<Path path = "/AddIns/XmlEditor/EditActions">
 		<EditAction id = "XmlCompletionPopup" class = "ICSharpCode.XmlEditor.CodeCompletionPopupCommand"  keys = "Control|Space"/>
 		<EditAction id = "GoToDefinition" class = "ICSharpCode.XmlEditor.GoToSchemaDefinitionEditAction" keys = "Control|Enter"/>
-	</Path>-->
-
+	</Path>
+	
 	<!-- XPath Query pad -->
-<!--	<Path name = "/SharpDevelop/Workbench/Pads">
-		<Pad id = "XPathQueryPad" 
+	<Path name = "/SharpDevelop/Workbench/Pads">
+		<Pad id = "XPathQueryPad"
 		     category = "Tools"
 		     icon = "PadIcons.XPathQuery"
 		     title = "${res:ICSharpCode.XmlEditor.XPathQueryPad.Title}"
 		     insertafter = "UnitTestingPad"
 		     class = "ICSharpCode.XmlEditor.XPathQueryPad"
 		     defaultPosition = "Bottom, Hidden" />
-	</Path>-->
-
+	</Path>
+	
 	<!-- Menu options to turn off XPath Query result highlighting -->
-<!--	<Path name = "/SharpDevelop/Workbench/MainMenu/Edit/Format">
+	<Path name = "/SharpDevelop/Workbench/MainMenu/Edit/Format">
 		<Condition name = "WindowActive" activewindow="ICSharpCode.XmlEditor.XmlView">
 			<MenuItem id = "RemoveXPathHighlighting"
-			          insertafter = "ShowCodeCoverage" 
+			          insertafter = "ShowCodeCoverage"
 			          label = "${res:ICSharpCode.XmlEditor.HideXPathResults}"
 			          class = "ICSharpCode.XmlEditor.RemoveXPathHighlightingCommand"/>
 		</Condition>
-	</Path>-->
-
+	</Path>
+	
 	<!-- XML Tree context menu options -->
-<!--	<Path name = "/AddIns/XmlEditor/XmlTree/AttributesGrid/ContextMenu">
+	<Path name = "/AddIns/XmlEditor/XmlTree/AttributesGrid/ContextMenu">
 		<Condition name = "Ownerstate" ownerstate="ElementSelected" action="Disable">
 			<MenuItem id = "AddAttribute"
-				label = "${res:ICSharpCode.XmlEditor.XmlTreeView.AddAttributeMenuLabel}"
-				class = "ICSharpCode.XmlEditor.AddAttributeCommand"/>
+			          label = "${res:ICSharpCode.XmlEditor.XmlTreeView.AddAttributeMenuLabel}"
+			          class = "ICSharpCode.XmlEditor.AddAttributeCommand"/>
 		</Condition>
 		<Condition name = "Ownerstate" ownerstate="AttributeSelected" action="Disable">
 			<MenuItem id = "RemoveAttribute"
-				label = "${res:ICSharpCode.XmlEditor.XmlTreeView.RemoveAttributeMenuLabel}"
-				icon = "Icons.16x16.DeleteIcon"
-				class = "ICSharpCode.XmlEditor.RemoveAttributeCommand"/>
+			          label = "${res:ICSharpCode.XmlEditor.XmlTreeView.RemoveAttributeMenuLabel}"
+			          icon = "Icons.16x16.DeleteIcon"
+			          class = "ICSharpCode.XmlEditor.RemoveAttributeCommand"/>
 		</Condition>
-	</Path>-->
-
-	<!--<Path name = "/AddIns/XmlEditor/XmlTree/ContextMenu">
+	</Path>
+	
+	<Path name = "/AddIns/XmlEditor/XmlTree/ContextMenu">
 		<MenuItem id = "Cut"
 		          label = "${res:XML.TextAreaContextMenu.Cut}"
 		          icon = "Icons.16x16.CutIcon"
@@ -230,16 +250,16 @@
 				</And>
 			</Or>
 			<MenuItem id = "InsertElementBefore"
-				label = "${res:ICSharpCode.XmlEditor.XmlTreeView.InsertElementBeforeMenuLabel}"
-				class = "ICSharpCode.XmlEditor.InsertElementBeforeCommand"/>
+			          label = "${res:ICSharpCode.XmlEditor.XmlTreeView.InsertElementBeforeMenuLabel}"
+			          class = "ICSharpCode.XmlEditor.InsertElementBeforeCommand"/>
 			<MenuItem id = "InsertElementAfter"
-				label = "${res:ICSharpCode.XmlEditor.XmlTreeView.InsertElementAfterMenuLabel}"
-				class = "ICSharpCode.XmlEditor.InsertElementAfterCommand"/>
+			          label = "${res:ICSharpCode.XmlEditor.XmlTreeView.InsertElementAfterMenuLabel}"
+			          class = "ICSharpCode.XmlEditor.InsertElementAfterCommand"/>
 		</ComplexCondition>
 		<Condition name = "Ownerstate" ownerstate = "ElementSelected" action = "Disable">
 			<MenuItem id = "AddChildElement"
-				label = "${res:ICSharpCode.XmlEditor.XmlTreeView.AddChildElementMenuLabel}"
-				class = "ICSharpCode.XmlEditor.AddChildElementCommand"/>
+			          label = "${res:ICSharpCode.XmlEditor.XmlTreeView.AddChildElementMenuLabel}"
+			          class = "ICSharpCode.XmlEditor.AddChildElementCommand"/>
 		</Condition>
 		<ComplexCondition action = "Disable">
 			<Or>
@@ -254,16 +274,16 @@
 			</Or>
 			<MenuItem id = "TextNodeCommandsSeparator" type = "Separator"/>
 			<MenuItem id = "InsertTextNodeBefore"
-				label = "${res:ICSharpCode.XmlEditor.XmlTreeView.InsertTextNodeBeforeMenuLabel}"
-				class = "ICSharpCode.XmlEditor.InsertTextNodeBeforeCommand"/>
+			          label = "${res:ICSharpCode.XmlEditor.XmlTreeView.InsertTextNodeBeforeMenuLabel}"
+			          class = "ICSharpCode.XmlEditor.InsertTextNodeBeforeCommand"/>
 			<MenuItem id = "InsertTextNodeAfter"
-				label = "${res:ICSharpCode.XmlEditor.XmlTreeView.InsertTextNodeAfterMenuLabel}"
-				class = "ICSharpCode.XmlEditor.InsertTextNodeAfterCommand"/>
-		</ComplexCondition>		
+			          label = "${res:ICSharpCode.XmlEditor.XmlTreeView.InsertTextNodeAfterMenuLabel}"
+			          class = "ICSharpCode.XmlEditor.InsertTextNodeAfterCommand"/>
+		</ComplexCondition>
 		<Condition name = "Ownerstate" ownerstate = "ElementSelected" action = "Disable">
 			<MenuItem id = "AddChildTextNode"
-				label = "${res:ICSharpCode.XmlEditor.XmlTreeView.AddChildTextNodeAfterMenuLabel}"
-				class = "ICSharpCode.XmlEditor.AddChildTextNodeCommand"/>			
+			          label = "${res:ICSharpCode.XmlEditor.XmlTreeView.AddChildTextNodeAfterMenuLabel}"
+			          class = "ICSharpCode.XmlEditor.AddChildTextNodeCommand"/>
 		</Condition>
 		<ComplexCondition action = "Disable">
 			<Or>
@@ -273,16 +293,16 @@
 			</Or>
 			<MenuItem id = "CommentNodeCommandsSeparator" type = "Separator"/>
 			<MenuItem id = "InsertCommentBefore"
-				label = "${res:ICSharpCode.XmlEditor.XmlTreeView.InsertCommentBeforeMenuLabel}"
-				class = "ICSharpCode.XmlEditor.InsertCommentBeforeCommand"/>
+			          label = "${res:ICSharpCode.XmlEditor.XmlTreeView.InsertCommentBeforeMenuLabel}"
+			          class = "ICSharpCode.XmlEditor.InsertCommentBeforeCommand"/>
 			<MenuItem id = "InsertCommentAfter"
-				label = "${res:ICSharpCode.XmlEditor.XmlTreeView.InsertCommentAfterMenuLabel}"
-				class = "ICSharpCode.XmlEditor.InsertCommentAfterCommand"/>
+			          label = "${res:ICSharpCode.XmlEditor.XmlTreeView.InsertCommentAfterMenuLabel}"
+			          class = "ICSharpCode.XmlEditor.InsertCommentAfterCommand"/>
 		</ComplexCondition>
 		<Condition name = "Ownerstate" ownerstate = "ElementSelected" action = "Disable">
 			<MenuItem id = "AddChildCommentNode"
-				label = "${res:ICSharpCode.XmlEditor.XmlTreeView.AddChildCommentMenuLabel}"
-				class = "ICSharpCode.XmlEditor.AddChildCommentCommand"/>			
+			          label = "${res:ICSharpCode.XmlEditor.XmlTreeView.AddChildCommentMenuLabel}"
+			          class = "ICSharpCode.XmlEditor.AddChildCommentCommand"/>
 		</Condition>
-	</Path>-->
+	</Path>
 </AddIn>
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.csproj b/src/AddIns/BackendBindings/XmlBinding/Project/XmlEditor.csproj
similarity index 66%
rename from src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.csproj
rename to src/AddIns/BackendBindings/XmlBinding/Project/XmlEditor.csproj
index 2f927559cd..54cd190423 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.csproj
+++ b/src/AddIns/BackendBindings/XmlBinding/Project/XmlEditor.csproj
@@ -1,149 +1,170 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
+    <ProjectGuid>{DCA2703D-250A-463E-A68A-07ED105AE6BD}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{6B717BD1-CD5E-498C-A42E-9E6A4584DC48}</ProjectGuid>
+    <OutputType>Library</OutputType>
     <RootNamespace>ICSharpCode.XmlEditor</RootNamespace>
     <AssemblyName>XmlEditor</AssemblyName>
-    <OutputType>Library</OutputType>
-    <WarningLevel>4</WarningLevel>
-    <NoStdLib>False</NoStdLib>
-    <NoConfig>False</NoConfig>
-    <RunPostBuildEvent>OnSuccessfulBuild</RunPostBuildEvent>
-    <ProductVersion>8.0.50215</ProductVersion>
-    <StartAction>Program</StartAction>
-    <StartProgram>..\..\..\..\..\bin\SharpDevelop.exe</StartProgram>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
-    <BaseAddress>110100480</BaseAddress>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <FileAlignment>4096</FileAlignment>
-    <NoWarn>0618</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <Optimize>False</Optimize>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <SourceAnalysisOverrideSettingsFile>C:\Users\Siegfried\AppData\Roaming\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-    <OutputPath>..\..\..\..\..\AddIns\AddIns\DisplayBindings\XmlEditor\</OutputPath>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <Optimize>True</Optimize>
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <OutputPath>..\..\..\..\..\AddIns\AddIns\DisplayBindings\XmlEditor\</OutputPath>
+    <NoStdLib>False</NoStdLib>
+    <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <OutputPath>..\..\..\..\..\AddIns\AddIns\BackendBindings\XmlEditor\</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <DebugType>Full</DebugType>
     <DebugSymbols>true</DebugSymbols>
+    <DebugType>Full</DebugType>
+    <Optimize>False</Optimize>
+    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <DebugSymbols>False</DebugSymbols>
     <DebugType>None</DebugType>
-    <DebugSymbols>false</DebugSymbols>
+    <Optimize>True</Optimize>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
     <DefineConstants>TRACE</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
+    <BaseAddress>4194304</BaseAddress>
+    <PlatformTarget>x86</PlatformTarget>
+    <FileAlignment>4096</FileAlignment>
+  </PropertyGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
   <ItemGroup>
+    <Reference Include="PresentationCore">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="PresentationFramework">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Core" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Data" />
+    <Reference Include="System.Data.DataSetExtensions">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Windows.Presentation">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="XmlEditor.addin">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <Compile Include="Configuration\AssemblyInfo.cs" />
+    <Compile Include="Src\AddAttributeCommand.cs" />
     <Compile Include="Src\AddChildCommentCommand.cs" />
+    <Compile Include="Src\AddChildElementCommand.cs" />
     <Compile Include="Src\AddChildTextNodeCommand.cs" />
-    <Compile Include="Src\AddXmlNodeDialog.cs" />
+    <Compile Include="Src\AddXmlNodeDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Src\AssignStylesheetCommand.cs" />
+    <Compile Include="Src\CodeCompletionPopupCommand.cs" />
+    <Compile Include="Src\CreateSchemaCommand.cs" />
+    <Compile Include="Src\EncodedStringWriter.cs" />
+    <Compile Include="Src\FormatXmlCommand.cs" />
+    <Compile Include="Src\GoToSchemaDefinitionCommand.cs" />
+    <Compile Include="Src\GoToSchemaDefinitionEditAction.cs" />
     <Compile Include="Src\IAddXmlNodeDialog.cs" />
     <Compile Include="Src\InsertCommentAfterCommand.cs" />
     <Compile Include="Src\InsertCommentBeforeCommand.cs" />
+    <Compile Include="Src\InsertElementAfterCommand.cs" />
+    <Compile Include="Src\InsertElementBeforeCommand.cs" />
     <Compile Include="Src\InsertTextNodeAfterCommand.cs" />
     <Compile Include="Src\InsertTextNodeBeforeCommand.cs" />
+    <Compile Include="Src\IXmlTreeView.cs" />
+    <Compile Include="Src\OpenStylesheetCommand.cs" />
+    <Compile Include="Src\Parser.cs" />
+    <Compile Include="Src\QualifiedName.cs" />
+    <Compile Include="Src\QualifiedNameCollection.cs" />
+    <Compile Include="Src\RemoveAttributeCommand.cs" />
+    <Compile Include="Src\RemoveXPathHighlightingCommand.cs" />
+    <Compile Include="Src\RunXslTransformCommand.cs" />
+    <Compile Include="Src\SelectXmlSchema.xaml.cs">
+      <DependentUpon>SelectXmlSchema.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Src\ValidateXmlCommand.cs" />
+    <Compile Include="Src\XmlAttributePropertyDescriptor.cs" />
+    <Compile Include="Src\XmlAttributeTypeDescriptor.cs" />
     <Compile Include="Src\XmlCharacterDataTreeNode.cs" />
+    <Compile Include="Src\XmlCodeCompletionBinding.cs" />
     <Compile Include="Src\XmlCommentTreeNode.cs" />
-    <Compile Include="Src\XmlEditorControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
     <Compile Include="Src\XmlCompletionDataProvider.cs" />
-    <Compile Include="Src\XmlCompletionData.cs" />
-    <Compile Include="Src\XmlCompletionDataImageList.cs" />
-    <Compile Include="Src\XmlParser.cs" />
-    <Compile Include="Src\XmlSchemaCompletionData.cs" />
-    <Compile Include="Src\XmlSchemaCompletionDataCollection.cs" />
-    <Compile Include="Src\XmlFoldingStrategy.cs" />
-    <Compile Include="Src\QualifiedName.cs" />
-    <Compile Include="Src\XmlElementPath.cs" />
-    <Compile Include="Src\QualifiedNameCollection.cs" />
-    <Compile Include="Src\XmlCompletionDataCollection.cs" />
+    <Compile Include="Src\XmlCompletionItem.cs" />
+    <Compile Include="Src\XmlCompletionItemCollection.cs" />
+    <Compile Include="Src\XmlCompletionItemList.cs" />
     <Compile Include="Src\XmlDisplayBinding.cs" />
-    <Compile Include="Src\XmlView.cs" />
-    <Compile Include="Src\XmlSchemaManager.cs" />
-    <Compile Include="Src\Parser.cs" />
-    <Compile Include="Src\ValidateXmlCommand.cs" />
-    <Compile Include="Src\XmlSchemasPanel.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Src\XmlSchemaListBoxItem.cs" />
     <Compile Include="Src\XmlEditorAddInOptions.cs" />
-    <Compile Include="Src\SelectXmlSchemaForm.cs">
-      <SubType>Form</SubType>
+    <Compile Include="Src\XmlEditorOptionsPanel.xaml.cs">
+      <DependentUpon>XmlEditorOptionsPanel.xaml</DependentUpon>
+      <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Src\CodeCompletionPopupCommand.cs" />
-    <Compile Include="Src\XmlSchemaAssociation.cs" />
-    <Compile Include="Src\XmlSchemaAssociationListBoxItem.cs" />
-    <Compile Include="Src\XmlEditorOptionsPanel.cs">
-      <SubType>UserControl</SubType>
+    <Compile Include="Src\XmlElementPath.cs" />
+    <Compile Include="Src\XmlElementTreeNode.cs" />
+    <Compile Include="Src\XmlEncoder.cs" />
+    <Compile Include="Src\XmlFormattingStrategy.cs">
     </Compile>
-    <Compile Include="Src\CreateSchemaCommand.cs" />
-    <Compile Include="Src\EncodedStringWriter.cs" />
-    <EmbeddedResource Include="Resources\XmlSchemasPanel.xfrm" />
-    <EmbeddedResource Include="Resources\SelectXmlSchema.xfrm" />
-    <EmbeddedResource Include="Resources\XmlEditorOptionsPanel.xfrm" />
-    <EmbeddedResource Include="Resources\XmlCommentTreeNodeIcon.png" />
-    <None Include="PostBuildEvent.proj" />
-    <None Include="XmlEditor.addin">
-      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-    </None>
-    <Compile Include="Src\RunXslTransformCommand.cs" />
-    <Compile Include="Src\XslOutputView.cs" />
-    <Compile Include="Src\AssignStylesheetCommand.cs" />
-    <Compile Include="Src\OpenStylesheetCommand.cs" />
     <Compile Include="Src\StylesheetAssignedCondition.cs" />
-    <Compile Include="..\..\..\..\Main\GlobalAssemblyInfo.cs">
-      <Link>Configuration\GlobalAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="Src\FormatXmlCommand.cs" />
-    <Compile Include="Src\XPathQueryPad.cs" />
-    <Compile Include="Src\XPathQueryControl.cs" />
+    <Compile Include="Src\XmlFoldingStrategy.cs" />
     <Compile Include="Src\XmlNamespace.cs" />
-    <Compile Include="Src\XPathNodeMatch.cs" />
-    <Compile Include="Src\XPathNodeTextMarker.cs" />
-    <Compile Include="Src\RemoveXPathHighlightingCommand.cs" />
-    <Compile Include="Src\GoToSchemaDefinitionCommand.cs" />
-    <Compile Include="Src\GoToSchemaDefinitionEditAction.cs" />
+    <Compile Include="Src\XmlParser.cs" />
+    <Compile Include="Src\XmlSchemaAssociation.cs" />
+    <Compile Include="Src\XmlSchemaAssociationListBoxItem.cs" />
+    <Compile Include="Src\XmlSchemaCompletionData.cs" />
+    <Compile Include="Src\XmlSchemaCompletionDataCollection.cs" />
+    <Compile Include="Src\XmlSchemaListBoxItem.cs" />
+    <Compile Include="Src\XmlSchemaManager.cs" />
+    <Compile Include="Src\XmlSchemasPanel.xaml.cs">
+      <DependentUpon>XmlSchemasPanel.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Src\XmlTextTreeNode.cs" />
     <Compile Include="Src\XmlTreeEditor.cs" />
-    <Compile Include="Src\IXmlTreeView.cs" />
     <Compile Include="Src\XmlTreeView.cs" />
-    <Compile Include="Src\XmlTreeViewContainerControl.cs" />
+    <Compile Include="Src\XmlTreeViewContainerControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="Src\XmlTreeViewControl.cs" />
+    <Compile Include="Src\XmlView.cs" />
+    <Compile Include="Src\XPathNodeMatch.cs" />
+    <Compile Include="Src\XPathNodeTextMarker.cs" />
+    <Compile Include="Src\XPathQueryControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Src\XPathQueryPad.cs" />
+    <Compile Include="Src\XslOutputView.cs" />
+    <EmbeddedResource Include="Resources\XmlCommentTreeNodeIcon.png" />
     <EmbeddedResource Include="Resources\XmlElementTreeNodeIcon.png" />
-    <Compile Include="Src\XmlElementTreeNode.cs" />
-    <Compile Include="Src\XmlTextTreeNode.cs" />
     <EmbeddedResource Include="Resources\XmlTextTreeNodeIcon.png" />
-    <Compile Include="Src\XmlAttributePropertyDescriptor.cs" />
-    <Compile Include="Src\XmlAttributeTypeDescriptor.cs" />
-    <Compile Include="Src\XmlEncoder.cs" />
-    <Compile Include="Src\AddAttributeCommand.cs" />
-    <Compile Include="Src\RemoveAttributeCommand.cs" />
-    <Compile Include="Src\AddChildElementCommand.cs" />
-    <Compile Include="Src\InsertElementBeforeCommand.cs" />
-    <Compile Include="Src\InsertElementAfterCommand.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Page Include="Src\SelectXmlSchema.xaml" />
+    <Page Include="Src\XmlEditorOptionsPanel.xaml" />
+    <Page Include="Src\XmlSchemasPanel.xaml" />
+    <ProjectReference Include="..\..\..\..\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj">
+      <Project>{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}</Project>
+      <Name>ICSharpCode.AvalonEdit</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">
       <Project>{2748AD25-9C63-4E12-877B-4DCE96FBED54}</Project>
       <Name>ICSharpCode.SharpDevelop</Name>
@@ -154,9 +175,9 @@
       <Name>ICSharpCode.Core</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj">
-      <Project>{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}</Project>
-      <Name>ICSharpCode.TextEditor</Name>
+    <ProjectReference Include="..\..\..\..\Main\ICSharpCode.Core.Presentation\ICSharpCode.Core.Presentation.csproj">
+      <Project>{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}</Project>
+      <Name>ICSharpCode.Core.Presentation</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\..\Main\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj">
@@ -170,6 +191,4 @@
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
-  <Import Project="PostBuildEvent.proj" />
 </Project>
\ No newline at end of file
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/AssemblyInfo.cs b/src/AddIns/BackendBindings/XmlBinding/Test/AssemblyInfo.cs
similarity index 96%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/AssemblyInfo.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/AssemblyInfo.cs
index f2a377273b..a55649487f 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/AssemblyInfo.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 984 $</version>
 // </file>
 
 using System.Reflection;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Completion/FirstCompletionListItemSelectedTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Completion/FirstCompletionListItemSelectedTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Completion/FirstCompletionListItemSelectedTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Completion/FirstCompletionListItemSelectedTestFixture.cs
index ccc3c11424..f7f1852278 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Completion/FirstCompletionListItemSelectedTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Completion/FirstCompletionListItemSelectedTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 3490 $</version>
 // </file>
 
 using System;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Completion/ProcessKeyTests.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Completion/ProcessKeyTests.cs
similarity index 96%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Completion/ProcessKeyTests.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Completion/ProcessKeyTests.cs
index 127f160c9a..a9a8b7c794 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Completion/ProcessKeyTests.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Completion/ProcessKeyTests.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2760 $</version>
 // </file>
 
 using System;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/FindSchemaObject/AttributeGroupReferenceSelectedTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/FindSchemaObject/AttributeGroupReferenceSelectedTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/FindSchemaObject/AttributeGroupReferenceSelectedTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/FindSchemaObject/AttributeGroupReferenceSelectedTestFixture.cs
index caf23d41d1..e17856b0ab 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/FindSchemaObject/AttributeGroupReferenceSelectedTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/FindSchemaObject/AttributeGroupReferenceSelectedTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 1683 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/FindSchemaObject/AttributeReferenceSelectedTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/FindSchemaObject/AttributeReferenceSelectedTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/FindSchemaObject/AttributeReferenceSelectedTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/FindSchemaObject/AttributeReferenceSelectedTestFixture.cs
index 6634dbb058..e7d751b27c 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/FindSchemaObject/AttributeReferenceSelectedTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/FindSchemaObject/AttributeReferenceSelectedTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 1683 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/FindSchemaObject/AttributeSelectedTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/FindSchemaObject/AttributeSelectedTestFixture.cs
similarity index 97%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/FindSchemaObject/AttributeSelectedTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/FindSchemaObject/AttributeSelectedTestFixture.cs
index 5550730b28..15527ce9cb 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/FindSchemaObject/AttributeSelectedTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/FindSchemaObject/AttributeSelectedTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 1683 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/FindSchemaObject/AttributeTypeSelectedTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/FindSchemaObject/AttributeTypeSelectedTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/FindSchemaObject/AttributeTypeSelectedTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/FindSchemaObject/AttributeTypeSelectedTestFixture.cs
index fa721e334d..ef7c6c977a 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/FindSchemaObject/AttributeTypeSelectedTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/FindSchemaObject/AttributeTypeSelectedTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 1683 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/FindSchemaObject/ElementReferenceSelectedTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/FindSchemaObject/ElementReferenceSelectedTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/FindSchemaObject/ElementReferenceSelectedTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/FindSchemaObject/ElementReferenceSelectedTestFixture.cs
index f57196c8c3..7369e4643d 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/FindSchemaObject/ElementReferenceSelectedTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/FindSchemaObject/ElementReferenceSelectedTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 1683 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/FindSchemaObject/ElementReferenceWithPrefixSelectedTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/FindSchemaObject/ElementReferenceWithPrefixSelectedTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/FindSchemaObject/ElementReferenceWithPrefixSelectedTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/FindSchemaObject/ElementReferenceWithPrefixSelectedTestFixture.cs
index 07a886cbae..ba1e592423 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/FindSchemaObject/ElementReferenceWithPrefixSelectedTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/FindSchemaObject/ElementReferenceWithPrefixSelectedTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 1683 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/FindSchemaObject/ElementSelectedTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/FindSchemaObject/ElementSelectedTestFixture.cs
similarity index 97%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/FindSchemaObject/ElementSelectedTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/FindSchemaObject/ElementSelectedTestFixture.cs
index 9c4bb0d657..ebd8351c71 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/FindSchemaObject/ElementSelectedTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/FindSchemaObject/ElementSelectedTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 1683 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/FindSchemaObject/ElementTypeSelectedTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/FindSchemaObject/ElementTypeSelectedTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/FindSchemaObject/ElementTypeSelectedTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/FindSchemaObject/ElementTypeSelectedTestFixture.cs
index adf4f8ba49..d4a047a609 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/FindSchemaObject/ElementTypeSelectedTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/FindSchemaObject/ElementTypeSelectedTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 1683 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/FindSchemaObject/ElementTypeWithPrefixSelectedTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/FindSchemaObject/ElementTypeWithPrefixSelectedTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/FindSchemaObject/ElementTypeWithPrefixSelectedTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/FindSchemaObject/ElementTypeWithPrefixSelectedTestFixture.cs
index c6cdfae403..1464727ccc 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/FindSchemaObject/ElementTypeWithPrefixSelectedTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/FindSchemaObject/ElementTypeWithPrefixSelectedTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 1683 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/FindSchemaObject/GroupReferenceSelectedTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/FindSchemaObject/GroupReferenceSelectedTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/FindSchemaObject/GroupReferenceSelectedTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/FindSchemaObject/GroupReferenceSelectedTestFixture.cs
index 3aaf71ed54..3fa43a15c5 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/FindSchemaObject/GroupReferenceSelectedTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/FindSchemaObject/GroupReferenceSelectedTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 1683 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Parser/ActiveElementStartPathTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Parser/ActiveElementStartPathTestFixture.cs
similarity index 99%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Parser/ActiveElementStartPathTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Parser/ActiveElementStartPathTestFixture.cs
index 8ad5f07d7c..1db31b8c1f 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Parser/ActiveElementStartPathTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Parser/ActiveElementStartPathTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 3003 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Parser/ActiveElementUnderCursorTests.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Parser/ActiveElementUnderCursorTests.cs
similarity index 99%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Parser/ActiveElementUnderCursorTests.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Parser/ActiveElementUnderCursorTests.cs
index 30cd306811..4fee409cac 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Parser/ActiveElementUnderCursorTests.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Parser/ActiveElementUnderCursorTests.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 3951 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Parser/AttributeNameTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Parser/AttributeNameTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Parser/AttributeNameTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Parser/AttributeNameTestFixture.cs
index bde890ed25..1b9f529b1b 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Parser/AttributeNameTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Parser/AttributeNameTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 3969 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Parser/AttributeNameUnderCursorTests.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Parser/AttributeNameUnderCursorTests.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Parser/AttributeNameUnderCursorTests.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Parser/AttributeNameUnderCursorTests.cs
index 7661aa54e1..a84fbbdbff 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Parser/AttributeNameUnderCursorTests.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Parser/AttributeNameUnderCursorTests.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2571 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Parser/AttributeValueUnderCursorTests.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Parser/AttributeValueUnderCursorTests.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Parser/AttributeValueUnderCursorTests.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Parser/AttributeValueUnderCursorTests.cs
index 22b00ee838..27081ba8ca 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Parser/AttributeValueUnderCursorTests.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Parser/AttributeValueUnderCursorTests.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 3977 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Parser/InsideAttributeValueTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Parser/InsideAttributeValueTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Parser/InsideAttributeValueTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Parser/InsideAttributeValueTestFixture.cs
index f093ae92a3..6b545f7700 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Parser/InsideAttributeValueTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Parser/InsideAttributeValueTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 3969 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Parser/NamespaceDeclarationTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Parser/NamespaceDeclarationTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Parser/NamespaceDeclarationTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Parser/NamespaceDeclarationTestFixture.cs
index 9d8410171e..2877a54841 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Parser/NamespaceDeclarationTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Parser/NamespaceDeclarationTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 3969 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Parser/ParentElementPathTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Parser/ParentElementPathTestFixture.cs
similarity index 97%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Parser/ParentElementPathTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Parser/ParentElementPathTestFixture.cs
index 4b353c94d8..fc34df6957 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Parser/ParentElementPathTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Parser/ParentElementPathTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 1683 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Parser/QualifiedNameTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Parser/QualifiedNameTestFixture.cs
similarity index 97%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Parser/QualifiedNameTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Parser/QualifiedNameTestFixture.cs
index b084d0e7e0..5b96b3866f 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Parser/QualifiedNameTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Parser/QualifiedNameTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2111 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Parser/XamlMixedNamespaceTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Parser/XamlMixedNamespaceTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Parser/XamlMixedNamespaceTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Parser/XamlMixedNamespaceTestFixture.cs
index ecebeb80eb..14f1d73d7c 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Parser/XamlMixedNamespaceTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Parser/XamlMixedNamespaceTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2752 $</version>
 // </file>
 
 using System;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Paths/NoElementPathTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Paths/NoElementPathTestFixture.cs
similarity index 97%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Paths/NoElementPathTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Paths/NoElementPathTestFixture.cs
index 972c6e04f4..dfba1d5cf0 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Paths/NoElementPathTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Paths/NoElementPathTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2752 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Paths/QualifiedNameToStringTests.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Paths/QualifiedNameToStringTests.cs
similarity index 97%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Paths/QualifiedNameToStringTests.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Paths/QualifiedNameToStringTests.cs
index 902fd5a9e5..b49283871a 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Paths/QualifiedNameToStringTests.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Paths/QualifiedNameToStringTests.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2752 $</version>
 // </file>
 
 using System;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Paths/SingleElementPathTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Paths/SingleElementPathTestFixture.cs
similarity index 97%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Paths/SingleElementPathTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Paths/SingleElementPathTestFixture.cs
index e200f15c75..3f22a9a14d 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Paths/SingleElementPathTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Paths/SingleElementPathTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2752 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Paths/TwoElementPathTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Paths/TwoElementPathTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Paths/TwoElementPathTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Paths/TwoElementPathTestFixture.cs
index 49d9762e9a..ef2f999689 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Paths/TwoElementPathTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Paths/TwoElementPathTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2752 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Resources/XMLSchema.xsd b/src/AddIns/BackendBindings/XmlBinding/Test/Resources/XMLSchema.xsd
similarity index 100%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Resources/XMLSchema.xsd
rename to src/AddIns/BackendBindings/XmlBinding/Test/Resources/XMLSchema.xsd
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Resources/xhtml1-strict-modified.xsd b/src/AddIns/BackendBindings/XmlBinding/Test/Resources/xhtml1-strict-modified.xsd
similarity index 100%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Resources/xhtml1-strict-modified.xsd
rename to src/AddIns/BackendBindings/XmlBinding/Test/Resources/xhtml1-strict-modified.xsd
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema.Includes/AttributeGroupRefSchemaIncludeTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Schema.Includes/AttributeGroupRefSchemaIncludeTestFixture.cs
similarity index 96%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Schema.Includes/AttributeGroupRefSchemaIncludeTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Schema.Includes/AttributeGroupRefSchemaIncludeTestFixture.cs
index 6646e82169..26791101bc 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema.Includes/AttributeGroupRefSchemaIncludeTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Schema.Includes/AttributeGroupRefSchemaIncludeTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 915 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema.Includes/TwoElementSchemaIncludeTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Schema.Includes/TwoElementSchemaIncludeTestFixture.cs
similarity index 96%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Schema.Includes/TwoElementSchemaIncludeTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Schema.Includes/TwoElementSchemaIncludeTestFixture.cs
index 6a73b5c594..bfb338925b 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema.Includes/TwoElementSchemaIncludeTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Schema.Includes/TwoElementSchemaIncludeTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 915 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema.Uri/GetUriTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Schema.Uri/GetUriTestFixture.cs
similarity index 96%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Schema.Uri/GetUriTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Schema.Uri/GetUriTestFixture.cs
index e5a8c7d0f2..fa20182732 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema.Uri/GetUriTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Schema.Uri/GetUriTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 915 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/AbstractElementTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/AbstractElementTestFixture.cs
similarity index 99%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Schema/AbstractElementTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Schema/AbstractElementTestFixture.cs
index 1d07fa3dfe..e410c4604b 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/AbstractElementTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/AbstractElementTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 915 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/AllElementTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/AllElementTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Schema/AllElementTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Schema/AllElementTestFixture.cs
index 0fb2ec2593..c0c2c3c7df 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/AllElementTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/AllElementTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 1388 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/AttributeAnnotationTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/AttributeAnnotationTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Schema/AttributeAnnotationTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Schema/AttributeAnnotationTestFixture.cs
index bc00395f8c..f7911188d6 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/AttributeAnnotationTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/AttributeAnnotationTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 915 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/AttributeGroupRefTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/AttributeGroupRefTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Schema/AttributeGroupRefTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Schema/AttributeGroupRefTestFixture.cs
index 464f1d221f..3b4ab5243f 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/AttributeGroupRefTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/AttributeGroupRefTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 915 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/AttributeRefTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/AttributeRefTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Schema/AttributeRefTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Schema/AttributeRefTestFixture.cs
index 74542d2f80..4c2a3fbfa1 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/AttributeRefTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/AttributeRefTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 915 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/AttributeValueAnnotationTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/AttributeValueAnnotationTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Schema/AttributeValueAnnotationTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Schema/AttributeValueAnnotationTestFixture.cs
index 42c0ab30d6..f7132a849f 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/AttributeValueAnnotationTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/AttributeValueAnnotationTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 915 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/ChildElementAttributesTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/ChildElementAttributesTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Schema/ChildElementAttributesTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Schema/ChildElementAttributesTestFixture.cs
index 179b0ae863..6df5a7019a 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/ChildElementAttributesTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/ChildElementAttributesTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 915 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/ChoiceTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/ChoiceTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Schema/ChoiceTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Schema/ChoiceTestFixture.cs
index b2fef4badb..f174a24a70 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/ChoiceTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/ChoiceTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 915 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/ComplexContentExtensionTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/ComplexContentExtensionTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Schema/ComplexContentExtensionTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Schema/ComplexContentExtensionTestFixture.cs
index ff7a92b1c2..8e76c6736f 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/ComplexContentExtensionTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/ComplexContentExtensionTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 915 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/DuplicateElementTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/DuplicateElementTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Schema/DuplicateElementTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Schema/DuplicateElementTestFixture.cs
index be84548def..72a43927d3 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/DuplicateElementTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/DuplicateElementTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 915 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/ElementAnnotationTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/ElementAnnotationTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Schema/ElementAnnotationTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Schema/ElementAnnotationTestFixture.cs
index 0cec872b05..e005bd5f76 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/ElementAnnotationTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/ElementAnnotationTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 915 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/ElementRefAnnotationTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/ElementRefAnnotationTestFixture.cs
similarity index 97%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Schema/ElementRefAnnotationTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Schema/ElementRefAnnotationTestFixture.cs
index 74b04427e1..a69920bf82 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/ElementRefAnnotationTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/ElementRefAnnotationTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 915 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/ElementWithAttributeSchemaTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/ElementWithAttributeSchemaTestFixture.cs
similarity index 97%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Schema/ElementWithAttributeSchemaTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Schema/ElementWithAttributeSchemaTestFixture.cs
index 892cae70ed..26cadef91f 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/ElementWithAttributeSchemaTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/ElementWithAttributeSchemaTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 915 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/EnumAttributeValueTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/EnumAttributeValueTestFixture.cs
similarity index 97%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Schema/EnumAttributeValueTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Schema/EnumAttributeValueTestFixture.cs
index 7da801a883..c74211beb0 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/EnumAttributeValueTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/EnumAttributeValueTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 915 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/ExtensionElementTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/ExtensionElementTestFixture.cs
similarity index 99%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Schema/ExtensionElementTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Schema/ExtensionElementTestFixture.cs
index e1fb79bb49..2ed0bf8689 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/ExtensionElementTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/ExtensionElementTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 915 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/FindAttributeFromComplexTypeTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/FindAttributeFromComplexTypeTestFixture.cs
similarity index 97%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Schema/FindAttributeFromComplexTypeTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Schema/FindAttributeFromComplexTypeTestFixture.cs
index ea508cf828..11f8760f4a 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/FindAttributeFromComplexTypeTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/FindAttributeFromComplexTypeTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 1683 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/GetSchemaFromFileNameTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/GetSchemaFromFileNameTestFixture.cs
similarity index 97%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Schema/GetSchemaFromFileNameTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Schema/GetSchemaFromFileNameTestFixture.cs
index c039808216..477bde265d 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/GetSchemaFromFileNameTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/GetSchemaFromFileNameTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 1683 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/GroupRefCompositorTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/GroupRefCompositorTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Schema/GroupRefCompositorTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Schema/GroupRefCompositorTestFixture.cs
index 4741c91bb5..f2c2c5373d 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/GroupRefCompositorTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/GroupRefCompositorTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 915 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/GroupRefTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/GroupRefTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Schema/GroupRefTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Schema/GroupRefTestFixture.cs
index 6558c563c2..bcf6fe041f 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/GroupRefTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/GroupRefTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 915 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/MissingSchemaElementTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/MissingSchemaElementTestFixture.cs
similarity index 97%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Schema/MissingSchemaElementTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Schema/MissingSchemaElementTestFixture.cs
index 0d1bd9938b..8683cb73a7 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/MissingSchemaElementTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/MissingSchemaElementTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 1228 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/NamespaceCompletionTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/NamespaceCompletionTestFixture.cs
similarity index 97%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Schema/NamespaceCompletionTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Schema/NamespaceCompletionTestFixture.cs
index 5ac8bcf718..854ec7963d 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/NamespaceCompletionTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/NamespaceCompletionTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 915 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/NestedAttributeGroupRefTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/NestedAttributeGroupRefTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Schema/NestedAttributeGroupRefTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Schema/NestedAttributeGroupRefTestFixture.cs
index 6aa242a159..93655c8c48 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/NestedAttributeGroupRefTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/NestedAttributeGroupRefTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 915 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/NestedChoiceTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/NestedChoiceTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Schema/NestedChoiceTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Schema/NestedChoiceTestFixture.cs
index 87f25dbcb3..2edb52b923 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/NestedChoiceTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/NestedChoiceTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 915 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/NestedElementSchemaTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/NestedElementSchemaTestFixture.cs
similarity index 97%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Schema/NestedElementSchemaTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Schema/NestedElementSchemaTestFixture.cs
index 9ae9da3d27..e319622399 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/NestedElementSchemaTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/NestedElementSchemaTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 915 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/NestedSequenceTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/NestedSequenceTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Schema/NestedSequenceTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Schema/NestedSequenceTestFixture.cs
index f9e879be22..77c62e34b3 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/NestedSequenceTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/NestedSequenceTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 915 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/ReferencedElementsTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/ReferencedElementsTestFixture.cs
similarity index 99%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Schema/ReferencedElementsTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Schema/ReferencedElementsTestFixture.cs
index c4af4faab7..ced55e74b3 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/ReferencedElementsTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/ReferencedElementsTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 915 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/RestrictionElementTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/RestrictionElementTestFixture.cs
similarity index 99%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Schema/RestrictionElementTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Schema/RestrictionElementTestFixture.cs
index 70919f2ba5..c5c454154d 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/RestrictionElementTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/RestrictionElementTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 915 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/SchemaTestFixtureBase.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/SchemaTestFixtureBase.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Schema/SchemaTestFixtureBase.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Schema/SchemaTestFixtureBase.cs
index c72efbf164..d9b9c70a49 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/SchemaTestFixtureBase.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/SchemaTestFixtureBase.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 1683 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/SequencedChoiceTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/SequencedChoiceTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Schema/SequencedChoiceTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Schema/SequencedChoiceTestFixture.cs
index a58ec9bc4e..3604150944 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/SequencedChoiceTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/SequencedChoiceTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 915 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/SimpleContentWithAttributeTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/SimpleContentWithAttributeTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Schema/SimpleContentWithAttributeTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Schema/SimpleContentWithAttributeTestFixture.cs
index 0837817736..04d34d3c79 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/SimpleContentWithAttributeTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/SimpleContentWithAttributeTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 915 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/SingleElementSchemaTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/SingleElementSchemaTestFixture.cs
similarity index 97%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Schema/SingleElementSchemaTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Schema/SingleElementSchemaTestFixture.cs
index a129bfd4d6..c46f766005 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/SingleElementSchemaTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/SingleElementSchemaTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 915 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/TwoElementSchemaTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/TwoElementSchemaTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Schema/TwoElementSchemaTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Schema/TwoElementSchemaTestFixture.cs
index 0bfd93c7f6..b6aaacdf47 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/TwoElementSchemaTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/TwoElementSchemaTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 915 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/XhtmlStrictSchemaTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/XhtmlStrictSchemaTestFixture.cs
similarity index 97%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Schema/XhtmlStrictSchemaTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Schema/XhtmlStrictSchemaTestFixture.cs
index badb92fd18..f8c7bffaf6 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/XhtmlStrictSchemaTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/XhtmlStrictSchemaTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 915 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/XmlSchemaNamespaceTests.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/XmlSchemaNamespaceTests.cs
similarity index 95%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Schema/XmlSchemaNamespaceTests.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Schema/XmlSchemaNamespaceTests.cs
index 62adfb5cec..eb77559fa6 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/XmlSchemaNamespaceTests.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/XmlSchemaNamespaceTests.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 1683 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/XsdSchemaTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/XsdSchemaTestFixture.cs
similarity index 99%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Schema/XsdSchemaTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Schema/XsdSchemaTestFixture.cs
index 8cac5bfbda..0ac963e317 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Schema/XsdSchemaTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Schema/XsdSchemaTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 1334 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/AddAttributeTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/AddAttributeTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/AddAttributeTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/AddAttributeTestFixture.cs
index 3af9b7b96e..6bcd634d75 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/AddAttributeTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/AddAttributeTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 1924 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/AddChildElementTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/AddChildElementTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/AddChildElementTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/AddChildElementTestFixture.cs
index 94653dd0f8..bbac6c98bc 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/AddChildElementTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/AddChildElementTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2128 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/AddChildTextNodeTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/AddChildTextNodeTestFixture.cs
similarity index 97%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/AddChildTextNodeTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/AddChildTextNodeTestFixture.cs
index 7f1f586926..252c153a51 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/AddChildTextNodeTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/AddChildTextNodeTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 4058 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/AddElementsToTreeControlTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/AddElementsToTreeControlTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/AddElementsToTreeControlTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/AddElementsToTreeControlTestFixture.cs
index 402a9ecf95..41eda383e8 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/AddElementsToTreeControlTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/AddElementsToTreeControlTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2111 $</version>
 // </file>
 
 using ICSharpCode.SharpDevelop.Gui;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/AddNewNodeDialogTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/AddNewNodeDialogTestFixture.cs
similarity index 99%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/AddNewNodeDialogTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/AddNewNodeDialogTestFixture.cs
index 67f8ec0b3a..2ba19b3d54 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/AddNewNodeDialogTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/AddNewNodeDialogTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 3288 $</version>
 // </file>
 
 using System;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/AttributeChangedTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/AttributeChangedTestFixture.cs
similarity index 95%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/AttributeChangedTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/AttributeChangedTestFixture.cs
index 54ad9a2b89..54eb94801c 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/AttributeChangedTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/AttributeChangedTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2128 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/DeleteTreeNodeWithDeleteKeyTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/DeleteTreeNodeWithDeleteKeyTestFixture.cs
similarity index 95%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/DeleteTreeNodeWithDeleteKeyTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/DeleteTreeNodeWithDeleteKeyTestFixture.cs
index d35f23bb9f..02a405342b 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/DeleteTreeNodeWithDeleteKeyTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/DeleteTreeNodeWithDeleteKeyTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2164 $</version>
 // </file>
 
 using System;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/DocumentElementOnlyTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/DocumentElementOnlyTestFixture.cs
similarity index 95%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/DocumentElementOnlyTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/DocumentElementOnlyTestFixture.cs
index 2025755b7a..1edf797a4d 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/DocumentElementOnlyTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/DocumentElementOnlyTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2128 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/EditCommentNodesInTreeControlTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/EditCommentNodesInTreeControlTestFixture.cs
similarity index 99%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/EditCommentNodesInTreeControlTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/EditCommentNodesInTreeControlTestFixture.cs
index c984a78760..48ea95c999 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/EditCommentNodesInTreeControlTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/EditCommentNodesInTreeControlTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 4058 $</version>
 // </file>
 
 using System;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/EditCommentNodesTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/EditCommentNodesTestFixture.cs
similarity index 99%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/EditCommentNodesTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/EditCommentNodesTestFixture.cs
index 0240b35db7..06e5c6f4f5 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/EditCommentNodesTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/EditCommentNodesTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 4058 $</version>
 // </file>
 
 using System;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/ExpandChildNodesInTreeControlTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/ExpandChildNodesInTreeControlTestFixture.cs
similarity index 99%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/ExpandChildNodesInTreeControlTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/ExpandChildNodesInTreeControlTestFixture.cs
index 2e68e20fed..1bd883584c 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/ExpandChildNodesInTreeControlTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/ExpandChildNodesInTreeControlTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2128 $</version>
 // </file>
 
 using ICSharpCode.SharpDevelop.Gui;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/ExplicitNamespaceTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/ExplicitNamespaceTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/ExplicitNamespaceTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/ExplicitNamespaceTestFixture.cs
index 93d4385db5..1d654f32b6 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/ExplicitNamespaceTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/ExplicitNamespaceTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2128 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/GetXmlAttributePropertyDescriptorTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/GetXmlAttributePropertyDescriptorTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/GetXmlAttributePropertyDescriptorTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/GetXmlAttributePropertyDescriptorTestFixture.cs
index 11d1c1fd8d..8c8b89e1e6 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/GetXmlAttributePropertyDescriptorTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/GetXmlAttributePropertyDescriptorTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2111 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/InsertElementAfterTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/InsertElementAfterTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/InsertElementAfterTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/InsertElementAfterTestFixture.cs
index ae79afdf3d..f1999394d9 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/InsertElementAfterTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/InsertElementAfterTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 1929 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/InsertElementBeforeTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/InsertElementBeforeTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/InsertElementBeforeTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/InsertElementBeforeTestFixture.cs
index 88c65b87ff..0210d1dd28 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/InsertElementBeforeTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/InsertElementBeforeTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 1929 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/InsertTextNodeAfterTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/InsertTextNodeAfterTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/InsertTextNodeAfterTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/InsertTextNodeAfterTestFixture.cs
index 0415d0a67e..9fe5bd1b35 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/InsertTextNodeAfterTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/InsertTextNodeAfterTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 4058 $</version>
 // </file>
 
 using System;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/InsertTextNodeBeforeTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/InsertTextNodeBeforeTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/InsertTextNodeBeforeTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/InsertTextNodeBeforeTestFixture.cs
index 5cadefefe5..77b40fb81d 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/InsertTextNodeBeforeTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/InsertTextNodeBeforeTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 4058 $</version>
 // </file>
 
 using System;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/LoadXmlFileWithMissingDtdFileRefTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/LoadXmlFileWithMissingDtdFileRefTestFixture.cs
similarity index 97%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/LoadXmlFileWithMissingDtdFileRefTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/LoadXmlFileWithMissingDtdFileRefTestFixture.cs
index bce55e439d..7e25e8a912 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/LoadXmlFileWithMissingDtdFileRefTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/LoadXmlFileWithMissingDtdFileRefTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 3908 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/MenuCommandsTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/MenuCommandsTestFixture.cs
similarity index 99%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/MenuCommandsTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/MenuCommandsTestFixture.cs
index b0c5aef12d..24f68d5faf 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/MenuCommandsTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/MenuCommandsTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2164 $</version>
 // </file>
 
 using System;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/MouseDownTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/MouseDownTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/MouseDownTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/MouseDownTestFixture.cs
index 0d24a0bf3c..98c93b564c 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/MouseDownTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/MouseDownTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2111 $</version>
 // </file>
 
 using System;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/NoMatchingSchemaTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/NoMatchingSchemaTestFixture.cs
similarity index 97%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/NoMatchingSchemaTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/NoMatchingSchemaTestFixture.cs
index 5f90519277..a00c16f7b7 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/NoMatchingSchemaTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/NoMatchingSchemaTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2128 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/OwnerStatusTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/OwnerStatusTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/OwnerStatusTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/OwnerStatusTestFixture.cs
index f2638e3b52..fa7b23c6d9 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/OwnerStatusTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/OwnerStatusTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2128 $</version>
 // </file>
 
 using System;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/PasteInTreeControlTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/PasteInTreeControlTestFixture.cs
similarity index 99%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/PasteInTreeControlTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/PasteInTreeControlTestFixture.cs
index c1736a8894..3c32b1bec5 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/PasteInTreeControlTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/PasteInTreeControlTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2164 $</version>
 // </file>
 
 using System;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/PasteTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/PasteTestFixture.cs
similarity index 99%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/PasteTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/PasteTestFixture.cs
index 50788a10ed..f8e4cfbefb 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/PasteTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/PasteTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2229 $</version>
 // </file>
 
 using System;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/RemoveAttributeTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/RemoveAttributeTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/RemoveAttributeTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/RemoveAttributeTestFixture.cs
index 6f0ca7c9ab..893a10154f 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/RemoveAttributeTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/RemoveAttributeTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 1924 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/RemoveElementTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/RemoveElementTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/RemoveElementTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/RemoveElementTestFixture.cs
index aa59b335cf..383ebe6c1d 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/RemoveElementTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/RemoveElementTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2164 $</version>
 // </file>
 
 using System;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/RemoveElementsFromTreeControlTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/RemoveElementsFromTreeControlTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/RemoveElementsFromTreeControlTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/RemoveElementsFromTreeControlTestFixture.cs
index 249941cb03..b801c4be43 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/RemoveElementsFromTreeControlTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/RemoveElementsFromTreeControlTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2111 $</version>
 // </file>
 
 using System;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/RemoveTextNodeTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/RemoveTextNodeTestFixture.cs
similarity index 97%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/RemoveTextNodeTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/RemoveTextNodeTestFixture.cs
index f712e5b625..5be9e29c50 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/RemoveTextNodeTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/RemoveTextNodeTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2164 $</version>
 // </file>
 
 using System;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/RemoveTextNodesFromTreeControlTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/RemoveTextNodesFromTreeControlTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/RemoveTextNodesFromTreeControlTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/RemoveTextNodesFromTreeControlTestFixture.cs
index dc9a2f3a74..101efb50f5 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/RemoveTextNodesFromTreeControlTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/RemoveTextNodesFromTreeControlTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2111 $</version>
 // </file>
 
 using System;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/RootNodeAddedToTreeControlTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/RootNodeAddedToTreeControlTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/RootNodeAddedToTreeControlTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/RootNodeAddedToTreeControlTestFixture.cs
index 7d66200d97..8153053c0f 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/RootNodeAddedToTreeControlTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/RootNodeAddedToTreeControlTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2128 $</version>
 // </file>
 
 using ICSharpCode.SharpDevelop.Gui;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/TextBoxTextChangedBeforeEditorLoadedTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/TextBoxTextChangedBeforeEditorLoadedTestFixture.cs
similarity index 95%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/TextBoxTextChangedBeforeEditorLoadedTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/TextBoxTextChangedBeforeEditorLoadedTestFixture.cs
index 2488e1b1b2..304dbd9735 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/TextBoxTextChangedBeforeEditorLoadedTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/TextBoxTextChangedBeforeEditorLoadedTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 3623 $</version>
 // </file>
 
 using System;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/TextNodeTextChangedTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/TextNodeTextChangedTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/TextNodeTextChangedTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/TextNodeTextChangedTestFixture.cs
index c95d0d3663..30af6f5c66 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/TextNodeTextChangedTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/TextNodeTextChangedTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2128 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/TreeControlViewStateTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/TreeControlViewStateTestFixture.cs
similarity index 97%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/TreeControlViewStateTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/TreeControlViewStateTestFixture.cs
index 055880f42e..e77da756cd 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/TreeControlViewStateTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/TreeControlViewStateTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2741 $</version>
 // </file>
 
 using ICSharpCode.Core;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/ViewInvalidXmlDocumentTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/ViewInvalidXmlDocumentTestFixture.cs
similarity index 95%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/ViewInvalidXmlDocumentTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/ViewInvalidXmlDocumentTestFixture.cs
index 7031bf6663..b41dae504e 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/ViewInvalidXmlDocumentTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/ViewInvalidXmlDocumentTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 1797 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlAttributeTypeDescriptorTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/XmlAttributeTypeDescriptorTestFixture.cs
similarity index 97%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlAttributeTypeDescriptorTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/XmlAttributeTypeDescriptorTestFixture.cs
index 6a6f4ed02e..744d77ed4a 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlAttributeTypeDescriptorTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/XmlAttributeTypeDescriptorTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2111 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlCommentTreeNodeTests.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/XmlCommentTreeNodeTests.cs
similarity index 97%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlCommentTreeNodeTests.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/XmlCommentTreeNodeTests.cs
index 656a584dc2..62787304ec 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlCommentTreeNodeTests.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/XmlCommentTreeNodeTests.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2164 $</version>
 // </file>
 
 using System;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlElementSelectedTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/XmlElementSelectedTestFixture.cs
similarity index 97%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlElementSelectedTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/XmlElementSelectedTestFixture.cs
index 953492ff74..9f3e544897 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlElementSelectedTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/XmlElementSelectedTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2128 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlElementTreeNodeTests.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/XmlElementTreeNodeTests.cs
similarity index 96%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlElementTreeNodeTests.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/XmlElementTreeNodeTests.cs
index 1c8c3e406a..848ffcc6af 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlElementTreeNodeTests.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/XmlElementTreeNodeTests.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 1797 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlTextSelectedTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/XmlTextSelectedTestFixture.cs
similarity index 96%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlTextSelectedTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/XmlTextSelectedTestFixture.cs
index 7e5b5854c4..9263ad034c 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlTextSelectedTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/XmlTextSelectedTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2128 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlTextTreeNodeTextTests.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/XmlTextTreeNodeTextTests.cs
similarity index 97%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlTextTreeNodeTextTests.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/XmlTextTreeNodeTextTests.cs
index 3bf721037d..89401953df 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlTextTreeNodeTextTests.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/XmlTextTreeNodeTextTests.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2164 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlTreeViewClipboardHandlerTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/XmlTreeViewClipboardHandlerTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlTreeViewClipboardHandlerTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/XmlTreeViewClipboardHandlerTestFixture.cs
index 77ea7b3a32..8c50dab8df 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlTreeViewClipboardHandlerTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/XmlTreeViewClipboardHandlerTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 4018 $</version>
 // </file>
 
 using System;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlTreeViewContainerTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/XmlTreeViewContainerTestFixture.cs
similarity index 99%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlTreeViewContainerTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/XmlTreeViewContainerTestFixture.cs
index a028906165..66549653d4 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlTreeViewContainerTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/XmlTreeViewContainerTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2229 $</version>
 // </file>
 
 using System;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlTreeViewTestFixtureBase.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/XmlTreeViewTestFixtureBase.cs
similarity index 96%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlTreeViewTestFixtureBase.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Tree/XmlTreeViewTestFixtureBase.cs
index bb54a33bbb..9651428773 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlTreeViewTestFixtureBase.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Tree/XmlTreeViewTestFixtureBase.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 1924 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Utils/DerivedAddXmlNodeDialog.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Utils/DerivedAddXmlNodeDialog.cs
similarity index 95%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Utils/DerivedAddXmlNodeDialog.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Utils/DerivedAddXmlNodeDialog.cs
index f1aee3d25d..001354586f 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Utils/DerivedAddXmlNodeDialog.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Utils/DerivedAddXmlNodeDialog.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2229 $</version>
 // </file>
 
 using System;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Utils/DerivedXmlTreeView.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Utils/DerivedXmlTreeView.cs
similarity index 94%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Utils/DerivedXmlTreeView.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Utils/DerivedXmlTreeView.cs
index 9268bd080c..eade65bc21 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Utils/DerivedXmlTreeView.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Utils/DerivedXmlTreeView.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2164 $</version>
 // </file>
 
 using System;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Utils/DerivedXmlTreeViewContainerControl.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Utils/DerivedXmlTreeViewContainerControl.cs
similarity index 99%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Utils/DerivedXmlTreeViewContainerControl.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Utils/DerivedXmlTreeViewContainerControl.cs
index 48a22cba6e..af8b7c1cd7 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Utils/DerivedXmlTreeViewContainerControl.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Utils/DerivedXmlTreeViewContainerControl.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2229 $</version>
 // </file>
 
 using System;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Utils/MockAddXmlNodeDialog.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Utils/MockAddXmlNodeDialog.cs
similarity index 96%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Utils/MockAddXmlNodeDialog.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Utils/MockAddXmlNodeDialog.cs
index 7b20827db5..402770f0b6 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Utils/MockAddXmlNodeDialog.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Utils/MockAddXmlNodeDialog.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2229 $</version>
 // </file>
 
 using System;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Utils/MockDocument.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Utils/MockDocument.cs
similarity index 92%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Utils/MockDocument.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Utils/MockDocument.cs
index 042cee2118..f6fb8aecf9 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Utils/MockDocument.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Utils/MockDocument.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2498 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Document;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Utils/MockOpenedFile.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Utils/MockOpenedFile.cs
similarity index 100%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Utils/MockOpenedFile.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Utils/MockOpenedFile.cs
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Utils/MockXmlTreeView.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Utils/MockXmlTreeView.cs
similarity index 99%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Utils/MockXmlTreeView.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Utils/MockXmlTreeView.cs
index d8dd129f04..62b7145379 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Utils/MockXmlTreeView.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Utils/MockXmlTreeView.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 3532 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Utils/ResourceManager.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Utils/ResourceManager.cs
similarity index 97%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Utils/ResourceManager.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Utils/ResourceManager.cs
index e3890c5f7e..cedc5dfb22 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Utils/ResourceManager.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Utils/ResourceManager.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 915 $</version>
 // </file>
 
 using System;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Utils/SchemaIncludeTestFixtureHelper.cs b/src/AddIns/BackendBindings/XmlBinding/Test/Utils/SchemaIncludeTestFixtureHelper.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/Utils/SchemaIncludeTestFixtureHelper.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/Utils/SchemaIncludeTestFixtureHelper.cs
index 48c7b0fc22..c10a865100 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Utils/SchemaIncludeTestFixtureHelper.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/Utils/SchemaIncludeTestFixtureHelper.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 915 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/XPathQuery/EncodeXPathParameterTests.cs b/src/AddIns/BackendBindings/XmlBinding/Test/XPathQuery/EncodeXPathParameterTests.cs
similarity index 94%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/XPathQuery/EncodeXPathParameterTests.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/XPathQuery/EncodeXPathParameterTests.cs
index 01f5c5523f..d0dc9309b9 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/XPathQuery/EncodeXPathParameterTests.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/XPathQuery/EncodeXPathParameterTests.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 1864 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/XPathQuery/GetNamespacesFromListViewTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/XPathQuery/GetNamespacesFromListViewTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/XPathQuery/GetNamespacesFromListViewTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/XPathQuery/GetNamespacesFromListViewTestFixture.cs
index 722b83eb4e..905928fe74 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/XPathQuery/GetNamespacesFromListViewTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/XPathQuery/GetNamespacesFromListViewTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 1662 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/XPathQuery/NamespaceGridColumnWidthsLoadedTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/XPathQuery/NamespaceGridColumnWidthsLoadedTestFixture.cs
similarity index 97%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/XPathQuery/NamespaceGridColumnWidthsLoadedTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/XPathQuery/NamespaceGridColumnWidthsLoadedTestFixture.cs
index cae78c8e49..afef6a8e08 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/XPathQuery/NamespaceGridColumnWidthsLoadedTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/XPathQuery/NamespaceGridColumnWidthsLoadedTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 1662 $</version>
 // </file>
 
 using ICSharpCode.Core;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/XPathQuery/NamespacePropertiesLoaded.cs b/src/AddIns/BackendBindings/XmlBinding/Test/XPathQuery/NamespacePropertiesLoaded.cs
similarity index 97%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/XPathQuery/NamespacePropertiesLoaded.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/XPathQuery/NamespacePropertiesLoaded.cs
index da0cf449ce..1bcedaa36d 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/XPathQuery/NamespacePropertiesLoaded.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/XPathQuery/NamespacePropertiesLoaded.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 1662 $</version>
 // </file>
 
 using ICSharpCode.Core;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/XPathQuery/NamespacePropertiesSaved.cs b/src/AddIns/BackendBindings/XmlBinding/Test/XPathQuery/NamespacePropertiesSaved.cs
similarity index 97%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/XPathQuery/NamespacePropertiesSaved.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/XPathQuery/NamespacePropertiesSaved.cs
index 22c5ac56e3..605096193e 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/XPathQuery/NamespacePropertiesSaved.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/XPathQuery/NamespacePropertiesSaved.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 1662 $</version>
 // </file>
 
 using ICSharpCode.Core;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/XPathQuery/RunXPathQueryTests.cs b/src/AddIns/BackendBindings/XmlBinding/Test/XPathQuery/RunXPathQueryTests.cs
similarity index 99%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/XPathQuery/RunXPathQueryTests.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/XPathQuery/RunXPathQueryTests.cs
index 58e6ecc0d4..0f314cba4f 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/XPathQuery/RunXPathQueryTests.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/XPathQuery/RunXPathQueryTests.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 1662 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/XPathQuery/XPathNodeTextMarkerTests.cs b/src/AddIns/BackendBindings/XmlBinding/Test/XPathQuery/XPathNodeTextMarkerTests.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/XPathQuery/XPathNodeTextMarkerTests.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/XPathQuery/XPathNodeTextMarkerTests.cs
index d3716335a2..71c5adc421 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/XPathQuery/XPathNodeTextMarkerTests.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/XPathQuery/XPathNodeTextMarkerTests.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2498 $</version>
 // </file>
 
 using ICSharpCode.TextEditor.Document;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/XPathQuery/XPathQueryHistoryTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/XPathQuery/XPathQueryHistoryTestFixture.cs
similarity index 98%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/XPathQuery/XPathQueryHistoryTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/XPathQuery/XPathQueryHistoryTestFixture.cs
index 6d8dd92335..d8ff66dbfc 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/XPathQuery/XPathQueryHistoryTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/XPathQuery/XPathQueryHistoryTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 1662 $</version>
 // </file>
 
 using ICSharpCode.Core;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/XPathQuery/XPathResultsListViewColumnWidthsTestFixture.cs b/src/AddIns/BackendBindings/XmlBinding/Test/XPathQuery/XPathResultsListViewColumnWidthsTestFixture.cs
similarity index 97%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/XPathQuery/XPathResultsListViewColumnWidthsTestFixture.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/XPathQuery/XPathResultsListViewColumnWidthsTestFixture.cs
index b73dad67f5..9cc5287969 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/XPathQuery/XPathResultsListViewColumnWidthsTestFixture.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/XPathQuery/XPathResultsListViewColumnWidthsTestFixture.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 1662 $</version>
 // </file>
 
 using ICSharpCode.Core;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/XPathQuery/XmlNamespaceTests.cs b/src/AddIns/BackendBindings/XmlBinding/Test/XPathQuery/XmlNamespaceTests.cs
similarity index 92%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/XPathQuery/XmlNamespaceTests.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/XPathQuery/XmlNamespaceTests.cs
index e58918b6c7..78bd3e82dc 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/XPathQuery/XmlNamespaceTests.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/XPathQuery/XmlNamespaceTests.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 1662 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/XPathQuery/XmlNamespaceToStringTests.cs b/src/AddIns/BackendBindings/XmlBinding/Test/XPathQuery/XmlNamespaceToStringTests.cs
similarity index 97%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/XPathQuery/XmlNamespaceToStringTests.cs
rename to src/AddIns/BackendBindings/XmlBinding/Test/XPathQuery/XmlNamespaceToStringTests.cs
index 55dbd04e9b..aafa0dcfd6 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/XPathQuery/XmlNamespaceToStringTests.cs
+++ b/src/AddIns/BackendBindings/XmlBinding/Test/XPathQuery/XmlNamespaceToStringTests.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 1662 $</version>
 // </file>
 
 using ICSharpCode.XmlEditor;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/XmlEditor.Tests.csproj b/src/AddIns/BackendBindings/XmlBinding/Test/XmlEditor.Tests.csproj
similarity index 100%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/XmlEditor.Tests.csproj
rename to src/AddIns/BackendBindings/XmlBinding/Test/XmlEditor.Tests.csproj
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/XmlEditor.Tests.csproj.user b/src/AddIns/BackendBindings/XmlBinding/Test/XmlEditor.Tests.csproj.user
similarity index 100%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/XmlEditor.Tests.csproj.user
rename to src/AddIns/BackendBindings/XmlBinding/Test/XmlEditor.Tests.csproj.user
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/app.config b/src/AddIns/BackendBindings/XmlBinding/Test/app.config
similarity index 100%
rename from src/AddIns/DisplayBindings/XmlEditor/Test/app.config
rename to src/AddIns/BackendBindings/XmlBinding/Test/app.config
diff --git a/src/AddIns/BackendBindings/XmlBinding/XmlEditor.csproj b/src/AddIns/BackendBindings/XmlBinding/XmlEditor.csproj
deleted file mode 100644
index 406c250213..0000000000
--- a/src/AddIns/BackendBindings/XmlBinding/XmlEditor.csproj
+++ /dev/null
@@ -1,195 +0,0 @@
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{DCA2703D-250A-463E-A68A-07ED105AE6BD}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <OutputType>Library</OutputType>
-    <RootNamespace>ICSharpCode.XmlEditor</RootNamespace>
-    <AssemblyName>XmlEditor</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <SourceAnalysisOverrideSettingsFile>C:\Users\Siegfried\AppData\Roaming\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <NoStdLib>False</NoStdLib>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <OutputPath>..\..\..\..\AddIns\AddIns\BackendBindings\XmlBinding\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>Full</DebugType>
-    <Optimize>False</Optimize>
-    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <DebugSymbols>False</DebugSymbols>
-    <DebugType>None</DebugType>
-    <Optimize>True</Optimize>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <DefineConstants>TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
-    <BaseAddress>4194304</BaseAddress>
-    <PlatformTarget>x86</PlatformTarget>
-    <FileAlignment>4096</FileAlignment>
-  </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
-  <ItemGroup>
-    <Reference Include="PresentationCore">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="PresentationFramework">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Data.DataSetExtensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Windows.Presentation">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="XmlEditor.addin">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <Compile Include="Configuration\AssemblyInfo.cs" />
-    <Compile Include="Src\CodeCompletion\XmlCodeCompletionBinding.cs" />
-    <Compile Include="Src\CodeCompletion\XmlCompletionItemList.cs" />
-    <Compile Include="Src\CodeCompletion\XmlSchemaCompletionData.cs" />
-    <Compile Include="Src\CodeCompletion\XmlSchemaCompletionDataCollection.cs" />
-    <Compile Include="Src\Gui\Dialogs\SelectXmlSchema.xaml.cs">
-      <DependentUpon>SelectXmlSchema.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Src\Gui\Dialogs\XmlEditorOptionsPanel.xaml.cs">
-      <DependentUpon>XmlEditorOptionsPanel.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Src\Gui\Dialogs\XmlSchemasPanel.xaml.cs">
-      <DependentUpon>XmlSchemasPanel.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Src\Gui\XmlAttributePropertyDescriptor.cs" />
-    <Compile Include="Src\Gui\XmlAttributeTypeDescriptor.cs" />
-    <Compile Include="Src\Gui\XmlCharacterDataTreeNode.cs" />
-    <Compile Include="Src\Gui\XmlCommentTreeNode.cs" />
-    <Compile Include="Src\Gui\XmlEditorAddInOptions.cs" />
-    <Compile Include="Src\Gui\XmlElementTreeNode.cs" />
-    <Compile Include="Src\Gui\XmlSchemaAssociation.cs" />
-    <Compile Include="Src\Gui\XmlSchemaAssociationListBoxItem.cs" />
-    <Compile Include="Src\Gui\XmlSchemaListBoxItem.cs" />
-    <Compile Include="Src\Gui\XmlTextTreeNode.cs" />
-    <Compile Include="Src\Gui\XmlTreeEditor.cs" />
-    <Compile Include="Src\Gui\XmlTreeViewContainerControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Src\Gui\XmlTreeViewControl.cs" />
-    <Compile Include="Src\Gui\XmlView.cs" />
-    <Compile Include="Src\Gui\XPathNodeMatch.cs" />
-    <Compile Include="Src\Gui\XPathNodeTextMarker.cs" />
-    <Compile Include="Src\XmlFormattingStrategy.cs">
-    </Compile>
-    <Compile Include="Src\CodeCompletion\XmlCompletionItem.cs" />
-    <Compile Include="Src\CodeCompletion\XmlCompletionItemCollection.cs" />
-    <Compile Include="Src\CodeCompletion\XmlCompletionDataProvider.cs" />
-    <Compile Include="Src\Commands\AddAttributeCommand.cs" />
-    <Compile Include="Src\Commands\AddChildCommentCommand.cs" />
-    <Compile Include="Src\Commands\AddChildElementCommand.cs" />
-    <Compile Include="Src\Commands\AddChildTextNodeCommand.cs" />
-    <Compile Include="Src\Commands\AssignStylesheetCommand.cs" />
-    <Compile Include="Src\Commands\CodeCompletionPopupCommand.cs" />
-    <Compile Include="Src\Commands\CreateSchemaCommand.cs" />
-    <Compile Include="Src\Commands\FormatXmlCommand.cs" />
-    <Compile Include="Src\Commands\GoToSchemaDefinitionCommand.cs" />
-    <Compile Include="Src\Commands\InsertCommentAfterCommand.cs" />
-    <Compile Include="Src\Commands\InsertCommentBeforeCommand.cs" />
-    <Compile Include="Src\Commands\InsertElementAfterCommand.cs" />
-    <Compile Include="Src\Commands\InsertElementBeforeCommand.cs" />
-    <Compile Include="Src\Commands\InsertTextNodeAfterCommand.cs" />
-    <Compile Include="Src\Commands\InsertTextNodeBeforeCommand.cs" />
-    <Compile Include="Src\Commands\OpenStylesheetCommand.cs" />
-    <Compile Include="Src\Commands\RemoveAttributeCommand.cs" />
-    <Compile Include="Src\Commands\RemoveXPathHighlightingCommand.cs" />
-    <Compile Include="Src\Commands\RunXslTransformCommand.cs" />
-    <Compile Include="Src\Commands\ValidateXmlCommand.cs" />
-    <Compile Include="Src\Gui\AddXmlNodeDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Src\Gui\GoToSchemaDefinitionEditAction.cs" />
-    <Compile Include="Src\Gui\IAddXmlNodeDialog.cs" />
-    <Compile Include="Src\Gui\IXmlTreeView.cs" />
-    <Compile Include="Src\Gui\XmlDisplayBinding.cs" />
-    <Compile Include="Src\Gui\XmlTreeView.cs" />
-    <Compile Include="Src\Gui\XPathQueryControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Src\Gui\XPathQueryPad.cs">
-    </Compile>
-    <Compile Include="Src\Gui\XslOutputView.cs" />
-    <Compile Include="Src\Parser\Parser.cs" />
-    <Compile Include="Src\Parser\QualifiedName.cs" />
-    <Compile Include="Src\Parser\QualifiedNameCollection.cs" />
-    <Compile Include="Src\Parser\XmlElementPath.cs" />
-    <Compile Include="Src\Parser\XmlParser.cs" />
-    <Compile Include="Src\StylesheetAssignedCondition.cs" />
-    <Compile Include="Src\XmlFoldingStrategy.cs" />
-    <Compile Include="Src\XmlSchemaManager.cs" />
-    <Compile Include="Src\Xml\EncodedStringWriter.cs" />
-    <Compile Include="Src\Xml\XmlEncoder.cs" />
-    <Compile Include="Src\Xml\XmlNamespace.cs" />
-    <EmbeddedResource Include="Resources\XmlCommentTreeNodeIcon.png" />
-    <EmbeddedResource Include="Resources\XmlElementTreeNodeIcon.png" />
-    <EmbeddedResource Include="Resources\XmlTextTreeNodeIcon.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj">
-      <Project>{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}</Project>
-      <Name>ICSharpCode.AvalonEdit</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">
-      <Project>{2748AD25-9C63-4E12-877B-4DCE96FBED54}</Project>
-      <Name>ICSharpCode.SharpDevelop</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Main\Core\Project\ICSharpCode.Core.csproj">
-      <Project>{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}</Project>
-      <Name>ICSharpCode.Core</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Main\ICSharpCode.Core.Presentation\ICSharpCode.Core.Presentation.csproj">
-      <Project>{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}</Project>
-      <Name>ICSharpCode.Core.Presentation</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Main\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj">
-      <Project>{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}</Project>
-      <Name>ICSharpCode.Core.WinForms</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj">
-      <Project>{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}</Project>
-      <Name>ICSharpCode.SharpDevelop.Dom</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <Page Include="Src\Gui\Dialogs\SelectXmlSchema.xaml" />
-    <Page Include="Src\Gui\Dialogs\XmlEditorOptionsPanel.xaml" />
-    <Page Include="Src\Gui\Dialogs\XmlSchemasPanel.xaml" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Doc/notes.txt b/src/AddIns/DisplayBindings/XmlEditor/Doc/notes.txt
deleted file mode 100644
index 6ccdec4605..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Doc/notes.txt
+++ /dev/null
@@ -1,175 +0,0 @@
-Xml Intellisense
-----------------
-
-In order to be able to provide intellisense for an xml document we need a schema.  From the schema we can determine an element's attributes and its child elements.  Without resorting to writing our own xml schema parser, can we retrieve this information from the schema?
-
-XmlSchema class
----------------
-
-The .Net framework provides us with the XmlSchema class.  It provides us with two methods that of interest to us when reading rather than creating an xml schema.
-
-1) Read - Reads an XML Schema definition language (XSD) schema.
-
-2) Compile - Compiles the XML Schema definition language (XSD) Schema Object Model (SOM) into schema information for validation. Used to check the syntactic and semantic structure of the programmatically-built SOM. Semantic validation checking is performed during compilation.
-
-Let us first look at the Read method and see what we can get from it.
-
-The read method seems to do a first parse of the schema, the XmlSchema.Elements property is not populated, about the only thing that is populated is the Items property, which seems to be pretty much a mirror image of what is in the xsd file.  
-
-Quickstart sample from Microsoft
---------------------------------
-
-XmlSchemaObjectModel sample
-
-http://go.microsoft.com/fwlink/?linkid=3268&url=/quickstart/howto/doc/XML/XmlSchemaObjectModel.aspx
-
-A sample provided by Microsoft adds two schemas to an XmlSchemaCollection, outputs the schema xsd based on what was read in, then generates an xml documentrepresentative of the read in schema.
-
-            XmlNameTable myXmlNameTable = new NameTable();
-            XmlSchemaCollection myXmlSchemaCollection = new XmlSchemaCollection(myXmlNameTable);
-            myXmlSchemaCollection.Add(null, "books.xsd");
-            myXmlSchemaCollection.Add(null, "poschema.xsd");
-
-            foreach(XmlSchema myTempXmlSchema in myXmlSchemaCollection)
-            {
-                myXmlSchema = myTempXmlSchema;
-
-                // Write out the various schema parts
-                WriteXSDSchema();
-
-                // Write out an example of the XML for the schema
-                WriteExample();
-
-            }
-
-
-    void WriteXSDSchema()
-    {
-        myXmlTextWriter.WriteStartElement("schema", XmlSchema.Namespace);
-        myXmlTextWriter.WriteAttributeString("targetNamespace", myXmlSchema.TargetNamespace);
-        foreach(XmlSchemaInclude include in myXmlSchema.Includes)
-        {
-            myXmlTextWriter.WriteStartElement("include", XmlSchema.Namespace);
-            myXmlTextWriter.WriteAttributeString("schemaLocation", include.SchemaLocation);
-            myXmlTextWriter.WriteEndElement();
-        }
-
-        foreach(object item in myXmlSchema.Items)
-        {
-            if (item is XmlSchemaAttribute)
-                WriteXmlSchemaAttribute((XmlSchemaAttribute)item);      //attribute
-            else if (item is XmlSchemaComplexType)
-                WriteXmlSchemaComplexType((XmlSchemaComplexType)item);  //complexType
-            else if (item is XmlSchemaSimpleType)
-                WriteXmlSchemaSimpleType((XmlSchemaSimpleType)item);    //simpleType
-            else if (item is XmlSchemaElement)
-                WriteXmlSchemaElement((XmlSchemaElement)item);          //element
-            else if (item is XmlSchemaAnnotation)
-                WriteXmlSchemaAnnotation((XmlSchemaAnnotation)item);    //annotation
-            else if (item is XmlSchemaAttributeGroup)
-                WriteXmlSchemaAttributeGroup((XmlSchemaAttributeGroup)item); //attributeGroup
-            else if (item is XmlSchemaNotation)
-                WriteXmlSchemaNotation((XmlSchemaNotation)item);        //notation
-            else if (item is XmlSchemaGroup)
-                WriteXmlSchemaGroup((XmlSchemaGroup)item);              //group
-            else
-                Console.WriteLine("Not Implemented.");
-        }
-        myXmlTextWriter.WriteEndElement();
-    }
-
-    // Write out the example of the XSD usage
-    void WriteExample()
-    {
-        foreach(XmlSchemaElement element in myXmlSchema.Elements.Values)
-            WriteExampleElement(element);
-    }
-
-    // Write some example elements
-    void WriteExampleElement(XmlSchemaElement element)
-    {
-        myXmlTextWriter.WriteStartElement(element.QualifiedName.Name, element.QualifiedName.Namespace);
-        if (element.ElementType is XmlSchemaComplexType)
-        {
-            XmlSchemaComplexType type = (XmlSchemaComplexType)element.ElementType;
-            if (type.ContentModel != null)
-                Console.WriteLine("Not Implemented for this ContentModel");
-            WriteExampleAttributes(type.Attributes);
-            WriteExampleParticle(type.Particle);
-        }
-        else
-            WriteExampleValue(element.ElementType);
-
-        myXmlTextWriter.WriteEndElement();
-    }
-
-Now how does this work?  The WriteExample code iterates through the XmlSchema.Elements.Values collection and outputs some data for each XmlSchemaElement.  The Elements property is not generated when you only do an XmlSchema.Read.  What is actually happening is that the schema is being compiled aswell.  I stumbled across this not using Reflector, but when changing the sample code to read in NAnt's 0.84 schema.  Reading in NAnt-0.84.xsd the code threw an exception since one of the types (formatter) was defined twice, even though the schema is valid as far as I can tell.  The exception was thrown at the line
-
- myXmlSchemaCollection.Add(null, "nant-0.84.xsd");
-
-The exception call stack showed that XmlSchemaCollection.Add method calls XmlSchema.Compile.
-
-So it looks like we need to compile the XmlSchema object to get it to do a second parse.
-
-Xhtml1-Strict
--------------
-
-Fun and games getting this to load in the XmlSchema object.
-
-First, set the XmlResolver to null on the XmlTextReader.  If this is not done the reader tries to look for referenced DTDs in the assembly folder.  When the resolver is set to null it looks for the DTDs in the same folder as the .xsd itself which seems more reasonable.  
-
-XmlSchema throws an exception because the xhtml1-strict.xsd redefines the xml namespace via the string xmlns:xml="http://www.w3.org/XML/1998/namespace" at the top of the file.  According to the w3 spec this is valid, but the XmlSchema class does not like it.
-
-
-Xml Editor handling property changes
-------------------------------------
-
-The properties are changed from inside SharpDevelop.  Options are:
-
-1) Directly access the SharpDevelop properties each time the control is about to do something.
-2) Control exposes properties which need to be changed via another object, not the editor, 
-   when they have changed.
-3) Control exposes a property object with a defined interface which the user of the control
-   can set.  This object is checked whenever the control attempts to do something.  This
-   object can access the SharpDevelop properties.
-
-I want to keep the Xml Editor control only dependent on the SharpDevelop Text Editor.  This rules out option 1.
-
-
-Schemas
--------
-
-System schemas
---------------
-
-System schemas will live in the C:\Program Files\SharpDevelop\data\schemas folder.  
-
-The PropertyService gives us a DataDirectory property which usually points to C:\Program Files\SharpDevelop\data so we can use this.
-
-If the folder does not exist it is not created since access to C:\Program Files can be restricted.
-
-User schemas
-------------
-
-User schemas will live in C:\Documents and Settings\web\Application Data\.ICSharpCode\SharpDevelop\schemas folder.
-
-The PropertyService gives us a ConfigDirectory which points to the parent of the above folder (i.e. SharpDevelop above the schemas folder).
-
-
-XmlEditor addin
----------------
-
-The binary and its addin file will exist in AddIns/AddIns/DisplayBindings/XmlEditor
-
-Folding
--------
-
-The standard way in SharpDevelop that folds are added is via the parser.  The SharpDevelop has a parser thread which checks if the current view's text has changed, then looks for a parser that can handle that particular filename.  This parser then parses the contents and the IParseInformation is sent to the view's IParseInformationListener.ParseInformationUpdated method.  This method then usually uses the parse info to update the foldings.
-
-Now, the SharpDevelop parsers are programming language orientated, so a lot of the properties and objects are not relevant to parsed xml, so do we create a parser just to update the folds?  The fold updating still needs to be done on a background thread, because folds aren't massively important, so creating our own extra thread is out of the question.  We could trigger a fold update on every key press, but again this is overkill and will be probably be slow.
-
-Enabling searching in the xml editor
-------------------------------------
-
-The view class needs to implement the ITextEditorControlProvider otherwise the search menu options are disabled.
-
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Doc/readme.txt b/src/AddIns/DisplayBindings/XmlEditor/Doc/readme.txt
deleted file mode 100644
index e6c704a28b..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Doc/readme.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-INSTALLATION:
--------------
-
-Using Binaries
---------------
-
-Assuming SharpDevelop is installed in the folder "C:/Program Files/SharpDevelop"
-
-Copy the contents of the "bin" folder to "C:/Program Files/SharpDevelop/AddIns/AddIns/DisplayBindings/XmlEditor".
-
-The binaries should work with SharpDevelop v1.0.3.1768.
-
-
-Building source
----------------
-
-Copy the contents of the XmlEditor folder to "src/AddIns/DisplayBindings/XmlEditor".
-
-Load the "XmlEditor.cmbx" combine and build the project OR run the "XmlEditor.build" file with NAnt 0.84.
-
-
-Configuring Schema Auto-completion
-----------------------------------
-
-Go to Tools->Options->Text Editor->Xml Schemas.  Use the Add button to add your .xsds to SharpDevelop.
-
-
-
-Done:
------
-
-Properties taken from SharpDevelop.
-Handle property changes whilst editor is open.
-Validate xml menu only available for the xml editor.
-Validation against schema.  Right click and menu option.
-User added xsds.
-System xsds.
-Check that we can still "jump to" NAnt errors in .build files.
-Test getting element completion data for the root element of a document.
-Code completion window size.  Long namespace URIs do not fit in the window.  Duplicated
-   the CodeCompletionWindow class.  The item width calculation should really be in 
-   the CodeCompletionListView.
-Custom code completion window.  Only autocomplete when the tab or return key
-    is pressed.
-Validation of the xml against the schema - send output to build window and add
-    task list entry. 
-Comment folding.
-Recognise special file extensions (e.g. build).  Allow user to specify schema
-    for a file extension.  This would act as a default, but could be overriden
-    by specifying an xmlns in the xml.
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Configuration/AssemblyInfo.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Configuration/AssemblyInfo.cs
deleted file mode 100644
index fc2973472d..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Configuration/AssemblyInfo.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System.Reflection;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("XmlEditor")]
-[assembly: AssemblyDescription("SharpDevelop Xml Editor AddIn")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/PostBuildEvent.proj b/src/AddIns/DisplayBindings/XmlEditor/Project/PostBuildEvent.proj
deleted file mode 100644
index 656932139c..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/PostBuildEvent.proj
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<PropertyGroup>
-		<PrepareForRunDependsOn>$(PrepareForRunDependsOn);MyPostBuildTarget</PrepareForRunDependsOn>
-	</PropertyGroup>
-	<ItemGroup>
-		<MyCopyItem Include="$(MSBuildProjectDirectory)\*.addin" />
-	</ItemGroup>
-	<Target Name="MyPostBuildTarget">
-		<!-- work around an MSBuild bug in CopyToOutputDirectory that causes this file to be copied -->
-		<!-- to projects referencing this project even if local copy on that reference is false -->
-		<Copy SourceFiles="@(MyCopyItem)" DestinationFolder="$(OutputPath)" />
-	</Target>
-</Project>
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Resources/SelectXmlSchema.xfrm b/src/AddIns/DisplayBindings/XmlEditor/Project/Resources/SelectXmlSchema.xfrm
deleted file mode 100644
index 574ab19744..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Resources/SelectXmlSchema.xfrm
+++ /dev/null
@@ -1,38 +0,0 @@
-<Components version="1.0">
-  <System.Windows.Forms.Form>
-    <Name value="SelectXmlSchemaForm" />
-    <ShowInTaskbar value="False" />
-    <ClientSize value="{Width=376, Height=286}" />
-    <DockPadding value="" />
-    <Text value="${res:ICSharpCode.XmlEditor.SelectXmlSchema.DialogTitle}" />
-    <AcceptButton value="okButton [System.Windows.Forms.Button], Text: ${res:Global.OKButtonText}" />
-    <CancelButton value="cancelButton [System.Windows.Forms.Button], Text: ${res:Global.CancelButtonText}" />
-    <Controls>
-      <System.Windows.Forms.Button>
-        <Name value="okButton" />
-        <Location value="{X=248,Y=256}" />
-        <Size value="{Width=56, Height=24}" />
-        <Text value="${res:Global.OKButtonText}" />
-        <Anchor value="Bottom, Right" />
-        <TabIndex value="2" />
-        <DialogResult value="Cancel" />
-      </System.Windows.Forms.Button>
-      <System.Windows.Forms.Button>
-        <Name value="cancelButton" />
-        <Location value="{X=312,Y=256}" />
-        <Size value="{Width=56, Height=24}" />
-        <Text value="${res:Global.CancelButtonText}" />
-        <Anchor value="Bottom, Right" />
-        <TabIndex value="1" />
-        <DialogResult value="Cancel" />
-      </System.Windows.Forms.Button>
-      <System.Windows.Forms.ListBox>
-        <Name value="schemaListBox" />
-        <Size value="{Width=360, Height=238}" />
-        <Anchor value="Top, Bottom, Left, Right" />
-        <TabIndex value="0" />
-        <Location value="{X=8,Y=8}" />
-      </System.Windows.Forms.ListBox>
-    </Controls>
-  </System.Windows.Forms.Form>
-</Components>
\ No newline at end of file
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Resources/XmlCommentTreeNodeIcon.png b/src/AddIns/DisplayBindings/XmlEditor/Project/Resources/XmlCommentTreeNodeIcon.png
deleted file mode 100644
index 4e63f07261..0000000000
Binary files a/src/AddIns/DisplayBindings/XmlEditor/Project/Resources/XmlCommentTreeNodeIcon.png and /dev/null differ
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Resources/XmlEditorOptionsPanel.xfrm b/src/AddIns/DisplayBindings/XmlEditor/Project/Resources/XmlEditorOptionsPanel.xfrm
deleted file mode 100644
index 7a9cebae60..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Resources/XmlEditorOptionsPanel.xfrm
+++ /dev/null
@@ -1,45 +0,0 @@
-<Components version="1.0">
-  <System.Windows.Forms.UserControl>
-    <Name value="XmlEditorOptionsPanel" />
-    <DockPadding value="" />
-    <ClientSize value="{Width=352, Height=336}" />
-    <Controls>
-      <System.Windows.Forms.GroupBox>
-        <Name value="foldingGroupBox" />
-        <TabIndex value="0" />
-        <Location value="{X=8,Y=8}" />
-        <Anchor value="Top, Left, Right" />
-        <Size value="{Width=336, Height=56}" />
-        <Text value="${res:ICSharpCode.XmlEditor.XmlEditorOptionsPanel.FoldingGroupLabel}" />
-        <Controls>
-          <System.Windows.Forms.CheckBox>
-            <Name value="showAttributesWhenFoldedCheckBox" />
-            <Location value="{X=16,Y=26}" />
-            <Size value="{Width=304, Height=16}" />
-            <Text value="${res:ICSharpCode.XmlEditor.XmlEditorOptionsPanel.ShowAttributesWhenFoldedLabel}" />
-            <Anchor value="Top, Left, Right" />
-            <TabIndex value="0" />
-          </System.Windows.Forms.CheckBox>
-        </Controls>
-      </System.Windows.Forms.GroupBox>
-      <System.Windows.Forms.GroupBox>
-        <Name value="xmlCompletionGroupBox" />
-        <TabIndex value="1" />
-        <Location value="{X=8,Y=72}" />
-        <Anchor value="Top, Left, Right" />
-        <Size value="{Width=336, Height=56}" />
-        <Text value="${res:ICSharpCode.XmlEditor.XmlEditorOptionsPanel.XmlCompletionGroupLabel}" />
-        <Controls>
-          <System.Windows.Forms.CheckBox>
-            <Name value="showSchemaAnnotationCheckBox" />
-            <Location value="{X=16,Y=27}" />
-            <Size value="{Width=304, Height=16}" />
-            <Text value="${res:ICSharpCode.XmlEditor.XmlEditorOptionsPanel.ShowSchemaAnnotationLabel}" />
-            <Anchor value="Top, Left, Right" />
-            <TabIndex value="0" />
-          </System.Windows.Forms.CheckBox>
-        </Controls>
-      </System.Windows.Forms.GroupBox>
-    </Controls>
-  </System.Windows.Forms.UserControl>
-</Components>
\ No newline at end of file
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Resources/XmlElementTreeNodeIcon.png b/src/AddIns/DisplayBindings/XmlEditor/Project/Resources/XmlElementTreeNodeIcon.png
deleted file mode 100644
index 424d161295..0000000000
Binary files a/src/AddIns/DisplayBindings/XmlEditor/Project/Resources/XmlElementTreeNodeIcon.png and /dev/null differ
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Resources/XmlSchemasPanel.xfrm b/src/AddIns/DisplayBindings/XmlEditor/Project/Resources/XmlSchemasPanel.xfrm
deleted file mode 100644
index 6c3d2eaf57..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Resources/XmlSchemasPanel.xfrm
+++ /dev/null
@@ -1,110 +0,0 @@
-<Components version="1.0">
-  <System.Windows.Forms.UserControl>
-    <Name value="XmlEditorOptionsPanel" />
-    <DockPadding value="" />
-    <ClientSize value="{Width=352, Height=328}" />
-    <SnapToGrid value="False" />
-    <Controls>
-      <System.Windows.Forms.GroupBox>
-        <Name value="xmlFileExtensionGroupBox" />
-        <TabIndex value="4" />
-        <Location value="{X=8,Y=186}" />
-        <Anchor value="Top, Left, Right" />
-        <Size value="{Width=336, Height=126}" />
-        <Text value="${res:ICSharpCode.XmlEditor.XmlSchemaPanel.FileExtensionsGroupBoxText}" />
-        <Controls>
-          <System.Windows.Forms.TextBox>
-            <Name value="namespacePrefixTextBox" />
-            <Anchor value="Top, Left, Right" />
-            <TabIndex value="10" />
-            <Location value="{X=80,Y=84}" />
-            <Size value="{Width=248, Height=21}" />
-            <Text value="" />
-          </System.Windows.Forms.TextBox>
-          <System.Windows.Forms.Label>
-            <Name value="prefixLabel" />
-            <Text value="${res:ICSharpCode.XmlEditor.XmlSchemaPanel.NamespacePrefixLabelText}" />
-            <TextAlign value="MiddleLeft" />
-            <TabIndex value="9" />
-            <Size value="{Width=72, Height=16}" />
-            <Location value="{X=8,Y=84}" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.TextBox>
-            <Name value="schemaTextBox" />
-            <ReadOnly value="True" />
-            <Anchor value="Top, Left, Right" />
-            <TabIndex value="8" />
-            <Location value="{X=80,Y=58}" />
-            <Size value="{Width=216, Height=21}" />
-            <Text value="" />
-          </System.Windows.Forms.TextBox>
-          <System.Windows.Forms.ComboBox>
-            <Name value="fileExtensionComboBox" />
-            <Anchor value="Top, Left, Right" />
-            <TabIndex value="7" />
-            <Location value="{X=80,Y=34}" />
-            <Size value="{Width=248, Height=21}" />
-            <DropDownStyle value="DropDownList" />
-          </System.Windows.Forms.ComboBox>
-          <System.Windows.Forms.Label>
-            <Name value="schemaLabel" />
-            <Text value="${res:ICSharpCode.XmlEditor.XmlSchemaPanel.SchemaLabelText}" />
-            <TextAlign value="MiddleLeft" />
-            <TabIndex value="1" />
-            <Size value="{Width=72, Height=16}" />
-            <Location value="{X=8,Y=58}" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.Label>
-            <Name value="fileExtensionLabel" />
-            <Text value="${res:ICSharpCode.XmlEditor.XmlSchemaPanel.FileExtensionLabelText}" />
-            <TextAlign value="MiddleLeft" />
-            <TabIndex value="0" />
-            <Size value="{Width=72, Height=16}" />
-            <Location value="{X=8,Y=34}" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.Button>
-            <Name value="changeSchemaButton" />
-            <Location value="{X=304,Y=58}" />
-            <Size value="{Width=24, Height=21}" />
-            <Text value="..." />
-            <Anchor value="Top, Right" />
-            <TabIndex value="6" />
-          </System.Windows.Forms.Button>
-        </Controls>
-      </System.Windows.Forms.GroupBox>
-      <System.Windows.Forms.GroupBox>
-        <Name value="schemasGroupBox" />
-        <TabIndex value="3" />
-        <Location value="{X=8,Y=8}" />
-        <Anchor value="Top, Left, Right" />
-        <Size value="{Width=336, Height=170}" />
-        <Text value="${res:ICSharpCode.XmlEditor.XmlSchemaPanel.SchemasGroupBoxText}" />
-        <Controls>
-          <System.Windows.Forms.Button>
-            <Name value="addButton" />
-            <Location value="{X=160,Y=140}" />
-            <Size value="{Width=80, Height=24}" />
-            <Text value="${res:Global.AddButtonText}..." />
-            <Anchor value="Bottom, Right" />
-            <TabIndex value="4" />
-          </System.Windows.Forms.Button>
-          <System.Windows.Forms.Button>
-            <Name value="removeButton" />
-            <Location value="{X=247,Y=140}" />
-            <Size value="{Width=80, Height=24}" />
-            <Text value="${res:Global.RemoveButtonText}" />
-            <Anchor value="Bottom, Right" />
-            <TabIndex value="5" />
-          </System.Windows.Forms.Button>
-          <System.Windows.Forms.ListBox>
-            <Name value="schemaListBox" />
-            <Size value="{Width=320, Height=108}" />
-            <Anchor value="Top, Left, Right" />
-            <TabIndex value="3" />
-            <Location value="{X=8,Y=29}" />
-          </System.Windows.Forms.ListBox>
-        </Controls>
-      </System.Windows.Forms.GroupBox>
-    </Controls>
-  </System.Windows.Forms.UserControl>
-</Components>
\ No newline at end of file
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Resources/XmlTextTreeNodeIcon.png b/src/AddIns/DisplayBindings/XmlEditor/Project/Resources/XmlTextTreeNodeIcon.png
deleted file mode 100644
index 2c56bf4e68..0000000000
Binary files a/src/AddIns/DisplayBindings/XmlEditor/Project/Resources/XmlTextTreeNodeIcon.png and /dev/null differ
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/AddAttributeCommand.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/AddAttributeCommand.cs
deleted file mode 100644
index 621455d48b..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/AddAttributeCommand.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using ICSharpCode.Core;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Adds a new attribute to the XML Tree's attribute property grid.
-	/// </summary>
-	public class AddAttributeCommand : AbstractMenuCommand
-	{		
-		public override void Run()
-		{
-			XmlTreeViewContainerControl view = Owner as XmlTreeViewContainerControl;
-			if (view != null) {
-				view.AddAttribute();
-			}
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/AddChildCommentCommand.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/AddChildCommentCommand.cs
deleted file mode 100644
index 2c6c7c0437..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/AddChildCommentCommand.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using ICSharpCode.Core;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Adds a new comment to the selected element.
-	/// </summary>
-	public class AddChildCommentCommand : AbstractMenuCommand
-	{		
-		public override void Run()
-		{
-			XmlTreeViewContainerControl view = Owner as XmlTreeViewContainerControl;
-			if (view != null) {
-				view.AppendChildComment();
-			}
-		}
-	}
-}
-
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/AddChildElementCommand.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/AddChildElementCommand.cs
deleted file mode 100644
index 4497cf4b8a..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/AddChildElementCommand.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using ICSharpCode.Core;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Adds a new child element to the XML Tree.
-	/// </summary>
-	public class AddChildElementCommand : AbstractMenuCommand
-	{		
-		public override void Run()
-		{
-			XmlTreeViewContainerControl view = Owner as XmlTreeViewContainerControl;
-			if (view != null) {
-				view.AddChildElement();
-			}
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/AddChildTextNodeCommand.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/AddChildTextNodeCommand.cs
deleted file mode 100644
index a2789476cb..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/AddChildTextNodeCommand.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using ICSharpCode.Core;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Adds a new text node to selected element.
-	/// </summary>
-	public class AddChildTextNodeCommand : AbstractMenuCommand
-	{		
-		public override void Run()
-		{
-			XmlTreeViewContainerControl view = Owner as XmlTreeViewContainerControl;
-			if (view != null) {
-				view.AppendChildTextNode();
-			}
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/AddXmlNodeDialog.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/AddXmlNodeDialog.cs
deleted file mode 100644
index 9aaed43e14..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/AddXmlNodeDialog.cs
+++ /dev/null
@@ -1,341 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Windows.Forms;
-using System.Xml;
-
-using ICSharpCode.Core;
-using ICSharpCode.Core.WinForms;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Base class for the AddElementDialog and AddAttributeDialog. This
-	/// dialog presents a list of names and an extra text box for entering
-	/// a custom name. It is used to add a new node to the XML tree. It 
-	/// contains all the core logic for the AddElementDialog and 
-	/// AddAttributeDialog classes.
-	/// </summary>
-	public class AddXmlNodeDialog : System.Windows.Forms.Form, IAddXmlNodeDialog
-	{
-		public AddXmlNodeDialog() : this(new string[0])
-		{
-		}
-		
-		/// <summary>
-		/// Creates the dialog and adds the specified names to the
-		/// list box.
-		/// </summary>
-		public AddXmlNodeDialog(string[] names)
-		{
-			InitializeComponent();
-			InitStrings();
-			if (names.Length > 0) {
-				AddNames(names);
-			} else {
-				RemoveNamesListBox();
-			}
-			RightToLeftConverter.ConvertRecursive(this);
-		}
-		
-		/// <summary>
-		/// Gets the selected names in the list box together with the
-		/// custom name entered in the text box.
-		/// </summary>
-		public string[] GetNames()
-		{
-			// Add items selected in list box.
-			List<string> names = new List<string>();
-			foreach (string name in namesListBox.SelectedItems) {
-				names.Add(name);
-			}
-			
-			// Add the custom name if entered.
-			string customName = customNameTextBox.Text.Trim();
-			if (customName.Length > 0) {
-				names.Add(customName);
-			}
-			return names.ToArray();
-		}
-		
-		/// <summary>
-		/// Gets the text from the error provider.
-		/// </summary>
-		public string GetError()
-		{
-			return errorProvider.GetError(customNameTextBox);
-		}
-		
-		/// <summary>
-		/// Gets or sets the custom name label's text.
-		/// </summary>
-		public string CustomNameLabelText {
-			get {
-				return customNameTextBoxLabel.Text;
-			}
-			set {
-				customNameTextBoxLabel.Text = value;
-			}
-		}
-		
-		/// <summary>
-		/// Disposes resources used by the form.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing) {
-				if (components != null) {
-					components.Dispose();
-				}
-			}
-			base.Dispose(disposing);
-		}
-		
-		protected void NamesListBoxSelectedIndexChanged(object sender, EventArgs e)
-		{
-			UpdateOkButtonState();
-		}
-		
-		protected void CustomNameTextBoxTextChanged(object sender, EventArgs e)
-		{
-			UpdateOkButtonState();
-		}
-		
-		#region Windows Forms Designer generated code
-
-		void InitializeComponent()
-		{
-			this.components = new System.ComponentModel.Container();
-			this.namesListBox = new System.Windows.Forms.ListBox();
-			this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components);
-			this.bottomPanel = new System.Windows.Forms.Panel();
-			this.customNameTextBoxLabel = new System.Windows.Forms.Label();
-			this.customNameTextBox = new System.Windows.Forms.TextBox();
-			this.cancelButton = new System.Windows.Forms.Button();
-			this.okButton = new System.Windows.Forms.Button();
-			((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
-			this.bottomPanel.SuspendLayout();
-			this.SuspendLayout();
-			// 
-			// namesListBox
-			// 
-			this.namesListBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-									| System.Windows.Forms.AnchorStyles.Left) 
-									| System.Windows.Forms.AnchorStyles.Right)));
-			this.namesListBox.FormattingEnabled = true;
-			this.namesListBox.Location = new System.Drawing.Point(0, 0);
-			this.namesListBox.Name = "namesListBox";
-			this.namesListBox.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended;
-			this.namesListBox.Size = new System.Drawing.Size(289, 173);
-			this.namesListBox.Sorted = true;
-			this.namesListBox.TabIndex = 1;
-			this.namesListBox.SelectedIndexChanged += new System.EventHandler(this.NamesListBoxSelectedIndexChanged);
-			// 
-			// errorProvider
-			// 
-			this.errorProvider.ContainerControl = this;
-			// 
-			// bottomPanel
-			// 
-			this.bottomPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-									| System.Windows.Forms.AnchorStyles.Right)));
-			this.bottomPanel.Controls.Add(this.customNameTextBoxLabel);
-			this.bottomPanel.Controls.Add(this.customNameTextBox);
-			this.bottomPanel.Controls.Add(this.cancelButton);
-			this.bottomPanel.Controls.Add(this.okButton);
-			this.bottomPanel.Location = new System.Drawing.Point(0, 173);
-			this.bottomPanel.Name = "bottomPanel";
-			this.bottomPanel.Size = new System.Drawing.Size(289, 73);
-			this.bottomPanel.TabIndex = 2;
-			// 
-			// customNameTextBoxLabel
-			// 
-			this.customNameTextBoxLabel.Location = new System.Drawing.Point(3, 10);
-			this.customNameTextBoxLabel.Name = "customNameTextBoxLabel";
-			this.customNameTextBoxLabel.Size = new System.Drawing.Size(82, 23);
-			this.customNameTextBoxLabel.TabIndex = 3;
-			this.customNameTextBoxLabel.Text = "Custom:";
-			// 
-			// customNameTextBox
-			// 
-			this.customNameTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-									| System.Windows.Forms.AnchorStyles.Right)));
-			this.customNameTextBox.Location = new System.Drawing.Point(107, 10);
-			this.customNameTextBox.Name = "customNameTextBox";
-			this.customNameTextBox.Size = new System.Drawing.Size(167, 20);
-			this.customNameTextBox.TabIndex = 4;
-			this.customNameTextBox.TextChanged += new System.EventHandler(this.CustomNameTextBoxTextChanged);
-			// 
-			// cancelButton
-			// 
-			this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-			this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.cancelButton.Location = new System.Drawing.Point(199, 40);
-			this.cancelButton.Name = "cancelButton";
-			this.cancelButton.Size = new System.Drawing.Size(75, 23);
-			this.cancelButton.TabIndex = 6;
-			this.cancelButton.Text = "Cancel";
-			this.cancelButton.UseVisualStyleBackColor = true;
-			// 
-			// okButton
-			// 
-			this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-			this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK;
-			this.okButton.Enabled = false;
-			this.okButton.Location = new System.Drawing.Point(118, 40);
-			this.okButton.Name = "okButton";
-			this.okButton.Size = new System.Drawing.Size(75, 23);
-			this.okButton.TabIndex = 5;
-			this.okButton.Text = "OK";
-			this.okButton.UseVisualStyleBackColor = true;
-			// 
-			// AddXmlNodeDialog
-			// 
-			this.AcceptButton = this.okButton;
-			this.CancelButton = this.cancelButton;
-			this.ClientSize = new System.Drawing.Size(289, 244);
-			this.Controls.Add(this.bottomPanel);
-			this.Controls.Add(this.namesListBox);
-			this.MaximizeBox = false;
-			this.MinimizeBox = false;
-			this.MinimumSize = new System.Drawing.Size(289, 143);
-			this.Name = "AddXmlNodeDialog";
-			this.ShowIcon = false;
-			this.ShowInTaskbar = false;
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
-			this.bottomPanel.ResumeLayout(false);
-			this.bottomPanel.PerformLayout();
-			this.ResumeLayout(false);
-		}
-		private System.Windows.Forms.Panel bottomPanel;
-		private System.ComponentModel.IContainer components;
-		private System.Windows.Forms.ErrorProvider errorProvider;
-		private System.Windows.Forms.Button cancelButton;
-		private System.Windows.Forms.Button okButton;
-		private System.Windows.Forms.TextBox customNameTextBox;
-		private System.Windows.Forms.Label customNameTextBoxLabel;
-		private System.Windows.Forms.ListBox namesListBox;
-		
-		#endregion
-	
-		/// <summary>
-		/// Adds the names to the list box.
-		/// </summary>
-		void AddNames(string[] names)
-		{
-			foreach (string name in names) {
-				namesListBox.Items.Add(name);
-			}
-		}
-		
-		/// <summary>
-		/// Enables or disables the ok button depending on whether any list 
-		/// item is selected or a custom name has been entered.
-		/// </summary>
-		void UpdateOkButtonState()
-		{
-			okButton.Enabled = IsOkButtonEnabled;
-		}
-		
-		/// <summary>
-		/// Returns whether any items are selected in the list box.
-		/// </summary>
-		bool IsItemSelected {
-			get {
-				return namesListBox.SelectedIndex >= 0;
-			}
-		}
-		
-		bool IsOkButtonEnabled {
-			get {
-				return IsItemSelected || ValidateCustomName();
-			}
-		}
-		
-		/// <summary>
-		/// Returns whether there is a valid string in the custom 
-		/// name text box. The string must be a name that can be used to 
-		/// create an xml element or attribute.
-		/// </summary>
-		bool ValidateCustomName()
-		{
-			string name = customNameTextBox.Text.Trim();
-			if (name.Length > 0) {
-				try {
-					VerifyName(name);
-					errorProvider.Clear();
-					return true;
-				} catch (XmlException ex) {
-					errorProvider.SetError(customNameTextBox, ex.Message);
-				}
-			}
-			return false;
-		}
-		
-		/// <summary>
-		/// Checks that the name would make a valid element name or 
-		/// attribute name. Trying to use XmlConvert and its Verify methods
-		/// so the validation is not done ourselves. XmlDocument has a 
-		/// CheckName method but this is not public.
-		/// </summary>
-		void VerifyName(string name)
-		{
-			// Check the qualification is valid.
-			string[] parts = name.Split(new char[] {':'}, 2);
-			if (parts.Length == 1) {
-				// No colons.
-				XmlConvert.VerifyName(name);
-				return;
-			}
-			
-			string firstPart = parts[0].Trim();
-			string secondPart = parts[1].Trim();
-			if (firstPart.Length > 0 && secondPart.Length > 0) {
-				XmlConvert.VerifyNCName(firstPart);
-				XmlConvert.VerifyNCName(secondPart);
-			} else {
-				// Throw an error using VerifyNCName since the
-				// qualified name parts have no strings.
-				XmlConvert.VerifyNCName(name);
-			}
-		}
-		
-		/// <summary>
-		/// Sets the control's text using string resources.
-		/// </summary>
-		void InitStrings()
-		{
-			okButton.Text = StringParser.Parse("${res:Global.OKButtonText}");
-			cancelButton.Text = StringParser.Parse("${res:Global.CancelButtonText}");
-		}
-		
-		/// <summary>
-		/// Removes the names list box from the dialog, re-positions the
-		/// remaining controls and resizes the dialog to fit.
-		/// </summary>
-		void RemoveNamesListBox()
-		{
-			using (namesListBox) {
-				Controls.Remove(namesListBox);
-				
-				// Reset the dialog's minimum size first so setting the
-				// ClientSize to something smaller works as expected.
-				MinimumSize = Size.Empty;
-				ClientSize = bottomPanel.Size;
-				MinimumSize = Size;
-				
-				// Make sure bottom panel fills the dialog when it is resized.
-				bottomPanel.Dock = DockStyle.Fill;
-			}
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/AssignStylesheetCommand.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/AssignStylesheetCommand.cs
deleted file mode 100644
index fba80cdd21..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/AssignStylesheetCommand.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Windows.Forms;
-using ICSharpCode.Core;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Allows the user to browse for an XSLT stylesheet.  The selected
-	/// stylesheet will be assigned to the currently open xml file.
-	/// </summary>
-	public class AssignStylesheetCommand : AbstractMenuCommand
-	{
-		public override void Run()
-		{
-			// Get active xml document.
-			XmlView xmlView = XmlView.ActiveXmlView;
-			if (xmlView != null) {
-				
-				// Prompt user for filename.
-				string stylesheetFileName = BrowseForStylesheetFile();
-				
-				// Assign stylesheet.
-				if (stylesheetFileName != null) {
-					xmlView.StylesheetFileName = stylesheetFileName;
-				}
-			}
-		}
-		
-		public static string BrowseForStylesheetFile()
-		{
-			using (OpenFileDialog dialog = new OpenFileDialog()) {
-				dialog.AddExtension = true;
-				dialog.Multiselect = false;
-				dialog.CheckFileExists = true;
-				dialog.Title = ResourceService.GetString("ICSharpCode.XmlEditor.AssignXSLT.Title");
-				
-				AddInTreeNode node = AddInTree.GetTreeNode("/SharpDevelop/Workbench/FileFilter");
-				if (node != null) {
-					
-					string xmlFileFilter = (string)node.BuildChildItem("Xml", null, null);
-					string allFilesFilter = (string)node.BuildChildItem("AllFiles", null, null);
-					string xslFileFilter = (string)node.BuildChildItem("Xsl", null, null);
-					
-					dialog.Filter = String.Concat(xslFileFilter, "|", xmlFileFilter, "|", allFilesFilter);
-					dialog.FilterIndex = 1;
-				}
-				
-				if (dialog.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window) == DialogResult.OK) {
-					return dialog.FileName;
-				}
-			}
-			
-			return null;
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/CodeCompletionPopupCommand.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/CodeCompletionPopupCommand.cs
deleted file mode 100644
index 013a77c1b9..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/CodeCompletionPopupCommand.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using ICSharpCode.TextEditor;
-using ICSharpCode.TextEditor.Actions;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Command executed when the user hits Ctrl+Space
-	/// </summary>
-	public class  CodeCompletionPopupCommand : AbstractEditAction
-	{
-		public override void Execute(TextArea services)
-		{
-			XmlEditorControl editor = services.MotherTextEditorControl as XmlEditorControl;
-			if (editor != null) {
-				editor.ShowCompletionWindow();			
-			}
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/CreateSchemaCommand.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/CreateSchemaCommand.cs
deleted file mode 100644
index 00e677fe8b..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/CreateSchemaCommand.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.IO;
-using ICSharpCode.Core;
-using ICSharpCode.SharpDevelop;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Creates a schema based on the xml in the currently active view.
-	/// </summary>
-	public class CreateSchemaCommand : AbstractMenuCommand
-	{
-		public CreateSchemaCommand()
-		{
-		}
-		
-		public override void Run()
-		{
-			// Find active XmlView.
-			XmlView xmlView = XmlView.ActiveXmlView;
-			if (xmlView != null) {
-				// Create a schema based on the xml.
-				string[] schemas = xmlView.InferSchema();
-				if (schemas != null) {
-					// Create a new file for each generated schema.
-					for (int i = 0; i < schemas.Length; ++i) {
-						string fileName = GenerateSchemaFileName(xmlView.TextEditorControl.FileName, i + 1);
-						OpenNewXmlFile(fileName, schemas[i]);
-					}
-				}
-			}
-		}
-		
-		/// <summary>
-		/// Opens a new unsaved xml file in SharpDevelop.
-		/// </summary>
-		void OpenNewXmlFile(string fileName, string xml)
-		{
-			FileService.NewFile(fileName, xml);
-		}
-		
-		/// <summary>
-		/// Generates an xsd filename based on the name of the original xml file.
-		/// </summary>
-		string GenerateSchemaFileName(string xmlFileName, int count)
-		{
-			string baseFileName = Path.GetFileNameWithoutExtension(xmlFileName);
-			string schemaFileName = String.Concat(baseFileName, ".xsd");
-			if (count == 1) {
-				return schemaFileName;
-			}
-			return schemaFileName = String.Concat(baseFileName, count.ToString(), ".xsd");
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/EncodedStringWriter.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/EncodedStringWriter.cs
deleted file mode 100644
index e2b5ca3b27..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/EncodedStringWriter.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.IO;
-using System.Text;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// A string writer that allows you to specify the text encoding to
-	/// be used when generating the string.
-	/// </summary>
-	/// <remarks>
-	/// This class is used when generating xml strings using a writer and
-	/// the encoding in the xml processing instruction needs to be changed.
-	/// The xml encoding string will be the encoding specified in the constructor 
-	/// of this class (i.e. UTF-8, UTF-16)</remarks>
-	public class EncodedStringWriter : StringWriter
-	{
-		Encoding encoding = Encoding.UTF8;
-		
-		/// <summary>
-		/// Creates a new string writer that will generate a string with the
-		/// specified encoding.  
-		/// </summary>
-		/// <remarks>The encoding will be used when generating the 
-		/// xml encoding header (i.e. UTF-8, UTF-16).</remarks>
-		public EncodedStringWriter(Encoding encoding)
-		{
-			this.encoding = encoding;
-		}
-		
-		/// <summary>
-		/// Gets the text encoding that will be used when generating
-		/// the string.
-		/// </summary>
-		public override Encoding Encoding {
-			get {
-				return encoding;
-			}
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/FormatXmlCommand.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/FormatXmlCommand.cs
deleted file mode 100644
index 15ef624d77..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/FormatXmlCommand.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using ICSharpCode.Core;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Pretty prints the xml.
-	/// </summary>
-	public class FormatXmlCommand : AbstractMenuCommand
-	{
-		public override void Run()
-		{
-			// Find active XmlView.
-			XmlView xmlView = XmlView.ActiveXmlView;
-			if (xmlView != null) {
-				xmlView.FormatXml();
-			}
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/GoToSchemaDefinitionCommand.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/GoToSchemaDefinitionCommand.cs
deleted file mode 100644
index 19a85f88b7..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/GoToSchemaDefinitionCommand.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using ICSharpCode.Core;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Finds the definition of the Xml element or attribute under the cursor,
-	/// finds the schema definition for it and then opens the schema and puts the cursor
-	/// on the definition.
-	/// </summary>
-	public class GoToSchemaDefinitionCommand : AbstractMenuCommand
-	{
-		public override void Run()
-		{
-			XmlView view = XmlView.ActiveXmlView;
-			if (view != null) {
-				view.GoToSchemaDefinition();
-			}
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/GoToSchemaDefinitionEditAction.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/GoToSchemaDefinitionEditAction.cs
deleted file mode 100644
index 696c149cff..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/GoToSchemaDefinitionEditAction.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using ICSharpCode.TextEditor;
-using ICSharpCode.TextEditor.Actions;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Finds the schema definition of the Xml element or attribute under the cursor
-	/// when the user presses Control+Enter
-	/// </summary>
-	public class GoToSchemaDefinitionEditAction	: AbstractEditAction
-	{
-		public override void Execute(TextArea services)
-		{
-			GoToSchemaDefinitionCommand goToDefinitionCommand = new GoToSchemaDefinitionCommand();
-			goToDefinitionCommand.Run();
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/IAddXmlNodeDialog.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/IAddXmlNodeDialog.cs
deleted file mode 100644
index cad1e99e4a..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/IAddXmlNodeDialog.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-
-using System;
-using System.Windows.Forms;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Interface for the AddXmlNodeDialog.
-	/// </summary>
-	public interface IAddXmlNodeDialog : IDisposable
-	{
-		/// <summary>
-		/// The names that should be added. These are the
-		/// names that the user selected in the dialog when
-		/// it was closed.
-		/// </summary>
-		string[] GetNames();
-		
-		/// <summary>
-		/// Shows the dialog.
-		/// </summary>
-		DialogResult ShowDialog();
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/IXmlTreeView.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/IXmlTreeView.cs
deleted file mode 100644
index 5dc3056cfb..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/IXmlTreeView.cs
+++ /dev/null
@@ -1,201 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Xml;
-
-namespace ICSharpCode.XmlEditor
-{
-	public interface IXmlTreeView
-	{
-		/// <summary>
-		/// Displays an error message indicating that the xml tree view
-		/// could not display the xml since the xml is not well formed.
-		/// </summary>
-		/// <param name="ex">The exception that occurred when the xml
-		/// was loaded.</param>
-		void ShowXmlIsNotWellFormedMessage(XmlException ex);
-	
-		/// <summary>
-		/// Displays an error message.
-		/// </summary>
-		void ShowErrorMessage(string message);
-		
-		/// <summary>
-		/// Gets or sets whether this view needs saving.
-		/// </summary>
-		bool IsDirty {get; set;}
-		
-		/// <summary>
-		/// Gets or sets the xml document.
-		/// </summary>
-		XmlDocument Document {get; set;}
-		
-		/// <summary>
-		/// Gets the selected node in the tree.
-		/// </summary>
-		XmlNode SelectedNode {get;}
-		
-		/// <summary>
-		/// Gets the xml element selected.
-		/// </summary>
-		XmlElement SelectedElement {get;}
-		
-		/// <summary>
-		/// Shows the attributes for the selected xml element in the view.
-		/// </summary>
-		void ShowAttributes(XmlAttributeCollection attributes);
-		
-		/// <summary>
-		/// Removes the attributes from the view.
-		/// </summary>
-		void ClearAttributes();
-		
-		/// <summary>
-		/// Shows the xml element text content.
-		/// </summary>
-		void ShowTextContent(string text);
-		
-		/// <summary>
-		/// Gets or sets the text content currently on display. The
-		/// text content will not be displayed unless 
-		/// ShowTextContent has been called.
-		/// </summary>
-		string TextContent {get; set;}
-		
-		/// <summary>
-		/// Gets the xml element text node.
-		/// </summary>
-		XmlText SelectedTextNode {get;}
-
-		/// <summary>
-		/// Shows the add attribute dialog and allows the user
-		/// to select a new attribute to be added to the selected
-		/// xml element.
-		/// </summary>
-		/// <param name="attributes">The list of attributes to
-		/// be displayed to the user.</param>
-		/// <returns>The attributes selected; otherwise an empty 
-		/// collection.</returns>
-		string[] SelectNewAttributes(string[] attributes);
-		
-		/// <summary>
-		/// Gets the name of the selected attribute.
-		/// </summary>
-		string SelectedAttribute {get;}
-		
-		/// <summary>
-		/// Shows the add element dialog and allows the user
-		/// to select a new element to be added to the selected
-		/// xml element, either added as a child, inserted before
-		/// or after.
-		/// </summary>
-		/// <param name="attributes">The list of elements to
-		/// be displayed to the user.</param>
-		/// <returns>The attributes elements; otherwise an empty 
-		/// collection.</returns>
-		string[] SelectNewElements(string[] elements);
-		
-		/// <summary>
-		/// Appends the child element to the currently selected element.
-		/// </summary>
-		void AppendChildElement(XmlElement element);
-		
-		/// <summary>
-		/// Inserts the specified element before the currently selected
-		/// element.
-		/// </summary>
-		void InsertElementBefore(XmlElement element);
-		
-		/// <summary>
-		/// Inserts the specified element after the currently selected
-		/// element.
-		/// </summary>
-		void InsertElementAfter(XmlElement element);
-		
-		/// <summary>
-		/// Removes the specified element from the tree.
-		/// </summary>
-		void RemoveElement(XmlElement element);
-		
-		/// <summary>
-		/// Informs the view that the specified node has been selected
-		/// to be cut from the tree. The view can then update its display
-		/// to inform the user that the node has been cut.
-		/// </summary>
-		void ShowCut(XmlNode node);
-		
-		/// <summary>
-		/// Informs the view that the visual indication of the cut should
-		/// be cleared.
-		/// </summary>
-		void HideCut(XmlNode node);
-		
-		/// <summary>
-		/// Appends a new child text node to the currently selected
-		/// element.
-		/// </summary>
-		void AppendChildTextNode(XmlText textNode);
-		
-		/// <summary>
-		/// Inserts a new child text node before the currently
-		/// selected node.
-		/// </summary>
-		void InsertTextNodeBefore(XmlText textNode);
-		
-		/// <summary>
-		/// Inserts a new child text node after the currently
-		/// selected node.
-		/// </summary>
-		void InsertTextNodeAfter(XmlText textNode);
-		
-		/// <summary>
-		/// Removes the currently selected text node.
-		/// </summary>
-		void RemoveTextNode(XmlText textNode);
-		
-		/// <summary>
-		/// Informs the xml tree view that the text node
-		/// has changed and the corresponding tree node
-		/// needs to be updated.
-		/// </summary>
-		void UpdateTextNode(XmlText textNode);
-		
-		/// <summary>
-		/// Gets the currently selected comment node.
-		/// </summary>
-		XmlComment SelectedComment {get;}
-		
-		/// <summary>
-		/// Informs the xml tree view that the comment node
-		/// has changed and the corresponding tree node
-		/// needs to be updated.
-		/// </summary>
-		void UpdateComment(XmlComment comment);
-		
-		/// <summary>
-		/// Appends a new child comment to the currently selected
-		/// element.
-		/// </summary>
-		void AppendChildComment(XmlComment comment);
-		
-		/// <summary>
-		/// Removes the specified comment node from the view.
-		/// </summary>
-		void RemoveComment(XmlComment comment);
-		
-		/// <summary>
-		/// Inserts the comment before the currently selected node.
-		/// </summary>
-		void InsertCommentBefore(XmlComment comment);
-		
-		/// <summary>
-		/// Inserts the comment after the currently selected node.
-		/// </summary>
-		void InsertCommentAfter(XmlComment comment);
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/InsertCommentAfterCommand.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/InsertCommentAfterCommand.cs
deleted file mode 100644
index 2a5154324f..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/InsertCommentAfterCommand.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using ICSharpCode.Core;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Inserts a new comment node after the selected node.
-	/// </summary>
-	public class InsertCommentAfterCommand : AbstractMenuCommand
-	{		
-		public override void Run()
-		{
-			XmlTreeViewContainerControl view = Owner as XmlTreeViewContainerControl;
-			if (view != null) {
-				view.InsertCommentAfter();
-			}
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/InsertCommentBeforeCommand.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/InsertCommentBeforeCommand.cs
deleted file mode 100644
index ee4f0d7634..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/InsertCommentBeforeCommand.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using ICSharpCode.Core;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Inserts a new comment node before the selected node.
-	/// </summary>
-	public class InsertCommentBeforeCommand : AbstractMenuCommand
-	{		
-		public override void Run()
-		{
-			XmlTreeViewContainerControl view = Owner as XmlTreeViewContainerControl;
-			if (view != null) {
-				view.InsertCommentBefore();
-			}
-		}
-	}
-}
-
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/InsertElementAfterCommand.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/InsertElementAfterCommand.cs
deleted file mode 100644
index 97a60634be..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/InsertElementAfterCommand.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using ICSharpCode.Core;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Inserts a child element after the selected element in the XML tree.
-	/// </summary>
-	public class InsertElementAfterCommand : AbstractMenuCommand
-	{		
-		public override void Run()
-		{
-			XmlTreeViewContainerControl view = Owner as XmlTreeViewContainerControl;
-			if (view != null) {
-				view.InsertElementAfter();
-			}
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/InsertElementBeforeCommand.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/InsertElementBeforeCommand.cs
deleted file mode 100644
index 44a2b11ee7..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/InsertElementBeforeCommand.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using ICSharpCode.Core;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Inserts a child element before the selected element in the XML tree.
-	/// </summary>
-	public class InsertElementBeforeCommand : AbstractMenuCommand
-	{		
-		public override void Run()
-		{
-			XmlTreeViewContainerControl view = Owner as XmlTreeViewContainerControl;
-			if (view != null) {
-				view.InsertElementBefore();
-			}
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/InsertTextNodeAfterCommand.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/InsertTextNodeAfterCommand.cs
deleted file mode 100644
index fe94f3b17d..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/InsertTextNodeAfterCommand.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using ICSharpCode.Core;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Inserts a new text node to after the selected node.
-	/// </summary>
-	public class InsertTextNodeAfterCommand : AbstractMenuCommand
-	{		
-		public override void Run()
-		{
-			XmlTreeViewContainerControl view = Owner as XmlTreeViewContainerControl;
-			if (view != null) {
-				view.InsertTextNodeAfter();
-			}
-		}
-	}
-}
-
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/InsertTextNodeBeforeCommand.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/InsertTextNodeBeforeCommand.cs
deleted file mode 100644
index d9214f8ded..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/InsertTextNodeBeforeCommand.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using ICSharpCode.Core;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Inserts a new text node to before the selected node.
-	/// </summary>
-	public class InsertTextNodeBeforeCommand : AbstractMenuCommand
-	{		
-		public override void Run()
-		{
-			XmlTreeViewContainerControl view = Owner as XmlTreeViewContainerControl;
-			if (view != null) {
-				view.InsertTextNodeBefore();
-			}
-		}
-	}
-}
-
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/OpenStylesheetCommand.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/OpenStylesheetCommand.cs
deleted file mode 100644
index 93a357fc95..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/OpenStylesheetCommand.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using ICSharpCode.Core;
-using ICSharpCode.SharpDevelop;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Opens the stylesheet associated with the active XML document.
-	/// </summary>
-	public class OpenStylesheetCommand : AbstractMenuCommand
-	{
-		public override void Run()
-		{
-			XmlView xmlView = XmlView.ActiveXmlView;
-			if (xmlView != null) {
-				if (xmlView.StylesheetFileName != null) {
-					try {
-						FileService.OpenFile(xmlView.StylesheetFileName);
-					} catch (Exception ex) {
-						MessageService.ShowError(ex);
-					}
-				}
-			}
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/Parser.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/Parser.cs
deleted file mode 100644
index 7fa19b7639..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/Parser.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using ICSharpCode.SharpDevelop.Dom;
-using ICSharpCode.SharpDevelop.Project;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Parser that does nothing except return empty compilation unit
-	/// classes so the XmlFoldingStrategy is executed.
-	/// </summary>
-	public class Parser : IParser
-	{
-		public Parser()
-		{
-		}
-		
-		#region IParser interface
-		public string[] LexerTags {
-			get {
-				return null;
-			}
-			set {
-			}
-		}
-		
-		public LanguageProperties Language {
-			get {
-				return null;
-			}
-		}
-		
-		public IExpressionFinder CreateExpressionFinder(string fileName)
-		{
-			return null;
-		}
-		
-		public IResolver CreateResolver()
-		{
-			return null;
-		}
-		
-		public ICompilationUnit Parse(IProjectContent projectContent, string fileName, string fileContent)
-		{
-			DefaultCompilationUnit compilationUnit = new DefaultCompilationUnit(projectContent);
-			compilationUnit.FileName = fileName;
-			return compilationUnit;
-		}
-		
-		public bool CanParse(IProject project)
-		{
-			return false;
-		}
-		
-		public bool CanParse(string fileName)
-		{
-			return XmlView.IsFileNameHandled(fileName);
-		}
-		#endregion
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/QualifiedName.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/QualifiedName.cs
deleted file mode 100644
index 6cab26b486..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/QualifiedName.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Xml;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// An <see cref="XmlQualifiedName"/> with the namespace prefix.
-	/// </summary>
-	/// <remarks>
-	/// The namespace prefix active for a namespace is 
-	/// needed when an element is inserted via autocompletion. This
-	/// class just adds this extra information alongside the 
-	/// <see cref="XmlQualifiedName"/>.
-	/// </remarks>
-	public class QualifiedName
-	{
-		XmlQualifiedName xmlQualifiedName = XmlQualifiedName.Empty;
-		string prefix = String.Empty;
-		
-		public QualifiedName()
-		{
-		}
-		
-		public QualifiedName(string name, string namespaceUri)
-			: this(name, namespaceUri, String.Empty)
-		{
-		}
-		
-		public QualifiedName(string name, string namespaceUri, string prefix)
-		{
-			xmlQualifiedName = new XmlQualifiedName(name, namespaceUri);
-			this.prefix = prefix;
-		}
-		
-		public static bool operator ==(QualifiedName lhs, QualifiedName rhs)
-		{
-			bool equals = false;
-			
-			if (((object)lhs != null) && ((object)rhs != null)) {
-				equals = lhs.Equals(rhs);
-			} else if (((object)lhs == null) && ((object)rhs == null)) {
-				equals = true;
-			}
-			
-			return equals;
-		}
-		
-		public static bool operator !=(QualifiedName lhs, QualifiedName rhs)
-		{
-			return !(lhs == rhs);
-		}		
-		
-		/// <summary>
-		/// A qualified name is considered equal if the namespace and 
-		/// name are the same.  The prefix is ignored.
-		/// </summary>
-		public override bool Equals(object obj) 
-		{
-			bool equals = false;
-			
-			QualifiedName qualifiedName = obj as QualifiedName;
-			if (qualifiedName != null) {
-				equals = xmlQualifiedName.Equals(qualifiedName.xmlQualifiedName);
-			} else {
-				XmlQualifiedName name = obj as XmlQualifiedName;
-				if (name != null) {
-					equals = xmlQualifiedName.Equals(name);
-				}
-			}
-			
-			return equals;
-		}
-		
-		public override int GetHashCode() 
-		{
-			return xmlQualifiedName.GetHashCode();
-		}
-		
-		/// <summary>
-		/// Gets the namespace of the qualified name.
-		/// </summary>
-		public string Namespace {
-			get { return xmlQualifiedName.Namespace; }
-			set { xmlQualifiedName = new XmlQualifiedName(xmlQualifiedName.Name, value); }
-		}
-		
-		/// <summary>
-		/// Gets the name of the element.
-		/// </summary>
-		public string Name {
-			get { return xmlQualifiedName.Name; }
-			set { xmlQualifiedName = new XmlQualifiedName(value, xmlQualifiedName.Namespace); }
-		}
-		
-		/// <summary>
-		/// Gets the namespace prefix used.
-		/// </summary>
-		public string Prefix {
-			get { return prefix; }
-			set { prefix = value; }
-		}
-		
-		/// <summary>
-		/// Returns a string that represents the QualifiedName.
-		/// </summary>
-		public override string ToString()
-		{			
-			if (xmlQualifiedName.Namespace.Length > 0) {
-				string prefixToString = String.Empty;
-				if (!String.IsNullOrEmpty(prefix)) {
-					prefixToString = prefix + ":";
-				}
-				return String.Concat(prefixToString, xmlQualifiedName.Name, " [", xmlQualifiedName.Namespace, "]");
-			} else if (!String.IsNullOrEmpty(prefix)) {
-				return prefix + ":" + xmlQualifiedName.Name;
-			}
-			return xmlQualifiedName.Name;
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/QualifiedNameCollection.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/QualifiedNameCollection.cs
deleted file mode 100644
index c254ea0136..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/QualifiedNameCollection.cs
+++ /dev/null
@@ -1,270 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Collections;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	///   A collection that stores <see cref='QualifiedName'/> objects.
-	/// </summary>
-	[Serializable()]
-	public class QualifiedNameCollection : CollectionBase {
-		
-		/// <summary>
-		///   Initializes a new instance of <see cref='QualifiedNameCollection'/>.
-		/// </summary>
-		public QualifiedNameCollection()
-		{
-		}
-		
-		/// <summary>
-		///   Initializes a new instance of <see cref='QualifiedNameCollection'/> based on another <see cref='QualifiedNameCollection'/>.
-		/// </summary>
-		/// <param name='val'>
-		///   A <see cref='QualifiedNameCollection'/> from which the contents are copied
-		/// </param>
-		public QualifiedNameCollection(QualifiedNameCollection val)
-		{
-			this.AddRange(val);
-		}
-		
-		/// <summary>
-		///   Initializes a new instance of <see cref='QualifiedNameCollection'/> containing any array of <see cref='QualifiedName'/> objects.
-		/// </summary>
-		/// <param name='val'>
-		///       A array of <see cref='QualifiedName'/> objects with which to intialize the collection
-		/// </param>
-		public QualifiedNameCollection(QualifiedName[] val)
-		{
-			this.AddRange(val);
-		}
-		
-		/// <summary>
-		///   Represents the entry at the specified index of the <see cref='QualifiedName'/>.
-		/// </summary>
-		/// <param name='index'>The zero-based index of the entry to locate in the collection.</param>
-		/// <value>The entry at the specified index of the collection.</value>
-		/// <exception cref='ArgumentOutOfRangeException'><paramref name='index'/> is outside the valid range of indexes for the collection.</exception>
-		public QualifiedName this[int index] {
-			get {
-				return ((QualifiedName)(List[index]));
-			}
-			set {
-				List[index] = value;
-			}
-		}
-		
-		/// <summary>
-		///   Adds a <see cref='QualifiedName'/> with the specified value to the 
-		///   <see cref='QualifiedNameCollection'/>.
-		/// </summary>
-		/// <param name='val'>The <see cref='QualifiedName'/> to add.</param>
-		/// <returns>The index at which the new element was inserted.</returns>
-		/// <seealso cref='QualifiedNameCollection.AddRange'/>
-		public int Add(QualifiedName val)
-		{
-			return List.Add(val);
-		}
-		
-		/// <summary>
-		///   Copies the elements of an array to the end of the <see cref='QualifiedNameCollection'/>.
-		/// </summary>
-		/// <param name='val'>
-		///    An array of type <see cref='QualifiedName'/> containing the objects to add to the collection.
-		/// </param>
-		/// <seealso cref='QualifiedNameCollection.Add'/>
-		public void AddRange(QualifiedName[] val)
-		{
-			for (int i = 0; i < val.Length; i++) {
-				this.Add(val[i]);
-			}
-		}
-		
-		/// <summary>
-		///   Adds the contents of another <see cref='QualifiedNameCollection'/> to the end of the collection.
-		/// </summary>
-		/// <param name='val'>
-		///    A <see cref='QualifiedNameCollection'/> containing the objects to add to the collection.
-		/// </param>
-		/// <seealso cref='QualifiedNameCollection.Add'/>
-		public void AddRange(QualifiedNameCollection val)
-		{
-			for (int i = 0; i < val.Count; i++)
-			{
-				this.Add(val[i]);
-			}
-		}
-		
-		/// <summary>
-		///   Gets a value indicating whether the 
-		///    <see cref='QualifiedNameCollection'/> contains the specified <see cref='QualifiedName'/>.
-		/// </summary>
-		/// <param name='val'>The <see cref='QualifiedName'/> to locate.</param>
-		/// <returns>
-		/// <see langword='true'/> if the <see cref='QualifiedName'/> is contained in the collection; 
-		///   otherwise, <see langword='false'/>.
-		/// </returns>
-		/// <seealso cref='QualifiedNameCollection.IndexOf'/>
-		public bool Contains(QualifiedName val)
-		{
-			return List.Contains(val);
-		}
-		
-		/// <summary>
-		///   Copies the <see cref='QualifiedNameCollection'/> values to a one-dimensional <see cref='Array'/> instance at the 
-		///    specified index.
-		/// </summary>
-		/// <param name='array'>The one-dimensional <see cref='Array'/> that is the destination of the values copied from <see cref='QualifiedNameCollection'/>.</param>
-		/// <param name='index'>The index in <paramref name='array'/> where copying begins.</param>
-		/// <exception cref='ArgumentException'>
-		///   <para><paramref name='array'/> is multidimensional.</para>
-		///   <para>-or-</para>
-		///   <para>The number of elements in the <see cref='QualifiedNameCollection'/> is greater than
-		///         the available space between <paramref name='arrayIndex'/> and the end of
-		///         <paramref name='array'/>.</para>
-		/// </exception>
-		/// <exception cref='ArgumentNullException'><paramref name='array'/> is <see langword='null'/>. </exception>
-		/// <exception cref='ArgumentOutOfRangeException'><paramref name='arrayIndex'/> is less than <paramref name='array'/>'s lowbound. </exception>
-		/// <seealso cref='Array'/>
-		public void CopyTo(QualifiedName[] array, int index)
-		{
-			List.CopyTo(array, index);
-		}
-		
-		/// <summary>
-		///    Returns the index of a <see cref='QualifiedName'/> in 
-		///       the <see cref='QualifiedNameCollection'/>.
-		/// </summary>
-		/// <param name='val'>The <see cref='QualifiedName'/> to locate.</param>
-		/// <returns>
-		///   The index of the <see cref='QualifiedName'/> of <paramref name='val'/> in the 
-		///   <see cref='QualifiedNameCollection'/>, if found; otherwise, -1.
-		/// </returns>
-		/// <seealso cref='QualifiedNameCollection.Contains'/>
-		public int IndexOf(QualifiedName val)
-		{
-			return List.IndexOf(val);
-		}
-		
-		/// <summary>
-		///   Inserts a <see cref='QualifiedName'/> into the <see cref='QualifiedNameCollection'/> at the specified index.
-		/// </summary>
-		/// <param name='index'>The zero-based index where <paramref name='val'/> should be inserted.</param>
-		/// <param name='val'>The <see cref='QualifiedName'/> to insert.</param>
-		/// <seealso cref='QualifiedNameCollection.Add'/>
-		public void Insert(int index, QualifiedName val)
-		{
-			List.Insert(index, val);
-		}
-		
-		/// <summary>
-		///  Returns an enumerator that can iterate through the <see cref='QualifiedNameCollection'/>.
-		/// </summary>
-		/// <seealso cref='IEnumerator'/>
-		public new QualifiedNameEnumerator GetEnumerator()
-		{
-			return new QualifiedNameEnumerator(this);
-		}
-		
-		/// <summary>
-		///   Removes a specific <see cref='QualifiedName'/> from the <see cref='QualifiedNameCollection'/>.
-		/// </summary>
-		/// <param name='val'>The <see cref='QualifiedName'/> to remove from the <see cref='QualifiedNameCollection'/>.</param>
-		/// <exception cref='ArgumentException'><paramref name='val'/> is not found in the Collection.</exception>
-		public void Remove(QualifiedName val)
-		{
-			List.Remove(val);
-		}
-		
-		/// <summary>
-		/// Removes the last item in this collection.
-		/// </summary>
-		public void RemoveLast()
-		{
-			if (Count > 0) {
-				RemoveAt(Count - 1);
-			}
-		}
-		
-		/// <summary>
-		/// Removes the first item in the collection.
-		/// </summary>
-		public void RemoveFirst()
-		{
-			if (Count > 0) {
-				RemoveAt(0);
-			}
-		}
-		
-		/// <summary>
-		/// Gets the namespace prefix of the last item.
-		/// </summary>
-		public string LastPrefix {
-			get {
-				if (Count > 0) {
-					QualifiedName name = this[Count - 1];
-					return name.Prefix;
-				}
-				return String.Empty;
-			}
-		}
-		
-		/// <summary>
-		///   Enumerator that can iterate through a QualifiedNameCollection.
-		/// </summary>
-		/// <seealso cref='IEnumerator'/>
-		/// <seealso cref='QualifiedNameCollection'/>
-		/// <seealso cref='QualifiedName'/>
-		public class QualifiedNameEnumerator : IEnumerator
-		{
-			IEnumerator baseEnumerator;
-			IEnumerable temp;
-			
-			/// <summary>
-			///   Initializes a new instance of <see cref='QualifiedNameEnumerator'/>.
-			/// </summary>
-			public QualifiedNameEnumerator(QualifiedNameCollection mappings)
-			{
-				this.temp = ((IEnumerable)(mappings));
-				this.baseEnumerator = temp.GetEnumerator();
-			}
-			
-			/// <summary>
-			///   Gets the current <see cref='QualifiedName'/> in the <seealso cref='QualifiedNameCollection'/>.
-			/// </summary>
-			public QualifiedName Current {
-				get {
-					return ((QualifiedName)(baseEnumerator.Current));
-				}
-			}
-			
-			object IEnumerator.Current {
-				get {
-					return baseEnumerator.Current;
-				}
-			}
-			
-			/// <summary>
-			///   Advances the enumerator to the next <see cref='QualifiedName'/> of the <see cref='QualifiedNameCollection'/>.
-			/// </summary>
-			public bool MoveNext()
-			{
-				return baseEnumerator.MoveNext();
-			}
-			
-			/// <summary>
-			///   Sets the enumerator to its initial position, which is before the first element in the <see cref='QualifiedNameCollection'/>.
-			/// </summary>
-			public void Reset()
-			{
-				baseEnumerator.Reset();
-			}
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/RemoveAttributeCommand.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/RemoveAttributeCommand.cs
deleted file mode 100644
index a1c4b2e82d..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/RemoveAttributeCommand.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using ICSharpCode.Core;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Removes the selected attribute from the xml document being 
-	/// displayed in the XML tree.
-	/// </summary>
-	public class RemoveAttributeCommand : AbstractMenuCommand
-	{
-		public override void Run()
-		{
-			XmlTreeViewContainerControl view = Owner as XmlTreeViewContainerControl;
-			if (view != null) {
-				view.RemoveAttribute();
-			}
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/RemoveXPathHighlightingCommand.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/RemoveXPathHighlightingCommand.cs
deleted file mode 100644
index 6233c3d9f0..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/RemoveXPathHighlightingCommand.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using ICSharpCode.Core;
-
-namespace ICSharpCode.XmlEditor
-{
-	public class RemoveXPathHighlightingCommand : AbstractMenuCommand
-	{
-		public override void Run()
-		{
-			XPathQueryPad pad = XPathQueryPad.Instance;
-			if (pad != null) {
-				pad.RemoveXPathHighlighting();
-			}
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/RunXslTransformCommand.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/RunXslTransformCommand.cs
deleted file mode 100644
index 47637474e2..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/RunXslTransformCommand.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.IO;
-using ICSharpCode.Core;
-using ICSharpCode.SharpDevelop;
-using ICSharpCode.SharpDevelop.Gui;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Runs an XSL transform on an xml document.
-	/// </summary>
-	public class RunXslTransformCommand : AbstractCommand
-	{
-		/// <summary>
-		/// Runs the transform on the xml file using the assigned stylesheet.
-		/// If no stylesheet is assigned the user is prompted to choose one.
-		/// If the view represents a stylesheet that is currently assigned to an
-		/// opened document then run the transform on that document.
-		/// </summary>
-		public override void Run()
-		{
-			XmlView xmlView = XmlView.ActiveXmlView;
-			if (xmlView != null) {
-				
-				if (xmlView is XslOutputView) {
-					return;
-				}
-				
-				// Check to see if this view is actually a referenced stylesheet.
-				if (!string.IsNullOrEmpty(xmlView.PrimaryFileName)) {
-					XmlView associatedXmlView = GetAssociatedXmlView(xmlView.PrimaryFileName);
-					if (associatedXmlView != null) {
-						LoggingService.Debug("Using associated xml view.");
-						xmlView = associatedXmlView;
-					}
-				}
-				
-				// Assign a stylesheet.
-				if (xmlView.StylesheetFileName == null) {
-					xmlView.StylesheetFileName = AssignStylesheetCommand.BrowseForStylesheetFile();
-				}
-				
-				if (xmlView.StylesheetFileName != null) {
-					try {
-						xmlView.RunXslTransform(GetStylesheetContent(xmlView.StylesheetFileName));
-					} catch (Exception ex) {
-						MessageService.ShowError(ex);
-					}
-				}
-			}
-		}
-		
-		/// <summary>
-		/// Gets the xml view that is currently referencing the
-		/// specified stylesheet view.
-		/// </summary>
-		XmlView GetAssociatedXmlView(string stylesheetFileName)
-		{
-			foreach (IViewContent content in WorkbenchSingleton.Workbench.ViewContentCollection) {
-				XmlView view = content as XmlView;
-				if (view != null && view.StylesheetFileName != null) {
-					if (FileUtility.IsEqualFileName(view.StylesheetFileName, stylesheetFileName)) {
-						return view;
-					}
-				}
-			}
-			return null;
-		}
-		
-		string GetStylesheetContent(string fileName)
-		{
-			// File already open?
-			XmlView view = FileService.GetOpenFile(fileName) as XmlView;
-			if (view != null) {
-				return view.Text;
-			}
-			
-			// Read in file contents.
-			StreamReader reader = new StreamReader(fileName, true);
-			return reader.ReadToEnd();
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/SelectXmlSchemaForm.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/SelectXmlSchemaForm.cs
deleted file mode 100644
index f5ce96e638..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/SelectXmlSchemaForm.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Windows.Forms;
-using ICSharpCode.Core;
-using ICSharpCode.SharpDevelop.Gui.XmlForms;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Allows the use to choose a schema from the schemas that SharpDevelop 
-	/// knows about.
-	/// </summary>
-	public class SelectXmlSchemaForm : XmlForm
-	{
-		ListBox schemaListBox;
-		string NoSchemaSelectedText = String.Empty;
-		
-		public SelectXmlSchemaForm(string[] namespaces)
-		{
-			Initialize();
-			PopulateListBox(namespaces);
-		}
-		
-		/// <summary>
-		/// Gets or sets the selected schema namesace.
-		/// </summary>
-		public string SelectedNamespaceUri {
-			get {
-				string namespaceUri = schemaListBox.Text;
-				if (namespaceUri == NoSchemaSelectedText) {
-					namespaceUri = String.Empty;
-				}
-				return namespaceUri;
-			}
-			
-			set {
-				int index = 0;
-				if (value.Length > 0) {
-					index = schemaListBox.Items.IndexOf(value);
-				} 
-				
-				// Select the option representing "no schema" if 
-				// the value does not exist in the list box.
-				if (index == -1) {
-					index = 0;
-				}
-				
-				schemaListBox.SelectedIndex = index;
-			}
-		}
-		
-		protected override void SetupXmlLoader()
-		{
-			xmlLoader.StringValueFilter    = new SharpDevelopStringValueFilter();
-			xmlLoader.PropertyValueCreator = new SharpDevelopPropertyValueCreator();
-		}
-		
-		void Initialize()
-		{
-			SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("ICSharpCode.XmlEditor.Resources.SelectXmlSchema.xfrm"));
-			
-			NoSchemaSelectedText = StringParser.Parse("${res:Dialog.Options.IDEOptions.TextEditor.Behaviour.IndentStyle.None}");
-			
-			schemaListBox = (ListBox)ControlDictionary["schemaListBox"];
-			
-			AcceptButton = (Button)ControlDictionary["okButton"];
-			CancelButton = (Button)ControlDictionary["cancelButton"];
-			AcceptButton.DialogResult = DialogResult.OK;
-		}
-		
-		void PopulateListBox(string[] namespaces)
-		{
-			foreach (string schemaNamespace in namespaces) {
-				schemaListBox.Items.Add(schemaNamespace);
-			}
-			
-			// Add the "None" string at the top of the list.
-			schemaListBox.Sorted = true;
-			schemaListBox.Sorted = false;
-			
-			schemaListBox.Items.Insert(0, NoSchemaSelectedText);
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/StylesheetAssignedCondition.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/StylesheetAssignedCondition.cs
deleted file mode 100644
index 16b425b811..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/StylesheetAssignedCondition.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using ICSharpCode.Core;
-using ICSharpCode.SharpDevelop.Gui;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Determines whether the active XML document has been assigned
-	/// an XSLT stylesheet.
-	/// </summary>
-	public class StylesheetAssignedCondition : IConditionEvaluator
-	{
-		public bool IsValid(object caller, Condition condition)
-		{
-			IWorkbenchWindow window = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow;
-			if (window != null) {
-				XmlView view = window.ActiveViewContent as XmlView;
-				if (view != null) {
-					return view.StylesheetFileName != null;
-				}
-			}
-			return false;
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/ValidateXmlCommand.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/ValidateXmlCommand.cs
deleted file mode 100644
index 241ebefb0a..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/ValidateXmlCommand.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using ICSharpCode.Core;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Validates the xml in the xml editor against the known schemas.
-	/// </summary>
-	public class ValidateXmlCommand : AbstractMenuCommand
-	{
-		/// <summary>
-		/// Validate the xml.
-		/// </summary>
-		public override void Run()
-		{
-			// Find active XmlView.
-			XmlView xmlView = XmlView.ActiveXmlView;
-			if (xmlView != null) {
-				// Validate the xml.
-				xmlView.ValidateXml();
-			}
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XPathNodeMatch.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XPathNodeMatch.cs
deleted file mode 100644
index 74e0cbfacf..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XPathNodeMatch.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Xml;
-using System.Xml.XPath;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Stores an XmlNode and its associated line number and position after an 
-	/// XPath query has been evaluated.
-	/// </summary>
-	public class XPathNodeMatch : IXmlLineInfo
-	{
-		int? lineNumber;
-		int linePosition;
-		string value;
-		string displayValue;
-		XPathNodeType nodeType;
-		
-		/// <summary>
-		/// Creates an XPathNodeMatch from the navigator which should be position on the
-		/// node.
-		/// </summary>
-		/// <remarks>
-		/// We deliberately use the OuterXml when we find a Namespace since the
-		/// navigator location returned starts from the xmlns attribute.
-		/// </remarks>
-		public XPathNodeMatch(XPathNavigator currentNavigator)
-		{
-			SetLineNumbers(currentNavigator as IXmlLineInfo);
-			nodeType = currentNavigator.NodeType;
-			switch (nodeType) {
-				case XPathNodeType.Text:
-					SetTextValue(currentNavigator);
-					break;
-				case XPathNodeType.Comment:
-					SetCommentValue(currentNavigator);
-					break;
-				case XPathNodeType.Namespace:
-					SetNamespaceValue(currentNavigator);
-					break;
-				case XPathNodeType.Element:
-					SetElementValue(currentNavigator);
-					break;
-				case XPathNodeType.ProcessingInstruction:
-					SetProcessingInstructionValue(currentNavigator);
-					break;
-				case XPathNodeType.Attribute:
-					SetAttributeValue(currentNavigator);
-					break;
-				default:
-					value = currentNavigator.LocalName;
-					displayValue = value;
-					break;
-			}
-		}
-		
-		/// <summary>
-		/// Line numbers are zero based.
-		/// </summary>
-		public int LineNumber {
-			get {
-				return lineNumber.GetValueOrDefault(0);
-			}
-		}
-		
-		/// <summary>
-		/// Line positions are zero based.
-		/// </summary>
-		public int LinePosition {
-			get {
-				return linePosition;
-			}
-		}
-		
-		public bool HasLineInfo()
-		{
-			return lineNumber.HasValue;
-		}
-		
-		/// <summary>
-		/// Gets the text value of the node.
-		/// </summary>
-		public string Value {
-			get {
-				return value;
-			}
-		}
-		
-		/// <summary>
-		/// Gets the node display value. This includes the angle brackets if it is
-		/// an element, for example.
-		/// </summary>
-		public string DisplayValue {
-			get {
-				return displayValue;
-			}
-		}
-		
-		public XPathNodeType NodeType {
-			get {
-				return nodeType;
-			}
-		}
-		
-		void SetElementValue(XPathNavigator navigator)
-		{
-			value = navigator.Name;
-			if (navigator.IsEmptyElement) {
-				displayValue = String.Concat("<", value, "/>");
-			} else {
-				displayValue = String.Concat("<", value, ">");
-			}
-		}
-		
-		void SetTextValue(XPathNavigator navigator)
-		{
-			value = navigator.Value;
-			displayValue = value;
-		}
-		
-		void SetCommentValue(XPathNavigator navigator)
-		{
-			value = navigator.Value;
-			displayValue = navigator.OuterXml;
-		}
-		
-		void SetNamespaceValue(XPathNavigator navigator)
-		{
-			value = navigator.OuterXml;
-			displayValue = value;
-		}
-		
-		void SetProcessingInstructionValue(XPathNavigator navigator)
-		{
-			value = navigator.Name;
-			displayValue = navigator.OuterXml;
-		}
-		
-		void SetAttributeValue(XPathNavigator navigator)
-		{
-			value = navigator.Name;
-			displayValue = String.Concat("@", value);
-		}
-		
-		/// <summary>
-		/// Takes one of the xml line number so the numbers are now zero
-		/// based instead of one based.
-		/// </summary>
-		/// <remarks>A namespace query (e.g. //namespace::*) will return
-		/// a line info of -1, -1 for the xml namespace. Which looks like
-		/// a bug in the XPathDocument class.</remarks>
-		void SetLineNumbers(IXmlLineInfo lineInfo)
-		{
-			if (lineInfo.HasLineInfo() && lineInfo.LineNumber > 0) {
-				lineNumber = lineInfo.LineNumber - 1;
-				linePosition = lineInfo.LinePosition - 1;
-			}
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XPathNodeTextMarker.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XPathNodeTextMarker.cs
deleted file mode 100644
index dfa6ae47f3..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XPathNodeTextMarker.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Drawing;
-using ICSharpCode.TextEditor.Document;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// A text marker for an XPath query match.
-	/// </summary>
-	public class XPathNodeTextMarker : TextMarker
-	{	
-		public static readonly Color MarkerBackColor = Color.FromArgb(159, 255, 162);
-		
-		public XPathNodeTextMarker(int offset, XPathNodeMatch node) : base(offset, node.Value.Length, TextMarkerType.SolidBlock, MarkerBackColor)
-		{
-		}
-		
-		/// <summary>
-		/// Adds markers for each XPathNodeMatch.
-		/// </summary>
-		public static void AddMarkers(MarkerStrategy markerStrategy, XPathNodeMatch[] nodes)
-		{
-			foreach (XPathNodeMatch node in nodes) {
-				AddMarker(markerStrategy, node);
-			}
-		}
-		
-		/// <summary>
-		/// Adds a single marker for the XPathNodeMatch.
-		/// </summary>
-		public static void AddMarker(MarkerStrategy markerStrategy, XPathNodeMatch node)
-		{
-			if (node.HasLineInfo() && node.Value.Length > 0) {
-				LineSegment lineSegment = markerStrategy.Document.GetLineSegment(node.LineNumber);
-				markerStrategy.AddMarker(new XPathNodeTextMarker(lineSegment.Offset + node.LinePosition, node));
-			}
-		}
-		
-		/// <summary>
-		/// Removes all the XPathNodeMarkers from the marker strategy.
-		/// </summary>
-		public static void RemoveMarkers(MarkerStrategy markerStrategy)
-		{
-			markerStrategy.RemoveAll(IsXPathNodeTextMarkerMatch);
-		}
-		
-		static bool IsXPathNodeTextMarkerMatch(TextMarker marker)
-		{
-			return marker is XPathNodeTextMarker;
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XPathQueryControl.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XPathQueryControl.cs
deleted file mode 100644
index 634fdbc4a7..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XPathQueryControl.cs
+++ /dev/null
@@ -1,702 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Threading;
-using System.Windows.Forms;
-using System.Xml;
-using System.Xml.XPath;
-
-using ICSharpCode.Core;
-using ICSharpCode.Core.WinForms;
-using ICSharpCode.SharpDevelop;
-using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
-using ICSharpCode.SharpDevelop.Gui;
-using ICSharpCode.TextEditor;
-using ICSharpCode.TextEditor.Document;
-
-namespace ICSharpCode.XmlEditor
-{
-	public class XPathQueryControl : System.Windows.Forms.UserControl, IMementoCapable
-	{		
-		const int ErrorImageIndex = 0;
-		const string NamespacesProperty = "Namespaces";
-		const string PrefixColumnWidthProperty = "NamespacesDataGridView.PrefixColumn.Width";
-		const string MatchColumnWidthProperty = "XPathResultsListView.MatchColumn.Width";
-		const string LineColumnWidthProperty = "XPathResultsListView.LineColumn.Width";
-		const string XPathComboBoxTextProperty = "XPathQuery.LastQuery";
-		const string XPathComboBoxItemsProperty = "XPathQuery.History";
-		
-		/// <summary>
-		/// The filename that the last query was executed on.
-		/// </summary>
-		string fileName = String.Empty;
-		
-		/// <summary>
-		/// The total number of xpath queries to remember.
-		/// </summary>
-		const int xpathQueryHistoryLimit = 20;
-		
-		bool ignoreXPathTextChanges;
-		
-		enum MoveCaret {
-			ByJumping = 1,
-			ByScrolling = 2
-		}
-		
-		public XPathQueryControl()
-		{
-			InitializeComponent();
-			InitStrings();
-			InitImageList();
-			xPathComboBox.KeyDown += XPathComboBoxKeyDown;
-			InitAutoCompleteMode();
-		}
-		
-		/// <summary>
-		/// Adds a namespace to the namespace list.
-		/// </summary>
-		public void AddNamespace(string prefix, string uri)
-		{
-			namespacesDataGridView.Rows.Add(new object[] {prefix, uri});
-		}
-		
-		/// <summary>
-		/// Gets the list of namespaces in the namespace list.
-		/// </summary>
-		public ReadOnlyCollection<XmlNamespace> GetNamespaces()
-		{
-			List<XmlNamespace> namespaces = new List<XmlNamespace>();
-			for (int i = 0; i < namespacesDataGridView.Rows.Count - 1; ++i) {
-				DataGridViewRow row = namespacesDataGridView.Rows[i];
-				string prefix = GetPrefix(row);
-				string uri = GetNamespace(row);
-				if (prefix.Length == 0 && uri.Length == 0) {
-					// Ignore.
-				} else {
-					namespaces.Add(new XmlNamespace(prefix, uri));
-				}
-			}
-			return new ReadOnlyCollection<XmlNamespace>(namespaces);
-		}
-		
-		public DataGridView NamespacesDataGridView {
-			get {
-				return namespacesDataGridView;
-			}
-		}
-		
-		public ListView XPathResultsListView {
-			get {
-				return xPathResultsListView;
-			}
-		}
-		
-		public ComboBox XPathComboBox {
-			get {
-				return xPathComboBox;
-			}
-		}
-		
-		/// <summary>
-		/// Creates a properties object that contains the current state of the
-		/// control.
-		/// </summary>
-		public Properties CreateMemento()
-		{
-			Properties properties = new Properties();
-			
-			// Save namespaces.
-			properties.Set(NamespacesProperty, GetNamespaceStringArray());
-			
-			// Save namespace data grid column widths.
-			properties.Set<int>(PrefixColumnWidthProperty, prefixColumn.Width);
-
-			// Save xpath results list view column widths.
-			properties.Set<int>(MatchColumnWidthProperty, matchColumnHeader.Width);
-			properties.Set<int>(LineColumnWidthProperty, lineColumnHeader.Width);
-
-			// Save xpath query history.
-			properties.Set(XPathComboBoxTextProperty, XPathComboBox.Text);
-			properties.Set(XPathComboBoxItemsProperty, GetXPathHistory());
-			
-			return properties;
-		}
-		
-		/// <summary>
-		/// Reloads the state of the control.
-		/// </summary>
-		public void SetMemento(Properties memento)
-		{
-			ignoreXPathTextChanges = true;
-			
-			try {
-				// Set namespaces.
-				string[] namespaces = memento.Get(NamespacesProperty, new string[0]);
-				foreach (string ns in namespaces) {
-					XmlNamespace xmlNamespace = XmlNamespace.FromString(ns);
-					AddNamespace(xmlNamespace.Prefix, xmlNamespace.Uri);
-				}
-				
-				// Set namespace data grid column widths.
-				prefixColumn.Width = memento.Get<int>(PrefixColumnWidthProperty, 50);
-				
-				// Set xpath results list view column widths.
-				matchColumnHeader.Width = memento.Get<int>(MatchColumnWidthProperty, 432);
-				lineColumnHeader.Width = memento.Get<int>(LineColumnWidthProperty, 60);
-				
-				// Set xpath query history.
-				XPathComboBox.Text = memento.Get(XPathComboBoxTextProperty, String.Empty);
-				string[] xpaths = memento.Get(XPathComboBoxItemsProperty, new string[0]);
-				foreach (string xpath in xpaths) {
-					xPathComboBox.Items.Add(xpath);
-				}
-			} finally {
-				ignoreXPathTextChanges = false;
-			}
-		}
-		
-		/// <summary>
-		/// Called when the active workbench window has changed.
-		/// </summary>
-		public void ActiveWindowChanged()
-		{
-			UpdateQueryButtonState();
-		}
-		
-		/// <summary>
-		/// Removes all the XPath Node markers from all the open documents.
-		/// </summary>
-		public void RemoveXPathNodeTextMarkers()
-		{
-			foreach (IViewContent view in WorkbenchSingleton.Workbench.ViewContentCollection) {
-				ITextEditorControlProvider textEditorProvider = view as ITextEditorControlProvider;
-				if (textEditorProvider != null) {
-					XPathNodeTextMarker.RemoveMarkers(textEditorProvider.TextEditorControl.Document.MarkerStrategy);
-					textEditorProvider.TextEditorControl.Refresh();
-				}
-			}
-		}
-				
-		/// <summary>
-		/// Disposes resources used by the control.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing) {
-				if (components != null) {
-					components.Dispose();
-				}
-			}
-			base.Dispose(disposing);
-		}
-		
-		#region Forms Designer generated code
-		
-		/// <summary>
-		/// Designer variable used to keep track of non-visual components.
-		/// </summary>
-		System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// This method is required for Windows Forms designer support.
-		/// Do not change the method contents inside the source code editor. The Forms designer might
-		/// not be able to load this method if it was changed manually.
-		/// </summary>
-		void InitializeComponent()
-		{
-			this.components = new System.ComponentModel.Container();
-			this.xPathLabel = new System.Windows.Forms.Label();
-			this.xPathComboBox = new System.Windows.Forms.ComboBox();
-			this.queryButton = new System.Windows.Forms.Button();
-			this.tabControl = new System.Windows.Forms.TabControl();
-			this.xPathResultsTabPage = new System.Windows.Forms.TabPage();
-			this.xPathResultsListView = new System.Windows.Forms.ListView();
-			this.matchColumnHeader = new System.Windows.Forms.ColumnHeader();
-			this.lineColumnHeader = new System.Windows.Forms.ColumnHeader();
-			this.imageList = new System.Windows.Forms.ImageList(this.components);
-			this.namespacesTabPage = new System.Windows.Forms.TabPage();
-			this.namespacesDataGridView = new System.Windows.Forms.DataGridView();
-			this.prefixColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.namespaceColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.tabControl.SuspendLayout();
-			this.xPathResultsTabPage.SuspendLayout();
-			this.namespacesTabPage.SuspendLayout();
-			((System.ComponentModel.ISupportInitialize)(this.namespacesDataGridView)).BeginInit();
-			this.SuspendLayout();
-			// 
-			// xPathLabel
-			// 
-			this.xPathLabel.Location = new System.Drawing.Point(3, 3);
-			this.xPathLabel.Name = "xPathLabel";
-			this.xPathLabel.Size = new System.Drawing.Size(46, 19);
-			this.xPathLabel.TabIndex = 0;
-			this.xPathLabel.Text = "XPath:";
-			this.xPathLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-			// 
-			// xPathComboBox
-			// 
-			this.xPathComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-									| System.Windows.Forms.AnchorStyles.Right)));
-			this.xPathComboBox.FormattingEnabled = true;
-			this.xPathComboBox.Location = new System.Drawing.Point(55, 3);
-			this.xPathComboBox.Name = "xPathComboBox";
-			this.xPathComboBox.Size = new System.Drawing.Size(438, 21);
-			this.xPathComboBox.TabIndex = 1;
-			this.xPathComboBox.TextChanged += new System.EventHandler(this.XPathComboBoxTextChanged);
-			this.xPathComboBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.XPathComboBoxKeyDown);
-			// 
-			// queryButton
-			// 
-			this.queryButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-			this.queryButton.Enabled = false;
-			this.queryButton.Location = new System.Drawing.Point(499, 3);
-			this.queryButton.Name = "queryButton";
-			this.queryButton.Size = new System.Drawing.Size(70, 23);
-			this.queryButton.TabIndex = 2;
-			this.queryButton.Text = "Query";
-			this.queryButton.UseVisualStyleBackColor = true;
-			this.queryButton.Click += new System.EventHandler(this.QueryButtonClick);
-			// 
-			// tabControl
-			// 
-			this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-									| System.Windows.Forms.AnchorStyles.Left) 
-									| System.Windows.Forms.AnchorStyles.Right)));
-			this.tabControl.Controls.Add(this.xPathResultsTabPage);
-			this.tabControl.Controls.Add(this.namespacesTabPage);
-			this.tabControl.Location = new System.Drawing.Point(0, 30);
-			this.tabControl.Name = "tabControl";
-			this.tabControl.SelectedIndex = 0;
-			this.tabControl.Size = new System.Drawing.Size(572, 208);
-			this.tabControl.TabIndex = 3;
-			// 
-			// xPathResultsTabPage
-			// 
-			this.xPathResultsTabPage.Controls.Add(this.xPathResultsListView);
-			this.xPathResultsTabPage.Location = new System.Drawing.Point(4, 22);
-			this.xPathResultsTabPage.Name = "xPathResultsTabPage";
-			this.xPathResultsTabPage.Padding = new System.Windows.Forms.Padding(3);
-			this.xPathResultsTabPage.Size = new System.Drawing.Size(564, 182);
-			this.xPathResultsTabPage.TabIndex = 0;
-			this.xPathResultsTabPage.Text = "Results";
-			this.xPathResultsTabPage.UseVisualStyleBackColor = true;
-			// 
-			// xPathResultsListView
-			// 
-			this.xPathResultsListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
-									this.matchColumnHeader,
-									this.lineColumnHeader});
-			this.xPathResultsListView.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.xPathResultsListView.FullRowSelect = true;
-			this.xPathResultsListView.HideSelection = false;
-			this.xPathResultsListView.Location = new System.Drawing.Point(3, 3);
-			this.xPathResultsListView.MultiSelect = false;
-			this.xPathResultsListView.Name = "xPathResultsListView";
-			this.xPathResultsListView.Size = new System.Drawing.Size(558, 176);
-			this.xPathResultsListView.SmallImageList = this.imageList;
-			this.xPathResultsListView.TabIndex = 0;
-			this.xPathResultsListView.UseCompatibleStateImageBehavior = false;
-			this.xPathResultsListView.View = System.Windows.Forms.View.Details;
-			this.xPathResultsListView.ItemActivate += new System.EventHandler(this.XPathResultsListViewItemActivate);
-			this.xPathResultsListView.SelectedIndexChanged += new System.EventHandler(this.XPathResultsListViewSelectedIndexChanged);
-			this.xPathResultsListView.Click += new System.EventHandler(this.XPathResultsListViewClick);
-			// 
-			// matchColumnHeader
-			// 
-			this.matchColumnHeader.Text = "Match";
-			this.matchColumnHeader.Width = 432;
-			// 
-			// lineColumnHeader
-			// 
-			this.lineColumnHeader.Text = "Line";
-			// 
-			// imageList
-			// 
-			this.imageList.ColorDepth = System.Windows.Forms.ColorDepth.Depth32Bit;
-			this.imageList.ImageSize = new System.Drawing.Size(16, 16);
-			this.imageList.TransparentColor = System.Drawing.Color.Transparent;
-			// 
-			// namespacesTabPage
-			// 
-			this.namespacesTabPage.Controls.Add(this.namespacesDataGridView);
-			this.namespacesTabPage.Location = new System.Drawing.Point(4, 22);
-			this.namespacesTabPage.Name = "namespacesTabPage";
-			this.namespacesTabPage.Padding = new System.Windows.Forms.Padding(3);
-			this.namespacesTabPage.Size = new System.Drawing.Size(564, 182);
-			this.namespacesTabPage.TabIndex = 1;
-			this.namespacesTabPage.Text = "Namespaces";
-			this.namespacesTabPage.UseVisualStyleBackColor = true;
-			// 
-			// namespacesDataGridView
-			// 
-			this.namespacesDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-			this.namespacesDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-									this.prefixColumn,
-									this.namespaceColumn});
-			this.namespacesDataGridView.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.namespacesDataGridView.Location = new System.Drawing.Point(3, 3);
-			this.namespacesDataGridView.MultiSelect = false;
-			this.namespacesDataGridView.Name = "namespacesDataGridView";
-			this.namespacesDataGridView.RowHeadersWidth = 25;
-			this.namespacesDataGridView.ShowEditingIcon = false;
-			this.namespacesDataGridView.Size = new System.Drawing.Size(558, 176);
-			this.namespacesDataGridView.TabIndex = 0;
-			// 
-			// prefixColumn
-			// 
-			this.prefixColumn.HeaderText = "Prefix";
-			this.prefixColumn.Name = "prefixColumn";
-			this.prefixColumn.Width = 50;
-			// 
-			// namespaceColumn
-			// 
-			this.namespaceColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-			this.namespaceColumn.HeaderText = "Namespace";
-			this.namespaceColumn.Name = "namespaceColumn";
-			// 
-			// XPathQueryControl
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.Controls.Add(this.tabControl);
-			this.Controls.Add(this.queryButton);
-			this.Controls.Add(this.xPathComboBox);
-			this.Controls.Add(this.xPathLabel);
-			this.Name = "XPathQueryControl";
-			this.Size = new System.Drawing.Size(572, 238);
-			this.tabControl.ResumeLayout(false);
-			this.xPathResultsTabPage.ResumeLayout(false);
-			this.namespacesTabPage.ResumeLayout(false);
-			((System.ComponentModel.ISupportInitialize)(this.namespacesDataGridView)).EndInit();
-			this.ResumeLayout(false);
-		}
-		private System.Windows.Forms.ImageList imageList;
-		private System.Windows.Forms.DataGridViewTextBoxColumn namespaceColumn;
-		private System.Windows.Forms.DataGridViewTextBoxColumn prefixColumn;
-		private System.Windows.Forms.DataGridView namespacesDataGridView;
-		private System.Windows.Forms.ColumnHeader lineColumnHeader;
-		private System.Windows.Forms.ColumnHeader matchColumnHeader;
-		private System.Windows.Forms.ListView xPathResultsListView;
-		private System.Windows.Forms.TabPage namespacesTabPage;
-		private System.Windows.Forms.TabPage xPathResultsTabPage;
-		private System.Windows.Forms.TabControl tabControl;
-		private System.Windows.Forms.Button queryButton;
-		private System.Windows.Forms.ComboBox xPathComboBox;
-		private System.Windows.Forms.Label xPathLabel;
-		
-		#endregion
-		
-		void XPathComboBoxTextChanged(object sender, EventArgs e)
-		{
-			if (!ignoreXPathTextChanges) {
-				UpdateQueryButtonState();
-			}
-		}
-		
-		void UpdateQueryButtonState()
-		{
-			queryButton.Enabled = IsXPathQueryEntered && XmlView.IsXmlViewActive;
-		}
-		
-		bool IsXPathQueryEntered {
-			get {
-				return xPathComboBox.Text.Length > 0;
-			}
-		}
-		
-		void QueryButtonClick(object sender, EventArgs e)
-		{
-			RunXPathQuery();
-		}
-		
-		void RunXPathQuery()
-		{
-			XmlView view = XmlView.ActiveXmlView;
-			if (view == null) {
-				return;
-			}
-			
-			try {
-				MarkerStrategy markerStrategy = view.TextEditorControl.Document.MarkerStrategy;
-				fileName = view.PrimaryFileName;
-			
-				// Clear previous XPath results.
-				ClearResults();
-				XPathNodeTextMarker.RemoveMarkers(markerStrategy);
-
-				// Run XPath query.
-				XPathNodeMatch[] nodes = view.SelectNodes(xPathComboBox.Text, GetNamespaces());
-				if (nodes.Length > 0) {
-					AddXPathResults(nodes);
-					XPathNodeTextMarker.AddMarkers(markerStrategy, nodes);
-				} else {
-					AddNoXPathResult();
-				}
-				AddXPathToHistory();
-			} catch (XPathException xpathEx) {
-				AddErrorResult(xpathEx);
-			} catch (XmlException xmlEx) {
-				AddErrorResult(xmlEx);
-			} finally {
-				BringResultsTabToFront();
-				view.TextEditorControl.Refresh();
-			}
-		}
-	
-		void ClearResults()
-		{
-			xPathResultsListView.Items.Clear();
-		}
-		
-		void BringResultsTabToFront()
-		{
-			tabControl.SelectedTab = tabControl.TabPages[0];
-		}
-		
-		void AddXPathResults(XPathNodeMatch[] nodes)
-		{
-			foreach (XPathNodeMatch node in nodes) {
-				ListViewItem item = new ListViewItem(node.DisplayValue);
-				if (node.HasLineInfo()) {
-					int line = node.LineNumber + 1;
-					item.SubItems.Add(line.ToString());
-				}
-				item.Tag = node;
-				xPathResultsListView.Items.Add(item);
-			}
-		}
-		
-		void AddNoXPathResult()
-		{
-			xPathResultsListView.Items.Add(StringParser.Parse("${res:ICSharpCode.XmlEditor.XPathQueryPad.NoXPathResultsMessage}"));
-		}
-		
-		void AddErrorResult(XmlException ex)
-		{
-			ListViewItem item = new ListViewItem(ex.Message, ErrorImageIndex);
-			item.SubItems.Add(ex.LineNumber.ToString());
-			item.Tag = ex;
-			xPathResultsListView.Items.Add(item);
-		}
-		
-		void AddErrorResult(XPathException ex)
-		{
-			ListViewItem item = new ListViewItem(String.Concat(StringParser.Parse("${res:ICSharpCode.XmlEditor.XPathQueryPad.XPathLabel}"), " ", ex.Message), ErrorImageIndex);
-			item.Tag = ex;
-			xPathResultsListView.Items.Add(item);
-		}
-		
-		void InitImageList()
-		{
-			try {
-				imageList.Images.Add(WinFormsResourceService.GetBitmap("Icons.16x16.Error"));
-			} catch (ResourceNotFoundException) { }
-		}
-		
-		void InitStrings()
-		{
-			lineColumnHeader.Text = StringParser.Parse("${res:CompilerResultView.LineText}");
-			matchColumnHeader.Text = StringParser.Parse("${res:ICSharpCode.XmlEditor.XPathQueryPad.XPathMatchColumnHeaderTitle}");
-			prefixColumn.HeaderText = StringParser.Parse("${res:ICSharpCode.XmlEditor.XPathQueryPad.PrefixColumnHeaderTitle}");
-			namespaceColumn.HeaderText = StringParser.Parse("${res:ICSharpCode.XmlEditor.XPathQueryPad.NamespaceColumnHeaderTitle}");
-			queryButton.Text = StringParser.Parse("${res:ICSharpCode.XmlEditor.XPathQueryPad.QueryButton}");
-			xPathLabel.Text = StringParser.Parse("${res:ICSharpCode.XmlEditor.XPathQueryPad.XPathLabel}");
-			xPathResultsTabPage.Text = StringParser.Parse("${res:ICSharpCode.XmlEditor.XPathQueryPad.ResultsTab}");
-			namespacesTabPage.Text = StringParser.Parse("${res:ICSharpCode.XmlEditor.XPathQueryPad.NamespacesTab}");
-		}
-		
-		void InitAutoCompleteMode()
-		{
-			try {
-				xPathComboBox.AutoCompleteMode = AutoCompleteMode.Suggest;
-				xPathComboBox.AutoCompleteSource = AutoCompleteSource.ListItems;
-			} catch (ThreadStateException) { }
-		}
-		
-		void XPathResultsListViewItemActivate(object sender, EventArgs e)
-		{
-			JumpToResultLocation();
-		}
-		
-		/// <summary>
-		/// Switches focus to the location of the XPath query result.
-		/// </summary>
-		void JumpToResultLocation()
-		{
-			MoveCaretToResultLocation(MoveCaret.ByJumping);
-		}
-		
-		/// <summary>
-		/// Scrolls the text editor so the location of the XPath query results is visible.
-		/// </summary>
-		void ScrollToResultLocation()
-		{
-			MoveCaretToResultLocation(MoveCaret.ByScrolling);
-		}
-		
-		void MoveCaretToResultLocation(MoveCaret moveCaret)
-		{
-			if (xPathResultsListView.SelectedItems.Count > 0) {
-				ListViewItem item = xPathResultsListView.SelectedItems[0];
-				XPathNodeMatch xPathNodeMatch = item.Tag as XPathNodeMatch;
-				XPathException xpathException = item.Tag as XPathException;
-				XmlException xmlException = item.Tag as XmlException;
-				if (xPathNodeMatch != null) {
-					MoveCaretToXPathNodeMatch(moveCaret, xPathNodeMatch);
-				} else if (xmlException != null) {
-					MoveCaretToXmlException(moveCaret, xmlException);
-				} else if (xpathException != null && moveCaret == MoveCaret.ByJumping) {
-					xPathComboBox.Focus();
-				}
-			}
-		}
-		
-		void MoveCaretToXPathNodeMatch(MoveCaret moveCaret, XPathNodeMatch node)
-		{
-			if (moveCaret == MoveCaret.ByJumping) {
-				JumpTo(fileName, node.LineNumber, node.LinePosition);
-			} else {
-				ScrollTo(fileName, node.LineNumber, node.LinePosition, node.Value.Length);
-			}
-		}
-		
-		void MoveCaretToXmlException(MoveCaret moveCaret, XmlException ex)
-		{
-			int line =  ex.LineNumber - 1;
-			int column = ex.LinePosition - 1;
-			if (moveCaret == MoveCaret.ByJumping) {
-				JumpTo(fileName, line, column);
-			} else {
-				ScrollTo(fileName, line, column);
-			}
-		}
-		
-		void JumpTo(string fileName, int line, int column)
-		{
-			FileService.JumpToFilePosition(fileName, line + 1, column + 1);
-		}
-		
-		/// <summary>
-		/// Scrolls to the specified line and column and also selects the given
-		/// length of text at this location.
-		/// </summary>
-		void ScrollTo(string fileName, int line, int column, int length)
-		{
-			XmlView view = XmlView.ActiveXmlView;
-			if (view != null && IsFileNameMatch(view)) {
-				TextAreaControl textAreaControl = view.TextEditorControl.ActiveTextAreaControl;
-				if (length > 0 && line < textAreaControl.Document.TotalNumberOfLines) {
-					SelectionManager selectionManager = textAreaControl.SelectionManager;
-					selectionManager.ClearSelection();
-					TextLocation startPos = new TextLocation(column, line);
-					TextLocation endPos = new TextLocation(column + length, line);
-					selectionManager.SetSelection(startPos, endPos);
-				}
-				line = Math.Min(line, textAreaControl.Document.TotalNumberOfLines - 1);
-				textAreaControl.ScrollTo(line, column);
-			}
-		}
-		
-		void ScrollTo(string fileName, int line, int column)
-		{
-			ScrollTo(fileName, line, column, 0);
-		}
-		
-		/// <summary>
-		/// Tests whether the specified view matches the filename the XPath
-		/// results were found in.
-		/// </summary>
-		bool IsFileNameMatch(XmlView view)
-		{
-			return FileUtility.IsEqualFileName(fileName, view.PrimaryFileName);
-		}
-		
-		/// <summary>
-		/// Gets the namespaces and prefixes as a string array.
-		/// </summary>
-		string[] GetNamespaceStringArray()
-		{
-			List<string> namespaces = new List<string>();
-			foreach (XmlNamespace ns in GetNamespaces()) {
-				namespaces.Add(ns.ToString());
-			}
-			return namespaces.ToArray();
-		}
-		
-		/// <summary>
-		/// Gets the previously used XPath queries from the combo box drop down list.
-		/// </summary>
-		/// <returns></returns>
-		string [] GetXPathHistory()
-		{
-			List<string> xpaths = new List<string>();
-			foreach (string xpath in xPathComboBox.Items) {
-				xpaths.Add(xpath);
-			}
-			return xpaths.ToArray();
-		}
-		
-		/// <summary>
-		/// Gets the namespace prefix in the specified row.
-		/// </summary>
-		string GetPrefix(DataGridViewRow row)
-		{
-			string prefix = (string)row.Cells[0].Value;
-			if (prefix != null) {
-				return prefix;
-			}
-			return String.Empty;
-		}
-		
-		/// <summary>
-		/// Gets the namespace stored in the row.
-		/// </summary>
-		string GetNamespace(DataGridViewRow row)
-		{
-			string ns = (string)row.Cells[1].Value;
-			if (ns != null) {
-				return ns;
-			}
-			return String.Empty;
-		}
-		
-		/// <summary>
-		/// Adds the text in the combo box to the combo box drop down list.
-		/// </summary>
-		void AddXPathToHistory()
-		{
-			string newXPath = xPathComboBox.Text;
-			if (!xPathComboBox.Items.Contains(newXPath)) {
-				xPathComboBox.Items.Insert(0, newXPath);
-				if (xPathComboBox.Items.Count > xpathQueryHistoryLimit) {
-					xPathComboBox.Items.RemoveAt(xpathQueryHistoryLimit);
-				}
-			}
-		}
-		
-		void XPathComboBoxKeyDown(object sender, KeyEventArgs e)
-		{
-			if (e.KeyCode == Keys.Return) {
-				RunXPathQuery();
-			}
-		}
-		
-		void XPathResultsListViewSelectedIndexChanged(object sender, EventArgs e)
-		{
-			ScrollToResultLocation();
-		}
-		
-		void XPathResultsListViewClick(object sender, EventArgs e)
-		{
-			ScrollToResultLocation();
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XPathQueryPad.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XPathQueryPad.cs
deleted file mode 100644
index 3f2e0b6d13..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XPathQueryPad.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Windows.Forms;
-using ICSharpCode.Core;
-using ICSharpCode.SharpDevelop.Gui;
-
-namespace ICSharpCode.XmlEditor
-{
-	public class XPathQueryPad : AbstractPadContent
-	{
-		public const string XPathQueryControlProperties = "XPathQueryControl.Options";
-		
-		XPathQueryControl xPathQueryControl;
-		bool disposed;
-		static XPathQueryPad instance;
-		
-		public XPathQueryPad()
-		{
-			xPathQueryControl = new XPathQueryControl();
-			WorkbenchSingleton.Workbench.ActiveViewContentChanged += ActiveViewContentChanged;
-			Properties properties = PropertyService.Get(XPathQueryControlProperties, new Properties());
-			xPathQueryControl.SetMemento(properties);
-			instance = this;
-		}
-		
-		public static XPathQueryPad Instance {
-			get {
-				return instance;
-			}
-		}
-		
-		/// <summary>
-		/// The <see cref="System.Windows.Forms.Control"/> representing the pad.
-		/// </summary>
-		public override object Control {
-			get {
-				return xPathQueryControl;
-			}
-		}
-		
-		public override void Dispose()
-		{
-			if (!disposed) {
-				disposed = true;
-				WorkbenchSingleton.Workbench.ActiveViewContentChanged -= ActiveViewContentChanged;
-				Properties properties = xPathQueryControl.CreateMemento();
-				PropertyService.Set(XPathQueryControlProperties, properties);
-				xPathQueryControl.Dispose();
-			}
-		}
-		
-		public void RemoveXPathHighlighting()
-		{
-			xPathQueryControl.RemoveXPathNodeTextMarkers();
-		}
-		
-		void ActiveViewContentChanged(object source, EventArgs e)
-		{
-			xPathQueryControl.ActiveWindowChanged();
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlAttributePropertyDescriptor.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlAttributePropertyDescriptor.cs
deleted file mode 100644
index ef41387778..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlAttributePropertyDescriptor.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Xml;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Property descriptor for an XmlAttribute. This is used when displaying
-	/// an XmlAttribute in the property grid.
-	/// </summary>
-	public class XmlAttributePropertyDescriptor : PropertyDescriptor
-	{
-		XmlAttribute xmlAttribute;
-		public XmlAttributePropertyDescriptor(XmlAttribute xmlAttribute)
-			: base(xmlAttribute.LocalName, new Attribute[0])
-		{
-			this.xmlAttribute = xmlAttribute;
-		}
-		
-		/// <summary>
-		/// Gets the property descriptors for the specified attributes.
-		/// </summary>
-		public static PropertyDescriptorCollection GetProperties(XmlAttributeCollection xmlAttributes)
-		{
-			List<PropertyDescriptor> properties = new List<PropertyDescriptor>();
-			foreach (XmlAttribute xmlAttribute in xmlAttributes) {
-				properties.Add(new XmlAttributePropertyDescriptor(xmlAttribute));
-			}
-			return new PropertyDescriptorCollection(properties.ToArray());
-		}
-		
-		public override Type ComponentType {
-			get {
-				return typeof(String);
-			}
-		}
-		
-		public override bool IsReadOnly {
-			get {
-				return false;
-			}
-		}
-		
-		/// <summary>
-		/// Returns the property type in this case a string.
-		/// </summary>
-		public override Type PropertyType {
-			get {
-				return typeof(String);
-			}
-		}
-		
-		public override bool CanResetValue(object component)
-		{
-			return false;
-		}
-		
-		/// <summary>
-		/// Gets the value of the xml attribute.
-		/// </summary>
-		public override object GetValue(object component)
-		{
-			return xmlAttribute.Value;
-		}
-		
-		public override void ResetValue(object component)
-		{
-		}
-		
-		/// <summary>
-		/// Sets the xml attribute value.
-		/// </summary>
-		public override void SetValue(object component, object value)
-		{
-			xmlAttribute.Value = (String)value;
-		}
-		
-		/// <summary>
-		/// If the current value has changed from the default value then this
-		/// method will return true.
-		/// </summary>
-		public override bool ShouldSerializeValue(object component)
-		{
-			return true;
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlAttributeTypeDescriptor.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlAttributeTypeDescriptor.cs
deleted file mode 100644
index 07e93ceac6..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlAttributeTypeDescriptor.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.ComponentModel;
-using System.Xml;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Type descriptor that allows us to display properties in the property grid
-	/// for Xml attributes.
-	/// </summary>
-	public class XmlAttributeTypeDescriptor : ICustomTypeDescriptor
-	{
-		PropertyDescriptorCollection properties;
-		
-		public XmlAttributeTypeDescriptor(XmlAttributeCollection xmlAttributes)
-		{
-			if (xmlAttributes != null) {
-				properties = XmlAttributePropertyDescriptor.GetProperties(xmlAttributes);
-			} else {
-				properties = new PropertyDescriptorCollection(new XmlAttributePropertyDescriptor[0]);
-			}
-		}
-		
-		public AttributeCollection GetAttributes()
-		{
-			return null;
-		}
-		
-		public string GetClassName()
-		{
-			return null;
-		}
-		
-		public string GetComponentName()
-		{
-			return null;
-		}
-		
-		public TypeConverter GetConverter()
-		{
-			return null;
-		}
-		
-		public EventDescriptor GetDefaultEvent()
-		{
-			return null;
-		}
-		
-		public PropertyDescriptor GetDefaultProperty()
-		{
-			return null;
-		}
-		
-		public object GetEditor(Type editorBaseType)
-		{
-			return null;
-		}
-		
-		public EventDescriptorCollection GetEvents()
-		{
-			return null;
-		}
-		
-		public EventDescriptorCollection GetEvents(Attribute[] attributes)
-		{
-			return null;
-		}
-		
-		public PropertyDescriptorCollection GetProperties()
-		{
-			return GetProperties(new Attribute[0]);
-		}
-		
-		public PropertyDescriptorCollection GetProperties(Attribute[] attributes)
-		{
-			return properties;
-		}
-		
-		/// <summary>
-		/// Returns this class instance.
-		/// </summary>
-		public object GetPropertyOwner(PropertyDescriptor pd)
-		{
-			return this;
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlCharacterDataTreeNode.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlCharacterDataTreeNode.cs
deleted file mode 100644
index d9e3cd1afe..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlCharacterDataTreeNode.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Xml;
-using ICSharpCode.SharpDevelop.Gui;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Base class for XmlTextTreeNodes and XmlCommentTreeNodes
-	/// </summary>
-	public abstract class XmlCharacterDataTreeNode : ExtTreeNode
-	{
-		XmlCharacterData characterData;
-		
-		public XmlCharacterDataTreeNode(XmlCharacterData characterData)
-		{
-			this.characterData = characterData;
-		}
-		
-		/// <summary>
-		/// Updates the display text based on changes in the
-		/// XmlCharacterData's InnerText associated with this node.
-		/// </summary>
-		public void Update()
-		{
-			Text = GetDisplayText(characterData.InnerText);
-		}
-		
-		/// <summary>
-		/// Gets the text to display for this tree node.
-		/// </summary>
-		/// <remarks>If the text is a single line then it is returned, but
-		/// trimmed. If the text has multiple lines then the first line that
-		/// is not empty is returned. This line may have "..." appended to indicate 
-		/// there is more text for this node that is not being displayed. The
-		/// "..." will be appended only if there are multiple lines containing 
-		/// text.</remarks>
-		static string GetDisplayText(string s)
-		{
-			string[] lines = s.Trim().Split('\n');
-			for (int i = 0; i < lines.Length; ++i) {
-				string line = lines[i].Trim();
-				if (line.Length > 0) {
-					if (lines.Length == 1) {
-						return line;
-					} else {
-						return String.Concat(line, "...");
-					}
-				}
-			}
-			return String.Empty;
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlCommentTreeNode.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlCommentTreeNode.cs
deleted file mode 100644
index 1d798c4af9..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlCommentTreeNode.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Xml;
-using ICSharpCode.SharpDevelop.Gui;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Represents an xml comment in the tree.
-	/// </summary>
-	public class XmlCommentTreeNode : XmlCharacterDataTreeNode
-	{
-		public const string XmlCommentTreeNodeImageKey = "XmlCommentTreeNodeImage";
-		public const string XmlCommentTreeNodeGhostImageKey = "XmlCommentTreeNodeGhostImage";
-
-		XmlComment comment;
-		
-		public XmlCommentTreeNode(XmlComment comment)
-			: base(comment)
-		{
-			this.comment = comment;
-			ImageKey = XmlCommentTreeNodeImageKey;
-			SelectedImageKey = ImageKey;
-			Update();
-		}
-		
-		/// <summary>
-		/// Gets the XmlComment associated with this tree node.
-		/// </summary>
-		public XmlComment XmlComment {
-			get {
-				return comment;
-			}
-		}
-		
-		/// <summary>
-		/// Gets or sets whether to show the ghost image which is 
-		/// displayed when cutting the node.
-		/// </summary>
-		public bool ShowGhostImage {
-			get {
-				return ImageKey == XmlCommentTreeNodeGhostImageKey;
-			}
-			set {
-				if (value) {
-					ImageKey = XmlCommentTreeNodeGhostImageKey;
-				} else {
-					ImageKey = XmlCommentTreeNodeImageKey;
-				}
-				SelectedImageKey = ImageKey;
-			}
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlCompletionData.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlCompletionData.cs
deleted file mode 100644
index 0dd231e573..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlCompletionData.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using ICSharpCode.TextEditor;
-using ICSharpCode.TextEditor.Gui.CompletionWindow;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Holds the text for  namespace, child element or attribute 
-	/// autocomplete (intellisense).
-	/// </summary>
-	public class XmlCompletionData : ICompletionData
-	{
-		string text;
-		DataType dataType = DataType.XmlElement;
-		string description = String.Empty;
-		
-		/// <summary>
-		/// The type of text held in this object.
-		/// </summary>
-		public enum DataType {
-			XmlElement = 1,
-			XmlAttribute = 2,
-			NamespaceUri = 3,
-			XmlAttributeValue = 4
-		}
-		
-		public XmlCompletionData(string text)
-			: this(text, String.Empty, DataType.XmlElement)
-		{
-		}
-		
-		public XmlCompletionData(string text, string description)
-			: this(text, description, DataType.XmlElement)
-		{
-		}
-
-		public XmlCompletionData(string text, DataType dataType)
-			: this(text, String.Empty, dataType)
-		{
-		}		
-
-		public XmlCompletionData(string text, string description, DataType dataType)
-		{
-			this.text = text;
-			this.description = description;
-			this.dataType = dataType;  
-		}		
-		
-		public int ImageIndex {
-			get {
-				return 0;
-			}
-		}
-		
-		public string Text {
-			get {
-				return text;
-			}
-			set {
-				text = value;
-			}
-		}
-		
-		/// <summary>
-		/// Returns the xml item's documentation as retrieved from
-		/// the xs:annotation/xs:documentation element.
-		/// </summary>
-		public string Description {
-			get {
-				return description;
-			}
-		}
-		
-		public double Priority {
-			get {
-				return 0;
-			}
-		}
-		
-		public bool InsertAction(TextArea textArea, char ch)
-		{
-			if ((dataType == DataType.XmlElement) || (dataType == DataType.XmlAttributeValue)) {
-				textArea.InsertString(text);
-			}
-			else if (dataType == DataType.NamespaceUri) {
-				textArea.InsertString(String.Concat("\"", text, "\""));
-			} else {
-				// Insert an attribute.
-				Caret caret = textArea.Caret;
-				textArea.InsertString(String.Concat(text, "=\"\""));	
-				
-				// Move caret into the middle of the attribute quotes.
-				caret.Position = textArea.Document.OffsetToPosition(caret.Offset - 1);
-			}
-			return false;
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlCompletionDataCollection.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlCompletionDataCollection.cs
deleted file mode 100644
index 5d2a8ff394..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlCompletionDataCollection.cs
+++ /dev/null
@@ -1,288 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Collections;
-using ICSharpCode.TextEditor.Gui.CompletionWindow;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	///   A collection that stores <see cref='XmlCompletionData'/> objects.
-	/// </summary>
-	[Serializable()]
-	public class XmlCompletionDataCollection : CollectionBase {
-		
-		/// <summary>
-		///   Initializes a new instance of <see cref='XmlCompletionDataCollection'/>.
-		/// </summary>
-		public XmlCompletionDataCollection()
-		{
-		}
-		
-		/// <summary>
-		///   Initializes a new instance of <see cref='XmlCompletionDataCollection'/> based on another <see cref='XmlCompletionDataCollection'/>.
-		/// </summary>
-		/// <param name='val'>
-		///   A <see cref='XmlCompletionDataCollection'/> from which the contents are copied
-		/// </param>
-		public XmlCompletionDataCollection(XmlCompletionDataCollection val)
-		{
-			this.AddRange(val);
-		}
-		
-		/// <summary>
-		///   Initializes a new instance of <see cref='XmlCompletionDataCollection'/> containing any array of <see cref='XmlCompletionData'/> objects.
-		/// </summary>
-		/// <param name='val'>
-		///       A array of <see cref='XmlCompletionData'/> objects with which to intialize the collection
-		/// </param>
-		public XmlCompletionDataCollection(XmlCompletionData[] val)
-		{
-			this.AddRange(val);
-		}
-		
-		/// <summary>
-		///   Represents the entry at the specified index of the <see cref='XmlCompletionData'/>.
-		/// </summary>
-		/// <param name='index'>The zero-based index of the entry to locate in the collection.</param>
-		/// <value>The entry at the specified index of the collection.</value>
-		/// <exception cref='ArgumentOutOfRangeException'><paramref name='index'/> is outside the valid range of indexes for the collection.</exception>
-		public XmlCompletionData this[int index] {
-			get {
-				return ((XmlCompletionData)(List[index]));
-			}
-			set {
-				List[index] = value;
-			}
-		}
-		
-		/// <summary>
-		///   Adds a <see cref='XmlCompletionData'/> with the specified value to the 
-		///   <see cref='XmlCompletionDataCollection'/>.
-		/// </summary>
-		/// <remarks>
-		/// If the completion data already exists in the collection it is not added.
-		/// </remarks>
-		/// <param name='val'>The <see cref='XmlCompletionData'/> to add.</param>
-		/// <returns>The index at which the new element was inserted.</returns>
-		/// <seealso cref='XmlCompletionDataCollection.AddRange'/>
-		public int Add(XmlCompletionData val)
-		{
-			int index = -1;
-			if (!Contains(val)) {
-				index = List.Add(val);
-			}
-			return index;
-		}
-		
-		/// <summary>
-		///   Copies the elements of an array to the end of the <see cref='XmlCompletionDataCollection'/>.
-		/// </summary>
-		/// <param name='val'>
-		///    An array of type <see cref='XmlCompletionData'/> containing the objects to add to the collection.
-		/// </param>
-		/// <seealso cref='XmlCompletionDataCollection.Add'/>
-		public void AddRange(XmlCompletionData[] val)
-		{
-			for (int i = 0; i < val.Length; i++) {
-				this.Add(val[i]);
-			}
-		}
-		
-		/// <summary>
-		///   Adds the contents of another <see cref='XmlCompletionDataCollection'/> to the end of the collection.
-		/// </summary>
-		/// <param name='val'>
-		///    A <see cref='XmlCompletionDataCollection'/> containing the objects to add to the collection.
-		/// </param>
-		/// <seealso cref='XmlCompletionDataCollection.Add'/>
-		public void AddRange(XmlCompletionDataCollection val)
-		{
-			for (int i = 0; i < val.Count; i++)
-			{
-				this.Add(val[i]);
-			}
-		}
-		
-		/// <summary>
-		///   Gets a value indicating whether the 
-		///    <see cref='XmlCompletionDataCollection'/> contains the specified <see cref='XmlCompletionData'/>.
-		/// </summary>
-		/// <param name='val'>The <see cref='XmlCompletionData'/> to locate.</param>
-		/// <returns>
-		/// <see langword='true'/> if the <see cref='XmlCompletionData'/> is contained in the collection; 
-		///   otherwise, <see langword='false'/>.
-		/// </returns>
-		/// <seealso cref='XmlCompletionDataCollection.IndexOf'/>
-		public bool Contains(XmlCompletionData val)
-		{
-			if (val.Text != null) {
-				if (val.Text.Length > 0) {
-					return Contains(val.Text);
-				}
-			}
-			return false;
-		}
-		
-		public bool Contains(string name)
-		{
-			bool contains = false;
-			
-			foreach (XmlCompletionData data in this) {
-				if (data.Text != null) {
-					if (data.Text.Length > 0) {
-						if (data.Text == name) {
-							contains = true;
-							break;
-						}
-					}
-				}
-			}
-			
-			return contains;
-		}
-		
-		/// <summary>
-		///   Copies the <see cref='XmlCompletionDataCollection'/> values to a one-dimensional <see cref='Array'/> instance at the 
-		///    specified index.
-		/// </summary>
-		/// <param name='array'>The one-dimensional <see cref='Array'/> that is the destination of the values copied from <see cref='XmlCompletionDataCollection'/>.</param>
-		/// <param name='index'>The index in <paramref name='array'/> where copying begins.</param>
-		/// <exception cref='ArgumentException'>
-		///   <para><paramref name='array'/> is multidimensional.</para>
-		///   <para>-or-</para>
-		///   <para>The number of elements in the <see cref='XmlCompletionDataCollection'/> is greater than
-		///         the available space between <paramref name='arrayIndex'/> and the end of
-		///         <paramref name='array'/>.</para>
-		/// </exception>
-		/// <exception cref='ArgumentNullException'><paramref name='array'/> is <see langword='null'/>. </exception>
-		/// <exception cref='ArgumentOutOfRangeException'><paramref name='arrayIndex'/> is less than <paramref name='array'/>'s lowbound. </exception>
-		/// <seealso cref='Array'/>
-		public void CopyTo(XmlCompletionData[] array, int index)
-		{
-			List.CopyTo(array, index);
-		}
-		
-		/// <summary>
-		///   Copies the <see cref='XmlCompletionDataCollection'/> values to a one-dimensional <see cref='Array'/> instance at the 
-		///    specified index.
-		/// </summary>
-		public void CopyTo(ICompletionData[] array, int index)
-		{
-			List.CopyTo(array, index);
-		}		
-		
-		/// <summary>
-		///    Returns the index of a <see cref='XmlCompletionData'/> in 
-		///       the <see cref='XmlCompletionDataCollection'/>.
-		/// </summary>
-		/// <param name='val'>The <see cref='XmlCompletionData'/> to locate.</param>
-		/// <returns>
-		///   The index of the <see cref='XmlCompletionData'/> of <paramref name='val'/> in the 
-		///   <see cref='XmlCompletionDataCollection'/>, if found; otherwise, -1.
-		/// </returns>
-		/// <seealso cref='XmlCompletionDataCollection.Contains'/>
-		public int IndexOf(XmlCompletionData val)
-		{
-			return List.IndexOf(val);
-		}
-		
-		/// <summary>
-		///   Inserts a <see cref='XmlCompletionData'/> into the <see cref='XmlCompletionDataCollection'/> at the specified index.
-		/// </summary>
-		/// <param name='index'>The zero-based index where <paramref name='val'/> should be inserted.</param>
-		/// <param name='val'>The <see cref='XmlCompletionData'/> to insert.</param>
-		/// <seealso cref='XmlCompletionDataCollection.Add'/>
-		public void Insert(int index, XmlCompletionData val)
-		{
-			List.Insert(index, val);
-		}
-		
-		/// <summary>
-		/// Returns an array of <see cref="ICompletionData"/> items.
-		/// </summary>
-		/// <returns></returns>
-		public ICompletionData[] ToArray()
-		{
-			ICompletionData[] data = new ICompletionData[Count];
-			CopyTo(data, 0);
-			return data;
-		}
-		
-		/// <summary>
-		///  Returns an enumerator that can iterate through the <see cref='XmlCompletionDataCollection'/>.
-		/// </summary>
-		/// <seealso cref='IEnumerator'/>
-		public new XmlCompletionDataEnumerator GetEnumerator()
-		{
-			return new XmlCompletionDataEnumerator(this);
-		}
-		
-		/// <summary>
-		///   Removes a specific <see cref='XmlCompletionData'/> from the <see cref='XmlCompletionDataCollection'/>.
-		/// </summary>
-		/// <param name='val'>The <see cref='XmlCompletionData'/> to remove from the <see cref='XmlCompletionDataCollection'/>.</param>
-		/// <exception cref='ArgumentException'><paramref name='val'/> is not found in the Collection.</exception>
-		public void Remove(XmlCompletionData val)
-		{
-			List.Remove(val);
-		}
-		
-		/// <summary>
-		///   Enumerator that can iterate through a XmlCompletionDataCollection.
-		/// </summary>
-		/// <seealso cref='IEnumerator'/>
-		/// <seealso cref='XmlCompletionDataCollection'/>
-		/// <seealso cref='XmlCompletionData'/>
-		public class XmlCompletionDataEnumerator : IEnumerator
-		{
-			IEnumerator baseEnumerator;
-			IEnumerable temp;
-			
-			/// <summary>
-			///   Initializes a new instance of <see cref='XmlCompletionDataEnumerator'/>.
-			/// </summary>
-			public XmlCompletionDataEnumerator(XmlCompletionDataCollection mappings)
-			{
-				this.temp = ((IEnumerable)(mappings));
-				this.baseEnumerator = temp.GetEnumerator();
-			}
-			
-			/// <summary>
-			///   Gets the current <see cref='XmlCompletionData'/> in the <seealso cref='XmlCompletionDataCollection'/>.
-			/// </summary>
-			public XmlCompletionData Current {
-				get {
-					return ((XmlCompletionData)(baseEnumerator.Current));
-				}
-			}
-			
-			object IEnumerator.Current {
-				get {
-					return baseEnumerator.Current;
-				}
-			}
-			
-			/// <summary>
-			///   Advances the enumerator to the next <see cref='XmlCompletionData'/> of the <see cref='XmlCompletionDataCollection'/>.
-			/// </summary>
-			public bool MoveNext()
-			{
-				return baseEnumerator.MoveNext();
-			}
-			
-			/// <summary>
-			///   Sets the enumerator to its initial position, which is before the first element in the <see cref='XmlCompletionDataCollection'/>.
-			/// </summary>
-			public void Reset()
-			{
-				baseEnumerator.Reset();
-			}
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlCompletionDataImageList.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlCompletionDataImageList.cs
deleted file mode 100644
index 130aeb92a8..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlCompletionDataImageList.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Windows.Forms;
-
-namespace ICSharpCode.XmlEditor
-{
-	public class XmlCompletionDataImageList
-	{
-		XmlCompletionDataImageList()
-		{
-		}
-		
-		public static ImageList GetImageList()
-		{
-			ImageList imageList = new ImageList();
-			                     
-			return imageList;
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlCompletionDataProvider.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlCompletionDataProvider.cs
deleted file mode 100644
index 295a59b4dc..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlCompletionDataProvider.cs
+++ /dev/null
@@ -1,182 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Windows.Forms;
-using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
-using ICSharpCode.TextEditor;
-using ICSharpCode.TextEditor.Gui.CompletionWindow;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Provides the autocomplete (intellisense) data for an
-	/// xml document that specifies a known schema.
-	/// </summary>
-	public class XmlCompletionDataProvider : AbstractCompletionDataProvider
-	{
-		XmlSchemaCompletionDataCollection schemaCompletionDataItems;
-		XmlSchemaCompletionData defaultSchemaCompletionData;
-		string defaultNamespacePrefix = String.Empty;
-		
-		public XmlCompletionDataProvider(XmlSchemaCompletionDataCollection schemaCompletionDataItems, XmlSchemaCompletionData defaultSchemaCompletionData, string defaultNamespacePrefix)
-		{
-			this.schemaCompletionDataItems = schemaCompletionDataItems;
-			this.defaultSchemaCompletionData = defaultSchemaCompletionData;
-			this.defaultNamespacePrefix = defaultNamespacePrefix;
-			DefaultIndex = 0;
-		}
-		
-		public override ImageList ImageList {
-			get {
-				return XmlCompletionDataImageList.GetImageList();
-			}
-		}
-
-		/// <summary>
-		/// Overrides the default behaviour and allows special xml
-		/// characters such as '.' and ':' to be used as completion data.
-		/// </summary>
-		public override CompletionDataProviderKeyResult ProcessKey(char key)
-		{
-			if (key == '\r' || key == '\t') {
-				return CompletionDataProviderKeyResult.InsertionKey;
-			}
-			return CompletionDataProviderKeyResult.NormalKey;
-		}
-		
-		public override ICompletionData[] GenerateCompletionData(string fileName, TextArea textArea, char charTyped)
-		{
-			preSelection = null;
-			string text = String.Concat(textArea.Document.GetText(0, textArea.Caret.Offset), charTyped);
-			
-			switch (charTyped) {
-				case '=':
-					// Namespace intellisense.
-					if (XmlParser.IsNamespaceDeclaration(text, text.Length)) {
-						return schemaCompletionDataItems.GetNamespaceCompletionData();;
-					}
-					break;
-				case '<':
-					// Child element intellisense.
-					XmlElementPath parentPath = XmlParser.GetParentElementPath(text);
-					if (parentPath.Elements.Count > 0) {
-						return GetChildElementCompletionData(parentPath);
-					} else if (defaultSchemaCompletionData != null) {
-						return defaultSchemaCompletionData.GetElementCompletionData(defaultNamespacePrefix);
-					}
-					break;
-					
-				case ' ':
-					// Attribute intellisense.
-					if (!XmlParser.IsInsideAttributeValue(text, text.Length)) {
-						XmlElementPath path = XmlParser.GetActiveElementStartPath(text, text.Length);
-						if (path.Elements.Count > 0) {
-							return GetAttributeCompletionData(path);
-						}
-					}
-					break;
-					
-				default:
-					
-					// Attribute value intellisense.
-					if (XmlParser.IsAttributeValueChar(charTyped)) {
-						string attributeName = XmlParser.GetAttributeName(text, text.Length);
-						if (attributeName.Length > 0) {
-							XmlElementPath elementPath = XmlParser.GetActiveElementStartPath(text, text.Length);
-							if (elementPath.Elements.Count > 0) {
-								preSelection = charTyped.ToString();
-								return GetAttributeValueCompletionData(elementPath, attributeName);
-							}
-						}
-					}
-					break;
-			}
-			
-			return null;
-		}
-		
-		/// <summary>
-		/// Finds the schema given the xml element path.
-		/// </summary>
-		public XmlSchemaCompletionData FindSchema(XmlElementPath path)
-		{
-			if (path.Elements.Count > 0) {
-				string namespaceUri = path.Elements[0].Namespace;
-				if (namespaceUri.Length > 0) {
-					return schemaCompletionDataItems[namespaceUri];
-				} else if (defaultSchemaCompletionData != null) {
-					
-					// Use the default schema namespace if none
-					// specified in a xml element path, otherwise
-					// we will not find any attribute or element matches
-					// later.
-					foreach (QualifiedName name in path.Elements) {
-						if (name.Namespace.Length == 0) {
-							name.Namespace = defaultSchemaCompletionData.NamespaceUri;
-						}
-					}
-					return defaultSchemaCompletionData;
-				}
-			}
-			return null;
-		}
-		
-		/// <summary>
-		/// Finds the schema given a namespace URI.
-		/// </summary>
-		public XmlSchemaCompletionData FindSchema(string namespaceUri)
-		{
-			return schemaCompletionDataItems[namespaceUri];
-		}
-		
-		/// <summary>
-		/// Gets the schema completion data that was created from the specified 
-		/// schema filename.
-		/// </summary>
-		public XmlSchemaCompletionData FindSchemaFromFileName(string fileName)
-		{
-			return schemaCompletionDataItems.GetSchemaFromFileName(fileName);
-		}
-		
-		ICompletionData[] GetChildElementCompletionData(XmlElementPath path)
-		{
-			ICompletionData[] completionData = null;
-			
-			XmlSchemaCompletionData schema = FindSchema(path);
-			if (schema != null) {
-				completionData = schema.GetChildElementCompletionData(path);
-			}
-			
-			return completionData;
-		}
-		
-		ICompletionData[] GetAttributeCompletionData(XmlElementPath path)
-		{
-			ICompletionData[] completionData = null;
-			
-			XmlSchemaCompletionData schema = FindSchema(path);
-			if (schema != null) {
-				completionData = schema.GetAttributeCompletionData(path);
-			}
-			
-			return completionData;
-		}
-		
-		ICompletionData[] GetAttributeValueCompletionData(XmlElementPath path, string name)
-		{
-			ICompletionData[] completionData = null;
-			
-			XmlSchemaCompletionData schema = FindSchema(path);
-			if (schema != null) {
-				completionData = schema.GetAttributeValueCompletionData(path, name);
-			}
-			
-			return completionData;
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlDisplayBinding.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlDisplayBinding.cs
deleted file mode 100644
index 95aa315502..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlDisplayBinding.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using ICSharpCode.SharpDevelop;
-using ICSharpCode.SharpDevelop.Gui;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Display binding for the xml editor.
-	/// </summary>
-	public class XmlDisplayBinding : IDisplayBinding
-	{
-		public IViewContent CreateContentForFile(OpenedFile file)
-		{
-			return new XmlView(file);
-		}
-		
-		/// <summary>
-		/// Can only create content for file with extensions that are
-		/// known to be xml files as specified in the SyntaxModes.xml file.
-		/// </summary>
-		public bool CanCreateContentForFile(string fileName)
-		{
-			return XmlView.IsFileNameHandled(fileName);
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlEditorAddInOptions.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlEditorAddInOptions.cs
deleted file mode 100644
index 5cd09205be..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlEditorAddInOptions.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Diagnostics;
-using ICSharpCode.Core;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// The Xml Editor add-in options.
-	/// </summary>
-	public static class XmlEditorAddInOptions
-	{
-		public static readonly string OptionsProperty = "XmlEditor.AddIn.Options";
-		public static readonly string ShowAttributesWhenFoldedPropertyName = "ShowAttributesWhenFolded";
-		public static readonly string ShowSchemaAnnotationPropertyName = "ShowSchemaAnnotation";
-		
-		static Properties properties;
-
-		static XmlEditorAddInOptions()
- 		{
-			properties = PropertyService.Get(OptionsProperty, new Properties());
-		}
-
- 		static Properties Properties {
-			get {
-				Debug.Assert(properties != null);
-				return properties;
- 			}
-		}
-		
-		public static event PropertyChangedEventHandler PropertyChanged {
-			add    { Properties.PropertyChanged += value; }
-			remove { Properties.PropertyChanged -= value; }
-		}
-		
-		#region Properties
-		/// <summary>
-		/// Gets an association between a schema and a file extension.
-		/// </summary>
-		/// <remarks>
-		/// <para>The property will be an xml element when the SharpDevelopProperties.xml
-		/// is read on startup.  The property will be a schema association
-		/// if the user changes the schema associated with the file
-		/// extension in tools->options.</para>
-		/// <para>The normal way of doing things is to
-		/// pass the GetProperty method a default value which auto-magically
-		/// turns the xml element into a schema association so we would not 
-		/// have to check for both.  In this case, however, I do not want
-		/// a default saved to the SharpDevelopProperties.xml file unless the user
-		/// makes a change using Tools->Options.</para>
-		/// <para>If we have a file extension that is currently missing a default 
-		/// schema then if we  ship the schema at a later date the association will 
-		/// be updated by the code if the user has not changed the settings themselves. 
-		/// </para>
-		/// <para>For example, the initial release of the xml editor add-in had
-		/// no default schema for .xsl files, by default it was associated with
-		/// no schema and this setting is saved if the user ever viewed the settings
-		/// in the tools->options dialog.  Now, after the initial release the
-		/// .xsl schema was created and shipped with SharpDevelop, there is
-		/// no way to associate this schema to .xsl files by default since 
-		/// the property exists in the SharpDevelopProperties.xml file.</para>
-		/// <para>An alternative way of doing this might be to have the
-		/// config info in the schema itself, which a special SharpDevelop 
-		/// namespace.  I believe this is what Visual Studio does.  This
-		/// way is not as flexible since it requires the user to locate
-		/// the schema and change the association manually.</para>
-		/// </remarks>
-		public static XmlSchemaAssociation GetSchemaAssociation(string extension)
-		{			
-			extension = extension.ToLower();
-			string property = Properties.Get("ext" + extension, String.Empty);
-			XmlSchemaAssociation association = null;
-			
-			if (property.Length > 0) {
-				association = XmlSchemaAssociation.ConvertFromString(property);
-			}
-			
-			// Use default?
-			if (association == null) {
-				association = XmlSchemaAssociation.GetDefaultAssociation(extension);
-			}
-			
-			return association;
-		}
-		
-		public static void SetSchemaAssociation(XmlSchemaAssociation association)
-		{
-			Properties.Set("ext" + association.Extension, association.ConvertToString());
-		}
-		
-		public static bool ShowAttributesWhenFolded {
-			get {
-				return Properties.Get(ShowAttributesWhenFoldedPropertyName, false);
-			}
-			
-			set {
-				Properties.Set(ShowAttributesWhenFoldedPropertyName, value);
-			}
-		}
-		
-		public static bool ShowSchemaAnnotation {
-			get {
-				return Properties.Get(ShowSchemaAnnotationPropertyName, true);
-			}
-			
-			set {
-				Properties.Set(ShowSchemaAnnotationPropertyName, value);
-			}
-		}
-		
-		#endregion
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlEditorControl.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlEditorControl.cs
deleted file mode 100644
index 1d51d859cf..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlEditorControl.cs
+++ /dev/null
@@ -1,339 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Windows.Forms;
-using ICSharpCode.Core;
-using ICSharpCode.SharpDevelop.Bookmarks;
-using ICSharpCode.SharpDevelop.DefaultEditor;
-using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
-using ICSharpCode.SharpDevelop.Gui;
-using ICSharpCode.TextEditor;
-using ICSharpCode.TextEditor.Actions;
-using ICSharpCode.TextEditor.Document;
-using ICSharpCode.TextEditor.Gui.CompletionWindow;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Xml editor derived from the SharpDevelop TextEditor control.
-	/// </summary>
-	public class XmlEditorControl : ICSharpCode.TextEditor.TextEditorControl
-	{
-		CodeCompletionWindow codeCompletionWindow;
-		XmlSchemaCompletionDataCollection schemaCompletionDataItems = new XmlSchemaCompletionDataCollection();
-		XmlSchemaCompletionData defaultSchemaCompletionData = null;
-		string defaultNamespacePrefix = String.Empty;
-		ContextMenuStrip contextMenuStrip;
-		TextAreaControl primaryTextAreaControl;
-		
-		public XmlEditorControl()
-		{
-//			XmlFormattingStrategy strategy = new XmlFormattingStrategy();
-//			Document.FormattingStrategy = (IFormattingStrategy)strategy;
-			
-			Document.HighlightingStrategy = HighlightingManager.Manager.FindHighlighter("XML");
-			Document.FoldingManager.FoldingStrategy = new XmlFoldingStrategy();
-		}
-		
-		/// <summary>
-		/// Gets the schemas that the xml editor will use.
-		/// </summary>
-		/// <remarks>
-		/// Probably should NOT have a 'set' property, but allowing one
-		/// allows us to share the completion data amongst multiple
-		/// xml editor controls.
-		/// </remarks>
-		public XmlSchemaCompletionDataCollection SchemaCompletionDataItems {
-			get {
-				return schemaCompletionDataItems;
-			}
-			set {
-				schemaCompletionDataItems = value;
-			}
-		}
-		
-		/// <summary>
-		/// Gets or sets the default namespace prefix.
-		/// </summary>
-		public string DefaultNamespacePrefix {
-			get {
-				return defaultNamespacePrefix;
-			}
-			set {
-				defaultNamespacePrefix = value;
-			}
-		}
-		
-		/// <summary>
-		/// Gets or sets the default schema completion data associated with this
-		/// view.
-		/// </summary>
-		public XmlSchemaCompletionData DefaultSchemaCompletionData {
-			get {
-				return defaultSchemaCompletionData;
-			}
-			set {
-				defaultSchemaCompletionData = value;
-			}
-		}
-		
-		/// <summary>
-		/// Called when the user hits Ctrl+Space.
-		/// </summary>
-		public void ShowCompletionWindow()
-		{
-			if (!IsCaretAtDocumentStart) {
-				// Find character before cursor.
-				
-				char ch = GetCharacterBeforeCaret();
-				
-				HandleKeyPress(ch);
-			}
-		}
-		
-		/// <summary>
-		/// Adds edit actions to the xml editor.
-		/// </summary>
-		public void AddEditActions(IEditAction[] actions)
-		{
-			foreach (IEditAction action in actions) {
-				foreach (Keys key in action.Keys) {
-					editactions[key] = action;
-				}
-			}
-		}
-		
-		/// <summary>
-		/// Gets or sets the right click menu associated with the
-		/// xml editor.
-		/// </summary>
-		public ContextMenuStrip TextAreaContextMenuStrip {
-			get {
-				return contextMenuStrip;
-			}
-			set {
-				contextMenuStrip = value;
-				if (primaryTextAreaControl != null) {
-					primaryTextAreaControl.ContextMenuStrip = value;
-				}
-			}
-		}
-		
-		protected override void InitializeTextAreaControl(TextAreaControl newControl)
-		{
-			base.InitializeTextAreaControl(newControl);
-			
-			primaryTextAreaControl = newControl;
-		
-			newControl.TextArea.KeyEventHandler += new ICSharpCode.TextEditor.KeyEventHandler(HandleKeyPress);
-
-			newControl.ContextMenuStrip = contextMenuStrip;
-			newControl.SelectionManager.SelectionChanged += new EventHandler(SelectionChanged);
-			newControl.Document.DocumentChanged += new DocumentEventHandler(DocumentChanged);
-			newControl.TextArea.ClipboardHandler.CopyText += new CopyTextEventHandler(ClipboardHandlerCopyText);
-			
-			newControl.MouseWheel += new MouseEventHandler(TextAreaMouseWheel);
-			newControl.DoHandleMousewheel = false;
-		}
-		
-		/// <summary>
-		/// Captures the user's key presses.
-		/// </summary>
-		/// <remarks>
-		/// <para>The code completion window ProcessKeyEvent is not perfect
-		/// when typing xml.  If enter a space or ':' the text is
-		/// autocompleted when it should not be.</para>
-		/// <para>The code completion window has one predefined width,
-		/// which cuts off any long namespaces that we show.</para>
-		/// <para>The above issues have been resolved by duplicating
-		/// the code completion window and fixing the problems in the
-		/// duplicated class.</para>
-		/// </remarks>
-		protected bool HandleKeyPress(char ch)
-		{
-			if (IsCodeCompletionWindowOpen) {
-				if (codeCompletionWindow.ProcessKeyEvent(ch)) {
-					return false;
-				}
-			}
-			
-			try {
-				switch (ch) {
-					case '<':
-					case ' ':
-					case '=':
-						ShowCompletionWindow(ch);
-						return false;
-					default:
-						if (XmlParser.IsAttributeValueChar(ch)) {
-							if (IsInsideQuotes(ActiveTextAreaControl.TextArea)) {
-								// Have to insert the character ourselves since
-								// it is not actually inserted yet.  If it is not
-								// inserted now the code completion will not work
-								// since the completion data provider attempts to
-								// include the key typed as the pre-selected text.
-								InsertCharacter(ch);
-								ShowCompletionWindow(ch);
-								return true;
-							}
-						}
-						break;
-				}
-			} catch (Exception e) {
-				MessageService.ShowError(e);
-			}
-			
-			return false;
-		}
-		
-		bool IsCodeCompletionEnabled {
-			get {
-				return ICSharpCode.SharpDevelop.CodeCompletionOptions.EnableCodeCompletion;
-			}
-		}
-		
-		void CodeCompletionWindowClosed(object sender, EventArgs e)
-		{
-			codeCompletionWindow.Closed -= new EventHandler(CodeCompletionWindowClosed);
-			codeCompletionWindow.Dispose();
-			codeCompletionWindow = null;
-		}
-		
-		bool IsCodeCompletionWindowOpen {
-			get {
-				return ((codeCompletionWindow != null) && (!codeCompletionWindow.IsDisposed));
-			}
-		}
-		
-		void ShowCompletionWindow(char ch)
-		{
-			if (IsCodeCompletionWindowOpen) {
-				codeCompletionWindow.Close();
-			}
-			
-			if (IsCodeCompletionEnabled) {
-				XmlCompletionDataProvider completionDataProvider = new XmlCompletionDataProvider(schemaCompletionDataItems, defaultSchemaCompletionData, defaultNamespacePrefix);
-				codeCompletionWindow = CodeCompletionWindow.ShowCompletionWindow(ParentForm, this, FileName, completionDataProvider, ch, XmlEditorAddInOptions.ShowSchemaAnnotation, false);
-				
-				if (codeCompletionWindow != null) {
-					codeCompletionWindow.Closed += new EventHandler(CodeCompletionWindowClosed);
-				}
-			}
-		}
-		
-		void DocumentChanged(object sender, DocumentEventArgs e)
-		{
-		}
-		
-		void SelectionChanged(object sender, EventArgs e)
-		{
-		}
-		
-		void ClipboardHandlerCopyText(object sender, CopyTextEventArgs e)
-		{
-//			TextEditorSideBar.PutInClipboardRing(e.Text);
-		}
-	
-		void TextAreaMouseWheel(object sender, MouseEventArgs e)
-		{
-			TextAreaControl textAreaControl = (TextAreaControl)sender;
-
-			if (IsCodeCompletionWindowOpen && codeCompletionWindow.Visible) {
-				codeCompletionWindow.HandleMouseWheel(e);
-			} else {
-				textAreaControl.HandleMouseWheel(e);
-			}
-		}
-		
-		char GetCharacterBeforeCaret()
-		{
-			string text = Document.GetText(ActiveTextAreaControl.TextArea.Caret.Offset - 1, 1);
-			if (text.Length > 0) {
-				return text[0];
-			}
-			
-			return '\0';
-		}
-		
-		bool IsCaretAtDocumentStart {
-			get {
-				return ActiveTextAreaControl.TextArea.Caret.Offset == 0;
-			}
-		}
-		
-		/// <summary>
-		/// Checks whether the caret is inside a set of quotes (" or ').
-		/// </summary>
-		bool IsInsideQuotes(TextArea textArea)
-		{
-			bool inside = false;
-			
-			LineSegment line = textArea.Document.GetLineSegment(textArea.Document.GetLineNumberForOffset(textArea.Caret.Offset));
-			if (line != null) {
-				if ((line.Offset + line.Length > textArea.Caret.Offset) &&
-				    (line.Offset < textArea.Caret.Offset)){
-					
-					char charAfter = textArea.Document.GetCharAt(textArea.Caret.Offset);
-					char charBefore = textArea.Document.GetCharAt(textArea.Caret.Offset - 1);
-					
-					if (((charBefore == '\'') && (charAfter == '\'')) ||
-					    ((charBefore == '\"') && (charAfter == '\"'))) {
-						inside = true;
-					}
-				}
-			}
-			
-			return inside;
-		}
-		
-		/// <summary>
-		/// Inserts a character into the text editor at the current offset.
-		/// </summary>
-		/// <remarks>
-		/// This code is copied from the TextArea.SimulateKeyPress method.  This
-		/// code is needed to handle an issue with code completion.  What if
-		/// we want to include the character just typed as the pre-selected text
-		/// for autocompletion?  If we do not insert the character before
-		/// displaying the autocompletion list we cannot set the pre-selected text
-		/// because it is not actually inserted yet.  The autocompletion window
-		/// checks the offset of the pre-selected text and closes the window
-		/// if the range is wrong.  The offset check is always wrong since the text
-		/// does not actually exist yet.  The check occurs in
-		/// CodeCompletionWindow.CaretOffsetChanged:
-		/// <code>[[!CDATA[	int offset = control.ActiveTextAreaControl.Caret.Offset;
-		///
-		///	if (offset < startOffset || offset > endOffset) {
-		///		Close();
-		///	} else {
-		///		codeCompletionListView.SelectItemWithStart(control.Document.GetText(startOffset, offset - startOffset));
-		///	}]]
-		/// </code>
-		/// The Close method is called because the offset is out of the range.
-		/// </remarks>
-		void InsertCharacter(char ch)
-		{
-			ActiveTextAreaControl.TextArea.BeginUpdate();
-			Document.UndoStack.StartUndoGroup();
-			
-			switch (ActiveTextAreaControl.TextArea.Caret.CaretMode)
-			{
-				case CaretMode.InsertMode:
-					ActiveTextAreaControl.TextArea.InsertChar(ch);
-					break;
-				case CaretMode.OverwriteMode:
-					ActiveTextAreaControl.TextArea.ReplaceChar(ch);
-					break;
-			}
-			int currentLineNr = ActiveTextAreaControl.TextArea.Caret.Line;
-			Document.FormattingStrategy.FormatLine(ActiveTextAreaControl.TextArea, currentLineNr, Document.PositionToOffset(ActiveTextAreaControl.TextArea.Caret.Position), ch);
-			
-			ActiveTextAreaControl.TextArea.EndUpdate();
-			Document.UndoStack.EndUndoGroup();
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlEditorOptionsPanel.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlEditorOptionsPanel.cs
deleted file mode 100644
index fd8b4e9338..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlEditorOptionsPanel.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using ICSharpCode.SharpDevelop.Gui.OptionPanels;
-using System;
-using System.Windows.Forms;
-using ICSharpCode.SharpDevelop.Gui;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Configuration settings for the xml editor.
-	/// </summary>
-	public class XmlEditorOptionsPanel : XmlFormsOptionPanel
-	{
-		static readonly string showAttributesWhenFoldedCheckBoxName = "showAttributesWhenFoldedCheckBox";
-		static readonly string showSchemaAnnotationCheckBoxName = "showSchemaAnnotationCheckBox";
-		
-		public XmlEditorOptionsPanel()
-		{
-		}
-		
-		/// <summary>
-		/// Initialises the panel.
-		/// </summary>
-		public override void LoadPanelContents()
-		{
-			SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("ICSharpCode.XmlEditor.Resources.XmlEditorOptionsPanel.xfrm"));
-				
-			((CheckBox)ControlDictionary[showAttributesWhenFoldedCheckBoxName]).Checked = XmlEditorAddInOptions.ShowAttributesWhenFolded;
-			((CheckBox)ControlDictionary[showSchemaAnnotationCheckBoxName]).Checked = XmlEditorAddInOptions.ShowSchemaAnnotation;		
-		}
-
-		/// <summary>
-		/// Saves any changes.
-		/// </summary>
-		public override bool StorePanelContents()
-		{
-			XmlEditorAddInOptions.ShowAttributesWhenFolded = ((CheckBox)ControlDictionary[showAttributesWhenFoldedCheckBoxName]).Checked;
-			XmlEditorAddInOptions.ShowSchemaAnnotation = ((CheckBox)ControlDictionary[showSchemaAnnotationCheckBoxName]).Checked;
-			
-			return true;
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlElementPath.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlElementPath.cs
deleted file mode 100644
index 09f9c18b37..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlElementPath.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Text;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Represents the path to an xml element starting from the root of the
-	/// document.
-	/// </summary>
-	public class XmlElementPath
-	{
-		QualifiedNameCollection elements = new QualifiedNameCollection();
-		
-		public XmlElementPath()
-		{
-		}
-		
-		/// <summary>
-		/// Gets the elements specifying the path.
-		/// </summary>
-		/// <remarks>The order of the elements determines the path.</remarks>
-		public QualifiedNameCollection Elements {
-			get { return elements; }
-		}
-		
-		/// <summary>
-		/// Compacts the path so it only contains the elements that are from 
-		/// the namespace of the last element in the path. 
-		/// </summary>
-		/// <remarks>This method is used when we need to know the path for a
-		/// particular namespace and do not care about the complete path.
-		/// </remarks>
-		public void Compact()
-		{
-			if (elements.Count > 0) {
-				QualifiedName lastName = Elements[Elements.Count - 1];
-				if (lastName != null) {
-					int index = FindNonMatchingParentElement(lastName.Namespace);
-					if (index != -1) {
-						RemoveParentElements(index);
-					}
-				}
-			}
-		}
-		
-		/// <summary>
-		/// An xml element path is considered to be equal if 
-		/// each path item has the same name and namespace.
-		/// </summary>
-		public override bool Equals(object obj) 
-		{	
-			if (!(obj is XmlElementPath)) return false;
-			if (this == obj) return true;
-			
-			XmlElementPath rhs = (XmlElementPath)obj;
-			if (elements.Count == rhs.elements.Count) {
-				
-				for (int i = 0; i < elements.Count; ++i) {
-					if (!elements[i].Equals(rhs.elements[i])) {
-						return false;
-					}
-				}
-				return true;
-			}
-			
-			return false;
-		}
-		
-		public override int GetHashCode() 
-		{
-			return elements.GetHashCode();
-		}
-		
-		
-		/// <summary>
-		/// Gets a string that represents the XmlElementPath.
-		/// </summary>
-		public override string ToString()
-		{
-			if (elements.Count > 0) {
-				StringBuilder toString = new StringBuilder();
-				int lastIndex = elements.Count - 1;
-				for (int i = 0; i < elements.Count; ++i) {
-					string elementToString = GetElementToString(elements[i]);
-					if (i == lastIndex) {
-						toString.Append(elementToString);
-					} else {
-						toString.Append(elementToString);
-						toString.Append(" > ");
-					}
-				}
-				return toString.ToString();
-			}
-			return String.Empty;
-		}
-		
-		/// <summary>
-		/// Removes elements up to and including the specified index.
-		/// </summary>
-		void RemoveParentElements(int index)
-		{
-			while (index >= 0) {
-				--index;
-				elements.RemoveFirst();
-			}
-		}
-		
-		/// <summary>
-		/// Finds the first parent that does belong in the specified
-		/// namespace.
-		/// </summary>
-		int FindNonMatchingParentElement(string namespaceUri)
-		{
-			int index = -1;
-			
-			if (elements.Count > 1) {
-				// Start the check from the the last but one item.
-				for (int i = elements.Count - 2; i >= 0; --i) {
-					QualifiedName name = elements[i];
-					if (name.Namespace != namespaceUri) {
-						index = i;
-						break;
-					}
-				}
-			}
-			return index;
-		}
-		
-		/// <summary>
-		/// Returns the qualified name as a string. If the name has a 
-		/// prefix then it returns "prefix:element" otherwise it returns
-		/// just the element name.
-		/// </summary>
-		static string GetElementToString(QualifiedName name)
-		{
-			if (name.Prefix.Length > 0) {
-				return name.Prefix + ":" + name.Name;
-			}
-			return name.Name;
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlElementTreeNode.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlElementTreeNode.cs
deleted file mode 100644
index 0ac741f95f..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlElementTreeNode.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Xml;
-using ICSharpCode.SharpDevelop.Gui;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Represents an XmlElement in the Xml Tree.
-	/// </summary>
-	public class XmlElementTreeNode : ExtTreeNode
-	{
-		public const string XmlElementTreeNodeImageKey = "XmlElementTreeNodeImage";
-		public const string XmlElementTreeNodeGhostImageKey = "XmlElementTreeNodeGhostImage";
-		
-		XmlElement element;
-		
-		public XmlElementTreeNode(XmlElement element)
-		{
-			this.element = element;
-			Text = GetDisplayText(element);
-			Tag = element;
-			ImageKey = XmlElementTreeNodeImageKey;
-			
-			if (element.HasChildNodes) {
-				// Add dummy node so that the tree node can be
-				// expanded in the tree view.
-				Nodes.Add(new ExtTreeNode());
-			}
-		}
-		
-		/// <summary>
-		/// Gets the XmlElement associated with this tree node.
-		/// </summary>
-		public XmlElement XmlElement {
-			get {
-				return element;
-			}
-		}
-		
-		/// <summary>
-		/// Gets or sets whether to show the ghost image which is 
-		/// displayed when cutting the node.
-		/// </summary>
-		public bool ShowGhostImage {
-			get {
-				return ImageKey == XmlElementTreeNodeGhostImageKey;
-			}
-			set {
-				if (value) {
-					ImageKey = XmlElementTreeNodeGhostImageKey;
-				} else {
-					ImageKey = XmlElementTreeNodeImageKey;
-				}
-				SelectedImageKey = ImageKey;
-			}
-		}
-		
-		/// <summary>
-		/// Adds child elements to this tree node.
-		/// </summary>
-		protected override void Initialize()
-		{
-			Nodes.Clear();
-			foreach (XmlNode childNode in element.ChildNodes) {
-				XmlElement childElement = childNode as XmlElement;
-				XmlText text = childNode as XmlText;
-				XmlComment comment = childNode as XmlComment;
-				if (childElement != null) {
-					XmlElementTreeNode treeNode = new XmlElementTreeNode(childElement);
-					treeNode.AddTo(this);
-				} else if (text != null) {
-					XmlTextTreeNode treeNode = new XmlTextTreeNode(text);
-					treeNode.AddTo(this);
-				} else if (comment != null) {
-					XmlCommentTreeNode treeNode = new XmlCommentTreeNode(comment);
-					treeNode.AddTo(this);
-				}
-			}
-		}
-		
-		/// <summary>
-		/// Gets the tree node's text for the element.
-		/// </summary>
-		static string GetDisplayText(XmlElement element)
-		{
-			if (element.Prefix.Length > 0) {
-				return String.Concat(element.Prefix, ":", element.LocalName);
-			}
-			return element.LocalName;
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlEncoder.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlEncoder.cs
deleted file mode 100644
index 4198c50d22..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlEncoder.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Text;
-using System.Xml;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Utility class that will encode special XML characters.
-	/// </summary>
-	public sealed class XmlEncoder
-	{
-		XmlEncoder()
-		{
-		}
-		
-		/// <summary>
-		/// Encodes any special characters in the xml string.
-		/// </summary>
-		public static string Encode(string xml, char quoteCharacter)
-		{
-			XmlEncoderTextWriter encoderWriter = new XmlEncoderTextWriter();
-			using (XmlTextWriter writer = new XmlTextWriter(encoderWriter)) {
-				writer.WriteStartElement("root");
-				writer.WriteStartAttribute("attribute");
-				writer.QuoteChar = quoteCharacter;
-				
-				encoderWriter.BeginMarkup();
-				writer.WriteString(xml);
-				return encoderWriter.Markup;
-			}
-		}
-		
-		/// <summary>
-		/// Special XmlTextWriter that will return the last item written to
-		/// it from a certain point. This is used by the XmlEncoder to
-		/// get the encoded attribute string so the XmlEncoder does not
-		/// have to do the special character encoding itself, but can
-		/// use the .NET framework to do the work.
-		/// </summary>
-		class XmlEncoderTextWriter : EncodedStringWriter
-		{
-			StringBuilder markup = new StringBuilder();
-			
-			public XmlEncoderTextWriter() : base(Encoding.UTF8)
-			{
-			}
-			
-			/// <summary>
-			/// Sets the point from which we are interested in 
-			/// saving the string written to the text writer.
-			/// </summary>
-			public void BeginMarkup()
-			{
-				markup = new StringBuilder();
-			}
-			
-			public void EndMarkup()
-			{
-				BeginMarkup();
-			}
-			
-			/// <summary>
-			/// Returns the string written to this text writer after the
-			/// BeginMarkup method was called.
-			/// </summary>
-			public string Markup {
-				get {
-					return markup.ToString();
-				}
-			}
-			
-			public override void Write(string text)
-			{
-				base.Write(text);
-				markup.Append(text);
-			}
-			
-			public override void Write(char value)
-			{
-				base.Write(value);
-				markup.Append(value);
-			}
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlFoldingStrategy.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlFoldingStrategy.cs
deleted file mode 100644
index d92ec05b93..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlFoldingStrategy.cs
+++ /dev/null
@@ -1,265 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using System.Xml;
-
-using ICSharpCode.TextEditor.Document;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Holds information about the start of a fold in an xml string.
-	/// </summary>
-	public class XmlFoldStart
-	{
-		int line = 0;
-		int col = 0;
-		string prefix = String.Empty;
-		string name = String.Empty;
-		string foldText = String.Empty;
-		
-		public XmlFoldStart(string prefix, string name, int line, int col)
-		{
-			this.line = line;
-			this.col = col;
-			this.prefix = prefix;
-			this.name = name;
-		}
-		
-		/// <summary>
-		/// The line where the fold should start.  Lines start from 0.
-		/// </summary>
-		public int Line {
-			get {
-				return line;
-			}
-		}
-		
-		/// <summary>
-		/// The column where the fold should start.  Columns start from 0.
-		/// </summary>
-		public int Column {
-			get {
-				return col;
-			}
-		}	
-		
-		/// <summary>
-		/// The name of the xml item with its prefix if it has one.
-		/// </summary>
-		public string Name {
-			get {
-				if (prefix.Length > 0) {
-					return String.Concat(prefix, ":", name);
-				} else {
-					return name;
-				}
-			}
-		}
-		
-		/// <summary>
-		/// The text to be displayed when the item is folded.
-		/// </summary>
-		public string FoldText {
-			get {
-				return foldText;
-			}
-			
-			set {
-				foldText = value;
-			}
-		}
-	}
-	
-	/// <summary>
-	/// Determines folds for an xml string in the editor.
-	/// </summary>
-	public class XmlFoldingStrategy : IFoldingStrategy
-	{
-		/// <summary>
-		/// Flag indicating whether attributes should be displayed on folded
-		/// elements.
-		/// </summary>
-		bool showAttributesWhenFolded = false;
-		
-		public XmlFoldingStrategy()
-		{
-		}	
-		
-		#region IFoldingStrategy 
-		
-		/// <summary>
-		/// Adds folds to the text editor around each start-end element pair.
-		/// </summary>
-		/// <remarks>
-		/// <para>If the xml is not well formed then no folds are created.</para> 
-		/// <para>Note that the xml text reader lines and positions start 
-		/// from 1 and the SharpDevelop text editor line information starts
-		/// from 0.</para>
-		/// </remarks>
-		public List<FoldMarker> GenerateFoldMarkers(IDocument document, string fileName, object parseInformation)
-		{
-			showAttributesWhenFolded = XmlEditorAddInOptions.ShowAttributesWhenFolded;
-			
-			List<FoldMarker> foldMarkers = new List<FoldMarker>();
-			Stack stack = new Stack();
-			
-			try {
-				string xml = document.TextContent;
-				XmlTextReader reader = new XmlTextReader(new StringReader(xml));
-				while (reader.Read()) {
-					switch (reader.NodeType) {
-						case XmlNodeType.Element:
-							if (!reader.IsEmptyElement) {
-								XmlFoldStart newFoldStart = CreateElementFoldStart(reader);
-								stack.Push(newFoldStart);
-							}
-							break;
-						
-						case XmlNodeType.EndElement:
-							XmlFoldStart foldStart = (XmlFoldStart)stack.Pop();
-							CreateElementFold(document, foldMarkers, reader, foldStart);
-							break;
-							
-						case XmlNodeType.Comment:
-							CreateCommentFold(document, foldMarkers, reader);
-							break;
-					}
-				}
-			} catch (Exception) {
-				// If the xml is not well formed keep the foldings 
-				// that already exist in the document.
-				return new List<FoldMarker>(document.FoldingManager.FoldMarker);
-			}
-
-			return foldMarkers;
-		}
-		
-		#endregion
-		
-		/// <summary>
-		/// Creates a comment fold if the comment spans more than one line.
-		/// </summary>
-		/// <remarks>The text displayed when the comment is folded is the first 
-		/// line of the comment.</remarks>
-		void CreateCommentFold(IDocument document, List<FoldMarker> foldMarkers, XmlTextReader reader)
-		{
-			if (reader.Value != null) {
-				string comment = reader.Value.Replace("\r\n", "\n");
-				string[] lines = comment.Split('\n');
-				if (lines.Length > 1) {
-					
-					// Take off 5 chars to get the actual comment start (takes
-					// into account the <!-- chars.
-
-					int startCol = reader.LinePosition - 5;
-					int startLine = reader.LineNumber - 1;
-					
-					// Add 3 to the end col value to take into account the '-->'
-					int endCol = lines[lines.Length - 1].Length + startCol + 3;
-					int endLine = startLine + lines.Length - 1;
-					string foldText = String.Concat("<!--", lines[0], "-->");
-					FoldMarker foldMarker = new FoldMarker(document, startLine, startCol, endLine, endCol, FoldType.TypeBody, foldText);
-					foldMarkers.Add(foldMarker);
-				}				
-			}
-		}
-		
-		/// <summary>
-		/// Creates an XmlFoldStart for the start tag of an element.
-		/// </summary>
-		XmlFoldStart CreateElementFoldStart(XmlTextReader reader)
-		{
-			// Take off 2 from the line position returned 
-			// from the xml since it points to the start
-			// of the element name and not the beginning 
-			// tag.
-			XmlFoldStart newFoldStart = new XmlFoldStart(reader.Prefix, reader.LocalName, reader.LineNumber - 1, reader.LinePosition - 2);
-			
-			if (showAttributesWhenFolded && reader.HasAttributes) {
-				newFoldStart.FoldText = String.Concat("<", newFoldStart.Name, " ", GetAttributeFoldText(reader), ">");
-			} else {
-				newFoldStart.FoldText = String.Concat("<", newFoldStart.Name, ">");			
-			}
-			
-			return newFoldStart;
-		}
-		
-		/// <summary>
-		/// Create an element fold if the start and end tag are on 
-		/// different lines.
-		/// </summary>
-		void CreateElementFold(IDocument document, List<FoldMarker> foldMarkers, XmlTextReader reader, XmlFoldStart foldStart)
-		{
-			int endLine = reader.LineNumber - 1;
-			if (endLine > foldStart.Line) {
-				int endCol = reader.LinePosition + foldStart.Name.Length;
-				FoldMarker foldMarker = new FoldMarker(document, foldStart.Line, foldStart.Column, endLine, endCol, FoldType.TypeBody, foldStart.FoldText);
-				foldMarkers.Add(foldMarker);
-			}
-		}
-		
-		/// <summary>
-		/// Gets the element's attributes as a string on one line that will
-		/// be displayed when the element is folded.
-		/// </summary>
-		/// <remarks>
-		/// Currently this puts all attributes from an element on the same
-		/// line of the start tag.  It does not cater for elements where attributes
-		/// are not on the same line as the start tag.
-		/// </remarks>
-		string GetAttributeFoldText(XmlTextReader reader)
-		{
-			StringBuilder text = new StringBuilder();
-			
-			for (int i = 0; i < reader.AttributeCount; ++i) {
-				reader.MoveToAttribute(i);
-				
-				text.Append(reader.Name);
-				text.Append("=");
-				text.Append(reader.QuoteChar.ToString());
-				text.Append(XmlEncodeAttributeValue(reader.Value, reader.QuoteChar));
-				text.Append(reader.QuoteChar.ToString());
-				
-				// Append a space if this is not the
-				// last attribute.
-				if (i < reader.AttributeCount - 1) {
-					text.Append(" ");
-				}
-			}
-			
-			return text.ToString();
-		}
-		
-		/// <summary>
-		/// Xml encode the attribute string since the string returned from
-		/// the XmlTextReader is the plain unencoded string and .NET
-		/// does not provide us with an xml encode method.
-		/// </summary>
-		static string XmlEncodeAttributeValue(string attributeValue, char quoteChar)
-		{
-			StringBuilder encodedValue = new StringBuilder(attributeValue);
-			
-			encodedValue.Replace("&", "&amp;");
-			encodedValue.Replace("<", "&lt;");
-			encodedValue.Replace(">", "&gt;");
-			
-			if (quoteChar == '"') {
-				encodedValue.Replace("\"", "&quot;");
-			} else {
-				encodedValue.Replace("'", "&apos;");
-			}
-			
-			return encodedValue.ToString();
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlNamespace.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlNamespace.cs
deleted file mode 100644
index adf5056fd7..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlNamespace.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// A namespace Uri and a prefix.
-	/// </summary>
-	public class XmlNamespace
-	{
-		string prefix = String.Empty;
-		string uri = String.Empty;
-		
-		const string prefixToStringStart = "Prefix [";
-		const string uriToStringMiddle = "] Uri [";
-		
-		public XmlNamespace(string prefix, string uri)
-		{
-			this.prefix = prefix;
-			this.uri = uri;
-		}
-		
-		public string Prefix {
-			get {
-				return prefix;
-			}
-		}
-		
-		public string Uri {
-			get {
-				return uri;
-			}
-		}
-		
-		public override string ToString()
-		{
-			return String.Concat(prefixToStringStart, prefix, uriToStringMiddle, uri, "]");
-		}
-		
-		/// <summary>
-		/// Creates an XmlNamespace instance from the given string that is in the
-		/// format returned by ToString.
-		/// </summary>
-		public static XmlNamespace FromString(string s)
-		{
-			int prefixIndex = s.IndexOf(prefixToStringStart);
-			if (prefixIndex >= 0) {
-				prefixIndex += prefixToStringStart.Length;
-				int uriIndex = s.IndexOf(uriToStringMiddle, prefixIndex);
-				if (uriIndex >= 0) {
-					string prefix = s.Substring(prefixIndex, uriIndex - prefixIndex);
-					uriIndex += uriToStringMiddle.Length;
-					string uri = s.Substring(uriIndex, s.Length - (uriIndex + 1));
-					return new XmlNamespace(prefix, uri);
-				}
-			}
-			return new XmlNamespace(String.Empty, String.Empty);
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlParser.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlParser.cs
deleted file mode 100644
index 7e775da9f9..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlParser.cs
+++ /dev/null
@@ -1,798 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Xml;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Utility class that contains xml parsing routines used to determine
-	/// the currently selected element so we can provide intellisense.
-	/// </summary>
-	/// <remarks>
-	/// All of the routines return <see cref="XmlElementPath"/> objects
-	/// since we are interested in the complete path or tree to the
-	/// currently active element.
-	/// </remarks>
-	public class XmlParser
-	{
-		/// <summary>
-		/// Helper class.  Holds the namespace URI and the prefix currently
-		/// in use for this namespace.
-		/// </summary>
-		class NamespaceURI
-		{
-			string namespaceURI = String.Empty;
-			string prefix = String.Empty;
-			
-			public NamespaceURI()
-			{
-			}
-			
-			public NamespaceURI(string namespaceURI, string prefix)
-			{
-				this.namespaceURI = namespaceURI;
-				this.prefix = prefix;
-			}
-			
-			public string Namespace {
-				get { return namespaceURI; }
-				set { namespaceURI = value; }
-			}
-			
-			public string Prefix {
-				get { return prefix; }
-				set {
-					prefix = value;
-					if (prefix == null) {
-						prefix = String.Empty;
-					}
-				}
-			}
-			
-			public override string ToString()
-			{
-				if (!String.IsNullOrEmpty(prefix)) {
-					return prefix + ":" + namespaceURI;
-				}
-				return namespaceURI;
-			}
-		}
-
-		static readonly char[] whitespaceCharacters = new char[] {' ', '\n', '\t', '\r'};
-		
-		XmlParser()
-		{
-		}
-
-		/// <summary>
-		/// Gets path of the xml element start tag that the specified
-		/// <paramref name="index"/> is currently inside.
-		/// </summary>
-		/// <remarks>If the index outside the start tag then an empty path
-		/// is returned.</remarks>
-		public static XmlElementPath GetActiveElementStartPath(string xml, int index)
-		{
-			QualifiedNameCollection namespaces = new QualifiedNameCollection();
-			return GetActiveElementStartPath(xml, index, namespaces);
-		}
-		
-		/// <summary>
-		/// Gets path of the xml element start tag that the specified
-		/// <paramref name="index"/> is currently located. This is different to the
-		/// GetActiveElementStartPath method since the index can be inside the element
-		/// name.
-		/// </summary>
-		/// <remarks>If the index outside the start tag then an empty path
-		/// is returned.</remarks>
-		public static XmlElementPath GetActiveElementStartPathAtIndex(string xml, int index)
-		{
-			QualifiedNameCollection namespaces = new QualifiedNameCollection();
-			return GetActiveElementStartPathAtIndex(xml, index, namespaces);
-		}
-
-		/// <summary>
-		/// Gets the parent element path based on the index position.
-		/// </summary>
-		public static XmlElementPath GetParentElementPath(string xml)
-		{
-			QualifiedNameCollection namespaces = new QualifiedNameCollection();
-			XmlElementPath path = GetFullParentElementPath(xml, namespaces);
-			path.Compact();
-			return path;
-		}
-		
-		/// <summary>
-		/// Checks whether the attribute at the end of the string is a
-		/// namespace declaration.
-		/// </summary>
-		public static bool IsNamespaceDeclaration(string xml, int index)
-		{
-			if (String.IsNullOrEmpty(xml)) {
-				return false;
-			}
-			
-			index = GetCorrectedIndex(xml.Length, index);
-			
-			// Move back one character if the last character is an '='
-			if (xml[index] == '=') {
-				xml = xml.Substring(0, xml.Length - 1);
-				--index;
-			}
-			
-			// From the end of the string work backwards until we have
-			// picked out the last attribute and reached some whitespace.
-			StringBuilder reversedAttributeName = new StringBuilder();
-			
-			bool ignoreWhitespace = true;
-			int currentIndex = index;
-			for (int i = 0; i < index; ++i) {
-				
-				char currentChar = xml[currentIndex];
-				
-				if (Char.IsWhiteSpace(currentChar)) {
-					if (ignoreWhitespace == false) {
-						// Reached the start of the attribute name.
-						break;
-					}
-				} else if (Char.IsLetterOrDigit(currentChar) || (currentChar == ':')) {
-					ignoreWhitespace = false;
-					reversedAttributeName.Append(currentChar);
-				} else {
-					// Invalid string.
-					break;
-				}
-				
-				--currentIndex;
-			}
-			
-			// Did we get a namespace?
-			
-			bool isNamespace = false;
-
-			if ((reversedAttributeName.ToString() == "snlmx") || (reversedAttributeName.ToString().EndsWith(":snlmx"))) {
-				isNamespace = true;
-			}
-			
-			return isNamespace;
-		}
-		
-		/// <summary>
-		/// Gets the attribute name and any prefix. The namespace
-		/// is not determined.
-		/// </summary>
-		/// <returns><see langword="null"/> if no attribute name can
-		/// be found.</returns>
-		public static QualifiedName GetQualifiedAttributeName(string xml, int index)
-		{
-			string name = GetAttributeName(xml, index);
-			return GetQualifiedName(name);
-		}
-		
-		/// <summary>
-		/// Gets the name of the attribute inside but before the specified
-		/// index.
-		/// </summary>
-		public static string GetAttributeName(string xml, int index)
-		{
-			if (String.IsNullOrEmpty(xml)) {
-				return String.Empty;
-			}
-			
-			index = GetCorrectedIndex(xml.Length, index);
-			return GetAttributeName(xml, index, true, true, true);
-		}
-
-		/// <summary>
-		/// Gets the name of the attribute and its prefix at the specified index. The index
-		/// can be anywhere inside the attribute name or in the attribute value.
-		/// The namespace for the element containing the attribute will also be determined
-		/// if the includeNamespace flag is set to true.
-		/// </summary>
-		public static QualifiedName GetQualifiedAttributeNameAtIndex(string xml, int index, bool includeNamespace)
-		{
-			string name = GetAttributeNameAtIndex(xml, index);
-			QualifiedName qualifiedName = GetQualifiedName(name);
-			if (qualifiedName != null && String.IsNullOrEmpty(qualifiedName.Namespace) && includeNamespace) {
-				QualifiedNameCollection namespaces = new QualifiedNameCollection();
-				XmlElementPath path = GetActiveElementStartPathAtIndex(xml, index, namespaces);
-				qualifiedName.Namespace = GetNamespaceForPrefix(namespaces, path.Elements.LastPrefix);
-			}
-			return qualifiedName;
-		}
-		
-		/// <summary>
-		/// Gets the name of the attribute and its prefix at the specified index. The index
-		/// can be anywhere inside the attribute name or in the attribute value.
-		/// </summary>
-		public static QualifiedName GetQualifiedAttributeNameAtIndex(string xml, int index)
-		{
-			return GetQualifiedAttributeNameAtIndex(xml, index, false);
-		}
-		
-		/// <summary>
-		/// Gets the name of the attribute at the specified index. The index
-		/// can be anywhere inside the attribute name or in the attribute value.
-		/// </summary>
-		public static string GetAttributeNameAtIndex(string xml, int index)
-		{
-			if (String.IsNullOrEmpty(xml)) {
-				return String.Empty;
-			}
-			
-			index = GetCorrectedIndex(xml.Length, index);
-			
-			bool ignoreWhitespace = true;
-			bool ignoreEqualsSign = false;
-			bool ignoreQuote = false;
-			
-			if (IsInsideAttributeValue(xml, index)) {
-				// Find attribute name start.
-				int elementStartIndex = GetActiveElementStartIndex(xml, index);
-				if (elementStartIndex == -1) {
-					return String.Empty;
-				}
-				
-				// Find equals sign.
-				for (int i = index; i > elementStartIndex; --i) {
-					char ch = xml[i];
-					if (ch == '=') {
-						index = i;
-						ignoreEqualsSign = true;
-						break;
-					}
-				}
-			} else {
-				// Find end of attribute name.
-				for (; index < xml.Length; ++index) {
-					char ch = xml[index];
-					if (!IsXmlNameChar(ch)) {
-						if (ch == '\'' || ch == '\"') {
-							ignoreQuote = true;
-							ignoreEqualsSign = true;
-						}
-						break;
-					}
-				}
-				--index;
-			}
-			
-			return GetAttributeName(xml, index, ignoreWhitespace, ignoreQuote, ignoreEqualsSign);
-		}
-		
-		/// <summary>
-		/// Checks for valid xml attribute value character
-		/// </summary>
-		public static bool IsAttributeValueChar(char ch)
-		{
-			if ((ch == '<') ||
-			    (ch == '>'))
-			{
-				return false;
-			}
-			
-			return true;
-		}
-		
-		/// <summary>
-		/// Checks for valid xml element or attribute name character.
-		/// </summary>
-		public static bool IsXmlNameChar(char ch)
-		{
-			if (Char.IsLetterOrDigit(ch) ||
-			    (ch == ':') ||
-			    (ch == '/') ||
-			    (ch == '_') ||
-			    (ch == '.') ||
-			    (ch == '-'))
-			{
-				return true;
-			}
-			
-			return false;
-		}
-		
-		/// <summary>
-		/// Determines whether the specified index is inside an attribute value.
-		/// </summary>
-		public static bool IsInsideAttributeValue(string xml, int index)
-		{
-			if (String.IsNullOrEmpty(xml)) {
-				return false;
-			}
-			
-			if (index > xml.Length) {
-				index = xml.Length;
-			}
-			
-			int elementStartIndex = GetActiveElementStartIndex(xml, index);
-			if (elementStartIndex == -1) {
-				return false;
-			}
-			
-			// Count the number of double quotes and single quotes that exist
-			// before the first equals sign encountered going backwards to
-			// the start of the active element.
-			bool foundEqualsSign = false;
-			int doubleQuotesCount = 0;
-			int singleQuotesCount = 0;
-			char lastQuoteChar = ' ';
-			for (int i = index - 1; i > elementStartIndex; --i) {
-				char ch = xml[i];
-				if (ch == '=') {
-					foundEqualsSign = true;
-					break;
-				} else if (ch == '\"') {
-					lastQuoteChar = ch;
-					++doubleQuotesCount;
-				} else if (ch == '\'') {
-					lastQuoteChar = ch;
-					++singleQuotesCount;
-				}
-			}
-			
-			bool isInside = false;
-			
-			if (foundEqualsSign) {
-				// Odd number of quotes?
-				if ((lastQuoteChar == '\"') && ((doubleQuotesCount % 2) > 0)) {
-					isInside = true;
-				} else if ((lastQuoteChar == '\'') && ((singleQuotesCount %2) > 0)) {
-					isInside = true;
-				}
-			}
-			
-			return isInside;
-		}
-		
-		/// <summary>
-		/// Gets the attribute value at the specified index.
-		/// </summary>
-		/// <returns>An empty string if no attribute value can be found.</returns>
-		public static string GetAttributeValueAtIndex(string xml, int index)
-		{
-			if (!IsInsideAttributeValue(xml, index)) {
-				return String.Empty;
-			}
-			
-			index = GetCorrectedIndex(xml.Length, index);
-			
-			int elementStartIndex = GetActiveElementStartIndex(xml, index);
-			if (elementStartIndex == -1) {
-				return String.Empty;
-			}
-			
-			// Find equals sign.
-			int equalsSignIndex = -1;
-			for (int i = index; i > elementStartIndex; --i) {
-				char ch = xml[i];
-				if (ch == '=') {
-					equalsSignIndex = i;
-					break;
-				}
-			}
-			
-			if (equalsSignIndex == -1) {
-				return String.Empty;
-			}
-			
-			// Find attribute value.
-			char quoteChar = ' ';
-			bool foundQuoteChar = false;
-			StringBuilder attributeValue = new StringBuilder();
-			for (int i = equalsSignIndex; i < xml.Length; ++i) {
-				char ch = xml[i];
-				if (!foundQuoteChar) {
-					if (ch == '\"' || ch == '\'') {
-						quoteChar = ch;
-						foundQuoteChar = true;
-					}
-				} else {
-					if (ch == quoteChar) {
-						// End of attribute value.
-						return attributeValue.ToString();
-					} else if (IsAttributeValueChar(ch) || (ch == '\"' || ch == '\'')) {
-						attributeValue.Append(ch);
-					} else {
-						// Invalid character found.
-						return String.Empty;
-					}
-				}
-			}
-			
-			return String.Empty;
-		}
-		
-		/// <summary>
-		/// Gets the text of the xml element start tag that the index is
-		/// currently inside.
-		/// </summary>
-		/// <returns>
-		/// Returns the text up to and including the start tag &lt; character.
-		/// </returns>
-		static string GetActiveElementStartText(string xml, int index)
-		{
-			int elementStartIndex = GetActiveElementStartIndex(xml, index);
-			if (elementStartIndex >= 0) {
-				if (elementStartIndex < index) {
-					int elementEndIndex = GetActiveElementEndIndex(xml, index);
-					if (elementEndIndex >= index) {
-						return xml.Substring(elementStartIndex, elementEndIndex - elementStartIndex);
-					}
-				}
-			}
-			return null;
-		}
-		
-		/// <summary>
-		/// Locates the index of the start tag &lt; character.
-		/// </summary>
-		/// <returns>
-		/// Returns the index of the start tag character; otherwise
-		/// -1 if no start tag character is found or a end tag
-		/// &gt; character is found first.
-		/// </returns>
-		public static int GetActiveElementStartIndex(string xml, int index)
-		{
-			int elementStartIndex = -1;
-			
-			int currentIndex = index - 1;
-
-			for (int i = 0; i < index; ++i) {
-				
-				char currentChar = xml[currentIndex];
-				if (currentChar == '<') {
-					elementStartIndex = currentIndex;
-					break;
-				} else if (currentChar == '>') {
-					break;
-				}
-				
-				--currentIndex;
-			}
-			
-			return elementStartIndex;
-		}
-		
-		/// <summary>
-		/// Locates the index of the end tag character.
-		/// </summary>
-		/// <returns>
-		/// Returns the index of the end tag character; otherwise
-		/// -1 if no end tag character is found or a start tag
-		/// character is found first.
-		/// </returns>
-		static int GetActiveElementEndIndex(string xml, int index)
-		{
-			int elementEndIndex = index;
-			
-			for (int i = index; i < xml.Length; ++i) {
-				
-				char currentChar = xml[i];
-				if (currentChar == '>') {
-					elementEndIndex = i;
-					break;
-				} else if (currentChar == '<'){
-					elementEndIndex = -1;
-					break;
-				}
-			}
-			
-			return elementEndIndex;
-		}
-		
-		/// <summary>
-		/// Gets the element name from the element start tag string.
-		/// </summary>
-		/// <param name="xml">This string must start at the
-		/// element we are interested in.</param>
-		static QualifiedName GetElementName(string xml)
-		{
-			string name = String.Empty;
-			
-			// Find the end of the element name.
-			xml = xml.Replace("\r\n", " ");
-			int index = xml.IndexOf(' ');
-			if (index > 0) {
-				name = xml.Substring(1, index - 1);
-			} else {
-				name = xml.Substring(1);
-			}
-			
-			return GetQualifiedName(name);
-		}
-		
-		/// <summary>
-		/// Gets the element namespace from the element start tag
-		/// string.
-		/// </summary>
-		/// <param name="xml">This string must start at the
-		/// element we are interested in.</param>
-		static NamespaceURI GetElementNamespace(string xml)
-		{
-			NamespaceURI namespaceURI = new NamespaceURI();
-			
-			Match match = Regex.Match(xml, ".*?(xmlns\\s*?|xmlns:.*?)=\\s*?['\\\"](.*?)['\\\"]");
-			if (match.Success) {
-				namespaceURI.Namespace = match.Groups[2].Value;
-				
-				string xmlns = match.Groups[1].Value.Trim();
-				int prefixIndex = xmlns.IndexOf(':');
-				if (prefixIndex > 0) {
-					namespaceURI.Prefix = xmlns.Substring(prefixIndex + 1);
-				}
-			}
-			
-			return namespaceURI;
-		}
-		
-		static string ReverseString(string text)
-		{
-			StringBuilder reversedString = new StringBuilder(text);
-			
-			int index = text.Length;
-			foreach (char ch in text) {
-				--index;
-				reversedString[index] = ch;
-			}
-			
-			return reversedString.ToString();
-		}
-		
-		/// <summary>
-		/// Ensures that the index is on the last character if it is
-		/// too large.
-		/// </summary>
-		/// <param name="length">The length of the string.</param>
-		/// <param name="index">The current index.</param>
-		/// <returns>The index unchanged if the index is smaller than the
-		/// length of the string; otherwise it returns length - 1.</returns>
-		static int GetCorrectedIndex(int length, int index)
-		{
-			if (index >= length) {
-				index = length - 1;
-			}
-			return index;
-		}
-		
-		/// <summary>
-		/// Gets the active element path given the element text.
-		/// </summary>
-		static XmlElementPath GetActiveElementStartPath(string xml, int index, string elementText, QualifiedNameCollection namespaces)
-		{
-			QualifiedName elementName = GetElementName(elementText);
-			if (elementName == null) {
-				return new XmlElementPath();
-			}
-			
-			NamespaceURI elementNamespace = GetElementNamespace(elementText);
-			
-			XmlElementPath path = GetFullParentElementPath(xml.Substring(0, index), namespaces);
-			
-			// Try to get a namespace for the active element's prefix.
-			if (elementName.Prefix.Length > 0 && elementNamespace.Namespace.Length == 0) {
-				elementName.Namespace = GetNamespaceForPrefix(namespaces, elementName.Prefix);
-				elementNamespace.Namespace = elementName.Namespace;
-				elementNamespace.Prefix = elementName.Prefix;
-			}
-			
-			if (elementNamespace.Namespace.Length == 0) {
-				if (path.Elements.Count > 0) {
-					QualifiedName parentName = path.Elements[path.Elements.Count - 1];
-					elementNamespace.Namespace = parentName.Namespace;
-					elementNamespace.Prefix = parentName.Prefix;
-				}
-			}
-			path.Elements.Add(new QualifiedName(elementName.Name, elementNamespace.Namespace, elementNamespace.Prefix));
-			path.Compact();
-			return path;
-		}
-		
-		static string GetAttributeName(string xml, int index, bool ignoreWhitespace, bool ignoreQuote, bool ignoreEqualsSign)
-		{
-			string name = String.Empty;
-			
-			// From the end of the string work backwards until we have
-			// picked out the attribute name.
-			StringBuilder reversedAttributeName = new StringBuilder();
-			
-			int currentIndex = index;
-			bool invalidString = true;
-			
-			for (int i = 0; i <= index; ++i) {
-				
-				char currentChar = xml[currentIndex];
-				
-				if (IsXmlNameChar(currentChar)) {
-					if (!ignoreEqualsSign) {
-						ignoreWhitespace = false;
-						reversedAttributeName.Append(currentChar);
-					}
-				} else if (Char.IsWhiteSpace(currentChar)) {
-					if (ignoreWhitespace == false) {
-						// Reached the start of the attribute name.
-						invalidString = false;
-						break;
-					}
-				} else if ((currentChar == '\'') || (currentChar == '\"')) {
-					if (ignoreQuote) {
-						ignoreQuote = false;
-					} else {
-						break;
-					}
-				} else if (currentChar == '='){
-					if (ignoreEqualsSign) {
-						ignoreEqualsSign = false;
-					} else {
-						break;
-					}
-				} else if (IsAttributeValueChar(currentChar)) {
-					if (!ignoreQuote) {
-						break;
-					}
-				} else {
-					break;
-				}
-				
-				--currentIndex;
-			}
-			
-			if (!invalidString) {
-				name = ReverseString(reversedAttributeName.ToString());
-			}
-			
-			return name;
-		}
-		
-		/// <summary>
-		/// Gets the element name at the specified index.
-		/// </summary>
-		static string GetElementNameAtIndex(string xml, int index)
-		{
-			int elementStartIndex = GetActiveElementStartIndex(xml, index);
-			if (elementStartIndex >= 0 && elementStartIndex < index) {
-				int elementEndIndex = GetActiveElementEndIndex(xml, index);
-				if (elementEndIndex == -1) {
-					elementEndIndex = xml.IndexOfAny(whitespaceCharacters, elementStartIndex);
-				}
-				if (elementEndIndex >= elementStartIndex) {
-					return xml.Substring(elementStartIndex, elementEndIndex - elementStartIndex);
-				}
-			}
-			return null;
-		}
-		
-		/// <summary>
-		/// Returns a name and its prefix.
-		/// </summary>
-		static QualifiedName GetQualifiedName(string name)
-		{
-			if (name.Length == 0) {
-				return null;
-			}
-			
-			QualifiedName qualifiedName = new QualifiedName();
-			int prefixIndex = name.IndexOf(':');
-			if (prefixIndex > 0) {
-				qualifiedName.Prefix = name.Substring(0, prefixIndex);
-				qualifiedName.Name = name.Substring(prefixIndex + 1);
-			} else {
-				qualifiedName.Name = name;
-			}
-			return qualifiedName;
-		}
-		
-		/// <summary>
-		/// Gets the parent element path based on the index position. This
-		/// method does not compact the path so it will include all elements
-		/// including those in another namespace in the path.
-		/// </summary>
-		static XmlElementPath GetFullParentElementPath(string xml, QualifiedNameCollection namespaces)
-		{
-			XmlElementPath path = new XmlElementPath();
-			IDictionary<string,string> namespacesInScope = null;
-			using (StringReader reader = new StringReader(xml)) {
-				using (XmlTextReader xmlReader = new XmlTextReader(reader)) {
-					try {
-						xmlReader.XmlResolver = null; // prevent XmlTextReader from loading external DTDs
-						while (xmlReader.Read()) {
-							switch (xmlReader.NodeType) {
-								case XmlNodeType.Element:
-									if (!xmlReader.IsEmptyElement) {
-										QualifiedName elementName = new QualifiedName(xmlReader.LocalName, xmlReader.NamespaceURI, xmlReader.Prefix);
-										path.Elements.Add(elementName);
-									}
-									break;
-								case XmlNodeType.EndElement:
-									path.Elements.RemoveLast();
-									break;
-							}
-						}
-					} catch (XmlException) {
-						namespacesInScope = xmlReader.GetNamespacesInScope(XmlNamespaceScope.All);
-					}
-				}
-			}
-			
-			// Add namespaces in scope for the last element read.
-			if (namespacesInScope != null) {
-				foreach (KeyValuePair<string, string> ns in namespacesInScope) {
-					namespaces.Add(new QualifiedName(String.Empty, ns.Value, ns.Key));
-				}
-			}
-			
-			return path;
-		}
-		
-		/// <summary>
-		/// Finds the namespace for the specified prefix.
-		/// </summary>
-		static string GetNamespaceForPrefix(QualifiedNameCollection namespaces, string prefix)
-		{
-			foreach (QualifiedName name in namespaces) {
-				if (name.Prefix == prefix) {
-					return name.Namespace;
-				}
-			}
-			return String.Empty;
-		}
-		
-		/// <summary>
-		/// Gets path of the xml element start tag that the specified
-		/// <paramref name="index"/> is currently inside.
-		/// </summary>
-		/// <remarks>If the index outside the start tag then an empty path
-		/// is returned.</remarks>
-		/// <param name="namespaces">Returns the namespaces that are
-		/// exist in the xml.</param>
-		static XmlElementPath GetActiveElementStartPath(string xml, int index, QualifiedNameCollection namespaces)
-		{
-			XmlElementPath path = new XmlElementPath();
-			string elementText = GetActiveElementStartText(xml, index);
-			if (elementText != null) {
-				path = GetActiveElementStartPath(xml, index, elementText, namespaces);
-			}
-			return path;
-		}
-		
-		/// <summary>
-		/// Gets path of the xml element start tag that the specified
-		/// <paramref name="index"/> is currently located. This is different to the
-		/// GetActiveElementStartPath method since the index can be inside the element
-		/// name.
-		/// </summary>
-		/// <remarks>If the index outside the start tag then an empty path
-		/// is returned.</remarks>
-		static XmlElementPath GetActiveElementStartPathAtIndex(string xml, int index, QualifiedNameCollection namespaces)
-		{
-			// Find first non xml element name character to the right of the index.
-			index = GetCorrectedIndex(xml.Length, index);
-			if (index < 0) // can happen when xml.Length==0
-				return new XmlElementPath();
-			int currentIndex = index;
-			for (; currentIndex < xml.Length; ++currentIndex) {
-				char ch = xml[currentIndex];
-				if (!IsXmlNameChar(ch)) {
-					break;
-				}
-			}
-			
-			string elementText = GetElementNameAtIndex(xml, currentIndex);
-			if (elementText != null) {
-				return GetActiveElementStartPath(xml, currentIndex, elementText, namespaces);
-			}
-			return new XmlElementPath();
-		}
-	}
-}
-
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemaAssociation.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemaAssociation.cs
deleted file mode 100644
index b9bb4b334b..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemaAssociation.cs
+++ /dev/null
@@ -1,157 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Represents an association between an xml schema and a file extension.
-	/// </summary>
-	public class XmlSchemaAssociation //: IXmlConvertable
-	{
-		string namespaceUri = String.Empty;
-		string extension = String.Empty;
-		string namespacePrefix = String.Empty;
-		
-		public XmlSchemaAssociation(string extension)
-			: this(extension, String.Empty, String.Empty)
-		{
-		}
-		
-		public XmlSchemaAssociation(string extension, string namespaceUri)
-			: this(extension, namespaceUri, String.Empty)
-		{
-		}
-		
-		public XmlSchemaAssociation(string extension, string namespaceUri, string namespacePrefix)
-		{
-			this.extension = extension;
-			this.namespaceUri = namespaceUri;
-			this.namespacePrefix = namespacePrefix;
-		}
-		
-		public string NamespaceUri {
-			get {
-				return namespaceUri;
-			}
-			
-			set {
-				namespaceUri = value;
-			}
-		}
-		
-		/// <summary>
-		/// Gets or sets the file extension (e.g. '.xml').
-		/// </summary>
-		public string Extension {
-			get {
-				return extension;
-			}
-			
-			set {
-				extension = value;
-			}
-		}
-		
-		/// <summary>
-		/// Gets or sets the default namespace prefix that will be added
-		/// to the xml elements.
-		/// </summary>
-		public string NamespacePrefix {
-			get {
-				return namespacePrefix;
-			}
-			
-			set {
-				namespacePrefix = value;
-			}
-		}		
-		
-		/// <summary>
-		/// Gets the default schema association for the file extension. 
-		/// </summary>
-		/// <remarks>
-		/// These defaults are hard coded.
-		/// </remarks>
-		public static XmlSchemaAssociation GetDefaultAssociation(string extension)
-		{
-			XmlSchemaAssociation association = null;
-			
-			switch (extension.ToLowerInvariant()) {
-				case ".wxs":
-					association = new XmlSchemaAssociation(extension, @"http://schemas.microsoft.com/wix/2003/01/wi");
-					break;
-				case ".config":
-					association = new XmlSchemaAssociation(extension, @"urn:app-config");
-					break;
-				case ".build":
-					association = new XmlSchemaAssociation(extension, @"http://nant.sf.net/release/0.85/nant.xsd");
-					break;
-				case ".addin":
-					association = new XmlSchemaAssociation(extension, @"http://www.icsharpcode.net/2005/addin");
-					break;
-				case ".xsl":
-				case ".xslt":
-					association = new XmlSchemaAssociation(extension, @"http://www.w3.org/1999/XSL/Transform", "xsl");
-					break;
-				case ".xsd":
-					association = new XmlSchemaAssociation(extension, @"http://www.w3.org/2001/XMLSchema", "xs");
-					break;
-				case ".manifest":
-					association = new XmlSchemaAssociation(extension, @"urn:schemas-microsoft-com:asm.v1");
-					break;					
-				case ".xaml":
-					association = new XmlSchemaAssociation(extension, @"http://schemas.microsoft.com/winfx/avalon/2005");
-					break;
-				default:
-					association = new XmlSchemaAssociation(extension);
-					break;
-			}
-			return association;
-		}
-		
-		/// <summary>
-		/// Two schema associations are considered equal if their file extension,
-		/// prefix and namespaceUri are the same.
-		/// </summary>
-		public override bool Equals(object obj)
-		{
-			bool equals = false;
-			
-			XmlSchemaAssociation rhs = obj as XmlSchemaAssociation;
-			if (rhs != null) {
-				if ((this.namespacePrefix == rhs.namespacePrefix) &&
-				    (this.extension == rhs.extension) &&
-				    (this.namespaceUri == rhs.namespaceUri)) {
-					equals = true;
-				}
-			}
-						
-			return equals;
-		}
-		
-		public override int GetHashCode()
-		{
-			return (namespaceUri != null ? namespaceUri.GetHashCode() : 0) ^ (extension != null ? extension.GetHashCode() : 0) ^ (namespacePrefix != null ? namespacePrefix.GetHashCode() : 0);
-		}
-		
-		/// <summary>
-		/// Creates an XmlSchemaAssociation from the saved xml.
-		/// </summary>
-		public static XmlSchemaAssociation ConvertFromString(string text)
-		{
-			string[] parts = text.Split(new char[] {'|'}, 3);
-			return new XmlSchemaAssociation(parts[0], parts[1], parts[2]);
-		}
-		
-		public string ConvertToString()
-		{	
-			return extension + "|" + namespaceUri + "|" + namespacePrefix;
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemaAssociationListBoxItem.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemaAssociationListBoxItem.cs
deleted file mode 100644
index c52336bf09..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemaAssociationListBoxItem.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Represents list box item showing the association between an xml schema 
-	/// and a file extension.
-	/// </summary>
-	public class XmlSchemaAssociationListBoxItem
-	{
-		bool isDirty = false;
-		string namespaceUri = String.Empty;
-		string extension = String.Empty;
-		string namespacePrefix = String.Empty;
-		
-		public XmlSchemaAssociationListBoxItem(string extension, string namespaceUri, string namespacePrefix)
-		{
-			this.extension = extension;
-			this.namespaceUri = namespaceUri;
-			this.namespacePrefix = namespacePrefix;
-		}
-		
-		/// <summary>
-		/// Gets or sets whether this association has been changed by the user.
-		/// </summary>
-		public bool IsDirty {
-			get {
-				return isDirty;
-			}
-			
-			set {
-				isDirty = value;
-			}
-		}
-		
-		public string NamespaceUri {
-			get {
-				return namespaceUri;
-			}
-			
-			set {
-				namespaceUri = value;
-			}
-		}
-		
-		/// <summary>
-		/// Gets or sets the file extension (e.g. '.xml').
-		/// </summary>
-		public string Extension {
-			get {
-				return extension;
-			}
-			
-			set {
-				extension = value;
-			}
-		}
-		
-		/// <summary>
-		/// Gets or sets the default namespace prefix that will be added
-		/// to the xml elements.
-		/// </summary>
-		public string NamespacePrefix {
-			get {
-				return namespacePrefix;
-			}
-			
-			set {
-				namespacePrefix = value;
-			}
-		}		
-		
-		/// <summary>
-		/// Returns the file extension so this can be sorted in a list box.
-		/// </summary>
-		/// <returns></returns>
-		public override string ToString()
-		{
-			return extension;
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemaCompletionData.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemaCompletionData.cs
deleted file mode 100644
index 84d470a8b3..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemaCompletionData.cs
+++ /dev/null
@@ -1,1346 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.IO;
-using System.Text;
-using System.Xml;
-using System.Xml.Schema;
-
-using ICSharpCode.TextEditor.Gui.CompletionWindow;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Holds the completion (intellisense) data for an xml schema.
-	/// </summary>
-	/// <remarks>
-	/// The XmlSchema class throws an exception if we attempt to load 
-	/// the xhtml1-strict.xsd schema.  It does not like the fact that
-	/// this schema redefines the xml namespace, even though this is
-	/// allowed by the w3.org specification.
-	/// </remarks>
-	public class XmlSchemaCompletionData
-	{
-		string namespaceUri = String.Empty;
-		XmlSchema schema;
-		string fileName = String.Empty;
-		bool readOnly = false;
-		
-		/// <summary>
-		/// Stores attributes that have been prohibited whilst the code
-		/// generates the attribute completion data.
-		/// </summary>
-		XmlSchemaObjectCollection prohibitedAttributes = new XmlSchemaObjectCollection();
-		
-		public XmlSchemaCompletionData()
-		{
-		}
-		
-		/// <summary>
-		/// Creates completion data from the schema passed in 
-		/// via the reader object.
-		/// </summary>
-		public XmlSchemaCompletionData(TextReader reader)
-		{
-			ReadSchema(String.Empty, reader);
-		}
-		
-		/// <summary>
-		/// Creates completion data from the schema passed in 
-		/// via the reader object.
-		/// </summary>
-		public XmlSchemaCompletionData(XmlTextReader reader)
-		{
-			reader.XmlResolver = null;
-			ReadSchema(reader);
-		}
-		
-		/// <summary>
-		/// Creates the completion data from the specified schema file.
-		/// </summary>
-		public XmlSchemaCompletionData(string fileName) : this(String.Empty, fileName)
-		{
-		}
-		
-		/// <summary>
-		/// Creates the completion data from the specified schema file and uses
-		/// the specified baseUri to resolve any referenced schemas.
-		/// </summary>
-		public XmlSchemaCompletionData(string baseUri, string fileName)
-		{
-			StreamReader reader = new StreamReader(fileName, true);
-			ReadSchema(baseUri, reader);
-			this.fileName = fileName;
-		}
-		
-		/// <summary>
-		/// Gets the schema.
-		/// </summary>
-		public XmlSchema Schema {
-			get {
-				return schema;
-			}
-		}
-		
-		/// <summary>
-		/// Read only schemas are those that are installed with 
-		/// SharpDevelop.
-		/// </summary>
-		public bool ReadOnly {
-			get {
-				return readOnly;
-			}
-			
-			set {
-				readOnly = value;
-			}
-		}
-		
-		/// <summary>
-		/// Gets or sets the schema's file name.
-		/// </summary>
-		public string FileName {
-			get {
-				return fileName;
-			}
-			set {
-				fileName = value;
-			}
-		}
-		
-		/// <summary>
-		/// Gets the namespace URI for the schema.
-		/// </summary>
-		public string NamespaceUri {
-			get {
-				return namespaceUri;
-			}
-		}
-
-		/// <summary>
-		/// Converts the filename into a valid Uri.
-		/// </summary>
-		public static string GetUri(string fileName)
-		{
-			string uri = String.Empty;
-			
-			if (fileName != null) {
-				if (fileName.Length > 0) {
-					uri = String.Concat("file:///", fileName.Replace('\\', '/'));
-				}
-			}
-			
-			return uri;
-		}
-
-		/// <summary>
-		/// Gets the possible root elements for an xml document using this schema.
-		/// </summary>
-		public ICompletionData[] GetElementCompletionData()
-		{
-			return GetElementCompletionData(String.Empty);
-		}
-		
-		/// <summary>
-		/// Gets the possible root elements for an xml document using this schema.
-		/// </summary>
-		public ICompletionData[] GetElementCompletionData(string namespacePrefix)
-		{
-			XmlCompletionDataCollection data = new XmlCompletionDataCollection();
-
-			foreach (XmlSchemaElement element in schema.Elements.Values) {
-				if (element.Name != null) {
-					AddElement(data, element.Name, namespacePrefix, element.Annotation);
-				} else {
-					// Do not add reference element.
-				}
-			}
-			
-			return data.ToArray();
-		}
-		
-		/// <summary>
-		/// Gets the attribute completion data for the xml element that exists
-		/// at the end of the specified path.
-		/// </summary>
-		public ICompletionData[] GetAttributeCompletionData(XmlElementPath path)
-		{
-			XmlCompletionDataCollection data = new XmlCompletionDataCollection();
-					
-			// Locate matching element.
-			XmlSchemaElement element = FindElement(path);
-			
-			// Get completion data.
-			if (element != null) {
-				prohibitedAttributes.Clear();
-				data = GetAttributeCompletionData(element);
-			}
-			
-			return data.ToArray();
-		}
-		
-		/// <summary>
-		/// Gets the child element completion data for the xml element that exists
-		/// at the end of the specified path.
-		/// </summary>
-		public ICompletionData[] GetChildElementCompletionData(XmlElementPath path)
-		{
-			XmlCompletionDataCollection data = new XmlCompletionDataCollection();
-		
-			// Locate matching element.
-			XmlSchemaElement element = FindElement(path);
-			
-			// Get completion data.
-			if (element != null) {
-				data = GetChildElementCompletionData(element, path.Elements.LastPrefix);
-			}
-			
-			return data.ToArray();
-		}		
-		
-		/// <summary>
-		/// Gets the autocomplete data for the specified attribute value.
-		/// </summary>
-		public ICompletionData[] GetAttributeValueCompletionData(XmlElementPath path, string name)
-		{
-			XmlCompletionDataCollection data = new XmlCompletionDataCollection();
-			
-			// Locate matching element.
-			XmlSchemaElement element = FindElement(path);
-			
-			// Get completion data.
-			if (element != null) {
-				data = GetAttributeValueCompletionData(element, name);
-			}
-			
-			return data.ToArray();
-		}
-		
-		/// <summary>
-		/// Finds the element that exists at the specified path.
-		/// </summary>
-		/// <remarks>This method is not used when generating completion data,
-		/// but is a useful method when locating an element so we can jump
-		/// to its schema definition.</remarks>
-		/// <returns><see langword="null"/> if no element can be found.</returns>
-		public XmlSchemaElement FindElement(XmlElementPath path)
-		{
-			XmlSchemaElement element = null;
-			for (int i = 0; i < path.Elements.Count; ++i) {
-				QualifiedName name = path.Elements[i];
-				if (i == 0) {
-					// Look for root element.
-					element = FindElement(name);
-					if (element == null) {
-						break;
-					}
-				} else {
-					element = FindChildElement(element, name);
-					if (element == null) {
-						break;
-					}
-				}
-			}
-			return element;
-		}
-		
-		/// <summary>
-		/// Finds an element in the schema.
-		/// </summary>
-		/// <remarks>
-		/// Only looks at the elements that are defined in the 
-		/// root of the schema so it will not find any elements
-		/// that are defined inside any complex types.
-		/// </remarks>
-		public XmlSchemaElement FindElement(QualifiedName name)
-		{
-			foreach (XmlSchemaElement element in schema.Elements.Values) {
-				if (name.Equals(element.QualifiedName)) {
-					return element;
-				}
-			}
-			return null;
-		}		
-		
-		/// <summary>
-		/// Finds the complex type with the specified name.
-		/// </summary>
-		public XmlSchemaComplexType FindComplexType(QualifiedName name)
-		{
-			XmlQualifiedName qualifiedName = new XmlQualifiedName(name.Name, name.Namespace);
-			return FindNamedType(schema, qualifiedName);
-		}
-		
-		/// <summary>
-		/// Finds the specified attribute name given the element.
-		/// </summary>
-		/// <remarks>This method is not used when generating completion data,
-		/// but is a useful method when locating an attribute so we can jump
-		/// to its schema definition.</remarks>
-		/// <returns><see langword="null"/> if no attribute can be found.</returns>
-		public XmlSchemaAttribute FindAttribute(XmlSchemaElement element, string name)
-		{
-			XmlSchemaAttribute attribute = null;
-			XmlSchemaComplexType complexType = GetElementAsComplexType(element);
-			if (complexType != null) {
-				attribute = FindAttribute(complexType, name);
-			}
-			return attribute;
-		}
-		
-		/// <summary>
-		/// Finds the attribute group with the specified name.
-		/// </summary>
-		public XmlSchemaAttributeGroup FindAttributeGroup(string name)
-		{
-			return FindAttributeGroup(schema, name);
-		}
-		
-		/// <summary>
-		/// Finds the simple type with the specified name.
-		/// </summary>
-		public XmlSchemaSimpleType FindSimpleType(string name)
-		{
-			XmlQualifiedName qualifiedName = new XmlQualifiedName(name, namespaceUri);
-			return FindSimpleType(qualifiedName);
-		}
-		
-				/// <summary>
-		/// Finds the specified attribute in the schema. This method only checks
-		/// the attributes defined in the root of the schema.
-		/// </summary>
-		public XmlSchemaAttribute FindAttribute(string name)
-		{
-			foreach (XmlSchemaAttribute attribute in schema.Attributes.Values) {
-				if (attribute.Name == name) {
-					return attribute;
-				}
-			}
-			return null;
-		}
-		
-		/// <summary>
-		/// Finds the schema group with the specified name.
-		/// </summary>
-		public XmlSchemaGroup FindGroup(string name)
-		{
-			if (name != null) {
-				foreach (XmlSchemaObject schemaObject in schema.Groups.Values) {
-					XmlSchemaGroup group = schemaObject as XmlSchemaGroup;
-					if (group != null) {
-						if (group.Name == name) {
-							return group;
-						}						
-					}
-				}
-			}
-			return null;
-		}	
-		
-		/// <summary>
-		/// Takes the name and creates a qualified name using the namespace of this
-		/// schema.
-		/// </summary>
-		/// <remarks>If the name is of the form myprefix:mytype then the correct 
-		/// namespace is determined from the prefix. If the name is not of this
-		/// form then no prefix is added.</remarks>
-		public QualifiedName CreateQualifiedName(string name)
-		{
-			int index = name.IndexOf(":");
-			if (index >= 0) {
-				string prefix = name.Substring(0, index);
-				name = name.Substring(index + 1);
-				foreach (XmlQualifiedName xmlQualifiedName in schema.Namespaces.ToArray()) {
-					if (xmlQualifiedName.Name == prefix) {
-						return new QualifiedName(name, xmlQualifiedName.Namespace, prefix);
-					}
-				}
-			}
-			
-			// Default behaviour just return the name with the namespace uri.
-			return new QualifiedName(name, namespaceUri);
-		}
-		
-		/// <summary>
-		/// Converts the element to a complex type if possible.
-		/// </summary>
-		public XmlSchemaComplexType GetElementAsComplexType(XmlSchemaElement element)
-		{
-			XmlSchemaComplexType complexType = element.SchemaType as XmlSchemaComplexType;
-			if (complexType == null) {
-				complexType = FindNamedType(schema, element.SchemaTypeName);
-			}
-			return complexType;
-		}
-		
-		/// <summary>
-		/// Handler for schema validation errors.
-		/// </summary>
-		void SchemaValidation(object source, ValidationEventArgs e)
-		{
-			// Do nothing.
-		}
-		
-		/// <summary>
-		/// Loads the schema.
-		/// </summary>
-		void ReadSchema(XmlReader reader)
-		{
-			try	{
-				schema = XmlSchema.Read(reader, new ValidationEventHandler(SchemaValidation));
-				schema.Compile(new ValidationEventHandler(SchemaValidation));
-			
-				namespaceUri = schema.TargetNamespace;
-			} finally {
-				reader.Close();
-			}
-		}
-		
-		void ReadSchema(string baseUri, TextReader reader)
-		{
-			XmlTextReader xmlReader = new XmlTextReader(baseUri, reader);
-			
-			// Setting the resolver to null allows us to
-			// load the xhtml1-strict.xsd without any exceptions if
-			// the referenced dtds exist in the same folder as the .xsd
-			// file.  If this is not set to null the dtd files are looked
-			// for in the assembly's folder.
-			xmlReader.XmlResolver = null;
-			ReadSchema(xmlReader);
-		}					
-			
-		/// <summary>
-		/// Finds an element in the schema.
-		/// </summary>
-		/// <remarks>
-		/// Only looks at the elements that are defined in the 
-		/// root of the schema so it will not find any elements
-		/// that are defined inside any complex types.
-		/// </remarks>
-		XmlSchemaElement FindElement(XmlQualifiedName name)
-		{
-			XmlSchemaElement matchedElement = null;
-			foreach (XmlSchemaElement element in schema.Elements.Values) {
-				if (name.Equals(element.QualifiedName)) {
-					matchedElement = element;
-					break;
-				}
-			}
-			
-			return matchedElement;
-		}		
-		
-		XmlCompletionDataCollection GetChildElementCompletionData(XmlSchemaElement element, string prefix)
-		{
-			XmlCompletionDataCollection data = new XmlCompletionDataCollection();
-			
-			XmlSchemaComplexType complexType = GetElementAsComplexType(element);
-			
-			if (complexType != null) {
-				data = GetChildElementCompletionData(complexType, prefix);
-			}
-				
-			return data;
-		}
-		
-		XmlCompletionDataCollection GetChildElementCompletionData(XmlSchemaComplexType complexType, string prefix)
-		{
-			XmlCompletionDataCollection data = new XmlCompletionDataCollection();
-			
-			XmlSchemaSequence sequence = complexType.Particle as XmlSchemaSequence;
-			XmlSchemaChoice choice = complexType.Particle as XmlSchemaChoice;
-			XmlSchemaGroupRef groupRef = complexType.Particle as XmlSchemaGroupRef;
-			XmlSchemaComplexContent complexContent = complexType.ContentModel as XmlSchemaComplexContent;
-			XmlSchemaAll all = complexType.Particle as XmlSchemaAll;
-			
-			if (sequence != null) {
-				data = GetChildElementCompletionData(sequence.Items, prefix);
-			} else if (choice != null) {
-				data = GetChildElementCompletionData(choice.Items, prefix);				
-			} else if (complexContent != null) {
-				data = GetChildElementCompletionData(complexContent, prefix);								
-			} else if (groupRef != null) {
-				data = GetChildElementCompletionData(groupRef, prefix);
-			} else if (all != null) {
-				data = GetChildElementCompletionData(all.Items, prefix);
-			}
-				
-			return data;
-		}
-		
-		XmlCompletionDataCollection GetChildElementCompletionData(XmlSchemaObjectCollection items, string prefix)
-		{
-			XmlCompletionDataCollection data = new XmlCompletionDataCollection();
-			
-			foreach (XmlSchemaObject schemaObject in items) {
-				
-				XmlSchemaElement childElement = schemaObject as XmlSchemaElement;
-				XmlSchemaSequence childSequence = schemaObject as XmlSchemaSequence;
-				XmlSchemaChoice childChoice = schemaObject as XmlSchemaChoice;
-				XmlSchemaGroupRef groupRef = schemaObject as XmlSchemaGroupRef;
-				
-				if (childElement != null) {
-					string name = childElement.Name;
-					if (name == null) {
-						name = childElement.RefName.Name;
-						XmlSchemaElement element = FindElement(childElement.RefName);
-						if (element != null) {
-							if (element.IsAbstract) {
-								AddSubstitionGroupElements(data, element.QualifiedName, prefix);
-							} else {
-								AddElement(data, name, prefix, element.Annotation);
-							}
-						} else {
-							AddElement(data, name, prefix, childElement.Annotation);						
-						}
-					} else {
-						AddElement(data, name, prefix, childElement.Annotation);
-					}
-				} else if (childSequence != null) {
-					AddElements(data, GetChildElementCompletionData(childSequence.Items, prefix));
-				} else if (childChoice != null) {
-					AddElements(data, GetChildElementCompletionData(childChoice.Items, prefix));
-				} else if (groupRef != null) {
-					AddElements(data, GetChildElementCompletionData(groupRef, prefix));
-				}
-			}
-				
-			return data;
-		}
-		
-		XmlCompletionDataCollection GetChildElementCompletionData(XmlSchemaComplexContent complexContent, string prefix)
-		{
-			XmlCompletionDataCollection data = new XmlCompletionDataCollection();
-			
-			XmlSchemaComplexContentExtension extension = complexContent.Content as XmlSchemaComplexContentExtension;
-			if (extension != null) {
-				data = GetChildElementCompletionData(extension, prefix);
-			} else {
-				XmlSchemaComplexContentRestriction restriction = complexContent.Content as XmlSchemaComplexContentRestriction;
-				if (restriction != null) {
-					data = GetChildElementCompletionData(restriction, prefix);
-				}
-			}
-			
-			return data;
-		}
-		
-		XmlCompletionDataCollection GetChildElementCompletionData(XmlSchemaComplexContentExtension extension, string prefix)
-		{
-			XmlCompletionDataCollection data = new XmlCompletionDataCollection();
-			
-			XmlSchemaComplexType complexType = FindNamedType(schema, extension.BaseTypeName);
-			if (complexType != null) {
-				data = GetChildElementCompletionData(complexType, prefix);
-			}
-			
-			// Add any elements.
-			if (extension.Particle != null) {
-				XmlSchemaSequence sequence = extension.Particle as XmlSchemaSequence;
-				XmlSchemaChoice choice = extension.Particle as XmlSchemaChoice;
-				XmlSchemaGroupRef groupRef = extension.Particle as XmlSchemaGroupRef;
-				
-				if(sequence != null) {
-					data.AddRange(GetChildElementCompletionData(sequence.Items, prefix));
-				} else if (choice != null) {
-					data.AddRange(GetChildElementCompletionData(choice.Items, prefix));
-				} else if (groupRef != null) {
-					data.AddRange(GetChildElementCompletionData(groupRef, prefix));
-				}
-			}
-			
-			return data;
-		}		
-		
-		XmlCompletionDataCollection GetChildElementCompletionData(XmlSchemaGroupRef groupRef, string prefix)
-		{
-			XmlCompletionDataCollection data = new XmlCompletionDataCollection();
-
-			XmlSchemaGroup group = FindGroup(groupRef.RefName.Name);
-			if (group != null) {
-				XmlSchemaSequence sequence = group.Particle as XmlSchemaSequence;
-				XmlSchemaChoice choice = group.Particle as XmlSchemaChoice;
-				
-				if(sequence != null) {
-					data = GetChildElementCompletionData(sequence.Items, prefix);
-				} else if (choice != null) {
-					data = GetChildElementCompletionData(choice.Items, prefix);
-				} 
-			}
-			
-			return data;
-		}		
-		
-		XmlCompletionDataCollection GetChildElementCompletionData(XmlSchemaComplexContentRestriction restriction, string prefix)
-		{
-			XmlCompletionDataCollection data = new XmlCompletionDataCollection();
-
-			// Add any elements.
-			if (restriction.Particle != null) {
-				XmlSchemaSequence sequence = restriction.Particle as XmlSchemaSequence;
-				XmlSchemaChoice choice = restriction.Particle as XmlSchemaChoice;
-				XmlSchemaGroupRef groupRef = restriction.Particle as XmlSchemaGroupRef;
-				
-				if(sequence != null) {
-					data = GetChildElementCompletionData(sequence.Items, prefix);
-				} else if (choice != null) {
-					data = GetChildElementCompletionData(choice.Items, prefix);
-				} else if (groupRef != null) {
-					data = GetChildElementCompletionData(groupRef, prefix);
-				}
-			}
-			
-			return data;
-		}		
-		
-		/// <summary>
-		/// Adds an element completion data to the collection if it does not 
-		/// already exist.
-		/// </summary>
-		void AddElement(XmlCompletionDataCollection data, string name, string prefix, string documentation)
-		{
-			if (!data.Contains(name)) {
-				if (prefix.Length > 0) {
-					name = String.Concat(prefix, ":", name);
-				}
-				XmlCompletionData completionData = new XmlCompletionData(name, documentation);
-				data.Add(completionData);
-			}				
-		}
-		
-		/// <summary>
-		/// Adds an element completion data to the collection if it does not 
-		/// already exist.
-		/// </summary>
-		void AddElement(XmlCompletionDataCollection data, string name, string prefix, XmlSchemaAnnotation annotation)
-		{
-			// Get any annotation documentation.
-			string documentation = GetDocumentation(annotation);
-			
-			AddElement(data, name, prefix, documentation);
-		}
-		
-		/// <summary>
-		/// Adds elements to the collection if it does not already exist.
-		/// </summary>
-		void AddElements(XmlCompletionDataCollection lhs, XmlCompletionDataCollection rhs)
-		{
-			foreach (XmlCompletionData data in rhs) {
-				if (!lhs.Contains(data)) {
-					lhs.Add(data);
-				}
-			}
-		}
-		
-		/// <summary>
-		/// Gets the documentation from the annotation element.
-		/// </summary>
-		/// <remarks>
-		/// All documentation elements are added.  All text nodes inside
-		/// the documentation element are added.
-		/// </remarks>
-		string GetDocumentation(XmlSchemaAnnotation annotation)
-		{
-			string documentation = String.Empty;
-			
-			if (annotation != null) {
-				StringBuilder documentationBuilder = new StringBuilder();
-				foreach (XmlSchemaObject schemaObject in annotation.Items) {
-					XmlSchemaDocumentation schemaDocumentation = schemaObject as XmlSchemaDocumentation;
-					if (schemaDocumentation != null) {
-						foreach (XmlNode node in schemaDocumentation.Markup) {
-							XmlText textNode = node as XmlText;
-							if (textNode != null) {
-								if (textNode.Data != null) {
-									if (textNode.Data.Length > 0) {
-										documentationBuilder.Append(textNode.Data);
-									}
-								}
-							}
-						}
-					}
-				}
-				
-				documentation = documentationBuilder.ToString();
-			}
-			
-			return documentation;
-		}
-		
-		XmlCompletionDataCollection GetAttributeCompletionData(XmlSchemaElement element)
-		{
-			XmlCompletionDataCollection data = new XmlCompletionDataCollection();
-			
-			XmlSchemaComplexType complexType = GetElementAsComplexType(element);
-			
-			if (complexType != null) {
-				data.AddRange(GetAttributeCompletionData(complexType));
-			}
-			
-			return data;
-		}	
-		
-		XmlCompletionDataCollection GetAttributeCompletionData(XmlSchemaComplexContentRestriction restriction)
-		{
-			XmlCompletionDataCollection data = new XmlCompletionDataCollection();
-									
-			data.AddRange(GetAttributeCompletionData(restriction.Attributes));
-			
-			XmlSchemaComplexType baseComplexType = FindNamedType(schema, restriction.BaseTypeName);
-			if (baseComplexType != null) {
-				data.AddRange(GetAttributeCompletionData(baseComplexType));
-			}
-			
-			return data;
-		}
-		
-		XmlCompletionDataCollection GetAttributeCompletionData(XmlSchemaComplexType complexType)
-		{
-			XmlCompletionDataCollection data = new XmlCompletionDataCollection();
-			
-			data = GetAttributeCompletionData(complexType.Attributes);
-
-			// Add any complex content attributes.
-			XmlSchemaComplexContent complexContent = complexType.ContentModel as XmlSchemaComplexContent;
-			if (complexContent != null) {
-				XmlSchemaComplexContentExtension extension = complexContent.Content as XmlSchemaComplexContentExtension;
-				XmlSchemaComplexContentRestriction restriction = complexContent.Content as XmlSchemaComplexContentRestriction;
-				if (extension != null) {
-					data.AddRange(GetAttributeCompletionData(extension));
-				} else if (restriction != null) {
-					data.AddRange(GetAttributeCompletionData(restriction));
-				} 
-			} else {
-				XmlSchemaSimpleContent simpleContent = complexType.ContentModel as XmlSchemaSimpleContent;
-				if (simpleContent != null) {
-					data.AddRange(GetAttributeCompletionData(simpleContent));
-				}
-			}
-			
-			return data;
-		}
-		
-		XmlCompletionDataCollection GetAttributeCompletionData(XmlSchemaComplexContentExtension extension)
-		{
-			XmlCompletionDataCollection data = new XmlCompletionDataCollection();
-									
-			data.AddRange(GetAttributeCompletionData(extension.Attributes));
-			XmlSchemaComplexType baseComplexType = FindNamedType(schema, extension.BaseTypeName);
-			if (baseComplexType != null) {
-				data.AddRange(GetAttributeCompletionData(baseComplexType));
-			}
-			
-			return data;
-		}		
-		
-		XmlCompletionDataCollection GetAttributeCompletionData(XmlSchemaSimpleContent simpleContent)
-		{
-			XmlCompletionDataCollection data = new XmlCompletionDataCollection();
-						
-			XmlSchemaSimpleContentExtension extension = simpleContent.Content as XmlSchemaSimpleContentExtension;
-			if (extension != null) {
-				data.AddRange(GetAttributeCompletionData(extension));
-			}
-			
-			return data;
-		}		
-		
-		XmlCompletionDataCollection GetAttributeCompletionData(XmlSchemaSimpleContentExtension extension)
-		{
-			XmlCompletionDataCollection data = new XmlCompletionDataCollection();
-									
-			data.AddRange(GetAttributeCompletionData(extension.Attributes));
-
-			return data;
-		}		
-		
-		XmlCompletionDataCollection GetAttributeCompletionData(XmlSchemaObjectCollection attributes)
-		{
-			XmlCompletionDataCollection data = new XmlCompletionDataCollection();
-			
-			foreach (XmlSchemaObject schemaObject in attributes) {
-				XmlSchemaAttribute attribute = schemaObject as XmlSchemaAttribute;
-				XmlSchemaAttributeGroupRef attributeGroupRef = schemaObject as XmlSchemaAttributeGroupRef;
-				if (attribute != null) {
-					if (!IsProhibitedAttribute(attribute)) {
-						AddAttribute(data, attribute);
-					} else {
-						prohibitedAttributes.Add(attribute);
-					}
-				} else if (attributeGroupRef != null) {
-					data.AddRange(GetAttributeCompletionData(attributeGroupRef));
-				}
-			}
-			return data;
-		}
-		
-		/// <summary>
-		/// Checks that the attribute is prohibited or has been flagged
-		/// as prohibited previously. 
-		/// </summary>
-		bool IsProhibitedAttribute(XmlSchemaAttribute attribute)
-		{
-			bool prohibited = false;
-			if (attribute.Use == XmlSchemaUse.Prohibited) {
-				prohibited = true;
-			} else {
-				foreach (XmlSchemaAttribute prohibitedAttribute in prohibitedAttributes) {
-					if (prohibitedAttribute.QualifiedName == attribute.QualifiedName) {
-						prohibited = true;
-						break;
-					}
-				}
-			}
-		
-			return prohibited;
-		}
-		
-		/// <summary>
-		/// Adds an attribute to the completion data collection.
-		/// </summary>
-		/// <remarks>
-		/// Note the special handling of xml:lang attributes.
-		/// </remarks>
-		void AddAttribute(XmlCompletionDataCollection data, XmlSchemaAttribute attribute)
-		{
-			string name = attribute.Name;
-			if (name == null) {
-				if (attribute.RefName.Namespace == "http://www.w3.org/XML/1998/namespace") {
-					name = String.Concat("xml:", attribute.RefName.Name);
-				}
-			}
-			
-			if (name != null) {
-				string documentation = GetDocumentation(attribute.Annotation);
-				XmlCompletionData completionData = new XmlCompletionData(name, documentation, XmlCompletionData.DataType.XmlAttribute);
-				data.Add(completionData);
-			}
-		}
-		
-		/// <summary>
-		/// Gets attribute completion data from a group ref.
-		/// </summary>
-		XmlCompletionDataCollection GetAttributeCompletionData(XmlSchemaAttributeGroupRef groupRef)
-		{
-			XmlCompletionDataCollection data = new XmlCompletionDataCollection();
-			XmlSchemaAttributeGroup group = FindAttributeGroup(schema, groupRef.RefName.Name);
-			if (group != null) {
-				data = GetAttributeCompletionData(group.Attributes);
-			}
-			
-			return data;
-		}
-		
-		static XmlSchemaComplexType FindNamedType(XmlSchema schema, XmlQualifiedName name)
-		{
-			XmlSchemaComplexType matchedComplexType = null;
-			
-			if (name != null) {
-				foreach (XmlSchemaObject schemaObject in schema.Items) {
-					XmlSchemaComplexType complexType = schemaObject as XmlSchemaComplexType;
-					if (complexType != null) {
-						if (complexType.QualifiedName == name) {
-							matchedComplexType = complexType;
-							break;
-						}
-					}
-				}
-			
-				// Try included schemas.
-				if (matchedComplexType == null) {				
-					foreach (XmlSchemaExternal external in schema.Includes) {
-						XmlSchemaInclude include = external as XmlSchemaInclude;
-						if (include != null) {
-							if (include.Schema != null) {	
-								matchedComplexType = FindNamedType(include.Schema, name);
-							}
-						}
-					}
-				}
-			}
-			
-			return matchedComplexType;
-		}	
-	
-		/// <summary>
-		/// Finds an element that matches the specified <paramref name="name"/>
-		/// from the children of the given <paramref name="element"/>.
-		/// </summary>
-		XmlSchemaElement FindChildElement(XmlSchemaElement element, QualifiedName name)
-		{
-			XmlSchemaElement matchedElement = null;
-			
-			XmlSchemaComplexType complexType = GetElementAsComplexType(element);
-			if (complexType != null) {
-				matchedElement = FindChildElement(complexType, name);
-			}
-			
-			return matchedElement;
-		}
-		
-		XmlSchemaElement FindChildElement(XmlSchemaComplexType complexType, QualifiedName name)
-		{
-			XmlSchemaElement matchedElement = null;
-
-			XmlSchemaSequence sequence = complexType.Particle as XmlSchemaSequence;
-			XmlSchemaChoice choice = complexType.Particle as XmlSchemaChoice;
-			XmlSchemaGroupRef groupRef = complexType.Particle as XmlSchemaGroupRef;
-			XmlSchemaAll all = complexType.Particle as XmlSchemaAll;
-			XmlSchemaComplexContent complexContent = complexType.ContentModel as XmlSchemaComplexContent;
-			
-			if (sequence != null) {
-				matchedElement = FindElement(sequence.Items, name);
-			} else if (choice != null) {
-				matchedElement = FindElement(choice.Items, name);
-			} else if (complexContent != null) {
-				XmlSchemaComplexContentExtension extension = complexContent.Content as XmlSchemaComplexContentExtension;
-				XmlSchemaComplexContentRestriction restriction = complexContent.Content as XmlSchemaComplexContentRestriction;
-				if (extension != null) {
-					matchedElement = FindChildElement(extension, name);
-				} else if (restriction != null) {
-					matchedElement = FindChildElement(restriction, name);
-				}
-			} else if (groupRef != null) {
-				matchedElement = FindElement(groupRef, name);
-			} else if (all != null) {
-				matchedElement = FindElement(all.Items, name);
-			}
-			
-			return matchedElement;
-		}
-		
-		/// <summary>
-		/// Finds the named child element contained in the extension element.
-		/// </summary>
-		XmlSchemaElement FindChildElement(XmlSchemaComplexContentExtension extension, QualifiedName name)
-		{
-			XmlSchemaElement matchedElement = null;
-			
-			XmlSchemaComplexType complexType = FindNamedType(schema, extension.BaseTypeName);
-			if (complexType != null) {
-				matchedElement = FindChildElement(complexType, name);
-							
-				if (matchedElement == null) {
-					
-					XmlSchemaSequence sequence = extension.Particle as XmlSchemaSequence;
-					XmlSchemaChoice choice = extension.Particle as XmlSchemaChoice;
-					XmlSchemaGroupRef groupRef = extension.Particle as XmlSchemaGroupRef;
-					
-					if (sequence != null) {
-						matchedElement = FindElement(sequence.Items, name);
-					} else if (choice != null) {
-						matchedElement = FindElement(choice.Items, name);
-					} else if (groupRef != null) {
-						matchedElement = FindElement(groupRef, name);
-					}
-				}
-			}
-			
-			return matchedElement;
-		}
-		
-		/// <summary>
-		/// Finds the named child element contained in the restriction element.
-		/// </summary>
-		XmlSchemaElement FindChildElement(XmlSchemaComplexContentRestriction restriction, QualifiedName name)
-		{
-			XmlSchemaElement matchedElement = null;		
-			XmlSchemaSequence sequence = restriction.Particle as XmlSchemaSequence;
-			XmlSchemaGroupRef groupRef = restriction.Particle as XmlSchemaGroupRef;
-			
-			if (sequence != null) {
-				matchedElement = FindElement(sequence.Items, name);
-			} else if (groupRef != null) {
-				matchedElement = FindElement(groupRef, name);
-			}
-
-			return matchedElement;
-		}		
-		
-		/// <summary>
-		/// Finds the element in the collection of schema objects.
-		/// </summary>
-		XmlSchemaElement FindElement(XmlSchemaObjectCollection items, QualifiedName name)
-		{
-			XmlSchemaElement matchedElement = null;
-			
-			foreach (XmlSchemaObject schemaObject in items) {
-				XmlSchemaElement element = schemaObject as XmlSchemaElement;
-				XmlSchemaSequence sequence = schemaObject as XmlSchemaSequence;
-				XmlSchemaChoice choice = schemaObject as XmlSchemaChoice;
-				XmlSchemaGroupRef groupRef = schemaObject as XmlSchemaGroupRef;
-				
-				if (element != null) {
-					if (element.Name != null) {
-						if (name.Name == element.Name) {
-							matchedElement = element;
-						}
-					} else if (element.RefName != null) {
-						if (name.Name == element.RefName.Name) {
-							matchedElement = FindElement(element.RefName);
-						} else {
-							// Abstract element?
-							XmlSchemaElement abstractElement = FindElement(element.RefName);
-							if (abstractElement != null && abstractElement.IsAbstract) {
-								matchedElement = FindSubstitutionGroupElement(abstractElement.QualifiedName, name);
-							}
-						}
-					}
-				} else if (sequence != null) {
-					matchedElement = FindElement(sequence.Items, name);
-				} else if (choice != null) {
-					matchedElement = FindElement(choice.Items, name);
-				} else if (groupRef != null) {
-					matchedElement = FindElement(groupRef, name);
-				}
-				
-				// Did we find a match?
-				if (matchedElement != null) {
-					break;
-				}
-			}
-			
-			return matchedElement;
-		}
-		
-		XmlSchemaElement FindElement(XmlSchemaGroupRef groupRef, QualifiedName name)
-		{
-			XmlSchemaElement matchedElement = null;
-			
-			XmlSchemaGroup group = FindGroup(groupRef.RefName.Name);
-			if (group != null) {
-				XmlSchemaSequence sequence = group.Particle as XmlSchemaSequence;
-				XmlSchemaChoice choice = group.Particle as XmlSchemaChoice;
-				
-				if(sequence != null) {
-					matchedElement = FindElement(sequence.Items, name);
-				} else if (choice != null) {
-					matchedElement = FindElement(choice.Items, name);
-				} 
-			}
-			
-			return matchedElement;
-		}
-		
-		static XmlSchemaAttributeGroup FindAttributeGroup(XmlSchema schema, string name)
-		{
-			XmlSchemaAttributeGroup matchedGroup = null;
-			
-			if (name != null) {
-				foreach (XmlSchemaObject schemaObject in schema.Items) {
-					
-					XmlSchemaAttributeGroup group = schemaObject as XmlSchemaAttributeGroup;
-					if (group != null) {
-						if (group.Name == name) {
-							matchedGroup = group;
-							break;
-						}
-					}
-				}
-				
-				// Try included schemas.
-				if (matchedGroup == null) {				
-					foreach (XmlSchemaExternal external in schema.Includes) {
-						XmlSchemaInclude include = external as XmlSchemaInclude;
-						if (include != null) {
-							if (include.Schema != null) {
-								matchedGroup = FindAttributeGroup(include.Schema, name);
-							}
-						}
-					}
-				}
-			}
-			
-			return matchedGroup;
-		}
-		
-		XmlCompletionDataCollection GetAttributeValueCompletionData(XmlSchemaElement element, string name)
-		{
-			XmlCompletionDataCollection data = new XmlCompletionDataCollection();
-			
-			XmlSchemaComplexType complexType = GetElementAsComplexType(element);
-			if (complexType != null) {
-				XmlSchemaAttribute attribute = FindAttribute(complexType, name);
-				if (attribute != null) {
-					data.AddRange(GetAttributeValueCompletionData(attribute));
-				}
-			}
-			
-			return data;
-		}
-		
-		XmlCompletionDataCollection GetAttributeValueCompletionData(XmlSchemaAttribute attribute)
-		{
-			XmlCompletionDataCollection data = new XmlCompletionDataCollection();
-			
-			if (attribute.SchemaType != null) {
-				XmlSchemaSimpleTypeRestriction simpleTypeRestriction = attribute.SchemaType.Content as XmlSchemaSimpleTypeRestriction;
-				if (simpleTypeRestriction != null) {
-					data.AddRange(GetAttributeValueCompletionData(simpleTypeRestriction));
-				}	
-			} else if (attribute.AttributeSchemaType != null) {
-				XmlSchemaSimpleType simpleType = attribute.AttributeSchemaType as XmlSchemaSimpleType;
-				
-				if (simpleType != null) {
-					if (simpleType.Name == "boolean") {
-						data.AddRange(GetBooleanAttributeValueCompletionData());
-					} else {
-						data.AddRange(GetAttributeValueCompletionData(simpleType));
-					}
-				}
-			}
-			
-			return data;
-		}
-		
-		XmlCompletionDataCollection GetAttributeValueCompletionData(XmlSchemaSimpleTypeRestriction simpleTypeRestriction)
-		{
-			XmlCompletionDataCollection data = new XmlCompletionDataCollection();
-			
-			foreach (XmlSchemaObject schemaObject in simpleTypeRestriction.Facets) {
-				XmlSchemaEnumerationFacet enumFacet = schemaObject as XmlSchemaEnumerationFacet;
-				if (enumFacet != null) {
-					AddAttributeValue(data, enumFacet.Value, enumFacet.Annotation);
-				}
-			}
-
-			return data;
-		}
-		
-		XmlCompletionDataCollection GetAttributeValueCompletionData(XmlSchemaSimpleTypeUnion union)
-		{
-			XmlCompletionDataCollection data = new XmlCompletionDataCollection();
-			
-			foreach (XmlSchemaObject schemaObject in union.BaseTypes) {
-				XmlSchemaSimpleType simpleType = schemaObject as XmlSchemaSimpleType;
-				if (simpleType != null) {
-					data.AddRange(GetAttributeValueCompletionData(simpleType));
-				}
-			}
-
-			return data;
-		}		
-		
-		XmlCompletionDataCollection GetAttributeValueCompletionData(XmlSchemaSimpleType simpleType)
-		{
-			XmlCompletionDataCollection data = new XmlCompletionDataCollection();
-			
-			XmlSchemaSimpleTypeRestriction simpleTypeRestriction = simpleType.Content as XmlSchemaSimpleTypeRestriction;
-			XmlSchemaSimpleTypeUnion union = simpleType.Content as XmlSchemaSimpleTypeUnion;
-			XmlSchemaSimpleTypeList list = simpleType.Content as XmlSchemaSimpleTypeList;
-			
-			if (simpleTypeRestriction != null) {
-				data.AddRange(GetAttributeValueCompletionData(simpleTypeRestriction));
-			} else if (union != null) {
-				data.AddRange(GetAttributeValueCompletionData(union));
-			} else if (list != null) {
-				data.AddRange(GetAttributeValueCompletionData(list));
-			}
-
-			return data;
-		}		
-			
-		XmlCompletionDataCollection GetAttributeValueCompletionData(XmlSchemaSimpleTypeList list)
-		{
-			XmlCompletionDataCollection data = new XmlCompletionDataCollection();
-			
-			if (list.ItemType != null) {
-				data.AddRange(GetAttributeValueCompletionData(list.ItemType));
-			} else if (list.ItemTypeName != null) {
-				XmlSchemaSimpleType simpleType = FindSimpleType(list.ItemTypeName);
-				if (simpleType != null) {
-					data.AddRange(GetAttributeValueCompletionData(simpleType));
-				}
-			}
-			
-			return data;
-		}	
-		
-		/// <summary>
-		/// Gets the set of attribute values for an xs:boolean type.
-		/// </summary>
-		XmlCompletionDataCollection GetBooleanAttributeValueCompletionData()
-		{
-			XmlCompletionDataCollection data = new XmlCompletionDataCollection();
-			
-			AddAttributeValue(data, "0");
-			AddAttributeValue(data, "1");
-			AddAttributeValue(data, "true");
-			AddAttributeValue(data, "false");
-			
-			return data;
-		}
-		
-		XmlSchemaAttribute FindAttribute(XmlSchemaComplexType complexType, string name)
-		{
-			XmlSchemaAttribute matchedAttribute = null;
-			
-			matchedAttribute = FindAttribute(complexType.Attributes, name);
-			
-			if (matchedAttribute == null) {
-				XmlSchemaComplexContent complexContent = complexType.ContentModel as XmlSchemaComplexContent;
-				if (complexContent != null) {
-					matchedAttribute = FindAttribute(complexContent, name);
-				}
-			}
-			
-			return matchedAttribute;
-		}
-		
-		XmlSchemaAttribute FindAttribute(XmlSchemaObjectCollection schemaObjects, string name)
-		{
-			XmlSchemaAttribute matchedAttribute = null;
-			
-			foreach (XmlSchemaObject schemaObject in schemaObjects) {
-				XmlSchemaAttribute attribute = schemaObject as XmlSchemaAttribute;
-				XmlSchemaAttributeGroupRef groupRef = schemaObject as XmlSchemaAttributeGroupRef;
-				
-				if (attribute != null) {
-					if (attribute.Name == name) {
-						matchedAttribute = attribute;
-						break;
-					}
-				} else if (groupRef != null) {
-					matchedAttribute = FindAttribute(groupRef, name);
-					if (matchedAttribute != null) {
-						break;
-					}
-				}
-			}
-			
-			return matchedAttribute;			
-		}
-		
-		XmlSchemaAttribute FindAttribute(XmlSchemaAttributeGroupRef groupRef, string name)
-		{
-			XmlSchemaAttribute matchedAttribute = null;
-			
-			if (groupRef.RefName != null) {
-				XmlSchemaAttributeGroup group = FindAttributeGroup(schema, groupRef.RefName.Name);
-				if (group != null) {
-					matchedAttribute = FindAttribute(group.Attributes, name);
-				}
-			}
-			
-			return matchedAttribute;		
-		}
-		
-		XmlSchemaAttribute FindAttribute(XmlSchemaComplexContent complexContent, string name)
-		{
-			XmlSchemaAttribute matchedAttribute = null;
-			
-			XmlSchemaComplexContentExtension extension = complexContent.Content as XmlSchemaComplexContentExtension;
-			XmlSchemaComplexContentRestriction restriction = complexContent.Content as XmlSchemaComplexContentRestriction;
-			
-			if (extension != null) {
-				matchedAttribute = FindAttribute(extension, name);
-			} else if (restriction != null) {
-				matchedAttribute = FindAttribute(restriction, name);
-			}
-			
-			return matchedAttribute;			
-		}		
-		
-		XmlSchemaAttribute FindAttribute(XmlSchemaComplexContentExtension extension, string name)
-		{
-			return FindAttribute(extension.Attributes, name);
-		}			
-		
-		XmlSchemaAttribute FindAttribute(XmlSchemaComplexContentRestriction restriction, string name)
-		{
-			XmlSchemaAttribute matchedAttribute = FindAttribute(restriction.Attributes, name);
-			
-			if (matchedAttribute == null) {
-				XmlSchemaComplexType complexType = FindNamedType(schema, restriction.BaseTypeName);
-				if (complexType != null) {
-					matchedAttribute = FindAttribute(complexType, name);
-				}
-			}
-			
-			return matchedAttribute;			
-		}			
-		
-		/// <summary>
-		/// Adds an attribute value to the completion data collection.
-		/// </summary>
-		void AddAttributeValue(XmlCompletionDataCollection data, string valueText)
-		{
-			XmlCompletionData completionData = new XmlCompletionData(valueText, XmlCompletionData.DataType.XmlAttributeValue);
-			data.Add(completionData);
-		}
-		
-		/// <summary>
-		/// Adds an attribute value to the completion data collection.
-		/// </summary>
-		void AddAttributeValue(XmlCompletionDataCollection data, string valueText, XmlSchemaAnnotation annotation)
-		{
-			string documentation = GetDocumentation(annotation);
-			XmlCompletionData completionData = new XmlCompletionData(valueText, documentation, XmlCompletionData.DataType.XmlAttributeValue);
-			data.Add(completionData);
-		}
-		
-		/// <summary>
-		/// Adds an attribute value to the completion data collection.
-		/// </summary>
-		void AddAttributeValue(XmlCompletionDataCollection data, string valueText, string description)
-		{
-			XmlCompletionData completionData = new XmlCompletionData(valueText, description, XmlCompletionData.DataType.XmlAttributeValue);
-			data.Add(completionData);
-		}		
-		
-		XmlSchemaSimpleType FindSimpleType(XmlQualifiedName name)
-		{
-			XmlSchemaSimpleType matchedSimpleType = null;
-			
-			foreach (XmlSchemaObject schemaObject in schema.SchemaTypes.Values) {
-				XmlSchemaSimpleType simpleType = schemaObject as XmlSchemaSimpleType;
-				if (simpleType != null) {
-					if (simpleType.QualifiedName == name) {
-						matchedSimpleType = simpleType;
-						break;
-					}
-				}
-			}
-			
-			return matchedSimpleType;
-		}
-
-		/// <summary>
-		/// Adds any elements that have the specified substitution group.
-		/// </summary>
-		void AddSubstitionGroupElements(XmlCompletionDataCollection data, XmlQualifiedName group, string prefix)
-		{
-			foreach (XmlSchemaElement element in schema.Elements.Values) {
-				if (element.SubstitutionGroup == group) {
-					AddElement(data, element.Name, prefix, element.Annotation);
-				}
-			}
-		}
-		
-		/// <summary>
-		/// Looks for the substitution group element of the specified name.
-		/// </summary>
-		XmlSchemaElement FindSubstitutionGroupElement(XmlQualifiedName group, QualifiedName name)
-		{
-			XmlSchemaElement matchedElement = null;
-			
-			foreach (XmlSchemaElement element in schema.Elements.Values) {
-				if (element.SubstitutionGroup == group) {
-					if (element.Name != null) {
-						if (element.Name == name.Name) {	
-							matchedElement = element;
-							break;
-						}
-					}
-				}
-			}
-			
-			return matchedElement;
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemaCompletionDataCollection.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemaCompletionDataCollection.cs
deleted file mode 100644
index d719fbfce8..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemaCompletionDataCollection.cs
+++ /dev/null
@@ -1,291 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Collections.Generic;
-using ICSharpCode.Core;
-using ICSharpCode.TextEditor.Gui.CompletionWindow;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	///   A collection that stores <see cref='XmlSchemaCompletionData'/> objects.
-	/// </summary>
-	[Serializable()]
-	public class XmlSchemaCompletionDataCollection : System.Collections.CollectionBase {
-		
-		/// <summary>
-		///   Initializes a new instance of <see cref='XmlSchemaCompletionDataCollection'/>.
-		/// </summary>
-		public XmlSchemaCompletionDataCollection()
-		{
-		}
-		
-		/// <summary>
-		///   Initializes a new instance of <see cref='XmlSchemaCompletionDataCollection'/> based on another <see cref='XmlSchemaCompletionDataCollection'/>.
-		/// </summary>
-		/// <param name='val'>
-		///   A <see cref='XmlSchemaCompletionDataCollection'/> from which the contents are copied
-		/// </param>
-		public XmlSchemaCompletionDataCollection(XmlSchemaCompletionDataCollection val)
-		{
-			this.AddRange(val);
-		}
-		
-		/// <summary>
-		///   Initializes a new instance of <see cref='XmlSchemaCompletionDataCollection'/> containing any array of <see cref='XmlSchemaCompletionData'/> objects.
-		/// </summary>
-		/// <param name='val'>
-		///       A array of <see cref='XmlSchemaCompletionData'/> objects with which to intialize the collection
-		/// </param>
-		public XmlSchemaCompletionDataCollection(XmlSchemaCompletionData[] val)
-		{
-			this.AddRange(val);
-		}
-		
-		/// <summary>
-		///   Represents the entry at the specified index of the <see cref='XmlSchemaCompletionData'/>.
-		/// </summary>
-		/// <param name='index'>The zero-based index of the entry to locate in the collection.</param>
-		/// <value>The entry at the specified index of the collection.</value>
-		/// <exception cref='ArgumentOutOfRangeException'><paramref name='index'/> is outside the valid range of indexes for the collection.</exception>
-		public XmlSchemaCompletionData this[int index] {
-			get {
-				return ((XmlSchemaCompletionData)(List[index]));
-			}
-			set {
-				List[index] = value;
-			}
-		}
-		
-		public ICompletionData[] GetNamespaceCompletionData()
-		{
-			List<ICompletionData> completionItems = new List<ICompletionData>();
-			
-			foreach (XmlSchemaCompletionData schema in this) {
-				XmlCompletionData completionData = new XmlCompletionData(schema.NamespaceUri, XmlCompletionData.DataType.NamespaceUri);
-				completionItems.Add(completionData);
-			}
-			
-			return completionItems.ToArray();
-		}
-		
-		/// <summary>
-		///   Represents the <see cref='XmlSchemaCompletionData'/> entry with the specified namespace URI.
-		/// </summary>
-		/// <param name='namespaceUri'>The schema's namespace URI.</param>
-		/// <value>The entry with the specified namespace URI.</value>
-		public XmlSchemaCompletionData this[string namespaceUri] {
-			get {
-				return GetItem(namespaceUri);
-			}
-		}		
-		
-		/// <summary>
-		///   Adds a <see cref='XmlSchemaCompletionData'/> with the specified value to the 
-		///   <see cref='XmlSchemaCompletionDataCollection'/>.
-		/// </summary>
-		/// <param name='val'>The <see cref='XmlSchemaCompletionData'/> to add.</param>
-		/// <returns>The index at which the new element was inserted.</returns>
-		/// <seealso cref='XmlSchemaCompletionDataCollection.AddRange'/>
-		public int Add(XmlSchemaCompletionData val)
-		{
-			return List.Add(val);
-		}
-		
-		/// <summary>
-		///   Copies the elements of an array to the end of the <see cref='XmlSchemaCompletionDataCollection'/>.
-		/// </summary>
-		/// <param name='val'>
-		///    An array of type <see cref='XmlSchemaCompletionData'/> containing the objects to add to the collection.
-		/// </param>
-		/// <seealso cref='XmlSchemaCompletionDataCollection.Add'/>
-		public void AddRange(XmlSchemaCompletionData[] val)
-		{
-			for (int i = 0; i < val.Length; i++) {
-				this.Add(val[i]);
-			}
-		}
-		
-		/// <summary>
-		///   Adds the contents of another <see cref='XmlSchemaCompletionDataCollection'/> to the end of the collection.
-		/// </summary>
-		/// <param name='val'>
-		///    A <see cref='XmlSchemaCompletionDataCollection'/> containing the objects to add to the collection.
-		/// </param>
-		/// <seealso cref='XmlSchemaCompletionDataCollection.Add'/>
-		public void AddRange(XmlSchemaCompletionDataCollection val)
-		{
-			for (int i = 0; i < val.Count; i++)
-			{
-				this.Add(val[i]);
-			}
-		}
-		
-		/// <summary>
-		///   Gets a value indicating whether the 
-		///    <see cref='XmlSchemaCompletionDataCollection'/> contains the specified <see cref='XmlSchemaCompletionData'/>.
-		/// </summary>
-		/// <param name='val'>The <see cref='XmlSchemaCompletionData'/> to locate.</param>
-		/// <returns>
-		/// <see langword='true'/> if the <see cref='XmlSchemaCompletionData'/> is contained in the collection; 
-		///   otherwise, <see langword='false'/>.
-		/// </returns>
-		/// <seealso cref='XmlSchemaCompletionDataCollection.IndexOf'/>
-		public bool Contains(XmlSchemaCompletionData val)
-		{
-			return List.Contains(val);
-		}
-		
-		/// <summary>
-		///   Copies the <see cref='XmlSchemaCompletionDataCollection'/> values to a one-dimensional <see cref='Array'/> instance at the 
-		///    specified index.
-		/// </summary>
-		/// <param name='array'>The one-dimensional <see cref='Array'/> that is the destination of the values copied from <see cref='XmlSchemaCompletionDataCollection'/>.</param>
-		/// <param name='index'>The index in <paramref name='array'/> where copying begins.</param>
-		/// <exception cref='ArgumentException'>
-		///   <para><paramref name='array'/> is multidimensional.</para>
-		///   <para>-or-</para>
-		///   <para>The number of elements in the <see cref='XmlSchemaCompletionDataCollection'/> is greater than
-		///         the available space between <paramref name='arrayIndex'/> and the end of
-		///         <paramref name='array'/>.</para>
-		/// </exception>
-		/// <exception cref='ArgumentNullException'><paramref name='array'/> is <see langword='null'/>. </exception>
-		/// <exception cref='ArgumentOutOfRangeException'><paramref name='arrayIndex'/> is less than <paramref name='array'/>'s lowbound. </exception>
-		/// <seealso cref='Array'/>
-		public void CopyTo(XmlSchemaCompletionData[] array, int index)
-		{
-			List.CopyTo(array, index);
-		}
-		
-		/// <summary>
-		///    Returns the index of a <see cref='XmlSchemaCompletionData'/> in 
-		///       the <see cref='XmlSchemaCompletionDataCollection'/>.
-		/// </summary>
-		/// <param name='val'>The <see cref='XmlSchemaCompletionData'/> to locate.</param>
-		/// <returns>
-		///   The index of the <see cref='XmlSchemaCompletionData'/> of <paramref name='val'/> in the 
-		///   <see cref='XmlSchemaCompletionDataCollection'/>, if found; otherwise, -1.
-		/// </returns>
-		/// <seealso cref='XmlSchemaCompletionDataCollection.Contains'/>
-		public int IndexOf(XmlSchemaCompletionData val)
-		{
-			return List.IndexOf(val);
-		}
-		
-		/// <summary>
-		///   Inserts a <see cref='XmlSchemaCompletionData'/> into the <see cref='XmlSchemaCompletionDataCollection'/> at the specified index.
-		/// </summary>
-		/// <param name='index'>The zero-based index where <paramref name='val'/> should be inserted.</param>
-		/// <param name='val'>The <see cref='XmlSchemaCompletionData'/> to insert.</param>
-		/// <seealso cref='XmlSchemaCompletionDataCollection.Add'/>
-		public void Insert(int index, XmlSchemaCompletionData val)
-		{
-			List.Insert(index, val);
-		}
-		
-		/// <summary>
-		///  Returns an enumerator that can iterate through the <see cref='XmlSchemaCompletionDataCollection'/>.
-		/// </summary>
-		/// <seealso cref='IEnumerator'/>
-		public new XmlSchemaCompletionDataEnumerator GetEnumerator()
-		{
-			return new XmlSchemaCompletionDataEnumerator(this);
-		}
-		
-		/// <summary>
-		///   Removes a specific <see cref='XmlSchemaCompletionData'/> from the <see cref='XmlSchemaCompletionDataCollection'/>.
-		/// </summary>
-		/// <param name='val'>The <see cref='XmlSchemaCompletionData'/> to remove from the <see cref='XmlSchemaCompletionDataCollection'/>.</param>
-		/// <exception cref='ArgumentException'><paramref name='val'/> is not found in the Collection.</exception>
-		public void Remove(XmlSchemaCompletionData val)
-		{
-			List.Remove(val);
-		}
-		
-		/// <summary>
-		/// Gets the schema completion data with the same filename.
-		/// </summary>
-		/// <returns><see langword="null"/> if no matching schema found.</returns>
-		public XmlSchemaCompletionData GetSchemaFromFileName(string fileName)
-		{
-			foreach (XmlSchemaCompletionData schema in this) {
-				if (FileUtility.IsEqualFileName(schema.FileName, fileName)) {
-					return schema;
-				}
-			}
-			return null;
-		}
-		
-		/// <summary>
-		///   Enumerator that can iterate through a XmlSchemaCompletionDataCollection.
-		/// </summary>
-		/// <seealso cref='IEnumerator'/>
-		/// <seealso cref='XmlSchemaCompletionDataCollection'/>
-		/// <seealso cref='XmlSchemaCompletionData'/>
-		public class XmlSchemaCompletionDataEnumerator : System.Collections.IEnumerator
-		{
-			System.Collections.IEnumerator baseEnumerator;
-			System.Collections.IEnumerable temp;
-			
-			/// <summary>
-			///   Initializes a new instance of <see cref='XmlSchemaCompletionDataEnumerator'/>.
-			/// </summary>
-			public XmlSchemaCompletionDataEnumerator(XmlSchemaCompletionDataCollection mappings)
-			{
-				this.temp = ((System.Collections.IEnumerable)(mappings));
-				this.baseEnumerator = temp.GetEnumerator();
-			}
-			
-			/// <summary>
-			///   Gets the current <see cref='XmlSchemaCompletionData'/> in the <seealso cref='XmlSchemaCompletionDataCollection'/>.
-			/// </summary>
-			public XmlSchemaCompletionData Current {
-				get {
-					return ((XmlSchemaCompletionData)(baseEnumerator.Current));
-				}
-			}
-			
-			object System.Collections.IEnumerator.Current {
-				get {
-					return baseEnumerator.Current;
-				}
-			}
-			
-			/// <summary>
-			///   Advances the enumerator to the next <see cref='XmlSchemaCompletionData'/> of the <see cref='XmlSchemaCompletionDataCollection'/>.
-			/// </summary>
-			public bool MoveNext()
-			{
-				return baseEnumerator.MoveNext();
-			}
-			
-			/// <summary>
-			///   Sets the enumerator to its initial position, which is before the first element in the <see cref='XmlSchemaCompletionDataCollection'/>.
-			/// </summary>
-			public void Reset()
-			{
-				baseEnumerator.Reset();
-			}
-		}
-		
-		XmlSchemaCompletionData GetItem(string namespaceUri)
-		{
-			XmlSchemaCompletionData matchedItem = null;
-			
-			foreach(XmlSchemaCompletionData item in this)
-			{
-				if (item.NamespaceUri == namespaceUri) {
-					matchedItem = item;
-					break;
-				}
-			}
-			
-			return matchedItem;
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemaListBoxItem.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemaListBoxItem.cs
deleted file mode 100644
index 0d1396cbc8..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemaListBoxItem.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// A schema item shown in the tools options dialog.
-	/// </summary>
-	public class XmlSchemaListBoxItem
-	{
-		string namespaceUri = String.Empty;
-		bool readOnly = false;
-		
-		/// <summary>
-		/// Creates a new list box item.
-		/// </summary>
-		/// <remarks>
-		/// A readonly list box item is used for system schemas, those that 
-		/// are installed with SharpDevelop. 
-		/// </remarks>
-		public XmlSchemaListBoxItem(string namespaceUri, bool readOnly)
-		{
-			this.namespaceUri = namespaceUri;
-			this.readOnly = readOnly;
-		}
-		
-		public XmlSchemaListBoxItem(string namespaceUri)
-			: this(namespaceUri, false)
-		{
-		}
-		
-		public string NamespaceUri {
-			get {
-				return namespaceUri;
-			}
-		}
-		
-		public bool ReadOnly {
-			get {
-				return readOnly;
-			}
-		}
-		
-		/// <summary>
-		/// Returns the namespace Uri so the list box item is sorted correctly.
-		/// </summary>
-		/// <returns></returns>
-		public override string ToString()
-		{
-			return namespaceUri;
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemaManager.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemaManager.cs
deleted file mode 100644
index e782d4cbfa..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemaManager.cs
+++ /dev/null
@@ -1,221 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.IO;
-using System.Runtime.InteropServices;
-
-using ICSharpCode.Core;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Keeps track of all the schemas that the Xml Editor is aware
-	/// of.
-	/// </summary>
-	public class XmlSchemaManager
-	{
-		public const string XmlSchemaNamespace = "http://www.w3.org/2001/XMLSchema";
-		
-		static XmlSchemaCompletionDataCollection schemas = null;
-		static XmlSchemaManager manager = null;
-		
-		public static event EventHandler UserSchemaAdded;
-		
-		public static event EventHandler UserSchemaRemoved;
-		
-		XmlSchemaManager()
-		{
-		}
-	
-		/// <summary>
-		/// Determines whether the specified namespace is actually the W3C namespace for
-		/// XSD files.
-		/// </summary>
-		public static bool IsXmlSchemaNamespace(string schemaNamespace)
-		{
-			return schemaNamespace == XmlSchemaNamespace;
-		}
-		
-		/// <summary>
-		/// Gets the schemas that SharpDevelop knows about.
-		/// </summary>
-		public static XmlSchemaCompletionDataCollection SchemaCompletionDataItems {
-			get {
-				if (schemas == null) {
-					schemas = new XmlSchemaCompletionDataCollection();
-					manager = new XmlSchemaManager();
-					manager.ReadSchemas();
-				}
-
-				return schemas;
-			}
-		}
-		
-		/// <summary>
-		/// Gets the schema completion data that is associated with the
-		/// specified file extension.
-		/// </summary>
-		public static XmlSchemaCompletionData GetSchemaCompletionData(string extension)
-		{
-			XmlSchemaCompletionData data = null;
-			
-			XmlSchemaAssociation association = XmlEditorAddInOptions.GetSchemaAssociation(extension);
-			if (association != null) {
-				if (association.NamespaceUri.Length > 0) {
-					data = SchemaCompletionDataItems[association.NamespaceUri];
-				}
-			}
-			return data;
-		}
-		
-		/// <summary>
-		/// Gets the namespace prefix that is associated with the
-		/// specified file extension.
-		/// </summary>
-		public static string GetNamespacePrefix(string extension)
-		{
-			string prefix = String.Empty;
-			
-			XmlSchemaAssociation association = XmlEditorAddInOptions.GetSchemaAssociation(extension);
-			if (association != null) {
-				prefix = association.NamespacePrefix;
-			}
-			
-			return prefix;
-		}
-		
-		/// <summary>
-		/// Removes the schema with the specified namespace from the
-		/// user schemas folder and removes the completion data.
-		/// </summary>
-		public static void RemoveUserSchema(string namespaceUri)
-		{
-			XmlSchemaCompletionData schemaData = SchemaCompletionDataItems[namespaceUri];
-			if (schemaData != null) {
-				if (File.Exists(schemaData.FileName)) {
-					File.Delete(schemaData.FileName);
-				}
-				SchemaCompletionDataItems.Remove(schemaData);
-				OnUserSchemaRemoved();
-			}
-		}
-		
-		/// <summary>
-		/// Adds the schema to the user schemas folder and makes the
-		/// schema available to the xml editor.
-		/// </summary>
-		public static void AddUserSchema(XmlSchemaCompletionData schemaData)
-		{
-			if (SchemaCompletionDataItems[schemaData.NamespaceUri] == null) {
-
-				if (!Directory.Exists(UserSchemaFolder)) {
-					Directory.CreateDirectory(UserSchemaFolder);
-				}			
-	
-				string fileName = Path.GetFileName(schemaData.FileName);
-				string destinationFileName = Path.Combine(UserSchemaFolder, fileName);
-				File.Copy(schemaData.FileName, destinationFileName);
-				schemaData.FileName = destinationFileName;
-				SchemaCompletionDataItems.Add(schemaData);
-				OnUserSchemaAdded();
-			} else {
-				LoggingService.Warn("Trying to add a schema that already exists.  Namespace=" + schemaData.NamespaceUri);
-			}
-		}		
-		
-		/// <summary>
-		/// Reads the system and user added schemas.
-		/// </summary>
-		void ReadSchemas()
-		{
-			// MSBuild schemas are in framework directory:
-			ReadSchemas(RuntimeEnvironment.GetRuntimeDirectory(), true);
-			ReadSchemas(SchemaFolder, true);
-			ReadSchemas(UserSchemaFolder, false);
-		}
-		
-		/// <summary>
-		/// Reads all .xsd files in the specified folder.
-		/// </summary>
-		void ReadSchemas(string folder, bool readOnly)
-		{
-			if (Directory.Exists(folder)) {
-				foreach (string fileName in Directory.GetFiles(folder, "*.xsd")) {
-					ReadSchema(fileName, readOnly);
-				}
-			}
-		}
-		
-		/// <summary>
-		/// Reads an individual schema and adds it to the collection.
-		/// </summary>
-		/// <remarks>
-		/// If the schema namespace exists in the collection it is not added.
-		/// </remarks>
-		void ReadSchema(string fileName, bool readOnly)
-		{
-			try {
-				string baseUri = XmlSchemaCompletionData.GetUri(fileName);
-				XmlSchemaCompletionData data = new XmlSchemaCompletionData(baseUri, fileName);
-				if (data.NamespaceUri != null) {
-					if (schemas[data.NamespaceUri] == null) {
-						data.ReadOnly = readOnly;
-						schemas.Add(data);
-					} else {
-						// Namespace already exists.
-						LoggingService.Warn("Ignoring duplicate schema namespace " + data.NamespaceUri);
-					} 
-				} else {
-					// Namespace is null.
-					LoggingService.Warn("Ignoring schema with no namespace " + data.FileName);
-				}
-			} catch (Exception ex) {
-				LoggingService.Warn("Unable to read schema '" + fileName + "'. ", ex);
-			}
-		}
-		
-		/// <summary>
-		/// Gets the folder where the schemas for all users on the
-		/// local machine are stored.
-		/// </summary>
-		static string SchemaFolder {
-			get {
-				return Path.Combine(PropertyService.DataDirectory, "schemas");
-			}
-		}
-		
-		/// <summary>
-		/// Gets the folder where schemas are stored for an individual user.
-		/// </summary>
-		static string UserSchemaFolder {
-			get {
-				return Path.Combine(PropertyService.ConfigDirectory, "schemas");				
-			}
-		}
-		
-		/// <summary>
-		/// Should really pass schema info with the event.
-		/// </summary>
-		static void OnUserSchemaAdded()
-		{
-			if (UserSchemaAdded != null) {
-				UserSchemaAdded(manager, new EventArgs());
-			}
-		}
-		
-		/// <summary>
-		/// Should really pass schema info with the event.
-		/// </summary>
-		static void OnUserSchemaRemoved()
-		{
-			if (UserSchemaRemoved != null) {
-				UserSchemaRemoved(manager, new EventArgs());
-			}
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemasPanel.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemasPanel.cs
deleted file mode 100644
index a23927b33e..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemasPanel.cs
+++ /dev/null
@@ -1,409 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using ICSharpCode.SharpDevelop.Gui.OptionPanels;
-using System;
-using System.Collections.Specialized;
-using System.Drawing;
-using System.IO;
-using System.Windows.Forms;
-using ICSharpCode.Core;
-using ICSharpCode.SharpDevelop.Gui;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Shows the xml schemas that SharpDevelop knows about.
-	/// </summary>
-	public class XmlSchemasPanel : XmlFormsOptionPanel
-	{		
-		ListBox schemaListBox;
-		Button removeButton;
-		ComboBox fileExtensionComboBox;
-		TextBox schemaTextBox;
-		TextBox namespacePrefixTextBox;
-		
-		bool ignoreNamespacePrefixTextChanges;
-		
-		bool changed;
-		XmlSchemaCompletionDataCollection addedSchemas = new XmlSchemaCompletionDataCollection();
-		StringCollection removedSchemaNamespaces = new StringCollection();
-		
-		SolidBrush readonlyTextBrush = new SolidBrush(SystemColors.GrayText);
-		SolidBrush selectedTextBrush = new SolidBrush(SystemColors.HighlightText);
-		SolidBrush normalTextBrush = new SolidBrush(SystemColors.WindowText);
-
-		/// <summary>
-		/// Initialises the panel.
-		/// </summary>
-		public override void LoadPanelContents()
-		{
-			SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("ICSharpCode.XmlEditor.Resources.XmlSchemasPanel.xfrm"));
-			
-			schemaListBox = (ListBox)ControlDictionary["schemaListBox"];
-			schemaListBox.DrawMode = DrawMode.OwnerDrawFixed;
-			schemaListBox.DrawItem += new DrawItemEventHandler(SchemaListBoxDrawItem);
-			schemaListBox.Sorted = true;
-			PopulateSchemaListBox();
-			schemaListBox.SelectedIndexChanged += new EventHandler(SchemaListBoxSelectedIndexChanged);
-			
-			namespacePrefixTextBox = (TextBox)ControlDictionary["namespacePrefixTextBox"];
-			namespacePrefixTextBox.TextChanged += new EventHandler(NamespacePrefixTextBoxTextChanged);
-			
-			ControlDictionary["addButton"].Click += new EventHandler(AddButtonClick);
-			removeButton = (Button)ControlDictionary["removeButton"];
-			removeButton.Click += new EventHandler(RemoveButtonClick);
-			removeButton.Enabled = false;
-			
-			ControlDictionary["changeSchemaButton"].Click += new EventHandler(ChangeSchemaButtonClick);
-		
-			schemaTextBox = (TextBox)ControlDictionary["schemaTextBox"];
-			fileExtensionComboBox = (ComboBox)ControlDictionary["fileExtensionComboBox"];
-			fileExtensionComboBox.Sorted = true;			
-			PopulateFileExtensionComboBox();
-			fileExtensionComboBox.SelectedIndexChanged += new EventHandler(FileExtensionComboBoxSelectedIndexChanged);
-		}
-
-		/// <summary>
-		/// Saves any changes to the configured schemas.
-		/// </summary>
-		public override bool StorePanelContents()
-		{
-			if (changed) {
-				try {
-					return SaveSchemaChanges();
-				} catch (Exception ex) {
-					MessageService.ShowError(ex, "${res:ICSharpCode.XmlEditor.XmlSchemasPanel.UnableToSaveChanges}");
-					return false;
-				}
-			}
-
-			// Update schema associations after we have added any new schemas to
-			// the schema manager.
-			UpdateSchemaAssociations();
-		
-			return true;
-		}
-	
-		void AddButtonClick(object source, EventArgs e)
-		{
-			try {
-				// Browse for schema.
-				
-				string schemaFileName = BrowseForSchema();
-				
-				// Add schema if the namespace does not already exist.
-				
-				if (schemaFileName.Length > 0) {
-					changed = AddSchema(schemaFileName);
-				}
-			} catch (Exception ex) {
-				MessageService.ShowError("${res:ICSharpCode.XmlEditor.XmlSchemasPanel.UnableToAddSchema}\n\n" + ex.Message);
-			}
-		}
-		
-		void RemoveButtonClick(object source, EventArgs e)
-		{
-			// Remove selected schema.
-			XmlSchemaListBoxItem item = schemaListBox.SelectedItem as XmlSchemaListBoxItem;
-			if (item != null) {
-				RemoveSchema(item.NamespaceUri);
-				changed = true;
-			}
-		}
-		
-		/// <summary>
-		/// Enables the remove button if a list box item is selected.
-		/// </summary>
-		void SchemaListBoxSelectedIndexChanged(object source, EventArgs e)
-		{
-			XmlSchemaListBoxItem item = schemaListBox.SelectedItem as XmlSchemaListBoxItem;
-			if (item != null) {
-				if (item.ReadOnly) {
-					removeButton.Enabled = false;
-				} else {
-					removeButton.Enabled = true;
-				}
-			} else {
-				removeButton.Enabled = false;
-			}
-		}
-		
-		/// <summary>
-		/// Adds the schema namespaces to the list.
-		/// </summary>
-		void PopulateSchemaListBox()
-		{
-			foreach (XmlSchemaCompletionData schema in XmlSchemaManager.SchemaCompletionDataItems) {
-				XmlSchemaListBoxItem item = new XmlSchemaListBoxItem(schema.NamespaceUri, schema.ReadOnly);
-				schemaListBox.Items.Add(item);
-			}
-		}
-		
-		/// <summary>
-		/// Saves any changes to the configured schemas.
-		/// </summary>
-		/// <returns></returns>
-		bool SaveSchemaChanges()
-		{
-			RemoveUserSchemas();
-			AddUserSchemas();
-
-			return true;
-		}
-		
-		/// <summary>
-		/// Allows the user to browse the file system for a schema.
-		/// </summary>
-		/// <returns>The schema file name the user selected; otherwise an 
-		/// empty string.</returns>
-		string BrowseForSchema()
-		{
-			string fileName = String.Empty;
-			
-			using (OpenFileDialog openFileDialog  = new OpenFileDialog()) {
-				openFileDialog.CheckFileExists = true;
-				openFileDialog.Multiselect = false;
-				openFileDialog.Filter = StringParser.Parse("${res:SharpDevelop.FileFilter.XmlSchemaFiles}|*.xsd|${res:SharpDevelop.FileFilter.AllFiles}|*.*");
-				
-				if (openFileDialog.ShowDialog() == DialogResult.OK) {
-					fileName = openFileDialog.FileName;
-				}
-			}
-			
-			return fileName;
-		}
-		
-		/// <summary>
-		/// Loads the specified schema and adds it to an internal collection.
-		/// </summary>
-		/// <remarks>The schema file is not copied to the user's schema folder
-		/// until they click the OK button.</remarks>
-		/// <returns><see langword="true"/> if the schema namespace 
-		/// does not already exist; otherwise <see langword="false"/>
-		/// </returns>
-		bool AddSchema(string fileName)
-		{			
-			// Load the schema.
-			XmlSchemaCompletionData schema = new XmlSchemaCompletionData(fileName);
-			
-			// Make sure the schema has a target namespace.
-			if (schema.NamespaceUri == null) {
-				MessageService.ShowErrorFormatted("${res:ICSharpCode.XmlEditor.XmlSchemasPanel.NoTargetNamespace}", Path.GetFileName(schema.FileName));
-				return false;
-			}
-			
-			// Check that the schema does not exist.
-			if (SchemaNamespaceExists(schema.NamespaceUri)) {	
-				MessageService.ShowErrorFormatted("${res:ICSharpCode.XmlEditor.XmlSchemasPanel.NamespaceExists}", schema.NamespaceUri);
-				return false;
-			} 
-
-			// Store the schema so we can add it later.
-			int index = schemaListBox.Items.Add(new XmlSchemaListBoxItem(schema.NamespaceUri));
-			schemaListBox.SelectedIndex = index;
-			addedSchemas.Add(schema);
-			if (removedSchemaNamespaces.Contains(schema.NamespaceUri)) {
-				removedSchemaNamespaces.Remove(schema.NamespaceUri);
-			}
-			
-			return true;
-		}
-		
-		/// <summary>
-		/// Checks that the schema namespace does not already exist.
-		/// </summary>
-		bool SchemaNamespaceExists(string namespaceURI)
-		{
-			bool exists = true;
-			if ((XmlSchemaManager.SchemaCompletionDataItems[namespaceURI] == null) &&
-			    (addedSchemas[namespaceURI] == null)){
-				exists = false;
-			} else {
-				// Makes sure it has not been flagged for removal.
-				exists = !removedSchemaNamespaces.Contains(namespaceURI);
-			}
-			return exists;
-		}
-		
-		/// <summary>
-		/// Schedules the schema for removal.
-		/// </summary>
-		void RemoveSchema(string namespaceUri)
-		{
-			RemoveListBoxItem(namespaceUri);
-			
-			XmlSchemaCompletionData addedSchema = addedSchemas[namespaceUri];
-			if (addedSchema != null) {
-				addedSchemas.Remove(addedSchema);
-			} else {
-				removedSchemaNamespaces.Add(namespaceUri);
-			}
-		}
-		
-		void RemoveListBoxItem(string namespaceUri)
-		{
-			foreach (XmlSchemaListBoxItem item in schemaListBox.Items) {
-				if (item.NamespaceUri == namespaceUri) {
-					schemaListBox.Items.Remove(item);
-					break;
-				}
-			}
-		}
-		
-		/// <summary>
-		/// Removes the schemas from the schema manager.
-		/// </summary>
-		void RemoveUserSchemas()
-		{
-			while (removedSchemaNamespaces.Count > 0) {
-				XmlSchemaManager.RemoveUserSchema(removedSchemaNamespaces[0]);
-				removedSchemaNamespaces.RemoveAt(0);
-			}
-		}
-		
-		/// <summary>
-		/// Adds the schemas to the schema manager.
-		/// </summary>
-		void AddUserSchemas()
-		{
-			while (addedSchemas.Count > 0) {
-				XmlSchemaManager.AddUserSchema(addedSchemas[0]);
-				addedSchemas.RemoveAt(0);
-			}
-		}
-		
-		/// <summary>
-		/// Draws the list box items so we can show the read only schemas in
-		/// a different colour.
-		/// </summary>
-		void SchemaListBoxDrawItem(object sender, DrawItemEventArgs e)
-		{
-			e.DrawBackground();
-			
-			if (e.Index >= 0) {
-				XmlSchemaListBoxItem item = (XmlSchemaListBoxItem)schemaListBox.Items[e.Index];
-				
-				if (IsListBoxItemSelected(e.State)) {
-					e.Graphics.DrawString(item.NamespaceUri, schemaListBox.Font, selectedTextBrush, e.Bounds);
-				} else if (item.ReadOnly) {
-					e.Graphics.DrawString(item.NamespaceUri, schemaListBox.Font, readonlyTextBrush, e.Bounds);
-				} else {
-					e.Graphics.DrawString(item.NamespaceUri, schemaListBox.Font, normalTextBrush, e.Bounds);				
-				}
-			}
-			
-			e.DrawFocusRectangle();
-		}
-	
-		bool IsListBoxItemSelected(DrawItemState state)
-		{
-			return ((state & DrawItemState.Selected) == DrawItemState.Selected);
-		}
-		
-		/// <summary>
-		/// Shows the namespace associated with the selected xml file extension.
-		/// </summary>
-		void FileExtensionComboBoxSelectedIndexChanged(object source, EventArgs e)
-		{
-			schemaTextBox.Text = String.Empty;
-			ignoreNamespacePrefixTextChanges = true;
-			namespacePrefixTextBox.Text = String.Empty;
-			
-			try {
-				XmlSchemaAssociationListBoxItem association = fileExtensionComboBox.SelectedItem as XmlSchemaAssociationListBoxItem;
-				if (association != null) {
-					schemaTextBox.Text = association.NamespaceUri;
-					namespacePrefixTextBox.Text = association.NamespacePrefix;
-				}
-			} finally {
-				ignoreNamespacePrefixTextChanges = false;			
-			}			
-		}
-
-		/// <summary>
-		/// Allows the user to change the schema associated with an xml file 
-		/// extension.
-		/// </summary>
-		void ChangeSchemaButtonClick(object source, EventArgs e)
-		{
-			string[] namespaces = GetSchemaListBoxNamespaces();
-			using (SelectXmlSchemaForm form = new SelectXmlSchemaForm(namespaces)) {
-				form.SelectedNamespaceUri = schemaTextBox.Text;
-				if (form.ShowDialog(this) == DialogResult.OK) {
-					schemaTextBox.Text = form.SelectedNamespaceUri;
-					XmlSchemaAssociationListBoxItem item = (XmlSchemaAssociationListBoxItem)fileExtensionComboBox.SelectedItem;
-					item.NamespaceUri = form.SelectedNamespaceUri;
-					item.IsDirty = true;
-				}
-			}
-		}
-		
-		/// <summary>
-		/// Reads the configured xml file extensions and their associated namespaces.
-		/// </summary>
-		void PopulateFileExtensionComboBox()
-		{
-			string [] extensions = XmlView.GetXmlFileExtensions();
-			
-			foreach (string extension in extensions) {
-				XmlSchemaAssociation association = XmlEditorAddInOptions.GetSchemaAssociation(extension);
-				XmlSchemaAssociationListBoxItem item = new XmlSchemaAssociationListBoxItem(association.Extension, association.NamespaceUri, association.NamespacePrefix);
-				fileExtensionComboBox.Items.Add(item);
-			}
-			
-			if (fileExtensionComboBox.Items.Count > 0) {
-				fileExtensionComboBox.SelectedIndex = 0;
-				FileExtensionComboBoxSelectedIndexChanged(this, new EventArgs());
-			}
-		}
-		
-		/// <summary>
-		/// Updates the configured file extension to namespace mappings.
-		/// </summary>
-		void UpdateSchemaAssociations()
-		{
-			foreach (XmlSchemaAssociationListBoxItem item in fileExtensionComboBox.Items) {
-				if (item.IsDirty) {
-					XmlSchemaAssociation association = new XmlSchemaAssociation(item.Extension, item.NamespaceUri, item.NamespacePrefix);
-					XmlEditorAddInOptions.SetSchemaAssociation(association);
-				}
-			}
-		}
-		
-		/// <summary>
-		/// Returns an array of schema namespace strings that will be displayed
-		/// when the user chooses to associated a namespace to a file extension
-		/// by default.
-		/// </summary>
-		string[] GetSchemaListBoxNamespaces()
-		{
-			string[] namespaces = new string[schemaListBox.Items.Count];
-			
-			for (int i = 0; i < schemaListBox.Items.Count; ++i) {
-				XmlSchemaListBoxItem item = (XmlSchemaListBoxItem)schemaListBox.Items[i];
-				namespaces[i] = item.NamespaceUri;
-			}
-			
-			return namespaces;
-		}
-		
-		/// <summary>
-		/// User has changed the namespace prefix.
-		/// </summary>
-		void NamespacePrefixTextBoxTextChanged(object source, EventArgs e)
-		{
-			if (!ignoreNamespacePrefixTextChanges) {
-				XmlSchemaAssociationListBoxItem item = fileExtensionComboBox.SelectedItem as XmlSchemaAssociationListBoxItem;
-				if (item != null) {
-					item.NamespacePrefix = namespacePrefixTextBox.Text;
-					item.IsDirty = true;
-				}
-			}
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlTextTreeNode.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlTextTreeNode.cs
deleted file mode 100644
index d253e7b7d6..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlTextTreeNode.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Xml;
-using ICSharpCode.SharpDevelop.Gui;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Represents an XmlText node in the tree.
-	/// </summary>
-	public class XmlTextTreeNode : XmlCharacterDataTreeNode
-	{
-		public const string XmlTextTreeNodeImageKey = "XmlTextTreeNodeImage";
-		public const string XmlTextTreeNodeGhostImageKey = "XmlTextTreeNodeGhostImage";
-		
-		XmlText xmlText;
-		
-		public XmlTextTreeNode(XmlText xmlText)
-			: base(xmlText)
-		{
-			this.xmlText = xmlText;
-			ImageKey = XmlTextTreeNodeImageKey;
-			SelectedImageKey = ImageKey;
-			Update();
-		}
-		
-		/// <summary>
-		/// Gets the XmlText associated with this tree node.
-		/// </summary>
-		public XmlText XmlText {
-			get {
-				return xmlText;
-			}
-		}
-		
-		/// <summary>
-		/// Gets or sets whether to show the ghost image which is 
-		/// displayed when cutting the node.
-		/// </summary>
-		public bool ShowGhostImage {
-			get {
-				return ImageKey == XmlTextTreeNodeGhostImageKey;
-			}
-			set {
-				if (value) {
-					ImageKey = XmlTextTreeNodeGhostImageKey;
-				} else {
-					ImageKey = XmlTextTreeNodeImageKey;
-				}
-				SelectedImageKey = ImageKey;
-			}
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlTreeEditor.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlTreeEditor.cs
deleted file mode 100644
index d67222e75a..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlTreeEditor.cs
+++ /dev/null
@@ -1,654 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Xml;
-
-using ICSharpCode.Core;
-using ICSharpCode.TextEditor.Gui.CompletionWindow;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// The class that is responsible for controlling the editing of the 
-	/// Xml tree view.
-	/// </summary>
-	public class XmlTreeEditor
-	{
-		IXmlTreeView view;
-		XmlDocument document;
-		XmlCompletionDataProvider completionDataProvider;
-		XmlNode copiedNode;
-		XmlNode cutNode;
-		
-		public XmlTreeEditor(IXmlTreeView view, XmlCompletionDataProvider completionDataProvider)
-		{
-			this.view = view;
-			this.completionDataProvider = completionDataProvider;
-		}
-		
-		/// <summary>
-		/// Loads the xml into the editor.
-		/// </summary>
-		public void LoadXml(string xml)
-		{
-			try {
-				document = new XmlDocument();
-				document.XmlResolver = null;
-				document.LoadXml(xml);
-				view.Document = document;
-			} catch (XmlException ex) {
-				view.ShowXmlIsNotWellFormedMessage(ex);
-			} catch (WebException ex) {
-				LoggingService.Debug(ex.ToString());
-				view.ShowErrorMessage(ex.Message);
-			}
-		}
-		
-		/// <summary>
-		/// Gets the Xml document being edited.
-		/// </summary>
-		public XmlDocument Document {
-			get {
-				return document;
-			}
-		}
-		
-		/// <summary>
-		/// The selected tree node in the view has changed.
-		/// </summary>
-		public void SelectedNodeChanged()
-		{
-			XmlElement selectedElement = view.SelectedElement;
-			XmlText selectedTextNode = view.SelectedTextNode;
-			XmlComment selectedComment = view.SelectedComment;
-			if (selectedTextNode != null) {
-				view.ClearAttributes();
-				view.ShowTextContent(selectedTextNode.InnerText);
-			} else if (selectedElement != null) {
-				view.TextContent = String.Empty;
-				view.ShowAttributes(selectedElement.Attributes);
-			} else if (selectedComment != null) {
-				view.ClearAttributes();
-				view.ShowTextContent(selectedComment.InnerText);
-			} else {
-				view.ClearAttributes();
-				view.TextContent = String.Empty;
-			}
-		}
-		
-		/// <summary>
-		/// The attribute value has changed.
-		/// </summary>
-		public void AttributeValueChanged()
-		{
-			view.IsDirty = true;
-		}
-		
-		/// <summary>
-		/// Adds one or more new attribute to the selected element.
-		/// </summary>
-		public void AddAttribute()
-		{
-			XmlElement selectedElement = view.SelectedElement;
-			if (selectedElement != null) {
-				string[] attributesNames = GetMissingAttributes(selectedElement);
-				string[] selectedAttributeNames = view.SelectNewAttributes(attributesNames);
-				if (selectedAttributeNames.Length > 0) {
-					foreach (string attributeName in selectedAttributeNames) {
-						selectedElement.SetAttribute(attributeName, String.Empty);
-					}
-					view.IsDirty = true;
-					view.ShowAttributes(selectedElement.Attributes);
-				}
-			}
-		}
-		
-		/// <summary>
-		/// Removes the selected attribute from the xml document.
-		/// </summary>
-		public void RemoveAttribute()
-		{
-			XmlElement selectedElement = view.SelectedElement;
-			if (selectedElement != null) {
-				string attribute = view.SelectedAttribute;
-				if (attribute != null) {
-					selectedElement.RemoveAttribute(attribute);
-					view.IsDirty = true;
-					view.ShowAttributes(selectedElement.Attributes);
-				}
-			}
-		}
-		
-		/// <summary>
-		/// The text content has been changed in the view.
-		/// </summary>
-		public void TextContentChanged()
-		{
-			XmlText textNode = view.SelectedTextNode;
-			XmlComment comment = view.SelectedComment;
-			if (textNode != null) {
-				view.IsDirty = true;
-				textNode.InnerText = view.TextContent;
-				view.UpdateTextNode(textNode);
-			} else if (comment != null) {
-				view.IsDirty = true;
-				comment.InnerText = view.TextContent;
-				view.UpdateComment(comment);
-			}
-		}
-		
-		/// <summary>
-		/// Adds a new child element to the selected element.
-		/// </summary>
-		public void AppendChildElement()
-		{
-			XmlElement selectedElement = view.SelectedElement;
-			if (selectedElement != null) {
-				string[] elementNames = GetChildElements(selectedElement);
-				string[] selectedElementNames = view.SelectNewElements(elementNames);
-				if (selectedElementNames.Length > 0) {
-					view.IsDirty = true;
-					foreach (string elementName in selectedElementNames) {
-						XmlElement newElement = document.CreateElement(elementName, selectedElement.NamespaceURI);
-						AppendChildElement(selectedElement, newElement);
-					}
-				}
-			}
-		}
-		
-		/// <summary>
-		/// Inserts an element before the currently selected element.
-		/// </summary>
-		public void InsertElementBefore()
-		{
-			XmlElement parentElement = null;
-			XmlNode selectedNode = view.SelectedElement;
-			if (selectedNode == null) {
-				selectedNode = view.SelectedComment;
-			}
-			if (selectedNode != null) {
-				parentElement = selectedNode.ParentNode as XmlElement;
-			}
-			
-			if (parentElement != null) {
-				string[] elementNames = GetChildElements(parentElement);
-				string[] selectedElementNames = view.SelectNewElements(elementNames);
-				if (selectedElementNames.Length > 0) {
-					view.IsDirty = true;
-					foreach (string elementName in selectedElementNames) {
-						XmlElement newElement = document.CreateElement(elementName, parentElement.NamespaceURI);
-						parentElement.InsertBefore(newElement, selectedNode);
-						view.InsertElementBefore(newElement);
-					}
-				}
-			}
-		}
-		
-		/// <summary>
-		/// Inserts an element after the currently selected element.
-		/// </summary>
-		public void InsertElementAfter()
-		{
-			XmlElement parentElement = null;
-			XmlNode selectedNode = view.SelectedElement;
-			if (selectedNode == null) {
-				selectedNode = view.SelectedComment;
-			}
-			if (selectedNode != null) {
-				parentElement = selectedNode.ParentNode as XmlElement;
-			}
-			
-			if (parentElement != null) {
-				string[] elementNames = GetChildElements(parentElement);
-				string[] selectedElementNames = view.SelectNewElements(elementNames);
-				if (selectedElementNames.Length > 0) {
-					view.IsDirty = true;
-					foreach (string elementName in selectedElementNames) {
-						XmlElement newElement = document.CreateElement(elementName, parentElement.NamespaceURI);
-						parentElement.InsertAfter(newElement, selectedNode);
-						view.InsertElementAfter(newElement);
-					}
-				}
-			}
-		}
-		
-		/// <summary>
-		/// Adds a child text node to the current selected element.
-		/// </summary>
-		public void AppendChildTextNode()
-		{
-			AppendChildTextNode(document.CreateTextNode(String.Empty));
-		}
-		
-		/// <summary>
-		/// Inserts a text node before the currently selected node.
-		/// </summary>
-		public void InsertTextNodeBefore()
-		{
-			// Get the currently selected text node or element.
-			XmlNode selectedNode = GetSelectedCommentOrElementOrTextNode();
-
-			// Insert the text node before the selected node.
-			if (selectedNode != null) {
-				XmlElement parentElement = selectedNode.ParentNode as XmlElement;
-				if (parentElement != null) {
-					XmlText textNode = document.CreateTextNode(String.Empty);
-					parentElement.InsertBefore(textNode, selectedNode);
-					view.IsDirty = true;
-					view.InsertTextNodeBefore(textNode);
-				}
-			}
-		}
-
-		/// <summary>
-		/// Inserts a text node after the currently selected node.
-		/// </summary>
-		public void InsertTextNodeAfter()
-		{
-			// Get the currently selected text node or element.
-			XmlNode selectedNode = GetSelectedCommentOrElementOrTextNode();
-
-			// Insert the text node after the selected node.
-			if (selectedNode != null) {
-				XmlElement parentElement = selectedNode.ParentNode as XmlElement;
-				if (parentElement != null) {
-					XmlText textNode = document.CreateTextNode(String.Empty);
-					parentElement.InsertAfter(textNode, selectedNode);
-					view.IsDirty = true;
-					view.InsertTextNodeAfter(textNode);
-				}
-			}
-		}
-		
-		/// <summary>
-		/// Adds a child comment node to the current selected element.
-		/// </summary>
-		public void AppendChildComment()
-		{
-			XmlComment comment = document.CreateComment(String.Empty);
-			AppendChildComment(comment);
-		}
-		
-		/// <summary>
-		/// Inserts a comment before the selected node.
-		/// </summary>
-		public void InsertCommentBefore()
-		{
-			XmlNode node = GetSelectedCommentOrElementOrTextNode();
-			if (node != null) {
-				XmlNode parentNode = node.ParentNode;
-				XmlComment comment = document.CreateComment(String.Empty);
-				parentNode.InsertBefore(comment, node);
-				view.IsDirty = true;
-				view.InsertCommentBefore(comment);
-			}
-		}
-		
-		/// <summary>
-		/// Inserts a comment after the selected node.
-		/// </summary>
-		public void InsertCommentAfter()
-		{
-			XmlNode node = GetSelectedCommentOrElementOrTextNode();
-			if (node != null) {
-				XmlNode parentNode = node.ParentNode;
-				XmlComment comment = document.CreateComment(String.Empty);
-				parentNode.InsertAfter(comment, node);
-				view.IsDirty = true;
-				view.InsertCommentAfter(comment);
-			}
-		}
-		
-		/// <summary>
-		/// Deletes the selected tree node from the xml document.
-		/// </summary>
-		public void Delete()
-		{
-			XmlNode selectedNode = view.SelectedNode;
-			XmlElement selectedElement = selectedNode as XmlElement;
-			XmlComment selectedComment = selectedNode as XmlComment;
-			XmlText selectedText = selectedNode as XmlText;
-			if (selectedElement != null) {
-				RemoveElement(selectedElement);
-			} else if (selectedComment != null) {
-				RemoveComment(selectedComment);
-			} else if (selectedText != null) {
-				RemoveTextNode(selectedText);
-			}
-		}
-		
-		/// <summary>
-		/// Copies the selected node.
-		/// </summary>
-		public void Copy()
-		{
-			copiedNode = view.SelectedNode;
-			if (cutNode != null) {
-				view.HideCut(cutNode);
-			}
-		}
-		
-		/// <summary>
-		/// Pastes the copied or cut node as a child of the selected node.
-		/// </summary>
-		public void Paste()
-		{
-			if (IsPasteEnabled) {
-				if (copiedNode != null) {
-					AppendChildCopy(copiedNode);
-				} else {
-					CutAndPasteNode(cutNode);
-				}
-			}
-		}
-				
-		/// <summary>
-		/// Cuts the selected node.
-		/// </summary>
-		public void Cut()
-		{
-			cutNode = view.SelectedNode;
-			if (cutNode != null) {
-				view.ShowCut(cutNode);
-			}
-			copiedNode = null;
-		}
-		
-		/// <summary>
-		/// Gets whether the cut method is enabled.
-		/// </summary>
-		public bool IsCutEnabled {
-			get {
-				XmlNode selectedNode = view.SelectedNode;
-				return selectedNode != null && document.DocumentElement != selectedNode;
-			}
-		}
-		
-		/// <summary>
-		/// Gets whether the copy method is enabled.
-		/// </summary>
-		public bool IsCopyEnabled {
-			get {
-				return view.SelectedNode != null;
-			}
-		}
-		
-		/// <summary>
-		/// Gets whether the paste method is enabled.
-		/// </summary>
-		public bool IsPasteEnabled {
-			get {
-				XmlNode destinationNode = view.SelectedNode;
-				if (destinationNode != null) {
-					XmlNode sourceNode = copiedNode ?? cutNode;
-					if (sourceNode != null) {
-						return GetPasteEnabled(sourceNode, destinationNode);
-					}
-				}
-				return false;
-			}
-		}
-		
-		/// <summary>
-		/// Gets whether the delete method is enabled.
-		/// </summary>
-		public bool IsDeleteEnabled {
-			get {
-				return view.SelectedNode != null;
-			}
-		}
-		
-		/// <summary>
-		/// Gets the missing attributes for the specified element based 
-		/// on its associated schema.
-		/// </summary>
-		string[] GetMissingAttributes(XmlElement element)
-		{
-			XmlElementPath elementPath = GetElementPath(element);
-
-			List<string> attributes = new List<string>();
-			XmlSchemaCompletionData schemaCompletionData = completionDataProvider.FindSchema(elementPath);
-			if (schemaCompletionData != null) {
-				ICompletionData[] completionData = schemaCompletionData.GetAttributeCompletionData(elementPath);
-				foreach (ICompletionData attributeCompletionData in completionData) {					
-					// Ignore existing attributes.
-					string attributeName = attributeCompletionData.Text;
-					if (!element.HasAttribute(attributeName)) {
-						attributes.Add(attributeName);
-					}
-				}
-			}
-			return attributes.ToArray();
-		}
-		
-		/// <summary>
-		/// Returns the path to the specified element starting from the
-		/// root element.
-		/// </summary>
-		XmlElementPath GetElementPath(XmlElement element)
-		{
-			XmlElementPath path = new XmlElementPath();
-			XmlElement parentElement = element;
-			while (parentElement != null) {
-				QualifiedName name = new QualifiedName(parentElement.LocalName, parentElement.NamespaceURI, parentElement.Prefix);
-				path.Elements.Insert(0, name);
-				
-				// Move to parent element.
-				parentElement = parentElement.ParentNode as XmlElement;
-			}
-			return path;
-		}
-		
-		/// <summary>
-		/// Returns a list of elements that can be children of the 
-		/// specified element.
-		/// </summary>
-		string[] GetChildElements(XmlElement element)
-		{
-			XmlElementPath elementPath = GetElementPath(element);
-			
-			List<string> elements = new List<string>();
-			XmlSchemaCompletionData schemaCompletionData = completionDataProvider.FindSchema(elementPath);
-			if (schemaCompletionData != null) {
-				ICompletionData[] completionData = schemaCompletionData.GetChildElementCompletionData(elementPath);
-				foreach (ICompletionData elementCompletionData in completionData) {					
-					elements.Add(elementCompletionData.Text);
-				}
-			}
-			return elements.ToArray();	
-		}
-		
-		/// <summary>
-		/// Gets the current comment or element or text node
-		/// from the view.
-		/// </summary>
-		XmlNode GetSelectedCommentOrElementOrTextNode()
-		{
-			XmlNode node = view.SelectedComment;
-			if (node != null) {
-				return node;
-			}
-			return GetSelectedElementOrTextNode();
-		}
-		
-		/// <summary>
-		/// Gets the currently selected element or text node.
-		/// </summary>
-		XmlNode GetSelectedElementOrTextNode()
-		{
-			XmlNode node = view.SelectedTextNode;
-			if (node != null) {
-				return node;
-			}
-			return view.SelectedElement;
-		}
-		
-		/// <summary>
-		/// Appends the specified element as a child to the selected element.
-		/// </summary>
-		void AppendChildElement(XmlElement element)
-		{
-			AppendChildElement(view.SelectedElement, element);
-		}
-		
-		/// <summary>
-		/// Appends the specified element as a child to the selected element.
-		/// </summary>
-		void AppendChildElement(XmlElement selectedElement, XmlElement element)
-		{
-			selectedElement.AppendChild(element);
-			view.AppendChildElement(element);
-			view.IsDirty = true;
-		}
-		
-		/// <summary>
-		/// Removes the specified element from the document.
-		/// </summary>
-		void RemoveElement(XmlElement element)
-		{
-			XmlNode parentNode = element.ParentNode;
-			parentNode.RemoveChild(element);
-			view.IsDirty = true;
-			view.RemoveElement(element);
-		}
-		
-		/// <summary>
-		/// Removes the specified comment from the document.
-		/// </summary>
-		void RemoveComment(XmlComment comment)
-		{
-			XmlNode parentNode = comment.ParentNode;
-			parentNode.RemoveChild(comment);
-			view.IsDirty = true;
-			view.RemoveComment(comment);
-		}
-		
-		/// <summary>
-		/// Removes the specified text node from the document.
-		/// </summary>
-		void RemoveTextNode(XmlText textNode)
-		{
-			XmlNode parentNode = textNode.ParentNode;
-			parentNode.RemoveChild(textNode);
-			view.IsDirty = true;
-			view.RemoveTextNode(textNode);
-		}
-		
-		/// <summary>
-		/// Gets whether the source node can be pasted as a child
-		/// node of the destination node.
-		/// </summary>
-		static bool GetPasteEnabled(XmlNode source, XmlNode destination)
-		{
-			if (source is XmlElement || source is XmlText || source is XmlComment) {
-				return destination is XmlElement;
-			}
-			return false;
-		}
-		
-		/// <summary>
-		/// Takes a copy of the node and appends it to the selected
-		/// node.
-		/// </summary>
-		void AppendChildCopy(XmlNode nodeToCopy)
-		{
-			if (nodeToCopy is XmlElement) {
-				XmlElement copy = (XmlElement)nodeToCopy.CloneNode(true);
-				AppendChildElement(copy);
-			} else if (nodeToCopy is XmlText) {
-				XmlText copy = (XmlText)nodeToCopy.CloneNode(true);
-				AppendChildTextNode(copy);
-			} else if (nodeToCopy is XmlComment) {
-				XmlComment copy = (XmlComment)nodeToCopy.CloneNode(true);
-				AppendChildComment(copy);
-			}
-		}
-		
-		/// <summary>
-		/// Appends the specified text node to the currently selected element.
-		/// </summary>
-		void AppendChildTextNode(XmlText textNode)
-		{
-			XmlElement selectedElement = view.SelectedElement;
-			if (selectedElement != null) {
-				selectedElement.AppendChild(textNode);
-				view.IsDirty = true;
-				view.AppendChildTextNode(textNode);
-			}
-		}
-		
-		/// <summary>
-		/// Cuts from the tree and pastes it to the currently selected node.
-		/// </summary>
-		void CutAndPasteNode(XmlNode node)
-		{
-			XmlElement cutElement = node as XmlElement;
-			XmlText cutTextNode = node as XmlText;
-			XmlComment cutCommentNode = node as XmlComment;
-			if (cutElement != null) {
-				CutAndPasteElement(cutElement);
-			} else if (cutTextNode != null) {
-				CutAndPasteTextNode(cutTextNode);
-			} else if (cutCommentNode != null) {
-				CutAndPasteComment(cutCommentNode);
-			}
-			cutNode = null;
-		}
-		
-		/// <summary>
-		/// Cuts the element from the document and pastes it as a child
-		/// of the selected element.
-		/// </summary>
-		void CutAndPasteElement(XmlElement element)
-		{
-			if (element != view.SelectedElement) {
-				view.RemoveElement(element);
-				AppendChildElement(element);
-			} else {
-				// Pasting to the same cut element so just 
-				// change the tree icon back to the uncut state.
-				view.HideCut(element);
-			}
-		}
-		
-		/// <summary>
-		/// Cuts the text node from the document and appends it as a child
-		/// of the currently selected element.
-		/// </summary>
-		void CutAndPasteTextNode(XmlText text)
-		{
-			view.RemoveTextNode(text);
-			AppendChildTextNode(text);
-		}
-		
-		/// <summary>
-		/// Appends the specified comment to the currently selected element.
-		/// </summary>
-		void AppendChildComment(XmlComment comment)
-		{
-			XmlElement selectedElement = view.SelectedElement;
-			if (selectedElement != null) {
-				selectedElement.AppendChild(comment);
-				view.IsDirty = true;
-				view.AppendChildComment(comment);
-			}
-		}
-		
-		/// <summary>
-		/// Cuts the comment node from the document and appends it as a child
-		/// of the currently selected element.
-		/// </summary>
-		void CutAndPasteComment(XmlComment comment)
-		{
-			view.RemoveComment(comment);
-			AppendChildComment(comment);
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlTreeView.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlTreeView.cs
deleted file mode 100644
index 91becadf85..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlTreeView.cs
+++ /dev/null
@@ -1,181 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Windows.Forms;
-using ICSharpCode.Core;
-using ICSharpCode.Core.WinForms;
-using ICSharpCode.SharpDevelop.Gui;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// The secondary view content that displays the XML document as a tree view.
-	/// </summary>
-	public class XmlTreeView : AbstractSecondaryViewContent, IClipboardHandler
-	{
-		XmlTreeViewContainerControl treeViewContainer = new XmlTreeViewContainerControl();
-		XmlView xmlView;
-		bool disposed;
-		bool ignoreDirtyChange;
-		
-		public XmlTreeView(XmlView xmlView) : this(xmlView, null, null)
-		{
-			treeViewContainer.AttributesGrid.ContextMenuStrip = MenuService.CreateContextMenu(treeViewContainer, "/AddIns/XmlEditor/XmlTree/AttributesGrid/ContextMenu");
-			treeViewContainer.TreeView.ContextMenuStrip = MenuService.CreateContextMenu(treeViewContainer, "/AddIns/XmlEditor/XmlTree/ContextMenu");
-		}
-		
-		/// <summary>
-		/// Creates an XmlTreeView with the specified context menu strips.
-		/// This constructor is only used to test the XmlTreeView class.
-		/// </summary>
-		public XmlTreeView(XmlView xmlView, ContextMenuStrip attributesGridContextMenuStrip, ContextMenuStrip treeViewContextMenuStrip)
-			: base(xmlView)
-		{
-			this.TabPageText = "${res:ICSharpCode.XmlEditor.XmlTreeView.Title}";
-			
-			this.xmlView = xmlView;
-			treeViewContainer.DirtyChanged += TreeViewContainerDirtyChanged;
-			treeViewContainer.AttributesGrid.ContextMenuStrip = attributesGridContextMenuStrip;
-			treeViewContainer.TreeView.ContextMenuStrip = treeViewContextMenuStrip;
-		}
-		
-		public override object Control {
-			get {
-				return treeViewContainer;
-			}
-		}
-		
-		public override void Dispose()
-		{
-			LoggingService.Debug("XmlTreeView.Dispose");
-			
-			if (!disposed) {
-				disposed = true;
-				treeViewContainer.Dispose();
-			}
-			base.Dispose();
-		}
-		
-		protected override void LoadFromPrimary()
-		{
-			LoggingService.Debug("XmlTreeView.LoadFromPrimary");
-			
-			XmlEditorControl xmlEditor = xmlView.XmlEditor;
-			XmlCompletionDataProvider completionDataProvider = new XmlCompletionDataProvider(xmlEditor.SchemaCompletionDataItems, xmlEditor.DefaultSchemaCompletionData, xmlEditor.DefaultNamespacePrefix);
-			treeViewContainer.LoadXml(xmlView.Text, completionDataProvider);
-			xmlView.CheckIsWellFormed();
-		}
-		
-		protected override void SaveToPrimary()
-		{
-			LoggingService.Debug("XmlTreeView.SaveToPrimary");
-			
-			if (treeViewContainer.IsDirty) {
-				xmlView.ReplaceAll(treeViewContainer.Document.OuterXml);
-				ignoreDirtyChange = true;
-				treeViewContainer.IsDirty = false;
-				ignoreDirtyChange = false;
-			}
-		}
-		
-		#region IClipboardHandler implementation
-		
-		/// <summary>
-		/// Gets whether the edit menu's cut command should be enabled.
-		/// </summary>
-		public bool EnableCut {
-			get {
-				return treeViewContainer.EnableCut;
-			}
-		}
-		
-		/// <summary>
-		/// Gets whether the edit menu's copy command should be enabled.
-		/// </summary>
-		public bool EnableCopy {
-			get {
-				return treeViewContainer.EnableCopy;
-			}
-		}
-		
-		/// <summary>
-		/// Gets whether the edit menu's paste command should be enabled.
-		/// </summary>
-		public bool EnablePaste {
-			get {
-				return treeViewContainer.EnablePaste;
-			}
-		}
-		
-		/// <summary>
-		/// Gets whether the edit menu's delete command should be enabled.
-		/// </summary>
-		public bool EnableDelete {
-			get {
-				return treeViewContainer.EnableDelete;
-			}
-		}
-		
-		/// <summary>
-		/// Always returns false.
-		/// </summary>
-		public bool EnableSelectAll {
-			get {
-				return false;
-			}
-		}
-		
-		/// <summary>
-		/// Cuts the selected tree node.
-		/// </summary>
-		public void Cut()
-		{
-			treeViewContainer.Cut();
-		}
-		
-		/// <summary>
-		/// Copies the selected tree node.
-		/// </summary>
-		public void Copy()
-		{
-			treeViewContainer.Copy();
-		}
-		
-		/// <summary>
-		/// Pastes the copied or cut node as a child of the selected tree node.
-		/// </summary>
-		public void Paste()
-		{
-			treeViewContainer.Paste();
-		}
-		
-		/// <summary>
-		/// Deletes the selected tree node.
-		/// </summary>
-		public void Delete()
-		{
-			treeViewContainer.Delete();
-		}
-		
-		/// <summary>
-		/// Select all is not currently supported.
-		/// </summary>
-		public void SelectAll()
-		{
-		}
-		
-		#endregion
-		
-		void TreeViewContainerDirtyChanged(object source, EventArgs e)
-		{
-			if (!ignoreDirtyChange) {
-				this.PrimaryFile.IsDirty = treeViewContainer.IsDirty;
-			}
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlTreeViewContainerControl.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlTreeViewContainerControl.cs
deleted file mode 100644
index 820eebe6f0..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlTreeViewContainerControl.cs
+++ /dev/null
@@ -1,923 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.ComponentModel;
-using System.Drawing;
-using System.Windows.Forms;
-using System.Xml;
-
-using ICSharpCode.Core;
-using ICSharpCode.SharpDevelop;
-using ICSharpCode.SharpDevelop.Gui;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// This user control holds both the XmlTreeViewControl and the
-	/// attributes property grid in a split container. This is separate from
-	/// the XmlTreeView class so we can use the forms designer to design this control.
-	/// </summary>
-	public class XmlTreeViewContainerControl : System.Windows.Forms.UserControl, IXmlTreeView, IOwnerState, IClipboardHandler
-	{
-		XmlTreeEditor editor;
-		bool dirty;
-		bool errorMessageTextBoxVisible;
-		bool attributesGridVisible = true;
-		bool textBoxVisible;
-		
-		[Flags]
-		public enum XmlTreeViewContainerControlState {
-			Nothing             = 0,
-			ElementSelected     = 1,
-			RootElementSelected = 2,
-			AttributeSelected   = 4,
-			TextNodeSelected    = 8,
-			CommentSelected     = 16
-		}
-		
-		public event EventHandler DirtyChanged;
-		
-		public XmlTreeViewContainerControl()
-		{
-			InitializeComponent();
-			InitImages();
-		}
-		
-		/// <summary>
-		/// Gets the current XmlTreeViewContainerControlState.
-		/// </summary>
-		public Enum InternalState {
-			get {
-				XmlTreeViewContainerControlState state = XmlTreeViewContainerControlState.Nothing;
-				if (SelectedElement != null) {
-					state |= XmlTreeViewContainerControlState.ElementSelected;
-					if (SelectedElement == Document.DocumentElement) {
-						state |= XmlTreeViewContainerControlState.RootElementSelected;
-					}
-				}
-				if (SelectedAttribute != null) {
-					state |= XmlTreeViewContainerControlState.AttributeSelected;
-				}
-				if (SelectedTextNode != null) {
-					state = XmlTreeViewContainerControlState.TextNodeSelected;
-				}
-				if (SelectedComment != null) {
-					state = XmlTreeViewContainerControlState.CommentSelected;
-				}
-				return state;
-			}
-		}
-		
-		/// <summary>
-		/// Gets the property grid that displays attributes for the
-		/// selected xml element.
-		/// </summary>
-		public PropertyGrid AttributesGrid {
-			get {
-				return attributesGrid;
-			}
-		}
-		
-		/// <summary>
-		/// Gets or sets whether the xml document needs saving.
-		/// </summary>
-		public bool IsDirty {
-			get {
-				return dirty;
-			}
-			set {
-				bool previousDirty = dirty;
-				dirty = value;
-				OnXmlChanged(previousDirty);
-			}
-		}
-		
-		/// <summary>
-		/// Gets or sets the error message to display.
-		/// </summary>
-		public string ErrorMessage {
-			get {
-				return errorMessageTextBox.Text;
-			}
-			set {
-				errorMessageTextBox.Text = value;
-			}
-		}
-		
-		/// <summary>
-		/// Gets or sets whether the error message is visible. When visible the
-		/// error message text box replaces the property grid.
-		/// </summary>
-		public bool IsErrorMessageTextBoxVisible {
-			get {
-				return errorMessageTextBoxVisible;
-			}
-			set {
-				errorMessageTextBoxVisible = value;
-				if (value) {
-					errorMessageTextBox.BringToFront();
-					errorMessageTextBox.TabStop = true;;
-					IsAttributesGridVisible = false;
-					IsTextBoxVisible = false;
-				} else {
-					errorMessageTextBox.SendToBack();
-					errorMessageTextBox.TabStop = false;
-				}
-			}
-		}
-		
-		/// <summary>
-		/// Gets the XmlTreeView in the container.
-		/// </summary>
-		public XmlTreeViewControl TreeView {
-			get {
-				return xmlElementTreeView;
-			}
-		}
-		
-		public void ShowXmlIsNotWellFormedMessage(XmlException ex)
-		{
-			ShowErrorMessage(ex.Message);
-		}
-		
-		public void ShowErrorMessage(string message)
-		{
-			xmlElementTreeView.Clear();
-			ErrorMessage = message;
-			IsErrorMessageTextBoxVisible = true;
-		}
-	
-		/// <summary>
-		/// Displays the specified xml as a tree.
-		/// </summary>
-		public void LoadXml(string xml, XmlCompletionDataProvider completionDataProvider)
-		{
-			textBox.Clear();
-			IsAttributesGridVisible = true;
-			ClearAttributes();
-			
-			editor = new XmlTreeEditor(this, completionDataProvider);
-			editor.LoadXml(xml);
-			
-			// Expand document element node.
-			if (xmlElementTreeView.Nodes.Count > 0) {
-				xmlElementTreeView.Nodes[0].Expand();
-			}
-		}
-		
-		/// <summary>
-		/// Gets or sets the xml document to be shown in this
-		/// container control.
-		/// </summary>
-		public XmlDocument Document {
-			get {
-				return editor.Document;
-			}
-			set {
-				xmlElementTreeView.Document = value;
-			}
-		}
-		
-		/// <summary>
-		/// Shows the attributes.
-		/// </summary>
-		public void ShowAttributes(XmlAttributeCollection attributes)
-		{
-			IsAttributesGridVisible = true;
-			attributesGrid.SelectedObject = new XmlAttributeTypeDescriptor(attributes);
-		}
-		
-		/// <summary>
-		/// Clears all the attributes currently on display.
-		/// </summary>
-		public void ClearAttributes()
-		{
-			attributesGrid.SelectedObject = null;
-		}
-		
-		/// <summary>
-		/// Shows the xml element's text content after the user has
-		/// selected the text node.
-		/// </summary>
-		public void ShowTextContent(string text)
-		{
-			IsTextBoxVisible = true;
-			textBox.Text = text;
-		}
-		
-		/// <summary>
-		/// Gets or sets the text of the text node or 
-		/// comment node currently on display.
-		/// </summary>
-		public string TextContent {
-			get {
-				return textBox.Text;
-			}
-			set {
-				textBox.Text = value;
-			}
-		}
-		
-		/// <summary>
-		/// Gets the currently selected node based on what is selected in 
-		/// the tree. This does not return the selected attribute.
-		/// </summary>
-		public XmlNode SelectedNode {
-			get {
-				XmlElement selectedElement = SelectedElement;
-				if (selectedElement != null) {
-					return selectedElement;
-				}
-				
-				XmlText selectedTextNode = SelectedTextNode;
-				if (selectedTextNode != null) {
-					return selectedTextNode;
-				}
-				
-				return SelectedComment;
-			}
-		}
-		
-		/// <summary>
-		/// Gets the element currently selected.
-		/// </summary>
-		public XmlElement SelectedElement {
-			get {
-				return xmlElementTreeView.SelectedElement;
-			}
-		}
-		
-		/// <summary>
-		/// Gets the text node currently selected.
-		/// </summary>
-		public XmlText SelectedTextNode {
-			get {
-				return xmlElementTreeView.SelectedTextNode;
-			}
-		}
-		
-		/// <summary>
-		/// Gets the comment node currently selected.
-		/// </summary>
-		public XmlComment SelectedComment {
-			get {
-				return xmlElementTreeView.SelectedComment;
-			}
-		}
-		
-		/// <summary>
-		/// Gets the name of the attribute currently selected.
-		/// </summary>
-		public string SelectedAttribute {
-			get {
-				GridItem gridItem = attributesGrid.SelectedGridItem;
-				if (IsAttributesGridVisible && gridItem != null && gridItem.PropertyDescriptor != null) {
-					return gridItem.PropertyDescriptor.Name;
-				}
-				return null;
-			}
-		}
-		
-		/// <summary>
-		/// Shows the add attribute dialog so the user can add a new
-		/// attribute to the XML tree.
-		/// </summary>
-		public void AddAttribute()
-		{
-			editor.AddAttribute();
-		}
-		
-		/// <summary>
-		/// Shows the add attribute dialog so the user can choose one or more
-		/// new attributes to be added to the selected element.
-		/// </summary>
-		/// <param name="attributes">The list of attributes the user
-		/// can choose from.</param>
-		/// <returns>The attributes selected by the user.</returns>
-		public string[] SelectNewAttributes(string[] attributes)
-		{
-			using (IAddXmlNodeDialog addAttributeDialog = CreateAddAttributeDialog(attributes)) {
-				if (addAttributeDialog.ShowDialog() == DialogResult.OK) {
-					return addAttributeDialog.GetNames();
-				}
-				return new string[0];
-			}
-		}
-		
-		/// <summary>
-		/// Removes the currently selected attribute.
-		/// </summary>
-		public void RemoveAttribute()
-		{
-			editor.RemoveAttribute();
-		}
-		
-		/// <summary>
-		/// Shows the add element dialog so the user can choose one or more
-		/// new elements to be added to the selected element.
-		/// </summary>
-		/// <param name="attributes">The list of elements the user
-		/// can choose from.</param>
-		/// <returns>The elements selected by the user.</returns>
-		public string[] SelectNewElements(string[] elements)
-		{
-			using (IAddXmlNodeDialog addElementDialog = CreateAddElementDialog(elements)) {
-				if (addElementDialog.ShowDialog() == DialogResult.OK) {
-					return addElementDialog.GetNames();
-				}
-				return new string[0];
-			}
-		}
-		
-		/// <summary>
-		/// Appends a new child element to the currently selected element.
-		/// </summary>
-		public void AppendChildElement(XmlElement element)
-		{
-			xmlElementTreeView.AppendChildElement(element);
-		}
-		
-		/// <summary>
-		/// Adds a new child element to the selected element.
-		/// </summary>
-		public void AddChildElement()
-		{
-			editor.AppendChildElement();
-		}
-		
-		/// <summary>
-		/// Inserts an element before the currently selected element.
-		/// </summary>
-		public void InsertElementBefore()
-		{
-			editor.InsertElementBefore();
-		}
-
-		/// <summary>
-		/// Inserts the specified element before the currently selected
-		/// element.
-		/// </summary>
-		public void InsertElementBefore(XmlElement element)
-		{
-			xmlElementTreeView.InsertElementBefore(element);
-		}
-		
-		/// <summary>
-		/// Inserts an element after the currently selected element.
-		/// </summary>
-		public void InsertElementAfter()
-		{
-			editor.InsertElementAfter();
-		}
-		
-		/// <summary>
-		/// Inserts the specified element after the currently selected
-		/// element.
-		/// </summary>
-		public void InsertElementAfter(XmlElement element)
-		{
-			xmlElementTreeView.InsertElementAfter(element);
-		}
-		
-		/// <summary>
-		/// Removes the specified element from the tree.
-		/// </summary>
-		public void RemoveElement(XmlElement element)
-		{
-			xmlElementTreeView.RemoveElement(element);
-		}
-		
-		/// <summary>
-		/// Appends a new text node to the currently selected
-		/// element.
-		/// </summary>
-		public void AppendChildTextNode(XmlText textNode)
-		{
-			xmlElementTreeView.AppendChildTextNode(textNode);			
-		}
-		
-		/// <summary>
-		/// Appends a new text node to the currently selected
-		/// element.
-		/// </summary>		
-		public void AppendChildTextNode()
-		{
-			editor.AppendChildTextNode();
-		}
-		
-		/// <summary>
-		/// Inserts a new text node before the currently selected
-		/// node.
-		/// </summary>
-		public void InsertTextNodeBefore()
-		{
-			editor.InsertTextNodeBefore();
-		}
-		
-		/// <summary>
-		/// Inserts a new text node before the currently selected
-		/// node.
-		/// </summary>
-		public void InsertTextNodeBefore(XmlText textNode)
-		{
-			xmlElementTreeView.InsertTextNodeBefore(textNode);
-		}
-		
-		/// <summary>
-		/// Inserts a new text node after the currently selected
-		/// node.
-		/// </summary>
-		public void InsertTextNodeAfter()
-		{
-			editor.InsertTextNodeAfter();
-		}
-		
-		/// <summary>
-		/// Inserts a new text node after the currently selected
-		/// node.
-		/// </summary>
-		public void InsertTextNodeAfter(XmlText textNode)
-		{
-			xmlElementTreeView.InsertTextNodeAfter(textNode);
-		}
-		
-		/// <summary>
-		/// Removes the currently selected text node.
-		/// </summary>
-		public void RemoveTextNode(XmlText textNode)
-		{
-			xmlElementTreeView.RemoveTextNode(textNode);
-		}
-		
-		/// <summary>
-		/// Updates the corresponding tree node's text.
-		/// </summary>
-		public void UpdateTextNode(XmlText textNode)
-		{
-			xmlElementTreeView.UpdateTextNode(textNode);
-		}
-		
-		/// <summary>
-		/// Updates the corresponding tree node's text.
-		/// </summary>
-		public void UpdateComment(XmlComment comment)
-		{
-			xmlElementTreeView.UpdateComment(comment);
-		}
-		
-		/// <summary>
-		/// Appends a new child comment node to the currently selected
-		/// element.
-		/// </summary>
-		public void AppendChildComment(XmlComment comment)
-		{
-			xmlElementTreeView.AppendChildComment(comment);
-		}
-		
-		/// <summary>
-		/// Appends a new child comment node to the currently selected
-		/// element.
-		/// </summary>
-		public void AppendChildComment()
-		{
-			editor.AppendChildComment();
-		}
-		
-		/// <summary>
-		/// Removes the specified xml comment from the tree.
-		/// </summary>
-		public void RemoveComment(XmlComment comment)
-		{
-			xmlElementTreeView.RemoveComment(comment);
-		}
-		
-		/// <summary>
-		/// Inserts the comment before the currently selected node.
-		/// </summary>
-		public void InsertCommentBefore(XmlComment comment)
-		{
-			xmlElementTreeView.InsertCommentBefore(comment);
-		}
-		
-		/// <summary>
-		/// Inserts a comment before the currently selected node.
-		/// </summary>
-		public void InsertCommentBefore()
-		{
-			editor.InsertCommentBefore();
-		}
-		
-		/// <summary>
-		/// Inserts the comment after the currently selected node.
-		/// </summary>
-		public void InsertCommentAfter(XmlComment comment)
-		{
-			xmlElementTreeView.InsertCommentAfter(comment);
-		}
-		
-		/// <summary>
-		/// Inserts a comment after the currently selected node.
-		/// </summary>
-		public void InsertCommentAfter()
-		{
-			editor.InsertCommentAfter();
-		}
-		
-		/// <summary>
-		/// Updates the view to show that the specified node is going
-		/// to be cut.
-		/// </summary>
-		public void ShowCut(XmlNode node)
-		{
-			xmlElementTreeView.ShowCut(node);
-		}
-		
-		/// <summary>
-		/// Updates the view so that the specified node is not displayed
-		/// as being cut.
-		/// </summary>
-		public void HideCut(XmlNode node)
-		{
-			xmlElementTreeView.HideCut(node);
-		}
-
-		#region IClipboardHandler implementation
-
-		/// <summary>
-		/// Gets whether cutting is enabled.
-		/// </summary>
-		public bool EnableCut {
-			get {
-				return editor.IsCutEnabled;
-			}
-		}
-		
-		/// <summary>
-		/// Gets whether copying is enabled.
-		/// </summary>
-		public bool EnableCopy {
-			get {
-				return editor.IsCopyEnabled;
-			}
-		}
-		
-		/// <summary>
-		/// Gets whether pasting is enabled.
-		/// </summary>
-		public bool EnablePaste {
-			get {
-				return editor.IsPasteEnabled;
-			}
-		}
-		
-		/// <summary>
-		/// Gets whether deleting is enabled.
-		/// </summary>
-		public bool EnableDelete {
-			get {
-				return editor.IsDeleteEnabled;
-			}
-		}
-		
-		/// <summary>
-		/// Currently not possible to select all tree nodes so this
-		/// always returns false.
-		/// </summary>
-		public bool EnableSelectAll {
-			get {
-				return false;
-			}
-		}
-		
-		/// <summary>
-		/// Cuts the selected tree node.
-		/// </summary>
-		public void Cut()
-		{
-			editor.Cut();
-		}
-		
-		/// <summary>
-		/// Copies the selected tree node.
-		/// </summary>
-		public void Copy()
-		{
-			editor.Copy();
-		}
-		
-		/// <summary>
-		/// Pastes the selected tree node.
-		/// </summary>
-		public void Paste()
-		{
-			editor.Paste();
-		}
-		
-		/// <summary>
-		/// Deletes the selected tree node.
-		/// </summary>
-		public void Delete()
-		{
-			editor.Delete();
-		}
-		
-		/// <summary>
-		/// Selects all tree nodes. Currently not supported.
-		/// </summary>
-		public void SelectAll()
-		{
-		}
-		
-		#endregion
-		
-		/// <summary>
-		/// Disposes resources used by the control.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing) {
-				if (components != null) {
-					components.Dispose();
-				}
-			}
-			base.Dispose(disposing);
-		}
-		
-		/// <summary>
-		/// Creates a new AddElementDialog.
-		/// </summary>
-		/// <param name="elementNames">The element names to be listed in the
-		/// dialog.</param>
-		protected virtual IAddXmlNodeDialog CreateAddElementDialog(string[] elementNames)
-		{
-			AddXmlNodeDialog dialog = new AddXmlNodeDialog(elementNames);
-			dialog.Text = StringParser.Parse("${res:ICSharpCode.XmlEditor.AddElementDialog.Title}");
-			dialog.CustomNameLabelText = StringParser.Parse("${res:ICSharpCode.XmlEditor.AddElementDialog.CustomElementLabel}");
-			return dialog;
-		}
-		
-		/// <summary>
-		/// Creates a new AddAttributeDialog.
-		/// </summary>
-		/// <param name="attributeNames">The attribute names to be listed in the
-		/// dialog.</param>
-		protected virtual IAddXmlNodeDialog CreateAddAttributeDialog(string[] attributeNames)
-		{
-			AddXmlNodeDialog dialog = new AddXmlNodeDialog(attributeNames);
-			dialog.Text = StringParser.Parse("${res:ICSharpCode.XmlEditor.AddAttributeDialog.Title}");
-			dialog.CustomNameLabelText = StringParser.Parse("${res:ICSharpCode.XmlEditor.AddAttributeDialog.CustomAttributeLabel}");
-			return dialog;
-		}
-		
-		/// <summary>
-		/// Deletes the selected node.
-		/// </summary>
-		protected void XmlElementTreeViewDeleteKeyPressed(object source, EventArgs e)
-		{
-			Delete();
-		}
-		
-		#region Forms Designer generated code
-
-		/// <summary>
-		/// Designer variable used to keep track of non-visual components.
-		/// </summary>
-		System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// This method is required for Windows Forms designer support.
-		/// Do not change the method contents inside the source code editor. The Forms designer might
-		/// not be able to load this method if it was changed manually.
-		/// </summary>
-		void InitializeComponent()
-		{
-			this.components = new System.ComponentModel.Container();
-			ICSharpCode.SharpDevelop.Gui.ExtTreeViewComparer extTreeViewComparer1 = new ICSharpCode.SharpDevelop.Gui.ExtTreeViewComparer();
-			this.splitContainer = new System.Windows.Forms.SplitContainer();
-			this.xmlElementTreeView = new ICSharpCode.XmlEditor.XmlTreeViewControl();
-			this.attributesGrid = new System.Windows.Forms.PropertyGrid();
-			this.errorMessageTextBox = new System.Windows.Forms.RichTextBox();
-			this.textBox = new System.Windows.Forms.RichTextBox();
-			this.splitContainer.Panel1.SuspendLayout();
-			this.splitContainer.Panel2.SuspendLayout();
-			this.splitContainer.SuspendLayout();
-			this.SuspendLayout();
-			// 
-			// splitContainer
-			// 
-			this.splitContainer.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.splitContainer.Location = new System.Drawing.Point(0, 0);
-			this.splitContainer.Name = "splitContainer";
-			// 
-			// splitContainer.Panel1
-			// 
-			this.splitContainer.Panel1.Controls.Add(this.xmlElementTreeView);
-			// 
-			// splitContainer.Panel2
-			// 
-			this.splitContainer.Panel2.Controls.Add(this.attributesGrid);
-			this.splitContainer.Panel2.Controls.Add(this.errorMessageTextBox);
-			this.splitContainer.Panel2.Controls.Add(this.textBox);
-			this.splitContainer.Size = new System.Drawing.Size(562, 326);
-			this.splitContainer.SplitterDistance = 185;
-			this.splitContainer.SplitterWidth = 2;
-			this.splitContainer.TabIndex = 0;
-			this.splitContainer.TabStop = false;
-			// 
-			// xmlElementTreeView
-			// 
-			this.xmlElementTreeView.AllowDrop = true;
-			this.xmlElementTreeView.CanClearSelection = true;
-			this.xmlElementTreeView.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.xmlElementTreeView.Document = null;
-			this.xmlElementTreeView.DrawMode = System.Windows.Forms.TreeViewDrawMode.OwnerDrawText;
-			this.xmlElementTreeView.HideSelection = false;
-			this.xmlElementTreeView.ImageIndex = 0;
-			this.xmlElementTreeView.IsSorted = false;
-			this.xmlElementTreeView.Location = new System.Drawing.Point(0, 0);
-			this.xmlElementTreeView.Name = "xmlElementTreeView";
-			this.xmlElementTreeView.NodeSorter = extTreeViewComparer1;
-			this.xmlElementTreeView.SelectedImageIndex = 0;
-			this.xmlElementTreeView.Size = new System.Drawing.Size(185, 326);
-			this.xmlElementTreeView.TabIndex = 0;
-			this.xmlElementTreeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.XmlElementTreeViewAfterSelect);
-			this.xmlElementTreeView.DeleteKeyPressed += new System.EventHandler(this.XmlElementTreeViewDeleteKeyPressed);
-			// 
-			// attributesGrid
-			// 
-			this.attributesGrid.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.attributesGrid.HelpVisible = false;
-			this.attributesGrid.Location = new System.Drawing.Point(0, 0);
-			this.attributesGrid.Name = "attributesGrid";
-			this.attributesGrid.PropertySort = System.Windows.Forms.PropertySort.Alphabetical;
-			this.attributesGrid.Size = new System.Drawing.Size(375, 326);
-			this.attributesGrid.TabIndex = 1;
-			this.attributesGrid.ToolbarVisible = false;
-			this.attributesGrid.PropertyValueChanged += new System.Windows.Forms.PropertyValueChangedEventHandler(this.AttributesGridPropertyValueChanged);
-			// 
-			// errorMessageTextBox
-			// 
-			this.errorMessageTextBox.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.errorMessageTextBox.Location = new System.Drawing.Point(0, 0);
-			this.errorMessageTextBox.Name = "errorMessageTextBox";
-			this.errorMessageTextBox.Size = new System.Drawing.Size(375, 326);
-			this.errorMessageTextBox.TabIndex = 0;
-			this.errorMessageTextBox.TabStop = false;
-			this.errorMessageTextBox.Text = "";
-			// 
-			// textBox
-			// 
-			this.textBox.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.textBox.Location = new System.Drawing.Point(0, 0);
-			this.textBox.Name = "textBox";
-			this.textBox.Size = new System.Drawing.Size(375, 326);
-			this.textBox.TabIndex = 2;
-			this.textBox.TabStop = false;
-			this.textBox.Text = "";
-			this.textBox.TextChanged += new System.EventHandler(this.TextBoxTextChanged);
-			// 
-			// XmlTreeViewContainerControl
-			// 
-			this.Controls.Add(this.splitContainer);
-			this.Name = "XmlTreeViewContainerControl";
-			this.Size = new System.Drawing.Size(562, 326);
-			this.splitContainer.Panel1.ResumeLayout(false);
-			this.splitContainer.Panel2.ResumeLayout(false);
-			this.splitContainer.ResumeLayout(false);
-			this.ResumeLayout(false);
-		}
-		private System.Windows.Forms.RichTextBox textBox;
-		private System.Windows.Forms.PropertyGrid attributesGrid;
-		private System.Windows.Forms.RichTextBox errorMessageTextBox;
-		private ICSharpCode.XmlEditor.XmlTreeViewControl xmlElementTreeView;
-		private System.Windows.Forms.SplitContainer splitContainer;
-		
-		#endregion
-
-		/// <summary>
-		/// This method is protected only so we can easily test
-		/// what happens when this method is called. Triggering
-		/// a TextChanged event is difficult to do from unit tests.
-		/// You can trigger it it by setting the textBox's Rtf property.
-		/// </summary>
-		protected void TextBoxTextChanged(object sender, EventArgs e)
-		{
-			if (editor != null) {
-				bool previousIsDirty = dirty;
-				editor.TextContentChanged();
-				OnXmlChanged(previousIsDirty);
-			}
-		}
-		
-		/// <summary>
-		/// This method is protected so we can test it.
-		/// </summary>
-		protected void XmlElementTreeViewAfterSelect(object sender, TreeViewEventArgs e)
-		{
-			editor.SelectedNodeChanged();
-		}
-		
-		/// <summary>
-		/// This method is protected so we can test it.
-		/// </summary>
-		protected void AttributesGridPropertyValueChanged(object s, PropertyValueChangedEventArgs e)
-		{
-			bool previousIsDirty = dirty;
-			editor.AttributeValueChanged();
-			OnXmlChanged(previousIsDirty);
-		}
-				
-		/// <summary>
-		/// Creates an image list that will be used for the XmlTreeViewControl.
-		/// </summary>
-		void InitImages()
-		{
-			if (components == null) {
-				components = new Container();
-			}
-			ImageList images = new ImageList(components);
-			
-			// Add xml element tree node images.
-			Image xmlElementImage = Image.FromStream(typeof(XmlTreeViewContainerControl).Assembly.GetManifestResourceStream("ICSharpCode.XmlEditor.Resources.XmlElementTreeNodeIcon.png"));
-			images.Images.Add(XmlElementTreeNode.XmlElementTreeNodeImageKey, xmlElementImage);
-			images.Images.Add(XmlElementTreeNode.XmlElementTreeNodeGhostImageKey, IconService.GetGhostBitmap(new Bitmap(xmlElementImage)));
-			
-			// Add text tree node images.
-			Image xmlTextImage = Image.FromStream(typeof(XmlTreeViewContainerControl).Assembly.GetManifestResourceStream("ICSharpCode.XmlEditor.Resources.XmlTextTreeNodeIcon.png"));
-			images.Images.Add(XmlTextTreeNode.XmlTextTreeNodeImageKey, xmlTextImage);
-			images.Images.Add(XmlTextTreeNode.XmlTextTreeNodeGhostImageKey, IconService.GetGhostBitmap(new Bitmap(xmlTextImage)));
-			
-			// Add comment tree node images.
-			Image xmlCommentImage = Image.FromStream(typeof(XmlTreeViewContainerControl).Assembly.GetManifestResourceStream("ICSharpCode.XmlEditor.Resources.XmlCommentTreeNodeIcon.png"));
-			images.Images.Add(XmlCommentTreeNode.XmlCommentTreeNodeImageKey, xmlCommentImage);
-			images.Images.Add(XmlCommentTreeNode.XmlCommentTreeNodeGhostImageKey, IconService.GetGhostBitmap(new Bitmap(xmlCommentImage)));
-
-			xmlElementTreeView.ImageList = images;
-		}
-		
-		/// <summary>
-		/// Raises the dirty changed event if the dirty flag has changed.
-		/// </summary>
-		void OnXmlChanged(bool previousIsDirty)
-		{
-			if (previousIsDirty != dirty) {
-				OnDirtyChanged();
-			}
-		}
-		
-		/// <summary>
-		/// Raises the DirtyChanged event.
-		/// </summary>
-		void OnDirtyChanged()
-		{
-			if (DirtyChanged != null) {
-				DirtyChanged(this, new EventArgs());
-			}
-		}
-		
-		/// <summary>
-		/// Gets or sets whether the attributes grid is visible.
-		/// </summary>
-		bool IsAttributesGridVisible {
-			get {
-				return attributesGridVisible;
-			}
-			set {
-				attributesGridVisible = value;
-				if (value) {
-					attributesGrid.BringToFront();
-					attributesGrid.TabStop = true;
-					IsTextBoxVisible = false;
-					IsErrorMessageTextBoxVisible = false;
-				} else {
-					attributesGrid.SendToBack();
-					attributesGrid.TabStop = false;
-				}
-			}
-		}
-		
-		/// <summary>
-		/// Gets or sets whether the text node text box is visible.
-		/// </summary>
-		bool IsTextBoxVisible {
-			set {
-				textBoxVisible = value;
-				if (value) {
-					textBox.BringToFront();
-					textBox.TabStop = true;
-					IsAttributesGridVisible = false;
-					IsErrorMessageTextBoxVisible = false;
-				} else {
-					textBox.SendToBack();
-					textBox.TabStop = false;
-				}
-			}
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlTreeViewControl.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlTreeViewControl.cs
deleted file mode 100644
index f9d8a62a86..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlTreeViewControl.cs
+++ /dev/null
@@ -1,578 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.ComponentModel;
-using System.Windows.Forms;
-using System.Xml;
-
-using ICSharpCode.Core;
-using ICSharpCode.SharpDevelop.Gui;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Displays a tree of XML elements. This is a separate control so it can
-	/// be unit tested. It has no SharpDevelop specific parts, for example,
-	/// the context menus are defined in the XmlTreeViewContainerControl.
-	/// </summary>
-	public class XmlTreeViewControl : ExtTreeView
-	{			
-		const string ViewStatePropertyName = "XmlTreeViewControl.ViewState";
-
-		XmlDocument document;
-
-		enum InsertionMode {
-			Before = 0,
-			After = 1
-		}
-		
-		/// <summary>
-		/// Raised when the delete key is pressed.
-		/// </summary>
-		public event EventHandler DeleteKeyPressed;
-		
-		public XmlTreeViewControl()
-		{
-		}
-		
-		/// <summary>
-		/// Gets or sets the xml document currently being displayed.
-		/// </summary>
-		[Browsable(false)]
-		public XmlDocument Document {
-			get {
-				return document;
-			}
-			set {
-				document = value;
-				
-				// Update display.
-				BeginUpdate();
-				try {
-					ShowDocument();
-				} finally {
-					EndUpdate();
-				}
-			}
-		}
-		
-		/// <summary>
-		/// Gets the selected element in the tree.
-		/// </summary>
-		public XmlElement SelectedElement {
-			get {
-				XmlElementTreeNode xmlElementTreeNode = SelectedElementNode;
-				if (xmlElementTreeNode != null) {
-					return xmlElementTreeNode.XmlElement;
-				}
-				return null;
-			}
-		}
-		
-		/// <summary>
-		/// Determines whether an element is selected in the tree.
-		/// </summary>
-		public bool IsElementSelected {
-			get {
-				return SelectedElement != null;
-			}
-		}
-		
-		/// <summary>
-		/// Gets the selected text node in the tree.
-		/// </summary>
-		public XmlText SelectedTextNode {
-			get {				
-				XmlTextTreeNode xmlTextTreeNode = SelectedNode as XmlTextTreeNode;
-				if (xmlTextTreeNode != null) {
-					return xmlTextTreeNode.XmlText;
-				}
-				return null;
-			}
-		}
-				
-		/// <summary>
-		/// Gets the selected comment node in the tree.
-		/// </summary>
-		public XmlComment SelectedComment {
-			get {				
-				XmlCommentTreeNode commentTreeNode = SelectedNode as XmlCommentTreeNode;
-				if (commentTreeNode != null) {
-					return commentTreeNode.XmlComment;
-				}
-				return null;
-			}
-		}
-		
-		/// <summary>
-		/// Determines whether a text node is selected in the tree.
-		/// </summary>
-		public bool IsTextNodeSelected {
-			get {
-				return SelectedTextNode != null;
-			}
-		}
-		
-		/// <summary>
-		/// Saves the current state of the tree.
-		/// </summary>
-		public void SaveViewState(Properties properties)
-		{
-			properties.Set(ViewStatePropertyName, TreeViewHelper.GetViewStateString(this));
-		}
-		
-		/// <summary>
-		/// Restores the node state of the tree.
-		/// </summary>
-		public void RestoreViewState(Properties properties)
-		{
-			TreeViewHelper.ApplyViewStateString(properties.Get(ViewStatePropertyName, String.Empty), this);
-		}
-		
-		/// <summary>
-		/// Appends a new child element to the currently selected node.
-		/// </summary>
-		public void AppendChildElement(XmlElement element)
-		{
-			XmlElementTreeNode selectedNode = SelectedElementNode;
-			if (selectedNode != null) {
-				XmlElementTreeNode newNode = new XmlElementTreeNode(element);
-				newNode.AddTo(selectedNode);
-				selectedNode.Expand();
-			}
-		}
-		
-		/// <summary>
-		/// Appends a new child text node to the currently selected element.
-		/// </summary>
-		public void AppendChildTextNode(XmlText textNode)
-		{
-			XmlElementTreeNode selectedNode = SelectedElementNode;
-			if (selectedNode != null) {
-				XmlTextTreeNode newNode = new XmlTextTreeNode(textNode);
-				newNode.AddTo(selectedNode);
-				selectedNode.Expand();
-			}
-		}
-		
-		/// <summary>
-		/// Inserts a new element node before the currently selected
-		/// node.
-		/// </summary>
-		public void InsertElementBefore(XmlElement element)
-		{
-			InsertElement(element, InsertionMode.Before);
-		}
-		
-		/// <summary>
-		/// Inserts a new element node after the currently selected
-		/// node.
-		/// </summary>
-		public void InsertElementAfter(XmlElement element)
-		{
-			InsertElement(element, InsertionMode.After);
-		}
-		
-		/// <summary>
-		/// Removes the specified element from the tree.
-		/// </summary>
-		public void RemoveElement(XmlElement element)
-		{
-			XmlElementTreeNode node = FindElement(element);
-			if (node != null) {
-				node.Remove();
-			}
-		}
-		
-		/// <summary>
-		/// Removes the specified text node from the tree.
-		/// </summary>
-		public void RemoveTextNode(XmlText textNode)
-		{
-			XmlTextTreeNode node = FindTextNode(textNode);
-			if (node != null) {
-				node.Remove();
-			}
-		}
-		
-		/// <summary>
-		/// Inserts a text node before the currently selected
-		/// node.
-		/// </summary>
-		public void InsertTextNodeBefore(XmlText textNode)
-		{
-			InsertTextNode(textNode, InsertionMode.Before);
-		}
-		
-		/// <summary>
-		/// Inserts a text node after the currently selected
-		/// node.
-		/// </summary>
-		public void InsertTextNodeAfter(XmlText textNode)
-		{
-			InsertTextNode(textNode, InsertionMode.After);
-		}
-		
-		/// <summary>
-		/// Updates the corresponding tree node's text based on 
-		/// the textNode's value.
-		/// </summary>
-		public void UpdateTextNode(XmlText textNode)
-		{
-			XmlTextTreeNode node = FindTextNode(textNode);
-			if (node != null) {
-				node.Update();
-			}
-		}
-				
-		/// <summary>
-		/// Updates the corresponding tree node's text based on 
-		/// the comment's value.
-		/// </summary>
-		public void UpdateComment(XmlComment comment)
-		{
-			XmlCommentTreeNode node = FindComment(comment);
-			if (node != null) {
-				node.Update();
-			}
-		}
-		
-		/// <summary>
-		/// Appends a new child comment node to the currently selected element.
-		/// </summary>
-		public void AppendChildComment(XmlComment comment)
-		{
-			XmlElementTreeNode selectedNode = SelectedElementNode;
-			if (selectedNode != null) {
-				XmlCommentTreeNode newNode = new XmlCommentTreeNode(comment);
-				newNode.AddTo(selectedNode);
-				selectedNode.Expand();
-			}
-		}
-		
-		/// <summary>
-		/// Removes the specified comment from the tree.
-		/// </summary>
-		public void RemoveComment(XmlComment comment)
-		{
-			XmlCommentTreeNode node = FindComment(comment);
-			if (node != null) {
-				node.Remove();
-			}
-		}
-		
-		/// <summary>
-		/// Inserts a comment node before the currently selected
-		/// node.
-		/// </summary>
-		public void InsertCommentBefore(XmlComment comment)
-		{
-			InsertComment(comment, InsertionMode.Before);
-		}
-		
-		/// <summary>
-		/// Inserts a comment node after the currently selected
-		/// node.
-		/// </summary>
-		public void InsertCommentAfter(XmlComment comment)
-		{
-			InsertComment(comment, InsertionMode.After);
-		}
-		
-		/// <summary>
-		/// Updates the image so the corresponding tree node shows that
-		/// it is in the process of being cut.
-		/// </summary>
-		public void ShowCut(XmlNode node)
-		{
-			ShowCut(node, true);
-		}
-		
-		/// <summary>
-		/// Updates the image so the corresponding tree node no longer
-		/// shows it is in the process of being cut.
-		/// </summary>
-		public void HideCut(XmlNode node)
-		{
-			ShowCut(node, false);
-		}
-		
-		/// <summary>
-		/// If no node is selected after a mouse click then we make 
-		/// sure the AfterSelect event is fired. Standard behaviour is
-		/// for the AfterSelect event not to be fired when the user
-		/// deselects all tree nodes.
-		/// </summary>
-		protected override void OnMouseDown(MouseEventArgs e)
-		{
-			base.OnMouseDown(e);
-			if (SelectedNode == null) {
-				this.OnAfterSelect(new TreeViewEventArgs(null, TreeViewAction.ByMouse));
-			}
-		}
-		
-		/// <summary>
-		/// Raises the DeleteKeyPressed event.
-		/// </summary>
-		protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
-		{
-			if (keyData == Keys.Delete && DeleteKeyPressed != null) {
-				DeleteKeyPressed(this, new EventArgs());
-			}
-			return base.ProcessCmdKey(ref msg, keyData);
-		}
-
-		/// <summary>
-		/// Displays the document in the xml tree.
-		/// </summary>
-		void ShowDocument()
-		{
-			Nodes.Clear();
-			if (document != null) {
-				foreach (XmlNode node in document.ChildNodes) {
-					switch (node.NodeType) {
-						case XmlNodeType.Element:
-							XmlElementTreeNode elementNode = new XmlElementTreeNode((XmlElement)node);
-							elementNode.AddTo(this);
-							break;
-						case XmlNodeType.Comment:
-							XmlCommentTreeNode commentNode = new XmlCommentTreeNode((XmlComment)node);
-							commentNode.AddTo(this);
-							break;
-					}
-				}
-			}
-		}
-		
-		/// <summary>
-		/// Returns the selected xml element tree node.
-		/// </summary>
-		XmlElementTreeNode SelectedElementNode {
-			get {
-				return SelectedNode as XmlElementTreeNode;
-			}
-		}
-		
-		/// <summary>
-		/// Inserts a new element node either before or after the 
-		/// currently selected element node.
-		/// </summary>
-		void InsertElement(XmlElement element, InsertionMode insertionMode)
-		{
-			ExtTreeNode selectedNode = (ExtTreeNode)SelectedNode;
-			if (selectedNode != null) {
-				XmlElementTreeNode parentNode = (XmlElementTreeNode)selectedNode.Parent;
-				XmlElementTreeNode newNode = new XmlElementTreeNode(element);
-				int index = parentNode.Nodes.IndexOf(selectedNode);
-				if (insertionMode == InsertionMode.After) {
-					index++;
-				}
-				newNode.Insert(index, parentNode);
-			}
-		}
-		
-		/// <summary>
-		/// Inserts a new text node either before or after the 
-		/// currently selected node.
-		/// </summary>
-		void InsertTextNode(XmlText textNode, InsertionMode insertionMode)
-		{
-			ExtTreeNode selectedNode = (ExtTreeNode)SelectedNode;
-			if (selectedNode != null) {
-				XmlElementTreeNode parentNode = (XmlElementTreeNode)selectedNode.Parent;
-				XmlTextTreeNode newNode = new XmlTextTreeNode(textNode);
-				int index = parentNode.Nodes.IndexOf(selectedNode);
-				if (insertionMode == InsertionMode.After) {
-					index++;
-				}
-				newNode.Insert(index, parentNode);
-			}
-		}
-		
-		/// <summary>
-		/// Inserts a new comment node either before or after the 
-		/// currently selected node.
-		/// </summary>
-		void InsertComment(XmlComment comment, InsertionMode insertionMode)
-		{
-			ExtTreeNode selectedNode = (ExtTreeNode)SelectedNode;
-			if (selectedNode != null) {
-				ExtTreeNode parentNode = (ExtTreeNode)selectedNode.Parent;
-				XmlCommentTreeNode newNode = new XmlCommentTreeNode(comment);
-				int index = 0;
-				if (parentNode != null) {
-					index = parentNode.Nodes.IndexOf(selectedNode);
-				} else {
-					index = Nodes.IndexOf(selectedNode);
-				}
-				if (insertionMode == InsertionMode.After) {
-					index++;
-				}
-				if (parentNode != null) {
-					newNode.Insert(index, parentNode);
-				} else {
-					newNode.Insert(index, this);
-				}
-			}
-		}
-		
-		/// <summary>
-		/// Looks at all the nodes in the tree view and returns the
-		/// tree node that represents the specified element.
-		/// </summary>
-		XmlElementTreeNode FindElement(XmlElement element, TreeNodeCollection nodes)
-		{
-			foreach (ExtTreeNode node in nodes) {
-				XmlElementTreeNode elementTreeNode = node as XmlElementTreeNode;
-				if (elementTreeNode != null) {
-					if (elementTreeNode.XmlElement == element) {
-						return elementTreeNode;
-					}
-					
-					// Look for a match in the element's child nodes.
-					XmlElementTreeNode childElementTreeNode = FindElement(element, elementTreeNode.Nodes);
-					if (childElementTreeNode != null) {
-						return childElementTreeNode;
-					}
-				}
-			}
-			return null;
-		}
-		
-		/// <summary>
-		/// Finds the corresponding XmlElementTreeNode.
-		/// </summary>
-		XmlElementTreeNode FindElement(XmlElement element)
-		{
-			XmlElementTreeNode selectedElementTreeNode = SelectedNode as XmlElementTreeNode;
-			if (selectedElementTreeNode != null && selectedElementTreeNode.XmlElement == element) {
-				return selectedElementTreeNode;
-			} else {
-				return FindElement(element, Nodes);
-			}
-		}
-		
-		/// <summary>
-		/// Looks at all the nodes in the tree view and returns the
-		/// tree node that represents the specified text node.
-		/// </summary>
-		XmlTextTreeNode FindTextNode(XmlText textNode, TreeNodeCollection nodes)
-		{
-			foreach (ExtTreeNode node in nodes) {
-				XmlTextTreeNode textTreeNode = node as XmlTextTreeNode;
-				if (textTreeNode != null) {
-					if (textTreeNode.XmlText == textNode) {
-						return textTreeNode;
-					}
-				} else {
-					// Look for a match in the node's child nodes.
-					XmlTextTreeNode childTextTreeNode = FindTextNode(textNode, node.Nodes);
-					if (childTextTreeNode != null) {
-						return childTextTreeNode;
-					}
-				}
-			}
-			return null;
-		}
-		
-		/// <summary>
-		/// Finds the specified text node in the tree.
-		/// </summary>
-		XmlTextTreeNode FindTextNode(XmlText textNode)
-		{
-			XmlTextTreeNode selectedTextTreeNode = SelectedNode as XmlTextTreeNode;
-			if (selectedTextTreeNode != null && selectedTextTreeNode.XmlText == textNode) {
-				return selectedTextTreeNode;
-			} else {
-				return FindTextNode(textNode, Nodes);
-			}
-		}
-		
-		/// <summary>
-		/// Looks at all the nodes in the tree view and returns the
-		/// tree node that represents the specified comment node.
-		/// </summary>
-		XmlCommentTreeNode FindComment(XmlComment comment, TreeNodeCollection nodes)
-		{
-			foreach (ExtTreeNode node in nodes) {
-				XmlCommentTreeNode commentTreeNode = node as XmlCommentTreeNode;
-				if (commentTreeNode != null) {
-					if (commentTreeNode.XmlComment == comment) {
-						return commentTreeNode;
-					}
-				} else {
-					// Look for a match in the node's child nodes.
-					XmlCommentTreeNode childCommentTreeNode = FindComment(comment, node.Nodes);
-					if (childCommentTreeNode != null) {
-						return childCommentTreeNode;
-					}
-				}
-			}
-			return null;
-		}
-		
-		/// <summary>
-		/// Locates the specified comment in the tree.
-		/// </summary>
-		XmlCommentTreeNode FindComment(XmlComment comment)
-		{
-			XmlCommentTreeNode selectedCommentTreeNode = SelectedNode as XmlCommentTreeNode;
-			if (selectedCommentTreeNode != null && selectedCommentTreeNode.XmlComment == comment) {
-				return selectedCommentTreeNode;
-			} else {
-				return FindComment(comment, Nodes);
-			}
-		}
-		
-		/// <summary>
-		/// Shows the corresponding tree node with the ghosted image 
-		/// that indicates it is being cut.
-		/// </summary>
-		void ShowCutElement(XmlElement element, bool showGhostImage)
-		{
-			XmlElementTreeNode node = FindElement(element);
-			node.ShowGhostImage = showGhostImage;
-		}
-		
-		/// <summary>
-		/// Shows the corresponding tree node with the ghosted image 
-		/// that indicates it is being cut.
-		/// </summary>
-		void ShowCutTextNode(XmlText textNode, bool showGhostImage)
-		{
-			XmlTextTreeNode node = FindTextNode(textNode);
-			node.ShowGhostImage = showGhostImage;
-		}
-				
-		/// <summary>
-		/// Shows the corresponding tree node with the ghosted image 
-		/// that indicates it is being cut.
-		/// </summary>
-		void ShowCutComment(XmlComment comment, bool showGhostImage)
-		{
-			XmlCommentTreeNode node = FindComment(comment);
-			node.ShowGhostImage = showGhostImage;
-		}
-		
-		/// <summary>
-		/// Shows the cut node with a ghost image.
-		/// </summary>
-		/// <param name="showGhostImage">True if the node should be
-		/// shown with the ghost image.</param>
-		void ShowCut(XmlNode node, bool showGhostImage)
-		{
-			if (node is XmlElement) {
-				ShowCutElement((XmlElement)node, showGhostImage);
-			} else if (node is XmlText) {
-				ShowCutTextNode((XmlText)node, showGhostImage);
-			} else if (node is XmlComment) {
-				ShowCutComment((XmlComment)node, showGhostImage);
-			}
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlView.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlView.cs
deleted file mode 100644
index 1d21d9c50a..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlView.cs
+++ /dev/null
@@ -1,1313 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Drawing.Printing;
-using System.IO;
-using System.Net;
-using System.Text;
-using System.Windows.Forms;
-using System.Xml;
-using System.Xml.Schema;
-using System.Xml.XPath;
-using System.Xml.Xsl;
-
-using ICSharpCode.Core;
-using ICSharpCode.Core.WinForms;
-using ICSharpCode.SharpDevelop;
-using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
-using ICSharpCode.SharpDevelop.Dom;
-using ICSharpCode.SharpDevelop.Editor;
-using ICSharpCode.SharpDevelop.Gui;
-using ICSharpCode.TextEditor;
-using ICSharpCode.TextEditor.Actions;
-using ICSharpCode.TextEditor.Document;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Wrapper class for the XmlEditor used when displaying the xml file.
-	/// </summary>
-	public class XmlView : AbstractViewContent, IEditable, IClipboardHandler, IParseInformationListener, IMementoCapable, IPrintable, ITextEditorControlProvider, IPositionable, IUndoHandler
-	{
-		/// <summary>
-		/// The language handled by this view.
-		/// </summary>
-		public static readonly string Language = "XML";
-		
-		/// <summary>
-		/// Output window category name.
-		/// </summary>
-		public static readonly string CategoryName = "XML";
-
-		/// <summary>
-		/// Edit actions addin tree path for the xml editor control.
-		/// </summary>
-		static readonly string editActionsPath = "/AddIns/XmlEditor/EditActions";
-		
-		/// <summary>
-		/// Right click menu addin tree path for the xml editor control.
-		/// </summary>
-		static readonly string contextMenuPath = "/SharpDevelop/ViewContent/XmlEditor/ContextMenu";
-
-		XmlEditorControl xmlEditor;
-		static MessageViewCategory category;
-		string stylesheetFileName;
-		XmlTreeView xmlTreeView;
-		bool isInUnitTest;
-		
-		/// <summary>
-		/// Sets the primary file. Public because it is used by some unit tests.
-		/// </summary>
-		public void SetPrimaryFileUnitTestMode(OpenedFile file)
-		{
-			if (PrimaryFile != null)
-				throw new InvalidOperationException("primary file is already set");
-			
-			isInUnitTest = true;
-			
-			this.Files.Add(file);
-			OnFileNameChanged(file);
-			file.ForceInitializeView(this);
-		}
-		
-		public XmlView(OpenedFile file)
-			: this()
-		{
-			this.Files.Add(file);
-			OnFileNameChanged(file);
-			file.ForceInitializeView(this);
-			
-			xmlTreeView = new XmlTreeView(this);
-			SecondaryViewContents.Add(xmlTreeView);
-		}
-		
-		public XmlView()
-			: this(SharpDevelopTextEditorProperties.Instance, XmlSchemaManager.SchemaCompletionDataItems)
-		{
-			xmlEditor.AddEditActions(GetEditActions());
-			xmlEditor.TextAreaContextMenuStrip = MenuService.CreateContextMenu(xmlEditor, contextMenuPath);
-			
-			// Add event handlers so we can update the status bar when
-			// the cursor position changes.
-			xmlEditor.ActiveTextAreaControl.Caret.CaretModeChanged += CaretModeChanged;
-			xmlEditor.ActiveTextAreaControl.Caret.PositionChanged += CaretChanged;
-			xmlEditor.ActiveTextAreaControl.Enter += CaretUpdate;
-			
-			// Listen for changes to the xml editor properties.
-			XmlEditorAddInOptions.PropertyChanged += PropertyChanged;
-			XmlSchemaManager.UserSchemaAdded += UserSchemaAdded;
-			XmlSchemaManager.UserSchemaRemoved += UserSchemaRemoved;
-		}
-		
-		/// <summary>
-		/// Creates an XmlView that is independent of SharpDevelop. This
-		/// constructor does rely on SharpDevelop being available and is
-		/// only used for testing the XmlView.
-		/// </summary>
-		public XmlView(ITextEditorProperties textEditorProperties, XmlSchemaCompletionDataCollection schemas)
-		{
-			this.TabPageText = "XML";
-			
-			TextEditorDisplayBinding.InitializeSyntaxModes();
-			
-			xmlEditor = new XmlEditorControl();
-			xmlEditor.Dock = DockStyle.Fill;
-			
-			xmlEditor.TextEditorProperties = textEditorProperties;
-			xmlEditor.SchemaCompletionDataItems = schemas;
-			xmlEditor.Document.DocumentChanged += DocumentChanged;
-		}
-
-		/// <summary>
-		/// Gets the active XmlView.
-		/// </summary>
-		/// <returns><see langword="null"/> if the active view is not an XmlView.</returns>
-		public static XmlView ActiveXmlView {
-			get {
-				IWorkbench workbench = WorkbenchSingleton.Workbench;
-				if (workbench != null) {
-					IWorkbenchWindow window = workbench.ActiveWorkbenchWindow;
-					if (window != null) {
-						return window.ActiveViewContent as XmlView;
-					}
-				}
-				return null;
-			}
-		}
-		
-		/// <summary>
-		/// Gets whether the active view is an XmlView.
-		/// </summary>
-		public static bool IsXmlViewActive {
-			get {
-				return ActiveXmlView != null;
-			}
-		}
-		
-		public XmlEditorControl XmlEditor {
-			get {
-				return xmlEditor;
-			}
-		}
-		
-		public override bool IsReadOnly {
-			get {
-				return xmlEditor.IsReadOnly;
-			}
-		}
-		
-		/// <summary>
-		/// Loads the string content into the view.
-		/// </summary>
-		public void LoadContent(string content)
-		{
-			xmlEditor.Document.TextContent = StringParser.Parse(content);
-			xmlEditor.Document.HighlightingStrategy = HighlightingStrategyFactory.CreateHighlightingStrategy(XmlView.Language);
-			UpdateFolding();
-		}
-		
-		/// <summary>
-		/// Can create content for the 'XML' language.
-		/// </summary>
-		public static bool IsLanguageHandled(string language)
-		{
-			return language == XmlView.Language;
-		}
-		
-		/// <summary>
-		/// Returns whether the view can handle the specified file.
-		/// </summary>
-		public static bool IsFileNameHandled(string fileName)
-		{
-			return IsXmlFileExtension(Path.GetExtension(fileName));
-		}
-		
-		/// <summary>
-		/// Gets the known xml file extensions.
-		/// </summary>
-		public static string[] GetXmlFileExtensions()
-		{
-			foreach (ParserDescriptor parser in AddInTree.BuildItems<ParserDescriptor>("/Workspace/Parser", null, false)) {
-				if (parser.Codon.Id == "XmlFoldingParser") {
-					return parser.Supportedextensions;
-				}
-			}
-
-			// Did not find the XmlFoldingParser so default to those files defined by the
-			// HighlightingManager.
-			IHighlightingStrategy strategy = HighlightingManager.Manager.FindHighlighter(XmlView.Language);
-			if (strategy != null) {
-				return strategy.Extensions;
-			}
-			
-			return new string[0];
-		}
-		
-		/// <summary>
-		/// Finds the xml nodes that match the specified xpath.
-		/// </summary>
-		/// <returns>An array of XPathNodeMatch items. These include line number
-		/// and line position information aswell as the node found.</returns>
-		public static XPathNodeMatch[] SelectNodes(string xml, string xpath, ReadOnlyCollection<XmlNamespace> namespaces)
-		{
-			XmlTextReader xmlReader = new XmlTextReader(new StringReader(xml));
-			xmlReader.XmlResolver = null;
-			XPathDocument doc = new XPathDocument(xmlReader);
-			XPathNavigator navigator = doc.CreateNavigator();
-			
-			// Add namespaces.
-			XmlNamespaceManager namespaceManager = new XmlNamespaceManager(navigator.NameTable);
-			foreach (XmlNamespace xmlNamespace in namespaces) {
-				namespaceManager.AddNamespace(xmlNamespace.Prefix, xmlNamespace.Uri);
-			}
-			
-			// Run the xpath query.
-			XPathNodeIterator iterator = navigator.Select(xpath, namespaceManager);
-			
-			List<XPathNodeMatch> nodes = new List<XPathNodeMatch>();
-			while (iterator.MoveNext()) {
-				nodes.Add(new XPathNodeMatch(iterator.Current));
-			}
-			return nodes.ToArray();
-		}
-		
-		/// <summary>
-		/// Finds the xml nodes that match the specified xpath.
-		/// </summary>
-		/// <returns>An array of XPathNodeMatch items. These include line number
-		/// and line position information aswell as the node found.</returns>
-		public static XPathNodeMatch[] SelectNodes(string xml, string xpath)
-		{
-			List<XmlNamespace> list = new List<XmlNamespace>();
-			return SelectNodes(xml, xpath, new ReadOnlyCollection<XmlNamespace>(list));
-		}
-		
-		/// <summary>
-		/// Finds the xml nodes in the current document that match the specified xpath.
-		/// </summary>
-		/// <returns>An array of XPathNodeMatch items. These include line number
-		/// and line position information aswell as the node found.</returns>
-		public XPathNodeMatch[] SelectNodes(string xpath, ReadOnlyCollection<XmlNamespace> namespaces)
-		{
-			return SelectNodes(Text, xpath, namespaces);
-		}
-		
-		/// <summary>
-		/// Gets the XmlSchemaObject that defines the currently selected xml element or
-		/// attribute.
-		/// </summary>
-		/// <param name="text">The complete xml text.</param>
-		/// <param name="index">The current cursor index.</param>
-		/// <param name="provider">The completion data provider</param>
-		public static XmlSchemaObject GetSchemaObjectSelected(string xml, int index, XmlCompletionDataProvider provider)
-		{
-			return GetSchemaObjectSelected(xml, index, provider, null);
-		}
-		
-		/// <summary>
-		/// Gets the XmlSchemaObject that defines the currently selected xml element or
-		/// attribute.
-		/// </summary>
-		/// <param name="text">The complete xml text.</param>
-		/// <param name="index">The current cursor index.</param>
-		/// <param name="provider">The completion data provider</param>
-		/// <param name="currentSchemaCompletionData">This is the schema completion data for the
-		/// schema currently being displayed. This can be null if the document is
-		/// not a schema.</param>
-		public static XmlSchemaObject GetSchemaObjectSelected(string xml, int index, XmlCompletionDataProvider provider, XmlSchemaCompletionData currentSchemaCompletionData)
-		{
-			// Find element under cursor.
-			XmlElementPath path = XmlParser.GetActiveElementStartPathAtIndex(xml, index);
-			string attributeName = XmlParser.GetAttributeNameAtIndex(xml, index);
-			
-			// Find schema definition object.
-			XmlSchemaCompletionData schemaCompletionData = provider.FindSchema(path);
-			XmlSchemaObject schemaObject = null;
-			if (schemaCompletionData != null) {
-				XmlSchemaElement element = schemaCompletionData.FindElement(path);
-				schemaObject = element;
-				if (element != null) {
-					if (attributeName.Length > 0) {
-						XmlSchemaAttribute attribute = schemaCompletionData.FindAttribute(element, attributeName);
-						if (attribute != null) {
-							if (currentSchemaCompletionData != null) {
-								schemaObject = GetSchemaObjectReferenced(xml, index, provider, currentSchemaCompletionData, element, attribute);
-							} else {
-								schemaObject = attribute;
-							}
-						}
-					}
-					return schemaObject;
-				}
-			}
-			return null;
-		}
-		
-		/// <summary>
-		/// Validates the xml against known schemas.
-		/// </summary>
-		public void ValidateXml()
-		{
-			TaskService.ClearExceptCommentTasks();
-			Category.ClearText();
-			ShowOutputWindow();
-			
-			OutputWindowWriteLine(StringParser.Parse("${res:MainWindow.XmlValidationMessages.ValidationStarted}"));
-
-			if (IsSchema) {
-				if (!ValidateSchema()) {
-					return;
-				}
-			} else {
-				if (!ValidateAgainstSchema()) {
-					return;
-				}
-			}
-			
-			OutputWindowWriteLine(String.Empty);
-			OutputWindowWriteLine(StringParser.Parse("${res:MainWindow.XmlValidationMessages.ValidationSuccess}"));
-		}
-		
-		public override void Dispose()
-		{
-			base.Dispose();
-			XmlEditorAddInOptions.PropertyChanged -= PropertyChanged;
-			XmlSchemaManager.UserSchemaAdded -= UserSchemaAdded;
-			XmlSchemaManager.UserSchemaRemoved -= UserSchemaRemoved;
-			xmlEditor.Dispose();
-		}
-		
-		
-		protected override void OnFileNameChanged(OpenedFile file)
-		{
-			base.OnFileNameChanged(file);
-			
-			string oldFileName = xmlEditor.FileName;
-			string newFileName = file.FileName;
-			
-			string extension = Path.GetExtension(newFileName);
-			if (Path.GetExtension(oldFileName) != extension) {
-				if (xmlEditor.Document.HighlightingStrategy != null) {
-					if (XmlView.IsXmlFileExtension(extension)) {
-						xmlEditor.Document.HighlightingStrategy = HighlightingStrategyFactory.CreateHighlightingStrategy(XmlView.Language);
-					} else {
-						xmlEditor.Document.HighlightingStrategy = HighlightingStrategyFactory.CreateHighlightingStrategyForFile(newFileName);
-					}
-					xmlEditor.Refresh();
-				}
-			}
-			SetDefaultSchema(extension);
-			
-			xmlEditor.FileName = newFileName;
-		}
-		
-		/// <summary>
-		/// Gets or sets the stylesheet associated with this xml file.
-		/// </summary>
-		public string StylesheetFileName {
-			get {
-				return stylesheetFileName;
-			}
-			set {
-				stylesheetFileName = value;
-			}
-		}
-		
-		/// <summary>
-		/// Applys the stylesheet to the xml and displays the resulting output.
-		/// </summary>
-		public void RunXslTransform(string xsl)
-		{
-			try {
-				WorkbenchSingleton.Workbench.GetPad(typeof(CompilerMessageView)).BringPadToFront();
-				
-				TaskService.ClearExceptCommentTasks();
-				
-				if (IsWellFormed) {
-					if (IsValidXsl(xsl)) {
-						try {
-							string transformedXml = Transform(Text, xsl);
-							ShowTransformOutput(transformedXml);
-						} catch (XsltException ex) {
-							AddTask(GetFileNameFromInnerException(ex, StylesheetFileName), GetInnerExceptionErrorMessage(ex), ex.LineNumber - 1, ex.LinePosition - 1, TaskType.Error);
-						}
-					}
-				}
-				
-				ShowErrorList();				
-			} catch (Exception ex) {
-				MessageService.ShowError(ex);
-			}
-		}
-		
-		/// <summary>
-		/// Pretty prints the xml.
-		/// </summary>
-		public void FormatXml()
-		{
-			TaskService.ClearExceptCommentTasks();
-			
-			if (IsWellFormed) {
-				ReplaceAll(Text);
-			} else {
-				ShowErrorList();
-			}
-		}
-		
-		/// <summary>
-		/// Creates a schema based on the xml content.
-		/// </summary>
-		/// <returns>A set of generated schemas or null if the xml content is not
-		/// well formed.</returns>
-		public string[] InferSchema()
-		{
-			TaskService.ClearExceptCommentTasks();
-			if (IsWellFormed) {
-				try {
-					using (XmlTextReader reader = new XmlTextReader(new StringReader(Text))) {
-						XmlSchemaInference schemaInference = new XmlSchemaInference();
-						XmlSchemaSet schemaSet = schemaInference.InferSchema(reader);
-						return GetSchemas(schemaSet);
-					}
-				} catch (XmlSchemaInferenceException ex) {
-					AddTask(xmlEditor.FileName, ex.Message, ex.LinePosition, ex.LineNumber, TaskType.Error);
-				}
-			}
-			ShowErrorList();
-			return null;
-		}
-		
-		/// <summary>
-		/// Finds the definition of the xml element or attribute under the cursor
-		/// in the corresponding schema and then displays that schema and the definition
-		/// found.
-		/// </summary>
-		public void GoToSchemaDefinition()
-		{
-			// Find schema object for selected xml element or attribute.
-			XmlCompletionDataProvider provider = new XmlCompletionDataProvider(xmlEditor.SchemaCompletionDataItems, xmlEditor.DefaultSchemaCompletionData, xmlEditor.DefaultNamespacePrefix);
-			XmlSchemaCompletionData currentSchemaCompletionData = provider.FindSchemaFromFileName(PrimaryFileName);
-			XmlSchemaObject schemaObject = GetSchemaObjectSelected(Text, xmlEditor.ActiveTextAreaControl.Caret.Offset, provider, currentSchemaCompletionData);
-			
-			// Open schema.
-			if (schemaObject != null && schemaObject.SourceUri != null && schemaObject.SourceUri.Length > 0) {
-				string fileName = schemaObject.SourceUri.Replace("file:///", String.Empty);
-				FileService.JumpToFilePosition(fileName, schemaObject.LineNumber, schemaObject.LinePosition);
-			}
-		}
-		
-		/// <summary>
-		/// Checks that the xml is well formed. Any errors are displayed in the
-		/// errors list.
-		/// </summary>
-		public void CheckIsWellFormed()
-		{
-			TaskService.ClearExceptCommentTasks();
-			if (!IsWellFormed) {
-				ShowErrorList();
-			}
-		}
-		
-		/// <summary>
-		/// Replaces the entire text of the xml view with the xml in the
-		/// specified. The xml will be formatted.
-		/// </summary>
-		public void ReplaceAll(string xml)
-		{
-			string formattedXml = SimpleFormat(IndentedFormat(xml));
-			xmlEditor.Document.Replace(0, xmlEditor.Document.TextLength, formattedXml);
-			UpdateFolding();
-		}
-		
-		#region IEditable interface
-		
-		public IClipboardHandler ClipboardHandler {
-			get {
-				return this;
-			}
-		}
-		
-		public bool EnableUndo {
-			get {
-				return xmlEditor.EnableUndo;
-			}
-		}
-		
-		public bool EnableRedo {
-			get {
-				return xmlEditor.EnableRedo;
-			}
-		}
-		
-		// ParserUpdateThread uses the text property via IEditable, I had an exception
-		// because multiple threads were accessing the GapBufferStrategy at the same time.
-		internal string GetText()
-		{
-			return xmlEditor.Document.TextContent;
-		}
-		
-		internal void SetText(string value)
-		{
-			xmlEditor.Document.TextContent = value;
-		}
-		
-		public string Text {
-			get {
-				if (WorkbenchSingleton.InvokeRequired) {
-					return WorkbenchSingleton.SafeThreadFunction<string>(GetText);
-				} else {
-					return GetText();
-				}
-			}
-			set {
-				if (WorkbenchSingleton.InvokeRequired) {
-					WorkbenchSingleton.SafeThreadCall(SetText, value);
-				} else {
-					SetText(value);
-				}
-			}
-		}
-		
-		public void Redo()
-		{
-			xmlEditor.Redo();
-		}
-		
-		public void Undo()
-		{
-			xmlEditor.Undo();
-		}
-		
-		#endregion
-		
-		#region AbstractViewContent implementation
-		
-		public override object Control {
-			get {
-				return xmlEditor;
-			}
-		}
-		
-		public override void Load(OpenedFile file, Stream stream)
-		{
-			if (!file.IsUntitled) {
-				xmlEditor.IsReadOnly = IsFileReadOnly(file.FileName);
-			}
-			
-			xmlEditor.LoadFile(file.FileName, stream, false, true);
-			UpdateFolding();
-		}
-		
-		public override void Save(OpenedFile file, Stream stream)
-		{
-			xmlEditor.SaveFile(stream);
-		}
-		
-		public override INavigationPoint BuildNavPoint()
-		{
-			int line = Line;
-			LineSegment lineSegment = xmlEditor.Document.GetLineSegment(line);
-			string text = xmlEditor.Document.GetText(lineSegment);
-			return new TextNavigationPoint(PrimaryFileName, line, Column, text);
-		}
-		
-		#endregion
-		
-		#region IClipboardHandler interface
-
-		public bool EnableCut {
-			get {
-				return xmlEditor.ActiveTextAreaControl.TextArea.ClipboardHandler.EnableCut;
-			}
-		}
-		
-		public bool EnableCopy {
-			get {
-				return xmlEditor.ActiveTextAreaControl.TextArea.ClipboardHandler.EnableCopy;
-			}
-		}
-		
-		public bool EnablePaste {
-			get {
-				return xmlEditor.ActiveTextAreaControl.TextArea.ClipboardHandler.EnablePaste;
-			}
-		}
-		
-		public bool EnableDelete {
-			get {
-				return xmlEditor.ActiveTextAreaControl.TextArea.ClipboardHandler.EnableDelete;
-			}
-		}
-		
-		public bool EnableSelectAll {
-			get {
-				return xmlEditor.ActiveTextAreaControl.TextArea.ClipboardHandler.EnableSelectAll;
-			}
-		}
-		
-		public void SelectAll()
-		{
-			xmlEditor.ActiveTextAreaControl.TextArea.ClipboardHandler.SelectAll(null, EventArgs.Empty);
-		}
-		
-		public void Delete()
-		{
-			xmlEditor.ActiveTextAreaControl.TextArea.ClipboardHandler.Delete(null, EventArgs.Empty);
-		}
-		
-		public void Paste()
-		{
-			xmlEditor.ActiveTextAreaControl.TextArea.ClipboardHandler.Paste(null, EventArgs.Empty);
-		}
-		
-		public void Copy()
-		{
-			xmlEditor.ActiveTextAreaControl.TextArea.ClipboardHandler.Copy(null, EventArgs.Empty);
-		}
-		
-		public void Cut()
-		{
-			xmlEditor.ActiveTextAreaControl.TextArea.ClipboardHandler.Cut(null, EventArgs.Empty);
-		}
-		
-		#endregion
-		
-		#region IParseInformationListener interface
-		
-		public void ParseInformationUpdated(ParseInformation parseInfo)
-		{
-			WorkbenchSingleton.SafeThreadAsyncCall(UpdateFolding);
-		}
-		
-		#endregion
-		
-		#region IMementoCapable interface
-		
-		public void SetMemento(Properties properties)
-		{
-			xmlEditor.ActiveTextAreaControl.Caret.Position =  xmlEditor.Document.OffsetToPosition(Math.Min(xmlEditor.Document.TextLength, Math.Max(0, properties.Get("CaretOffset", xmlEditor.ActiveTextAreaControl.Caret.Offset))));
-
-			if (xmlEditor.Document.HighlightingStrategy.Name != properties.Get("HighlightingLanguage", xmlEditor.Document.HighlightingStrategy.Name)) {
-				IHighlightingStrategy highlightingStrategy = HighlightingStrategyFactory.CreateHighlightingStrategy(properties.Get("HighlightingLanguage", xmlEditor.Document.HighlightingStrategy.Name));
-				if (highlightingStrategy != null) {
-					xmlEditor.Document.HighlightingStrategy = highlightingStrategy;
-				}
-			}
-			xmlEditor.ActiveTextAreaControl.TextArea.TextView.FirstVisibleLine = properties.Get("VisibleLine", 0);
-			xmlEditor.Document.FoldingManager.DeserializeFromString(properties.Get("Foldings", String.Empty));
-		}
-		
-		public Properties CreateMemento()
-		{
-			Properties properties = new Properties();
-			properties.Set("CaretOffset", xmlEditor.ActiveTextAreaControl.Caret.Offset);
-			properties.Set("VisibleLine", xmlEditor.ActiveTextAreaControl.TextArea.TextView.FirstVisibleLine);
-			properties.Set("HighlightingLanguage", xmlEditor.Document.HighlightingStrategy.Name);
-			properties.Set("Foldings", xmlEditor.Document.FoldingManager.SerializeToString());
-			return properties;
-		}
-		
-		#endregion
-		
-		#region IPrintable interface
-		
-		public PrintDocument PrintDocument{
-			get {
-				return xmlEditor.PrintDocument;
-			}
-		}
-		
-		#endregion
-		
-		#region ITextEditorControlProvider interface
-		
-		public TextEditorControl TextEditorControl {
-			get {
-				return xmlEditor;
-			}
-		}
-		
-		public ITextEditor TextEditor {
-			get {
-				return new TextEditorAdapter(xmlEditor);
-			}
-		}
-		
-		public ICSharpCode.SharpDevelop.Editor.IDocument GetDocumentForFile(OpenedFile file)
-		{
-			if (file == this.PrimaryFile) {
-				return new ICSharpCode.SharpDevelop.Refactoring.TextEditorDocument(this.TextEditorControl.Document);
-			} else {
-				return null;
-			}
-		}
-		
-		#endregion
-		
-		#region IPositionable interface
-
-		/// <summary>
-		/// Moves the cursor to the specified line and column.
-		/// </summary>
-		public void JumpTo(int line, int column)
-		{
-			xmlEditor.ActiveTextAreaControl.JumpTo(line, column);
-		}
-		
-		public int Line {
-			get {
-				return xmlEditor.ActiveTextAreaControl.Caret.Line;
-			}
-		}
-		
-		public int Column {
-			get {
-				return xmlEditor.ActiveTextAreaControl.Caret.Column;
-			}
-		}
-
-		#endregion
-
-		static bool IsFileReadOnly(string fileName)
-		{
-			return (File.GetAttributes(fileName) & FileAttributes.ReadOnly) == FileAttributes.ReadOnly;
-		}
-		
-		/// <summary>
-		/// Checks that the file extension refers to an xml file as
-		/// specified in the SyntaxModes.xml file.
-		/// </summary>
-		static bool IsXmlFileExtension(string extension)
-		{
-			foreach (string currentExtension in GetXmlFileExtensions()) {
-				if (String.Compare(extension, currentExtension, true) == 0) {
-					return true;
-				}
-			}
-			return false;
-		}
-		
-		/// <summary>
-		/// Forces the editor to update its folds.
-		/// </summary>
-		void UpdateFolding()
-		{
-			xmlEditor.Document.FoldingManager.UpdateFoldings(String.Empty, null);
-			RefreshMargin();
-		}
-		
-		/// <summary>
-		/// Repaints the folds in the margin.
-		/// </summary>
-		void RefreshMargin()
-		{
-			if (isInUnitTest) // SafeThreadAsyncCall doesn't work in unit testing
-				return;
-			WorkbenchSingleton.SafeThreadAsyncCall(xmlEditor.ActiveTextAreaControl.TextArea.Refresh,
-			                                       xmlEditor.ActiveTextAreaControl.TextArea.FoldMargin);
-		}
-		
-		/// <summary>
-		/// Sets the dirty flag since the document has changed.
-		/// </summary>
-		void DocumentChanged(object sender, DocumentEventArgs e)
-		{
-			if (PrimaryFile != null) {
-				PrimaryFile.MakeDirty();
-			}
-		}
-		
-		/// <summary>
-		/// Updates the line, col, overwrite/insert mode in the status bar.
-		/// </summary>
-		void CaretUpdate(object sender, EventArgs e)
-		{
-			CaretChanged(sender, e);
-			CaretModeChanged(sender, e);
-		}
-		
-		/// <summary>
-		/// Updates the line, col information in the status bar.
-		/// </summary>
-		void CaretChanged(object sender, EventArgs e)
-		{
-			TextAreaControl activeTextAreaControl = xmlEditor.ActiveTextAreaControl;
-			int line = activeTextAreaControl.Caret.Line;
-			int col = activeTextAreaControl.Caret.Column;
-			StatusBarService.SetCaretPosition(activeTextAreaControl.TextArea.TextView.GetVisualColumn(line, col) + 1, line + 1, col = 1);
-		}
-		
-		/// <summary>
-		/// Updates the insert/overwrite mode text in the status bar.
-		/// </summary>
-		void CaretModeChanged(object sender, EventArgs e)
-		{
-			StatusBarService.SetInsertMode(xmlEditor.ActiveTextAreaControl.Caret.CaretMode == CaretMode.InsertMode);
-		}
-		
-		/// <summary>
-		/// Gets the xml validation output window.
-		/// </summary>
-		MessageViewCategory Category {
-			get {
-				if (category == null) {
-					MessageViewCategory.Create(ref category, CategoryName);
-				}
-				
-				return category;
-			}
-		}
-		
-		/// <summary>
-		/// Brings output window pad to the front.
-		/// </summary>
-		void ShowOutputWindow()
-		{
-			WorkbenchSingleton.Workbench.GetPad(typeof(CompilerMessageView)).BringPadToFront();
-		}
-		
-		/// <summary>
-		/// Writes a line of text to the output window.
-		/// </summary>
-		/// <param name="message">The message to send to the output
-		/// window.</param>
-		void OutputWindowWriteLine(string message)
-		{
-			Category.AppendText(String.Concat(message, Environment.NewLine));
-		}
-		
-		void ShowErrorList()
-		{
-			if (ErrorListPad.ShowAfterBuild && TaskService.SomethingWentWrong) {
-				WorkbenchSingleton.Workbench.GetPad(typeof(ErrorListPad)).BringPadToFront();
-			}
-		}
-		
-		void AddTask(string fileName, string message, int column, int line, TaskType taskType)
-		{
-			TaskService.Add(new Task(fileName, message, column, line, taskType));
-		}
-		
-		/// <summary>
-		/// Displays the validation error.
-		/// </summary>
-		void DisplayValidationError(string fileName, string message, int column, int line)
-		{
-			OutputWindowWriteLine(message);
-			AddTask(fileName, message, column, line, TaskType.Error);
-		}
-		
-		void ShowValidationFailedMessage()
-		{
-			OutputWindowWriteLine(String.Empty);
-			OutputWindowWriteLine(StringParser.Parse("${res:MainWindow.XmlValidationMessages.ValidationFailed}"));
-		}
-		
-		/// <summary>
-		/// Updates the default schema associated with the xml editor.
-		/// </summary>
-		void PropertyChanged(object sender, PropertyChangedEventArgs e)
-		{
-			string extension = Path.GetExtension(xmlEditor.FileName).ToLowerInvariant();
-			if (e.Key == String.Concat("ext", extension)) {
-				SetDefaultSchema(extension);
-			} else if (e.Key == XmlEditorAddInOptions.ShowAttributesWhenFoldedPropertyName) {
-				UpdateFolding();
-				xmlEditor.Refresh();
-			}
-		}
-
-		/// <summary>
-		/// Sets the default schema and namespace prefix that the xml editor will use.
-		/// </summary>
-		void SetDefaultSchema(string extension)
-		{
-			xmlEditor.DefaultSchemaCompletionData = XmlSchemaManager.GetSchemaCompletionData(extension);
-			xmlEditor.DefaultNamespacePrefix = XmlSchemaManager.GetNamespacePrefix(extension);
-		}
-		
-		/// <summary>
-		/// Updates the default schema association since the schema
-		/// may have been added.
-		/// </summary>
-		void UserSchemaAdded(object source, EventArgs e)
-		{
-			SetDefaultSchema(Path.GetExtension(xmlEditor.FileName).ToLowerInvariant());
-		}
-		
-		/// <summary>
-		/// Updates the default schema association since the schema
-		/// may have been removed.
-		/// </summary>
-		void UserSchemaRemoved(object source, EventArgs e)
-		{
-			SetDefaultSchema(Path.GetExtension(xmlEditor.FileName).ToLowerInvariant());
-		}
-		
-		/// <summary>
-		/// Displays the transformed output.
-		/// </summary>
-		void ShowTransformOutput(string xml)
-		{
-			// Pretty print the xml.
-			xml = SimpleFormat(IndentedFormat(xml));
-			
-			// Display the output xml.
-			XslOutputView view = XslOutputView.Instance;
-			if (view == null) {
-				view = new XslOutputView();
-				view.LoadContent(xml);
-				WorkbenchSingleton.Workbench.ShowView(view);
-			} else {
-				// Transform output window already opened.
-				view.LoadContent(xml);
-				view.WorkbenchWindow.SelectWindow();
-			}
-		}
-		
-		/// <summary>
-		/// Returns a formatted xml string using a simple formatting algorithm.
-		/// </summary>
-		static string SimpleFormat(string xml)
-		{
-			return xml.Replace("><", ">\r\n<");
-		}
-		
-		/// <summary>
-		/// Runs an XSL transform on the input xml.
-		/// </summary>
-		/// <param name="input">The input xml to transform.</param>
-		/// <param name="transform">The transform xml.</param>
-		/// <returns>The output of the transform.</returns>
-		static string Transform(string input, string transform)
-		{
-			StringReader inputString = new StringReader(input);
-			XmlTextReader sourceDocument = new XmlTextReader(inputString);
-
-			StringReader transformString = new StringReader(transform);
-			XPathDocument transformDocument = new XPathDocument(transformString);
-
-			XslCompiledTransform xslTransform = new XslCompiledTransform();
-			xslTransform.Load(transformDocument, XsltSettings.TrustedXslt, new XmlUrlResolver());
-			
-			MemoryStream outputStream = new MemoryStream();
-			XmlTextWriter writer = new XmlTextWriter(outputStream, Encoding.UTF8);
-			
-			xslTransform.Transform(sourceDocument, null, writer);
-
-			int preambleLength = Encoding.UTF8.GetPreamble().Length;
-			byte[] outputBytes = outputStream.ToArray();
-			return UTF8Encoding.UTF8.GetString(outputBytes, preambleLength, outputBytes.Length - preambleLength);
-		}
-		
-		/// <summary>
-		/// Returns a pretty print version of the given xml.
-		/// </summary>
-		/// <param name="xml">Xml string to pretty print.</param>
-		/// <returns>A pretty print version of the specified xml.  If the
-		/// string is not well formed xml the original string is returned.
-		/// </returns>
-		string IndentedFormat(string xml)
-		{
-			string indentedText = String.Empty;
-
-			try	{
-				XmlTextReader reader = new XmlTextReader(new StringReader(xml));
-				reader.WhitespaceHandling = WhitespaceHandling.None;
-
-				StringWriter indentedXmlWriter = new StringWriter();
-				XmlTextWriter writer = CreateXmlTextWriter(indentedXmlWriter);
-				writer.WriteNode(reader, false);
-				writer.Flush();
-
-				indentedText = indentedXmlWriter.ToString();
-			} catch(Exception) {
-				indentedText = xml;
-			}
-
-			return indentedText;
-		}
-		
-		XmlTextWriter CreateXmlTextWriter(TextWriter textWriter)
-		{
-			XmlTextWriter writer = new XmlTextWriter(textWriter);
-			if (xmlEditor.TextEditorProperties.ConvertTabsToSpaces) {
-				writer.Indentation = xmlEditor.TextEditorProperties.IndentationSize;
-				writer.IndentChar = ' ';
-			} else {
-				writer.Indentation = 1;
-				writer.IndentChar = '\t';
-			}
-			writer.Formatting = Formatting.Indented;
-			return writer;
-		}
-		
-		/// <summary>
-		/// Checks that the xml in this view is well-formed.
-		/// </summary>
-		bool IsWellFormed {
-			get {
-				try	{
-					XmlDocument Document = new XmlDocument();
-					Document.LoadXml(Text);
-					return true;
-				} catch(XmlException ex) {
-					AddTask(xmlEditor.FileName, ex.Message, ex.LinePosition - 1, ex.LineNumber - 1, TaskType.Error);
-				} catch (WebException ex) {
-					AddTask(xmlEditor.FileName, ex.Message, 0, 0, TaskType.Error);
-				}
-				return false;
-			}
-		}
-		
-		/// <summary>
-		/// Validates the given xsl string,.
-		/// </summary>
-		bool IsValidXsl(string xml)
-		{
-			try	{
-				WorkbenchSingleton.Workbench.GetPad(typeof(CompilerMessageView)).BringPadToFront();
-
-				StringReader reader = new StringReader(xml);
-				XPathDocument doc = new XPathDocument(reader);
-
-				XslCompiledTransform xslTransform = new XslCompiledTransform();
-				xslTransform.Load(doc, XsltSettings.Default, new XmlUrlResolver());
-
-				return true;
-			} catch(XsltCompileException ex) {
-				AddTask(StylesheetFileName, GetInnerExceptionErrorMessage(ex), ex.LineNumber - 1, ex.LinePosition - 1, TaskType.Error);
-			} catch(XsltException ex) {
-				AddTask(StylesheetFileName, ex.Message, ex.LinePosition - 1, ex.LineNumber - 1, TaskType.Error);
-			} catch(XmlException ex) {
-				AddTask(StylesheetFileName, ex.Message, ex.LinePosition - 1, ex.LineNumber - 1, TaskType.Error);
-			}
-
-			return false;
-		}
-		
-		/// <summary>
-		/// Returns the inner exception message if there is one otherwise returns the exception's error message.
-		/// </summary>
-		static string GetInnerExceptionErrorMessage(Exception ex)
-		{
-			if(ex.InnerException != null) {
-				return ex.InnerException.Message;
-			}
-			return ex.Message;
-		}
-		
-		/// <summary>
-		/// Validates the XML in the editor against all the schemas in the
-		/// schema manager.
-		/// </summary>
-		bool ValidateAgainstSchema()
-		{
-			try {
-				StringReader stringReader = new StringReader(xmlEditor.Document.TextContent);
-				XmlTextReader xmlReader = new XmlTextReader(stringReader);
-				xmlReader.XmlResolver = null;
-				XmlReaderSettings settings = new XmlReaderSettings();
-				settings.ValidationType = ValidationType.Schema;
-				settings.ValidationFlags = XmlSchemaValidationFlags.None;
-				settings.XmlResolver = null;
-				
-				XmlSchemaCompletionData schemaData = null;
-				try {
-					for (int i = 0; i < XmlSchemaManager.SchemaCompletionDataItems.Count; ++i) {
-						schemaData = XmlSchemaManager.SchemaCompletionDataItems[i];
-						settings.Schemas.Add(schemaData.Schema);
-					}
-				} catch (XmlSchemaException ex) {
-					DisplayValidationError(schemaData.FileName, ex.Message, ex.LinePosition - 1, ex.LineNumber - 1);
-					ShowValidationFailedMessage();
-					ShowErrorList();
-					return false;
-				}
-				
-				XmlReader reader = XmlReader.Create(xmlReader, settings);
-				
-				XmlDocument doc = new XmlDocument();
-				doc.Load(reader);
-				return true;
-				
-			} catch (XmlSchemaException ex) {
-				DisplayValidationError(xmlEditor.FileName, ex.Message, ex.LinePosition - 1, ex.LineNumber - 1);
-			} catch (XmlException ex) {
-				DisplayValidationError(xmlEditor.FileName, ex.Message, ex.LinePosition - 1, ex.LineNumber - 1);
-			}
-			ShowValidationFailedMessage();
-			ShowErrorList();
-			return false;
-		}
-		
-		/// <summary>
-		/// Assumes the content in the editor is a schema and validates it using
-		/// the XmlSchema class.  This is used instead of validating against the
-		/// XMLSchema.xsd file since it gives us better error information.
-		/// </summary>
-		bool ValidateSchema()
-		{
-			StringReader stringReader = new StringReader(xmlEditor.Document.TextContent);
-			XmlTextReader xmlReader = new XmlTextReader(stringReader);
-			xmlReader.XmlResolver = null;
-
-			try	{
-				XmlSchema schema = XmlSchema.Read(xmlReader, new ValidationEventHandler(SchemaValidation));
-				schema.Compile(new ValidationEventHandler(SchemaValidation));
-			} catch (XmlSchemaException ex) {
-				DisplayValidationError(xmlEditor.FileName, ex.Message, ex.LinePosition - 1, ex.LineNumber - 1);
-			} catch (XmlException ex) {
-				DisplayValidationError(xmlEditor.FileName, ex.Message, ex.LinePosition - 1, ex.LineNumber - 1);
-			} finally {
-				xmlReader.Close();
-			}
-			if (TaskService.SomethingWentWrong) {
-				ShowValidationFailedMessage();
-				ShowErrorList();
-				return false;
-			}
-			return true;
-		}
-		
-		void SchemaValidation(object source, ValidationEventArgs e)
-		{
-			if (e.Severity == XmlSeverityType.Error) {
-				DisplayValidationError(xmlEditor.FileName, e.Message, e.Exception.LinePosition - 1, e.Exception.LineNumber - 1);
-			} else {
-				DisplayValidationWarning(xmlEditor.FileName, e.Message, e.Exception.LinePosition - 1, e.Exception.LineNumber - 1);
-			}
-		}
-		
-		/// <summary>
-		/// Displays the validation warning.
-		/// </summary>
-		void DisplayValidationWarning(string fileName, string message, int column, int line)
-		{
-			OutputWindowWriteLine(message);
-			AddTask(fileName, message, column, line, TaskType.Warning);
-		}
-
-		bool IsSchema {
-			get {
-				string extension = Path.GetExtension(xmlEditor.FileName);
-				if (extension != null) {
-					return String.Compare(".xsd", extension, true) == 0;
-				}
-				return false;
-			}
-		}
-		
-		/// <summary>
-		/// Checks whether the element belongs to the XSD namespace.
-		/// </summary>
-		static bool IsXmlSchemaNamespace(XmlSchemaElement element)
-		{
-			XmlQualifiedName qualifiedName = element.QualifiedName;
-			if (qualifiedName != null) {
-				return XmlSchemaManager.IsXmlSchemaNamespace(qualifiedName.Namespace);
-			}
-			return false;
-		}
-		
-		/// <summary>
-		/// If the attribute value found references another item in the schema
-		/// return this instead of the attribute schema object. For example, if the
-		/// user can select the attribute value and the code will work out the schema object pointed to by the ref
-		/// or type attribute:
-		///
-		/// xs:element ref="ref-name"
-		/// xs:attribute type="type-name"
-		/// </summary>
-		/// <returns>
-		/// The <paramref name="attribute"/> if no schema object was referenced.
-		/// </returns>
-		static XmlSchemaObject GetSchemaObjectReferenced(string xml, int index, XmlCompletionDataProvider provider, XmlSchemaCompletionData currentSchemaCompletionData, XmlSchemaElement element, XmlSchemaAttribute attribute)
-		{
-			XmlSchemaObject schemaObject = null;
-			if (IsXmlSchemaNamespace(element)) {
-				// Find attribute value.
-				string attributeValue = XmlParser.GetAttributeValueAtIndex(xml, index);
-				if (attributeValue.Length == 0) {
-					return attribute;
-				}
-				
-				if (attribute.Name == "ref") {
-					schemaObject = FindSchemaObjectReference(attributeValue, provider, currentSchemaCompletionData, element.Name);
-				} else if (attribute.Name == "type") {
-					schemaObject = FindSchemaObjectType(attributeValue, provider, currentSchemaCompletionData, element.Name);
-				}
-			}
-			
-			if (schemaObject != null) {
-				return schemaObject;
-			}
-			return attribute;
-		}
-		
-		/// <summary>
-		/// Attempts to locate the reference name in the specified schema.
-		/// </summary>
-		/// <param name="name">The reference to look up.</param>
-		/// <param name="schemaCompletionData">The schema completion data to use to
-		/// find the reference.</param>
-		/// <param name="elementName">The element to determine what sort of reference it is
-		/// (e.g. group, attribute, element).</param>
-		/// <returns><see langword="null"/> if no match can be found.</returns>
-		static XmlSchemaObject FindSchemaObjectReference(string name, XmlCompletionDataProvider provider, XmlSchemaCompletionData schemaCompletionData, string elementName)
-		{
-			QualifiedName qualifiedName = schemaCompletionData.CreateQualifiedName(name);
-			XmlSchemaCompletionData qualifiedNameSchema = provider.FindSchema(qualifiedName.Namespace);
-			if (qualifiedNameSchema != null) {
-				schemaCompletionData = qualifiedNameSchema;
-			}
-			switch (elementName) {
-				case "element":
-					return schemaCompletionData.FindElement(qualifiedName);
-				case "attribute":
-					return schemaCompletionData.FindAttribute(qualifiedName.Name);
-				case "group":
-					return schemaCompletionData.FindGroup(qualifiedName.Name);
-				case "attributeGroup":
-					return schemaCompletionData.FindAttributeGroup(qualifiedName.Name);
-			}
-			return null;
-		}
-		
-		/// <summary>
-		/// Attempts to locate the type name in the specified schema.
-		/// </summary>
-		/// <param name="name">The type to look up.</param>
-		/// <param name="schemaCompletionData">The schema completion data to use to
-		/// find the type.</param>
-		/// <param name="elementName">The element to determine what sort of type it is
-		/// (e.g. group, attribute, element).</param>
-		/// <returns><see langword="null"/> if no match can be found.</returns>
-		static XmlSchemaObject FindSchemaObjectType(string name, XmlCompletionDataProvider provider, XmlSchemaCompletionData schemaCompletionData, string elementName)
-		{
-			QualifiedName qualifiedName = schemaCompletionData.CreateQualifiedName(name);
-			XmlSchemaCompletionData qualifiedNameSchema = provider.FindSchema(qualifiedName.Namespace);
-			if (qualifiedNameSchema != null) {
-				schemaCompletionData = qualifiedNameSchema;
-			}
-			switch (elementName) {
-				case "element":
-					return schemaCompletionData.FindComplexType(qualifiedName);
-				case "attribute":
-					return schemaCompletionData.FindSimpleType(qualifiedName.Name);
-			}
-			return null;
-		}
-		
-		/// <summary>
-		/// Converts a set of schemas to a string array, each array item
-		/// contains the schema converted to a string.
-		/// </summary>
-		string[] GetSchemas(XmlSchemaSet schemaSet)
-		{
-			List<string> schemas = new List<string>();
-			foreach (XmlSchema schema in schemaSet.Schemas()) {
-				using (EncodedStringWriter writer = new EncodedStringWriter(xmlEditor.TextEditorProperties.Encoding)) {
-					using (XmlTextWriter xmlWriter = CreateXmlTextWriter(writer)) {
-						schema.Write(xmlWriter);
-						schemas.Add(writer.ToString());
-					}
-				}
-			}
-			return schemas.ToArray();
-		}
-		
-		/// <summary>
-		/// Gets the edit actions for the xml editor from the addin tree.
-		/// </summary>
-		IEditAction[] GetEditActions()
-		{
-			return AddInTree.BuildItems<IEditAction>(editActionsPath, this, false).ToArray();
-		}
-		
-		/// <summary>
-		/// Tries to get the filename from the inner exception otherwise returns the default filename.
-		/// </summary>
-		/// <param name="ex"></param>
-		/// <param name="defaultFileName"></param>
-		/// <returns></returns>
-		static string GetFileNameFromInnerException(Exception ex, string defaultFileName)
-		{
-			XmlException innerException = ex.InnerException as XmlException;
-			if (innerException != null) {
-				string fileName = innerException.SourceUri.Replace("file:///", String.Empty);
-				if (!String.IsNullOrEmpty(fileName)) {
-					return fileName;
-				}
-			}
-			return defaultFileName;
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XslOutputView.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XslOutputView.cs
deleted file mode 100644
index 4c35aea070..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XslOutputView.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using ICSharpCode.Core;
-using ICSharpCode.SharpDevelop.Gui;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Displays the resulting output from an XSL transform.
-	/// </summary>
-	public class XslOutputView : XmlView
-	{
-		public XslOutputView()
-		{
-			TitleName = StringParser.Parse("${res:ICSharpCode.XmlEditor.XslOutputView.Title}");
-			TextEditorControl.FileName = String.Empty;
-		}
-		
-		public static XslOutputView Instance {
-			get {
-				foreach (IViewContent content in WorkbenchSingleton.Workbench.ViewContentCollection) {
-					if (content is XslOutputView) {
-						LoggingService.Debug("XslOutputView instance exists.");
-						return (XslOutputView)content;
-					}
-				}
-				return null;
-			}
-		}
-	}
-}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.csproj.user b/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.csproj.user
deleted file mode 100644
index 6481ba3dcb..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.csproj.user
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <LastOpenVersion>8.0.50215</LastOpenVersion>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/AddIns/DisplayBindings/XmlEditor/XmlEditor.sln b/src/AddIns/DisplayBindings/XmlEditor/XmlEditor.sln
deleted file mode 100644
index 35999f21e3..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/XmlEditor.sln
+++ /dev/null
@@ -1,60 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-# SharpDevelop 3.0.0.2745
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor", "Project\XmlEditor.csproj", "{6B717BD1-CD5E-498C-A42E-9E6A4584DC48}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor.Tests", "Test\XmlEditor.Tests.csproj", "{FC0FE702-A87D-4D70-A9B6-1ECCD611125F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "..\..\..\Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor", "..\..\..\Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "..\..\..\Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsUI", "..\..\..\Libraries\DockPanel_Src\WinFormsUI\WinFormsUI.csproj", "{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom", "..\..\..\Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj", "{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2748AD25-9C63-4E12-877B-4DCE96FBED54}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2748AD25-9C63-4E12-877B-4DCE96FBED54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2748AD25-9C63-4E12-877B-4DCE96FBED54}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2748AD25-9C63-4E12-877B-4DCE96FBED54}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FC0FE702-A87D-4D70-A9B6-1ECCD611125F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FC0FE702-A87D-4D70-A9B6-1ECCD611125F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FC0FE702-A87D-4D70-A9B6-1ECCD611125F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FC0FE702-A87D-4D70-A9B6-1ECCD611125F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6B717BD1-CD5E-498C-A42E-9E6A4584DC48}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6B717BD1-CD5E-498C-A42E-9E6A4584DC48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6B717BD1-CD5E-498C-A42E-9E6A4584DC48}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6B717BD1-CD5E-498C-A42E-9E6A4584DC48}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-	EndGlobalSection
-EndGlobal
diff --git a/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/OptionsPanels/General.cs b/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/OptionsPanels/General.cs
index 40b5d0ba61..83b866d687 100644
--- a/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/OptionsPanels/General.cs
+++ b/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/OptionsPanels/General.cs
@@ -20,7 +20,7 @@ namespace ICSharpCode.Profiler.AddIn.OptionsPanels
 	/// <summary>
 	/// Description of General
 	/// </summary>
-	public class General : AbstractOptionPanel
+	public class General : OptionPanel
 	{
 		GeneralOptionsPanel panel;
 		
diff --git a/src/SharpDevelop.Tests.sln b/src/SharpDevelop.Tests.sln
index 5762be51c7..03ec4ae373 100644
--- a/src/SharpDevelop.Tests.sln
+++ b/src/SharpDevelop.Tests.sln
@@ -1,132 +1,132 @@
 
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-# SharpDevelop 3.1.0.3946
+# SharpDevelop 3.1.0.4153
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{14A277EE-7DF1-4529-B639-7D1EF334C1C5}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonEdit.AddIn", "AddIns\DisplayBindings\AvalonEdit.AddIn\AvalonEdit.AddIn.csproj", "{0162E499-42D0-409B-AA25-EED21F75336B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlBinding.Tests", "AddIns\BackendBindings\XamlBinding\XamlBinding.Tests\XamlBinding.Tests.csproj", "{F390DA70-1FE1-4715-81A0-389AB010C130}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding.Tests", "AddIns\BackendBindings\VBNetBinding\Test\VBNetBinding.Tests.csproj", "{50A89267-A28B-4DF3-8E62-912E005143B8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlBinding", "AddIns\BackendBindings\XamlBinding\XamlBinding\XamlBinding.csproj", "{7C96B65D-28A5-4F28-A35B-8D83CE831EE8}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Python", "Python", "{F94FA21D-78E6-410B-895D-E16D3E7240DB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceToolkit.Tests", "AddIns\Misc\ResourceToolkit\Test\ResourceToolkit.Tests.csproj", "{DD9AE6A5-2B9D-443A-BC71-38BE578C36BD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceToolkit", "AddIns\Misc\ResourceToolkit\Project\ResourceToolkit.csproj", "{461606BD-E824-4D0A-8CBA-01810B1F5E02}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Boo", "Boo", "{5DA95927-5F2D-46D8-9265-D092734B6F0E}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding.Tests", "AddIns\BackendBindings\Python\PythonBinding\Test\PythonBinding.Tests.csproj", "{23B517C9-1ECC-4419-A13F-0B7136D085CB}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Build.Tasks.Tests", "AddIns\BackendBindings\Python\Python.Build.Tasks\Test\Python.Build.Tasks.Tests.csproj", "{833904AB-3CD4-4071-9B48-5770E44685AA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter.Tests", "AddIns\BackendBindings\Boo\NRefactoryToBooConverter\Test\NRefactoryToBooConverter.Tests.csproj", "{C9DE556D-325C-4544-B29F-16A9EB7C9830}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding", "AddIns\BackendBindings\Python\PythonBinding\Project\PythonBinding.csproj", "{8D732610-8FC6-43BA-94C9-7126FD7FE361}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter", "AddIns\BackendBindings\Boo\NRefactoryToBooConverter\Project\NRefactoryToBooConverter.csproj", "{DBCF20A1-BA13-4582-BFA9-74DE4D987B73}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Build.Tasks", "AddIns\BackendBindings\Python\Python.Build.Tasks\Project\Python.Build.Tasks.csproj", "{D332F2D1-2CF1-43B7-903C-844BD5211A7E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooBinding.Tests", "AddIns\BackendBindings\Boo\BooBinding\Test\BooBinding.Tests.csproj", "{6FA16499-896F-4C02-BB43-1AF5C6C7C713}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding", "AddIns\BackendBindings\CSharpBinding\Project\CSharpBinding.csproj", "{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooBinding", "AddIns\BackendBindings\Boo\BooBinding\Project\BooBinding.csproj", "{4AC2D5F1-F671-480C-A075-6BF62B3721B2}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugger", "Debugger", "{6604365C-C702-4C10-9BA8-637F1E3D4D0D}"
-	ProjectSection(SolutionItems) = postProject
-	EndProjectSection
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SearchAndReplace.Tests", "AddIns\Misc\SearchAndReplace\Test\SearchAndReplace.Tests.csproj", "{A569DCC1-C608-45FD-B770-4F79335EF154}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Core", "AddIns\Misc\Debugger\Debugger.Core\Project\Debugger.Core.csproj", "{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SearchAndReplace", "AddIns\Misc\SearchAndReplace\Project\SearchAndReplace.csproj", "{9196DD8A-B4D4-4780-8742-C5762E547FC2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.AddIn", "AddIns\Misc\Debugger\Debugger.AddIn\Project\Debugger.AddIn.csproj", "{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting.Tests", "AddIns\Misc\UnitTesting\Test\UnitTesting.Tests.csproj", "{44A8DE09-CAB9-49D8-9CFC-5EB0A552F181}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Tests", "AddIns\Misc\Debugger\Debugger.Tests\Project\Debugger.Tests.csproj", "{A4C858C8-51B6-4265-A695-A20FCEBA1D19}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding.Tests", "AddIns\BackendBindings\WixBinding\Test\WixBinding.Tests.csproj", "{388E7B64-0393-4EB4-A3E3-5C474F141853}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor", "AddIns\DisplayBindings\XmlEditor\Project\XmlEditor.csproj", "{6B717BD1-CD5E-498C-A42E-9E6A4584DC48}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding", "AddIns\BackendBindings\WixBinding\Project\WixBinding.csproj", "{e1b288a2-08ee-4318-8bbb-8ab72c69e33e}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor.Tests", "AddIns\DisplayBindings\XmlEditor\Test\XmlEditor.Tests.csproj", "{FC0FE702-A87D-4D70-A9B6-1ECCD611125F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeAnalysis", "AddIns\Misc\CodeAnalysis\CodeAnalysis.csproj", "{3EAA45A9-735C-4AC7-A799-947B93EA449D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding", "AddIns\BackendBindings\VBNetBinding\Project\VBNetBinding.csproj", "{BF38FB72-B380-4196-AF8C-95749D726C61}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormsDesigner", "AddIns\DisplayBindings\FormsDesigner\Project\FormsDesigner.csproj", "{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage.Tests", "AddIns\Misc\CodeCoverage\Test\CodeCoverage.Tests.csproj", "{A5C0E8F8-9D04-46ED-91D6-1DEF1575313B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting", "AddIns\Misc\UnitTesting\UnitTesting.csproj", "{1F261725-6318-4434-A1B1-6C70CE4CD324}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage", "AddIns\Misc\CodeCoverage\Project\CodeCoverage.csproj", "{08ce9972-283b-44f4-82fa-966f7dfa6b7a}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting", "AddIns\Misc\UnitTesting\UnitTesting.csproj", "{1F261725-6318-4434-A1B1-6C70CE4CD324}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormsDesigner", "AddIns\DisplayBindings\FormsDesigner\Project\FormsDesigner.csproj", "{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage.Tests", "AddIns\Misc\CodeCoverage\Test\CodeCoverage.Tests.csproj", "{A5C0E8F8-9D04-46ED-91D6-1DEF1575313B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeAnalysis", "AddIns\Misc\CodeAnalysis\CodeAnalysis.csproj", "{3EAA45A9-735C-4AC7-A799-947B93EA449D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding", "AddIns\BackendBindings\VBNetBinding\Project\VBNetBinding.csproj", "{BF38FB72-B380-4196-AF8C-95749D726C61}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding", "AddIns\BackendBindings\WixBinding\Project\WixBinding.csproj", "{e1b288a2-08ee-4318-8bbb-8ab72c69e33e}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugger", "Debugger", "{6604365C-C702-4C10-9BA8-637F1E3D4D0D}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding.Tests", "AddIns\BackendBindings\WixBinding\Test\WixBinding.Tests.csproj", "{388E7B64-0393-4EB4-A3E3-5C474F141853}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Tests", "AddIns\Misc\Debugger\Debugger.Tests\Project\Debugger.Tests.csproj", "{A4C858C8-51B6-4265-A695-A20FCEBA1D19}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting.Tests", "AddIns\Misc\UnitTesting\Test\UnitTesting.Tests.csproj", "{44A8DE09-CAB9-49D8-9CFC-5EB0A552F181}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.AddIn", "AddIns\Misc\Debugger\Debugger.AddIn\Project\Debugger.AddIn.csproj", "{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SearchAndReplace", "AddIns\Misc\SearchAndReplace\Project\SearchAndReplace.csproj", "{9196DD8A-B4D4-4780-8742-C5762E547FC2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Core", "AddIns\Misc\Debugger\Debugger.Core\Project\Debugger.Core.csproj", "{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SearchAndReplace.Tests", "AddIns\Misc\SearchAndReplace\Test\SearchAndReplace.Tests.csproj", "{A569DCC1-C608-45FD-B770-4F79335EF154}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding", "AddIns\BackendBindings\CSharpBinding\Project\CSharpBinding.csproj", "{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Boo", "Boo", "{5DA95927-5F2D-46D8-9265-D092734B6F0E}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Python", "Python", "{F94FA21D-78E6-410B-895D-E16D3E7240DB}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooBinding", "AddIns\BackendBindings\Boo\BooBinding\Project\BooBinding.csproj", "{4AC2D5F1-F671-480C-A075-6BF62B3721B2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Build.Tasks", "AddIns\BackendBindings\Python\Python.Build.Tasks\Project\Python.Build.Tasks.csproj", "{D332F2D1-2CF1-43B7-903C-844BD5211A7E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooBinding.Tests", "AddIns\BackendBindings\Boo\BooBinding\Test\BooBinding.Tests.csproj", "{6FA16499-896F-4C02-BB43-1AF5C6C7C713}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding", "AddIns\BackendBindings\Python\PythonBinding\Project\PythonBinding.csproj", "{8D732610-8FC6-43BA-94C9-7126FD7FE361}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter", "AddIns\BackendBindings\Boo\NRefactoryToBooConverter\Project\NRefactoryToBooConverter.csproj", "{DBCF20A1-BA13-4582-BFA9-74DE4D987B73}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Build.Tasks.Tests", "AddIns\BackendBindings\Python\Python.Build.Tasks\Test\Python.Build.Tasks.Tests.csproj", "{833904AB-3CD4-4071-9B48-5770E44685AA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter.Tests", "AddIns\BackendBindings\Boo\NRefactoryToBooConverter\Test\NRefactoryToBooConverter.Tests.csproj", "{C9DE556D-325C-4544-B29F-16A9EB7C9830}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding.Tests", "AddIns\BackendBindings\Python\PythonBinding\Test\PythonBinding.Tests.csproj", "{23B517C9-1ECC-4419-A13F-0B7136D085CB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceToolkit", "AddIns\Misc\ResourceToolkit\Project\ResourceToolkit.csproj", "{461606BD-E824-4D0A-8CBA-01810B1F5E02}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding.Tests", "AddIns\BackendBindings\VBNetBinding\Test\VBNetBinding.Tests.csproj", "{50A89267-A28B-4DF3-8E62-912E005143B8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceToolkit.Tests", "AddIns\Misc\ResourceToolkit\Test\ResourceToolkit.Tests.csproj", "{DD9AE6A5-2B9D-443A-BC71-38BE578C36BD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonEdit.AddIn", "AddIns\DisplayBindings\AvalonEdit.AddIn\AvalonEdit.AddIn.csproj", "{0162E499-42D0-409B-AA25-EED21F75336B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlBinding", "AddIns\BackendBindings\XamlBinding\XamlBinding\XamlBinding.csproj", "{7C96B65D-28A5-4F28-A35B-8D83CE831EE8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor", "AddIns\BackendBindings\XmlBinding\Project\XmlEditor.csproj", "{DCA2703D-250A-463E-A68A-07ED105AE6BD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlBinding.Tests", "AddIns\BackendBindings\XamlBinding\XamlBinding.Tests\XamlBinding.Tests.csproj", "{F390DA70-1FE1-4715-81A0-389AB010C130}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor.Tests", "AddIns\BackendBindings\XmlBinding\Test\XmlEditor.Tests.csproj", "{FC0FE702-A87D-4D70-A9B6-1ECCD611125F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{9421EDF4-9769-4BE9-B5A6-C87DE221D73C}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryTests", "Libraries\NRefactory\Test\NRefactoryTests.csproj", "{870115DD-960A-4406-A6B9-600BCDC36A03}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TreeView", "Libraries\SharpTreeView\ICSharpCode.TreeView\ICSharpCode.TreeView.csproj", "{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor", "Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit.Tests", "Libraries\AvalonEdit\ICSharpCode.AvalonEdit.Tests\ICSharpCode.AvalonEdit.Tests.csproj", "{6222A3A1-83CE-47A3-A4E4-A018F82D44D8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor.Tests", "Libraries\ICSharpCode.TextEditor\Test\ICSharpCode.TextEditor.Tests.csproj", "{6259D767-BA7C-484D-9472-68F350A20086}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit", "Libraries\AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj", "{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aga.Controls", "Libraries\TreeViewAdv\Aga.Controls\Aga.Controls.csproj", "{E73BB233-D88B-44A7-A98F-D71EE158381D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit", "Libraries\AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj", "{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor.Tests", "Libraries\ICSharpCode.TextEditor\Test\ICSharpCode.TextEditor.Tests.csproj", "{6259D767-BA7C-484D-9472-68F350A20086}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit.Tests", "Libraries\AvalonEdit\ICSharpCode.AvalonEdit.Tests\ICSharpCode.AvalonEdit.Tests.csproj", "{6222A3A1-83CE-47A3-A4E4-A018F82D44D8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor", "Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TreeView", "Libraries\SharpTreeView\ICSharpCode.TreeView\ICSharpCode.TreeView.csproj", "{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryTests", "Libraries\NRefactory\Test\NRefactoryTests.csproj", "{870115DD-960A-4406-A6B9-600BCDC36A03}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{5A3EBEBA-0560-41C1-966B-23F7D03A5486}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Presentation", "Main\ICSharpCode.Core.Presentation\ICSharpCode.Core.Presentation.csproj", "{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.WinForms", "Main\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj", "{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Tests", "Main\Base\Test\ICSharpCode.SharpDevelop.Tests.csproj", "{4980B743-B32F-4aba-AABD-45E2CAD3568D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom.Tests", "Main\ICSharpCode.SharpDevelop.Dom\Tests\ICSharpCode.SharpDevelop.Dom.Tests\ICSharpCode.SharpDevelop.Dom.Tests.csproj", "{7DB80259-24D4-46C3-A024-53FF1987733D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Tests", "Main\Core\Test\ICSharpCode.Core.Tests.csproj", "{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.BuildWorker", "Main\ICSharpCode.SharpDevelop.BuildWorker\ICSharpCode.SharpDevelop.BuildWorker.csproj", "{C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Sda", "Main\ICSharpCode.SharpDevelop.Sda\ICSharpCode.SharpDevelop.Sda.csproj", "{80318B5F-A25D-45AB-8A95-EF31D2370A4C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Widgets", "Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj", "{8035765F-D51F-4A0C-A746-2FD100E19419}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom", "Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj", "{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Widgets", "Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj", "{8035765F-D51F-4A0C-A746-2FD100E19419}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Sda", "Main\ICSharpCode.SharpDevelop.Sda\ICSharpCode.SharpDevelop.Sda.csproj", "{80318B5F-A25D-45AB-8A95-EF31D2370A4C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.BuildWorker", "Main\ICSharpCode.SharpDevelop.BuildWorker\ICSharpCode.SharpDevelop.BuildWorker.csproj", "{C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Tests", "Main\Core\Test\ICSharpCode.Core.Tests.csproj", "{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom.Tests", "Main\ICSharpCode.SharpDevelop.Dom\Tests\ICSharpCode.SharpDevelop.Dom.Tests\ICSharpCode.SharpDevelop.Dom.Tests.csproj", "{7DB80259-24D4-46C3-A024-53FF1987733D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Tests", "Main\Base\Test\ICSharpCode.SharpDevelop.Tests.csproj", "{4980B743-B32F-4aba-AABD-45E2CAD3568D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.WinForms", "Main\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj", "{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Presentation", "Main\ICSharpCode.Core.Presentation\ICSharpCode.Core.Presentation.csproj", "{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}"
 EndProject
 Project("{00000000-0000-0000-0000-000000000000}") = "Tools", "Tools\Tools.build", "{970116b0-f96b-4257-8579-986b9cf086f5}"
 EndProject
@@ -176,14 +176,6 @@ Global
 		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FC0FE702-A87D-4D70-A9B6-1ECCD611125F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FC0FE702-A87D-4D70-A9B6-1ECCD611125F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FC0FE702-A87D-4D70-A9B6-1ECCD611125F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FC0FE702-A87D-4D70-A9B6-1ECCD611125F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6B717BD1-CD5E-498C-A42E-9E6A4584DC48}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6B717BD1-CD5E-498C-A42E-9E6A4584DC48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6B717BD1-CD5E-498C-A42E-9E6A4584DC48}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6B717BD1-CD5E-498C-A42E-9E6A4584DC48}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A4C858C8-51B6-4265-A695-A20FCEBA1D19}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A4C858C8-51B6-4265-A695-A20FCEBA1D19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A4C858C8-51B6-4265-A695-A20FCEBA1D19}.Release|Any CPU.Build.0 = Release|Any CPU
@@ -344,64 +336,72 @@ Global
 		{0162E499-42D0-409B-AA25-EED21F75336B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0162E499-42D0-409B-AA25-EED21F75336B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0162E499-42D0-409B-AA25-EED21F75336B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DCA2703D-250A-463E-A68A-07ED105AE6BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DCA2703D-250A-463E-A68A-07ED105AE6BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DCA2703D-250A-463E-A68A-07ED105AE6BD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DCA2703D-250A-463E-A68A-07ED105AE6BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FC0FE702-A87D-4D70-A9B6-1ECCD611125F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FC0FE702-A87D-4D70-A9B6-1ECCD611125F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FC0FE702-A87D-4D70-A9B6-1ECCD611125F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FC0FE702-A87D-4D70-A9B6-1ECCD611125F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{F390DA70-1FE1-4715-81A0-389AB010C130} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
-		{7C96B65D-28A5-4F28-A35B-8D83CE831EE8} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
-		{DD9AE6A5-2B9D-443A-BC71-38BE578C36BD} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
-		{461606BD-E824-4D0A-8CBA-01810B1F5E02} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
-		{5DA95927-5F2D-46D8-9265-D092734B6F0E} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
-		{A569DCC1-C608-45FD-B770-4F79335EF154} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
-		{9196DD8A-B4D4-4780-8742-C5762E547FC2} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
-		{44A8DE09-CAB9-49D8-9CFC-5EB0A552F181} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
-		{388E7B64-0393-4EB4-A3E3-5C474F141853} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
-		{e1b288a2-08ee-4318-8bbb-8ab72c69e33e} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
-		{3EAA45A9-735C-4AC7-A799-947B93EA449D} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
-		{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
-		{1F261725-6318-4434-A1B1-6C70CE4CD324} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
-		{08ce9972-283b-44f4-82fa-966f7dfa6b7a} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
-		{A5C0E8F8-9D04-46ED-91D6-1DEF1575313B} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
-		{BF38FB72-B380-4196-AF8C-95749D726C61} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
 		{FC0FE702-A87D-4D70-A9B6-1ECCD611125F} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
-		{6B717BD1-CD5E-498C-A42E-9E6A4584DC48} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
-		{6604365C-C702-4C10-9BA8-637F1E3D4D0D} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
-		{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
-		{F94FA21D-78E6-410B-895D-E16D3E7240DB} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
-		{50A89267-A28B-4DF3-8E62-912E005143B8} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
+		{DCA2703D-250A-463E-A68A-07ED105AE6BD} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
 		{0162E499-42D0-409B-AA25-EED21F75336B} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
-		{D332F2D1-2CF1-43B7-903C-844BD5211A7E} = {F94FA21D-78E6-410B-895D-E16D3E7240DB}
-		{8D732610-8FC6-43BA-94C9-7126FD7FE361} = {F94FA21D-78E6-410B-895D-E16D3E7240DB}
-		{833904AB-3CD4-4071-9B48-5770E44685AA} = {F94FA21D-78E6-410B-895D-E16D3E7240DB}
-		{23B517C9-1ECC-4419-A13F-0B7136D085CB} = {F94FA21D-78E6-410B-895D-E16D3E7240DB}
-		{A4C858C8-51B6-4265-A695-A20FCEBA1D19} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D}
-		{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D}
-		{1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D}
-		{C9DE556D-325C-4544-B29F-16A9EB7C9830} = {5DA95927-5F2D-46D8-9265-D092734B6F0E}
-		{DBCF20A1-BA13-4582-BFA9-74DE4D987B73} = {5DA95927-5F2D-46D8-9265-D092734B6F0E}
-		{6FA16499-896F-4C02-BB43-1AF5C6C7C713} = {5DA95927-5F2D-46D8-9265-D092734B6F0E}
+		{50A89267-A28B-4DF3-8E62-912E005143B8} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
+		{F94FA21D-78E6-410B-895D-E16D3E7240DB} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
+		{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
+		{6604365C-C702-4C10-9BA8-637F1E3D4D0D} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
+		{BF38FB72-B380-4196-AF8C-95749D726C61} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
+		{A5C0E8F8-9D04-46ED-91D6-1DEF1575313B} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
+		{08ce9972-283b-44f4-82fa-966f7dfa6b7a} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
+		{1F261725-6318-4434-A1B1-6C70CE4CD324} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
+		{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
+		{3EAA45A9-735C-4AC7-A799-947B93EA449D} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
+		{e1b288a2-08ee-4318-8bbb-8ab72c69e33e} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
+		{388E7B64-0393-4EB4-A3E3-5C474F141853} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
+		{44A8DE09-CAB9-49D8-9CFC-5EB0A552F181} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
+		{9196DD8A-B4D4-4780-8742-C5762E547FC2} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
+		{A569DCC1-C608-45FD-B770-4F79335EF154} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
+		{5DA95927-5F2D-46D8-9265-D092734B6F0E} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
+		{461606BD-E824-4D0A-8CBA-01810B1F5E02} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
+		{DD9AE6A5-2B9D-443A-BC71-38BE578C36BD} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
+		{7C96B65D-28A5-4F28-A35B-8D83CE831EE8} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
+		{F390DA70-1FE1-4715-81A0-389AB010C130} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
 		{4AC2D5F1-F671-480C-A075-6BF62B3721B2} = {5DA95927-5F2D-46D8-9265-D092734B6F0E}
-		{DDE2A481-8271-4EAC-A330-8FA6A38D13D1} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
-		{6222A3A1-83CE-47A3-A4E4-A018F82D44D8} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
-		{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
-		{E73BB233-D88B-44A7-A98F-D71EE158381D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
-		{6259D767-BA7C-484D-9472-68F350A20086} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
-		{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
-		{870115DD-960A-4406-A6B9-600BCDC36A03} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
+		{6FA16499-896F-4C02-BB43-1AF5C6C7C713} = {5DA95927-5F2D-46D8-9265-D092734B6F0E}
+		{DBCF20A1-BA13-4582-BFA9-74DE4D987B73} = {5DA95927-5F2D-46D8-9265-D092734B6F0E}
+		{C9DE556D-325C-4544-B29F-16A9EB7C9830} = {5DA95927-5F2D-46D8-9265-D092734B6F0E}
+		{1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D}
+		{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D}
+		{A4C858C8-51B6-4265-A695-A20FCEBA1D19} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D}
+		{23B517C9-1ECC-4419-A13F-0B7136D085CB} = {F94FA21D-78E6-410B-895D-E16D3E7240DB}
+		{833904AB-3CD4-4071-9B48-5770E44685AA} = {F94FA21D-78E6-410B-895D-E16D3E7240DB}
+		{8D732610-8FC6-43BA-94C9-7126FD7FE361} = {F94FA21D-78E6-410B-895D-E16D3E7240DB}
+		{D332F2D1-2CF1-43B7-903C-844BD5211A7E} = {F94FA21D-78E6-410B-895D-E16D3E7240DB}
 		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
-		{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
-		{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
-		{7DB80259-24D4-46C3-A024-53FF1987733D} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
-		{C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
-		{8035765F-D51F-4A0C-A746-2FD100E19419} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
-		{924EE450-603D-49C1-A8E5-4AFAA31CE6F3} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
-		{80318B5F-A25D-45AB-8A95-EF31D2370A4C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
-		{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
-		{4980B743-B32F-4aba-AABD-45E2CAD3568D} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
-		{2748AD25-9C63-4E12-877B-4DCE96FBED54} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
+		{870115DD-960A-4406-A6B9-600BCDC36A03} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
+		{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
+		{6259D767-BA7C-484D-9472-68F350A20086} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
+		{E73BB233-D88B-44A7-A98F-D71EE158381D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
+		{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
+		{6222A3A1-83CE-47A3-A4E4-A018F82D44D8} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
+		{DDE2A481-8271-4EAC-A330-8FA6A38D13D1} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
 		{1152B71B-3C05-4598-B20D-823B5D40559E} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
+		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
+		{2748AD25-9C63-4E12-877B-4DCE96FBED54} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
+		{4980B743-B32F-4aba-AABD-45E2CAD3568D} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
+		{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
+		{80318B5F-A25D-45AB-8A95-EF31D2370A4C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
+		{924EE450-603D-49C1-A8E5-4AFAA31CE6F3} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
+		{8035765F-D51F-4A0C-A746-2FD100E19419} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
+		{C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
+		{7DB80259-24D4-46C3-A024-53FF1987733D} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
+		{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
+		{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
 	EndGlobalSection
 EndGlobal
diff --git a/src/SharpDevelop.sln b/src/SharpDevelop.sln
index 3f65571f65..7ff4cb27c8 100644
--- a/src/SharpDevelop.sln
+++ b/src/SharpDevelop.sln
@@ -66,6 +66,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Backends", "Backends", "{FE
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor", "AddIns\BackendBindings\XmlBinding\Project\XmlEditor.csproj", "{DCA2703D-250A-463E-A68A-07ED105AE6BD}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlBinding", "AddIns\BackendBindings\XamlBinding\XamlBinding\XamlBinding.csproj", "{7C96B65D-28A5-4F28-A35B-8D83CE831EE8}"
 EndProject
 Project("{982E8BC1-ACD7-4dbf-96AB-B2CE67D6A008}") = "FSharpBinding", "AddIns\BackendBindings\FSharp\FSharpBinding\Project\FSharpBinding.fsproj", "{99BAE3A2-C40D-40D2-A7B4-EBB4798F36E4}"
@@ -90,8 +92,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding", "AddIns\BackendBindings\WixBinding\Project\WixBinding.csproj", "{e1b288a2-08ee-4318-8bbb-8ab72c69e33e}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor", "AddIns\BackendBindings\XmlBinding\XmlEditor.csproj", "{DCA2703D-250A-463E-A68A-07ED105AE6BD}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display Bindings", "{4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
@@ -441,7 +441,6 @@ Global
 		{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF} = {BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C}
 		{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446} = {BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C}
 		{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD} = {BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C}
-		{DCA2703D-250A-463E-A68A-07ED105AE6BD} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
 		{e1b288a2-08ee-4318-8bbb-8ab72c69e33e} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
 		{DBCF20A1-BA13-4582-BFA9-74DE4D987B73} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
 		{4AC2D5F1-F671-480C-A075-6BF62B3721B2} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
@@ -451,6 +450,7 @@ Global
 		{8CF9DB5A-A2F6-4A88-BABA-100912EAF6E8} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
 		{99BAE3A2-C40D-40D2-A7B4-EBB4798F36E4} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
 		{7C96B65D-28A5-4F28-A35B-8D83CE831EE8} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
+		{DCA2703D-250A-463E-A68A-07ED105AE6BD} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
 		{D332F2D1-2CF1-43B7-903C-844BD5211A7E} = {8CF9DB5A-A2F6-4A88-BABA-100912EAF6E8}
 		{8D732610-8FC6-43BA-94C9-7126FD7FE361} = {8CF9DB5A-A2F6-4A88-BABA-100912EAF6E8}
 		{533F4684-DBA6-4518-B005-C84F22A2DD57} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}