diff --git a/UI/TagHierarchyManager.UI.csproj b/UI/TagHierarchyManager.UI.csproj
index d726768..3d55423 100644
--- a/UI/TagHierarchyManager.UI.csproj
+++ b/UI/TagHierarchyManager.UI.csproj
@@ -9,16 +9,61 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <AvaloniaResource Include="Assets\**" Exclude="Assets\*.resx;Assets\*.Designer.cs"/>
+        <AvaloniaResource Include="Assets\**" Exclude="Assets\*.resx;Assets\*.Designer.cs" />
         <EmbeddedResource Update="Assets\Resources.resx">
             <Generator>PublicResXFileCodeGenerator</Generator>
             <LastGenOutput>Resources.Designer.cs</LastGenOutput>
 
         </EmbeddedResource>
 
-        <Compile Update="Views\UnsavedCancelDialog.axaml.cs">
-            <DependentUpon>UnsavedCancelDialog.axaml</DependentUpon>
-            <SubType>Code</SubType>
+        <Compile Update="Views\Windows\AboutWindow.axaml.cs">
+          <DependentUpon>AboutWindow.axaml</DependentUpon>
+          <SubType>Code</SubType>
+        </Compile>
+
+        <Compile Update="Views\Windows\BulkAddWindow.axaml.cs">
+          <DependentUpon>BulkAddWindow.axaml</DependentUpon>
+          <SubType>Code</SubType>
+        </Compile>
+
+        <Compile Update="Views\Windows\DatabaseSettingsWindow.axaml.cs">
+          <DependentUpon>DatabaseSettingsWindow.axaml</DependentUpon>
+          <SubType>Code</SubType>
+        </Compile>
+
+        <Compile Update="Views\Dialogs\DeleteTagDialog.axaml.cs">
+          <DependentUpon>DeleteTagDialog.axaml</DependentUpon>
+          <SubType>Code</SubType>
+        </Compile>
+
+        <Compile Update="Views\Dialogs\ErrorDialog.axaml.cs">
+          <DependentUpon>ErrorDialog.axaml</DependentUpon>
+          <SubType>Code</SubType>
+        </Compile>
+
+        <Compile Update="Views\Dialogs\ImportDialog.axaml.cs">
+          <DependentUpon>ImportDialog.axaml</DependentUpon>
+          <SubType>Code</SubType>
+        </Compile>
+
+        <Compile Update="Views\Windows\MainWindow.axaml.cs">
+          <DependentUpon>MainWindow.axaml</DependentUpon>
+          <SubType>Code</SubType>
+        </Compile>
+
+        <Compile Update="Views\Windows\RecentsWindow.axaml.cs">
+          <DependentUpon>RecentsWindow.axaml</DependentUpon>
+          <SubType>Code</SubType>
+        </Compile>
+
+        <Compile Update="Views\Dialogs\UnsavedCancelDialog.axaml.cs">
+          <DependentUpon>UnsavedCancelDialog.axaml</DependentUpon>
+          <SubType>Code</SubType>
+        </Compile>
+
+        <Compile Update="Views\Dialogs\UnsavedChangesDialog.axaml.cs">
+          <DependentUpon>UnsavedChangesDialog.axaml</DependentUpon>
+          <SubType>Code</SubType>
         </Compile>
     </ItemGroup>
 
@@ -31,35 +76,23 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.3.10"/>
-        <PackageReference Include="Avalonia.Desktop" Version="11.3.10"/>
-        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.10"/>
-        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.10"/>
+        <PackageReference Include="Avalonia" Version="11.3.10" />
+        <PackageReference Include="Avalonia.Desktop" Version="11.3.10" />
+        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.10" />
+        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.10" />
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
         <PackageReference Include="Avalonia.Diagnostics" Version="11.3.10">
             <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
             <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1"/>
-        <PackageReference Include="Irihi.Ursa" Version="1.15.0"/>
-        <PackageReference Include="Irihi.Ursa.Themes.Semi" Version="1.15.0"/>
-        <PackageReference Include="Semi.Avalonia" Version="11.3.7.2"/>
-        <PackageReference Include="Semi.Avalonia.DataGrid" Version="11.3.7.2"/>
+        <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
+        <PackageReference Include="Irihi.Ursa" Version="1.15.1" />
+        <PackageReference Include="Irihi.Ursa.Themes.Semi" Version="1.15.1" />
+        <PackageReference Include="Semi.Avalonia" Version="11.3.7.2" />
+        <PackageReference Include="Semi.Avalonia.DataGrid" Version="11.3.7.2" />
     </ItemGroup>
 
     <ItemGroup>
-        <Compile Update="Views\AboutWindow.axaml.cs">
-            <DependentUpon>AboutWindow.axaml</DependentUpon>
-            <SubType>Code</SubType>
-        </Compile>
-        <Compile Update="Views\DatabaseSettingsWindow.axaml.cs">
-            <DependentUpon>DatabaseSettingsWindow.axaml</DependentUpon>
-            <SubType>Code</SubType>
-        </Compile>
-        <Compile Update="Views\MainWindow.axaml.cs">
-            <DependentUpon>MainWindow.axaml</DependentUpon>
-            <SubType>Code</SubType>
-        </Compile>
         <Compile Update="App.axaml.cs">
             <DependentUpon>App.axaml</DependentUpon>
             <SubType>Code</SubType>
@@ -67,12 +100,22 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Core\TagHierarchyManager.csproj"/>
+        <ProjectReference Include="..\Core\TagHierarchyManager.csproj" />
     </ItemGroup>
 
     <ItemGroup>
       <AdditionalFiles Include="Controls\HierarchyTree.axaml" />
       <AdditionalFiles Include="Controls\SearchPane.axaml" />
       <AdditionalFiles Include="Controls\TagEditor.axaml" />
+      <AdditionalFiles Include="Views\Dialogs\DeleteTagDialog.axaml" />
+      <AdditionalFiles Include="Views\Dialogs\ErrorDialog.axaml" />
+      <AdditionalFiles Include="Views\Dialogs\ImportDialog.axaml" />
+      <AdditionalFiles Include="Views\Dialogs\UnsavedCancelDialog.axaml" />
+      <AdditionalFiles Include="Views\Dialogs\UnsavedChangesDialog.axaml" />
+      <AdditionalFiles Include="Views\Windows\AboutWindow.axaml" />
+      <AdditionalFiles Include="Views\Windows\BulkAddWindow.axaml" />
+      <AdditionalFiles Include="Views\Windows\DatabaseSettingsWindow.axaml" />
+      <AdditionalFiles Include="Views\Windows\MainWindow.axaml" />
+      <AdditionalFiles Include="Views\Windows\RecentsWindow.axaml" />
     </ItemGroup>
 </Project>
diff --git a/UI/Views/DeleteTagDialog.axaml b/UI/Views/Dialogs/DeleteTagDialog.axaml
similarity index 100%
rename from UI/Views/DeleteTagDialog.axaml
rename to UI/Views/Dialogs/DeleteTagDialog.axaml
diff --git a/UI/Views/DeleteTagDialog.axaml.cs b/UI/Views/Dialogs/DeleteTagDialog.axaml.cs
similarity index 100%
rename from UI/Views/DeleteTagDialog.axaml.cs
rename to UI/Views/Dialogs/DeleteTagDialog.axaml.cs
diff --git a/UI/Views/ErrorDialog.axaml b/UI/Views/Dialogs/ErrorDialog.axaml
similarity index 100%
rename from UI/Views/ErrorDialog.axaml
rename to UI/Views/Dialogs/ErrorDialog.axaml
diff --git a/UI/Views/ErrorDialog.axaml.cs b/UI/Views/Dialogs/ErrorDialog.axaml.cs
similarity index 100%
rename from UI/Views/ErrorDialog.axaml.cs
rename to UI/Views/Dialogs/ErrorDialog.axaml.cs
diff --git a/UI/Views/ImportDialog.axaml b/UI/Views/Dialogs/ImportDialog.axaml
similarity index 100%
rename from UI/Views/ImportDialog.axaml
rename to UI/Views/Dialogs/ImportDialog.axaml
diff --git a/UI/Views/ImportDialog.axaml.cs b/UI/Views/Dialogs/ImportDialog.axaml.cs
similarity index 100%
rename from UI/Views/ImportDialog.axaml.cs
rename to UI/Views/Dialogs/ImportDialog.axaml.cs
diff --git a/UI/Views/UnsavedCancelDialog.axaml b/UI/Views/Dialogs/UnsavedCancelDialog.axaml
similarity index 100%
rename from UI/Views/UnsavedCancelDialog.axaml
rename to UI/Views/Dialogs/UnsavedCancelDialog.axaml
diff --git a/UI/Views/UnsavedCancelDialog.axaml.cs b/UI/Views/Dialogs/UnsavedCancelDialog.axaml.cs
similarity index 100%
rename from UI/Views/UnsavedCancelDialog.axaml.cs
rename to UI/Views/Dialogs/UnsavedCancelDialog.axaml.cs
diff --git a/UI/Views/UnsavedChangesDialog.axaml b/UI/Views/Dialogs/UnsavedChangesDialog.axaml
similarity index 100%
rename from UI/Views/UnsavedChangesDialog.axaml
rename to UI/Views/Dialogs/UnsavedChangesDialog.axaml
diff --git a/UI/Views/UnsavedChangesDialog.axaml.cs b/UI/Views/Dialogs/UnsavedChangesDialog.axaml.cs
similarity index 100%
rename from UI/Views/UnsavedChangesDialog.axaml.cs
rename to UI/Views/Dialogs/UnsavedChangesDialog.axaml.cs
diff --git a/UI/Views/AboutWindow.axaml b/UI/Views/Windows/AboutWindow.axaml
similarity index 100%
rename from UI/Views/AboutWindow.axaml
rename to UI/Views/Windows/AboutWindow.axaml
diff --git a/UI/Views/AboutWindow.axaml.cs b/UI/Views/Windows/AboutWindow.axaml.cs
similarity index 100%
rename from UI/Views/AboutWindow.axaml.cs
rename to UI/Views/Windows/AboutWindow.axaml.cs
diff --git a/UI/Views/BulkAddWindow.axaml b/UI/Views/Windows/BulkAddWindow.axaml
similarity index 100%
rename from UI/Views/BulkAddWindow.axaml
rename to UI/Views/Windows/BulkAddWindow.axaml
diff --git a/UI/Views/BulkAddWindow.axaml.cs b/UI/Views/Windows/BulkAddWindow.axaml.cs
similarity index 100%
rename from UI/Views/BulkAddWindow.axaml.cs
rename to UI/Views/Windows/BulkAddWindow.axaml.cs
diff --git a/UI/Views/DatabaseSettingsWindow.axaml b/UI/Views/Windows/DatabaseSettingsWindow.axaml
similarity index 100%
rename from UI/Views/DatabaseSettingsWindow.axaml
rename to UI/Views/Windows/DatabaseSettingsWindow.axaml
diff --git a/UI/Views/DatabaseSettingsWindow.axaml.cs b/UI/Views/Windows/DatabaseSettingsWindow.axaml.cs
similarity index 100%
rename from UI/Views/DatabaseSettingsWindow.axaml.cs
rename to UI/Views/Windows/DatabaseSettingsWindow.axaml.cs
diff --git a/UI/Views/MainWindow.axaml b/UI/Views/Windows/MainWindow.axaml
similarity index 100%
rename from UI/Views/MainWindow.axaml
rename to UI/Views/Windows/MainWindow.axaml
diff --git a/UI/Views/MainWindow.axaml.cs b/UI/Views/Windows/MainWindow.axaml.cs
similarity index 100%
rename from UI/Views/MainWindow.axaml.cs
rename to UI/Views/Windows/MainWindow.axaml.cs
diff --git a/UI/Views/RecentsWindow.axaml b/UI/Views/Windows/RecentsWindow.axaml
similarity index 100%
rename from UI/Views/RecentsWindow.axaml
rename to UI/Views/Windows/RecentsWindow.axaml
diff --git a/UI/Views/RecentsWindow.axaml.cs b/UI/Views/Windows/RecentsWindow.axaml.cs
similarity index 100%
rename from UI/Views/RecentsWindow.axaml.cs
rename to UI/Views/Windows/RecentsWindow.axaml.cs