diff --git a/common/source/java/ch/systemsx/cisd/common/exceptions/ClientSafeException.java b/common/source/java/ch/systemsx/cisd/common/utilities/ClientSafeException.java
similarity index 97%
rename from common/source/java/ch/systemsx/cisd/common/exceptions/ClientSafeException.java
rename to common/source/java/ch/systemsx/cisd/common/utilities/ClientSafeException.java
index 3c27080a6d97062e4c6b1dd49448776722716541..72464dbba75877f48835ca7e7b45e8961f4c6c2c 100644
--- a/common/source/java/ch/systemsx/cisd/common/exceptions/ClientSafeException.java
+++ b/common/source/java/ch/systemsx/cisd/common/utilities/ClientSafeException.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common.exceptions;
+package ch.systemsx.cisd.common.utilities;
 
 import org.apache.commons.lang.exception.ExceptionUtils;
 
-import ch.systemsx.cisd.common.utilities.ClassUtils;
+import ch.systemsx.cisd.common.exceptions.CheckedExceptionTunnel;
 
 /**
  * A <code>RuntimeException</code> extension which is client safe, meaning that it does not contain any third-party
diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/exceptions/ClientSafeExceptionTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/utilities/ClientSafeExceptionTest.java
similarity index 95%
rename from common/sourceTest/java/ch/systemsx/cisd/common/exceptions/ClientSafeExceptionTest.java
rename to common/sourceTest/java/ch/systemsx/cisd/common/utilities/ClientSafeExceptionTest.java
index f6700e701659aa7f459ab211bd4abdd1bc469d5a..f5e5943d86aa03fdf050ea5adb7942df1e073d4c 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/exceptions/ClientSafeExceptionTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/utilities/ClientSafeExceptionTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common.exceptions;
+package ch.systemsx.cisd.common.utilities;
 
 import org.testng.annotations.Test;