diff --git a/src/Robware.Api.Auth/ApiKey/ApiKeyAuthenticationHandler.cs b/src/Robware.Api.Auth/Authentication/ApiKeyAuthenticationHandler.cs
similarity index 97%
rename from src/Robware.Api.Auth/ApiKey/ApiKeyAuthenticationHandler.cs
rename to src/Robware.Api.Auth/Authentication/ApiKeyAuthenticationHandler.cs
index a0cb84f..2e304c4 100644
--- a/src/Robware.Api.Auth/ApiKey/ApiKeyAuthenticationHandler.cs
+++ b/src/Robware.Api.Auth/Authentication/ApiKeyAuthenticationHandler.cs
@@ -8,7 +8,7 @@ using System.Security.Claims;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
 
-namespace Robware.Api.Auth.ApiKey {
+namespace Robware.Api.Auth.Authentication {
 	public class ApiKeyAuthenticationHandler : AuthenticationHandler<ApiKeyAuthenticationOptions> {
 		private const string ApiKeyHeaderName = "X-Api-Key";
 		private readonly IApiKeyValidator _apiKeyValidator;
diff --git a/src/Robware.Api.Auth/ApiKey/ApiKeyAuthenticationOptions.cs b/src/Robware.Api.Auth/Authentication/ApiKeyAuthenticationOptions.cs
similarity index 85%
rename from src/Robware.Api.Auth/ApiKey/ApiKeyAuthenticationOptions.cs
rename to src/Robware.Api.Auth/Authentication/ApiKeyAuthenticationOptions.cs
index 931827c..50ec322 100644
--- a/src/Robware.Api.Auth/ApiKey/ApiKeyAuthenticationOptions.cs
+++ b/src/Robware.Api.Auth/Authentication/ApiKeyAuthenticationOptions.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Authentication;
 
-namespace Robware.Api.Auth.ApiKey {
+namespace Robware.Api.Auth.Authentication {
 	public class ApiKeyAuthenticationOptions : AuthenticationSchemeOptions {
 		public const string DefaultScheme = "API Key";
 		public string Scheme => DefaultScheme;
diff --git a/src/Robware.Api.Auth/ApiKey/AuthenticationBuilderExtensions.cs b/src/Robware.Api.Auth/Authentication/AuthenticationBuilderExtensions.cs
similarity index 90%
rename from src/Robware.Api.Auth/ApiKey/AuthenticationBuilderExtensions.cs
rename to src/Robware.Api.Auth/Authentication/AuthenticationBuilderExtensions.cs
index 15bd21e..8f0306c 100644
--- a/src/Robware.Api.Auth/ApiKey/AuthenticationBuilderExtensions.cs
+++ b/src/Robware.Api.Auth/Authentication/AuthenticationBuilderExtensions.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Authentication;
 using System;
 
-namespace Robware.Api.Auth.ApiKey {
+namespace Robware.Api.Auth.Authentication {
 	public static class AuthenticationBuilderExtensions {
 		public static AuthenticationBuilder AddApiKeySupport(this AuthenticationBuilder authenticationBuilder, Action<ApiKeyAuthenticationOptions> options) {
 			return authenticationBuilder.AddScheme<ApiKeyAuthenticationOptions, ApiKeyAuthenticationHandler>(ApiKeyAuthenticationOptions.DefaultScheme, options);
diff --git a/src/Robware.Api.Auth/Startup.cs b/src/Robware.Api.Auth/Startup.cs
index 4c28976..8e952b8 100644
--- a/src/Robware.Api.Auth/Startup.cs
+++ b/src/Robware.Api.Auth/Startup.cs
@@ -4,7 +4,7 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using MongoDB.Driver;
-using Robware.Api.Auth.ApiKey;
+using Robware.Api.Auth.Authentication;
 using Robware.Auth.API;
 using Robware.Auth.Users;
 using Robware.Data;