diff --git a/spring-di/src/main/java/com/baeldung/componentscan/filter/annotation/Animal.java b/spring-di/src/main/java/com/baeldung/componentscan/filter/annotation/Animal.java
new file mode 100644
index 0000000000..7ec076abc7
--- /dev/null
+++ b/spring-di/src/main/java/com/baeldung/componentscan/filter/annotation/Animal.java
@@ -0,0 +1,11 @@
+package com.baeldung.componentscan.filter.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface Animal {
+}
diff --git a/spring-di/src/main/java/com/baeldung/componentscan/filter/annotation/ComponentScanAnnotationFilterApp.java b/spring-di/src/main/java/com/baeldung/componentscan/filter/annotation/ComponentScanAnnotationFilterApp.java
new file mode 100644
index 0000000000..7849e4e10a
--- /dev/null
+++ b/spring-di/src/main/java/com/baeldung/componentscan/filter/annotation/ComponentScanAnnotationFilterApp.java
@@ -0,0 +1,13 @@
+package com.baeldung.componentscan.filter.annotation;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.FilterType;
+
+@Configuration
+@ComponentScan(includeFilters = @ComponentScan.Filter(type = FilterType.ANNOTATION, classes = Animal.class))
+public class ComponentScanAnnotationFilterApp {
+
+    public static void main(String[] args) {
+    }
+}
diff --git a/spring-di/src/main/java/com/baeldung/componentscan/filter/annotation/Elephant.java b/spring-di/src/main/java/com/baeldung/componentscan/filter/annotation/Elephant.java
new file mode 100644
index 0000000000..758775a737
--- /dev/null
+++ b/spring-di/src/main/java/com/baeldung/componentscan/filter/annotation/Elephant.java
@@ -0,0 +1,5 @@
+package com.baeldung.componentscan.filter.annotation;
+
+@Animal
+public class Elephant {
+}
diff --git a/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/aspectj/Cat.java b/spring-di/src/main/java/com/baeldung/componentscan/filter/aspectj/Cat.java
similarity index 100%
rename from spring-boot-di/src/main/java/com/baeldung/componentscan/filter/aspectj/Cat.java
rename to spring-di/src/main/java/com/baeldung/componentscan/filter/aspectj/Cat.java
diff --git a/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/aspectj/ComponentScanAspectJFilterApp.java b/spring-di/src/main/java/com/baeldung/componentscan/filter/aspectj/ComponentScanAspectJFilterApp.java
similarity index 100%
rename from spring-boot-di/src/main/java/com/baeldung/componentscan/filter/aspectj/ComponentScanAspectJFilterApp.java
rename to spring-di/src/main/java/com/baeldung/componentscan/filter/aspectj/ComponentScanAspectJFilterApp.java
diff --git a/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/aspectj/Elephant.java b/spring-di/src/main/java/com/baeldung/componentscan/filter/aspectj/Elephant.java
similarity index 100%
rename from spring-boot-di/src/main/java/com/baeldung/componentscan/filter/aspectj/Elephant.java
rename to spring-di/src/main/java/com/baeldung/componentscan/filter/aspectj/Elephant.java
diff --git a/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/aspectj/Loin.java b/spring-di/src/main/java/com/baeldung/componentscan/filter/aspectj/Loin.java
similarity index 100%
rename from spring-boot-di/src/main/java/com/baeldung/componentscan/filter/aspectj/Loin.java
rename to spring-di/src/main/java/com/baeldung/componentscan/filter/aspectj/Loin.java
diff --git a/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/assignable/Animal.java b/spring-di/src/main/java/com/baeldung/componentscan/filter/assignable/Animal.java
similarity index 100%
rename from spring-boot-di/src/main/java/com/baeldung/componentscan/filter/assignable/Animal.java
rename to spring-di/src/main/java/com/baeldung/componentscan/filter/assignable/Animal.java
diff --git a/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/assignable/Cat.java b/spring-di/src/main/java/com/baeldung/componentscan/filter/assignable/Cat.java
similarity index 100%
rename from spring-boot-di/src/main/java/com/baeldung/componentscan/filter/assignable/Cat.java
rename to spring-di/src/main/java/com/baeldung/componentscan/filter/assignable/Cat.java
diff --git a/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/assignable/ComponentScanAssignableTypeFilterApp.java b/spring-di/src/main/java/com/baeldung/componentscan/filter/assignable/ComponentScanAssignableTypeFilterApp.java
similarity index 100%
rename from spring-boot-di/src/main/java/com/baeldung/componentscan/filter/assignable/ComponentScanAssignableTypeFilterApp.java
rename to spring-di/src/main/java/com/baeldung/componentscan/filter/assignable/ComponentScanAssignableTypeFilterApp.java
diff --git a/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/assignable/Elephant.java b/spring-di/src/main/java/com/baeldung/componentscan/filter/assignable/Elephant.java
similarity index 100%
rename from spring-boot-di/src/main/java/com/baeldung/componentscan/filter/assignable/Elephant.java
rename to spring-di/src/main/java/com/baeldung/componentscan/filter/assignable/Elephant.java
diff --git a/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/custom/Cat.java b/spring-di/src/main/java/com/baeldung/componentscan/filter/custom/Cat.java
similarity index 100%
rename from spring-boot-di/src/main/java/com/baeldung/componentscan/filter/custom/Cat.java
rename to spring-di/src/main/java/com/baeldung/componentscan/filter/custom/Cat.java
diff --git a/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/custom/ComponentScanCustomFilter.java b/spring-di/src/main/java/com/baeldung/componentscan/filter/custom/ComponentScanCustomFilter.java
similarity index 100%
rename from spring-boot-di/src/main/java/com/baeldung/componentscan/filter/custom/ComponentScanCustomFilter.java
rename to spring-di/src/main/java/com/baeldung/componentscan/filter/custom/ComponentScanCustomFilter.java
diff --git a/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/custom/ComponentScanCustomFilterApp.java b/spring-di/src/main/java/com/baeldung/componentscan/filter/custom/ComponentScanCustomFilterApp.java
similarity index 100%
rename from spring-boot-di/src/main/java/com/baeldung/componentscan/filter/custom/ComponentScanCustomFilterApp.java
rename to spring-di/src/main/java/com/baeldung/componentscan/filter/custom/ComponentScanCustomFilterApp.java
diff --git a/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/custom/Elephant.java b/spring-di/src/main/java/com/baeldung/componentscan/filter/custom/Elephant.java
similarity index 100%
rename from spring-boot-di/src/main/java/com/baeldung/componentscan/filter/custom/Elephant.java
rename to spring-di/src/main/java/com/baeldung/componentscan/filter/custom/Elephant.java
diff --git a/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/custom/Loin.java b/spring-di/src/main/java/com/baeldung/componentscan/filter/custom/Loin.java
similarity index 100%
rename from spring-boot-di/src/main/java/com/baeldung/componentscan/filter/custom/Loin.java
rename to spring-di/src/main/java/com/baeldung/componentscan/filter/custom/Loin.java
diff --git a/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/regex/Cat.java b/spring-di/src/main/java/com/baeldung/componentscan/filter/regex/Cat.java
similarity index 100%
rename from spring-boot-di/src/main/java/com/baeldung/componentscan/filter/regex/Cat.java
rename to spring-di/src/main/java/com/baeldung/componentscan/filter/regex/Cat.java
diff --git a/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/regex/ComponentScanRegexFilterApp.java b/spring-di/src/main/java/com/baeldung/componentscan/filter/regex/ComponentScanRegexFilterApp.java
similarity index 100%
rename from spring-boot-di/src/main/java/com/baeldung/componentscan/filter/regex/ComponentScanRegexFilterApp.java
rename to spring-di/src/main/java/com/baeldung/componentscan/filter/regex/ComponentScanRegexFilterApp.java
diff --git a/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/regex/Elephant.java b/spring-di/src/main/java/com/baeldung/componentscan/filter/regex/Elephant.java
similarity index 100%
rename from spring-boot-di/src/main/java/com/baeldung/componentscan/filter/regex/Elephant.java
rename to spring-di/src/main/java/com/baeldung/componentscan/filter/regex/Elephant.java
diff --git a/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/regex/Loin.java b/spring-di/src/main/java/com/baeldung/componentscan/filter/regex/Loin.java
similarity index 100%
rename from spring-boot-di/src/main/java/com/baeldung/componentscan/filter/regex/Loin.java
rename to spring-di/src/main/java/com/baeldung/componentscan/filter/regex/Loin.java
diff --git a/spring-boot-di/src/test/java/com/baeldung/componentscan/filter/annotation/ComponentScanAnnotationFilterAppIntegrationTest.java b/spring-di/src/test/java/com/baeldung/componentscan/filter/annotation/ComponentScanAnnotationFilterAppIntegrationTest.java
similarity index 100%
rename from spring-boot-di/src/test/java/com/baeldung/componentscan/filter/annotation/ComponentScanAnnotationFilterAppIntegrationTest.java
rename to spring-di/src/test/java/com/baeldung/componentscan/filter/annotation/ComponentScanAnnotationFilterAppIntegrationTest.java
diff --git a/spring-boot-di/src/test/java/com/baeldung/componentscan/filter/aspectj/ComponentScanAspectJFilterAppIntegrationTest.java b/spring-di/src/test/java/com/baeldung/componentscan/filter/aspectj/ComponentScanAspectJFilterAppIntegrationTest.java
similarity index 100%
rename from spring-boot-di/src/test/java/com/baeldung/componentscan/filter/aspectj/ComponentScanAspectJFilterAppIntegrationTest.java
rename to spring-di/src/test/java/com/baeldung/componentscan/filter/aspectj/ComponentScanAspectJFilterAppIntegrationTest.java
diff --git a/spring-boot-di/src/test/java/com/baeldung/componentscan/filter/assignable/ComponentScanAssignableTypeFilterAppIntegrationTest.java b/spring-di/src/test/java/com/baeldung/componentscan/filter/assignable/ComponentScanAssignableTypeFilterAppIntegrationTest.java
similarity index 100%
rename from spring-boot-di/src/test/java/com/baeldung/componentscan/filter/assignable/ComponentScanAssignableTypeFilterAppIntegrationTest.java
rename to spring-di/src/test/java/com/baeldung/componentscan/filter/assignable/ComponentScanAssignableTypeFilterAppIntegrationTest.java
diff --git a/spring-boot-di/src/test/java/com/baeldung/componentscan/filter/custom/ComponentScanCustomFilterAppIntegrationTest.java b/spring-di/src/test/java/com/baeldung/componentscan/filter/custom/ComponentScanCustomFilterAppIntegrationTest.java
similarity index 100%
rename from spring-boot-di/src/test/java/com/baeldung/componentscan/filter/custom/ComponentScanCustomFilterAppIntegrationTest.java
rename to spring-di/src/test/java/com/baeldung/componentscan/filter/custom/ComponentScanCustomFilterAppIntegrationTest.java
diff --git a/spring-boot-di/src/test/java/com/baeldung/componentscan/filter/regex/ComponentScanRegexFilterAppIntegrationTest.java b/spring-di/src/test/java/com/baeldung/componentscan/filter/regex/ComponentScanRegexFilterAppIntegrationTest.java
similarity index 100%
rename from spring-boot-di/src/test/java/com/baeldung/componentscan/filter/regex/ComponentScanRegexFilterAppIntegrationTest.java
rename to spring-di/src/test/java/com/baeldung/componentscan/filter/regex/ComponentScanRegexFilterAppIntegrationTest.java