diff --git a/src/main/java/teetime/util/concurrent/queue/PCBlockingQueue.java b/src/main/java/teetime/util/concurrent/queue/PCBlockingQueue.java
index 262257c2d48069df60a44c76658b1ce177102f67..702ccc9e6ecb8fc146f5b222f587c1fa5c8a04a8 100644
--- a/src/main/java/teetime/util/concurrent/queue/PCBlockingQueue.java
+++ b/src/main/java/teetime/util/concurrent/queue/PCBlockingQueue.java
@@ -1,3 +1,18 @@
+/**
+ * Copyright (C) 2015 TeeTime (http://teetime.sourceforge.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package teetime.util.concurrent.queue;
 
 import java.util.Collection;
diff --git a/src/main/java/teetime/util/concurrent/queue/putstrategy/PutStrategy.java b/src/main/java/teetime/util/concurrent/queue/putstrategy/PutStrategy.java
index df20e0f48697e5dd8a48b84dd0ba74b5e30242a5..1c958b97c3aaf13f276a494faca756f3993a3221 100644
--- a/src/main/java/teetime/util/concurrent/queue/putstrategy/PutStrategy.java
+++ b/src/main/java/teetime/util/concurrent/queue/putstrategy/PutStrategy.java
@@ -1,3 +1,18 @@
+/**
+ * Copyright (C) 2015 TeeTime (http://teetime.sourceforge.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package teetime.util.concurrent.queue.putstrategy;
 
 import java.util.Queue;
diff --git a/src/main/java/teetime/util/concurrent/queue/putstrategy/YieldPutStrategy.java b/src/main/java/teetime/util/concurrent/queue/putstrategy/YieldPutStrategy.java
index a92a500064b9f01374bafc92b9478960ee1c2533..bef6afff82d6f570d208e1b7972d6964aa9e7ef1 100644
--- a/src/main/java/teetime/util/concurrent/queue/putstrategy/YieldPutStrategy.java
+++ b/src/main/java/teetime/util/concurrent/queue/putstrategy/YieldPutStrategy.java
@@ -1,3 +1,18 @@
+/**
+ * Copyright (C) 2015 TeeTime (http://teetime.sourceforge.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package teetime.util.concurrent.queue.putstrategy;
 
 import java.util.Queue;
diff --git a/src/main/java/teetime/util/concurrent/queue/takestrategy/SCParkTakeStrategy.java b/src/main/java/teetime/util/concurrent/queue/takestrategy/SCParkTakeStrategy.java
index 0b010ba95aa480874cb5d17aedc0a6c58963cb9e..7f42c039b7f21ab004dc217cb83313cffbd0ce48 100644
--- a/src/main/java/teetime/util/concurrent/queue/takestrategy/SCParkTakeStrategy.java
+++ b/src/main/java/teetime/util/concurrent/queue/takestrategy/SCParkTakeStrategy.java
@@ -1,3 +1,18 @@
+/**
+ * Copyright (C) 2015 TeeTime (http://teetime.sourceforge.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package teetime.util.concurrent.queue.takestrategy;
 
 import java.util.Queue;
diff --git a/src/main/java/teetime/util/concurrent/queue/takestrategy/TakeStrategy.java b/src/main/java/teetime/util/concurrent/queue/takestrategy/TakeStrategy.java
index f772f864bf946c60886c8069d95e1a5a70d84484..4f2a2096e376de963ae92d85a7ddc72a0f81d747 100644
--- a/src/main/java/teetime/util/concurrent/queue/takestrategy/TakeStrategy.java
+++ b/src/main/java/teetime/util/concurrent/queue/takestrategy/TakeStrategy.java
@@ -1,3 +1,18 @@
+/**
+ * Copyright (C) 2015 TeeTime (http://teetime.sourceforge.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package teetime.util.concurrent.queue.takestrategy;
 
 import java.util.Queue;
diff --git a/src/main/java/teetime/util/concurrent/queue/takestrategy/YieldTakeStrategy.java b/src/main/java/teetime/util/concurrent/queue/takestrategy/YieldTakeStrategy.java
index 00377facc9a76677b5c8dca6b7cec9963055e488..28b19de4b5f52a72cac654a9e65ae8f1e41f7496 100644
--- a/src/main/java/teetime/util/concurrent/queue/takestrategy/YieldTakeStrategy.java
+++ b/src/main/java/teetime/util/concurrent/queue/takestrategy/YieldTakeStrategy.java
@@ -1,3 +1,18 @@
+/**
+ * Copyright (C) 2015 TeeTime (http://teetime.sourceforge.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package teetime.util.concurrent.queue.takestrategy;
 
 import java.util.Queue;
diff --git a/src/test/java/util/test/eval/BucketTimingsReader.java b/src/main/java/teetime/util/test/eval/BucketTimingsReader.java
similarity index 98%
rename from src/test/java/util/test/eval/BucketTimingsReader.java
rename to src/main/java/teetime/util/test/eval/BucketTimingsReader.java
index d6e509924c6eabad0ab4f87c2ad16d35d5bade39..df90e66e46c470d26d00a6767d4f755102da67f0 100644
--- a/src/test/java/util/test/eval/BucketTimingsReader.java
+++ b/src/main/java/teetime/util/test/eval/BucketTimingsReader.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package util.test.eval;
+package teetime.util.test.eval;
 
 import java.io.BufferedReader;
 import java.io.File;
diff --git a/src/main/java/teetime/util/MathUtil.java b/src/main/java/teetime/util/test/eval/MathUtil.java
similarity index 97%
rename from src/main/java/teetime/util/MathUtil.java
rename to src/main/java/teetime/util/test/eval/MathUtil.java
index b665faa746dacb3c79a4726bfd903eab680107d6..410a85eafab2f89394ec084a862250899a775b18 100644
--- a/src/main/java/teetime/util/MathUtil.java
+++ b/src/main/java/teetime/util/test/eval/MathUtil.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package teetime.util;
+package teetime.util.test.eval;
 
 import java.util.List;
 
diff --git a/src/test/java/util/test/PerformanceResult.java b/src/main/java/teetime/util/test/eval/PerformanceResult.java
similarity index 96%
rename from src/test/java/util/test/PerformanceResult.java
rename to src/main/java/teetime/util/test/eval/PerformanceResult.java
index 5008db70274914435aaf0346af60300191953a86..5c8d05d8143ba7b13b71fee3279c9fa281e3a4f1 100644
--- a/src/test/java/util/test/PerformanceResult.java
+++ b/src/main/java/teetime/util/test/eval/PerformanceResult.java
@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package util.test;
+package teetime.util.test.eval;
 
 import java.util.Map;
 
-import util.test.eval.StatisticsUtil;
-
 public class PerformanceResult {
 
 	public long overallDurationInNs;
diff --git a/src/test/java/util/test/eval/StatisticsUtil.java b/src/main/java/teetime/util/test/eval/StatisticsUtil.java
similarity index 97%
rename from src/test/java/util/test/eval/StatisticsUtil.java
rename to src/main/java/teetime/util/test/eval/StatisticsUtil.java
index e4cb08e9a3a59687278be80abf6c34b347665dcf..48711f1a3b914198f77e6dfeeac70a7f57189c2d 100644
--- a/src/test/java/util/test/eval/StatisticsUtil.java
+++ b/src/main/java/teetime/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.eval;
+package teetime.util.test.eval;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -24,9 +24,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 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/examples/ChwHomeComparisonMethodcallWithPorts.java b/src/performancetest/java/teetime/examples/ChwHomeComparisonMethodcallWithPorts.java
index 7efe6aeac616b240e445c0acd2ec904aa38fc960..3bb9e58cd4e9796a242e8ce4c39a6b32d7e43959 100644
--- a/src/performancetest/java/teetime/examples/ChwHomeComparisonMethodcallWithPorts.java
+++ b/src/performancetest/java/teetime/examples/ChwHomeComparisonMethodcallWithPorts.java
@@ -20,8 +20,8 @@ import static org.junit.Assert.assertEquals;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import teetime.util.test.eval.PerformanceResult;
 import util.test.AbstractProfiledPerformanceAssertion;
-import util.test.PerformanceResult;
 import util.test.PerformanceTest;
 
 public class ChwHomeComparisonMethodcallWithPorts extends AbstractProfiledPerformanceAssertion {
diff --git a/src/performancetest/java/teetime/examples/ChwWorkComparisonMethodcallWithPorts.java b/src/performancetest/java/teetime/examples/ChwWorkComparisonMethodcallWithPorts.java
index 4f7387aab04a2eb7b4f2f022d073edd29697b2c8..d65e58f59c433bd527fe18a637dc50b0fc9c6f3b 100644
--- a/src/performancetest/java/teetime/examples/ChwWorkComparisonMethodcallWithPorts.java
+++ b/src/performancetest/java/teetime/examples/ChwWorkComparisonMethodcallWithPorts.java
@@ -20,8 +20,8 @@ import static org.junit.Assert.assertEquals;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import teetime.util.test.eval.PerformanceResult;
 import util.test.AbstractProfiledPerformanceAssertion;
-import util.test.PerformanceResult;
 import util.test.PerformanceTest;
 
 public class ChwWorkComparisonMethodcallWithPorts extends AbstractProfiledPerformanceAssertion {
diff --git a/src/performancetest/java/teetime/examples/NieWorkComparisonMethodcallWithPorts.java b/src/performancetest/java/teetime/examples/NieWorkComparisonMethodcallWithPorts.java
index 6e93bef0d9f295875c20b5d0ef6c930d4bae3b30..7216f1916b52bd2faaab21a1ed306c8bc8d2c329 100644
--- a/src/performancetest/java/teetime/examples/NieWorkComparisonMethodcallWithPorts.java
+++ b/src/performancetest/java/teetime/examples/NieWorkComparisonMethodcallWithPorts.java
@@ -20,8 +20,8 @@ import static org.junit.Assert.assertEquals;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import teetime.util.test.eval.PerformanceResult;
 import util.test.AbstractProfiledPerformanceAssertion;
-import util.test.PerformanceResult;
 import util.test.PerformanceTest;
 
 public class NieWorkComparisonMethodcallWithPorts extends AbstractProfiledPerformanceAssertion {
diff --git a/src/performancetest/java/teetime/examples/experiment01/ChwHomePerformanceCheck.java b/src/performancetest/java/teetime/examples/experiment01/ChwHomePerformanceCheck.java
index 3ac4a900fb5f188bff90a6210cdd3e4a17d9a080..9944e2c2be7ade243cd37821c95266fcf337456a 100644
--- a/src/performancetest/java/teetime/examples/experiment01/ChwHomePerformanceCheck.java
+++ b/src/performancetest/java/teetime/examples/experiment01/ChwHomePerformanceCheck.java
@@ -17,8 +17,8 @@ package teetime.examples.experiment01;
 
 import static org.junit.Assert.assertEquals;
 import teetime.examples.HostName;
+import teetime.util.test.eval.PerformanceResult;
 import util.test.AbstractProfiledPerformanceAssertion;
-import util.test.PerformanceResult;
 import util.test.PerformanceTest;
 
 class ChwHomePerformanceCheck extends AbstractProfiledPerformanceAssertion {
diff --git a/src/performancetest/java/teetime/examples/experiment01/ChwWorkPerformanceCheck.java b/src/performancetest/java/teetime/examples/experiment01/ChwWorkPerformanceCheck.java
index efe7f9e5f9d5822e437b0065136008458e6de831..6c7a37bb07ea43b72abfce361e74eedf3398b964 100644
--- a/src/performancetest/java/teetime/examples/experiment01/ChwWorkPerformanceCheck.java
+++ b/src/performancetest/java/teetime/examples/experiment01/ChwWorkPerformanceCheck.java
@@ -16,7 +16,7 @@
 package teetime.examples.experiment01;
 
 import static org.junit.Assert.assertEquals;
-import util.test.PerformanceResult;
+import teetime.util.test.eval.PerformanceResult;
 import util.test.PerformanceTest;
 import util.test.AbstractProfiledPerformanceAssertion;
 
diff --git a/src/performancetest/java/teetime/examples/experiment09pipeimpls/AbstractPerformanceCheck.java b/src/performancetest/java/teetime/examples/experiment09pipeimpls/AbstractPerformanceCheck.java
index 3a8b3f5d4bc16927349182357f1f013ed117894b..8f7eb29bba0b95ceb5d857e3f61bf9d1580d7f1c 100644
--- a/src/performancetest/java/teetime/examples/experiment09pipeimpls/AbstractPerformanceCheck.java
+++ b/src/performancetest/java/teetime/examples/experiment09pipeimpls/AbstractPerformanceCheck.java
@@ -16,9 +16,9 @@
 package teetime.examples.experiment09pipeimpls;
 
 import teetime.examples.experiment01.MethodCallThoughputTimestampAnalysis1Test;
+import teetime.util.test.eval.PerformanceResult;
 import util.test.AbstractProfiledPerformanceAssertion;
 import util.test.MeasurementRepository;
-import util.test.PerformanceResult;
 import util.test.PerformanceTest;
 
 abstract class AbstractPerformanceCheck extends AbstractProfiledPerformanceAssertion {
diff --git a/src/performancetest/java/teetime/examples/experiment11/ChwHomePerformanceCheck.java b/src/performancetest/java/teetime/examples/experiment11/ChwHomePerformanceCheck.java
index 1a566d22abdc226ea8a2e12a6118f061211c8c96..e0a0864496c87e8200b9209e7d66ca797f95087e 100644
--- a/src/performancetest/java/teetime/examples/experiment11/ChwHomePerformanceCheck.java
+++ b/src/performancetest/java/teetime/examples/experiment11/ChwHomePerformanceCheck.java
@@ -17,8 +17,8 @@ package teetime.examples.experiment11;
 
 import static org.junit.Assert.assertEquals;
 import teetime.examples.HostName;
+import teetime.util.test.eval.PerformanceResult;
 import util.test.AbstractProfiledPerformanceAssertion;
-import util.test.PerformanceResult;
 import util.test.PerformanceTest;
 
 class ChwHomePerformanceCheck extends AbstractProfiledPerformanceAssertion {
diff --git a/src/performancetest/java/teetime/examples/experiment11/ChwWorkPerformanceCheck.java b/src/performancetest/java/teetime/examples/experiment11/ChwWorkPerformanceCheck.java
index 5bb3d871785bdacd6f8834bb5396b87d555d5ab2..f20539b6e24a0e36dad90d6d7a9cd07425fad3e9 100644
--- a/src/performancetest/java/teetime/examples/experiment11/ChwWorkPerformanceCheck.java
+++ b/src/performancetest/java/teetime/examples/experiment11/ChwWorkPerformanceCheck.java
@@ -16,7 +16,7 @@
 package teetime.examples.experiment11;
 
 import static org.junit.Assert.assertEquals;
-import util.test.PerformanceResult;
+import teetime.util.test.eval.PerformanceResult;
 import util.test.PerformanceTest;
 import util.test.AbstractProfiledPerformanceAssertion;
 
diff --git a/src/performancetest/java/teetime/examples/experiment16/ChwHomePerformanceCheck.java b/src/performancetest/java/teetime/examples/experiment16/ChwHomePerformanceCheck.java
index fe49d8ed69023b2546d1508b5093165a61d1fefb..a21b243bf173ac5041d8724afe99a6f1bc8dede7 100644
--- a/src/performancetest/java/teetime/examples/experiment16/ChwHomePerformanceCheck.java
+++ b/src/performancetest/java/teetime/examples/experiment16/ChwHomePerformanceCheck.java
@@ -17,8 +17,8 @@ package teetime.examples.experiment16;
 
 import static org.junit.Assert.assertEquals;
 import teetime.examples.HostName;
+import teetime.util.test.eval.PerformanceResult;
 import util.test.AbstractProfiledPerformanceAssertion;
-import util.test.PerformanceResult;
 import util.test.PerformanceTest;
 
 class ChwHomePerformanceCheck extends AbstractProfiledPerformanceAssertion {
diff --git a/src/performancetest/java/teetime/examples/experiment16/ChwWorkPerformanceCheck.java b/src/performancetest/java/teetime/examples/experiment16/ChwWorkPerformanceCheck.java
index 70486997d3a7e61c12f334a8ce79d443947a6de5..c9c07e70add55ee979112f01846f5991eda82b7a 100644
--- a/src/performancetest/java/teetime/examples/experiment16/ChwWorkPerformanceCheck.java
+++ b/src/performancetest/java/teetime/examples/experiment16/ChwWorkPerformanceCheck.java
@@ -16,8 +16,8 @@
 package teetime.examples.experiment16;
 
 import static org.junit.Assert.assertEquals;
+import teetime.util.test.eval.PerformanceResult;
 import util.test.AbstractProfiledPerformanceAssertion;
-import util.test.PerformanceResult;
 import util.test.PerformanceTest;
 
 class ChwWorkPerformanceCheck extends AbstractProfiledPerformanceAssertion {
diff --git a/src/performancetest/java/teetime/util/StopWatchTest.java b/src/performancetest/java/teetime/util/StopWatchTest.java
index 4f74ebfc692375301413a5c9c811af36344a69ce..5bbb8a0789dd8d55a0f3adbf7acaa28ec032073f 100644
--- a/src/performancetest/java/teetime/util/StopWatchTest.java
+++ b/src/performancetest/java/teetime/util/StopWatchTest.java
@@ -22,7 +22,7 @@ import java.util.Map;
 
 import org.junit.Test;
 
-import util.test.eval.StatisticsUtil;
+import teetime.util.test.eval.StatisticsUtil;
 
 public class StopWatchTest {
 
diff --git a/src/test/java/teetime/framework/RunnableConsumerStageTestConfiguration.java b/src/test/java/teetime/framework/RunnableConsumerStageTestConfiguration.java
index 0631e81b6f6015de3670b0eb0aab8369f46f2738..71769300a748b81d1a7e9fc8d817bcacebda9c20 100644
--- a/src/test/java/teetime/framework/RunnableConsumerStageTestConfiguration.java
+++ b/src/test/java/teetime/framework/RunnableConsumerStageTestConfiguration.java
@@ -1,3 +1,18 @@
+/**
+ * Copyright (C) 2015 TeeTime (http://teetime.sourceforge.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package teetime.framework;
 
 import java.util.ArrayList;
diff --git a/src/test/java/util/test/MeasurementRepository.java b/src/test/java/util/test/MeasurementRepository.java
index 484f84643797c18c9371c584bfe8705a453bb760..0c01463da3d8ab2f7b44a72fe67cd447c7248db8 100644
--- a/src/test/java/util/test/MeasurementRepository.java
+++ b/src/test/java/util/test/MeasurementRepository.java
@@ -18,6 +18,8 @@ package util.test;
 import java.util.HashMap;
 import java.util.Map;
 
+import teetime.util.test.eval.PerformanceResult;
+
 public class MeasurementRepository {
 
 	public final Map<String, PerformanceResult> performanceResults = new HashMap<String, PerformanceResult>();
diff --git a/src/test/java/util/test/PerformanceTest.java b/src/test/java/util/test/PerformanceTest.java
index 698152b5776dafdd2cf854c262cf8a100a3c0f62..59ff3ba6e456a3ab5f9753aa65c2d68a2fb16259 100644
--- a/src/test/java/util/test/PerformanceTest.java
+++ b/src/test/java/util/test/PerformanceTest.java
@@ -28,7 +28,8 @@ import org.junit.runner.Description;
 
 import teetime.util.StopWatch;
 import teetime.util.TimestampObject;
-import util.test.eval.StatisticsUtil;
+import teetime.util.test.eval.PerformanceResult;
+import teetime.util.test.eval.StatisticsUtil;
 
 public abstract class PerformanceTest {