diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/RemoteAcquisitionMain.java b/ch.psi.fda/src/main/java/ch/psi/fda/ui/RemoteAcquisitionMain.java
similarity index 99%
rename from ch.psi.fda/src/main/java/ch/psi/fda/RemoteAcquisitionMain.java
rename to ch.psi.fda/src/main/java/ch/psi/fda/ui/RemoteAcquisitionMain.java
index ffb8dc7..8805b39 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/RemoteAcquisitionMain.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/ui/RemoteAcquisitionMain.java
@@ -17,7 +17,7 @@
  * 
  */
 
-package ch.psi.fda;
+package ch.psi.fda.ui;
 
 import java.awt.FlowLayout;
 import java.awt.event.ActionEvent;
@@ -57,6 +57,7 @@ import com.google.common.eventbus.Subscribe;
 
 import sun.misc.Signal;
 import sun.misc.SignalHandler;
+import ch.psi.fda.DescriptorProvider;
 import ch.psi.fda.edescriptor.EDescriptor;
 import ch.psi.fda.gui.ProgressPanel;
 import ch.psi.fda.gui.ScrollableFlowPanel;
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/RestClient.java b/ch.psi.fda/src/main/java/ch/psi/fda/ui/RestClient.java
similarity index 98%
rename from ch.psi.fda/src/main/java/ch/psi/fda/RestClient.java
rename to ch.psi.fda/src/main/java/ch/psi/fda/ui/RestClient.java
index ee7a8f3..52e8ca0 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/RestClient.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/ui/RestClient.java
@@ -16,7 +16,7 @@
  * along with this code. If not, see <http://www.gnu.org/licenses/>.
  * 
  */
-package ch.psi.fda;
+package ch.psi.fda.ui;
 
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/StreamClient.java b/ch.psi.fda/src/main/java/ch/psi/fda/ui/StreamClient.java
similarity index 99%
rename from ch.psi.fda/src/main/java/ch/psi/fda/StreamClient.java
rename to ch.psi.fda/src/main/java/ch/psi/fda/ui/StreamClient.java
index 60dddf1..60d11ff 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/StreamClient.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/ui/StreamClient.java
@@ -16,7 +16,7 @@
  * along with this code. If not, see <http://www.gnu.org/licenses/>.
  * 
  */
-package ch.psi.fda;
+package ch.psi.fda.ui;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/ui/VisualizationZMQMain.java b/ch.psi.fda/src/main/java/ch/psi/fda/ui/VisualizationZMQMain.java
index 063ba9b..ae01183 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/ui/VisualizationZMQMain.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/ui/VisualizationZMQMain.java
@@ -41,7 +41,6 @@ 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;