diff --git a/pom.xml b/pom.xml
index 4796a11ac4..187ff60dd2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,6 +123,7 @@
         <module>spring-cloud</module>
         <module>spring-core</module>
         <module>spring-cucumber</module>
+        <module>spring-aop</module>
         <module>spring-data-cassandra</module>
         <module>spring-data-couchbase-2</module>
         <module>spring-data-dynamodb</module>
diff --git a/spring-custom-aop/pom.xml b/spring-aop/pom.xml
similarity index 100%
rename from spring-custom-aop/pom.xml
rename to spring-aop/pom.xml
diff --git a/spring-custom-aop/src/main/java/org/baeldung/Application.java b/spring-aop/src/main/java/org/baeldung/Application.java
similarity index 100%
rename from spring-custom-aop/src/main/java/org/baeldung/Application.java
rename to spring-aop/src/main/java/org/baeldung/Application.java
diff --git a/spring-custom-aop/src/main/java/org/baeldung/ExampleAspect.java b/spring-aop/src/main/java/org/baeldung/ExampleAspect.java
similarity index 100%
rename from spring-custom-aop/src/main/java/org/baeldung/ExampleAspect.java
rename to spring-aop/src/main/java/org/baeldung/ExampleAspect.java
diff --git a/spring-custom-aop/src/main/java/org/baeldung/LogExecutionTime.java b/spring-aop/src/main/java/org/baeldung/LogExecutionTime.java
similarity index 100%
rename from spring-custom-aop/src/main/java/org/baeldung/LogExecutionTime.java
rename to spring-aop/src/main/java/org/baeldung/LogExecutionTime.java
diff --git a/spring-custom-aop/src/main/java/org/baeldung/Service.java b/spring-aop/src/main/java/org/baeldung/Service.java
similarity index 100%
rename from spring-custom-aop/src/main/java/org/baeldung/Service.java
rename to spring-aop/src/main/java/org/baeldung/Service.java
diff --git a/spring-custom-aop/src/test/java/org/baeldung/CustomAnnotationTest.java b/spring-aop/src/test/java/org/baeldung/CustomAnnotationTest.java
similarity index 100%
rename from spring-custom-aop/src/test/java/org/baeldung/CustomAnnotationTest.java
rename to spring-aop/src/test/java/org/baeldung/CustomAnnotationTest.java