diff --git a/axon/src/main/java/com/baeldung/axon/aggregates/MessagesAggregate.java b/axon/src/main/java/com/baeldung/axon/commandmodel/MessagesAggregate.java
similarity index 96%
rename from axon/src/main/java/com/baeldung/axon/aggregates/MessagesAggregate.java
rename to axon/src/main/java/com/baeldung/axon/commandmodel/MessagesAggregate.java
index d95dd81df9..b2c3a0a0b6 100644
--- a/axon/src/main/java/com/baeldung/axon/aggregates/MessagesAggregate.java
+++ b/axon/src/main/java/com/baeldung/axon/commandmodel/MessagesAggregate.java
@@ -1,4 +1,4 @@
-package com.baeldung.axon.aggregates;
+package com.baeldung.axon.commandmodel;
 
 import static org.axonframework.modelling.command.AggregateLifecycle.apply;
 
diff --git a/axon/src/test/java/com/baeldung/axon/MessagesAggregateIntegrationTest.java b/axon/src/test/java/com/baeldung/axon/commandmodel/MessagesAggregateIntegrationTest.java
similarity index 94%
rename from axon/src/test/java/com/baeldung/axon/MessagesAggregateIntegrationTest.java
rename to axon/src/test/java/com/baeldung/axon/commandmodel/MessagesAggregateIntegrationTest.java
index dc008dcd78..96bb2cf3b7 100644
--- a/axon/src/test/java/com/baeldung/axon/MessagesAggregateIntegrationTest.java
+++ b/axon/src/test/java/com/baeldung/axon/commandmodel/MessagesAggregateIntegrationTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.axon;
+package com.baeldung.axon.commandmodel;
 
 import java.util.UUID;
 
@@ -6,7 +6,6 @@ import org.axonframework.test.aggregate.AggregateTestFixture;
 import org.axonframework.test.aggregate.FixtureConfiguration;
 import org.junit.*;
 
-import com.baeldung.axon.aggregates.MessagesAggregate;
 import com.baeldung.axon.commands.CreateMessageCommand;
 import com.baeldung.axon.commands.MarkReadMessageCommand;
 import com.baeldung.axon.events.MessageCreatedEvent;