diff --git a/algorithms/pom.xml b/algorithms/pom.xml
index 46a2b9d897..529af19686 100644
--- a/algorithms/pom.xml
+++ b/algorithms/pom.xml
@@ -10,9 +10,15 @@
 		<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
 		<exec-maven-plugin.version>1.5.0</exec-maven-plugin.version>
 		<lombok.version>1.16.12</lombok.version>
+		<commons-math3.version>3.6.1</commons-math3.version>
 	</properties>
 
 	<dependencies>
+		<dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-math3</artifactId>
+            <version>${commons-math3.version}</version>
+        </dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
diff --git a/core-java/src/main/java/com/baeldung/primechecker/BigIntegerPrimeChecker.java b/algorithms/src/main/java/com/baeldung/algorithms/primechecker/BigIntegerPrimeChecker.java
similarity index 84%
rename from core-java/src/main/java/com/baeldung/primechecker/BigIntegerPrimeChecker.java
rename to algorithms/src/main/java/com/baeldung/algorithms/primechecker/BigIntegerPrimeChecker.java
index 1ac4fed63f..bd4708b661 100644
--- a/core-java/src/main/java/com/baeldung/primechecker/BigIntegerPrimeChecker.java
+++ b/algorithms/src/main/java/com/baeldung/algorithms/primechecker/BigIntegerPrimeChecker.java
@@ -1,4 +1,4 @@
-package com.baeldung.primechecker;
+package com.baeldung.algorithms.primechecker;
 
 import java.math.BigInteger;
 
diff --git a/core-java/src/main/java/com/baeldung/primechecker/BruteForcePrimeChecker.java b/algorithms/src/main/java/com/baeldung/algorithms/primechecker/BruteForcePrimeChecker.java
similarity index 58%
rename from core-java/src/main/java/com/baeldung/primechecker/BruteForcePrimeChecker.java
rename to algorithms/src/main/java/com/baeldung/algorithms/primechecker/BruteForcePrimeChecker.java
index 7a94479b8f..0dfcfa1505 100644
--- a/core-java/src/main/java/com/baeldung/primechecker/BruteForcePrimeChecker.java
+++ b/algorithms/src/main/java/com/baeldung/algorithms/primechecker/BruteForcePrimeChecker.java
@@ -1,4 +1,4 @@
-package com.baeldung.primechecker;
+package com.baeldung.algorithms.primechecker;
 
 import java.util.stream.IntStream;
 
@@ -6,7 +6,7 @@ public class BruteForcePrimeChecker implements PrimeChecker{
 
     @Override
     public boolean isPrime(int number) {
-        return IntStream.range(2, number).filter(n -> (number % n == 0)).count() == 0;
+        return IntStream.range(2, number).noneMatch(n -> (number % n == 0));
     }
 
     
diff --git a/core-java/src/main/java/com/baeldung/primechecker/OptimisedPrimeChecker.java b/algorithms/src/main/java/com/baeldung/algorithms/primechecker/OptimisedPrimeChecker.java
similarity index 68%
rename from core-java/src/main/java/com/baeldung/primechecker/OptimisedPrimeChecker.java
rename to algorithms/src/main/java/com/baeldung/algorithms/primechecker/OptimisedPrimeChecker.java
index 40669f4181..f7e3e09be0 100644
--- a/core-java/src/main/java/com/baeldung/primechecker/OptimisedPrimeChecker.java
+++ b/algorithms/src/main/java/com/baeldung/algorithms/primechecker/OptimisedPrimeChecker.java
@@ -1,4 +1,4 @@
-package com.baeldung.primechecker;
+package com.baeldung.algorithms.primechecker;
 
 import java.util.stream.IntStream;
 
@@ -7,8 +7,7 @@ public class OptimisedPrimeChecker implements PrimeChecker{
     @Override
     public boolean isPrime(int number) {
         return IntStream.range(2, (int)Math.sqrt(number) + 1)
-            .filter(n -> (number % n == 0))
-            .count() == 0;
+            .noneMatch(n -> (number % n == 0));
     }
 
     
diff --git a/core-java/src/main/java/com/baeldung/primechecker/PrimeChecker.java b/algorithms/src/main/java/com/baeldung/algorithms/primechecker/PrimeChecker.java
similarity index 64%
rename from core-java/src/main/java/com/baeldung/primechecker/PrimeChecker.java
rename to algorithms/src/main/java/com/baeldung/algorithms/primechecker/PrimeChecker.java
index 22260268bc..f31af1ca4f 100644
--- a/core-java/src/main/java/com/baeldung/primechecker/PrimeChecker.java
+++ b/algorithms/src/main/java/com/baeldung/algorithms/primechecker/PrimeChecker.java
@@ -1,4 +1,4 @@
-package com.baeldung.primechecker;
+package com.baeldung.algorithms.primechecker;
 
 public interface PrimeChecker {
     
diff --git a/core-java/src/main/java/com/baeldung/primechecker/PrimesPrimeChecker.java b/algorithms/src/main/java/com/baeldung/algorithms/primechecker/PrimesPrimeChecker.java
similarity index 82%
rename from core-java/src/main/java/com/baeldung/primechecker/PrimesPrimeChecker.java
rename to algorithms/src/main/java/com/baeldung/algorithms/primechecker/PrimesPrimeChecker.java
index 0c6a636612..ee66d5d2ab 100644
--- a/core-java/src/main/java/com/baeldung/primechecker/PrimesPrimeChecker.java
+++ b/algorithms/src/main/java/com/baeldung/algorithms/primechecker/PrimesPrimeChecker.java
@@ -1,4 +1,4 @@
-package com.baeldung.primechecker;
+package com.baeldung.algorithms.primechecker;
 
 import org.apache.commons.math3.primes.Primes;
 
diff --git a/core-java/src/test/java/com/baeldung/primechecker/BigIntegerPrimeCheckerTest.java b/algorithms/src/test/java/com/baeldung/algorithms/primechecker/BigIntegerPrimeCheckerTest.java
similarity index 75%
rename from core-java/src/test/java/com/baeldung/primechecker/BigIntegerPrimeCheckerTest.java
rename to algorithms/src/test/java/com/baeldung/algorithms/primechecker/BigIntegerPrimeCheckerTest.java
index 6a5228cc50..95eb85749d 100644
--- a/core-java/src/test/java/com/baeldung/primechecker/BigIntegerPrimeCheckerTest.java
+++ b/algorithms/src/test/java/com/baeldung/algorithms/primechecker/BigIntegerPrimeCheckerTest.java
@@ -1,9 +1,12 @@
-package com.baeldung.primechecker;
+package com.baeldung.algorithms.primechecker;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
+import com.baeldung.algorithms.primechecker.BigIntegerPrimeChecker;
+import com.baeldung.algorithms.primechecker.PrimeChecker;
+
 public class BigIntegerPrimeCheckerTest {
 
     PrimeChecker primeChecker = new BigIntegerPrimeChecker();
diff --git a/core-java/src/test/java/com/baeldung/primechecker/BruteForcePrimeCheckerTest.java b/algorithms/src/test/java/com/baeldung/algorithms/primechecker/BruteForcePrimeCheckerTest.java
similarity index 82%
rename from core-java/src/test/java/com/baeldung/primechecker/BruteForcePrimeCheckerTest.java
rename to algorithms/src/test/java/com/baeldung/algorithms/primechecker/BruteForcePrimeCheckerTest.java
index 7139373f5e..50af4ab05c 100644
--- a/core-java/src/test/java/com/baeldung/primechecker/BruteForcePrimeCheckerTest.java
+++ b/algorithms/src/test/java/com/baeldung/algorithms/primechecker/BruteForcePrimeCheckerTest.java
@@ -1,6 +1,9 @@
-package com.baeldung.primechecker;
+package com.baeldung.algorithms.primechecker;
 
 import org.junit.Test;
+
+import com.baeldung.algorithms.primechecker.BruteForcePrimeChecker;
+
 import static org.junit.Assert.*;
 
 public class BruteForcePrimeCheckerTest {
diff --git a/core-java/src/test/java/com/baeldung/primechecker/OptimisedPrimeCheckerTest.java b/algorithms/src/test/java/com/baeldung/algorithms/primechecker/OptimisedPrimeCheckerTest.java
similarity index 75%
rename from core-java/src/test/java/com/baeldung/primechecker/OptimisedPrimeCheckerTest.java
rename to algorithms/src/test/java/com/baeldung/algorithms/primechecker/OptimisedPrimeCheckerTest.java
index bb4c06a53a..21ad55467f 100644
--- a/core-java/src/test/java/com/baeldung/primechecker/OptimisedPrimeCheckerTest.java
+++ b/algorithms/src/test/java/com/baeldung/algorithms/primechecker/OptimisedPrimeCheckerTest.java
@@ -1,9 +1,12 @@
-package com.baeldung.primechecker;
+package com.baeldung.algorithms.primechecker;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
+import com.baeldung.algorithms.primechecker.OptimisedPrimeChecker;
+import com.baeldung.algorithms.primechecker.PrimeChecker;
+
 public class OptimisedPrimeCheckerTest {
 
     PrimeChecker primeChecker = new OptimisedPrimeChecker();
diff --git a/core-java/src/test/java/com/baeldung/primechecker/PrimesPrimeCheckerTest.java b/algorithms/src/test/java/com/baeldung/algorithms/primechecker/PrimesPrimeCheckerTest.java
similarity index 75%
rename from core-java/src/test/java/com/baeldung/primechecker/PrimesPrimeCheckerTest.java
rename to algorithms/src/test/java/com/baeldung/algorithms/primechecker/PrimesPrimeCheckerTest.java
index f8b194e855..63de593b44 100644
--- a/core-java/src/test/java/com/baeldung/primechecker/PrimesPrimeCheckerTest.java
+++ b/algorithms/src/test/java/com/baeldung/algorithms/primechecker/PrimesPrimeCheckerTest.java
@@ -1,9 +1,12 @@
-package com.baeldung.primechecker;
+package com.baeldung.algorithms.primechecker;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
+import com.baeldung.algorithms.primechecker.PrimeChecker;
+import com.baeldung.algorithms.primechecker.PrimesPrimeChecker;
+
 public class PrimesPrimeCheckerTest {
     PrimeChecker primeChecker = new PrimesPrimeChecker();