diff --git a/rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/AbstractLVDataElement.java b/rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/AbstractLVDataElement.java
similarity index 96%
rename from rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/AbstractLVDataElement.java
rename to rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/AbstractLVDataElement.java
index aefae83718890eff5cf3616a0085580e189b0096..fee9c0174ea44651cdf3d690e85d72d8fa3045a4 100644
--- a/rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/AbstractLVDataElement.java
+++ b/rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/AbstractLVDataElement.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.cina.dss.labview;
+package ch.systemsx.cisd.cina.shared.labview;
 
 import javax.xml.bind.annotation.XmlElement;
 
diff --git a/rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/Cluster.java b/rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/Cluster.java
similarity index 98%
rename from rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/Cluster.java
rename to rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/Cluster.java
index 02047c7b0bb663e482b9b05c4bd7addb2c69fe55..c7a900fd01d868278ab96db3ec4151586c750d85 100644
--- a/rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/Cluster.java
+++ b/rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/Cluster.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.cina.dss.labview;
+package ch.systemsx.cisd.cina.shared.labview;
 
 import java.util.List;
 
diff --git a/rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/DBL.java b/rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/DBL.java
similarity index 95%
rename from rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/DBL.java
rename to rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/DBL.java
index 7cdd158bb20c5d789aca83c13749e2644cf99da3..0f10f8d875d07bb59fc168e4592c10d6a4c197f2 100644
--- a/rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/DBL.java
+++ b/rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/DBL.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.cina.dss.labview;
+package ch.systemsx.cisd.cina.shared.labview;
 
 import javax.xml.bind.annotation.XmlElement;
 
diff --git a/rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/I32.java b/rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/I32.java
similarity index 93%
rename from rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/I32.java
rename to rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/I32.java
index 32dc5d26f84ff8332e85c3876d661598411a6c7d..f5de27a69af974426ccf2115e4e49f1f711874de 100644
--- a/rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/I32.java
+++ b/rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/I32.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.cina.dss.labview;
+package ch.systemsx.cisd.cina.shared.labview;
 
 /**
  * @author Chandrasekhar Ramakrishnan
diff --git a/rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/LVData.java b/rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/LVData.java
similarity index 96%
rename from rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/LVData.java
rename to rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/LVData.java
index c313723638c00c3d552bab53d03452d0ec80af8b..fa37543e229a67259aed6db7ccfc848bc7501e8b 100644
--- a/rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/LVData.java
+++ b/rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/LVData.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.cina.dss.labview;
+package ch.systemsx.cisd.cina.shared.labview;
 
 import java.util.List;
 
diff --git a/rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/LVDataParser.java b/rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/LVDataParser.java
similarity index 99%
rename from rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/LVDataParser.java
rename to rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/LVDataParser.java
index 2e273aa652249ce69aa88315822e09fa1ee65eeb..4ff0e76590f699a060122bcba5231cdde41a8f71 100644
--- a/rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/LVDataParser.java
+++ b/rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/LVDataParser.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.cina.dss.labview;
+package ch.systemsx.cisd.cina.shared.labview;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/LVDataString.java b/rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/LVDataString.java
similarity index 95%
rename from rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/LVDataString.java
rename to rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/LVDataString.java
index 8710b656e748f409fd0020a795110f3e2ad8ab42..8d2cd32a8c8d3e9bcc1d18844b005fdd8548fc2f 100644
--- a/rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/LVDataString.java
+++ b/rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/LVDataString.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.cina.dss.labview;
+package ch.systemsx.cisd.cina.shared.labview;
 
 import javax.xml.bind.annotation.XmlElement;
 
diff --git a/rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/LVDataTimestamp.java b/rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/LVDataTimestamp.java
similarity index 93%
rename from rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/LVDataTimestamp.java
rename to rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/LVDataTimestamp.java
index 4a3b27413fa5c84d3015a7484cf07b67165b17f6..1dc3ca6608d63f6d42959e72ba90cc20afc2af5d 100644
--- a/rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/LVDataTimestamp.java
+++ b/rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/LVDataTimestamp.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.cina.dss.labview;
+package ch.systemsx.cisd.cina.shared.labview;
 
 /**
  * @author Chandrasekhar Ramakrishnan
diff --git a/rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/package-info.java b/rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/package-info.java
similarity index 87%
rename from rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/package-info.java
rename to rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/package-info.java
index 71816af0415e7ed03e3384ffde240b2bc2156c96..cb55cc2123d6c2ddf69a31b53c3d8ea385d4cc54 100644
--- a/rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/package-info.java
+++ b/rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/package-info.java
@@ -3,4 +3,4 @@
     {
             @javax.xml.bind.annotation.XmlNs(prefix = "lv", namespaceURI = "http://www.ni.com/LVData"),
             @javax.xml.bind.annotation.XmlNs(prefix = "xsd", namespaceURI = "http://www.w3.org/2001/XMLSchema") })
-package ch.systemsx.cisd.cina.dss.labview;
\ No newline at end of file
+package ch.systemsx.cisd.cina.shared.labview;
\ No newline at end of file
diff --git a/rtd_cina/sourceTest/java/ch/systemsx/cisd/cina/dss/labview/LVDataTest.java b/rtd_cina/sourceTest/java/ch/systemsx/cisd/cina/shared/labview/LVDataTest.java
similarity index 84%
rename from rtd_cina/sourceTest/java/ch/systemsx/cisd/cina/dss/labview/LVDataTest.java
rename to rtd_cina/sourceTest/java/ch/systemsx/cisd/cina/shared/labview/LVDataTest.java
index 5aad269a7a291631424debb088ed3b45c6288281..2e337e86944b1d8e8add2be9fb74ceb71d1224bb 100644
--- a/rtd_cina/sourceTest/java/ch/systemsx/cisd/cina/dss/labview/LVDataTest.java
+++ b/rtd_cina/sourceTest/java/ch/systemsx/cisd/cina/shared/labview/LVDataTest.java
@@ -14,13 +14,17 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.cina.dss.labview;
+package ch.systemsx.cisd.cina.shared.labview;
 
 import java.io.File;
 
 import org.testng.AssertJUnit;
 import org.testng.annotations.Test;
 
+import ch.systemsx.cisd.cina.shared.labview.Cluster;
+import ch.systemsx.cisd.cina.shared.labview.LVData;
+import ch.systemsx.cisd.cina.shared.labview.LVDataParser;
+
 /**
  * @author Chandrasekhar Ramakrishnan
  */
@@ -35,7 +39,7 @@ public class LVDataTest extends AssertJUnit
     @Test
     public void testParseFile()
     {
-        LVData lvdata = parse("sourceTest/java/ch/systemsx/cisd/cina/dss/labview/lvdata.xml");
+        LVData lvdata = parse("sourceTest/java/ch/systemsx/cisd/cina/shared/labview/lvdata.xml");
         assertNotNull(lvdata);
 
         assertEquals("8.6.1", lvdata.getVersion());
diff --git a/rtd_cina/sourceTest/java/ch/systemsx/cisd/cina/dss/labview/lvdata.xml b/rtd_cina/sourceTest/java/ch/systemsx/cisd/cina/shared/labview/lvdata.xml
similarity index 100%
rename from rtd_cina/sourceTest/java/ch/systemsx/cisd/cina/dss/labview/lvdata.xml
rename to rtd_cina/sourceTest/java/ch/systemsx/cisd/cina/shared/labview/lvdata.xml