diff --git a/src/SeqCli/Cli/Commands/Forwarder/InstallCommand.cs b/src/SeqCli/Cli/Commands/Forwarder/InstallCommand.cs
index 3eeda939..a598b87f 100644
--- a/src/SeqCli/Cli/Commands/Forwarder/InstallCommand.cs
+++ b/src/SeqCli/Cli/Commands/Forwarder/InstallCommand.cs
@@ -22,12 +22,14 @@
 using System.ServiceProcess;
 using System.Threading.Tasks;
 using Seq.Forwarder.Cli.Features;
-using Seq.Forwarder.Config;
 using Seq.Forwarder.ServiceProcess;
 using Seq.Forwarder.Util;
 using SeqCli;
 using SeqCli.Cli;
 using SeqCli.Cli.Features;
+using SeqCli.Config;
+using SeqCli.Config.Forwarder;
+using SeqCli.Forwarder.Util;
 
 // ReSharper disable once ClassNeverInstantiated.Global
 
@@ -181,12 +183,12 @@ void Install()
                 throw new ArgumentException("Seq requires a local (or SAN) storage location; network shares are not supported.");
 
             Console.WriteLine($"Updating the configuration in {_storagePath.ConfigFilePath}...");
-            var config = SeqForwarderConfig.ReadOrInit(_storagePath.ConfigFilePath);
+            var config = SeqCliConfig.Read();
             
             if (!string.IsNullOrEmpty(_listenUri.ListenUri))
             {
-                config.Api.ListenUri = _listenUri.ListenUri;
-                SeqForwarderConfig.Write(_storagePath.ConfigFilePath, config);
+                config.Forwarder.Api.ListenUri = _listenUri.ListenUri;
+                SeqCliConfig.Write(config);
             }
 
             if (_serviceCredentials.IsUsernameSpecified)
@@ -203,10 +205,10 @@ void Install()
             Console.WriteLine($"Granting {ServiceUsername} rights to {_storagePath.StorageRootPath}...");
             GiveFullControl(_storagePath.StorageRootPath);
 
-            Console.WriteLine($"Granting {ServiceUsername} rights to {config.Diagnostics.InternalLogPath}...");
-            GiveFullControl(config.Diagnostics.InternalLogPath);
+            Console.WriteLine($"Granting {ServiceUsername} rights to {config.Forwarder.Diagnostics.InternalLogPath}...");
+            GiveFullControl(config.Forwarder.Diagnostics.InternalLogPath);
 
-            var listenUri = MakeListenUriReservationPattern(config.Api.ListenUri);
+            var listenUri = MakeListenUriReservationPattern(config.Forwarder.Api.ListenUri);
             Console.WriteLine($"Adding URL reservation at {listenUri} for {ServiceUsername}...");
             var netshResult = CaptiveProcess.Run("netsh", $"http add urlacl url={listenUri} user=\"{ServiceUsername}\"", Console.WriteLine, Console.WriteLine);
             if (netshResult != 0)
diff --git a/src/SeqCli/Cli/Commands/Forwarder/RunCommand.cs b/src/SeqCli/Cli/Commands/Forwarder/RunCommand.cs
index 3c94225e..df5e1b84 100644
--- a/src/SeqCli/Cli/Commands/Forwarder/RunCommand.cs
+++ b/src/SeqCli/Cli/Commands/Forwarder/RunCommand.cs
@@ -16,11 +16,13 @@
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Net;
+using System.Security.Cryptography.X509Certificates;
 using System.Threading.Tasks;
 using Autofac;
 using Autofac.Extensions.DependencyInjection;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
+using Seq.Forwarder.ServiceProcess;
 using SeqCli.Cli.Features;
 using SeqCli.Config;
 using SeqCli.Config.Forwarder;
@@ -169,7 +171,7 @@ static int RunService(ServerService service)
     {
 #if WINDOWS
             System.ServiceProcess.ServiceBase.Run([
-                new ServiceProcess.SeqForwarderWindowsService(service)
+                new SeqForwarderWindowsService(service)
             ]);
             return 0;
 #else
diff --git a/src/SeqCli/Cli/Commands/Forwarder/UninstallCommand.cs b/src/SeqCli/Cli/Commands/Forwarder/UninstallCommand.cs
index b9a55efa..c823a04c 100644
--- a/src/SeqCli/Cli/Commands/Forwarder/UninstallCommand.cs
+++ b/src/SeqCli/Cli/Commands/Forwarder/UninstallCommand.cs
@@ -20,6 +20,7 @@
 using Seq.Forwarder.ServiceProcess;
 using Seq.Forwarder.Util;
 using SeqCli.Cli;
+using SeqCli.Forwarder.Util;
 
 namespace Seq.Forwarder.Cli.Commands
 {
diff --git a/src/SeqCli/Forwarder/Cryptography/DpapiMachineScopeDataProtection.cs b/src/SeqCli/Forwarder/Cryptography/DpapiMachineScopeDataProtection.cs
index 635bb415..2eb74421 100644
--- a/src/SeqCli/Forwarder/Cryptography/DpapiMachineScopeDataProtection.cs
+++ b/src/SeqCli/Forwarder/Cryptography/DpapiMachineScopeDataProtection.cs
@@ -18,6 +18,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Security.Cryptography;
 using System.Text;
+using SeqCli.Forwarder.Cryptography;
 
 namespace Seq.Forwarder.Cryptography
 {
diff --git a/src/SeqCli/Forwarder/Cryptography/StringDataProtector.cs b/src/SeqCli/Forwarder/Cryptography/StringDataProtector.cs
index e35ef0b7..97c46021 100644
--- a/src/SeqCli/Forwarder/Cryptography/StringDataProtector.cs
+++ b/src/SeqCli/Forwarder/Cryptography/StringDataProtector.cs
@@ -1,4 +1,6 @@
-namespace SeqCli.Forwarder.Cryptography;
+using Seq.Forwarder.Cryptography;
+
+namespace SeqCli.Forwarder.Cryptography;
 
 static class StringDataProtector
 {
diff --git a/src/SeqCli/Forwarder/ServiceProcess/SeqForwarderWindowsService.cs b/src/SeqCli/Forwarder/ServiceProcess/SeqForwarderWindowsService.cs
index a77efec1..ec944c8b 100644
--- a/src/SeqCli/Forwarder/ServiceProcess/SeqForwarderWindowsService.cs
+++ b/src/SeqCli/Forwarder/ServiceProcess/SeqForwarderWindowsService.cs
@@ -17,7 +17,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Net;
 using System.ServiceProcess;
-using Seq.Forwarder.Web.Host;
+using SeqCli.Forwarder.Web.Host;
 
 namespace Seq.Forwarder.ServiceProcess
 {
diff --git a/src/SeqCli/Forwarder/Util/ExecutionEnvironment.cs b/src/SeqCli/Forwarder/Util/ExecutionEnvironment.cs
index e0449984..300d77b5 100644
--- a/src/SeqCli/Forwarder/Util/ExecutionEnvironment.cs
+++ b/src/SeqCli/Forwarder/Util/ExecutionEnvironment.cs
@@ -1,4 +1,6 @@
-namespace SeqCli.Forwarder.Util;
+using Seq.Forwarder.Util;
+
+namespace SeqCli.Forwarder.Util;
 
 static class ExecutionEnvironment
 {
diff --git a/src/SeqCli/Forwarder/Util/ServiceConfiguration.cs b/src/SeqCli/Forwarder/Util/ServiceConfiguration.cs
index b15c4775..f1739326 100644
--- a/src/SeqCli/Forwarder/Util/ServiceConfiguration.cs
+++ b/src/SeqCli/Forwarder/Util/ServiceConfiguration.cs
@@ -20,6 +20,7 @@
 using System.Linq;
 using System.ServiceProcess;
 using System.Text;
+using SeqCli.Forwarder.Util;
 
 namespace Seq.Forwarder.Util
 {