diff --git a/mRemoteV1/Tree/ExpandNodeClickHandler.cs b/mRemoteV1/Tree/ClickHandlers/ExpandNodeClickHandler.cs
similarity index 100%
rename from mRemoteV1/Tree/ExpandNodeClickHandler.cs
rename to mRemoteV1/Tree/ClickHandlers/ExpandNodeClickHandler.cs
diff --git a/mRemoteV1/Tree/ITreeNodeClickHandler.cs b/mRemoteV1/Tree/ClickHandlers/ITreeNodeClickHandler.cs
similarity index 100%
rename from mRemoteV1/Tree/ITreeNodeClickHandler.cs
rename to mRemoteV1/Tree/ClickHandlers/ITreeNodeClickHandler.cs
diff --git a/mRemoteV1/Tree/OpenConnectionClickHandler.cs b/mRemoteV1/Tree/ClickHandlers/OpenConnectionClickHandler.cs
similarity index 100%
rename from mRemoteV1/Tree/OpenConnectionClickHandler.cs
rename to mRemoteV1/Tree/ClickHandlers/OpenConnectionClickHandler.cs
diff --git a/mRemoteV1/Tree/SwitchToConnectionClickHandler.cs b/mRemoteV1/Tree/ClickHandlers/SwitchToConnectionClickHandler.cs
similarity index 100%
rename from mRemoteV1/Tree/SwitchToConnectionClickHandler.cs
rename to mRemoteV1/Tree/ClickHandlers/SwitchToConnectionClickHandler.cs
diff --git a/mRemoteV1/Tree/TreeNodeDoubleClickHandler.cs b/mRemoteV1/Tree/ClickHandlers/TreeNodeDoubleClickHandler.cs
similarity index 100%
rename from mRemoteV1/Tree/TreeNodeDoubleClickHandler.cs
rename to mRemoteV1/Tree/ClickHandlers/TreeNodeDoubleClickHandler.cs
diff --git a/mRemoteV1/Tree/TreeNodeSingleClickHandler.cs b/mRemoteV1/Tree/ClickHandlers/TreeNodeSingleClickHandler.cs
similarity index 100%
rename from mRemoteV1/Tree/TreeNodeSingleClickHandler.cs
rename to mRemoteV1/Tree/ClickHandlers/TreeNodeSingleClickHandler.cs
diff --git a/mRemoteV1/mRemoteV1.csproj b/mRemoteV1/mRemoteV1.csproj
index 2514dd25a..b59da048d 100644
--- a/mRemoteV1/mRemoteV1.csproj
+++ b/mRemoteV1/mRemoteV1.csproj
@@ -215,18 +215,18 @@
     <Compile Include="Tree\ConnectionDeletionConfirmer.cs" />
     <Compile Include="Tree\ConnectionTreeDragAndDropHandler.cs" />
     <Compile Include="Tree\ConnectionTreeModel.cs" />
-    <Compile Include="Tree\ExpandNodeClickHandler.cs" />
-    <Compile Include="Tree\ITreeNodeClickHandler.cs" />
+    <Compile Include="Tree\ClickHandlers\ExpandNodeClickHandler.cs" />
+    <Compile Include="Tree\ClickHandlers\ITreeNodeClickHandler.cs" />
     <Compile Include="Tree\NodeSearcher.cs" />
     <Compile Include="Tree\NodeType.cs" />
-    <Compile Include="Tree\OpenConnectionClickHandler.cs" />
+    <Compile Include="Tree\ClickHandlers\OpenConnectionClickHandler.cs" />
     <Compile Include="Tree\PreviouslyOpenedFolderExpander.cs" />
     <Compile Include="Tree\PreviousSessionOpener.cs" />
     <Compile Include="Tree\RootNodeExpander.cs" />
     <Compile Include="Tree\Root\RootNodeTypeEnum.cs" />
-    <Compile Include="Tree\SwitchToConnectionClickHandler.cs" />
-    <Compile Include="Tree\TreeNodeDoubleClickHandler.cs" />
-    <Compile Include="Tree\TreeNodeSingleClickHandler.cs" />
+    <Compile Include="Tree\ClickHandlers\SwitchToConnectionClickHandler.cs" />
+    <Compile Include="Tree\ClickHandlers\TreeNodeDoubleClickHandler.cs" />
+    <Compile Include="Tree\ClickHandlers\TreeNodeSingleClickHandler.cs" />
     <Compile Include="UI\Controls\ConnectionContextMenu.cs">
       <SubType>Component</SubType>
     </Compile>
diff --git a/mRemoteV1/mRemoteV1.csproj.DotSettings b/mRemoteV1/mRemoteV1.csproj.DotSettings
index 294c0624e..07f70d627 100644
--- a/mRemoteV1/mRemoteV1.csproj.DotSettings
+++ b/mRemoteV1/mRemoteV1.csproj.DotSettings
@@ -1,2 +1,3 @@
 <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/=tree_005Cclickhandlers/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=ui_005Ccontrols_005Cconnectiontree/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file