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