diff --git a/src/main/java/io/kokuwa/keycloak/metrics/MetricsEventListener.java b/src/main/java/io/kokuwa/keycloak/metrics/event/MetricsEventListener.java
similarity index 98%
rename from src/main/java/io/kokuwa/keycloak/metrics/MetricsEventListener.java
rename to src/main/java/io/kokuwa/keycloak/metrics/event/MetricsEventListener.java
index ea811fb..38bb7d0 100644
--- a/src/main/java/io/kokuwa/keycloak/metrics/MetricsEventListener.java
+++ b/src/main/java/io/kokuwa/keycloak/metrics/event/MetricsEventListener.java
@@ -1,4 +1,4 @@
-package io.kokuwa.keycloak.metrics;
+package io.kokuwa.keycloak.metrics.event;
 
 import java.util.Optional;
 
diff --git a/src/main/java/io/kokuwa/keycloak/metrics/MetricsEventListenerFactory.java b/src/main/java/io/kokuwa/keycloak/metrics/event/MetricsEventListenerFactory.java
similarity index 96%
rename from src/main/java/io/kokuwa/keycloak/metrics/MetricsEventListenerFactory.java
rename to src/main/java/io/kokuwa/keycloak/metrics/event/MetricsEventListenerFactory.java
index 3804d21..b5e8a68 100644
--- a/src/main/java/io/kokuwa/keycloak/metrics/MetricsEventListenerFactory.java
+++ b/src/main/java/io/kokuwa/keycloak/metrics/event/MetricsEventListenerFactory.java
@@ -1,4 +1,4 @@
-package io.kokuwa.keycloak.metrics;
+package io.kokuwa.keycloak.metrics.event;
 
 import javax.enterprise.inject.spi.CDI;
 
diff --git a/src/main/resources/META-INF/services/org.keycloak.events.EventListenerProviderFactory b/src/main/resources/META-INF/services/org.keycloak.events.EventListenerProviderFactory
index 6fca1e1..9984e54 100644
--- a/src/main/resources/META-INF/services/org.keycloak.events.EventListenerProviderFactory
+++ b/src/main/resources/META-INF/services/org.keycloak.events.EventListenerProviderFactory
@@ -1 +1 @@
-io.kokuwa.keycloak.metrics.MetricsEventListenerFactory
+io.kokuwa.keycloak.metrics.event.MetricsEventListenerFactory
diff --git a/src/test/java/io/kokuwa/keycloak/metrics/KeycloakIT.java b/src/test/java/io/kokuwa/keycloak/metrics/KeycloakIT.java
index 283f3a9..aab932e 100644
--- a/src/test/java/io/kokuwa/keycloak/metrics/KeycloakIT.java
+++ b/src/test/java/io/kokuwa/keycloak/metrics/KeycloakIT.java
@@ -14,7 +14,7 @@ import org.keycloak.events.EventType;
 
 import io.kokuwa.keycloak.metrics.junit.KeycloakClient;
 import io.kokuwa.keycloak.metrics.junit.KeycloakExtension;
-import io.kokuwa.keycloak.metrics.prometheus.Prometheus;
+import io.kokuwa.keycloak.metrics.junit.Prometheus;
 
 /**
  * Integration tests with Keycloak.
diff --git a/src/test/java/io/kokuwa/keycloak/metrics/MetricsEventListenerTest.java b/src/test/java/io/kokuwa/keycloak/metrics/event/MetricsEventListenerTest.java
similarity index 98%
rename from src/test/java/io/kokuwa/keycloak/metrics/MetricsEventListenerTest.java
rename to src/test/java/io/kokuwa/keycloak/metrics/event/MetricsEventListenerTest.java
index 2abb9ea..f1bd995 100644
--- a/src/test/java/io/kokuwa/keycloak/metrics/MetricsEventListenerTest.java
+++ b/src/test/java/io/kokuwa/keycloak/metrics/event/MetricsEventListenerTest.java
@@ -1,4 +1,4 @@
-package io.kokuwa.keycloak.metrics;
+package io.kokuwa.keycloak.metrics.event;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
@@ -378,8 +378,8 @@ public class MetricsEventListenerTest {
 		}
 	}
 
-	private MetricsEventListener listener(boolean replaceIds) {
-		return new MetricsEventListener(registry, replaceIds, session);
+	private MetricsEventListener listener(boolean replace) {
+		return new MetricsEventListener(registry, replace, session);
 	}
 
 	private void assertCounter(String metric, Map<String, String> tags) {
diff --git a/src/test/java/io/kokuwa/keycloak/metrics/junit/KeycloakExtension.java b/src/test/java/io/kokuwa/keycloak/metrics/junit/KeycloakExtension.java
index 31ffe6c..8238320 100644
--- a/src/test/java/io/kokuwa/keycloak/metrics/junit/KeycloakExtension.java
+++ b/src/test/java/io/kokuwa/keycloak/metrics/junit/KeycloakExtension.java
@@ -19,9 +19,6 @@ import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.MountableFile;
 
-import io.kokuwa.keycloak.metrics.prometheus.Prometheus;
-import io.kokuwa.keycloak.metrics.prometheus.PrometheusClient;
-
 /**
  * JUnit extension to start keycloak.
  *
diff --git a/src/test/java/io/kokuwa/keycloak/metrics/prometheus/Prometheus.java b/src/test/java/io/kokuwa/keycloak/metrics/junit/Prometheus.java
similarity index 97%
rename from src/test/java/io/kokuwa/keycloak/metrics/prometheus/Prometheus.java
rename to src/test/java/io/kokuwa/keycloak/metrics/junit/Prometheus.java
index 8fa1483..7bcc4ff 100644
--- a/src/test/java/io/kokuwa/keycloak/metrics/prometheus/Prometheus.java
+++ b/src/test/java/io/kokuwa/keycloak/metrics/junit/Prometheus.java
@@ -1,4 +1,4 @@
-package io.kokuwa.keycloak.metrics.prometheus;
+package io.kokuwa.keycloak.metrics.junit;
 
 import java.util.HashSet;
 import java.util.Map;
diff --git a/src/test/java/io/kokuwa/keycloak/metrics/prometheus/PrometheusClient.java b/src/test/java/io/kokuwa/keycloak/metrics/junit/PrometheusClient.java
similarity index 86%
rename from src/test/java/io/kokuwa/keycloak/metrics/prometheus/PrometheusClient.java
rename to src/test/java/io/kokuwa/keycloak/metrics/junit/PrometheusClient.java
index 2355f3f..0ce08bd 100644
--- a/src/test/java/io/kokuwa/keycloak/metrics/prometheus/PrometheusClient.java
+++ b/src/test/java/io/kokuwa/keycloak/metrics/junit/PrometheusClient.java
@@ -1,4 +1,4 @@
-package io.kokuwa.keycloak.metrics.prometheus;
+package io.kokuwa.keycloak.metrics.junit;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
diff --git a/src/test/java/io/kokuwa/keycloak/metrics/prometheus/PrometheusMetric.java b/src/test/java/io/kokuwa/keycloak/metrics/junit/PrometheusMetric.java
similarity index 86%
rename from src/test/java/io/kokuwa/keycloak/metrics/prometheus/PrometheusMetric.java
rename to src/test/java/io/kokuwa/keycloak/metrics/junit/PrometheusMetric.java
index a79f6c8..9996372 100644
--- a/src/test/java/io/kokuwa/keycloak/metrics/prometheus/PrometheusMetric.java
+++ b/src/test/java/io/kokuwa/keycloak/metrics/junit/PrometheusMetric.java
@@ -1,4 +1,4 @@
-package io.kokuwa.keycloak.metrics.prometheus;
+package io.kokuwa.keycloak.metrics.junit;
 
 import java.util.Map;