diff --git a/rtd_cina/source/java/ch/systemsx/cisd/cina/client/util/cli/ReplicaDownloader.java b/rtd_cina/source/java/ch/systemsx/cisd/cina/client/util/cli/ReplicaDownloader.java
index d546e6039b3c5fb3a6f52930a6f91c174c2f7f50..073e339f29003b92ae8f8114063bfa7c1110ff99 100644
--- a/rtd_cina/source/java/ch/systemsx/cisd/cina/client/util/cli/ReplicaDownloader.java
+++ b/rtd_cina/source/java/ch/systemsx/cisd/cina/client/util/cli/ReplicaDownloader.java
@@ -106,7 +106,7 @@ class ReplicaDownloader
     private void downloadDataSet(DataSet dataSet, String subfolderName)
     {
         IDataSetDss dataSetDss = component.getDataSet(dataSet.getCode());
-        FileInfoDssDTO[] fileInfos = dataSetDss.listFiles("/", true);
+        FileInfoDssDTO[] fileInfos = dataSetDss.listFiles("/original/", true);
 
         FileInfoDssDownloader downloader =
                 new FileInfoDssDownloader(dataSetDss, fileInfos,
diff --git a/rtd_cina/sourceTest/java/ch/systemsx/cisd/cina/client/util/cli/CommandGetReplicaTest.java b/rtd_cina/sourceTest/java/ch/systemsx/cisd/cina/client/util/cli/CommandGetReplicaTest.java
index a6d13e26e64d1b22b53692417f17904c37da42d6..0c85866972c517cbcfc50e2e05fad6a447121d2d 100644
--- a/rtd_cina/sourceTest/java/ch/systemsx/cisd/cina/client/util/cli/CommandGetReplicaTest.java
+++ b/rtd_cina/sourceTest/java/ch/systemsx/cisd/cina/client/util/cli/CommandGetReplicaTest.java
@@ -174,16 +174,16 @@ public class CommandGetReplicaTest extends AbstractFileSystemTestCase
 
         final String rawImagesFolderName = sampleCode + "RawImages";
         ArrayList<FileInfoDssDTO> rawImagesInfos =
-                getFileInfosForPath(new File(parent, "RawImages"), "ReplicaRawImages",
-                        rawImagesFolderName);
+                getFileInfosForPath(new File(parent, "RawImages"), new File(parent,
+                        "RawImages/original"), "ReplicaRawImages", rawImagesFolderName);
         final FileInfoDssDTO[] rawImagesInfosArray =
                 (rawImagesInfos.size() > 0) ? rawImagesInfos
                         .toArray(new FileInfoDssDTO[rawImagesInfos.size()]) : new FileInfoDssDTO[0];
 
         final String metadataFolderName = sampleCode + "Metadata";
         ArrayList<FileInfoDssDTO> metadataInfos =
-                getFileInfosForPath(new File(parent, "Metadata"), "ReplicaMetadata",
-                        metadataFolderName);
+                getFileInfosForPath(new File(parent, "Metadata"), new File(parent,
+                        "Metadata/original"), "ReplicaMetadata", metadataFolderName);
         final FileInfoDssDTO[] metadataInfosArray =
                 (metadataInfos.size() > 0) ? metadataInfos.toArray(new FileInfoDssDTO[metadataInfos
                         .size()]) : new FileInfoDssDTO[0];
@@ -193,19 +193,20 @@ public class CommandGetReplicaTest extends AbstractFileSystemTestCase
                 {
                     one(dssComponent).getDataSet(sampleCode + "-RAW-IMAGES");
                     will(returnValue(dataSetDss));
-                    one(dataSetDss).listFiles("/", true);
+                    final String startPath = "/original/";
+                    one(dataSetDss).listFiles(startPath, true);
                     will(returnValue(rawImagesInfosArray));
-                    one(dataSetDss).getFile("/" + rawImagesFolderName + "/Image.txt");
+                    one(dataSetDss).getFile(startPath + rawImagesFolderName + "/Image.txt");
                     will(returnValue(new FileInputStream(new File(parent,
-                            "RawImages/ReplicaRawImages/Image.txt"))));
+                            "RawImages/original/ReplicaRawImages/Image.txt"))));
 
                     one(dssComponent).getDataSet(sampleCode + "-METADATA-NEW");
                     will(returnValue(dataSetDss));
-                    one(dataSetDss).listFiles("/", true);
+                    one(dataSetDss).listFiles(startPath, true);
                     will(returnValue(metadataInfosArray));
-                    one(dataSetDss).getFile("/" + metadataFolderName + "/Metadata.txt");
+                    one(dataSetDss).getFile(startPath + metadataFolderName + "/Metadata.txt");
                     will(returnValue(new FileInputStream(new File(parent,
-                            "Metadata/ReplicaMetadata/Metadata.txt"))));
+                            "Metadata/original/ReplicaMetadata/Metadata.txt"))));
 
                     // The command should not ask for the -METADATA-OLD dataset!
                 }
@@ -213,23 +214,20 @@ public class CommandGetReplicaTest extends AbstractFileSystemTestCase
     }
 
     @SuppressWarnings("unchecked")
-    private ArrayList<FileInfoDssDTO> getFileInfosForPath(File file, String original,
-            String replacement) throws IOException
+    private ArrayList<FileInfoDssDTO> getFileInfosForPath(File dataSetRoot, File listingRoot,
+            String original, String replacement) throws IOException
     {
         ArrayList<FileInfoDssDTO> rawFileInfos = new ArrayList<FileInfoDssDTO>();
-        if (false == file.exists())
+        if (false == dataSetRoot.exists())
         {
             return rawFileInfos;
         }
 
-        String path = file.getCanonicalPath();
-        if (false == file.isDirectory())
-        {
-            path = file.getParentFile().getCanonicalPath();
-        }
+        String dataSetRootPath = dataSetRoot.getCanonicalPath();
+        String listingRootPath = listingRoot.getCanonicalPath();
 
-        FileInfoDssBuilder builder = new FileInfoDssBuilder(path, path);
-        builder.appendFileInfosForFile(file, rawFileInfos, true);
+        FileInfoDssBuilder builder = new FileInfoDssBuilder(dataSetRootPath, listingRootPath);
+        builder.appendFileInfosForFile(listingRoot, rawFileInfos, true);
 
         // Massage the results
         ArrayList<FileInfoDssDTO> fileInfos = new ArrayList<FileInfoDssDTO>();
diff --git a/rtd_cina/sourceTest/java/ch/systemsx/cisd/cina/client/util/cli/Metadata/ReplicaMetadata/Metadata.txt b/rtd_cina/sourceTest/java/ch/systemsx/cisd/cina/client/util/cli/Metadata/original/ReplicaMetadata/Metadata.txt
similarity index 100%
rename from rtd_cina/sourceTest/java/ch/systemsx/cisd/cina/client/util/cli/Metadata/ReplicaMetadata/Metadata.txt
rename to rtd_cina/sourceTest/java/ch/systemsx/cisd/cina/client/util/cli/Metadata/original/ReplicaMetadata/Metadata.txt
diff --git a/rtd_cina/sourceTest/java/ch/systemsx/cisd/cina/client/util/cli/RawImages/ReplicaRawImages/Image.txt b/rtd_cina/sourceTest/java/ch/systemsx/cisd/cina/client/util/cli/RawImages/original/ReplicaRawImages/Image.txt
similarity index 100%
rename from rtd_cina/sourceTest/java/ch/systemsx/cisd/cina/client/util/cli/RawImages/ReplicaRawImages/Image.txt
rename to rtd_cina/sourceTest/java/ch/systemsx/cisd/cina/client/util/cli/RawImages/original/ReplicaRawImages/Image.txt