diff --git a/MinecraftClient/MinecraftClient.csproj b/MinecraftClient/MinecraftClient.csproj
index dc64c04b..3410ba2c 100644
--- a/MinecraftClient/MinecraftClient.csproj
+++ b/MinecraftClient/MinecraftClient.csproj
@@ -219,9 +219,9 @@
     <Compile Include="Protocol\IMinecraftCom.cs" />
     <Compile Include="Protocol\IMinecraftComHandler.cs" />
     <Compile Include="Protocol\ProtocolHandler.cs" />
-    <Compile Include="Protocol\SessionCache\CacheType.cs" />
-    <Compile Include="Protocol\SessionCache\SessionCache.cs" />
-    <Compile Include="Protocol\SessionToken.cs" />
+    <Compile Include="Protocol\Session\CacheType.cs" />
+    <Compile Include="Protocol\Session\SessionCache.cs" />
+    <Compile Include="Protocol\Session\SessionToken.cs" />
     <Compile Include="Proxy\ProxyHandler.cs" />
     <Compile Include="Proxy\Handlers\EventArgs\CreateConnectionAsyncCompletedEventArgs.cs" />
     <Compile Include="Proxy\Handlers\Exceptions\ProxyException.cs" />
diff --git a/MinecraftClient/Program.cs b/MinecraftClient/Program.cs
index fb8d2549..5281ffed 100644
--- a/MinecraftClient/Program.cs
+++ b/MinecraftClient/Program.cs
@@ -6,7 +6,7 @@ using MinecraftClient.Protocol;
 using System.Reflection;
 using System.Threading;
 using MinecraftClient.Protocol.Handlers.Forge;
-using MinecraftClient.Protocol.SessionCache;
+using MinecraftClient.Protocol.Session;
 using MinecraftClient.WinAPI;
 
 namespace MinecraftClient
diff --git a/MinecraftClient/Protocol/ProtocolHandler.cs b/MinecraftClient/Protocol/ProtocolHandler.cs
index b0e0f047..97200473 100644
--- a/MinecraftClient/Protocol/ProtocolHandler.cs
+++ b/MinecraftClient/Protocol/ProtocolHandler.cs
@@ -2,11 +2,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using MinecraftClient.Protocol.Handlers;
-using MinecraftClient.Proxy;
 using System.Net.Sockets;
 using System.Net.Security;
+using MinecraftClient.Proxy;
+using MinecraftClient.Protocol.Handlers;
 using MinecraftClient.Protocol.Handlers.Forge;
+using MinecraftClient.Protocol.Session;
 
 namespace MinecraftClient.Protocol
 {
diff --git a/MinecraftClient/Protocol/Session/CacheType.cs b/MinecraftClient/Protocol/Session/CacheType.cs
new file mode 100644
index 00000000..81faed00
--- /dev/null
+++ b/MinecraftClient/Protocol/Session/CacheType.cs
@@ -0,0 +1,20 @@
+namespace MinecraftClient.Protocol.Session
+{
+    public enum CacheType
+    {
+        /// <summary>
+        /// Do not perform any session caching, always perform login requests from scratch.
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// Cache session information in memory to reuse session tokens across server joins.
+        /// </summary>
+        Memory,
+
+        /// <summary>
+        /// Cache session information in a SessionCache file to share session tokens between different MCC instances.
+        /// </summary>
+        Disk
+    };
+}
diff --git a/MinecraftClient/Protocol/SessionCache/SessionCache.cs b/MinecraftClient/Protocol/Session/SessionCache.cs
similarity index 97%
rename from MinecraftClient/Protocol/SessionCache/SessionCache.cs
rename to MinecraftClient/Protocol/Session/SessionCache.cs
index 6e65a4fb..b388018c 100644
--- a/MinecraftClient/Protocol/SessionCache/SessionCache.cs
+++ b/MinecraftClient/Protocol/Session/SessionCache.cs
@@ -6,7 +6,7 @@ using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters.Binary;
 using System.Timers;
 
-namespace MinecraftClient.Protocol.SessionCache
+namespace MinecraftClient.Protocol.Session
 {
     /// <summary>
     /// Handle sessions caching and storage.
diff --git a/MinecraftClient/Protocol/SessionToken.cs b/MinecraftClient/Protocol/Session/SessionToken.cs
similarity index 97%
rename from MinecraftClient/Protocol/SessionToken.cs
rename to MinecraftClient/Protocol/Session/SessionToken.cs
index e7b52f64..8e784673 100644
--- a/MinecraftClient/Protocol/SessionToken.cs
+++ b/MinecraftClient/Protocol/Session/SessionToken.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace MinecraftClient.Protocol
+namespace MinecraftClient.Protocol.Session
 {
     [Serializable]
     public class SessionToken
diff --git a/MinecraftClient/Protocol/SessionCache/CacheType.cs b/MinecraftClient/Protocol/SessionCache/CacheType.cs
deleted file mode 100644
index 886d61f9..00000000
--- a/MinecraftClient/Protocol/SessionCache/CacheType.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace MinecraftClient.Protocol.SessionCache
-{
-    public enum CacheType { None, Memory, Disk };
-}
diff --git a/MinecraftClient/Settings.cs b/MinecraftClient/Settings.cs
index 31ae1b08..fcd2087f 100644
--- a/MinecraftClient/Settings.cs
+++ b/MinecraftClient/Settings.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.IO;
 using System.Text.RegularExpressions;
-using MinecraftClient.Protocol.SessionCache;
+using MinecraftClient.Protocol.Session;
 using MinecraftClient.Protocol;
 
 namespace MinecraftClient