diff --git a/Changes b/Changes
index 7d58afe..76af4c4 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+0.14 2016-03-12
+        - Renamed ::Index to ::Annotate and ::Field to ::Index.
+
 0.13 2016-03-10
         - Removed korapxml2krill_dir.
 	- Renamed dependency nodes.
diff --git a/MANIFEST b/MANIFEST
index fa79950..3ba080c 100755
--- a/MANIFEST
+++ b/MANIFEST
@@ -9,38 +9,38 @@
 lib/KorAP/XML/Tokenizer/Token.pm
 lib/KorAP/XML/Tokenizer/Tokens.pm
 lib/KorAP/XML/Tokenizer/Units.pm
-lib/KorAP/XML/Field/MultiTerm.pm
-lib/KorAP/XML/Field/MultiTermToken.pm
-lib/KorAP/XML/Field/MultiTermTokenStream.pm
+lib/KorAP/XML/Index/MultiTerm.pm
+lib/KorAP/XML/Index/MultiTermToken.pm
+lib/KorAP/XML/Index/MultiTermTokenStream.pm
 lib/KorAP/XML/Document/Primary.pm
-lib/KorAP/XML/Index/Base.pm
-lib/KorAP/XML/Index/Base/Paragraphs.pm
-lib/KorAP/XML/Index/Base/Sentences.pm
-lib/KorAP/XML/Index/Connexor/Sentences.pm
-lib/KorAP/XML/Index/Connexor/Morpho.pm
-lib/KorAP/XML/Index/Connexor/Phrase.pm
-lib/KorAP/XML/Index/Connexor/Syntax.pm
-lib/KorAP/XML/Index/CoreNLP/Constituency.pm
-lib/KorAP/XML/Index/CoreNLP/Morpho.pm
-lib/KorAP/XML/Index/CoreNLP/NamedEntities.pm
-lib/KorAP/XML/Index/CoreNLP/Sentences.pm
-lib/KorAP/XML/Index/DeReKo/Structure.pm
-lib/KorAP/XML/Index/Glemm/Morpho.pm
-lib/KorAP/XML/Index/Malt/Dependency.pm
-lib/KorAP/XML/Index/Mate/Dependency.pm
-lib/KorAP/XML/Index/Mate/Morpho.pm
-lib/KorAP/XML/Index/Mate/MorphoAttr.pm
-lib/KorAP/XML/Index/OpenNLP/Morpho.pm
-lib/KorAP/XML/Index/OpenNLP/Sentences.pm
-lib/KorAP/XML/Index/OpenNLP/Morpho.pm
-lib/KorAP/XML/Index/Sgbr/Morpho.pm
-lib/KorAP/XML/Index/Sgbr/Lemma.pm
-lib/KorAP/XML/Index/TreeTagger/Morpho.pm
-lib/KorAP/XML/Index/TreeTagger/Sentences.pm
-lib/KorAP/XML/Index/XIP/Constituency.pm
-lib/KorAP/XML/Index/XIP/Dependency.pm
-lib/KorAP/XML/Index/XIP/Morpho.pm
-lib/KorAP/XML/Index/XIP/Sentences.pm
+lib/KorAP/XML/Annotation/Base.pm
+lib/KorAP/XML/Annotation/Base/Paragraphs.pm
+lib/KorAP/XML/Annotation/Base/Sentences.pm
+lib/KorAP/XML/Annotation/Connexor/Sentences.pm
+lib/KorAP/XML/Annotation/Connexor/Morpho.pm
+lib/KorAP/XML/Annotation/Connexor/Phrase.pm
+lib/KorAP/XML/Annotation/Connexor/Syntax.pm
+lib/KorAP/XML/Annotation/CoreNLP/Constituency.pm
+lib/KorAP/XML/Annotation/CoreNLP/Morpho.pm
+lib/KorAP/XML/Annotation/CoreNLP/NamedEntities.pm
+lib/KorAP/XML/Annotation/CoreNLP/Sentences.pm
+lib/KorAP/XML/Annotation/DeReKo/Structure.pm
+lib/KorAP/XML/Annotation/Glemm/Morpho.pm
+lib/KorAP/XML/Annotation/Malt/Dependency.pm
+lib/KorAP/XML/Annotation/Mate/Dependency.pm
+lib/KorAP/XML/Annotation/Mate/Morpho.pm
+lib/KorAP/XML/Annotation/Mate/MorphoAttr.pm
+lib/KorAP/XML/Annotation/OpenNLP/Morpho.pm
+lib/KorAP/XML/Annotation/OpenNLP/Sentences.pm
+lib/KorAP/XML/Annotation/OpenNLP/Morpho.pm
+lib/KorAP/XML/Annotation/Sgbr/Morpho.pm
+lib/KorAP/XML/Annotation/Sgbr/Lemma.pm
+lib/KorAP/XML/Annotation/TreeTagger/Morpho.pm
+lib/KorAP/XML/Annotation/TreeTagger/Sentences.pm
+lib/KorAP/XML/Annotation/XIP/Constituency.pm
+lib/KorAP/XML/Annotation/XIP/Dependency.pm
+lib/KorAP/XML/Annotation/XIP/Morpho.pm
+lib/KorAP/XML/Annotation/XIP/Sentences.pm
 t/archive.t
 t/meta.t
 t/primary.t
@@ -48,34 +48,34 @@
 t/sort_tokens.t
 t/tokens.t
 t/transform.t
-t/index/TestInit.pm
-t/index/base_paragraphs.t
-t/index/base_sentences.t
-t/index/connexor_morpho.t
-t/index/connexor_phrase.t
-t/index/connexor_sentences.t
-t/index/connexor_syntax.t
-t/index/corenlp_constituency.t
-t/index/corenlp_ent.t
-t/index/corenlp_morpho.t
-t/index/corenlp_sentences.t
-t/index/dereko_struct.t
-t/index/glemm_morpho.t
-t/index/malt_dependency.t
-t/index/mate_dependency.t
-t/index/mate_morpho.t
-t/index/mate_morpho_attr.t
-t/index/meta.t
-t/index/opennlp_morpho.t
-t/index/opennlp_sentences.t
-t/index/primary.t
-t/index/tt_morpho.t
-t/index/tt_sentences.t
-t/index/xip_constituency.t
-t/index/xip_dependency.t
-t/index/xip_morpho.t
-t/index/xip_sentences.t
-t/index/koralquery.t
+t/annotation/TestInit.pm
+t/annotation/base_paragraphs.t
+t/annotation/base_sentences.t
+t/annotation/connexor_morpho.t
+t/annotation/connexor_phrase.t
+t/annotation/connexor_sentences.t
+t/annotation/connexor_syntax.t
+t/annotation/corenlp_constituency.t
+t/annotation/corenlp_ent.t
+t/annotation/corenlp_morpho.t
+t/annotation/corenlp_sentences.t
+t/annotation/dereko_struct.t
+t/annotation/glemm_morpho.t
+t/annotation/malt_dependency.t
+t/annotation/mate_dependency.t
+t/annotation/mate_morpho.t
+t/annotation/mate_morpho_attr.t
+t/annotation/meta.t
+t/annotation/opennlp_morpho.t
+t/annotation/opennlp_sentences.t
+t/annotation/primary.t
+t/annotation/tt_morpho.t
+t/annotation/tt_sentences.t
+t/annotation/xip_constituency.t
+t/annotation/xip_dependency.t
+t/annotation/xip_morpho.t
+t/annotation/xip_sentences.t
+t/annotation/koralquery.t
 t/real/bzk.t
 t/real/bzk_2.t
 t/real/goethe.t
@@ -94,7 +94,7 @@
 t/corpus/artificial/data.xml
 t/corpus/artificial/header.xml
 t/corpus/artificial/metadata.xml
-t/index/corpus/header.xml
+t/annotation/corpus/header.xml
 t/sgbr/TEST/header.xml
 t/corpus/A00/02035-substring/data.xml
 t/corpus/A00/02035-substring/header.xml
@@ -146,7 +146,7 @@
 t/corpus/artificial/xip/dependency.xml
 t/corpus/artificial/xip/morpho.xml
 t/corpus/artificial/xip/sentences.xml
-t/index/corpus/doc/header.xml
+t/annotation/corpus/doc/header.xml
 t/sgbr/TEST/BSP/header.xml
 t/corpus/A00/02035-substring/base/paragraph.xml
 t/corpus/A00/02035-substring/base/sentences.xml
@@ -407,10 +407,10 @@
 t/corpus/WPD/00001/xip/morpho.xml
 t/corpus/WPD/00001/xip/sentences.xml
 t/corpus/WPD/00001/xip/tokens.xml
-t/index/corpus/doc/0001/data.xml
-t/index/corpus/doc/0001/header.xml
-t/index/corpus/doc/0002/data.xml
-t/index/corpus/doc/0002/header.xml
+t/annotation/corpus/doc/0001/data.xml
+t/annotation/corpus/doc/0001/header.xml
+t/annotation/corpus/doc/0002/data.xml
+t/annotation/corpus/doc/0002/header.xml
 t/sgbr/TEST/BSP/1/data.xml
 t/sgbr/TEST/BSP/1/header.xml
 t/corpus/A00/02035-substring/mate/pipeline/one_token_per_line.txt
@@ -586,42 +586,42 @@
 t/corpus/WPD/00001/mate/pipeline/one_token_per_line.txt
 t/corpus/WPD/00001/mate/pipeline/parsed.txt
 t/corpus/WPD/00001/mate/tokenSpans/number_tokenSpans.xml
-t/index/corpus/doc/0001/base/paragraph.xml
-t/index/corpus/doc/0001/base/sentences.xml
-t/index/corpus/doc/0001/connexor/morpho.xml
-t/index/corpus/doc/0001/connexor/phrase.xml
-t/index/corpus/doc/0001/connexor/sentences.xml
-t/index/corpus/doc/0001/connexor/syntax.xml
-t/index/corpus/doc/0001/corenlp/constituency.xml
-t/index/corpus/doc/0001/corenlp/morpho.xml
-t/index/corpus/doc/0001/corenlp/ne_dewac_175m_600.xml
-t/index/corpus/doc/0001/corenlp/ne_hgc_175m_600.xml
-t/index/corpus/doc/0001/corenlp/sentences.xml
-t/index/corpus/doc/0001/corenlp/tokens.xml
-t/index/corpus/doc/0001/glemm/glemm.xml
-t/index/corpus/doc/0001/mate/dependency.xml
-t/index/corpus/doc/0001/mate/morpho.xml
-t/index/corpus/doc/0001/opennlp/morpho.xml
-t/index/corpus/doc/0001/opennlp/sentences.xml
-t/index/corpus/doc/0001/opennlp/tokens.xml
-t/index/corpus/doc/0001/struct/structure.xml
-t/index/corpus/doc/0001/tree_tagger/morpho.xml
-t/index/corpus/doc/0001/tree_tagger/sentences.xml
-t/index/corpus/doc/0001/xip/constituency.xml
-t/index/corpus/doc/0001/xip/dependency.xml
-t/index/corpus/doc/0001/xip/morpho.xml
-t/index/corpus/doc/0001/xip/sentences.xml
-t/index/corpus/doc/0002/base/paragraph.xml
-t/index/corpus/doc/0002/base/sentences.xml
-t/index/corpus/doc/0002/base/tokens_aggr.xml
-t/index/corpus/doc/0002/base/tokens_conservative.xml
-t/index/corpus/doc/0002/malt/dependency.xml
-t/index/corpus/doc/0002/malt/metadata.xml
-t/index/corpus/doc/0002/struct/structure.xml
-t/index/corpus/doc/0002/tree_tagger/metadata.xml
-t/index/corpus/doc/0002/tree_tagger/morpho.xml
-t/index/corpus/doc/0002/tree_tagger/sentences.xml
-t/index/corpus/doc/0002/tree_tagger/tokens.xml
+t/annotation/corpus/doc/0001/base/paragraph.xml
+t/annotation/corpus/doc/0001/base/sentences.xml
+t/annotation/corpus/doc/0001/connexor/morpho.xml
+t/annotation/corpus/doc/0001/connexor/phrase.xml
+t/annotation/corpus/doc/0001/connexor/sentences.xml
+t/annotation/corpus/doc/0001/connexor/syntax.xml
+t/annotation/corpus/doc/0001/corenlp/constituency.xml
+t/annotation/corpus/doc/0001/corenlp/morpho.xml
+t/annotation/corpus/doc/0001/corenlp/ne_dewac_175m_600.xml
+t/annotation/corpus/doc/0001/corenlp/ne_hgc_175m_600.xml
+t/annotation/corpus/doc/0001/corenlp/sentences.xml
+t/annotation/corpus/doc/0001/corenlp/tokens.xml
+t/annotation/corpus/doc/0001/glemm/glemm.xml
+t/annotation/corpus/doc/0001/mate/dependency.xml
+t/annotation/corpus/doc/0001/mate/morpho.xml
+t/annotation/corpus/doc/0001/opennlp/morpho.xml
+t/annotation/corpus/doc/0001/opennlp/sentences.xml
+t/annotation/corpus/doc/0001/opennlp/tokens.xml
+t/annotation/corpus/doc/0001/struct/structure.xml
+t/annotation/corpus/doc/0001/tree_tagger/morpho.xml
+t/annotation/corpus/doc/0001/tree_tagger/sentences.xml
+t/annotation/corpus/doc/0001/xip/constituency.xml
+t/annotation/corpus/doc/0001/xip/dependency.xml
+t/annotation/corpus/doc/0001/xip/morpho.xml
+t/annotation/corpus/doc/0001/xip/sentences.xml
+t/annotation/corpus/doc/0002/base/paragraph.xml
+t/annotation/corpus/doc/0002/base/sentences.xml
+t/annotation/corpus/doc/0002/base/tokens_aggr.xml
+t/annotation/corpus/doc/0002/base/tokens_conservative.xml
+t/annotation/corpus/doc/0002/malt/dependency.xml
+t/annotation/corpus/doc/0002/malt/metadata.xml
+t/annotation/corpus/doc/0002/struct/structure.xml
+t/annotation/corpus/doc/0002/tree_tagger/metadata.xml
+t/annotation/corpus/doc/0002/tree_tagger/morpho.xml
+t/annotation/corpus/doc/0002/tree_tagger/sentences.xml
+t/annotation/corpus/doc/0002/tree_tagger/tokens.xml
 t/sgbr/TEST/BSP/1/base/paragraph.xml
 t/sgbr/TEST/BSP/1/base/sentences.xml
 t/sgbr/TEST/BSP/1/base/tokens_aggr.xml
diff --git a/Makefile.PL b/Makefile.PL
index 17beeba..88327ba 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -36,7 +36,7 @@
   test => {
     TESTS =>
       't/*.t '.
-	't/index/*.t ' .
+	't/annotation/*.t ' .
 	  't/sgbr/*.t ' .
 	    't/real/*.t'
 	  },
diff --git a/lib/KorAP/XML/Index/Base.pm b/lib/KorAP/XML/Annotation/Base.pm
similarity index 84%
rename from lib/KorAP/XML/Index/Base.pm
rename to lib/KorAP/XML/Annotation/Base.pm
index 8daa8c0..e4fcd99 100644
--- a/lib/KorAP/XML/Index/Base.pm
+++ b/lib/KorAP/XML/Annotation/Base.pm
@@ -1,4 +1,4 @@
-package KorAP::XML::Index::Base;
+package KorAP::XML::Annotation::Base;
 
 use strict;
 use warnings;
@@ -37,4 +37,4 @@
 
 =pod
 
-=head1 KorAP::XML::Index::Base
+=head1 KorAP::XML::Annotation::Base
diff --git a/lib/KorAP/XML/Index/Base/Paragraphs.pm b/lib/KorAP/XML/Annotation/Base/Paragraphs.pm
similarity index 86%
rename from lib/KorAP/XML/Index/Base/Paragraphs.pm
rename to lib/KorAP/XML/Annotation/Base/Paragraphs.pm
index caf0161..ced09c2 100644
--- a/lib/KorAP/XML/Index/Base/Paragraphs.pm
+++ b/lib/KorAP/XML/Annotation/Base/Paragraphs.pm
@@ -1,5 +1,5 @@
-package KorAP::XML::Index::Base::Paragraphs;
-use KorAP::XML::Index::Base;
+package KorAP::XML::Annotation::Base::Paragraphs;
+use KorAP::XML::Annotation::Base;
 
 sub parse {
   my $self = shift;
diff --git a/lib/KorAP/XML/Index/Base/Sentences.pm b/lib/KorAP/XML/Annotation/Base/Sentences.pm
similarity index 91%
rename from lib/KorAP/XML/Index/Base/Sentences.pm
rename to lib/KorAP/XML/Annotation/Base/Sentences.pm
index 6b77d98..28c9434 100644
--- a/lib/KorAP/XML/Index/Base/Sentences.pm
+++ b/lib/KorAP/XML/Annotation/Base/Sentences.pm
@@ -1,5 +1,5 @@
-package KorAP::XML::Index::Base::Sentences;
-use KorAP::XML::Index::Base;
+package KorAP::XML::Annotation::Base::Sentences;
+use KorAP::XML::Annotation::Base;
 
 sub parse {
   my $self = shift;
diff --git a/lib/KorAP/XML/Index/Connexor/Morpho.pm b/lib/KorAP/XML/Annotation/Connexor/Morpho.pm
similarity index 94%
rename from lib/KorAP/XML/Index/Connexor/Morpho.pm
rename to lib/KorAP/XML/Annotation/Connexor/Morpho.pm
index 6aba416..9f79305 100644
--- a/lib/KorAP/XML/Index/Connexor/Morpho.pm
+++ b/lib/KorAP/XML/Annotation/Connexor/Morpho.pm
@@ -1,5 +1,5 @@
-package KorAP::XML::Index::Connexor::Morpho;
-use KorAP::XML::Index::Base;
+package KorAP::XML::Annotation::Connexor::Morpho;
+use KorAP::XML::Annotation::Base;
 
 our %MAP = (
   'v_ind'   => 'mood',
diff --git a/lib/KorAP/XML/Index/Connexor/Phrase.pm b/lib/KorAP/XML/Annotation/Connexor/Phrase.pm
similarity index 87%
rename from lib/KorAP/XML/Index/Connexor/Phrase.pm
rename to lib/KorAP/XML/Annotation/Connexor/Phrase.pm
index c3b257f..1fb5901 100644
--- a/lib/KorAP/XML/Index/Connexor/Phrase.pm
+++ b/lib/KorAP/XML/Annotation/Connexor/Phrase.pm
@@ -1,5 +1,5 @@
-package KorAP::XML::Index::Connexor::Phrase;
-use KorAP::XML::Index::Base;
+package KorAP::XML::Annotation::Connexor::Phrase;
+use KorAP::XML::Annotation::Base;
 
 sub parse {
   my $self = shift;
diff --git a/lib/KorAP/XML/Index/Connexor/Sentences.pm b/lib/KorAP/XML/Annotation/Connexor/Sentences.pm
similarity index 85%
rename from lib/KorAP/XML/Index/Connexor/Sentences.pm
rename to lib/KorAP/XML/Annotation/Connexor/Sentences.pm
index cc4d43c..52798b4 100644
--- a/lib/KorAP/XML/Index/Connexor/Sentences.pm
+++ b/lib/KorAP/XML/Annotation/Connexor/Sentences.pm
@@ -1,5 +1,5 @@
-package KorAP::XML::Index::Connexor::Sentences;
-use KorAP::XML::Index::Base;
+package KorAP::XML::Annotation::Connexor::Sentences;
+use KorAP::XML::Annotation::Base;
 
 sub parse {
   my $self = shift;
diff --git a/lib/KorAP/XML/Index/Connexor/Syntax.pm b/lib/KorAP/XML/Annotation/Connexor/Syntax.pm
similarity index 85%
rename from lib/KorAP/XML/Index/Connexor/Syntax.pm
rename to lib/KorAP/XML/Annotation/Connexor/Syntax.pm
index 758fe9e..a75e4cd 100644
--- a/lib/KorAP/XML/Index/Connexor/Syntax.pm
+++ b/lib/KorAP/XML/Annotation/Connexor/Syntax.pm
@@ -1,5 +1,5 @@
-package KorAP::XML::Index::Connexor::Syntax;
-use KorAP::XML::Index::Base;
+package KorAP::XML::Annotation::Connexor::Syntax;
+use KorAP::XML::Annotation::Base;
 
 sub parse {
   my $self = shift;
diff --git a/lib/KorAP/XML/Index/CoreNLP/Constituency.pm b/lib/KorAP/XML/Annotation/CoreNLP/Constituency.pm
similarity index 95%
rename from lib/KorAP/XML/Index/CoreNLP/Constituency.pm
rename to lib/KorAP/XML/Annotation/CoreNLP/Constituency.pm
index 48f34b8..2fa8106 100644
--- a/lib/KorAP/XML/Index/CoreNLP/Constituency.pm
+++ b/lib/KorAP/XML/Annotation/CoreNLP/Constituency.pm
@@ -1,5 +1,5 @@
-package KorAP::XML::Index::CoreNLP::Constituency;
-use KorAP::XML::Index::Base;
+package KorAP::XML::Annotation::CoreNLP::Constituency;
+use KorAP::XML::Annotation::Base;
 use Set::Scalar;
 
 sub parse {
diff --git a/lib/KorAP/XML/Index/CoreNLP/Morpho.pm b/lib/KorAP/XML/Annotation/CoreNLP/Morpho.pm
similarity index 86%
rename from lib/KorAP/XML/Index/CoreNLP/Morpho.pm
rename to lib/KorAP/XML/Annotation/CoreNLP/Morpho.pm
index 2ab3301..6711fe0 100644
--- a/lib/KorAP/XML/Index/CoreNLP/Morpho.pm
+++ b/lib/KorAP/XML/Annotation/CoreNLP/Morpho.pm
@@ -1,5 +1,5 @@
-package KorAP::XML::Index::CoreNLP::Morpho;
-use KorAP::XML::Index::Base;
+package KorAP::XML::Annotation::CoreNLP::Morpho;
+use KorAP::XML::Annotation::Base;
 
 sub parse {
   my $self = shift;
diff --git a/lib/KorAP/XML/Index/CoreNLP/NamedEntities.pm b/lib/KorAP/XML/Annotation/CoreNLP/NamedEntities.pm
similarity index 90%
rename from lib/KorAP/XML/Index/CoreNLP/NamedEntities.pm
rename to lib/KorAP/XML/Annotation/CoreNLP/NamedEntities.pm
index b5ef3cc..317b9e9 100644
--- a/lib/KorAP/XML/Index/CoreNLP/NamedEntities.pm
+++ b/lib/KorAP/XML/Annotation/CoreNLP/NamedEntities.pm
@@ -1,5 +1,5 @@
-package KorAP::XML::Index::CoreNLP::NamedEntities;
-use KorAP::XML::Index::Base;
+package KorAP::XML::Annotation::CoreNLP::NamedEntities;
+use KorAP::XML::Annotation::Base;
 
 # Import named entities, potentially with a specified
 # Model. However - now all models are mapped to the 'ne'-Prefix
diff --git a/lib/KorAP/XML/Index/CoreNLP/Sentences.pm b/lib/KorAP/XML/Annotation/CoreNLP/Sentences.pm
similarity index 86%
rename from lib/KorAP/XML/Index/CoreNLP/Sentences.pm
rename to lib/KorAP/XML/Annotation/CoreNLP/Sentences.pm
index 4384aee..f643526 100644
--- a/lib/KorAP/XML/Index/CoreNLP/Sentences.pm
+++ b/lib/KorAP/XML/Annotation/CoreNLP/Sentences.pm
@@ -1,5 +1,5 @@
-package KorAP::XML::Index::CoreNLP::Sentences;
-use KorAP::XML::Index::Base;
+package KorAP::XML::Annotation::CoreNLP::Sentences;
+use KorAP::XML::Annotation::Base;
 
 sub parse {
   my $self = shift;
diff --git a/lib/KorAP/XML/Index/DeReKo/Structure.pm b/lib/KorAP/XML/Annotation/DeReKo/Structure.pm
similarity index 94%
rename from lib/KorAP/XML/Index/DeReKo/Structure.pm
rename to lib/KorAP/XML/Annotation/DeReKo/Structure.pm
index dfb9e62..80a284e 100644
--- a/lib/KorAP/XML/Index/DeReKo/Structure.pm
+++ b/lib/KorAP/XML/Annotation/DeReKo/Structure.pm
@@ -1,5 +1,5 @@
-package KorAP::XML::Index::DeReKo::Structure;
-use KorAP::XML::Index::Base;
+package KorAP::XML::Annotation::DeReKo::Structure;
+use KorAP::XML::Annotation::Base;
 use Data::Dumper;
 
 sub parse {
diff --git a/lib/KorAP/XML/Index/Glemm/Morpho.pm b/lib/KorAP/XML/Annotation/Glemm/Morpho.pm
similarity index 92%
rename from lib/KorAP/XML/Index/Glemm/Morpho.pm
rename to lib/KorAP/XML/Annotation/Glemm/Morpho.pm
index 80f75e0..f96aee5 100644
--- a/lib/KorAP/XML/Index/Glemm/Morpho.pm
+++ b/lib/KorAP/XML/Annotation/Glemm/Morpho.pm
@@ -1,5 +1,5 @@
-package KorAP::XML::Index::Glemm::Morpho;
-use KorAP::XML::Index::Base;
+package KorAP::XML::Annotation::Glemm::Morpho;
+use KorAP::XML::Annotation::Base;
 
 sub parse {
   my $self = shift;
diff --git a/lib/KorAP/XML/Index/Malt/Dependency.pm b/lib/KorAP/XML/Annotation/Malt/Dependency.pm
similarity index 93%
rename from lib/KorAP/XML/Index/Malt/Dependency.pm
rename to lib/KorAP/XML/Annotation/Malt/Dependency.pm
index a92a4c9..77e3bff 100644
--- a/lib/KorAP/XML/Index/Malt/Dependency.pm
+++ b/lib/KorAP/XML/Annotation/Malt/Dependency.pm
@@ -1,5 +1,5 @@
-package KorAP::XML::Index::Malt::Dependency;
-use KorAP::XML::Index::Base;
+package KorAP::XML::Annotation::Malt::Dependency;
+use KorAP::XML::Annotation::Base;
 
 sub parse {
   my $self = shift;
diff --git a/lib/KorAP/XML/Index/Mate/Dependency.pm b/lib/KorAP/XML/Annotation/Mate/Dependency.pm
similarity index 97%
rename from lib/KorAP/XML/Index/Mate/Dependency.pm
rename to lib/KorAP/XML/Annotation/Mate/Dependency.pm
index 04e1e9f..ffc3223 100644
--- a/lib/KorAP/XML/Index/Mate/Dependency.pm
+++ b/lib/KorAP/XML/Annotation/Mate/Dependency.pm
@@ -1,5 +1,5 @@
-package KorAP::XML::Index::Mate::Dependency;
-use KorAP::XML::Index::Base;
+package KorAP::XML::Annotation::Mate::Dependency;
+use KorAP::XML::Annotation::Base;
 use strict;
 use warnings;
 our $NODE_LABEL = '&&&';
diff --git a/lib/KorAP/XML/Index/Mate/Morpho.pm b/lib/KorAP/XML/Annotation/Mate/Morpho.pm
similarity index 92%
rename from lib/KorAP/XML/Index/Mate/Morpho.pm
rename to lib/KorAP/XML/Annotation/Mate/Morpho.pm
index f62465f..7f21afa 100644
--- a/lib/KorAP/XML/Index/Mate/Morpho.pm
+++ b/lib/KorAP/XML/Annotation/Mate/Morpho.pm
@@ -1,5 +1,5 @@
-package KorAP::XML::Index::Mate::Morpho;
-use KorAP::XML::Index::Base;
+package KorAP::XML::Annotation::Mate::Morpho;
+use KorAP::XML::Annotation::Base;
 
 sub parse {
   my $self = shift;
diff --git a/lib/KorAP/XML/Index/Mate/MorphoAttr.pm b/lib/KorAP/XML/Annotation/Mate/MorphoAttr.pm
similarity index 93%
rename from lib/KorAP/XML/Index/Mate/MorphoAttr.pm
rename to lib/KorAP/XML/Annotation/Mate/MorphoAttr.pm
index f937c5f..ce140e7 100644
--- a/lib/KorAP/XML/Index/Mate/MorphoAttr.pm
+++ b/lib/KorAP/XML/Annotation/Mate/MorphoAttr.pm
@@ -1,5 +1,5 @@
-package KorAP::XML::Index::Mate::MorphoAttr;
-use KorAP::XML::Index::Base;
+package KorAP::XML::Annotation::Mate::MorphoAttr;
+use KorAP::XML::Annotation::Base;
 
 # This attaches morphological information as attributes to the pos
 
diff --git a/lib/KorAP/XML/Index/OpenNLP/Morpho.pm b/lib/KorAP/XML/Annotation/OpenNLP/Morpho.pm
similarity index 87%
rename from lib/KorAP/XML/Index/OpenNLP/Morpho.pm
rename to lib/KorAP/XML/Annotation/OpenNLP/Morpho.pm
index a59d6c0..3eb2e37 100644
--- a/lib/KorAP/XML/Index/OpenNLP/Morpho.pm
+++ b/lib/KorAP/XML/Annotation/OpenNLP/Morpho.pm
@@ -1,5 +1,5 @@
-package KorAP::XML::Index::OpenNLP::Morpho;
-use KorAP::XML::Index::Base;
+package KorAP::XML::Annotation::OpenNLP::Morpho;
+use KorAP::XML::Annotation::Base;
 use Scalar::Util 'weaken';
 
 sub parse {
diff --git a/lib/KorAP/XML/Index/OpenNLP/Sentences.pm b/lib/KorAP/XML/Annotation/OpenNLP/Sentences.pm
similarity index 86%
rename from lib/KorAP/XML/Index/OpenNLP/Sentences.pm
rename to lib/KorAP/XML/Annotation/OpenNLP/Sentences.pm
index f2f60f9..b448817 100644
--- a/lib/KorAP/XML/Index/OpenNLP/Sentences.pm
+++ b/lib/KorAP/XML/Annotation/OpenNLP/Sentences.pm
@@ -1,5 +1,5 @@
-package KorAP::XML::Index::OpenNLP::Sentences;
-use KorAP::XML::Index::Base;
+package KorAP::XML::Annotation::OpenNLP::Sentences;
+use KorAP::XML::Annotation::Base;
 
 sub parse {
   my $self = shift;
diff --git a/lib/KorAP/XML/Index/Sgbr/Lemma.pm b/lib/KorAP/XML/Annotation/Sgbr/Lemma.pm
similarity index 91%
rename from lib/KorAP/XML/Index/Sgbr/Lemma.pm
rename to lib/KorAP/XML/Annotation/Sgbr/Lemma.pm
index 81726be..a8a169b 100644
--- a/lib/KorAP/XML/Index/Sgbr/Lemma.pm
+++ b/lib/KorAP/XML/Annotation/Sgbr/Lemma.pm
@@ -1,5 +1,5 @@
-package KorAP::XML::Index::Sgbr::Lemma;
-use KorAP::XML::Index::Base;
+package KorAP::XML::Annotation::Sgbr::Lemma;
+use KorAP::XML::Annotation::Base;
 use Mojo::ByteStream 'b';
 
 sub parse {
diff --git a/lib/KorAP/XML/Index/Sgbr/Morpho.pm b/lib/KorAP/XML/Annotation/Sgbr/Morpho.pm
similarity index 89%
rename from lib/KorAP/XML/Index/Sgbr/Morpho.pm
rename to lib/KorAP/XML/Annotation/Sgbr/Morpho.pm
index fac17a7..9eb261b 100644
--- a/lib/KorAP/XML/Index/Sgbr/Morpho.pm
+++ b/lib/KorAP/XML/Annotation/Sgbr/Morpho.pm
@@ -1,5 +1,5 @@
-package KorAP::XML::Index::Sgbr::Morpho;
-use KorAP::XML::Index::Base;
+package KorAP::XML::Annotation::Sgbr::Morpho;
+use KorAP::XML::Annotation::Base;
 
 sub parse {
   my $self = shift;
diff --git a/lib/KorAP/XML/Index/TreeTagger/Morpho.pm b/lib/KorAP/XML/Annotation/TreeTagger/Morpho.pm
similarity index 93%
rename from lib/KorAP/XML/Index/TreeTagger/Morpho.pm
rename to lib/KorAP/XML/Annotation/TreeTagger/Morpho.pm
index 5bde977..a337261 100644
--- a/lib/KorAP/XML/Index/TreeTagger/Morpho.pm
+++ b/lib/KorAP/XML/Annotation/TreeTagger/Morpho.pm
@@ -1,5 +1,5 @@
-package KorAP::XML::Index::TreeTagger::Morpho;
-use KorAP::XML::Index::Base;
+package KorAP::XML::Annotation::TreeTagger::Morpho;
+use KorAP::XML::Annotation::Base;
 use POSIX 'floor';
 
 sub parse {
diff --git a/lib/KorAP/XML/Index/TreeTagger/Sentences.pm b/lib/KorAP/XML/Annotation/TreeTagger/Sentences.pm
similarity index 85%
rename from lib/KorAP/XML/Index/TreeTagger/Sentences.pm
rename to lib/KorAP/XML/Annotation/TreeTagger/Sentences.pm
index 9297817..721ea5c 100644
--- a/lib/KorAP/XML/Index/TreeTagger/Sentences.pm
+++ b/lib/KorAP/XML/Annotation/TreeTagger/Sentences.pm
@@ -1,5 +1,5 @@
-package KorAP::XML::Index::TreeTagger::Sentences;
-use KorAP::XML::Index::Base;
+package KorAP::XML::Annotation::TreeTagger::Sentences;
+use KorAP::XML::Annotation::Base;
 
 sub parse {
   my $self = shift;
diff --git a/lib/KorAP/XML/Index/XIP/Constituency.pm b/lib/KorAP/XML/Annotation/XIP/Constituency.pm
similarity index 96%
rename from lib/KorAP/XML/Index/XIP/Constituency.pm
rename to lib/KorAP/XML/Annotation/XIP/Constituency.pm
index 81c7db0..b823dea 100644
--- a/lib/KorAP/XML/Index/XIP/Constituency.pm
+++ b/lib/KorAP/XML/Annotation/XIP/Constituency.pm
@@ -1,5 +1,5 @@
-package KorAP::XML::Index::XIP::Constituency;
-use KorAP::XML::Index::Base;
+package KorAP::XML::Annotation::XIP::Constituency;
+use KorAP::XML::Annotation::Base;
 use Set::Scalar;
 use Scalar::Util qw/weaken/;
 
diff --git a/lib/KorAP/XML/Index/XIP/Dependency.pm b/lib/KorAP/XML/Annotation/XIP/Dependency.pm
similarity index 93%
rename from lib/KorAP/XML/Index/XIP/Dependency.pm
rename to lib/KorAP/XML/Annotation/XIP/Dependency.pm
index cb5dd25..2efd2b1 100644
--- a/lib/KorAP/XML/Index/XIP/Dependency.pm
+++ b/lib/KorAP/XML/Annotation/XIP/Dependency.pm
@@ -1,5 +1,5 @@
-package KorAP::XML::Index::XIP::Dependency;
-use KorAP::XML::Index::Base;
+package KorAP::XML::Annotation::XIP::Dependency;
+use KorAP::XML::Annotation::Base;
 
 # > source to target
 # < target to source
diff --git a/lib/KorAP/XML/Index/XIP/Morpho.pm b/lib/KorAP/XML/Annotation/XIP/Morpho.pm
similarity index 93%
rename from lib/KorAP/XML/Index/XIP/Morpho.pm
rename to lib/KorAP/XML/Annotation/XIP/Morpho.pm
index 74bb3ea..1760d25 100644
--- a/lib/KorAP/XML/Index/XIP/Morpho.pm
+++ b/lib/KorAP/XML/Annotation/XIP/Morpho.pm
@@ -1,5 +1,5 @@
-package KorAP::XML::Index::XIP::Morpho;
-use KorAP::XML::Index::Base;
+package KorAP::XML::Annotation::XIP::Morpho;
+use KorAP::XML::Annotation::Base;
 
 sub parse {
   my $self = shift;
diff --git a/lib/KorAP/XML/Index/XIP/Sentences.pm b/lib/KorAP/XML/Annotation/XIP/Sentences.pm
similarity index 87%
rename from lib/KorAP/XML/Index/XIP/Sentences.pm
rename to lib/KorAP/XML/Annotation/XIP/Sentences.pm
index 1eda81e..56a0e53 100644
--- a/lib/KorAP/XML/Index/XIP/Sentences.pm
+++ b/lib/KorAP/XML/Annotation/XIP/Sentences.pm
@@ -1,5 +1,5 @@
-package KorAP::XML::Index::XIP::Sentences;
-use KorAP::XML::Index::Base;
+package KorAP::XML::Annotation::XIP::Sentences;
+use KorAP::XML::Annotation::Base;
 
 sub parse {
   my $self = shift;
diff --git a/lib/KorAP/XML/Field/MultiTerm.pm b/lib/KorAP/XML/Index/MultiTerm.pm
similarity index 98%
rename from lib/KorAP/XML/Field/MultiTerm.pm
rename to lib/KorAP/XML/Index/MultiTerm.pm
index 43e0049..87946e2 100644
--- a/lib/KorAP/XML/Field/MultiTerm.pm
+++ b/lib/KorAP/XML/Index/MultiTerm.pm
@@ -1,4 +1,4 @@
-package KorAP::XML::Field::MultiTerm;
+package KorAP::XML::Index::MultiTerm;
 use strict;
 use warnings;
 use MIME::Base64;
@@ -184,6 +184,7 @@
 };
 
 
+# DEPRECATED
 sub to_solr {
   my $self = shift;
   my $increment = shift;
diff --git a/lib/KorAP/XML/Field/MultiTermToken.pm b/lib/KorAP/XML/Index/MultiTermToken.pm
similarity index 92%
rename from lib/KorAP/XML/Field/MultiTermToken.pm
rename to lib/KorAP/XML/Index/MultiTermToken.pm
index dbc0880..9e78df8 100644
--- a/lib/KorAP/XML/Field/MultiTermToken.pm
+++ b/lib/KorAP/XML/Index/MultiTermToken.pm
@@ -1,11 +1,13 @@
-package KorAP::XML::Field::MultiTermToken;
-use KorAP::XML::Field::MultiTerm;
+package KorAP::XML::Index::MultiTermToken;
+use KorAP::XML::Index::MultiTerm;
 use List::MoreUtils 'uniq';
 use Carp qw/carp croak/;
 use strict;
 use warnings;
 
-# This tries to be highly optimized - it's not supposed to be readable
+# This tries to be highly optimized (it's not supposed to be readable)
+# but is rather slow on sorting relations.
+# Should be replaced by an efficient implementation!
 
 sub new {
   bless [], shift;
@@ -17,10 +19,10 @@
   my $mt;
   unless (ref $_[0] eq 'MultiTerm') {
     if (@_ == 1) {
-      $mt = KorAP::XML::Field::MultiTerm->new(term => $_[0]);
+      $mt = KorAP::XML::Index::MultiTerm->new(term => $_[0]);
     }
     else {
-      $mt = KorAP::XML::Field::MultiTerm->new(@_);
+      $mt = KorAP::XML::Index::MultiTerm->new(@_);
     };
   }
   else {
diff --git a/lib/KorAP/XML/Field/MultiTermTokenStream.pm b/lib/KorAP/XML/Index/MultiTermTokenStream.pm
similarity index 92%
rename from lib/KorAP/XML/Field/MultiTermTokenStream.pm
rename to lib/KorAP/XML/Index/MultiTermTokenStream.pm
index 3b828d5..f480be1 100644
--- a/lib/KorAP/XML/Field/MultiTermTokenStream.pm
+++ b/lib/KorAP/XML/Index/MultiTermTokenStream.pm
@@ -1,12 +1,12 @@
-package KorAP::XML::Field::MultiTermTokenStream;
+package KorAP::XML::Index::MultiTermTokenStream;
 use Mojo::Base -base;
-use KorAP::XML::Field::MultiTermToken;
+use KorAP::XML::Index::MultiTermToken;
 
 has [qw/oStart oEnd/];
 
 sub add {
   my $self = shift;
-  my $mtt = shift // KorAP::XML::Field::MultiTermToken->new;
+  my $mtt = shift // KorAP::XML::Index::MultiTermToken->new;
   $self->{mtt} //= [];
   $self->{tui} //= [];
   push(@{$self->{mtt}}, $mtt);
diff --git a/lib/KorAP/XML/Krill.pm b/lib/KorAP/XML/Krill.pm
index 1a0980d..519e26e 100644
--- a/lib/KorAP/XML/Krill.pm
+++ b/lib/KorAP/XML/Krill.pm
@@ -18,7 +18,7 @@
 #       Due to the kind of processing, processed metadata may be stored in
 #       a multiprocess cache instead.
 
-our $VERSION = '0.13';
+our $VERSION = '0.14';
 
 our @ATTR = qw/text_sigle
 	       doc_sigle
diff --git a/lib/KorAP/XML/Tokenizer.pm b/lib/KorAP/XML/Tokenizer.pm
index 27929ac..2e7d2d7 100644
--- a/lib/KorAP/XML/Tokenizer.pm
+++ b/lib/KorAP/XML/Tokenizer.pm
@@ -9,7 +9,7 @@
 use KorAP::XML::Tokenizer::Match;
 use KorAP::XML::Tokenizer::Spans;
 use KorAP::XML::Tokenizer::Tokens;
-use KorAP::XML::Field::MultiTermTokenStream;
+use KorAP::XML::Index::MultiTermTokenStream;
 use List::MoreUtils 'uniq';
 use JSON::XS;
 use Log::Log4perl;
@@ -45,7 +45,7 @@
   my $self = shift;
 
   # Create new token stream
-  my $mtts = KorAP::XML::Field::MultiTermTokenStream->new;
+  my $mtts = KorAP::XML::Index::MultiTermTokenStream->new;
   my $path = $self->path . lc($self->foundry) . '/' . lc($self->layer) . '.xml';
 
   unless (-e $path) {
@@ -393,7 +393,7 @@
     return;
   };
 
-  my $mod = 'KorAP::XML::Index::' . $foundry . '::' . $layer;
+  my $mod = 'KorAP::XML::Annotation::' . $foundry . '::' . $layer;
 
   if ($mod->can('new') || eval("require $mod; 1;")) {
     if (my $retval = $mod->new($self)->parse(@_)) {
@@ -638,7 +638,7 @@
 
   $tokens->stream->add_meta('adjCount', '<i>45');
 
-The L<KorAP::XML::Field::MultiTermTokenStream> object
+The L<KorAP::XML::Index::MultiTermTokenStream> object
 
 
 =head2 range
@@ -715,7 +715,7 @@
 Add span information to the parsed token stream.
 Expects a C<foundry> name, a C<layer> name and a
 callback parameter, that will be called after each parsed
-span. The L<KorAP::XML::Field::MultiTermTokenStream> object will be passed,
+span. The L<KorAP::XML::Index::MultiTermTokenStream> object will be passed,
 as well as the current L<KorAP::XML::Tokenizer::Span>.
 
 An optional parameter C<encoding> may indicate that the span offsets
@@ -745,7 +745,7 @@
 Add token information to the parsed token stream.
 Expects a C<foundry> name, a C<layer> name and a
 callback parameter, that will be called after each parsed
-token. The L<KorAP::XML::Field::MultiTermTokenStream> object will be passed,
+token. The L<KorAP::XML::Index::MultiTermTokenStream> object will be passed,
 as well as the current L<KorAP::XML::Tokenizer::Span>.
 
 An optional parameter C<encoding> may indicate that the token offsets
diff --git a/t/index/TestInit.pm b/t/annotation/TestInit.pm
similarity index 100%
rename from t/index/TestInit.pm
rename to t/annotation/TestInit.pm
diff --git a/t/index/base_paragraphs.t b/t/annotation/base_paragraphs.t
similarity index 96%
rename from t/index/base_paragraphs.t
rename to t/annotation/base_paragraphs.t
index 71484cc..e5d0c6b 100644
--- a/t/index/base_paragraphs.t
+++ b/t/annotation/base_paragraphs.t
@@ -3,7 +3,7 @@
 use warnings;
 use utf8;
 use Test::More;
-use lib 't/index';
+use lib 't/annotation';
 use TestInit;
 use Scalar::Util qw/weaken/;
 use Data::Dumper;
diff --git a/t/index/base_sentences.t b/t/annotation/base_sentences.t
similarity index 96%
rename from t/index/base_sentences.t
rename to t/annotation/base_sentences.t
index 06bdfda..69bb313 100644
--- a/t/index/base_sentences.t
+++ b/t/annotation/base_sentences.t
@@ -3,7 +3,7 @@
 use warnings;
 use utf8;
 use Test::More;
-use lib 't/index';
+use lib 't/annotation';
 use TestInit;
 use Scalar::Util qw/weaken/;
 use Data::Dumper;
diff --git a/t/index/connexor_morpho.t b/t/annotation/connexor_morpho.t
similarity index 97%
rename from t/index/connexor_morpho.t
rename to t/annotation/connexor_morpho.t
index d0be68c..de0f704 100644
--- a/t/index/connexor_morpho.t
+++ b/t/annotation/connexor_morpho.t
@@ -3,7 +3,7 @@
 use warnings;
 use utf8;
 use Test::More;
-use lib 't/index';
+use lib 't/annotation';
 use TestInit;
 use Scalar::Util qw/weaken/;
 use Data::Dumper;
diff --git a/t/index/connexor_phrase.t b/t/annotation/connexor_phrase.t
similarity index 95%
rename from t/index/connexor_phrase.t
rename to t/annotation/connexor_phrase.t
index 2c1c933..a2cf6e3 100644
--- a/t/index/connexor_phrase.t
+++ b/t/annotation/connexor_phrase.t
@@ -3,7 +3,7 @@
 use warnings;
 use utf8;
 use Test::More;
-use lib 't/index';
+use lib 't/annotation';
 use TestInit;
 use Scalar::Util qw/weaken/;
 use Data::Dumper;
diff --git a/t/index/connexor_sentences.t b/t/annotation/connexor_sentences.t
similarity index 100%
rename from t/index/connexor_sentences.t
rename to t/annotation/connexor_sentences.t
diff --git a/t/index/connexor_syntax.t b/t/annotation/connexor_syntax.t
similarity index 95%
rename from t/index/connexor_syntax.t
rename to t/annotation/connexor_syntax.t
index c32dc63..c94fc58 100644
--- a/t/index/connexor_syntax.t
+++ b/t/annotation/connexor_syntax.t
@@ -5,7 +5,7 @@
 use Test::More;
 use Scalar::Util qw/weaken/;
 use Data::Dumper;
-use lib 't/index';
+use lib 't/annotation';
 use TestInit;
 
 ok(my $tokens = TestInit::tokens('0001'), 'Parse tokens');
diff --git a/t/index/corenlp_constituency.t b/t/annotation/corenlp_constituency.t
similarity index 96%
rename from t/index/corenlp_constituency.t
rename to t/annotation/corenlp_constituency.t
index 3e84c56..4198ede 100644
--- a/t/index/corenlp_constituency.t
+++ b/t/annotation/corenlp_constituency.t
@@ -5,7 +5,7 @@
 use Test::More;
 use Scalar::Util qw/weaken/;
 use Data::Dumper;
-use lib 't/index';
+use lib 't/annotation';
 use TestInit;
 
 ok(my $tokens = TestInit::tokens('0001'), 'Parse tokens');
diff --git a/t/index/corenlp_ent.t b/t/annotation/corenlp_ent.t
similarity index 96%
rename from t/index/corenlp_ent.t
rename to t/annotation/corenlp_ent.t
index edbc1a1..30e8081 100644
--- a/t/index/corenlp_ent.t
+++ b/t/annotation/corenlp_ent.t
@@ -5,7 +5,7 @@
 use Test::More;
 use Scalar::Util qw/weaken/;
 use Data::Dumper;
-use lib 't/index';
+use lib 't/annotation';
 use TestInit;
 
 ok(my $tokens = TestInit::tokens('0001'), 'Parse tokens');
diff --git a/t/index/corenlp_morpho.t b/t/annotation/corenlp_morpho.t
similarity index 96%
rename from t/index/corenlp_morpho.t
rename to t/annotation/corenlp_morpho.t
index c9afdca..ec6e518 100644
--- a/t/index/corenlp_morpho.t
+++ b/t/annotation/corenlp_morpho.t
@@ -5,7 +5,7 @@
 use Test::More;
 use Scalar::Util qw/weaken/;
 use Data::Dumper;
-use lib 't/index';
+use lib 't/annotation';
 use TestInit;
 
 ok(my $tokens = TestInit::tokens('0001'), 'Parse tokens');
diff --git a/t/index/corenlp_sentences.t b/t/annotation/corenlp_sentences.t
similarity index 96%
rename from t/index/corenlp_sentences.t
rename to t/annotation/corenlp_sentences.t
index 0102748..b9e9b75 100644
--- a/t/index/corenlp_sentences.t
+++ b/t/annotation/corenlp_sentences.t
@@ -5,7 +5,7 @@
 use Test::More;
 use Scalar::Util qw/weaken/;
 use Data::Dumper;
-use lib 't/index';
+use lib 't/annotation';
 use TestInit;
 
 ok(my $tokens = TestInit::tokens('0001'), 'Parse tokens');
diff --git a/t/index/corpus/doc/0001/base/paragraph.xml b/t/annotation/corpus/doc/0001/base/paragraph.xml
similarity index 100%
rename from t/index/corpus/doc/0001/base/paragraph.xml
rename to t/annotation/corpus/doc/0001/base/paragraph.xml
diff --git a/t/index/corpus/doc/0001/base/sentences.xml b/t/annotation/corpus/doc/0001/base/sentences.xml
similarity index 100%
rename from t/index/corpus/doc/0001/base/sentences.xml
rename to t/annotation/corpus/doc/0001/base/sentences.xml
diff --git a/t/index/corpus/doc/0001/connexor/morpho.xml b/t/annotation/corpus/doc/0001/connexor/morpho.xml
similarity index 100%
rename from t/index/corpus/doc/0001/connexor/morpho.xml
rename to t/annotation/corpus/doc/0001/connexor/morpho.xml
diff --git a/t/index/corpus/doc/0001/connexor/phrase.xml b/t/annotation/corpus/doc/0001/connexor/phrase.xml
similarity index 100%
rename from t/index/corpus/doc/0001/connexor/phrase.xml
rename to t/annotation/corpus/doc/0001/connexor/phrase.xml
diff --git a/t/index/corpus/doc/0001/connexor/sentences.xml b/t/annotation/corpus/doc/0001/connexor/sentences.xml
similarity index 100%
rename from t/index/corpus/doc/0001/connexor/sentences.xml
rename to t/annotation/corpus/doc/0001/connexor/sentences.xml
diff --git a/t/index/corpus/doc/0001/connexor/syntax.xml b/t/annotation/corpus/doc/0001/connexor/syntax.xml
similarity index 100%
rename from t/index/corpus/doc/0001/connexor/syntax.xml
rename to t/annotation/corpus/doc/0001/connexor/syntax.xml
diff --git a/t/index/corpus/doc/0001/corenlp/constituency.xml b/t/annotation/corpus/doc/0001/corenlp/constituency.xml
similarity index 100%
rename from t/index/corpus/doc/0001/corenlp/constituency.xml
rename to t/annotation/corpus/doc/0001/corenlp/constituency.xml
diff --git a/t/index/corpus/doc/0001/corenlp/morpho.xml b/t/annotation/corpus/doc/0001/corenlp/morpho.xml
similarity index 100%
rename from t/index/corpus/doc/0001/corenlp/morpho.xml
rename to t/annotation/corpus/doc/0001/corenlp/morpho.xml
diff --git a/t/index/corpus/doc/0001/corenlp/ne_dewac_175m_600.xml b/t/annotation/corpus/doc/0001/corenlp/ne_dewac_175m_600.xml
similarity index 100%
rename from t/index/corpus/doc/0001/corenlp/ne_dewac_175m_600.xml
rename to t/annotation/corpus/doc/0001/corenlp/ne_dewac_175m_600.xml
diff --git a/t/index/corpus/doc/0001/corenlp/ne_hgc_175m_600.xml b/t/annotation/corpus/doc/0001/corenlp/ne_hgc_175m_600.xml
similarity index 100%
rename from t/index/corpus/doc/0001/corenlp/ne_hgc_175m_600.xml
rename to t/annotation/corpus/doc/0001/corenlp/ne_hgc_175m_600.xml
diff --git a/t/index/corpus/doc/0001/corenlp/sentences.xml b/t/annotation/corpus/doc/0001/corenlp/sentences.xml
similarity index 100%
rename from t/index/corpus/doc/0001/corenlp/sentences.xml
rename to t/annotation/corpus/doc/0001/corenlp/sentences.xml
diff --git a/t/index/corpus/doc/0001/corenlp/tokens.xml b/t/annotation/corpus/doc/0001/corenlp/tokens.xml
similarity index 100%
rename from t/index/corpus/doc/0001/corenlp/tokens.xml
rename to t/annotation/corpus/doc/0001/corenlp/tokens.xml
diff --git a/t/index/corpus/doc/0001/data.xml b/t/annotation/corpus/doc/0001/data.xml
similarity index 100%
rename from t/index/corpus/doc/0001/data.xml
rename to t/annotation/corpus/doc/0001/data.xml
diff --git a/t/index/corpus/doc/0001/glemm/glemm.xml b/t/annotation/corpus/doc/0001/glemm/glemm.xml
similarity index 100%
rename from t/index/corpus/doc/0001/glemm/glemm.xml
rename to t/annotation/corpus/doc/0001/glemm/glemm.xml
diff --git a/t/index/corpus/doc/0001/header.xml b/t/annotation/corpus/doc/0001/header.xml
similarity index 100%
rename from t/index/corpus/doc/0001/header.xml
rename to t/annotation/corpus/doc/0001/header.xml
diff --git a/t/index/corpus/doc/0001/mate/dependency.xml b/t/annotation/corpus/doc/0001/mate/dependency.xml
similarity index 100%
rename from t/index/corpus/doc/0001/mate/dependency.xml
rename to t/annotation/corpus/doc/0001/mate/dependency.xml
diff --git a/t/index/corpus/doc/0001/mate/morpho.xml b/t/annotation/corpus/doc/0001/mate/morpho.xml
similarity index 100%
rename from t/index/corpus/doc/0001/mate/morpho.xml
rename to t/annotation/corpus/doc/0001/mate/morpho.xml
diff --git a/t/index/corpus/doc/0001/opennlp/morpho.xml b/t/annotation/corpus/doc/0001/opennlp/morpho.xml
similarity index 100%
rename from t/index/corpus/doc/0001/opennlp/morpho.xml
rename to t/annotation/corpus/doc/0001/opennlp/morpho.xml
diff --git a/t/index/corpus/doc/0001/opennlp/sentences.xml b/t/annotation/corpus/doc/0001/opennlp/sentences.xml
similarity index 100%
rename from t/index/corpus/doc/0001/opennlp/sentences.xml
rename to t/annotation/corpus/doc/0001/opennlp/sentences.xml
diff --git a/t/index/corpus/doc/0001/opennlp/tokens.xml b/t/annotation/corpus/doc/0001/opennlp/tokens.xml
similarity index 100%
rename from t/index/corpus/doc/0001/opennlp/tokens.xml
rename to t/annotation/corpus/doc/0001/opennlp/tokens.xml
diff --git a/t/index/corpus/doc/0001/struct/structure.xml b/t/annotation/corpus/doc/0001/struct/structure.xml
similarity index 100%
rename from t/index/corpus/doc/0001/struct/structure.xml
rename to t/annotation/corpus/doc/0001/struct/structure.xml
diff --git a/t/index/corpus/doc/0001/tree_tagger/morpho.xml b/t/annotation/corpus/doc/0001/tree_tagger/morpho.xml
similarity index 100%
rename from t/index/corpus/doc/0001/tree_tagger/morpho.xml
rename to t/annotation/corpus/doc/0001/tree_tagger/morpho.xml
diff --git a/t/index/corpus/doc/0001/tree_tagger/sentences.xml b/t/annotation/corpus/doc/0001/tree_tagger/sentences.xml
similarity index 100%
rename from t/index/corpus/doc/0001/tree_tagger/sentences.xml
rename to t/annotation/corpus/doc/0001/tree_tagger/sentences.xml
diff --git a/t/index/corpus/doc/0001/xip/constituency.xml b/t/annotation/corpus/doc/0001/xip/constituency.xml
similarity index 100%
rename from t/index/corpus/doc/0001/xip/constituency.xml
rename to t/annotation/corpus/doc/0001/xip/constituency.xml
diff --git a/t/index/corpus/doc/0001/xip/dependency.xml b/t/annotation/corpus/doc/0001/xip/dependency.xml
similarity index 100%
rename from t/index/corpus/doc/0001/xip/dependency.xml
rename to t/annotation/corpus/doc/0001/xip/dependency.xml
diff --git a/t/index/corpus/doc/0001/xip/morpho.xml b/t/annotation/corpus/doc/0001/xip/morpho.xml
similarity index 100%
rename from t/index/corpus/doc/0001/xip/morpho.xml
rename to t/annotation/corpus/doc/0001/xip/morpho.xml
diff --git a/t/index/corpus/doc/0001/xip/sentences.xml b/t/annotation/corpus/doc/0001/xip/sentences.xml
similarity index 100%
rename from t/index/corpus/doc/0001/xip/sentences.xml
rename to t/annotation/corpus/doc/0001/xip/sentences.xml
diff --git a/t/index/corpus/doc/0002/base/paragraph.xml b/t/annotation/corpus/doc/0002/base/paragraph.xml
similarity index 100%
rename from t/index/corpus/doc/0002/base/paragraph.xml
rename to t/annotation/corpus/doc/0002/base/paragraph.xml
diff --git a/t/index/corpus/doc/0002/base/sentences.xml b/t/annotation/corpus/doc/0002/base/sentences.xml
similarity index 100%
rename from t/index/corpus/doc/0002/base/sentences.xml
rename to t/annotation/corpus/doc/0002/base/sentences.xml
diff --git a/t/index/corpus/doc/0002/base/tokens_aggr.xml b/t/annotation/corpus/doc/0002/base/tokens_aggr.xml
similarity index 100%
rename from t/index/corpus/doc/0002/base/tokens_aggr.xml
rename to t/annotation/corpus/doc/0002/base/tokens_aggr.xml
diff --git a/t/index/corpus/doc/0002/base/tokens_conservative.xml b/t/annotation/corpus/doc/0002/base/tokens_conservative.xml
similarity index 100%
rename from t/index/corpus/doc/0002/base/tokens_conservative.xml
rename to t/annotation/corpus/doc/0002/base/tokens_conservative.xml
diff --git a/t/index/corpus/doc/0002/data.xml b/t/annotation/corpus/doc/0002/data.xml
similarity index 100%
rename from t/index/corpus/doc/0002/data.xml
rename to t/annotation/corpus/doc/0002/data.xml
diff --git a/t/index/corpus/doc/0002/header.xml b/t/annotation/corpus/doc/0002/header.xml
similarity index 100%
rename from t/index/corpus/doc/0002/header.xml
rename to t/annotation/corpus/doc/0002/header.xml
diff --git a/t/index/corpus/doc/0002/malt/dependency.xml b/t/annotation/corpus/doc/0002/malt/dependency.xml
similarity index 100%
rename from t/index/corpus/doc/0002/malt/dependency.xml
rename to t/annotation/corpus/doc/0002/malt/dependency.xml
diff --git a/t/index/corpus/doc/0002/malt/metadata.xml b/t/annotation/corpus/doc/0002/malt/metadata.xml
similarity index 100%
rename from t/index/corpus/doc/0002/malt/metadata.xml
rename to t/annotation/corpus/doc/0002/malt/metadata.xml
diff --git a/t/index/corpus/doc/0002/struct/structure.xml b/t/annotation/corpus/doc/0002/struct/structure.xml
similarity index 100%
rename from t/index/corpus/doc/0002/struct/structure.xml
rename to t/annotation/corpus/doc/0002/struct/structure.xml
diff --git a/t/index/corpus/doc/0002/tree_tagger/metadata.xml b/t/annotation/corpus/doc/0002/tree_tagger/metadata.xml
similarity index 100%
rename from t/index/corpus/doc/0002/tree_tagger/metadata.xml
rename to t/annotation/corpus/doc/0002/tree_tagger/metadata.xml
diff --git a/t/index/corpus/doc/0002/tree_tagger/morpho.xml b/t/annotation/corpus/doc/0002/tree_tagger/morpho.xml
similarity index 100%
rename from t/index/corpus/doc/0002/tree_tagger/morpho.xml
rename to t/annotation/corpus/doc/0002/tree_tagger/morpho.xml
diff --git a/t/index/corpus/doc/0002/tree_tagger/sentences.xml b/t/annotation/corpus/doc/0002/tree_tagger/sentences.xml
similarity index 100%
rename from t/index/corpus/doc/0002/tree_tagger/sentences.xml
rename to t/annotation/corpus/doc/0002/tree_tagger/sentences.xml
diff --git a/t/index/corpus/doc/0002/tree_tagger/tokens.xml b/t/annotation/corpus/doc/0002/tree_tagger/tokens.xml
similarity index 100%
rename from t/index/corpus/doc/0002/tree_tagger/tokens.xml
rename to t/annotation/corpus/doc/0002/tree_tagger/tokens.xml
diff --git a/t/index/corpus/doc/header.xml b/t/annotation/corpus/doc/header.xml
similarity index 100%
rename from t/index/corpus/doc/header.xml
rename to t/annotation/corpus/doc/header.xml
diff --git a/t/index/corpus/header.xml b/t/annotation/corpus/header.xml
similarity index 100%
rename from t/index/corpus/header.xml
rename to t/annotation/corpus/header.xml
diff --git a/t/index/dereko_struct.t b/t/annotation/dereko_struct.t
similarity index 97%
rename from t/index/dereko_struct.t
rename to t/annotation/dereko_struct.t
index 4ecf608..8f5f18a 100644
--- a/t/index/dereko_struct.t
+++ b/t/annotation/dereko_struct.t
@@ -3,7 +3,7 @@
 use warnings;
 use utf8;
 use Test::More;
-use lib 't/index';
+use lib 't/annotation';
 use TestInit;
 use Scalar::Util qw/weaken/;
 use Data::Dumper;
diff --git a/t/index/glemm_morpho.t b/t/annotation/glemm_morpho.t
similarity index 97%
rename from t/index/glemm_morpho.t
rename to t/annotation/glemm_morpho.t
index 34e70c5..208d9d1 100644
--- a/t/index/glemm_morpho.t
+++ b/t/annotation/glemm_morpho.t
@@ -5,7 +5,7 @@
 use Test::More;
 use Scalar::Util qw/weaken/;
 use Data::Dumper;
-use lib 't/index';
+use lib 't/annotation';
 use TestInit;
 
 ok(my $tokens = TestInit::tokens('0001'), 'Parse tokens');
diff --git a/t/index/koralquery.t b/t/annotation/koralquery.t
similarity index 98%
rename from t/index/koralquery.t
rename to t/annotation/koralquery.t
index e20c559..7193bd6 100644
--- a/t/index/koralquery.t
+++ b/t/annotation/koralquery.t
@@ -3,7 +3,7 @@
 use warnings;
 use utf8;
 use Test::More skip_all => 'Not yet implemented';
-use lib 't/index';
+use lib 't/annotation';
 use File::Basename 'dirname';
 use File::Spec::Functions 'catdir';
 
diff --git a/t/index/malt_dependency.t b/t/annotation/malt_dependency.t
similarity index 96%
rename from t/index/malt_dependency.t
rename to t/annotation/malt_dependency.t
index 04c216c..620b0ce 100644
--- a/t/index/malt_dependency.t
+++ b/t/annotation/malt_dependency.t
@@ -5,7 +5,7 @@
 use Test::More skip_all => 'Not yet implemented';
 use Scalar::Util qw/weaken/;
 use Data::Dumper;
-use lib 't/index';
+use lib 't/annotation';
 use TestInit;
 
 ok(my $tokens = TestInit::tokens('0002'), 'Parse tokens');
diff --git a/t/index/mate_dependency.t b/t/annotation/mate_dependency.t
similarity index 96%
rename from t/index/mate_dependency.t
rename to t/annotation/mate_dependency.t
index 2567a2a..d955ebe 100644
--- a/t/index/mate_dependency.t
+++ b/t/annotation/mate_dependency.t
@@ -5,7 +5,7 @@
 use Test::More;
 use Scalar::Util qw/weaken/;
 use Data::Dumper;
-use lib 't/index';
+use lib 't/annotation';
 use TestInit;
 
 ok(my $tokens = TestInit::tokens('0001'), 'Parse tokens');
diff --git a/t/index/mate_morpho.t b/t/annotation/mate_morpho.t
similarity index 97%
rename from t/index/mate_morpho.t
rename to t/annotation/mate_morpho.t
index 1f5fb91..736fd31 100644
--- a/t/index/mate_morpho.t
+++ b/t/annotation/mate_morpho.t
@@ -5,7 +5,7 @@
 use Test::More;
 use Scalar::Util qw/weaken/;
 use Data::Dumper;
-use lib 't/index';
+use lib 't/annotation';
 use TestInit;
 
 ok(my $tokens = TestInit::tokens('0001'), 'Parse tokens');
diff --git a/t/index/mate_morpho_attr.t b/t/annotation/mate_morpho_attr.t
similarity index 97%
rename from t/index/mate_morpho_attr.t
rename to t/annotation/mate_morpho_attr.t
index 04daffa..b32c12c 100644
--- a/t/index/mate_morpho_attr.t
+++ b/t/annotation/mate_morpho_attr.t
@@ -5,7 +5,7 @@
 use Test::More;
 use Scalar::Util qw/weaken/;
 use Data::Dumper;
-use lib 't/index';
+use lib 't/annotation';
 use TestInit;
 
 ok(my $tokens = TestInit::tokens('0001'), 'Parse tokens');
diff --git a/t/index/meta.t b/t/annotation/meta.t
similarity index 98%
rename from t/index/meta.t
rename to t/annotation/meta.t
index 44ee526..713d8fd 100644
--- a/t/index/meta.t
+++ b/t/annotation/meta.t
@@ -5,7 +5,7 @@
 use Test::More;
 use Scalar::Util qw/weaken/;
 use Data::Dumper;
-use lib 't/index';
+use lib 't/annotation';
 use TestInit;
 use File::Basename 'dirname';
 use File::Spec::Functions 'catdir';
diff --git a/t/index/opennlp_morpho.t b/t/annotation/opennlp_morpho.t
similarity index 98%
rename from t/index/opennlp_morpho.t
rename to t/annotation/opennlp_morpho.t
index eb94a31..c8bcbb7 100644
--- a/t/index/opennlp_morpho.t
+++ b/t/annotation/opennlp_morpho.t
@@ -5,7 +5,7 @@
 use Test::More;
 use Scalar::Util qw/weaken/;
 use Data::Dumper;
-use lib 't/index';
+use lib 't/annotation';
 use TestInit;
 
 ok(my $tokens = TestInit::tokens('0001'), 'Parse tokens');
diff --git a/t/index/opennlp_sentences.t b/t/annotation/opennlp_sentences.t
similarity index 96%
rename from t/index/opennlp_sentences.t
rename to t/annotation/opennlp_sentences.t
index 98bb243..16c8a65 100644
--- a/t/index/opennlp_sentences.t
+++ b/t/annotation/opennlp_sentences.t
@@ -5,7 +5,7 @@
 use Test::More;
 use Scalar::Util qw/weaken/;
 use Data::Dumper;
-use lib 't/index';
+use lib 't/annotation';
 use TestInit;
 
 ok(my $tokens = TestInit::tokens('0001'), 'Parse tokens');
diff --git a/t/index/primary.t b/t/annotation/primary.t
similarity index 96%
rename from t/index/primary.t
rename to t/annotation/primary.t
index e42453c..32431d3 100644
--- a/t/index/primary.t
+++ b/t/annotation/primary.t
@@ -5,7 +5,7 @@
 use Test::More;
 use Scalar::Util qw/weaken/;
 use Data::Dumper;
-use lib 't/index';
+use lib 't/annotation';
 use KorAP::XML::Krill;
 use File::Basename 'dirname';
 use File::Spec::Functions 'catdir';
diff --git a/t/index/tt_morpho.t b/t/annotation/tt_morpho.t
similarity index 97%
rename from t/index/tt_morpho.t
rename to t/annotation/tt_morpho.t
index 5d50b38..3ce5cc3 100644
--- a/t/index/tt_morpho.t
+++ b/t/annotation/tt_morpho.t
@@ -5,7 +5,7 @@
 use Test::More;
 use Scalar::Util qw/weaken/;
 use Data::Dumper;
-use lib 't/index';
+use lib 't/annotation';
 use TestInit;
 
 ok(my $tokens = TestInit::tokens('0001'), 'Parse tokens');
diff --git a/t/index/tt_sentences.t b/t/annotation/tt_sentences.t
similarity index 96%
rename from t/index/tt_sentences.t
rename to t/annotation/tt_sentences.t
index c47ebb6..703f1a6 100644
--- a/t/index/tt_sentences.t
+++ b/t/annotation/tt_sentences.t
@@ -5,7 +5,7 @@
 use Test::More;
 use Scalar::Util qw/weaken/;
 use Data::Dumper;
-use lib 't/index';
+use lib 't/annotation';
 use TestInit;
 
 ok(my $tokens = TestInit::tokens('0001'), 'Parse tokens');
diff --git a/t/index/xip_constituency.t b/t/annotation/xip_constituency.t
similarity index 97%
rename from t/index/xip_constituency.t
rename to t/annotation/xip_constituency.t
index afd1e2a..026321f 100644
--- a/t/index/xip_constituency.t
+++ b/t/annotation/xip_constituency.t
@@ -5,7 +5,7 @@
 use Test::More;
 use Scalar::Util qw/weaken/;
 use Data::Dumper;
-use lib 't/index';
+use lib 't/annotation';
 use TestInit;
 
 ok(my $tokens = TestInit::tokens('0001'), 'Parse tokens');
diff --git a/t/index/xip_dependency.t b/t/annotation/xip_dependency.t
similarity index 97%
rename from t/index/xip_dependency.t
rename to t/annotation/xip_dependency.t
index 446e5ad..1f8a169 100644
--- a/t/index/xip_dependency.t
+++ b/t/annotation/xip_dependency.t
@@ -5,7 +5,7 @@
 use Test::More skip_all => 'Not yet implemented';
 use Scalar::Util qw/weaken/;
 use Data::Dumper;
-use lib 't/index';
+use lib 't/annotation';
 use TestInit;
 
 ok(my $tokens = TestInit::tokens('0001'), 'Parse tokens');
diff --git a/t/index/xip_morpho.t b/t/annotation/xip_morpho.t
similarity index 97%
rename from t/index/xip_morpho.t
rename to t/annotation/xip_morpho.t
index db59ef3..7a4404c 100644
--- a/t/index/xip_morpho.t
+++ b/t/annotation/xip_morpho.t
@@ -5,7 +5,7 @@
 use Test::More;
 use Scalar::Util qw/weaken/;
 use Data::Dumper;
-use lib 't/index';
+use lib 't/annotation';
 use TestInit;
 
 ok(my $tokens = TestInit::tokens('0001'), 'Parse tokens');
diff --git a/t/index/xip_sentences.t b/t/annotation/xip_sentences.t
similarity index 96%
rename from t/index/xip_sentences.t
rename to t/annotation/xip_sentences.t
index 896422e..3f2c62c 100644
--- a/t/index/xip_sentences.t
+++ b/t/annotation/xip_sentences.t
@@ -5,7 +5,7 @@
 use Test::More;
 use Scalar::Util qw/weaken/;
 use Data::Dumper;
-use lib 't/index';
+use lib 't/annotation';
 use TestInit;
 
 ok(my $tokens = TestInit::tokens('0001'), 'Parse tokens');
diff --git a/t/sort_tokens.t b/t/sort_tokens.t
index e729729..b5683d5 100644
--- a/t/sort_tokens.t
+++ b/t/sort_tokens.t
@@ -6,9 +6,9 @@
 use utf8;
 use lib 'lib', '../lib';
 
-use_ok('KorAP::XML::Field::MultiTermTokenStream');
+use_ok('KorAP::XML::Index::MultiTermTokenStream');
 
-ok(my $mtt = KorAP::XML::Field::MultiTermToken->new, 'New token');
+ok(my $mtt = KorAP::XML::Index::MultiTermToken->new, 'New token');
 ok(defined $mtt->o_start(0), 'Set start character offset');
 ok($mtt->o_end(5), 'Set end character offset');
 ok($mtt->add(term => '@:k=N',
@@ -70,7 +70,7 @@
 		       'g=N$<b>129<b>144]',
    'Check string');
 
-ok($mtt = KorAP::XML::Field::MultiTermToken->new, 'New token');
+ok($mtt = KorAP::XML::Index::MultiTermToken->new, 'New token');
 ok(defined $mtt->o_start(0), 'Set start character offset');
 ok($mtt->o_end(5), 'Set end character offset');