This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch SYNCOPE-163-1
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/SYNCOPE-163-1 by this push:
     new 572fc4a  Package renaming and cleanup
572fc4a is described below

commit 572fc4ad216bfb8107bfd2101709295d51e795f6
Author: Francesco Chicchiriccò <ilgro...@apache.org>
AuthorDate: Wed Mar 25 12:53:19 2020 +0100

    Package renaming and cleanup
---
 .../module => auth}/AbstractAuthModuleConf.java    |  2 +-
 .../module => auth}/AuthModuleConf.java            |  2 +-
 .../module => auth}/GoogleMfaAuthModuleConf.java   |  2 +-
 .../module => auth}/JaasAuthModuleConf.java        |  2 +-
 .../module => auth}/LDAPAuthModuleConf.java        |  2 +-
 .../module => auth}/OIDCAuthModuleConf.java        |  2 +-
 .../module => auth}/SAML2IdPAuthModuleConf.java    |  2 +-
 .../module => auth}/StaticAuthModuleConf.java      |  2 +-
 .../package-info.java}                             | 21 +++++++--------
 .../AbstractAccessPolicyConf.java                  |  2 +-
 .../AbstractAttrReleasePolicyConf.java             |  2 +-
 .../policy/AbstractAuthPolicyConf.java             |  2 +-
 .../policy/AbstractAuthPolicyCriteriaConf.java     |  2 +-
 .../lib/{access => policy}/AccessPolicyConf.java   |  2 +-
 .../AllowedAttrReleasePolicyConf.java              |  2 +-
 .../{attrs => policy}/AttrReleasePolicyConf.java   |  2 +-
 .../policy/AuthPolicyConf.java                     |  2 +-
 .../policy/AuthPolicyCriteriaConf.java             |  2 +-
 .../DefaultAccessPolicyConf.java                   |  2 +-
 .../policy/DefaultAuthPolicyConf.java              |  2 +-
 .../policy/DefaultAuthPolicyCriteriaConf.java      |  2 +-
 .../package-info.java}                             | 21 +++++++--------
 .../apache/syncope/core/logic/ClientAppLogic.java  | 14 +++++-----
 .../init/ClassPathScanImplementationLookup.java    |  6 ++---
 .../{authentication => auth}/AuthModuleDAO.java    |  4 +--
 .../dao/{authentication => auth}/OIDCRPDAO.java    |  4 +--
 .../dao/{authentication => auth}/SAML2SPDAO.java   |  4 +--
 .../{authentication => auth}/AuthModule.java       |  2 +-
 .../entity/{authentication => auth}/ClientApp.java |  2 +-
 .../{authentication => auth}/ClientAppUtils.java   |  2 +-
 .../ClientAppUtilsFactory.java                     |  2 +-
 .../entity/{authentication => auth}/OIDCRP.java    |  2 +-
 .../entity/{authentication => auth}/SAML2SP.java   |  2 +-
 .../{authentication => auth}/JPAAuthModuleDAO.java |  8 +++---
 .../dao/{authentication => auth}/JPAOIDCRPDAO.java |  8 +++---
 .../{authentication => auth}/JPASAML2SPDAO.java    |  8 +++---
 .../persistence/jpa/entity/JPAEntityFactory.java   | 12 ++++-----
 .../AbstractClientApp.java                         |  4 +--
 .../{authentication => auth}/JPAAuthModule.java    |  4 +--
 .../JPAClientAppUtils.java                         | 10 +++----
 .../JPAClientAppUtilsFactory.java                  | 12 ++++-----
 .../entity/{authentication => auth}/JPAOIDCRP.java |  4 +--
 .../{authentication => auth}/JPASAML2SP.java       |  4 +--
 .../jpa/inner/AbstractClientAppTest.java           |  6 ++---
 .../core/persistence/jpa/inner/AuthModuleTest.java | 31 ++++++++++------------
 .../core/persistence/jpa/inner/OIDCRPTest.java     |  4 +--
 .../core/persistence/jpa/inner/PolicyTest.java     |  8 +++---
 .../core/persistence/jpa/inner/SAML2SPTest.java    |  4 +--
 .../core/persistence/jpa/outer/PolicyTest.java     |  4 +--
 .../provisioning/api/data/ClientAppDataBinder.java |  2 +-
 .../java/data/ClientAppDataBinderImpl.java         |  6 ++---
 .../java/data/ImplementationDataBinderImpl.java    | 10 +++----
 .../org/apache/syncope/fit/core/PolicyITCase.java  |  6 ++---
 .../org/apache/syncope/fit/core/RealmITCase.java   |  6 ++---
 54 files changed, 139 insertions(+), 148 deletions(-)

diff --git 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/AbstractAuthModuleConf.java
 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/auth/AbstractAuthModuleConf.java
similarity index 97%
rename from 
common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/AbstractAuthModuleConf.java
rename to 
common/am/lib/src/main/java/org/apache/syncope/common/lib/auth/AbstractAuthModuleConf.java
index bfc90c3..edec434 100644
--- 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/AbstractAuthModuleConf.java
+++ 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/auth/AbstractAuthModuleConf.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.common.lib.authentication.module;
+package org.apache.syncope.common.lib.auth;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import javax.xml.bind.annotation.XmlSeeAlso;
diff --git 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/AuthModuleConf.java
 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/auth/AuthModuleConf.java
similarity index 96%
rename from 
common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/AuthModuleConf.java
rename to 
common/am/lib/src/main/java/org/apache/syncope/common/lib/auth/AuthModuleConf.java
index 7eb13a9..8f8fa4f 100644
--- 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/AuthModuleConf.java
+++ 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/auth/AuthModuleConf.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.common.lib.authentication.module;
+package org.apache.syncope.common.lib.auth;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import java.io.Serializable;
diff --git 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/GoogleMfaAuthModuleConf.java
 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/auth/GoogleMfaAuthModuleConf.java
similarity index 97%
rename from 
common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/GoogleMfaAuthModuleConf.java
rename to 
common/am/lib/src/main/java/org/apache/syncope/common/lib/auth/GoogleMfaAuthModuleConf.java
index 2b22e2b..a2e4168 100644
--- 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/GoogleMfaAuthModuleConf.java
+++ 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/auth/GoogleMfaAuthModuleConf.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.common.lib.authentication.module;
+package org.apache.syncope.common.lib.auth;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
diff --git 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/JaasAuthModuleConf.java
 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/auth/JaasAuthModuleConf.java
similarity index 97%
rename from 
common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/JaasAuthModuleConf.java
rename to 
common/am/lib/src/main/java/org/apache/syncope/common/lib/auth/JaasAuthModuleConf.java
index bae7344..b8627ab 100644
--- 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/JaasAuthModuleConf.java
+++ 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/auth/JaasAuthModuleConf.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.common.lib.authentication.module;
+package org.apache.syncope.common.lib.auth;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
diff --git 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/LDAPAuthModuleConf.java
 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/auth/LDAPAuthModuleConf.java
similarity index 98%
rename from 
common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/LDAPAuthModuleConf.java
rename to 
common/am/lib/src/main/java/org/apache/syncope/common/lib/auth/LDAPAuthModuleConf.java
index 680854b..b344c6e 100644
--- 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/LDAPAuthModuleConf.java
+++ 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/auth/LDAPAuthModuleConf.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.common.lib.authentication.module;
+package org.apache.syncope.common.lib.auth;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
diff --git 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/OIDCAuthModuleConf.java
 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/auth/OIDCAuthModuleConf.java
similarity index 98%
rename from 
common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/OIDCAuthModuleConf.java
rename to 
common/am/lib/src/main/java/org/apache/syncope/common/lib/auth/OIDCAuthModuleConf.java
index 5b77280..c56e160 100644
--- 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/OIDCAuthModuleConf.java
+++ 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/auth/OIDCAuthModuleConf.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.common.lib.authentication.module;
+package org.apache.syncope.common.lib.auth;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/SAML2IdPAuthModuleConf.java
 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/auth/SAML2IdPAuthModuleConf.java
similarity index 99%
rename from 
common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/SAML2IdPAuthModuleConf.java
rename to 
common/am/lib/src/main/java/org/apache/syncope/common/lib/auth/SAML2IdPAuthModuleConf.java
index c9e8bb4..8a835a6 100644
--- 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/SAML2IdPAuthModuleConf.java
+++ 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/auth/SAML2IdPAuthModuleConf.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.common.lib.authentication.module;
+package org.apache.syncope.common.lib.auth;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/StaticAuthModuleConf.java
 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/auth/StaticAuthModuleConf.java
similarity index 96%
rename from 
common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/StaticAuthModuleConf.java
rename to 
common/am/lib/src/main/java/org/apache/syncope/common/lib/auth/StaticAuthModuleConf.java
index 8ccfa18..4d2112f 100644
--- 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/StaticAuthModuleConf.java
+++ 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/auth/StaticAuthModuleConf.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.common.lib.authentication.module;
+package org.apache.syncope.common.lib.auth;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/attrs/AttrReleasePolicyConf.java
 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/auth/package-info.java
similarity index 62%
copy from 
common/am/lib/src/main/java/org/apache/syncope/common/lib/attrs/AttrReleasePolicyConf.java
copy to 
common/am/lib/src/main/java/org/apache/syncope/common/lib/auth/package-info.java
index fbe94ea..e3765a0 100644
--- 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/attrs/AttrReleasePolicyConf.java
+++ 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/auth/package-info.java
@@ -16,18 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.common.lib.attrs;
+@XmlSchema(namespace = SyncopeConstants.NS)
+@XmlJavaTypeAdapters({ @XmlJavaTypeAdapter(type = Date.class, value = 
DateAdapter.class), })
+package org.apache.syncope.common.lib.auth;
 
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import java.io.Serializable;
+import org.apache.syncope.common.lib.SyncopeConstants;
+import org.apache.syncope.common.lib.jaxb.DateAdapter;
 
-@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, 
property = "@class")
-public interface AttrReleasePolicyConf extends Serializable {
+import javax.xml.bind.annotation.XmlSchema;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
 
-    /**
-     * Give name of related attr release policy.
-     *
-     * @return name of this attr release policy
-     */
-    String getName();
-}
+import java.util.Date;
diff --git 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/access/AbstractAccessPolicyConf.java
 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/AbstractAccessPolicyConf.java
similarity index 98%
rename from 
common/am/lib/src/main/java/org/apache/syncope/common/lib/access/AbstractAccessPolicyConf.java
rename to 
common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/AbstractAccessPolicyConf.java
index b6babd8..cdf5d8e 100644
--- 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/access/AbstractAccessPolicyConf.java
+++ 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/AbstractAccessPolicyConf.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.common.lib.access;
+package org.apache.syncope.common.lib.policy;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import javax.xml.bind.annotation.XmlSeeAlso;
diff --git 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/attrs/AbstractAttrReleasePolicyConf.java
 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/AbstractAttrReleasePolicyConf.java
similarity index 96%
rename from 
common/am/lib/src/main/java/org/apache/syncope/common/lib/attrs/AbstractAttrReleasePolicyConf.java
rename to 
common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/AbstractAttrReleasePolicyConf.java
index 218509d..e3a8206 100644
--- 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/attrs/AbstractAttrReleasePolicyConf.java
+++ 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/AbstractAttrReleasePolicyConf.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.common.lib.attrs;
+package org.apache.syncope.common.lib.policy;
 
 import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlType;
diff --git 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AbstractAuthPolicyConf.java
 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/AbstractAuthPolicyConf.java
similarity index 96%
rename from 
common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AbstractAuthPolicyConf.java
rename to 
common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/AbstractAuthPolicyConf.java
index 5979afb..ac19f37 100644
--- 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AbstractAuthPolicyConf.java
+++ 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/AbstractAuthPolicyConf.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.common.lib.authentication.policy;
+package org.apache.syncope.common.lib.policy;
 
 import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlType;
diff --git 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AbstractAuthPolicyCriteriaConf.java
 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/AbstractAuthPolicyCriteriaConf.java
similarity index 96%
rename from 
common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AbstractAuthPolicyCriteriaConf.java
rename to 
common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/AbstractAuthPolicyCriteriaConf.java
index e17f816..1f497de 100644
--- 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AbstractAuthPolicyCriteriaConf.java
+++ 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/AbstractAuthPolicyCriteriaConf.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.common.lib.authentication.policy;
+package org.apache.syncope.common.lib.policy;
 
 import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlType;
diff --git 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/access/AccessPolicyConf.java
 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/AccessPolicyConf.java
similarity index 96%
rename from 
common/am/lib/src/main/java/org/apache/syncope/common/lib/access/AccessPolicyConf.java
rename to 
common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/AccessPolicyConf.java
index beabbff..698e171 100644
--- 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/access/AccessPolicyConf.java
+++ 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/AccessPolicyConf.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.common.lib.access;
+package org.apache.syncope.common.lib.policy;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import java.io.Serializable;
diff --git 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/attrs/AllowedAttrReleasePolicyConf.java
 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/AllowedAttrReleasePolicyConf.java
similarity index 97%
rename from 
common/am/lib/src/main/java/org/apache/syncope/common/lib/attrs/AllowedAttrReleasePolicyConf.java
rename to 
common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/AllowedAttrReleasePolicyConf.java
index f8d6d60..3bcccd0 100644
--- 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/attrs/AllowedAttrReleasePolicyConf.java
+++ 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/AllowedAttrReleasePolicyConf.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.common.lib.attrs;
+package org.apache.syncope.common.lib.policy;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/attrs/AttrReleasePolicyConf.java
 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/AttrReleasePolicyConf.java
similarity index 96%
copy from 
common/am/lib/src/main/java/org/apache/syncope/common/lib/attrs/AttrReleasePolicyConf.java
copy to 
common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/AttrReleasePolicyConf.java
index fbe94ea..0a3e1d1 100644
--- 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/attrs/AttrReleasePolicyConf.java
+++ 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/AttrReleasePolicyConf.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.common.lib.attrs;
+package org.apache.syncope.common.lib.policy;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import java.io.Serializable;
diff --git 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AuthPolicyConf.java
 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/AuthPolicyConf.java
similarity index 95%
rename from 
common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AuthPolicyConf.java
rename to 
common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/AuthPolicyConf.java
index 1cd5e6d..7740d3c 100644
--- 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AuthPolicyConf.java
+++ 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/AuthPolicyConf.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.common.lib.authentication.policy;
+package org.apache.syncope.common.lib.policy;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import java.io.Serializable;
diff --git 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AuthPolicyCriteriaConf.java
 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/AuthPolicyCriteriaConf.java
similarity index 96%
rename from 
common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AuthPolicyCriteriaConf.java
rename to 
common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/AuthPolicyCriteriaConf.java
index ba9208c..1847fc4 100644
--- 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AuthPolicyCriteriaConf.java
+++ 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/AuthPolicyCriteriaConf.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.common.lib.authentication.policy;
+package org.apache.syncope.common.lib.policy;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import java.io.Serializable;
diff --git 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/access/DefaultAccessPolicyConf.java
 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/DefaultAccessPolicyConf.java
similarity index 96%
rename from 
common/am/lib/src/main/java/org/apache/syncope/common/lib/access/DefaultAccessPolicyConf.java
rename to 
common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/DefaultAccessPolicyConf.java
index d97b023..d12c98b 100644
--- 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/access/DefaultAccessPolicyConf.java
+++ 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/DefaultAccessPolicyConf.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.common.lib.access;
+package org.apache.syncope.common.lib.policy;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
diff --git 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/DefaultAuthPolicyConf.java
 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/DefaultAuthPolicyConf.java
similarity index 96%
rename from 
common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/DefaultAuthPolicyConf.java
rename to 
common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/DefaultAuthPolicyConf.java
index 6a74833..08ebb4e 100644
--- 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/DefaultAuthPolicyConf.java
+++ 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/DefaultAuthPolicyConf.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.common.lib.authentication.policy;
+package org.apache.syncope.common.lib.policy;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/DefaultAuthPolicyCriteriaConf.java
 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/DefaultAuthPolicyCriteriaConf.java
similarity index 95%
rename from 
common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/DefaultAuthPolicyCriteriaConf.java
rename to 
common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/DefaultAuthPolicyCriteriaConf.java
index 6d41a6d..8bcb84b 100644
--- 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/DefaultAuthPolicyCriteriaConf.java
+++ 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/DefaultAuthPolicyCriteriaConf.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.common.lib.authentication.policy;
+package org.apache.syncope.common.lib.policy;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
diff --git 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/attrs/AttrReleasePolicyConf.java
 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/package-info.java
similarity index 62%
rename from 
common/am/lib/src/main/java/org/apache/syncope/common/lib/attrs/AttrReleasePolicyConf.java
rename to 
common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/package-info.java
index fbe94ea..d3c7ee7 100644
--- 
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/attrs/AttrReleasePolicyConf.java
+++ 
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/package-info.java
@@ -16,18 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.common.lib.attrs;
+@XmlSchema(namespace = SyncopeConstants.NS)
+@XmlJavaTypeAdapters({ @XmlJavaTypeAdapter(type = Date.class, value = 
DateAdapter.class), })
+package org.apache.syncope.common.lib.policy;
 
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import java.io.Serializable;
+import org.apache.syncope.common.lib.SyncopeConstants;
+import org.apache.syncope.common.lib.jaxb.DateAdapter;
 
-@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, 
property = "@class")
-public interface AttrReleasePolicyConf extends Serializable {
+import javax.xml.bind.annotation.XmlSchema;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
 
-    /**
-     * Give name of related attr release policy.
-     *
-     * @return name of this attr release policy
-     */
-    String getName();
-}
+import java.util.Date;
diff --git 
a/core/am/logic/src/main/java/org/apache/syncope/core/logic/ClientAppLogic.java 
b/core/am/logic/src/main/java/org/apache/syncope/core/logic/ClientAppLogic.java
index ebe9f14..6e27383 100644
--- 
a/core/am/logic/src/main/java/org/apache/syncope/core/logic/ClientAppLogic.java
+++ 
b/core/am/logic/src/main/java/org/apache/syncope/core/logic/ClientAppLogic.java
@@ -29,13 +29,13 @@ import org.apache.syncope.common.lib.types.AMEntitlement;
 import org.apache.syncope.common.lib.types.ClientAppType;
 import org.apache.syncope.common.lib.types.ClientExceptionType;
 import org.apache.syncope.core.persistence.api.dao.NotFoundException;
-import org.apache.syncope.core.persistence.api.dao.authentication.OIDCRPDAO;
-import org.apache.syncope.core.persistence.api.dao.authentication.SAML2SPDAO;
-import org.apache.syncope.core.persistence.api.entity.authentication.ClientApp;
-import 
org.apache.syncope.core.persistence.api.entity.authentication.ClientAppUtils;
-import 
org.apache.syncope.core.persistence.api.entity.authentication.ClientAppUtilsFactory;
-import org.apache.syncope.core.persistence.api.entity.authentication.OIDCRP;
-import org.apache.syncope.core.persistence.api.entity.authentication.SAML2SP;
+import org.apache.syncope.core.persistence.api.dao.auth.OIDCRPDAO;
+import org.apache.syncope.core.persistence.api.dao.auth.SAML2SPDAO;
+import org.apache.syncope.core.persistence.api.entity.auth.ClientApp;
+import org.apache.syncope.core.persistence.api.entity.auth.ClientAppUtils;
+import 
org.apache.syncope.core.persistence.api.entity.auth.ClientAppUtilsFactory;
+import org.apache.syncope.core.persistence.api.entity.auth.OIDCRP;
+import org.apache.syncope.core.persistence.api.entity.auth.SAML2SP;
 import org.apache.syncope.core.provisioning.api.data.ClientAppDataBinder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
diff --git 
a/core/am/logic/src/main/java/org/apache/syncope/core/logic/init/ClassPathScanImplementationLookup.java
 
b/core/am/logic/src/main/java/org/apache/syncope/core/logic/init/ClassPathScanImplementationLookup.java
index c882de7..07d2efd 100644
--- 
a/core/am/logic/src/main/java/org/apache/syncope/core/logic/init/ClassPathScanImplementationLookup.java
+++ 
b/core/am/logic/src/main/java/org/apache/syncope/core/logic/init/ClassPathScanImplementationLookup.java
@@ -25,7 +25,7 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
-import org.apache.syncope.common.lib.access.AccessPolicyConf;
+import org.apache.syncope.common.lib.policy.AccessPolicyConf;
 import org.apache.syncope.common.lib.types.AMImplementationType;
 import org.apache.syncope.common.lib.types.ImplementationTypesHolder;
 import org.apache.syncope.core.persistence.api.ImplementationLookup;
@@ -36,8 +36,8 @@ import 
org.springframework.context.annotation.ClassPathScanningCandidateComponen
 import org.springframework.core.Ordered;
 import org.springframework.core.type.filter.AssignableTypeFilter;
 import org.springframework.util.ClassUtils;
-import org.apache.syncope.common.lib.authentication.module.AuthModuleConf;
-import org.apache.syncope.common.lib.authentication.policy.AuthPolicyConf;
+import org.apache.syncope.common.lib.auth.AuthModuleConf;
+import org.apache.syncope.common.lib.policy.AuthPolicyConf;
 
 /**
  * Cache class names for all implementations of Syncope interfaces found in 
classpath, for later usage.
diff --git 
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/authentication/AuthModuleDAO.java
 
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/auth/AuthModuleDAO.java
similarity index 89%
rename from 
core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/authentication/AuthModuleDAO.java
rename to 
core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/auth/AuthModuleDAO.java
index fc8ee3b..fcd1f90 100644
--- 
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/authentication/AuthModuleDAO.java
+++ 
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/auth/AuthModuleDAO.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.persistence.api.dao.authentication;
+package org.apache.syncope.core.persistence.api.dao.auth;
 
 import org.apache.syncope.core.persistence.api.dao.DAO;
 import org.apache.syncope.core.persistence.api.entity.Implementation;
 import java.util.List;
-import 
org.apache.syncope.core.persistence.api.entity.authentication.AuthModule;
+import org.apache.syncope.core.persistence.api.entity.auth.AuthModule;
 
 public interface AuthModuleDAO extends DAO<AuthModule> {
 
diff --git 
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/authentication/OIDCRPDAO.java
 
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/auth/OIDCRPDAO.java
similarity index 89%
rename from 
core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/authentication/OIDCRPDAO.java
rename to 
core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/auth/OIDCRPDAO.java
index f1789f2..dc647ab 100644
--- 
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/authentication/OIDCRPDAO.java
+++ 
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/auth/OIDCRPDAO.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.persistence.api.dao.authentication;
+package org.apache.syncope.core.persistence.api.dao.auth;
 
 import org.apache.syncope.core.persistence.api.dao.DAO;
 
 import java.util.List;
-import org.apache.syncope.core.persistence.api.entity.authentication.OIDCRP;
+import org.apache.syncope.core.persistence.api.entity.auth.OIDCRP;
 
 public interface OIDCRPDAO extends DAO<OIDCRP> {
 
diff --git 
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/authentication/SAML2SPDAO.java
 
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/auth/SAML2SPDAO.java
similarity index 89%
rename from 
core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/authentication/SAML2SPDAO.java
rename to 
core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/auth/SAML2SPDAO.java
index 46a0dad..6196965 100644
--- 
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/authentication/SAML2SPDAO.java
+++ 
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/auth/SAML2SPDAO.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.persistence.api.dao.authentication;
+package org.apache.syncope.core.persistence.api.dao.auth;
 
 import org.apache.syncope.core.persistence.api.dao.DAO;
 
 import java.util.List;
-import org.apache.syncope.core.persistence.api.entity.authentication.SAML2SP;
+import org.apache.syncope.core.persistence.api.entity.auth.SAML2SP;
 
 public interface SAML2SPDAO extends DAO<SAML2SP> {
 
diff --git 
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/AuthModule.java
 
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/auth/AuthModule.java
similarity index 94%
rename from 
core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/AuthModule.java
rename to 
core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/auth/AuthModule.java
index c786f0a..68c5669 100644
--- 
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/AuthModule.java
+++ 
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/auth/AuthModule.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.persistence.api.entity.authentication;
+package org.apache.syncope.core.persistence.api.entity.auth;
 
 import org.apache.syncope.core.persistence.api.entity.Entity;
 import org.apache.syncope.core.persistence.api.entity.Implementation;
diff --git 
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/ClientApp.java
 
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/auth/ClientApp.java
similarity index 95%
rename from 
core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/ClientApp.java
rename to 
core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/auth/ClientApp.java
index 3d67a89..fd52314 100644
--- 
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/ClientApp.java
+++ 
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/auth/ClientApp.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.persistence.api.entity.authentication;
+package org.apache.syncope.core.persistence.api.entity.auth;
 
 import org.apache.syncope.core.persistence.api.entity.Entity;
 import org.apache.syncope.core.persistence.api.entity.Realm;
diff --git 
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/ClientAppUtils.java
 
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/auth/ClientAppUtils.java
similarity index 93%
rename from 
core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/ClientAppUtils.java
rename to 
core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/auth/ClientAppUtils.java
index 2474325..7db5f11 100644
--- 
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/ClientAppUtils.java
+++ 
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/auth/ClientAppUtils.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.persistence.api.entity.authentication;
+package org.apache.syncope.core.persistence.api.entity.auth;
 
 import org.apache.syncope.common.lib.types.ClientAppType;
 
diff --git 
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/ClientAppUtilsFactory.java
 
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/auth/ClientAppUtilsFactory.java
similarity index 94%
rename from 
core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/ClientAppUtilsFactory.java
rename to 
core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/auth/ClientAppUtilsFactory.java
index debdd75..6777d9d 100644
--- 
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/ClientAppUtilsFactory.java
+++ 
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/auth/ClientAppUtilsFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.persistence.api.entity.authentication;
+package org.apache.syncope.core.persistence.api.entity.auth;
 
 import org.apache.syncope.common.lib.to.client.ClientAppTO;
 import org.apache.syncope.common.lib.types.ClientAppType;
diff --git 
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/OIDCRP.java
 
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/auth/OIDCRP.java
similarity index 95%
rename from 
core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/OIDCRP.java
rename to 
core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/auth/OIDCRP.java
index fe5dbbe..0a72461 100644
--- 
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/OIDCRP.java
+++ 
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/auth/OIDCRP.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.persistence.api.entity.authentication;
+package org.apache.syncope.core.persistence.api.entity.auth;
 
 import java.util.List;
 import java.util.Set;
diff --git 
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/SAML2SP.java
 
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/auth/SAML2SP.java
similarity index 96%
rename from 
core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/SAML2SP.java
rename to 
core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/auth/SAML2SP.java
index 0199b64..2103b5d 100644
--- 
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/SAML2SP.java
+++ 
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/auth/SAML2SP.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.persistence.api.entity.authentication;
+package org.apache.syncope.core.persistence.api.entity.auth;
 
 import org.apache.syncope.common.lib.types.SAML2SPNameId;
 
diff --git 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/authentication/JPAAuthModuleDAO.java
 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/auth/JPAAuthModuleDAO.java
similarity index 89%
rename from 
core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/authentication/JPAAuthModuleDAO.java
rename to 
core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/auth/JPAAuthModuleDAO.java
index 5a9679f..bd21ef5 100644
--- 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/authentication/JPAAuthModuleDAO.java
+++ 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/auth/JPAAuthModuleDAO.java
@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.persistence.jpa.dao.authentication;
+package org.apache.syncope.core.persistence.jpa.dao.auth;
 
 import org.apache.syncope.core.persistence.api.entity.Implementation;
 import org.apache.syncope.core.persistence.jpa.dao.AbstractDAO;
-import 
org.apache.syncope.core.persistence.jpa.entity.authentication.JPAAuthModule;
+import org.apache.syncope.core.persistence.jpa.entity.auth.JPAAuthModule;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 import javax.persistence.TypedQuery;
 import java.util.List;
-import 
org.apache.syncope.core.persistence.api.entity.authentication.AuthModule;
-import 
org.apache.syncope.core.persistence.api.dao.authentication.AuthModuleDAO;
+import org.apache.syncope.core.persistence.api.entity.auth.AuthModule;
+import org.apache.syncope.core.persistence.api.dao.auth.AuthModuleDAO;
 
 @Repository
 public class JPAAuthModuleDAO extends AbstractDAO<AuthModule> implements 
AuthModuleDAO {
diff --git 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/authentication/JPAOIDCRPDAO.java
 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/auth/JPAOIDCRPDAO.java
similarity index 91%
rename from 
core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/authentication/JPAOIDCRPDAO.java
rename to 
core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/auth/JPAOIDCRPDAO.java
index 498f5ed..b4e9481 100644
--- 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/authentication/JPAOIDCRPDAO.java
+++ 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/auth/JPAOIDCRPDAO.java
@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.persistence.jpa.dao.authentication;
+package org.apache.syncope.core.persistence.jpa.dao.auth;
 
 import java.util.List;
 import javax.persistence.NoResultException;
 import javax.persistence.TypedQuery;
 import org.apache.syncope.core.persistence.jpa.dao.AbstractDAO;
-import org.apache.syncope.core.persistence.jpa.entity.authentication.JPAOIDCRP;
+import org.apache.syncope.core.persistence.jpa.entity.auth.JPAOIDCRP;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
-import org.apache.syncope.core.persistence.api.dao.authentication.OIDCRPDAO;
-import org.apache.syncope.core.persistence.api.entity.authentication.OIDCRP;
+import org.apache.syncope.core.persistence.api.dao.auth.OIDCRPDAO;
+import org.apache.syncope.core.persistence.api.entity.auth.OIDCRP;
 
 @Repository
 public class JPAOIDCRPDAO extends AbstractDAO<OIDCRP> implements OIDCRPDAO {
diff --git 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/authentication/JPASAML2SPDAO.java
 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/auth/JPASAML2SPDAO.java
similarity index 91%
rename from 
core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/authentication/JPASAML2SPDAO.java
rename to 
core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/auth/JPASAML2SPDAO.java
index d37a067..15aba07 100644
--- 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/authentication/JPASAML2SPDAO.java
+++ 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/auth/JPASAML2SPDAO.java
@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.persistence.jpa.dao.authentication;
+package org.apache.syncope.core.persistence.jpa.dao.auth;
 
 import org.apache.syncope.core.persistence.jpa.dao.AbstractDAO;
-import 
org.apache.syncope.core.persistence.jpa.entity.authentication.JPASAML2SP;
+import org.apache.syncope.core.persistence.jpa.entity.auth.JPASAML2SP;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 import javax.persistence.NoResultException;
 import javax.persistence.TypedQuery;
 import java.util.List;
-import org.apache.syncope.core.persistence.api.dao.authentication.SAML2SPDAO;
-import org.apache.syncope.core.persistence.api.entity.authentication.SAML2SP;
+import org.apache.syncope.core.persistence.api.dao.auth.SAML2SPDAO;
+import org.apache.syncope.core.persistence.api.entity.auth.SAML2SP;
 
 @Repository
 public class JPASAML2SPDAO extends AbstractDAO<SAML2SP> implements SAML2SPDAO {
diff --git 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPAEntityFactory.java
 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPAEntityFactory.java
index 986c716..e625cad 100644
--- 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPAEntityFactory.java
+++ 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPAEntityFactory.java
@@ -56,9 +56,9 @@ import 
org.apache.syncope.core.persistence.api.entity.anyobject.APlainAttrUnique
 import 
org.apache.syncope.core.persistence.api.entity.anyobject.APlainAttrValue;
 import org.apache.syncope.core.persistence.api.entity.anyobject.ARelationship;
 import org.apache.syncope.core.persistence.api.entity.anyobject.AnyObject;
-import 
org.apache.syncope.core.persistence.api.entity.authentication.AuthModule;
-import org.apache.syncope.core.persistence.api.entity.authentication.OIDCRP;
-import org.apache.syncope.core.persistence.api.entity.authentication.SAML2SP;
+import org.apache.syncope.core.persistence.api.entity.auth.AuthModule;
+import org.apache.syncope.core.persistence.api.entity.auth.OIDCRP;
+import org.apache.syncope.core.persistence.api.entity.auth.SAML2SP;
 import org.apache.syncope.core.persistence.api.entity.group.GPlainAttr;
 import 
org.apache.syncope.core.persistence.api.entity.group.GPlainAttrUniqueValue;
 import org.apache.syncope.core.persistence.api.entity.group.GPlainAttrValue;
@@ -108,9 +108,9 @@ import 
org.apache.syncope.core.persistence.jpa.entity.anyobject.JPAAPlainAttrUni
 import 
org.apache.syncope.core.persistence.jpa.entity.anyobject.JPAAPlainAttrValue;
 import 
org.apache.syncope.core.persistence.jpa.entity.anyobject.JPAARelationship;
 import org.apache.syncope.core.persistence.jpa.entity.anyobject.JPAAnyObject;
-import 
org.apache.syncope.core.persistence.jpa.entity.authentication.JPAAuthModule;
-import org.apache.syncope.core.persistence.jpa.entity.authentication.JPAOIDCRP;
-import 
org.apache.syncope.core.persistence.jpa.entity.authentication.JPASAML2SP;
+import org.apache.syncope.core.persistence.jpa.entity.auth.JPAAuthModule;
+import org.apache.syncope.core.persistence.jpa.entity.auth.JPAOIDCRP;
+import org.apache.syncope.core.persistence.jpa.entity.auth.JPASAML2SP;
 import org.apache.syncope.core.persistence.jpa.entity.group.JPAGPlainAttr;
 import 
org.apache.syncope.core.persistence.jpa.entity.group.JPAGPlainAttrUniqueValue;
 import org.apache.syncope.core.persistence.jpa.entity.group.JPAGPlainAttrValue;
diff --git 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/authentication/AbstractClientApp.java
 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/auth/AbstractClientApp.java
similarity index 96%
rename from 
core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/authentication/AbstractClientApp.java
rename to 
core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/auth/AbstractClientApp.java
index a115d02..65c7987 100644
--- 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/authentication/AbstractClientApp.java
+++ 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/auth/AbstractClientApp.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.persistence.jpa.entity.authentication;
+package org.apache.syncope.core.persistence.jpa.entity.auth;
 
 import org.apache.syncope.core.persistence.api.entity.Realm;
-import org.apache.syncope.core.persistence.api.entity.authentication.ClientApp;
+import org.apache.syncope.core.persistence.api.entity.auth.ClientApp;
 import org.apache.syncope.core.persistence.api.entity.policy.AttrReleasePolicy;
 import org.apache.syncope.core.persistence.api.entity.policy.AccessPolicy;
 import 
org.apache.syncope.core.persistence.jpa.entity.AbstractGeneratedKeyEntity;
diff --git 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/authentication/JPAAuthModule.java
 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/auth/JPAAuthModule.java
similarity index 94%
rename from 
core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/authentication/JPAAuthModule.java
rename to 
core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/auth/JPAAuthModule.java
index 7a0ed2f..2a91d09 100644
--- 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/authentication/JPAAuthModule.java
+++ 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/auth/JPAAuthModule.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.persistence.jpa.entity.authentication;
+package org.apache.syncope.core.persistence.jpa.entity.auth;
 
 import org.apache.syncope.common.lib.types.AMImplementationType;
 import org.apache.syncope.core.persistence.api.entity.Implementation;
@@ -33,7 +33,7 @@ import javax.persistence.Table;
 
 import java.util.ArrayList;
 import java.util.List;
-import 
org.apache.syncope.core.persistence.api.entity.authentication.AuthModule;
+import org.apache.syncope.core.persistence.api.entity.auth.AuthModule;
 
 @Entity
 @Table(name = JPAAuthModule.TABLE)
diff --git 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/authentication/JPAClientAppUtils.java
 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/auth/JPAClientAppUtils.java
similarity index 78%
rename from 
core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/authentication/JPAClientAppUtils.java
rename to 
core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/auth/JPAClientAppUtils.java
index b6160f3..ced3c6a 100644
--- 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/authentication/JPAClientAppUtils.java
+++ 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/auth/JPAClientAppUtils.java
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.persistence.jpa.entity.authentication;
+package org.apache.syncope.core.persistence.jpa.entity.auth;
 
 import org.apache.syncope.common.lib.types.ClientAppType;
-import org.apache.syncope.core.persistence.api.entity.authentication.ClientApp;
-import 
org.apache.syncope.core.persistence.api.entity.authentication.ClientAppUtils;
-import org.apache.syncope.core.persistence.api.entity.authentication.OIDCRP;
-import org.apache.syncope.core.persistence.api.entity.authentication.SAML2SP;
+import org.apache.syncope.core.persistence.api.entity.auth.ClientApp;
+import org.apache.syncope.core.persistence.api.entity.auth.ClientAppUtils;
+import org.apache.syncope.core.persistence.api.entity.auth.OIDCRP;
+import org.apache.syncope.core.persistence.api.entity.auth.SAML2SP;
 
 public class JPAClientAppUtils implements ClientAppUtils {
 
diff --git 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/authentication/JPAClientAppUtilsFactory.java
 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/auth/JPAClientAppUtilsFactory.java
similarity index 83%
rename from 
core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/authentication/JPAClientAppUtilsFactory.java
rename to 
core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/auth/JPAClientAppUtilsFactory.java
index f19691d..610cc63 100644
--- 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/authentication/JPAClientAppUtilsFactory.java
+++ 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/auth/JPAClientAppUtilsFactory.java
@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.persistence.jpa.entity.authentication;
+package org.apache.syncope.core.persistence.jpa.entity.auth;
 
 import org.apache.syncope.common.lib.to.client.ClientAppTO;
 import org.apache.syncope.common.lib.to.client.OIDCRPTO;
 import org.apache.syncope.common.lib.to.client.SAML2SPTO;
 import org.apache.syncope.common.lib.types.ClientAppType;
-import org.apache.syncope.core.persistence.api.entity.authentication.ClientApp;
-import 
org.apache.syncope.core.persistence.api.entity.authentication.ClientAppUtils;
-import 
org.apache.syncope.core.persistence.api.entity.authentication.ClientAppUtilsFactory;
-import org.apache.syncope.core.persistence.api.entity.authentication.OIDCRP;
-import org.apache.syncope.core.persistence.api.entity.authentication.SAML2SP;
+import org.apache.syncope.core.persistence.api.entity.auth.ClientApp;
+import org.apache.syncope.core.persistence.api.entity.auth.ClientAppUtils;
+import 
org.apache.syncope.core.persistence.api.entity.auth.ClientAppUtilsFactory;
+import org.apache.syncope.core.persistence.api.entity.auth.OIDCRP;
+import org.apache.syncope.core.persistence.api.entity.auth.SAML2SP;
 import org.springframework.stereotype.Component;
 
 @Component
diff --git 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/authentication/JPAOIDCRP.java
 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/auth/JPAOIDCRP.java
similarity index 96%
rename from 
core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/authentication/JPAOIDCRP.java
rename to 
core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/auth/JPAOIDCRP.java
index 58797a0..a4f9a7b 100644
--- 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/authentication/JPAOIDCRP.java
+++ 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/auth/JPAOIDCRP.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.persistence.jpa.entity.authentication;
+package org.apache.syncope.core.persistence.jpa.entity.auth;
 
 import javax.persistence.CollectionTable;
 import javax.persistence.Column;
@@ -30,7 +30,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import org.apache.syncope.common.lib.types.OIDCSubjectType;
-import org.apache.syncope.core.persistence.api.entity.authentication.OIDCRP;
+import org.apache.syncope.core.persistence.api.entity.auth.OIDCRP;
 
 @Entity
 @Table(name = JPAOIDCRP.TABLE)
diff --git 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/authentication/JPASAML2SP.java
 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/auth/JPASAML2SP.java
similarity index 97%
rename from 
core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/authentication/JPASAML2SP.java
rename to 
core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/auth/JPASAML2SP.java
index f573b8e..a34f0e5 100644
--- 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/authentication/JPASAML2SP.java
+++ 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/auth/JPASAML2SP.java
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.persistence.jpa.entity.authentication;
+package org.apache.syncope.core.persistence.jpa.entity.auth;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import org.apache.syncope.common.lib.types.SAML2SPNameId;
-import org.apache.syncope.core.persistence.api.entity.authentication.SAML2SP;
+import org.apache.syncope.core.persistence.api.entity.auth.SAML2SP;
 
 @Entity
 @Table(name = JPASAML2SP.TABLE)
diff --git 
a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AbstractClientAppTest.java
 
b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AbstractClientAppTest.java
index 9c20b25..360e076 100644
--- 
a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AbstractClientAppTest.java
+++ 
b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AbstractClientAppTest.java
@@ -20,9 +20,9 @@ package org.apache.syncope.core.persistence.jpa.inner;
 
 import java.util.List;
 import java.util.Map;
-import org.apache.syncope.common.lib.access.DefaultAccessPolicyConf;
-import org.apache.syncope.common.lib.attrs.AllowedAttrReleasePolicyConf;
-import 
org.apache.syncope.common.lib.authentication.policy.DefaultAuthPolicyConf;
+import org.apache.syncope.common.lib.policy.DefaultAccessPolicyConf;
+import org.apache.syncope.common.lib.policy.AllowedAttrReleasePolicyConf;
+import org.apache.syncope.common.lib.policy.DefaultAuthPolicyConf;
 import org.apache.syncope.common.lib.types.AMImplementationType;
 import org.apache.syncope.common.lib.types.ImplementationEngine;
 import org.apache.syncope.core.persistence.api.dao.ImplementationDAO;
diff --git 
a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AuthModuleTest.java
 
b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AuthModuleTest.java
index 3bbbf10..780a9b0 100644
--- 
a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AuthModuleTest.java
+++ 
b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AuthModuleTest.java
@@ -22,27 +22,27 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
-import 
org.apache.syncope.common.lib.authentication.module.GoogleMfaAuthModuleConf;
-import org.apache.syncope.common.lib.authentication.module.JaasAuthModuleConf;
-import org.apache.syncope.common.lib.authentication.module.LDAPAuthModuleConf;
-import 
org.apache.syncope.common.lib.authentication.module.StaticAuthModuleConf;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.syncope.common.lib.auth.AuthModuleConf;
+import org.apache.syncope.common.lib.auth.GoogleMfaAuthModuleConf;
+import org.apache.syncope.common.lib.auth.JaasAuthModuleConf;
+import org.apache.syncope.common.lib.auth.LDAPAuthModuleConf;
+import org.apache.syncope.common.lib.auth.OIDCAuthModuleConf;
+import org.apache.syncope.common.lib.auth.StaticAuthModuleConf;
+import org.apache.syncope.common.lib.to.ItemTO;
 import org.apache.syncope.common.lib.types.AMImplementationType;
 import org.apache.syncope.common.lib.types.ImplementationEngine;
 import org.apache.syncope.core.persistence.api.dao.ImplementationDAO;
+import org.apache.syncope.core.persistence.api.dao.auth.AuthModuleDAO;
 import org.apache.syncope.core.persistence.api.entity.Implementation;
+import org.apache.syncope.core.persistence.api.entity.auth.AuthModule;
 import org.apache.syncope.core.persistence.jpa.AbstractTest;
 import org.apache.syncope.core.provisioning.api.serialization.POJOHelper;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import 
org.apache.syncope.core.persistence.api.entity.authentication.AuthModule;
-import org.apache.syncope.common.lib.authentication.module.AuthModuleConf;
-import org.apache.syncope.common.lib.authentication.module.OIDCAuthModuleConf;
-import org.apache.syncope.common.lib.to.ItemTO;
-import 
org.apache.syncope.core.persistence.api.dao.authentication.AuthModuleDAO;
 
 @Transactional("Master")
 public class AuthModuleTest extends AbstractTest {
@@ -55,8 +55,7 @@ public class AuthModuleTest extends AbstractTest {
 
     @Test
     public void find() {
-        AuthModule module = authModuleDAO.find(
-                "be456831-593d-4003-b273-4c3fb61700df");
+        AuthModule module = 
authModuleDAO.find("be456831-593d-4003-b273-4c3fb61700df");
         assertNotNull(module);
 
         module = authModuleDAO.find(UUID.randomUUID().toString());
@@ -72,8 +71,7 @@ public class AuthModuleTest extends AbstractTest {
 
     @Test
     public void saveWithPredefinedModule() {
-        StaticAuthModuleConf conf =
-                new StaticAuthModuleConf(Map.of("user", 
UUID.randomUUID().toString()));
+        StaticAuthModuleConf conf = new StaticAuthModuleConf(Map.of("user", 
UUID.randomUUID().toString()));
 
         Implementation config = getImplementation(conf);
 
@@ -201,5 +199,4 @@ public class AuthModuleTest extends AbstractTest {
         authModule = 
authModuleDAO.find("be456831-593d-4003-b273-4c3fb61700df");
         assertNull(authModule);
     }
-
 }
diff --git 
a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/OIDCRPTest.java
 
b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/OIDCRPTest.java
index 263c2a4..95da892 100644
--- 
a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/OIDCRPTest.java
+++ 
b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/OIDCRPTest.java
@@ -23,8 +23,8 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
 import org.apache.syncope.common.lib.types.OIDCSubjectType;
-import org.apache.syncope.core.persistence.api.dao.authentication.OIDCRPDAO;
-import org.apache.syncope.core.persistence.api.entity.authentication.OIDCRP;
+import org.apache.syncope.core.persistence.api.dao.auth.OIDCRPDAO;
+import org.apache.syncope.core.persistence.api.entity.auth.OIDCRP;
 import org.apache.syncope.core.persistence.api.entity.policy.AccessPolicy;
 import org.apache.syncope.core.persistence.api.entity.policy.AuthPolicy;
 import org.junit.jupiter.api.Test;
diff --git 
a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/PolicyTest.java
 
b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/PolicyTest.java
index 8f42058..304d97a 100644
--- 
a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/PolicyTest.java
+++ 
b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/PolicyTest.java
@@ -18,10 +18,10 @@
  */
 package org.apache.syncope.core.persistence.jpa.inner;
 
-import org.apache.syncope.common.lib.access.DefaultAccessPolicyConf;
-import org.apache.syncope.common.lib.attrs.AllowedAttrReleasePolicyConf;
-import 
org.apache.syncope.common.lib.authentication.policy.DefaultAuthPolicyConf;
-import 
org.apache.syncope.common.lib.authentication.policy.DefaultAuthPolicyCriteriaConf;
+import org.apache.syncope.common.lib.policy.DefaultAccessPolicyConf;
+import org.apache.syncope.common.lib.policy.AllowedAttrReleasePolicyConf;
+import org.apache.syncope.common.lib.policy.DefaultAuthPolicyConf;
+import org.apache.syncope.common.lib.policy.DefaultAuthPolicyCriteriaConf;
 import org.apache.syncope.common.lib.policy.DefaultPasswordRuleConf;
 import org.apache.syncope.common.lib.policy.DefaultPullCorrelationRuleConf;
 import org.apache.syncope.common.lib.policy.DefaultPushCorrelationRuleConf;
diff --git 
a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/SAML2SPTest.java
 
b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/SAML2SPTest.java
index 8639e9a..9415166 100644
--- 
a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/SAML2SPTest.java
+++ 
b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/SAML2SPTest.java
@@ -28,8 +28,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.apache.syncope.common.lib.types.SAML2SPNameId;
 import org.apache.syncope.core.persistence.api.entity.policy.AuthPolicy;
-import org.apache.syncope.core.persistence.api.dao.authentication.SAML2SPDAO;
-import org.apache.syncope.core.persistence.api.entity.authentication.SAML2SP;
+import org.apache.syncope.core.persistence.api.dao.auth.SAML2SPDAO;
+import org.apache.syncope.core.persistence.api.entity.auth.SAML2SP;
 
 @Transactional("Master")
 public class SAML2SPTest extends AbstractClientAppTest {
diff --git 
a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/outer/PolicyTest.java
 
b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/outer/PolicyTest.java
index fe6e99e..75a5f3b 100644
--- 
a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/outer/PolicyTest.java
+++ 
b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/outer/PolicyTest.java
@@ -38,8 +38,8 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-import org.apache.syncope.core.persistence.api.dao.authentication.OIDCRPDAO;
-import org.apache.syncope.core.persistence.api.entity.authentication.OIDCRP;
+import org.apache.syncope.core.persistence.api.dao.auth.OIDCRPDAO;
+import org.apache.syncope.core.persistence.api.entity.auth.OIDCRP;
 
 @Transactional("Master")
 public class PolicyTest extends AbstractClientAppTest {
diff --git 
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/ClientAppDataBinder.java
 
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/ClientAppDataBinder.java
index 308543d..0590122 100644
--- 
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/ClientAppDataBinder.java
+++ 
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/ClientAppDataBinder.java
@@ -19,7 +19,7 @@
 package org.apache.syncope.core.provisioning.api.data;
 
 import org.apache.syncope.common.lib.to.client.ClientAppTO;
-import org.apache.syncope.core.persistence.api.entity.authentication.ClientApp;
+import org.apache.syncope.core.persistence.api.entity.auth.ClientApp;
 
 public interface ClientAppDataBinder {
 
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ClientAppDataBinderImpl.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ClientAppDataBinderImpl.java
index a915513..9bc5a8d 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ClientAppDataBinderImpl.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ClientAppDataBinderImpl.java
@@ -25,8 +25,8 @@ import org.apache.syncope.common.lib.to.client.SAML2SPTO;
 import org.apache.syncope.common.lib.types.ClientExceptionType;
 import org.apache.syncope.core.persistence.api.dao.PolicyDAO;
 import org.apache.syncope.core.persistence.api.entity.EntityFactory;
-import org.apache.syncope.core.persistence.api.entity.authentication.ClientApp;
-import org.apache.syncope.core.persistence.api.entity.authentication.SAML2SP;
+import org.apache.syncope.core.persistence.api.entity.auth.ClientApp;
+import org.apache.syncope.core.persistence.api.entity.auth.SAML2SP;
 import org.apache.syncope.core.persistence.api.entity.policy.AccessPolicy;
 import org.apache.syncope.core.persistence.api.entity.policy.AttrReleasePolicy;
 import org.apache.syncope.core.persistence.api.entity.policy.AuthPolicy;
@@ -34,7 +34,7 @@ import 
org.apache.syncope.core.persistence.api.entity.policy.Policy;
 import org.apache.syncope.core.provisioning.api.data.ClientAppDataBinder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.apache.syncope.core.persistence.api.entity.authentication.OIDCRP;
+import org.apache.syncope.core.persistence.api.entity.auth.OIDCRP;
 
 @Component
 public class ClientAppDataBinderImpl implements ClientAppDataBinder {
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ImplementationDataBinderImpl.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ImplementationDataBinderImpl.java
index fce1439..dca7d28 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ImplementationDataBinderImpl.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ImplementationDataBinderImpl.java
@@ -21,9 +21,9 @@ package org.apache.syncope.core.provisioning.java.data;
 import java.lang.reflect.Modifier;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.syncope.common.lib.SyncopeClientException;
-import org.apache.syncope.common.lib.access.AccessPolicyConf;
-import org.apache.syncope.common.lib.attrs.AttrReleasePolicyConf;
-import org.apache.syncope.common.lib.authentication.module.AuthModuleConf;
+import org.apache.syncope.common.lib.policy.AccessPolicyConf;
+import org.apache.syncope.common.lib.policy.AttrReleasePolicyConf;
+import org.apache.syncope.common.lib.auth.AuthModuleConf;
 import org.apache.syncope.common.lib.policy.RuleConf;
 import org.apache.syncope.common.lib.report.ReportletConf;
 import org.apache.syncope.common.lib.to.ImplementationTO;
@@ -57,8 +57,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.apache.syncope.common.lib.authentication.policy.AuthPolicyConf;
-import 
org.apache.syncope.core.persistence.api.entity.authentication.AuthModule;
+import org.apache.syncope.common.lib.policy.AuthPolicyConf;
+import org.apache.syncope.core.persistence.api.entity.auth.AuthModule;
 import org.apache.syncope.core.persistence.api.entity.policy.AuthPolicy;
 
 @Component
diff --git 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PolicyITCase.java
 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PolicyITCase.java
index 687b520..b35211f 100644
--- 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PolicyITCase.java
+++ 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PolicyITCase.java
@@ -28,8 +28,8 @@ import static org.junit.jupiter.api.Assertions.fail;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.SerializationUtils;
 import org.apache.syncope.common.lib.SyncopeClientException;
-import org.apache.syncope.common.lib.access.DefaultAccessPolicyConf;
-import org.apache.syncope.common.lib.attrs.AllowedAttrReleasePolicyConf;
+import org.apache.syncope.common.lib.policy.DefaultAccessPolicyConf;
+import org.apache.syncope.common.lib.policy.AllowedAttrReleasePolicyConf;
 import org.apache.syncope.common.lib.policy.AccountPolicyTO;
 import org.apache.syncope.common.lib.policy.DefaultAccountRuleConf;
 import org.apache.syncope.common.lib.policy.DefaultPasswordRuleConf;
@@ -57,7 +57,7 @@ import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Set;
-import 
org.apache.syncope.common.lib.authentication.policy.DefaultAuthPolicyConf;
+import org.apache.syncope.common.lib.policy.DefaultAuthPolicyConf;
 import org.apache.syncope.common.lib.to.AuthPolicyTO;
 
 public class PolicyITCase extends AbstractITCase {
diff --git 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/RealmITCase.java 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/RealmITCase.java
index 04efaba..7c1e252 100644
--- 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/RealmITCase.java
+++ 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/RealmITCase.java
@@ -32,9 +32,9 @@ import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.Response;
 import org.apache.syncope.common.lib.SyncopeClientException;
 import org.apache.syncope.common.lib.SyncopeConstants;
-import org.apache.syncope.common.lib.access.DefaultAccessPolicyConf;
-import org.apache.syncope.common.lib.attrs.AllowedAttrReleasePolicyConf;
-import 
org.apache.syncope.common.lib.authentication.policy.DefaultAuthPolicyConf;
+import org.apache.syncope.common.lib.policy.DefaultAccessPolicyConf;
+import org.apache.syncope.common.lib.policy.AllowedAttrReleasePolicyConf;
+import org.apache.syncope.common.lib.policy.DefaultAuthPolicyConf;
 import org.apache.syncope.common.lib.policy.AccountPolicyTO;
 import org.apache.syncope.common.lib.to.RealmTO;
 import org.apache.syncope.common.lib.policy.DefaultAccountRuleConf;

Reply via email to