diff --git a/README.md b/README.md
index 375f026..bbb6212 100644
--- a/README.md
+++ b/README.md
@@ -506,10 +506,10 @@ Run from the repo root. Writes one `.html` file per option that appears in the m
 **Codebase overview:**
 
 - **Entry and config:** `Program.cs` wires the host; configuration (e.g. `Dnsmasq__*`) lives in `Models/Config/` (`DnsmasqOptions`, `ApplicationOptions`, `DnsmasqOptionsValidator`). Options are validated at startup.
-- **Infrastructure:** Under `Infrastructure/`: **Client/** (HTTP API clients and `Abstractions/`), **Services/** and **Services/Abstractions/** (caches, config/hosts/leases services, reload, hosted services), **Parsers/** (dnsmasq config and hosts line parsers), **Helpers/Config/** and **Helpers/Http/** (option keys, encoding, tooltips, JSON options). A **managed** config file and optional managed hosts file are written by the app; the main config must include the managed file (e.g. via a final `conf-file=` line). Caches (`ConfigSetCache`, `HostsCache`) keep in-memory snapshots and refresh on file changes or staleness.
+- **Infrastructure:** Under `Infrastructure/`: **Client/** (HTTP API clients and `Abstractions/`), **Serialization/Parsers/** (Dnsmasq version/compile, DnsmasqConfig conf-line and include parsers, EffectiveConfig syntax helpers), **Services/** (caches, config/hosts/leases services, reload, hosted services; EffectiveConfig has Metadata, Rendering, Editing, Validation, Readonly), **Helpers/Config/** (file encoding for config/hosts), **Helpers/Http/** (HTTP helpers). A **managed** config file and optional managed hosts file are written by the app; the main config must include the managed file (e.g. via a final `conf-file=` line). Caches (`ConfigSetCache`, `HostsCache`) keep in-memory snapshots and refresh on file changes or staleness.
 - **Models:** `Models/Config/` (options, validators, `DnsmasqConfLine`); `Models/Contracts/` (snapshots and DTOs such as `ConfigSetSnapshot`, `HostsSnapshot`, `ManagedConfigContent`, `ProcessRunResult`, `ReloadResult`); `Models/Dnsmasq/` (status, `SaveWithReloadResult`, and `EffectiveConfig/` for effective config and sources); `Models/Client/`, `Models/Dhcp/`, `Models/Hosts/` (UI and API DTOs).
 - **API and UI:** `Controllers/` expose API endpoints; `Components/` contains Blazor Server components for config editor, hosts, DHCP, Dnsmasq status, and app settings. Static assets in `wwwroot/`.
-- **Tests:** `DnsmasqWebUI.Tests` contains unit tests for parsers, config set service, config, and related logic. Run with `dotnet test`.
+- **Tests:** `DnsmasqWebUI.Tests` contains unit tests organised to mirror the main project: `Serialization/Parsers/` (Dnsmasq, DnsmasqConfig), `Services/Dnsmasq/Config/`, `Services/EffectiveConfig/`, `Models/`, and `Helpers/` (TestDataHelper). Run with `dotnet test`.
 
 <!-- SUGGESTED SCREENSHOT: SOLUTION EXPLORER OR FOLDER TREE OF SRC/ -->
 
diff --git a/src/DnsmasqWebUI.Tests/TestDataHelper.cs b/src/DnsmasqWebUI.Tests/Helpers/TestDataHelper.cs
similarity index 94%
rename from src/DnsmasqWebUI.Tests/TestDataHelper.cs
rename to src/DnsmasqWebUI.Tests/Helpers/TestDataHelper.cs
index 92f13dd..10658fb 100644
--- a/src/DnsmasqWebUI.Tests/TestDataHelper.cs
+++ b/src/DnsmasqWebUI.Tests/Helpers/TestDataHelper.cs
@@ -1,4 +1,4 @@
-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Helpers;
 
 /// <summary>
 /// Resolves paths to testdata files. Files are copied to output (testdata/) when the project builds.
diff --git a/src/DnsmasqWebUI.Tests/ConfigValueSourceTests.cs b/src/DnsmasqWebUI.Tests/Models/ConfigValueSourceTests.cs
similarity index 98%
rename from src/DnsmasqWebUI.Tests/ConfigValueSourceTests.cs
rename to src/DnsmasqWebUI.Tests/Models/ConfigValueSourceTests.cs
index 0a9abd7..78316c0 100644
--- a/src/DnsmasqWebUI.Tests/ConfigValueSourceTests.cs
+++ b/src/DnsmasqWebUI.Tests/Models/ConfigValueSourceTests.cs
@@ -1,6 +1,6 @@
 using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
 
-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Models;
 
 /// <summary>
 /// Tests for <see cref="ConfigValueSource"/> and <see cref="ConfigValueSource.GetReadOnlyTooltip"/>.
diff --git a/src/DnsmasqWebUI.Tests/DnsmasqCompileOptionsParserTests.cs b/src/DnsmasqWebUI.Tests/Serialization/Parsers/Dnsmasq/DnsmasqCompileOptionsParserTests.cs
similarity index 94%
rename from src/DnsmasqWebUI.Tests/DnsmasqCompileOptionsParserTests.cs
rename to src/DnsmasqWebUI.Tests/Serialization/Parsers/Dnsmasq/DnsmasqCompileOptionsParserTests.cs
index 1e5ef2b..b850e50 100644
--- a/src/DnsmasqWebUI.Tests/DnsmasqCompileOptionsParserTests.cs
+++ b/src/DnsmasqWebUI.Tests/Serialization/Parsers/Dnsmasq/DnsmasqCompileOptionsParserTests.cs
@@ -1,7 +1,7 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Dnsmasq;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.Dnsmasq;
 using DnsmasqWebUI.Models.Dnsmasq;
 
-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.Dnsmasq;
 
 /// <summary>
 /// Tests for parsing "Compile time options: ..." from dnsmasq --version output.
diff --git a/src/DnsmasqWebUI.Tests/DnsmasqConfDhcpHostLineParserTests.cs b/src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfDhcpHostLineParserTests.cs
similarity index 98%
rename from src/DnsmasqWebUI.Tests/DnsmasqConfDhcpHostLineParserTests.cs
rename to src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfDhcpHostLineParserTests.cs
index a1cb55c..6868e0a 100644
--- a/src/DnsmasqWebUI.Tests/DnsmasqConfDhcpHostLineParserTests.cs
+++ b/src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfDhcpHostLineParserTests.cs
@@ -1,7 +1,9 @@
 using DnsmasqWebUI.Models.Dhcp;
-using DnsmasqWebUI.Infrastructure.Parsers;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;
 
-namespace DnsmasqWebUI.Tests;
+using DnsmasqWebUI.Tests.Helpers;
+
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.DnsmasqConfig;
 
 /// <summary>
 /// Tests for DnsmasqConfDhcpHostLineParser. Format: dhcp-host=[hwaddr][,id:...][,set:tag][,tag:tag][,ip][,hostname][,lease][,ignore]
diff --git a/src/DnsmasqWebUI.Tests/DnsmasqConfDirectiveParserTests.cs b/src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfDirectiveParserTests.cs
similarity index 93%
rename from src/DnsmasqWebUI.Tests/DnsmasqConfDirectiveParserTests.cs
rename to src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfDirectiveParserTests.cs
index b73bc5a..eab1d87 100644
--- a/src/DnsmasqWebUI.Tests/DnsmasqConfDirectiveParserTests.cs
+++ b/src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfDirectiveParserTests.cs
@@ -1,7 +1,7 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
-using DnsmasqWebUI.Infrastructure.Parsers;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;
 
-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.DnsmasqConfig;
 
 /// <summary>
 /// Tests for DnsmasqConfDirectiveParser. Key/value parsing (TryParseKeyValue) and comment stripping (StripComment)
diff --git a/src/DnsmasqWebUI.Tests/DnsmasqConfFileLineParserTests.cs b/src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfFileLineParserTests.cs
similarity index 97%
rename from src/DnsmasqWebUI.Tests/DnsmasqConfFileLineParserTests.cs
rename to src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfFileLineParserTests.cs
index 0c64829..ef17ba3 100644
--- a/src/DnsmasqWebUI.Tests/DnsmasqConfFileLineParserTests.cs
+++ b/src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfFileLineParserTests.cs
@@ -1,8 +1,10 @@
 using DnsmasqWebUI.Models.Config;
 using DnsmasqWebUI.Models.Dhcp;
-using DnsmasqWebUI.Infrastructure.Parsers;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;
 
-namespace DnsmasqWebUI.Tests;
+using DnsmasqWebUI.Tests.Helpers;
+
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.DnsmasqConfig;
 
 /// <summary>
 /// Tests for DnsmasqConfFileLineParser. Parses dnsmasq config file lines into Blank, Comment, AddnHosts, DhcpHost, Other.
diff --git a/src/DnsmasqWebUI.Tests/DnsmasqConfIncludeParserCoreBehaviourTests.cs b/src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfIncludeParserCoreBehaviourTests.cs
similarity index 98%
rename from src/DnsmasqWebUI.Tests/DnsmasqConfIncludeParserCoreBehaviourTests.cs
rename to src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfIncludeParserCoreBehaviourTests.cs
index 709491e..916fcb6 100644
--- a/src/DnsmasqWebUI.Tests/DnsmasqConfIncludeParserCoreBehaviourTests.cs
+++ b/src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfIncludeParserCoreBehaviourTests.cs
@@ -1,8 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 using DnsmasqWebUI.Models.Dnsmasq;
-using DnsmasqWebUI.Infrastructure.Parsers;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;
 
-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.DnsmasqConfig;
 
 
 /// <summary>Parser semantics: flags (option present/absent/with value), last-wins, case-sensitive, path order.</summary>
diff --git a/src/DnsmasqWebUI.Tests/DnsmasqConfIncludeParserDhcpTftpDnssecTests.cs b/src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfIncludeParserDhcpTftpDnssecTests.cs
similarity index 98%
rename from src/DnsmasqWebUI.Tests/DnsmasqConfIncludeParserDhcpTftpDnssecTests.cs
rename to src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfIncludeParserDhcpTftpDnssecTests.cs
index c929626..b7a0f56 100644
--- a/src/DnsmasqWebUI.Tests/DnsmasqConfIncludeParserDhcpTftpDnssecTests.cs
+++ b/src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfIncludeParserDhcpTftpDnssecTests.cs
@@ -1,8 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 using DnsmasqWebUI.Models.Dnsmasq;
-using DnsmasqWebUI.Infrastructure.Parsers;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;
 
-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.DnsmasqConfig;
 
 
 /// <summary>DHCP advanced, TFTP/PXE, DNSSEC, enable-dbus/ubus, fast-dns-retry.</summary>
diff --git a/src/DnsmasqWebUI.Tests/DnsmasqConfIncludeParserFlagsTests.cs b/src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfIncludeParserFlagsTests.cs
similarity index 98%
rename from src/DnsmasqWebUI.Tests/DnsmasqConfIncludeParserFlagsTests.cs
rename to src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfIncludeParserFlagsTests.cs
index 3ba9ac2..d9bf3f1 100644
--- a/src/DnsmasqWebUI.Tests/DnsmasqConfIncludeParserFlagsTests.cs
+++ b/src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfIncludeParserFlagsTests.cs
@@ -1,8 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 using DnsmasqWebUI.Models.Dnsmasq;
-using DnsmasqWebUI.Infrastructure.Parsers;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;
 
-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.DnsmasqConfig;
 
 
 /// <summary>Boolean flags: no-hosts, bogus-priv, strict-order, domain-needed, no-poll, bind-*, rebind-*, clear-on-reload, filter*, localise-queries, log-debug, dhcp-authoritative, leasefile-ro.</summary>
diff --git a/src/DnsmasqWebUI.Tests/DnsmasqConfIncludeParserHostsAndLeaseTests.cs b/src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfIncludeParserHostsAndLeaseTests.cs
similarity index 97%
rename from src/DnsmasqWebUI.Tests/DnsmasqConfIncludeParserHostsAndLeaseTests.cs
rename to src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfIncludeParserHostsAndLeaseTests.cs
index d7a1d84..c78a974 100644
--- a/src/DnsmasqWebUI.Tests/DnsmasqConfIncludeParserHostsAndLeaseTests.cs
+++ b/src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfIncludeParserHostsAndLeaseTests.cs
@@ -1,8 +1,10 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 using DnsmasqWebUI.Models.Dnsmasq;
-using DnsmasqWebUI.Infrastructure.Parsers;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;
 
-namespace DnsmasqWebUI.Tests;
+using DnsmasqWebUI.Tests.Helpers;
+
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.DnsmasqConfig;
 
 
 /// <summary>Hosts (addn-hosts, hostsdir) and DHCP lease file parsing.</summary>
diff --git a/src/DnsmasqWebUI.Tests/DnsmasqConfIncludeParserIncludeTests.cs b/src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfIncludeParserIncludeTests.cs
similarity index 98%
rename from src/DnsmasqWebUI.Tests/DnsmasqConfIncludeParserIncludeTests.cs
rename to src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfIncludeParserIncludeTests.cs
index 82ad436..b120fc0 100644
--- a/src/DnsmasqWebUI.Tests/DnsmasqConfIncludeParserIncludeTests.cs
+++ b/src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfIncludeParserIncludeTests.cs
@@ -1,9 +1,9 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 using DnsmasqWebUI.Models.Dnsmasq;
 using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
-using DnsmasqWebUI.Infrastructure.Parsers;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;
 
-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.DnsmasqConfig;
 
 
 /// <summary>Config discovery: conf-file=, conf-dir=, GetIncludedPaths, GetFirstConfDir, GetIncludedPathsWithSource, conf-dir suffix.</summary>
diff --git a/src/DnsmasqWebUI.Tests/DnsmasqConfIncludeParserInterfacesAndFilteringTests.cs b/src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfIncludeParserInterfacesAndFilteringTests.cs
similarity index 98%
rename from src/DnsmasqWebUI.Tests/DnsmasqConfIncludeParserInterfacesAndFilteringTests.cs
rename to src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfIncludeParserInterfacesAndFilteringTests.cs
index 2d37125..c5c5fb9 100644
--- a/src/DnsmasqWebUI.Tests/DnsmasqConfIncludeParserInterfacesAndFilteringTests.cs
+++ b/src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfIncludeParserInterfacesAndFilteringTests.cs
@@ -1,8 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 using DnsmasqWebUI.Models.Dnsmasq;
-using DnsmasqWebUI.Infrastructure.Parsers;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;
 
-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.DnsmasqConfig;
 
 
 /// <summary>Interfaces, auth-server, DHCP/option/resolv multi-value, rebind/bogus/ignore/alias, filter-rr, cache-rr.</summary>
diff --git a/src/DnsmasqWebUI.Tests/DnsmasqConfIncludeParserNewOptionsTests.cs b/src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfIncludeParserNewOptionsTests.cs
similarity index 98%
rename from src/DnsmasqWebUI.Tests/DnsmasqConfIncludeParserNewOptionsTests.cs
rename to src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfIncludeParserNewOptionsTests.cs
index c9c807a..21ea374 100644
--- a/src/DnsmasqWebUI.Tests/DnsmasqConfIncludeParserNewOptionsTests.cs
+++ b/src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfIncludeParserNewOptionsTests.cs
@@ -1,8 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 using DnsmasqWebUI.Models.Dnsmasq;
-using DnsmasqWebUI.Infrastructure.Parsers;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;
 
-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.DnsmasqConfig;
 
 /// <summary>
 /// Positive parser tests for added options: key wired and "option present" behaviour.
diff --git a/src/DnsmasqWebUI.Tests/DnsmasqConfIncludeParserOfficialExampleTests.cs b/src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfIncludeParserOfficialExampleTests.cs
similarity index 96%
rename from src/DnsmasqWebUI.Tests/DnsmasqConfIncludeParserOfficialExampleTests.cs
rename to src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfIncludeParserOfficialExampleTests.cs
index aea45a3..36feaf3 100644
--- a/src/DnsmasqWebUI.Tests/DnsmasqConfIncludeParserOfficialExampleTests.cs
+++ b/src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfIncludeParserOfficialExampleTests.cs
@@ -1,7 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
-using DnsmasqWebUI.Infrastructure.Parsers;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;
+using DnsmasqWebUI.Tests.Helpers;
 
-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.DnsmasqConfig;
 
 /// <summary>
 /// Tests that the parser correctly handles the official dnsmasq example (testdata/dnsmasq.official.conf.example).
diff --git a/src/DnsmasqWebUI.Tests/DnsmasqConfIncludeParserRecordsTests.cs b/src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfIncludeParserRecordsTests.cs
similarity index 97%
rename from src/DnsmasqWebUI.Tests/DnsmasqConfIncludeParserRecordsTests.cs
rename to src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfIncludeParserRecordsTests.cs
index 9681ac9..3667de9 100644
--- a/src/DnsmasqWebUI.Tests/DnsmasqConfIncludeParserRecordsTests.cs
+++ b/src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfIncludeParserRecordsTests.cs
@@ -1,8 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 using DnsmasqWebUI.Models.Dnsmasq;
-using DnsmasqWebUI.Infrastructure.Parsers;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;
 
-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.DnsmasqConfig;
 
 
 /// <summary>DNS records and local names: hostsdir, domain, cname, mx-host, srv, ptr/txt/naptr/host-record, dynamic-host, interface-name.</summary>
diff --git a/src/DnsmasqWebUI.Tests/DnsmasqConfIncludeParserServerAndResolvTests.cs b/src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfIncludeParserServerAndResolvTests.cs
similarity index 95%
rename from src/DnsmasqWebUI.Tests/DnsmasqConfIncludeParserServerAndResolvTests.cs
rename to src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfIncludeParserServerAndResolvTests.cs
index 0badecf..80e81f6 100644
--- a/src/DnsmasqWebUI.Tests/DnsmasqConfIncludeParserServerAndResolvTests.cs
+++ b/src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfIncludeParserServerAndResolvTests.cs
@@ -1,8 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 using DnsmasqWebUI.Models.Dnsmasq;
-using DnsmasqWebUI.Infrastructure.Parsers;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;
 
-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.DnsmasqConfig;
 
 
 /// <summary>Server/local, rev-server, dhcp-range, all-servers, log-queries.</summary>
diff --git a/src/DnsmasqWebUI.Tests/DnsmasqConfIncludeParserSingleValueTests.cs b/src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfIncludeParserSingleValueTests.cs
similarity index 98%
rename from src/DnsmasqWebUI.Tests/DnsmasqConfIncludeParserSingleValueTests.cs
rename to src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfIncludeParserSingleValueTests.cs
index 6e16d4b..9d22f0f 100644
--- a/src/DnsmasqWebUI.Tests/DnsmasqConfIncludeParserSingleValueTests.cs
+++ b/src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqConfIncludeParserSingleValueTests.cs
@@ -1,8 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 using DnsmasqWebUI.Models.Dnsmasq;
-using DnsmasqWebUI.Infrastructure.Parsers;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;
 
-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.DnsmasqConfig;
 
 
 /// <summary>Single-value options (last wins): local-ttl, pid-file, user, group, auth-ttl, edns-packet-max, query-port, port-limit, min/max-port, log-async, local-service, dhcp-lease-max, neg/max/min-cache-ttl, dhcp-ttl.</summary>
diff --git a/src/DnsmasqWebUI.Tests/DnsmasqDhcpRangeValueParserTests.cs b/src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqDhcpRangeValueParserTests.cs
similarity index 90%
rename from src/DnsmasqWebUI.Tests/DnsmasqDhcpRangeValueParserTests.cs
rename to src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqDhcpRangeValueParserTests.cs
index 006cdc1..902314b 100644
--- a/src/DnsmasqWebUI.Tests/DnsmasqDhcpRangeValueParserTests.cs
+++ b/src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqDhcpRangeValueParserTests.cs
@@ -1,7 +1,7 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Config;
 
-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.DnsmasqConfig;
 
 public class DnsmasqDhcpRangeValueParserTests
 {
diff --git a/src/DnsmasqWebUI.Tests/DnsmasqLeasesFileLineParserTests.cs b/src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqLeasesFileLineParserTests.cs
similarity index 97%
rename from src/DnsmasqWebUI.Tests/DnsmasqLeasesFileLineParserTests.cs
rename to src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqLeasesFileLineParserTests.cs
index e7fa5a4..2f3a950 100644
--- a/src/DnsmasqWebUI.Tests/DnsmasqLeasesFileLineParserTests.cs
+++ b/src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/DnsmasqLeasesFileLineParserTests.cs
@@ -1,7 +1,9 @@
 using DnsmasqWebUI.Models.Dhcp;
-using DnsmasqWebUI.Infrastructure.Parsers;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;
 
-namespace DnsmasqWebUI.Tests;
+using DnsmasqWebUI.Tests.Helpers;
+
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.DnsmasqConfig;
 
 /// <summary>
 /// Tests for DnsmasqLeasesFileLineParser. Format per dnsmasq author (dnsmasq-discuss 2006): five space-separated
diff --git a/src/DnsmasqWebUI.Tests/HostsFileLineParserTests.cs b/src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/HostsFileLineParserTests.cs
similarity index 97%
rename from src/DnsmasqWebUI.Tests/HostsFileLineParserTests.cs
rename to src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/HostsFileLineParserTests.cs
index 58b29ba..358fd31 100644
--- a/src/DnsmasqWebUI.Tests/HostsFileLineParserTests.cs
+++ b/src/DnsmasqWebUI.Tests/Serialization/Parsers/DnsmasqConfig/HostsFileLineParserTests.cs
@@ -1,7 +1,9 @@
 using DnsmasqWebUI.Models.Hosts;
-using DnsmasqWebUI.Infrastructure.Parsers;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;
 
-namespace DnsmasqWebUI.Tests;
+using DnsmasqWebUI.Tests.Helpers;
+
+namespace DnsmasqWebUI.Tests.Serialization.Parsers.DnsmasqConfig;
 
 /// <summary>
 /// Tests for HostsFileLineParser. Format: IP_address canonical_hostname [aliases...] (hosts(5), RFC 952).
diff --git a/src/DnsmasqWebUI.Tests/ConfigSetCacheEffectiveConfigTests.cs b/src/DnsmasqWebUI.Tests/Services/Dnsmasq/Config/ConfigSetCacheEffectiveConfigTests.cs
similarity index 97%
rename from src/DnsmasqWebUI.Tests/ConfigSetCacheEffectiveConfigTests.cs
rename to src/DnsmasqWebUI.Tests/Services/Dnsmasq/Config/ConfigSetCacheEffectiveConfigTests.cs
index 20c3fae..90d2159 100644
--- a/src/DnsmasqWebUI.Tests/ConfigSetCacheEffectiveConfigTests.cs
+++ b/src/DnsmasqWebUI.Tests/Services/Dnsmasq/Config/ConfigSetCacheEffectiveConfigTests.cs
@@ -1,11 +1,11 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Config;
 using DnsmasqWebUI.Models.Config;
 using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
 
-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Services.Dnsmasq.Config;
 
 /// <summary>
 /// Tests effective-config resolution in ConfigSetCache (BuildEffectiveConfig / BuildEffectiveConfigSources).
diff --git a/src/DnsmasqWebUI.Tests/DnsmasqConfigServiceApplyChangesTests.cs b/src/DnsmasqWebUI.Tests/Services/Dnsmasq/Config/DnsmasqConfigServiceApplyChangesTests.cs
similarity index 99%
rename from src/DnsmasqWebUI.Tests/DnsmasqConfigServiceApplyChangesTests.cs
rename to src/DnsmasqWebUI.Tests/Services/Dnsmasq/Config/DnsmasqConfigServiceApplyChangesTests.cs
index be7c50e..f4431f6 100644
--- a/src/DnsmasqWebUI.Tests/DnsmasqConfigServiceApplyChangesTests.cs
+++ b/src/DnsmasqWebUI.Tests/Services/Dnsmasq/Config/DnsmasqConfigServiceApplyChangesTests.cs
@@ -1,11 +1,11 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Config;
 using DnsmasqWebUI.Models.Config;
 using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
 
-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Services.Dnsmasq.Config;
 
 /// <summary>
 /// Save-path tests for DnsmasqConfigService.ApplyEffectiveConfigChangesAsync.
diff --git a/src/DnsmasqWebUI.Tests/DnsmasqConfigSetServiceTests.cs b/src/DnsmasqWebUI.Tests/Services/Dnsmasq/Config/DnsmasqConfigSetServiceTests.cs
similarity index 98%
rename from src/DnsmasqWebUI.Tests/DnsmasqConfigSetServiceTests.cs
rename to src/DnsmasqWebUI.Tests/Services/Dnsmasq/Config/DnsmasqConfigSetServiceTests.cs
index 688ae72..e6ac1ad 100644
--- a/src/DnsmasqWebUI.Tests/DnsmasqConfigSetServiceTests.cs
+++ b/src/DnsmasqWebUI.Tests/Services/Dnsmasq/Config/DnsmasqConfigSetServiceTests.cs
@@ -5,7 +5,7 @@ using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Config;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
 
-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Services.Dnsmasq.Config;
 
 /// <summary>
 /// Tests for DnsmasqConfigSetService, including GetEffectiveConfigWithSources.
diff --git a/src/DnsmasqWebUI.Tests/Do0x20EncodeDisplayLabelTests.cs b/src/DnsmasqWebUI.Tests/Services/EffectiveConfig/Do0x20EncodeDisplayLabelTests.cs
similarity index 95%
rename from src/DnsmasqWebUI.Tests/Do0x20EncodeDisplayLabelTests.cs
rename to src/DnsmasqWebUI.Tests/Services/EffectiveConfig/Do0x20EncodeDisplayLabelTests.cs
index 419f94e..df015e6 100644
--- a/src/DnsmasqWebUI.Tests/Do0x20EncodeDisplayLabelTests.cs
+++ b/src/DnsmasqWebUI.Tests/Services/EffectiveConfig/Do0x20EncodeDisplayLabelTests.cs
@@ -1,6 +1,6 @@
 using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
 
-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Services.EffectiveConfig;
 
 /// <summary>
 /// Documents and guards the Do0x20 display label rule: Default and Disabled both show "Disabled" (product choice).
diff --git a/src/DnsmasqWebUI.Tests/EffectiveConfigEditableOptionsTests.cs b/src/DnsmasqWebUI.Tests/Services/EffectiveConfig/EffectiveConfigEditableOptionsTests.cs
similarity index 85%
rename from src/DnsmasqWebUI.Tests/EffectiveConfigEditableOptionsTests.cs
rename to src/DnsmasqWebUI.Tests/Services/EffectiveConfig/EffectiveConfigEditableOptionsTests.cs
index 3109912..b87dadd 100644
--- a/src/DnsmasqWebUI.Tests/EffectiveConfigEditableOptionsTests.cs
+++ b/src/DnsmasqWebUI.Tests/Services/EffectiveConfig/EffectiveConfigEditableOptionsTests.cs
@@ -1,6 +1,6 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 
-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Services.EffectiveConfig;
 
 /// <summary>
 /// Ensures effective-config editable options list includes supported cache flags.
diff --git a/src/DnsmasqWebUI.Tests/EffectiveConfigFeatureRequirementsTests.cs b/src/DnsmasqWebUI.Tests/Services/EffectiveConfig/EffectiveConfigFeatureRequirementsTests.cs
similarity index 98%
rename from src/DnsmasqWebUI.Tests/EffectiveConfigFeatureRequirementsTests.cs
rename to src/DnsmasqWebUI.Tests/Services/EffectiveConfig/EffectiveConfigFeatureRequirementsTests.cs
index 2ac1b6f..20534f9 100644
--- a/src/DnsmasqWebUI.Tests/EffectiveConfigFeatureRequirementsTests.cs
+++ b/src/DnsmasqWebUI.Tests/Services/EffectiveConfig/EffectiveConfigFeatureRequirementsTests.cs
@@ -1,8 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 using DnsmasqWebUI.Models.Dnsmasq;
 using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
 
-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Services.EffectiveConfig;
 
 /// <summary>
 /// Tests for option -> feature mapping and capability checks.
diff --git a/src/DnsmasqWebUI.Tests/EffectiveConfigFieldBuilderCapabilityTests.cs b/src/DnsmasqWebUI.Tests/Services/EffectiveConfig/EffectiveConfigFieldBuilderCapabilityTests.cs
similarity index 96%
rename from src/DnsmasqWebUI.Tests/EffectiveConfigFieldBuilderCapabilityTests.cs
rename to src/DnsmasqWebUI.Tests/Services/EffectiveConfig/EffectiveConfigFieldBuilderCapabilityTests.cs
index 73f9ca7..f626675 100644
--- a/src/DnsmasqWebUI.Tests/EffectiveConfigFieldBuilderCapabilityTests.cs
+++ b/src/DnsmasqWebUI.Tests/Services/EffectiveConfig/EffectiveConfigFieldBuilderCapabilityTests.cs
@@ -1,8 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 using DnsmasqWebUI.Models.Dnsmasq;
 using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
 
-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Services.EffectiveConfig;
 
 /// <summary>
 /// Tests that field descriptors get IsCapabilityDisabled set when the status indicates the option is not supported by the dnsmasq build.
diff --git a/src/DnsmasqWebUI.Tests/EffectiveConfigSemanticsWiringTests.cs b/src/DnsmasqWebUI.Tests/Services/EffectiveConfig/EffectiveConfigSemanticsWiringTests.cs
similarity index 89%
rename from src/DnsmasqWebUI.Tests/EffectiveConfigSemanticsWiringTests.cs
rename to src/DnsmasqWebUI.Tests/Services/EffectiveConfig/EffectiveConfigSemanticsWiringTests.cs
index 9ef8338..be63a98 100644
--- a/src/DnsmasqWebUI.Tests/EffectiveConfigSemanticsWiringTests.cs
+++ b/src/DnsmasqWebUI.Tests/Services/EffectiveConfig/EffectiveConfigSemanticsWiringTests.cs
@@ -1,9 +1,11 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Rendering;
 using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
 
-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Services.EffectiveConfig;
 
 /// <summary>
 /// Wiring tests that ensure special-option semantics actually feed parser and registry behavior.
diff --git a/src/DnsmasqWebUI.Tests/EffectiveDnsmasqConfigTests.cs b/src/DnsmasqWebUI.Tests/Services/EffectiveConfig/EffectiveDnsmasqConfigTests.cs
similarity index 99%
rename from src/DnsmasqWebUI.Tests/EffectiveDnsmasqConfigTests.cs
rename to src/DnsmasqWebUI.Tests/Services/EffectiveConfig/EffectiveDnsmasqConfigTests.cs
index ab39f19..1fc5069 100644
--- a/src/DnsmasqWebUI.Tests/EffectiveDnsmasqConfigTests.cs
+++ b/src/DnsmasqWebUI.Tests/Services/EffectiveConfig/EffectiveDnsmasqConfigTests.cs
@@ -1,6 +1,6 @@
 using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
 
-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Services.EffectiveConfig;
 
 /// <summary>
 /// Tests for EffectiveDnsmasqConfig, including GetLogsPath (log-facility as file path).
diff --git a/src/DnsmasqWebUI.Tests/OptionSemanticValidatorTests.cs b/src/DnsmasqWebUI.Tests/Services/EffectiveConfig/OptionSemanticValidatorTests.cs
similarity index 99%
rename from src/DnsmasqWebUI.Tests/OptionSemanticValidatorTests.cs
rename to src/DnsmasqWebUI.Tests/Services/EffectiveConfig/OptionSemanticValidatorTests.cs
index 925196b..6023dc8 100644
--- a/src/DnsmasqWebUI.Tests/OptionSemanticValidatorTests.cs
+++ b/src/DnsmasqWebUI.Tests/Services/EffectiveConfig/OptionSemanticValidatorTests.cs
@@ -1,8 +1,10 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
 
-namespace DnsmasqWebUI.Tests;
+namespace DnsmasqWebUI.Tests.Services.EffectiveConfig;
 
 /// <summary>
 /// Tests for the central semantic validator (handler dispatch and generic kind validation).
@@ -45,7 +47,7 @@ public class OptionSemanticValidatorTests
         new PxeServiceSemanticHandler(),
         new DhcpCircuitidSemanticHandler(),
         new DhcpRemoteidSemanticHandler(),
-        new DhcpSubscridSemanticHandler(),
+        new DhcpSubscrIdSemanticHandler(),
         new FilterRrSemanticHandler(),
         new CacheRrSemanticHandler(),
         new InterfaceNameSemanticHandler(),
@@ -55,7 +57,7 @@ public class OptionSemanticValidatorTests
         new PtrRecordSemanticHandler(),
         new InterfaceNameRecordSemanticHandler(),
         new CaaRecordSemanticHandler(),
-        new SrvHostSemanticHandler(),
+        new SrvSemanticHandler(),
         new NaptrRecordSemanticHandler(),
         new DnsRrSemanticHandler(),
         new DynamicHostSemanticHandler(),
diff --git a/src/DnsmasqWebUI/Components/EffectiveConfig/Composition/EffectiveConfigPanels.razor b/src/DnsmasqWebUI/Components/EffectiveConfig/Composition/EffectiveConfigPanels.razor
index 6c8ec0c..79db1df 100644
--- a/src/DnsmasqWebUI/Components/EffectiveConfig/Composition/EffectiveConfigPanels.razor
+++ b/src/DnsmasqWebUI/Components/EffectiveConfig/Composition/EffectiveConfigPanels.razor
@@ -1,7 +1,6 @@
 @namespace DnsmasqWebUI.Components.EffectiveConfig
 @using DnsmasqWebUI.Models.Dnsmasq
 @using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig
-@using DnsmasqWebUI.Infrastructure.Helpers.Config
 @inject IEffectiveConfigRenderFragmentRegistry RenderFragmentRegistry
 
 <div class="ec-sections small">
diff --git a/src/DnsmasqWebUI/Components/EffectiveConfig/Composition/EffectiveConfigSection.razor b/src/DnsmasqWebUI/Components/EffectiveConfig/Composition/EffectiveConfigSection.razor
index f0aae32..477b30d 100644
--- a/src/DnsmasqWebUI/Components/EffectiveConfig/Composition/EffectiveConfigSection.razor
+++ b/src/DnsmasqWebUI/Components/EffectiveConfig/Composition/EffectiveConfigSection.razor
@@ -1,7 +1,6 @@
 @namespace DnsmasqWebUI.Components.EffectiveConfig
 @using DnsmasqWebUI.Models.Dnsmasq
 @using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig
-@using DnsmasqWebUI.Infrastructure.Helpers.Config
 @using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Abstractions
 @using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation
 @inject IEffectiveConfigEditSession Session
diff --git a/src/DnsmasqWebUI/Components/EffectiveConfig/CustomDisplays/KeyOnlyOrValueDisplay.razor b/src/DnsmasqWebUI/Components/EffectiveConfig/CustomDisplays/KeyOnlyOrValueDisplay.razor
index c5088fa..b456d46 100644
--- a/src/DnsmasqWebUI/Components/EffectiveConfig/CustomDisplays/KeyOnlyOrValueDisplay.razor
+++ b/src/DnsmasqWebUI/Components/EffectiveConfig/CustomDisplays/KeyOnlyOrValueDisplay.razor
@@ -1,5 +1,4 @@
 @namespace DnsmasqWebUI.Components.EffectiveConfig.CustomDisplays
-@using DnsmasqWebUI.Infrastructure.Helpers.Config
 @using DnsmasqWebUI.Models.Dnsmasq
 @inherits EffectiveConfigValueDisplayBase
 
diff --git a/src/DnsmasqWebUI/Components/EffectiveConfig/Fields/EffectiveConfigFieldDisplay.razor b/src/DnsmasqWebUI/Components/EffectiveConfig/Fields/EffectiveConfigFieldDisplay.razor
index f1d3614..b6ee156 100644
--- a/src/DnsmasqWebUI/Components/EffectiveConfig/Fields/EffectiveConfigFieldDisplay.razor
+++ b/src/DnsmasqWebUI/Components/EffectiveConfig/Fields/EffectiveConfigFieldDisplay.razor
@@ -2,7 +2,6 @@
 @using DnsmasqWebUI.Models.Dnsmasq
 @using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig
 @using DnsmasqWebUI.Models.Config
-@using DnsmasqWebUI.Infrastructure.Helpers.Config
 @using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Abstractions
 @using DnsmasqWebUI.Infrastructure.Services.UI.Notifications.Abstractions
 @inject IEffectiveConfigRenderFragmentRegistry RenderFragmentRegistry
diff --git a/src/DnsmasqWebUI/Components/EffectiveConfig/Fields/EffectiveConfigMultiValueListEditor.razor b/src/DnsmasqWebUI/Components/EffectiveConfig/Fields/EffectiveConfigMultiValueListEditor.razor
index eee82fa..ad9eff4 100644
--- a/src/DnsmasqWebUI/Components/EffectiveConfig/Fields/EffectiveConfigMultiValueListEditor.razor
+++ b/src/DnsmasqWebUI/Components/EffectiveConfig/Fields/EffectiveConfigMultiValueListEditor.razor
@@ -1,5 +1,4 @@
 @namespace DnsmasqWebUI.Components.EffectiveConfig
-@using DnsmasqWebUI.Infrastructure.Helpers.Config
 @using DnsmasqWebUI.Models.Dnsmasq
 @using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig
 @using Microsoft.AspNetCore.Components.Web
diff --git a/src/DnsmasqWebUI/Components/EffectiveConfig/Fields/EffectiveConfigOptionItem.razor b/src/DnsmasqWebUI/Components/EffectiveConfig/Fields/EffectiveConfigOptionItem.razor
index 7cac9cf..1026919 100644
--- a/src/DnsmasqWebUI/Components/EffectiveConfig/Fields/EffectiveConfigOptionItem.razor
+++ b/src/DnsmasqWebUI/Components/EffectiveConfig/Fields/EffectiveConfigOptionItem.razor
@@ -1,5 +1,4 @@
 @namespace DnsmasqWebUI.Components.EffectiveConfig
-@using DnsmasqWebUI.Infrastructure.Helpers.Config
 @using DnsmasqWebUI.Models.Dnsmasq
 @using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig
 
diff --git a/src/DnsmasqWebUI/Components/EffectiveConfig/Modals/EffectiveConfigSaveModal.razor b/src/DnsmasqWebUI/Components/EffectiveConfig/Modals/EffectiveConfigSaveModal.razor
index 344320e..8645f93 100644
--- a/src/DnsmasqWebUI/Components/EffectiveConfig/Modals/EffectiveConfigSaveModal.razor
+++ b/src/DnsmasqWebUI/Components/EffectiveConfig/Modals/EffectiveConfigSaveModal.razor
@@ -2,7 +2,6 @@
 @using DnsmasqWebUI.Models.Dnsmasq
 @using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig
 @using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Abstractions
-@using DnsmasqWebUI.Infrastructure.Helpers.Config
 
 <div class="modal fade show" style="display: block;" tabindex="-1" role="dialog" aria-labelledby="ec-save-modal-title" aria-modal="true">
     <div class="modal-dialog modal-dialog-scrollable" role="document">
diff --git a/src/DnsmasqWebUI/Components/EffectiveConfig/Popovers/ReadonlyEditHint.razor b/src/DnsmasqWebUI/Components/EffectiveConfig/Popovers/ReadonlyEditHint.razor
index e4cb264..5377224 100644
--- a/src/DnsmasqWebUI/Components/EffectiveConfig/Popovers/ReadonlyEditHint.razor
+++ b/src/DnsmasqWebUI/Components/EffectiveConfig/Popovers/ReadonlyEditHint.razor
@@ -1,6 +1,5 @@
 @namespace DnsmasqWebUI.Components.EffectiveConfig
 @using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig
-@using DnsmasqWebUI.Infrastructure.Helpers.Config
 
 @if (Source is { IsReadOnly: true })
 {
diff --git a/src/DnsmasqWebUI/Components/EffectiveConfig/Popovers/ReadonlyEditPopover.razor b/src/DnsmasqWebUI/Components/EffectiveConfig/Popovers/ReadonlyEditPopover.razor
index 59d7879..f0cac58 100644
--- a/src/DnsmasqWebUI/Components/EffectiveConfig/Popovers/ReadonlyEditPopover.razor
+++ b/src/DnsmasqWebUI/Components/EffectiveConfig/Popovers/ReadonlyEditPopover.razor
@@ -1,6 +1,5 @@
 @namespace DnsmasqWebUI.Components.EffectiveConfig
 @using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig
-@using DnsmasqWebUI.Infrastructure.Helpers.Config
 @using DnsmasqWebUI.Extensions
 @using Microsoft.AspNetCore.Components
 @using Microsoft.JSInterop
diff --git a/src/DnsmasqWebUI/Components/_Imports.razor b/src/DnsmasqWebUI/Components/_Imports.razor
index 260c1c2..6926eb1 100644
--- a/src/DnsmasqWebUI/Components/_Imports.razor
+++ b/src/DnsmasqWebUI/Components/_Imports.razor
@@ -18,6 +18,11 @@
 @using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Leases.Abstractions
 @using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Reload.Abstractions
 @using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Abstractions
+@using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Editing.Abstractions
+@using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Rendering.Abstractions
+@using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions
+@using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata
+@using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Readonly
 @using DnsmasqWebUI.Infrastructure.Services.Logs.Abstractions
 @using DnsmasqWebUI.Infrastructure.Services.UI.Settings.Abstractions
 @using DnsmasqWebUI.Infrastructure.Services.Updates.Abstractions
@@ -31,7 +36,6 @@
 @using DnsmasqWebUI.Components.EffectiveConfig
 @using DnsmasqWebUI.Components.Hosts
 @using DnsmasqWebUI.Infrastructure
-@using DnsmasqWebUI.Infrastructure.Helpers.Config
 @using DnsmasqWebUI.Models
 @using DnsmasqWebUI.Models.Dnsmasq
 @using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig
diff --git a/src/DnsmasqWebUI/Infrastructure/Helpers/Dnsmasq/DnsmasqCompileOptionsParser.cs b/src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/Dnsmasq/DnsmasqCompileOptionsParser.cs
similarity index 94%
rename from src/DnsmasqWebUI/Infrastructure/Helpers/Dnsmasq/DnsmasqCompileOptionsParser.cs
rename to src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/Dnsmasq/DnsmasqCompileOptionsParser.cs
index 4da4bb6..f5b730a 100644
--- a/src/DnsmasqWebUI/Infrastructure/Helpers/Dnsmasq/DnsmasqCompileOptionsParser.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/Dnsmasq/DnsmasqCompileOptionsParser.cs
@@ -1,7 +1,7 @@
 using System.Text.RegularExpressions;
 using DnsmasqWebUI.Models.Dnsmasq;
 
-namespace DnsmasqWebUI.Infrastructure.Helpers.Dnsmasq;
+namespace DnsmasqWebUI.Infrastructure.Serialization.Parsers.Dnsmasq;
 
 /// <summary>
 /// Parses "Compile time options: ..." line from dnsmasq --version output
diff --git a/src/DnsmasqWebUI/Infrastructure/Helpers/Dnsmasq/DnsmasqVersionParser.cs b/src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/Dnsmasq/DnsmasqVersionParser.cs
similarity index 92%
rename from src/DnsmasqWebUI/Infrastructure/Helpers/Dnsmasq/DnsmasqVersionParser.cs
rename to src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/Dnsmasq/DnsmasqVersionParser.cs
index c22be6e..509baa0 100644
--- a/src/DnsmasqWebUI/Infrastructure/Helpers/Dnsmasq/DnsmasqVersionParser.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/Dnsmasq/DnsmasqVersionParser.cs
@@ -1,6 +1,6 @@
 using System.Text.RegularExpressions;
 
-namespace DnsmasqWebUI.Infrastructure.Helpers.Dnsmasq;
+namespace DnsmasqWebUI.Infrastructure.Serialization.Parsers.Dnsmasq;
 
 /// <summary>Parses dnsmasq version from command output (e.g. "dnsmasq --version" stdout/stderr).</summary>
 public static class DnsmasqVersionParser
diff --git a/src/DnsmasqWebUI/Infrastructure/Parsers/ConfParserHelpers.cs b/src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/DnsmasqConfig/ConfParserHelpers.cs
similarity index 97%
rename from src/DnsmasqWebUI/Infrastructure/Parsers/ConfParserHelpers.cs
rename to src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/DnsmasqConfig/ConfParserHelpers.cs
index 93b8a72..ca6ec88 100644
--- a/src/DnsmasqWebUI/Infrastructure/Parsers/ConfParserHelpers.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/DnsmasqConfig/ConfParserHelpers.cs
@@ -2,7 +2,7 @@ using Superpower;
 using Superpower.Model;
 using Superpower.Parsers;
 
-namespace DnsmasqWebUI.Infrastructure.Parsers;
+namespace DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;
 
 /// <summary>
 /// Shared Superpower text-parser helpers used by .conf and related parsers.
diff --git a/src/DnsmasqWebUI/Infrastructure/Parsers/DnsmasqConfDhcpHostLineParser.cs b/src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/DnsmasqConfig/DnsmasqConfDhcpHostLineParser.cs
similarity index 99%
rename from src/DnsmasqWebUI/Infrastructure/Parsers/DnsmasqConfDhcpHostLineParser.cs
rename to src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/DnsmasqConfig/DnsmasqConfDhcpHostLineParser.cs
index d3f668d..bf2adc1 100644
--- a/src/DnsmasqWebUI/Infrastructure/Parsers/DnsmasqConfDhcpHostLineParser.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/DnsmasqConfig/DnsmasqConfDhcpHostLineParser.cs
@@ -3,7 +3,7 @@ using Superpower;
 using Superpower.Model;
 using Superpower.Parsers;
 
-namespace DnsmasqWebUI.Infrastructure.Parsers;
+namespace DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;
 
 /// <summary>
 /// Parses a single <c>dhcp-host=</c> line from a dnsmasq .conf file. Same format as long option without <c>--</c>.
diff --git a/src/DnsmasqWebUI/Infrastructure/Parsers/DnsmasqConfDirectiveParser.cs b/src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/DnsmasqConfig/DnsmasqConfDirectiveParser.cs
similarity index 97%
rename from src/DnsmasqWebUI/Infrastructure/Parsers/DnsmasqConfDirectiveParser.cs
rename to src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/DnsmasqConfig/DnsmasqConfDirectiveParser.cs
index b03b78f..1f05ff5 100644
--- a/src/DnsmasqWebUI/Infrastructure/Parsers/DnsmasqConfDirectiveParser.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/DnsmasqConfig/DnsmasqConfDirectiveParser.cs
@@ -2,7 +2,7 @@ using Superpower;
 using Superpower.Model;
 using Superpower.Parsers;
 
-namespace DnsmasqWebUI.Infrastructure.Parsers;
+namespace DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;
 
 /// <summary>
 /// Key/value parsing for dnsmasq .conf lines. Used by <see cref="DnsmasqConfIncludeParser"/> to build effective config.
diff --git a/src/DnsmasqWebUI/Infrastructure/Parsers/DnsmasqConfFileLineParser.cs b/src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/DnsmasqConfig/DnsmasqConfFileLineParser.cs
similarity index 98%
rename from src/DnsmasqWebUI/Infrastructure/Parsers/DnsmasqConfFileLineParser.cs
rename to src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/DnsmasqConfig/DnsmasqConfFileLineParser.cs
index ea6c1c7..ed4bf0e 100644
--- a/src/DnsmasqWebUI/Infrastructure/Parsers/DnsmasqConfFileLineParser.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/DnsmasqConfig/DnsmasqConfFileLineParser.cs
@@ -4,7 +4,7 @@ using Superpower;
 using Superpower.Model;
 using Superpower.Parsers;
 
-namespace DnsmasqWebUI.Infrastructure.Parsers;
+namespace DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;
 
 /// <summary>
 /// Parses a dnsmasq .conf file line-by-line into <see cref="DnsmasqConfLine"/> variants (BlankLine, CommentLine, DhcpHostLine, OtherLine).
diff --git a/src/DnsmasqWebUI/Infrastructure/Parsers/DnsmasqConfIncludeParser.cs b/src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/DnsmasqConfig/DnsmasqConfIncludeParser.cs
similarity index 99%
rename from src/DnsmasqWebUI/Infrastructure/Parsers/DnsmasqConfIncludeParser.cs
rename to src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/DnsmasqConfig/DnsmasqConfIncludeParser.cs
index 3ba6444..70b3a21 100644
--- a/src/DnsmasqWebUI/Infrastructure/Parsers/DnsmasqConfIncludeParser.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/DnsmasqConfig/DnsmasqConfIncludeParser.cs
@@ -1,11 +1,12 @@
 using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 using DnsmasqWebUI.Models.Dnsmasq;
 using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
 using Superpower;
 using Superpower.Model;
 using Superpower.Parsers;
 
-namespace DnsmasqWebUI.Infrastructure.Parsers;
+namespace DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;
 
 /// <summary>
 /// Parses the main dnsmasq .conf file only for <c>conf-file=</c> and <c>conf-dir=</c> directives
diff --git a/src/DnsmasqWebUI/Infrastructure/Parsers/DnsmasqLeasesFileLineParser.cs b/src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/DnsmasqConfig/DnsmasqLeasesFileLineParser.cs
similarity index 96%
rename from src/DnsmasqWebUI/Infrastructure/Parsers/DnsmasqLeasesFileLineParser.cs
rename to src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/DnsmasqConfig/DnsmasqLeasesFileLineParser.cs
index dafeb83..c04fc57 100644
--- a/src/DnsmasqWebUI/Infrastructure/Parsers/DnsmasqLeasesFileLineParser.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/DnsmasqConfig/DnsmasqLeasesFileLineParser.cs
@@ -3,7 +3,7 @@ using Superpower;
 using Superpower.Model;
 using Superpower.Parsers;
 
-namespace DnsmasqWebUI.Infrastructure.Parsers;
+namespace DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;
 
 /// <summary>
 /// Parses a single line of the dnsmasq DHCPv4 lease file (e.g. /var/lib/misc/dnsmasq.leases).
diff --git a/src/DnsmasqWebUI/Infrastructure/Parsers/HostsFileLineParser.cs b/src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/DnsmasqConfig/HostsFileLineParser.cs
similarity index 97%
rename from src/DnsmasqWebUI/Infrastructure/Parsers/HostsFileLineParser.cs
rename to src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/DnsmasqConfig/HostsFileLineParser.cs
index 07c07f9..16aad79 100644
--- a/src/DnsmasqWebUI/Infrastructure/Parsers/HostsFileLineParser.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/DnsmasqConfig/HostsFileLineParser.cs
@@ -3,7 +3,7 @@ using Superpower;
 using Superpower.Model;
 using Superpower.Parsers;
 
-namespace DnsmasqWebUI.Infrastructure.Parsers;
+namespace DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;
 
 /// <summary>
 /// Parses a single line of an /etc/hosts-style file. Format: IP_address canonical_hostname [aliases...]
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DnsmasqDhcpOptionSyntax.cs b/src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/EffectiveConfig/DnsmasqDhcpOptionSyntax.cs
similarity index 95%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DnsmasqDhcpOptionSyntax.cs
rename to src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/EffectiveConfig/DnsmasqDhcpOptionSyntax.cs
index 9379f70..9d5c392 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DnsmasqDhcpOptionSyntax.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/EffectiveConfig/DnsmasqDhcpOptionSyntax.cs
@@ -1,4 +1,4 @@
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
 /// <summary>
 /// Shared token parsing helpers for DHCP option-style values such as <c>dhcp-option</c>,
diff --git a/src/DnsmasqWebUI/Infrastructure/Helpers/Config/DnsmasqDhcpRangeValueParser.cs b/src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/EffectiveConfig/DnsmasqDhcpRangeValueParser.cs
similarity index 98%
rename from src/DnsmasqWebUI/Infrastructure/Helpers/Config/DnsmasqDhcpRangeValueParser.cs
rename to src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/EffectiveConfig/DnsmasqDhcpRangeValueParser.cs
index cd703ff..fc911e5 100644
--- a/src/DnsmasqWebUI/Infrastructure/Helpers/Config/DnsmasqDhcpRangeValueParser.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/EffectiveConfig/DnsmasqDhcpRangeValueParser.cs
@@ -1,6 +1,6 @@
 using System.Net;
 
-namespace DnsmasqWebUI.Infrastructure.Helpers.Config;
+namespace DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
 /// <summary>
 /// Shared structural parser for <c>dhcp-range</c> option values.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DnsmasqDhcpTagSyntax.cs b/src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/EffectiveConfig/DnsmasqDhcpTagSyntax.cs
similarity index 96%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DnsmasqDhcpTagSyntax.cs
rename to src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/EffectiveConfig/DnsmasqDhcpTagSyntax.cs
index 58cee8d..aaf341d 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DnsmasqDhcpTagSyntax.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/EffectiveConfig/DnsmasqDhcpTagSyntax.cs
@@ -1,4 +1,4 @@
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
 /// <summary>
 /// Shared helpers for DHCP option families that use <c>set:</c>, <c>tag:</c>,
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DnsmasqIpPrefixSyntax.cs b/src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/EffectiveConfig/DnsmasqIpPrefixSyntax.cs
similarity index 92%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DnsmasqIpPrefixSyntax.cs
rename to src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/EffectiveConfig/DnsmasqIpPrefixSyntax.cs
index 199f7f3..5858236 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DnsmasqIpPrefixSyntax.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/EffectiveConfig/DnsmasqIpPrefixSyntax.cs
@@ -1,6 +1,6 @@
 using System.Net;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
 /// <summary>
 /// Shared helpers for option values that are an IP literal with an optional prefix length.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DnsmasqRelaySyntax.cs b/src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/EffectiveConfig/DnsmasqRelaySyntax.cs
similarity index 95%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DnsmasqRelaySyntax.cs
rename to src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/EffectiveConfig/DnsmasqRelaySyntax.cs
index 50e49c3..75de154 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DnsmasqRelaySyntax.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/EffectiveConfig/DnsmasqRelaySyntax.cs
@@ -1,6 +1,6 @@
 using System.Net;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
 /// <summary>
 /// Shared parsing helpers for relay/proxy style values that work primarily with
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DnsmasqRrTypeSyntax.cs b/src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/EffectiveConfig/DnsmasqRrTypeSyntax.cs
similarity index 89%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DnsmasqRrTypeSyntax.cs
rename to src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/EffectiveConfig/DnsmasqRrTypeSyntax.cs
index 61954af..ab602b2 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DnsmasqRrTypeSyntax.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/EffectiveConfig/DnsmasqRrTypeSyntax.cs
@@ -1,4 +1,4 @@
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
 /// <summary>
 /// Shared helpers for DNS RR-type values used by <c>filter-rr</c> and <c>cache-rr</c>.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DnsmasqScopedDomainSyntax.cs b/src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/EffectiveConfig/DnsmasqScopedDomainSyntax.cs
similarity index 97%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DnsmasqScopedDomainSyntax.cs
rename to src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/EffectiveConfig/DnsmasqScopedDomainSyntax.cs
index 25488c2..497afc5 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DnsmasqScopedDomainSyntax.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Serialization/Parsers/EffectiveConfig/DnsmasqScopedDomainSyntax.cs
@@ -1,6 +1,6 @@
 using System.Text.RegularExpressions;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
 /// <summary>
 /// Shared parsing/validation helpers for dnsmasq option values that use the
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Config/ConfigSetCache.cs b/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Config/ConfigSetCache.cs
index aeeb982..307a645 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Config/ConfigSetCache.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Config/ConfigSetCache.cs
@@ -1,10 +1,11 @@
 using DnsmasqWebUI.Models.Config;
 using DnsmasqWebUI.Models.Contracts;
 using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 using DnsmasqWebUI.Models.Dhcp;
 using DnsmasqWebUI.Models.Dnsmasq;
 using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
-using DnsmasqWebUI.Infrastructure.Parsers;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;
 using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Config.Abstractions;
 using Microsoft.Extensions.Options;
 
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Config/DnsmasqConfigService.cs b/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Config/DnsmasqConfigService.cs
index 64d29fc..d4c5c89 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Config/DnsmasqConfigService.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Config/DnsmasqConfigService.cs
@@ -1,6 +1,7 @@
 using System.Text;
 using DnsmasqWebUI.Infrastructure.Helpers.Config;
-using DnsmasqWebUI.Infrastructure.Parsers;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;
 using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Config.Abstractions;
 using DnsmasqWebUI.Models.Config;
 using DnsmasqWebUI.Models.Contracts;
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Config/DnsmasqConfigSetService.cs b/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Config/DnsmasqConfigSetService.cs
index 7c52d8c..717c5b1 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Config/DnsmasqConfigSetService.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Config/DnsmasqConfigSetService.cs
@@ -1,7 +1,8 @@
 using DnsmasqWebUI.Models.Dnsmasq;
 using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
 using DnsmasqWebUI.Models.Contracts;
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Config.Abstractions;
 
 namespace DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Config;
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Config/EnsureManagedConfigHostedService.cs b/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Config/EnsureManagedConfigHostedService.cs
index f5065a2..c1357a4 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Config/EnsureManagedConfigHostedService.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Config/EnsureManagedConfigHostedService.cs
@@ -1,6 +1,7 @@
 using System.Text;
 using DnsmasqWebUI.Infrastructure.Helpers.Config;
-using DnsmasqWebUI.Infrastructure.Parsers;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;
 using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Config.Abstractions;
 using DnsmasqWebUI.Infrastructure.Services.Registration.Abstractions;
 using DnsmasqWebUI.Models.Config;
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Hosts/HostsCache.cs b/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Hosts/HostsCache.cs
index 801fd35..ee7113b 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Hosts/HostsCache.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Hosts/HostsCache.cs
@@ -2,7 +2,7 @@ using System.Text;
 using DnsmasqWebUI.Models.Config;
 using DnsmasqWebUI.Models.Contracts;
 using DnsmasqWebUI.Models.Hosts;
-using DnsmasqWebUI.Infrastructure.Parsers;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;
 using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Config.Abstractions;
 using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Hosts.Abstractions;
 using Microsoft.Extensions.Options;
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Hosts/HostsFileService.cs b/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Hosts/HostsFileService.cs
index 17e0d76..7de31ca 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Hosts/HostsFileService.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Hosts/HostsFileService.cs
@@ -1,5 +1,6 @@
 using DnsmasqWebUI.Infrastructure.Helpers.Config;
-using DnsmasqWebUI.Infrastructure.Parsers;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;
 using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Config.Abstractions;
 using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Hosts.Abstractions;
 using DnsmasqWebUI.Models.Hosts;
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Leases/LeasesCache.cs b/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Leases/LeasesCache.cs
index 16b8cbe..8efa977 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Leases/LeasesCache.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Leases/LeasesCache.cs
@@ -1,6 +1,6 @@
 using System.Text;
 using DnsmasqWebUI.Models.Dhcp;
-using DnsmasqWebUI.Infrastructure.Parsers;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.DnsmasqConfig;
 using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Config.Abstractions;
 using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Leases.Abstractions;
 
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Version/DnsmasqVersionService.cs b/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Version/DnsmasqVersionService.cs
index 6479e40..6c440f2 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Version/DnsmasqVersionService.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Version/DnsmasqVersionService.cs
@@ -1,4 +1,4 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Dnsmasq;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.Dnsmasq;
 using DnsmasqWebUI.Infrastructure.Services.Common.Process.Abstractions;
 using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Version.Abstractions;
 using DnsmasqWebUI.Models.Config;
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/IEffectiveConfigSemanticValidationService.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Abstractions/IEffectiveConfigSemanticValidationService.cs
similarity index 90%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/IEffectiveConfigSemanticValidationService.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Abstractions/IEffectiveConfigSemanticValidationService.cs
index 1e674e1..27dade8 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/IEffectiveConfigSemanticValidationService.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Abstractions/IEffectiveConfigSemanticValidationService.cs
@@ -1,7 +1,7 @@
 using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
 using DnsmasqWebUI.Infrastructure.Services.Registration.Abstractions;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Abstractions;
 
 /// <summary>
 /// Validates pending effective-config changes against option semantics before write.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/IMultiValueEditBehavior.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Editing/Abstractions/IMultiValueEditBehavior.cs
similarity index 82%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/IMultiValueEditBehavior.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Editing/Abstractions/IMultiValueEditBehavior.cs
index 8c910c3..5b45bdd 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/IMultiValueEditBehavior.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Editing/Abstractions/IMultiValueEditBehavior.cs
@@ -1,4 +1,4 @@
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Editing.Abstractions;
 
 /// <summary>
 /// Option-specific behavior for the multi-value list editor: duplicate policy and normalization.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DefaultMultiValueEditBehavior.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Editing/DefaultMultiValueEditBehavior.cs
similarity index 66%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DefaultMultiValueEditBehavior.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Editing/DefaultMultiValueEditBehavior.cs
index 75e3b75..7c3e744 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DefaultMultiValueEditBehavior.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Editing/DefaultMultiValueEditBehavior.cs
@@ -1,4 +1,6 @@
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Editing.Abstractions;
+
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Editing;
 
 /// <summary>
 /// Default behavior for multi-value list editor: allow duplicates and trim normalization.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DistinctMultiValueEditBehavior.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Editing/DistinctMultiValueEditBehavior.cs
similarity index 70%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DistinctMultiValueEditBehavior.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Editing/DistinctMultiValueEditBehavior.cs
index 69531d1..c8017e1 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DistinctMultiValueEditBehavior.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Editing/DistinctMultiValueEditBehavior.cs
@@ -1,4 +1,6 @@
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Editing.Abstractions;
+
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Editing;
 
 /// <summary>
 /// Generic edit behavior for multi-value options that should reject duplicate items
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/EffectiveConfigSaveService.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/EffectiveConfigSaveService.cs
index 19599fb..6da7c64 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/EffectiveConfigSaveService.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/EffectiveConfigSaveService.cs
@@ -1,5 +1,5 @@
 using System.Linq;
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Config.Abstractions;
 using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Reload.Abstractions;
 using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Validation.Abstractions;
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/EffectiveConfigSemanticValidationService.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/EffectiveConfigSemanticValidationService.cs
index 94abc75..33ec2cb 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/EffectiveConfigSemanticValidationService.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/EffectiveConfigSemanticValidationService.cs
@@ -1,6 +1,8 @@
 using System.Collections.Generic;
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Abstractions;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
 using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
 
 namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig;
diff --git a/src/DnsmasqWebUI/Infrastructure/Helpers/Config/DnsmasqConfKeys.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Metadata/DnsmasqConfKeys.cs
similarity index 99%
rename from src/DnsmasqWebUI/Infrastructure/Helpers/Config/DnsmasqConfKeys.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Metadata/DnsmasqConfKeys.cs
index f784a13..c0bd664 100644
--- a/src/DnsmasqWebUI/Infrastructure/Helpers/Config/DnsmasqConfKeys.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Metadata/DnsmasqConfKeys.cs
@@ -1,4 +1,4 @@
-namespace DnsmasqWebUI.Infrastructure.Helpers.Config;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 
 /// <summary>
 /// Literal dnsmasq .conf option names (config keys). Use these everywhere we reference option names
diff --git a/src/DnsmasqWebUI/Infrastructure/Helpers/Config/DnsmasqOptionPlaceholders.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Metadata/DnsmasqOptionPlaceholders.cs
similarity index 99%
rename from src/DnsmasqWebUI/Infrastructure/Helpers/Config/DnsmasqOptionPlaceholders.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Metadata/DnsmasqOptionPlaceholders.cs
index 6a8ec06..51e2c4e 100644
--- a/src/DnsmasqWebUI/Infrastructure/Helpers/Config/DnsmasqOptionPlaceholders.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Metadata/DnsmasqOptionPlaceholders.cs
@@ -1,6 +1,6 @@
 using System.Collections.Frozen;
 
-namespace DnsmasqWebUI.Infrastructure.Helpers.Config;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 
 /// <summary>
 /// Placeholder values shown in effective-config editors before the user enters a value.
diff --git a/src/DnsmasqWebUI/Infrastructure/Helpers/Config/DnsmasqOptionTooltips.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Metadata/DnsmasqOptionTooltips.cs
similarity index 99%
rename from src/DnsmasqWebUI/Infrastructure/Helpers/Config/DnsmasqOptionTooltips.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Metadata/DnsmasqOptionTooltips.cs
index 3f79b3a..c287d43 100644
--- a/src/DnsmasqWebUI/Infrastructure/Helpers/Config/DnsmasqOptionTooltips.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Metadata/DnsmasqOptionTooltips.cs
@@ -1,6 +1,6 @@
 using System.Collections.Frozen;
 
-namespace DnsmasqWebUI.Infrastructure.Helpers.Config;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 
 /// <summary>
 /// Short explainer tooltips for dnsmasq option names. Shown on hover over the field label.
diff --git a/src/DnsmasqWebUI/Infrastructure/Helpers/Config/EffectiveConfigFeatureRequirements.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Metadata/EffectiveConfigFeatureRequirements.cs
similarity index 99%
rename from src/DnsmasqWebUI/Infrastructure/Helpers/Config/EffectiveConfigFeatureRequirements.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Metadata/EffectiveConfigFeatureRequirements.cs
index c1a1f2b..f9391a7 100644
--- a/src/DnsmasqWebUI/Infrastructure/Helpers/Config/EffectiveConfigFeatureRequirements.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Metadata/EffectiveConfigFeatureRequirements.cs
@@ -1,6 +1,6 @@
 using DnsmasqWebUI.Models.Dnsmasq;
 
-namespace DnsmasqWebUI.Infrastructure.Helpers.Config;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 
 /// <summary>Dnsmasq compile-time feature required for certain options.</summary>
 public enum DnsmasqFeature
diff --git a/src/DnsmasqWebUI/Infrastructure/Helpers/Config/EffectiveConfigFieldBuilder.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Metadata/EffectiveConfigFieldBuilder.cs
similarity index 99%
rename from src/DnsmasqWebUI/Infrastructure/Helpers/Config/EffectiveConfigFieldBuilder.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Metadata/EffectiveConfigFieldBuilder.cs
index b4cdfce..3fcc417 100644
--- a/src/DnsmasqWebUI/Infrastructure/Helpers/Config/EffectiveConfigFieldBuilder.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Metadata/EffectiveConfigFieldBuilder.cs
@@ -1,8 +1,8 @@
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Rendering.Abstractions;
 using DnsmasqWebUI.Models.Dnsmasq;
 using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
-using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Abstractions;
 
-namespace DnsmasqWebUI.Infrastructure.Helpers.Config;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 
 /// <summary>
 /// Builds field descriptors for viewing and editing. Mapping is done once here via delegates passed to each descriptor.
diff --git a/src/DnsmasqWebUI/Infrastructure/Helpers/Config/EffectiveConfigFieldDescriptorListExtensions.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Metadata/EffectiveConfigFieldDescriptorListExtensions.cs
similarity index 95%
rename from src/DnsmasqWebUI/Infrastructure/Helpers/Config/EffectiveConfigFieldDescriptorListExtensions.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Metadata/EffectiveConfigFieldDescriptorListExtensions.cs
index 955b47d..1386e0c 100644
--- a/src/DnsmasqWebUI/Infrastructure/Helpers/Config/EffectiveConfigFieldDescriptorListExtensions.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Metadata/EffectiveConfigFieldDescriptorListExtensions.cs
@@ -1,8 +1,8 @@
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Rendering.Abstractions;
 using DnsmasqWebUI.Models.Dnsmasq;
 using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
-using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Abstractions;
 
-namespace DnsmasqWebUI.Infrastructure.Helpers.Config;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 
 /// <summary>
 /// Extension methods for building lists of effective-config field descriptors. Keeps the field builder readable.
diff --git a/src/DnsmasqWebUI/Infrastructure/Helpers/Config/EffectiveConfigOptionKindMap.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Metadata/EffectiveConfigOptionKindMap.cs
similarity index 99%
rename from src/DnsmasqWebUI/Infrastructure/Helpers/Config/EffectiveConfigOptionKindMap.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Metadata/EffectiveConfigOptionKindMap.cs
index a9e1d95..c3b0a21 100644
--- a/src/DnsmasqWebUI/Infrastructure/Helpers/Config/EffectiveConfigOptionKindMap.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Metadata/EffectiveConfigOptionKindMap.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace DnsmasqWebUI.Infrastructure.Helpers.Config;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 
 /// <summary>
 /// Whether an effective-config option has a single value (or flag) or multiple values.
diff --git a/src/DnsmasqWebUI/Infrastructure/Helpers/Config/EffectiveConfigSections.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Metadata/EffectiveConfigSections.cs
similarity index 99%
rename from src/DnsmasqWebUI/Infrastructure/Helpers/Config/EffectiveConfigSections.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Metadata/EffectiveConfigSections.cs
index 4ea133a..e77cf2a 100644
--- a/src/DnsmasqWebUI/Infrastructure/Helpers/Config/EffectiveConfigSections.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Metadata/EffectiveConfigSections.cs
@@ -1,6 +1,6 @@
 using System.Collections.Frozen;
 
-namespace DnsmasqWebUI.Infrastructure.Helpers.Config;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 
 /// <summary>
 /// Single source of truth: which effective-config sections exist, their display order and titles,
diff --git a/src/DnsmasqWebUI/Infrastructure/Helpers/Config/EffectiveConfigSpecialOptionSemantics.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Metadata/EffectiveConfigSpecialOptionSemantics.cs
similarity index 99%
rename from src/DnsmasqWebUI/Infrastructure/Helpers/Config/EffectiveConfigSpecialOptionSemantics.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Metadata/EffectiveConfigSpecialOptionSemantics.cs
index e6c6094..949ad7c 100644
--- a/src/DnsmasqWebUI/Infrastructure/Helpers/Config/EffectiveConfigSpecialOptionSemantics.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Metadata/EffectiveConfigSpecialOptionSemantics.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace DnsmasqWebUI.Infrastructure.Helpers.Config;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 
 /// <summary>
 /// Single source of truth for options with special parse/write/validation semantics.
diff --git a/src/DnsmasqWebUI/Infrastructure/Helpers/Config/EffectiveConfigViews.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Metadata/EffectiveConfigViews.cs
similarity index 96%
rename from src/DnsmasqWebUI/Infrastructure/Helpers/Config/EffectiveConfigViews.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Metadata/EffectiveConfigViews.cs
index 197914c..6e1ae0b 100644
--- a/src/DnsmasqWebUI/Infrastructure/Helpers/Config/EffectiveConfigViews.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Metadata/EffectiveConfigViews.cs
@@ -1,8 +1,8 @@
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Rendering.Abstractions;
 using DnsmasqWebUI.Models.Dnsmasq;
 using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
-using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Abstractions;
 
-namespace DnsmasqWebUI.Infrastructure.Helpers.Config;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 
 /// <summary>
 /// Defines which sections and (optionally) which fields are visible per EffectiveConfigContext.
diff --git a/src/DnsmasqWebUI/Infrastructure/Helpers/Config/EffectiveConfigWriteSemantics.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Metadata/EffectiveConfigWriteSemantics.cs
similarity index 95%
rename from src/DnsmasqWebUI/Infrastructure/Helpers/Config/EffectiveConfigWriteSemantics.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Metadata/EffectiveConfigWriteSemantics.cs
index af684e2..c3c0d50 100644
--- a/src/DnsmasqWebUI/Infrastructure/Helpers/Config/EffectiveConfigWriteSemantics.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Metadata/EffectiveConfigWriteSemantics.cs
@@ -1,4 +1,4 @@
-namespace DnsmasqWebUI.Infrastructure.Helpers.Config;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 
 /// <summary>
 /// How to serialize an option when writing the managed config file.
diff --git a/src/DnsmasqWebUI/Infrastructure/Helpers/Config/OptionValidationSemantics.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Metadata/OptionValidationSemantics.cs
similarity index 95%
rename from src/DnsmasqWebUI/Infrastructure/Helpers/Config/OptionValidationSemantics.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Metadata/OptionValidationSemantics.cs
index 449b606..3fe3ec2 100644
--- a/src/DnsmasqWebUI/Infrastructure/Helpers/Config/OptionValidationSemantics.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Metadata/OptionValidationSemantics.cs
@@ -1,6 +1,6 @@
 using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Helpers.Config;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 
 /// <summary>
 /// Shared validation kinds for effective-config options.
diff --git a/src/DnsmasqWebUI/Infrastructure/Helpers/Config/ReadonlyConfigCommandGenerator.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Readonly/ReadonlyConfigCommandGenerator.cs
similarity index 97%
rename from src/DnsmasqWebUI/Infrastructure/Helpers/Config/ReadonlyConfigCommandGenerator.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Readonly/ReadonlyConfigCommandGenerator.cs
index 8264398..979b277 100644
--- a/src/DnsmasqWebUI/Infrastructure/Helpers/Config/ReadonlyConfigCommandGenerator.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Readonly/ReadonlyConfigCommandGenerator.cs
@@ -1,6 +1,7 @@
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Helpers.Config;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Readonly;
 
 /// <summary>
 /// Generates copyable commands or hints for readonly effective-config values:
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Abstractions/IEffectiveConfigRenderFragmentRegistry.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Rendering/Abstractions/IEffectiveConfigRenderFragmentRegistry.cs
similarity index 96%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Abstractions/IEffectiveConfigRenderFragmentRegistry.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Rendering/Abstractions/IEffectiveConfigRenderFragmentRegistry.cs
index d74e749..5e8744f 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Abstractions/IEffectiveConfigRenderFragmentRegistry.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Rendering/Abstractions/IEffectiveConfigRenderFragmentRegistry.cs
@@ -4,7 +4,7 @@ using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
 using DnsmasqWebUI.Infrastructure.Services.Registration.Abstractions;
 using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig.Abstractions;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Abstractions;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Rendering.Abstractions;
 
 /// <summary>
 /// Lookup for custom display fragments per effective-config field (section + option).
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/EffectiveConfigRenderFragmentRegistry.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Rendering/EffectiveConfigRenderFragmentRegistry.cs
similarity index 97%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/EffectiveConfigRenderFragmentRegistry.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Rendering/EffectiveConfigRenderFragmentRegistry.cs
index 8d85332..91e5a0d 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/EffectiveConfigRenderFragmentRegistry.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Rendering/EffectiveConfigRenderFragmentRegistry.cs
@@ -1,13 +1,16 @@
 using Microsoft.AspNetCore.Components;
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Editing;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Editing.Abstractions;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Rendering.Abstractions;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
 using DnsmasqWebUI.Models.Dnsmasq;
 using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
 using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig.Abstractions;
-using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Abstractions;
 using DnsmasqWebUI.Components.EffectiveConfig.CustomDisplays;
-using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Rendering;
 
 /// <summary>
 /// Maps (sectionId, optionName) to custom effective-config value display component types and descriptor factories.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/IMultiValueOptionValidator.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Abstractions/IMultiValueOptionValidator.cs
similarity index 96%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/IMultiValueOptionValidator.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Abstractions/IMultiValueOptionValidator.cs
index 6b4b2b6..38afee8 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/IMultiValueOptionValidator.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Abstractions/IMultiValueOptionValidator.cs
@@ -1,4 +1,4 @@
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
 
 /// <summary>
 /// Option-specific validation for a single item in a multi-value list.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/IOptionSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Abstractions/IOptionSemanticHandler.cs
similarity index 97%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/IOptionSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Abstractions/IOptionSemanticHandler.cs
index c3e3ea9..40d954a 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/IOptionSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Abstractions/IOptionSemanticHandler.cs
@@ -1,6 +1,6 @@
 using DnsmasqWebUI.Infrastructure.Services.Registration.Abstractions;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
 
 /// <summary>
 /// Option-specific semantic handler for cases that generic validation kinds cannot express clearly.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/IOptionSemanticValidator.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Abstractions/IOptionSemanticValidator.cs
similarity index 90%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/IOptionSemanticValidator.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Abstractions/IOptionSemanticValidator.cs
index cb14616..04d12b9 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/IOptionSemanticValidator.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Abstractions/IOptionSemanticValidator.cs
@@ -1,7 +1,7 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 using DnsmasqWebUI.Infrastructure.Services.Registration.Abstractions;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
 
 /// <summary>
 /// Central validator for effective-config option values driven by <see cref="OptionValidationSemantics"/>.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DelegateMultiValueOptionValidator.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DelegateMultiValueOptionValidator.cs
index 64675ad..e5d28a7 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DelegateMultiValueOptionValidator.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DelegateMultiValueOptionValidator.cs
@@ -1,3 +1,5 @@
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+
 namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
 
 /// <summary>
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/EffectiveConfigCrossOptionEvaluator.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/EffectiveConfigCrossOptionEvaluator.cs
index 2557e51..f76b58e 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/EffectiveConfigCrossOptionEvaluator.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/EffectiveConfigCrossOptionEvaluator.cs
@@ -1,4 +1,4 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
 using DnsmasqWebUI.Models.Dnsmasq;
 using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
 
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/AddressSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/AddressSemanticHandler.cs
similarity index 85%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/AddressSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/AddressSemanticHandler.cs
index 30285f4..e5ee9fb 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/AddressSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/AddressSemanticHandler.cs
@@ -1,7 +1,9 @@
 using System.Net;
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Specialized semantic behavior for <c>address</c> values.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/AliasSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/AliasSemanticHandler.cs
similarity index 90%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/AliasSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/AliasSemanticHandler.cs
index 28a0b12..a9c44e0 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/AliasSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/AliasSemanticHandler.cs
@@ -1,7 +1,8 @@
 using System.Net;
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Specialized semantic behavior for <c>alias</c> values.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/AuthPeerSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/AuthPeerSemanticHandler.cs
similarity index 86%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/AuthPeerSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/AuthPeerSemanticHandler.cs
index a97efb1..9bff0e1 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/AuthPeerSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/AuthPeerSemanticHandler.cs
@@ -1,7 +1,8 @@
 using System.Net;
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Semantic validation for <c>auth-peer</c> values: &lt;ip-address&gt;[,&lt;ip-address&gt;...].
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/AuthSecServersSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/AuthSecServersSemanticHandler.cs
similarity index 81%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/AuthSecServersSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/AuthSecServersSemanticHandler.cs
index e1c16ef..d098503 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/AuthSecServersSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/AuthSecServersSemanticHandler.cs
@@ -1,6 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Semantic validation for <c>auth-sec-servers</c> values: &lt;domain&gt;[,&lt;domain&gt;...].
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/AuthServerSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/AuthServerSemanticHandler.cs
similarity index 87%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/AuthServerSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/AuthServerSemanticHandler.cs
index 50b0638..f3e2679 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/AuthServerSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/AuthServerSemanticHandler.cs
@@ -1,7 +1,9 @@
 using System.Net;
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Semantic validation for <c>auth-server</c> values: &lt;domain&gt;,[&lt;interface&gt;|&lt;ip-address&gt;...].
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/AuthSoaSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/AuthSoaSemanticHandler.cs
similarity index 86%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/AuthSoaSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/AuthSoaSemanticHandler.cs
index c2be876..053535f 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/AuthSoaSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/AuthSoaSemanticHandler.cs
@@ -1,7 +1,9 @@
 using System.Globalization;
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Semantic validation for <c>auth-soa</c> values: &lt;serial&gt;[,&lt;hostmaster&gt;[,&lt;refresh&gt;[,&lt;retry&gt;[,&lt;expiry&gt;]]]].
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/AuthZoneSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/AuthZoneSemanticHandler.cs
similarity index 83%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/AuthZoneSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/AuthZoneSemanticHandler.cs
index e2ca354..7554baa 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/AuthZoneSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/AuthZoneSemanticHandler.cs
@@ -1,6 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Semantic validation for <c>auth-zone</c> values: &lt;domain&gt;[,&lt;subnet&gt;[/prefix]...][,exclude:&lt;subnet&gt;...].
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/BogusNxdomainSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/BogusNxdomainSemanticHandler.cs
similarity index 72%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/BogusNxdomainSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/BogusNxdomainSemanticHandler.cs
index f42bd19..5fbb81b 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/BogusNxdomainSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/BogusNxdomainSemanticHandler.cs
@@ -1,6 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Semantic validation for <c>bogus-nxdomain</c> values.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/BridgeInterfaceSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/BridgeInterfaceSemanticHandler.cs
similarity index 82%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/BridgeInterfaceSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/BridgeInterfaceSemanticHandler.cs
index ca2922e..0effbad 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/BridgeInterfaceSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/BridgeInterfaceSemanticHandler.cs
@@ -1,6 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Semantic validation for <c>bridge-interface</c> values.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/CaaRecordSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/CaaRecordSemanticHandler.cs
similarity index 82%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/CaaRecordSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/CaaRecordSemanticHandler.cs
index 8cb8067..aee56b8 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/CaaRecordSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/CaaRecordSemanticHandler.cs
@@ -1,6 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Semantic validation for <c>caa-record</c> values: &lt;name&gt;,&lt;flags&gt;,&lt;tag&gt;,&lt;value&gt; (RFC6844).
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/CacheRrSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/CacheRrSemanticHandler.cs
similarity index 80%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/CacheRrSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/CacheRrSemanticHandler.cs
index cf8edf9..39ca6d6 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/CacheRrSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/CacheRrSemanticHandler.cs
@@ -1,6 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Semantic validation for <c>cache-rr</c> values: RR-type or comma-separated list (e.g. A,AAAA,TXT or ANY).
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/CnameSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/CnameSemanticHandler.cs
similarity index 85%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/CnameSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/CnameSemanticHandler.cs
index 75cfbf7..9f8183d 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/CnameSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/CnameSemanticHandler.cs
@@ -1,6 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Semantic validation for <c>cname</c> values: &lt;cname&gt;[,&lt;cname&gt;,]&lt;target&gt;[,&lt;TTL&gt;].
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/ConnmarkAllowlistSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/ConnmarkAllowlistSemanticHandler.cs
similarity index 93%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/ConnmarkAllowlistSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/ConnmarkAllowlistSemanticHandler.cs
index 328894d..a097aa6 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/ConnmarkAllowlistSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/ConnmarkAllowlistSemanticHandler.cs
@@ -1,7 +1,8 @@
 using System.Text.RegularExpressions;
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Specialized semantic behavior for <c>connmark-allowlist</c> values.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpBootSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpBootSemanticHandler.cs
similarity index 85%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpBootSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpBootSemanticHandler.cs
index 7a65c7e..38f0c75 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpBootSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpBootSemanticHandler.cs
@@ -1,6 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Conservative semantic validation for <c>dhcp-boot</c> values.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpCircuitidSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpCircuitidSemanticHandler.cs
similarity index 70%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpCircuitidSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpCircuitidSemanticHandler.cs
index 7857779..5c01fc1 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpCircuitidSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpCircuitidSemanticHandler.cs
@@ -1,6 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Semantic validation for <c>dhcp-circuitid</c> values: set:&lt;tag&gt;,&lt;circuit-id&gt; (colon-hex or string).
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpHostSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpHostSemanticHandler.cs
similarity index 92%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpHostSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpHostSemanticHandler.cs
index b1a6c95..18bb386 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpHostSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpHostSemanticHandler.cs
@@ -1,8 +1,10 @@
 using System.Net;
 using System.Text.RegularExpressions;
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Conservative semantic validation for <c>dhcp-host</c> values.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpIgnoreNamesSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpIgnoreNamesSemanticHandler.cs
similarity index 79%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpIgnoreNamesSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpIgnoreNamesSemanticHandler.cs
index 5b70e06..4d99336 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpIgnoreNamesSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpIgnoreNamesSemanticHandler.cs
@@ -1,6 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Semantic validation for <c>dhcp-ignore-names</c> values.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpIgnoreSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpIgnoreSemanticHandler.cs
similarity index 79%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpIgnoreSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpIgnoreSemanticHandler.cs
index 9f2da99..2ce8cb5 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpIgnoreSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpIgnoreSemanticHandler.cs
@@ -1,6 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Semantic validation for <c>dhcp-ignore</c> values.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpMacSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpMacSemanticHandler.cs
similarity index 88%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpMacSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpMacSemanticHandler.cs
index 86aee93..ee3fea7 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpMacSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpMacSemanticHandler.cs
@@ -1,7 +1,8 @@
 using System.Text.RegularExpressions;
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Specialized semantic behavior for <c>dhcp-mac</c> values.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpMatchSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpMatchSemanticHandler.cs
similarity index 82%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpMatchSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpMatchSemanticHandler.cs
index c3db8c9..0739322 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpMatchSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpMatchSemanticHandler.cs
@@ -1,6 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Conservative semantic behavior for <c>dhcp-match</c> values.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpNameMatchSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpNameMatchSemanticHandler.cs
similarity index 83%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpNameMatchSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpNameMatchSemanticHandler.cs
index d27232f..12cbbc2 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpNameMatchSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpNameMatchSemanticHandler.cs
@@ -1,6 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Semantic validation for <c>dhcp-name-match</c> values.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpOptionPxeSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpOptionPxeSemanticHandler.cs
similarity index 84%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpOptionPxeSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpOptionPxeSemanticHandler.cs
index 9b88f43..f13b136 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpOptionPxeSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpOptionPxeSemanticHandler.cs
@@ -1,6 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Semantic validation for <c>dhcp-option-pxe</c> values.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpOptionSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpOptionSemanticHandler.cs
similarity index 85%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpOptionSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpOptionSemanticHandler.cs
index 7f09769..ae7265a 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpOptionSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpOptionSemanticHandler.cs
@@ -1,6 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Conservative semantic validation for <c>dhcp-option</c> and <c>dhcp-option-force</c> values.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpProxySemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpProxySemanticHandler.cs
similarity index 80%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpProxySemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpProxySemanticHandler.cs
index 14aa593..f219401 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpProxySemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpProxySemanticHandler.cs
@@ -1,6 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Specialized semantic behavior for <c>dhcp-proxy</c> values.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpRangeSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpRangeSemanticHandler.cs
similarity index 75%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpRangeSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpRangeSemanticHandler.cs
index 4cd835e..33c60e9 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpRangeSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpRangeSemanticHandler.cs
@@ -1,6 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Specialized semantic behavior for <c>dhcp-range</c> values.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpRelaySemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpRelaySemanticHandler.cs
similarity index 86%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpRelaySemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpRelaySemanticHandler.cs
index 803b4e8..8c518fb 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpRelaySemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpRelaySemanticHandler.cs
@@ -1,6 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Specialized semantic behavior for <c>dhcp-relay</c> values.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpRemoteidSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpRemoteidSemanticHandler.cs
similarity index 70%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpRemoteidSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpRemoteidSemanticHandler.cs
index d8229bd..cb2e928 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpRemoteidSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpRemoteidSemanticHandler.cs
@@ -1,6 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Semantic validation for <c>dhcp-remoteid</c> values: set:&lt;tag&gt;,&lt;remote-id&gt; (colon-hex or string).
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpSubscridSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpSubscrIdSemanticHandler.cs
similarity index 62%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpSubscridSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpSubscrIdSemanticHandler.cs
index 3d4f5ed..799535c 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpSubscridSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpSubscrIdSemanticHandler.cs
@@ -1,11 +1,13 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Semantic validation for <c>dhcp-subscrid</c> values: set:&lt;tag&gt;,&lt;subscriber-id&gt; (RFC3993).
 /// </summary>
-public sealed class DhcpSubscridSemanticHandler : IOptionSemanticHandler
+public sealed class DhcpSubscrIdSemanticHandler : IOptionSemanticHandler
 {
     public bool CanHandle(string optionName) => optionName == DnsmasqConfKeys.DhcpSubscrid;
 
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpUserclassSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpUserclassSemanticHandler.cs
similarity index 79%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpUserclassSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpUserclassSemanticHandler.cs
index 8774963..704214a 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpUserclassSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpUserclassSemanticHandler.cs
@@ -1,6 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Semantic validation for <c>dhcp-userclass</c> values.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpVendorclassSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpVendorclassSemanticHandler.cs
similarity index 85%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpVendorclassSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpVendorclassSemanticHandler.cs
index 0ccc694..4f6f78e 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DhcpVendorclassSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DhcpVendorclassSemanticHandler.cs
@@ -1,6 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Semantic validation for <c>dhcp-vendorclass</c> values.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DnsRrSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DnsRrSemanticHandler.cs
similarity index 86%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DnsRrSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DnsRrSemanticHandler.cs
index 67bf863..96b05b8 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DnsRrSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DnsRrSemanticHandler.cs
@@ -1,7 +1,9 @@
 using System.Globalization;
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Semantic validation for <c>dns-rr</c> values: &lt;name&gt;,&lt;RR-number&gt;,[&lt;hex data&gt;].
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DomainSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DomainSemanticHandler.cs
similarity index 87%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DomainSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DomainSemanticHandler.cs
index 4735c3a..f85a85f 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DomainSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DomainSemanticHandler.cs
@@ -1,7 +1,9 @@
 using System.Net;
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Semantic validation for <c>domain</c> (DHCP/DNS) values: &lt;domain&gt;[[,&lt;address range&gt;[,local]]|&lt;interface&gt;].
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DynamicHostSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DynamicHostSemanticHandler.cs
similarity index 87%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DynamicHostSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DynamicHostSemanticHandler.cs
index 5a94f06..ac861d9 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/DynamicHostSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/DynamicHostSemanticHandler.cs
@@ -1,7 +1,9 @@
 using System.Net;
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Semantic validation for <c>dynamic-host</c> values: &lt;name&gt;,[IPv4],[IPv6],&lt;interface&gt; (dnsmasq man).
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/FilterRrSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/FilterRrSemanticHandler.cs
similarity index 80%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/FilterRrSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/FilterRrSemanticHandler.cs
index 40f701c..749e791 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/FilterRrSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/FilterRrSemanticHandler.cs
@@ -1,6 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Semantic validation for <c>filter-rr</c> values: RR-type or comma-separated list (e.g. A,AAAA,TXT or ANY).
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/HostRecordSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/HostRecordSemanticHandler.cs
similarity index 87%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/HostRecordSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/HostRecordSemanticHandler.cs
index c3a45ee..0cb1299 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/HostRecordSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/HostRecordSemanticHandler.cs
@@ -1,7 +1,9 @@
 using System.Net;
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Semantic validation for <c>host-record</c> values: &lt;name&gt;[,&lt;name&gt;...],[&lt;IPv4&gt;],[&lt;IPv6&gt;][,&lt;TTL&gt;].
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/IgnoreAddressSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/IgnoreAddressSemanticHandler.cs
similarity index 75%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/IgnoreAddressSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/IgnoreAddressSemanticHandler.cs
index 1fdd8e7..1fffba6 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/IgnoreAddressSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/IgnoreAddressSemanticHandler.cs
@@ -1,7 +1,9 @@
 using System.Net;
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Specialized semantic behavior for <c>ignore-address</c> values.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/InterfaceNameRecordSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/InterfaceNameRecordSemanticHandler.cs
similarity index 85%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/InterfaceNameRecordSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/InterfaceNameRecordSemanticHandler.cs
index 91bab35..51d2940 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/InterfaceNameRecordSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/InterfaceNameRecordSemanticHandler.cs
@@ -1,6 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Semantic validation for <c>interface-name</c> (DNS record) values: &lt;name&gt;,&lt;interface&gt;[/4|/6].
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/InterfaceNameSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/InterfaceNameSemanticHandler.cs
similarity index 83%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/InterfaceNameSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/InterfaceNameSemanticHandler.cs
index 445068f..6bf1410 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/InterfaceNameSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/InterfaceNameSemanticHandler.cs
@@ -1,6 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Semantic validation for interface-name options: <c>interface</c>, <c>except-interface</c>,
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/IpsetSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/IpsetSemanticHandler.cs
similarity index 84%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/IpsetSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/IpsetSemanticHandler.cs
index fa4bf01..17906ba 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/IpsetSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/IpsetSemanticHandler.cs
@@ -1,6 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Specialized semantic behavior for <c>ipset</c> values.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/LeasequerySemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/LeasequerySemanticHandler.cs
similarity index 84%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/LeasequerySemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/LeasequerySemanticHandler.cs
index ea61507..d19f409 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/LeasequerySemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/LeasequerySemanticHandler.cs
@@ -1,7 +1,8 @@
 using System.Net;
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Specialized semantic behavior for <c>leasequery</c> values.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/LocalSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/LocalSemanticHandler.cs
similarity index 83%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/LocalSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/LocalSemanticHandler.cs
index 206eacd..c0f48ad 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/LocalSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/LocalSemanticHandler.cs
@@ -1,6 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Specialized semantic behavior for <c>local</c> values.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/MxHostSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/MxHostSemanticHandler.cs
similarity index 88%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/MxHostSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/MxHostSemanticHandler.cs
index 0a7cacc..cd7327a 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/MxHostSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/MxHostSemanticHandler.cs
@@ -1,6 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Semantic validation for <c>mx-host</c> values: &lt;mx name&gt;[[,&lt;hostname&gt;],&lt;preference&gt;].
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/NaptrRecordSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/NaptrRecordSemanticHandler.cs
similarity index 85%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/NaptrRecordSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/NaptrRecordSemanticHandler.cs
index af7b29a..ca51dd0 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/NaptrRecordSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/NaptrRecordSemanticHandler.cs
@@ -1,6 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Semantic validation for <c>naptr-record</c> values: &lt;name&gt;,&lt;order&gt;,&lt;preference&gt;,&lt;flags&gt;,&lt;service&gt;,&lt;regexp&gt;[,&lt;replacement&gt;] (RFC3403).
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/NftsetSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/NftsetSemanticHandler.cs
similarity index 88%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/NftsetSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/NftsetSemanticHandler.cs
index 32ef74c..56af0b0 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/NftsetSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/NftsetSemanticHandler.cs
@@ -1,6 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Specialized semantic behavior for <c>nftset</c> values.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/PtrRecordSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/PtrRecordSemanticHandler.cs
similarity index 83%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/PtrRecordSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/PtrRecordSemanticHandler.cs
index c950263..74d1212 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/PtrRecordSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/PtrRecordSemanticHandler.cs
@@ -1,6 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Semantic validation for <c>ptr-record</c> values: &lt;name&gt;[,&lt;target&gt;].
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/PxeServiceSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/PxeServiceSemanticHandler.cs
similarity index 91%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/PxeServiceSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/PxeServiceSemanticHandler.cs
index 938aaea..14435a3 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/PxeServiceSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/PxeServiceSemanticHandler.cs
@@ -1,6 +1,7 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Conservative semantic behavior for <c>pxe-service</c> values.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/RaParamSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/RaParamSemanticHandler.cs
similarity index 90%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/RaParamSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/RaParamSemanticHandler.cs
index f690ecd..4634e71 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/RaParamSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/RaParamSemanticHandler.cs
@@ -1,6 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Specialized semantic behavior for <c>ra-param</c> values.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/RebindDomainOkSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/RebindDomainOkSemanticHandler.cs
similarity index 85%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/RebindDomainOkSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/RebindDomainOkSemanticHandler.cs
index 31dcf00..d20bf54 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/RebindDomainOkSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/RebindDomainOkSemanticHandler.cs
@@ -1,6 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Semantic validation for <c>rebind-domain-ok</c> values.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/RevServerSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/RevServerSemanticHandler.cs
similarity index 91%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/RevServerSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/RevServerSemanticHandler.cs
index e690414..b940911 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/RevServerSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/RevServerSemanticHandler.cs
@@ -1,7 +1,8 @@
 using System.Net;
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Specialized semantic behavior for <c>rev-server</c> values.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/ServerSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/ServerSemanticHandler.cs
similarity index 94%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/ServerSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/ServerSemanticHandler.cs
index 6904965..7b19785 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/ServerSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/ServerSemanticHandler.cs
@@ -2,9 +2,11 @@ using System.Linq;
 using System.Net;
 using System.Net.Sockets;
 using System.Text.RegularExpressions;
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Specialized semantic behavior for <c>server</c> values.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/SharedNetworkSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/SharedNetworkSemanticHandler.cs
similarity index 79%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/SharedNetworkSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/SharedNetworkSemanticHandler.cs
index a290e0e..d87f6c0 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/SharedNetworkSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/SharedNetworkSemanticHandler.cs
@@ -1,6 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Conservative semantic validation for <c>shared-network</c> values.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/SlaacSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/SlaacSemanticHandler.cs
similarity index 86%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/SlaacSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/SlaacSemanticHandler.cs
index d5c5cfa..7ed2785 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/SlaacSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/SlaacSemanticHandler.cs
@@ -1,7 +1,9 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
 using System.Net;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Conservative semantic validation for <c>slaac</c> values.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/SrvHostSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/SrvSemanticHandler.cs
similarity index 85%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/SrvHostSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/SrvSemanticHandler.cs
index f586981..d622bd3 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/SrvHostSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/SrvSemanticHandler.cs
@@ -1,12 +1,14 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Semantic validation for <c>srv-host</c> values: &lt;_service&gt;.&lt;_prot&gt;[.&lt;domain&gt;],[&lt;target&gt;[,&lt;port&gt;[,&lt;priority&gt;[,&lt;weight&gt;]]]].
 /// Service name required; optional target, port (0-65535), priority, weight.
 /// </summary>
-public sealed class SrvHostSemanticHandler : IOptionSemanticHandler
+public sealed class SrvSemanticHandler : IOptionSemanticHandler
 {
     public bool CanHandle(string optionName) => optionName == DnsmasqConfKeys.Srv;
 
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/SynthDomainSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/SynthDomainSemanticHandler.cs
similarity index 82%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/SynthDomainSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/SynthDomainSemanticHandler.cs
index 9efb8df..066352e 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/SynthDomainSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/SynthDomainSemanticHandler.cs
@@ -1,6 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Semantic validation for <c>synth-domain</c> values: &lt;domain&gt;,&lt;address range&gt;[,&lt;prefix&gt;[*]].
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/TagIfSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/TagIfSemanticHandler.cs
similarity index 83%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/TagIfSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/TagIfSemanticHandler.cs
index 76ea251..e7bb90b 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/TagIfSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/TagIfSemanticHandler.cs
@@ -1,6 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Semantic validation for <c>tag-if</c> values.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/TrustAnchorSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/TrustAnchorSemanticHandler.cs
similarity index 91%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/TrustAnchorSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/TrustAnchorSemanticHandler.cs
index 859d0dc..fa00362 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/TrustAnchorSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/TrustAnchorSemanticHandler.cs
@@ -1,6 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Specialized semantic behavior for <c>trust-anchor</c> values.
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/TxtRecordSemanticHandler.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/TxtRecordSemanticHandler.cs
similarity index 80%
rename from src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/TxtRecordSemanticHandler.cs
rename to src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/TxtRecordSemanticHandler.cs
index 74ce254..152212c 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/TxtRecordSemanticHandler.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/Handlers/TxtRecordSemanticHandler.cs
@@ -1,6 +1,8 @@
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
+using DnsmasqWebUI.Infrastructure.Serialization.Parsers.EffectiveConfig;
 
-namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
+namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Handlers;
 
 /// <summary>
 /// Semantic validation for <c>txt-record</c> values: &lt;name&gt;[[,&lt;text&gt;],&lt;text&gt;].
diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/OptionSemanticValidator.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/OptionSemanticValidator.cs
index 6d9c253..56feb10 100644
--- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/OptionSemanticValidator.cs
+++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/Validation/OptionSemanticValidator.cs
@@ -1,6 +1,7 @@
 using System.Net;
 using System.Net.Sockets;
-using DnsmasqWebUI.Infrastructure.Helpers.Config;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Metadata;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
 using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;
 
 namespace DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
diff --git a/src/DnsmasqWebUI/Models/Dnsmasq/EffectiveConfig/EffectiveMultiValueConfigFieldDescriptor.cs b/src/DnsmasqWebUI/Models/Dnsmasq/EffectiveConfig/EffectiveMultiValueConfigFieldDescriptor.cs
index cf63afe..627852f 100644
--- a/src/DnsmasqWebUI/Models/Dnsmasq/EffectiveConfig/EffectiveMultiValueConfigFieldDescriptor.cs
+++ b/src/DnsmasqWebUI/Models/Dnsmasq/EffectiveConfig/EffectiveMultiValueConfigFieldDescriptor.cs
@@ -1,5 +1,6 @@
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Editing.Abstractions;
+using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation.Abstractions;
 using DnsmasqWebUI.Models.Dnsmasq;
-using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Validation;
 
 namespace DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig;