diff --git a/src/main/java/de/ids_mannheim/korap/model/AbstractDocument.java b/src/main/java/de/ids_mannheim/korap/index/AbstractDocument.java
similarity index 99%
rename from src/main/java/de/ids_mannheim/korap/model/AbstractDocument.java
rename to src/main/java/de/ids_mannheim/korap/index/AbstractDocument.java
index a71319d..82acd68 100644
--- a/src/main/java/de/ids_mannheim/korap/model/AbstractDocument.java
+++ b/src/main/java/de/ids_mannheim/korap/index/AbstractDocument.java
@@ -1,4 +1,4 @@
-package de.ids_mannheim.korap.model;
+package de.ids_mannheim.korap.index;
 
 import java.util.*;
 
diff --git a/src/main/java/de/ids_mannheim/korap/index/FieldDocument.java b/src/main/java/de/ids_mannheim/korap/index/FieldDocument.java
index ce38fdb..70d183f 100644
--- a/src/main/java/de/ids_mannheim/korap/index/FieldDocument.java
+++ b/src/main/java/de/ids_mannheim/korap/index/FieldDocument.java
@@ -1,8 +1,8 @@
 package de.ids_mannheim.korap.index;
 
-import de.ids_mannheim.korap.model.MultiTermTokenStream;
-import de.ids_mannheim.korap.model.MultiTermToken;
-import de.ids_mannheim.korap.model.AbstractDocument;
+import de.ids_mannheim.korap.index.MultiTermTokenStream;
+import de.ids_mannheim.korap.index.MultiTermToken;
+import de.ids_mannheim.korap.index.AbstractDocument;
 import de.ids_mannheim.korap.util.KrillDate;
 import de.ids_mannheim.korap.util.CorpusDataException;
 
diff --git a/src/main/java/de/ids_mannheim/korap/model/MultiTerm.java b/src/main/java/de/ids_mannheim/korap/index/MultiTerm.java
similarity index 99%
rename from src/main/java/de/ids_mannheim/korap/model/MultiTerm.java
rename to src/main/java/de/ids_mannheim/korap/index/MultiTerm.java
index c710419..33a81cf 100644
--- a/src/main/java/de/ids_mannheim/korap/model/MultiTerm.java
+++ b/src/main/java/de/ids_mannheim/korap/index/MultiTerm.java
@@ -1,4 +1,4 @@
-package de.ids_mannheim.korap.model;
+package de.ids_mannheim.korap.index;
 
 import static de.ids_mannheim.korap.util.KrillArray.*;
 import de.ids_mannheim.korap.util.CorpusDataException;
diff --git a/src/main/java/de/ids_mannheim/korap/model/MultiTermToken.java b/src/main/java/de/ids_mannheim/korap/index/MultiTermToken.java
similarity index 99%
rename from src/main/java/de/ids_mannheim/korap/model/MultiTermToken.java
rename to src/main/java/de/ids_mannheim/korap/index/MultiTermToken.java
index d72433e..c3ef720 100644
--- a/src/main/java/de/ids_mannheim/korap/model/MultiTermToken.java
+++ b/src/main/java/de/ids_mannheim/korap/index/MultiTermToken.java
@@ -1,4 +1,4 @@
-package de.ids_mannheim.korap.model;
+package de.ids_mannheim.korap.index;
 
 import de.ids_mannheim.korap.util.CorpusDataException;
 
diff --git a/src/main/java/de/ids_mannheim/korap/model/MultiTermTokenStream.java b/src/main/java/de/ids_mannheim/korap/index/MultiTermTokenStream.java
similarity index 99%
rename from src/main/java/de/ids_mannheim/korap/model/MultiTermTokenStream.java
rename to src/main/java/de/ids_mannheim/korap/index/MultiTermTokenStream.java
index 2ca5242..bae942a 100644
--- a/src/main/java/de/ids_mannheim/korap/model/MultiTermTokenStream.java
+++ b/src/main/java/de/ids_mannheim/korap/index/MultiTermTokenStream.java
@@ -1,4 +1,4 @@
-package de.ids_mannheim.korap.model;
+package de.ids_mannheim.korap.index;
 
 import static de.ids_mannheim.korap.util.KrillByte.*;
 import de.ids_mannheim.korap.util.CorpusDataException;
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 941dd8e..3739336 100644
--- a/src/main/java/de/ids_mannheim/korap/response/Match.java
+++ b/src/main/java/de/ids_mannheim/korap/response/Match.java
@@ -15,7 +15,7 @@
 // Todo:
 import de.ids_mannheim.korap.meta.SearchContext;
 
-import de.ids_mannheim.korap.model.AbstractDocument;
+import de.ids_mannheim.korap.index.AbstractDocument;
 import de.ids_mannheim.korap.response.match.HighlightCombinator;
 import de.ids_mannheim.korap.response.match.HighlightCombinatorElement;
 import de.ids_mannheim.korap.response.match.Relation;