diff --git a/Projects/Server/Network/NetState/NetState.cs b/Projects/Server/Network/NetState/NetState.cs
index 8f34dc9bf..98ddb2662 100755
--- a/Projects/Server/Network/NetState/NetState.cs
+++ b/Projects/Server/Network/NetState/NetState.cs
@@ -48,7 +48,7 @@ public partial class NetState : IComparable<NetState>
     private const int MenuCap = 512;
     private const int PacketPerSecondThreshold = 3000;
 
-    private static GCHandle[] _polledStates = new GCHandle[2048];
+    private static readonly GCHandle[] _polledStates = new GCHandle[2048];
     private static readonly IPollGroup _pollGroup = PollGroup.Create();
     private static readonly Queue<NetState> _flushPending = new(2048);
     private static readonly Queue<NetState> _flushedPartials = new(256);
@@ -67,8 +67,6 @@ public partial class NetState : IComparable<NetState>
     private readonly long[] _packetCounts = new long[0x100];
     private string _disconnectReason = string.Empty;
 
-    internal int _authId;
-    internal int _seed;
     internal ParserState _parserState = ParserState.AwaitingNextPacket;
     internal ProtocolState _protocolState = ProtocolState.AwaitingSeed;
     internal GCHandle _handle;
@@ -166,6 +164,10 @@ public partial class NetState : IComparable<NetState>
         }
     }
 
+    public int AuthId { get; set; }
+
+    public int Seed { get; set; }
+
     public DateTime ConnectedOn { get; }
 
     public TimeSpan ConnectedFor => Core.Now - ConnectedOn;
@@ -611,15 +613,15 @@ public partial class NetState : IComparable<NetState>
                                 }
                                 else if (length >= 4)
                                 {
-                                    int seed = (packetId << 24) | (packetReader.ReadByte() << 16) | (packetReader.ReadByte() << 8) | packetReader.ReadByte();
+                                    int newSeed = (packetId << 24) | (packetReader.ReadByte() << 16) | (packetReader.ReadByte() << 8) | packetReader.ReadByte();
 
-                                    if (seed == 0)
+                                    if (newSeed == 0)
                                     {
                                         HandleError(0, 0);
                                         return;
                                     }
 
-                                    _seed = seed;
+                                    Seed = newSeed;
                                     packetLength = 4;
 
                                     _parserState = ParserState.AwaitingNextPacket;
diff --git a/Projects/Server/Network/Packets/IncomingAccountPackets.cs b/Projects/UOContent/Network/Packets/IncomingAccountPackets.cs
similarity index 94%
rename from Projects/Server/Network/Packets/IncomingAccountPackets.cs
rename to Projects/UOContent/Network/Packets/IncomingAccountPackets.cs
index c67c50c0c..7f2a2dabe 100644
--- a/Projects/Server/Network/Packets/IncomingAccountPackets.cs
+++ b/Projects/UOContent/Network/Packets/IncomingAccountPackets.cs
@@ -22,9 +22,9 @@ namespace Server.Network;
 
 public static class IncomingAccountPackets
 {
-    private const int m_AuthIDWindowSize = 128;
-    private static readonly Dictionary<int, AuthIDPersistence> m_AuthIDWindow =
-        new(m_AuthIDWindowSize);
+    private const int _authIDWindowSize = 128;
+    private static readonly Dictionary<int, AuthIDPersistence> _authIDWindow =
+        new(_authIDWindowSize);
 
     internal struct AuthIDPersistence
     {
@@ -311,12 +311,12 @@ public static class IncomingAccountPackets
 
     private static int GenerateAuthID(this NetState state)
     {
-        if (m_AuthIDWindow.Count == m_AuthIDWindowSize)
+        if (_authIDWindow.Count == _authIDWindowSize)
         {
             var oldestID = 0;
             var oldest = DateTime.MaxValue;
 
-            foreach (var (key, authId) in m_AuthIDWindow)
+            foreach (var (key, authId) in _authIDWindow)
             {
                 if (authId.Age < oldest)
                 {
@@ -325,7 +325,7 @@ public static class IncomingAccountPackets
                 }
             }
 
-            m_AuthIDWindow.Remove(oldestID);
+            _authIDWindow.Remove(oldestID);
         }
 
         int authID;
@@ -338,9 +338,9 @@ public static class IncomingAccountPackets
             {
                 authID |= 1 << 31;
             }
-        } while (m_AuthIDWindow.ContainsKey(authID));
+        } while (_authIDWindow.ContainsKey(authID));
 
-        m_AuthIDWindow[authID] = new AuthIDPersistence(state.Version);
+        _authIDWindow[authID] = new AuthIDPersistence(state.Version);
 
         return authID;
     }
@@ -357,22 +357,22 @@ public static class IncomingAccountPackets
 
         state.SentFirstPacket = true;
 
-        var authID = reader.ReadInt32();
+        var authId = reader.ReadInt32();
 
-        if (!m_AuthIDWindow.TryGetValue(authID, out var ap))
+        if (!_authIDWindow.TryGetValue(authId, out var ap))
         {
             state.LogInfo("Invalid client detected, disconnecting...");
             state.Disconnect("Unable to find auth id.");
         }
 
-        if (state._authId != 0 && authID != state._authId || state._authId == 0 && authID != state._seed)
+        if (state.AuthId != 0 && authId != state.AuthId || state.AuthId == 0 && authId != state.Seed)
         {
             state.LogInfo("Invalid client detected, disconnecting...");
             state.Disconnect("Invalid auth id in game login packet.");
             return;
         }
 
-        m_AuthIDWindow.Remove(authID);
+        _authIDWindow.Remove(authId);
         state.Version = ap.Version;
 
         var username = reader.ReadAscii(30);
@@ -413,19 +413,19 @@ public static class IncomingAccountPackets
         {
             var si = info[index];
 
-            state._authId = GenerateAuthID(state);
+            state.AuthId = GenerateAuthID(state);
 
             state.SentFirstPacket = false;
-            state.SendPlayServerAck(si, state._authId);
+            state.SendPlayServerAck(si, state.AuthId);
         }
     }
 
     public static void LoginServerSeed(NetState state, CircularBufferReader reader, int packetLength)
     {
-        state._seed = reader.ReadInt32();
+        state.Seed = reader.ReadInt32();
         state.Seeded = true;
 
-        if (state._seed == 0)
+        if (state.Seed == 0)
         {
             state.LogInfo("Invalid client detected, disconnecting");
             state.Disconnect("Duplicate seed sent.");
diff --git a/Projects/Server/Network/Packets/IncomingEntityPackets.cs b/Projects/UOContent/Network/Packets/IncomingEntityPackets.cs
similarity index 100%
rename from Projects/Server/Network/Packets/IncomingEntityPackets.cs
rename to Projects/UOContent/Network/Packets/IncomingEntityPackets.cs
diff --git a/Projects/Server/Network/Packets/IncomingExtendedCommandPackets.cs b/Projects/UOContent/Network/Packets/IncomingExtendedCommandPackets.cs
similarity index 100%
rename from Projects/Server/Network/Packets/IncomingExtendedCommandPackets.cs
rename to Projects/UOContent/Network/Packets/IncomingExtendedCommandPackets.cs
diff --git a/Projects/Server/Network/Packets/IncomingHousePackets.cs b/Projects/UOContent/Network/Packets/IncomingHousePackets.cs
similarity index 100%
rename from Projects/Server/Network/Packets/IncomingHousePackets.cs
rename to Projects/UOContent/Network/Packets/IncomingHousePackets.cs