diff --git a/core-back-end/src/main/java/org/student/messaging/archiver/ArchiverListener.java b/core-back-end/src/main/java/org/student/messaging/archiver/ArchiverListener.java
index 2e62776..f646c66 100644
--- a/core-back-end/src/main/java/org/student/messaging/archiver/ArchiverListener.java
+++ b/core-back-end/src/main/java/org/student/messaging/archiver/ArchiverListener.java
@@ -3,7 +3,7 @@
 import org.springframework.kafka.annotation.KafkaListener;
 import org.springframework.kafka.annotation.TopicPartition;
 import org.springframework.stereotype.Service;
-import org.student.messaging.KafkaTopics;
+import org.student.messaging.topics.KafkaTopics;
 
 @Service
 public class ArchiverListener {
diff --git a/core-back-end/src/main/java/org/student/messaging/archiver/ArchiverProducer.java b/core-back-end/src/main/java/org/student/messaging/archiver/ArchiverProducer.java
index 835c519..ae1be63 100644
--- a/core-back-end/src/main/java/org/student/messaging/archiver/ArchiverProducer.java
+++ b/core-back-end/src/main/java/org/student/messaging/archiver/ArchiverProducer.java
@@ -3,7 +3,7 @@
 import org.apache.kafka.clients.producer.ProducerRecord;
 import org.springframework.kafka.core.KafkaTemplate;
 import org.springframework.stereotype.Service;
-import org.student.messaging.KafkaTopics;
+import org.student.messaging.topics.KafkaTopics;
 
 @Service
 public class ArchiverProducer {
diff --git a/core-back-end/src/main/java/org/student/messaging/artifact_processor/ArtifactProcessorListener.java b/core-back-end/src/main/java/org/student/messaging/artifact_processor/ArtifactProcessorListener.java
index dcf968d..5d326dc 100644
--- a/core-back-end/src/main/java/org/student/messaging/artifact_processor/ArtifactProcessorListener.java
+++ b/core-back-end/src/main/java/org/student/messaging/artifact_processor/ArtifactProcessorListener.java
@@ -3,7 +3,7 @@
 import org.springframework.kafka.annotation.KafkaListener;
 import org.springframework.kafka.annotation.TopicPartition;
 import org.springframework.stereotype.Service;
-import org.student.messaging.KafkaTopics;
+import org.student.messaging.topics.KafkaTopics;
 
 @Service
 public class ArtifactProcessorListener {
diff --git a/core-back-end/src/main/java/org/student/messaging/artifact_processor/ArtifactProcessorProducer.java b/core-back-end/src/main/java/org/student/messaging/artifact_processor/ArtifactProcessorProducer.java
index 6c40a28..06a392a 100644
--- a/core-back-end/src/main/java/org/student/messaging/artifact_processor/ArtifactProcessorProducer.java
+++ b/core-back-end/src/main/java/org/student/messaging/artifact_processor/ArtifactProcessorProducer.java
@@ -2,7 +2,7 @@
 
 import org.apache.kafka.clients.producer.ProducerRecord;
 import org.springframework.kafka.core.KafkaTemplate;
-import org.student.messaging.KafkaTopics;
+import org.student.messaging.topics.KafkaTopics;
 
 public class ArtifactProcessorProducer {
     private final KafkaTemplate<String, byte[]> template;