diff --git a/build.gradle b/build.gradle
index 54f6611..6afd877 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 wrapper {
-    gradleVersion = "${project.property('gradle.wrapper.version')}"
+    gradleVersion = libs.versions.gradle.get()
     distributionType = Wrapper.DistributionType.ALL
 }
 ext {
@@ -31,10 +31,10 @@ apply from: rootProject.file('gradle/publishing/publication.gradle')
 apply from: rootProject.file('gradle/publishing/sonatype.gradle')
 
 dependencies {
-    api "org.xbib:settings-api:${project.property('xbib-content.version')}"
-    implementation "org.xbib:guava:${project.property('xbib-guava.version')}"
-    implementation "org.xbib:time:${project.property('xbib-time.version')}"
-    implementation "org.xbib:datastructures-json-tiny:${project.property('xbib-datastructures.version')}"
-    implementation "org.reactivestreams:reactive-streams:${project.property('reactivestreams.version')}"
-    testImplementation "io.reactivex.rxjava3:rxjava:${project.property('rxjava3.version')}"
+    api libs.settings.api
+    implementation libs.guava
+    implementation libs.time
+    implementation libs.datastructures.json.tiny
+    implementation libs.reactivestreams
+    testImplementation libs.rxjava3
 }
diff --git a/gradle.properties b/gradle.properties
index 0071ad3..1cef11c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,10 +3,3 @@ name = event
 version = 0.0.1
 
 org.gradle.warning.mode = ALL
-gradle.wrapper.version = 7.3.2
-xbib-guava.version = 30.1
-xbib-content.version = 4.0.0
-xbib-time.version = 2.1.1
-xbib-datastructures.version = 1.0.0
-reactivestreams.version = 1.0.3
-rxjava3.version = 3.0.3
diff --git a/gradle/test/junit5.gradle b/gradle/test/junit5.gradle
index cfef972..d7a8070 100644
--- a/gradle/test/junit5.gradle
+++ b/gradle/test/junit5.gradle
@@ -1,12 +1,8 @@
-
-def junitVersion = project.hasProperty('junit.version')?project.property('junit.version'):'5.6.2'
-def hamcrestVersion = project.hasProperty('hamcrest.version')?project.property('hamcrest.version'):'2.2'
-
 dependencies {
-    testImplementation "org.junit.jupiter:junit-jupiter-api:${junitVersion}"
-    testImplementation "org.junit.jupiter:junit-jupiter-params:${junitVersion}"
-    testImplementation "org.hamcrest:hamcrest-library:${hamcrestVersion}"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitVersion}"
+    testImplementation libs.junit.jupiter.api
+    testImplementation libs.junit.jupiter.params
+    testImplementation libs.hamcrest
+    testRuntimeOnly libs.junit.jupiter.engine
 }
 
 test {
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7454180..41d9927 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ac0b842..92f06b5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
index e69de29..f5d4669 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -0,0 +1,19 @@
+dependencyResolutionManagement {
+    versionCatalogs {
+        libs {
+            version('gradle', '7.4.2')
+            version('junit', '5.8.2')
+            library('junit-jupiter-api', 'org.junit.jupiter', 'junit-jupiter-api').versionRef('junit')
+            library('junit-jupiter-params', 'org.junit.jupiter', 'junit-jupiter-params').versionRef('junit')
+            library('junit-jupiter-engine', 'org.junit.jupiter', 'junit-jupiter-engine').versionRef('junit')
+            library('junit4', 'junit', 'junit').version('4.13.2')
+            library('hamcrest', 'org.hamcrest', 'hamcrest-library').version('2.2')
+            library('settings-api', 'org.xbib', 'settings-api').version('4.0.0')
+            library('guava', 'org.xbib', 'guava').version('30.1')
+            library('time', 'org.xbib', 'time').version('2.1.1')
+            library('datastructures-json-tiny', 'org.xbib', 'datastructures-json-tiny').version('1.0.0')
+            library('reactivestreams', 'org.reactivestreams', 'reactive-streams').version('1.0.3')
+            library('rxjava3', 'io.reactivex.rxjava3', 'rxjava').version('3.0.3')
+        }
+    }
+}
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
new file mode 100644
index 0000000..31112bf
--- /dev/null
+++ b/src/main/java/module-info.java
@@ -0,0 +1,20 @@
+module org.xbib.event {
+    exports org.xbib.event;
+    exports org.xbib.event.async;
+    exports org.xbib.event.clock;
+    exports org.xbib.event.persistence;
+    exports org.xbib.event.queue;
+    exports org.xbib.event.queue.path.simple;
+    exports org.xbib.event.queue.path.watch;
+    exports org.xbib.event.timer;
+    exports org.xbib.event.yield;
+    exports org.xbib.event.yield.async;
+    exports org.xbib.event.yield.boxes;
+    exports org.xbib.event.yield.ops;
+    requires org.xbib.guava;
+    requires org.xbib.settings.api;
+    requires org.xbib.time;
+    requires org.xbib.datastructures.json.tiny;
+    requires org.reactivestreams;
+    requires java.logging;
+}