diff --git a/common/source/java/ch/systemsx/cisd/common/jmx/JMXMemoryMonitor.java b/common/source/java/ch/systemsx/cisd/common/monitoring/JMXMemoryMonitor.java
similarity index 99%
rename from common/source/java/ch/systemsx/cisd/common/jmx/JMXMemoryMonitor.java
rename to common/source/java/ch/systemsx/cisd/common/monitoring/JMXMemoryMonitor.java
index 4488b01b885582727aa4d5022ad0427ca9dbfba7..14e1a4e2156050ecc20f8283fce29b134840eef9 100644
--- a/common/source/java/ch/systemsx/cisd/common/jmx/JMXMemoryMonitor.java
+++ b/common/source/java/ch/systemsx/cisd/common/monitoring/JMXMemoryMonitor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common.jmx;
+package ch.systemsx.cisd.common.monitoring;
 
 import java.lang.management.ManagementFactory;
 import java.lang.management.MemoryMXBean;
diff --git a/common/source/java/ch/systemsx/cisd/common/jmx/JMXMemoryMonitorSpringBean.java b/common/source/java/ch/systemsx/cisd/common/monitoring/JMXMemoryMonitorSpringBean.java
similarity index 98%
rename from common/source/java/ch/systemsx/cisd/common/jmx/JMXMemoryMonitorSpringBean.java
rename to common/source/java/ch/systemsx/cisd/common/monitoring/JMXMemoryMonitorSpringBean.java
index 2e99113a8f0d918894404baa5dd9eb43bc971125..9368b7c63b031dc454108041bd9c63b873ab4a34 100644
--- a/common/source/java/ch/systemsx/cisd/common/jmx/JMXMemoryMonitorSpringBean.java
+++ b/common/source/java/ch/systemsx/cisd/common/monitoring/JMXMemoryMonitorSpringBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common.jmx;
+package ch.systemsx.cisd.common.monitoring;
 
 import java.util.Properties;
 
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/ThreadDump.java b/common/source/java/ch/systemsx/cisd/common/monitoring/ThreadDump.java
similarity index 98%
rename from common/source/java/ch/systemsx/cisd/common/utilities/ThreadDump.java
rename to common/source/java/ch/systemsx/cisd/common/monitoring/ThreadDump.java
index 757c6e3b66a3baa6427ecdbeb9ea30ebe0be4093..0de770b8396e2099639f1c20228c14d2a06e9a4b 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/ThreadDump.java
+++ b/common/source/java/ch/systemsx/cisd/common/monitoring/ThreadDump.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.monitoring;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
diff --git a/datastore_server/source/java/dssApplicationContext.xml b/datastore_server/source/java/dssApplicationContext.xml
index 554a3fd6e10a87186dcbe5fa23649e9d938ae8b0..c46cdf66f3130412acb0c9ba24c9a67fddab1a11 100644
--- a/datastore_server/source/java/dssApplicationContext.xml
+++ b/datastore_server/source/java/dssApplicationContext.xml
@@ -27,7 +27,7 @@
         factory-method="getResolvedProps">
     </bean>
     
-	<bean id="memory-monitor" class="ch.systemsx.cisd.common.jmx.JMXMemoryMonitorSpringBean" />
+	<bean id="memory-monitor" class="ch.systemsx.cisd.common.monitoring.JMXMemoryMonitorSpringBean" />
 
     <bean id="data-set-path-infos-provider" class="ch.systemsx.cisd.openbis.dss.generic.server.DatabaseBasedDataSetPathInfoProvider"/>
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServerExceptionTranslatingAdvisor.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServerExceptionTranslatingAdvisor.java
index 0f0faf54db9bcc7410f852f30a42b8b2b58bb549..c1a12011167a04e6db0fd34b9920c483fd38014a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServerExceptionTranslatingAdvisor.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServerExceptionTranslatingAdvisor.java
@@ -32,7 +32,7 @@ import org.springframework.transaction.annotation.Transactional;
 import ch.systemsx.cisd.common.exception.UserFailureException;
 import ch.systemsx.cisd.common.logging.LogCategory;
 import ch.systemsx.cisd.common.logging.LogFactory;
-import ch.systemsx.cisd.common.utilities.ThreadDump;
+import ch.systemsx.cisd.common.monitoring.ThreadDump;
 import ch.systemsx.cisd.openbis.generic.shared.IServer;
 
 /**
diff --git a/openbis/source/java/genericApplicationContext.xml b/openbis/source/java/genericApplicationContext.xml
index c86f31a93a2ed698b34389b43cc43c95ee171b71..0c17b542a90cf9f5f96800951da7b8305768f1f3 100644
--- a/openbis/source/java/genericApplicationContext.xml
+++ b/openbis/source/java/genericApplicationContext.xml
@@ -17,7 +17,7 @@
 
     <bean id="exception-translator" class="ch.systemsx.cisd.openbis.generic.server.business.bo.NextExceptionFallbackExceptionTranslator" />
 
-	<bean id="memory-monitor" class="ch.systemsx.cisd.common.jmx.JMXMemoryMonitorSpringBean" />
+	<bean id="memory-monitor" class="ch.systemsx.cisd.common.monitoring.JMXMemoryMonitorSpringBean" />
 
     <bean id="transaction-manager"
         class="ch.systemsx.cisd.openbis.generic.server.dataaccess.db.OpenBISHibernateTransactionManager">