diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/service/ImportService.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/service/ImportService.java
index 1866d55cff75ec3f964e047c617af93b68c31dcf..1371cd7537fb9de1f72a806340fe76c2b907492c 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/service/ImportService.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/service/ImportService.java
@@ -24,8 +24,8 @@ import org.springframework.stereotype.Component;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.plugin.service.IImportService;
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
-import ch.systemsx.cisd.openbis.generic.server.ICustomImportService;
-import ch.systemsx.cisd.openbis.generic.server.IEntityImportService;
+import ch.systemsx.cisd.openbis.generic.shared.ICustomImportService;
+import ch.systemsx.cisd.openbis.generic.shared.IEntityImportService;
 import ch.systemsx.cisd.openbis.generic.shared.ResourceNames;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.BatchRegistrationResult;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetType;
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 6eb4083dcc99d0c9ea60362685beb0aeca5e9895..5e40a49e48f729c1639f27939625f2d6ecc7bf2a 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
@@ -123,8 +123,8 @@ import ch.systemsx.cisd.openbis.generic.client.web.server.translator.SearchableE
 import ch.systemsx.cisd.openbis.generic.client.web.server.translator.SearchableSearchDomainTranslator;
 import ch.systemsx.cisd.openbis.generic.client.web.server.translator.UserFailureExceptionTranslator;
 import ch.systemsx.cisd.openbis.generic.client.web.server.util.TSVRenderer;
-import ch.systemsx.cisd.openbis.generic.server.ICustomImportService;
 import ch.systemsx.cisd.openbis.generic.shared.ICommonServer;
+import ch.systemsx.cisd.openbis.generic.shared.ICustomImportService;
 import ch.systemsx.cisd.openbis.generic.shared.IServer;
 import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.SearchDomain;
 import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.SearchDomainSearchOption;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ICustomImportService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/ICustomImportService.java
similarity index 94%
rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ICustomImportService.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/ICustomImportService.java
index 1a2a9e0cb6b6d29f2491f9e765ee7252202d4a9c..9a36b36f53a60fd32379bd3b9bdaef665ed32a45 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ICustomImportService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/ICustomImportService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.generic.server;
+package ch.systemsx.cisd.openbis.generic.shared;
 
 import java.util.List;
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/IEntityImportService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/IEntityImportService.java
similarity index 98%
rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/server/IEntityImportService.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/IEntityImportService.java
index f3015cc1eee57264d9a7305b449757bd7991a16d..effab330fc838ad57e0c91e370c7b50b97dff566 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/IEntityImportService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/IEntityImportService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.generic.server;
+package ch.systemsx.cisd.openbis.generic.shared;
 
 import java.util.List;
 
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 c86812246e5a43f46a8cf782f1bd18e7144ac8bb..2e25dc082109cf4207591bd308e4b9ef9527b6fe 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
@@ -49,10 +49,10 @@ import ch.systemsx.cisd.openbis.generic.client.web.server.UploadedFilesBean;
 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.generic.client.web.server.translator.UserFailureExceptionTranslator;
-import ch.systemsx.cisd.openbis.generic.server.IEntityImportService;
 import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.exception.SampleUniqueCodeViolationException;
 import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.exception.SampleUniqueCodeViolationExceptionAbstract;
 import ch.systemsx.cisd.openbis.generic.shared.Constants;
+import ch.systemsx.cisd.openbis.generic.shared.IEntityImportService;
 import ch.systemsx.cisd.openbis.generic.shared.IServer;
 import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.AbstractExternalData;