diff --git a/AddIns/ICSharpCode.SharpDevelop.addin b/AddIns/ICSharpCode.SharpDevelop.addin
index 2602cd8606..99661839e5 100644
--- a/AddIns/ICSharpCode.SharpDevelop.addin
+++ b/AddIns/ICSharpCode.SharpDevelop.addin
@@ -6,8 +6,8 @@
        version     = "1.0.0">
 	
 	<Runtime>
-		<Import assembly="/ICSharpCode.SharpDevelop"/>
-		<Import assembly="/ICSharpCode.TextEditor"/>
+		<Import assembly=":ICSharpCode.SharpDevelop"/>
+		<Import assembly=":ICSharpCode.TextEditor"/>
 	</Runtime>
 	
 	<Path name = "/SharpDevelop/Workbench/Ambiences">
@@ -734,7 +734,7 @@
 				<Condition name="IsProcessRunning" isdebugging="False" action="Disable">
 					<ToolbarItem id      = "RunWithoutDebugger"
 					             icon    = "Icons.16x16.Debug.StartWithoutDebugging"
-					             tooltip = "${res:XML.MainMenu.RunMenu.Run.Description}"
+					             tooltip = "${res:XML.MainMenu.DebugMenu.RunWithoutDebug.Description}"
 					             class   = "ICSharpCode.SharpDevelop.Project.Commands.ExecuteWithoutDebugger"/>
 				</Condition>
 			</Condition>
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin
index fc018d7768..b78d71942d 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin
@@ -7,7 +7,7 @@
 	
 	<Runtime>
 		<Import assembly = "CSharpBinding.dll"/>
-		<Import assembly = "/ICSharpCode.SharpDevelop"/>
+		<Import assembly = ":ICSharpCode.SharpDevelop"/>
 	</Runtime>
 	
 	<Path name = "/SharpDevelop/Workbench/Ambiences">
diff --git a/src/AddIns/BackendBindings/ILAsmBinding/Project/ILAsmBinding.addin b/src/AddIns/BackendBindings/ILAsmBinding/Project/ILAsmBinding.addin
index f38632640e..5aa599d5db 100644
--- a/src/AddIns/BackendBindings/ILAsmBinding/Project/ILAsmBinding.addin
+++ b/src/AddIns/BackendBindings/ILAsmBinding/Project/ILAsmBinding.addin
@@ -7,7 +7,7 @@
 	
 	<Runtime>
 		<Import assembly = "ILAsmBinding.dll"/>
-		<Import assembly = "/ICSharpCode.SharpDevelop"/>
+		<Import assembly = ":ICSharpCode.SharpDevelop"/>
 	</Runtime>
 	
 	<Path name = "/SharpDevelop/Workbench/FileFilter">
diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin b/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin
index 1eba5299d6..4bcea60153 100644
--- a/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin
+++ b/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin
@@ -7,7 +7,7 @@
 	
 	<Runtime>
 		<Import assembly = "VBNetBinding.dll"/>
-		<Import assembly = "/ICSharpCode.SharpDevelop"/>
+		<Import assembly = ":ICSharpCode.SharpDevelop"/>
 	</Runtime>
 
 	<Path name = "/SharpDevelop/Workbench/Ambiences">
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/AssemblyInfo.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Configuration/AssemblyInfo.cs
similarity index 100%
rename from src/AddIns/DisplayBindings/XmlEditor/Project/AssemblyInfo.cs
rename to src/AddIns/DisplayBindings/XmlEditor/Project/Configuration/AssemblyInfo.cs
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/SelectXmlSchema.xfrm b/src/AddIns/DisplayBindings/XmlEditor/Project/Resources/SelectXmlSchema.xfrm
similarity index 100%
rename from src/AddIns/DisplayBindings/XmlEditor/Project/SelectXmlSchema.xfrm
rename to src/AddIns/DisplayBindings/XmlEditor/Project/Resources/SelectXmlSchema.xfrm
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditorOptionsPanel.xfrm b/src/AddIns/DisplayBindings/XmlEditor/Project/Resources/XmlEditorOptionsPanel.xfrm
similarity index 100%
rename from src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditorOptionsPanel.xfrm
rename to src/AddIns/DisplayBindings/XmlEditor/Project/Resources/XmlEditorOptionsPanel.xfrm
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlSchemasPanel.xfrm b/src/AddIns/DisplayBindings/XmlEditor/Project/Resources/XmlSchemasPanel.xfrm
similarity index 100%
rename from src/AddIns/DisplayBindings/XmlEditor/Project/XmlSchemasPanel.xfrm
rename to src/AddIns/DisplayBindings/XmlEditor/Project/Resources/XmlSchemasPanel.xfrm
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/CodeCompletionPopupCommand.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/CodeCompletionPopupCommand.cs
similarity index 100%
rename from src/AddIns/DisplayBindings/XmlEditor/Project/CodeCompletionPopupCommand.cs
rename to src/AddIns/DisplayBindings/XmlEditor/Project/Src/CodeCompletionPopupCommand.cs
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/CodeCompletionWindow.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/CodeCompletionWindow.cs
similarity index 100%
rename from src/AddIns/DisplayBindings/XmlEditor/Project/CodeCompletionWindow.cs
rename to src/AddIns/DisplayBindings/XmlEditor/Project/Src/CodeCompletionWindow.cs
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/CreateSchemaCommand.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/CreateSchemaCommand.cs
similarity index 100%
rename from src/AddIns/DisplayBindings/XmlEditor/Project/CreateSchemaCommand.cs
rename to src/AddIns/DisplayBindings/XmlEditor/Project/Src/CreateSchemaCommand.cs
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/EncodedStringWriter.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/EncodedStringWriter.cs
similarity index 100%
rename from src/AddIns/DisplayBindings/XmlEditor/Project/EncodedStringWriter.cs
rename to src/AddIns/DisplayBindings/XmlEditor/Project/Src/EncodedStringWriter.cs
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Parser.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/Parser.cs
similarity index 100%
rename from src/AddIns/DisplayBindings/XmlEditor/Project/Parser.cs
rename to src/AddIns/DisplayBindings/XmlEditor/Project/Src/Parser.cs
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/QualifiedName.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/QualifiedName.cs
similarity index 100%
rename from src/AddIns/DisplayBindings/XmlEditor/Project/QualifiedName.cs
rename to src/AddIns/DisplayBindings/XmlEditor/Project/Src/QualifiedName.cs
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/QualifiedNameCollection.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/QualifiedNameCollection.cs
similarity index 100%
rename from src/AddIns/DisplayBindings/XmlEditor/Project/QualifiedNameCollection.cs
rename to src/AddIns/DisplayBindings/XmlEditor/Project/Src/QualifiedNameCollection.cs
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/SelectXmlSchemaForm.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/SelectXmlSchemaForm.cs
similarity index 97%
rename from src/AddIns/DisplayBindings/XmlEditor/Project/SelectXmlSchemaForm.cs
rename to src/AddIns/DisplayBindings/XmlEditor/Project/Src/SelectXmlSchemaForm.cs
index c957e748b3..e15056da34 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/SelectXmlSchemaForm.cs
+++ b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/SelectXmlSchemaForm.cs
@@ -64,7 +64,7 @@ namespace ICSharpCode.XmlEditor
 		
 		void Initialize()
 		{
-			SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("ICSharpCode.XmlEditor.SelectXmlSchema.xfrm"));
+			SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("ICSharpCode.XmlEditor.Resources.SelectXmlSchema.xfrm"));
 			
 			NoSchemaSelectedText = StringParser.Parse("${res:Dialog.Options.IDEOptions.TextEditor.Behaviour.IndentStyle.None}");
 			
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/ValidateXmlCommand.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/ValidateXmlCommand.cs
similarity index 100%
rename from src/AddIns/DisplayBindings/XmlEditor/Project/ValidateXmlCommand.cs
rename to src/AddIns/DisplayBindings/XmlEditor/Project/Src/ValidateXmlCommand.cs
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlCompletionData.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlCompletionData.cs
similarity index 100%
rename from src/AddIns/DisplayBindings/XmlEditor/Project/XmlCompletionData.cs
rename to src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlCompletionData.cs
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlCompletionDataCollection.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlCompletionDataCollection.cs
similarity index 100%
rename from src/AddIns/DisplayBindings/XmlEditor/Project/XmlCompletionDataCollection.cs
rename to src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlCompletionDataCollection.cs
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlCompletionDataImageList.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlCompletionDataImageList.cs
similarity index 100%
rename from src/AddIns/DisplayBindings/XmlEditor/Project/XmlCompletionDataImageList.cs
rename to src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlCompletionDataImageList.cs
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlCompletionDataProvider.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlCompletionDataProvider.cs
similarity index 100%
rename from src/AddIns/DisplayBindings/XmlEditor/Project/XmlCompletionDataProvider.cs
rename to src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlCompletionDataProvider.cs
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlDisplayBinding.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlDisplayBinding.cs
similarity index 100%
rename from src/AddIns/DisplayBindings/XmlEditor/Project/XmlDisplayBinding.cs
rename to src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlDisplayBinding.cs
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditorAddInOptions.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlEditorAddInOptions.cs
similarity index 100%
rename from src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditorAddInOptions.cs
rename to src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlEditorAddInOptions.cs
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditorControl.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlEditorControl.cs
similarity index 100%
rename from src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditorControl.cs
rename to src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlEditorControl.cs
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditorOptionsPanel.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlEditorOptionsPanel.cs
similarity index 95%
rename from src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditorOptionsPanel.cs
rename to src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlEditorOptionsPanel.cs
index b83455d781..1fb76537b9 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditorOptionsPanel.cs
+++ b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlEditorOptionsPanel.cs
@@ -28,7 +28,7 @@ namespace ICSharpCode.XmlEditor
 		/// </summary>
 		public override void LoadPanelContents()
 		{
-			SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("ICSharpCode.XmlEditor.XmlEditorOptionsPanel.xfrm"));
+			SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("ICSharpCode.XmlEditor.Resources.XmlEditorOptionsPanel.xfrm"));
 				
 			((CheckBox)ControlDictionary[showAttributesWhenFoldedCheckBoxName]).Checked = XmlEditorAddInOptions.ShowAttributesWhenFolded;
 			((CheckBox)ControlDictionary[showSchemaAnnotationCheckBoxName]).Checked = XmlEditorAddInOptions.ShowSchemaAnnotation;		
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlElementPath.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlElementPath.cs
similarity index 100%
rename from src/AddIns/DisplayBindings/XmlEditor/Project/XmlElementPath.cs
rename to src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlElementPath.cs
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlFoldingStrategy.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlFoldingStrategy.cs
similarity index 100%
rename from src/AddIns/DisplayBindings/XmlEditor/Project/XmlFoldingStrategy.cs
rename to src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlFoldingStrategy.cs
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlParser.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlParser.cs
similarity index 100%
rename from src/AddIns/DisplayBindings/XmlEditor/Project/XmlParser.cs
rename to src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlParser.cs
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlSchemaAssociation.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemaAssociation.cs
similarity index 100%
rename from src/AddIns/DisplayBindings/XmlEditor/Project/XmlSchemaAssociation.cs
rename to src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemaAssociation.cs
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlSchemaAssociationListBoxItem.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemaAssociationListBoxItem.cs
similarity index 100%
rename from src/AddIns/DisplayBindings/XmlEditor/Project/XmlSchemaAssociationListBoxItem.cs
rename to src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemaAssociationListBoxItem.cs
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlSchemaCompletionData.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemaCompletionData.cs
similarity index 100%
rename from src/AddIns/DisplayBindings/XmlEditor/Project/XmlSchemaCompletionData.cs
rename to src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemaCompletionData.cs
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlSchemaCompletionDataCollection.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemaCompletionDataCollection.cs
similarity index 100%
rename from src/AddIns/DisplayBindings/XmlEditor/Project/XmlSchemaCompletionDataCollection.cs
rename to src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemaCompletionDataCollection.cs
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlSchemaListBoxItem.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemaListBoxItem.cs
similarity index 100%
rename from src/AddIns/DisplayBindings/XmlEditor/Project/XmlSchemaListBoxItem.cs
rename to src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemaListBoxItem.cs
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlSchemaManager.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemaManager.cs
similarity index 100%
rename from src/AddIns/DisplayBindings/XmlEditor/Project/XmlSchemaManager.cs
rename to src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemaManager.cs
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlSchemasPanel.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemasPanel.cs
similarity index 99%
rename from src/AddIns/DisplayBindings/XmlEditor/Project/XmlSchemasPanel.cs
rename to src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemasPanel.cs
index 26f5971b88..ec0e297ecf 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlSchemasPanel.cs
+++ b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemasPanel.cs
@@ -45,7 +45,7 @@ namespace ICSharpCode.XmlEditor
 		/// </summary>
 		public override void LoadPanelContents()
 		{
-			SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("ICSharpCode.XmlEditor.XmlSchemasPanel.xfrm"));
+			SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("ICSharpCode.XmlEditor.Resources.XmlSchemasPanel.xfrm"));
 			
 			schemaListBox = (ListBox)ControlDictionary["schemaListBox"];
 			schemaListBox.DrawMode = DrawMode.OwnerDrawFixed;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlView.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlView.cs
similarity index 100%
rename from src/AddIns/DisplayBindings/XmlEditor/Project/XmlView.cs
rename to src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlView.cs
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.addin b/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.addin
index 98027459f6..9072f51359 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.addin
+++ b/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.addin
@@ -7,7 +7,7 @@
 	
 	<Runtime>
 		<Import assembly = "XmlEditor.dll"/>
-		<Import assembly = "/ICSharpCode.SharpDevelop"/>
+		<Import assembly = ":ICSharpCode.SharpDevelop"/>
 	</Runtime>
 	
 	<!-- Xml Editor View -->
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.csproj b/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.csproj
index 6f691c78d7..0dcd4feb1c 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.csproj
+++ b/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.csproj
@@ -36,38 +36,38 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="XmlEditorControl.cs" />
-    <Compile Include="XmlCompletionDataProvider.cs" />
-    <Compile Include="XmlCompletionData.cs" />
-    <Compile Include="XmlCompletionDataImageList.cs" />
-    <Compile Include="XmlParser.cs" />
-    <Compile Include="XmlSchemaCompletionData.cs" />
-    <Compile Include="XmlSchemaCompletionDataCollection.cs" />
-    <Compile Include="XmlFoldingStrategy.cs" />
-    <Compile Include="QualifiedName.cs" />
-    <Compile Include="XmlElementPath.cs" />
-    <Compile Include="QualifiedNameCollection.cs" />
-    <Compile Include="XmlCompletionDataCollection.cs" />
-    <Compile Include="XmlDisplayBinding.cs" />
-    <Compile Include="XmlView.cs" />
-    <Compile Include="XmlSchemaManager.cs" />
-    <Compile Include="Parser.cs" />
-    <Compile Include="ValidateXmlCommand.cs" />
-    <Compile Include="XmlSchemasPanel.cs" />
-    <Compile Include="XmlSchemaListBoxItem.cs" />
-    <Compile Include="CodeCompletionWindow.cs" />
-    <Compile Include="XmlEditorAddInOptions.cs" />
-    <Compile Include="SelectXmlSchemaForm.cs" />
-    <Compile Include="CodeCompletionPopupCommand.cs" />
-    <Compile Include="XmlSchemaAssociation.cs" />
-    <Compile Include="XmlSchemaAssociationListBoxItem.cs" />
-    <Compile Include="XmlEditorOptionsPanel.cs" />
-    <Compile Include="CreateSchemaCommand.cs" />
-    <Compile Include="EncodedStringWriter.cs" />
-    <EmbeddedResource Include="XmlSchemasPanel.xfrm" />
-    <EmbeddedResource Include="SelectXmlSchema.xfrm" />
-    <EmbeddedResource Include="XmlEditorOptionsPanel.xfrm" />
+    <Compile Include="Configuration\AssemblyInfo.cs" />
+    <Compile Include="Src\XmlEditorControl.cs" />
+    <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\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" />
+    <Compile Include="Src\XmlSchemaListBoxItem.cs" />
+    <Compile Include="Src\CodeCompletionWindow.cs" />
+    <Compile Include="Src\XmlEditorAddInOptions.cs" />
+    <Compile Include="Src\SelectXmlSchemaForm.cs" />
+    <Compile Include="Src\CodeCompletionPopupCommand.cs" />
+    <Compile Include="Src\XmlSchemaAssociation.cs" />
+    <Compile Include="Src\XmlSchemaAssociationListBoxItem.cs" />
+    <Compile Include="Src\XmlEditorOptionsPanel.cs" />
+    <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" />
     <None Include="XmlEditor.addin">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/Runtime.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/Runtime.cs
index d470bcb7ac..4011f991eb 100644
--- a/src/Main/Core/Project/Src/AddInTree/AddIn/Runtime.cs
+++ b/src/Main/Core/Project/Src/AddInTree/AddIn/Runtime.cs
@@ -45,7 +45,7 @@ namespace ICSharpCode.Core
 					isAssemblyLoaded = true;
 
 					try {
-						if (assembly[0] == '/') {
+						if (assembly[0] == ':') {
 							loadedAssembly = System.Reflection.Assembly.Load(assembly.Substring(1));
 						} else {
 							loadedAssembly = System.Reflection.Assembly.LoadFrom(Path.Combine(hintPath, assembly));