diff --git a/spring-boot-modules/spring-boot-annotations-2/README.md b/spring-boot-modules/spring-boot-annotations-2/README.md
index bea5d2fec6..541fa2fd73 100644
--- a/spring-boot-modules/spring-boot-annotations-2/README.md
+++ b/spring-boot-modules/spring-boot-annotations-2/README.md
@@ -7,4 +7,8 @@ This module contains articles about Spring Boot annotations
 - [Spring Conditional Annotations](https://www.baeldung.com/spring-conditional-annotations)
 - [Guide to @SpringBootConfiguration in Spring Boot](https://www.baeldung.com/springbootconfiguration-annotation)
 - [Spring @Primary Annotation](http://www.baeldung.com/spring-primary)
+- [Spring Bean Names](https://www.baeldung.com/spring-bean-names)
+- [AliasFor Annotation in Spring](https://www.baeldung.com/spring-aliasfor-annotation)
+- [A Quick Guide to the Spring @Lazy Annotation](https://www.baeldung.com/spring-lazy-annotation)
+- [Instantiating Multiple Beans of the Same Class with Spring Annotations](https://www.baeldung.com/spring-same-class-multiple-beans)
 - More articles: [[<-- prev]](/spring-boot-modules/spring-boot-annotations)
diff --git a/spring-boot-modules/spring-boot-annotations-2/pom.xml b/spring-boot-modules/spring-boot-annotations-2/pom.xml
index 99d1c4587b..71fc7ff388 100644
--- a/spring-boot-modules/spring-boot-annotations-2/pom.xml
+++ b/spring-boot-modules/spring-boot-annotations-2/pom.xml
@@ -28,6 +28,11 @@
             <artifactId>mockito-inline</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/spring-core-5/src/main/java/com/baeldung/aliasfor/MyMapping.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/aliasfor/MyMapping.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/aliasfor/MyMapping.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/aliasfor/MyMapping.java
diff --git a/spring-core-5/src/main/java/com/baeldung/aliasfor/MyMappingController.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/aliasfor/MyMappingController.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/aliasfor/MyMappingController.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/aliasfor/MyMappingController.java
diff --git a/spring-core-5/src/main/java/com/baeldung/lazy/AppConfig.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/lazy/AppConfig.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/lazy/AppConfig.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/lazy/AppConfig.java
diff --git a/spring-core-5/src/main/java/com/baeldung/lazy/City.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/lazy/City.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/lazy/City.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/lazy/City.java
diff --git a/spring-core-5/src/main/java/com/baeldung/lazy/Country.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/lazy/Country.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/lazy/Country.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/lazy/Country.java
diff --git a/spring-core-5/src/main/java/com/baeldung/lazy/Region.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/lazy/Region.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/lazy/Region.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/lazy/Region.java
diff --git a/spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution1/Person.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution1/Person.java
similarity index 100%
rename from spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution1/Person.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution1/Person.java
diff --git a/spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution1/PersonConfig.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution1/PersonConfig.java
similarity index 100%
rename from spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution1/PersonConfig.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution1/PersonConfig.java
diff --git a/spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution1/SpringApp1.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution1/SpringApp1.java
similarity index 100%
rename from spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution1/SpringApp1.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution1/SpringApp1.java
diff --git a/spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution2/Person.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution2/Person.java
similarity index 100%
rename from spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution2/Person.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution2/Person.java
diff --git a/spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution2/PersonConfig.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution2/PersonConfig.java
similarity index 100%
rename from spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution2/PersonConfig.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution2/PersonConfig.java
diff --git a/spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution2/PersonOne.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution2/PersonOne.java
similarity index 100%
rename from spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution2/PersonOne.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution2/PersonOne.java
diff --git a/spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution2/PersonTwo.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution2/PersonTwo.java
similarity index 100%
rename from spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution2/PersonTwo.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution2/PersonTwo.java
diff --git a/spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution2/SpringApp2.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution2/SpringApp2.java
similarity index 100%
rename from spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution2/SpringApp2.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution2/SpringApp2.java
diff --git a/spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution3/Human.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution3/Human.java
similarity index 100%
rename from spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution3/Human.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution3/Human.java
diff --git a/spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution3/MultiBeanFactory.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution3/MultiBeanFactory.java
similarity index 100%
rename from spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution3/MultiBeanFactory.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution3/MultiBeanFactory.java
diff --git a/spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution3/Person.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution3/Person.java
similarity index 100%
rename from spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution3/Person.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution3/Person.java
diff --git a/spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution3/PersonConfig.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution3/PersonConfig.java
similarity index 100%
rename from spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution3/PersonConfig.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution3/PersonConfig.java
diff --git a/spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution3/PersonFactoryPostProcessor.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution3/PersonFactoryPostProcessor.java
similarity index 100%
rename from spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution3/PersonFactoryPostProcessor.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution3/PersonFactoryPostProcessor.java
diff --git a/spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution3/SpringApp3.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution3/SpringApp3.java
similarity index 100%
rename from spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution3/SpringApp3.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution3/SpringApp3.java
diff --git a/spring-core-5/src/main/java/com/baeldung/springbean/naming/component/Animal.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/component/Animal.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/springbean/naming/component/Animal.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/component/Animal.java
diff --git a/spring-core-5/src/main/java/com/baeldung/springbean/naming/component/Cat.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/component/Cat.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/springbean/naming/component/Cat.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/component/Cat.java
diff --git a/spring-core-5/src/main/java/com/baeldung/springbean/naming/component/CustomComponent.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/component/CustomComponent.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/springbean/naming/component/CustomComponent.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/component/CustomComponent.java
diff --git a/spring-core-5/src/main/java/com/baeldung/springbean/naming/component/Dog.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/component/Dog.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/springbean/naming/component/Dog.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/component/Dog.java
diff --git a/spring-core-5/src/main/java/com/baeldung/springbean/naming/configuration/AuditConfiguration.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/configuration/AuditConfiguration.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/springbean/naming/configuration/AuditConfiguration.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/configuration/AuditConfiguration.java
diff --git a/spring-core-5/src/main/java/com/baeldung/springbean/naming/configuration/MyConfiguration.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/configuration/MyConfiguration.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/springbean/naming/configuration/MyConfiguration.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/configuration/MyConfiguration.java
diff --git a/spring-core-5/src/main/java/com/baeldung/springbean/naming/controller/MessagingController.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/controller/MessagingController.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/springbean/naming/controller/MessagingController.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/controller/MessagingController.java
diff --git a/spring-core-5/src/main/java/com/baeldung/springbean/naming/service/AuditService.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/service/AuditService.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/springbean/naming/service/AuditService.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/service/AuditService.java
diff --git a/spring-core-5/src/main/java/com/baeldung/springbean/naming/service/LoggingService.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/service/LoggingService.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/springbean/naming/service/LoggingService.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/service/LoggingService.java
diff --git a/spring-core-5/src/main/java/com/baeldung/springbean/naming/service/MessagingService.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/service/MessagingService.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/springbean/naming/service/MessagingService.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/service/MessagingService.java
diff --git a/spring-core-5/src/main/java/com/baeldung/springbean/naming/service/MessagingServiceImpl.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/service/MessagingServiceImpl.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/springbean/naming/service/MessagingServiceImpl.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/service/MessagingServiceImpl.java
diff --git a/spring-core-5/src/main/java/com/baeldung/springbean/naming/service/PetShow.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/service/PetShow.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/springbean/naming/service/PetShow.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/service/PetShow.java
diff --git a/spring-core-5/src/test/java/com/baeldung/aliasfor/AliasForUnitTest.java b/spring-boot-modules/spring-boot-annotations-2/src/test/java/com/baeldung/aliasfor/AliasForUnitTest.java
similarity index 100%
rename from spring-core-5/src/test/java/com/baeldung/aliasfor/AliasForUnitTest.java
rename to spring-boot-modules/spring-boot-annotations-2/src/test/java/com/baeldung/aliasfor/AliasForUnitTest.java
diff --git a/spring-core-5/src/test/java/com/baeldung/lazy/LazyAnnotationUnitTest.java b/spring-boot-modules/spring-boot-annotations-2/src/test/java/com/baeldung/lazy/LazyAnnotationUnitTest.java
similarity index 100%
rename from spring-core-5/src/test/java/com/baeldung/lazy/LazyAnnotationUnitTest.java
rename to spring-boot-modules/spring-boot-annotations-2/src/test/java/com/baeldung/lazy/LazyAnnotationUnitTest.java
diff --git a/spring-core-5/src/test/java/com/baeldung/springbean/naming/SpringBeanNamingUnitTest.java b/spring-boot-modules/spring-boot-annotations-2/src/test/java/com/baeldung/springbean/naming/SpringBeanNamingUnitTest.java
similarity index 100%
rename from spring-core-5/src/test/java/com/baeldung/springbean/naming/SpringBeanNamingUnitTest.java
rename to spring-boot-modules/spring-boot-annotations-2/src/test/java/com/baeldung/springbean/naming/SpringBeanNamingUnitTest.java
diff --git a/spring-core-5/README.md b/spring-core-5/README.md
index ebf62ac24f..13945c1f8b 100644
--- a/spring-core-5/README.md
+++ b/spring-core-5/README.md
@@ -6,9 +6,6 @@ This module contains articles about core Spring functionality.
 
 - [Spring @Component Annotation](https://www.baeldung.com/spring-component-annotation)
 - [Solving Spring’s “not eligible for auto-proxying” Warning](https://www.baeldung.com/spring-not-eligible-for-auto-proxying)
-- [Spring Bean Names](https://www.baeldung.com/spring-bean-names)
-- [AliasFor Annotation in Spring](https://www.baeldung.com/spring-aliasfor-annotation)
-- [A Quick Guide to the Spring @Lazy Annotation](https://www.baeldung.com/spring-lazy-annotation)
 - [Finding the Spring Version](https://www.baeldung.com/spring-find-version)
 - [How Does the Spring Singleton Bean Serve Concurrent Requests?](https://www.baeldung.com/spring-singleton-concurrent-requests)
 - More articles: [[<-- prev]](../spring-core-4)
diff --git a/spring-core-6/README.md b/spring-core-6/README.md
index e10db19a54..af9fd7e32c 100644
--- a/spring-core-6/README.md
+++ b/spring-core-6/README.md
@@ -1,6 +1,5 @@
 
 ### Relevant Articles:
-- [Instantiating Multiple Beans of the Same Class with Spring Annotations](https://www.baeldung.com/spring-same-class-multiple-beans)
 - [Using Environment Variables in Spring Boot’s application.properties](https://www.baeldung.com/spring-boot-properties-env-variables)
 - [Reinitialize Singleton Bean in Spring Context](https://www.baeldung.com/spring-reinitialize-singleton-bean)
 - [HTTP Interface in Spring 6](https://www.baeldung.com/spring-6-http-interface)