diff --git a/src/main/java/util/MooBenchStarter.java b/src/main/java/util/MooBenchStarter.java
deleted file mode 100644
index 6d2253022d0d7df3a5fd2769eba517199764038d..0000000000000000000000000000000000000000
--- a/src/main/java/util/MooBenchStarter.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package util;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.List;
-
-public class MooBenchStarter {
-
-	private final File execDir;
-
-	public MooBenchStarter() {
-		this.execDir = new File("scripts/MooBench-cmd");
-		System.out.println("execDir: " + this.execDir.getAbsolutePath());
-	}
-
-	public void start(final int runs, final long calls) throws IOException {
-		final List<String> command = new LinkedList<String>();
-		command.add("cmd");
-		command.add("/c");
-		command.add("start");
-		command.add("/D");
-		command.add(this.execDir.getAbsolutePath());
-		command.add("Load Driver");
-		command.add("startMooBench.cmd");
-		command.add(String.valueOf(runs));
-		command.add(String.valueOf(calls));
-
-		new ProcessBuilder(command).start();
-	}
-}
diff --git a/src/main/java/util/test/PerformanceResult.java b/src/main/java/util/test/PerformanceResult.java
index d6d77a6c0d0da014bd1d7c4637cbeaa9531e2aec..e852dce947b1b2531db723c986545668d1f61202 100644
--- a/src/main/java/util/test/PerformanceResult.java
+++ b/src/main/java/util/test/PerformanceResult.java
@@ -2,6 +2,8 @@ package util.test;
 
 import java.util.Map;
 
+import util.test.eval.StatisticsUtil;
+
 public class PerformanceResult {
 
 	public long overallDurationInNs;
diff --git a/src/main/java/util/BucketTimingsReader.java b/src/main/java/util/test/eval/BucketTimingsReader.java
similarity index 97%
rename from src/main/java/util/BucketTimingsReader.java
rename to src/main/java/util/test/eval/BucketTimingsReader.java
index 0efdfe65e9abf67179a5905c94c4894dfcab5843..9b17b9731bd17ae43edc0d7222955e79c8a6f5ae 100644
--- a/src/main/java/util/BucketTimingsReader.java
+++ b/src/main/java/util/test/eval/BucketTimingsReader.java
@@ -1,4 +1,4 @@
-package util;
+package util.test.eval;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -11,8 +11,6 @@ import java.util.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import util.test.StatisticsUtil;
-
 import com.google.common.base.Charsets;
 import com.google.common.io.CharSource;
 import com.google.common.io.Files;
diff --git a/src/main/java/util/test/StatisticsUtil.java b/src/main/java/util/test/eval/StatisticsUtil.java
similarity index 98%
rename from src/main/java/util/test/StatisticsUtil.java
rename to src/main/java/util/test/eval/StatisticsUtil.java
index 26a9bc35b3d1b6ade2c38fffe1296bb28579afb4..0f30e96be261a75d62f299fc807bc91cb4f06c99 100644
--- a/src/main/java/util/test/StatisticsUtil.java
+++ b/src/main/java/util/test/eval/StatisticsUtil.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-package util.test;
+package util.test.eval;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -26,6 +26,7 @@ import java.util.concurrent.TimeUnit;
 
 import teetime.util.MathUtil;
 import teetime.util.TimestampObject;
+import util.test.PerformanceResult;
 
 /**
  * @author Christian Wulf
diff --git a/src/performancetest/java/teetime/util/StopWatchTest.java b/src/performancetest/java/teetime/util/StopWatchTest.java
index 5c0a6a0d721e27e2c44694115ce2b40576e27ec3..e7ad6ec973e556e6ec229c9c7ee6807af5b49ee5 100644
--- a/src/performancetest/java/teetime/util/StopWatchTest.java
+++ b/src/performancetest/java/teetime/util/StopWatchTest.java
@@ -7,7 +7,7 @@ import java.util.Map;
 
 import org.junit.Test;
 
-import util.test.StatisticsUtil;
+import util.test.eval.StatisticsUtil;
 
 public class StopWatchTest {
 
diff --git a/src/test/java/util/test/PerformanceTest.java b/src/test/java/util/test/PerformanceTest.java
index 031b4f62052ce12de8d16c146c461c4926abdbcc..7a4b0895cbababddf7e3556738e0e4d2f6e6ab1c 100644
--- a/src/test/java/util/test/PerformanceTest.java
+++ b/src/test/java/util/test/PerformanceTest.java
@@ -13,6 +13,7 @@ import org.junit.runner.Description;
 
 import teetime.util.StopWatch;
 import teetime.util.TimestampObject;
+import util.test.eval.StatisticsUtil;
 
 public abstract class PerformanceTest {