diff --git a/core-java-8/src/main/java/com/baeldung/convertlisttomap/Animal.java b/core-java-collections/src/main/java/com/baeldung/convertlisttomap/Animal.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/convertlisttomap/Animal.java
rename to core-java-collections/src/main/java/com/baeldung/convertlisttomap/Animal.java
diff --git a/core-java-8/src/main/java/com/baeldung/convertlisttomap/ConvertListToMapService.java b/core-java-collections/src/main/java/com/baeldung/convertlisttomap/ConvertListToMapService.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/convertlisttomap/ConvertListToMapService.java
rename to core-java-collections/src/main/java/com/baeldung/convertlisttomap/ConvertListToMapService.java
index 88fc175f38..6527d35742 100644
--- a/core-java-8/src/main/java/com/baeldung/convertlisttomap/ConvertListToMapService.java
+++ b/core-java-collections/src/main/java/com/baeldung/convertlisttomap/ConvertListToMapService.java
@@ -1,13 +1,13 @@
 package com.baeldung.convertlisttomap;
 
+import com.google.common.collect.Maps;
+import org.apache.commons.collections4.MapUtils;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import org.apache.commons.collections4.MapUtils;
-import com.google.common.collect.Maps;
-
 public class ConvertListToMapService {
 
     public Map<Integer, Animal> convertListBeforeJava8(List<Animal> list) {
diff --git a/core-java-8/src/test/java/com/baeldung/convertlisttomap/ConvertListToMapServiceUnitTest.java b/core-java-collections/src/test/java/com/baeldung/convertlisttomap/ConvertListToMapServiceUnitTest.java
similarity index 97%
rename from core-java-8/src/test/java/com/baeldung/convertlisttomap/ConvertListToMapServiceUnitTest.java
rename to core-java-collections/src/test/java/com/baeldung/convertlisttomap/ConvertListToMapServiceUnitTest.java
index a4234d2af4..4d783f4525 100644
--- a/core-java-8/src/test/java/com/baeldung/convertlisttomap/ConvertListToMapServiceUnitTest.java
+++ b/core-java-collections/src/test/java/com/baeldung/convertlisttomap/ConvertListToMapServiceUnitTest.java
@@ -1,13 +1,14 @@
 package com.baeldung.convertlisttomap;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.*;
+import org.junit.Before;
+import org.junit.Test;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.junit.Before;
-import org.junit.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsInAnyOrder;
 
 public class ConvertListToMapServiceUnitTest {
     List<Animal> list;
diff --git a/core-java-8/src/test/java/com/baeldung/convertlisttomap/ConvertListWithDiplicatedIdToMapServiceUnitTest.java b/core-java-collections/src/test/java/com/baeldung/convertlisttomap/ConvertListWithDiplicatedIdToMapServiceUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/convertlisttomap/ConvertListWithDiplicatedIdToMapServiceUnitTest.java
rename to core-java-collections/src/test/java/com/baeldung/convertlisttomap/ConvertListWithDiplicatedIdToMapServiceUnitTest.java
index 6d3ad9e76e..6e766433d1 100644
--- a/core-java-8/src/test/java/com/baeldung/convertlisttomap/ConvertListWithDiplicatedIdToMapServiceUnitTest.java
+++ b/core-java-collections/src/test/java/com/baeldung/convertlisttomap/ConvertListWithDiplicatedIdToMapServiceUnitTest.java
@@ -1,15 +1,15 @@
 package com.baeldung.convertlisttomap;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.hasItem;
-import static org.hamcrest.Matchers.hasSize;
+import org.junit.Before;
+import org.junit.Test;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.junit.Before;
-import org.junit.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.hasSize;
 
 public class ConvertListWithDiplicatedIdToMapServiceUnitTest {
     List<Animal> duplicatedIdList;