diff --git a/UI/Views/Controls/HierarchyTree.axaml b/UI/Controls/HierarchyTree.axaml
similarity index 100%
rename from UI/Views/Controls/HierarchyTree.axaml
rename to UI/Controls/HierarchyTree.axaml
diff --git a/UI/Views/Controls/HierarchyTree.axaml.cs b/UI/Controls/HierarchyTree.axaml.cs
similarity index 92%
rename from UI/Views/Controls/HierarchyTree.axaml.cs
rename to UI/Controls/HierarchyTree.axaml.cs
index 4159ba0..dd06789 100644
--- a/UI/Views/Controls/HierarchyTree.axaml.cs
+++ b/UI/Controls/HierarchyTree.axaml.cs
@@ -14,7 +14,7 @@ public partial class HierarchyTree : UserControl
         this.TagTree.AddHandler(PointerPressedEvent, OnTagTreeItemRightClick, RoutingStrategies.Tunnel);
     }
 
-    private static void OnTagTreeItemRightClick(object sender, PointerPressedEventArgs e)
+    private static void OnTagTreeItemRightClick(object? sender, PointerPressedEventArgs e)
     {
         if (!e.GetCurrentPoint(null).Properties.IsRightButtonPressed) return;
         if (e.Source is not Control source) return;
diff --git a/UI/Views/Controls/SearchPane.axaml b/UI/Controls/SearchPane.axaml
similarity index 100%
rename from UI/Views/Controls/SearchPane.axaml
rename to UI/Controls/SearchPane.axaml
diff --git a/UI/Views/Controls/SearchPane.axaml.cs b/UI/Controls/SearchPane.axaml.cs
similarity index 92%
rename from UI/Views/Controls/SearchPane.axaml.cs
rename to UI/Controls/SearchPane.axaml.cs
index 6c6251e..b4d7898 100644
--- a/UI/Views/Controls/SearchPane.axaml.cs
+++ b/UI/Controls/SearchPane.axaml.cs
@@ -24,7 +24,7 @@ public partial class SearchPane : UserControl
             this.SearchAliasesCheckBox.IsChecked ?? false
         };
 
-        this.ViewModel.StartSearchCommand.Execute(args);
+        this.ViewModel?.StartSearchCommand.Execute(args);
         e.Handled = true;
     }
 }
\ No newline at end of file
diff --git a/UI/Views/Controls/TagEditor.axaml b/UI/Controls/TagEditor.axaml
similarity index 100%
rename from UI/Views/Controls/TagEditor.axaml
rename to UI/Controls/TagEditor.axaml
diff --git a/UI/Views/Controls/TagEditor.axaml.cs b/UI/Controls/TagEditor.axaml.cs
similarity index 100%
rename from UI/Views/Controls/TagEditor.axaml.cs
rename to UI/Controls/TagEditor.axaml.cs
diff --git a/UI/TagHierarchyManager.UI.csproj b/UI/TagHierarchyManager.UI.csproj
index 7a0f5c4..d726768 100644
--- a/UI/TagHierarchyManager.UI.csproj
+++ b/UI/TagHierarchyManager.UI.csproj
@@ -20,11 +20,6 @@
             <DependentUpon>UnsavedCancelDialog.axaml</DependentUpon>
             <SubType>Code</SubType>
         </Compile>
-
-        <Compile Update="Views\Controls\SearchPane.axaml.oldcs">
-            <DependentUpon>SearchPane.axaml</DependentUpon>
-            <SubType>Code</SubType>
-        </Compile>
     </ItemGroup>
 
     <ItemGroup>
@@ -76,6 +71,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <Folder Include="Views\Windows\"/>
+      <AdditionalFiles Include="Controls\HierarchyTree.axaml" />
+      <AdditionalFiles Include="Controls\SearchPane.axaml" />
+      <AdditionalFiles Include="Controls\TagEditor.axaml" />
     </ItemGroup>
 </Project>