diff --git a/src/lu/jpt/csparqltest/Main.java b/src/lu/jpt/csparqltest/Main.java
index f24ede7..592cb79 100644
--- a/src/lu/jpt/csparqltest/Main.java
+++ b/src/lu/jpt/csparqltest/Main.java
@@ -10,6 +10,7 @@ import eu.larkc.csparql.core.engine.ConsoleFormatter;
 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.carexample.CarStreamGenerator;
 
 public class Main {
 
@@ -49,9 +50,9 @@ public class Main {
 		// Add ConsoleFormatter as observer so it gets notified of every query result
 		resultProxy.addObserver(new ConsoleFormatter());
 		
-		// Let it all run for a couple of seconds
+		// Let it all run for a couple of seconds (3 min, 20 seconds)
 		try {
-			Thread.sleep(200000);
+			Thread.sleep(10000);
 		} catch (InterruptedException e) {
 			logger.error(e.getMessage(), e);
 		}
diff --git a/src/lu/jpt/csparqltest/CarStreamGenerator.java b/src/lu/jpt/csparqltest/carexample/CarStreamGenerator.java
similarity index 96%
rename from src/lu/jpt/csparqltest/CarStreamGenerator.java
rename to src/lu/jpt/csparqltest/carexample/CarStreamGenerator.java
index 33cf277..03c4699 100644
--- a/src/lu/jpt/csparqltest/CarStreamGenerator.java
+++ b/src/lu/jpt/csparqltest/carexample/CarStreamGenerator.java
@@ -1,4 +1,4 @@
-package lu.jpt.csparqltest;
+package lu.jpt.csparqltest.carexample;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;