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');