diff --git a/src/main/java/ch/psi/daq/rest/DaqRestConfiguration.java b/src/main/java/ch/psi/daq/rest/DaqRestConfiguration.java
index c4998c6..799c52d 100644
--- a/src/main/java/ch/psi/daq/rest/DaqRestConfiguration.java
+++ b/src/main/java/ch/psi/daq/rest/DaqRestConfiguration.java
@@ -5,7 +5,7 @@ import org.springframework.context.annotation.Configuration;
 
 import ch.psi.daq.common.statistic.StorelessStatistics;
 import ch.psi.daq.domain.cassandra.ChannelEvent;
-import ch.psi.daq.hazelcast.common.query.processor.QueryProcessor;
+import ch.psi.daq.hazelcast.query.processor.QueryProcessor;
 import ch.psi.daq.rest.model.PropertyFilterMixin;
 import ch.psi.daq.test.rest.query.DummyQueryProcessor;
 
diff --git a/src/main/java/ch/psi/daq/rest/DaqRestController.java b/src/main/java/ch/psi/daq/rest/DaqRestController.java
index 626b612..9747f1d 100644
--- a/src/main/java/ch/psi/daq/rest/DaqRestController.java
+++ b/src/main/java/ch/psi/daq/rest/DaqRestController.java
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import ch.psi.daq.domain.cassandra.DataEvent;
-import ch.psi.daq.hazelcast.common.query.processor.QueryProcessor;
+import ch.psi.daq.hazelcast.query.processor.QueryProcessor;
 import ch.psi.daq.rest.queries.AbstractQuery;
 import ch.psi.daq.rest.queries.PulseRangeQuery;
 import ch.psi.daq.rest.queries.TimeRangeQuery;
diff --git a/src/main/java/ch/psi/daq/rest/queries/AbstractQuery.java b/src/main/java/ch/psi/daq/rest/queries/AbstractQuery.java
index 62e3be3..1714195 100644
--- a/src/main/java/ch/psi/daq/rest/queries/AbstractQuery.java
+++ b/src/main/java/ch/psi/daq/rest/queries/AbstractQuery.java
@@ -8,10 +8,10 @@ import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.springframework.util.Assert;
 
 import ch.psi.daq.cassandra.reader.Ordering;
-import ch.psi.daq.hazelcast.common.query.Aggregation;
-import ch.psi.daq.hazelcast.common.query.AggregationType;
-import ch.psi.daq.hazelcast.common.query.Query;
-import ch.psi.daq.hazelcast.common.query.bin.BinIntervalCalculator;
+import ch.psi.daq.hazelcast.query.Aggregation;
+import ch.psi.daq.hazelcast.query.AggregationType;
+import ch.psi.daq.hazelcast.query.Query;
+import ch.psi.daq.hazelcast.query.bin.BinIntervalCalculator;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/ch/psi/daq/rest/queries/PulseRangeQuery.java b/src/main/java/ch/psi/daq/rest/queries/PulseRangeQuery.java
index fb33172..baf3d18 100644
--- a/src/main/java/ch/psi/daq/rest/queries/PulseRangeQuery.java
+++ b/src/main/java/ch/psi/daq/rest/queries/PulseRangeQuery.java
@@ -6,9 +6,9 @@ import java.util.List;
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 import ch.psi.daq.cassandra.reader.Ordering;
-import ch.psi.daq.hazelcast.common.query.Aggregation;
-import ch.psi.daq.hazelcast.common.query.AggregationType;
-import ch.psi.daq.hazelcast.common.query.range.QueryRange;
+import ch.psi.daq.hazelcast.query.Aggregation;
+import ch.psi.daq.hazelcast.query.AggregationType;
+import ch.psi.daq.hazelcast.query.range.QueryRange;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/ch/psi/daq/rest/queries/TimeRangeQuery.java b/src/main/java/ch/psi/daq/rest/queries/TimeRangeQuery.java
index 7edbebc..abddaf1 100644
--- a/src/main/java/ch/psi/daq/rest/queries/TimeRangeQuery.java
+++ b/src/main/java/ch/psi/daq/rest/queries/TimeRangeQuery.java
@@ -13,9 +13,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import ch.psi.daq.cassandra.reader.Ordering;
-import ch.psi.daq.hazelcast.common.query.Aggregation;
-import ch.psi.daq.hazelcast.common.query.AggregationType;
-import ch.psi.daq.hazelcast.common.query.range.QueryRange;
+import ch.psi.daq.hazelcast.query.Aggregation;
+import ch.psi.daq.hazelcast.query.AggregationType;
+import ch.psi.daq.hazelcast.query.range.QueryRange;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/test/java/ch/psi/daq/test/rest/controller/DaqControllerTest.java b/src/test/java/ch/psi/daq/test/rest/controller/DaqControllerTest.java
index 924b32b..bd8e22f 100644
--- a/src/test/java/ch/psi/daq/test/rest/controller/DaqControllerTest.java
+++ b/src/test/java/ch/psi/daq/test/rest/controller/DaqControllerTest.java
@@ -11,7 +11,7 @@ import org.springframework.test.web.servlet.result.MockMvcResultHandlers;
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
 
 import ch.psi.daq.cassandra.reader.Ordering;
-import ch.psi.daq.hazelcast.common.query.AggregationType;
+import ch.psi.daq.hazelcast.query.AggregationType;
 import ch.psi.daq.rest.queries.PulseRangeQuery;
 import ch.psi.daq.rest.queries.TimeRangeQuery;
 import ch.psi.daq.test.rest.AbstractDaqRestTest;
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 724ca96..fd96466 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
@@ -12,8 +12,8 @@ import java.util.stream.Stream;
 
 import ch.psi.daq.domain.cassandra.ChannelEvent;
 import ch.psi.daq.domain.cassandra.DataEvent;
-import ch.psi.daq.hazelcast.common.query.Query;
-import ch.psi.daq.hazelcast.common.query.processor.QueryProcessor;
+import ch.psi.daq.hazelcast.query.Query;
+import ch.psi.daq.hazelcast.query.processor.QueryProcessor;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;