diff --git a/gms/src/main/java/it/inaf/ia2/gms/CustomAuthenticationData.java b/gms/src/main/java/it/inaf/ia2/gms/authn/CustomAuthenticationData.java
similarity index 95%
rename from gms/src/main/java/it/inaf/ia2/gms/CustomAuthenticationData.java
rename to gms/src/main/java/it/inaf/ia2/gms/authn/CustomAuthenticationData.java
index 49d9fbcb5fd5600471369c48bb216a28356d3682..66f86bcd9e2ba89e3548ac0e06986747d0d52bfd 100644
--- a/gms/src/main/java/it/inaf/ia2/gms/CustomAuthenticationData.java
+++ b/gms/src/main/java/it/inaf/ia2/gms/authn/CustomAuthenticationData.java
@@ -1,4 +1,4 @@
-package it.inaf.ia2.gms;
+package it.inaf.ia2.gms.authn;
 
 import java.util.Collection;
 import java.util.Map;
diff --git a/gms/src/main/java/it/inaf/ia2/gms/CustomIdTokenConverter.java b/gms/src/main/java/it/inaf/ia2/gms/authn/CustomIdTokenConverter.java
similarity index 97%
rename from gms/src/main/java/it/inaf/ia2/gms/CustomIdTokenConverter.java
rename to gms/src/main/java/it/inaf/ia2/gms/authn/CustomIdTokenConverter.java
index beabbe56b934ecb7d18ffc375f477c1c3df33e16..d3decd339b8cf51a1d9fa84c0006b68800ba873b 100644
--- a/gms/src/main/java/it/inaf/ia2/gms/CustomIdTokenConverter.java
+++ b/gms/src/main/java/it/inaf/ia2/gms/authn/CustomIdTokenConverter.java
@@ -1,4 +1,4 @@
-package it.inaf.ia2.gms;
+package it.inaf.ia2.gms.authn;
 
 import java.util.List;
 import java.util.Map;
diff --git a/gms/src/main/java/it/inaf/ia2/gms/LoginController.java b/gms/src/main/java/it/inaf/ia2/gms/authn/LoginController.java
similarity index 94%
rename from gms/src/main/java/it/inaf/ia2/gms/LoginController.java
rename to gms/src/main/java/it/inaf/ia2/gms/authn/LoginController.java
index e94ecfea291ad9aee9415f530754b37dd5f7bb03..6e0b895164d8a49eb48e5103131813298b7b9d69 100644
--- a/gms/src/main/java/it/inaf/ia2/gms/LoginController.java
+++ b/gms/src/main/java/it/inaf/ia2/gms/authn/LoginController.java
@@ -1,4 +1,4 @@
-package it.inaf.ia2.gms;
+package it.inaf.ia2.gms.authn;
 
 import java.security.Principal;
 import org.springframework.http.MediaType;
diff --git a/gms/src/main/java/it/inaf/ia2/gms/OAuth2Config.java b/gms/src/main/java/it/inaf/ia2/gms/authn/OAuth2Config.java
similarity index 98%
rename from gms/src/main/java/it/inaf/ia2/gms/OAuth2Config.java
rename to gms/src/main/java/it/inaf/ia2/gms/authn/OAuth2Config.java
index c823502a5fd94c590626233c0f9a23bffad3d734..9b45d30a3b73b3008b28693537f3d1b1eda5d2f9 100644
--- a/gms/src/main/java/it/inaf/ia2/gms/OAuth2Config.java
+++ b/gms/src/main/java/it/inaf/ia2/gms/authn/OAuth2Config.java
@@ -1,4 +1,4 @@
-package it.inaf.ia2.gms;
+package it.inaf.ia2.gms.authn;
 
 import java.util.List;
 import org.springframework.beans.factory.ObjectProvider;