diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/hdf5/Hdf5StorageProcessor.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/hdf5/Hdf5StorageProcessor.java
index 8d0a9611304606fed418291a13d9a1b4f2656967..8d87700ab57ffdcc9d7ad6f34d696f87b5022fa1 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/hdf5/Hdf5StorageProcessor.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/hdf5/Hdf5StorageProcessor.java
@@ -24,6 +24,7 @@ import ch.systemsx.cisd.common.mail.IMailClient;
 import ch.systemsx.cisd.common.utilities.PropertyUtils;
 import ch.systemsx.cisd.etlserver.AbstractStorageProcessor;
 import ch.systemsx.cisd.etlserver.ITypeExtractor;
+import ch.systemsx.cisd.openbis.dss.generic.shared.content.Hdf5Container;
 import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
 
 /**
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/hdf5/HierarchicalStructureDuplicatorFileToHdf5.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/hdf5/HierarchicalStructureDuplicatorFileToHdf5.java
index 5cc97aa2ebcfa8e2b99292bb494abc389c4b36be..72c620cdc038293e2f8110b16dc0b2fba8db9532 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/hdf5/HierarchicalStructureDuplicatorFileToHdf5.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/hdf5/HierarchicalStructureDuplicatorFileToHdf5.java
@@ -25,6 +25,7 @@ import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
 import ch.systemsx.cisd.base.exceptions.IOExceptionUnchecked;
 import ch.systemsx.cisd.common.filesystem.FileUtilities;
 import ch.systemsx.cisd.hdf5.IHDF5SimpleWriter;
+import ch.systemsx.cisd.openbis.dss.generic.shared.content.Hdf5Container;
 
 /**
  * Takes the hierarchical structure of a file and applies it to an HDF5 container.
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/hdf5/CompressingHdf5WriterWrapper.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/CompressingHdf5WriterWrapper.java
similarity index 99%
rename from datastore_server/source/java/ch/systemsx/cisd/etlserver/hdf5/CompressingHdf5WriterWrapper.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/CompressingHdf5WriterWrapper.java
index c811d459910830bdfbe1640c976dc50abb589107..e2677a710e1cb94fd7bfd3df3bbd532fa2eb0de7 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/hdf5/CompressingHdf5WriterWrapper.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/CompressingHdf5WriterWrapper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.etlserver.hdf5;
+package ch.systemsx.cisd.openbis.dss.generic.shared.content;
 
 import java.util.BitSet;
 import java.util.Date;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/HDF5ContainerBasedHierarchicalContentNode.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/HDF5ContainerBasedHierarchicalContentNode.java
index f0e7026dac2c0ff790cb1da3629e95370950d40d..c7928dc9eb20d0961590fbfd99fb8388d05ecdca 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/HDF5ContainerBasedHierarchicalContentNode.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/HDF5ContainerBasedHierarchicalContentNode.java
@@ -30,7 +30,6 @@ import ch.systemsx.cisd.common.io.IContent;
 import ch.systemsx.cisd.common.io.IHierarchicalContent;
 import ch.systemsx.cisd.common.io.IHierarchicalContentFactory;
 import ch.systemsx.cisd.common.io.IHierarchicalContentNode;
-import ch.systemsx.cisd.etlserver.hdf5.Hdf5Container;
 import ch.systemsx.cisd.hdf5.IHDF5SimpleReader;
 
 /**
@@ -38,8 +37,7 @@ import ch.systemsx.cisd.hdf5.IHDF5SimpleReader;
  * 
  * @author Piotr Buczek
  */
-public class HDF5ContainerBasedHierarchicalContentNode extends
-        DefaultFileBasedHierarchicalContentNode // TODO make package protected
+class HDF5ContainerBasedHierarchicalContentNode extends DefaultFileBasedHierarchicalContentNode
 {
     private final Hdf5Container hdf5Container;
 
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/hdf5/Hdf5Container.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/Hdf5Container.java
similarity index 98%
rename from datastore_server/source/java/ch/systemsx/cisd/etlserver/hdf5/Hdf5Container.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/Hdf5Container.java
index 37dca08ae6d5b884a8969a8d9edbb276af0c61a0..031396510f4763463a78e93a862da3c10cdaca31 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/hdf5/Hdf5Container.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/Hdf5Container.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.etlserver.hdf5;
+package ch.systemsx.cisd.openbis.dss.generic.shared.content;
 
 import java.io.File;
 
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/AbstractHdf5StorageProcessorTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/AbstractHdf5StorageProcessorTest.java
index a9e9db4f6c3f05f84db63efc8a37028fafdec845..f1093af651bdea796e60463318a58f6261ca985d 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/AbstractHdf5StorageProcessorTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/AbstractHdf5StorageProcessorTest.java
@@ -22,8 +22,9 @@ import java.util.Properties;
 import ch.systemsx.cisd.base.tests.AbstractFileSystemTestCase;
 import ch.systemsx.cisd.common.filesystem.FileUtilities;
 import ch.systemsx.cisd.etlserver.IStorageProcessorTransactional.IStorageProcessorTransaction;
-import ch.systemsx.cisd.etlserver.hdf5.Hdf5Container.IHdf5ReaderClient;
 import ch.systemsx.cisd.hdf5.IHDF5SimpleReader;
+import ch.systemsx.cisd.openbis.dss.generic.shared.content.Hdf5Container;
+import ch.systemsx.cisd.openbis.dss.generic.shared.content.Hdf5Container.IHdf5ReaderClient;
 
 /**
  * Tests for {@link Hdf5StorageProcessor}.
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/FileToHdf5DuplicationVerifier.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/FileToHdf5DuplicationVerifier.java
index ea50d497ef4a9fce961210ecf962ecd0f37464be..152413bd17a5184dddffad69703fc02040428064 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/FileToHdf5DuplicationVerifier.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/FileToHdf5DuplicationVerifier.java
@@ -22,8 +22,9 @@ import java.io.IOException;
 import org.apache.commons.io.FileUtils;
 import org.testng.AssertJUnit;
 
-import ch.systemsx.cisd.etlserver.hdf5.Hdf5Container.IHdf5ReaderClient;
 import ch.systemsx.cisd.hdf5.IHDF5SimpleReader;
+import ch.systemsx.cisd.openbis.dss.generic.shared.content.Hdf5Container;
+import ch.systemsx.cisd.openbis.dss.generic.shared.content.Hdf5Container.IHdf5ReaderClient;
 
 /**
  * Helper class that verifies that a file structure is matched by the HDF5 structure.
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/Hdf5ContainerTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/Hdf5ContainerTest.java
index b7da4daeced0e842a6dca064e3cf287bcadebe10..25380f0cb899c33cb3c96646572638e9d7d062b2 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/Hdf5ContainerTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/Hdf5ContainerTest.java
@@ -24,10 +24,11 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import ch.systemsx.cisd.base.tests.AbstractFileSystemTestCase;
-import ch.systemsx.cisd.etlserver.hdf5.Hdf5Container.IHdf5ReaderClient;
-import ch.systemsx.cisd.etlserver.hdf5.Hdf5Container.IHdf5WriterClient;
 import ch.systemsx.cisd.hdf5.IHDF5SimpleReader;
 import ch.systemsx.cisd.hdf5.IHDF5SimpleWriter;
+import ch.systemsx.cisd.openbis.dss.generic.shared.content.Hdf5Container;
+import ch.systemsx.cisd.openbis.dss.generic.shared.content.Hdf5Container.IHdf5ReaderClient;
+import ch.systemsx.cisd.openbis.dss.generic.shared.content.Hdf5Container.IHdf5WriterClient;
 
 /**
  * @author Chandrasekhar Ramakrishnan
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/HierarchicalStructureDuplicatorFileToHdf5Test.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/HierarchicalStructureDuplicatorFileToHdf5Test.java
index e3880138d7924f6a12981a22dd0a7709f53af080..bfc424a64fe2bfd46c71aafa21e67fe9d05ca220 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/HierarchicalStructureDuplicatorFileToHdf5Test.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/HierarchicalStructureDuplicatorFileToHdf5Test.java
@@ -23,8 +23,9 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import ch.systemsx.cisd.base.tests.AbstractFileSystemTestCase;
-import ch.systemsx.cisd.etlserver.hdf5.Hdf5Container.IHdf5ReaderClient;
 import ch.systemsx.cisd.hdf5.IHDF5SimpleReader;
+import ch.systemsx.cisd.openbis.dss.generic.shared.content.Hdf5Container;
+import ch.systemsx.cisd.openbis.dss.generic.shared.content.Hdf5Container.IHdf5ReaderClient;
 
 /**
  * @author Chandrasekhar Ramakrishnan