diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/rest/client/RemoteAcquisitionMain.java b/ch.psi.fda/src/main/java/ch/psi/fda/RemoteAcquisitionMain.java
similarity index 98%
rename from ch.psi.fda/src/main/java/ch/psi/fda/rest/client/RemoteAcquisitionMain.java
rename to ch.psi.fda/src/main/java/ch/psi/fda/RemoteAcquisitionMain.java
index 71837ab..6565655 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/rest/client/RemoteAcquisitionMain.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/RemoteAcquisitionMain.java
@@ -17,7 +17,7 @@
  * 
  */
 
-package ch.psi.fda.rest.client;
+package ch.psi.fda;
 
 import java.awt.FlowLayout;
 import java.awt.event.ActionEvent;
@@ -61,6 +61,8 @@ import ch.psi.fda.gui.ScrollableFlowPanel;
 import ch.psi.fda.model.ModelManager;
 import ch.psi.fda.model.v1.Configuration;
 import ch.psi.fda.model.v1.Data;
+import ch.psi.fda.rest.ControlClient;
+import ch.psi.fda.rest.StreamClient;
 import ch.psi.fda.visualizer.Visualizer;
 
 @SuppressWarnings("restriction")
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/ViewerMain.java b/ch.psi.fda/src/main/java/ch/psi/fda/ViewerMain.java
index 769764c..71d1807 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/ViewerMain.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/ViewerMain.java
@@ -45,7 +45,7 @@ import com.google.common.eventbus.Subscribe;
 import ch.psi.fda.aq.VisualizationMapper;
 import ch.psi.fda.gui.ScrollableFlowPanel;
 import ch.psi.fda.model.v1.Visualization;
-import ch.psi.fda.rest.client.StreamClient;
+import ch.psi.fda.rest.StreamClient;
 import ch.psi.fda.visualizer.Visualizer;
 
 /**
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/rest/client/ControlClient.java b/ch.psi.fda/src/test/java/ch/psi/fda/rest/ControlClient.java
similarity index 98%
rename from ch.psi.fda/src/main/java/ch/psi/fda/rest/client/ControlClient.java
rename to ch.psi.fda/src/test/java/ch/psi/fda/rest/ControlClient.java
index 1ad93d5..fd26756 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/rest/client/ControlClient.java
+++ b/ch.psi.fda/src/test/java/ch/psi/fda/rest/ControlClient.java
@@ -16,7 +16,7 @@
  * along with this code. If not, see <http://www.gnu.org/licenses/>.
  * 
  */
-package ch.psi.fda.rest.client;
+package ch.psi.fda.rest;
 
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/rest/client/StreamClient.java b/ch.psi.fda/src/test/java/ch/psi/fda/rest/StreamClient.java
similarity index 98%
rename from ch.psi.fda/src/main/java/ch/psi/fda/rest/client/StreamClient.java
rename to ch.psi.fda/src/test/java/ch/psi/fda/rest/StreamClient.java
index 6d59dad..ed13ad9 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/rest/client/StreamClient.java
+++ b/ch.psi.fda/src/test/java/ch/psi/fda/rest/StreamClient.java
@@ -16,7 +16,7 @@
  * along with this code. If not, see <http://www.gnu.org/licenses/>.
  * 
  */
-package ch.psi.fda.rest.client;
+package ch.psi.fda.rest;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;