diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractTabularDataGraphServlet.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractTabularDataGraphServlet.java
similarity index 100%
rename from screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractTabularDataGraphServlet.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractTabularDataGraphServlet.java
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/FileTabularDataGraphServlet.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/FileTabularDataGraphServlet.java
similarity index 95%
rename from screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/FileTabularDataGraphServlet.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/FileTabularDataGraphServlet.java
index df7ed6ce97e2c3288d1282b4aa8e168bfe8af24a..ef67dc98f602de06c3bace97bb8d2596e8b4248d 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/FileTabularDataGraphServlet.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/FileTabularDataGraphServlet.java
@@ -21,7 +21,7 @@ import java.io.IOException;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
 import ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.ITabularData;
-import ch.systemsx.cisd.utils.CsvFileReaderHelper;
+import ch.systemsx.cisd.openbis.dss.generic.shared.utils.CsvFileReaderHelper;
 
 /**
  * @author Chandrasekhar Ramakrishnan
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/AbstractTabularDataGraph.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/AbstractTabularDataGraph.java
similarity index 100%
rename from screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/AbstractTabularDataGraph.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/AbstractTabularDataGraph.java
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/HeatmapDataset.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/HeatmapDataset.java
similarity index 100%
rename from screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/HeatmapDataset.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/HeatmapDataset.java
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/ITabularDataGraph.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/ITabularDataGraph.java
similarity index 100%
rename from screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/ITabularDataGraph.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/ITabularDataGraph.java
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/SpreadsheetColumnTickUnit.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/SpreadsheetColumnTickUnit.java
similarity index 92%
rename from screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/SpreadsheetColumnTickUnit.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/SpreadsheetColumnTickUnit.java
index b5c0e8682de754ad14a54e7e765185c426e0277d..2e36820d5da762c3bcb4bb65602fd41437dd00c1 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/SpreadsheetColumnTickUnit.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/SpreadsheetColumnTickUnit.java
@@ -18,7 +18,7 @@ package ch.systemsx.cisd.openbis.dss.generic.server.graph;
 
 import org.jfree.chart.axis.NumberTickUnit;
 
-import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.PlateUtils;
+import ch.systemsx.cisd.common.geometry.ConversionUtils;
 
 /**
  * @author Chandrasekhar Ramakrishnan
@@ -62,6 +62,6 @@ public class SpreadsheetColumnTickUnit extends NumberTickUnit
         {
             return "";
         }
-        return PlateUtils.translateRowNumberIntoLetterCode((int) value);
+        return ConversionUtils.translateRowNumberIntoLetterCode((int) value);
     }
 }
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataGraphCollectionConfiguration.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataGraphCollectionConfiguration.java
similarity index 97%
rename from screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataGraphCollectionConfiguration.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataGraphCollectionConfiguration.java
index 572eb11bb7e92f0a21584dcc5031ca2152abdedd..9e6ba0f63d3809da4cbfd61ef686cf45362e88da 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataGraphCollectionConfiguration.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataGraphCollectionConfiguration.java
@@ -30,12 +30,11 @@ import ch.systemsx.cisd.common.exceptions.EnvironmentFailureException;
 import ch.systemsx.cisd.common.utilities.PropertyParametersUtil;
 import ch.systemsx.cisd.common.utilities.PropertyParametersUtil.SectionProperties;
 import ch.systemsx.cisd.common.utilities.PropertyUtils;
-import ch.systemsx.cisd.openbis.dss.generic.server.TabularDataGraphServlet;
 import ch.systemsx.cisd.openbis.dss.generic.server.graph.TabularDataGraphConfiguration.GraphType;
 import ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.ITabularData;
 import ch.systemsx.cisd.openbis.dss.generic.shared.utils.CodeAndLabelUtil;
+import ch.systemsx.cisd.openbis.dss.generic.shared.utils.CsvFileReaderHelper.ICsvFileReaderConfiguration;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.CodeAndLabel;
-import ch.systemsx.cisd.utils.CsvFileReaderHelper.ICsvFileReaderConfiguration;
 
 /**
  * @author Chandrasekhar Ramakrishnan
@@ -183,10 +182,10 @@ public class TabularDataGraphCollectionConfiguration implements ICsvFileReaderCo
                 // specified.
                 CodeAndLabel xAxis =
                         getCodeAndLabelWithDefault(props, X_AXIS_KEY,
-                                TabularDataGraphServlet.WELL_ROW_COLUMN);
+                                "Row");
                 CodeAndLabel yAxis =
                         getCodeAndLabelWithDefault(props, Y_AXIS_KEY,
-                                TabularDataGraphServlet.WELL_COLUMN_COLUMN);
+                                "Column");
                 CodeAndLabel zAxis = getCodeAndLabel(props, COLUMN_KEY);
                 if (xAxis.equals(yAxis))
                 {
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataGraphConfiguration.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataGraphConfiguration.java
similarity index 100%
rename from screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataGraphConfiguration.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataGraphConfiguration.java
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHeatmap.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHeatmap.java
similarity index 100%
rename from screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHeatmap.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHeatmap.java
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHeatmapConfiguration.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHeatmapConfiguration.java
similarity index 100%
rename from screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHeatmapConfiguration.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHeatmapConfiguration.java
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHistogram.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHistogram.java
similarity index 100%
rename from screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHistogram.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHistogram.java
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHistogramConfiguration.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHistogramConfiguration.java
similarity index 100%
rename from screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHistogramConfiguration.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHistogramConfiguration.java
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataScatterplot.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataScatterplot.java
similarity index 100%
rename from screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataScatterplot.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataScatterplot.java
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataScatterplotConfiguration.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataScatterplotConfiguration.java
similarity index 100%
rename from screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataScatterplotConfiguration.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataScatterplotConfiguration.java
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataTickUnit.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataTickUnit.java
similarity index 100%
rename from screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataTickUnit.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataTickUnit.java
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataTickUnitSource.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataTickUnitSource.java
similarity index 100%
rename from screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataTickUnitSource.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataTickUnitSource.java
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/FileBasedImageAnalysisGraphReportingPlugin.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/FileBasedImageAnalysisGraphReportingPlugin.java
similarity index 100%
rename from screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/FileBasedImageAnalysisGraphReportingPlugin.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/FileBasedImageAnalysisGraphReportingPlugin.java
diff --git a/screening/source/java/ch/systemsx/cisd/utils/CsvFileReaderHelper.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CsvFileReaderHelper.java
similarity index 98%
rename from screening/source/java/ch/systemsx/cisd/utils/CsvFileReaderHelper.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CsvFileReaderHelper.java
index 2a752f299c1742b98148b87f8aacf41d4a2d615f..22f3454155aae6429c3a9d1791abafc728a84ea9 100644
--- a/screening/source/java/ch/systemsx/cisd/utils/CsvFileReaderHelper.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CsvFileReaderHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.utils;
+package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/featurevector/CsvFeatureVectorMigrator.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/featurevector/CsvFeatureVectorMigrator.java
index 94b201d5affee94001fc368241c32e172234c36a..daa7fa233ab90696109c72ea78c9bd492e6e5092 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/featurevector/CsvFeatureVectorMigrator.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/featurevector/CsvFeatureVectorMigrator.java
@@ -28,8 +28,8 @@ import ch.systemsx.cisd.openbis.dss.etl.HCSContainerDatasetInfo;
 import ch.systemsx.cisd.openbis.dss.etl.dataaccess.IImagingQueryDAO;
 import ch.systemsx.cisd.openbis.dss.etl.featurevector.CsvFeatureVectorParser.CsvFeatureVectorParserConfiguration;
 import ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.DatasetFileLines;
+import ch.systemsx.cisd.openbis.dss.generic.shared.utils.CsvFileReaderHelper;
 import ch.systemsx.cisd.openbis.generic.shared.dto.SimpleDataSetInformationDTO;
-import ch.systemsx.cisd.utils.CsvFileReaderHelper;
 
 /**
  * @author Chandrasekhar Ramakrishnan
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/featurevector/CsvFeatureVectorParser.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/featurevector/CsvFeatureVectorParser.java
index 446112863690fb5ed5dbbf174969219e1788a7a3..976e31e6473da892fcc8564cc0f6545823370656 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/featurevector/CsvFeatureVectorParser.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/featurevector/CsvFeatureVectorParser.java
@@ -29,10 +29,10 @@ import ch.systemsx.cisd.common.utilities.Counters;
 import ch.systemsx.cisd.openbis.dss.etl.dto.api.impl.FeatureDefinition;
 import ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.DatasetFileLines;
 import ch.systemsx.cisd.openbis.dss.generic.shared.utils.CodeAndLabelUtil;
+import ch.systemsx.cisd.openbis.dss.generic.shared.utils.CsvFileReaderHelper;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.CodeAndLabel;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.WellLocation;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.imaging.dataaccess.ImgFeatureDefDTO;
-import ch.systemsx.cisd.utils.CsvFileReaderHelper;
 
 /**
  * Converts feature vectors from CSV files to {@link FeatureDefinition} objects.
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/featurevector/FeatureVectorStorageProcessorConfiguration.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/featurevector/FeatureVectorStorageProcessorConfiguration.java
index 19e5942378ef698975f6d72d8c740285a3d99c37..e1a2ed592a0c4f8e74ac3917f9f7042bf7b183c7 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/featurevector/FeatureVectorStorageProcessorConfiguration.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/featurevector/FeatureVectorStorageProcessorConfiguration.java
@@ -23,7 +23,7 @@ import java.util.Set;
 
 import ch.rinn.restrictions.Private;
 import ch.systemsx.cisd.common.utilities.PropertyUtils;
-import ch.systemsx.cisd.utils.CsvFileReaderHelper.ICsvFileReaderConfiguration;
+import ch.systemsx.cisd.openbis.dss.generic.shared.utils.CsvFileReaderHelper.ICsvFileReaderConfiguration;
 
 class FeatureVectorStorageProcessorConfiguration implements
         ICsvFileReaderConfiguration