diff --git a/pom.xml b/pom.xml
index 0d75448dc3a08d84cdc0c4cb86cf7ba3e2454596..bb705a5fac088805528f1aaade62665ad7deba4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,19 +27,16 @@
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>4.11</version>
-			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
 			<artifactId>hamcrest-core</artifactId>
 			<version>1.3</version>
-			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
 			<artifactId>hamcrest-library</artifactId>
 			<version>1.3</version>
-			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>net.kieker-monitoring</groupId>
diff --git a/src/test/java/util/MeasurementRepository.java b/src/main/java/util/MeasurementRepository.java
similarity index 100%
rename from src/test/java/util/MeasurementRepository.java
rename to src/main/java/util/MeasurementRepository.java
diff --git a/src/test/java/util/PerformanceCheckProfile.java b/src/main/java/util/PerformanceCheckProfile.java
similarity index 100%
rename from src/test/java/util/PerformanceCheckProfile.java
rename to src/main/java/util/PerformanceCheckProfile.java
diff --git a/src/test/java/util/PerformanceCheckProfileRepository.java b/src/main/java/util/PerformanceCheckProfileRepository.java
similarity index 100%
rename from src/test/java/util/PerformanceCheckProfileRepository.java
rename to src/main/java/util/PerformanceCheckProfileRepository.java
diff --git a/src/test/java/util/PerformanceResult.java b/src/main/java/util/PerformanceResult.java
similarity index 100%
rename from src/test/java/util/PerformanceResult.java
rename to src/main/java/util/PerformanceResult.java
diff --git a/src/test/java/util/PerformanceTest.java b/src/main/java/util/PerformanceTest.java
similarity index 100%
rename from src/test/java/util/PerformanceTest.java
rename to src/main/java/util/PerformanceTest.java
diff --git a/src/test/java/util/StatisticsUtil.java b/src/main/java/util/StatisticsUtil.java
similarity index 100%
rename from src/test/java/util/StatisticsUtil.java
rename to src/main/java/util/StatisticsUtil.java
diff --git a/submodules/JCTools b/submodules/JCTools
index 88e1e25f9519b250258c7e5ada30935975ab2d10..75998aa20b7ec897ec321c1f94192de888f2dc6e 160000
--- a/submodules/JCTools
+++ b/submodules/JCTools
@@ -1 +1 @@
-Subproject commit 88e1e25f9519b250258c7e5ada30935975ab2d10
+Subproject commit 75998aa20b7ec897ec321c1f94192de888f2dc6e