diff --git a/core-java-8/README.md b/core-java-8/README.md
index 3d1d89896f..a835914b4d 100644
--- a/core-java-8/README.md
+++ b/core-java-8/README.md
@@ -13,7 +13,6 @@
 - [Java 8 Streams Advanced](http://www.baeldung.com/java-8-streams)
 - [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)
 - [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 6671d7c2f4..c18e6670ca 100644
--- a/core-java/README.md
+++ b/core-java/README.md
@@ -21,3 +21,4 @@
 - [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)
+- [Guide to Java 8’s Functional Interfaces](http://www.baeldung.com/java-8-functional-interfaces)
diff --git a/core-java-8/src/test/java/com/baeldung/functionalinterface/FunctionalInterfaceTest.java b/core-java/src/test/java/com/baeldung/functionalinterface/FunctionalInterfaceTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/functionalinterface/FunctionalInterfaceTest.java
rename to core-java/src/test/java/com/baeldung/functionalinterface/FunctionalInterfaceTest.java
index ce878026d4..e07bcc9a8d 100644
--- a/core-java-8/src/test/java/com/baeldung/functionalinterface/FunctionalInterfaceTest.java
+++ b/core-java/src/test/java/com/baeldung/functionalinterface/FunctionalInterfaceTest.java
@@ -1,5 +1,8 @@
 package com.baeldung.functionalinterface;
 
+import com.google.common.util.concurrent.Uninterruptibles;
+import org.junit.Test;
+
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -10,9 +13,6 @@ import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import com.google.common.util.concurrent.Uninterruptibles;
-import org.junit.Test;
-
 import static org.junit.Assert.*;
 
 public class FunctionalInterfaceTest {
diff --git a/core-java-8/src/test/java/com/baeldung/functionalinterface/ShortToByteFunction.java b/core-java/src/test/java/com/baeldung/functionalinterface/ShortToByteFunction.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/functionalinterface/ShortToByteFunction.java
rename to core-java/src/test/java/com/baeldung/functionalinterface/ShortToByteFunction.java