diff --git a/SharpTreeView/FlatListTreeNode.cs b/ICSharpCode.ILSpyX/TreeView/FlatListTreeNode.cs
similarity index 99%
rename from SharpTreeView/FlatListTreeNode.cs
rename to ICSharpCode.ILSpyX/TreeView/FlatListTreeNode.cs
index 6ae54e74e..f63898278 100644
--- a/SharpTreeView/FlatListTreeNode.cs
+++ b/ICSharpCode.ILSpyX/TreeView/FlatListTreeNode.cs
@@ -20,7 +20,9 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 
-namespace ICSharpCode.TreeView
+#nullable disable
+
+namespace ICSharpCode.ILSpyX.TreeView
 {
 	// This part of SharpTreeNode controls the 'flat list' data structure, which emulates
 	// a big flat list containing the whole tree; allowing access by visible index.
diff --git a/SharpTreeView/PlatformAbstractions/IPlatformDataObject.cs b/ICSharpCode.ILSpyX/TreeView/PlatformAbstractions/IPlatformDataObject.cs
similarity index 72%
rename from SharpTreeView/PlatformAbstractions/IPlatformDataObject.cs
rename to ICSharpCode.ILSpyX/TreeView/PlatformAbstractions/IPlatformDataObject.cs
index 5834d7d3b..5c2f4a1ef 100644
--- a/SharpTreeView/PlatformAbstractions/IPlatformDataObject.cs
+++ b/ICSharpCode.ILSpyX/TreeView/PlatformAbstractions/IPlatformDataObject.cs
@@ -1,4 +1,4 @@
-namespace ICSharpCode.TreeView.PlatformAbstractions
+namespace ICSharpCode.ILSpyX.TreeView.PlatformAbstractions
 {
 	public interface IPlatformDataObject
 	{
diff --git a/SharpTreeView/PlatformAbstractions/IPlatformDragDrop.cs b/ICSharpCode.ILSpyX/TreeView/PlatformAbstractions/IPlatformDragDrop.cs
similarity index 70%
rename from SharpTreeView/PlatformAbstractions/IPlatformDragDrop.cs
rename to ICSharpCode.ILSpyX/TreeView/PlatformAbstractions/IPlatformDragDrop.cs
index 198c05be0..c554f4f27 100644
--- a/SharpTreeView/PlatformAbstractions/IPlatformDragDrop.cs
+++ b/ICSharpCode.ILSpyX/TreeView/PlatformAbstractions/IPlatformDragDrop.cs
@@ -1,4 +1,4 @@
-namespace ICSharpCode.TreeView.PlatformAbstractions
+namespace ICSharpCode.ILSpyX.TreeView.PlatformAbstractions
 {
 	public interface IPlatformDragDrop
 	{
diff --git a/SharpTreeView/PlatformAbstractions/IPlatformDragEventArgs.cs b/ICSharpCode.ILSpyX/TreeView/PlatformAbstractions/IPlatformDragEventArgs.cs
similarity index 68%
rename from SharpTreeView/PlatformAbstractions/IPlatformDragEventArgs.cs
rename to ICSharpCode.ILSpyX/TreeView/PlatformAbstractions/IPlatformDragEventArgs.cs
index 455ba3aea..543480203 100644
--- a/SharpTreeView/PlatformAbstractions/IPlatformDragEventArgs.cs
+++ b/ICSharpCode.ILSpyX/TreeView/PlatformAbstractions/IPlatformDragEventArgs.cs
@@ -1,4 +1,4 @@
-namespace ICSharpCode.TreeView.PlatformAbstractions
+namespace ICSharpCode.ILSpyX.TreeView.PlatformAbstractions
 {
 	public interface IPlatformDragEventArgs
 	{
diff --git a/SharpTreeView/PlatformAbstractions/IPlatformRoutedEventArgs.cs b/ICSharpCode.ILSpyX/TreeView/PlatformAbstractions/IPlatformRoutedEventArgs.cs
similarity index 56%
rename from SharpTreeView/PlatformAbstractions/IPlatformRoutedEventArgs.cs
rename to ICSharpCode.ILSpyX/TreeView/PlatformAbstractions/IPlatformRoutedEventArgs.cs
index 6f08d77d6..7d1b8ec30 100644
--- a/SharpTreeView/PlatformAbstractions/IPlatformRoutedEventArgs.cs
+++ b/ICSharpCode.ILSpyX/TreeView/PlatformAbstractions/IPlatformRoutedEventArgs.cs
@@ -1,4 +1,4 @@
-namespace ICSharpCode.TreeView.PlatformAbstractions
+namespace ICSharpCode.ILSpyX.TreeView.PlatformAbstractions
 {
 	public interface IPlatformRoutedEventArgs
 	{
diff --git a/SharpTreeView/PlatformAbstractions/ITreeNodeImagesProvider.cs b/ICSharpCode.ILSpyX/TreeView/PlatformAbstractions/ITreeNodeImagesProvider.cs
similarity index 56%
rename from SharpTreeView/PlatformAbstractions/ITreeNodeImagesProvider.cs
rename to ICSharpCode.ILSpyX/TreeView/PlatformAbstractions/ITreeNodeImagesProvider.cs
index 3cf7e4e05..acd2e85d2 100644
--- a/SharpTreeView/PlatformAbstractions/ITreeNodeImagesProvider.cs
+++ b/ICSharpCode.ILSpyX/TreeView/PlatformAbstractions/ITreeNodeImagesProvider.cs
@@ -1,4 +1,4 @@
-namespace ICSharpCode.TreeView.PlatformAbstractions
+namespace ICSharpCode.ILSpyX.TreeView.PlatformAbstractions
 {
 	public interface ITreeNodeImagesProvider
 	{
diff --git a/SharpTreeView/PlatformAbstractions/XPlatDragDropEffects.cs b/ICSharpCode.ILSpyX/TreeView/PlatformAbstractions/XPlatDragDropEffects.cs
similarity index 92%
rename from SharpTreeView/PlatformAbstractions/XPlatDragDropEffects.cs
rename to ICSharpCode.ILSpyX/TreeView/PlatformAbstractions/XPlatDragDropEffects.cs
index 637e613ed..fdfd89369 100644
--- a/SharpTreeView/PlatformAbstractions/XPlatDragDropEffects.cs
+++ b/ICSharpCode.ILSpyX/TreeView/PlatformAbstractions/XPlatDragDropEffects.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace ICSharpCode.TreeView.PlatformAbstractions
+namespace ICSharpCode.ILSpyX.TreeView.PlatformAbstractions
 {
 	//
 	// Summary:
diff --git a/SharpTreeView/SharpTreeNode.cs b/ICSharpCode.ILSpyX/TreeView/SharpTreeNode.cs
similarity index 99%
rename from SharpTreeView/SharpTreeNode.cs
rename to ICSharpCode.ILSpyX/TreeView/SharpTreeNode.cs
index 139930d5f..79686bdba 100644
--- a/SharpTreeView/SharpTreeNode.cs
+++ b/ICSharpCode.ILSpyX/TreeView/SharpTreeNode.cs
@@ -23,9 +23,11 @@ using System.ComponentModel;
 using System.Diagnostics;
 using System.Linq;
 
-using ICSharpCode.TreeView.PlatformAbstractions;
+#nullable disable
 
-namespace ICSharpCode.TreeView
+using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions;
+
+namespace ICSharpCode.ILSpyX.TreeView
 {
 	public partial class SharpTreeNode : INotifyPropertyChanged
 	{
diff --git a/SharpTreeView/SharpTreeNodeCollection.cs b/ICSharpCode.ILSpyX/TreeView/SharpTreeNodeCollection.cs
similarity index 99%
rename from SharpTreeView/SharpTreeNodeCollection.cs
rename to ICSharpCode.ILSpyX/TreeView/SharpTreeNodeCollection.cs
index f21d46686..8b69a9553 100644
--- a/SharpTreeView/SharpTreeNodeCollection.cs
+++ b/ICSharpCode.ILSpyX/TreeView/SharpTreeNodeCollection.cs
@@ -22,7 +22,9 @@ using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Linq;
 
-namespace ICSharpCode.TreeView
+#nullable disable
+
+namespace ICSharpCode.ILSpyX.TreeView
 {
 	/// <summary>
 	/// Collection that validates that inserted nodes do not have another parent.
diff --git a/SharpTreeView/TreeFlattener.cs b/ICSharpCode.ILSpyX/TreeView/TreeFlattener.cs
similarity index 98%
rename from SharpTreeView/TreeFlattener.cs
rename to ICSharpCode.ILSpyX/TreeView/TreeFlattener.cs
index 39175f470..46cc5cafd 100644
--- a/SharpTreeView/TreeFlattener.cs
+++ b/ICSharpCode.ILSpyX/TreeView/TreeFlattener.cs
@@ -22,7 +22,9 @@ using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Diagnostics;
 
-namespace ICSharpCode.TreeView
+#nullable disable
+
+namespace ICSharpCode.ILSpyX.TreeView
 {
 	sealed class TreeFlattener : IList, INotifyCollectionChanged
 	{
diff --git a/SharpTreeView/TreeTraversal.cs b/ICSharpCode.ILSpyX/TreeView/TreeTraversal.cs
similarity index 98%
rename from SharpTreeView/TreeTraversal.cs
rename to ICSharpCode.ILSpyX/TreeView/TreeTraversal.cs
index ef196a61d..25034616d 100644
--- a/SharpTreeView/TreeTraversal.cs
+++ b/ICSharpCode.ILSpyX/TreeView/TreeTraversal.cs
@@ -19,7 +19,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace ICSharpCode.TreeView
+namespace ICSharpCode.ILSpyX.TreeView
 {
 	/// <summary>
 	/// Static helper methods for traversing trees.
diff --git a/ILSpy.Wpf.slnf b/ILSpy.Wpf.slnf
index 831214ce7..4e5db53cc 100644
--- a/ILSpy.Wpf.slnf
+++ b/ILSpy.Wpf.slnf
@@ -12,7 +12,6 @@
 			"ILSpy.ReadyToRun\\ILSpy.ReadyToRun.csproj",
 			"ILSpy.Tests\\ILSpy.Tests.csproj",
 			"ILSpy\\ILSpy.csproj",
-			"SharpTreeView\\ICSharpCode.TreeView.csproj",
 			"TestPlugin\\TestPlugin.csproj"
 		]
 	}
diff --git a/ILSpy.sln b/ILSpy.sln
index 604606ee3..5d4e13a93 100644
--- a/ILSpy.sln
+++ b/ILSpy.sln
@@ -12,8 +12,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doc", "doc", "{F45DB999-7E7
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILSpy", "ILSpy\ILSpy.csproj", "{1E85EFF9-E370-4683-83E4-8A3D063FF791}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.TreeView", "SharpTreeView\ICSharpCode.TreeView.csproj", "{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.Decompiler", "ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj", "{984CC812-9470-4A13-AFF9-CC44068D666C}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.Decompiler.Tests", "ICSharpCode.Decompiler.Tests\ICSharpCode.Decompiler.Tests.csproj", "{FEC0DA52-C4A6-4710-BE36-B484A20C5E22}"
@@ -36,7 +34,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.Decompiler.Test
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.ILSpyX", "ICSharpCode.ILSpyX\ICSharpCode.ILSpyX.csproj", "{F8EFCF9D-B9A3-4BA0-A1B2-B026A71DAC22}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.BamlDecompiler", "ICSharpCode.BamlDecompiler\ICSharpCode.BamlDecompiler.csproj", "{81A30182-3378-4952-8880-F44822390040}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.BamlDecompiler", "ICSharpCode.BamlDecompiler\ICSharpCode.BamlDecompiler.csproj", "{81A30182-3378-4952-8880-F44822390040}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -48,10 +46,6 @@ Global
 		{1E85EFF9-E370-4683-83E4-8A3D063FF791}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1E85EFF9-E370-4683-83E4-8A3D063FF791}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1E85EFF9-E370-4683-83E4-8A3D063FF791}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{984CC812-9470-4A13-AFF9-CC44068D666C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{984CC812-9470-4A13-AFF9-CC44068D666C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{984CC812-9470-4A13-AFF9-CC44068D666C}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/ILSpy/Analyzers/AnalyzerEntityTreeNode.cs b/ILSpy/Analyzers/AnalyzerEntityTreeNode.cs
index 6daa6448f..213624ee1 100644
--- a/ILSpy/Analyzers/AnalyzerEntityTreeNode.cs
+++ b/ILSpy/Analyzers/AnalyzerEntityTreeNode.cs
@@ -22,8 +22,8 @@ using System.Windows;
 using ICSharpCode.Decompiler.TypeSystem;
 using ICSharpCode.ILSpy.TreeNodes;
 using ICSharpCode.ILSpyX;
-using ICSharpCode.TreeView;
-using ICSharpCode.TreeView.PlatformAbstractions;
+using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions;
+using ICSharpCode.ILSpyX.TreeView;
 
 namespace ICSharpCode.ILSpy.Analyzers
 {
diff --git a/ILSpy/Analyzers/AnalyzerTreeNode.cs b/ILSpy/Analyzers/AnalyzerTreeNode.cs
index 5f9b39650..e2946c3e0 100644
--- a/ILSpy/Analyzers/AnalyzerTreeNode.cs
+++ b/ILSpy/Analyzers/AnalyzerTreeNode.cs
@@ -21,7 +21,7 @@ using System.Collections.Specialized;
 using System.Linq;
 
 using ICSharpCode.ILSpyX;
-using ICSharpCode.TreeView;
+using ICSharpCode.ILSpyX.TreeView;
 
 namespace ICSharpCode.ILSpy.Analyzers
 {
@@ -56,7 +56,7 @@ namespace ICSharpCode.ILSpy.Analyzers
 			DeleteCore();
 		}
 
-		protected override void OnChildrenChanged(NotifyCollectionChangedEventArgs e)
+		internal protected override void OnChildrenChanged(NotifyCollectionChangedEventArgs e)
 		{
 			if (e.NewItems != null)
 			{
diff --git a/ILSpy/Analyzers/AnalyzerTreeView.cs b/ILSpy/Analyzers/AnalyzerTreeView.cs
index 500f40f79..4e40239ea 100644
--- a/ILSpy/Analyzers/AnalyzerTreeView.cs
+++ b/ILSpy/Analyzers/AnalyzerTreeView.cs
@@ -27,7 +27,8 @@ using ICSharpCode.ILSpy.Analyzers.TreeNodes;
 using ICSharpCode.ILSpy.Docking;
 using ICSharpCode.ILSpy.ViewModels;
 using ICSharpCode.ILSpyX;
-using ICSharpCode.TreeView;
+using ICSharpCode.ILSpy.Controls.TreeView;
+using ICSharpCode.ILSpyX.TreeView;
 
 namespace ICSharpCode.ILSpy.Analyzers
 {
diff --git a/ILSpy/Analyzers/TreeNodes/AnalyzedModuleTreeNode.cs b/ILSpy/Analyzers/TreeNodes/AnalyzedModuleTreeNode.cs
index db2c105e0..e7f83f638 100644
--- a/ILSpy/Analyzers/TreeNodes/AnalyzedModuleTreeNode.cs
+++ b/ILSpy/Analyzers/TreeNodes/AnalyzedModuleTreeNode.cs
@@ -22,7 +22,7 @@ using System.Windows;
 
 using ICSharpCode.Decompiler.TypeSystem;
 using ICSharpCode.ILSpyX.Analyzers;
-using ICSharpCode.TreeView.PlatformAbstractions;
+using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions;
 
 namespace ICSharpCode.ILSpy.Analyzers.TreeNodes
 {
diff --git a/ILSpy/App.xaml.cs b/ILSpy/App.xaml.cs
index c34dd9b39..77722c3ae 100644
--- a/ILSpy/App.xaml.cs
+++ b/ILSpy/App.xaml.cs
@@ -34,13 +34,13 @@ using ICSharpCode.ILSpy.AppEnv;
 using ICSharpCode.ILSpy.Options;
 using ICSharpCode.ILSpyX.Analyzers;
 using ICSharpCode.ILSpyX.Settings;
-using ICSharpCode.TreeView;
 
 using Medo.Application;
 
 using Microsoft.VisualStudio.Composition;
 
 using TomsToolbox.Wpf.Styles;
+using ICSharpCode.ILSpyX.TreeView;
 
 namespace ICSharpCode.ILSpy
 {
diff --git a/ILSpy/Commands/SaveCodeContextMenuEntry.cs b/ILSpy/Commands/SaveCodeContextMenuEntry.cs
index 13b06a3b3..5ce79ee10 100644
--- a/ILSpy/Commands/SaveCodeContextMenuEntry.cs
+++ b/ILSpy/Commands/SaveCodeContextMenuEntry.cs
@@ -27,9 +27,9 @@ using ICSharpCode.ILSpy.Options;
 using ICSharpCode.ILSpy.Properties;
 using ICSharpCode.ILSpy.TreeNodes;
 using ICSharpCode.ILSpy.ViewModels;
-using ICSharpCode.TreeView;
 
 using Microsoft.Win32;
+using ICSharpCode.ILSpyX.TreeView;
 
 namespace ICSharpCode.ILSpy.TextView
 {
diff --git a/ILSpy/Commands/SortAssemblyListCommand.cs b/ILSpy/Commands/SortAssemblyListCommand.cs
index 29cd8ae05..110a60b8a 100644
--- a/ILSpy/Commands/SortAssemblyListCommand.cs
+++ b/ILSpy/Commands/SortAssemblyListCommand.cs
@@ -21,7 +21,7 @@ using System.Collections.Generic;
 
 using ICSharpCode.ILSpy.Properties;
 using ICSharpCode.ILSpyX;
-using ICSharpCode.TreeView;
+using ICSharpCode.ILSpyX.TreeView;
 
 namespace ICSharpCode.ILSpy
 {
diff --git a/ILSpy/ContextMenuEntry.cs b/ILSpy/ContextMenuEntry.cs
index 73aa3ba73..9ce4416a2 100644
--- a/ILSpy/ContextMenuEntry.cs
+++ b/ILSpy/ContextMenuEntry.cs
@@ -28,7 +28,8 @@ using System.Windows.Media;
 using ICSharpCode.AvalonEdit;
 using ICSharpCode.ILSpy.TextView;
 using ICSharpCode.ILSpyX.Search;
-using ICSharpCode.TreeView;
+using ICSharpCode.ILSpy.Controls.TreeView;
+using ICSharpCode.ILSpyX.TreeView;
 
 namespace ICSharpCode.ILSpy
 {
diff --git a/SharpTreeView/Converters.cs b/ILSpy/Controls/TreeView/Converters.cs
similarity index 97%
rename from SharpTreeView/Converters.cs
rename to ILSpy/Controls/TreeView/Converters.cs
index 87c31ee37..401d9026c 100644
--- a/SharpTreeView/Converters.cs
+++ b/ILSpy/Controls/TreeView/Converters.cs
@@ -22,7 +22,7 @@ using System.Windows;
 using System.Windows.Data;
 using System.Windows.Markup;
 
-namespace ICSharpCode.TreeView
+namespace ICSharpCode.ILSpy.Controls.TreeView
 {
 	public class CollapsedWhenFalse : MarkupExtension, IValueConverter
 	{
diff --git a/SharpTreeView/EditTextBox.cs b/ILSpy/Controls/TreeView/EditTextBox.cs
similarity index 96%
rename from SharpTreeView/EditTextBox.cs
rename to ILSpy/Controls/TreeView/EditTextBox.cs
index 965c035c8..0f37b8b56 100644
--- a/SharpTreeView/EditTextBox.cs
+++ b/ILSpy/Controls/TreeView/EditTextBox.cs
@@ -20,7 +20,9 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 
-namespace ICSharpCode.TreeView
+using ICSharpCode.ILSpyX.TreeView;
+
+namespace ICSharpCode.ILSpy.Controls.TreeView
 {
 	class EditTextBox : TextBox
 	{
diff --git a/SharpTreeView/ExtensionMethods.cs b/ILSpy/Controls/TreeView/ExtensionMethods.cs
similarity index 97%
rename from SharpTreeView/ExtensionMethods.cs
rename to ILSpy/Controls/TreeView/ExtensionMethods.cs
index 6ae130d25..410169272 100644
--- a/SharpTreeView/ExtensionMethods.cs
+++ b/ILSpy/Controls/TreeView/ExtensionMethods.cs
@@ -22,7 +22,7 @@ using System.Linq;
 using System.Windows;
 using System.Windows.Media;
 
-namespace ICSharpCode.TreeView
+namespace ICSharpCode.ILSpy.Controls.TreeView
 {
 	static class ExtensionMethods
 	{
diff --git a/SharpTreeView/GeneralAdorner.cs b/ILSpy/Controls/TreeView/GeneralAdorner.cs
similarity index 97%
rename from SharpTreeView/GeneralAdorner.cs
rename to ILSpy/Controls/TreeView/GeneralAdorner.cs
index e1188bf41..4e75b6352 100644
--- a/SharpTreeView/GeneralAdorner.cs
+++ b/ILSpy/Controls/TreeView/GeneralAdorner.cs
@@ -20,7 +20,7 @@ using System.Windows;
 using System.Windows.Documents;
 using System.Windows.Media;
 
-namespace ICSharpCode.TreeView
+namespace ICSharpCode.ILSpy.Controls.TreeView
 {
 	public class GeneralAdorner : Adorner
 	{
diff --git a/SharpTreeView/InsertMarker.cs b/ILSpy/Controls/TreeView/InsertMarker.cs
similarity index 96%
rename from SharpTreeView/InsertMarker.cs
rename to ILSpy/Controls/TreeView/InsertMarker.cs
index 7bbc6bb27..11ecde55c 100644
--- a/SharpTreeView/InsertMarker.cs
+++ b/ILSpy/Controls/TreeView/InsertMarker.cs
@@ -19,7 +19,7 @@
 using System.Windows;
 using System.Windows.Controls;
 
-namespace ICSharpCode.TreeView
+namespace ICSharpCode.ILSpy.Controls.TreeView
 {
 	public class InsertMarker : Control
 	{
diff --git a/SharpTreeView/LinesRenderer.cs b/ILSpy/Controls/TreeView/LinesRenderer.cs
similarity index 98%
rename from SharpTreeView/LinesRenderer.cs
rename to ILSpy/Controls/TreeView/LinesRenderer.cs
index 66aac78f8..ca62d3b31 100644
--- a/SharpTreeView/LinesRenderer.cs
+++ b/ILSpy/Controls/TreeView/LinesRenderer.cs
@@ -20,7 +20,7 @@ using System.Diagnostics;
 using System.Windows;
 using System.Windows.Media;
 
-namespace ICSharpCode.TreeView
+namespace ICSharpCode.ILSpy.Controls.TreeView
 {
 	class LinesRenderer : FrameworkElement
 	{
diff --git a/SharpTreeView/SharpGridView.cs b/ILSpy/Controls/TreeView/SharpGridView.cs
similarity index 97%
rename from SharpTreeView/SharpGridView.cs
rename to ILSpy/Controls/TreeView/SharpGridView.cs
index 9487d936d..c48f0d3a1 100644
--- a/SharpTreeView/SharpGridView.cs
+++ b/ILSpy/Controls/TreeView/SharpGridView.cs
@@ -19,7 +19,7 @@
 using System.Windows;
 using System.Windows.Controls;
 
-namespace ICSharpCode.TreeView
+namespace ICSharpCode.ILSpy.Controls.TreeView
 {
 	public class SharpGridView : GridView
 	{
diff --git a/SharpTreeView/SharpTreeNodeView.cs b/ILSpy/Controls/TreeView/SharpTreeNodeView.cs
similarity index 98%
rename from SharpTreeView/SharpTreeNodeView.cs
rename to ILSpy/Controls/TreeView/SharpTreeNodeView.cs
index 30c8c13a1..a7cca8838 100644
--- a/SharpTreeView/SharpTreeNodeView.cs
+++ b/ILSpy/Controls/TreeView/SharpTreeNodeView.cs
@@ -16,7 +16,6 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-using System;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Windows;
@@ -24,7 +23,9 @@ using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Media;
 
-namespace ICSharpCode.TreeView
+using ICSharpCode.ILSpyX.TreeView;
+
+namespace ICSharpCode.ILSpy.Controls.TreeView
 {
 	public class SharpTreeNodeView : Control
 	{
diff --git a/SharpTreeView/SharpTreeView.cs b/ILSpy/Controls/TreeView/SharpTreeView.cs
similarity index 99%
rename from SharpTreeView/SharpTreeView.cs
rename to ILSpy/Controls/TreeView/SharpTreeView.cs
index 92e969e46..3d4e3e7e6 100644
--- a/SharpTreeView/SharpTreeView.cs
+++ b/ILSpy/Controls/TreeView/SharpTreeView.cs
@@ -28,9 +28,9 @@ using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Threading;
 
-using ICSharpCode.TreeView.PlatformAbstractions.WpfWindows;
+using ICSharpCode.ILSpyX.TreeView;
 
-namespace ICSharpCode.TreeView
+namespace ICSharpCode.ILSpy.Controls.TreeView
 {
 	public class SharpTreeView : ListView
 	{
diff --git a/SharpTreeView/Themes/Generic.xaml b/ILSpy/Controls/TreeView/SharpTreeView.xaml
similarity index 99%
rename from SharpTreeView/Themes/Generic.xaml
rename to ILSpy/Controls/TreeView/SharpTreeView.xaml
index 5d3109b35..6e87b9e67 100644
--- a/SharpTreeView/Themes/Generic.xaml
+++ b/ILSpy/Controls/TreeView/SharpTreeView.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:Default="clr-namespace:ICSharpCode.TreeView"
+                    xmlns:Default="clr-namespace:ICSharpCode.ILSpy.Controls.TreeView"
                     xmlns:styles="urn:TomsToolbox.Wpf.Styles">
 
     <Style x:Key="ExpandCollapseToggleStyle"
diff --git a/SharpTreeView/SharpTreeViewAutomationPeer.cs b/ILSpy/Controls/TreeView/SharpTreeViewAutomationPeer.cs
similarity index 96%
rename from SharpTreeView/SharpTreeViewAutomationPeer.cs
rename to ILSpy/Controls/TreeView/SharpTreeViewAutomationPeer.cs
index 0f8967b03..8175f35fe 100644
--- a/SharpTreeView/SharpTreeViewAutomationPeer.cs
+++ b/ILSpy/Controls/TreeView/SharpTreeViewAutomationPeer.cs
@@ -18,7 +18,7 @@
 
 using System.Windows.Automation.Peers;
 
-namespace ICSharpCode.TreeView
+namespace ICSharpCode.ILSpy.Controls.TreeView
 {
 	class SharpTreeViewAutomationPeer : FrameworkElementAutomationPeer
 	{
diff --git a/SharpTreeView/SharpTreeViewItem.cs b/ILSpy/Controls/TreeView/SharpTreeViewItem.cs
similarity index 97%
rename from SharpTreeView/SharpTreeViewItem.cs
rename to ILSpy/Controls/TreeView/SharpTreeViewItem.cs
index 8814dc115..5ec32d855 100644
--- a/SharpTreeView/SharpTreeViewItem.cs
+++ b/ILSpy/Controls/TreeView/SharpTreeViewItem.cs
@@ -22,9 +22,9 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 
-using ICSharpCode.TreeView.PlatformAbstractions.WpfWindows;
+using ICSharpCode.ILSpyX.TreeView;
 
-namespace ICSharpCode.TreeView
+namespace ICSharpCode.ILSpy.Controls.TreeView
 {
 	public class SharpTreeViewItem : ListViewItem
 	{
diff --git a/SharpTreeView/SharpTreeViewItemAutomationPeer.cs b/ILSpy/Controls/TreeView/SharpTreeViewItemAutomationPeer.cs
similarity index 97%
rename from SharpTreeView/SharpTreeViewItemAutomationPeer.cs
rename to ILSpy/Controls/TreeView/SharpTreeViewItemAutomationPeer.cs
index 174f5b0cc..ca38c4ea4 100644
--- a/SharpTreeView/SharpTreeViewItemAutomationPeer.cs
+++ b/ILSpy/Controls/TreeView/SharpTreeViewItemAutomationPeer.cs
@@ -22,7 +22,9 @@ using System.Windows.Automation;
 using System.Windows.Automation.Peers;
 using System.Windows.Automation.Provider;
 
-namespace ICSharpCode.TreeView
+using ICSharpCode.ILSpyX.TreeView;
+
+namespace ICSharpCode.ILSpy.Controls.TreeView
 {
 	class SharpTreeViewItemAutomationPeer : FrameworkElementAutomationPeer, IExpandCollapseProvider
 	{
diff --git a/SharpTreeView/SharpTreeViewTextSearch.cs b/ILSpy/Controls/TreeView/SharpTreeViewTextSearch.cs
similarity index 98%
rename from SharpTreeView/SharpTreeViewTextSearch.cs
rename to ILSpy/Controls/TreeView/SharpTreeViewTextSearch.cs
index 08e3c4ec6..f48638359 100644
--- a/SharpTreeView/SharpTreeViewTextSearch.cs
+++ b/ILSpy/Controls/TreeView/SharpTreeViewTextSearch.cs
@@ -22,7 +22,9 @@ using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Threading;
 
-namespace ICSharpCode.TreeView
+using ICSharpCode.ILSpyX.TreeView;
+
+namespace ICSharpCode.ILSpy.Controls.TreeView
 {
 	/// <summary>
 	/// Custom TextSearch-implementation.
diff --git a/SharpTreeView/PlatformAbstractions/WpfWindows/WpfWindowsDataObject.cs b/ILSpy/Controls/TreeView/WpfWindowsDataObject.cs
similarity index 83%
rename from SharpTreeView/PlatformAbstractions/WpfWindows/WpfWindowsDataObject.cs
rename to ILSpy/Controls/TreeView/WpfWindowsDataObject.cs
index 3dfa20f75..6d2655604 100644
--- a/SharpTreeView/PlatformAbstractions/WpfWindows/WpfWindowsDataObject.cs
+++ b/ILSpy/Controls/TreeView/WpfWindowsDataObject.cs
@@ -1,6 +1,8 @@
 using System.Windows;
 
-namespace ICSharpCode.TreeView.PlatformAbstractions.WpfWindows
+using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions;
+
+namespace ICSharpCode.ILSpy.Controls.TreeView
 {
 	public class WpfWindowsDataObject : IPlatformDataObject
 	{
diff --git a/SharpTreeView/PlatformAbstractions/WpfWindows/WpfWindowsDragDropManager.cs b/ILSpy/Controls/TreeView/WpfWindowsDragDropManager.cs
similarity index 76%
rename from SharpTreeView/PlatformAbstractions/WpfWindows/WpfWindowsDragDropManager.cs
rename to ILSpy/Controls/TreeView/WpfWindowsDragDropManager.cs
index 7b63ca89e..99d64bb77 100644
--- a/SharpTreeView/PlatformAbstractions/WpfWindows/WpfWindowsDragDropManager.cs
+++ b/ILSpy/Controls/TreeView/WpfWindowsDragDropManager.cs
@@ -1,6 +1,8 @@
 using System.Windows;
 
-namespace ICSharpCode.TreeView.PlatformAbstractions.WpfWindows
+using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions;
+
+namespace ICSharpCode.ILSpy.Controls.TreeView
 {
 	public class WpfWindowsDragDropManager : IPlatformDragDrop
 	{
diff --git a/SharpTreeView/PlatformAbstractions/WpfWindows/WpfWindowsDragEventArgs.cs b/ILSpy/Controls/TreeView/WpfWindowsDragEventArgs.cs
similarity index 81%
rename from SharpTreeView/PlatformAbstractions/WpfWindows/WpfWindowsDragEventArgs.cs
rename to ILSpy/Controls/TreeView/WpfWindowsDragEventArgs.cs
index d1657e2e9..c2ca7b59c 100644
--- a/SharpTreeView/PlatformAbstractions/WpfWindows/WpfWindowsDragEventArgs.cs
+++ b/ILSpy/Controls/TreeView/WpfWindowsDragEventArgs.cs
@@ -1,6 +1,8 @@
 using System.Windows;
 
-namespace ICSharpCode.TreeView.PlatformAbstractions.WpfWindows
+using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions;
+
+namespace ICSharpCode.ILSpy.Controls.TreeView
 {
 	public class WpfWindowsDragEventArgs : IPlatformDragEventArgs
 	{
diff --git a/SharpTreeView/PlatformAbstractions/WpfWindows/WpfWindowsRoutedEventArgs.cs b/ILSpy/Controls/TreeView/WpfWindowsRoutedEventArgs.cs
similarity index 76%
rename from SharpTreeView/PlatformAbstractions/WpfWindows/WpfWindowsRoutedEventArgs.cs
rename to ILSpy/Controls/TreeView/WpfWindowsRoutedEventArgs.cs
index fee88e451..6f3322026 100644
--- a/SharpTreeView/PlatformAbstractions/WpfWindows/WpfWindowsRoutedEventArgs.cs
+++ b/ILSpy/Controls/TreeView/WpfWindowsRoutedEventArgs.cs
@@ -1,6 +1,8 @@
 using System.Windows;
 
-namespace ICSharpCode.TreeView.PlatformAbstractions.WpfWindows
+using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions;
+
+namespace ICSharpCode.ILSpy.Controls.TreeView
 {
 	public class WpfWindowsRoutedEventArgs : IPlatformRoutedEventArgs
 	{
diff --git a/ILSpy/ILSpy.csproj b/ILSpy/ILSpy.csproj
index 0ecb0caad..7b83970f6 100644
--- a/ILSpy/ILSpy.csproj
+++ b/ILSpy/ILSpy.csproj
@@ -86,7 +86,6 @@
   <ItemGroup>
     <ProjectReference Include="..\ICSharpCode.ILSpyX\ICSharpCode.ILSpyX.csproj" />
     <ProjectReference Include="..\ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj" />
-    <ProjectReference Include="..\SharpTreeView\ICSharpCode.TreeView.csproj" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(Configuration)' == 'Debug'">
diff --git a/ILSpy/Images/WpfWindowsTreeNodeImagesProvider.cs b/ILSpy/Images/WpfWindowsTreeNodeImagesProvider.cs
index 73369c126..4b0cb6868 100644
--- a/ILSpy/Images/WpfWindowsTreeNodeImagesProvider.cs
+++ b/ILSpy/Images/WpfWindowsTreeNodeImagesProvider.cs
@@ -1,4 +1,4 @@
-using ICSharpCode.TreeView.PlatformAbstractions;
+using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions;
 
 namespace ICSharpCode.ILSpy
 {
diff --git a/ILSpy/MainWindow.xaml b/ILSpy/MainWindow.xaml
index 0d236371f..e1f84bff9 100644
--- a/ILSpy/MainWindow.xaml
+++ b/ILSpy/MainWindow.xaml
@@ -2,7 +2,9 @@
 <Window
 	x:Class="ICSharpCode.ILSpy.MainWindow"
 	x:ClassModifier="public"
-	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:tv="clr-namespace:ICSharpCode.TreeView;assembly=ICSharpCode.TreeView"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+	xmlns:tv="clr-namespace:ICSharpCode.ILSpy.Controls.TreeView"
 	xmlns:local="clr-namespace:ICSharpCode.ILSpy"
 	xmlns:search="clr-namespace:ICSharpCode.ILSpy.Search"
 	xmlns:avalondock="https://github.com/Dirkster99/AvalonDock"
@@ -144,7 +146,8 @@
 						<Style TargetType="{x:Type MenuItem}" BasedOn="{StaticResource {x:Type MenuItem}}">
 							<Setter Property="Command" Value="{x:Static local:ILSpyCommands.SetTheme}" />
 							<Setter Property="CommandParameter" Value="{Binding}" />
-							<Setter Property="IsCheckable" Value="True" /> <!-- Required by AvalonDock's MenuItem style to show the checkmark -->
+							<Setter Property="IsCheckable" Value="True" />
+							<!-- Required by AvalonDock's MenuItem style to show the checkmark -->
 							<Setter Property="IsChecked">
 								<Setter.Value>
 									<MultiBinding Converter="{x:Static toms:BinaryOperationConverter.Equality}" Mode="OneWay">
diff --git a/ILSpy/MainWindow.xaml.cs b/ILSpy/MainWindow.xaml.cs
index 10525cbb8..e154a67d3 100644
--- a/ILSpy/MainWindow.xaml.cs
+++ b/ILSpy/MainWindow.xaml.cs
@@ -57,9 +57,10 @@ using ICSharpCode.ILSpy.ViewModels;
 using ICSharpCode.ILSpyX;
 using ICSharpCode.ILSpyX.FileLoaders;
 using ICSharpCode.ILSpyX.Settings;
-using ICSharpCode.TreeView;
+using ICSharpCode.ILSpy.Controls.TreeView;
 
 using Microsoft.Win32;
+using ICSharpCode.ILSpyX.TreeView;
 
 namespace ICSharpCode.ILSpy
 {
diff --git a/ILSpy/NavigationState.cs b/ILSpy/NavigationState.cs
index 23ba9a1b4..e7400b40e 100644
--- a/ILSpy/NavigationState.cs
+++ b/ILSpy/NavigationState.cs
@@ -22,7 +22,7 @@ using System.Diagnostics;
 
 using ICSharpCode.ILSpy.TextView;
 using ICSharpCode.ILSpy.ViewModels;
-using ICSharpCode.TreeView;
+using ICSharpCode.ILSpyX.TreeView;
 
 namespace ICSharpCode.ILSpy
 {
diff --git a/ILSpy/Themes/generic.xaml b/ILSpy/Themes/generic.xaml
index de0378c65..0b1b367fb 100644
--- a/ILSpy/Themes/generic.xaml
+++ b/ILSpy/Themes/generic.xaml
@@ -5,8 +5,9 @@
 	<ResourceDictionary.MergedDictionaries>
 		<ResourceDictionary Source="../Controls/SearchBoxStyle.xaml" />
 		<ResourceDictionary Source="../Controls/ZoomScrollViewer.xaml" />
+		<ResourceDictionary Source="../Controls/TreeView/SharpTreeView.xaml" />
 	</ResourceDictionary.MergedDictionaries>
-	
+
 	<!-- SortableGridViewColumn.
 		Displays an up arrow or down arrow in the column header when the grid is sorted using that column.
 	-->
diff --git a/ILSpy/TreeNodes/AssemblyListTreeNode.cs b/ILSpy/TreeNodes/AssemblyListTreeNode.cs
index e3c33beff..9808ddcfd 100644
--- a/ILSpy/TreeNodes/AssemblyListTreeNode.cs
+++ b/ILSpy/TreeNodes/AssemblyListTreeNode.cs
@@ -26,8 +26,8 @@ using ICSharpCode.Decompiler.Metadata;
 using ICSharpCode.Decompiler.TypeSystem;
 using ICSharpCode.Decompiler.Util;
 using ICSharpCode.ILSpyX;
-using ICSharpCode.TreeView;
-using ICSharpCode.TreeView.PlatformAbstractions;
+using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions;
+using ICSharpCode.ILSpyX.TreeView;
 
 namespace ICSharpCode.ILSpy.TreeNodes
 {
@@ -187,7 +187,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 				if (bundle == null)
 					return null;
 				bundle.EnsureLazyChildren();
-				foreach (var node in TreeTraversal.PreOrder(bundle.Children, ExpandAndGetChildren).OfType<AssemblyTreeNode>())
+				foreach (var node in ILSpyX.TreeView.TreeTraversal.PreOrder(bundle.Children, ExpandAndGetChildren).OfType<AssemblyTreeNode>())
 				{
 					if (node.LoadedAssembly == asm)
 						return node;
diff --git a/ILSpy/TreeNodes/AssemblyReferenceTreeNode.cs b/ILSpy/TreeNodes/AssemblyReferenceTreeNode.cs
index 80c39380e..708eeb51d 100644
--- a/ILSpy/TreeNodes/AssemblyReferenceTreeNode.cs
+++ b/ILSpy/TreeNodes/AssemblyReferenceTreeNode.cs
@@ -22,7 +22,7 @@ using System.Windows.Threading;
 using ICSharpCode.Decompiler;
 using ICSharpCode.Decompiler.Metadata;
 using ICSharpCode.Decompiler.TypeSystem;
-using ICSharpCode.TreeView.PlatformAbstractions;
+using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions;
 
 using TomsToolbox.Wpf.Controls;
 
diff --git a/ILSpy/TreeNodes/AssemblyTreeNode.cs b/ILSpy/TreeNodes/AssemblyTreeNode.cs
index 1ca7dd7ac..44969d558 100644
--- a/ILSpy/TreeNodes/AssemblyTreeNode.cs
+++ b/ILSpy/TreeNodes/AssemblyTreeNode.cs
@@ -35,13 +35,13 @@ using ICSharpCode.ILSpy.ViewModels;
 using ICSharpCode.ILSpyX;
 using ICSharpCode.ILSpyX.FileLoaders;
 using ICSharpCode.ILSpyX.PdbProvider;
-using ICSharpCode.TreeView;
-using ICSharpCode.TreeView.PlatformAbstractions;
-using ICSharpCode.TreeView.PlatformAbstractions.WpfWindows;
+using ICSharpCode.ILSpy.Controls.TreeView;
+using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions;
 
 using Microsoft.Win32;
 
 using TypeDefinitionHandle = System.Reflection.Metadata.TypeDefinitionHandle;
+using ICSharpCode.ILSpyX.TreeView;
 
 namespace ICSharpCode.ILSpy.TreeNodes
 {
diff --git a/ILSpy/TreeNodes/BaseTypesEntryNode.cs b/ILSpy/TreeNodes/BaseTypesEntryNode.cs
index f0a28eb0c..0c1f68b33 100644
--- a/ILSpy/TreeNodes/BaseTypesEntryNode.cs
+++ b/ILSpy/TreeNodes/BaseTypesEntryNode.cs
@@ -20,8 +20,8 @@ using System.Linq;
 
 using ICSharpCode.Decompiler;
 using ICSharpCode.Decompiler.TypeSystem;
-using ICSharpCode.TreeView;
-using ICSharpCode.TreeView.PlatformAbstractions;
+using ICSharpCode.ILSpyX.TreeView;
+using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions;
 
 namespace ICSharpCode.ILSpy.TreeNodes
 {
diff --git a/ILSpy/TreeNodes/BaseTypesTreeNode.cs b/ILSpy/TreeNodes/BaseTypesTreeNode.cs
index 4b8100747..19986594f 100644
--- a/ILSpy/TreeNodes/BaseTypesTreeNode.cs
+++ b/ILSpy/TreeNodes/BaseTypesTreeNode.cs
@@ -25,7 +25,7 @@ using ICSharpCode.Decompiler;
 using ICSharpCode.Decompiler.Metadata;
 using ICSharpCode.Decompiler.TypeSystem;
 using ICSharpCode.ILSpyX;
-using ICSharpCode.TreeView;
+using ICSharpCode.ILSpyX.TreeView;
 
 namespace ICSharpCode.ILSpy.TreeNodes
 {
diff --git a/ILSpy/TreeNodes/DerivedTypesEntryNode.cs b/ILSpy/TreeNodes/DerivedTypesEntryNode.cs
index 224ba0261..525bb8aa3 100644
--- a/ILSpy/TreeNodes/DerivedTypesEntryNode.cs
+++ b/ILSpy/TreeNodes/DerivedTypesEntryNode.cs
@@ -26,7 +26,7 @@ using ICSharpCode.ILSpyX;
 namespace ICSharpCode.ILSpy.TreeNodes
 {
 	using ICSharpCode.Decompiler.TypeSystem;
-	using ICSharpCode.TreeView.PlatformAbstractions;
+	using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions;
 
 	class DerivedTypesEntryNode : ILSpyTreeNode, IMemberTreeNode
 	{
diff --git a/ILSpy/TreeNodes/ILSpyTreeNode.cs b/ILSpy/TreeNodes/ILSpyTreeNode.cs
index 16f1d4833..56c055308 100644
--- a/ILSpy/TreeNodes/ILSpyTreeNode.cs
+++ b/ILSpy/TreeNodes/ILSpyTreeNode.cs
@@ -23,15 +23,13 @@ using System.ComponentModel;
 using System.Linq;
 using System.Reflection.Metadata;
 using System.Reflection.Metadata.Ecma335;
-using System.Windows;
 using System.Windows.Threading;
 
 using ICSharpCode.Decompiler;
 using ICSharpCode.Decompiler.TypeSystem;
-using ICSharpCode.ILSpy.Options;
 using ICSharpCode.ILSpyX.Abstractions;
-using ICSharpCode.TreeView;
-using ICSharpCode.TreeView.PlatformAbstractions;
+using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions;
+using ICSharpCode.ILSpyX.TreeView;
 
 namespace ICSharpCode.ILSpy.TreeNodes
 {
@@ -94,7 +92,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 			return false;
 		}
 
-		protected override void OnChildrenChanged(NotifyCollectionChangedEventArgs e)
+		internal protected override void OnChildrenChanged(NotifyCollectionChangedEventArgs e)
 		{
 			if (e.NewItems != null)
 			{
diff --git a/ILSpy/TreeNodes/ModuleReferenceTreeNode.cs b/ILSpy/TreeNodes/ModuleReferenceTreeNode.cs
index 7b799af61..b9a1d6de2 100644
--- a/ILSpy/TreeNodes/ModuleReferenceTreeNode.cs
+++ b/ILSpy/TreeNodes/ModuleReferenceTreeNode.cs
@@ -21,7 +21,7 @@ using System.Reflection.Metadata;
 
 using ICSharpCode.Decompiler;
 using ICSharpCode.Decompiler.Metadata;
-using ICSharpCode.TreeView.PlatformAbstractions;
+using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions;
 
 namespace ICSharpCode.ILSpy.TreeNodes
 {
diff --git a/ILSpy/TreeNodes/PackageFolderTreeNode.cs b/ILSpy/TreeNodes/PackageFolderTreeNode.cs
index 81dbe9002..9fc528b3f 100644
--- a/ILSpy/TreeNodes/PackageFolderTreeNode.cs
+++ b/ILSpy/TreeNodes/PackageFolderTreeNode.cs
@@ -22,7 +22,7 @@ using System.Linq;
 
 using ICSharpCode.Decompiler;
 using ICSharpCode.ILSpyX;
-using ICSharpCode.TreeView;
+using ICSharpCode.ILSpyX.TreeView;
 
 namespace ICSharpCode.ILSpy.TreeNodes
 {
diff --git a/ILSpy/TreeNodes/ThreadingSupport.cs b/ILSpy/TreeNodes/ThreadingSupport.cs
index 4e8861c21..636a967f3 100644
--- a/ILSpy/TreeNodes/ThreadingSupport.cs
+++ b/ILSpy/TreeNodes/ThreadingSupport.cs
@@ -28,7 +28,7 @@ using System.Windows.Threading;
 
 using ICSharpCode.Decompiler;
 using ICSharpCode.ILSpy.Properties;
-using ICSharpCode.TreeView;
+using ICSharpCode.ILSpyX.TreeView;
 
 namespace ICSharpCode.ILSpy.TreeNodes
 {
diff --git a/SharpTreeView/ICSharpCode.TreeView.csproj b/SharpTreeView/ICSharpCode.TreeView.csproj
deleted file mode 100644
index b59e5fde5..000000000
--- a/SharpTreeView/ICSharpCode.TreeView.csproj
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <UseWpf>true</UseWpf>
-    <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
-    <SignAssembly>True</SignAssembly>
-    <TargetFramework>net8.0-windows</TargetFramework>
-    <AssemblyOriginatorKeyFile>..\ICSharpCode.Decompiler\ICSharpCode.Decompiler.snk</AssemblyOriginatorKeyFile>
-    <EnableWindowsTargeting>true</EnableWindowsTargeting>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
-    <DebugType>full</DebugType>
-    <DebugSymbols>true</DebugSymbols>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
-    <DebugType>pdbonly</DebugType>
-    <DebugSymbols>true</DebugSymbols>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="TomsToolbox.Wpf.Styles" />
-  </ItemGroup>
-
-</Project>
diff --git a/SharpTreeView/Properties/AssemblyInfo.cs b/SharpTreeView/Properties/AssemblyInfo.cs
deleted file mode 100644
index df3193e3d..000000000
--- a/SharpTreeView/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) 2020 AlphaSierraPapa for the SharpDevelop Team
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this
-// software and associated documentation files (the "Software"), to deal in the Software
-// without restriction, including without limitation the rights to use, copy, modify, merge,
-// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in all copies or
-// substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
-// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System.Reflection;
-using System.Windows;
-using System.Windows.Markup;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("ICSharpCode.TreeView")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-//In order to begin building localizable applications, set 
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[assembly: ThemeInfo(
-	ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-									 //(used if a resource is not found in the page, 
-									 // or application resource dictionaries)
-	ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-											  //(used if a resource is not found in the page, 
-											  // app, or any theme specific resource dictionaries)
-)]
-
-
-[assembly: XmlnsPrefix("http://icsharpcode.net/sharpdevelop/treeview", "treeview")]
-
-[assembly: XmlnsDefinition("http://icsharpcode.net/sharpdevelop/treeview", "ICSharpCode.TreeView")]
diff --git a/SharpTreeView/Properties/GlobalAssemblyInfo.cs b/SharpTreeView/Properties/GlobalAssemblyInfo.cs
deleted file mode 100644
index 52976c664..000000000
--- a/SharpTreeView/Properties/GlobalAssemblyInfo.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) 2020 AlphaSierraPapa for the SharpDevelop Team
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this
-// software and associated documentation files (the "Software"), to deal in the Software
-// without restriction, including without limitation the rights to use, copy, modify, merge,
-// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in all copies or
-// substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
-// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////
-//                                                                                         //
-// DO NOT EDIT GlobalAssemblyInfo.cs, it is recreated using AssemblyInfo.template whenever //
-// ICSharpCode.Core is compiled.                                                           //
-//                                                                                         //
-/////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////
-
-using System.Reflection;
-using System.Resources;
-
-[assembly: System.Runtime.InteropServices.ComVisible(false)]
-[assembly: AssemblyCompany("ic#code")]
-[assembly: AssemblyProduct("SharpDevelop")]
-[assembly: AssemblyCopyright("2000-2012 AlphaSierraPapa for the SharpDevelop Team")]
-[assembly: AssemblyVersion(RevisionClass.Major + "." + RevisionClass.Minor + "." + RevisionClass.Build + "." + RevisionClass.Revision)]
-[assembly: AssemblyInformationalVersion(RevisionClass.FullVersion + "-ca8a8e28")]
-[assembly: NeutralResourcesLanguage("en-US")]
-
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2243:AttributeStringLiteralsShouldParseCorrectly",
-	Justification = "AssemblyInformationalVersion does not need to be a parsable version")]
-
-internal static class RevisionClass
-{
-	public const string Major = "4";
-	public const string Minor = "2";
-	public const string Build = "0";
-	public const string Revision = "8752";
-	public const string VersionName = "Beta 2";
-
-	public const string FullVersion = Major + "." + Minor + "." + Build + ".8752-Beta 2";
-}