diff --git a/samoa-api/src/main/java/org/apache/samoa/streams/ClusteringEntranceProcessor.java b/samoa-api/src/main/java/org/apache/samoa/streams/ClusteringEntranceProcessor.java
index db6f6985..3c0d76e8 100644
--- a/samoa-api/src/main/java/org/apache/samoa/streams/ClusteringEntranceProcessor.java
+++ b/samoa-api/src/main/java/org/apache/samoa/streams/ClusteringEntranceProcessor.java
@@ -32,9 +32,8 @@
 import org.apache.samoa.moa.cluster.Clustering;
 import org.apache.samoa.moa.core.DataPoint;
 import org.apache.samoa.moa.options.AbstractOptionHandler;
-import org.apache.samoa.moa.streams.InstanceStream;
-import org.apache.samoa.moa.streams.clustering.ClusteringStream;
-import org.apache.samoa.moa.streams.clustering.RandomRBFGeneratorEvents;
+import org.apache.samoa.streams.clustering.ClusteringStream;
+import org.apache.samoa.streams.clustering.RandomRBFGeneratorEvents;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/samoa-api/src/main/java/org/apache/samoa/moa/streams/ExampleStream.java b/samoa-api/src/main/java/org/apache/samoa/streams/ExampleStream.java
similarity index 98%
rename from samoa-api/src/main/java/org/apache/samoa/moa/streams/ExampleStream.java
rename to samoa-api/src/main/java/org/apache/samoa/streams/ExampleStream.java
index c4ab2dfa..b0cbe11b 100644
--- a/samoa-api/src/main/java/org/apache/samoa/moa/streams/ExampleStream.java
+++ b/samoa-api/src/main/java/org/apache/samoa/streams/ExampleStream.java
@@ -1,4 +1,4 @@
-package org.apache.samoa.moa.streams;
+package org.apache.samoa.streams;
 
 /*
  * #%L
diff --git a/samoa-api/src/main/java/org/apache/samoa/streams/FileStream.java b/samoa-api/src/main/java/org/apache/samoa/streams/FileStream.java
index 4f07ed29..eece5419 100644
--- a/samoa-api/src/main/java/org/apache/samoa/streams/FileStream.java
+++ b/samoa-api/src/main/java/org/apache/samoa/streams/FileStream.java
@@ -31,7 +31,6 @@
 import org.apache.samoa.moa.core.InstanceExample;
 import org.apache.samoa.moa.core.ObjectRepository;
 import org.apache.samoa.moa.options.AbstractOptionHandler;
-import org.apache.samoa.moa.streams.InstanceStream;
 import org.apache.samoa.moa.tasks.TaskMonitor;
 import org.apache.samoa.streams.fs.FileStreamSource;
 
diff --git a/samoa-api/src/main/java/org/apache/samoa/moa/streams/InstanceStream.java b/samoa-api/src/main/java/org/apache/samoa/streams/InstanceStream.java
similarity index 96%
rename from samoa-api/src/main/java/org/apache/samoa/moa/streams/InstanceStream.java
rename to samoa-api/src/main/java/org/apache/samoa/streams/InstanceStream.java
index fc6ed8e4..bf9e7afb 100644
--- a/samoa-api/src/main/java/org/apache/samoa/moa/streams/InstanceStream.java
+++ b/samoa-api/src/main/java/org/apache/samoa/streams/InstanceStream.java
@@ -1,4 +1,4 @@
-package org.apache.samoa.moa.streams;
+package org.apache.samoa.streams;
 
 /*
  * #%L
diff --git a/samoa-api/src/main/java/org/apache/samoa/streams/PrequentialSourceProcessor.java b/samoa-api/src/main/java/org/apache/samoa/streams/PrequentialSourceProcessor.java
index b947b2f9..6e1598f6 100644
--- a/samoa-api/src/main/java/org/apache/samoa/streams/PrequentialSourceProcessor.java
+++ b/samoa-api/src/main/java/org/apache/samoa/streams/PrequentialSourceProcessor.java
@@ -32,7 +32,6 @@
 import org.apache.samoa.instances.Instances;
 import org.apache.samoa.learners.InstanceContentEvent;
 import org.apache.samoa.moa.options.AbstractOptionHandler;
-import org.apache.samoa.moa.streams.InstanceStream;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/samoa-api/src/main/java/org/apache/samoa/streams/StreamSource.java b/samoa-api/src/main/java/org/apache/samoa/streams/StreamSource.java
index f4dba63a..14684dba 100644
--- a/samoa-api/src/main/java/org/apache/samoa/streams/StreamSource.java
+++ b/samoa-api/src/main/java/org/apache/samoa/streams/StreamSource.java
@@ -26,7 +26,6 @@
 
 import org.apache.samoa.instances.Instance;
 import org.apache.samoa.moa.core.Example;
-import org.apache.samoa.moa.streams.InstanceStream;
 
 /**
  * The Class StreamSource.
diff --git a/samoa-api/src/main/java/org/apache/samoa/streams/StreamSourceProcessor.java b/samoa-api/src/main/java/org/apache/samoa/streams/StreamSourceProcessor.java
index d34f7017..82381343 100644
--- a/samoa-api/src/main/java/org/apache/samoa/streams/StreamSourceProcessor.java
+++ b/samoa-api/src/main/java/org/apache/samoa/streams/StreamSourceProcessor.java
@@ -29,7 +29,6 @@
 import org.apache.samoa.instances.Instance;
 import org.apache.samoa.instances.Instances;
 import org.apache.samoa.learners.InstanceContentEvent;
-import org.apache.samoa.moa.streams.InstanceStream;
 import org.apache.samoa.topology.Stream;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/samoa-api/src/main/java/org/apache/samoa/moa/streams/clustering/ClusterEvent.java b/samoa-api/src/main/java/org/apache/samoa/streams/clustering/ClusterEvent.java
similarity index 95%
rename from samoa-api/src/main/java/org/apache/samoa/moa/streams/clustering/ClusterEvent.java
rename to samoa-api/src/main/java/org/apache/samoa/streams/clustering/ClusterEvent.java
index 9aa11684..80d222cb 100644
--- a/samoa-api/src/main/java/org/apache/samoa/moa/streams/clustering/ClusterEvent.java
+++ b/samoa-api/src/main/java/org/apache/samoa/streams/clustering/ClusterEvent.java
@@ -1,4 +1,4 @@
-package org.apache.samoa.moa.streams.clustering;
+package org.apache.samoa.streams.clustering;
 
 /*
  * #%L
diff --git a/samoa-api/src/main/java/org/apache/samoa/moa/streams/clustering/ClusterEventListener.java b/samoa-api/src/main/java/org/apache/samoa/streams/clustering/ClusterEventListener.java
similarity index 94%
rename from samoa-api/src/main/java/org/apache/samoa/moa/streams/clustering/ClusterEventListener.java
rename to samoa-api/src/main/java/org/apache/samoa/streams/clustering/ClusterEventListener.java
index af7881b7..34125494 100644
--- a/samoa-api/src/main/java/org/apache/samoa/moa/streams/clustering/ClusterEventListener.java
+++ b/samoa-api/src/main/java/org/apache/samoa/streams/clustering/ClusterEventListener.java
@@ -1,4 +1,4 @@
-package org.apache.samoa.moa.streams.clustering;
+package org.apache.samoa.streams.clustering;
 
 /*
  * #%L
diff --git a/samoa-api/src/main/java/org/apache/samoa/moa/streams/clustering/ClusteringStream.java b/samoa-api/src/main/java/org/apache/samoa/streams/clustering/ClusteringStream.java
similarity index 94%
rename from samoa-api/src/main/java/org/apache/samoa/moa/streams/clustering/ClusteringStream.java
rename to samoa-api/src/main/java/org/apache/samoa/streams/clustering/ClusteringStream.java
index e51b4370..1eb5607d 100644
--- a/samoa-api/src/main/java/org/apache/samoa/moa/streams/clustering/ClusteringStream.java
+++ b/samoa-api/src/main/java/org/apache/samoa/streams/clustering/ClusteringStream.java
@@ -1,4 +1,4 @@
-package org.apache.samoa.moa.streams.clustering;
+package org.apache.samoa.streams.clustering;
 
 /*
  * #%L
@@ -21,7 +21,7 @@
  */
 
 import org.apache.samoa.moa.options.AbstractOptionHandler;
-import org.apache.samoa.moa.streams.InstanceStream;
+import org.apache.samoa.streams.InstanceStream;
 
 import com.github.javacliparser.FloatOption;
 import com.github.javacliparser.IntOption;
diff --git a/samoa-api/src/main/java/org/apache/samoa/moa/streams/clustering/RandomRBFGeneratorEvents.java b/samoa-api/src/main/java/org/apache/samoa/streams/clustering/RandomRBFGeneratorEvents.java
similarity index 99%
rename from samoa-api/src/main/java/org/apache/samoa/moa/streams/clustering/RandomRBFGeneratorEvents.java
rename to samoa-api/src/main/java/org/apache/samoa/streams/clustering/RandomRBFGeneratorEvents.java
index c83f688d..139b8f79 100644
--- a/samoa-api/src/main/java/org/apache/samoa/moa/streams/clustering/RandomRBFGeneratorEvents.java
+++ b/samoa-api/src/main/java/org/apache/samoa/streams/clustering/RandomRBFGeneratorEvents.java
@@ -1,4 +1,4 @@
-package org.apache.samoa.moa.streams.clustering;
+package org.apache.samoa.streams.clustering;
 
 /*
  * #%L
@@ -40,8 +40,8 @@
 import org.apache.samoa.moa.core.FastVector;
 import org.apache.samoa.moa.core.InstanceExample;
 import org.apache.samoa.moa.core.ObjectRepository;
-import org.apache.samoa.moa.streams.InstanceStream;
 import org.apache.samoa.moa.tasks.TaskMonitor;
+import org.apache.samoa.streams.InstanceStream;
 
 import com.github.javacliparser.FlagOption;
 import com.github.javacliparser.FloatOption;
diff --git a/samoa-api/src/main/java/org/apache/samoa/moa/streams/generators/HyperplaneGenerator.java b/samoa-api/src/main/java/org/apache/samoa/streams/generators/HyperplaneGenerator.java
similarity index 98%
rename from samoa-api/src/main/java/org/apache/samoa/moa/streams/generators/HyperplaneGenerator.java
rename to samoa-api/src/main/java/org/apache/samoa/streams/generators/HyperplaneGenerator.java
index b05fa1b1..8274040b 100644
--- a/samoa-api/src/main/java/org/apache/samoa/moa/streams/generators/HyperplaneGenerator.java
+++ b/samoa-api/src/main/java/org/apache/samoa/streams/generators/HyperplaneGenerator.java
@@ -1,4 +1,4 @@
-package org.apache.samoa.moa.streams.generators;
+package org.apache.samoa.streams.generators;
 
 /*
  * #%L
@@ -32,8 +32,8 @@
 import org.apache.samoa.moa.core.InstanceExample;
 import org.apache.samoa.moa.core.ObjectRepository;
 import org.apache.samoa.moa.options.AbstractOptionHandler;
-import org.apache.samoa.moa.streams.InstanceStream;
 import org.apache.samoa.moa.tasks.TaskMonitor;
+import org.apache.samoa.streams.InstanceStream;
 
 import com.github.javacliparser.FloatOption;
 import com.github.javacliparser.IntOption;
diff --git a/samoa-api/src/main/java/org/apache/samoa/moa/streams/generators/RandomTreeGenerator.java b/samoa-api/src/main/java/org/apache/samoa/streams/generators/RandomTreeGenerator.java
similarity index 98%
rename from samoa-api/src/main/java/org/apache/samoa/moa/streams/generators/RandomTreeGenerator.java
rename to samoa-api/src/main/java/org/apache/samoa/streams/generators/RandomTreeGenerator.java
index 69100aa0..70dc4f89 100644
--- a/samoa-api/src/main/java/org/apache/samoa/moa/streams/generators/RandomTreeGenerator.java
+++ b/samoa-api/src/main/java/org/apache/samoa/streams/generators/RandomTreeGenerator.java
@@ -1,4 +1,4 @@
-package org.apache.samoa.moa.streams.generators;
+package org.apache.samoa.streams.generators;
 
 /*
  * #%L
@@ -33,8 +33,8 @@
 import org.apache.samoa.moa.core.InstanceExample;
 import org.apache.samoa.moa.core.ObjectRepository;
 import org.apache.samoa.moa.options.AbstractOptionHandler;
-import org.apache.samoa.moa.streams.InstanceStream;
 import org.apache.samoa.moa.tasks.TaskMonitor;
+import org.apache.samoa.streams.InstanceStream;
 
 import com.github.javacliparser.FloatOption;
 import com.github.javacliparser.IntOption;
diff --git a/samoa-api/src/main/java/org/apache/samoa/tasks/ClusteringEvaluation.java b/samoa-api/src/main/java/org/apache/samoa/tasks/ClusteringEvaluation.java
index a5c0ef19..327b1adb 100644
--- a/samoa-api/src/main/java/org/apache/samoa/tasks/ClusteringEvaluation.java
+++ b/samoa-api/src/main/java/org/apache/samoa/tasks/ClusteringEvaluation.java
@@ -26,10 +26,10 @@
 import org.apache.samoa.learners.Learner;
 import org.apache.samoa.learners.clusterers.simple.ClusteringDistributorProcessor;
 import org.apache.samoa.learners.clusterers.simple.DistributedClusterer;
-import org.apache.samoa.moa.streams.InstanceStream;
-import org.apache.samoa.moa.streams.clustering.ClusteringStream;
-import org.apache.samoa.moa.streams.clustering.RandomRBFGeneratorEvents;
 import org.apache.samoa.streams.ClusteringEntranceProcessor;
+import org.apache.samoa.streams.InstanceStream;
+import org.apache.samoa.streams.clustering.ClusteringStream;
+import org.apache.samoa.streams.clustering.RandomRBFGeneratorEvents;
 import org.apache.samoa.topology.ComponentFactory;
 import org.apache.samoa.topology.Stream;
 import org.apache.samoa.topology.Topology;
diff --git a/samoa-api/src/main/java/org/apache/samoa/tasks/PrequentialEvaluation.java b/samoa-api/src/main/java/org/apache/samoa/tasks/PrequentialEvaluation.java
index 575adadb..da0057d7 100644
--- a/samoa-api/src/main/java/org/apache/samoa/tasks/PrequentialEvaluation.java
+++ b/samoa-api/src/main/java/org/apache/samoa/tasks/PrequentialEvaluation.java
@@ -32,9 +32,9 @@
 import org.apache.samoa.learners.Learner;
 import org.apache.samoa.learners.RegressionLearner;
 import org.apache.samoa.learners.classifiers.trees.VerticalHoeffdingTree;
-import org.apache.samoa.moa.streams.InstanceStream;
-import org.apache.samoa.moa.streams.generators.RandomTreeGenerator;
+import org.apache.samoa.streams.InstanceStream;
 import org.apache.samoa.streams.PrequentialSourceProcessor;
+import org.apache.samoa.streams.generators.RandomTreeGenerator;
 import org.apache.samoa.topology.ComponentFactory;
 import org.apache.samoa.topology.Stream;
 import org.apache.samoa.topology.Topology;
diff --git a/samoa-test/src/test/java/org/apache/samoa/TestParams.java b/samoa-test/src/test/java/org/apache/samoa/TestParams.java
index 0d9d6393..615d4da0 100644
--- a/samoa-test/src/test/java/org/apache/samoa/TestParams.java
+++ b/samoa-test/src/test/java/org/apache/samoa/TestParams.java
@@ -36,18 +36,18 @@ public static class Templates {
 
     public final static String PREQEVAL_VHT_RANDOMTREE = "PrequentialEvaluation -d %s -i %d -f %d -w %d "
         + "-l (org.apache.samoa.learners.classifiers.trees.VerticalHoeffdingTree -p 4) " +
-        "-s (org.apache.samoa.moa.streams.generators.RandomTreeGenerator -c 2 -o 10 -u 10)";
+        "-s (org.apache.samoa.streams.generators.RandomTreeGenerator -c 2 -o 10 -u 10)";
 
     public final static String PREQEVAL_NAIVEBAYES_HYPERPLANE = "PrequentialEvaluation -d %s -i %d -f %d -w %d "
         + "-l (classifiers.SingleClassifier -l org.apache.samoa.learners.classifiers.NaiveBayes) " +
-        "-s (org.apache.samoa.moa.streams.generators.HyperplaneGenerator -c 2)";
+        "-s (org.apache.samoa.streams.generators.HyperplaneGenerator -c 2)";
 
     // setting the number of nominal attributes to zero significantly reduces
     // the processing time,
     // so that it's acceptable in a test case
     public final static String PREQEVAL_BAGGING_RANDOMTREE = "PrequentialEvaluation -d %s -i %d -f %d -w %d "
         + "-l (org.apache.samoa.learners.classifiers.ensemble.Bagging) " +
-        "-s (org.apache.samoa.moa.streams.generators.RandomTreeGenerator -c 2 -o 0 -u 10)";
+        "-s (org.apache.samoa.streams.generators.RandomTreeGenerator -c 2 -o 0 -u 10)";
 
   }