WIP

.run/Controller + Agent.run.xml

@@ -1,7 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Controller + Agent" type="CompoundRunConfigurationType">
-    <toRun name="Agent 1" type="DotNetProject" />
-    <toRun name="Controller" type="DotNetProject" />
-    <method v="2" />
-  </configuration>
-</component>

.run/Server + Agent x3.run.xml

@@ -1,9 +1,9 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Controller + Agent x3" type="CompoundRunConfigurationType">
+  <configuration default="false" name="Server + Agent x3" type="CompoundRunConfigurationType">
     <toRun name="Agent 1" type="DotNetProject" />
     <toRun name="Agent 2" type="DotNetProject" />
     <toRun name="Agent 3" type="DotNetProject" />
-    <toRun name="Controller" type="DotNetProject" />
+    <toRun name="Server" type="DotNetProject" />
     <method v="2" />
   </configuration>
-</component>
+</component>

.run/Server + Agent.run.xml

@@ -0,0 +1,7 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Server + Agent" type="CompoundRunConfigurationType">
+    <toRun name="Agent 1" type="DotNetProject" />
+    <toRun name="Server" type="DotNetProject" />
+    <method v="2" />
+  </configuration>
+</component>

Agent/Phantom.Agent.Minecraft/Command/MinecraftCommand.cs

@@ -1,4 +1,4 @@
-namespace Phantom.Agent.Minecraft.Command;
+namespace Phantom.Agent.Minecraft.Command; 
 
 public static class MinecraftCommand {
 	public const string SaveOn = "save-on";

Agent/Phantom.Agent.Minecraft/Instance/InstanceProcess.cs

@@ -1,7 +1,7 @@
 using Phantom.Utils.Collections;
 using Phantom.Utils.Processes;
 
-namespace Phantom.Agent.Minecraft.Instance;
+namespace Phantom.Agent.Minecraft.Instance; 
 
 public sealed class InstanceProcess : IDisposable {
 	public InstanceProperties InstanceProperties { get; }

Agent/Phantom.Agent.Minecraft/Java/JavaRuntimeExecutable.cs

@@ -1,6 +1,6 @@
 using Phantom.Common.Data.Java;
 
-namespace Phantom.Agent.Minecraft.Java;
+namespace Phantom.Agent.Minecraft.Java; 
 
 public sealed class JavaRuntimeExecutable {
 	internal string ExecutablePath { get; }

Agent/Phantom.Agent.Minecraft/Launcher/LaunchServices.cs

@@ -1,6 +1,6 @@
 using Phantom.Agent.Minecraft.Java;
 using Phantom.Agent.Minecraft.Server;
 
-namespace Phantom.Agent.Minecraft.Launcher;
+namespace Phantom.Agent.Minecraft.Launcher; 
 
 public sealed record LaunchServices(MinecraftServerExecutables ServerExecutables, JavaRuntimeRepository JavaRuntimeRepository);

Agent/Phantom.Agent.Minecraft/Launcher/Types/FabricLauncher.cs

@@ -3,7 +3,7 @@ using Phantom.Agent.Minecraft.Instance;
 using Phantom.Utils.IO;
 using Serilog;
 
-namespace Phantom.Agent.Minecraft.Launcher.Types;
+namespace Phantom.Agent.Minecraft.Launcher.Types; 
 
 public sealed class FabricLauncher : BaseLauncher {
 	public FabricLauncher(InstanceProperties instanceProperties) : base(instanceProperties) {}

Agent/Phantom.Agent.Minecraft/Launcher/Types/InvalidLauncher.cs

@@ -1,7 +1,7 @@
 using Phantom.Agent.Minecraft.Server;
 using Serilog;
 
-namespace Phantom.Agent.Minecraft.Launcher.Types;
+namespace Phantom.Agent.Minecraft.Launcher.Types; 
 
 public sealed class InvalidLauncher : IServerLauncher {
 	public static InvalidLauncher Instance { get; } = new ();

Agent/Phantom.Agent.Minecraft/Launcher/Types/VanillaLauncher.cs

@@ -1,6 +1,6 @@
 using Phantom.Agent.Minecraft.Instance;
 
-namespace Phantom.Agent.Minecraft.Launcher.Types;
+namespace Phantom.Agent.Minecraft.Launcher.Types; 
 
 public sealed class VanillaLauncher : BaseLauncher {
 	public VanillaLauncher(InstanceProperties instanceProperties) : base(instanceProperties) {}

Agent/Phantom.Agent.Minecraft/Properties/MinecraftServerProperty.cs

@@ -1,6 +1,6 @@
 using Phantom.Agent.Minecraft.Java;
 
-namespace Phantom.Agent.Minecraft.Properties;
+namespace Phantom.Agent.Minecraft.Properties; 
 
 abstract class MinecraftServerProperty<T> {
 	private readonly string key;

Agent/Phantom.Agent.Minecraft/Server/DownloadProgressEventArgs.cs

@@ -1,4 +1,4 @@
-namespace Phantom.Agent.Minecraft.Server;
+namespace Phantom.Agent.Minecraft.Server; 
 
 public sealed class DownloadProgressEventArgs : EventArgs {
 	public ulong DownloadedBytes { get; }

Agent/Phantom.Agent.Minecraft/Server/MinecraftServerExecutableDownloadListener.cs

@@ -1,3 +1,3 @@
-namespace Phantom.Agent.Minecraft.Server;
+namespace Phantom.Agent.Minecraft.Server; 
 
 sealed record MinecraftServerExecutableDownloadListener(EventHandler<DownloadProgressEventArgs> DownloadProgressEventHandler, CancellationToken CancellationToken);

Agent/Phantom.Agent.Minecraft/Server/ServerStatusProtocol.cs

@@ -6,7 +6,7 @@ using System.Text;
 using Phantom.Common.Logging;
 using Serilog;
 
-namespace Phantom.Agent.Minecraft.Server;
+namespace Phantom.Agent.Minecraft.Server; 
 
 public sealed class ServerStatusProtocol {
 	private readonly ILogger logger;

Agent/Phantom.Agent.Rpc/RpcClientRuntime.cs

@@ -1,43 +0,0 @@
-using NetMQ;
-using NetMQ.Sockets;
-using Phantom.Common.Data.Agent;
-using Phantom.Common.Messages.Agent;
-using Phantom.Common.Messages.Agent.ToController;
-using Phantom.Utils.Rpc;
-using Phantom.Utils.Tasks;
-
-namespace Phantom.Agent.Rpc;
-
-public sealed class RpcClientRuntime : RpcClientRuntime<IMessageToAgentListener, IMessageToControllerListener, RegisterAgentMessage> {
-	public static Task Launch(RpcConfiguration config, AuthToken authToken, AgentInfo agentInfo, Func<RpcConnectionToServer<IMessageToControllerListener>, IMessageToAgentListener> listenerFactory, SemaphoreSlim disconnectSemaphore, CancellationToken receiveCancellationToken) {
-		return new RpcClientRuntime(config, agentInfo.Guid, listenerFactory, new RegisterAgentMessage(authToken, agentInfo), disconnectSemaphore, receiveCancellationToken).Launch();
-	}
-
-	private readonly RpcConfiguration config;
-	private readonly Guid agentGuid;
-
-	private RpcClientRuntime(RpcConfiguration config, Guid agentGuid, Func<RpcConnectionToServer<IMessageToControllerListener>, IMessageToAgentListener> messageListenerFactory, RegisterAgentMessage registerAgentMessage, SemaphoreSlim disconnectSemaphore, CancellationToken receiveCancellationToken) : base(config, AgentMessageRegistries.Definitions, messageListenerFactory, registerAgentMessage, disconnectSemaphore, receiveCancellationToken) {
-		this.config = config;
-		this.agentGuid = agentGuid;
-	}
-
-	protected override void RunWithConnection(ClientSocket socket, RpcConnectionToServer<IMessageToControllerListener> connection, TaskManager taskManager) {
-		ServerMessaging.SetCurrentConnection(connection);
-		
-		var keepAliveLoop = new KeepAliveLoop(connection);
-		try {
-			base.RunWithConnection(socket, connection, taskManager);
-		} finally {
-			keepAliveLoop.Cancel();
-		}
-	}
-
-	protected override async Task Disconnect(ClientSocket socket) {
-		var unregisterMessageBytes = AgentMessageRegistries.ToController.Write(new UnregisterAgentMessage(agentGuid)).ToArray();
-		try {
-			await socket.SendAsync(unregisterMessageBytes).AsTask().WaitAsync(TimeSpan.FromSeconds(5), CancellationToken.None);
-		} catch (TimeoutException) {
-			config.RuntimeLogger.Error("Timed out communicating agent shutdown with the controller.");
-		}
-	}
-}

Agent/Phantom.Agent.Rpc/RpcLauncher.cs

@@ -0,0 +1,107 @@
+using NetMQ;
+using NetMQ.Sockets;
+using Phantom.Common.Data.Agent;
+using Phantom.Common.Messages.Agent;
+using Phantom.Common.Messages.Agent.BiDirectional;
+using Phantom.Common.Messages.Agent.ToController;
+using Phantom.Utils.Rpc;
+using Phantom.Utils.Rpc.Message;
+using Phantom.Utils.Tasks;
+using Serilog;
+using Serilog.Events;
+
+namespace Phantom.Agent.Rpc;
+
+public sealed class RpcLauncher : RpcRuntime<ClientSocket> {
+	public static Task Launch(RpcConfiguration config, AuthToken authToken, AgentInfo agentInfo, Func<RpcConnectionToServer<IMessageToControllerListener>, IMessageToAgentListener> listenerFactory, SemaphoreSlim disconnectSemaphore, CancellationToken receiveCancellationToken) {
+		var socket = new ClientSocket();
+		var options = socket.Options;
+
+		options.CurveServerCertificate = config.ServerCertificate;
+		options.CurveCertificate = new NetMQCertificate();
+		options.HelloMessage = AgentMessageRegistries.ToController.Write(new RegisterAgentMessage(authToken, agentInfo)).ToArray();
+
+		return new RpcLauncher(config, socket, agentInfo.Guid, listenerFactory, disconnectSemaphore, receiveCancellationToken).Launch();
+	}
+
+	private readonly RpcConfiguration config;
+	private readonly Guid agentGuid;
+	private readonly Func<RpcConnectionToServer<IMessageToControllerListener>, IMessageToAgentListener> messageListenerFactory;
+
+	private readonly SemaphoreSlim disconnectSemaphore;
+	private readonly CancellationToken receiveCancellationToken;
+
+	private RpcLauncher(RpcConfiguration config, ClientSocket socket, Guid agentGuid, Func<RpcConnectionToServer<IMessageToControllerListener>, IMessageToAgentListener> messageListenerFactory, SemaphoreSlim disconnectSemaphore, CancellationToken receiveCancellationToken) : base(config, socket) {
+		this.config = config;
+		this.agentGuid = agentGuid;
+		this.messageListenerFactory = messageListenerFactory;
+		this.disconnectSemaphore = disconnectSemaphore;
+		this.receiveCancellationToken = receiveCancellationToken;
+	}
+
+	protected override void Connect(ClientSocket socket) {
+		var logger = config.RuntimeLogger;
+		var url = config.TcpUrl;
+
+		logger.Information("Starting ZeroMQ client and connecting to {Url}...", url);
+		socket.Connect(url);
+		logger.Information("ZeroMQ client ready.");
+	}
+
+	protected override void Run(ClientSocket socket, MessageReplyTracker replyTracker, TaskManager taskManager) {
+		var connection = new RpcConnectionToServer<IMessageToControllerListener>(socket, AgentMessageRegistries.ToController, replyTracker);
+		ServerMessaging.SetCurrentConnection(connection);
+		
+		var logger = config.RuntimeLogger;
+		var handler = new MessageToAgentHandler(messageListenerFactory(connection), logger, taskManager, receiveCancellationToken);
+		var keepAliveLoop = new KeepAliveLoop(connection);
+
+		try {
+			while (!receiveCancellationToken.IsCancellationRequested) {
+				var data = socket.Receive(receiveCancellationToken);
+				
+				LogMessageType(logger, data);
+				
+				if (data.Length > 0) {
+					AgentMessageRegistries.ToAgent.Handle(data, handler);
+				}
+			}
+		} catch (OperationCanceledException) {
+			// Ignore.
+		} finally {
+			logger.Debug("ZeroMQ client stopped receiving messages.");
+
+			disconnectSemaphore.Wait(CancellationToken.None);
+			keepAliveLoop.Cancel();
+		}
+	}
+
+	private static void LogMessageType(ILogger logger, ReadOnlyMemory<byte> data) {
+		if (!logger.IsEnabled(LogEventLevel.Verbose)) {
+			return;
+		}
+
+		if (data.Length > 0 && AgentMessageRegistries.ToAgent.TryGetType(data, out var type)) {
+			logger.Verbose("Received {MessageType} ({Bytes} B) from controller.", type.Name, data.Length);
+		}
+		else {
+			logger.Verbose("Received {Bytes} B message from controller.", data.Length);
+		}
+	}
+
+	protected override async Task Disconnect() {
+		var unregisterTimeoutTask = Task.Delay(TimeSpan.FromSeconds(5), CancellationToken.None);
+		var finishedTask = await Task.WhenAny(ServerMessaging.Send(new UnregisterAgentMessage(agentGuid)), unregisterTimeoutTask);
+		if (finishedTask == unregisterTimeoutTask) {
+			config.RuntimeLogger.Error("Timed out communicating agent shutdown with the controller.");
+		}
+	}
+
+	private sealed class MessageToAgentHandler : MessageHandler<IMessageToAgentListener> {
+		public MessageToAgentHandler(IMessageToAgentListener listener, ILogger logger, TaskManager taskManager, CancellationToken cancellationToken) : base(listener, logger, taskManager, cancellationToken) {}
+		
+		protected override Task SendReply(uint sequenceId, byte[] serializedReply) {
+			return ServerMessaging.Send(new ReplyMessage(sequenceId, serializedReply));
+		}
+	}
+}

Agent/Phantom.Agent.Services/AgentServiceConfiguration.cs

@@ -1,3 +1,3 @@
-namespace Phantom.Agent.Services;
+namespace Phantom.Agent.Services; 
 
 public readonly record struct AgentServiceConfiguration(int MaxConcurrentCompressionTasks);

Agent/Phantom.Agent.Services/Backups/BackupArchiver.cs

@@ -7,7 +7,7 @@ using Phantom.Common.Logging;
 using Phantom.Utils.IO;
 using Serilog;
 
-namespace Phantom.Agent.Services.Backups;
+namespace Phantom.Agent.Services.Backups; 
 
 sealed class BackupArchiver {
 	private readonly string destinationBasePath;

Agent/Phantom.Agent.Services/Backups/BackupCompressor.cs

@@ -2,7 +2,7 @@
 using Phantom.Utils.Processes;
 using Serilog;
 
-namespace Phantom.Agent.Services.Backups;
+namespace Phantom.Agent.Services.Backups; 
 
 static class BackupCompressor {
 	private static ILogger Logger { get; } = PhantomLogger.Create(nameof(BackupCompressor));

Agent/Phantom.Agent.Services/Backups/BackupScheduler.cs

@@ -23,7 +23,7 @@ sealed class BackupScheduler : CancellableBackgroundTask {
 	private readonly ServerStatusProtocol serverStatusProtocol;
 	private readonly ManualResetEventSlim serverOutputWhileWaitingForOnlinePlayers = new ();
 	
-	public event EventHandler<BackupCreationResult>? BackupCompleted;
+	public event EventHandler<BackupCreationResult>? BackupCompleted; 
 
 	public BackupScheduler(TaskManager taskManager, BackupManager backupManager, InstanceProcess process, IInstanceContext context, int serverPort) : base(PhantomLogger.Create<BackupScheduler>(context.ShortName), taskManager, "Backup scheduler for " + context.ShortName) {
 		this.backupManager = backupManager;

Agent/Phantom.Agent.Services/Instances/IInstanceContext.cs

@@ -3,7 +3,7 @@ using Phantom.Agent.Services.Instances.States;
 using Phantom.Common.Data.Instance;
 using Serilog;
 
-namespace Phantom.Agent.Services.Instances;
+namespace Phantom.Agent.Services.Instances; 
 
 interface IInstanceContext {
 	string ShortName { get; }

Agent/Phantom.Agent.Services/Instances/Instance.cs

@@ -27,7 +27,7 @@ sealed class Instance : IAsyncDisposable {
 	private IInstanceState currentState;
 	public bool IsRunning => currentState is not InstanceNotRunningState;
 	
-	public event EventHandler? IsRunningChanged;
+	public event EventHandler? IsRunningChanged; 
 	
 	private readonly InstanceProcedureManager procedureManager;
 

Agent/Phantom.Agent.Services/Instances/InstanceServices.cs

@@ -2,6 +2,6 @@
 using Phantom.Agent.Services.Backups;
 using Phantom.Utils.Tasks;
 
-namespace Phantom.Agent.Services.Instances;
+namespace Phantom.Agent.Services.Instances; 
 
 sealed record InstanceServices(TaskManager TaskManager, PortManager PortManager, BackupManager BackupManager, LaunchServices LaunchServices);

Agent/Phantom.Agent.Services/Instances/Procedures/IInstanceProcedure.cs

@@ -1,6 +1,6 @@
 using Phantom.Agent.Services.Instances.States;
 
-namespace Phantom.Agent.Services.Instances.Procedures;
+namespace Phantom.Agent.Services.Instances.Procedures; 
 
 interface IInstanceProcedure {
 	Task<IInstanceState?> Run(IInstanceContext context, CancellationToken cancellationToken);

Agent/Phantom.Agent.Services/Instances/States/IInstanceState.cs

@@ -1,4 +1,4 @@
-namespace Phantom.Agent.Services.Instances.States;
+namespace Phantom.Agent.Services.Instances.States; 
 
 interface IInstanceState {
 	void Initialize();

Agent/Phantom.Agent.Services/Instances/States/InstanceNotRunningState.cs

@@ -1,4 +1,4 @@
-namespace Phantom.Agent.Services.Instances.States;
+namespace Phantom.Agent.Services.Instances.States; 
 
 sealed class InstanceNotRunningState : IInstanceState {
 	public void Initialize() {}

Agent/Phantom.Agent.Services/Rpc/MessageListener.cs

@@ -41,7 +41,7 @@ public sealed class MessageListener : IMessageToAgentListener {
 			}
 		}
 
-		await connection.Send(new AdvertiseJavaRuntimesMessage(agent.JavaRuntimeRepository.All));
+		await ServerMessaging.Send(new AdvertiseJavaRuntimesMessage(agent.JavaRuntimeRepository.All));
 		await agent.InstanceSessionManager.RefreshAgentStatus();
 		
 		return NoReply.Instance;

Agent/Phantom.Agent/AgentKey.cs

@@ -1,5 +1,4 @@
 using NetMQ;
-using Phantom.Common.Data;
 using Phantom.Common.Data.Agent;
 using Phantom.Common.Logging;
 using Phantom.Utils.Cryptography;

Agent/Phantom.Agent/GuidFile.cs

@@ -3,7 +3,7 @@ using Phantom.Common.Logging;
 using Phantom.Utils.IO;
 using Serilog;
 
-namespace Phantom.Agent;
+namespace Phantom.Agent; 
 
 static class GuidFile {
 	private static ILogger Logger { get; } = PhantomLogger.Create(nameof(GuidFile));

Agent/Phantom.Agent/Program.cs

@@ -58,7 +58,7 @@ try {
 
 	var rpcDisconnectSemaphore = new SemaphoreSlim(0, 1);
 	var rpcConfiguration = new RpcConfiguration(PhantomLogger.Create("Rpc"), PhantomLogger.Create<TaskManager>("Rpc"), controllerHost, controllerPort, controllerCertificate);
-	var rpcTask = RpcClientRuntime.Launch(rpcConfiguration, agentToken, agentInfo, MessageListenerFactory, rpcDisconnectSemaphore, shutdownCancellationToken);
+	var rpcTask = RpcLauncher.Launch(rpcConfiguration, agentToken, agentInfo, MessageListenerFactory, rpcDisconnectSemaphore, shutdownCancellationToken);
 	try {
 		await rpcTask.WaitAsync(shutdownCancellationToken);
 	} finally {

Common/Phantom.Common.Data.Tests/AllowedPortsTests.cs

@@ -1,6 +1,6 @@
 using NUnit.Framework;
 
-namespace Phantom.Common.Data.Tests;
+namespace Phantom.Common.Data.Tests; 
 
 [TestFixture]
 public sealed class AllowedPortsTests {

Common/Phantom.Common.Data.Web/Audit/AuditLogEventType.cs

@@ -1,4 +1,4 @@
-namespace Phantom.Common.Data.Web.AuditLog;
+namespace Phantom.Controller.Database.Enums;
 
 public enum AuditLogEventType {
 	AdministratorUserCreated,
@@ -16,7 +16,7 @@ public enum AuditLogEventType {
 	InstanceCommandExecuted
 }
 
-public static class AuditLogEventTypeExtensions {
+static class AuditLogEventTypeExtensions {
 	private static readonly Dictionary<AuditLogEventType, AuditLogSubjectType> SubjectTypes = new () {
 		{ AuditLogEventType.AdministratorUserCreated,  AuditLogSubjectType.User },
 		{ AuditLogEventType.AdministratorUserModified, AuditLogSubjectType.User },
@@ -41,7 +41,7 @@ public static class AuditLogEventTypeExtensions {
 		}
 	}
 
-	public static AuditLogSubjectType GetSubjectType(this AuditLogEventType type) {
+	internal static AuditLogSubjectType GetSubjectType(this AuditLogEventType type) {
 		return SubjectTypes[type];
 	}
 }

Common/Phantom.Common.Data.Web/Audit/AuditLogItem.cs

@@ -1,5 +1,6 @@
 using System.Text.Json;
+using Phantom.Controller.Database.Enums;
 
-namespace Phantom.Common.Data.Web.AuditLog;
+namespace Phantom.Controller.Services.Audit; 
 
 public sealed record AuditLogItem(DateTime UtcTime, Guid? UserGuid, string? UserName, AuditLogEventType EventType, AuditLogSubjectType SubjectType, string? SubjectId, JsonDocument? Data);

Common/Phantom.Common.Data.Web/Audit/AuditLogSubjectType.cs

@@ -1,4 +1,4 @@
-namespace Phantom.Common.Data.Web.AuditLog;
+namespace Phantom.Controller.Database.Enums; 
 
 public enum AuditLogSubjectType {
 	User,

Common/Phantom.Common.Data.Web/EventLog/EventLogSubjectType.cs

@@ -1,5 +0,0 @@
-namespace Phantom.Common.Data.Web.EventLog;
-
-public enum EventLogSubjectType {
-	Instance
-}

Common/Phantom.Common.Data.Web/Users/AddRoleError.cs

@@ -1,4 +1,4 @@
-namespace Phantom.Common.Data.Web.Users;
+namespace Phantom.Controller.Services.Users.Roles; 
 
 public enum AddRoleError : byte {
 	NameIsEmpty,

Common/Phantom.Common.Data.Web/Users/AddUserError.cs

@@ -1,28 +1,25 @@
 using System.Collections.Immutable;
 using MemoryPack;
-using Phantom.Common.Data.Web.Users.AddUserErrors;
 
-namespace Phantom.Common.Data.Web.Users {
-	[MemoryPackable]
-	[MemoryPackUnion(0, typeof(NameIsInvalid))]
-	[MemoryPackUnion(1, typeof(PasswordIsInvalid))]
-	[MemoryPackUnion(2, typeof(NameAlreadyExists))]
-	[MemoryPackUnion(3, typeof(UnknownError))]
-	public abstract partial record AddUserError {
-		internal AddUserError() {}
-	}
-}
-
-namespace Phantom.Common.Data.Web.Users.AddUserErrors {
-	[MemoryPackable(GenerateType.VersionTolerant)]
-	public sealed partial record NameIsInvalid([property: MemoryPackOrder(0)] UsernameRequirementViolation Violation) : AddUserError;
-
-	[MemoryPackable(GenerateType.VersionTolerant)]
-	public sealed partial record PasswordIsInvalid([property: MemoryPackOrder(0)] ImmutableArray<PasswordRequirementViolation> Violations) : AddUserError;
-
-	[MemoryPackable(GenerateType.VersionTolerant)]
-	public sealed partial record NameAlreadyExists : AddUserError;
-
-	[MemoryPackable(GenerateType.VersionTolerant)]
-	public sealed partial record UnknownError : AddUserError;
+namespace Phantom.Common.Data.Web.Users;
+
+[MemoryPackable]
+[MemoryPackUnion(0, typeof(NameIsInvalid))]
+[MemoryPackUnion(1, typeof(PasswordIsInvalid))]
+[MemoryPackUnion(2, typeof(NameAlreadyExists))]
+[MemoryPackUnion(3, typeof(UnknownError))]
+public abstract record AddUserError {
+	private AddUserError() {}
+
+	[MemoryPackable(GenerateType.VersionTolerant)]
+	public sealed record NameIsInvalid([property: MemoryPackOrder(0)] UsernameRequirementViolation Violation) : AddUserError;
+
+	[MemoryPackable(GenerateType.VersionTolerant)]
+	public sealed record PasswordIsInvalid([property: MemoryPackOrder(0)] ImmutableArray<PasswordRequirementViolation> Violations) : AddUserError;
+
+	[MemoryPackable(GenerateType.VersionTolerant)]
+	public sealed record NameAlreadyExists : AddUserError;
+
+	[MemoryPackable(GenerateType.VersionTolerant)]
+	public sealed record UnknownError : AddUserError;
 }

Common/Phantom.Common.Data.Web/Users/CreateOrUpdateAdministratorUserResult.cs

@@ -1,19 +1,16 @@
 using MemoryPack;
-using Phantom.Common.Data.Web.Users.CreateOrUpdateAdministratorUserResults;
 
-namespace Phantom.Common.Data.Web.Users {
-	[MemoryPackable]
-	[MemoryPackUnion(0, typeof(Success))]
-	[MemoryPackUnion(1, typeof(CreationFailed))]
-	[MemoryPackUnion(2, typeof(UpdatingFailed))]
-	[MemoryPackUnion(3, typeof(AddingToRoleFailed))]
-	[MemoryPackUnion(4, typeof(UnknownError))]
-	public abstract partial record CreateOrUpdateAdministratorUserResult {
-		internal CreateOrUpdateAdministratorUserResult() {}
-	}
-}
+namespace Phantom.Common.Data.Web.Users;
+
+[MemoryPackable]
+[MemoryPackUnion(0, typeof(Success))]
+[MemoryPackUnion(1, typeof(CreationFailed))]
+[MemoryPackUnion(2, typeof(UpdatingFailed))]
+[MemoryPackUnion(3, typeof(AddingToRoleFailed))]
+[MemoryPackUnion(4, typeof(UnknownError))]
+public abstract partial record CreateOrUpdateAdministratorUserResult {
+	private CreateOrUpdateAdministratorUserResult() {}
 
-namespace Phantom.Common.Data.Web.Users.CreateOrUpdateAdministratorUserResults {
 	[MemoryPackable(GenerateType.VersionTolerant)]
 	public sealed partial record Success([property: MemoryPackOrder(0)] UserInfo User) : CreateOrUpdateAdministratorUserResult;
 
@@ -22,10 +19,10 @@ namespace Phantom.Common.Data.Web.Users.CreateOrUpdateAdministratorUserResults {
 
 	[MemoryPackable(GenerateType.VersionTolerant)]
 	public sealed partial record UpdatingFailed([property: MemoryPackOrder(0)] SetUserPasswordError Error) : CreateOrUpdateAdministratorUserResult;
-
+	
 	[MemoryPackable(GenerateType.VersionTolerant)]
 	public sealed partial record AddingToRoleFailed : CreateOrUpdateAdministratorUserResult;
-
+	
 	[MemoryPackable(GenerateType.VersionTolerant)]
 	public sealed partial record UnknownError : CreateOrUpdateAdministratorUserResult;
 }

Common/Phantom.Common.Data.Web/Users/DeleteUserResult.cs

@@ -1,4 +1,4 @@
-namespace Phantom.Common.Data.Web.Users;
+namespace Phantom.Common.Data.Web.Users; 
 
 public enum DeleteUserResult : byte {
 	Deleted,

Common/Phantom.Common.Data.Web/Users/IdentityPermissions.cs

@@ -1,6 +1,6 @@
 using System.Collections.Immutable;
 
-namespace Phantom.Common.Data.Web.Users;
+namespace Phantom.Common.Data.Web.Users.Permissions; 
 
 public sealed class IdentityPermissions {
 	public static IdentityPermissions None { get; } = new (ImmutableHashSet<string>.Empty);

Common/Phantom.Common.Data.Web/Users/PasswordRequirementViolation.cs

@@ -1,27 +1,24 @@
 using MemoryPack;
-using Phantom.Common.Data.Web.Users.PasswordRequirementViolations;
 
-namespace Phantom.Common.Data.Web.Users {
-	[MemoryPackable]
-	[MemoryPackUnion(0, typeof(TooShort))]
-	[MemoryPackUnion(1, typeof(MustContainLowercaseLetter))]
-	[MemoryPackUnion(2, typeof(MustContainUppercaseLetter))]
-	[MemoryPackUnion(3, typeof(MustContainDigit))]
-	public abstract partial record PasswordRequirementViolation {
-		internal PasswordRequirementViolation() {}
-	}
-}
-
-namespace Phantom.Common.Data.Web.Users.PasswordRequirementViolations {
-	[MemoryPackable(GenerateType.VersionTolerant)]
-	public sealed partial record TooShort([property: MemoryPackOrder(0)] int MinimumLength) : PasswordRequirementViolation;
-
-	[MemoryPackable(GenerateType.VersionTolerant)]
-	public sealed partial record MustContainLowercaseLetter : PasswordRequirementViolation;
-
-	[MemoryPackable(GenerateType.VersionTolerant)]
-	public sealed partial record MustContainUppercaseLetter : PasswordRequirementViolation;
-
-	[MemoryPackable(GenerateType.VersionTolerant)]
-	public sealed partial record MustContainDigit : PasswordRequirementViolation;
+namespace Phantom.Common.Data.Web.Users;
+
+[MemoryPackable]
+[MemoryPackUnion(0, typeof(TooShort))]
+[MemoryPackUnion(1, typeof(LowercaseLetterRequired))]
+[MemoryPackUnion(2, typeof(UppercaseLetterRequired))]
+[MemoryPackUnion(3, typeof(DigitRequired))]
+public abstract record PasswordRequirementViolation {
+	private PasswordRequirementViolation() {}
+
+	[MemoryPackable(GenerateType.VersionTolerant)]
+	public sealed record TooShort([property: MemoryPackOrder(0)] int MinimumLength) : PasswordRequirementViolation;
+
+	[MemoryPackable(GenerateType.VersionTolerant)]
+	public sealed record LowercaseLetterRequired : PasswordRequirementViolation;
+
+	[MemoryPackable(GenerateType.VersionTolerant)]
+	public sealed record UppercaseLetterRequired : PasswordRequirementViolation;
+
+	[MemoryPackable(GenerateType.VersionTolerant)]
+	public sealed record DigitRequired : PasswordRequirementViolation;
 }

Common/Phantom.Common.Data.Web/Users/Permission.cs

@@ -1,4 +1,4 @@
-namespace Phantom.Common.Data.Web.Users;
+namespace Phantom.Common.Data.Web.Users.Permissions;
 
 public sealed record Permission(string Id, Permission? Parent) {
 	private static readonly List<Permission> AllPermissions = new ();

Common/Phantom.Common.Data.Web/Users/RoleInfo.cs

@@ -1,6 +1,6 @@
 using MemoryPack;
 
-namespace Phantom.Common.Data.Web.Users;
+namespace Phantom.Common.Data.Web.Users; 
 
 [MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record RoleInfo(

Common/Phantom.Common.Data.Web/Users/SetUserPasswordError.cs

@@ -1,24 +1,21 @@
 using System.Collections.Immutable;
 using MemoryPack;
-using Phantom.Common.Data.Web.Users.SetUserPasswordErrors;
 
-namespace Phantom.Common.Data.Web.Users {
-	[MemoryPackable]
-	[MemoryPackUnion(0, typeof(UserNotFound))]
-	[MemoryPackUnion(1, typeof(PasswordIsInvalid))]
-	[MemoryPackUnion(2, typeof(UnknownError))]
-	public abstract partial record SetUserPasswordError {
-		internal SetUserPasswordError() {}
-	}
-}
-
-namespace Phantom.Common.Data.Web.Users.SetUserPasswordErrors {
-	[MemoryPackable(GenerateType.VersionTolerant)]
-	public sealed partial record UserNotFound : SetUserPasswordError;
-
-	[MemoryPackable(GenerateType.VersionTolerant)]
-	public sealed partial record PasswordIsInvalid([property: MemoryPackOrder(0)] ImmutableArray<PasswordRequirementViolation> Violations) : SetUserPasswordError;
-
-	[MemoryPackable(GenerateType.VersionTolerant)]
-	public sealed partial record UnknownError : SetUserPasswordError;
+namespace Phantom.Common.Data.Web.Users;
+
+[MemoryPackable]
+[MemoryPackUnion(0, typeof(UserNotFound))]
+[MemoryPackUnion(1, typeof(PasswordIsInvalid))]
+[MemoryPackUnion(2, typeof(UnknownError))]
+public abstract record SetUserPasswordError {
+	private SetUserPasswordError() {}
+
+	[MemoryPackable(GenerateType.VersionTolerant)]
+	public sealed record UserNotFound : SetUserPasswordError;
+
+	[MemoryPackable(GenerateType.VersionTolerant)]
+	public sealed record PasswordIsInvalid(ImmutableArray<PasswordRequirementViolation> Violations) : SetUserPasswordError;
+	
+	[MemoryPackable(GenerateType.VersionTolerant)]
+	public sealed record UnknownError : SetUserPasswordError;
 }

Common/Phantom.Common.Data.Web/Users/UserPasswords.cs

@@ -1,4 +1,4 @@
-namespace Phantom.Common.Data.Web.Users;
+namespace Phantom.Common.Data.Web.Users; 
 
 public static class UserPasswords {
 	public static string Hash(string password) {

Common/Phantom.Common.Data.Web/Users/UsernameRequirementViolation.cs

@@ -1,19 +1,16 @@
 using MemoryPack;
-using Phantom.Common.Data.Web.Users.UsernameRequirementViolations;
 
-namespace Phantom.Common.Data.Web.Users {
-	[MemoryPackable]
-	[MemoryPackUnion(0, typeof(IsEmpty))]
-	[MemoryPackUnion(1, typeof(TooLong))]
-	public abstract partial record UsernameRequirementViolation {
-		internal UsernameRequirementViolation() {}
-	}
-}
+namespace Phantom.Common.Data.Web.Users;
 
-namespace Phantom.Common.Data.Web.Users.UsernameRequirementViolations {
-	[MemoryPackable(GenerateType.VersionTolerant)]
-	public sealed partial record IsEmpty : UsernameRequirementViolation;
+[MemoryPackable]
+[MemoryPackUnion(0, typeof(IsEmpty))]
+[MemoryPackUnion(1, typeof(TooLong))]
+public abstract record UsernameRequirementViolation {
+	private UsernameRequirementViolation() {}
 
 	[MemoryPackable(GenerateType.VersionTolerant)]
-	public sealed partial record TooLong([property: MemoryPackOrder(0)] int MaxLength) : UsernameRequirementViolation;
+	public sealed record IsEmpty : UsernameRequirementViolation;
+
+	[MemoryPackable(GenerateType.VersionTolerant)]
+	public sealed record TooLong(int MaxLength) : UsernameRequirementViolation;
 }

Common/Phantom.Common.Data/Agent/AuthToken.cs

@@ -2,7 +2,7 @@
 using System.Security.Cryptography;
 using MemoryPack;
 
-namespace Phantom.Common.Data;
+namespace Phantom.Common.Data.Agent;
 
 [MemoryPackable(GenerateType.VersionTolerant)]
 [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]

Common/Phantom.Common.Data/Agent/ConnectionCommonKey.cs

@@ -1,4 +1,4 @@
-namespace Phantom.Common.Data;
+namespace Phantom.Common.Data.Agent;
 
 public readonly record struct ConnectionCommonKey(byte[] CertificatePublicKey, AuthToken AuthToken) {
 	private const byte TokenLength = AuthToken.Length;

Common/Phantom.Common.Data/Instance/IInstanceEventVisitor.cs

@@ -1,4 +1,4 @@
-namespace Phantom.Common.Data.Instance;
+namespace Phantom.Common.Data.Instance; 
 
 public interface IInstanceEventVisitor {
 	void OnLaunchSucceeded(InstanceLaunchSuccededEvent e);

Common/Phantom.Common.Data/Instance/InstanceLaunchProperties.cs

@@ -1,7 +1,7 @@
 using MemoryPack;
 using Phantom.Common.Data.Minecraft;
 
-namespace Phantom.Common.Data.Instance;
+namespace Phantom.Common.Data.Instance; 
 
 [MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record InstanceLaunchProperties(

Common/Phantom.Common.Data/Java/TaggedJavaRuntime.cs

@@ -1,6 +1,6 @@
 using MemoryPack;
 
-namespace Phantom.Common.Data.Java;
+namespace Phantom.Common.Data.Java; 
 
 [MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record TaggedJavaRuntime(

Common/Phantom.Common.Data/Minecraft/FileDownloadInfo.cs

@@ -2,7 +2,7 @@
 using Phantom.Utils.Cryptography;
 using Phantom.Utils.IO;
 
-namespace Phantom.Common.Data.Minecraft;
+namespace Phantom.Common.Data.Minecraft; 
 
 [MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial class FileDownloadInfo {

Common/Phantom.Common.Data/Minecraft/MinecraftServerKind.cs

@@ -1,4 +1,4 @@
-namespace Phantom.Common.Data.Minecraft;
+namespace Phantom.Common.Data.Minecraft; 
 
 public enum MinecraftServerKind : ushort {
 	Vanilla = 1,

Common/Phantom.Common.Data/Minecraft/MinecraftVersion.cs

@@ -1,4 +1,4 @@
-namespace Phantom.Common.Data.Minecraft;
+namespace Phantom.Common.Data.Minecraft; 
 
 public sealed record MinecraftVersion(
 	string Id,

Common/Phantom.Common.Data/Replies/ConfigureInstanceResult.cs

@@ -1,4 +1,4 @@
-namespace Phantom.Common.Data.Replies;
+namespace Phantom.Common.Data.Replies; 
 
 public enum ConfigureInstanceResult : byte {
 	Success

Common/Phantom.Common.Data/Replies/RegisterAgentFailure.cs

@@ -1,4 +1,4 @@
-namespace Phantom.Common.Data.Replies;
+namespace Phantom.Common.Data.Replies; 
 
 public enum RegisterAgentFailure : byte {
 	ConnectionAlreadyHasAnAgent,

Common/Phantom.Common.Logging/DefaultLogLevel.cs

@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Serilog.Events;
 
-namespace Phantom.Common.Logging;
+namespace Phantom.Common.Logging; 
 
 static class DefaultLogLevel {
 	private const string ENVIRONMENT_VARIABLE = "LOG_LEVEL";

Common/Phantom.Common.Logging/LoggerExtensions.cs

@@ -1,6 +1,6 @@
 using Serilog;
 
-namespace Phantom.Common.Logging;
+namespace Phantom.Common.Logging; 
 
 public static class LoggerExtensions {
 	private static readonly string HeadingPadding = new (' ', 23);

Common/Phantom.Common.Messages.Agent/AgentMessageRegistries.cs

@@ -5,7 +5,7 @@ using Phantom.Common.Messages.Agent.ToAgent;
 using Phantom.Common.Messages.Agent.ToController;
 using Phantom.Utils.Rpc.Message;
 
-namespace Phantom.Common.Messages.Agent;
+namespace Phantom.Common.Messages.Agent; 
 
 public static class AgentMessageRegistries {
 	public static MessageRegistry<IMessageToAgentListener> ToAgent { get; } = new (PhantomLogger.Create("MessageRegistry", nameof(ToAgent)));
@@ -34,18 +34,14 @@ public static class AgentMessageRegistries {
 	}
 
 	private sealed class MessageDefinitions : IMessageDefinitions<IMessageToAgentListener, IMessageToControllerListener> {
-		public MessageRegistry<IMessageToAgentListener> ToClient => ToAgent;
-		public MessageRegistry<IMessageToControllerListener> ToServer => ToController;
+		public MessageRegistry<IMessageToAgentListener> Outgoing => ToAgent;
+		public MessageRegistry<IMessageToControllerListener> Incoming => ToController;
 
 		public bool IsRegistrationMessage(Type messageType) {
 			return messageType == typeof(RegisterAgentMessage);
 		}
 
-		public IMessage<IMessageToAgentListener, NoReply> CreateReplyToServerMessage( uint sequenceId, byte[] serializedReply) {
-			return new ReplyMessage(sequenceId, serializedReply);
-		}
-
-		public IMessage<IMessageToControllerListener, NoReply> CreateReplyToClientMessage(uint sequenceId, byte[] serializedReply) {
+		public IMessage<IMessageToAgentListener, NoReply> CreateReplyMessage( uint sequenceId, byte[] serializedReply) {
 			return new ReplyMessage(sequenceId, serializedReply);
 		}
 	}

Common/Phantom.Common.Messages.Agent/IMessageToControllerListener.cs

@@ -2,7 +2,7 @@
 using Phantom.Common.Messages.Agent.ToController;
 using Phantom.Utils.Rpc.Message;
 
-namespace Phantom.Common.Messages.Agent;
+namespace Phantom.Common.Messages.Agent; 
 
 public interface IMessageToControllerListener {
 	Task<NoReply> HandleRegisterAgent(RegisterAgentMessage message);

Common/Phantom.Common.Messages.Agent/ToAgent/LaunchInstanceMessage.cs

@@ -1,7 +1,7 @@
 using MemoryPack;
 using Phantom.Common.Data.Replies;
 
-namespace Phantom.Common.Messages.Agent.ToAgent;
+namespace Phantom.Common.Messages.Agent.ToAgent; 
 
 [MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record LaunchInstanceMessage(

Common/Phantom.Common.Messages.Agent/ToAgent/SendCommandToInstanceMessage.cs

@@ -1,7 +1,7 @@
 using MemoryPack;
 using Phantom.Common.Data.Replies;
 
-namespace Phantom.Common.Messages.Agent.ToAgent;
+namespace Phantom.Common.Messages.Agent.ToAgent; 
 
 [MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record SendCommandToInstanceMessage(

Common/Phantom.Common.Messages.Agent/ToAgent/StopInstanceMessage.cs

@@ -2,7 +2,7 @@
 using Phantom.Common.Data.Minecraft;
 using Phantom.Common.Data.Replies;
 
-namespace Phantom.Common.Messages.Agent.ToAgent;
+namespace Phantom.Common.Messages.Agent.ToAgent; 
 
 [MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record StopInstanceMessage(

Common/Phantom.Common.Messages.Agent/ToController/AdvertiseJavaRuntimesMessage.cs

@@ -3,7 +3,7 @@ using MemoryPack;
 using Phantom.Common.Data.Java;
 using Phantom.Utils.Rpc.Message;
 
-namespace Phantom.Common.Messages.Agent.ToController;
+namespace Phantom.Common.Messages.Agent.ToController; 
 
 [MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record AdvertiseJavaRuntimesMessage(

Common/Phantom.Common.Messages.Agent/ToController/AgentIsAliveMessage.cs

@@ -1,7 +1,7 @@
 using MemoryPack;
 using Phantom.Utils.Rpc.Message;
 
-namespace Phantom.Common.Messages.Agent.ToController;
+namespace Phantom.Common.Messages.Agent.ToController; 
 
 [MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record AgentIsAliveMessage : IMessageToController {

Common/Phantom.Common.Messages.Agent/ToController/RegisterAgentMessage.cs

@@ -1,5 +1,4 @@
 using MemoryPack;
-using Phantom.Common.Data;
 using Phantom.Common.Data.Agent;
 using Phantom.Utils.Rpc.Message;
 

Common/Phantom.Common.Messages.Agent/ToController/ReportAgentStatusMessage.cs

@@ -2,7 +2,7 @@
 using Phantom.Common.Data;
 using Phantom.Utils.Rpc.Message;
 
-namespace Phantom.Common.Messages.Agent.ToController;
+namespace Phantom.Common.Messages.Agent.ToController; 
 
 [MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record ReportAgentStatusMessage(

Common/Phantom.Common.Messages.Agent/ToController/ReportInstanceEventMessage.cs

@@ -2,7 +2,7 @@
 using Phantom.Common.Data.Instance;
 using Phantom.Utils.Rpc.Message;
 
-namespace Phantom.Common.Messages.Agent.ToController;
+namespace Phantom.Common.Messages.Agent.ToController; 
 
 [MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record ReportInstanceEventMessage(

Common/Phantom.Common.Messages.Web/IMessageToControllerListener.cs

@@ -3,10 +3,9 @@ using Phantom.Common.Messages.Web.BiDirectional;
 using Phantom.Common.Messages.Web.ToController;
 using Phantom.Utils.Rpc.Message;
 
-namespace Phantom.Common.Messages.Web;
+namespace Phantom.Common.Messages.Web; 
 
 public interface IMessageToControllerListener {
-	Task<NoReply> HandleRegisterWeb(RegisterWebMessage message);
 	Task<CreateOrUpdateAdministratorUserResult> CreateOrUpdateAdministratorUser(CreateOrUpdateAdministratorUser message);
 	Task<NoReply> HandleReply(ReplyMessage message);
 }

Common/Phantom.Common.Messages.Web/ToController/CreateOrUpdateAdministratorUser.cs

@@ -1,7 +1,7 @@
 using MemoryPack;
 using Phantom.Common.Data.Web.Users;
 
-namespace Phantom.Common.Messages.Web.ToController;
+namespace Phantom.Common.Messages.Web.ToController; 
 
 [MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record CreateOrUpdateAdministratorUser(

Common/Phantom.Common.Messages.Web/ToController/RegisterWebMessage.cs

@@ -1,14 +0,0 @@
-using MemoryPack;
-using Phantom.Common.Data;
-using Phantom.Utils.Rpc.Message;
-
-namespace Phantom.Common.Messages.Web.ToController;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record RegisterWebMessage(
-	[property: MemoryPackOrder(0)] AuthToken AuthToken
-) : IMessageToController {
-	public Task<NoReply> Accept(IMessageToControllerListener listener) {
-		return listener.HandleRegisterWeb(this);
-	}
-}

Common/Phantom.Common.Messages.Web/WebMessageRegistries.cs

@@ -4,7 +4,7 @@ using Phantom.Common.Messages.Web.BiDirectional;
 using Phantom.Common.Messages.Web.ToController;
 using Phantom.Utils.Rpc.Message;
 
-namespace Phantom.Common.Messages.Web;
+namespace Phantom.Common.Messages.Web; 
 
 public static class WebMessageRegistries {
 	public static MessageRegistry<IMessageToControllerListener> ToController { get; } = new (PhantomLogger.Create("MessageRegistry", nameof(ToController)));
@@ -20,18 +20,14 @@ public static class WebMessageRegistries {
 	}
 
 	private sealed class MessageDefinitions : IMessageDefinitions<IMessageToWebListener, IMessageToControllerListener> {
-		public MessageRegistry<IMessageToWebListener> ToClient => ToWeb;
-		public MessageRegistry<IMessageToControllerListener> ToServer => ToController;
+		public MessageRegistry<IMessageToWebListener> Outgoing => ToWeb;
+		public MessageRegistry<IMessageToControllerListener> Incoming => ToController;
 
 		public bool IsRegistrationMessage(Type messageType) {
 			return false;
 		}
 
-		public IMessage<IMessageToWebListener, NoReply> CreateReplyToServerMessage( uint sequenceId, byte[] serializedReply) {
-			return new ReplyMessage(sequenceId, serializedReply);
-		}
-
-		public IMessage<IMessageToControllerListener, NoReply> CreateReplyToClientMessage(uint sequenceId, byte[] serializedReply) {
+		public IMessage<IMessageToWebListener, NoReply> CreateReplyMessage( uint sequenceId, byte[] serializedReply) {
 			return new ReplyMessage(sequenceId, serializedReply);
 		}
 	}

Controller/Phantom.Controller.Database.Postgres/ApplicationDbContextFactory.cs

@@ -2,7 +2,7 @@
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure;
 
-namespace Phantom.Controller.Database.Postgres;
+namespace Phantom.Controller.Database.Postgres; 
 
 public sealed class ApplicationDbContextFactory : IDbContextProvider {
 	private readonly PooledDbContextFactory<ApplicationDbContext> factory;

Controller/Phantom.Controller.Database/ApplicationDbContext.cs

@@ -3,10 +3,9 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Phantom.Common.Data;
 using Phantom.Common.Data.Minecraft;
-using Phantom.Common.Data.Web.AuditLog;
-using Phantom.Common.Data.Web.EventLog;
 using Phantom.Controller.Database.Converters;
 using Phantom.Controller.Database.Entities;
+using Phantom.Controller.Database.Enums;
 using Phantom.Controller.Database.Factories;
 
 namespace Phantom.Controller.Database;

Controller/Phantom.Controller.Database/DatabaseMigrator.cs

@@ -3,7 +3,7 @@ using Phantom.Common.Logging;
 using Phantom.Utils.Tasks;
 using Serilog;
 
-namespace Phantom.Controller.Database;
+namespace Phantom.Controller.Database; 
 
 public static class DatabaseMigrator {
 	private static readonly ILogger Logger = PhantomLogger.Create(nameof(DatabaseMigrator));

Controller/Phantom.Controller.Database/Entities/AuditLogEntity.cs

@@ -2,9 +2,9 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
-using Phantom.Common.Data.Web.AuditLog;
+using Phantom.Controller.Database.Enums;
 
-namespace Phantom.Controller.Database.Entities;
+namespace Phantom.Controller.Database.Entities; 
 
 [Table("AuditLog", Schema = "system")]
 [SuppressMessage("ReSharper", "AutoPropertyCanBeMadeGetOnly.Global")]

Controller/Phantom.Controller.Database/Entities/EventLogEntity.cs

@@ -2,9 +2,9 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
-using Phantom.Common.Data.Web.EventLog;
+using Phantom.Controller.Database.Enums;
 
-namespace Phantom.Controller.Database.Entities;
+namespace Phantom.Controller.Database.Entities; 
 
 [Table("EventLog", Schema = "system")]
 [SuppressMessage("ReSharper", "AutoPropertyCanBeMadeGetOnly.Global")]

Controller/Phantom.Controller.Database/Entities/InstanceEntity.cs

@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 using Phantom.Common.Data;
 using Phantom.Common.Data.Minecraft;
 
-namespace Phantom.Controller.Database.Entities;
+namespace Phantom.Controller.Database.Entities; 
 
 [Table("Instances", Schema = "agents")]
 [SuppressMessage("ReSharper", "AutoPropertyCanBeMadeGetOnly.Global")]

Controller/Phantom.Controller.Database/Entities/PermissionEntity.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Phantom.Controller.Database.Entities;
+namespace Phantom.Controller.Database.Entities; 
 
 [Table("Permissions", Schema = "identity")]
 public sealed class PermissionEntity {

Controller/Phantom.Controller.Database/Entities/RoleEntity.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Phantom.Controller.Database.Entities;
+namespace Phantom.Controller.Database.Entities; 
 
 [Table("Roles", Schema = "identity")]
 public sealed class RoleEntity {

Controller/Phantom.Controller.Database/Entities/RolePermissionEntity.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Phantom.Controller.Database.Entities;
+namespace Phantom.Controller.Database.Entities; 
 
 [Table("RolePermissions", Schema = "identity")]
 public sealed class RolePermissionEntity {

Controller/Phantom.Controller.Database/Entities/UserEntity.cs

@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using Phantom.Common.Data.Web.Users;
 
-namespace Phantom.Controller.Database.Entities;
+namespace Phantom.Controller.Database.Entities; 
 
 [Table("Users", Schema = "identity")]
 public sealed class UserEntity {

Controller/Phantom.Controller.Database/Entities/UserRoleEntity.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Phantom.Controller.Database.Entities;
+namespace Phantom.Controller.Database.Entities; 
 
 [Table("UserRoles", Schema = "identity")]
 public sealed class UserRoleEntity {

Controller/Phantom.Controller.Database/Enums/EventLogEventType.cs

@@ -1,4 +1,4 @@
-namespace Phantom.Common.Data.Web.EventLog;
+namespace Phantom.Controller.Database.Enums;
 
 public enum EventLogEventType {
 	InstanceLaunchSucceded,
@@ -10,7 +10,7 @@ public enum EventLogEventType {
 	InstanceBackupFailed,
 }
 
-public static class EventLogEventTypeExtensions {
+static class EventLogEventTypeExtensions {
 	private static readonly Dictionary<EventLogEventType, EventLogSubjectType> SubjectTypes = new () {
 		{ EventLogEventType.InstanceLaunchSucceded, EventLogSubjectType.Instance },
 		{ EventLogEventType.InstanceLaunchFailed, EventLogSubjectType.Instance },

Controller/Phantom.Controller.Database/Enums/EventLogSubjectType.cs

@@ -0,0 +1,5 @@
+namespace Phantom.Controller.Database.Enums; 
+
+public enum EventLogSubjectType {
+	Instance
+}

Controller/Phantom.Controller.Database/Factories/AgentEntityUpsert.cs

@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using Phantom.Controller.Database.Entities;
 
-namespace Phantom.Controller.Database.Factories;
+namespace Phantom.Controller.Database.Factories; 
 
 public sealed class AgentEntityUpsert : AbstractUpsertHelper<AgentEntity> {
 	internal AgentEntityUpsert(ApplicationDbContext ctx) : base(ctx) {}

Controller/Phantom.Controller.Database/Factories/InstanceEntityUpsert.cs

@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using Phantom.Controller.Database.Entities;
 
-namespace Phantom.Controller.Database.Factories;
+namespace Phantom.Controller.Database.Factories; 
 
 public sealed class InstanceEntityUpsert : AbstractUpsertHelper<InstanceEntity> {
 	internal InstanceEntityUpsert(ApplicationDbContext ctx) : base(ctx) {}

Controller/Phantom.Controller.Database/IDbContextProvider.cs

@@ -1,4 +1,4 @@
-namespace Phantom.Controller.Database;
+namespace Phantom.Controller.Database; 
 
 public interface IDbContextProvider {
 	ApplicationDbContext Eager();

Controller/Phantom.Controller.Database/ILazyDbContext.cs

@@ -1,4 +1,4 @@
-namespace Phantom.Controller.Database;
+namespace Phantom.Controller.Database; 
 
 public interface ILazyDbContext : IAsyncDisposable {
 	ApplicationDbContext Ctx { get; }

Controller/Phantom.Controller.Database/Repositories/AuditLogRepository.EventTypes.cs

@@ -1,5 +1,5 @@
-using Phantom.Common.Data.Web.AuditLog;
-using Phantom.Controller.Database.Entities;
+using Phantom.Controller.Database.Entities;
+using Phantom.Controller.Database.Enums;
 
 namespace Phantom.Controller.Database.Repositories;
 

Controller/Phantom.Controller.Database/Repositories/AuditLogRepository.cs

@@ -1,6 +1,7 @@
 using Microsoft.EntityFrameworkCore;
-using Phantom.Common.Data.Web.AuditLog;
 using Phantom.Controller.Database.Entities;
+using Phantom.Controller.Database.Enums;
+using Phantom.Controller.Services.Audit;
 
 namespace Phantom.Controller.Database.Repositories;
 

Controller/Phantom.Controller.Database/Repositories/RoleRepository.cs

@@ -1,11 +1,12 @@
 using System.Collections.Immutable;
 using Microsoft.EntityFrameworkCore;
-using Phantom.Common.Data.Web.Users;
+using Phantom.Controller.Database;
 using Phantom.Controller.Database.Entities;
+using Phantom.Controller.Services.Users.Roles;
 using Phantom.Utils.Collections;
 using Phantom.Utils.Tasks;
 
-namespace Phantom.Controller.Database.Repositories;
+namespace Phantom.Controller.Services.Users;
 
 public sealed class RoleRepository {
 	private const int MaxRoleNameLength = 40;

Controller/Phantom.Controller.Database/Repositories/UserRepository.cs

@@ -1,9 +1,6 @@
 using System.Collections.Immutable;
 using Microsoft.EntityFrameworkCore;
 using Phantom.Common.Data.Web.Users;
-using Phantom.Common.Data.Web.Users.AddUserErrors;
-using Phantom.Common.Data.Web.Users.PasswordRequirementViolations;
-using Phantom.Common.Data.Web.Users.UsernameRequirementViolations;
 using Phantom.Controller.Database.Entities;
 using Phantom.Utils.Collections;
 using Phantom.Utils.Tasks;
@@ -16,10 +13,10 @@ public sealed class UserRepository {
 
 	private static UsernameRequirementViolation? CheckUsernameRequirements(string username) {
 		if (string.IsNullOrWhiteSpace(username)) {
-			return new IsEmpty();
+			return new UsernameRequirementViolation.IsEmpty();
 		}
 		else if (username.Length > MaxUserNameLength) {
-			return new TooLong(MaxUserNameLength);
+			return new UsernameRequirementViolation.TooLong(MaxUserNameLength);
 		}
 		else {
 			return null;
@@ -30,19 +27,19 @@ public sealed class UserRepository {
 		var violations = ImmutableArray.CreateBuilder<PasswordRequirementViolation>();
 		
 		if (password.Length < MinimumPasswordLength) {
-			violations.Add(new TooShort(MinimumPasswordLength));
+			violations.Add(new PasswordRequirementViolation.TooShort(MinimumPasswordLength));
 		}
 
 		if (!password.Any(char.IsLower)) {
-			violations.Add(new MustContainLowercaseLetter());
+			violations.Add(new PasswordRequirementViolation.LowercaseLetterRequired());
 		}
 
 		if (!password.Any(char.IsUpper)) {
-			violations.Add(new MustContainUppercaseLetter());
+			violations.Add(new PasswordRequirementViolation.UppercaseLetterRequired());
 		}
 
 		if (!password.Any(char.IsDigit)) {
-			violations.Add(new MustContainDigit());
+			violations.Add(new PasswordRequirementViolation.DigitRequired());
 		}
 		
 		return violations.ToImmutable();
@@ -76,16 +73,16 @@ public sealed class UserRepository {
 	public async Task<Result<UserEntity, AddUserError>> CreateUser(string username, string password) {
 		var usernameRequirementViolation = CheckUsernameRequirements(username);
 		if (usernameRequirementViolation != null) {
-			return new NameIsInvalid(usernameRequirementViolation);
+			return new AddUserError.NameIsInvalid(usernameRequirementViolation);
 		}
 
 		var passwordRequirementViolations = CheckPasswordRequirements(password);
 		if (!passwordRequirementViolations.IsEmpty) {
-			return new PasswordIsInvalid(passwordRequirementViolations);
+			return new AddUserError.PasswordIsInvalid(passwordRequirementViolations);
 		}
 
 		if (await db.Ctx.Users.AnyAsync(user => user.Name == username)) {
-			return new NameAlreadyExists();
+			return new AddUserError.NameAlreadyExists();
 		}
 
 		var user = new UserEntity(Guid.NewGuid(), username, UserPasswords.Hash(password));
@@ -99,7 +96,7 @@ public sealed class UserRepository {
 	public Result<SetUserPasswordError> SetUserPassword(UserEntity user, string password) {
 		var requirementViolations = CheckPasswordRequirements(password);
 		if (!requirementViolations.IsEmpty) {
-			return new Common.Data.Web.Users.SetUserPasswordErrors.PasswordIsInvalid(requirementViolations);
+			return new SetUserPasswordError.PasswordIsInvalid(requirementViolations);
 		}
 
 		user.PasswordHash = UserPasswords.Hash(password);

Controller/Phantom.Controller.Rpc/RpcClientConnection.cs

@@ -1,10 +1,11 @@
 using NetMQ;
 using NetMQ.Sockets;
+using Phantom.Common.Messages.Agent.BiDirectional;
 using Phantom.Utils.Rpc.Message;
 
 namespace Phantom.Controller.Rpc;
 
-public sealed class RpcConnectionToClient<TListener> {
+public sealed class RpcClientConnection<TListener> {
 	private readonly ServerSocket socket;
 	private readonly uint routingId;
 
@@ -14,14 +15,14 @@ public sealed class RpcConnectionToClient<TListener> {
 	internal event EventHandler<RpcClientConnectionClosedEventArgs>? Closed;
 	private bool isClosed;
 
-	internal RpcConnectionToClient(ServerSocket socket, uint routingId, MessageRegistry<TListener> messageRegistry, MessageReplyTracker messageReplyTracker) {
+	internal RpcClientConnection(ServerSocket socket, uint routingId, MessageRegistry<TListener> messageRegistry, MessageReplyTracker messageReplyTracker) {
 		this.socket = socket;
 		this.routingId = routingId;
 		this.messageRegistry = messageRegistry;
 		this.messageReplyTracker = messageReplyTracker;
 	}
 
-	public bool IsSame(RpcConnectionToClient<TListener> other) {
+	public bool IsSame(RpcClientConnection<TListener> other) {
 		return this.routingId == other.routingId && this.socket == other.socket;
 	}
 
@@ -62,7 +63,7 @@ public sealed class RpcConnectionToClient<TListener> {
 		return await messageReplyTracker.WaitForReply<TReply>(sequenceId, waitForReplyTime, waitForReplyCancellationToken);
 	}
 
-	public void Receive(IReply message) {
+	public void Receive(ReplyMessage message) {
 		messageReplyTracker.ReceiveReply(message.SequenceId, message.SerializedReply);
 	}
 }

Controller/Phantom.Controller.Rpc/RpcClientConnectionClosedEventArgs.cs

@@ -1,4 +1,4 @@
-namespace Phantom.Controller.Rpc;
+namespace Phantom.Controller.Rpc; 
 
 sealed class RpcClientConnectionClosedEventArgs : EventArgs {
 	public uint RoutingId { get; }

Controller/Phantom.Controller.Rpc/RpcRuntime.cs

@@ -8,14 +8,14 @@ using Serilog.Events;
 namespace Phantom.Controller.Rpc;
 
 public static class RpcRuntime {
-	public static Task Launch<TClientListener, TServerListener>(RpcConfiguration config, IMessageDefinitions<TClientListener, TServerListener> messageDefinitions, Func<RpcConnectionToClient<TClientListener>, TServerListener> listenerFactory, CancellationToken cancellationToken) {
-		return RpcRuntime<TClientListener, TServerListener>.Launch(config, messageDefinitions, listenerFactory, cancellationToken);
+	public static Task Launch<TOutgoingListener, TIncomingListener>(RpcConfiguration config, IMessageDefinitions<TOutgoingListener, TIncomingListener> messageDefinitions, Func<RpcClientConnection<TOutgoingListener>, TIncomingListener> listenerFactory, CancellationToken cancellationToken) {
+		return RpcRuntime<TOutgoingListener, TIncomingListener>.Launch(config, messageDefinitions, listenerFactory, cancellationToken);
 	}
 }
 
-internal sealed class RpcRuntime<TClientListener, TServerListener> : RpcRuntime<ServerSocket> {
-	internal static Task Launch(RpcConfiguration config, IMessageDefinitions<TClientListener, TServerListener> messageDefinitions, Func<RpcConnectionToClient<TClientListener>, TServerListener> listenerFactory, CancellationToken cancellationToken) {
-		return new RpcRuntime<TClientListener, TServerListener>(config, messageDefinitions, listenerFactory, cancellationToken).Launch();
+internal sealed class RpcRuntime<TOutgoingListener, TIncomingListener> : RpcRuntime<ServerSocket> {
+	internal static Task Launch(RpcConfiguration config, IMessageDefinitions<TOutgoingListener, TIncomingListener> messageDefinitions, Func<RpcClientConnection<TOutgoingListener>, TIncomingListener> listenerFactory, CancellationToken cancellationToken) {
+		return new RpcRuntime<TOutgoingListener, TIncomingListener>(config, messageDefinitions, listenerFactory, cancellationToken).Launch();
 	}
 
 	private static ServerSocket CreateSocket(RpcConfiguration config) {
@@ -29,11 +29,11 @@ internal sealed class RpcRuntime<TClientListener, TServerListener> : RpcRuntime<
 	}
 	
 	private readonly RpcConfiguration config;
-	private readonly IMessageDefinitions<TClientListener, TServerListener> messageDefinitions;
-	private readonly Func<RpcConnectionToClient<TClientListener>, TServerListener> listenerFactory;
+	private readonly IMessageDefinitions<TOutgoingListener, TIncomingListener> messageDefinitions;
+	private readonly Func<RpcClientConnection<TOutgoingListener>, TIncomingListener> listenerFactory;
 	private readonly CancellationToken cancellationToken;
 
-	private RpcRuntime(RpcConfiguration config, IMessageDefinitions<TClientListener, TServerListener> messageDefinitions, Func<RpcConnectionToClient<TClientListener>, TServerListener> listenerFactory, CancellationToken cancellationToken) : base(config, CreateSocket(config)) {
+	private RpcRuntime(RpcConfiguration config, IMessageDefinitions<TOutgoingListener, TIncomingListener> messageDefinitions, Func<RpcClientConnection<TOutgoingListener>, TIncomingListener> listenerFactory, CancellationToken cancellationToken) : base(config, CreateSocket(config)) {
 		this.config = config;
 		this.messageDefinitions = messageDefinitions;
 		this.listenerFactory = listenerFactory;
@@ -71,7 +71,7 @@ internal sealed class RpcRuntime<TClientListener, TServerListener> : RpcRuntime<
 					continue;
 				}
 
-				var connection = new RpcConnectionToClient<TClientListener>(socket, routingId, messageDefinitions.ToClient, replyTracker);
+				var connection = new RpcClientConnection<TOutgoingListener>(socket, routingId, messageDefinitions.Outgoing, replyTracker);
 				connection.Closed += OnConnectionClosed;
 
 				client = new Client(connection, messageDefinitions, listenerFactory(connection), logger, taskManager, cancellationToken);
@@ -79,7 +79,7 @@ internal sealed class RpcRuntime<TClientListener, TServerListener> : RpcRuntime<
 			}
 
 			LogMessageType(logger, routingId, data);
-			messageDefinitions.ToServer.Handle(data, client);
+			messageDefinitions.Incoming.Handle(data, client);
 		}
 
 		foreach (var client in clients.Values) {
@@ -92,7 +92,7 @@ internal sealed class RpcRuntime<TClientListener, TServerListener> : RpcRuntime<
 			return;
 		}
 
-		if (data.Length > 0 && messageDefinitions.ToServer.TryGetType(data, out var type)) {
+		if (data.Length > 0 && messageDefinitions.Incoming.TryGetType(data, out var type)) {
 			logger.Verbose("Received {MessageType} ({Bytes} B) from {RoutingId}.", type.Name, data.Length, routingId);
 		}
 		else {
@@ -101,7 +101,7 @@ internal sealed class RpcRuntime<TClientListener, TServerListener> : RpcRuntime<
 	}
 
 	private bool CheckIsRegistrationMessage(ReadOnlyMemory<byte> data, ILogger logger, uint routingId) {
-		if (messageDefinitions.ToServer.TryGetType(data, out var type) && messageDefinitions.IsRegistrationMessage(type)) {
+		if (messageDefinitions.Incoming.TryGetType(data, out var type) && messageDefinitions.IsRegistrationMessage(type)) {
 			return true;
 		}
 
@@ -109,18 +109,18 @@ internal sealed class RpcRuntime<TClientListener, TServerListener> : RpcRuntime<
 		return false;
 	}
 	
-	private sealed class Client : MessageHandler<TServerListener> {
-		public RpcConnectionToClient<TClientListener> Connection { get; }
+	private sealed class Client : MessageHandler<TIncomingListener> {
+		public RpcClientConnection<TOutgoingListener> Connection { get; }
 		
-		private readonly IMessageDefinitions<TClientListener, TServerListener> messageDefinitions;
+		private readonly IMessageDefinitions<TOutgoingListener, TIncomingListener> messageDefinitions;
 		
-		public Client(RpcConnectionToClient<TClientListener> connection, IMessageDefinitions<TClientListener, TServerListener> messageDefinitions, TServerListener listener, ILogger logger, TaskManager taskManager, CancellationToken cancellationToken) : base(listener, logger, taskManager, cancellationToken) {
+		public Client(RpcClientConnection<TOutgoingListener> connection, IMessageDefinitions<TOutgoingListener, TIncomingListener> messageDefinitions, TIncomingListener listener, ILogger logger, TaskManager taskManager, CancellationToken cancellationToken) : base(listener, logger, taskManager, cancellationToken) {
 			this.Connection = connection;
 			this.messageDefinitions = messageDefinitions;
 		}
 	
 		protected override Task SendReply(uint sequenceId, byte[] serializedReply) {
-			return Connection.Send(messageDefinitions.CreateReplyToServerMessage(sequenceId, serializedReply));
+			return Connection.Send(messageDefinitions.CreateReplyMessage(sequenceId, serializedReply));
 		}
 	}
 }

Controller/Phantom.Controller.Services/Agents/AgentConnection.cs

@@ -4,13 +4,13 @@ using Phantom.Controller.Rpc;
 namespace Phantom.Controller.Services.Agents;
 
 sealed class AgentConnection {
-	private readonly RpcConnectionToClient<IMessageToAgentListener> connection;
+	private readonly RpcClientConnection<IMessageToAgentListener> connection;
 
-	internal AgentConnection(RpcConnectionToClient<IMessageToAgentListener> connection) {
+	internal AgentConnection(RpcClientConnection<IMessageToAgentListener> connection) {
 		this.connection = connection;
 	}
 
-	public bool IsSame(RpcConnectionToClient<IMessageToAgentListener> connection) {
+	public bool IsSame(RpcClientConnection<IMessageToAgentListener> connection) {
 		return this.connection.IsSame(connection);
 	}
 

Controller/Phantom.Controller.Services/Agents/AgentJavaRuntimesManager.cs

@@ -2,7 +2,7 @@
 using Phantom.Common.Data.Java;
 using Phantom.Utils.Collections;
 
-namespace Phantom.Controller.Services.Agents;
+namespace Phantom.Controller.Services.Agents; 
 
 public sealed class AgentJavaRuntimesManager {
 	private readonly RwLockedDictionary<Guid, ImmutableArray<TaggedJavaRuntime>> runtimes = new (LockRecursionPolicy.NoRecursion);

Controller/Phantom.Controller.Services/Agents/AgentManager.cs

@@ -52,7 +52,7 @@ public sealed class AgentManager {
 		return agents.ByGuid.ToImmutable();
 	}
 
-	internal async Task<bool> RegisterAgent(AuthToken authToken, AgentInfo agentInfo, InstanceManager instanceManager, RpcConnectionToClient<IMessageToAgentListener> connection) {
+	internal async Task<bool> RegisterAgent(AuthToken authToken, AgentInfo agentInfo, InstanceManager instanceManager, RpcClientConnection<IMessageToAgentListener> connection) {
 		if (!this.authToken.FixedTimeEquals(authToken)) {
 			await connection.Send(new RegisterAgentFailureMessage(RegisterAgentFailure.InvalidToken));
 			return false;
@@ -88,7 +88,7 @@ public sealed class AgentManager {
 		return true;
 	}
 
-	internal bool UnregisterAgent(Guid agentGuid, RpcConnectionToClient<IMessageToAgentListener> connection) {
+	internal bool UnregisterAgent(Guid agentGuid, RpcClientConnection<IMessageToAgentListener> connection) {
 		if (agents.ByGuid.TryReplaceIf(agentGuid, static oldAgent => oldAgent.AsOffline(), oldAgent => oldAgent.Connection?.IsSame(connection) == true)) {
 			Logger.Information("Unregistered agent with GUID {Guid}.", agentGuid);
 			return true;

Controller/Phantom.Controller.Services/ControllerServices.cs

@@ -1,4 +1,4 @@
-using Phantom.Common.Data;
+using Phantom.Common.Data.Agent;
 using Phantom.Common.Logging;
 using Phantom.Common.Messages.Agent;
 using Phantom.Common.Messages.Web;
@@ -10,9 +10,10 @@ using Phantom.Controller.Services.Events;
 using Phantom.Controller.Services.Instances;
 using Phantom.Controller.Services.Rpc;
 using Phantom.Controller.Services.Users;
+using Phantom.Controller.Services.Users.Permissions;
 using Phantom.Utils.Tasks;
 
-namespace Phantom.Controller.Services;
+namespace Phantom.Controller.Services; 
 
 public sealed class ControllerServices {
 	private TaskManager TaskManager { get; }
@@ -49,11 +50,11 @@ public sealed class ControllerServices {
 		this.cancellationToken = shutdownCancellationToken;
 	}
 
-	public AgentMessageListener CreateAgentMessageListener(RpcConnectionToClient<IMessageToAgentListener> connection) {
+	public AgentMessageListener CreateAgentMessageListener(RpcClientConnection<IMessageToAgentListener> connection) {
 		return new AgentMessageListener(connection, AgentManager, AgentJavaRuntimesManager, InstanceManager, InstanceLogManager, EventLog, cancellationToken);
 	}
 
-	public WebMessageListener CreateWebMessageListener(RpcConnectionToClient<IMessageToWebListener> connection) {
+	public WebMessageListener CreateWebMessageListener(RpcClientConnection<IMessageToWebListener> connection) {
 		return new WebMessageListener(connection, UserManager, RoleManager);
 	}