diff --git a/common/source/java/ch/systemsx/cisd/common/filesystem/FaultyPathDirectoryScanningHandler.java b/common/source/java/ch/systemsx/cisd/common/filesystem/FaultyPathDirectoryScanningHandler.java
index 70d33cbd98c9b96cf84bf70c22b7e1da29e866cb..32260bf59c2d3072a23b6633997f78bac877501d 100644
--- a/common/source/java/ch/systemsx/cisd/common/filesystem/FaultyPathDirectoryScanningHandler.java
+++ b/common/source/java/ch/systemsx/cisd/common/filesystem/FaultyPathDirectoryScanningHandler.java
@@ -30,7 +30,6 @@ import ch.systemsx.cisd.common.exceptions.Status;
 import ch.systemsx.cisd.common.filesystem.DirectoryScanningTimerTask.IScannedStore;
 import ch.systemsx.cisd.common.logging.LogCategory;
 import ch.systemsx.cisd.common.logging.LogFactory;
-import ch.systemsx.cisd.common.utilities.IStopSignaler;
 
 /**
  * An <code>IDirectoryScanningHandler</code> which manages faulty paths.
diff --git a/common/source/java/ch/systemsx/cisd/common/filesystem/IPathHandler.java b/common/source/java/ch/systemsx/cisd/common/filesystem/IPathHandler.java
index 118957178d57be7193c0bd0807f70cf1ad8e2dd0..2f5c37423ed0fd85e9dc7230b94714a090551822 100644
--- a/common/source/java/ch/systemsx/cisd/common/filesystem/IPathHandler.java
+++ b/common/source/java/ch/systemsx/cisd/common/filesystem/IPathHandler.java
@@ -18,7 +18,6 @@ package ch.systemsx.cisd.common.filesystem;
 
 import java.io.File;
 
-import ch.systemsx.cisd.common.utilities.IStopSignaler;
 
 /**
  * A role for handling paths. The paths are supposed to go away when they have been handled
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/IStopSignaler.java b/common/source/java/ch/systemsx/cisd/common/filesystem/IStopSignaler.java
similarity index 96%
rename from common/source/java/ch/systemsx/cisd/common/utilities/IStopSignaler.java
rename to common/source/java/ch/systemsx/cisd/common/filesystem/IStopSignaler.java
index 6563a0b8e20a64a57eb0567269b09b09f6472963..5c40c1af7ae64106999d0f52db31a2a92c646fa6 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/IStopSignaler.java
+++ b/common/source/java/ch/systemsx/cisd/common/filesystem/IStopSignaler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.filesystem;
 
 /**
  * A role that allows to signal that a worker was stopped. 
diff --git a/common/source/java/ch/systemsx/cisd/common/filesystem/IStoreHandler.java b/common/source/java/ch/systemsx/cisd/common/filesystem/IStoreHandler.java
index eab14cff96a3fd1127f304940b23a71167ac8d67..de8b2e5b539fd4bee9f805561f4b0e367ceaceaf 100644
--- a/common/source/java/ch/systemsx/cisd/common/filesystem/IStoreHandler.java
+++ b/common/source/java/ch/systemsx/cisd/common/filesystem/IStoreHandler.java
@@ -16,7 +16,6 @@
 
 package ch.systemsx.cisd.common.filesystem;
 
-import ch.systemsx.cisd.common.utilities.IStopSignaler;
 
 /**
  * Handles items in the file store.
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/common/IStoreMover.java b/datamover/source/java/ch/systemsx/cisd/datamover/common/IStoreMover.java
index bf238b178b4b909bcc8c677c7315b9f6cc5d8b5a..f1d016e8621bfbfc1c747492c09cf90f889f7cfd 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/common/IStoreMover.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/common/IStoreMover.java
@@ -16,9 +16,9 @@
 
 package ch.systemsx.cisd.datamover.common;
 
+import ch.systemsx.cisd.common.filesystem.IStopSignaler;
 import ch.systemsx.cisd.common.filesystem.IStoreHandler;
 import ch.systemsx.cisd.common.filesystem.StoreItem;
-import ch.systemsx.cisd.common.utilities.IStopSignaler;
 
 /**
  * Moves items in the file store.
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/ETLDaemon.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/ETLDaemon.java
index e9d00ef7e84672ca8487225ce5cba50d6a1613b8..bba6fc197163112bff030f567a313f796b71e4fa 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/ETLDaemon.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/ETLDaemon.java
@@ -51,6 +51,7 @@ import ch.systemsx.cisd.common.filesystem.highwatermark.HostAwareFileWithHighwat
 import ch.systemsx.cisd.common.filesystem.FileUtilities;
 import ch.systemsx.cisd.common.filesystem.HostAwareFile;
 import ch.systemsx.cisd.common.filesystem.IDirectoryScanningHandler;
+import ch.systemsx.cisd.common.filesystem.IStopSignaler;
 import ch.systemsx.cisd.common.filesystem.IStoreItemFilter;
 import ch.systemsx.cisd.common.filesystem.LastModificationChecker;
 import ch.systemsx.cisd.common.filesystem.QueueingPathRemoverService;
@@ -68,7 +69,6 @@ import ch.systemsx.cisd.common.properties.PropertyUtils;
 import ch.systemsx.cisd.common.reflection.ClassUtils;
 import ch.systemsx.cisd.common.utilities.IExitHandler;
 import ch.systemsx.cisd.common.utilities.ISelfTestable;
-import ch.systemsx.cisd.common.utilities.IStopSignaler;
 import ch.systemsx.cisd.common.utilities.SystemExit;
 import ch.systemsx.cisd.etlserver.plugins.DeleteDataSetsAlreadyDeletedInApplicationServerMaintenanceTask;
 import ch.systemsx.cisd.etlserver.postregistration.PostRegistrationMaintenanceTask;