diff --git a/.project b/.project
index 3a3b8a1..e824f9f 100644
--- a/.project
+++ b/.project
@@ -5,11 +5,6 @@
 	<projects>
 	</projects>
 	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -25,6 +20,5 @@
 		<nature>org.springframework.ide.eclipse.core.springnature</nature>
 		<nature>org.springsource.ide.eclipse.gradle.core.nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 	</natures>
 </projectDescription>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index c0287d3..77432af 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,5 @@
 #
-#Fri Jun 26 16:19:32 CEST 2015
+#Wed Jul 08 14:23:53 CEST 2015
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
diff --git a/build.gradle b/build.gradle
index 346adb0..33ebb31 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,7 @@ applicationDefaultJvmArgs = [
 //}
 
 dependencies {
-   compile (project(':ch.psi.daq.hazelcast'))
+   compile (project(':ch.psi.daq.query'))
    compile libraries.spring_boot_starter_web
    compile libraries.commons_lang
 
diff --git a/src/main/java/ch/psi/daq/rest/config/RestConfig.java b/src/main/java/ch/psi/daq/rest/config/RestConfig.java
index 7b30cdf..7d3a2c9 100644
--- a/src/main/java/ch/psi/daq/rest/config/RestConfig.java
+++ b/src/main/java/ch/psi/daq/rest/config/RestConfig.java
@@ -19,8 +19,8 @@ import com.google.common.collect.Sets;
 
 import ch.psi.daq.common.statistic.StorelessStatistics;
 import ch.psi.daq.domain.cassandra.ChannelEvent;
-import ch.psi.daq.hazelcast.config.HazelcastClientConfig;
-import ch.psi.daq.hazelcast.config.HazelcastConfig;
+import ch.psi.daq.query.config.HazelcastClientConfig;
+import ch.psi.daq.query.config.HazelcastConfig;
 import ch.psi.daq.rest.model.PropertyFilterMixin;
 import ch.psi.daq.rest.response.ResponseStreamWriter;
 
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 8b537e8..da4c919 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.hazelcast.query.AbstractQuery;
-import ch.psi.daq.hazelcast.query.PulseRangeQuery;
-import ch.psi.daq.hazelcast.query.TimeRangeQuery;
-import ch.psi.daq.hazelcast.query.processor.QueryProcessor;
+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.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 11a2893..2f26e6e 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.hazelcast.query.AbstractQuery;
+import ch.psi.daq.query.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 8d9f47a..028f6c3 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.hazelcast.query.AggregationType;
-import ch.psi.daq.hazelcast.query.BinningStrategyEnum;
-import ch.psi.daq.hazelcast.query.PulseRangeQuery;
-import ch.psi.daq.hazelcast.query.TimeRangeQuery;
-import ch.psi.daq.hazelcast.query.range.QueryRange;
-import ch.psi.daq.hazelcast.query.range.QueryRangeImpl;
+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.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 93b5e0a..b64bae5 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.hazelcast.query.AggregationType;
-import ch.psi.daq.hazelcast.query.BinningStrategyEnum;
-import ch.psi.daq.hazelcast.query.TimeRangeQuery;
-import ch.psi.daq.hazelcast.query.bin.BinningStrategyBinCount;
-import ch.psi.daq.hazelcast.query.bin.BinningStrategyLengthPulse;
-import ch.psi.daq.hazelcast.query.bin.BinningStrategyLengthTime;
-import ch.psi.daq.hazelcast.query.range.QueryRange;
-import ch.psi.daq.hazelcast.query.range.QueryRangeImpl;
+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;
 
 @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 931d90e..12f6a2a 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.hazelcast.query.AggregationType;
-import ch.psi.daq.hazelcast.query.BinningStrategyEnum;
-import ch.psi.daq.hazelcast.query.TimeRangeQuery;
-import ch.psi.daq.hazelcast.query.range.QueryRange;
-import ch.psi.daq.hazelcast.query.range.QueryRangeImpl;
+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;
 
 @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 0ffa7be..f501f4f 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.hazelcast.query.Query;
-import ch.psi.daq.hazelcast.query.processor.QueryProcessor;
+import ch.psi.daq.query.query.model.Query;
+import ch.psi.daq.query.query.processor.QueryProcessor;
 
 /**
  * @author zellweger_c