diff --git a/spring-all/src/main/java/org/baeldung/di/core/IBeanB.java b/spring-all/src/main/java/org/baeldung/di/core/IBeanB.java
deleted file mode 100644
index 3eec2adc0f..0000000000
--- a/spring-all/src/main/java/org/baeldung/di/core/IBeanB.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.baeldung.di.core;
-
-public interface IBeanB {
-    //
-}
diff --git a/spring-all/src/main/java/org/baeldung/di/spring/ContextWithJavaConfig.java b/spring-all/src/main/java/org/baeldung/di/spring/ContextWithJavaConfig.java
deleted file mode 100644
index 2507a95de3..0000000000
--- a/spring-all/src/main/java/org/baeldung/di/spring/ContextWithJavaConfig.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.baeldung.di.spring;
-
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@ComponentScan("org.baeldung.di")
-public class ContextWithJavaConfig {
-
-    public ContextWithJavaConfig() {
-        super();
-    }
-
-    // beans
-
-}
\ No newline at end of file
diff --git a/spring-all/src/main/java/org/baeldung/di/core/BeanA.java b/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause1/BeanA.java
similarity index 51%
rename from spring-all/src/main/java/org/baeldung/di/core/BeanA.java
rename to spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause1/BeanA.java
index 714ee49015..c664309426 100644
--- a/spring-all/src/main/java/org/baeldung/di/core/BeanA.java
+++ b/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause1/BeanA.java
@@ -1,14 +1,12 @@
-package org.baeldung.di.core;
+package org.baeldung.ex.nosuchbeandefinitionexception.cause1;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 @Component
 public class BeanA {
 
     @Autowired
-    @Qualifier("beanB2")
-    private IBeanB dependency;
+    private BeanB dependency;
 
-}
+}
\ No newline at end of file
diff --git a/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause1/BeanB.java b/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause1/BeanB.java
new file mode 100644
index 0000000000..8a198422e8
--- /dev/null
+++ b/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause1/BeanB.java
@@ -0,0 +1,5 @@
+package org.baeldung.ex.nosuchbeandefinitionexception.cause1;
+
+public class BeanB {
+    //
+}
diff --git a/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause3/BeanA.java b/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause3/BeanA.java
new file mode 100644
index 0000000000..4341a11c84
--- /dev/null
+++ b/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause3/BeanA.java
@@ -0,0 +1,19 @@
+package org.baeldung.ex.nosuchbeandefinitionexception.cause3;
+
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.stereotype.Component;
+
+@Component
+public class BeanA implements InitializingBean {
+
+    @Autowired
+    private ApplicationContext context;
+
+    @Override
+    public final void afterPropertiesSet() {
+        context.getBean("test");
+    }
+
+}
diff --git a/spring-all/src/main/java/org/baeldung/di/core/BeanB.java b/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause3/BeanB.java
similarity index 63%
rename from spring-all/src/main/java/org/baeldung/di/core/BeanB.java
rename to spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause3/BeanB.java
index 8ac65e5023..e4461477be 100644
--- a/spring-all/src/main/java/org/baeldung/di/core/BeanB.java
+++ b/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause3/BeanB.java
@@ -1,4 +1,4 @@
-package org.baeldung.di.core;
+package org.baeldung.ex.nosuchbeandefinitionexception.cause3;
 
 import org.springframework.stereotype.Component;
 
diff --git a/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause3/IBeanB.java b/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause3/IBeanB.java
new file mode 100644
index 0000000000..ac37919452
--- /dev/null
+++ b/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause3/IBeanB.java
@@ -0,0 +1,5 @@
+package org.baeldung.ex.nosuchbeandefinitionexception.cause3;
+
+public interface IBeanB {
+    //
+}
diff --git a/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/spring/Cause1ContextWithJavaConfig.java b/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/spring/Cause1ContextWithJavaConfig.java
new file mode 100644
index 0000000000..4eb6161f3d
--- /dev/null
+++ b/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/spring/Cause1ContextWithJavaConfig.java
@@ -0,0 +1,16 @@
+package org.baeldung.ex.nosuchbeandefinitionexception.spring;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ComponentScan("org.baeldung.di.cause1")
+public class Cause1ContextWithJavaConfig {
+
+    public Cause1ContextWithJavaConfig() {
+        super();
+    }
+
+    // beans
+
+}
\ No newline at end of file
diff --git a/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/spring/Cause2ContextWithJavaConfig.java b/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/spring/Cause2ContextWithJavaConfig.java
new file mode 100644
index 0000000000..ade8692bb4
--- /dev/null
+++ b/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/spring/Cause2ContextWithJavaConfig.java
@@ -0,0 +1,16 @@
+package org.baeldung.ex.nosuchbeandefinitionexception.spring;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ComponentScan("org.baeldung.di.cause2")
+public class Cause2ContextWithJavaConfig {
+
+    public Cause2ContextWithJavaConfig() {
+        super();
+    }
+
+    // beans
+
+}
\ No newline at end of file
diff --git a/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/spring/Cause3ContextWithJavaConfig.java b/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/spring/Cause3ContextWithJavaConfig.java
new file mode 100644
index 0000000000..21d36f2ba6
--- /dev/null
+++ b/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/spring/Cause3ContextWithJavaConfig.java
@@ -0,0 +1,16 @@
+package org.baeldung.ex.nosuchbeandefinitionexception.spring;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ComponentScan("org.baeldung.di.cause2")
+public class Cause3ContextWithJavaConfig {
+
+    public Cause3ContextWithJavaConfig() {
+        super();
+    }
+
+    // beans
+
+}
\ No newline at end of file
diff --git a/spring-all/src/test/java/org/baeldung/di/core/DependencyInjectionWithJavaIntegrationTest.java b/spring-all/src/test/java/org/baeldung/ex/nosuchbeandefinitionexception/Cause1NoSuchBeanDefinitionExceptionIntegrationTest.java
similarity index 55%
rename from spring-all/src/test/java/org/baeldung/di/core/DependencyInjectionWithJavaIntegrationTest.java
rename to spring-all/src/test/java/org/baeldung/ex/nosuchbeandefinitionexception/Cause1NoSuchBeanDefinitionExceptionIntegrationTest.java
index f06d930a7f..aed37a125a 100644
--- a/spring-all/src/test/java/org/baeldung/di/core/DependencyInjectionWithJavaIntegrationTest.java
+++ b/spring-all/src/test/java/org/baeldung/ex/nosuchbeandefinitionexception/Cause1NoSuchBeanDefinitionExceptionIntegrationTest.java
@@ -1,6 +1,6 @@
-package org.baeldung.di.core;
+package org.baeldung.ex.nosuchbeandefinitionexception;
 
-import org.baeldung.di.spring.ContextWithJavaConfig;
+import org.baeldung.ex.nosuchbeandefinitionexception.spring.Cause1ContextWithJavaConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
@@ -8,8 +8,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = { ContextWithJavaConfig.class }, loader = AnnotationConfigContextLoader.class)
-public class DependencyInjectionWithJavaIntegrationTest {
+@ContextConfiguration(classes = { Cause1ContextWithJavaConfig.class }, loader = AnnotationConfigContextLoader.class)
+public class Cause1NoSuchBeanDefinitionExceptionIntegrationTest {
 
     @Test
     public final void givenContextIsInitialized_thenNoException() {
diff --git a/spring-all/src/test/java/org/baeldung/ex/nosuchbeandefinitionexception/Cause2NoSuchBeanDefinitionExceptionIntegrationTest.java b/spring-all/src/test/java/org/baeldung/ex/nosuchbeandefinitionexception/Cause2NoSuchBeanDefinitionExceptionIntegrationTest.java
new file mode 100644
index 0000000000..90d7317f44
--- /dev/null
+++ b/spring-all/src/test/java/org/baeldung/ex/nosuchbeandefinitionexception/Cause2NoSuchBeanDefinitionExceptionIntegrationTest.java
@@ -0,0 +1,19 @@
+package org.baeldung.ex.nosuchbeandefinitionexception;
+
+import org.baeldung.ex.nosuchbeandefinitionexception.spring.Cause2ContextWithJavaConfig;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { Cause2ContextWithJavaConfig.class }, loader = AnnotationConfigContextLoader.class)
+public class Cause2NoSuchBeanDefinitionExceptionIntegrationTest {
+
+    @Test
+    public final void givenContextIsInitialized_thenNoException() {
+        //
+    }
+
+}
diff --git a/spring-all/src/test/java/org/baeldung/ex/nosuchbeandefinitionexception/Cause3NoSuchBeanDefinitionExceptionIntegrationTest.java b/spring-all/src/test/java/org/baeldung/ex/nosuchbeandefinitionexception/Cause3NoSuchBeanDefinitionExceptionIntegrationTest.java
new file mode 100644
index 0000000000..0e2123b7ff
--- /dev/null
+++ b/spring-all/src/test/java/org/baeldung/ex/nosuchbeandefinitionexception/Cause3NoSuchBeanDefinitionExceptionIntegrationTest.java
@@ -0,0 +1,19 @@
+package org.baeldung.ex.nosuchbeandefinitionexception;
+
+import org.baeldung.ex.nosuchbeandefinitionexception.spring.Cause3ContextWithJavaConfig;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { Cause3ContextWithJavaConfig.class }, loader = AnnotationConfigContextLoader.class)
+public class Cause3NoSuchBeanDefinitionExceptionIntegrationTest {
+
+    @Test
+    public final void givenContextIsInitialized_thenNoException() {
+        //
+    }
+
+}