diff --git a/core-java-8/README.md b/core-java-8/README.md
index 300d6ce33b..3d1d89896f 100644
--- a/core-java-8/README.md
+++ b/core-java-8/README.md
@@ -14,7 +14,6 @@
 - [Convert String to int or Integer in Java](http://www.baeldung.com/java-convert-string-to-int-or-integer)
 - [Convert char to String in Java](http://www.baeldung.com/java-convert-char-to-string)
 - [Guide to Java 8’s Functional Interfaces](http://www.baeldung.com/java-8-functional-interfaces)
-- [Guide To CompletableFuture](http://www.baeldung.com/java-completablefuture)
 - [Introduction to Thread Pools in Java](http://www.baeldung.com/thread-pool-java-and-guava)
 - [Guide to Java 8 Collectors](http://www.baeldung.com/java-8-collectors)
 - [The Java 8 Stream API Tutorial](http://www.baeldung.com/java-8-streams)
diff --git a/core-java/README.md b/core-java/README.md
index a9310c1c16..6671d7c2f4 100644
--- a/core-java/README.md
+++ b/core-java/README.md
@@ -20,3 +20,4 @@
 - [Guide to Java Reflection](http://www.baeldung.com/java-reflection)
 - [A Guide to Java Sockets](http://www.baeldung.com/a-guide-to-java-sockets)
 - [Java 8 Collectors](http://www.baeldung.com/java-8-collectors)
+- [Guide To CompletableFuture](http://www.baeldung.com/java-completablefuture)
diff --git a/core-java-8/src/test/java/com/baeldung/completablefuture/CompletableFutureTest.java b/core-java/src/test/java/com/baeldung/completablefuture/CompletableFutureTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/completablefuture/CompletableFutureTest.java
rename to core-java/src/test/java/com/baeldung/completablefuture/CompletableFutureTest.java