diff --git a/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/DataSetService.java b/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/DataSetService.java
index 864eb3244e1de111b1733e75af1add44feaf87f3..d88af4a954582d47277736e7be69344369b870de 100644
--- a/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/DataSetService.java
+++ b/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/DataSetService.java
@@ -17,10 +17,10 @@
 package ch.systemsx.cisd.openbis.datasetdownload;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
-import ch.systemsx.cisd.lims.base.ExternalData;
 import ch.systemsx.cisd.lims.base.IDataSetService;
 import ch.systemsx.cisd.lims.base.ILIMSServiceFactory;
 import ch.systemsx.cisd.lims.base.ServiceRegistry;
+import ch.systemsx.cisd.lims.base.dto.ExternalData;
 
 /**
  * 
diff --git a/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/DatasetDownloadServlet.java b/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/DatasetDownloadServlet.java
index c5ada0e8390b25471c48395717870ebad4ad2d0e..a80eca58637b4a0ae23a1c60fdb94bc015599209 100644
--- a/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/DatasetDownloadServlet.java
+++ b/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/DatasetDownloadServlet.java
@@ -48,9 +48,9 @@ import ch.systemsx.cisd.common.exceptions.UserFailureException;
 import ch.systemsx.cisd.common.logging.LogCategory;
 import ch.systemsx.cisd.common.logging.LogFactory;
 import ch.systemsx.cisd.common.utilities.FileUtilities;
-import ch.systemsx.cisd.lims.base.ExternalData;
 import ch.systemsx.cisd.lims.base.IDataSetService;
-import ch.systemsx.cisd.lims.base.LocatorType;
+import ch.systemsx.cisd.lims.base.dto.ExternalData;
+import ch.systemsx.cisd.lims.base.dto.LocatorType;
 
 /**
  * @author Franz-Josef Elmer
diff --git a/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/HTMLDirectoryRenderer.java b/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/HTMLDirectoryRenderer.java
index 4335aec1f5a3225679e9132da60ea5a59f3808f9..fa6b8939b89ea862f5901d01df1c092389a5017a 100644
--- a/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/HTMLDirectoryRenderer.java
+++ b/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/HTMLDirectoryRenderer.java
@@ -25,11 +25,11 @@ import org.apache.commons.lang.StringUtils;
 
 import ch.systemsx.cisd.common.exceptions.CheckedExceptionTunnel;
 import ch.systemsx.cisd.common.utilities.Template;
-import ch.systemsx.cisd.lims.base.Experiment;
-import ch.systemsx.cisd.lims.base.ExternalData;
-import ch.systemsx.cisd.lims.base.Group;
-import ch.systemsx.cisd.lims.base.Procedure;
-import ch.systemsx.cisd.lims.base.Project;
+import ch.systemsx.cisd.lims.base.dto.Experiment;
+import ch.systemsx.cisd.lims.base.dto.ExternalData;
+import ch.systemsx.cisd.lims.base.dto.Group;
+import ch.systemsx.cisd.lims.base.dto.Procedure;
+import ch.systemsx.cisd.lims.base.dto.Project;
 
 /**
  * An <code>IDirectoryRenderer</code> implementation which renders on HTML pages.
diff --git a/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/IDirectoryRenderer.java b/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/IDirectoryRenderer.java
index 9c808f16271822d34954c8fcf436283a12973ba3..3d3d411d9f071f2b490ba4f8c6300350d9e30b3b 100644
--- a/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/IDirectoryRenderer.java
+++ b/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/IDirectoryRenderer.java
@@ -17,7 +17,7 @@
 package ch.systemsx.cisd.openbis.datasetdownload;
 
 
-import ch.systemsx.cisd.lims.base.ExternalData;
+import ch.systemsx.cisd.lims.base.dto.ExternalData;
 
 /**
  * Interface of a renderer of a directory.
diff --git a/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/PlainTextRendererFactory.java b/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/PlainTextRendererFactory.java
index 371ae26344d11cf0936920e7d719126d669ced6a..137908615a2a78f7f304db2a0b480a5c9667c1e3 100644
--- a/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/PlainTextRendererFactory.java
+++ b/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/PlainTextRendererFactory.java
@@ -20,7 +20,7 @@ import java.io.PrintWriter;
 
 import org.apache.commons.io.FileUtils;
 
-import ch.systemsx.cisd.lims.base.ExternalData;
+import ch.systemsx.cisd.lims.base.dto.ExternalData;
 
 /**
  * Factory for rendering file system view in plain text.
diff --git a/dataset_download/sourceTest/java/ch/systemsx/cisd/openbis/datasetdownload/DatasetDownloadServletTest.java b/dataset_download/sourceTest/java/ch/systemsx/cisd/openbis/datasetdownload/DatasetDownloadServletTest.java
index f5bbeadf32e2be7d0719fa659a5fcb73ccbb68e8..b551453faa43ffa8649a7464f015742b82156d94 100644
--- a/dataset_download/sourceTest/java/ch/systemsx/cisd/openbis/datasetdownload/DatasetDownloadServletTest.java
+++ b/dataset_download/sourceTest/java/ch/systemsx/cisd/openbis/datasetdownload/DatasetDownloadServletTest.java
@@ -45,13 +45,13 @@ import ch.systemsx.cisd.common.exceptions.CheckedExceptionTunnel;
 import ch.systemsx.cisd.common.logging.BufferedAppender;
 import ch.systemsx.cisd.common.utilities.FileUtilities;
 import ch.systemsx.cisd.common.utilities.OSUtilities;
-import ch.systemsx.cisd.lims.base.Experiment;
-import ch.systemsx.cisd.lims.base.ExternalData;
-import ch.systemsx.cisd.lims.base.Group;
 import ch.systemsx.cisd.lims.base.IDataSetService;
-import ch.systemsx.cisd.lims.base.LocatorType;
-import ch.systemsx.cisd.lims.base.Procedure;
-import ch.systemsx.cisd.lims.base.Project;
+import ch.systemsx.cisd.lims.base.dto.Experiment;
+import ch.systemsx.cisd.lims.base.dto.ExternalData;
+import ch.systemsx.cisd.lims.base.dto.Group;
+import ch.systemsx.cisd.lims.base.dto.LocatorType;
+import ch.systemsx.cisd.lims.base.dto.Procedure;
+import ch.systemsx.cisd.lims.base.dto.Project;
 
 /**
  * @author Franz-Josef Elmer