diff --git a/src/main/java/ch/psi/daq/rest/controller/DaqRestController.java b/src/main/java/ch/psi/daq/rest/controller/DaqRestController.java
index da4c919..f629eed 100644
--- a/src/main/java/ch/psi/daq/rest/controller/DaqRestController.java
+++ b/src/main/java/ch/psi/daq/rest/controller/DaqRestController.java
@@ -26,10 +26,10 @@ import ch.psi.daq.cassandra.writer.CassandraWriter;
 import ch.psi.daq.domain.DataType;
 import ch.psi.daq.domain.cassandra.ChannelEvent;
 import ch.psi.daq.domain.cassandra.DataEvent;
-import ch.psi.daq.query.query.model.AbstractQuery;
-import ch.psi.daq.query.query.model.PulseRangeQuery;
-import ch.psi.daq.query.query.model.TimeRangeQuery;
-import ch.psi.daq.query.query.processor.QueryProcessor;
+import ch.psi.daq.query.model.AbstractQuery;
+import ch.psi.daq.query.model.PulseRangeQuery;
+import ch.psi.daq.query.model.TimeRangeQuery;
+import ch.psi.daq.query.processor.QueryProcessor;
 import ch.psi.daq.rest.response.ResponseStreamWriter;
 
 @RestController
diff --git a/src/main/java/ch/psi/daq/rest/response/ResponseStreamWriter.java b/src/main/java/ch/psi/daq/rest/response/ResponseStreamWriter.java
index 2f26e6e..6979633 100644
--- a/src/main/java/ch/psi/daq/rest/response/ResponseStreamWriter.java
+++ b/src/main/java/ch/psi/daq/rest/response/ResponseStreamWriter.java
@@ -23,7 +23,7 @@ import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter;
 import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
 
 import ch.psi.daq.domain.cassandra.DataEvent;
-import ch.psi.daq.query.query.model.AbstractQuery;
+import ch.psi.daq.query.model.AbstractQuery;
 
 /**
  * Takes a Java 8 stream and writes it to the output stream provided by the {@link ServletResponse}
diff --git a/src/test/java/ch/psi/daq/test/rest/controller/DaqRestControllerTest.java b/src/test/java/ch/psi/daq/test/rest/controller/DaqRestControllerTest.java
index 028f6c3..c4ee29e 100644
--- a/src/test/java/ch/psi/daq/test/rest/controller/DaqRestControllerTest.java
+++ b/src/test/java/ch/psi/daq/test/rest/controller/DaqRestControllerTest.java
@@ -15,12 +15,12 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 
 import ch.psi.daq.cassandra.reader.Ordering;
-import ch.psi.daq.query.query.model.AggregationType;
-import ch.psi.daq.query.query.model.BinningStrategyEnum;
-import ch.psi.daq.query.query.model.PulseRangeQuery;
-import ch.psi.daq.query.query.model.TimeRangeQuery;
-import ch.psi.daq.query.query.range.QueryRange;
-import ch.psi.daq.query.query.range.QueryRangeImpl;
+import ch.psi.daq.query.model.AggregationType;
+import ch.psi.daq.query.model.BinningStrategyEnum;
+import ch.psi.daq.query.model.PulseRangeQuery;
+import ch.psi.daq.query.model.TimeRangeQuery;
+import ch.psi.daq.query.range.QueryRange;
+import ch.psi.daq.query.range.QueryRangeImpl;
 import ch.psi.daq.test.rest.AbstractDaqRestTest;
 
 /**
diff --git a/src/test/java/ch/psi/daq/test/rest/queries/AbstractQueryTestTest.java b/src/test/java/ch/psi/daq/test/rest/queries/AbstractQueryTestTest.java
index b64bae5..f36d166 100644
--- a/src/test/java/ch/psi/daq/test/rest/queries/AbstractQueryTestTest.java
+++ b/src/test/java/ch/psi/daq/test/rest/queries/AbstractQueryTestTest.java
@@ -12,14 +12,14 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 
 import ch.psi.daq.cassandra.reader.Ordering;
-import ch.psi.daq.query.query.bin.BinningStrategyBinCount;
-import ch.psi.daq.query.query.bin.BinningStrategyLengthPulse;
-import ch.psi.daq.query.query.bin.BinningStrategyLengthTime;
-import ch.psi.daq.query.query.model.AggregationType;
-import ch.psi.daq.query.query.model.BinningStrategyEnum;
-import ch.psi.daq.query.query.model.TimeRangeQuery;
-import ch.psi.daq.query.query.range.QueryRange;
-import ch.psi.daq.query.query.range.QueryRangeImpl;
+import ch.psi.daq.query.bin.BinningStrategyBinCount;
+import ch.psi.daq.query.bin.BinningStrategyLengthPulse;
+import ch.psi.daq.query.bin.BinningStrategyLengthTime;
+import ch.psi.daq.query.model.AggregationType;
+import ch.psi.daq.query.model.BinningStrategyEnum;
+import ch.psi.daq.query.model.TimeRangeQuery;
+import ch.psi.daq.query.range.QueryRange;
+import ch.psi.daq.query.range.QueryRangeImpl;
 
 @RunWith(BlockJUnit4ClassRunner.class)
 public class AbstractQueryTestTest extends AbstractQueryTest {
diff --git a/src/test/java/ch/psi/daq/test/rest/queries/TimeRangeQueryTest.java b/src/test/java/ch/psi/daq/test/rest/queries/TimeRangeQueryTest.java
index 12f6a2a..b610637 100644
--- a/src/test/java/ch/psi/daq/test/rest/queries/TimeRangeQueryTest.java
+++ b/src/test/java/ch/psi/daq/test/rest/queries/TimeRangeQueryTest.java
@@ -12,11 +12,11 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 
 import ch.psi.daq.cassandra.reader.Ordering;
-import ch.psi.daq.query.query.model.AggregationType;
-import ch.psi.daq.query.query.model.BinningStrategyEnum;
-import ch.psi.daq.query.query.model.TimeRangeQuery;
-import ch.psi.daq.query.query.range.QueryRange;
-import ch.psi.daq.query.query.range.QueryRangeImpl;
+import ch.psi.daq.query.model.AggregationType;
+import ch.psi.daq.query.model.BinningStrategyEnum;
+import ch.psi.daq.query.model.TimeRangeQuery;
+import ch.psi.daq.query.range.QueryRange;
+import ch.psi.daq.query.range.QueryRangeImpl;
 
 @RunWith(BlockJUnit4ClassRunner.class)
 public class TimeRangeQueryTest extends AbstractQueryTest {
diff --git a/src/test/java/ch/psi/daq/test/rest/query/DummyQueryProcessor.java b/src/test/java/ch/psi/daq/test/rest/query/DummyQueryProcessor.java
index f501f4f..1040166 100644
--- a/src/test/java/ch/psi/daq/test/rest/query/DummyQueryProcessor.java
+++ b/src/test/java/ch/psi/daq/test/rest/query/DummyQueryProcessor.java
@@ -15,8 +15,8 @@ import com.google.common.collect.Maps;
 
 import ch.psi.daq.domain.cassandra.ChannelEvent;
 import ch.psi.daq.domain.cassandra.DataEvent;
-import ch.psi.daq.query.query.model.Query;
-import ch.psi.daq.query.query.processor.QueryProcessor;
+import ch.psi.daq.query.model.Query;
+import ch.psi.daq.query.processor.QueryProcessor;
 
 /**
  * @author zellweger_c