diff --git a/axon/src/main/java/com/baeldung/axon/commandmodel/MessagesAggregate.java b/axon/src/main/java/com/baeldung/axon/commandmodel/MessagesAggregate.java
index 60b5c7c94e..1ab9501617 100644
--- a/axon/src/main/java/com/baeldung/axon/commandmodel/MessagesAggregate.java
+++ b/axon/src/main/java/com/baeldung/axon/commandmodel/MessagesAggregate.java
@@ -9,8 +9,8 @@ import org.axonframework.spring.stereotype.Aggregate;
 
 import com.baeldung.axon.coreapi.commands.CreateMessageCommand;
 import com.baeldung.axon.coreapi.commands.MarkReadMessageCommand;
-import com.baeldung.axon.events.MessageCreatedEvent;
-import com.baeldung.axon.events.MessageReadEvent;
+import com.baeldung.axon.coreapi.events.MessageCreatedEvent;
+import com.baeldung.axon.coreapi.events.MessageReadEvent;
 
 @Aggregate
 public class MessagesAggregate {
diff --git a/axon/src/main/java/com/baeldung/axon/events/MessageCreatedEvent.java b/axon/src/main/java/com/baeldung/axon/coreapi/events/MessageCreatedEvent.java
similarity index 94%
rename from axon/src/main/java/com/baeldung/axon/events/MessageCreatedEvent.java
rename to axon/src/main/java/com/baeldung/axon/coreapi/events/MessageCreatedEvent.java
index e638a2a94d..debf383771 100644
--- a/axon/src/main/java/com/baeldung/axon/events/MessageCreatedEvent.java
+++ b/axon/src/main/java/com/baeldung/axon/coreapi/events/MessageCreatedEvent.java
@@ -1,4 +1,4 @@
-package com.baeldung.axon.events;
+package com.baeldung.axon.coreapi.events;
 
 import java.util.Objects;
 
diff --git a/axon/src/main/java/com/baeldung/axon/events/MessageReadEvent.java b/axon/src/main/java/com/baeldung/axon/coreapi/events/MessageReadEvent.java
similarity index 93%
rename from axon/src/main/java/com/baeldung/axon/events/MessageReadEvent.java
rename to axon/src/main/java/com/baeldung/axon/coreapi/events/MessageReadEvent.java
index e362599bb3..f90bfb054e 100644
--- a/axon/src/main/java/com/baeldung/axon/events/MessageReadEvent.java
+++ b/axon/src/main/java/com/baeldung/axon/coreapi/events/MessageReadEvent.java
@@ -1,4 +1,4 @@
-package com.baeldung.axon.events;
+package com.baeldung.axon.coreapi.events;
 
 import java.util.Objects;
 
diff --git a/axon/src/main/java/com/baeldung/axon/querymodel/MessagesEventHandler.java b/axon/src/main/java/com/baeldung/axon/querymodel/MessagesEventHandler.java
index d93fe03941..6988d40a53 100644
--- a/axon/src/main/java/com/baeldung/axon/querymodel/MessagesEventHandler.java
+++ b/axon/src/main/java/com/baeldung/axon/querymodel/MessagesEventHandler.java
@@ -3,8 +3,8 @@ package com.baeldung.axon.querymodel;
 import org.axonframework.eventhandling.EventHandler;
 import org.springframework.stereotype.Service;
 
-import com.baeldung.axon.events.MessageCreatedEvent;
-import com.baeldung.axon.events.MessageReadEvent;
+import com.baeldung.axon.coreapi.events.MessageCreatedEvent;
+import com.baeldung.axon.coreapi.events.MessageReadEvent;
 
 @Service
 public class MessagesEventHandler {
diff --git a/axon/src/test/java/com/baeldung/axon/commandmodel/MessagesAggregateTest.java b/axon/src/test/java/com/baeldung/axon/commandmodel/MessagesAggregateTest.java
index 3bb7fdc9a2..1a95726c83 100644
--- a/axon/src/test/java/com/baeldung/axon/commandmodel/MessagesAggregateTest.java
+++ b/axon/src/test/java/com/baeldung/axon/commandmodel/MessagesAggregateTest.java
@@ -8,8 +8,8 @@ import org.junit.*;
 
 import com.baeldung.axon.coreapi.commands.CreateMessageCommand;
 import com.baeldung.axon.coreapi.commands.MarkReadMessageCommand;
-import com.baeldung.axon.events.MessageCreatedEvent;
-import com.baeldung.axon.events.MessageReadEvent;
+import com.baeldung.axon.coreapi.events.MessageCreatedEvent;
+import com.baeldung.axon.coreapi.events.MessageReadEvent;
 
 public class MessagesAggregateTest {