diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java
index 66fecaa4d2837ae406b26e0aa0788e90a85271c5..2609af98340b4cd0090a68c2a0f16ad9d5b8d847 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java
@@ -220,8 +220,8 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ProjectIdentifier;
 import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ProjectIdentifierFactory;
 import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SpaceIdentifier;
 import ch.systemsx.cisd.openbis.generic.shared.parser.BisTabFileLoader;
-import ch.systemsx.cisd.openbis.plugin.generic.client.web.server.queue.ConsumerQueue;
-import ch.systemsx.cisd.openbis.plugin.generic.client.web.server.queue.ConsumerTask;
+import ch.systemsx.cisd.openbis.generic.client.web.server.queue.ConsumerQueue;
+import ch.systemsx.cisd.openbis.generic.client.web.server.queue.ConsumerTask;
 
 /**
  * The {@link ICommonClientService} implementation.
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/queue/ConsumerQueue.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/queue/ConsumerQueue.java
similarity index 93%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/queue/ConsumerQueue.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/queue/ConsumerQueue.java
index 2b127e3f8cc5da227631596c56b1f7efef544d3d..b6a0c301afad77ece2ebfc0f162b5e3c91033cff 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/queue/ConsumerQueue.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/queue/ConsumerQueue.java
@@ -1,4 +1,4 @@
-package ch.systemsx.cisd.openbis.plugin.generic.client.web.server.queue;
+package ch.systemsx.cisd.openbis.generic.client.web.server.queue;
 
 import java.io.StringWriter;
 import java.util.Date;
@@ -62,7 +62,7 @@ public final class ConsumerQueue
                                  final IMailClient mailClient = new MailClient(mailClientParameters);
                                  sendEmail(mailClient, writer.toString(), getSubject(consumerTask.getName(), startDate, success), consumerTask.getUserEmail());
                              } catch(Throwable anyErrorOnMail) {
-                                 operationLog.error("Could not send email about asynchronous action '" + consumerTask.getName() + "' result. ", anyErrorOnMail);
+                                 operationLog.error("Asynchronous action '" + consumerTask.getName() + "' failed. ", anyErrorOnMail);
                              }
                          }
                      }
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/queue/ConsumerTask.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/queue/ConsumerTask.java
similarity index 95%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/queue/ConsumerTask.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/queue/ConsumerTask.java
index 40faa04b3751934bd2722e40717e9482a6b5d230..e5c95d0229a22c2f194340fb463a5e283909ff41 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/queue/ConsumerTask.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/queue/ConsumerTask.java
@@ -1,4 +1,4 @@
-package ch.systemsx.cisd.openbis.plugin.generic.client.web.server.queue;
+package ch.systemsx.cisd.openbis.generic.client.web.server.queue;
 
 import java.io.IOException;
 import java.io.Writer;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientService.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientService.java
index 4dcb613e6eed1ae0929e5deed36b1674ab3b0b9d..a2e682eb702e7d4e578b6c52755f5d7ff67b18a0 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientService.java
@@ -92,8 +92,8 @@ import ch.systemsx.cisd.openbis.generic.shared.parser.SampleUploadSectionsParser
 import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.IGenericClientService;
 import ch.systemsx.cisd.openbis.plugin.generic.client.web.server.parser.MaterialUploadSectionsParser;
 import ch.systemsx.cisd.openbis.plugin.generic.client.web.server.parser.MaterialUploadSectionsParser.BatchMaterialsOperation;
-import ch.systemsx.cisd.openbis.plugin.generic.client.web.server.queue.ConsumerQueue;
-import ch.systemsx.cisd.openbis.plugin.generic.client.web.server.queue.ConsumerTask;
+import ch.systemsx.cisd.openbis.generic.client.web.server.queue.ConsumerQueue;
+import ch.systemsx.cisd.openbis.generic.client.web.server.queue.ConsumerTask;
 import ch.systemsx.cisd.openbis.plugin.generic.shared.IGenericServer;
 import ch.systemsx.cisd.openbis.plugin.generic.shared.ResourceNames;
 
diff --git a/openbis/source/java/genericApplicationContext.xml b/openbis/source/java/genericApplicationContext.xml
index a9a18ac6481ddba028b12f0ea06b898bc938e846..0af786405f47c2daf6ace61627d76d8ab2985f25 100644
--- a/openbis/source/java/genericApplicationContext.xml
+++ b/openbis/source/java/genericApplicationContext.xml
@@ -198,7 +198,7 @@
         <property name="maxResults" value="${hibernate.search.maxResults}" />
     </bean>
     
-    <bean id="registration-queue" class="ch.systemsx.cisd.openbis.plugin.generic.client.web.server.queue.ConsumerQueue">
+    <bean id="registration-queue" class="ch.systemsx.cisd.openbis.generic.client.web.server.queue.ConsumerQueue">
         <constructor-arg ref="mail-client-parameters" />
     </bean>