diff --git a/modern-java/src/main/java/org/gym/fp/moderjava/StreamTest.java b/modern-java/src/main/java/org/gym/fp/moderjava/StreamTest.java
index 42860c1..9bd4fd6 100644
--- a/modern-java/src/main/java/org/gym/fp/moderjava/StreamTest.java
+++ b/modern-java/src/main/java/org/gym/fp/moderjava/StreamTest.java
@@ -1,5 +1,7 @@
 package org.gym.fp.moderjava;
 
+import org.gym.fp.moderjava.stream.*;
+
 import java.util.*;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
diff --git a/modern-java/src/main/java/org/gym/fp/moderjava/Dish.java b/modern-java/src/main/java/org/gym/fp/moderjava/stream/Dish.java
similarity index 92%
rename from modern-java/src/main/java/org/gym/fp/moderjava/Dish.java
rename to modern-java/src/main/java/org/gym/fp/moderjava/stream/Dish.java
index fcdfdc0..3aa4235 100644
--- a/modern-java/src/main/java/org/gym/fp/moderjava/Dish.java
+++ b/modern-java/src/main/java/org/gym/fp/moderjava/stream/Dish.java
@@ -1,4 +1,4 @@
-package org.gym.fp.moderjava;
+package org.gym.fp.moderjava.stream;
 
 import lombok.AllArgsConstructor;
 import lombok.Value;
diff --git a/modern-java/src/main/java/org/gym/fp/moderjava/ForkJoinSumCalculator.java b/modern-java/src/main/java/org/gym/fp/moderjava/stream/ForkJoinSumCalculator.java
similarity index 97%
rename from modern-java/src/main/java/org/gym/fp/moderjava/ForkJoinSumCalculator.java
rename to modern-java/src/main/java/org/gym/fp/moderjava/stream/ForkJoinSumCalculator.java
index ae57bfd..f291003 100644
--- a/modern-java/src/main/java/org/gym/fp/moderjava/ForkJoinSumCalculator.java
+++ b/modern-java/src/main/java/org/gym/fp/moderjava/stream/ForkJoinSumCalculator.java
@@ -1,4 +1,4 @@
-package org.gym.fp.moderjava;
+package org.gym.fp.moderjava.stream;
 
 import java.util.concurrent.RecursiveTask;
 
diff --git a/modern-java/src/main/java/org/gym/fp/moderjava/PrimeNumbersCollector.java b/modern-java/src/main/java/org/gym/fp/moderjava/stream/PrimeNumbersCollector.java
similarity index 97%
rename from modern-java/src/main/java/org/gym/fp/moderjava/PrimeNumbersCollector.java
rename to modern-java/src/main/java/org/gym/fp/moderjava/stream/PrimeNumbersCollector.java
index 7c37896..e29e486 100644
--- a/modern-java/src/main/java/org/gym/fp/moderjava/PrimeNumbersCollector.java
+++ b/modern-java/src/main/java/org/gym/fp/moderjava/stream/PrimeNumbersCollector.java
@@ -1,4 +1,4 @@
-package org.gym.fp.moderjava;
+package org.gym.fp.moderjava.stream;
 
 import java.util.*;
 import java.util.function.BiConsumer;
diff --git a/modern-java/src/main/java/org/gym/fp/moderjava/ToListCollector.java b/modern-java/src/main/java/org/gym/fp/moderjava/stream/ToListCollector.java
similarity index 98%
rename from modern-java/src/main/java/org/gym/fp/moderjava/ToListCollector.java
rename to modern-java/src/main/java/org/gym/fp/moderjava/stream/ToListCollector.java
index f163a3e..c88f807 100644
--- a/modern-java/src/main/java/org/gym/fp/moderjava/ToListCollector.java
+++ b/modern-java/src/main/java/org/gym/fp/moderjava/stream/ToListCollector.java
@@ -1,4 +1,4 @@
-package org.gym.fp.moderjava;
+package org.gym.fp.moderjava.stream;
 
 import java.util.*;
 import java.util.function.BiConsumer;
diff --git a/modern-java/src/main/java/org/gym/fp/moderjava/Trader.java b/modern-java/src/main/java/org/gym/fp/moderjava/stream/Trader.java
similarity index 82%
rename from modern-java/src/main/java/org/gym/fp/moderjava/Trader.java
rename to modern-java/src/main/java/org/gym/fp/moderjava/stream/Trader.java
index 8315453..6acaf23 100644
--- a/modern-java/src/main/java/org/gym/fp/moderjava/Trader.java
+++ b/modern-java/src/main/java/org/gym/fp/moderjava/stream/Trader.java
@@ -1,4 +1,4 @@
-package org.gym.fp.moderjava;
+package org.gym.fp.moderjava.stream;
 
 import lombok.AllArgsConstructor;
 import lombok.Value;
diff --git a/modern-java/src/main/java/org/gym/fp/moderjava/Transaction.java b/modern-java/src/main/java/org/gym/fp/moderjava/stream/Transaction.java
similarity index 84%
rename from modern-java/src/main/java/org/gym/fp/moderjava/Transaction.java
rename to modern-java/src/main/java/org/gym/fp/moderjava/stream/Transaction.java
index b5a0aa5..b1afa49 100644
--- a/modern-java/src/main/java/org/gym/fp/moderjava/Transaction.java
+++ b/modern-java/src/main/java/org/gym/fp/moderjava/stream/Transaction.java
@@ -1,4 +1,4 @@
-package org.gym.fp.moderjava;
+package org.gym.fp.moderjava.stream;
 
 import lombok.AllArgsConstructor;
 import lombok.Value;
diff --git a/modern-java/src/main/java/org/gym/fp/moderjava/WordCounter.java b/modern-java/src/main/java/org/gym/fp/moderjava/stream/WordCounter.java
similarity index 94%
rename from modern-java/src/main/java/org/gym/fp/moderjava/WordCounter.java
rename to modern-java/src/main/java/org/gym/fp/moderjava/stream/WordCounter.java
index 38aa1b3..3ef5cee 100644
--- a/modern-java/src/main/java/org/gym/fp/moderjava/WordCounter.java
+++ b/modern-java/src/main/java/org/gym/fp/moderjava/stream/WordCounter.java
@@ -1,4 +1,4 @@
-package org.gym.fp.moderjava;
+package org.gym.fp.moderjava.stream;
 
 public class WordCounter {
     private final int counter;
diff --git a/modern-java/src/main/java/org/gym/fp/moderjava/WordCounterSpliterator.java b/modern-java/src/main/java/org/gym/fp/moderjava/stream/WordCounterSpliterator.java
similarity index 97%
rename from modern-java/src/main/java/org/gym/fp/moderjava/WordCounterSpliterator.java
rename to modern-java/src/main/java/org/gym/fp/moderjava/stream/WordCounterSpliterator.java
index b122de1..5a7e4b7 100644
--- a/modern-java/src/main/java/org/gym/fp/moderjava/WordCounterSpliterator.java
+++ b/modern-java/src/main/java/org/gym/fp/moderjava/stream/WordCounterSpliterator.java
@@ -1,4 +1,4 @@
-package org.gym.fp.moderjava;
+package org.gym.fp.moderjava.stream;
 
 import java.util.Spliterator;
 import java.util.function.Consumer;