diff --git a/Changes b/Changes
index 0fee626..6f3bcf4 100644
--- a/Changes
+++ b/Changes
@@ -7,7 +7,8 @@
 	  renamed KorapDocument to model/AbstractDocument,
 	  renamed KorapMatch to response/Match,
 	  renamed KorapIndex to KrillIndex,
-	  renamed KorapCollection to KrillCollection (diewald)
+	  renamed KorapCollection to KrillCollection,
+	  move collector classes from index to response (diewald)
         - [documentation] Improved documentation for API classes (diewald)
 
 0.50 2015-02-23
diff --git a/src/main/java/de/ids_mannheim/korap/KrillIndex.java b/src/main/java/de/ids_mannheim/korap/KrillIndex.java
index f698ffb..124e560 100644
--- a/src/main/java/de/ids_mannheim/korap/KrillIndex.java
+++ b/src/main/java/de/ids_mannheim/korap/KrillIndex.java
@@ -26,11 +26,12 @@
 import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-// KorAP classes
+// Krill classes
 import de.ids_mannheim.korap.*;
 import de.ids_mannheim.korap.index.*;
 import de.ids_mannheim.korap.meta.*;
 import de.ids_mannheim.korap.response.Match;
+import de.ids_mannheim.korap.response.MatchCollector;
 import de.ids_mannheim.korap.query.SpanElementQuery;
 import de.ids_mannheim.korap.util.QueryException;
 
diff --git a/src/main/java/de/ids_mannheim/korap/node/Resource.java b/src/main/java/de/ids_mannheim/korap/node/Resource.java
index 9270bbd..3e1c3d2 100644
--- a/src/main/java/de/ids_mannheim/korap/node/Resource.java
+++ b/src/main/java/de/ids_mannheim/korap/node/Resource.java
@@ -29,8 +29,8 @@
 import de.ids_mannheim.korap.response.KorapResponse;
 import de.ids_mannheim.korap.index.FieldDocument;
 import de.ids_mannheim.korap.util.QueryException;
-import de.ids_mannheim.korap.index.MatchCollector;
-import de.ids_mannheim.korap.index.collector.MatchCollectorDB;
+import de.ids_mannheim.korap.response.MatchCollector;
+import de.ids_mannheim.korap.response.collector.MatchCollectorDB;
 
 import java.util.List;
 import java.util.regex.Pattern;
diff --git a/src/main/java/de/ids_mannheim/korap/index/collector/MatchCollectorDB.java b/src/main/java/de/ids_mannheim/korap/response/collector/MatchCollectorDB.java
similarity index 97%
rename from src/main/java/de/ids_mannheim/korap/index/collector/MatchCollectorDB.java
rename to src/main/java/de/ids_mannheim/korap/response/collector/MatchCollectorDB.java
index 1bbf33b..dd2c09f 100644
--- a/src/main/java/de/ids_mannheim/korap/index/collector/MatchCollectorDB.java
+++ b/src/main/java/de/ids_mannheim/korap/response/collector/MatchCollectorDB.java
@@ -1,7 +1,7 @@
-package de.ids_mannheim.korap.index.collector;
+package de.ids_mannheim.korap.response.collector;
 import de.ids_mannheim.korap.KorapNode;
 import de.ids_mannheim.korap.response.Match;
-import de.ids_mannheim.korap.index.MatchCollector;
+import de.ids_mannheim.korap.response.MatchCollector;
 import com.fasterxml.jackson.annotation.*;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
diff --git a/src/test/java/de/ids_mannheim/korap/index/TestMatchCollector.java b/src/test/java/de/ids_mannheim/korap/index/TestMatchCollector.java
index 3f0bd6d..9cce9fd 100644
--- a/src/test/java/de/ids_mannheim/korap/index/TestMatchCollector.java
+++ b/src/test/java/de/ids_mannheim/korap/index/TestMatchCollector.java
@@ -16,7 +16,7 @@
 import de.ids_mannheim.korap.KrillIndex;
 import de.ids_mannheim.korap.KrillQuery;
 import de.ids_mannheim.korap.response.Match;
-import de.ids_mannheim.korap.index.MatchCollector;
+import de.ids_mannheim.korap.response.MatchCollector;
 import de.ids_mannheim.korap.KrillCollection;
 import de.ids_mannheim.korap.Krill;
 import de.ids_mannheim.korap.query.SpanNextQuery;
diff --git a/src/test/java/de/ids_mannheim/korap/node/TestDatabase.java b/src/test/java/de/ids_mannheim/korap/node/TestDatabase.java
index 0c26021..22a8b0c 100644
--- a/src/test/java/de/ids_mannheim/korap/node/TestDatabase.java
+++ b/src/test/java/de/ids_mannheim/korap/node/TestDatabase.java
@@ -1,7 +1,7 @@
 package de.ids_mannheim.korap.node;
 
-import de.ids_mannheim.korap.index.MatchCollector;
-import de.ids_mannheim.korap.index.collector.MatchCollectorDB;
+import de.ids_mannheim.korap.response.MatchCollector;
+import de.ids_mannheim.korap.response.collector.MatchCollectorDB;
 
 import java.sql.Connection;
 import java.sql.DriverManager;