diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.Admin/Security/ILdapAuthService.cs b/src/Server/ZB.MOM.WW.OtOpcUa.Security/Ldap/ILdapAuthService.cs
similarity index 77%
rename from src/Server/ZB.MOM.WW.OtOpcUa.Admin/Security/ILdapAuthService.cs
rename to src/Server/ZB.MOM.WW.OtOpcUa.Security/Ldap/ILdapAuthService.cs
index 17f6e00..d4c7c6d 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.Admin/Security/ILdapAuthService.cs
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.Security/Ldap/ILdapAuthService.cs
@@ -1,4 +1,4 @@
-namespace ZB.MOM.WW.OtOpcUa.Admin.Security;
+namespace ZB.MOM.WW.OtOpcUa.Security.Ldap;
 
 public interface ILdapAuthService
 {
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.Admin/Security/LdapAuthResult.cs b/src/Server/ZB.MOM.WW.OtOpcUa.Security/Ldap/LdapAuthResult.cs
similarity index 87%
rename from src/Server/ZB.MOM.WW.OtOpcUa.Admin/Security/LdapAuthResult.cs
rename to src/Server/ZB.MOM.WW.OtOpcUa.Security/Ldap/LdapAuthResult.cs
index 9e7de44..4ca801e 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.Admin/Security/LdapAuthResult.cs
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.Security/Ldap/LdapAuthResult.cs
@@ -1,4 +1,4 @@
-namespace ZB.MOM.WW.OtOpcUa.Admin.Security;
+namespace ZB.MOM.WW.OtOpcUa.Security.Ldap;
 
 /// <summary>Outcome of an LDAP bind attempt. <see cref="Roles"/> is the mapped-set of Admin roles.</summary>
 public sealed record LdapAuthResult(
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.Admin/Security/LdapAuthService.cs b/src/Server/ZB.MOM.WW.OtOpcUa.Security/Ldap/LdapAuthService.cs
similarity index 99%
rename from src/Server/ZB.MOM.WW.OtOpcUa.Admin/Security/LdapAuthService.cs
rename to src/Server/ZB.MOM.WW.OtOpcUa.Security/Ldap/LdapAuthService.cs
index 5328457..55191eb 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.Admin/Security/LdapAuthService.cs
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.Security/Ldap/LdapAuthService.cs
@@ -2,7 +2,7 @@ using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Novell.Directory.Ldap;
 
-namespace ZB.MOM.WW.OtOpcUa.Admin.Security;
+namespace ZB.MOM.WW.OtOpcUa.Security.Ldap;
 
 /// <summary>
 ///     LDAP bind-and-search authentication mirrored from ScadaLink's <c>LdapAuthService</c>
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.Admin/Security/LdapOptions.cs b/src/Server/ZB.MOM.WW.OtOpcUa.Security/Ldap/LdapOptions.cs
similarity index 97%
rename from src/Server/ZB.MOM.WW.OtOpcUa.Admin/Security/LdapOptions.cs
rename to src/Server/ZB.MOM.WW.OtOpcUa.Security/Ldap/LdapOptions.cs
index 45d3e3d..ac2e71a 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.Admin/Security/LdapOptions.cs
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.Security/Ldap/LdapOptions.cs
@@ -1,4 +1,4 @@
-namespace ZB.MOM.WW.OtOpcUa.Admin.Security;
+namespace ZB.MOM.WW.OtOpcUa.Security.Ldap;
 
 /// <summary>
 ///     LDAP + role-mapping configuration for the Admin UI. Bound from <c>appsettings.json</c>
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.Admin/Security/RoleMapper.cs b/src/Server/ZB.MOM.WW.OtOpcUa.Security/Ldap/RoleMapper.cs
similarity index 94%
rename from src/Server/ZB.MOM.WW.OtOpcUa.Admin/Security/RoleMapper.cs
rename to src/Server/ZB.MOM.WW.OtOpcUa.Security/Ldap/RoleMapper.cs
index 4b291f7..fd892ed 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.Admin/Security/RoleMapper.cs
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.Security/Ldap/RoleMapper.cs
@@ -1,4 +1,4 @@
-namespace ZB.MOM.WW.OtOpcUa.Admin.Security;
+namespace ZB.MOM.WW.OtOpcUa.Security.Ldap;
 
 /// <summary>
 ///     Deterministic LDAP-group-to-Admin-role mapper driven by <see cref="LdapOptions.GroupToRole"/>.