diff --git a/Changes b/Changes
index 3e32d39..41f3c39 100644
--- a/Changes
+++ b/Changes
@@ -16,7 +16,8 @@
 	  moved KorapNode to server/Node,
 	  moved KorapResult to response/Result,
 	  renamed KorapResponse to Response,
-	  moved model/* to index (diewald)
+	  moved model/* to index,
+	  moved meta/SearchContext to response/SearchContext (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 a7327e2..70e99bb 100644
--- a/src/main/java/de/ids_mannheim/korap/KrillIndex.java
+++ b/src/main/java/de/ids_mannheim/korap/KrillIndex.java
@@ -29,7 +29,6 @@
 // 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.*;
 import de.ids_mannheim.korap.query.SpanElementQuery;
 import de.ids_mannheim.korap.util.QueryException;
diff --git a/src/main/java/de/ids_mannheim/korap/KrillMeta.java b/src/main/java/de/ids_mannheim/korap/KrillMeta.java
index ccb836d..16b9865 100644
--- a/src/main/java/de/ids_mannheim/korap/KrillMeta.java
+++ b/src/main/java/de/ids_mannheim/korap/KrillMeta.java
@@ -8,7 +8,7 @@
 import com.fasterxml.jackson.databind.node.*;
 
 
-import de.ids_mannheim.korap.meta.SearchContext;
+import de.ids_mannheim.korap.response.SearchContext;
 import de.ids_mannheim.korap.util.QueryException;
 import de.ids_mannheim.korap.response.Notifications;
 
diff --git a/src/main/java/de/ids_mannheim/korap/response/Match.java b/src/main/java/de/ids_mannheim/korap/response/Match.java
index 3739336..db32550 100644
--- a/src/main/java/de/ids_mannheim/korap/response/Match.java
+++ b/src/main/java/de/ids_mannheim/korap/response/Match.java
@@ -13,7 +13,7 @@
 import de.ids_mannheim.korap.index.PositionsToOffset;
 
 // Todo:
-import de.ids_mannheim.korap.meta.SearchContext;
+import de.ids_mannheim.korap.response.SearchContext;
 
 import de.ids_mannheim.korap.index.AbstractDocument;
 import de.ids_mannheim.korap.response.match.HighlightCombinator;
diff --git a/src/main/java/de/ids_mannheim/korap/response/Result.java b/src/main/java/de/ids_mannheim/korap/response/Result.java
index 257780f..23bbcca 100644
--- a/src/main/java/de/ids_mannheim/korap/response/Result.java
+++ b/src/main/java/de/ids_mannheim/korap/response/Result.java
@@ -11,7 +11,7 @@
 import de.ids_mannheim.korap.index.PositionsToOffset;
 
 // Remove:
-import de.ids_mannheim.korap.meta.SearchContext;
+import de.ids_mannheim.korap.response.SearchContext;
 
 import de.ids_mannheim.korap.response.Response;
 import de.ids_mannheim.korap.response.Match;
diff --git a/src/main/java/de/ids_mannheim/korap/meta/SearchContext.java b/src/main/java/de/ids_mannheim/korap/response/SearchContext.java
similarity index 98%
rename from src/main/java/de/ids_mannheim/korap/meta/SearchContext.java
rename to src/main/java/de/ids_mannheim/korap/response/SearchContext.java
index 437d726..451dcd2 100644
--- a/src/main/java/de/ids_mannheim/korap/meta/SearchContext.java
+++ b/src/main/java/de/ids_mannheim/korap/response/SearchContext.java
@@ -1,4 +1,4 @@
-package de.ids_mannheim.korap.meta;
+package de.ids_mannheim.korap.response;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.JsonNode;
diff --git a/src/test/java/de/ids_mannheim/korap/search/TestKrill.java b/src/test/java/de/ids_mannheim/korap/search/TestKrill.java
index 822b3bf..5932ee3 100644
--- a/src/test/java/de/ids_mannheim/korap/search/TestKrill.java
+++ b/src/test/java/de/ids_mannheim/korap/search/TestKrill.java
@@ -12,8 +12,8 @@
 import de.ids_mannheim.korap.KrillIndex;
 import de.ids_mannheim.korap.query.QueryBuilder;
 import de.ids_mannheim.korap.index.FieldDocument;
-import de.ids_mannheim.korap.meta.SearchContext;
 import de.ids_mannheim.korap.collection.CollectionBuilder;
+import de.ids_mannheim.korap.response.SearchContext;
 import de.ids_mannheim.korap.response.Result;
 import java.nio.file.Files;
 import java.nio.file.FileSystem;
diff --git a/src/test/java/de/ids_mannheim/korap/search/TestMetaFields.java b/src/test/java/de/ids_mannheim/korap/search/TestMetaFields.java
index d79ce79..93894cb 100644
--- a/src/test/java/de/ids_mannheim/korap/search/TestMetaFields.java
+++ b/src/test/java/de/ids_mannheim/korap/search/TestMetaFields.java
@@ -10,7 +10,6 @@
 import de.ids_mannheim.korap.KrillQuery;
 import de.ids_mannheim.korap.KrillIndex;
 import de.ids_mannheim.korap.index.FieldDocument;
-import de.ids_mannheim.korap.meta.SearchContext;
 import de.ids_mannheim.korap.response.Result;
 import java.nio.file.Files;
 import java.nio.file.FileSystem;