diff --git a/src/Tgstation.Server.Host/Core/ApplicationBuilderExtensions.cs b/src/Tgstation.Server.Host/ApplicationBuilderExtensions.cs
similarity index 90%
rename from src/Tgstation.Server.Host/Core/ApplicationBuilderExtensions.cs
rename to src/Tgstation.Server.Host/ApplicationBuilderExtensions.cs
index 343053cdfd..36eaa08627 100644
--- a/src/Tgstation.Server.Host/Core/ApplicationBuilderExtensions.cs
+++ b/src/Tgstation.Server.Host/ApplicationBuilderExtensions.cs
@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Builder;
+using Tgstation.Server.Host.Security;
 
-namespace Tgstation.Server.Host.Core
+namespace Tgstation.Server.Host
 {
 	/// <summary>
 	/// Extension methods for <see cref="IApplicationBuilder"/>
diff --git a/src/Tgstation.Server.Host/Core/Application.cs b/src/Tgstation.Server.Host/Core/Application.cs
index 146d764b45..1f196815c9 100644
--- a/src/Tgstation.Server.Host/Core/Application.cs
+++ b/src/Tgstation.Server.Host/Core/Application.cs
@@ -9,6 +9,7 @@ using System;
 using System.Globalization;
 using Tgstation.Server.Host.Configuration;
 using Tgstation.Server.Host.Models;
+using Tgstation.Server.Host.Security;
 
 namespace Tgstation.Server.Host.Core
 {
diff --git a/src/Tgstation.Server.Host/Core/HttpContextExtensions.cs b/src/Tgstation.Server.Host/HttpContextExtensions.cs
similarity index 79%
rename from src/Tgstation.Server.Host/Core/HttpContextExtensions.cs
rename to src/Tgstation.Server.Host/HttpContextExtensions.cs
index f81085d310..e3677240e9 100644
--- a/src/Tgstation.Server.Host/Core/HttpContextExtensions.cs
+++ b/src/Tgstation.Server.Host/HttpContextExtensions.cs
@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Http;
+using Tgstation.Server.Host.Security;
 
-namespace Tgstation.Server.Host.Core
+namespace Tgstation.Server.Host
 {
 	/// <summary>
 	/// Extension methods for <see cref="HttpContext"/>
@@ -12,6 +13,6 @@ namespace Tgstation.Server.Host.Core
 		/// </summary>
 		/// <param name="httpContext">The <see cref="HttpContext"/> containing the <see cref="IAuthenticationContext"/></param>
 		/// <returns>The <see cref="IAuthenticationContext"/> associated with the <see cref="HttpContext"/></returns>
-		public static IAuthenticationContext AuthenticationContext(this HttpContext httpContext) => Core.AuthenticationContext.Current(httpContext);
+		public static IAuthenticationContext AuthenticationContext(this HttpContext httpContext) => Security.AuthenticationContext.Current(httpContext);
 	}
 }
diff --git a/src/Tgstation.Server.Host/Models/DatabaseSeeder.cs b/src/Tgstation.Server.Host/Models/DatabaseSeeder.cs
index 75d4615c3e..bd6236c940 100644
--- a/src/Tgstation.Server.Host/Models/DatabaseSeeder.cs
+++ b/src/Tgstation.Server.Host/Models/DatabaseSeeder.cs
@@ -1,9 +1,8 @@
 using System;
-using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Tgstation.Server.Api.Rights;
-using Tgstation.Server.Host.Core;
+using Tgstation.Server.Host.Security;
 
 namespace Tgstation.Server.Host.Models
 {
diff --git a/src/Tgstation.Server.Host/Models/User.cs b/src/Tgstation.Server.Host/Models/User.cs
index 5dc89d9e3b..1264476db3 100644
--- a/src/Tgstation.Server.Host/Models/User.cs
+++ b/src/Tgstation.Server.Host/Models/User.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using Tgstation.Server.Host.Core;
+using Tgstation.Server.Host.Security;
 
 namespace Tgstation.Server.Host.Models
 {
diff --git a/src/Tgstation.Server.Host/Core/AuthenticationContext.cs b/src/Tgstation.Server.Host/Security/AuthenticationContext.cs
similarity index 99%
rename from src/Tgstation.Server.Host/Core/AuthenticationContext.cs
rename to src/Tgstation.Server.Host/Security/AuthenticationContext.cs
index 4737b0ad9b..3e9ac45993 100644
--- a/src/Tgstation.Server.Host/Core/AuthenticationContext.cs
+++ b/src/Tgstation.Server.Host/Security/AuthenticationContext.cs
@@ -9,7 +9,7 @@ using Tgstation.Server.Api;
 using Tgstation.Server.Host.Models;
 using Tgstation.Server.Api.Models;
 
-namespace Tgstation.Server.Host.Core
+namespace Tgstation.Server.Host.Security
 {
 	/// <summary>
 	/// Manages <see cref="Api.Models.User"/>s for a scope
diff --git a/src/Tgstation.Server.Host/Core/CryptographySuite.cs b/src/Tgstation.Server.Host/Security/CryptographySuite.cs
similarity index 98%
rename from src/Tgstation.Server.Host/Core/CryptographySuite.cs
rename to src/Tgstation.Server.Host/Security/CryptographySuite.cs
index 9cd7294780..7b04a11e4e 100644
--- a/src/Tgstation.Server.Host/Core/CryptographySuite.cs
+++ b/src/Tgstation.Server.Host/Security/CryptographySuite.cs
@@ -4,7 +4,7 @@ using System.Security.Cryptography;
 using System.Text;
 using Tgstation.Server.Host.Models;
 
-namespace Tgstation.Server.Host.Core
+namespace Tgstation.Server.Host.Security
 {
 	/// <inheritdoc />
 	sealed class CryptographySuite : ICryptographySuite
diff --git a/src/Tgstation.Server.Host/Core/IAuthenticationContext.cs b/src/Tgstation.Server.Host/Security/IAuthenticationContext.cs
similarity index 97%
rename from src/Tgstation.Server.Host/Core/IAuthenticationContext.cs
rename to src/Tgstation.Server.Host/Security/IAuthenticationContext.cs
index 81dc20535f..1b5ce33483 100644
--- a/src/Tgstation.Server.Host/Core/IAuthenticationContext.cs
+++ b/src/Tgstation.Server.Host/Security/IAuthenticationContext.cs
@@ -3,7 +3,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Tgstation.Server.Host.Models;
 
-namespace Tgstation.Server.Host.Core
+namespace Tgstation.Server.Host.Security
 {
 	/// <summary>
 	/// Represents the currently authenticated <see cref="Api.Models.User"/>
diff --git a/src/Tgstation.Server.Host/Core/ICryptographySuite.cs b/src/Tgstation.Server.Host/Security/ICryptographySuite.cs
similarity index 95%
rename from src/Tgstation.Server.Host/Core/ICryptographySuite.cs
rename to src/Tgstation.Server.Host/Security/ICryptographySuite.cs
index f773c17301..71685b1c10 100644
--- a/src/Tgstation.Server.Host/Core/ICryptographySuite.cs
+++ b/src/Tgstation.Server.Host/Security/ICryptographySuite.cs
@@ -1,6 +1,6 @@
 using Tgstation.Server.Host.Models;
 
-namespace Tgstation.Server.Host.Core
+namespace Tgstation.Server.Host.Security
 {
 	/// <summary>
 	/// Contains various cryptographic functions
diff --git a/src/Tgstation.Server.Host/Core/ISystemIdentity.cs b/src/Tgstation.Server.Host/Security/ISystemIdentity.cs
similarity index 94%
rename from src/Tgstation.Server.Host/Core/ISystemIdentity.cs
rename to src/Tgstation.Server.Host/Security/ISystemIdentity.cs
index 8901917d98..4ddf8f23fa 100644
--- a/src/Tgstation.Server.Host/Core/ISystemIdentity.cs
+++ b/src/Tgstation.Server.Host/Security/ISystemIdentity.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Tgstation.Server.Host.Core
+namespace Tgstation.Server.Host.Security
 {
 	/// <summary>
 	/// Represents a user on the current <see cref="System.Runtime.InteropServices.OSPlatform"/>
diff --git a/src/Tgstation.Server.Host/Core/ISystemIdentityFactory.cs b/src/Tgstation.Server.Host/Security/ISystemIdentityFactory.cs
similarity index 95%
rename from src/Tgstation.Server.Host/Core/ISystemIdentityFactory.cs
rename to src/Tgstation.Server.Host/Security/ISystemIdentityFactory.cs
index a0de1cda52..1d5a4a53f5 100644
--- a/src/Tgstation.Server.Host/Core/ISystemIdentityFactory.cs
+++ b/src/Tgstation.Server.Host/Security/ISystemIdentityFactory.cs
@@ -1,6 +1,6 @@
 using Tgstation.Server.Host.Models;
 
-namespace Tgstation.Server.Host.Core
+namespace Tgstation.Server.Host.Security
 {
 	/// <summary>
 	/// Factory for <see cref="ISystemIdentity"/>s
diff --git a/src/Tgstation.Server.Host/Core/ITokenManager.cs b/src/Tgstation.Server.Host/Security/ITokenManager.cs
similarity index 96%
rename from src/Tgstation.Server.Host/Core/ITokenManager.cs
rename to src/Tgstation.Server.Host/Security/ITokenManager.cs
index d34def21a2..bb94e38e48 100644
--- a/src/Tgstation.Server.Host/Core/ITokenManager.cs
+++ b/src/Tgstation.Server.Host/Security/ITokenManager.cs
@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using Tgstation.Server.Api.Models;
 
-namespace Tgstation.Server.Host.Core
+namespace Tgstation.Server.Host.Security
 {
 	/// <summary>
 	/// For creating and decoding JWTs