diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/DataMover.java b/datamover/source/java/ch/systemsx/cisd/datamover/DataMover.java
index 70793203770f7700ac388ae3794fb20c513900a1..4661f264f70d9eb84b77d2c253c0c1658aa0b7e5 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/DataMover.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/DataMover.java
@@ -35,10 +35,10 @@ import ch.systemsx.cisd.common.filesystem.highwatermark.HighwaterMarkDirectorySc
 import ch.systemsx.cisd.common.logging.LogCategory;
 import ch.systemsx.cisd.common.logging.LogFactory;
 import ch.systemsx.cisd.common.process.ProcessExecutionHelper;
-import ch.systemsx.cisd.common.utilities.CompoundTriggerable;
 import ch.systemsx.cisd.common.utilities.ITerminable;
-import ch.systemsx.cisd.common.utilities.TriggeringTimerTask;
+import ch.systemsx.cisd.datamover.common.CompoundTriggerable;
 import ch.systemsx.cisd.datamover.common.StoreHandlerToMoverAdapter;
+import ch.systemsx.cisd.datamover.common.TriggeringTimerTask;
 import ch.systemsx.cisd.datamover.filesystem.FileStoreFactory;
 import ch.systemsx.cisd.datamover.filesystem.RemoteMonitoredMoverFactory;
 import ch.systemsx.cisd.datamover.filesystem.intf.IFileStore;
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/DataMoverProcess.java b/datamover/source/java/ch/systemsx/cisd/datamover/DataMoverProcess.java
index d54157f124dcef17786021ca4ddd849a046aaa70..5683ebbbb664c7d93c41e32fb1ad3203c6a20d74 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/DataMoverProcess.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/DataMoverProcess.java
@@ -25,7 +25,7 @@ import ch.systemsx.cisd.common.concurrent.TimerUtilities;
 import ch.systemsx.cisd.common.logging.LogCategory;
 import ch.systemsx.cisd.common.logging.LogFactory;
 import ch.systemsx.cisd.common.utilities.ITerminable;
-import ch.systemsx.cisd.common.utilities.ITriggerable;
+import ch.systemsx.cisd.datamover.common.ITriggerable;
 import ch.systemsx.cisd.datamover.filesystem.intf.IRecoverableTimerTaskFactory;
 
 /**
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/DataMoverShutdownHook.java b/datamover/source/java/ch/systemsx/cisd/datamover/DataMoverShutdownHook.java
index aaece887219fdd387f0acaba6013ee4ddd58136c..4b4e7a700ca5e896af1637fd3901ee671939406a 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/DataMoverShutdownHook.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/DataMoverShutdownHook.java
@@ -26,7 +26,7 @@ import ch.systemsx.cisd.common.logging.LogCategory;
 import ch.systemsx.cisd.common.logging.LogFactory;
 import ch.systemsx.cisd.common.utilities.IExitHandler;
 import ch.systemsx.cisd.common.utilities.ITerminable;
-import ch.systemsx.cisd.common.utilities.ITriggerable;
+import ch.systemsx.cisd.datamover.common.ITriggerable;
 
 /**
  * The <i>DataMover</i> shutdown hook.
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/Main.java b/datamover/source/java/ch/systemsx/cisd/datamover/Main.java
index cb59fd9d99bd56efcef0429f4ae62d8be441d205..a5684a3d892fed5f6c174059352faa9e9ebfb08e 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/Main.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/Main.java
@@ -33,7 +33,7 @@ import ch.systemsx.cisd.common.logging.LogFactory;
 import ch.systemsx.cisd.common.logging.LogInitializer;
 import ch.systemsx.cisd.common.utilities.ITerminable;
 import ch.systemsx.cisd.common.utilities.SystemExit;
-import ch.systemsx.cisd.common.utilities.TriggeringTimerTask;
+import ch.systemsx.cisd.datamover.common.TriggeringTimerTask;
 import ch.systemsx.cisd.datamover.filesystem.FileStoreFactory;
 import ch.systemsx.cisd.datamover.filesystem.FileStoreSelfTestables;
 import ch.systemsx.cisd.datamover.filesystem.FileSysOperationsFactory;
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/CompoundTriggerable.java b/datamover/source/java/ch/systemsx/cisd/datamover/common/CompoundTriggerable.java
similarity index 96%
rename from common/source/java/ch/systemsx/cisd/common/utilities/CompoundTriggerable.java
rename to datamover/source/java/ch/systemsx/cisd/datamover/common/CompoundTriggerable.java
index 5655eec92b554c01068c2c90c261643e7d050fe6..ac136bb75ccc09dfe48f27cf7adc71d5f898e4c0 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/CompoundTriggerable.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/common/CompoundTriggerable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.datamover.common;
 
 /**
  * A <code>ITriggerable</code> that chains a sequence of one or more {@link ITriggerable}s.
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/ITriggerable.java b/datamover/source/java/ch/systemsx/cisd/datamover/common/ITriggerable.java
similarity index 94%
rename from common/source/java/ch/systemsx/cisd/common/utilities/ITriggerable.java
rename to datamover/source/java/ch/systemsx/cisd/datamover/common/ITriggerable.java
index 77550c713005c1ff55de5c457d104b0e8239279a..2490aeb959004718f0476ad7f5cae2c5d224a121 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/ITriggerable.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/common/ITriggerable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.datamover.common;
 
 /**
  * A role that allows to trigger some operation.
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/TriggeringTimerTask.java b/datamover/source/java/ch/systemsx/cisd/datamover/common/TriggeringTimerTask.java
similarity index 97%
rename from common/source/java/ch/systemsx/cisd/common/utilities/TriggeringTimerTask.java
rename to datamover/source/java/ch/systemsx/cisd/datamover/common/TriggeringTimerTask.java
index 068c1dd7066d47fc012093911b7890de9c83fd99..b31650eb9323b21674d58955dd0f237824c65e1d 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/TriggeringTimerTask.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/common/TriggeringTimerTask.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.datamover.common;
 
 import java.io.File;
 import java.util.TimerTask;
@@ -23,6 +23,7 @@ import org.apache.log4j.Logger;
 
 import ch.systemsx.cisd.common.logging.LogCategory;
 import ch.systemsx.cisd.common.logging.LogFactory;
+import ch.systemsx.cisd.common.utilities.SynchronizationMonitor;
 
 /**
  * A role that triggers an {@link ITriggerable} when a given trigger file has been found.