diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/DataMoverProcess.java b/datamover/source/java/ch/systemsx/cisd/datamover/DataMoverProcess.java
index 82f903c10c7067bb6ebbc2a0703cdf201ca8b24b..77af971dd7d99284ac2cf1aaa289fdc4ca50f4ef 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/DataMoverProcess.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/DataMoverProcess.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.datamover;
 
 import java.util.Timer;
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/RetryingPathRemover.java b/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/RetryingPathRemover.java
index 584f5a83a02afa31426a2f97dc11cbd310e0aded..8ee9658fc90446886c8d42344e51eebcc5dfb607 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/RetryingPathRemover.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/RetryingPathRemover.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.datamover.filesystem;
 
 import java.io.File;
@@ -34,7 +50,7 @@ final class RetryingPathRemover implements IPathRemover
         this.millisToSleepOnFailure = millisToSleepOnFailure;
     }
 
-    private final Status STATUS_FAILED_DELETION = new Status(StatusFlag.FATAL_ERROR, "Failed to remove path.");
+    private final static Status STATUS_FAILED_DELETION = new Status(StatusFlag.FATAL_ERROR, "Failed to remove path.");
 
     public Status remove(File path)
     {
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/intf/IRecoverableTimerTaskFactory.java b/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/intf/IRecoverableTimerTaskFactory.java
index 8dc784475ac4e4336abf2227003b123617addb28..bbdbaa1441fb304b6cefc5b1edf40fb916d369a6 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/intf/IRecoverableTimerTaskFactory.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/intf/IRecoverableTimerTaskFactory.java
@@ -1,6 +1,3 @@
-package ch.systemsx.cisd.datamover.filesystem.intf;
-import java.util.TimerTask;
-
 /*
  * Copyright 2007 ETH Zuerich, CISD
  *
@@ -17,6 +14,10 @@ import java.util.TimerTask;
  * limitations under the License.
  */
 
+package ch.systemsx.cisd.datamover.filesystem.intf;
+
+import java.util.TimerTask;
+
 /**
  * A factory for creating {@link TimerTask}s that, when run, perform a recovery operation on the data mover.
  *