diff --git a/libraries-data-2/src/main/java/com/baeldung/kafka/EvenOddPartitioner.java b/libraries-data-2/src/main/java/com/baeldung/kafka/producer/EvenOddPartitioner.java
similarity index 100%
rename from libraries-data-2/src/main/java/com/baeldung/kafka/EvenOddPartitioner.java
rename to libraries-data-2/src/main/java/com/baeldung/kafka/producer/EvenOddPartitioner.java
diff --git a/libraries-data-2/src/main/java/com/baeldung/kafka/KafkaProducer.java b/libraries-data-2/src/main/java/com/baeldung/kafka/producer/KafkaProducer.java
similarity index 100%
rename from libraries-data-2/src/main/java/com/baeldung/kafka/KafkaProducer.java
rename to libraries-data-2/src/main/java/com/baeldung/kafka/producer/KafkaProducer.java
diff --git a/libraries-data-2/src/test/java/com/baeldung/kafka/KafkaProducerUnitTest.java b/libraries-data-2/src/test/java/com/baeldung/kafka/producer/KafkaProducerUnitTest.java
similarity index 100%
rename from libraries-data-2/src/test/java/com/baeldung/kafka/KafkaProducerUnitTest.java
rename to libraries-data-2/src/test/java/com/baeldung/kafka/producer/KafkaProducerUnitTest.java