diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/AcquisitionMain.java b/ch.psi.fda/src/main/java/ch/psi/fda/AcquisitionMain.java
index 39c225e..8961c08 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/AcquisitionMain.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/AcquisitionMain.java
@@ -60,8 +60,8 @@ import ch.psi.fda.edescriptor.EDescriptor;
 import ch.psi.fda.gui.ProgressPanel;
 import ch.psi.fda.gui.ScrollableFlowPanel;
 import ch.psi.fda.rest.InjectionModule;
+import ch.psi.fda.ui.visualizer.Visualizer;
 import ch.psi.fda.vdescriptor.VDescriptor;
-import ch.psi.fda.visualizer.Visualizer;
 import ch.psi.jcae.ChannelService;
 import ch.psi.jcae.impl.DefaultChannelService;
 
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/RemoteAcquisitionMain.java b/ch.psi.fda/src/main/java/ch/psi/fda/RemoteAcquisitionMain.java
index 1eb8bd0..239694a 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/RemoteAcquisitionMain.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/RemoteAcquisitionMain.java
@@ -59,8 +59,8 @@ import sun.misc.SignalHandler;
 import ch.psi.fda.edescriptor.EDescriptor;
 import ch.psi.fda.gui.ProgressPanel;
 import ch.psi.fda.gui.ScrollableFlowPanel;
+import ch.psi.fda.ui.visualizer.Visualizer;
 import ch.psi.fda.vdescriptor.VDescriptor;
-import ch.psi.fda.visualizer.Visualizer;
 
 @SuppressWarnings("restriction")
 public class RemoteAcquisitionMain {
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/rest/ZMQDataService.java b/ch.psi.fda/src/main/java/ch/psi/fda/rest/ZMQDataService.java
index 4bb71a4..77f7eb6 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/rest/ZMQDataService.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/rest/ZMQDataService.java
@@ -31,8 +31,7 @@ import ch.psi.fda.messages.Message;
 import com.google.common.eventbus.Subscribe;
 
 /**
- * @author ebner
- *
+ * Service to stream out messages via ZMQ
  */
 public class ZMQDataService {
 	
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/ConversionMain.java b/ch.psi.fda/src/main/java/ch/psi/fda/ui/ConversionMain.java
similarity index 99%
rename from ch.psi.fda/src/main/java/ch/psi/fda/ConversionMain.java
rename to ch.psi.fda/src/main/java/ch/psi/fda/ui/ConversionMain.java
index 2d67037..4921482 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/ConversionMain.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/ui/ConversionMain.java
@@ -17,7 +17,7 @@
  * 
  */
 
-package ch.psi.fda;
+package ch.psi.fda.ui;
 
 import java.io.File;
 import java.io.PrintWriter;
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/VisualizationMain.java b/ch.psi.fda/src/main/java/ch/psi/fda/ui/VisualizationMain.java
similarity index 98%
rename from ch.psi.fda/src/main/java/ch/psi/fda/VisualizationMain.java
rename to ch.psi.fda/src/main/java/ch/psi/fda/ui/VisualizationMain.java
index e1e0e85..a919e4b 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/VisualizationMain.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/ui/VisualizationMain.java
@@ -17,7 +17,7 @@
  * 
  */
 
-package ch.psi.fda;
+package ch.psi.fda.ui;
 
 import java.awt.FlowLayout;
 import java.awt.event.WindowAdapter;
@@ -49,11 +49,12 @@ import org.xml.sax.SAXException;
 import com.google.common.eventbus.AsyncEventBus;
 import com.google.common.eventbus.EventBus;
 
+import ch.psi.fda.DescriptorProvider;
 import ch.psi.fda.deserializer.DataDeserializer;
 import ch.psi.fda.deserializer.DataDeserializerTXT;
 import ch.psi.fda.gui.ScrollableFlowPanel;
+import ch.psi.fda.ui.visualizer.Visualizer;
 import ch.psi.fda.vdescriptor.VDescriptor;
-import ch.psi.fda.visualizer.Visualizer;
 
 /**
  * Visualize data according to the scan description
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/ViewerMain.java b/ch.psi.fda/src/main/java/ch/psi/fda/ui/VisualizationZMQMain.java
similarity index 91%
rename from ch.psi.fda/src/main/java/ch/psi/fda/ViewerMain.java
rename to ch.psi.fda/src/main/java/ch/psi/fda/ui/VisualizationZMQMain.java
index 51318a4..063ba9b 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/ViewerMain.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/ui/VisualizationZMQMain.java
@@ -17,7 +17,7 @@
  * 
  */
 
-package ch.psi.fda;
+package ch.psi.fda.ui;
 
 import java.awt.FlowLayout;
 import java.awt.Label;
@@ -41,21 +41,22 @@ import org.apache.commons.cli.ParseException;
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
 
+import ch.psi.fda.StreamClient;
 import ch.psi.fda.gui.ScrollableFlowPanel;
+import ch.psi.fda.ui.visualizer.Visualizer;
 import ch.psi.fda.vdescriptor.VDescriptor;
-import ch.psi.fda.visualizer.Visualizer;
 
 /**
- * Visualize data according to the scan description
+ * Visualize data according to the descriptor streamed via ZMQ
  */
-public class ViewerMain {
+public class VisualizationZMQMain {
 
-	private static Logger logger = Logger.getLogger(ViewerMain.class.getName());
+	private static Logger logger = Logger.getLogger(VisualizationZMQMain.class.getName());
 	
 	private Visualizer visualizer;
 	private String source;;
 	
-	public ViewerMain(String source){
+	public VisualizationZMQMain(String source){
 		this.source = source;
 	}
 	
@@ -171,7 +172,7 @@ public class ViewerMain {
 		
 		
 		try{
-			ViewerMain e = new ViewerMain("tcp://"+hostname+":"+port);
+			VisualizationZMQMain e = new VisualizationZMQMain("tcp://"+hostname+":"+port);
 			e.visualize();
 		}
 		catch(Exception ee){
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/visualizer/DataVisualization.java b/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/DataVisualization.java
similarity index 97%
rename from ch.psi.fda/src/main/java/ch/psi/fda/visualizer/DataVisualization.java
rename to ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/DataVisualization.java
index 920a1b7..5e7ad98 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/visualizer/DataVisualization.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/DataVisualization.java
@@ -17,7 +17,7 @@
  * 
  */
 
-package ch.psi.fda.visualizer;
+package ch.psi.fda.ui.visualizer;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/visualizer/SeriesDataFilter.java b/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/SeriesDataFilter.java
similarity index 96%
rename from ch.psi.fda/src/main/java/ch/psi/fda/visualizer/SeriesDataFilter.java
rename to ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/SeriesDataFilter.java
index 0a356b2..9d953d7 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/visualizer/SeriesDataFilter.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/SeriesDataFilter.java
@@ -17,7 +17,7 @@
  * 
  */
 
-package ch.psi.fda.visualizer;
+package ch.psi.fda.ui.visualizer;
 
 import ch.psi.plot.Plot;
 
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/visualizer/Visualizer.java b/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/Visualizer.java
similarity index 99%
rename from ch.psi.fda/src/main/java/ch/psi/fda/visualizer/Visualizer.java
rename to ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/Visualizer.java
index 042976a..51fc3b4 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/visualizer/Visualizer.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/Visualizer.java
@@ -17,7 +17,7 @@
  * 
  */
 
-package ch.psi.fda.visualizer;
+package ch.psi.fda.ui.visualizer;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/visualizer/XYSeriesArrayDataFilter.java b/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/XYSeriesArrayDataFilter.java
similarity index 98%
rename from ch.psi.fda/src/main/java/ch/psi/fda/visualizer/XYSeriesArrayDataFilter.java
rename to ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/XYSeriesArrayDataFilter.java
index 781dba1..18bdb30 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/visualizer/XYSeriesArrayDataFilter.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/XYSeriesArrayDataFilter.java
@@ -17,7 +17,7 @@
  * 
  */
 
-package ch.psi.fda.visualizer;
+package ch.psi.fda.ui.visualizer;
 
 import ch.psi.plot.Plot;
 
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/visualizer/XYSeriesDataFilter.java b/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/XYSeriesDataFilter.java
similarity index 98%
rename from ch.psi.fda/src/main/java/ch/psi/fda/visualizer/XYSeriesDataFilter.java
rename to ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/XYSeriesDataFilter.java
index 18b0324..3b087a1 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/visualizer/XYSeriesDataFilter.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/XYSeriesDataFilter.java
@@ -17,7 +17,7 @@
  * 
  */
 
-package ch.psi.fda.visualizer;
+package ch.psi.fda.ui.visualizer;
 
 import ch.psi.plot.Plot;
 import ch.psi.plot.xy.XYSeriesP;
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/visualizer/XYZSeriesArrayDataFilter.java b/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/XYZSeriesArrayDataFilter.java
similarity index 98%
rename from ch.psi.fda/src/main/java/ch/psi/fda/visualizer/XYZSeriesArrayDataFilter.java
rename to ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/XYZSeriesArrayDataFilter.java
index 024b33b..8a04f56 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/visualizer/XYZSeriesArrayDataFilter.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/XYZSeriesArrayDataFilter.java
@@ -17,7 +17,7 @@
  * 
  */
 
-package ch.psi.fda.visualizer;
+package ch.psi.fda.ui.visualizer;
 
 import ch.psi.plot.Plot;
 
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/visualizer/XYZSeriesDataFilter.java b/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/XYZSeriesDataFilter.java
similarity index 98%
rename from ch.psi.fda/src/main/java/ch/psi/fda/visualizer/XYZSeriesDataFilter.java
rename to ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/XYZSeriesDataFilter.java
index 57a19de..daa0ab1 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/visualizer/XYZSeriesDataFilter.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/XYZSeriesDataFilter.java
@@ -17,7 +17,7 @@
  * 
  */
 
-package ch.psi.fda.visualizer;
+package ch.psi.fda.ui.visualizer;
 
 import ch.psi.plot.Plot;
 
diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/VisualizationMainTest.java b/ch.psi.fda/src/test/java/ch/psi/fda/VisualizationMainTest.java
index 83fc7cd..9992c11 100644
--- a/ch.psi.fda/src/test/java/ch/psi/fda/VisualizationMainTest.java
+++ b/ch.psi.fda/src/test/java/ch/psi/fda/VisualizationMainTest.java
@@ -30,7 +30,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.xml.sax.SAXException;
 
-import ch.psi.fda.VisualizationMain;
+import ch.psi.fda.ui.VisualizationMain;
 
 /**
  * Testcase for visualization engine
@@ -65,7 +65,7 @@ public class VisualizationMainTest {
 	}
 
 	/**
-	 * Test method for {@link ch.psi.fda.VisualizationMain#visualize(java.io.File, java.io.File)}.
+	 * Test method for {@link ch.psi.fda.ui.VisualizationMain#visualize(java.io.File, java.io.File)}.
 	 * Test whether a null data parameter is handled correctly
 	 * @throws InterruptedException 
 	 * @throws SAXException 
@@ -77,7 +77,7 @@ public class VisualizationMainTest {
 	}
 	
 	/**
-	 * Test method for {@link ch.psi.fda.VisualizationMain#visualize(java.io.File, java.io.File)}.
+	 * Test method for {@link ch.psi.fda.ui.VisualizationMain#visualize(java.io.File, java.io.File)}.
 	 * Test whether a non existing data file is handled correctly
 	 * @throws InterruptedException 
 	 * @throws SAXException 
@@ -89,7 +89,7 @@ public class VisualizationMainTest {
 	}
 
 	/**
-	 * Test method for {@link ch.psi.fda.VisualizationMain#visualize(java.io.File, java.io.File)}.
+	 * Test method for {@link ch.psi.fda.ui.VisualizationMain#visualize(java.io.File, java.io.File)}.
 	 * Check whether null configuration file is handled correctly
 	 * @throws InterruptedException 
 	 * @throws SAXException 
@@ -101,7 +101,7 @@ public class VisualizationMainTest {
 	}
 	
 	/**
-	 * Test method for {@link ch.psi.fda.VisualizationMain#visualize(java.io.File, java.io.File)}.
+	 * Test method for {@link ch.psi.fda.ui.VisualizationMain#visualize(java.io.File, java.io.File)}.
 	 * Test correct visualization
 	 * @throws InterruptedException 
 	 * @throws SAXException 
@@ -114,7 +114,7 @@ public class VisualizationMainTest {
 	
 	/**
 	 * Test whether main can automatically determine the configuration file for a given data file
-	 * Test method for {@link ch.psi.fda.VisualizationMain#main(String[])}
+	 * Test method for {@link ch.psi.fda.ui.VisualizationMain#main(String[])}
 	 */
 	@Test
 	public void testMain(){
diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/visualizer/DataVisualizerTest.java b/ch.psi.fda/src/test/java/ch/psi/fda/visualizer/DataVisualizerTest.java
index 1f900f6..90860bb 100644
--- a/ch.psi.fda/src/test/java/ch/psi/fda/visualizer/DataVisualizerTest.java
+++ b/ch.psi.fda/src/test/java/ch/psi/fda/visualizer/DataVisualizerTest.java
@@ -37,6 +37,7 @@ import ch.psi.fda.messages.DataMessage;
 import ch.psi.fda.messages.EndOfStreamMessage;
 import ch.psi.fda.messages.Metadata;
 import ch.psi.fda.messages.StreamDelimiterMessage;
+import ch.psi.fda.ui.visualizer.Visualizer;
 import ch.psi.fda.vdescriptor.VDescriptor;
 import ch.psi.fda.vdescriptor.XYSeries;
 import ch.psi.fda.vdescriptor.XYZSeries;