diff --git a/mRemoteV1/UI/Controls/ConnectionTree.Designer.cs b/mRemoteV1/UI/Controls/ConnectionTree/ConnectionTree.Designer.cs
similarity index 100%
rename from mRemoteV1/UI/Controls/ConnectionTree.Designer.cs
rename to mRemoteV1/UI/Controls/ConnectionTree/ConnectionTree.Designer.cs
diff --git a/mRemoteV1/UI/Controls/ConnectionTree.cs b/mRemoteV1/UI/Controls/ConnectionTree/ConnectionTree.cs
similarity index 100%
rename from mRemoteV1/UI/Controls/ConnectionTree.cs
rename to mRemoteV1/UI/Controls/ConnectionTree/ConnectionTree.cs
diff --git a/mRemoteV1/UI/Controls/IConnectionTree.cs b/mRemoteV1/UI/Controls/ConnectionTree/IConnectionTree.cs
similarity index 100%
rename from mRemoteV1/UI/Controls/IConnectionTree.cs
rename to mRemoteV1/UI/Controls/ConnectionTree/IConnectionTree.cs
diff --git a/mRemoteV1/UI/Controls/IConnectionTreeDelegate.cs b/mRemoteV1/UI/Controls/ConnectionTree/IConnectionTreeDelegate.cs
similarity index 100%
rename from mRemoteV1/UI/Controls/IConnectionTreeDelegate.cs
rename to mRemoteV1/UI/Controls/ConnectionTree/IConnectionTreeDelegate.cs
diff --git a/mRemoteV1/UI/Controls/NameColumn.cs b/mRemoteV1/UI/Controls/ConnectionTree/NameColumn.cs
similarity index 100%
rename from mRemoteV1/UI/Controls/NameColumn.cs
rename to mRemoteV1/UI/Controls/ConnectionTree/NameColumn.cs
diff --git a/mRemoteV1/mRemoteV1.csproj b/mRemoteV1/mRemoteV1.csproj
index b5649435d..2514dd25a 100644
--- a/mRemoteV1/mRemoteV1.csproj
+++ b/mRemoteV1/mRemoteV1.csproj
@@ -230,10 +230,10 @@
     <Compile Include="UI\Controls\ConnectionContextMenu.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="UI\Controls\ConnectionTree.cs">
+    <Compile Include="UI\Controls\ConnectionTree\ConnectionTree.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="UI\Controls\ConnectionTree.Designer.cs">
+    <Compile Include="UI\Controls\ConnectionTree\ConnectionTree.Designer.cs">
       <DependentUpon>ConnectionTree.cs</DependentUpon>
     </Compile>
     <Compile Include="UI\Controls\FilteredPropertyGrid\FilteredPropertyGrid.cs">
@@ -243,12 +243,12 @@
       <DependentUpon>FilteredPropertyGrid.cs</DependentUpon>
     </Compile>
     <Compile Include="UI\Controls\FilteredPropertyGrid\ObjectWrapper.cs" />
-    <Compile Include="UI\Controls\IConnectionTree.cs" />
+    <Compile Include="UI\Controls\ConnectionTree\IConnectionTree.cs" />
     <Compile Include="UI\Controls\IPTextBox.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="UI\Controls\IConnectionTreeDelegate.cs" />
-    <Compile Include="UI\Controls\NameColumn.cs">
+    <Compile Include="UI\Controls\ConnectionTree\IConnectionTreeDelegate.cs" />
+    <Compile Include="UI\Controls\ConnectionTree\NameColumn.cs">
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="UI\Controls\QuickConnectComboBox.cs">
diff --git a/mRemoteV1/mRemoteV1.csproj.DotSettings b/mRemoteV1/mRemoteV1.csproj.DotSettings
new file mode 100644
index 000000000..294c0624e
--- /dev/null
+++ b/mRemoteV1/mRemoteV1.csproj.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=ui_005Ccontrols_005Cconnectiontree/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file