diff --git a/atomikos/README.md b/persistence-modules/atomikos/README.md
similarity index 100%
rename from atomikos/README.md
rename to persistence-modules/atomikos/README.md
diff --git a/atomikos/pom.xml b/persistence-modules/atomikos/pom.xml
similarity index 98%
rename from atomikos/pom.xml
rename to persistence-modules/atomikos/pom.xml
index 2cbc106268..c1748f7dac 100644
--- a/atomikos/pom.xml
+++ b/persistence-modules/atomikos/pom.xml
@@ -8,7 +8,7 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
+        <artifactId>persistence-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
diff --git a/atomikos/src/main/java/com/baeldung/atomikos/direct/Application.java b/persistence-modules/atomikos/src/main/java/com/baeldung/atomikos/direct/Application.java
similarity index 100%
rename from atomikos/src/main/java/com/baeldung/atomikos/direct/Application.java
rename to persistence-modules/atomikos/src/main/java/com/baeldung/atomikos/direct/Application.java
diff --git a/atomikos/src/main/java/com/baeldung/atomikos/spring/Application.java b/persistence-modules/atomikos/src/main/java/com/baeldung/atomikos/spring/Application.java
similarity index 100%
rename from atomikos/src/main/java/com/baeldung/atomikos/spring/Application.java
rename to persistence-modules/atomikos/src/main/java/com/baeldung/atomikos/spring/Application.java
diff --git a/atomikos/src/main/java/com/baeldung/atomikos/spring/config/Config.java b/persistence-modules/atomikos/src/main/java/com/baeldung/atomikos/spring/config/Config.java
similarity index 100%
rename from atomikos/src/main/java/com/baeldung/atomikos/spring/config/Config.java
rename to persistence-modules/atomikos/src/main/java/com/baeldung/atomikos/spring/config/Config.java
diff --git a/atomikos/src/main/java/com/baeldung/atomikos/spring/jpa/Application.java b/persistence-modules/atomikos/src/main/java/com/baeldung/atomikos/spring/jpa/Application.java
similarity index 100%
rename from atomikos/src/main/java/com/baeldung/atomikos/spring/jpa/Application.java
rename to persistence-modules/atomikos/src/main/java/com/baeldung/atomikos/spring/jpa/Application.java
diff --git a/atomikos/src/main/java/com/baeldung/atomikos/spring/jpa/config/Config.java b/persistence-modules/atomikos/src/main/java/com/baeldung/atomikos/spring/jpa/config/Config.java
similarity index 100%
rename from atomikos/src/main/java/com/baeldung/atomikos/spring/jpa/config/Config.java
rename to persistence-modules/atomikos/src/main/java/com/baeldung/atomikos/spring/jpa/config/Config.java
diff --git a/atomikos/src/main/java/com/baeldung/atomikos/spring/jpa/inventory/Inventory.java b/persistence-modules/atomikos/src/main/java/com/baeldung/atomikos/spring/jpa/inventory/Inventory.java
similarity index 100%
rename from atomikos/src/main/java/com/baeldung/atomikos/spring/jpa/inventory/Inventory.java
rename to persistence-modules/atomikos/src/main/java/com/baeldung/atomikos/spring/jpa/inventory/Inventory.java
diff --git a/atomikos/src/main/java/com/baeldung/atomikos/spring/jpa/inventory/InventoryConfig.java b/persistence-modules/atomikos/src/main/java/com/baeldung/atomikos/spring/jpa/inventory/InventoryConfig.java
similarity index 100%
rename from atomikos/src/main/java/com/baeldung/atomikos/spring/jpa/inventory/InventoryConfig.java
rename to persistence-modules/atomikos/src/main/java/com/baeldung/atomikos/spring/jpa/inventory/InventoryConfig.java
diff --git a/atomikos/src/main/java/com/baeldung/atomikos/spring/jpa/inventory/InventoryRepository.java b/persistence-modules/atomikos/src/main/java/com/baeldung/atomikos/spring/jpa/inventory/InventoryRepository.java
similarity index 100%
rename from atomikos/src/main/java/com/baeldung/atomikos/spring/jpa/inventory/InventoryRepository.java
rename to persistence-modules/atomikos/src/main/java/com/baeldung/atomikos/spring/jpa/inventory/InventoryRepository.java
diff --git a/atomikos/src/main/java/com/baeldung/atomikos/spring/jpa/order/Order.java b/persistence-modules/atomikos/src/main/java/com/baeldung/atomikos/spring/jpa/order/Order.java
similarity index 100%
rename from atomikos/src/main/java/com/baeldung/atomikos/spring/jpa/order/Order.java
rename to persistence-modules/atomikos/src/main/java/com/baeldung/atomikos/spring/jpa/order/Order.java
diff --git a/atomikos/src/main/java/com/baeldung/atomikos/spring/jpa/order/OrderConfig.java b/persistence-modules/atomikos/src/main/java/com/baeldung/atomikos/spring/jpa/order/OrderConfig.java
similarity index 100%
rename from atomikos/src/main/java/com/baeldung/atomikos/spring/jpa/order/OrderConfig.java
rename to persistence-modules/atomikos/src/main/java/com/baeldung/atomikos/spring/jpa/order/OrderConfig.java
diff --git a/atomikos/src/main/java/com/baeldung/atomikos/spring/jpa/order/OrderRepository.java b/persistence-modules/atomikos/src/main/java/com/baeldung/atomikos/spring/jpa/order/OrderRepository.java
similarity index 100%
rename from atomikos/src/main/java/com/baeldung/atomikos/spring/jpa/order/OrderRepository.java
rename to persistence-modules/atomikos/src/main/java/com/baeldung/atomikos/spring/jpa/order/OrderRepository.java
diff --git a/atomikos/src/main/resources/logback.xml b/persistence-modules/atomikos/src/main/resources/logback.xml
similarity index 100%
rename from atomikos/src/main/resources/logback.xml
rename to persistence-modules/atomikos/src/main/resources/logback.xml
diff --git a/atomikos/src/main/resources/schema.sql b/persistence-modules/atomikos/src/main/resources/schema.sql
similarity index 100%
rename from atomikos/src/main/resources/schema.sql
rename to persistence-modules/atomikos/src/main/resources/schema.sql
diff --git a/atomikos/src/main/resources/transactions.properties b/persistence-modules/atomikos/src/main/resources/transactions.properties
similarity index 100%
rename from atomikos/src/main/resources/transactions.properties
rename to persistence-modules/atomikos/src/main/resources/transactions.properties
diff --git a/atomikos/src/test/java/com/baeldung/atomikos/direct/ApplicationUnitTest.java b/persistence-modules/atomikos/src/test/java/com/baeldung/atomikos/direct/ApplicationUnitTest.java
similarity index 100%
rename from atomikos/src/test/java/com/baeldung/atomikos/direct/ApplicationUnitTest.java
rename to persistence-modules/atomikos/src/test/java/com/baeldung/atomikos/direct/ApplicationUnitTest.java
diff --git a/atomikos/src/test/java/com/baeldung/atomikos/spring/ApplicationUnitTest.java b/persistence-modules/atomikos/src/test/java/com/baeldung/atomikos/spring/ApplicationUnitTest.java
similarity index 100%
rename from atomikos/src/test/java/com/baeldung/atomikos/spring/ApplicationUnitTest.java
rename to persistence-modules/atomikos/src/test/java/com/baeldung/atomikos/spring/ApplicationUnitTest.java
diff --git a/atomikos/src/test/java/com/baeldung/atomikos/spring/jpa/ApplicationUnitTest.java b/persistence-modules/atomikos/src/test/java/com/baeldung/atomikos/spring/jpa/ApplicationUnitTest.java
similarity index 100%
rename from atomikos/src/test/java/com/baeldung/atomikos/spring/jpa/ApplicationUnitTest.java
rename to persistence-modules/atomikos/src/test/java/com/baeldung/atomikos/spring/jpa/ApplicationUnitTest.java
diff --git a/atomikos/src/test/resources/logback.xml b/persistence-modules/atomikos/src/test/resources/logback.xml
similarity index 100%
rename from atomikos/src/test/resources/logback.xml
rename to persistence-modules/atomikos/src/test/resources/logback.xml
diff --git a/atomikos/src/test/resources/transactions.properties b/persistence-modules/atomikos/src/test/resources/transactions.properties
similarity index 100%
rename from atomikos/src/test/resources/transactions.properties
rename to persistence-modules/atomikos/src/test/resources/transactions.properties
diff --git a/persistence-modules/pom.xml b/persistence-modules/pom.xml
index 6823b460b2..d9ee7e358c 100644
--- a/persistence-modules/pom.xml
+++ b/persistence-modules/pom.xml
@@ -18,6 +18,7 @@
         <module>apache-bookkeeper</module>
         <module>apache-cayenne</module>
         <module>apache-derby</module>
+        <module>atomikos</module>
         <module>blaze-persistence</module>
         <module>core-java-persistence</module>
         <module>core-java-persistence-2</module>
diff --git a/pom.xml b/pom.xml
index 3452ae81ee..c6abc0d4d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -710,7 +710,6 @@
                 <module>apache-velocity</module>
                 <module>asciidoctor</module>
                 <module>asm</module>
-                <module>atomikos</module>
                 <module>atomix</module>
                 <module>aws-modules</module>
                 <module>azure</module>
@@ -955,7 +954,6 @@
                 <module>apache-velocity</module>
                 <module>asciidoctor</module>
                 <module>asm</module>
-                <module>atomikos</module>
                 <module>atomix</module>
                 <module>aws-modules</module>
                 <module>azure</module>