diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/ComparableCellValueHelper.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/ComparableCellValueHelper.java
similarity index 94%
rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/ComparableCellValueHelper.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/ComparableCellValueHelper.java
index efcf4cb2f4ec6e2ec126a6192346b207b8c1f6bd..38d6e1bde9ab87c71fe7a459773c242065f23061 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/ComparableCellValueHelper.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/ComparableCellValueHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.columns.specific;
+package ch.systemsx.cisd.openbis.generic.client.web.server.calculator;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DateTableCell;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DoubleTableCell;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/Row.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/Row.java
index 7c5d4ccb37a4c27ce90eb563670720bfd4a1ff1f..6b9b5dc1dbb2cac630b074f64aca9e818f6a45b9 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/Row.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/Row.java
@@ -25,7 +25,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.Map.Entry;
 
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.columns.specific.ComparableCellValueHelper;
 import ch.systemsx.cisd.openbis.generic.shared.basic.GridRowModel;
 import ch.systemsx.cisd.openbis.generic.shared.basic.IColumnDefinition;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ISerializableComparable;