diff --git a/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause1/BeanA.java b/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause1/BeanA.java
deleted file mode 100644
index c664309426..0000000000
--- a/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause1/BeanA.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.baeldung.ex.nosuchbeandefinitionexception.cause1;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-@Component
-public class BeanA {
-
-    @Autowired
-    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
deleted file mode 100644
index 8a198422e8..0000000000
--- a/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause1/BeanB.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.baeldung.ex.nosuchbeandefinitionexception.cause1;
-
-public class BeanB {
-    //
-}
diff --git a/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanA.java b/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanA.java
deleted file mode 100644
index 2b454bfabb..0000000000
--- a/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanA.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.baeldung.ex.nosuchbeandefinitionexception.cause2;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-@Component
-public class BeanA {
-
-    @Autowired
-    private IBeanB dependency;
-
-}
\ No newline at end of file
diff --git a/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanB1.java b/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanB1.java
deleted file mode 100644
index 877f400668..0000000000
--- a/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanB1.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.baeldung.ex.nosuchbeandefinitionexception.cause2;
-
-import org.springframework.stereotype.Component;
-
-@Component
-public class BeanB1 implements IBeanB {
-    //
-}
\ No newline at end of file
diff --git a/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanB2.java b/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanB2.java
deleted file mode 100644
index 6bf4160966..0000000000
--- a/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/BeanB2.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.baeldung.ex.nosuchbeandefinitionexception.cause2;
-
-import org.springframework.stereotype.Component;
-
-@Component
-public class BeanB2 implements IBeanB {
-    //
-}
\ No newline at end of file
diff --git a/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/IBeanB.java b/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/IBeanB.java
deleted file mode 100644
index 3e70126c1a..0000000000
--- a/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause2/IBeanB.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.baeldung.ex.nosuchbeandefinitionexception.cause2;
-
-public interface IBeanB {
-    //
-}
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
deleted file mode 100644
index 091d3f1aa8..0000000000
--- a/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/cause3/BeanA.java
+++ /dev/null
@@ -1,19 +0,0 @@
-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 void afterPropertiesSet() {
-        context.getBean("someBeanName");
-    }
-
-}
\ No newline at end of file
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
deleted file mode 100644
index 5ba971baa9..0000000000
--- a/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/spring/Cause1ContextWithJavaConfig.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.baeldung.ex.nosuchbeandefinitionexception.spring;
-
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@ComponentScan("org.baeldung.ex.nosuchbeandefinitionexception.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
deleted file mode 100644
index 9f4816ef7c..0000000000
--- a/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/spring/Cause2ContextWithJavaConfig.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.baeldung.ex.nosuchbeandefinitionexception.spring;
-
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@ComponentScan("org.baeldung.ex.nosuchbeandefinitionexception.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
deleted file mode 100644
index a8d0fbe37b..0000000000
--- a/spring-all/src/main/java/org/baeldung/ex/nosuchbeandefinitionexception/spring/Cause3ContextWithJavaConfig.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.baeldung.ex.nosuchbeandefinitionexception.spring;
-
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@ComponentScan("org.baeldung.ex.nosuchbeandefinitionexception.cause3")
-public class Cause3ContextWithJavaConfig {
-
-    public Cause3ContextWithJavaConfig() {
-        super();
-    }
-
-    // beans
-
-}
\ No newline at end of file
diff --git a/spring-all/src/test/java/org/baeldung/ex/nosuchbeandefinitionexception/Cause1NoSuchBeanDefinitionExceptionIntegrationTest.java b/spring-all/src/test/java/org/baeldung/ex/nosuchbeandefinitionexception/Cause1NoSuchBeanDefinitionExceptionIntegrationTest.java
deleted file mode 100644
index aed37a125a..0000000000
--- a/spring-all/src/test/java/org/baeldung/ex/nosuchbeandefinitionexception/Cause1NoSuchBeanDefinitionExceptionIntegrationTest.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.baeldung.ex.nosuchbeandefinitionexception;
-
-import org.baeldung.ex.nosuchbeandefinitionexception.spring.Cause1ContextWithJavaConfig;
-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 = { 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
deleted file mode 100644
index 90d7317f44..0000000000
--- a/spring-all/src/test/java/org/baeldung/ex/nosuchbeandefinitionexception/Cause2NoSuchBeanDefinitionExceptionIntegrationTest.java
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 100644
index 0e2123b7ff..0000000000
--- a/spring-all/src/test/java/org/baeldung/ex/nosuchbeandefinitionexception/Cause3NoSuchBeanDefinitionExceptionIntegrationTest.java
+++ /dev/null
@@ -1,19 +0,0 @@
-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() {
-        //
-    }
-
-}