diff --git a/spring-core-2/README.md b/spring-core-2/README.md
index 7ff3a628a1..bcb1ce1fb4 100644
--- a/spring-core-2/README.md
+++ b/spring-core-2/README.md
@@ -4,8 +4,6 @@ This module contains articles about core Spring functionality
 
 ## Relevant Articles:
 
-- [Understanding getBean() in Spring](https://www.baeldung.com/spring-getbean)
-
 - [Guide to Spring @Autowired](http://www.baeldung.com/spring-autowire)
 - [Spring Profiles](http://www.baeldung.com/spring-profiles)
 - [A Spring Custom Annotation for a Better DAO](http://www.baeldung.com/spring-annotation-bean-pre-processor)
@@ -17,7 +15,4 @@ This module contains articles about core Spring functionality
 - [Spring Events](https://www.baeldung.com/spring-events)
 - [Spring Null-Safety Annotations](https://www.baeldung.com/spring-null-safety-annotations)
 - [Using @Autowired in Abstract Classes](https://www.baeldung.com/spring-autowired-abstract-class)
-- [Exploring the Spring BeanFactory API](https://www.baeldung.com/spring-beanfactory)
-- [How to use the Spring FactoryBean?](https://www.baeldung.com/spring-factorybean)
-- [Spring – Injecting Collections](https://www.baeldung.com/spring-injecting-collections)
 - More articles: [[<-- prev]](/spring-core)
\ No newline at end of file
diff --git a/spring-core-3/README.md b/spring-core-3/README.md
index 4c9e3b9ddf..7ca95ae78e 100644
--- a/spring-core-3/README.md
+++ b/spring-core-3/README.md
@@ -1,3 +1,7 @@
 ## Relevant Articles:
 
 - [Understanding getBean() in Spring](https://www.baeldung.com/spring-getbean)
+- [Exploring the Spring BeanFactory API](https://www.baeldung.com/spring-beanfactory)
+- [How to use the Spring FactoryBean?](https://www.baeldung.com/spring-factorybean)
+- [Spring – Injecting Collections](https://www.baeldung.com/spring-injecting-collections)
+- More articles: [[<-- prev]](/spring-core-2)
\ No newline at end of file
diff --git a/spring-core-3/pom.xml b/spring-core-3/pom.xml
index 7ed4a2df86..cd82f23320 100644
--- a/spring-core-3/pom.xml
+++ b/spring-core-3/pom.xml
@@ -29,10 +29,16 @@
             <artifactId>spring-core</artifactId>
             <version>${spring.version}</version>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${annotation-api.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
             <version>${spring.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -60,6 +66,7 @@
 
     <properties>
         <maven.surefire.version>2.22.1</maven.surefire.version>
+        <annotation-api.version>1.3.2</annotation-api.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-core-2/src/main/java/com/baeldung/beanfactory/Employee.java b/spring-core-3/src/main/java/com/baeldung/beanfactory/Employee.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/beanfactory/Employee.java
rename to spring-core-3/src/main/java/com/baeldung/beanfactory/Employee.java
diff --git a/spring-core-2/src/main/java/com/baeldung/collection/BaeldungBean.java b/spring-core-3/src/main/java/com/baeldung/collection/BaeldungBean.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/collection/BaeldungBean.java
rename to spring-core-3/src/main/java/com/baeldung/collection/BaeldungBean.java
diff --git a/spring-core-2/src/main/java/com/baeldung/collection/CollectionConfig.java b/spring-core-3/src/main/java/com/baeldung/collection/CollectionConfig.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/collection/CollectionConfig.java
rename to spring-core-3/src/main/java/com/baeldung/collection/CollectionConfig.java
diff --git a/spring-core-2/src/main/java/com/baeldung/collection/CollectionInjectionDemo.java b/spring-core-3/src/main/java/com/baeldung/collection/CollectionInjectionDemo.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/collection/CollectionInjectionDemo.java
rename to spring-core-3/src/main/java/com/baeldung/collection/CollectionInjectionDemo.java
diff --git a/spring-core-2/src/main/java/com/baeldung/collection/CollectionsBean.java b/spring-core-3/src/main/java/com/baeldung/collection/CollectionsBean.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/collection/CollectionsBean.java
rename to spring-core-3/src/main/java/com/baeldung/collection/CollectionsBean.java
diff --git a/spring-core-2/src/main/java/com/baeldung/factorybean/FactoryBeanAppConfig.java b/spring-core-3/src/main/java/com/baeldung/factorybean/FactoryBeanAppConfig.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/factorybean/FactoryBeanAppConfig.java
rename to spring-core-3/src/main/java/com/baeldung/factorybean/FactoryBeanAppConfig.java
diff --git a/spring-core-2/src/main/java/com/baeldung/factorybean/NonSingleToolFactory.java b/spring-core-3/src/main/java/com/baeldung/factorybean/NonSingleToolFactory.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/factorybean/NonSingleToolFactory.java
rename to spring-core-3/src/main/java/com/baeldung/factorybean/NonSingleToolFactory.java
diff --git a/spring-core-2/src/main/java/com/baeldung/factorybean/README.md b/spring-core-3/src/main/java/com/baeldung/factorybean/README.md
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/factorybean/README.md
rename to spring-core-3/src/main/java/com/baeldung/factorybean/README.md
diff --git a/spring-core-2/src/main/java/com/baeldung/factorybean/SingleToolFactory.java b/spring-core-3/src/main/java/com/baeldung/factorybean/SingleToolFactory.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/factorybean/SingleToolFactory.java
rename to spring-core-3/src/main/java/com/baeldung/factorybean/SingleToolFactory.java
diff --git a/spring-core-2/src/main/java/com/baeldung/factorybean/Tool.java b/spring-core-3/src/main/java/com/baeldung/factorybean/Tool.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/factorybean/Tool.java
rename to spring-core-3/src/main/java/com/baeldung/factorybean/Tool.java
diff --git a/spring-core-2/src/main/java/com/baeldung/factorybean/ToolFactory.java b/spring-core-3/src/main/java/com/baeldung/factorybean/ToolFactory.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/factorybean/ToolFactory.java
rename to spring-core-3/src/main/java/com/baeldung/factorybean/ToolFactory.java
diff --git a/spring-core-2/src/main/resources/factorybean-abstract-spring-ctx.xml b/spring-core-3/src/main/resources/factorybean-abstract-spring-ctx.xml
similarity index 100%
rename from spring-core-2/src/main/resources/factorybean-abstract-spring-ctx.xml
rename to spring-core-3/src/main/resources/factorybean-abstract-spring-ctx.xml
diff --git a/spring-core-2/src/main/resources/factorybean-spring-ctx.xml b/spring-core-3/src/main/resources/factorybean-spring-ctx.xml
similarity index 100%
rename from spring-core-2/src/main/resources/factorybean-spring-ctx.xml
rename to spring-core-3/src/main/resources/factorybean-spring-ctx.xml
diff --git a/spring-core-2/src/test/java/com/baeldung/beanfactory/BeanFactoryWithClassPathResourceIntegrationTest.java b/spring-core-3/src/test/java/com/baeldung/beanfactory/BeanFactoryWithClassPathResourceIntegrationTest.java
similarity index 100%
rename from spring-core-2/src/test/java/com/baeldung/beanfactory/BeanFactoryWithClassPathResourceIntegrationTest.java
rename to spring-core-3/src/test/java/com/baeldung/beanfactory/BeanFactoryWithClassPathResourceIntegrationTest.java
diff --git a/spring-core-2/src/test/java/com/baeldung/beanfactory/README.md b/spring-core-3/src/test/java/com/baeldung/beanfactory/README.md
similarity index 100%
rename from spring-core-2/src/test/java/com/baeldung/beanfactory/README.md
rename to spring-core-3/src/test/java/com/baeldung/beanfactory/README.md
diff --git a/spring-core-2/src/test/java/com/baeldung/factorybean/AbstractFactoryBeanIntegrationTest.java b/spring-core-3/src/test/java/com/baeldung/factorybean/AbstractFactoryBeanIntegrationTest.java
similarity index 100%
rename from spring-core-2/src/test/java/com/baeldung/factorybean/AbstractFactoryBeanIntegrationTest.java
rename to spring-core-3/src/test/java/com/baeldung/factorybean/AbstractFactoryBeanIntegrationTest.java
diff --git a/spring-core-2/src/test/java/com/baeldung/factorybean/FactoryBeanJavaConfigIntegrationTest.java b/spring-core-3/src/test/java/com/baeldung/factorybean/FactoryBeanJavaConfigIntegrationTest.java
similarity index 100%
rename from spring-core-2/src/test/java/com/baeldung/factorybean/FactoryBeanJavaConfigIntegrationTest.java
rename to spring-core-3/src/test/java/com/baeldung/factorybean/FactoryBeanJavaConfigIntegrationTest.java
diff --git a/spring-core-2/src/test/java/com/baeldung/factorybean/FactoryBeanXmlConfigIntegrationTest.java b/spring-core-3/src/test/java/com/baeldung/factorybean/FactoryBeanXmlConfigIntegrationTest.java
similarity index 100%
rename from spring-core-2/src/test/java/com/baeldung/factorybean/FactoryBeanXmlConfigIntegrationTest.java
rename to spring-core-3/src/test/java/com/baeldung/factorybean/FactoryBeanXmlConfigIntegrationTest.java
diff --git a/spring-core-2/src/test/resources/beanfactory-example.xml b/spring-core-3/src/test/resources/beanfactory-example.xml
similarity index 100%
rename from spring-core-2/src/test/resources/beanfactory-example.xml
rename to spring-core-3/src/test/resources/beanfactory-example.xml