diff --git a/CHANGELOG.md b/CHANGELOG.md
index 087a7e9dadd41d05bc5c09c4e3101e9cc53bfeb9..a0e7f5e2ff185c2372459c0852f75ef668bcb307 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 Upcoming version:
 -----------------
+  - moved some packages (Nikolaus Krismer)
   - fixed invalid config for vienna (Nikolaus Krismer)
   - fixing broken tests; adding paackage it.unibz.inf.isochrone.algorithm.tile (Nikolaus Krismer)
   - fixed some findbugs warnings (Nikolaus Krismer)
diff --git a/src/performance/java/it/unibz/inf/isochrone/algorithm/queue/QueueTypeTest.java b/src/performance/java/it/unibz/inf/isochrone/algorithm/queue/QueueTypeTest.java
index 95e9465f1731866d5b507eabab5577bab030cd79..1f953dd7ada232fafd63b16fe19c664e58eaf00e 100644
--- a/src/performance/java/it/unibz/inf/isochrone/algorithm/queue/QueueTypeTest.java
+++ b/src/performance/java/it/unibz/inf/isochrone/algorithm/queue/QueueTypeTest.java
@@ -1,4 +1,4 @@
-package it.unibz.inf.isochrone.algorithm;
+package it.unibz.inf.isochrone.algorithm.queue;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -17,9 +17,8 @@ import it.unibz.inf.isochrone.ConfigAlgorithmHelper;
 import it.unibz.inf.isochrone.ListenerLogging;
 import it.unibz.inf.isochrone.ListenerSetup;
 import it.unibz.inf.isochrone.SampleHelper;
-import it.unibz.inf.isochrone.TestConfiguration;
 import it.unibz.inf.isochrone.TestHelper;
-import it.unibz.inf.isochrone.algorithm.queue.QueueType;
+import it.unibz.inf.isochrone.algorithm.Algorithm;
 import it.unibz.inf.isochrone.config.ConfigAlgorithm.ConfigAlgorithmBuilder;
 import it.unibz.inf.isochrone.plot.sample.SamplePlotter;
 import it.unibz.inf.isochrone.plot.sample.SampleProperty;
@@ -27,14 +26,14 @@ import it.unibz.inf.isochrone.plot.sample.SampleRunner;
 import it.unibz.inf.isochrone.plot.sample.SampleRunner.SampleRunnerBuilder;
 
 /**
- * Sophisticated performance test that executes each algorithm
- * and computes different isochrones multiple times.
+ * Performance tests for the different types of priority queues.
  */
 @Listeners({ListenerSetup.class, ListenerLogging.class})
 public class QueueTypeTest {
 	// General properties
 	private static final Logger LOGGER = LogManager.getLogger(QueueTypeTest.class);
-	private static final int REPEAT_COUNT = TestConfiguration.DEFAULT_REPEAT_COUNT;
+	// TODO: Reset me!
+	private static final int REPEAT_COUNT = 1;//TestConfiguration.DEFAULT_REPEAT_COUNT;
 	private static final String RESULTFILE_NAME = "build/reports/performanceTests/algorithm-queueType";
 	private static final SampleProperty SAMPLE_PROPERTY = SampleProperty.RUNTIME;
 	private final Collection<SampleRunner> sampleRunners;
diff --git a/src/performance/java/it/unibz/inf/isochrone/algorithm/tile/TileInformationTest.java b/src/performance/java/it/unibz/inf/isochrone/algorithm/tile/TileInformationTest.java
index ef040a9b28443f855e7f0ecb6c6fc40db452a6b1..52f8915d42d1739876020ff4700b3c2cc386dfca 100644
--- a/src/performance/java/it/unibz/inf/isochrone/algorithm/tile/TileInformationTest.java
+++ b/src/performance/java/it/unibz/inf/isochrone/algorithm/tile/TileInformationTest.java
@@ -1,4 +1,4 @@
-package it.unibz.inf.isochrone.algorithm;
+package it.unibz.inf.isochrone.algorithm.tile;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -17,6 +17,7 @@ import it.unibz.inf.isochrone.ListenerSetup;
 import it.unibz.inf.isochrone.SampleHelper;
 import it.unibz.inf.isochrone.TestConfiguration;
 import it.unibz.inf.isochrone.TestHelper;
+import it.unibz.inf.isochrone.algorithm.Algorithm;
 import it.unibz.inf.isochrone.plot.sample.SamplePlotter;
 import it.unibz.inf.isochrone.plot.sample.SampleProperty;
 import it.unibz.inf.isochrone.plot.sample.SampleRunner;
diff --git a/src/performance/java/it/unibz/inf/isochrone/algorithm/tile/TileSizeTest.java b/src/performance/java/it/unibz/inf/isochrone/algorithm/tile/TileSizeTest.java
index 349450eff8627761fb43815781f3c8ead1991626..e9281f8da234b4feed0b2dd6d09769dd4f6b733e 100644
--- a/src/performance/java/it/unibz/inf/isochrone/algorithm/tile/TileSizeTest.java
+++ b/src/performance/java/it/unibz/inf/isochrone/algorithm/tile/TileSizeTest.java
@@ -1,4 +1,4 @@
-package it.unibz.inf.isochrone.algorithm;
+package it.unibz.inf.isochrone.algorithm.tile;
 
 import java.awt.geom.Line2D;
 import java.awt.geom.Point2D;
@@ -29,7 +29,8 @@ import it.unibz.inf.isochrone.ListenerSetup;
 import it.unibz.inf.isochrone.MathHelper;
 import it.unibz.inf.isochrone.SampleHelper;
 import it.unibz.inf.isochrone.TestHelper;
-import it.unibz.inf.isochrone.algorithm.tile.ZoomInformation;
+import it.unibz.inf.isochrone.algorithm.Algorithm;
+import it.unibz.inf.isochrone.algorithm.Mine;
 import it.unibz.inf.isochrone.plot.AbstractPlotter.SampleType;
 import it.unibz.inf.isochrone.plot.BestAdaptivePlotter;
 import it.unibz.inf.isochrone.plot.sample.SampleInformation;