diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/Address.java b/persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/Address.java
similarity index 100%
rename from hibernate5/src/main/java/com/baeldung/hibernate/customtypes/Address.java
rename to persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/Address.java
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/AddressType.java b/persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/AddressType.java
similarity index 100%
rename from hibernate5/src/main/java/com/baeldung/hibernate/customtypes/AddressType.java
rename to persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/AddressType.java
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/LocalDateStringJavaDescriptor.java b/persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/LocalDateStringJavaDescriptor.java
similarity index 100%
rename from hibernate5/src/main/java/com/baeldung/hibernate/customtypes/LocalDateStringJavaDescriptor.java
rename to persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/LocalDateStringJavaDescriptor.java
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/LocalDateStringType.java b/persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/LocalDateStringType.java
similarity index 100%
rename from hibernate5/src/main/java/com/baeldung/hibernate/customtypes/LocalDateStringType.java
rename to persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/LocalDateStringType.java
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/OfficeEmployee.java b/persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/OfficeEmployee.java
similarity index 100%
rename from hibernate5/src/main/java/com/baeldung/hibernate/customtypes/OfficeEmployee.java
rename to persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/OfficeEmployee.java
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/PhoneNumber.java b/persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/PhoneNumber.java
similarity index 100%
rename from hibernate5/src/main/java/com/baeldung/hibernate/customtypes/PhoneNumber.java
rename to persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/PhoneNumber.java
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/PhoneNumberType.java b/persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/PhoneNumberType.java
similarity index 100%
rename from hibernate5/src/main/java/com/baeldung/hibernate/customtypes/PhoneNumberType.java
rename to persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/PhoneNumberType.java
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/Salary.java b/persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/Salary.java
similarity index 100%
rename from hibernate5/src/main/java/com/baeldung/hibernate/customtypes/Salary.java
rename to persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/Salary.java
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/SalaryCurrencyConvertor.java b/persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/SalaryCurrencyConvertor.java
similarity index 100%
rename from hibernate5/src/main/java/com/baeldung/hibernate/customtypes/SalaryCurrencyConvertor.java
rename to persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/SalaryCurrencyConvertor.java
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/SalaryType.java b/persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/SalaryType.java
similarity index 100%
rename from hibernate5/src/main/java/com/baeldung/hibernate/customtypes/SalaryType.java
rename to persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/SalaryType.java
diff --git a/hibernate5/src/test/java/com/baeldung/hibernate/customtypes/HibernateCustomTypesUnitTest.java b/persistence-modules/hibernate5/src/test/java/com/baeldung/hibernate/customtypes/HibernateCustomTypesUnitTest.java
similarity index 100%
rename from hibernate5/src/test/java/com/baeldung/hibernate/customtypes/HibernateCustomTypesUnitTest.java
rename to persistence-modules/hibernate5/src/test/java/com/baeldung/hibernate/customtypes/HibernateCustomTypesUnitTest.java
diff --git a/hibernate5/src/test/resources/hibernate-customtypes.properties b/persistence-modules/hibernate5/src/test/resources/hibernate-customtypes.properties
similarity index 100%
rename from hibernate5/src/test/resources/hibernate-customtypes.properties
rename to persistence-modules/hibernate5/src/test/resources/hibernate-customtypes.properties