diff --git a/src/main/java/org/dependencytrack/event/kafka/KafkaStreamsInitializer.java b/src/main/java/org/dependencytrack/event/kafka/streams/KafkaStreamsInitializer.java
similarity index 95%
rename from src/main/java/org/dependencytrack/event/kafka/KafkaStreamsInitializer.java
rename to src/main/java/org/dependencytrack/event/kafka/streams/KafkaStreamsInitializer.java
index 48d70695d..4358822d6 100644
--- a/src/main/java/org/dependencytrack/event/kafka/KafkaStreamsInitializer.java
+++ b/src/main/java/org/dependencytrack/event/kafka/streams/KafkaStreamsInitializer.java
@@ -1,4 +1,4 @@
-package org.dependencytrack.event.kafka;
+package org.dependencytrack.event.kafka.streams;
import alpine.Config;
import alpine.common.logging.Logger;
@@ -11,9 +11,9 @@
import org.apache.kafka.streams.KafkaStreams;
import org.apache.kafka.streams.StreamsConfig;
import org.dependencytrack.common.ConfigKey;
-import org.dependencytrack.event.kafka.exception.KafkaStreamsDeserializationExceptionHandler;
-import org.dependencytrack.event.kafka.exception.KafkaStreamsProductionExceptionHandler;
-import org.dependencytrack.event.kafka.exception.KafkaStreamsUncaughtExceptionHandler;
+import org.dependencytrack.event.kafka.streams.exception.KafkaStreamsDeserializationExceptionHandler;
+import org.dependencytrack.event.kafka.streams.exception.KafkaStreamsProductionExceptionHandler;
+import org.dependencytrack.event.kafka.streams.exception.KafkaStreamsUncaughtExceptionHandler;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
diff --git a/src/main/java/org/dependencytrack/event/kafka/KafkaStreamsTopologyFactory.java b/src/main/java/org/dependencytrack/event/kafka/streams/KafkaStreamsTopologyFactory.java
similarity index 96%
rename from src/main/java/org/dependencytrack/event/kafka/KafkaStreamsTopologyFactory.java
rename to src/main/java/org/dependencytrack/event/kafka/streams/KafkaStreamsTopologyFactory.java
index 2b6cb2e38..96f446392 100644
--- a/src/main/java/org/dependencytrack/event/kafka/KafkaStreamsTopologyFactory.java
+++ b/src/main/java/org/dependencytrack/event/kafka/streams/KafkaStreamsTopologyFactory.java
@@ -1,4 +1,4 @@
-package org.dependencytrack.event.kafka;
+package org.dependencytrack.event.kafka.streams;
import alpine.Config;
import alpine.common.logging.Logger;
@@ -21,10 +21,11 @@
import org.dependencytrack.event.PortfolioVulnerabilityAnalysisEvent;
import org.dependencytrack.event.ProjectMetricsUpdateEvent;
import org.dependencytrack.event.ProjectPolicyEvaluationEvent;
-import org.dependencytrack.event.kafka.processor.DelayedBomProcessedNotificationProcessor;
-import org.dependencytrack.event.kafka.processor.MirrorVulnerabilityProcessor;
-import org.dependencytrack.event.kafka.processor.RepositoryMetaResultProcessor;
-import org.dependencytrack.event.kafka.processor.VulnerabilityScanResultProcessor;
+import org.dependencytrack.event.kafka.KafkaTopics;
+import org.dependencytrack.event.kafka.streams.processor.DelayedBomProcessedNotificationProcessor;
+import org.dependencytrack.event.kafka.streams.processor.MirrorVulnerabilityProcessor;
+import org.dependencytrack.event.kafka.streams.processor.RepositoryMetaResultProcessor;
+import org.dependencytrack.event.kafka.streams.processor.VulnerabilityScanResultProcessor;
import org.dependencytrack.model.VulnerabilityScan;
import org.dependencytrack.model.WorkflowState;
import org.dependencytrack.model.WorkflowStatus;
diff --git a/src/main/java/org/dependencytrack/event/kafka/exception/AbstractThresholdBasedExceptionHandler.java b/src/main/java/org/dependencytrack/event/kafka/streams/exception/AbstractThresholdBasedExceptionHandler.java
similarity index 96%
rename from src/main/java/org/dependencytrack/event/kafka/exception/AbstractThresholdBasedExceptionHandler.java
rename to src/main/java/org/dependencytrack/event/kafka/streams/exception/AbstractThresholdBasedExceptionHandler.java
index 5089560ef..b11705602 100644
--- a/src/main/java/org/dependencytrack/event/kafka/exception/AbstractThresholdBasedExceptionHandler.java
+++ b/src/main/java/org/dependencytrack/event/kafka/streams/exception/AbstractThresholdBasedExceptionHandler.java
@@ -1,4 +1,4 @@
-package org.dependencytrack.event.kafka.exception;
+package org.dependencytrack.event.kafka.streams.exception;
import java.time.Clock;
import java.time.Duration;
diff --git a/src/main/java/org/dependencytrack/event/kafka/exception/KafkaStreamsDeserializationExceptionHandler.java b/src/main/java/org/dependencytrack/event/kafka/streams/exception/KafkaStreamsDeserializationExceptionHandler.java
similarity index 98%
rename from src/main/java/org/dependencytrack/event/kafka/exception/KafkaStreamsDeserializationExceptionHandler.java
rename to src/main/java/org/dependencytrack/event/kafka/streams/exception/KafkaStreamsDeserializationExceptionHandler.java
index 83bc9dd50..e91c9a38c 100644
--- a/src/main/java/org/dependencytrack/event/kafka/exception/KafkaStreamsDeserializationExceptionHandler.java
+++ b/src/main/java/org/dependencytrack/event/kafka/streams/exception/KafkaStreamsDeserializationExceptionHandler.java
@@ -1,4 +1,4 @@
-package org.dependencytrack.event.kafka.exception;
+package org.dependencytrack.event.kafka.streams.exception;
import alpine.Config;
import alpine.common.logging.Logger;
diff --git a/src/main/java/org/dependencytrack/event/kafka/exception/KafkaStreamsProductionExceptionHandler.java b/src/main/java/org/dependencytrack/event/kafka/streams/exception/KafkaStreamsProductionExceptionHandler.java
similarity index 98%
rename from src/main/java/org/dependencytrack/event/kafka/exception/KafkaStreamsProductionExceptionHandler.java
rename to src/main/java/org/dependencytrack/event/kafka/streams/exception/KafkaStreamsProductionExceptionHandler.java
index afae44abd..37cc45963 100644
--- a/src/main/java/org/dependencytrack/event/kafka/exception/KafkaStreamsProductionExceptionHandler.java
+++ b/src/main/java/org/dependencytrack/event/kafka/streams/exception/KafkaStreamsProductionExceptionHandler.java
@@ -1,4 +1,4 @@
-package org.dependencytrack.event.kafka.exception;
+package org.dependencytrack.event.kafka.streams.exception;
import alpine.Config;
import alpine.common.logging.Logger;
diff --git a/src/main/java/org/dependencytrack/event/kafka/exception/KafkaStreamsUncaughtExceptionHandler.java b/src/main/java/org/dependencytrack/event/kafka/streams/exception/KafkaStreamsUncaughtExceptionHandler.java
similarity index 98%
rename from src/main/java/org/dependencytrack/event/kafka/exception/KafkaStreamsUncaughtExceptionHandler.java
rename to src/main/java/org/dependencytrack/event/kafka/streams/exception/KafkaStreamsUncaughtExceptionHandler.java
index c862ddd3b..492827890 100644
--- a/src/main/java/org/dependencytrack/event/kafka/exception/KafkaStreamsUncaughtExceptionHandler.java
+++ b/src/main/java/org/dependencytrack/event/kafka/streams/exception/KafkaStreamsUncaughtExceptionHandler.java
@@ -1,4 +1,4 @@
-package org.dependencytrack.event.kafka.exception;
+package org.dependencytrack.event.kafka.streams.exception;
import alpine.Config;
import alpine.common.logging.Logger;
diff --git a/src/main/java/org/dependencytrack/event/kafka/processor/DelayedBomProcessedNotificationProcessor.java b/src/main/java/org/dependencytrack/event/kafka/streams/processor/DelayedBomProcessedNotificationProcessor.java
similarity index 98%
rename from src/main/java/org/dependencytrack/event/kafka/processor/DelayedBomProcessedNotificationProcessor.java
rename to src/main/java/org/dependencytrack/event/kafka/streams/processor/DelayedBomProcessedNotificationProcessor.java
index cddc5b692..5df73b646 100644
--- a/src/main/java/org/dependencytrack/event/kafka/processor/DelayedBomProcessedNotificationProcessor.java
+++ b/src/main/java/org/dependencytrack/event/kafka/streams/processor/DelayedBomProcessedNotificationProcessor.java
@@ -1,4 +1,4 @@
-package org.dependencytrack.event.kafka.processor;
+package org.dependencytrack.event.kafka.streams.processor;
import alpine.common.logging.Logger;
import alpine.notification.NotificationLevel;
diff --git a/src/main/java/org/dependencytrack/event/kafka/processor/MirrorVulnerabilityProcessor.java b/src/main/java/org/dependencytrack/event/kafka/streams/processor/MirrorVulnerabilityProcessor.java
similarity index 99%
rename from src/main/java/org/dependencytrack/event/kafka/processor/MirrorVulnerabilityProcessor.java
rename to src/main/java/org/dependencytrack/event/kafka/streams/processor/MirrorVulnerabilityProcessor.java
index 74eb56f58..0b99c2420 100644
--- a/src/main/java/org/dependencytrack/event/kafka/processor/MirrorVulnerabilityProcessor.java
+++ b/src/main/java/org/dependencytrack/event/kafka/streams/processor/MirrorVulnerabilityProcessor.java
@@ -1,4 +1,4 @@
-package org.dependencytrack.event.kafka.processor;
+package org.dependencytrack.event.kafka.streams.processor;
import alpine.common.logging.Logger;
import alpine.common.metrics.Metrics;
diff --git a/src/main/java/org/dependencytrack/event/kafka/processor/RepositoryMetaResultProcessor.java b/src/main/java/org/dependencytrack/event/kafka/streams/processor/RepositoryMetaResultProcessor.java
similarity index 99%
rename from src/main/java/org/dependencytrack/event/kafka/processor/RepositoryMetaResultProcessor.java
rename to src/main/java/org/dependencytrack/event/kafka/streams/processor/RepositoryMetaResultProcessor.java
index 8a4eb6f5a..7b2bace7a 100644
--- a/src/main/java/org/dependencytrack/event/kafka/processor/RepositoryMetaResultProcessor.java
+++ b/src/main/java/org/dependencytrack/event/kafka/streams/processor/RepositoryMetaResultProcessor.java
@@ -1,4 +1,4 @@
-package org.dependencytrack.event.kafka.processor;
+package org.dependencytrack.event.kafka.streams.processor;
import alpine.common.logging.Logger;
import alpine.common.metrics.Metrics;
diff --git a/src/main/java/org/dependencytrack/event/kafka/processor/VulnerabilityScanResultProcessor.java b/src/main/java/org/dependencytrack/event/kafka/streams/processor/VulnerabilityScanResultProcessor.java
similarity index 99%
rename from src/main/java/org/dependencytrack/event/kafka/processor/VulnerabilityScanResultProcessor.java
rename to src/main/java/org/dependencytrack/event/kafka/streams/processor/VulnerabilityScanResultProcessor.java
index 2ec19832e..d3f3e9c0b 100644
--- a/src/main/java/org/dependencytrack/event/kafka/processor/VulnerabilityScanResultProcessor.java
+++ b/src/main/java/org/dependencytrack/event/kafka/streams/processor/VulnerabilityScanResultProcessor.java
@@ -1,4 +1,4 @@
-package org.dependencytrack.event.kafka.processor;
+package org.dependencytrack.event.kafka.streams.processor;
import alpine.Config;
import alpine.common.logging.Logger;
@@ -625,7 +625,7 @@ private org.dependencytrack.proto.notification.v1.Notification createProjectAudi
.setLevel(LEVEL_INFORMATIONAL)
.setTimestamp(Timestamps.now())
.setTitle(generateTitle(policyAnalysis.getState(), policyAnalysis.getSuppressed(), analysisStateChange, suppressionChange))
- .setContent(generateNotificationContent(policyAnalysis))
+ .setContent("An analysis decision was made to a finding affecting a project")
.setSubject(Any.pack(subject))
.build())
.orElse(null);
diff --git a/src/main/java/org/dependencytrack/health/KafkaStreamsHealthCheck.java b/src/main/java/org/dependencytrack/health/KafkaStreamsHealthCheck.java
index c3553b3dd..730d47337 100644
--- a/src/main/java/org/dependencytrack/health/KafkaStreamsHealthCheck.java
+++ b/src/main/java/org/dependencytrack/health/KafkaStreamsHealthCheck.java
@@ -1,7 +1,7 @@
package org.dependencytrack.health;
import org.apache.kafka.streams.KafkaStreams;
-import org.dependencytrack.event.kafka.KafkaStreamsInitializer;
+import org.dependencytrack.event.kafka.streams.KafkaStreamsInitializer;
import org.eclipse.microprofile.health.HealthCheck;
import org.eclipse.microprofile.health.HealthCheckResponse;
import org.eclipse.microprofile.health.Liveness;
diff --git a/src/main/java/org/dependencytrack/util/NotificationUtil.java b/src/main/java/org/dependencytrack/util/NotificationUtil.java
index 721ac20b1..be5f04a0a 100644
--- a/src/main/java/org/dependencytrack/util/NotificationUtil.java
+++ b/src/main/java/org/dependencytrack/util/NotificationUtil.java
@@ -24,7 +24,6 @@
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
import org.dependencytrack.event.kafka.KafkaEventDispatcher;
-import org.dependencytrack.event.kafka.processor.VulnerabilityScanResultProcessor;
import org.dependencytrack.model.Analysis;
import org.dependencytrack.model.AnalysisState;
import org.dependencytrack.model.Component;
@@ -429,10 +428,6 @@ public static String generateNotificationTitle(String messageType, Project proje
return messageType;
}
- public static String generateNotificationContent(final VulnerabilityScanResultProcessor.Analysis analysis) {
- return "An analysis decision was made to a finding affecting a project";
- }
-
public static String generateNotificationTitle(final String messageType, final org.dependencytrack.proto.notification.v1.Project project) {
if (project == null) {
return messageType;
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 74af896da..f7f1c5d63 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -48,7 +48,7 @@
org.dependencytrack.event.EventSubsystemInitializer
- org.dependencytrack.event.kafka.KafkaStreamsInitializer
+ org.dependencytrack.event.kafka.streams.KafkaStreamsInitializer
org.dependencytrack.event.PurlMigrator
diff --git a/src/test/java/org/dependencytrack/event/kafka/KafkaStreamsDelayedBomProcessedNotificationTest.java b/src/test/java/org/dependencytrack/event/kafka/streams/KafkaStreamsDelayedBomProcessedNotificationTest.java
similarity index 99%
rename from src/test/java/org/dependencytrack/event/kafka/KafkaStreamsDelayedBomProcessedNotificationTest.java
rename to src/test/java/org/dependencytrack/event/kafka/streams/KafkaStreamsDelayedBomProcessedNotificationTest.java
index 758e4b47d..c84db7b3c 100644
--- a/src/test/java/org/dependencytrack/event/kafka/KafkaStreamsDelayedBomProcessedNotificationTest.java
+++ b/src/test/java/org/dependencytrack/event/kafka/streams/KafkaStreamsDelayedBomProcessedNotificationTest.java
@@ -1,4 +1,4 @@
-package org.dependencytrack.event.kafka;
+package org.dependencytrack.event.kafka.streams;
import net.mguenther.kafka.junit.KeyValue;
import net.mguenther.kafka.junit.ReadKeyValues;
@@ -6,6 +6,7 @@
import org.apache.kafka.clients.consumer.ConsumerConfig;
import org.apache.kafka.clients.producer.ProducerConfig;
import org.apache.kafka.common.serialization.StringDeserializer;
+import org.dependencytrack.event.kafka.KafkaTopics;
import org.dependencytrack.event.kafka.serialization.KafkaProtobufSerializer;
import org.dependencytrack.model.Project;
import org.dependencytrack.model.VulnerabilityScan;
diff --git a/src/test/java/org/dependencytrack/event/kafka/KafkaStreamsPostgresTest.java b/src/test/java/org/dependencytrack/event/kafka/streams/KafkaStreamsPostgresTest.java
similarity index 97%
rename from src/test/java/org/dependencytrack/event/kafka/KafkaStreamsPostgresTest.java
rename to src/test/java/org/dependencytrack/event/kafka/streams/KafkaStreamsPostgresTest.java
index 9576efb55..d62d50917 100644
--- a/src/test/java/org/dependencytrack/event/kafka/KafkaStreamsPostgresTest.java
+++ b/src/test/java/org/dependencytrack/event/kafka/streams/KafkaStreamsPostgresTest.java
@@ -1,4 +1,4 @@
-package org.dependencytrack.event.kafka;
+package org.dependencytrack.event.kafka.streams;
import net.mguenther.kafka.junit.ExternalKafkaCluster;
import net.mguenther.kafka.junit.TopicConfig;
@@ -6,6 +6,7 @@
import org.apache.kafka.streams.StreamsConfig;
import org.apache.kafka.streams.Topology;
import org.dependencytrack.AbstractPostgresEnabledTest;
+import org.dependencytrack.event.kafka.KafkaTopics;
import org.dependencytrack.event.kafka.serialization.KafkaProtobufDeserializer;
import org.dependencytrack.proto.notification.v1.Notification;
import org.junit.After;
diff --git a/src/test/java/org/dependencytrack/event/kafka/KafkaStreamsTest.java b/src/test/java/org/dependencytrack/event/kafka/streams/KafkaStreamsTest.java
similarity index 96%
rename from src/test/java/org/dependencytrack/event/kafka/KafkaStreamsTest.java
rename to src/test/java/org/dependencytrack/event/kafka/streams/KafkaStreamsTest.java
index d69b75875..0b850bdee 100644
--- a/src/test/java/org/dependencytrack/event/kafka/KafkaStreamsTest.java
+++ b/src/test/java/org/dependencytrack/event/kafka/streams/KafkaStreamsTest.java
@@ -1,10 +1,11 @@
-package org.dependencytrack.event.kafka;
+package org.dependencytrack.event.kafka.streams;
import net.mguenther.kafka.junit.ExternalKafkaCluster;
import net.mguenther.kafka.junit.TopicConfig;
import org.apache.kafka.streams.KafkaStreams;
import org.apache.kafka.streams.StreamsConfig;
import org.dependencytrack.PersistenceCapableTest;
+import org.dependencytrack.event.kafka.KafkaTopics;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
diff --git a/src/test/java/org/dependencytrack/event/kafka/KafkaStreamsTopologyTest.java b/src/test/java/org/dependencytrack/event/kafka/streams/KafkaStreamsTopologyTest.java
similarity index 99%
rename from src/test/java/org/dependencytrack/event/kafka/KafkaStreamsTopologyTest.java
rename to src/test/java/org/dependencytrack/event/kafka/streams/KafkaStreamsTopologyTest.java
index 79bccb001..e3c632f93 100644
--- a/src/test/java/org/dependencytrack/event/kafka/KafkaStreamsTopologyTest.java
+++ b/src/test/java/org/dependencytrack/event/kafka/streams/KafkaStreamsTopologyTest.java
@@ -1,4 +1,4 @@
-package org.dependencytrack.event.kafka;
+package org.dependencytrack.event.kafka.streams;
import alpine.event.framework.Event;
import alpine.event.framework.EventService;
@@ -19,6 +19,7 @@
import org.dependencytrack.event.PortfolioVulnerabilityAnalysisEvent;
import org.dependencytrack.event.ProjectMetricsUpdateEvent;
import org.dependencytrack.event.ProjectPolicyEvaluationEvent;
+import org.dependencytrack.event.kafka.KafkaTopics;
import org.dependencytrack.event.kafka.serialization.KafkaProtobufSerializer;
import org.dependencytrack.model.Policy;
import org.dependencytrack.model.PolicyCondition;
diff --git a/src/test/java/org/dependencytrack/event/kafka/exception/KafkaStreamsDeserializationExceptionHandlerTest.java b/src/test/java/org/dependencytrack/event/kafka/streams/exception/KafkaStreamsDeserializationExceptionHandlerTest.java
similarity index 97%
rename from src/test/java/org/dependencytrack/event/kafka/exception/KafkaStreamsDeserializationExceptionHandlerTest.java
rename to src/test/java/org/dependencytrack/event/kafka/streams/exception/KafkaStreamsDeserializationExceptionHandlerTest.java
index 4ce0df779..43aac8de9 100644
--- a/src/test/java/org/dependencytrack/event/kafka/exception/KafkaStreamsDeserializationExceptionHandlerTest.java
+++ b/src/test/java/org/dependencytrack/event/kafka/streams/exception/KafkaStreamsDeserializationExceptionHandlerTest.java
@@ -1,4 +1,4 @@
-package org.dependencytrack.event.kafka.exception;
+package org.dependencytrack.event.kafka.streams.exception;
import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.apache.kafka.common.errors.SerializationException;
diff --git a/src/test/java/org/dependencytrack/event/kafka/exception/KafkaStreamsProductionExceptionHandlerTest.java b/src/test/java/org/dependencytrack/event/kafka/streams/exception/KafkaStreamsProductionExceptionHandlerTest.java
similarity index 97%
rename from src/test/java/org/dependencytrack/event/kafka/exception/KafkaStreamsProductionExceptionHandlerTest.java
rename to src/test/java/org/dependencytrack/event/kafka/streams/exception/KafkaStreamsProductionExceptionHandlerTest.java
index 0e2c8e6b4..741933f92 100644
--- a/src/test/java/org/dependencytrack/event/kafka/exception/KafkaStreamsProductionExceptionHandlerTest.java
+++ b/src/test/java/org/dependencytrack/event/kafka/streams/exception/KafkaStreamsProductionExceptionHandlerTest.java
@@ -1,4 +1,4 @@
-package org.dependencytrack.event.kafka.exception;
+package org.dependencytrack.event.kafka.streams.exception;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.common.errors.RecordTooLargeException;
diff --git a/src/test/java/org/dependencytrack/event/kafka/exception/KafkaStreamsUncaughtExceptionHandlerTest.java b/src/test/java/org/dependencytrack/event/kafka/streams/exception/KafkaStreamsUncaughtExceptionHandlerTest.java
similarity index 97%
rename from src/test/java/org/dependencytrack/event/kafka/exception/KafkaStreamsUncaughtExceptionHandlerTest.java
rename to src/test/java/org/dependencytrack/event/kafka/streams/exception/KafkaStreamsUncaughtExceptionHandlerTest.java
index 992330edf..4ee06fe3e 100644
--- a/src/test/java/org/dependencytrack/event/kafka/exception/KafkaStreamsUncaughtExceptionHandlerTest.java
+++ b/src/test/java/org/dependencytrack/event/kafka/streams/exception/KafkaStreamsUncaughtExceptionHandlerTest.java
@@ -1,4 +1,4 @@
-package org.dependencytrack.event.kafka.exception;
+package org.dependencytrack.event.kafka.streams.exception;
import org.apache.kafka.streams.errors.StreamsUncaughtExceptionHandler.StreamThreadExceptionResponse;
import org.junit.Test;
diff --git a/src/test/java/org/dependencytrack/event/kafka/processor/MirrorVulnerabilityProcessorTest.java b/src/test/java/org/dependencytrack/event/kafka/streams/processor/MirrorVulnerabilityProcessorTest.java
similarity index 99%
rename from src/test/java/org/dependencytrack/event/kafka/processor/MirrorVulnerabilityProcessorTest.java
rename to src/test/java/org/dependencytrack/event/kafka/streams/processor/MirrorVulnerabilityProcessorTest.java
index fb0ae342a..b8a57778c 100644
--- a/src/test/java/org/dependencytrack/event/kafka/processor/MirrorVulnerabilityProcessorTest.java
+++ b/src/test/java/org/dependencytrack/event/kafka/streams/processor/MirrorVulnerabilityProcessorTest.java
@@ -1,4 +1,4 @@
-package org.dependencytrack.event.kafka.processor;
+package org.dependencytrack.event.kafka.streams.processor;
import org.apache.kafka.common.serialization.Serdes;
import org.apache.kafka.common.serialization.StringSerializer;
diff --git a/src/test/java/org/dependencytrack/event/kafka/processor/RepositoryMetaResultProcessorTest.java b/src/test/java/org/dependencytrack/event/kafka/streams/processor/RepositoryMetaResultProcessorTest.java
similarity index 99%
rename from src/test/java/org/dependencytrack/event/kafka/processor/RepositoryMetaResultProcessorTest.java
rename to src/test/java/org/dependencytrack/event/kafka/streams/processor/RepositoryMetaResultProcessorTest.java
index 16506299a..5f14df992 100644
--- a/src/test/java/org/dependencytrack/event/kafka/processor/RepositoryMetaResultProcessorTest.java
+++ b/src/test/java/org/dependencytrack/event/kafka/streams/processor/RepositoryMetaResultProcessorTest.java
@@ -1,4 +1,4 @@
-package org.dependencytrack.event.kafka.processor;
+package org.dependencytrack.event.kafka.streams.processor;
import com.google.protobuf.Timestamp;
import org.apache.kafka.common.serialization.StringDeserializer;
diff --git a/src/test/java/org/dependencytrack/event/kafka/processor/VulnerabilityScanResultProcessorTest.java b/src/test/java/org/dependencytrack/event/kafka/streams/processor/VulnerabilityScanResultProcessorTest.java
similarity index 99%
rename from src/test/java/org/dependencytrack/event/kafka/processor/VulnerabilityScanResultProcessorTest.java
rename to src/test/java/org/dependencytrack/event/kafka/streams/processor/VulnerabilityScanResultProcessorTest.java
index fe5c27a04..457cb413e 100644
--- a/src/test/java/org/dependencytrack/event/kafka/processor/VulnerabilityScanResultProcessorTest.java
+++ b/src/test/java/org/dependencytrack/event/kafka/streams/processor/VulnerabilityScanResultProcessorTest.java
@@ -1,4 +1,4 @@
-package org.dependencytrack.event.kafka.processor;
+package org.dependencytrack.event.kafka.streams.processor;
import com.google.protobuf.Timestamp;
import junitparams.JUnitParamsRunner;