diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/rest/FdaqRequest.java b/ch.psi.fda/src/main/java/ch/psi/fda/rest/model/FdaqRequest.java
similarity index 94%
rename from ch.psi.fda/src/main/java/ch/psi/fda/rest/FdaqRequest.java
rename to ch.psi.fda/src/main/java/ch/psi/fda/rest/model/FdaqRequest.java
index 3880164..da52764 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/rest/FdaqRequest.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/rest/model/FdaqRequest.java
@@ -16,12 +16,10 @@
  * along with this code. If not, see <http://www.gnu.org/licenses/>.
  * 
  */
-package ch.psi.fda.rest;
+package ch.psi.fda.rest.model;
 
 import javax.xml.bind.annotation.XmlRootElement;
 
-import ch.psi.fda.rest.model.Stream;
-
 @XmlRootElement
 public class FdaqRequest {
 	private String filename;
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/rest/services/FDAQService.java b/ch.psi.fda/src/main/java/ch/psi/fda/rest/services/FDAQService.java
index 4e62339..58058d3 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/rest/services/FDAQService.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/rest/services/FDAQService.java
@@ -33,7 +33,7 @@ import com.google.common.eventbus.AsyncEventBus;
 import com.google.common.eventbus.EventBus;
 
 import ch.psi.fda.fdaq.FdaqService;
-import ch.psi.fda.rest.FdaqRequest;
+import ch.psi.fda.rest.model.FdaqRequest;
 import ch.psi.fda.serializer.SerializerTXT;
 
 @Path("fdaq")