diff --git a/src/main/java/lu/jpt/csparqltest/Main.java b/src/main/java/lu/jpt/csparqltest/Main.java
index af83f56..204abaa 100644
--- a/src/main/java/lu/jpt/csparqltest/Main.java
+++ b/src/main/java/lu/jpt/csparqltest/Main.java
@@ -10,8 +10,8 @@ import eu.larkc.csparql.core.engine.CsparqlEngine;
 import eu.larkc.csparql.core.engine.CsparqlEngineImpl;
 import eu.larkc.csparql.core.engine.CsparqlQueryResultProxy;
 import lu.jpt.csparqltest.gui.TextObserverWindow;
+import lu.jpt.csparqltest.misc.TestStreamGenerator;
 import lu.jpt.csparqltest.rentacar.RentACarSimulation;
-import lu.jpt.csparqltest.util.TestStreamGenerator;
 
 public class Main {
 
diff --git a/src/main/java/lu/jpt/csparqltest/util/TestStreamGenerator.java b/src/main/java/lu/jpt/csparqltest/misc/TestStreamGenerator.java
similarity index 89%
rename from src/main/java/lu/jpt/csparqltest/util/TestStreamGenerator.java
rename to src/main/java/lu/jpt/csparqltest/misc/TestStreamGenerator.java
index 672d5c0..c1cccc0 100644
--- a/src/main/java/lu/jpt/csparqltest/util/TestStreamGenerator.java
+++ b/src/main/java/lu/jpt/csparqltest/misc/TestStreamGenerator.java
@@ -1,9 +1,11 @@
-package lu.jpt.csparqltest.util;
+package lu.jpt.csparqltest.misc;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import eu.larkc.csparql.cep.api.RdfQuadruple;
+import lu.jpt.csparqltest.util.RandomHelper;
+import lu.jpt.csparqltest.util.WindowLoggingRdfStream;
 
 public class TestStreamGenerator extends WindowLoggingRdfStream implements Runnable {
 	protected final Logger logger = LoggerFactory.getLogger(TestStreamGenerator.class);