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 b2c3a0a0b6..60b5c7c94e 100644
--- a/axon/src/main/java/com/baeldung/axon/commandmodel/MessagesAggregate.java
+++ b/axon/src/main/java/com/baeldung/axon/commandmodel/MessagesAggregate.java
@@ -7,8 +7,8 @@ import org.axonframework.eventsourcing.EventSourcingHandler;
 import org.axonframework.modelling.command.AggregateIdentifier;
 import org.axonframework.spring.stereotype.Aggregate;
 
-import com.baeldung.axon.commands.CreateMessageCommand;
-import com.baeldung.axon.commands.MarkReadMessageCommand;
+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;
 
diff --git a/axon/src/main/java/com/baeldung/axon/commands/CreateMessageCommand.java b/axon/src/main/java/com/baeldung/axon/coreapi/commands/CreateMessageCommand.java
similarity index 95%
rename from axon/src/main/java/com/baeldung/axon/commands/CreateMessageCommand.java
rename to axon/src/main/java/com/baeldung/axon/coreapi/commands/CreateMessageCommand.java
index 70d2e46480..fd03d6b269 100644
--- a/axon/src/main/java/com/baeldung/axon/commands/CreateMessageCommand.java
+++ b/axon/src/main/java/com/baeldung/axon/coreapi/commands/CreateMessageCommand.java
@@ -1,4 +1,4 @@
-package com.baeldung.axon.commands;
+package com.baeldung.axon.coreapi.commands;
 
 import java.util.Objects;
 
diff --git a/axon/src/main/java/com/baeldung/axon/commands/MarkReadMessageCommand.java b/axon/src/main/java/com/baeldung/axon/coreapi/commands/MarkReadMessageCommand.java
similarity index 94%
rename from axon/src/main/java/com/baeldung/axon/commands/MarkReadMessageCommand.java
rename to axon/src/main/java/com/baeldung/axon/coreapi/commands/MarkReadMessageCommand.java
index f7d911d65b..ec68a380f8 100644
--- a/axon/src/main/java/com/baeldung/axon/commands/MarkReadMessageCommand.java
+++ b/axon/src/main/java/com/baeldung/axon/coreapi/commands/MarkReadMessageCommand.java
@@ -1,4 +1,4 @@
-package com.baeldung.axon.commands;
+package com.baeldung.axon.coreapi.commands;
 
 import java.util.Objects;
 
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 30914e3fd3..3bb7fdc9a2 100644
--- a/axon/src/test/java/com/baeldung/axon/commandmodel/MessagesAggregateTest.java
+++ b/axon/src/test/java/com/baeldung/axon/commandmodel/MessagesAggregateTest.java
@@ -6,8 +6,8 @@ import org.axonframework.test.aggregate.AggregateTestFixture;
 import org.axonframework.test.aggregate.FixtureConfiguration;
 import org.junit.*;
 
-import com.baeldung.axon.commands.CreateMessageCommand;
-import com.baeldung.axon.commands.MarkReadMessageCommand;
+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;