From f90a81d4170b775aa5cc5451e64ce796bc4da13c Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Sun, 3 May 2026 14:26:16 -0500
Subject: [PATCH] Lift Tier A components into library and restructure folders
 by category

---
 .../{ => Database}/DatabaseEntryRowTests.cs         |  3 ++-
 .../{ => Database}/DatabaseRecoveryDialogTests.cs   |  3 ++-
 .../{ => Database}/DatabaseRecoveryHostTests.cs     |  3 ++-
 .../SettingsUpgradeProgressBannerTests.cs           |  3 ++-
 .../Base/ModalBase.cs                               |  9 +++++----
 .../{ => Database}/DatabaseEntryRow.razor           |  0
 .../{ => Database}/DatabaseEntryRow.razor.cs        |  2 +-
 .../{ => Database}/DatabaseEntryRow.razor.css       |  0
 .../{ => Database}/DatabaseRecoveryDialog.razor     |  0
 .../{ => Database}/DatabaseRecoveryDialog.razor.cs  |  2 +-
 .../{ => Database}/DatabaseRecoveryDialog.razor.css |  0
 .../{ => Database}/DatabaseRecoveryHost.razor       |  0
 .../{ => Database}/DatabaseRecoveryHost.razor.cs    |  2 +-
 .../SettingsUpgradeProgressBanner.razor             |  2 --
 .../SettingsUpgradeProgressBanner.razor.cs          |  2 +-
 .../SettingsUpgradeProgressBanner.razor.css         |  0
 .../Filters/AdvancedFilterRow.razor                 |  1 -
 .../Filters/AdvancedFilterRow.razor.cs              |  4 ++--
 .../Filters}/Base/EditableFilterRowBase.cs          |  2 +-
 .../Filters}/Base/FilterRowBase.cs                  |  2 +-
 .../Filters/FilterCacheRow.razor                    |  1 -
 .../Filters/FilterCacheRow.razor.cs                 |  4 ++--
 .../Filters/FilterCacheRow.razor.css                |  0
 .../Filters/FilterCategoryEditor.razor              |  0
 .../Filters/FilterCategoryEditor.razor.cs           |  2 +-
 .../Filters/FilterGroupRow.razor                    |  1 -
 .../Filters/FilterGroupRow.razor.cs                 |  4 ++--
 .../Filters/FilterGroupRow.razor.css                |  0
 .../Filters/FilterRow.razor                         |  1 -
 .../Filters/FilterRow.razor.cs                      |  4 ++--
 .../Filters/FilterRowChrome.razor                   |  0
 .../Filters/FilterRowChrome.razor.cs                |  2 +-
 .../Filters/FilterRowChrome.razor.css               |  0
 .../Filters/SubFilterRow.razor                      |  1 -
 .../Filters/SubFilterRow.razor.cs                   |  4 ++--
 .../{ => Inputs}/BooleanSelect.razor                |  0
 .../{ => Inputs}/BooleanSelect.razor.cs             |  2 +-
 .../{ => Inputs}/BooleanSelect.razor.css            |  0
 .../Inputs}/TextInput.razor                         |  0
 .../Inputs}/TextInput.razor.cs                      |  2 +-
 .../Inputs}/ValueSelect.razor                       |  0
 .../Inputs}/ValueSelect.razor.cs                    |  2 +-
 .../Inputs}/ValueSelect.razor.css                   |  0
 .../Inputs}/ValueSelectItem.razor                   |  0
 .../Inputs}/ValueSelectItem.razor.cs                |  2 +-
 .../Inputs}/ValueSelectItem.razor.css               |  0
 .../Menu/MenuBar.razor                              |  0
 .../Menu/MenuBar.razor.cs                           |  3 ++-
 .../Menu/MenuBar.razor.css                          |  0
 .../Menu/MenuHost.razor                             |  0
 .../Menu/MenuHost.razor.cs                          |  2 +-
 .../Menu/MenuHost.razor.css                         |  0
 .../Menu/MenuRenderer.razor                         |  0
 .../Menu/MenuRenderer.razor.cs                      |  3 ++-
 .../Menu/MenuRenderer.razor.css                     |  0
 .../Modals}/Alerts/AlertModal.razor                 |  1 -
 .../Modals}/Alerts/AlertModal.razor.cs              |  4 ++--
 .../Modals}/Alerts/AlertModal.razor.css             |  0
 .../Modals}/Alerts/PromptModal.razor                |  1 -
 .../Modals}/Alerts/PromptModal.razor.cs             |  4 ++--
 .../Modals}/Alerts/PromptModal.razor.css            |  0
 .../Modals}/DebugLogModal.razor                     |  1 -
 .../Modals}/DebugLogModal.razor.cs                  |  4 ++--
 .../Modals}/ModalHost.razor                         |  0
 .../Modals}/ModalHost.razor.cs                      |  2 +-
 .../Modals}/ReleaseNotesModal.razor                 |  1 -
 .../Modals}/ReleaseNotesModal.razor.cs              |  4 ++--
 .../Modals}/ReleaseNotesModal.razor.css             |  0
 src/EventLogExpert.Components/_Imports.razor        | 10 ++++++++++
 .../ExtensionMethods.cs                             | 10 +++++-----
 .../{Shared => Components/Layout}/MainLayout.razor  |  3 ---
 .../Layout}/MainLayout.razor.cs                     |  2 +-
 .../Layout}/MainLayout.razor.css                    |  0
 .../Layout}/UnhandledExceptionHandler.razor         |  0
 .../Layout}/UnhandledExceptionHandler.razor.cs      |  2 +-
 .../Modals}/Filters/FilterCacheModal.razor          |  1 -
 .../Modals}/Filters/FilterCacheModal.razor.cs       |  4 ++--
 .../Modals}/Filters/FilterCacheModal.razor.css      |  0
 .../Modals}/Filters/FilterGroup.razor               |  0
 .../Modals}/Filters/FilterGroup.razor.cs            |  2 +-
 .../Modals}/Filters/FilterGroupModal.razor          |  1 -
 .../Modals}/Filters/FilterGroupModal.razor.cs       |  4 ++--
 .../Modals}/Filters/FilterGroupSection.razor        |  0
 .../Modals}/Filters/FilterGroupSection.razor.cs     |  2 +-
 .../Modals}/SettingsModal.razor                     |  1 -
 .../Modals}/SettingsModal.razor.cs                  |  4 ++--
 .../Modals}/SettingsModal.razor.css                 |  0
 .../Components/{ => Sections}/DetailsPane.razor     |  0
 .../Components/{ => Sections}/DetailsPane.razor.cs  |  2 +-
 .../Components/{ => Sections}/DetailsPane.razor.css |  0
 .../Components/{ => Sections}/EventTable.razor      |  0
 .../Components/{ => Sections}/EventTable.razor.cs   |  2 +-
 .../Components/{ => Sections}/EventTable.razor.css  |  0
 .../Components/{ => Sections}/FilterPane.razor      |  3 +--
 .../Components/{ => Sections}/FilterPane.razor.cs   |  4 ++--
 .../Components/{ => Sections}/FilterPane.razor.css  |  0
 .../Components/{ => Sections}/SplitLogTabPane.razor |  0
 .../{ => Sections}/SplitLogTabPane.razor.cs         |  2 +-
 .../{ => Sections}/SplitLogTabPane.razor.css        |  0
 .../Components/{ => Sections}/StatusBar.razor       |  0
 .../Components/{ => Sections}/StatusBar.razor.cs    |  2 +-
 .../Components/{ => Sections}/StatusBar.razor.css   |  0
 src/EventLogExpert/MauiProgram.cs                   |  2 +-
 .../Services/MauiMenuActionService.cs               |  4 ++--
 src/EventLogExpert/_Imports.razor                   | 13 +++++++++++--
 105 files changed, 95 insertions(+), 87 deletions(-)
 rename src/EventLogExpert.Components.Tests/{ => Database}/DatabaseEntryRowTests.cs (99%)
 rename src/EventLogExpert.Components.Tests/{ => Database}/DatabaseRecoveryDialogTests.cs (99%)
 rename src/EventLogExpert.Components.Tests/{ => Database}/DatabaseRecoveryHostTests.cs (99%)
 rename src/EventLogExpert.Components.Tests/{ => Database}/SettingsUpgradeProgressBannerTests.cs (98%)
 rename src/{EventLogExpert/Shared => EventLogExpert.Components}/Base/ModalBase.cs (93%)
 rename src/EventLogExpert.Components/{ => Database}/DatabaseEntryRow.razor (100%)
 rename src/EventLogExpert.Components/{ => Database}/DatabaseEntryRow.razor.cs (98%)
 rename src/EventLogExpert.Components/{ => Database}/DatabaseEntryRow.razor.css (100%)
 rename src/EventLogExpert.Components/{ => Database}/DatabaseRecoveryDialog.razor (100%)
 rename src/EventLogExpert.Components/{ => Database}/DatabaseRecoveryDialog.razor.cs (99%)
 rename src/EventLogExpert.Components/{ => Database}/DatabaseRecoveryDialog.razor.css (100%)
 rename src/EventLogExpert.Components/{ => Database}/DatabaseRecoveryHost.razor (100%)
 rename src/EventLogExpert.Components/{ => Database}/DatabaseRecoveryHost.razor.cs (98%)
 rename src/EventLogExpert.Components/{ => Database}/SettingsUpgradeProgressBanner.razor (96%)
 rename src/EventLogExpert.Components/{ => Database}/SettingsUpgradeProgressBanner.razor.cs (96%)
 rename src/EventLogExpert.Components/{ => Database}/SettingsUpgradeProgressBanner.razor.css (100%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components}/Filters/AdvancedFilterRow.razor (96%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components}/Filters/AdvancedFilterRow.razor.cs (90%)
 rename src/{EventLogExpert/Shared => EventLogExpert.Components/Filters}/Base/EditableFilterRowBase.cs (99%)
 rename src/{EventLogExpert/Shared => EventLogExpert.Components/Filters}/Base/FilterRowBase.cs (89%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components}/Filters/FilterCacheRow.razor (97%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components}/Filters/FilterCacheRow.razor.cs (93%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components}/Filters/FilterCacheRow.razor.css (100%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components}/Filters/FilterCategoryEditor.razor (100%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components}/Filters/FilterCategoryEditor.razor.cs (97%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components}/Filters/FilterGroupRow.razor (96%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components}/Filters/FilterGroupRow.razor.cs (94%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components}/Filters/FilterGroupRow.razor.css (100%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components}/Filters/FilterRow.razor (97%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components}/Filters/FilterRow.razor.cs (95%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components}/Filters/FilterRowChrome.razor (100%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components}/Filters/FilterRowChrome.razor.cs (96%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components}/Filters/FilterRowChrome.razor.css (100%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components}/Filters/SubFilterRow.razor (93%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components}/Filters/SubFilterRow.razor.cs (80%)
 rename src/EventLogExpert.Components/{ => Inputs}/BooleanSelect.razor (100%)
 rename src/EventLogExpert.Components/{ => Inputs}/BooleanSelect.razor.cs (95%)
 rename src/EventLogExpert.Components/{ => Inputs}/BooleanSelect.razor.css (100%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components/Inputs}/TextInput.razor (100%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components/Inputs}/TextInput.razor.cs (89%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components/Inputs}/ValueSelect.razor (100%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components/Inputs}/ValueSelect.razor.cs (99%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components/Inputs}/ValueSelect.razor.css (100%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components/Inputs}/ValueSelectItem.razor (100%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components/Inputs}/ValueSelectItem.razor.cs (97%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components/Inputs}/ValueSelectItem.razor.css (100%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components}/Menu/MenuBar.razor (100%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components}/Menu/MenuBar.razor.cs (99%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components}/Menu/MenuBar.razor.css (100%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components}/Menu/MenuHost.razor (100%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components}/Menu/MenuHost.razor.cs (98%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components}/Menu/MenuHost.razor.css (100%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components}/Menu/MenuRenderer.razor (100%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components}/Menu/MenuRenderer.razor.cs (99%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components}/Menu/MenuRenderer.razor.css (100%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components/Modals}/Alerts/AlertModal.razor (95%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components/Modals}/Alerts/AlertModal.razor.cs (92%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components/Modals}/Alerts/AlertModal.razor.css (100%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components/Modals}/Alerts/PromptModal.razor (95%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components/Modals}/Alerts/PromptModal.razor.cs (95%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components/Modals}/Alerts/PromptModal.razor.css (100%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components/Modals}/DebugLogModal.razor (97%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components/Modals}/DebugLogModal.razor.cs (95%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components/Modals}/ModalHost.razor (100%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components/Modals}/ModalHost.razor.cs (92%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components/Modals}/ReleaseNotesModal.razor (94%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components/Modals}/ReleaseNotesModal.razor.cs (90%)
 rename src/{EventLogExpert/Shared/Components => EventLogExpert.Components/Modals}/ReleaseNotesModal.razor.css (100%)
 rename src/{EventLogExpert => EventLogExpert.UI}/ExtensionMethods.cs (69%)
 rename src/EventLogExpert/{Shared => Components/Layout}/MainLayout.razor (76%)
 rename src/EventLogExpert/{Shared => Components/Layout}/MainLayout.razor.cs (94%)
 rename src/EventLogExpert/{Shared => Components/Layout}/MainLayout.razor.css (100%)
 rename src/EventLogExpert/{Shared => Components/Layout}/UnhandledExceptionHandler.razor (100%)
 rename src/EventLogExpert/{Shared => Components/Layout}/UnhandledExceptionHandler.razor.cs (96%)
 rename src/EventLogExpert/{Shared/Components => Components/Modals}/Filters/FilterCacheModal.razor (98%)
 rename src/EventLogExpert/{Shared/Components => Components/Modals}/Filters/FilterCacheModal.razor.cs (97%)
 rename src/EventLogExpert/{Shared/Components => Components/Modals}/Filters/FilterCacheModal.razor.css (100%)
 rename src/EventLogExpert/{Shared/Components => Components/Modals}/Filters/FilterGroup.razor (100%)
 rename src/EventLogExpert/{Shared/Components => Components/Modals}/Filters/FilterGroup.razor.cs (99%)
 rename src/EventLogExpert/{Shared/Components => Components/Modals}/Filters/FilterGroupModal.razor (97%)
 rename src/EventLogExpert/{Shared/Components => Components/Modals}/Filters/FilterGroupModal.razor.cs (97%)
 rename src/EventLogExpert/{Shared/Components => Components/Modals}/Filters/FilterGroupSection.razor (100%)
 rename src/EventLogExpert/{Shared/Components => Components/Modals}/Filters/FilterGroupSection.razor.cs (93%)
 rename src/EventLogExpert/{Shared/Components => Components/Modals}/SettingsModal.razor (99%)
 rename src/EventLogExpert/{Shared/Components => Components/Modals}/SettingsModal.razor.cs (99%)
 rename src/EventLogExpert/{Shared/Components => Components/Modals}/SettingsModal.razor.css (100%)
 rename src/EventLogExpert/Components/{ => Sections}/DetailsPane.razor (100%)
 rename src/EventLogExpert/Components/{ => Sections}/DetailsPane.razor.cs (99%)
 rename src/EventLogExpert/Components/{ => Sections}/DetailsPane.razor.css (100%)
 rename src/EventLogExpert/Components/{ => Sections}/EventTable.razor (100%)
 rename src/EventLogExpert/Components/{ => Sections}/EventTable.razor.cs (97%)
 rename src/EventLogExpert/Components/{ => Sections}/EventTable.razor.css (100%)
 rename src/EventLogExpert/Components/{ => Sections}/FilterPane.razor (98%)
 rename src/EventLogExpert/Components/{ => Sections}/FilterPane.razor.cs (98%)
 rename src/EventLogExpert/Components/{ => Sections}/FilterPane.razor.css (100%)
 rename src/EventLogExpert/Components/{ => Sections}/SplitLogTabPane.razor (100%)
 rename src/EventLogExpert/Components/{ => Sections}/SplitLogTabPane.razor.cs (98%)
 rename src/EventLogExpert/Components/{ => Sections}/SplitLogTabPane.razor.css (100%)
 rename src/EventLogExpert/Components/{ => Sections}/StatusBar.razor (100%)
 rename src/EventLogExpert/Components/{ => Sections}/StatusBar.razor.cs (97%)
 rename src/EventLogExpert/Components/{ => Sections}/StatusBar.razor.css (100%)

diff --git a/src/EventLogExpert.Components.Tests/DatabaseEntryRowTests.cs b/src/EventLogExpert.Components.Tests/Database/DatabaseEntryRowTests.cs
similarity index 99%
rename from src/EventLogExpert.Components.Tests/DatabaseEntryRowTests.cs
rename to src/EventLogExpert.Components.Tests/Database/DatabaseEntryRowTests.cs
index b38abd62..1f8fc95a 100644
--- a/src/EventLogExpert.Components.Tests/DatabaseEntryRowTests.cs
+++ b/src/EventLogExpert.Components.Tests/Database/DatabaseEntryRowTests.cs
@@ -2,10 +2,11 @@
 // // Licensed under the MIT License.
 
 using Bunit;
+using EventLogExpert.Components.Database;
 using EventLogExpert.UI;
 using EventLogExpert.UI.Models;
 
-namespace EventLogExpert.Components.Tests;
+namespace EventLogExpert.Components.Tests.Database;
 
 public sealed class DatabaseEntryRowTests : BunitContext
 {
diff --git a/src/EventLogExpert.Components.Tests/DatabaseRecoveryDialogTests.cs b/src/EventLogExpert.Components.Tests/Database/DatabaseRecoveryDialogTests.cs
similarity index 99%
rename from src/EventLogExpert.Components.Tests/DatabaseRecoveryDialogTests.cs
rename to src/EventLogExpert.Components.Tests/Database/DatabaseRecoveryDialogTests.cs
index 5ce63f28..a328123b 100644
--- a/src/EventLogExpert.Components.Tests/DatabaseRecoveryDialogTests.cs
+++ b/src/EventLogExpert.Components.Tests/Database/DatabaseRecoveryDialogTests.cs
@@ -2,6 +2,7 @@
 // // Licensed under the MIT License.
 
 using Bunit;
+using EventLogExpert.Components.Database;
 using EventLogExpert.Eventing.Helpers;
 using EventLogExpert.UI;
 using EventLogExpert.UI.Interfaces;
@@ -9,7 +10,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using NSubstitute;
 
-namespace EventLogExpert.Components.Tests;
+namespace EventLogExpert.Components.Tests.Database;
 
 public sealed class DatabaseRecoveryDialogTests : BunitContext
 {
diff --git a/src/EventLogExpert.Components.Tests/DatabaseRecoveryHostTests.cs b/src/EventLogExpert.Components.Tests/Database/DatabaseRecoveryHostTests.cs
similarity index 99%
rename from src/EventLogExpert.Components.Tests/DatabaseRecoveryHostTests.cs
rename to src/EventLogExpert.Components.Tests/Database/DatabaseRecoveryHostTests.cs
index 32821edd..f1a21cb2 100644
--- a/src/EventLogExpert.Components.Tests/DatabaseRecoveryHostTests.cs
+++ b/src/EventLogExpert.Components.Tests/Database/DatabaseRecoveryHostTests.cs
@@ -2,6 +2,7 @@
 // // Licensed under the MIT License.
 
 using Bunit;
+using EventLogExpert.Components.Database;
 using EventLogExpert.Eventing.Helpers;
 using EventLogExpert.UI;
 using EventLogExpert.UI.Interfaces;
@@ -9,7 +10,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using NSubstitute;
 
-namespace EventLogExpert.Components.Tests;
+namespace EventLogExpert.Components.Tests.Database;
 
 public sealed class DatabaseRecoveryHostTests : BunitContext
 {
diff --git a/src/EventLogExpert.Components.Tests/SettingsUpgradeProgressBannerTests.cs b/src/EventLogExpert.Components.Tests/Database/SettingsUpgradeProgressBannerTests.cs
similarity index 98%
rename from src/EventLogExpert.Components.Tests/SettingsUpgradeProgressBannerTests.cs
rename to src/EventLogExpert.Components.Tests/Database/SettingsUpgradeProgressBannerTests.cs
index f8d9fd68..3f8eb06c 100644
--- a/src/EventLogExpert.Components.Tests/SettingsUpgradeProgressBannerTests.cs
+++ b/src/EventLogExpert.Components.Tests/Database/SettingsUpgradeProgressBannerTests.cs
@@ -2,13 +2,14 @@
 // // Licensed under the MIT License.
 
 using Bunit;
+using EventLogExpert.Components.Database;
 using EventLogExpert.Eventing.Helpers;
 using EventLogExpert.UI.Interfaces;
 using EventLogExpert.UI.Models;
 using Microsoft.Extensions.DependencyInjection;
 using NSubstitute;
 
-namespace EventLogExpert.Components.Tests;
+namespace EventLogExpert.Components.Tests.Database;
 
 public sealed class SettingsUpgradeProgressBannerTests : BunitContext
 {
diff --git a/src/EventLogExpert/Shared/Base/ModalBase.cs b/src/EventLogExpert.Components/Base/ModalBase.cs
similarity index 93%
rename from src/EventLogExpert/Shared/Base/ModalBase.cs
rename to src/EventLogExpert.Components/Base/ModalBase.cs
index bd4c1fca..f993d03f 100644
--- a/src/EventLogExpert/Shared/Base/ModalBase.cs
+++ b/src/EventLogExpert.Components/Base/ModalBase.cs
@@ -1,12 +1,11 @@
 // // Copyright (c) Microsoft Corporation.
 // // Licensed under the MIT License.
 
-using EventLogExpert.Components.Base;
 using EventLogExpert.UI.Interfaces;
 using Fluxor.Blazor.Web.Components;
 using Microsoft.AspNetCore.Components;
 
-namespace EventLogExpert.Shared.Base;
+namespace EventLogExpert.Components.Base;
 
 /// <summary>
 ///     Base for modals shown via <see cref="IModalService" />. Owns the per-show id handshake with the service and
@@ -68,9 +67,11 @@ public Task<InlineAlertResult> ShowInlineAlertAsync(InlineAlertRequest request,
     }
 
     // Route Esc/native-close through OnCancelAsync so all close paths share the same pipeline.
-    internal Task HandleDialogClosedByUserAsync() => OnCancelAsync();
+    // Protected so derived modals' .razor markup can wire OnDialogClosedByUser="HandleDialogClosedByUserAsync"
+    // even when the derived class lives in a different assembly than ModalBase.
+    protected Task HandleDialogClosedByUserAsync() => OnCancelAsync();
 
-    internal Task HandleInlineAlertResolvedAsync(InlineAlertResult result)
+    protected Task HandleInlineAlertResolvedAsync(InlineAlertResult result)
     {
         TryClearInlineAlert(null, result, false);
         return Task.CompletedTask;
diff --git a/src/EventLogExpert.Components/DatabaseEntryRow.razor b/src/EventLogExpert.Components/Database/DatabaseEntryRow.razor
similarity index 100%
rename from src/EventLogExpert.Components/DatabaseEntryRow.razor
rename to src/EventLogExpert.Components/Database/DatabaseEntryRow.razor
diff --git a/src/EventLogExpert.Components/DatabaseEntryRow.razor.cs b/src/EventLogExpert.Components/Database/DatabaseEntryRow.razor.cs
similarity index 98%
rename from src/EventLogExpert.Components/DatabaseEntryRow.razor.cs
rename to src/EventLogExpert.Components/Database/DatabaseEntryRow.razor.cs
index 6d168f96..50416eb2 100644
--- a/src/EventLogExpert.Components/DatabaseEntryRow.razor.cs
+++ b/src/EventLogExpert.Components/Database/DatabaseEntryRow.razor.cs
@@ -5,7 +5,7 @@
 using EventLogExpert.UI.Models;
 using Microsoft.AspNetCore.Components;
 
-namespace EventLogExpert.Components;
+namespace EventLogExpert.Components.Database;
 
 public sealed partial class DatabaseEntryRow : ComponentBase
 {
diff --git a/src/EventLogExpert.Components/DatabaseEntryRow.razor.css b/src/EventLogExpert.Components/Database/DatabaseEntryRow.razor.css
similarity index 100%
rename from src/EventLogExpert.Components/DatabaseEntryRow.razor.css
rename to src/EventLogExpert.Components/Database/DatabaseEntryRow.razor.css
diff --git a/src/EventLogExpert.Components/DatabaseRecoveryDialog.razor b/src/EventLogExpert.Components/Database/DatabaseRecoveryDialog.razor
similarity index 100%
rename from src/EventLogExpert.Components/DatabaseRecoveryDialog.razor
rename to src/EventLogExpert.Components/Database/DatabaseRecoveryDialog.razor
diff --git a/src/EventLogExpert.Components/DatabaseRecoveryDialog.razor.cs b/src/EventLogExpert.Components/Database/DatabaseRecoveryDialog.razor.cs
similarity index 99%
rename from src/EventLogExpert.Components/DatabaseRecoveryDialog.razor.cs
rename to src/EventLogExpert.Components/Database/DatabaseRecoveryDialog.razor.cs
index 0865e4cc..a9faeb11 100644
--- a/src/EventLogExpert.Components/DatabaseRecoveryDialog.razor.cs
+++ b/src/EventLogExpert.Components/Database/DatabaseRecoveryDialog.razor.cs
@@ -7,7 +7,7 @@
 using EventLogExpert.UI.Models;
 using Microsoft.AspNetCore.Components;
 
-namespace EventLogExpert.Components;
+namespace EventLogExpert.Components.Database;
 
 public sealed partial class DatabaseRecoveryDialog : ComponentBase, IAsyncDisposable
 {
diff --git a/src/EventLogExpert.Components/DatabaseRecoveryDialog.razor.css b/src/EventLogExpert.Components/Database/DatabaseRecoveryDialog.razor.css
similarity index 100%
rename from src/EventLogExpert.Components/DatabaseRecoveryDialog.razor.css
rename to src/EventLogExpert.Components/Database/DatabaseRecoveryDialog.razor.css
diff --git a/src/EventLogExpert.Components/DatabaseRecoveryHost.razor b/src/EventLogExpert.Components/Database/DatabaseRecoveryHost.razor
similarity index 100%
rename from src/EventLogExpert.Components/DatabaseRecoveryHost.razor
rename to src/EventLogExpert.Components/Database/DatabaseRecoveryHost.razor
diff --git a/src/EventLogExpert.Components/DatabaseRecoveryHost.razor.cs b/src/EventLogExpert.Components/Database/DatabaseRecoveryHost.razor.cs
similarity index 98%
rename from src/EventLogExpert.Components/DatabaseRecoveryHost.razor.cs
rename to src/EventLogExpert.Components/Database/DatabaseRecoveryHost.razor.cs
index fd5003ac..86895d8c 100644
--- a/src/EventLogExpert.Components/DatabaseRecoveryHost.razor.cs
+++ b/src/EventLogExpert.Components/Database/DatabaseRecoveryHost.razor.cs
@@ -6,7 +6,7 @@
 using EventLogExpert.UI.Models;
 using Microsoft.AspNetCore.Components;
 
-namespace EventLogExpert.Components;
+namespace EventLogExpert.Components.Database;
 
 public sealed partial class DatabaseRecoveryHost : ComponentBase, IDisposable
 {
diff --git a/src/EventLogExpert.Components/SettingsUpgradeProgressBanner.razor b/src/EventLogExpert.Components/Database/SettingsUpgradeProgressBanner.razor
similarity index 96%
rename from src/EventLogExpert.Components/SettingsUpgradeProgressBanner.razor
rename to src/EventLogExpert.Components/Database/SettingsUpgradeProgressBanner.razor
index 9bf76f6f..0ba91cf5 100644
--- a/src/EventLogExpert.Components/SettingsUpgradeProgressBanner.razor
+++ b/src/EventLogExpert.Components/Database/SettingsUpgradeProgressBanner.razor
@@ -1,5 +1,3 @@
-@namespace EventLogExpert.Components
-
 @if (BannerService.SettingsProgress is { } progress)
 {
     <aside class="settings-upgrade-banner" role="status">
diff --git a/src/EventLogExpert.Components/SettingsUpgradeProgressBanner.razor.cs b/src/EventLogExpert.Components/Database/SettingsUpgradeProgressBanner.razor.cs
similarity index 96%
rename from src/EventLogExpert.Components/SettingsUpgradeProgressBanner.razor.cs
rename to src/EventLogExpert.Components/Database/SettingsUpgradeProgressBanner.razor.cs
index 51fb2a8d..41483fe8 100644
--- a/src/EventLogExpert.Components/SettingsUpgradeProgressBanner.razor.cs
+++ b/src/EventLogExpert.Components/Database/SettingsUpgradeProgressBanner.razor.cs
@@ -6,7 +6,7 @@
 using EventLogExpert.UI.Models;
 using Microsoft.AspNetCore.Components;
 
-namespace EventLogExpert.Components;
+namespace EventLogExpert.Components.Database;
 
 public sealed partial class SettingsUpgradeProgressBanner : ComponentBase, IDisposable
 {
diff --git a/src/EventLogExpert.Components/SettingsUpgradeProgressBanner.razor.css b/src/EventLogExpert.Components/Database/SettingsUpgradeProgressBanner.razor.css
similarity index 100%
rename from src/EventLogExpert.Components/SettingsUpgradeProgressBanner.razor.css
rename to src/EventLogExpert.Components/Database/SettingsUpgradeProgressBanner.razor.css
diff --git a/src/EventLogExpert/Shared/Components/Filters/AdvancedFilterRow.razor b/src/EventLogExpert.Components/Filters/AdvancedFilterRow.razor
similarity index 96%
rename from src/EventLogExpert/Shared/Components/Filters/AdvancedFilterRow.razor
rename to src/EventLogExpert.Components/Filters/AdvancedFilterRow.razor
index f9a0290f..8c094e19 100644
--- a/src/EventLogExpert/Shared/Components/Filters/AdvancedFilterRow.razor
+++ b/src/EventLogExpert.Components/Filters/AdvancedFilterRow.razor
@@ -1,4 +1,3 @@
-@using EventLogExpert.Shared.Base
 @inherits EditableFilterRowBase
 
 <FilterRowChrome ErrorMessage="@ErrorMessage"
diff --git a/src/EventLogExpert/Shared/Components/Filters/AdvancedFilterRow.razor.cs b/src/EventLogExpert.Components/Filters/AdvancedFilterRow.razor.cs
similarity index 90%
rename from src/EventLogExpert/Shared/Components/Filters/AdvancedFilterRow.razor.cs
rename to src/EventLogExpert.Components/Filters/AdvancedFilterRow.razor.cs
index a93b5137..2a97b8d2 100644
--- a/src/EventLogExpert/Shared/Components/Filters/AdvancedFilterRow.razor.cs
+++ b/src/EventLogExpert.Components/Filters/AdvancedFilterRow.razor.cs
@@ -1,11 +1,11 @@
 // // Copyright (c) Microsoft Corporation.
 // // Licensed under the MIT License.
 
-using EventLogExpert.Shared.Base;
+using EventLogExpert.Components.Filters.Base;
 using EventLogExpert.UI.Models;
 using EventLogExpert.UI.Store.FilterPane;
 
-namespace EventLogExpert.Shared.Components.Filters;
+namespace EventLogExpert.Components.Filters;
 
 public sealed partial class AdvancedFilterRow : EditableFilterRowBase
 {
diff --git a/src/EventLogExpert/Shared/Base/EditableFilterRowBase.cs b/src/EventLogExpert.Components/Filters/Base/EditableFilterRowBase.cs
similarity index 99%
rename from src/EventLogExpert/Shared/Base/EditableFilterRowBase.cs
rename to src/EventLogExpert.Components/Filters/Base/EditableFilterRowBase.cs
index f9cb9201..8ecd4f3f 100644
--- a/src/EventLogExpert/Shared/Base/EditableFilterRowBase.cs
+++ b/src/EventLogExpert.Components/Filters/Base/EditableFilterRowBase.cs
@@ -8,7 +8,7 @@
 using Microsoft.AspNetCore.Components;
 using IDispatcher = Fluxor.IDispatcher;
 
-namespace EventLogExpert.Shared.Base;
+namespace EventLogExpert.Components.Filters.Base;
 
 /// <summary>
 ///     Base for filter rows that bind either to a saved <see cref="FilterModel" /> (via
diff --git a/src/EventLogExpert/Shared/Base/FilterRowBase.cs b/src/EventLogExpert.Components/Filters/Base/FilterRowBase.cs
similarity index 89%
rename from src/EventLogExpert/Shared/Base/FilterRowBase.cs
rename to src/EventLogExpert.Components/Filters/Base/FilterRowBase.cs
index e0d7caa2..b2dc8286 100644
--- a/src/EventLogExpert/Shared/Base/FilterRowBase.cs
+++ b/src/EventLogExpert.Components/Filters/Base/FilterRowBase.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.AspNetCore.Components;
 
-namespace EventLogExpert.Shared.Base;
+namespace EventLogExpert.Components.Filters.Base;
 
 /// <summary>Generic base for filter rows: stable DOM <see cref="Id" /> and a typed <see cref="Value" />.</summary>
 public abstract class FilterRowBase<TValue> : ComponentBase
diff --git a/src/EventLogExpert/Shared/Components/Filters/FilterCacheRow.razor b/src/EventLogExpert.Components/Filters/FilterCacheRow.razor
similarity index 97%
rename from src/EventLogExpert/Shared/Components/Filters/FilterCacheRow.razor
rename to src/EventLogExpert.Components/Filters/FilterCacheRow.razor
index 0c8d2351..1dc9fc25 100644
--- a/src/EventLogExpert/Shared/Components/Filters/FilterCacheRow.razor
+++ b/src/EventLogExpert.Components/Filters/FilterCacheRow.razor
@@ -1,4 +1,3 @@
-@using EventLogExpert.Shared.Base
 @using EventLogExpert.UI
 @inherits EditableFilterRowBase
 
diff --git a/src/EventLogExpert/Shared/Components/Filters/FilterCacheRow.razor.cs b/src/EventLogExpert.Components/Filters/FilterCacheRow.razor.cs
similarity index 93%
rename from src/EventLogExpert/Shared/Components/Filters/FilterCacheRow.razor.cs
rename to src/EventLogExpert.Components/Filters/FilterCacheRow.razor.cs
index d417c743..abe0518f 100644
--- a/src/EventLogExpert/Shared/Components/Filters/FilterCacheRow.razor.cs
+++ b/src/EventLogExpert.Components/Filters/FilterCacheRow.razor.cs
@@ -1,7 +1,7 @@
 // // Copyright (c) Microsoft Corporation.
 // // Licensed under the MIT License.
 
-using EventLogExpert.Shared.Base;
+using EventLogExpert.Components.Filters.Base;
 using EventLogExpert.UI;
 using EventLogExpert.UI.Models;
 using EventLogExpert.UI.Store.FilterCache;
@@ -9,7 +9,7 @@
 using Fluxor;
 using Microsoft.AspNetCore.Components;
 
-namespace EventLogExpert.Shared.Components.Filters;
+namespace EventLogExpert.Components.Filters;
 
 public sealed partial class FilterCacheRow : EditableFilterRowBase
 {
diff --git a/src/EventLogExpert/Shared/Components/Filters/FilterCacheRow.razor.css b/src/EventLogExpert.Components/Filters/FilterCacheRow.razor.css
similarity index 100%
rename from src/EventLogExpert/Shared/Components/Filters/FilterCacheRow.razor.css
rename to src/EventLogExpert.Components/Filters/FilterCacheRow.razor.css
diff --git a/src/EventLogExpert/Shared/Components/Filters/FilterCategoryEditor.razor b/src/EventLogExpert.Components/Filters/FilterCategoryEditor.razor
similarity index 100%
rename from src/EventLogExpert/Shared/Components/Filters/FilterCategoryEditor.razor
rename to src/EventLogExpert.Components/Filters/FilterCategoryEditor.razor
diff --git a/src/EventLogExpert/Shared/Components/Filters/FilterCategoryEditor.razor.cs b/src/EventLogExpert.Components/Filters/FilterCategoryEditor.razor.cs
similarity index 97%
rename from src/EventLogExpert/Shared/Components/Filters/FilterCategoryEditor.razor.cs
rename to src/EventLogExpert.Components/Filters/FilterCategoryEditor.razor.cs
index 3220fbaa..670341e1 100644
--- a/src/EventLogExpert/Shared/Components/Filters/FilterCategoryEditor.razor.cs
+++ b/src/EventLogExpert.Components/Filters/FilterCategoryEditor.razor.cs
@@ -9,7 +9,7 @@
 using Microsoft.AspNetCore.Components;
 using System.Collections.Immutable;
 
-namespace EventLogExpert.Shared.Components.Filters;
+namespace EventLogExpert.Components.Filters;
 
 public sealed partial class FilterCategoryEditor : ComponentBase
 {
diff --git a/src/EventLogExpert/Shared/Components/Filters/FilterGroupRow.razor b/src/EventLogExpert.Components/Filters/FilterGroupRow.razor
similarity index 96%
rename from src/EventLogExpert/Shared/Components/Filters/FilterGroupRow.razor
rename to src/EventLogExpert.Components/Filters/FilterGroupRow.razor
index f50afd23..097b09ff 100644
--- a/src/EventLogExpert/Shared/Components/Filters/FilterGroupRow.razor
+++ b/src/EventLogExpert.Components/Filters/FilterGroupRow.razor
@@ -1,4 +1,3 @@
-@using EventLogExpert.Shared.Base
 @inherits EditableFilterRowBase
 
 <FilterRowChrome ErrorMessage="@ErrorMessage"
diff --git a/src/EventLogExpert/Shared/Components/Filters/FilterGroupRow.razor.cs b/src/EventLogExpert.Components/Filters/FilterGroupRow.razor.cs
similarity index 94%
rename from src/EventLogExpert/Shared/Components/Filters/FilterGroupRow.razor.cs
rename to src/EventLogExpert.Components/Filters/FilterGroupRow.razor.cs
index 9aff311d..764564bc 100644
--- a/src/EventLogExpert/Shared/Components/Filters/FilterGroupRow.razor.cs
+++ b/src/EventLogExpert.Components/Filters/FilterGroupRow.razor.cs
@@ -1,13 +1,13 @@
 // // Copyright (c) Microsoft Corporation.
 // // Licensed under the MIT License.
 
-using EventLogExpert.Shared.Base;
+using EventLogExpert.Components.Filters.Base;
 using EventLogExpert.UI;
 using EventLogExpert.UI.Models;
 using EventLogExpert.UI.Store.FilterGroup;
 using Microsoft.AspNetCore.Components;
 
-namespace EventLogExpert.Shared.Components.Filters;
+namespace EventLogExpert.Components.Filters;
 
 public sealed partial class FilterGroupRow : EditableFilterRowBase
 {
diff --git a/src/EventLogExpert/Shared/Components/Filters/FilterGroupRow.razor.css b/src/EventLogExpert.Components/Filters/FilterGroupRow.razor.css
similarity index 100%
rename from src/EventLogExpert/Shared/Components/Filters/FilterGroupRow.razor.css
rename to src/EventLogExpert.Components/Filters/FilterGroupRow.razor.css
diff --git a/src/EventLogExpert/Shared/Components/Filters/FilterRow.razor b/src/EventLogExpert.Components/Filters/FilterRow.razor
similarity index 97%
rename from src/EventLogExpert/Shared/Components/Filters/FilterRow.razor
rename to src/EventLogExpert.Components/Filters/FilterRow.razor
index 535abed6..671d0765 100644
--- a/src/EventLogExpert/Shared/Components/Filters/FilterRow.razor
+++ b/src/EventLogExpert.Components/Filters/FilterRow.razor
@@ -1,4 +1,3 @@
-@using EventLogExpert.Shared.Base
 @inherits EditableFilterRowBase
 
 <FilterRowChrome ErrorMessage="@ErrorMessage"
diff --git a/src/EventLogExpert/Shared/Components/Filters/FilterRow.razor.cs b/src/EventLogExpert.Components/Filters/FilterRow.razor.cs
similarity index 95%
rename from src/EventLogExpert/Shared/Components/Filters/FilterRow.razor.cs
rename to src/EventLogExpert.Components/Filters/FilterRow.razor.cs
index 46b25e62..22546e61 100644
--- a/src/EventLogExpert/Shared/Components/Filters/FilterRow.razor.cs
+++ b/src/EventLogExpert.Components/Filters/FilterRow.razor.cs
@@ -1,14 +1,14 @@
 // // Copyright (c) Microsoft Corporation.
 // // Licensed under the MIT License.
 
-using EventLogExpert.Shared.Base;
+using EventLogExpert.Components.Filters.Base;
 using EventLogExpert.UI;
 using EventLogExpert.UI.Interfaces;
 using EventLogExpert.UI.Models;
 using EventLogExpert.UI.Store.FilterPane;
 using Microsoft.AspNetCore.Components;
 
-namespace EventLogExpert.Shared.Components.Filters;
+namespace EventLogExpert.Components.Filters;
 
 public sealed partial class FilterRow : EditableFilterRowBase
 {
diff --git a/src/EventLogExpert/Shared/Components/Filters/FilterRowChrome.razor b/src/EventLogExpert.Components/Filters/FilterRowChrome.razor
similarity index 100%
rename from src/EventLogExpert/Shared/Components/Filters/FilterRowChrome.razor
rename to src/EventLogExpert.Components/Filters/FilterRowChrome.razor
diff --git a/src/EventLogExpert/Shared/Components/Filters/FilterRowChrome.razor.cs b/src/EventLogExpert.Components/Filters/FilterRowChrome.razor.cs
similarity index 96%
rename from src/EventLogExpert/Shared/Components/Filters/FilterRowChrome.razor.cs
rename to src/EventLogExpert.Components/Filters/FilterRowChrome.razor.cs
index 3dcf6272..3a2efbc8 100644
--- a/src/EventLogExpert/Shared/Components/Filters/FilterRowChrome.razor.cs
+++ b/src/EventLogExpert.Components/Filters/FilterRowChrome.razor.cs
@@ -4,7 +4,7 @@
 using EventLogExpert.UI.Models;
 using Microsoft.AspNetCore.Components;
 
-namespace EventLogExpert.Shared.Components.Filters;
+namespace EventLogExpert.Components.Filters;
 
 /// <summary>
 ///     Reusable chrome for filter rows: handles the color picker, saved-state value display, action buttons, and
diff --git a/src/EventLogExpert/Shared/Components/Filters/FilterRowChrome.razor.css b/src/EventLogExpert.Components/Filters/FilterRowChrome.razor.css
similarity index 100%
rename from src/EventLogExpert/Shared/Components/Filters/FilterRowChrome.razor.css
rename to src/EventLogExpert.Components/Filters/FilterRowChrome.razor.css
diff --git a/src/EventLogExpert/Shared/Components/Filters/SubFilterRow.razor b/src/EventLogExpert.Components/Filters/SubFilterRow.razor
similarity index 93%
rename from src/EventLogExpert/Shared/Components/Filters/SubFilterRow.razor
rename to src/EventLogExpert.Components/Filters/SubFilterRow.razor
index 744b049c..75e3b225 100644
--- a/src/EventLogExpert/Shared/Components/Filters/SubFilterRow.razor
+++ b/src/EventLogExpert.Components/Filters/SubFilterRow.razor
@@ -1,4 +1,3 @@
-@using EventLogExpert.Shared.Base
 @inherits FilterRowBase<SubFilterDraft>
 
 <div class="flex-center-aligned-row px-4">
diff --git a/src/EventLogExpert/Shared/Components/Filters/SubFilterRow.razor.cs b/src/EventLogExpert.Components/Filters/SubFilterRow.razor.cs
similarity index 80%
rename from src/EventLogExpert/Shared/Components/Filters/SubFilterRow.razor.cs
rename to src/EventLogExpert.Components/Filters/SubFilterRow.razor.cs
index cf272dd3..b9fa14c4 100644
--- a/src/EventLogExpert/Shared/Components/Filters/SubFilterRow.razor.cs
+++ b/src/EventLogExpert.Components/Filters/SubFilterRow.razor.cs
@@ -1,11 +1,11 @@
 // // Copyright (c) Microsoft Corporation.
 // // Licensed under the MIT License.
 
-using EventLogExpert.Shared.Base;
+using EventLogExpert.Components.Filters.Base;
 using EventLogExpert.UI.Models;
 using Microsoft.AspNetCore.Components;
 
-namespace EventLogExpert.Shared.Components.Filters;
+namespace EventLogExpert.Components.Filters;
 
 public sealed partial class SubFilterRow : FilterRowBase<SubFilterDraft>
 {
diff --git a/src/EventLogExpert.Components/BooleanSelect.razor b/src/EventLogExpert.Components/Inputs/BooleanSelect.razor
similarity index 100%
rename from src/EventLogExpert.Components/BooleanSelect.razor
rename to src/EventLogExpert.Components/Inputs/BooleanSelect.razor
diff --git a/src/EventLogExpert.Components/BooleanSelect.razor.cs b/src/EventLogExpert.Components/Inputs/BooleanSelect.razor.cs
similarity index 95%
rename from src/EventLogExpert.Components/BooleanSelect.razor.cs
rename to src/EventLogExpert.Components/Inputs/BooleanSelect.razor.cs
index 9972a6c0..403e5bd3 100644
--- a/src/EventLogExpert.Components/BooleanSelect.razor.cs
+++ b/src/EventLogExpert.Components/Inputs/BooleanSelect.razor.cs
@@ -4,7 +4,7 @@
 using EventLogExpert.Components.Base;
 using Microsoft.AspNetCore.Components;
 
-namespace EventLogExpert.Components;
+namespace EventLogExpert.Components.Inputs;
 
 public sealed partial class BooleanSelect : InputComponent<bool>
 {
diff --git a/src/EventLogExpert.Components/BooleanSelect.razor.css b/src/EventLogExpert.Components/Inputs/BooleanSelect.razor.css
similarity index 100%
rename from src/EventLogExpert.Components/BooleanSelect.razor.css
rename to src/EventLogExpert.Components/Inputs/BooleanSelect.razor.css
diff --git a/src/EventLogExpert/Shared/Components/TextInput.razor b/src/EventLogExpert.Components/Inputs/TextInput.razor
similarity index 100%
rename from src/EventLogExpert/Shared/Components/TextInput.razor
rename to src/EventLogExpert.Components/Inputs/TextInput.razor
diff --git a/src/EventLogExpert/Shared/Components/TextInput.razor.cs b/src/EventLogExpert.Components/Inputs/TextInput.razor.cs
similarity index 89%
rename from src/EventLogExpert/Shared/Components/TextInput.razor.cs
rename to src/EventLogExpert.Components/Inputs/TextInput.razor.cs
index 2bcd5a90..0dc78661 100644
--- a/src/EventLogExpert/Shared/Components/TextInput.razor.cs
+++ b/src/EventLogExpert.Components/Inputs/TextInput.razor.cs
@@ -4,7 +4,7 @@
 using EventLogExpert.Components.Base;
 using Microsoft.AspNetCore.Components;
 
-namespace EventLogExpert.Shared.Components;
+namespace EventLogExpert.Components.Inputs;
 
 public partial class TextInput : InputComponent<string>
 {
diff --git a/src/EventLogExpert/Shared/Components/ValueSelect.razor b/src/EventLogExpert.Components/Inputs/ValueSelect.razor
similarity index 100%
rename from src/EventLogExpert/Shared/Components/ValueSelect.razor
rename to src/EventLogExpert.Components/Inputs/ValueSelect.razor
diff --git a/src/EventLogExpert/Shared/Components/ValueSelect.razor.cs b/src/EventLogExpert.Components/Inputs/ValueSelect.razor.cs
similarity index 99%
rename from src/EventLogExpert/Shared/Components/ValueSelect.razor.cs
rename to src/EventLogExpert.Components/Inputs/ValueSelect.razor.cs
index a7d7a816..70b18da0 100644
--- a/src/EventLogExpert/Shared/Components/ValueSelect.razor.cs
+++ b/src/EventLogExpert.Components/Inputs/ValueSelect.razor.cs
@@ -6,7 +6,7 @@
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.JSInterop;
 
-namespace EventLogExpert.Shared.Components;
+namespace EventLogExpert.Components.Inputs;
 
 public sealed partial class ValueSelect<T> : InputComponent<T>, IAsyncDisposable
 {
diff --git a/src/EventLogExpert/Shared/Components/ValueSelect.razor.css b/src/EventLogExpert.Components/Inputs/ValueSelect.razor.css
similarity index 100%
rename from src/EventLogExpert/Shared/Components/ValueSelect.razor.css
rename to src/EventLogExpert.Components/Inputs/ValueSelect.razor.css
diff --git a/src/EventLogExpert/Shared/Components/ValueSelectItem.razor b/src/EventLogExpert.Components/Inputs/ValueSelectItem.razor
similarity index 100%
rename from src/EventLogExpert/Shared/Components/ValueSelectItem.razor
rename to src/EventLogExpert.Components/Inputs/ValueSelectItem.razor
diff --git a/src/EventLogExpert/Shared/Components/ValueSelectItem.razor.cs b/src/EventLogExpert.Components/Inputs/ValueSelectItem.razor.cs
similarity index 97%
rename from src/EventLogExpert/Shared/Components/ValueSelectItem.razor.cs
rename to src/EventLogExpert.Components/Inputs/ValueSelectItem.razor.cs
index fd1f6f72..81157729 100644
--- a/src/EventLogExpert/Shared/Components/ValueSelectItem.razor.cs
+++ b/src/EventLogExpert.Components/Inputs/ValueSelectItem.razor.cs
@@ -4,7 +4,7 @@
 using EventLogExpert.UI.Models;
 using Microsoft.AspNetCore.Components;
 
-namespace EventLogExpert.Shared.Components;
+namespace EventLogExpert.Components.Inputs;
 
 public sealed partial class ValueSelectItem<T> : IDisposable
 {
diff --git a/src/EventLogExpert/Shared/Components/ValueSelectItem.razor.css b/src/EventLogExpert.Components/Inputs/ValueSelectItem.razor.css
similarity index 100%
rename from src/EventLogExpert/Shared/Components/ValueSelectItem.razor.css
rename to src/EventLogExpert.Components/Inputs/ValueSelectItem.razor.css
diff --git a/src/EventLogExpert/Shared/Components/Menu/MenuBar.razor b/src/EventLogExpert.Components/Menu/MenuBar.razor
similarity index 100%
rename from src/EventLogExpert/Shared/Components/Menu/MenuBar.razor
rename to src/EventLogExpert.Components/Menu/MenuBar.razor
diff --git a/src/EventLogExpert/Shared/Components/Menu/MenuBar.razor.cs b/src/EventLogExpert.Components/Menu/MenuBar.razor.cs
similarity index 99%
rename from src/EventLogExpert/Shared/Components/Menu/MenuBar.razor.cs
rename to src/EventLogExpert.Components/Menu/MenuBar.razor.cs
index fffb5835..ae531901 100644
--- a/src/EventLogExpert/Shared/Components/Menu/MenuBar.razor.cs
+++ b/src/EventLogExpert.Components/Menu/MenuBar.razor.cs
@@ -4,6 +4,7 @@
 using EventLogExpert.Eventing.Helpers;
 using EventLogExpert.UI;
 using EventLogExpert.UI.Interfaces;
+using EventLogExpert.UI.Models;
 using EventLogExpert.UI.Services;
 using EventLogExpert.UI.Store.EventLog;
 using EventLogExpert.UI.Store.FilterPane;
@@ -13,7 +14,7 @@
 using Microsoft.JSInterop;
 using System.Text;
 
-namespace EventLogExpert.Shared.Components.Menu;
+namespace EventLogExpert.Components.Menu;
 
 public sealed partial class MenuBar : IDisposable
 {
diff --git a/src/EventLogExpert/Shared/Components/Menu/MenuBar.razor.css b/src/EventLogExpert.Components/Menu/MenuBar.razor.css
similarity index 100%
rename from src/EventLogExpert/Shared/Components/Menu/MenuBar.razor.css
rename to src/EventLogExpert.Components/Menu/MenuBar.razor.css
diff --git a/src/EventLogExpert/Shared/Components/Menu/MenuHost.razor b/src/EventLogExpert.Components/Menu/MenuHost.razor
similarity index 100%
rename from src/EventLogExpert/Shared/Components/Menu/MenuHost.razor
rename to src/EventLogExpert.Components/Menu/MenuHost.razor
diff --git a/src/EventLogExpert/Shared/Components/Menu/MenuHost.razor.cs b/src/EventLogExpert.Components/Menu/MenuHost.razor.cs
similarity index 98%
rename from src/EventLogExpert/Shared/Components/Menu/MenuHost.razor.cs
rename to src/EventLogExpert.Components/Menu/MenuHost.razor.cs
index 904a8db7..a7c32e9a 100644
--- a/src/EventLogExpert/Shared/Components/Menu/MenuHost.razor.cs
+++ b/src/EventLogExpert.Components/Menu/MenuHost.razor.cs
@@ -7,7 +7,7 @@
 using Microsoft.JSInterop;
 using System.Globalization;
 
-namespace EventLogExpert.Shared.Components.Menu;
+namespace EventLogExpert.Components.Menu;
 
 public sealed partial class MenuHost : IAsyncDisposable
 {
diff --git a/src/EventLogExpert/Shared/Components/Menu/MenuHost.razor.css b/src/EventLogExpert.Components/Menu/MenuHost.razor.css
similarity index 100%
rename from src/EventLogExpert/Shared/Components/Menu/MenuHost.razor.css
rename to src/EventLogExpert.Components/Menu/MenuHost.razor.css
diff --git a/src/EventLogExpert/Shared/Components/Menu/MenuRenderer.razor b/src/EventLogExpert.Components/Menu/MenuRenderer.razor
similarity index 100%
rename from src/EventLogExpert/Shared/Components/Menu/MenuRenderer.razor
rename to src/EventLogExpert.Components/Menu/MenuRenderer.razor
diff --git a/src/EventLogExpert/Shared/Components/Menu/MenuRenderer.razor.cs b/src/EventLogExpert.Components/Menu/MenuRenderer.razor.cs
similarity index 99%
rename from src/EventLogExpert/Shared/Components/Menu/MenuRenderer.razor.cs
rename to src/EventLogExpert.Components/Menu/MenuRenderer.razor.cs
index 7e31efcf..1e162cc2 100644
--- a/src/EventLogExpert/Shared/Components/Menu/MenuRenderer.razor.cs
+++ b/src/EventLogExpert.Components/Menu/MenuRenderer.razor.cs
@@ -1,11 +1,12 @@
 // // Copyright (c) Microsoft Corporation.
 // // Licensed under the MIT License.
 
+using EventLogExpert.UI.Models;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.JSInterop;
 
-namespace EventLogExpert.Shared.Components.Menu;
+namespace EventLogExpert.Components.Menu;
 
 public sealed partial class MenuRenderer
 {
diff --git a/src/EventLogExpert/Shared/Components/Menu/MenuRenderer.razor.css b/src/EventLogExpert.Components/Menu/MenuRenderer.razor.css
similarity index 100%
rename from src/EventLogExpert/Shared/Components/Menu/MenuRenderer.razor.css
rename to src/EventLogExpert.Components/Menu/MenuRenderer.razor.css
diff --git a/src/EventLogExpert/Shared/Components/Alerts/AlertModal.razor b/src/EventLogExpert.Components/Modals/Alerts/AlertModal.razor
similarity index 95%
rename from src/EventLogExpert/Shared/Components/Alerts/AlertModal.razor
rename to src/EventLogExpert.Components/Modals/Alerts/AlertModal.razor
index 6cc35455..41ab0b3a 100644
--- a/src/EventLogExpert/Shared/Components/Alerts/AlertModal.razor
+++ b/src/EventLogExpert.Components/Modals/Alerts/AlertModal.razor
@@ -1,4 +1,3 @@
-@using EventLogExpert.Shared.Base
 @inherits ModalBase<bool>
 
 <ModalChrome AriaLabel="@AriaLabelText"
diff --git a/src/EventLogExpert/Shared/Components/Alerts/AlertModal.razor.cs b/src/EventLogExpert.Components/Modals/Alerts/AlertModal.razor.cs
similarity index 92%
rename from src/EventLogExpert/Shared/Components/Alerts/AlertModal.razor.cs
rename to src/EventLogExpert.Components/Modals/Alerts/AlertModal.razor.cs
index abb098be..3355d374 100644
--- a/src/EventLogExpert/Shared/Components/Alerts/AlertModal.razor.cs
+++ b/src/EventLogExpert.Components/Modals/Alerts/AlertModal.razor.cs
@@ -1,10 +1,10 @@
 // // Copyright (c) Microsoft Corporation.
 // // Licensed under the MIT License.
 
-using EventLogExpert.Shared.Base;
+using EventLogExpert.Components.Base;
 using Microsoft.AspNetCore.Components;
 
-namespace EventLogExpert.Shared.Components.Alerts;
+namespace EventLogExpert.Components.Modals.Alerts;
 
 /// <summary>
 ///     Standalone alert modal used by <c>ModalAlertDialogService</c> when no host modal is active. Dismiss-only when
diff --git a/src/EventLogExpert/Shared/Components/Alerts/AlertModal.razor.css b/src/EventLogExpert.Components/Modals/Alerts/AlertModal.razor.css
similarity index 100%
rename from src/EventLogExpert/Shared/Components/Alerts/AlertModal.razor.css
rename to src/EventLogExpert.Components/Modals/Alerts/AlertModal.razor.css
diff --git a/src/EventLogExpert/Shared/Components/Alerts/PromptModal.razor b/src/EventLogExpert.Components/Modals/Alerts/PromptModal.razor
similarity index 95%
rename from src/EventLogExpert/Shared/Components/Alerts/PromptModal.razor
rename to src/EventLogExpert.Components/Modals/Alerts/PromptModal.razor
index 1e75d913..958797d4 100644
--- a/src/EventLogExpert/Shared/Components/Alerts/PromptModal.razor
+++ b/src/EventLogExpert.Components/Modals/Alerts/PromptModal.razor
@@ -1,4 +1,3 @@
-@using EventLogExpert.Shared.Base
 @inherits ModalBase<string>
 
 <ModalChrome AriaLabel="@AriaLabelText"
diff --git a/src/EventLogExpert/Shared/Components/Alerts/PromptModal.razor.cs b/src/EventLogExpert.Components/Modals/Alerts/PromptModal.razor.cs
similarity index 95%
rename from src/EventLogExpert/Shared/Components/Alerts/PromptModal.razor.cs
rename to src/EventLogExpert.Components/Modals/Alerts/PromptModal.razor.cs
index 96de45b8..04bbdc2d 100644
--- a/src/EventLogExpert/Shared/Components/Alerts/PromptModal.razor.cs
+++ b/src/EventLogExpert.Components/Modals/Alerts/PromptModal.razor.cs
@@ -1,10 +1,10 @@
 // // Copyright (c) Microsoft Corporation.
 // // Licensed under the MIT License.
 
-using EventLogExpert.Shared.Base;
+using EventLogExpert.Components.Base;
 using Microsoft.AspNetCore.Components;
 
-namespace EventLogExpert.Shared.Components.Alerts;
+namespace EventLogExpert.Components.Modals.Alerts;
 
 /// <summary>
 ///     Standalone prompt modal used by <c>ModalAlertDialogService</c> when no host modal is active. Returns the input
diff --git a/src/EventLogExpert/Shared/Components/Alerts/PromptModal.razor.css b/src/EventLogExpert.Components/Modals/Alerts/PromptModal.razor.css
similarity index 100%
rename from src/EventLogExpert/Shared/Components/Alerts/PromptModal.razor.css
rename to src/EventLogExpert.Components/Modals/Alerts/PromptModal.razor.css
diff --git a/src/EventLogExpert/Shared/Components/DebugLogModal.razor b/src/EventLogExpert.Components/Modals/DebugLogModal.razor
similarity index 97%
rename from src/EventLogExpert/Shared/Components/DebugLogModal.razor
rename to src/EventLogExpert.Components/Modals/DebugLogModal.razor
index 67f4e074..226d9aa2 100644
--- a/src/EventLogExpert/Shared/Components/DebugLogModal.razor
+++ b/src/EventLogExpert.Components/Modals/DebugLogModal.razor
@@ -1,4 +1,3 @@
-@using EventLogExpert.Shared.Base
 @inherits ModalBase<bool>
 
 <ModalChrome AriaLabel="Debug Log"
diff --git a/src/EventLogExpert/Shared/Components/DebugLogModal.razor.cs b/src/EventLogExpert.Components/Modals/DebugLogModal.razor.cs
similarity index 95%
rename from src/EventLogExpert/Shared/Components/DebugLogModal.razor.cs
rename to src/EventLogExpert.Components/Modals/DebugLogModal.razor.cs
index 1b97c6ba..4556a653 100644
--- a/src/EventLogExpert/Shared/Components/DebugLogModal.razor.cs
+++ b/src/EventLogExpert.Components/Modals/DebugLogModal.razor.cs
@@ -1,11 +1,11 @@
 // // Copyright (c) Microsoft Corporation.
 // // Licensed under the MIT License.
 
-using EventLogExpert.Shared.Base;
+using EventLogExpert.Components.Base;
 using EventLogExpert.UI.Interfaces;
 using Microsoft.AspNetCore.Components;
 
-namespace EventLogExpert.Shared.Components;
+namespace EventLogExpert.Components.Modals;
 
 public sealed partial class DebugLogModal : ModalBase<bool>
 {
diff --git a/src/EventLogExpert/Shared/Components/ModalHost.razor b/src/EventLogExpert.Components/Modals/ModalHost.razor
similarity index 100%
rename from src/EventLogExpert/Shared/Components/ModalHost.razor
rename to src/EventLogExpert.Components/Modals/ModalHost.razor
diff --git a/src/EventLogExpert/Shared/Components/ModalHost.razor.cs b/src/EventLogExpert.Components/Modals/ModalHost.razor.cs
similarity index 92%
rename from src/EventLogExpert/Shared/Components/ModalHost.razor.cs
rename to src/EventLogExpert.Components/Modals/ModalHost.razor.cs
index ad57644d..7057790d 100644
--- a/src/EventLogExpert/Shared/Components/ModalHost.razor.cs
+++ b/src/EventLogExpert.Components/Modals/ModalHost.razor.cs
@@ -4,7 +4,7 @@
 using EventLogExpert.UI.Interfaces;
 using Microsoft.AspNetCore.Components;
 
-namespace EventLogExpert.Shared.Components;
+namespace EventLogExpert.Components.Modals;
 
 public sealed partial class ModalHost : ComponentBase, IDisposable
 {
diff --git a/src/EventLogExpert/Shared/Components/ReleaseNotesModal.razor b/src/EventLogExpert.Components/Modals/ReleaseNotesModal.razor
similarity index 94%
rename from src/EventLogExpert/Shared/Components/ReleaseNotesModal.razor
rename to src/EventLogExpert.Components/Modals/ReleaseNotesModal.razor
index 87ebbb8b..4f4b2e2f 100644
--- a/src/EventLogExpert/Shared/Components/ReleaseNotesModal.razor
+++ b/src/EventLogExpert.Components/Modals/ReleaseNotesModal.razor
@@ -1,4 +1,3 @@
-@using EventLogExpert.Shared.Base
 @inherits ModalBase<bool>
 
 <ModalChrome AriaLabel="Release Notes"
diff --git a/src/EventLogExpert/Shared/Components/ReleaseNotesModal.razor.cs b/src/EventLogExpert.Components/Modals/ReleaseNotesModal.razor.cs
similarity index 90%
rename from src/EventLogExpert/Shared/Components/ReleaseNotesModal.razor.cs
rename to src/EventLogExpert.Components/Modals/ReleaseNotesModal.razor.cs
index 3cf3d296..cae76d53 100644
--- a/src/EventLogExpert/Shared/Components/ReleaseNotesModal.razor.cs
+++ b/src/EventLogExpert.Components/Modals/ReleaseNotesModal.razor.cs
@@ -1,11 +1,11 @@
 // // Copyright (c) Microsoft Corporation.
 // // Licensed under the MIT License.
 
-using EventLogExpert.Shared.Base;
+using EventLogExpert.Components.Base;
 using EventLogExpert.UI.Services;
 using Microsoft.AspNetCore.Components;
 
-namespace EventLogExpert.Shared.Components;
+namespace EventLogExpert.Components.Modals;
 
 public sealed partial class ReleaseNotesModal : ModalBase<bool>
 {
diff --git a/src/EventLogExpert/Shared/Components/ReleaseNotesModal.razor.css b/src/EventLogExpert.Components/Modals/ReleaseNotesModal.razor.css
similarity index 100%
rename from src/EventLogExpert/Shared/Components/ReleaseNotesModal.razor.css
rename to src/EventLogExpert.Components/Modals/ReleaseNotesModal.razor.css
diff --git a/src/EventLogExpert.Components/_Imports.razor b/src/EventLogExpert.Components/_Imports.razor
index c9e120af..cd31af72 100644
--- a/src/EventLogExpert.Components/_Imports.razor
+++ b/src/EventLogExpert.Components/_Imports.razor
@@ -1,4 +1,14 @@
 @using Microsoft.AspNetCore.Components
 @using Microsoft.AspNetCore.Components.Web
+@using EventLogExpert.Components.Base
+@using EventLogExpert.Components.Database
+@using EventLogExpert.Components.Filters
+@using EventLogExpert.Components.Filters.Base
+@using EventLogExpert.Components.Inputs
+@using EventLogExpert.Components.Menu
+@using EventLogExpert.Components.Modals
+@using EventLogExpert.Components.Modals.Alerts
 @using EventLogExpert.UI.Models
 @using EventLogExpert.UI.Services
+@using Fluxor
+@using Fluxor.Blazor.Web.Components
diff --git a/src/EventLogExpert/ExtensionMethods.cs b/src/EventLogExpert.UI/ExtensionMethods.cs
similarity index 69%
rename from src/EventLogExpert/ExtensionMethods.cs
rename to src/EventLogExpert.UI/ExtensionMethods.cs
index 42305736..65b52899 100644
--- a/src/EventLogExpert/ExtensionMethods.cs
+++ b/src/EventLogExpert.UI/ExtensionMethods.cs
@@ -4,11 +4,11 @@
 using System.Reflection;
 using System.Runtime.Serialization;
 
-namespace EventLogExpert;
+namespace EventLogExpert.UI;
 
-internal static class ExtensionMethods
+public static class ExtensionMethods
 {
-    internal static string ToFullString(this Enum value)
+    public static string ToFullString(this Enum value)
     {
         var memberAttribute = value.GetType().GetField(value.ToString())?
             .GetCustomAttribute(typeof(EnumMemberAttribute)) as EnumMemberAttribute;
@@ -18,10 +18,10 @@ internal static string ToFullString(this Enum value)
 
     extension(DateTime time)
     {
-        internal DateTime ConvertTimeZone(TimeZoneInfo? destinationTime) =>
+        public DateTime ConvertTimeZone(TimeZoneInfo? destinationTime) =>
             destinationTime is null ? time : TimeZoneInfo.ConvertTimeFromUtc(time, destinationTime);
 
-        internal DateTime ConvertTimeZoneToUtc(TimeZoneInfo? destinationTime) =>
+        public DateTime ConvertTimeZoneToUtc(TimeZoneInfo? destinationTime) =>
             destinationTime is null ? time : TimeZoneInfo.ConvertTimeToUtc(time, destinationTime);
     }
 }
diff --git a/src/EventLogExpert/Shared/MainLayout.razor b/src/EventLogExpert/Components/Layout/MainLayout.razor
similarity index 76%
rename from src/EventLogExpert/Shared/MainLayout.razor
rename to src/EventLogExpert/Components/Layout/MainLayout.razor
index 3b4c64a0..53045bb4 100644
--- a/src/EventLogExpert/Shared/MainLayout.razor
+++ b/src/EventLogExpert/Components/Layout/MainLayout.razor
@@ -1,6 +1,3 @@
-@using EventLogExpert.Components
-@using EventLogExpert.Shared.Components
-@using EventLogExpert.Shared.Components.Menu
 @inherits LayoutComponentBase
 
 <div class="page">
diff --git a/src/EventLogExpert/Shared/MainLayout.razor.cs b/src/EventLogExpert/Components/Layout/MainLayout.razor.cs
similarity index 94%
rename from src/EventLogExpert/Shared/MainLayout.razor.cs
rename to src/EventLogExpert/Components/Layout/MainLayout.razor.cs
index 034aab1c..5aeab89d 100644
--- a/src/EventLogExpert/Shared/MainLayout.razor.cs
+++ b/src/EventLogExpert/Components/Layout/MainLayout.razor.cs
@@ -7,7 +7,7 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
 
-namespace EventLogExpert.Shared;
+namespace EventLogExpert.Components.Layout;
 
 public sealed partial class MainLayout : IAsyncDisposable
 {
diff --git a/src/EventLogExpert/Shared/MainLayout.razor.css b/src/EventLogExpert/Components/Layout/MainLayout.razor.css
similarity index 100%
rename from src/EventLogExpert/Shared/MainLayout.razor.css
rename to src/EventLogExpert/Components/Layout/MainLayout.razor.css
diff --git a/src/EventLogExpert/Shared/UnhandledExceptionHandler.razor b/src/EventLogExpert/Components/Layout/UnhandledExceptionHandler.razor
similarity index 100%
rename from src/EventLogExpert/Shared/UnhandledExceptionHandler.razor
rename to src/EventLogExpert/Components/Layout/UnhandledExceptionHandler.razor
diff --git a/src/EventLogExpert/Shared/UnhandledExceptionHandler.razor.cs b/src/EventLogExpert/Components/Layout/UnhandledExceptionHandler.razor.cs
similarity index 96%
rename from src/EventLogExpert/Shared/UnhandledExceptionHandler.razor.cs
rename to src/EventLogExpert/Components/Layout/UnhandledExceptionHandler.razor.cs
index 4d74b3ea..8988b34c 100644
--- a/src/EventLogExpert/Shared/UnhandledExceptionHandler.razor.cs
+++ b/src/EventLogExpert/Components/Layout/UnhandledExceptionHandler.razor.cs
@@ -6,7 +6,7 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Web;
 
-namespace EventLogExpert.Shared;
+namespace EventLogExpert.Components.Layout;
 
 public partial class UnhandledExceptionHandler : ErrorBoundary, IDisposable
 {
diff --git a/src/EventLogExpert/Shared/Components/Filters/FilterCacheModal.razor b/src/EventLogExpert/Components/Modals/Filters/FilterCacheModal.razor
similarity index 98%
rename from src/EventLogExpert/Shared/Components/Filters/FilterCacheModal.razor
rename to src/EventLogExpert/Components/Modals/Filters/FilterCacheModal.razor
index 1d0792be..53c12098 100644
--- a/src/EventLogExpert/Shared/Components/Filters/FilterCacheModal.razor
+++ b/src/EventLogExpert/Components/Modals/Filters/FilterCacheModal.razor
@@ -1,4 +1,3 @@
-@using EventLogExpert.Shared.Base
 @inherits ModalBase<bool>
 
 <ModalChrome AriaLabel="Saved Filters"
diff --git a/src/EventLogExpert/Shared/Components/Filters/FilterCacheModal.razor.cs b/src/EventLogExpert/Components/Modals/Filters/FilterCacheModal.razor.cs
similarity index 97%
rename from src/EventLogExpert/Shared/Components/Filters/FilterCacheModal.razor.cs
rename to src/EventLogExpert/Components/Modals/Filters/FilterCacheModal.razor.cs
index 792e8401..e4c57ec5 100644
--- a/src/EventLogExpert/Shared/Components/Filters/FilterCacheModal.razor.cs
+++ b/src/EventLogExpert/Components/Modals/Filters/FilterCacheModal.razor.cs
@@ -1,7 +1,7 @@
 // // Copyright (c) Microsoft Corporation.
 // // Licensed under the MIT License.
 
-using EventLogExpert.Shared.Base;
+using EventLogExpert.Components.Base;
 using EventLogExpert.UI;
 using EventLogExpert.UI.Interfaces;
 using EventLogExpert.UI.Models;
@@ -14,7 +14,7 @@
 using WinRT.Interop;
 using IDispatcher = Fluxor.IDispatcher;
 
-namespace EventLogExpert.Shared.Components.Filters;
+namespace EventLogExpert.Components.Modals.Filters;
 
 public sealed partial class FilterCacheModal : ModalBase<bool>
 {
diff --git a/src/EventLogExpert/Shared/Components/Filters/FilterCacheModal.razor.css b/src/EventLogExpert/Components/Modals/Filters/FilterCacheModal.razor.css
similarity index 100%
rename from src/EventLogExpert/Shared/Components/Filters/FilterCacheModal.razor.css
rename to src/EventLogExpert/Components/Modals/Filters/FilterCacheModal.razor.css
diff --git a/src/EventLogExpert/Shared/Components/Filters/FilterGroup.razor b/src/EventLogExpert/Components/Modals/Filters/FilterGroup.razor
similarity index 100%
rename from src/EventLogExpert/Shared/Components/Filters/FilterGroup.razor
rename to src/EventLogExpert/Components/Modals/Filters/FilterGroup.razor
diff --git a/src/EventLogExpert/Shared/Components/Filters/FilterGroup.razor.cs b/src/EventLogExpert/Components/Modals/Filters/FilterGroup.razor.cs
similarity index 99%
rename from src/EventLogExpert/Shared/Components/Filters/FilterGroup.razor.cs
rename to src/EventLogExpert/Components/Modals/Filters/FilterGroup.razor.cs
index e0c10175..ec5c014c 100644
--- a/src/EventLogExpert/Shared/Components/Filters/FilterGroup.razor.cs
+++ b/src/EventLogExpert/Components/Modals/Filters/FilterGroup.razor.cs
@@ -12,7 +12,7 @@
 using WinRT.Interop;
 using IDispatcher = Fluxor.IDispatcher;
 
-namespace EventLogExpert.Shared.Components.Filters;
+namespace EventLogExpert.Components.Modals.Filters;
 
 public sealed partial class FilterGroup
 {
diff --git a/src/EventLogExpert/Shared/Components/Filters/FilterGroupModal.razor b/src/EventLogExpert/Components/Modals/Filters/FilterGroupModal.razor
similarity index 97%
rename from src/EventLogExpert/Shared/Components/Filters/FilterGroupModal.razor
rename to src/EventLogExpert/Components/Modals/Filters/FilterGroupModal.razor
index 3265f801..a0a14a5a 100644
--- a/src/EventLogExpert/Shared/Components/Filters/FilterGroupModal.razor
+++ b/src/EventLogExpert/Components/Modals/Filters/FilterGroupModal.razor
@@ -1,4 +1,3 @@
-@using EventLogExpert.Shared.Base
 @using EventLogExpert.UI.Models
 @inherits ModalBase<bool>
 
diff --git a/src/EventLogExpert/Shared/Components/Filters/FilterGroupModal.razor.cs b/src/EventLogExpert/Components/Modals/Filters/FilterGroupModal.razor.cs
similarity index 97%
rename from src/EventLogExpert/Shared/Components/Filters/FilterGroupModal.razor.cs
rename to src/EventLogExpert/Components/Modals/Filters/FilterGroupModal.razor.cs
index 7420d6c8..bab0917e 100644
--- a/src/EventLogExpert/Shared/Components/Filters/FilterGroupModal.razor.cs
+++ b/src/EventLogExpert/Components/Modals/Filters/FilterGroupModal.razor.cs
@@ -1,7 +1,7 @@
 // // Copyright (c) Microsoft Corporation.
 // // Licensed under the MIT License.
 
-using EventLogExpert.Shared.Base;
+using EventLogExpert.Components.Base;
 using EventLogExpert.UI.Interfaces;
 using EventLogExpert.UI.Models;
 using EventLogExpert.UI.Store.FilterGroup;
@@ -12,7 +12,7 @@
 using WinRT.Interop;
 using IDispatcher = Fluxor.IDispatcher;
 
-namespace EventLogExpert.Shared.Components.Filters;
+namespace EventLogExpert.Components.Modals.Filters;
 
 public sealed partial class FilterGroupModal : ModalBase<bool>
 {
diff --git a/src/EventLogExpert/Shared/Components/Filters/FilterGroupSection.razor b/src/EventLogExpert/Components/Modals/Filters/FilterGroupSection.razor
similarity index 100%
rename from src/EventLogExpert/Shared/Components/Filters/FilterGroupSection.razor
rename to src/EventLogExpert/Components/Modals/Filters/FilterGroupSection.razor
diff --git a/src/EventLogExpert/Shared/Components/Filters/FilterGroupSection.razor.cs b/src/EventLogExpert/Components/Modals/Filters/FilterGroupSection.razor.cs
similarity index 93%
rename from src/EventLogExpert/Shared/Components/Filters/FilterGroupSection.razor.cs
rename to src/EventLogExpert/Components/Modals/Filters/FilterGroupSection.razor.cs
index efe1f29d..743186ab 100644
--- a/src/EventLogExpert/Shared/Components/Filters/FilterGroupSection.razor.cs
+++ b/src/EventLogExpert/Components/Modals/Filters/FilterGroupSection.razor.cs
@@ -5,7 +5,7 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Web;
 
-namespace EventLogExpert.Shared.Components.Filters;
+namespace EventLogExpert.Components.Modals.Filters;
 
 public sealed partial class FilterGroupSection
 {
diff --git a/src/EventLogExpert/Shared/Components/SettingsModal.razor b/src/EventLogExpert/Components/Modals/SettingsModal.razor
similarity index 99%
rename from src/EventLogExpert/Shared/Components/SettingsModal.razor
rename to src/EventLogExpert/Components/Modals/SettingsModal.razor
index b2d1997d..e7c5ddea 100644
--- a/src/EventLogExpert/Shared/Components/SettingsModal.razor
+++ b/src/EventLogExpert/Components/Modals/SettingsModal.razor
@@ -1,4 +1,3 @@
-@using EventLogExpert.Shared.Base
 @using EventLogExpert.UI
 @using Microsoft.Extensions.Logging
 @inherits ModalBase<bool>
diff --git a/src/EventLogExpert/Shared/Components/SettingsModal.razor.cs b/src/EventLogExpert/Components/Modals/SettingsModal.razor.cs
similarity index 99%
rename from src/EventLogExpert/Shared/Components/SettingsModal.razor.cs
rename to src/EventLogExpert/Components/Modals/SettingsModal.razor.cs
index f352be3a..7297ea79 100644
--- a/src/EventLogExpert/Shared/Components/SettingsModal.razor.cs
+++ b/src/EventLogExpert/Components/Modals/SettingsModal.razor.cs
@@ -1,7 +1,7 @@
 // // Copyright (c) Microsoft Corporation.
 // // Licensed under the MIT License.
 
-using EventLogExpert.Shared.Base;
+using EventLogExpert.Components.Base;
 using EventLogExpert.UI;
 using EventLogExpert.UI.Interfaces;
 using EventLogExpert.UI.Models;
@@ -12,7 +12,7 @@
 using System.Text;
 using IDispatcher = Fluxor.IDispatcher;
 
-namespace EventLogExpert.Shared.Components;
+namespace EventLogExpert.Components.Modals;
 
 public sealed partial class SettingsModal : ModalBase<bool>
 {
diff --git a/src/EventLogExpert/Shared/Components/SettingsModal.razor.css b/src/EventLogExpert/Components/Modals/SettingsModal.razor.css
similarity index 100%
rename from src/EventLogExpert/Shared/Components/SettingsModal.razor.css
rename to src/EventLogExpert/Components/Modals/SettingsModal.razor.css
diff --git a/src/EventLogExpert/Components/DetailsPane.razor b/src/EventLogExpert/Components/Sections/DetailsPane.razor
similarity index 100%
rename from src/EventLogExpert/Components/DetailsPane.razor
rename to src/EventLogExpert/Components/Sections/DetailsPane.razor
diff --git a/src/EventLogExpert/Components/DetailsPane.razor.cs b/src/EventLogExpert/Components/Sections/DetailsPane.razor.cs
similarity index 99%
rename from src/EventLogExpert/Components/DetailsPane.razor.cs
rename to src/EventLogExpert/Components/Sections/DetailsPane.razor.cs
index 9e723855..6df2af59 100644
--- a/src/EventLogExpert/Components/DetailsPane.razor.cs
+++ b/src/EventLogExpert/Components/Sections/DetailsPane.razor.cs
@@ -14,7 +14,7 @@
 using System.Xml;
 using System.Xml.Linq;
 
-namespace EventLogExpert.Components;
+namespace EventLogExpert.Components.Sections;
 
 public sealed partial class DetailsPane
 {
diff --git a/src/EventLogExpert/Components/DetailsPane.razor.css b/src/EventLogExpert/Components/Sections/DetailsPane.razor.css
similarity index 100%
rename from src/EventLogExpert/Components/DetailsPane.razor.css
rename to src/EventLogExpert/Components/Sections/DetailsPane.razor.css
diff --git a/src/EventLogExpert/Components/EventTable.razor b/src/EventLogExpert/Components/Sections/EventTable.razor
similarity index 100%
rename from src/EventLogExpert/Components/EventTable.razor
rename to src/EventLogExpert/Components/Sections/EventTable.razor
diff --git a/src/EventLogExpert/Components/EventTable.razor.cs b/src/EventLogExpert/Components/Sections/EventTable.razor.cs
similarity index 97%
rename from src/EventLogExpert/Components/EventTable.razor.cs
rename to src/EventLogExpert/Components/Sections/EventTable.razor.cs
index c08a4cc7..c7407ccf 100644
--- a/src/EventLogExpert/Components/EventTable.razor.cs
+++ b/src/EventLogExpert/Components/Sections/EventTable.razor.cs
@@ -16,7 +16,7 @@
 using System.Collections.Immutable;
 using IDispatcher = Fluxor.IDispatcher;
 
-namespace EventLogExpert.Components;
+namespace EventLogExpert.Components.Sections;
 
 public sealed partial class EventTable
 {
diff --git a/src/EventLogExpert/Components/EventTable.razor.css b/src/EventLogExpert/Components/Sections/EventTable.razor.css
similarity index 100%
rename from src/EventLogExpert/Components/EventTable.razor.css
rename to src/EventLogExpert/Components/Sections/EventTable.razor.css
diff --git a/src/EventLogExpert/Components/FilterPane.razor b/src/EventLogExpert/Components/Sections/FilterPane.razor
similarity index 98%
rename from src/EventLogExpert/Components/FilterPane.razor
rename to src/EventLogExpert/Components/Sections/FilterPane.razor
index 36f8a020..61ebc392 100644
--- a/src/EventLogExpert/Components/FilterPane.razor
+++ b/src/EventLogExpert/Components/Sections/FilterPane.razor
@@ -1,5 +1,4 @@
-@using EventLogExpert.Shared.Components.Filters
-@using EventLogExpert.UI
+@using EventLogExpert.UI
 @inherits FluxorComponent
 
 <div class="filter-pane">
diff --git a/src/EventLogExpert/Components/FilterPane.razor.cs b/src/EventLogExpert/Components/Sections/FilterPane.razor.cs
similarity index 98%
rename from src/EventLogExpert/Components/FilterPane.razor.cs
rename to src/EventLogExpert/Components/Sections/FilterPane.razor.cs
index f43f004f..cc66c7d2 100644
--- a/src/EventLogExpert/Components/FilterPane.razor.cs
+++ b/src/EventLogExpert/Components/Sections/FilterPane.razor.cs
@@ -1,7 +1,7 @@
 // // Copyright (c) Microsoft Corporation.
 // // Licensed under the MIT License.
 
-using EventLogExpert.Shared.Components.Filters;
+using EventLogExpert.Components.Modals.Filters;
 using EventLogExpert.UI;
 using EventLogExpert.UI.Interfaces;
 using EventLogExpert.UI.Models;
@@ -12,7 +12,7 @@
 using Microsoft.AspNetCore.Components.Web;
 using IDispatcher = Fluxor.IDispatcher;
 
-namespace EventLogExpert.Components;
+namespace EventLogExpert.Components.Sections;
 
 public sealed partial class FilterPane : IDisposable
 {
diff --git a/src/EventLogExpert/Components/FilterPane.razor.css b/src/EventLogExpert/Components/Sections/FilterPane.razor.css
similarity index 100%
rename from src/EventLogExpert/Components/FilterPane.razor.css
rename to src/EventLogExpert/Components/Sections/FilterPane.razor.css
diff --git a/src/EventLogExpert/Components/SplitLogTabPane.razor b/src/EventLogExpert/Components/Sections/SplitLogTabPane.razor
similarity index 100%
rename from src/EventLogExpert/Components/SplitLogTabPane.razor
rename to src/EventLogExpert/Components/Sections/SplitLogTabPane.razor
diff --git a/src/EventLogExpert/Components/SplitLogTabPane.razor.cs b/src/EventLogExpert/Components/Sections/SplitLogTabPane.razor.cs
similarity index 98%
rename from src/EventLogExpert/Components/SplitLogTabPane.razor.cs
rename to src/EventLogExpert/Components/Sections/SplitLogTabPane.razor.cs
index 7f9f1958..656a94f0 100644
--- a/src/EventLogExpert/Components/SplitLogTabPane.razor.cs
+++ b/src/EventLogExpert/Components/Sections/SplitLogTabPane.razor.cs
@@ -10,7 +10,7 @@
 using Microsoft.JSInterop;
 using IDispatcher = Fluxor.IDispatcher;
 
-namespace EventLogExpert.Components;
+namespace EventLogExpert.Components.Sections;
 
 public sealed partial class SplitLogTabPane
 {
diff --git a/src/EventLogExpert/Components/SplitLogTabPane.razor.css b/src/EventLogExpert/Components/Sections/SplitLogTabPane.razor.css
similarity index 100%
rename from src/EventLogExpert/Components/SplitLogTabPane.razor.css
rename to src/EventLogExpert/Components/Sections/SplitLogTabPane.razor.css
diff --git a/src/EventLogExpert/Components/StatusBar.razor b/src/EventLogExpert/Components/Sections/StatusBar.razor
similarity index 100%
rename from src/EventLogExpert/Components/StatusBar.razor
rename to src/EventLogExpert/Components/Sections/StatusBar.razor
diff --git a/src/EventLogExpert/Components/StatusBar.razor.cs b/src/EventLogExpert/Components/Sections/StatusBar.razor.cs
similarity index 97%
rename from src/EventLogExpert/Components/StatusBar.razor.cs
rename to src/EventLogExpert/Components/Sections/StatusBar.razor.cs
index 7d1238c6..84b29fab 100644
--- a/src/EventLogExpert/Components/StatusBar.razor.cs
+++ b/src/EventLogExpert/Components/Sections/StatusBar.razor.cs
@@ -8,7 +8,7 @@
 using Fluxor;
 using Microsoft.AspNetCore.Components;
 
-namespace EventLogExpert.Components;
+namespace EventLogExpert.Components.Sections;
 
 public sealed partial class StatusBar
 {
diff --git a/src/EventLogExpert/Components/StatusBar.razor.css b/src/EventLogExpert/Components/Sections/StatusBar.razor.css
similarity index 100%
rename from src/EventLogExpert/Components/StatusBar.razor.css
rename to src/EventLogExpert/Components/Sections/StatusBar.razor.css
diff --git a/src/EventLogExpert/MauiProgram.cs b/src/EventLogExpert/MauiProgram.cs
index 71bee1cb..8d86ddd5 100644
--- a/src/EventLogExpert/MauiProgram.cs
+++ b/src/EventLogExpert/MauiProgram.cs
@@ -4,7 +4,7 @@
 using EventLogExpert.Eventing.EventResolvers;
 using EventLogExpert.Eventing.Helpers;
 using EventLogExpert.Services;
-using EventLogExpert.Shared.Components.Alerts;
+using EventLogExpert.Components.Modals.Alerts;
 using EventLogExpert.UI.Interfaces;
 using EventLogExpert.UI.Options;
 using EventLogExpert.UI.Services;
diff --git a/src/EventLogExpert/Services/MauiMenuActionService.cs b/src/EventLogExpert/Services/MauiMenuActionService.cs
index ffb82022..dd137994 100644
--- a/src/EventLogExpert/Services/MauiMenuActionService.cs
+++ b/src/EventLogExpert/Services/MauiMenuActionService.cs
@@ -1,11 +1,11 @@
 // // Copyright (c) Microsoft Corporation.
 // // Licensed under the MIT License.
 
+using EventLogExpert.Components.Modals;
+using EventLogExpert.Components.Modals.Filters;
 using EventLogExpert.Eventing.Helpers;
 using EventLogExpert.Eventing.Readers;
 using EventLogExpert.Platforms.Windows;
-using EventLogExpert.Shared.Components;
-using EventLogExpert.Shared.Components.Filters;
 using EventLogExpert.UI;
 using EventLogExpert.UI.Interfaces;
 using EventLogExpert.UI.Services;
diff --git a/src/EventLogExpert/_Imports.razor b/src/EventLogExpert/_Imports.razor
index f4ed1bbb..9fa32866 100644
--- a/src/EventLogExpert/_Imports.razor
+++ b/src/EventLogExpert/_Imports.razor
@@ -7,9 +7,18 @@
 @using EventLogExpert
 @using EventLogExpert.Components
 @using EventLogExpert.Components.Base
+@using EventLogExpert.Components.Database
+@using EventLogExpert.Components.Filters
+@using EventLogExpert.Components.Filters.Base
+@using EventLogExpert.Components.Inputs
+@using EventLogExpert.Components.Layout
+@using EventLogExpert.Components.Menu
+@using EventLogExpert.Components.Modals
+@using EventLogExpert.Components.Modals.Alerts
+@using EventLogExpert.Components.Modals.Filters
+@using EventLogExpert.Components.Sections
 @using EventLogExpert.Eventing.Helpers
-@using EventLogExpert.Shared
-@using EventLogExpert.Shared.Components
+@using EventLogExpert.UI
 @using EventLogExpert.UI.Models
 
 @using Fluxor