Update namespaces in Controller and Web projects

Controller/Phantom.Controller.Database.Postgres/ApplicationDbContextDesignFactory.cs

@@ -2,7 +2,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Design;
 
-namespace Phantom.Server.Database.Postgres;
+namespace Phantom.Controller.Database.Postgres;
 
 public sealed class ApplicationDbContextDesignFactory : IDesignTimeDbContextFactory<ApplicationDbContext> {
 	public ApplicationDbContext CreateDbContext(string[] args) {

Controller/Phantom.Controller.Database.Postgres/Migrations/20221007033307_Agents.Designer.cs

@@ -5,11 +5,11 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-using Phantom.Server.Database;
+using Phantom.Controller.Database;
 
 #nullable disable
 
-namespace Phantom.Server.Database.Postgres.Migrations
+namespace Phantom.Controller.Database.Postgres.Migrations
 {
     [DbContext(typeof(ApplicationDbContext))]
     [Migration("20221007033307_Agents")]
@@ -25,7 +25,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.AgentEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.AgentEntity", b =>
                 {
                     b.Property<Guid>("AgentGuid")
                         .ValueGeneratedOnAdd()

Controller/Phantom.Controller.Database.Postgres/Migrations/20221007033307_Agents.cs

@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
-namespace Phantom.Server.Database.Postgres.Migrations
+namespace Phantom.Controller.Database.Postgres.Migrations
 {
     /// <inheritdoc />
     public partial class Agents : Migration

Controller/Phantom.Controller.Database.Postgres/Migrations/20221007095438_Instances.Designer.cs

@@ -5,11 +5,11 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-using Phantom.Server.Database;
+using Phantom.Controller.Database;
 
 #nullable disable
 
-namespace Phantom.Server.Database.Postgres.Migrations
+namespace Phantom.Controller.Database.Postgres.Migrations
 {
     [DbContext(typeof(ApplicationDbContext))]
     [Migration("20221007095438_Instances")]
@@ -25,7 +25,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.AgentEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.AgentEntity", b =>
                 {
                     b.Property<Guid>("AgentGuid")
                         .ValueGeneratedOnAdd()
@@ -49,7 +49,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("Agents", "agents");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.InstanceEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.InstanceEntity", b =>
                 {
                     b.Property<Guid>("InstanceGuid")
                         .ValueGeneratedOnAdd()

Controller/Phantom.Controller.Database.Postgres/Migrations/20221007095438_Instances.cs

@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
-namespace Phantom.Server.Database.Postgres.Migrations
+namespace Phantom.Controller.Database.Postgres.Migrations
 {
     /// <inheritdoc />
     public partial class Instances : Migration

Controller/Phantom.Controller.Database.Postgres/Migrations/20221008163849_Identity.Designer.cs

@@ -5,11 +5,11 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-using Phantom.Server.Database;
+using Phantom.Controller.Database;
 
 #nullable disable
 
-namespace Phantom.Server.Database.Postgres.Migrations
+namespace Phantom.Controller.Database.Postgres.Migrations
 {
     [DbContext(typeof(ApplicationDbContext))]
     [Migration("20221008163849_Identity")]
@@ -221,7 +221,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("UserTokens", "identity");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.AgentEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.AgentEntity", b =>
                 {
                     b.Property<Guid>("AgentGuid")
                         .ValueGeneratedOnAdd()
@@ -245,7 +245,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("Agents", "agents");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.InstanceEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.InstanceEntity", b =>
                 {
                     b.Property<Guid>("InstanceGuid")
                         .ValueGeneratedOnAdd()

Controller/Phantom.Controller.Database.Postgres/Migrations/20221008163849_Identity.cs

@@ -4,7 +4,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
 #nullable disable
 
-namespace Phantom.Server.Database.Postgres.Migrations
+namespace Phantom.Controller.Database.Postgres.Migrations
 {
     /// <inheritdoc />
     public partial class Identity : Migration

Controller/Phantom.Controller.Database.Postgres/Migrations/20221010193220_InstanceJvmArguments.Designer.cs

@@ -5,11 +5,11 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-using Phantom.Server.Database;
+using Phantom.Controller.Database;
 
 #nullable disable
 
-namespace Phantom.Server.Database.Postgres.Migrations
+namespace Phantom.Controller.Database.Postgres.Migrations
 {
     [DbContext(typeof(ApplicationDbContext))]
     [Migration("20221010193220_InstanceJvmArguments")]
@@ -221,7 +221,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("UserTokens", "identity");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.AgentEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.AgentEntity", b =>
                 {
                     b.Property<Guid>("AgentGuid")
                         .ValueGeneratedOnAdd()
@@ -245,7 +245,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("Agents", "agents");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.InstanceEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.InstanceEntity", b =>
                 {
                     b.Property<Guid>("InstanceGuid")
                         .ValueGeneratedOnAdd()

Controller/Phantom.Controller.Database.Postgres/Migrations/20221010193220_InstanceJvmArguments.cs

@@ -2,7 +2,7 @@
 
 #nullable disable
 
-namespace Phantom.Server.Database.Postgres.Migrations
+namespace Phantom.Controller.Database.Postgres.Migrations
 {
     /// <inheritdoc />
     public partial class InstanceJvmArguments : Migration

Controller/Phantom.Controller.Database.Postgres/Migrations/20221016035515_AuditLog.Designer.cs

@@ -6,11 +6,11 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-using Phantom.Server.Database;
+using Phantom.Controller.Database;
 
 #nullable disable
 
-namespace Phantom.Server.Database.Postgres.Migrations
+namespace Phantom.Controller.Database.Postgres.Migrations
 {
     [DbContext(typeof(ApplicationDbContext))]
     [Migration("20221016035515_AuditLog")]
@@ -222,7 +222,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("UserTokens", "identity");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.AgentEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.AgentEntity", b =>
                 {
                     b.Property<Guid>("AgentGuid")
                         .ValueGeneratedOnAdd()
@@ -246,7 +246,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("Agents", "agents");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.AuditEventEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditEventEntity", b =>
                 {
                     b.Property<long>("Id")
                         .ValueGeneratedOnAdd()
@@ -282,7 +282,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("AuditEvents", "system");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.InstanceEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.InstanceEntity", b =>
                 {
                     b.Property<Guid>("InstanceGuid")
                         .ValueGeneratedOnAdd()
@@ -378,7 +378,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                         .IsRequired();
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.AuditEventEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditEventEntity", b =>
                 {
                     b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", "User")
                         .WithMany()

Controller/Phantom.Controller.Database.Postgres/Migrations/20221016035515_AuditLog.cs

@@ -5,7 +5,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
 #nullable disable
 
-namespace Phantom.Server.Database.Postgres.Migrations
+namespace Phantom.Controller.Database.Postgres.Migrations
 {
     /// <inheritdoc />
     public partial class AuditLog : Migration

Controller/Phantom.Controller.Database.Postgres/Migrations/20221018231328_AgentVersion.Designer.cs

@@ -6,11 +6,11 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-using Phantom.Server.Database;
+using Phantom.Controller.Database;
 
 #nullable disable
 
-namespace Phantom.Server.Database.Postgres.Migrations
+namespace Phantom.Controller.Database.Postgres.Migrations
 {
     [DbContext(typeof(ApplicationDbContext))]
     [Migration("20221018231328_AgentVersion")]
@@ -222,7 +222,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("UserTokens", "identity");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.AgentEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.AgentEntity", b =>
                 {
                     b.Property<Guid>("AgentGuid")
                         .ValueGeneratedOnAdd()
@@ -250,7 +250,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("Agents", "agents");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.AuditEventEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditEventEntity", b =>
                 {
                     b.Property<long>("Id")
                         .ValueGeneratedOnAdd()
@@ -286,7 +286,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("AuditEvents", "system");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.InstanceEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.InstanceEntity", b =>
                 {
                     b.Property<Guid>("InstanceGuid")
                         .ValueGeneratedOnAdd()
@@ -382,7 +382,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                         .IsRequired();
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.AuditEventEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditEventEntity", b =>
                 {
                     b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", "User")
                         .WithMany()

Controller/Phantom.Controller.Database.Postgres/Migrations/20221018231328_AgentVersion.cs

@@ -2,7 +2,7 @@
 
 #nullable disable
 
-namespace Phantom.Server.Database.Postgres.Migrations
+namespace Phantom.Controller.Database.Postgres.Migrations
 {
     /// <inheritdoc />
     public partial class AgentVersion : Migration

Controller/Phantom.Controller.Database.Postgres/Migrations/20221021125232_Permissions.Designer.cs

@@ -6,11 +6,11 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-using Phantom.Server.Database;
+using Phantom.Controller.Database;
 
 #nullable disable
 
-namespace Phantom.Server.Database.Postgres.Migrations
+namespace Phantom.Controller.Database.Postgres.Migrations
 {
     [DbContext(typeof(ApplicationDbContext))]
     [Migration("20221021125232_Permissions")]
@@ -222,7 +222,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("UserTokens", "identity");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.AgentEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.AgentEntity", b =>
                 {
                     b.Property<Guid>("AgentGuid")
                         .ValueGeneratedOnAdd()
@@ -250,7 +250,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("Agents", "agents");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.AuditEventEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditEventEntity", b =>
                 {
                     b.Property<long>("Id")
                         .ValueGeneratedOnAdd()
@@ -286,7 +286,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("AuditEvents", "system");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.InstanceEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.InstanceEntity", b =>
                 {
                     b.Property<Guid>("InstanceGuid")
                         .ValueGeneratedOnAdd()
@@ -331,7 +331,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("Instances", "agents");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.PermissionEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.PermissionEntity", b =>
                 {
                     b.Property<string>("Id")
                         .HasColumnType("text");
@@ -341,7 +341,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("Permissions", "identity");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.RolePermissionEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.RolePermissionEntity", b =>
                 {
                     b.Property<string>("RoleId")
                         .HasColumnType("text");
@@ -356,7 +356,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("RolePermissions", "identity");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.UserPermissionEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserPermissionEntity", b =>
                 {
                     b.Property<string>("UserId")
                         .HasColumnType("text");
@@ -422,7 +422,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                         .IsRequired();
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.AuditEventEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditEventEntity", b =>
                 {
                     b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", "User")
                         .WithMany()
@@ -431,9 +431,9 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.Navigation("User");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.RolePermissionEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.RolePermissionEntity", b =>
                 {
-                    b.HasOne("Phantom.Server.Database.Entities.PermissionEntity", null)
+                    b.HasOne("Phantom.Controller.Database.Entities.PermissionEntity", null)
                         .WithMany()
                         .HasForeignKey("PermissionId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -446,9 +446,9 @@ namespace Phantom.Server.Database.Postgres.Migrations
                         .IsRequired();
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.UserPermissionEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserPermissionEntity", b =>
                 {
-                    b.HasOne("Phantom.Server.Database.Entities.PermissionEntity", null)
+                    b.HasOne("Phantom.Controller.Database.Entities.PermissionEntity", null)
                         .WithMany()
                         .HasForeignKey("PermissionId")
                         .OnDelete(DeleteBehavior.Cascade)

Controller/Phantom.Controller.Database.Postgres/Migrations/20221021125232_Permissions.cs

@@ -2,7 +2,7 @@
 
 #nullable disable
 
-namespace Phantom.Server.Database.Postgres.Migrations
+namespace Phantom.Controller.Database.Postgres.Migrations
 {
     /// <inheritdoc />
     public partial class Permissions : Migration

Controller/Phantom.Controller.Database.Postgres/Migrations/20230213040522_AuditLogRename.Designer.cs

@@ -6,11 +6,11 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-using Phantom.Server.Database;
+using Phantom.Controller.Database;
 
 #nullable disable
 
-namespace Phantom.Server.Database.Postgres.Migrations
+namespace Phantom.Controller.Database.Postgres.Migrations
 {
     [DbContext(typeof(ApplicationDbContext))]
     [Migration("20230213040522_AuditLogRename")]
@@ -222,7 +222,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("UserTokens", "identity");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.AgentEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.AgentEntity", b =>
                 {
                     b.Property<Guid>("AgentGuid")
                         .ValueGeneratedOnAdd()
@@ -250,7 +250,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("Agents", "agents");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.AuditEventEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditEventEntity", b =>
                 {
                     b.Property<long>("Id")
                         .ValueGeneratedOnAdd()
@@ -286,7 +286,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("AuditLog", "system");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.InstanceEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.InstanceEntity", b =>
                 {
                     b.Property<Guid>("InstanceGuid")
                         .ValueGeneratedOnAdd()
@@ -331,7 +331,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("Instances", "agents");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.PermissionEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.PermissionEntity", b =>
                 {
                     b.Property<string>("Id")
                         .HasColumnType("text");
@@ -341,7 +341,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("Permissions", "identity");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.RolePermissionEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.RolePermissionEntity", b =>
                 {
                     b.Property<string>("RoleId")
                         .HasColumnType("text");
@@ -356,7 +356,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("RolePermissions", "identity");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.UserPermissionEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserPermissionEntity", b =>
                 {
                     b.Property<string>("UserId")
                         .HasColumnType("text");
@@ -422,7 +422,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                         .IsRequired();
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.AuditEventEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditEventEntity", b =>
                 {
                     b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", "User")
                         .WithMany()
@@ -431,9 +431,9 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.Navigation("User");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.RolePermissionEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.RolePermissionEntity", b =>
                 {
-                    b.HasOne("Phantom.Server.Database.Entities.PermissionEntity", null)
+                    b.HasOne("Phantom.Controller.Database.Entities.PermissionEntity", null)
                         .WithMany()
                         .HasForeignKey("PermissionId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -446,9 +446,9 @@ namespace Phantom.Server.Database.Postgres.Migrations
                         .IsRequired();
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.UserPermissionEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserPermissionEntity", b =>
                 {
-                    b.HasOne("Phantom.Server.Database.Entities.PermissionEntity", null)
+                    b.HasOne("Phantom.Controller.Database.Entities.PermissionEntity", null)
                         .WithMany()
                         .HasForeignKey("PermissionId")
                         .OnDelete(DeleteBehavior.Cascade)

Controller/Phantom.Controller.Database.Postgres/Migrations/20230213040522_AuditLogRename.cs

@@ -2,7 +2,7 @@
 
 #nullable disable
 
-namespace Phantom.Server.Database.Postgres.Migrations
+namespace Phantom.Controller.Database.Postgres.Migrations
 {
     /// <inheritdoc />
     public partial class AuditLogRename : Migration

Controller/Phantom.Controller.Database.Postgres/Migrations/20230215101444_EventLog.Designer.cs

@@ -6,11 +6,11 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-using Phantom.Server.Database;
+using Phantom.Controller.Database;
 
 #nullable disable
 
-namespace Phantom.Server.Database.Postgres.Migrations
+namespace Phantom.Controller.Database.Postgres.Migrations
 {
     [DbContext(typeof(ApplicationDbContext))]
     [Migration("20230215101444_EventLog")]
@@ -222,7 +222,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("UserTokens", "identity");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.AgentEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.AgentEntity", b =>
                 {
                     b.Property<Guid>("AgentGuid")
                         .ValueGeneratedOnAdd()
@@ -250,7 +250,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("Agents", "agents");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.AuditLogEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditLogEntity", b =>
                 {
                     b.Property<long>("Id")
                         .ValueGeneratedOnAdd()
@@ -286,7 +286,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("AuditLog", "system");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.EventLogEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.EventLogEntity", b =>
                 {
                     b.Property<Guid>("EventGuid")
                         .ValueGeneratedOnAdd()
@@ -318,7 +318,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("EventLog", "system");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.InstanceEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.InstanceEntity", b =>
                 {
                     b.Property<Guid>("InstanceGuid")
                         .ValueGeneratedOnAdd()
@@ -363,7 +363,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("Instances", "agents");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.PermissionEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.PermissionEntity", b =>
                 {
                     b.Property<string>("Id")
                         .HasColumnType("text");
@@ -373,7 +373,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("Permissions", "identity");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.RolePermissionEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.RolePermissionEntity", b =>
                 {
                     b.Property<string>("RoleId")
                         .HasColumnType("text");
@@ -388,7 +388,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("RolePermissions", "identity");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.UserPermissionEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserPermissionEntity", b =>
                 {
                     b.Property<string>("UserId")
                         .HasColumnType("text");
@@ -454,7 +454,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                         .IsRequired();
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.AuditLogEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditLogEntity", b =>
                 {
                     b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", "User")
                         .WithMany()
@@ -463,9 +463,9 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.Navigation("User");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.RolePermissionEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.RolePermissionEntity", b =>
                 {
-                    b.HasOne("Phantom.Server.Database.Entities.PermissionEntity", null)
+                    b.HasOne("Phantom.Controller.Database.Entities.PermissionEntity", null)
                         .WithMany()
                         .HasForeignKey("PermissionId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -478,9 +478,9 @@ namespace Phantom.Server.Database.Postgres.Migrations
                         .IsRequired();
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.UserPermissionEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserPermissionEntity", b =>
                 {
-                    b.HasOne("Phantom.Server.Database.Entities.PermissionEntity", null)
+                    b.HasOne("Phantom.Controller.Database.Entities.PermissionEntity", null)
                         .WithMany()
                         .HasForeignKey("PermissionId")
                         .OnDelete(DeleteBehavior.Cascade)

Controller/Phantom.Controller.Database.Postgres/Migrations/20230215101444_EventLog.cs

@@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
-namespace Phantom.Server.Database.Postgres.Migrations
+namespace Phantom.Controller.Database.Postgres.Migrations
 {
     /// <inheritdoc />
     public partial class EventLog : Migration

Controller/Phantom.Controller.Database.Postgres/Migrations/20231008122637_ReplaceIdentity.Designer.cs

@@ -6,11 +6,11 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-using Phantom.Server.Database;
+using Phantom.Controller.Database;
 
 #nullable disable
 
-namespace Phantom.Server.Database.Postgres.Migrations
+namespace Phantom.Controller.Database.Postgres.Migrations
 {
     [DbContext(typeof(ApplicationDbContext))]
     [Migration("20231008122637_ReplaceIdentity")]
@@ -26,7 +26,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.AgentEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.AgentEntity", b =>
                 {
                     b.Property<Guid>("AgentGuid")
                         .ValueGeneratedOnAdd()
@@ -54,7 +54,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("Agents", "agents");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.AuditLogEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditLogEntity", b =>
                 {
                     b.Property<long>("Id")
                         .ValueGeneratedOnAdd()
@@ -88,7 +88,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("AuditLog", "system");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.EventLogEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.EventLogEntity", b =>
                 {
                     b.Property<Guid>("EventGuid")
                         .ValueGeneratedOnAdd()
@@ -120,7 +120,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("EventLog", "system");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.InstanceEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.InstanceEntity", b =>
                 {
                     b.Property<Guid>("InstanceGuid")
                         .ValueGeneratedOnAdd()
@@ -165,7 +165,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("Instances", "agents");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.PermissionEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.PermissionEntity", b =>
                 {
                     b.Property<string>("Id")
                         .HasColumnType("text");

Controller/Phantom.Controller.Database.Postgres/Migrations/20231008122637_ReplaceIdentity.cs

@@ -4,7 +4,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
 #nullable disable
 
-namespace Phantom.Server.Database.Postgres.Migrations
+namespace Phantom.Controller.Database.Postgres.Migrations
 {
     /// <inheritdoc />
     public partial class ReplaceIdentity : Migration

Controller/Phantom.Controller.Database.Postgres/Migrations/20231008123315_ReplaceIdentity2.Designer.cs

@@ -6,11 +6,11 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-using Phantom.Server.Database;
+using Phantom.Controller.Database;
 
 #nullable disable
 
-namespace Phantom.Server.Database.Postgres.Migrations
+namespace Phantom.Controller.Database.Postgres.Migrations
 {
     [DbContext(typeof(ApplicationDbContext))]
     [Migration("20231008123315_ReplaceIdentity2")]
@@ -26,7 +26,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.AgentEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.AgentEntity", b =>
                 {
                     b.Property<Guid>("AgentGuid")
                         .ValueGeneratedOnAdd()
@@ -54,7 +54,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("Agents", "agents");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.AuditLogEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditLogEntity", b =>
                 {
                     b.Property<long>("Id")
                         .ValueGeneratedOnAdd()
@@ -90,7 +90,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("AuditLog", "system");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.EventLogEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.EventLogEntity", b =>
                 {
                     b.Property<Guid>("EventGuid")
                         .ValueGeneratedOnAdd()
@@ -122,7 +122,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("EventLog", "system");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.InstanceEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.InstanceEntity", b =>
                 {
                     b.Property<Guid>("InstanceGuid")
                         .ValueGeneratedOnAdd()
@@ -167,7 +167,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("Instances", "agents");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.PermissionEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.PermissionEntity", b =>
                 {
                     b.Property<string>("Id")
                         .HasColumnType("text");
@@ -177,7 +177,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("Permissions", "identity");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.RoleEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.RoleEntity", b =>
                 {
                     b.Property<Guid>("RoleGuid")
                         .ValueGeneratedOnAdd()
@@ -192,7 +192,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("Roles", "identity");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.RolePermissionEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.RolePermissionEntity", b =>
                 {
                     b.Property<Guid>("RoleGuid")
                         .HasColumnType("uuid");
@@ -207,7 +207,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("RolePermissions", "identity");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.UserEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserEntity", b =>
                 {
                     b.Property<Guid>("UserGuid")
                         .ValueGeneratedOnAdd()
@@ -229,7 +229,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("Users", "identity");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.UserPermissionEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserPermissionEntity", b =>
                 {
                     b.Property<Guid>("UserGuid")
                         .HasColumnType("uuid");
@@ -244,7 +244,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("UserPermissions", "identity");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.UserRoleEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserRoleEntity", b =>
                 {
                     b.Property<Guid>("UserGuid")
                         .HasColumnType("uuid");
@@ -259,9 +259,9 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("UserRoles", "identity");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.AuditLogEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditLogEntity", b =>
                 {
-                    b.HasOne("Phantom.Server.Database.Entities.UserEntity", "User")
+                    b.HasOne("Phantom.Controller.Database.Entities.UserEntity", "User")
                         .WithMany()
                         .HasForeignKey("UserGuid")
                         .OnDelete(DeleteBehavior.SetNull);
@@ -269,45 +269,45 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.Navigation("User");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.RolePermissionEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.RolePermissionEntity", b =>
                 {
-                    b.HasOne("Phantom.Server.Database.Entities.PermissionEntity", null)
+                    b.HasOne("Phantom.Controller.Database.Entities.PermissionEntity", null)
                         .WithMany()
                         .HasForeignKey("PermissionId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Phantom.Server.Database.Entities.RoleEntity", null)
+                    b.HasOne("Phantom.Controller.Database.Entities.RoleEntity", null)
                         .WithMany()
                         .HasForeignKey("RoleGuid")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.UserPermissionEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserPermissionEntity", b =>
                 {
-                    b.HasOne("Phantom.Server.Database.Entities.PermissionEntity", null)
+                    b.HasOne("Phantom.Controller.Database.Entities.PermissionEntity", null)
                         .WithMany()
                         .HasForeignKey("PermissionId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Phantom.Server.Database.Entities.UserEntity", null)
+                    b.HasOne("Phantom.Controller.Database.Entities.UserEntity", null)
                         .WithMany()
                         .HasForeignKey("UserGuid")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.UserRoleEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserRoleEntity", b =>
                 {
-                    b.HasOne("Phantom.Server.Database.Entities.RoleEntity", "Role")
+                    b.HasOne("Phantom.Controller.Database.Entities.RoleEntity", "Role")
                         .WithMany()
                         .HasForeignKey("RoleGuid")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Phantom.Server.Database.Entities.UserEntity", "User")
+                    b.HasOne("Phantom.Controller.Database.Entities.UserEntity", "User")
                         .WithMany()
                         .HasForeignKey("UserGuid")
                         .OnDelete(DeleteBehavior.Cascade)

Controller/Phantom.Controller.Database.Postgres/Migrations/20231008123315_ReplaceIdentity2.cs

@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
-namespace Phantom.Server.Database.Postgres.Migrations
+namespace Phantom.Controller.Database.Postgres.Migrations
 {
     /// <inheritdoc />
     public partial class ReplaceIdentity2 : Migration

Controller/Phantom.Controller.Database.Postgres/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -5,11 +5,11 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-using Phantom.Server.Database;
+using Phantom.Controller.Database;
 
 #nullable disable
 
-namespace Phantom.Server.Database.Postgres.Migrations
+namespace Phantom.Controller.Database.Postgres.Migrations
 {
     [DbContext(typeof(ApplicationDbContext))]
     partial class ApplicationDbContextModelSnapshot : ModelSnapshot
@@ -23,7 +23,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.AgentEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.AgentEntity", b =>
                 {
                     b.Property<Guid>("AgentGuid")
                         .ValueGeneratedOnAdd()
@@ -51,7 +51,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("Agents", "agents");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.AuditLogEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditLogEntity", b =>
                 {
                     b.Property<long>("Id")
                         .ValueGeneratedOnAdd()
@@ -87,7 +87,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("AuditLog", "system");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.EventLogEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.EventLogEntity", b =>
                 {
                     b.Property<Guid>("EventGuid")
                         .ValueGeneratedOnAdd()
@@ -119,7 +119,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("EventLog", "system");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.InstanceEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.InstanceEntity", b =>
                 {
                     b.Property<Guid>("InstanceGuid")
                         .ValueGeneratedOnAdd()
@@ -164,7 +164,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("Instances", "agents");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.PermissionEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.PermissionEntity", b =>
                 {
                     b.Property<string>("Id")
                         .HasColumnType("text");
@@ -174,7 +174,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("Permissions", "identity");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.RoleEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.RoleEntity", b =>
                 {
                     b.Property<Guid>("RoleGuid")
                         .ValueGeneratedOnAdd()
@@ -189,7 +189,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("Roles", "identity");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.RolePermissionEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.RolePermissionEntity", b =>
                 {
                     b.Property<Guid>("RoleGuid")
                         .HasColumnType("uuid");
@@ -204,7 +204,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("RolePermissions", "identity");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.UserEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserEntity", b =>
                 {
                     b.Property<Guid>("UserGuid")
                         .ValueGeneratedOnAdd()
@@ -226,7 +226,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("Users", "identity");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.UserPermissionEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserPermissionEntity", b =>
                 {
                     b.Property<Guid>("UserGuid")
                         .HasColumnType("uuid");
@@ -241,7 +241,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("UserPermissions", "identity");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.UserRoleEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserRoleEntity", b =>
                 {
                     b.Property<Guid>("UserGuid")
                         .HasColumnType("uuid");
@@ -256,9 +256,9 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.ToTable("UserRoles", "identity");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.AuditLogEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditLogEntity", b =>
                 {
-                    b.HasOne("Phantom.Server.Database.Entities.UserEntity", "User")
+                    b.HasOne("Phantom.Controller.Database.Entities.UserEntity", "User")
                         .WithMany()
                         .HasForeignKey("UserGuid")
                         .OnDelete(DeleteBehavior.SetNull);
@@ -266,45 +266,45 @@ namespace Phantom.Server.Database.Postgres.Migrations
                     b.Navigation("User");
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.RolePermissionEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.RolePermissionEntity", b =>
                 {
-                    b.HasOne("Phantom.Server.Database.Entities.PermissionEntity", null)
+                    b.HasOne("Phantom.Controller.Database.Entities.PermissionEntity", null)
                         .WithMany()
                         .HasForeignKey("PermissionId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Phantom.Server.Database.Entities.RoleEntity", null)
+                    b.HasOne("Phantom.Controller.Database.Entities.RoleEntity", null)
                         .WithMany()
                         .HasForeignKey("RoleGuid")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.UserPermissionEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserPermissionEntity", b =>
                 {
-                    b.HasOne("Phantom.Server.Database.Entities.PermissionEntity", null)
+                    b.HasOne("Phantom.Controller.Database.Entities.PermissionEntity", null)
                         .WithMany()
                         .HasForeignKey("PermissionId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Phantom.Server.Database.Entities.UserEntity", null)
+                    b.HasOne("Phantom.Controller.Database.Entities.UserEntity", null)
                         .WithMany()
                         .HasForeignKey("UserGuid")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
                 });
 
-            modelBuilder.Entity("Phantom.Server.Database.Entities.UserRoleEntity", b =>
+            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserRoleEntity", b =>
                 {
-                    b.HasOne("Phantom.Server.Database.Entities.RoleEntity", "Role")
+                    b.HasOne("Phantom.Controller.Database.Entities.RoleEntity", "Role")
                         .WithMany()
                         .HasForeignKey("RoleGuid")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Phantom.Server.Database.Entities.UserEntity", "User")
+                    b.HasOne("Phantom.Controller.Database.Entities.UserEntity", "User")
                         .WithMany()
                         .HasForeignKey("UserGuid")
                         .OnDelete(DeleteBehavior.Cascade)

Controller/Phantom.Controller.Database.Postgres/Phantom.Controller.Database.Postgres.csproj

@@ -5,10 +5,6 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   
-  <PropertyGroup>
-    <RootNamespace>Phantom.Server.Database.Postgres</RootNamespace>
-  </PropertyGroup>
-  
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools">
       <PrivateAssets>all</PrivateAssets>

Controller/Phantom.Controller.Database/ApplicationDbContext.cs

@@ -3,12 +3,12 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Phantom.Common.Data;
 using Phantom.Common.Data.Minecraft;
-using Phantom.Server.Database.Converters;
+using Phantom.Controller.Database.Converters;
-using Phantom.Server.Database.Entities;
+using Phantom.Controller.Database.Entities;
-using Phantom.Server.Database.Enums;
+using Phantom.Controller.Database.Enums;
-using Phantom.Server.Database.Factories;
+using Phantom.Controller.Database.Factories;
 
-namespace Phantom.Server.Database;
+namespace Phantom.Controller.Database;
 
 [SuppressMessage("ReSharper", "AutoPropertyCanBeMadeGetOnly.Global")]
 public class ApplicationDbContext : DbContext {

Controller/Phantom.Controller.Database/Converters/RamAllocationUnitsConverter.cs

@@ -2,7 +2,7 @@
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Phantom.Common.Data;
 
-namespace Phantom.Server.Database.Converters;
+namespace Phantom.Controller.Database.Converters;
 
 [SuppressMessage("ReSharper", "ClassNeverInstantiated.Global")]
 sealed class RamAllocationUnitsConverter : ValueConverter<RamAllocationUnits, ushort> {

Controller/Phantom.Controller.Database/DatabaseProvider.cs

@@ -1,6 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Phantom.Server.Database; 
+namespace Phantom.Controller.Database; 
 
 public sealed class DatabaseProvider {
 	private readonly IServiceScopeFactory serviceScopeFactory;

Controller/Phantom.Controller.Database/Entities/AgentEntity.cs

@@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 using System.Diagnostics.CodeAnalysis;
 using Phantom.Common.Data;
 
-namespace Phantom.Server.Database.Entities;
+namespace Phantom.Controller.Database.Entities;
 
 [Table("Agents", Schema = "agents")]
 [SuppressMessage("ReSharper", "AutoPropertyCanBeMadeGetOnly.Global")]

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.Server.Database.Enums;
+using Phantom.Controller.Database.Enums;
 
-namespace Phantom.Server.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.Server.Database.Enums;
+using Phantom.Controller.Database.Enums;
 
-namespace Phantom.Server.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.Server.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.Server.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.Server.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.Server.Database.Entities; 
+namespace Phantom.Controller.Database.Entities; 
 
 [Table("RolePermissions", Schema = "identity")]
 public sealed class RolePermissionEntity {

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

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

Controller/Phantom.Controller.Database/Entities/UserPermissionEntity.cs

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

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

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

Controller/Phantom.Controller.Database/Enums/AuditLogEventType.cs

@@ -1,4 +1,4 @@
-namespace Phantom.Server.Database.Enums;
+namespace Phantom.Controller.Database.Enums;
 
 public enum AuditLogEventType {
 	AdministratorUserCreated,

Controller/Phantom.Controller.Database/Enums/AuditLogSubjectType.cs

@@ -1,4 +1,4 @@
-namespace Phantom.Server.Database.Enums; 
+namespace Phantom.Controller.Database.Enums; 
 
 public enum AuditLogSubjectType {
 	User,

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

@@ -1,4 +1,4 @@
-namespace Phantom.Server.Database.Enums;
+namespace Phantom.Controller.Database.Enums;
 
 public enum EventLogEventType {
 	InstanceLaunchSucceded,

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

@@ -1,4 +1,4 @@
-namespace Phantom.Server.Database.Enums; 
+namespace Phantom.Controller.Database.Enums; 
 
 public enum EventLogSubjectType {
 	Instance

Controller/Phantom.Controller.Database/Factories/AbstractUpsertHelper.cs

@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 
-namespace Phantom.Server.Database.Factories;
+namespace Phantom.Controller.Database.Factories;
 
 public abstract class AbstractUpsertHelper<T> where T : class {
 	private protected readonly ApplicationDbContext Ctx;

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

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

Controller/Phantom.Controller.Database/Phantom.Controller.Database.csproj

@@ -5,10 +5,6 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   
-  <PropertyGroup>
-    <RootNamespace>Phantom.Server.Database</RootNamespace>
-  </PropertyGroup>
-  
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools">

Controller/Phantom.Controller.Minecraft/JvmArgumentsHelper.cs

@@ -1,6 +1,6 @@
 using System.Collections.Immutable;
 
-namespace Phantom.Server.Minecraft;
+namespace Phantom.Controller.Minecraft;
 
 public static class JvmArgumentsHelper {
 	public static ImmutableArray<string> Split(string arguments) {

Controller/Phantom.Controller.Minecraft/MinecraftVersionApi.cs

@@ -8,7 +8,7 @@ using Phantom.Utils.IO;
 using Phantom.Utils.Runtime;
 using Serilog;
 
-namespace Phantom.Server.Minecraft;
+namespace Phantom.Controller.Minecraft;
 
 sealed class MinecraftVersionApi : IDisposable {
 	private static readonly ILogger Logger = PhantomLogger.Create<MinecraftVersionApi>();

Controller/Phantom.Controller.Minecraft/MinecraftVersions.cs

@@ -4,7 +4,7 @@ using Phantom.Common.Data.Minecraft;
 using Phantom.Common.Logging;
 using Serilog;
 
-namespace Phantom.Server.Minecraft;
+namespace Phantom.Controller.Minecraft;
 
 public sealed class MinecraftVersions : IDisposable {
 	private static readonly ILogger Logger = PhantomLogger.Create<MinecraftVersions>();

Controller/Phantom.Controller.Minecraft/Phantom.Controller.Minecraft.csproj

@@ -5,10 +5,6 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   
-  <PropertyGroup>
-    <RootNamespace>Phantom.Server.Minecraft</RootNamespace>
-  </PropertyGroup>
-  
   <ItemGroup>
     <ProjectReference Include="..\..\Common\Phantom.Common.Data\Phantom.Common.Data.csproj" />
     <ProjectReference Include="..\..\Common\Phantom.Common.Logging\Phantom.Common.Logging.csproj" />

Controller/Phantom.Controller.Rpc/Phantom.Controller.Rpc.csproj

@@ -5,10 +5,6 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   
-  <PropertyGroup>
-    <RootNamespace>Phantom.Server.Rpc</RootNamespace>
-  </PropertyGroup>
-  
   <ItemGroup>
     <ProjectReference Include="..\..\Common\Phantom.Common.Messages\Phantom.Common.Messages.csproj" />
   </ItemGroup>

Controller/Phantom.Controller.Rpc/RpcClientConnection.cs

@@ -4,7 +4,7 @@ using Phantom.Common.Messages;
 using Phantom.Common.Messages.BiDirectional;
 using Phantom.Utils.Rpc.Message;
 
-namespace Phantom.Server.Rpc;
+namespace Phantom.Controller.Rpc;
 
 public sealed class RpcClientConnection {
 	private readonly ServerSocket socket;

Controller/Phantom.Controller.Rpc/RpcClientConnectionClosedEventArgs.cs

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

Controller/Phantom.Controller.Rpc/RpcLauncher.cs

@@ -8,7 +8,7 @@ using Phantom.Utils.Tasks;
 using Serilog;
 using Serilog.Events;
 
-namespace Phantom.Server.Rpc;
+namespace Phantom.Controller.Rpc;
 
 public sealed class RpcLauncher : RpcRuntime<ServerSocket> {
 	public static Task Launch(RpcConfiguration config, Func<RpcClientConnection, IMessageToServerListener> listenerFactory, CancellationToken cancellationToken) {

Controller/Phantom.Controller.Services/Agents/Agent.cs

@@ -1,7 +1,7 @@
 using Phantom.Common.Data;
 using Phantom.Common.Data.Agent;
 
-namespace Phantom.Server.Services.Agents;
+namespace Phantom.Controller.Services.Agents;
 
 public sealed record Agent(
 	Guid Guid,

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

@@ -1,7 +1,7 @@
 using Phantom.Common.Messages;
-using Phantom.Server.Rpc;
+using Phantom.Controller.Rpc;
 
-namespace Phantom.Server.Services.Agents;
+namespace Phantom.Controller.Services.Agents;
 
 sealed class AgentConnection {
 	private readonly RpcClientConnection connection;

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

@@ -2,7 +2,7 @@
 using Phantom.Common.Data.Java;
 using Phantom.Utils.Collections;
 
-namespace Phantom.Server.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

@@ -5,15 +5,15 @@ using Phantom.Common.Data.Replies;
 using Phantom.Common.Logging;
 using Phantom.Common.Messages;
 using Phantom.Common.Messages.ToAgent;
-using Phantom.Server.Database;
+using Phantom.Controller.Database;
-using Phantom.Server.Rpc;
+using Phantom.Controller.Rpc;
-using Phantom.Server.Services.Instances;
+using Phantom.Controller.Services.Instances;
 using Phantom.Utils.Collections;
 using Phantom.Utils.Events;
 using Phantom.Utils.Tasks;
 using ILogger = Serilog.ILogger;
 
-namespace Phantom.Server.Services.Agents;
+namespace Phantom.Controller.Services.Agents;
 
 public sealed class AgentManager {
 	private static readonly ILogger Logger = PhantomLogger.Create<AgentManager>();

Controller/Phantom.Controller.Services/Agents/AgentStats.cs

@@ -1,6 +1,6 @@
 using Phantom.Common.Data;
 
-namespace Phantom.Server.Services.Agents;
+namespace Phantom.Controller.Services.Agents;
 
 public sealed record AgentStats(
 	int RunningInstanceCount,

Controller/Phantom.Controller.Services/Audit/AuditLog.EventTypes.cs

@@ -1,7 +1,7 @@
-using Phantom.Server.Database.Entities;
+using Phantom.Controller.Database.Entities;
-using Phantom.Server.Database.Enums;
+using Phantom.Controller.Database.Enums;
 
-namespace Phantom.Server.Services.Audit;
+namespace Phantom.Controller.Services.Audit;
 
 public sealed partial class AuditLog {
 	public Task AddAdministratorUserCreatedEvent(UserEntity administratorUser) {

Controller/Phantom.Controller.Services/Audit/AuditLog.cs

@@ -1,12 +1,12 @@
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.EntityFrameworkCore;
-using Phantom.Server.Database;
+using Phantom.Controller.Database;
-using Phantom.Server.Database.Entities;
+using Phantom.Controller.Database.Entities;
-using Phantom.Server.Database.Enums;
+using Phantom.Controller.Database.Enums;
-using Phantom.Server.Services.Users;
+using Phantom.Controller.Services.Users;
 using Phantom.Utils.Tasks;
 
-namespace Phantom.Server.Services.Audit;
+namespace Phantom.Controller.Services.Audit;
 
 public sealed partial class AuditLog {
 	private readonly CancellationToken cancellationToken;

Controller/Phantom.Controller.Services/Audit/AuditLogItem.cs

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

Controller/Phantom.Controller.Services/Events/EventLog.InstanceEventVisitor.cs

@@ -1,8 +1,8 @@
 using Phantom.Common.Data.Backups;
 using Phantom.Common.Data.Instance;
-using Phantom.Server.Database.Enums;
+using Phantom.Controller.Database.Enums;
 
-namespace Phantom.Server.Services.Events;
+namespace Phantom.Controller.Services.Events;
 
 public sealed partial class EventLog {
 	internal IInstanceEventVisitor CreateInstanceEventVisitor(Guid eventGuid, DateTime utcTime, Guid agentGuid, Guid instanceGuid) {

Controller/Phantom.Controller.Services/Events/EventLog.cs

@@ -1,10 +1,10 @@
 using Microsoft.EntityFrameworkCore;
-using Phantom.Server.Database;
+using Phantom.Controller.Database;
-using Phantom.Server.Database.Entities;
+using Phantom.Controller.Database.Entities;
-using Phantom.Server.Database.Enums;
+using Phantom.Controller.Database.Enums;
 using Phantom.Utils.Tasks;
 
-namespace Phantom.Server.Services.Events; 
+namespace Phantom.Controller.Services.Events; 
 
 public sealed partial class EventLog {
 	private readonly CancellationToken cancellationToken;

Controller/Phantom.Controller.Services/Events/EventLogItem.cs

@@ -1,6 +1,6 @@
 using System.Text.Json;
-using Phantom.Server.Database.Enums;
+using Phantom.Controller.Database.Enums;
 
-namespace Phantom.Server.Services.Events; 
+namespace Phantom.Controller.Services.Events; 
 
 public sealed record EventLogItem(DateTime UtcTime, Guid? AgentGuid, EventLogEventType EventType, EventLogSubjectType SubjectType, string SubjectId, JsonDocument? Data);

Controller/Phantom.Controller.Services/Instances/AddOrEditInstanceResult.cs

@@ -1,4 +1,4 @@
-namespace Phantom.Server.Services.Instances;
+namespace Phantom.Controller.Services.Instances;
 
 public enum AddOrEditInstanceResult : byte {
 	UnknownError,

Controller/Phantom.Controller.Services/Instances/Instance.cs

@@ -1,6 +1,6 @@
 using Phantom.Common.Data.Instance;
 
-namespace Phantom.Server.Services.Instances; 
+namespace Phantom.Controller.Services.Instances; 
 
 public sealed record Instance(
 	InstanceConfiguration Configuration,

Controller/Phantom.Controller.Services/Instances/InstanceLogHtmlFilters.cs

@@ -1,7 +1,7 @@
 using System.Net;
 using System.Text.RegularExpressions;
 
-namespace Phantom.Server.Services.Instances;
+namespace Phantom.Controller.Services.Instances;
 
 static partial class InstanceLogHtmlFilters {
 	/// <summary>

Controller/Phantom.Controller.Services/Instances/InstanceLogManager.cs

@@ -5,7 +5,7 @@ using Phantom.Utils.Collections;
 using Phantom.Utils.Events;
 using ILogger = Serilog.ILogger;
 
-namespace Phantom.Server.Services.Instances; 
+namespace Phantom.Controller.Services.Instances; 
 
 public sealed class InstanceLogManager {
 	private const int RetainedLines = 1000;

Controller/Phantom.Controller.Services/Instances/InstanceManager.cs

@@ -2,21 +2,20 @@
 using System.Diagnostics.CodeAnalysis;
 using Phantom.Common.Data;
 using Phantom.Common.Data.Instance;
-using Phantom.Common.Data.Java;
 using Phantom.Common.Data.Minecraft;
 using Phantom.Common.Data.Replies;
 using Phantom.Common.Logging;
 using Phantom.Common.Messages;
 using Phantom.Common.Messages.ToAgent;
-using Phantom.Server.Database;
+using Phantom.Controller.Database;
-using Phantom.Server.Database.Entities;
+using Phantom.Controller.Database.Entities;
-using Phantom.Server.Minecraft;
+using Phantom.Controller.Minecraft;
-using Phantom.Server.Services.Agents;
+using Phantom.Controller.Services.Agents;
 using Phantom.Utils.Collections;
 using Phantom.Utils.Events;
 using ILogger = Serilog.ILogger;
 
-namespace Phantom.Server.Services.Instances;
+namespace Phantom.Controller.Services.Instances;
 
 public sealed class InstanceManager {
 	private static readonly ILogger Logger = PhantomLogger.Create<InstanceManager>();

Controller/Phantom.Controller.Services/Phantom.Controller.Services.csproj

@@ -5,10 +5,6 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   
-  <PropertyGroup>
-    <RootNamespace>Phantom.Server.Services</RootNamespace>
-  </PropertyGroup>
-  
   <PropertyGroup>
     <OutputType>Library</OutputType>
   </PropertyGroup>

Controller/Phantom.Controller.Services/Rpc/MessageToServerListener.cs

@@ -4,14 +4,14 @@ using Phantom.Common.Messages;
 using Phantom.Common.Messages.BiDirectional;
 using Phantom.Common.Messages.ToAgent;
 using Phantom.Common.Messages.ToServer;
-using Phantom.Server.Rpc;
+using Phantom.Controller.Rpc;
-using Phantom.Server.Services.Agents;
+using Phantom.Controller.Services.Agents;
-using Phantom.Server.Services.Events;
+using Phantom.Controller.Services.Events;
-using Phantom.Server.Services.Instances;
+using Phantom.Controller.Services.Instances;
 using Phantom.Utils.Rpc.Message;
 using Phantom.Utils.Tasks;
 
-namespace Phantom.Server.Services.Rpc;
+namespace Phantom.Controller.Services.Rpc;
 
 public sealed class MessageToServerListener : IMessageToServerListener {
 	private readonly RpcClientConnection connection;

Controller/Phantom.Controller.Services/Rpc/MessageToServerListenerFactory.cs

@@ -1,9 +1,9 @@
-using Phantom.Server.Rpc;
+using Phantom.Controller.Rpc;
-using Phantom.Server.Services.Agents;
+using Phantom.Controller.Services.Agents;
-using Phantom.Server.Services.Events;
+using Phantom.Controller.Services.Events;
-using Phantom.Server.Services.Instances;
+using Phantom.Controller.Services.Instances;
 
-namespace Phantom.Server.Services.Rpc; 
+namespace Phantom.Controller.Services.Rpc; 
 
 public sealed class MessageToServerListenerFactory {
 	private readonly ServiceConfiguration configuration;

Controller/Phantom.Controller.Services/ServiceConfiguration.cs

@@ -1,4 +1,4 @@
-namespace Phantom.Server.Services;
+namespace Phantom.Controller.Services;
 
 public sealed record ServiceConfiguration(
 	string Version,

Controller/Phantom.Controller.Services/Users/AddRoleError.cs

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

Controller/Phantom.Controller.Services/Users/AddUserError.cs

@@ -1,6 +1,6 @@
 using System.Collections.Immutable;
 
-namespace Phantom.Server.Services.Users;
+namespace Phantom.Controller.Services.Users;
 
 public abstract record AddUserError {
 	private AddUserError() {}

Controller/Phantom.Controller.Services/Users/DeleteUserResult.cs

@@ -1,4 +1,4 @@
-namespace Phantom.Server.Services.Users; 
+namespace Phantom.Controller.Services.Users; 
 
 public enum DeleteUserResult : byte {
 	Deleted,

Controller/Phantom.Controller.Services/Users/PasswordRequirementViolation.cs

@@ -1,4 +1,4 @@
-namespace Phantom.Server.Services.Users;
+namespace Phantom.Controller.Services.Users;
 
 public abstract record PasswordRequirementViolation {
 	private PasswordRequirementViolation() {}

Controller/Phantom.Controller.Services/Users/RoleManager.cs

@@ -1,13 +1,13 @@
 using System.Collections.Immutable;
 using Microsoft.EntityFrameworkCore;
 using Phantom.Common.Logging;
-using Phantom.Server.Database;
+using Phantom.Controller.Database;
-using Phantom.Server.Database.Entities;
+using Phantom.Controller.Database.Entities;
 using Phantom.Utils.Collections;
 using Phantom.Utils.Tasks;
 using ILogger = Serilog.ILogger;
 
-namespace Phantom.Server.Services.Users;
+namespace Phantom.Controller.Services.Users;
 
 public sealed class RoleManager {
 	private static readonly ILogger Logger = PhantomLogger.Create<RoleManager>();

Controller/Phantom.Controller.Services/Users/SetUserPasswordError.cs

@@ -1,6 +1,6 @@
 using System.Collections.Immutable;
 
-namespace Phantom.Server.Services.Users;
+namespace Phantom.Controller.Services.Users;
 
 public abstract record SetUserPasswordError {
 	private SetUserPasswordError() {}

Controller/Phantom.Controller.Services/Users/UserManager.cs

@@ -3,13 +3,13 @@ using System.Security.Claims;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.EntityFrameworkCore;
 using Phantom.Common.Logging;
-using Phantom.Server.Database;
+using Phantom.Controller.Database;
-using Phantom.Server.Database.Entities;
+using Phantom.Controller.Database.Entities;
 using Phantom.Utils.Collections;
 using Phantom.Utils.Tasks;
 using ILogger = Serilog.ILogger;
 
-namespace Phantom.Server.Services.Users;
+namespace Phantom.Controller.Services.Users;
 
 public sealed class UserManager {
 	private static readonly ILogger Logger = PhantomLogger.Create<UserManager>();

Controller/Phantom.Controller.Services/Users/UserPasswords.cs

@@ -1,8 +1,8 @@
 using System.Collections.Immutable;
 using Microsoft.AspNetCore.Identity;
-using Phantom.Server.Database.Entities;
+using Phantom.Controller.Database.Entities;
 
-namespace Phantom.Server.Services.Users;
+namespace Phantom.Controller.Services.Users;
 
 internal static class UserPasswords {
 	private static PasswordHasher<UserEntity> Hasher { get; } = new ();

Controller/Phantom.Controller.Services/Users/UserRoleManager.cs

@@ -1,12 +1,12 @@
 using System.Collections.Immutable;
 using Microsoft.EntityFrameworkCore;
 using Phantom.Common.Logging;
-using Phantom.Server.Database;
+using Phantom.Controller.Database;
-using Phantom.Server.Database.Entities;
+using Phantom.Controller.Database.Entities;
 using Phantom.Utils.Collections;
 using ILogger = Serilog.ILogger;
 
-namespace Phantom.Server.Services.Users;
+namespace Phantom.Controller.Services.Users;
 
 public sealed class UserRoleManager {
 	private static readonly ILogger Logger = PhantomLogger.Create<UserRoleManager>();

Controller/Phantom.Controller/CertificateFiles.cs

@@ -5,7 +5,7 @@ using Phantom.Utils.Cryptography;
 using Phantom.Utils.IO;
 using Serilog;
 
-namespace Phantom.Server;
+namespace Phantom.Controller;
 
 static class CertificateFiles {
 	private static ILogger Logger { get; } = PhantomLogger.Create(nameof(CertificateFiles));

Controller/Phantom.Controller/Phantom.Controller.csproj

@@ -5,10 +5,6 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   
-  <PropertyGroup>
-    <RootNamespace>Phantom.Server</RootNamespace>
-  </PropertyGroup>
-  
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>

Controller/Phantom.Controller/Program.cs

@@ -2,18 +2,18 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Phantom.Common.Logging;
-using Phantom.Server;
+using Phantom.Controller;
-using Phantom.Server.Database.Postgres;
+using Phantom.Controller.Database.Postgres;
-using Phantom.Server.Rpc;
+using Phantom.Controller.Rpc;
-using Phantom.Server.Services;
+using Phantom.Controller.Services;
-using Phantom.Server.Services.Rpc;
+using Phantom.Controller.Services.Rpc;
 using Phantom.Utils.Cryptography;
 using Phantom.Utils.IO;
 using Phantom.Utils.Rpc;
 using Phantom.Utils.Runtime;
 using Phantom.Utils.Tasks;
-using WebConfiguration = Phantom.Server.Web.Configuration;
+using WebConfiguration = Phantom.Web.Configuration;
-using WebLauncher = Phantom.Server.Web.Launcher;
+using WebLauncher = Phantom.Web.Launcher;
 
 var cancellationTokenSource = new CancellationTokenSource();
 

Controller/Phantom.Controller/Variables.cs

@@ -2,7 +2,7 @@
 using Phantom.Common.Logging;
 using Phantom.Utils.Runtime;
 
-namespace Phantom.Server;
+namespace Phantom.Controller;
 
 sealed record Variables(
 	string WebServerHost,

Controller/Phantom.Controller/WebConfigurator.cs

@@ -1,16 +1,16 @@
 using Microsoft.Extensions.DependencyInjection;
 using Phantom.Common.Data.Agent;
-using Phantom.Server.Minecraft;
+using Phantom.Controller.Minecraft;
-using Phantom.Server.Services;
+using Phantom.Controller.Services;
-using Phantom.Server.Services.Agents;
+using Phantom.Controller.Services.Agents;
-using Phantom.Server.Services.Audit;
+using Phantom.Controller.Services.Audit;
-using Phantom.Server.Services.Events;
+using Phantom.Controller.Services.Events;
-using Phantom.Server.Services.Instances;
+using Phantom.Controller.Services.Instances;
-using Phantom.Server.Services.Rpc;
+using Phantom.Controller.Services.Rpc;
 using Phantom.Utils.Tasks;
-using WebLauncher = Phantom.Server.Web.Launcher;
+using WebLauncher = Phantom.Web.Launcher;
 
-namespace Phantom.Server;
+namespace Phantom.Controller;
 
 sealed class WebConfigurator : WebLauncher.IConfigurator {
 	private readonly ServiceConfiguration serviceConfiguration;

Web/Phantom.Web.Components/Dialogs/Modal.razor

@@ -1,4 +1,4 @@
-@using Phantom.Server.Web.Components.Utils
+@using Phantom.Web.Components.Utils
 <div id="@Id" class="modal fade" tabindex="-1">
   <div class="modal-dialog modal-dialog-centered">
     <div class="modal-content">

Web/Phantom.Web.Components/Forms/Base/FormInputBase.cs

@@ -1,7 +1,7 @@
 using System.Linq.Expressions;
 using Microsoft.AspNetCore.Components;
 
-namespace Phantom.Server.Web.Components.Forms.Base;
+namespace Phantom.Web.Components.Forms.Base;
 
 public abstract class FormInputBase<TValue> : ComponentBase {
 	[Parameter, EditorRequired]

Web/Phantom.Web.Components/Forms/Base/FormInputBaseDebounced.cs

@@ -1,9 +1,9 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.AspNetCore.Components.Web;
-using Phantom.Server.Web.Components.Utils;
+using Phantom.Web.Components.Utils;
 
-namespace Phantom.Server.Web.Components.Forms.Base;
+namespace Phantom.Web.Components.Forms.Base;
 
 public abstract class FormInputBaseDebounced<TValue> : FormInputBase<TValue>, IDisposable {
 	private const uint DefaultDebounceMillis = 700;

Web/Phantom.Web.Components/Forms/Base/ICustomFormField.cs

@@ -1,4 +1,4 @@
-namespace Phantom.Server.Web.Components.Forms.Base; 
+namespace Phantom.Web.Components.Forms.Base; 
 
 public interface ICustomFormField {
 	bool TwoWayValueBinding { get; set; }

Web/Phantom.Web.Components/Forms/Fields/InputFieldNumeric.cs

@@ -4,9 +4,9 @@ using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.AspNetCore.Components.Rendering;
 using Microsoft.AspNetCore.Components.Web;
-using Phantom.Server.Web.Components.Forms.Base;
+using Phantom.Web.Components.Forms.Base;
 
-namespace Phantom.Server.Web.Components.Forms.Fields;
+namespace Phantom.Web.Components.Forms.Fields;
 
 public sealed class InputFieldNumeric<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] TValue> : InputBase<TValue>, ICustomFormField {
 	[Parameter]

Web/Phantom.Web.Components/Forms/Fields/InputFieldText.cs

@@ -3,9 +3,9 @@ using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.AspNetCore.Components.Rendering;
 using Microsoft.AspNetCore.Components.Web;
-using Phantom.Server.Web.Components.Forms.Base;
+using Phantom.Web.Components.Forms.Base;
 
-namespace Phantom.Server.Web.Components.Forms.Fields;
+namespace Phantom.Web.Components.Forms.Fields;
 
 public sealed class InputFieldText : InputBase<string?>, ICustomFormField {
 	[Parameter]

Web/Phantom.Web.Components/Forms/FormButtonSubmit.cs

@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Rendering;
-using Phantom.Server.Web.Components.Utils;
+using Phantom.Web.Components.Utils;
 
-namespace Phantom.Server.Web.Components.Forms;
+namespace Phantom.Web.Components.Forms;
 
 public sealed class FormButtonSubmit : ComponentBase {
 	[Parameter]

Web/Phantom.Web.Components/Forms/FormLabel.razor

@@ -1,4 +1,4 @@
-@using Phantom.Server.Web.Components.Utils
+@using Phantom.Web.Components.Utils
 @if (Label != null) {
   <label for="@Id" class="form-label">@Label</label>
 }

Web/Phantom.Web.Components/Forms/FormModel.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Components.Forms;
-using Phantom.Server.Web.Components.Utils;
+using Phantom.Web.Components.Utils;
 
-namespace Phantom.Server.Web.Components.Forms; 
+namespace Phantom.Web.Components.Forms; 
 
 public abstract class FormModel {
 	public EditContext EditContext { get; }

Web/Phantom.Web.Components/Forms/FormNumberInputType.cs

@@ -1,4 +1,4 @@
-namespace Phantom.Server.Web.Components.Forms;
+namespace Phantom.Web.Components.Forms;
 
 public enum FormNumberInputType {
 	Number,

Web/Phantom.Web.Components/Forms/FormSubmitError.razor

@@ -1,4 +1,4 @@
-@using Phantom.Server.Web.Components.Utils
+@using Phantom.Web.Components.Utils
 @if (messageLines.Length > 0) {
   <div class="form-submit-errors text-danger">
     @for (int i = 0; i < messageLines.Length; i++) {

Web/Phantom.Web.Components/Forms/FormTextInputType.cs

@@ -1,4 +1,4 @@
-namespace Phantom.Server.Web.Components.Forms;
+namespace Phantom.Web.Components.Forms;
 
 public enum FormTextInputType {
 	Text,