diff --git a/spring-cloud/spring-cloud-stream/README.md b/spring-cloud/spring-cloud-stream/README.md
new file mode 100644
index 0000000000..5ecb852df5
--- /dev/null
+++ b/spring-cloud/spring-cloud-stream/README.md
@@ -0,0 +1,2 @@
+## Relevant Articles
+- [Introduction to Spring Cloud Stream](http://www.baeldung.com/spring-cloud-stream)
diff --git a/spring-boot/src/main/java/org/baeldung/dsrouting/ClientDao.java b/spring-jpa/src/main/java/org/baeldung/dsrouting/ClientDao.java
similarity index 100%
rename from spring-boot/src/main/java/org/baeldung/dsrouting/ClientDao.java
rename to spring-jpa/src/main/java/org/baeldung/dsrouting/ClientDao.java
diff --git a/spring-boot/src/main/java/org/baeldung/dsrouting/ClientDataSourceRouter.java b/spring-jpa/src/main/java/org/baeldung/dsrouting/ClientDataSourceRouter.java
similarity index 100%
rename from spring-boot/src/main/java/org/baeldung/dsrouting/ClientDataSourceRouter.java
rename to spring-jpa/src/main/java/org/baeldung/dsrouting/ClientDataSourceRouter.java
diff --git a/spring-boot/src/main/java/org/baeldung/dsrouting/ClientDatabase.java b/spring-jpa/src/main/java/org/baeldung/dsrouting/ClientDatabase.java
similarity index 100%
rename from spring-boot/src/main/java/org/baeldung/dsrouting/ClientDatabase.java
rename to spring-jpa/src/main/java/org/baeldung/dsrouting/ClientDatabase.java
diff --git a/spring-boot/src/main/java/org/baeldung/dsrouting/ClientDatabaseContextHolder.java b/spring-jpa/src/main/java/org/baeldung/dsrouting/ClientDatabaseContextHolder.java
similarity index 100%
rename from spring-boot/src/main/java/org/baeldung/dsrouting/ClientDatabaseContextHolder.java
rename to spring-jpa/src/main/java/org/baeldung/dsrouting/ClientDatabaseContextHolder.java
diff --git a/spring-boot/src/main/java/org/baeldung/dsrouting/ClientService.java b/spring-jpa/src/main/java/org/baeldung/dsrouting/ClientService.java
similarity index 100%
rename from spring-boot/src/main/java/org/baeldung/dsrouting/ClientService.java
rename to spring-jpa/src/main/java/org/baeldung/dsrouting/ClientService.java
diff --git a/spring-boot/src/test/java/org/baeldung/dsrouting/DataSourceRoutingIntegrationTest.java b/spring-jpa/src/test/java/org/baeldung/dsrouting/DataSourceRoutingIntegrationTest.java
similarity index 100%
rename from spring-boot/src/test/java/org/baeldung/dsrouting/DataSourceRoutingIntegrationTest.java
rename to spring-jpa/src/test/java/org/baeldung/dsrouting/DataSourceRoutingIntegrationTest.java
diff --git a/spring-boot/src/test/java/org/baeldung/dsrouting/DataSourceRoutingTestConfiguration.java b/spring-jpa/src/test/java/org/baeldung/dsrouting/DataSourceRoutingTestConfiguration.java
similarity index 100%
rename from spring-boot/src/test/java/org/baeldung/dsrouting/DataSourceRoutingTestConfiguration.java
rename to spring-jpa/src/test/java/org/baeldung/dsrouting/DataSourceRoutingTestConfiguration.java
diff --git a/spring-boot/src/test/resources/dsrouting-db.sql b/spring-jpa/src/test/resources/dsrouting-db.sql
similarity index 100%
rename from spring-boot/src/test/resources/dsrouting-db.sql
rename to spring-jpa/src/test/resources/dsrouting-db.sql
diff --git a/testing-modules/mockito/README.md b/testing-modules/mockito/README.md
index 2407a5c3c5..0d6f69a64f 100644
--- a/testing-modules/mockito/README.md
+++ b/testing-modules/mockito/README.md
@@ -11,3 +11,4 @@
 - [Mockito’s Mock Methods](http://www.baeldung.com/mockito-mock-methods)
 - [Introduction to PowerMock](http://www.baeldung.com/intro-to-powermock)
 - [Mocking Exception Throwing using Mockito](http://www.baeldung.com/mockito-exceptions)
+- [Mocking Void Methods with Mockito](http://www.baeldung.com/mockito-void-methods)
diff --git a/testing-modules/testing/README.md b/testing-modules/testing/README.md
index 889f6706d4..143cb792cf 100644
--- a/testing-modules/testing/README.md
+++ b/testing-modules/testing/README.md
@@ -15,3 +15,4 @@
 - [Cucumber Java 8 Support](http://www.baeldung.com/cucumber-java-8-support)
 - [Introduction to Lambda Behave](http://www.baeldung.com/lambda-behave)
 - [Introduction to Jukito](http://www.baeldung.com/jukito)
+- [Custom JUnit 4 Test Runners](http://www.baeldung.com/junit-4-custom-runners)