diff --git a/common/source/java/ch/systemsx/cisd/common/parser/BeanAnalyzer.java b/common/source/java/ch/systemsx/cisd/common/parser/BeanAnalyzer.java
index 3c3fafa51b2eff6633fc43bb6cf96d4d7ff851f7..49c61d738b36b04234cdf5dc6def26ff3f173a0d 100644
--- a/common/source/java/ch/systemsx/cisd/common/parser/BeanAnalyzer.java
+++ b/common/source/java/ch/systemsx/cisd/common/parser/BeanAnalyzer.java
@@ -27,7 +27,7 @@ import java.util.TreeSet;
 import org.apache.commons.lang.StringUtils;
 
 import ch.systemsx.cisd.common.annotation.BeanProperty;
-import ch.systemsx.cisd.common.utilities.AnnotationUtils;
+import ch.systemsx.cisd.common.reflection.AnnotationUtils;
 
 /**
  * A <i>Bean</i> class analyzer.
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/AnnotationUtils.java b/common/source/java/ch/systemsx/cisd/common/reflection/AnnotationUtils.java
similarity index 99%
rename from common/source/java/ch/systemsx/cisd/common/utilities/AnnotationUtils.java
rename to common/source/java/ch/systemsx/cisd/common/reflection/AnnotationUtils.java
index e503b8b3ddea9c5cc78293bd8402d8a6998244dd..6eeb1d112e553cb3255a13bb87a399716d5bf116 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/AnnotationUtils.java
+++ b/common/source/java/ch/systemsx/cisd/common/reflection/AnnotationUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.reflection;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/utilities/AnnotationUtilsTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/reflection/AnnotationUtilsTest.java
similarity index 96%
rename from common/sourceTest/java/ch/systemsx/cisd/common/utilities/AnnotationUtilsTest.java
rename to common/sourceTest/java/ch/systemsx/cisd/common/reflection/AnnotationUtilsTest.java
index 202a1255b86ddadda48b02058153892c893b7f2f..a892c9c7f23a03eb1876aa7d4d9c8e3915c04570 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/utilities/AnnotationUtilsTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/reflection/AnnotationUtilsTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.reflection;
 
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertFalse;
@@ -27,7 +27,8 @@ import java.util.List;
 import org.testng.annotations.Test;
 
 import ch.systemsx.cisd.common.annotation.BeanProperty;
-import ch.systemsx.cisd.common.utilities.AnnotationUtils.Parameter;
+import ch.systemsx.cisd.common.reflection.AnnotationUtils;
+import ch.systemsx.cisd.common.reflection.AnnotationUtils.Parameter;
 
 /**
  * Test cases for the {@link AnnotationUtils} class.
@@ -128,7 +129,6 @@ public final class AnnotationUtilsTest
         @SuppressWarnings("unused")
         protected Object b;
 
-        @SuppressWarnings("unused")
         @BeanProperty
         protected void setA(final Object a)
         {
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcAuthorizationAdvisor.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcAuthorizationAdvisor.java
index 0603d9d103f3a0f5d5be14a220faf3c78f4a2da0..cf2020165dd1699e6f8d50be5f86896426dd544d 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcAuthorizationAdvisor.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcAuthorizationAdvisor.java
@@ -32,10 +32,10 @@ import ch.systemsx.cisd.common.exceptions.AuthorizationFailureException;
 import ch.systemsx.cisd.common.exceptions.Status;
 import ch.systemsx.cisd.common.logging.LogCategory;
 import ch.systemsx.cisd.common.logging.LogFactory;
+import ch.systemsx.cisd.common.reflection.AnnotationUtils;
 import ch.systemsx.cisd.common.reflection.ClassUtils;
 import ch.systemsx.cisd.common.reflection.MethodUtils;
-import ch.systemsx.cisd.common.utilities.AnnotationUtils;
-import ch.systemsx.cisd.common.utilities.AnnotationUtils.Parameter;
+import ch.systemsx.cisd.common.reflection.AnnotationUtils.Parameter;
 import ch.systemsx.cisd.openbis.dss.generic.shared.IShareIdManager;
 import ch.systemsx.cisd.openbis.dss.generic.shared.ServiceProvider;
 import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.authorization.AuthorizationGuard;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationAdvisor.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationAdvisor.java
index 9c1fc4438e3c583773b434598731d2208c23c3b5..e83dec0a9d2e0fb85101a1d9257d238298cf7150 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationAdvisor.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationAdvisor.java
@@ -36,9 +36,9 @@ import ch.systemsx.cisd.common.exceptions.Status;
 import ch.systemsx.cisd.common.exceptions.StatusFlag;
 import ch.systemsx.cisd.common.logging.LogCategory;
 import ch.systemsx.cisd.common.logging.LogFactory;
+import ch.systemsx.cisd.common.reflection.AnnotationUtils;
 import ch.systemsx.cisd.common.reflection.MethodUtils;
-import ch.systemsx.cisd.common.utilities.AnnotationUtils;
-import ch.systemsx.cisd.common.utilities.AnnotationUtils.Parameter;
+import ch.systemsx.cisd.common.reflection.AnnotationUtils.Parameter;
 import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.AuthorizationGuard;
 import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.RolesAllowed;
 import ch.systemsx.cisd.openbis.generic.server.util.MethodInvocationUtils;