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