diff --git a/persistence-modules/hibernate-exceptions-2/pom.xml b/persistence-modules/hibernate-exceptions-2/pom.xml
index 26559295ded3..d3e652671614 100644
--- a/persistence-modules/hibernate-exceptions-2/pom.xml
+++ b/persistence-modules/hibernate-exceptions-2/pom.xml
@@ -24,10 +24,16 @@
             <artifactId>h2</artifactId>
             <version>${h2.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+            <version>${hsqldb.version}</version>
+        </dependency>
     </dependencies>
 
     <properties>
         <h2.version>2.3.232</h2.version>
+        <hsqldb.version>2.7.1</hsqldb.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/entitynotfoundexception/Category.java b/persistence-modules/hibernate-exceptions-2/src/main/java/com/baeldung/hibernate/entitynotfoundexception/Category.java
similarity index 99%
rename from persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/entitynotfoundexception/Category.java
rename to persistence-modules/hibernate-exceptions-2/src/main/java/com/baeldung/hibernate/entitynotfoundexception/Category.java
index cab06ae9cf0a..197e1657d7fe 100644
--- a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/entitynotfoundexception/Category.java
+++ b/persistence-modules/hibernate-exceptions-2/src/main/java/com/baeldung/hibernate/entitynotfoundexception/Category.java
@@ -1,6 +1,7 @@
 package com.baeldung.hibernate.entitynotfoundexception;
 
 import jakarta.persistence.*;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/entitynotfoundexception/Item.java b/persistence-modules/hibernate-exceptions-2/src/main/java/com/baeldung/hibernate/entitynotfoundexception/Item.java
similarity index 99%
rename from persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/entitynotfoundexception/Item.java
rename to persistence-modules/hibernate-exceptions-2/src/main/java/com/baeldung/hibernate/entitynotfoundexception/Item.java
index 2d07178aafd0..f478990e7967 100644
--- a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/entitynotfoundexception/Item.java
+++ b/persistence-modules/hibernate-exceptions-2/src/main/java/com/baeldung/hibernate/entitynotfoundexception/Item.java
@@ -1,6 +1,7 @@
 package com.baeldung.hibernate.entitynotfoundexception;
 
 import jakarta.persistence.*;
+
 import java.io.Serializable;
 
 @Entity
diff --git a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/entitynotfoundexception/User.java b/persistence-modules/hibernate-exceptions-2/src/main/java/com/baeldung/hibernate/entitynotfoundexception/User.java
similarity index 100%
rename from persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/entitynotfoundexception/User.java
rename to persistence-modules/hibernate-exceptions-2/src/main/java/com/baeldung/hibernate/entitynotfoundexception/User.java
diff --git a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/persistentobject/HibernateUtil.java b/persistence-modules/hibernate-exceptions-2/src/main/java/com/baeldung/hibernate/exception/persistentobject/HibernateUtil.java
similarity index 99%
rename from persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/persistentobject/HibernateUtil.java
rename to persistence-modules/hibernate-exceptions-2/src/main/java/com/baeldung/hibernate/exception/persistentobject/HibernateUtil.java
index bbf8f46e8292..c9d02a26e4e3 100644
--- a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/persistentobject/HibernateUtil.java
+++ b/persistence-modules/hibernate-exceptions-2/src/main/java/com/baeldung/hibernate/exception/persistentobject/HibernateUtil.java
@@ -1,17 +1,16 @@
 package com.baeldung.hibernate.exception.persistentobject;
 
-import java.util.Properties;
-
+import com.baeldung.hibernate.exception.persistentobject.entity.Article;
+import com.baeldung.hibernate.exception.persistentobject.entity.Author;
+import com.baeldung.hibernate.exception.persistentobject.entity.Book;
+import com.baeldung.hibernate.namedparameternotbound.Person;
 import org.hibernate.SessionFactory;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.cfg.Environment;
 import org.hibernate.service.ServiceRegistry;
 
-import com.baeldung.hibernate.exception.persistentobject.entity.Article;
-import com.baeldung.hibernate.exception.persistentobject.entity.Author;
-import com.baeldung.hibernate.exception.persistentobject.entity.Book;
-import com.baeldung.hibernate.namedparameternotbound.Person;
+import java.util.Properties;
 
 public class HibernateUtil {
     private static SessionFactory sessionFactory;
diff --git a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/persistentobject/entity/Article.java b/persistence-modules/hibernate-exceptions-2/src/main/java/com/baeldung/hibernate/exception/persistentobject/entity/Article.java
similarity index 69%
rename from persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/persistentobject/entity/Article.java
rename to persistence-modules/hibernate-exceptions-2/src/main/java/com/baeldung/hibernate/exception/persistentobject/entity/Article.java
index eb697334ae06..bfa16948c56d 100644
--- a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/persistentobject/entity/Article.java
+++ b/persistence-modules/hibernate-exceptions-2/src/main/java/com/baeldung/hibernate/exception/persistentobject/entity/Article.java
@@ -1,10 +1,6 @@
 package com.baeldung.hibernate.exception.persistentobject.entity;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.ManyToOne;
+import jakarta.persistence.*;
 
 @Entity
 public class Article {
diff --git a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/persistentobject/entity/Author.java b/persistence-modules/hibernate-exceptions-2/src/main/java/com/baeldung/hibernate/exception/persistentobject/entity/Author.java
similarity index 81%
rename from persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/persistentobject/entity/Author.java
rename to persistence-modules/hibernate-exceptions-2/src/main/java/com/baeldung/hibernate/exception/persistentobject/entity/Author.java
index f8dcb82b7e52..dbd921ed413d 100644
--- a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/persistentobject/entity/Author.java
+++ b/persistence-modules/hibernate-exceptions-2/src/main/java/com/baeldung/hibernate/exception/persistentobject/entity/Author.java
@@ -1,16 +1,11 @@
 package com.baeldung.hibernate.exception.persistentobject.entity;
 
-import java.util.List;
-
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.OneToMany;
-
+import jakarta.persistence.*;
 import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
 
+import java.util.List;
+
 @Entity
 public class Author {
 
diff --git a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/persistentobject/entity/Book.java b/persistence-modules/hibernate-exceptions-2/src/main/java/com/baeldung/hibernate/exception/persistentobject/entity/Book.java
similarity index 71%
rename from persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/persistentobject/entity/Book.java
rename to persistence-modules/hibernate-exceptions-2/src/main/java/com/baeldung/hibernate/exception/persistentobject/entity/Book.java
index 986c7f061f8e..ae7bb3271153 100644
--- a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/persistentobject/entity/Book.java
+++ b/persistence-modules/hibernate-exceptions-2/src/main/java/com/baeldung/hibernate/exception/persistentobject/entity/Book.java
@@ -1,10 +1,6 @@
 package com.baeldung.hibernate.exception.persistentobject.entity;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
+import jakarta.persistence.*;
 
 @Entity
 public class Book {
diff --git a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/namedparameternotbound/Person.java b/persistence-modules/hibernate-exceptions-2/src/main/java/com/baeldung/hibernate/namedparameternotbound/Person.java
similarity index 100%
rename from persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/namedparameternotbound/Person.java
rename to persistence-modules/hibernate-exceptions-2/src/main/java/com/baeldung/hibernate/namedparameternotbound/Person.java
diff --git a/persistence-modules/hibernate-exceptions/src/main/resources/META-INF/persistence.xml b/persistence-modules/hibernate-exceptions-2/src/main/resources/META-INF/persistence.xml
similarity index 100%
rename from persistence-modules/hibernate-exceptions/src/main/resources/META-INF/persistence.xml
rename to persistence-modules/hibernate-exceptions-2/src/main/resources/META-INF/persistence.xml
diff --git a/persistence-modules/hibernate-exceptions/src/test/java/com/baeldung/hibernate/entitynotfoundexception/EntityNotFoundExceptionIntegrationTest.java b/persistence-modules/hibernate-exceptions-2/src/test/java/com/baeldung/hibernate/entitynotfoundexception/EntityNotFoundExceptionIntegrationTest.java
similarity index 100%
rename from persistence-modules/hibernate-exceptions/src/test/java/com/baeldung/hibernate/entitynotfoundexception/EntityNotFoundExceptionIntegrationTest.java
rename to persistence-modules/hibernate-exceptions-2/src/test/java/com/baeldung/hibernate/entitynotfoundexception/EntityNotFoundExceptionIntegrationTest.java
index f339afd536de..a99d9d2460a1 100644
--- a/persistence-modules/hibernate-exceptions/src/test/java/com/baeldung/hibernate/entitynotfoundexception/EntityNotFoundExceptionIntegrationTest.java
+++ b/persistence-modules/hibernate-exceptions-2/src/test/java/com/baeldung/hibernate/entitynotfoundexception/EntityNotFoundExceptionIntegrationTest.java
@@ -1,13 +1,13 @@
 package com.baeldung.hibernate.entitynotfoundexception;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityManagerFactory;
 import jakarta.persistence.EntityNotFoundException;
 import jakarta.persistence.Persistence;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
 import java.io.IOException;
 
 public class EntityNotFoundExceptionIntegrationTest {
diff --git a/persistence-modules/hibernate-exceptions/src/test/java/com/baeldung/hibernate/exception/persistentobject/HibernatePersistentObjectUnitTest.java b/persistence-modules/hibernate-exceptions-2/src/test/java/com/baeldung/hibernate/exception/persistentobject/HibernatePersistentObjectUnitTest.java
similarity index 99%
rename from persistence-modules/hibernate-exceptions/src/test/java/com/baeldung/hibernate/exception/persistentobject/HibernatePersistentObjectUnitTest.java
rename to persistence-modules/hibernate-exceptions-2/src/test/java/com/baeldung/hibernate/exception/persistentobject/HibernatePersistentObjectUnitTest.java
index 09f11b07a2fc..29c075a30f5c 100644
--- a/persistence-modules/hibernate-exceptions/src/test/java/com/baeldung/hibernate/exception/persistentobject/HibernatePersistentObjectUnitTest.java
+++ b/persistence-modules/hibernate-exceptions-2/src/test/java/com/baeldung/hibernate/exception/persistentobject/HibernatePersistentObjectUnitTest.java
@@ -1,17 +1,16 @@
 package com.baeldung.hibernate.exception.persistentobject;
 
-import static java.util.Arrays.asList;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
+import com.baeldung.hibernate.exception.persistentobject.entity.Article;
+import com.baeldung.hibernate.exception.persistentobject.entity.Author;
+import com.baeldung.hibernate.exception.persistentobject.entity.Book;
 import org.hibernate.PropertyValueException;
 import org.hibernate.Session;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.baeldung.hibernate.exception.persistentobject.entity.Article;
-import com.baeldung.hibernate.exception.persistentobject.entity.Author;
-import com.baeldung.hibernate.exception.persistentobject.entity.Book;
+import static java.util.Arrays.asList;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class HibernatePersistentObjectUnitTest {
 
diff --git a/persistence-modules/hibernate-exceptions/src/test/java/com/baeldung/hibernate/namedparameternotbound/NamedParameterNotBoundExceptionUnitTest.java b/persistence-modules/hibernate-exceptions-2/src/test/java/com/baeldung/hibernate/namedparameternotbound/NamedParameterNotBoundExceptionUnitTest.java
similarity index 88%
rename from persistence-modules/hibernate-exceptions/src/test/java/com/baeldung/hibernate/namedparameternotbound/NamedParameterNotBoundExceptionUnitTest.java
rename to persistence-modules/hibernate-exceptions-2/src/test/java/com/baeldung/hibernate/namedparameternotbound/NamedParameterNotBoundExceptionUnitTest.java
index 82788ce5629d..3685738dd51d 100644
--- a/persistence-modules/hibernate-exceptions/src/test/java/com/baeldung/hibernate/namedparameternotbound/NamedParameterNotBoundExceptionUnitTest.java
+++ b/persistence-modules/hibernate-exceptions-2/src/test/java/com/baeldung/hibernate/namedparameternotbound/NamedParameterNotBoundExceptionUnitTest.java
@@ -1,9 +1,6 @@
 package com.baeldung.hibernate.namedparameternotbound;
 
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
+import com.baeldung.hibernate.exception.persistentobject.HibernateUtil;
 import org.hibernate.QueryException;
 import org.hibernate.Session;
 import org.hibernate.query.Query;
@@ -11,7 +8,7 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-import com.baeldung.hibernate.exception.persistentobject.HibernateUtil;
+import static org.junit.jupiter.api.Assertions.*;
 
 class NamedParameterNotBoundExceptionUnitTest {
 
diff --git a/persistence-modules/hibernate-exceptions/src/test/java/com/baeldung/hibernate/unknownentityexception/UnknownEntityExceptionUnitTest.java b/persistence-modules/hibernate-exceptions-2/src/test/java/com/baeldung/hibernate/unknownentityexception/UnknownEntityExceptionUnitTest.java
similarity index 89%
rename from persistence-modules/hibernate-exceptions/src/test/java/com/baeldung/hibernate/unknownentityexception/UnknownEntityExceptionUnitTest.java
rename to persistence-modules/hibernate-exceptions-2/src/test/java/com/baeldung/hibernate/unknownentityexception/UnknownEntityExceptionUnitTest.java
index 73233c5ba7a9..4f127158db47 100644
--- a/persistence-modules/hibernate-exceptions/src/test/java/com/baeldung/hibernate/unknownentityexception/UnknownEntityExceptionUnitTest.java
+++ b/persistence-modules/hibernate-exceptions-2/src/test/java/com/baeldung/hibernate/unknownentityexception/UnknownEntityExceptionUnitTest.java
@@ -1,8 +1,7 @@
 package com.baeldung.hibernate.unknownentityexception;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
+import com.baeldung.hibernate.exception.persistentobject.HibernateUtil;
+import com.baeldung.hibernate.namedparameternotbound.Person;
 import org.hibernate.Session;
 import org.hibernate.query.Query;
 import org.hibernate.query.sqm.UnknownEntityException;
@@ -10,8 +9,8 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-import com.baeldung.hibernate.exception.persistentobject.HibernateUtil;
-import com.baeldung.hibernate.namedparameternotbound.Person;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 class UnknownEntityExceptionUnitTest {
 
@@ -32,8 +31,8 @@ static void clear() {
     @Test
     void whenUsingUnknownEntity_thenThrowUnknownEntityException() {
         assertThatThrownBy(() -> session.createQuery("FROM PERSON", Person.class))
-          .hasRootCauseInstanceOf(UnknownEntityException.class)
-          .hasRootCauseMessage("Could not resolve root entity 'PERSON'");
+                .hasRootCauseInstanceOf(UnknownEntityException.class)
+                .hasRootCauseMessage("Could not resolve root entity 'PERSON'");
     }
 
     @Test