diff --git a/common/source/java/ch/systemsx/cisd/common/collections/CollectionStyle.java b/common/source/java/ch/systemsx/cisd/common/collections/CollectionStyle.java
index ea072da2f65ffb3554536314f99f5fc8413692eb..5155e4792f2b665bcb45df4e75d2e6016120eed5 100644
--- a/common/source/java/ch/systemsx/cisd/common/collections/CollectionStyle.java
+++ b/common/source/java/ch/systemsx/cisd/common/collections/CollectionStyle.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2008 ETH Zuerich, CISD
+ *
+ * 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 ch.systemsx.cisd.common.collections;
 
 /**
diff --git a/common/source/java/ch/systemsx/cisd/common/logging/LogLevel.java b/common/source/java/ch/systemsx/cisd/common/logging/LogLevel.java
index efc86d649282c22ecca919851f5ec4d97c6cbdc4..7e92733d2f8e8eaf8726121bfff4db6a0bf0ca07 100644
--- a/common/source/java/ch/systemsx/cisd/common/logging/LogLevel.java
+++ b/common/source/java/ch/systemsx/cisd/common/logging/LogLevel.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2008 ETH Zuerich, CISD
+ *
+ * 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 ch.systemsx.cisd.common.logging;
 
 /**
diff --git a/common/source/java/ch/systemsx/cisd/common/parser/DefaultLineTokenizer.java b/common/source/java/ch/systemsx/cisd/common/parser/DefaultLineTokenizer.java
index 669161345b8330c20d6f860a5894077eec5b9c13..4ceb0c5a59e2a63e3a71b95a3669863c9cd2102f 100644
--- a/common/source/java/ch/systemsx/cisd/common/parser/DefaultLineTokenizer.java
+++ b/common/source/java/ch/systemsx/cisd/common/parser/DefaultLineTokenizer.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2007 ETH Zuerich, CISD
+ *
+ * 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 ch.systemsx.cisd.common.parser;
 
 import java.util.EnumMap;
diff --git a/common/source/java/ch/systemsx/cisd/common/parser/HeaderLineFilter.java b/common/source/java/ch/systemsx/cisd/common/parser/HeaderLineFilter.java
index 6b3d0b08adf3de9ca9a0f4aea013dc6813caf306..77fdb325a744ab46d024bb5170e6a0f090048ce2 100644
--- a/common/source/java/ch/systemsx/cisd/common/parser/HeaderLineFilter.java
+++ b/common/source/java/ch/systemsx/cisd/common/parser/HeaderLineFilter.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2007 ETH Zuerich, CISD
+ *
+ * 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 ch.systemsx.cisd.common.parser;
 
 import ch.systemsx.cisd.common.parser.filter.ExcludeEmptyAndCommentLineFilter;
diff --git a/common/source/java/ch/systemsx/cisd/common/parser/Line.java b/common/source/java/ch/systemsx/cisd/common/parser/Line.java
index 332b4086fde5a6e695897e562138fb224eabdd74..8dc1066ac95938bf6c71b919ea471989a3f47ad2 100644
--- a/common/source/java/ch/systemsx/cisd/common/parser/Line.java
+++ b/common/source/java/ch/systemsx/cisd/common/parser/Line.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2008 ETH Zuerich, CISD
+ *
+ * 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 ch.systemsx.cisd.common.parser;
 
 /**
diff --git a/common/source/java/ch/systemsx/cisd/common/parser/MappedProperty.java b/common/source/java/ch/systemsx/cisd/common/parser/MappedProperty.java
index eccd5604922eec2b820f648675d7ca798bc65191..e1f679dfb31bdc5eabd87154270e8bbce5601a90 100644
--- a/common/source/java/ch/systemsx/cisd/common/parser/MappedProperty.java
+++ b/common/source/java/ch/systemsx/cisd/common/parser/MappedProperty.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2007 ETH Zuerich, CISD
+ *
+ * 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 ch.systemsx.cisd.common.parser;
 
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/common/source/java/ch/systemsx/cisd/common/parser/filter/AlwaysAcceptLineFilter.java b/common/source/java/ch/systemsx/cisd/common/parser/filter/AlwaysAcceptLineFilter.java
index 7ebf9129639557af23b6b4c2f694f45a788fceca..6b9a72647b14c0805e295b9ad1da7dfc089b3342 100644
--- a/common/source/java/ch/systemsx/cisd/common/parser/filter/AlwaysAcceptLineFilter.java
+++ b/common/source/java/ch/systemsx/cisd/common/parser/filter/AlwaysAcceptLineFilter.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2007 ETH Zuerich, CISD
+ *
+ * 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 ch.systemsx.cisd.common.parser.filter;
 
 /**
diff --git a/common/source/java/ch/systemsx/cisd/common/parser/filter/ExcludeEmptyAndCommentLineFilter.java b/common/source/java/ch/systemsx/cisd/common/parser/filter/ExcludeEmptyAndCommentLineFilter.java
index b0c16d27d0c836b46f123c77bca0e79fc1b09123..193f17aa7e59e36cd1f75e038ce357312259350f 100644
--- a/common/source/java/ch/systemsx/cisd/common/parser/filter/ExcludeEmptyAndCommentLineFilter.java
+++ b/common/source/java/ch/systemsx/cisd/common/parser/filter/ExcludeEmptyAndCommentLineFilter.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2007 ETH Zuerich, CISD
+ *
+ * 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 ch.systemsx.cisd.common.parser.filter;
 
 /**
diff --git a/common/source/java/ch/systemsx/cisd/common/process/ProcessResult.java b/common/source/java/ch/systemsx/cisd/common/process/ProcessResult.java
index a0a72e0d231eaa3434b0cebee62f3b6753277fba..06cf63111cc70a6dcf80ad17036093280dae05cd 100644
--- a/common/source/java/ch/systemsx/cisd/common/process/ProcessResult.java
+++ b/common/source/java/ch/systemsx/cisd/common/process/ProcessResult.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2007 ETH Zuerich, CISD
+ *
+ * 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 ch.systemsx.cisd.common.process;
 
 import java.io.File;
diff --git a/common/source/java/ch/systemsx/cisd/common/test/EqualsHashCodeTestCase.java b/common/source/java/ch/systemsx/cisd/common/test/EqualsHashCodeTestCase.java
index 9653b63b53a485dc994189bb1d2c0997f137f5e9..484f96462fb1caeb7bec2c5934595ef53f6ba16d 100644
--- a/common/source/java/ch/systemsx/cisd/common/test/EqualsHashCodeTestCase.java
+++ b/common/source/java/ch/systemsx/cisd/common/test/EqualsHashCodeTestCase.java
@@ -1,8 +1,8 @@
 /*
- * The JUnit-addons Software License, Version 1.0
- *     (based on the Apache Software License, Version 1.1)
+ * Copyright 2002-2003 Vladimir R. Bossicard.  All rights reserved.
  *
- * Copyright (c) 2002-2003 Vladimir R. Bossicard.  All rights reserved.
+ * Licensed under the JUnit-addons Software License, Version 1.0
+ *     (based on the Apache Software License, Version 1.1)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/common/source/java/ch/systemsx/cisd/common/test/SerializabilityTest.java b/common/source/java/ch/systemsx/cisd/common/test/SerializabilityTest.java
index 5d18dbcf9e8661f787cd3796a27069e3c30c66fa..f0070e6db1fa18c5f334b49daff165161cd1c583 100644
--- a/common/source/java/ch/systemsx/cisd/common/test/SerializabilityTest.java
+++ b/common/source/java/ch/systemsx/cisd/common/test/SerializabilityTest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2007 ETH Zuerich, CISD
+ *
+ * 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 ch.systemsx.cisd.common.test;
 
 import java.io.Serializable;
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/IPathHandler.java b/common/source/java/ch/systemsx/cisd/common/utilities/IPathHandler.java
index c85c7d4291f381553b49857f690157c467230019..8f4722ded0426ad3445c006dc51ae57de67795b9 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/IPathHandler.java
+++ b/common/source/java/ch/systemsx/cisd/common/utilities/IPathHandler.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2007 ETH Zuerich, CISD
+ *
+ * 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 ch.systemsx.cisd.common.utilities;
 
 import java.io.File;
diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/utilities/FileUtilitiesDeleteRecursivelyTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/utilities/FileUtilitiesDeleteRecursivelyTest.java
index e4c6ba54a18d848c0cc3fa5c2367f0e1abd69bb7..d66650a69d2202c4b47b1aa66afc42303b2c60ce 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/utilities/FileUtilitiesDeleteRecursivelyTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/utilities/FileUtilitiesDeleteRecursivelyTest.java
@@ -1,5 +1,3 @@
-package ch.systemsx.cisd.common.utilities;
-
 /*
  * Copyright 2007 ETH Zuerich, CISD
  *
@@ -16,6 +14,8 @@ package ch.systemsx.cisd.common.utilities;
  * limitations under the License.
  */
 
+package ch.systemsx.cisd.common.utilities;
+
 import static org.testng.AssertJUnit.assertEquals;
 
 import java.io.File;