diff --git a/README.md b/README.md
index 5f6c85e..b685699 100644
--- a/README.md
+++ b/README.md
@@ -15,3 +15,9 @@ Quarkus Commons
 This repository contains modules with common classes and utilities 
 that can be used by Quarkus applications.
 
+The modules are:
+
+* `quarkus-clock-service`
+* `quarkus-random-number-generator`
+* `quarkus-uuid-generator`
+
diff --git a/pom.xml b/pom.xml
index 0ad0f40..521e405 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,8 @@
 
     <modules>
         <module>quarkus-clock-service</module>
-        <module>quarkus-random-generator</module>
+        <module>quarkus-random-number-generator</module>
+        <module>quarkus-uuid-generator</module>
     </modules>
 
     <properties>
diff --git a/quarkus-random-number-generator/pom.xml b/quarkus-random-number-generator/pom.xml
new file mode 100644
index 0000000..d230bdd
--- /dev/null
+++ b/quarkus-random-number-generator/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>ch.phoenixtechnologies.quarkus</groupId>
+        <artifactId>quarkus-commons</artifactId>
+        <version>0.1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-random-number-generator</artifactId>
+    <packaging>jar</packaging>
+
+</project>
diff --git a/quarkus-random-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/random/RandomNumberGenerator.java b/quarkus-random-number-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/random/RandomNumberGenerator.java
similarity index 100%
rename from quarkus-random-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/random/RandomNumberGenerator.java
rename to quarkus-random-number-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/random/RandomNumberGenerator.java
diff --git a/quarkus-random-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/random/RandomNumberGeneratorImpl.java b/quarkus-random-number-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/random/RandomNumberGeneratorImpl.java
similarity index 100%
rename from quarkus-random-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/random/RandomNumberGeneratorImpl.java
rename to quarkus-random-number-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/random/RandomNumberGeneratorImpl.java
diff --git a/quarkus-random-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/random/RandomProvider.java b/quarkus-random-number-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/random/RandomProvider.java
similarity index 100%
rename from quarkus-random-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/random/RandomProvider.java
rename to quarkus-random-number-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/random/RandomProvider.java
diff --git a/quarkus-random-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/random/RandomProviderImpl.java b/quarkus-random-number-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/random/RandomProviderImpl.java
similarity index 100%
rename from quarkus-random-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/random/RandomProviderImpl.java
rename to quarkus-random-number-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/random/RandomProviderImpl.java
diff --git a/quarkus-random-generator/src/test/java/ch/phoenixtechnologies/quarkus/commons/random/RandomNumberGeneratorImplTest.java b/quarkus-random-number-generator/src/test/java/ch/phoenixtechnologies/quarkus/commons/random/RandomNumberGeneratorImplTest.java
similarity index 100%
rename from quarkus-random-generator/src/test/java/ch/phoenixtechnologies/quarkus/commons/random/RandomNumberGeneratorImplTest.java
rename to quarkus-random-number-generator/src/test/java/ch/phoenixtechnologies/quarkus/commons/random/RandomNumberGeneratorImplTest.java
diff --git a/quarkus-random-generator/src/test/java/ch/phoenixtechnologies/quarkus/commons/random/RandomProviderImplTest.java b/quarkus-random-number-generator/src/test/java/ch/phoenixtechnologies/quarkus/commons/random/RandomProviderImplTest.java
similarity index 100%
rename from quarkus-random-generator/src/test/java/ch/phoenixtechnologies/quarkus/commons/random/RandomProviderImplTest.java
rename to quarkus-random-number-generator/src/test/java/ch/phoenixtechnologies/quarkus/commons/random/RandomProviderImplTest.java
diff --git a/quarkus-random-generator/pom.xml b/quarkus-uuid-generator/pom.xml
similarity index 94%
rename from quarkus-random-generator/pom.xml
rename to quarkus-uuid-generator/pom.xml
index 6313df2..d0c6333 100644
--- a/quarkus-random-generator/pom.xml
+++ b/quarkus-uuid-generator/pom.xml
@@ -10,7 +10,7 @@
         <version>0.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>quarkus-random-generator</artifactId>
+    <artifactId>quarkus-uuid-generator</artifactId>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/quarkus-random-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/random/UUIDGenerator.java b/quarkus-uuid-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/uuid/UUIDGenerator.java
similarity index 94%
rename from quarkus-random-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/random/UUIDGenerator.java
rename to quarkus-uuid-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/uuid/UUIDGenerator.java
index 1f81fdd..3848724 100644
--- a/quarkus-random-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/random/UUIDGenerator.java
+++ b/quarkus-uuid-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/uuid/UUIDGenerator.java
@@ -1,4 +1,4 @@
-package ch.phoenixtechnologies.quarkus.commons.random;
+package ch.phoenixtechnologies.quarkus.commons.uuid;
 
 import java.util.Random;
 import java.util.UUID;
diff --git a/quarkus-random-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/random/UUIDGeneratorImpl.java b/quarkus-uuid-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/uuid/UUIDGeneratorImpl.java
similarity index 93%
rename from quarkus-random-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/random/UUIDGeneratorImpl.java
rename to quarkus-uuid-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/uuid/UUIDGeneratorImpl.java
index 79501d6..9f846be 100644
--- a/quarkus-random-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/random/UUIDGeneratorImpl.java
+++ b/quarkus-uuid-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/uuid/UUIDGeneratorImpl.java
@@ -1,4 +1,4 @@
-package ch.phoenixtechnologies.quarkus.commons.random;
+package ch.phoenixtechnologies.quarkus.commons.uuid;
 
 import com.fasterxml.uuid.Generators;
 import io.quarkus.arc.DefaultBean;
diff --git a/quarkus-random-generator/src/test/java/ch/phoenixtechnologies/quarkus/commons/random/UUIDGeneratorImplTest.java b/quarkus-uuid-generator/src/test/java/ch/phoenixtechnologies/quarkus/commons/uuid/UUIDGeneratorImplTest.java
similarity index 97%
rename from quarkus-random-generator/src/test/java/ch/phoenixtechnologies/quarkus/commons/random/UUIDGeneratorImplTest.java
rename to quarkus-uuid-generator/src/test/java/ch/phoenixtechnologies/quarkus/commons/uuid/UUIDGeneratorImplTest.java
index 793fab4..7b1cc6f 100644
--- a/quarkus-random-generator/src/test/java/ch/phoenixtechnologies/quarkus/commons/random/UUIDGeneratorImplTest.java
+++ b/quarkus-uuid-generator/src/test/java/ch/phoenixtechnologies/quarkus/commons/uuid/UUIDGeneratorImplTest.java
@@ -1,5 +1,6 @@
-package ch.phoenixtechnologies.quarkus.commons.random;
+package ch.phoenixtechnologies.quarkus.commons.uuid;
 
+import ch.phoenixtechnologies.quarkus.commons.uuid.UUIDGeneratorImpl;
 import io.quarkus.test.junit.QuarkusTest;
 import jakarta.inject.Inject;
 import org.junit.jupiter.api.Test;