diff --git a/README.md b/README.md
index 60dc6af..196175c 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Firefly Framework - Identity Provider (IDP)
 
-[![CI](https://github.com/fireflyframework/fireflyframework-idp/actions/workflows/ci.yml/badge.svg)](https://github.com/fireflyframework/fireflyframework-idp/actions/workflows/ci.yml)
+[![CI](https://github.com/fireflyframework/fireflyframework-security-idp/actions/workflows/ci.yml/badge.svg)](https://github.com/fireflyframework/fireflyframework-security-idp/actions/workflows/ci.yml)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](LICENSE)
 [![Java](https://img.shields.io/badge/Java-21%2B-orange.svg)](https://openjdk.org)
 [![Spring Boot](https://img.shields.io/badge/Spring%20Boot-3.x-green.svg)](https://spring.io/projects/spring-boot)
@@ -39,10 +39,10 @@ The concrete provider is selected at runtime with the `firefly.idp.provider` pro
 
 | Provider value | Adapter module | Backend |
 | --- | --- | --- |
-| `keycloak` | [`fireflyframework-idp-keycloak`](https://github.com/fireflyframework/fireflyframework-idp-keycloak) | Keycloak Admin API + token endpoint |
-| `cognito` | [`fireflyframework-idp-aws-cognito`](https://github.com/fireflyframework/fireflyframework-idp-aws-cognito) | AWS Cognito User Pools |
-| `azure-ad` | [`fireflyframework-idp-azure-ad`](https://github.com/fireflyframework/fireflyframework-idp-azure-ad) | Microsoft Entra ID (Azure AD) |
-| `internal-db` | [`fireflyframework-idp-internal-db`](https://github.com/fireflyframework/fireflyframework-idp-internal-db) | Local database-backed identity store |
+| `keycloak` | [`fireflyframework-security-idp-keycloak`](https://github.com/fireflyframework/fireflyframework-security-idp-keycloak) | Keycloak Admin API + token endpoint |
+| `cognito` | [`fireflyframework-security-idp-aws-cognito`](https://github.com/fireflyframework/fireflyframework-security-idp-aws-cognito) | AWS Cognito User Pools |
+| `azure-ad` | [`fireflyframework-security-idp-azure-ad`](https://github.com/fireflyframework/fireflyframework-security-idp-azure-ad) | Microsoft Entra ID (Azure AD) |
+| `internal-db` | [`fireflyframework-security-idp-internal-db`](https://github.com/fireflyframework/fireflyframework-security-idp-internal-db) | Local database-backed identity store |
 
 ## Features
 
@@ -74,13 +74,13 @@ Add the core abstraction together with exactly one provider adapter. The version
     <!-- Core IDP abstraction (this module) -->
     <dependency>
         <groupId>org.fireflyframework</groupId>
-        <artifactId>fireflyframework-idp</artifactId>
+        <artifactId>fireflyframework-security-idp</artifactId>
     </dependency>
 
     <!-- Choose one provider adapter -->
     <dependency>
         <groupId>org.fireflyframework</groupId>
-        <artifactId>fireflyframework-idp-keycloak</artifactId>
+        <artifactId>fireflyframework-security-idp-keycloak</artifactId>
     </dependency>
 </dependencies>
 ```
@@ -90,7 +90,7 @@ If you are not inheriting the Firefly parent, pin the version explicitly:
 ```xml
 <dependency>
     <groupId>org.fireflyframework</groupId>
-    <artifactId>fireflyframework-idp</artifactId>
+    <artifactId>fireflyframework-security-idp</artifactId>
     <version>26.05.08</version>
 </dependency>
 ```
@@ -110,8 +110,8 @@ With the chosen adapter on the classpath, its `IdpAdapter` bean is auto-configur
 **2. Or consume the `IdpAdapter` directly** from your own services:
 
 ```java
-import org.fireflyframework.idp.adapter.IdpAdapter;
-import org.fireflyframework.idp.dtos.*;
+import org.fireflyframework.security.idp.adapter.IdpAdapter;
+import org.fireflyframework.security.idp.dtos.*;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Mono;
@@ -207,7 +207,7 @@ Adapters wrap their authentication calls with `IdpMetrics.timedAuthentication(pr
 ## Documentation
 
 - Firefly Framework documentation hub and module catalog: [github.com/fireflyframework](https://github.com/fireflyframework)
-- Provider adapters: [Keycloak](https://github.com/fireflyframework/fireflyframework-idp-keycloak) · [AWS Cognito](https://github.com/fireflyframework/fireflyframework-idp-aws-cognito) · [Azure AD](https://github.com/fireflyframework/fireflyframework-idp-azure-ad) · [Internal DB](https://github.com/fireflyframework/fireflyframework-idp-internal-db)
+- Provider adapters: [Keycloak](https://github.com/fireflyframework/fireflyframework-security-idp-keycloak) · [AWS Cognito](https://github.com/fireflyframework/fireflyframework-security-idp-aws-cognito) · [Azure AD](https://github.com/fireflyframework/fireflyframework-security-idp-azure-ad) · [Internal DB](https://github.com/fireflyframework/fireflyframework-security-idp-internal-db)
 
 ## Contributing
 
diff --git a/pom.xml b/pom.xml
index 9ce0e2d..b53c1e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
         <relativePath/>
     </parent>
 
-    <artifactId>fireflyframework-idp</artifactId>
+    <artifactId>fireflyframework-security-idp</artifactId>
     <version>26.06.01</version>
     <packaging>jar</packaging>
 
diff --git a/src/main/java/org/fireflyframework/idp/adapter/IdpAdapter.java b/src/main/java/org/fireflyframework/security/idp/adapter/IdpAdapter.java
similarity index 80%
rename from src/main/java/org/fireflyframework/idp/adapter/IdpAdapter.java
rename to src/main/java/org/fireflyframework/security/idp/adapter/IdpAdapter.java
index e6cd03e..34b4b1e 100644
--- a/src/main/java/org/fireflyframework/idp/adapter/IdpAdapter.java
+++ b/src/main/java/org/fireflyframework/security/idp/adapter/IdpAdapter.java
@@ -15,17 +15,17 @@
  */
 
 
-package org.fireflyframework.idp.adapter;
+package org.fireflyframework.security.idp.adapter;
 
-import org.fireflyframework.idp.dtos.CreateUserRequest;
-import org.fireflyframework.idp.dtos.CreateUserResponse;
-import org.fireflyframework.idp.dtos.RegisterUserRequest;
-import org.fireflyframework.idp.port.AuthenticationPort;
-import org.fireflyframework.idp.port.MfaPort;
-import org.fireflyframework.idp.port.RoleScopePort;
-import org.fireflyframework.idp.port.SessionPort;
-import org.fireflyframework.idp.port.TokenIntrospectionPort;
-import org.fireflyframework.idp.port.UserAdminPort;
+import org.fireflyframework.security.idp.dtos.CreateUserRequest;
+import org.fireflyframework.security.idp.dtos.CreateUserResponse;
+import org.fireflyframework.security.idp.dtos.RegisterUserRequest;
+import org.fireflyframework.security.idp.port.AuthenticationPort;
+import org.fireflyframework.security.idp.port.MfaPort;
+import org.fireflyframework.security.idp.port.RoleScopePort;
+import org.fireflyframework.security.idp.port.SessionPort;
+import org.fireflyframework.security.idp.port.TokenIntrospectionPort;
+import org.fireflyframework.security.idp.port.UserAdminPort;
 import org.springframework.http.ResponseEntity;
 import reactor.core.publisher.Mono;
 
diff --git a/src/main/java/org/fireflyframework/idp/config/IdpProperties.java b/src/main/java/org/fireflyframework/security/idp/config/IdpProperties.java
similarity index 90%
rename from src/main/java/org/fireflyframework/idp/config/IdpProperties.java
rename to src/main/java/org/fireflyframework/security/idp/config/IdpProperties.java
index 43c7fd3..9c853c6 100644
--- a/src/main/java/org/fireflyframework/idp/config/IdpProperties.java
+++ b/src/main/java/org/fireflyframework/security/idp/config/IdpProperties.java
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2024 Firefly Software Foundation.
  */
-package org.fireflyframework.idp.config;
+package org.fireflyframework.security.idp.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/src/main/java/org/fireflyframework/idp/config/IdpWebAutoConfiguration.java b/src/main/java/org/fireflyframework/security/idp/config/IdpWebAutoConfiguration.java
similarity index 85%
rename from src/main/java/org/fireflyframework/idp/config/IdpWebAutoConfiguration.java
rename to src/main/java/org/fireflyframework/security/idp/config/IdpWebAutoConfiguration.java
index 1470186..45fe6c8 100644
--- a/src/main/java/org/fireflyframework/idp/config/IdpWebAutoConfiguration.java
+++ b/src/main/java/org/fireflyframework/security/idp/config/IdpWebAutoConfiguration.java
@@ -1,11 +1,11 @@
 /*
  * Copyright (c) 2024 Firefly Software Foundation.
  */
-package org.fireflyframework.idp.config;
+package org.fireflyframework.security.idp.config;
 
 import lombok.extern.slf4j.Slf4j;
-import org.fireflyframework.idp.adapter.IdpAdapter;
-import org.fireflyframework.idp.web.IdpController;
+import org.fireflyframework.security.idp.adapter.IdpAdapter;
+import org.fireflyframework.security.idp.web.IdpController;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
diff --git a/src/main/java/org/fireflyframework/idp/dtos/AssignRolesRequest.java b/src/main/java/org/fireflyframework/security/idp/dtos/AssignRolesRequest.java
similarity index 95%
rename from src/main/java/org/fireflyframework/idp/dtos/AssignRolesRequest.java
rename to src/main/java/org/fireflyframework/security/idp/dtos/AssignRolesRequest.java
index fe2a070..9edc566 100644
--- a/src/main/java/org/fireflyframework/idp/dtos/AssignRolesRequest.java
+++ b/src/main/java/org/fireflyframework/security/idp/dtos/AssignRolesRequest.java
@@ -15,7 +15,7 @@
  */
 
 
-package org.fireflyframework.idp.dtos;
+package org.fireflyframework.security.idp.dtos;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/src/main/java/org/fireflyframework/idp/dtos/ChangePasswordRequest.java b/src/main/java/org/fireflyframework/security/idp/dtos/ChangePasswordRequest.java
similarity index 95%
rename from src/main/java/org/fireflyframework/idp/dtos/ChangePasswordRequest.java
rename to src/main/java/org/fireflyframework/security/idp/dtos/ChangePasswordRequest.java
index 4c48e52..b2bd3b0 100644
--- a/src/main/java/org/fireflyframework/idp/dtos/ChangePasswordRequest.java
+++ b/src/main/java/org/fireflyframework/security/idp/dtos/ChangePasswordRequest.java
@@ -15,7 +15,7 @@
  */
 
 
-package org.fireflyframework.idp.dtos;
+package org.fireflyframework.security.idp.dtos;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/src/main/java/org/fireflyframework/idp/dtos/CreateRolesRequest.java b/src/main/java/org/fireflyframework/security/idp/dtos/CreateRolesRequest.java
similarity index 96%
rename from src/main/java/org/fireflyframework/idp/dtos/CreateRolesRequest.java
rename to src/main/java/org/fireflyframework/security/idp/dtos/CreateRolesRequest.java
index 950a400..d62cad7 100644
--- a/src/main/java/org/fireflyframework/idp/dtos/CreateRolesRequest.java
+++ b/src/main/java/org/fireflyframework/security/idp/dtos/CreateRolesRequest.java
@@ -15,7 +15,7 @@
  */
 
 
-package org.fireflyframework.idp.dtos;
+package org.fireflyframework.security.idp.dtos;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/src/main/java/org/fireflyframework/idp/dtos/CreateRolesResponse.java b/src/main/java/org/fireflyframework/security/idp/dtos/CreateRolesResponse.java
similarity index 95%
rename from src/main/java/org/fireflyframework/idp/dtos/CreateRolesResponse.java
rename to src/main/java/org/fireflyframework/security/idp/dtos/CreateRolesResponse.java
index 59fc89d..4e9d0bb 100644
--- a/src/main/java/org/fireflyframework/idp/dtos/CreateRolesResponse.java
+++ b/src/main/java/org/fireflyframework/security/idp/dtos/CreateRolesResponse.java
@@ -15,7 +15,7 @@
  */
 
 
-package org.fireflyframework.idp.dtos;
+package org.fireflyframework.security.idp.dtos;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/src/main/java/org/fireflyframework/idp/dtos/CreateScopeRequest.java b/src/main/java/org/fireflyframework/security/idp/dtos/CreateScopeRequest.java
similarity index 95%
rename from src/main/java/org/fireflyframework/idp/dtos/CreateScopeRequest.java
rename to src/main/java/org/fireflyframework/security/idp/dtos/CreateScopeRequest.java
index da6620f..6aa18f8 100644
--- a/src/main/java/org/fireflyframework/idp/dtos/CreateScopeRequest.java
+++ b/src/main/java/org/fireflyframework/security/idp/dtos/CreateScopeRequest.java
@@ -15,7 +15,7 @@
  */
 
 
-package org.fireflyframework.idp.dtos;
+package org.fireflyframework.security.idp.dtos;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/src/main/java/org/fireflyframework/idp/dtos/CreateScopeResponse.java b/src/main/java/org/fireflyframework/security/idp/dtos/CreateScopeResponse.java
similarity index 95%
rename from src/main/java/org/fireflyframework/idp/dtos/CreateScopeResponse.java
rename to src/main/java/org/fireflyframework/security/idp/dtos/CreateScopeResponse.java
index 5c7c17b..a3deecd 100644
--- a/src/main/java/org/fireflyframework/idp/dtos/CreateScopeResponse.java
+++ b/src/main/java/org/fireflyframework/security/idp/dtos/CreateScopeResponse.java
@@ -15,7 +15,7 @@
  */
 
 
-package org.fireflyframework.idp.dtos;
+package org.fireflyframework.security.idp.dtos;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/src/main/java/org/fireflyframework/idp/dtos/CreateUserRequest.java b/src/main/java/org/fireflyframework/security/idp/dtos/CreateUserRequest.java
similarity index 96%
rename from src/main/java/org/fireflyframework/idp/dtos/CreateUserRequest.java
rename to src/main/java/org/fireflyframework/security/idp/dtos/CreateUserRequest.java
index 1efe23e..f5a95aa 100644
--- a/src/main/java/org/fireflyframework/idp/dtos/CreateUserRequest.java
+++ b/src/main/java/org/fireflyframework/security/idp/dtos/CreateUserRequest.java
@@ -15,7 +15,7 @@
  */
 
 
-package org.fireflyframework.idp.dtos;
+package org.fireflyframework.security.idp.dtos;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/src/main/java/org/fireflyframework/idp/dtos/CreateUserResponse.java b/src/main/java/org/fireflyframework/security/idp/dtos/CreateUserResponse.java
similarity index 95%
rename from src/main/java/org/fireflyframework/idp/dtos/CreateUserResponse.java
rename to src/main/java/org/fireflyframework/security/idp/dtos/CreateUserResponse.java
index 034fd7a..a8f4268 100644
--- a/src/main/java/org/fireflyframework/idp/dtos/CreateUserResponse.java
+++ b/src/main/java/org/fireflyframework/security/idp/dtos/CreateUserResponse.java
@@ -15,7 +15,7 @@
  */
 
 
-package org.fireflyframework.idp.dtos;
+package org.fireflyframework.security.idp.dtos;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/src/main/java/org/fireflyframework/idp/dtos/IntrospectionResponse.java b/src/main/java/org/fireflyframework/security/idp/dtos/IntrospectionResponse.java
similarity index 96%
rename from src/main/java/org/fireflyframework/idp/dtos/IntrospectionResponse.java
rename to src/main/java/org/fireflyframework/security/idp/dtos/IntrospectionResponse.java
index c5e4df3..f861aa4 100644
--- a/src/main/java/org/fireflyframework/idp/dtos/IntrospectionResponse.java
+++ b/src/main/java/org/fireflyframework/security/idp/dtos/IntrospectionResponse.java
@@ -15,7 +15,7 @@
  */
 
 
-package org.fireflyframework.idp.dtos;
+package org.fireflyframework.security.idp.dtos;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/org/fireflyframework/idp/dtos/LoginRequest.java b/src/main/java/org/fireflyframework/security/idp/dtos/LoginRequest.java
similarity index 95%
rename from src/main/java/org/fireflyframework/idp/dtos/LoginRequest.java
rename to src/main/java/org/fireflyframework/security/idp/dtos/LoginRequest.java
index b0c2e4b..9451a8b 100644
--- a/src/main/java/org/fireflyframework/idp/dtos/LoginRequest.java
+++ b/src/main/java/org/fireflyframework/security/idp/dtos/LoginRequest.java
@@ -15,7 +15,7 @@
  */
 
 
-package org.fireflyframework.idp.dtos;
+package org.fireflyframework.security.idp.dtos;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/src/main/java/org/fireflyframework/idp/dtos/LogoutRequest.java b/src/main/java/org/fireflyframework/security/idp/dtos/LogoutRequest.java
similarity index 95%
rename from src/main/java/org/fireflyframework/idp/dtos/LogoutRequest.java
rename to src/main/java/org/fireflyframework/security/idp/dtos/LogoutRequest.java
index 8466b9d..44dab46 100644
--- a/src/main/java/org/fireflyframework/idp/dtos/LogoutRequest.java
+++ b/src/main/java/org/fireflyframework/security/idp/dtos/LogoutRequest.java
@@ -15,7 +15,7 @@
  */
 
 
-package org.fireflyframework.idp.dtos;
+package org.fireflyframework.security.idp.dtos;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/src/main/java/org/fireflyframework/idp/dtos/MfaChallengeResponse.java b/src/main/java/org/fireflyframework/security/idp/dtos/MfaChallengeResponse.java
similarity index 95%
rename from src/main/java/org/fireflyframework/idp/dtos/MfaChallengeResponse.java
rename to src/main/java/org/fireflyframework/security/idp/dtos/MfaChallengeResponse.java
index 08ec2e4..f03a155 100644
--- a/src/main/java/org/fireflyframework/idp/dtos/MfaChallengeResponse.java
+++ b/src/main/java/org/fireflyframework/security/idp/dtos/MfaChallengeResponse.java
@@ -15,7 +15,7 @@
  */
 
 
-package org.fireflyframework.idp.dtos;
+package org.fireflyframework.security.idp.dtos;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/src/main/java/org/fireflyframework/idp/dtos/MfaVerifyRequest.java b/src/main/java/org/fireflyframework/security/idp/dtos/MfaVerifyRequest.java
similarity index 94%
rename from src/main/java/org/fireflyframework/idp/dtos/MfaVerifyRequest.java
rename to src/main/java/org/fireflyframework/security/idp/dtos/MfaVerifyRequest.java
index 7408fba..9d67ef4 100644
--- a/src/main/java/org/fireflyframework/idp/dtos/MfaVerifyRequest.java
+++ b/src/main/java/org/fireflyframework/security/idp/dtos/MfaVerifyRequest.java
@@ -15,7 +15,7 @@
  */
 
 
-package org.fireflyframework.idp.dtos;
+package org.fireflyframework.security.idp.dtos;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/src/main/java/org/fireflyframework/idp/dtos/RefreshRequest.java b/src/main/java/org/fireflyframework/security/idp/dtos/RefreshRequest.java
similarity index 95%
rename from src/main/java/org/fireflyframework/idp/dtos/RefreshRequest.java
rename to src/main/java/org/fireflyframework/security/idp/dtos/RefreshRequest.java
index cf575a0..841142f 100644
--- a/src/main/java/org/fireflyframework/idp/dtos/RefreshRequest.java
+++ b/src/main/java/org/fireflyframework/security/idp/dtos/RefreshRequest.java
@@ -15,7 +15,7 @@
  */
 
 
-package org.fireflyframework.idp.dtos;
+package org.fireflyframework.security.idp.dtos;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/org/fireflyframework/idp/dtos/RegisterUserRequest.java b/src/main/java/org/fireflyframework/security/idp/dtos/RegisterUserRequest.java
similarity index 97%
rename from src/main/java/org/fireflyframework/idp/dtos/RegisterUserRequest.java
rename to src/main/java/org/fireflyframework/security/idp/dtos/RegisterUserRequest.java
index fbfd961..3480e7d 100644
--- a/src/main/java/org/fireflyframework/idp/dtos/RegisterUserRequest.java
+++ b/src/main/java/org/fireflyframework/security/idp/dtos/RegisterUserRequest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.fireflyframework.idp.dtos;
+package org.fireflyframework.security.idp.dtos;
 
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
diff --git a/src/main/java/org/fireflyframework/idp/dtos/SessionInfo.java b/src/main/java/org/fireflyframework/security/idp/dtos/SessionInfo.java
similarity index 95%
rename from src/main/java/org/fireflyframework/idp/dtos/SessionInfo.java
rename to src/main/java/org/fireflyframework/security/idp/dtos/SessionInfo.java
index db9032d..8a198ad 100644
--- a/src/main/java/org/fireflyframework/idp/dtos/SessionInfo.java
+++ b/src/main/java/org/fireflyframework/security/idp/dtos/SessionInfo.java
@@ -15,7 +15,7 @@
  */
 
 
-package org.fireflyframework.idp.dtos;
+package org.fireflyframework.security.idp.dtos;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/src/main/java/org/fireflyframework/idp/dtos/TokenResponse.java b/src/main/java/org/fireflyframework/security/idp/dtos/TokenResponse.java
similarity index 96%
rename from src/main/java/org/fireflyframework/idp/dtos/TokenResponse.java
rename to src/main/java/org/fireflyframework/security/idp/dtos/TokenResponse.java
index 3ca1ee9..005a33f 100644
--- a/src/main/java/org/fireflyframework/idp/dtos/TokenResponse.java
+++ b/src/main/java/org/fireflyframework/security/idp/dtos/TokenResponse.java
@@ -15,7 +15,7 @@
  */
 
 
-package org.fireflyframework.idp.dtos;
+package org.fireflyframework.security.idp.dtos;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/org/fireflyframework/idp/dtos/UpdateUserRequest.java b/src/main/java/org/fireflyframework/security/idp/dtos/UpdateUserRequest.java
similarity index 96%
rename from src/main/java/org/fireflyframework/idp/dtos/UpdateUserRequest.java
rename to src/main/java/org/fireflyframework/security/idp/dtos/UpdateUserRequest.java
index 33a4c0d..1b62a02 100644
--- a/src/main/java/org/fireflyframework/idp/dtos/UpdateUserRequest.java
+++ b/src/main/java/org/fireflyframework/security/idp/dtos/UpdateUserRequest.java
@@ -15,7 +15,7 @@
  */
 
 
-package org.fireflyframework.idp.dtos;
+package org.fireflyframework.security.idp.dtos;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/src/main/java/org/fireflyframework/idp/dtos/UpdateUserResponse.java b/src/main/java/org/fireflyframework/security/idp/dtos/UpdateUserResponse.java
similarity index 95%
rename from src/main/java/org/fireflyframework/idp/dtos/UpdateUserResponse.java
rename to src/main/java/org/fireflyframework/security/idp/dtos/UpdateUserResponse.java
index 7a253da..7435723 100644
--- a/src/main/java/org/fireflyframework/idp/dtos/UpdateUserResponse.java
+++ b/src/main/java/org/fireflyframework/security/idp/dtos/UpdateUserResponse.java
@@ -15,7 +15,7 @@
  */
 
 
-package org.fireflyframework.idp.dtos;
+package org.fireflyframework.security.idp.dtos;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/src/main/java/org/fireflyframework/idp/dtos/UserInfoResponse.java b/src/main/java/org/fireflyframework/security/idp/dtos/UserInfoResponse.java
similarity index 95%
rename from src/main/java/org/fireflyframework/idp/dtos/UserInfoResponse.java
rename to src/main/java/org/fireflyframework/security/idp/dtos/UserInfoResponse.java
index 534e34e..9670030 100644
--- a/src/main/java/org/fireflyframework/idp/dtos/UserInfoResponse.java
+++ b/src/main/java/org/fireflyframework/security/idp/dtos/UserInfoResponse.java
@@ -15,7 +15,7 @@
  */
 
 
-package org.fireflyframework.idp.dtos;
+package org.fireflyframework.security.idp.dtos;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/src/main/java/org/fireflyframework/idp/observability/IdpMetrics.java b/src/main/java/org/fireflyframework/security/idp/observability/IdpMetrics.java
similarity index 98%
rename from src/main/java/org/fireflyframework/idp/observability/IdpMetrics.java
rename to src/main/java/org/fireflyframework/security/idp/observability/IdpMetrics.java
index c4312d6..3fec19b 100644
--- a/src/main/java/org/fireflyframework/idp/observability/IdpMetrics.java
+++ b/src/main/java/org/fireflyframework/security/idp/observability/IdpMetrics.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.fireflyframework.idp.observability;
+package org.fireflyframework.security.idp.observability;
 
 import io.micrometer.core.instrument.MeterRegistry;
 import org.fireflyframework.observability.metrics.FireflyMetricsSupport;
diff --git a/src/main/java/org/fireflyframework/idp/observability/IdpObservabilityAutoConfiguration.java b/src/main/java/org/fireflyframework/security/idp/observability/IdpObservabilityAutoConfiguration.java
similarity index 96%
rename from src/main/java/org/fireflyframework/idp/observability/IdpObservabilityAutoConfiguration.java
rename to src/main/java/org/fireflyframework/security/idp/observability/IdpObservabilityAutoConfiguration.java
index 9d434aa..07d6846 100644
--- a/src/main/java/org/fireflyframework/idp/observability/IdpObservabilityAutoConfiguration.java
+++ b/src/main/java/org/fireflyframework/security/idp/observability/IdpObservabilityAutoConfiguration.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.fireflyframework.idp.observability;
+package org.fireflyframework.security.idp.observability;
 
 import io.micrometer.core.instrument.MeterRegistry;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
diff --git a/src/main/java/org/fireflyframework/idp/port/AuthenticationPort.java b/src/main/java/org/fireflyframework/security/idp/port/AuthenticationPort.java
similarity index 84%
rename from src/main/java/org/fireflyframework/idp/port/AuthenticationPort.java
rename to src/main/java/org/fireflyframework/security/idp/port/AuthenticationPort.java
index 14de044..5b95f24 100644
--- a/src/main/java/org/fireflyframework/idp/port/AuthenticationPort.java
+++ b/src/main/java/org/fireflyframework/security/idp/port/AuthenticationPort.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.fireflyframework.idp.port;
+package org.fireflyframework.security.idp.port;
 
-import org.fireflyframework.idp.dtos.LoginRequest;
-import org.fireflyframework.idp.dtos.LogoutRequest;
-import org.fireflyframework.idp.dtos.RefreshRequest;
-import org.fireflyframework.idp.dtos.TokenResponse;
+import org.fireflyframework.security.idp.dtos.LoginRequest;
+import org.fireflyframework.security.idp.dtos.LogoutRequest;
+import org.fireflyframework.security.idp.dtos.RefreshRequest;
+import org.fireflyframework.security.idp.dtos.TokenResponse;
 import org.springframework.http.ResponseEntity;
 import reactor.core.publisher.Mono;
 
diff --git a/src/main/java/org/fireflyframework/idp/port/MfaPort.java b/src/main/java/org/fireflyframework/security/idp/port/MfaPort.java
similarity index 87%
rename from src/main/java/org/fireflyframework/idp/port/MfaPort.java
rename to src/main/java/org/fireflyframework/security/idp/port/MfaPort.java
index 1e43793..a750372 100644
--- a/src/main/java/org/fireflyframework/idp/port/MfaPort.java
+++ b/src/main/java/org/fireflyframework/security/idp/port/MfaPort.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.fireflyframework.idp.port;
+package org.fireflyframework.security.idp.port;
 
-import org.fireflyframework.idp.dtos.MfaChallengeResponse;
-import org.fireflyframework.idp.dtos.MfaVerifyRequest;
+import org.fireflyframework.security.idp.dtos.MfaChallengeResponse;
+import org.fireflyframework.security.idp.dtos.MfaVerifyRequest;
 import org.springframework.http.ResponseEntity;
 import reactor.core.publisher.Mono;
 
diff --git a/src/main/java/org/fireflyframework/idp/port/RoleScopePort.java b/src/main/java/org/fireflyframework/security/idp/port/RoleScopePort.java
similarity index 83%
rename from src/main/java/org/fireflyframework/idp/port/RoleScopePort.java
rename to src/main/java/org/fireflyframework/security/idp/port/RoleScopePort.java
index e1b4a5a..f16c36a 100644
--- a/src/main/java/org/fireflyframework/idp/port/RoleScopePort.java
+++ b/src/main/java/org/fireflyframework/security/idp/port/RoleScopePort.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.fireflyframework.idp.port;
+package org.fireflyframework.security.idp.port;
 
-import org.fireflyframework.idp.dtos.AssignRolesRequest;
-import org.fireflyframework.idp.dtos.CreateRolesRequest;
-import org.fireflyframework.idp.dtos.CreateRolesResponse;
-import org.fireflyframework.idp.dtos.CreateScopeRequest;
-import org.fireflyframework.idp.dtos.CreateScopeResponse;
+import org.fireflyframework.security.idp.dtos.AssignRolesRequest;
+import org.fireflyframework.security.idp.dtos.CreateRolesRequest;
+import org.fireflyframework.security.idp.dtos.CreateRolesResponse;
+import org.fireflyframework.security.idp.dtos.CreateScopeRequest;
+import org.fireflyframework.security.idp.dtos.CreateScopeResponse;
 import org.springframework.http.ResponseEntity;
 import reactor.core.publisher.Mono;
 
diff --git a/src/main/java/org/fireflyframework/idp/port/SessionPort.java b/src/main/java/org/fireflyframework/security/idp/port/SessionPort.java
similarity index 93%
rename from src/main/java/org/fireflyframework/idp/port/SessionPort.java
rename to src/main/java/org/fireflyframework/security/idp/port/SessionPort.java
index 5cf2038..19ccd33 100644
--- a/src/main/java/org/fireflyframework/idp/port/SessionPort.java
+++ b/src/main/java/org/fireflyframework/security/idp/port/SessionPort.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.fireflyframework.idp.port;
+package org.fireflyframework.security.idp.port;
 
-import org.fireflyframework.idp.dtos.SessionInfo;
+import org.fireflyframework.security.idp.dtos.SessionInfo;
 import org.springframework.http.ResponseEntity;
 import reactor.core.publisher.Mono;
 
diff --git a/src/main/java/org/fireflyframework/idp/port/TokenIntrospectionPort.java b/src/main/java/org/fireflyframework/security/idp/port/TokenIntrospectionPort.java
similarity index 88%
rename from src/main/java/org/fireflyframework/idp/port/TokenIntrospectionPort.java
rename to src/main/java/org/fireflyframework/security/idp/port/TokenIntrospectionPort.java
index 23d79be..8ec2903 100644
--- a/src/main/java/org/fireflyframework/idp/port/TokenIntrospectionPort.java
+++ b/src/main/java/org/fireflyframework/security/idp/port/TokenIntrospectionPort.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.fireflyframework.idp.port;
+package org.fireflyframework.security.idp.port;
 
-import org.fireflyframework.idp.dtos.IntrospectionResponse;
-import org.fireflyframework.idp.dtos.UserInfoResponse;
+import org.fireflyframework.security.idp.dtos.IntrospectionResponse;
+import org.fireflyframework.security.idp.dtos.UserInfoResponse;
 import org.springframework.http.ResponseEntity;
 import reactor.core.publisher.Mono;
 
diff --git a/src/main/java/org/fireflyframework/idp/port/UserAdminPort.java b/src/main/java/org/fireflyframework/security/idp/port/UserAdminPort.java
similarity index 82%
rename from src/main/java/org/fireflyframework/idp/port/UserAdminPort.java
rename to src/main/java/org/fireflyframework/security/idp/port/UserAdminPort.java
index 4030293..a285f83 100644
--- a/src/main/java/org/fireflyframework/idp/port/UserAdminPort.java
+++ b/src/main/java/org/fireflyframework/security/idp/port/UserAdminPort.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.fireflyframework.idp.port;
+package org.fireflyframework.security.idp.port;
 
-import org.fireflyframework.idp.dtos.ChangePasswordRequest;
-import org.fireflyframework.idp.dtos.CreateUserRequest;
-import org.fireflyframework.idp.dtos.CreateUserResponse;
-import org.fireflyframework.idp.dtos.UpdateUserRequest;
-import org.fireflyframework.idp.dtos.UpdateUserResponse;
+import org.fireflyframework.security.idp.dtos.ChangePasswordRequest;
+import org.fireflyframework.security.idp.dtos.CreateUserRequest;
+import org.fireflyframework.security.idp.dtos.CreateUserResponse;
+import org.fireflyframework.security.idp.dtos.UpdateUserRequest;
+import org.fireflyframework.security.idp.dtos.UpdateUserResponse;
 import org.springframework.http.ResponseEntity;
 import reactor.core.publisher.Mono;
 
diff --git a/src/main/java/org/fireflyframework/idp/web/IdpController.java b/src/main/java/org/fireflyframework/security/idp/web/IdpController.java
similarity index 96%
rename from src/main/java/org/fireflyframework/idp/web/IdpController.java
rename to src/main/java/org/fireflyframework/security/idp/web/IdpController.java
index 23f8eb3..f304e64 100644
--- a/src/main/java/org/fireflyframework/idp/web/IdpController.java
+++ b/src/main/java/org/fireflyframework/security/idp/web/IdpController.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.fireflyframework.idp.web;
+package org.fireflyframework.security.idp.web;
 
 import jakarta.validation.Valid;
-import org.fireflyframework.idp.adapter.IdpAdapter;
-import org.fireflyframework.idp.dtos.*;
+import org.fireflyframework.security.idp.adapter.IdpAdapter;
+import org.fireflyframework.security.idp.dtos.*;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
diff --git a/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 6de5313..58a3dd8 100644
--- a/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,2 +1,2 @@
-org.fireflyframework.idp.config.IdpWebAutoConfiguration
-org.fireflyframework.idp.observability.IdpObservabilityAutoConfiguration
+org.fireflyframework.security.idp.config.IdpWebAutoConfiguration
+org.fireflyframework.security.idp.observability.IdpObservabilityAutoConfiguration
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index 17664fb..2434daf 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -1,6 +1,6 @@
 spring:
   application:
-    name: fireflyframework-idp
+    name: fireflyframework-security-idp
     version: 1.0.0
     description: Identity Provider Adapter
     team: