diff --git a/t/A00/02035-substring/base/paragraph.xml b/t/corpus/A00/02035-substring/base/paragraph.xml
similarity index 100%
rename from t/A00/02035-substring/base/paragraph.xml
rename to t/corpus/A00/02035-substring/base/paragraph.xml
diff --git a/t/A00/02035-substring/base/sentences.xml b/t/corpus/A00/02035-substring/base/sentences.xml
similarity index 100%
rename from t/A00/02035-substring/base/sentences.xml
rename to t/corpus/A00/02035-substring/base/sentences.xml
diff --git a/t/A00/02035-substring/base/tokens_aggr.xml b/t/corpus/A00/02035-substring/base/tokens_aggr.xml
similarity index 100%
rename from t/A00/02035-substring/base/tokens_aggr.xml
rename to t/corpus/A00/02035-substring/base/tokens_aggr.xml
diff --git a/t/A00/02035-substring/base/tokens_conservative.xml b/t/corpus/A00/02035-substring/base/tokens_conservative.xml
similarity index 100%
rename from t/A00/02035-substring/base/tokens_conservative.xml
rename to t/corpus/A00/02035-substring/base/tokens_conservative.xml
diff --git a/t/A00/02035-substring/connexor/metadata.xml b/t/corpus/A00/02035-substring/connexor/metadata.xml
similarity index 100%
rename from t/A00/02035-substring/connexor/metadata.xml
rename to t/corpus/A00/02035-substring/connexor/metadata.xml
diff --git a/t/A00/02035-substring/connexor/morpho.xml b/t/corpus/A00/02035-substring/connexor/morpho.xml
similarity index 100%
rename from t/A00/02035-substring/connexor/morpho.xml
rename to t/corpus/A00/02035-substring/connexor/morpho.xml
diff --git a/t/A00/02035-substring/connexor/mpt.xml b/t/corpus/A00/02035-substring/connexor/mpt.xml
similarity index 100%
rename from t/A00/02035-substring/connexor/mpt.xml
rename to t/corpus/A00/02035-substring/connexor/mpt.xml
diff --git a/t/A00/02035-substring/connexor/phrase.xml b/t/corpus/A00/02035-substring/connexor/phrase.xml
similarity index 100%
rename from t/A00/02035-substring/connexor/phrase.xml
rename to t/corpus/A00/02035-substring/connexor/phrase.xml
diff --git a/t/A00/02035-substring/connexor/sentences.xml b/t/corpus/A00/02035-substring/connexor/sentences.xml
similarity index 100%
rename from t/A00/02035-substring/connexor/sentences.xml
rename to t/corpus/A00/02035-substring/connexor/sentences.xml
diff --git a/t/A00/02035-substring/connexor/syntax.xml b/t/corpus/A00/02035-substring/connexor/syntax.xml
similarity index 100%
rename from t/A00/02035-substring/connexor/syntax.xml
rename to t/corpus/A00/02035-substring/connexor/syntax.xml
diff --git a/t/A00/02035-substring/connexor/tokens.xml b/t/corpus/A00/02035-substring/connexor/tokens.xml
similarity index 100%
rename from t/A00/02035-substring/connexor/tokens.xml
rename to t/corpus/A00/02035-substring/connexor/tokens.xml
diff --git a/t/A00/02035-substring/corenlp/ne_dewac_175m_600.xml b/t/corpus/A00/02035-substring/corenlp/ne_dewac_175m_600.xml
similarity index 100%
rename from t/A00/02035-substring/corenlp/ne_dewac_175m_600.xml
rename to t/corpus/A00/02035-substring/corenlp/ne_dewac_175m_600.xml
diff --git a/t/A00/02035-substring/corenlp/ne_hgc_175m_600.xml b/t/corpus/A00/02035-substring/corenlp/ne_hgc_175m_600.xml
similarity index 100%
rename from t/A00/02035-substring/corenlp/ne_hgc_175m_600.xml
rename to t/corpus/A00/02035-substring/corenlp/ne_hgc_175m_600.xml
diff --git a/t/A00/02035-substring/corenlp/sentences.xml b/t/corpus/A00/02035-substring/corenlp/sentences.xml
similarity index 100%
rename from t/A00/02035-substring/corenlp/sentences.xml
rename to t/corpus/A00/02035-substring/corenlp/sentences.xml
diff --git a/t/A00/02035-substring/corenlp/tokens.xml b/t/corpus/A00/02035-substring/corenlp/tokens.xml
similarity index 100%
rename from t/A00/02035-substring/corenlp/tokens.xml
rename to t/corpus/A00/02035-substring/corenlp/tokens.xml
diff --git a/t/A00/02035-substring/data.xml b/t/corpus/A00/02035-substring/data.xml
similarity index 100%
rename from t/A00/02035-substring/data.xml
rename to t/corpus/A00/02035-substring/data.xml
diff --git a/t/A00/02035-substring/header.xml b/t/corpus/A00/02035-substring/header.xml
similarity index 100%
rename from t/A00/02035-substring/header.xml
rename to t/corpus/A00/02035-substring/header.xml
diff --git a/t/A00/02035-substring/mate/dependency.xml b/t/corpus/A00/02035-substring/mate/dependency.xml
similarity index 100%
rename from t/A00/02035-substring/mate/dependency.xml
rename to t/corpus/A00/02035-substring/mate/dependency.xml
diff --git a/t/A00/02035-substring/mate/morpho.xml b/t/corpus/A00/02035-substring/mate/morpho.xml
similarity index 100%
rename from t/A00/02035-substring/mate/morpho.xml
rename to t/corpus/A00/02035-substring/mate/morpho.xml
diff --git a/t/A00/02035-substring/mate/pipeline/one_token_per_line.txt b/t/corpus/A00/02035-substring/mate/pipeline/one_token_per_line.txt
similarity index 100%
rename from t/A00/02035-substring/mate/pipeline/one_token_per_line.txt
rename to t/corpus/A00/02035-substring/mate/pipeline/one_token_per_line.txt
diff --git a/t/A00/02035-substring/mate/pipeline/parsed.txt b/t/corpus/A00/02035-substring/mate/pipeline/parsed.txt
similarity index 100%
rename from t/A00/02035-substring/mate/pipeline/parsed.txt
rename to t/corpus/A00/02035-substring/mate/pipeline/parsed.txt
diff --git a/t/A00/02035-substring/mate/tokenSpans/number_tokenSpans.xml b/t/corpus/A00/02035-substring/mate/tokenSpans/number_tokenSpans.xml
similarity index 100%
rename from t/A00/02035-substring/mate/tokenSpans/number_tokenSpans.xml
rename to t/corpus/A00/02035-substring/mate/tokenSpans/number_tokenSpans.xml
diff --git a/t/A00/02035-substring/opennlp/morpho.xml b/t/corpus/A00/02035-substring/opennlp/morpho.xml
similarity index 100%
rename from t/A00/02035-substring/opennlp/morpho.xml
rename to t/corpus/A00/02035-substring/opennlp/morpho.xml
diff --git a/t/A00/02035-substring/opennlp/sentences.xml b/t/corpus/A00/02035-substring/opennlp/sentences.xml
similarity index 100%
rename from t/A00/02035-substring/opennlp/sentences.xml
rename to t/corpus/A00/02035-substring/opennlp/sentences.xml
diff --git a/t/A00/02035-substring/opennlp/tokens.xml b/t/corpus/A00/02035-substring/opennlp/tokens.xml
similarity index 100%
rename from t/A00/02035-substring/opennlp/tokens.xml
rename to t/corpus/A00/02035-substring/opennlp/tokens.xml
diff --git a/t/A00/02035-substring/struct/structure.xml b/t/corpus/A00/02035-substring/struct/structure.xml
similarity index 100%
rename from t/A00/02035-substring/struct/structure.xml
rename to t/corpus/A00/02035-substring/struct/structure.xml
diff --git a/t/A00/02035-substring/text.txt b/t/corpus/A00/02035-substring/text.txt
similarity index 100%
rename from t/A00/02035-substring/text.txt
rename to t/corpus/A00/02035-substring/text.txt
diff --git a/t/A00/02035-substring/tree_tagger/metadata.xml b/t/corpus/A00/02035-substring/tree_tagger/metadata.xml
similarity index 100%
rename from t/A00/02035-substring/tree_tagger/metadata.xml
rename to t/corpus/A00/02035-substring/tree_tagger/metadata.xml
diff --git a/t/A00/02035-substring/tree_tagger/morpho.xml b/t/corpus/A00/02035-substring/tree_tagger/morpho.xml
similarity index 100%
rename from t/A00/02035-substring/tree_tagger/morpho.xml
rename to t/corpus/A00/02035-substring/tree_tagger/morpho.xml
diff --git a/t/A00/02035-substring/tree_tagger/sentences.xml b/t/corpus/A00/02035-substring/tree_tagger/sentences.xml
similarity index 100%
rename from t/A00/02035-substring/tree_tagger/sentences.xml
rename to t/corpus/A00/02035-substring/tree_tagger/sentences.xml
diff --git a/t/A00/02035-substring/tree_tagger/tokens.xml b/t/corpus/A00/02035-substring/tree_tagger/tokens.xml
similarity index 100%
rename from t/A00/02035-substring/tree_tagger/tokens.xml
rename to t/corpus/A00/02035-substring/tree_tagger/tokens.xml
diff --git a/t/A00/02035-substring/xip/constituency.xml b/t/corpus/A00/02035-substring/xip/constituency.xml
similarity index 100%
rename from t/A00/02035-substring/xip/constituency.xml
rename to t/corpus/A00/02035-substring/xip/constituency.xml
diff --git a/t/A00/02035-substring/xip/dependency.xml b/t/corpus/A00/02035-substring/xip/dependency.xml
similarity index 100%
rename from t/A00/02035-substring/xip/dependency.xml
rename to t/corpus/A00/02035-substring/xip/dependency.xml
diff --git a/t/A00/02035-substring/xip/metadata.xml b/t/corpus/A00/02035-substring/xip/metadata.xml
similarity index 100%
rename from t/A00/02035-substring/xip/metadata.xml
rename to t/corpus/A00/02035-substring/xip/metadata.xml
diff --git a/t/A00/02035-substring/xip/morpho.xml b/t/corpus/A00/02035-substring/xip/morpho.xml
similarity index 100%
rename from t/A00/02035-substring/xip/morpho.xml
rename to t/corpus/A00/02035-substring/xip/morpho.xml
diff --git a/t/A00/02035-substring/xip/sentences.xml b/t/corpus/A00/02035-substring/xip/sentences.xml
similarity index 100%
rename from t/A00/02035-substring/xip/sentences.xml
rename to t/corpus/A00/02035-substring/xip/sentences.xml
diff --git a/t/A00/02035-substring/xip/tokens.xml b/t/corpus/A00/02035-substring/xip/tokens.xml
similarity index 100%
rename from t/A00/02035-substring/xip/tokens.xml
rename to t/corpus/A00/02035-substring/xip/tokens.xml
diff --git a/t/A00/02873-meta/base/paragraph.xml b/t/corpus/A00/02873-meta/base/paragraph.xml
similarity index 100%
rename from t/A00/02873-meta/base/paragraph.xml
rename to t/corpus/A00/02873-meta/base/paragraph.xml
diff --git a/t/A00/02873-meta/base/sentences.xml b/t/corpus/A00/02873-meta/base/sentences.xml
similarity index 100%
rename from t/A00/02873-meta/base/sentences.xml
rename to t/corpus/A00/02873-meta/base/sentences.xml
diff --git a/t/A00/02873-meta/base/tokens_aggr.xml b/t/corpus/A00/02873-meta/base/tokens_aggr.xml
similarity index 100%
rename from t/A00/02873-meta/base/tokens_aggr.xml
rename to t/corpus/A00/02873-meta/base/tokens_aggr.xml
diff --git a/t/A00/02873-meta/base/tokens_conservative.xml b/t/corpus/A00/02873-meta/base/tokens_conservative.xml
similarity index 100%
rename from t/A00/02873-meta/base/tokens_conservative.xml
rename to t/corpus/A00/02873-meta/base/tokens_conservative.xml
diff --git a/t/A00/02873-meta/connexor/metadata.xml b/t/corpus/A00/02873-meta/connexor/metadata.xml
similarity index 100%
rename from t/A00/02873-meta/connexor/metadata.xml
rename to t/corpus/A00/02873-meta/connexor/metadata.xml
diff --git a/t/A00/02873-meta/connexor/morpho.xml b/t/corpus/A00/02873-meta/connexor/morpho.xml
similarity index 100%
rename from t/A00/02873-meta/connexor/morpho.xml
rename to t/corpus/A00/02873-meta/connexor/morpho.xml
diff --git a/t/A00/02873-meta/connexor/mpt.xml b/t/corpus/A00/02873-meta/connexor/mpt.xml
similarity index 100%
rename from t/A00/02873-meta/connexor/mpt.xml
rename to t/corpus/A00/02873-meta/connexor/mpt.xml
diff --git a/t/A00/02873-meta/connexor/phrase.xml b/t/corpus/A00/02873-meta/connexor/phrase.xml
similarity index 100%
rename from t/A00/02873-meta/connexor/phrase.xml
rename to t/corpus/A00/02873-meta/connexor/phrase.xml
diff --git a/t/A00/02873-meta/connexor/sentences.xml b/t/corpus/A00/02873-meta/connexor/sentences.xml
similarity index 100%
rename from t/A00/02873-meta/connexor/sentences.xml
rename to t/corpus/A00/02873-meta/connexor/sentences.xml
diff --git a/t/A00/02873-meta/connexor/syntax.xml b/t/corpus/A00/02873-meta/connexor/syntax.xml
similarity index 100%
rename from t/A00/02873-meta/connexor/syntax.xml
rename to t/corpus/A00/02873-meta/connexor/syntax.xml
diff --git a/t/A00/02873-meta/connexor/tokens.xml b/t/corpus/A00/02873-meta/connexor/tokens.xml
similarity index 100%
rename from t/A00/02873-meta/connexor/tokens.xml
rename to t/corpus/A00/02873-meta/connexor/tokens.xml
diff --git a/t/A00/02873-meta/corenlp/ne_dewac_175m_600.xml b/t/corpus/A00/02873-meta/corenlp/ne_dewac_175m_600.xml
similarity index 100%
rename from t/A00/02873-meta/corenlp/ne_dewac_175m_600.xml
rename to t/corpus/A00/02873-meta/corenlp/ne_dewac_175m_600.xml
diff --git a/t/A00/02873-meta/corenlp/ne_hgc_175m_600.xml b/t/corpus/A00/02873-meta/corenlp/ne_hgc_175m_600.xml
similarity index 100%
rename from t/A00/02873-meta/corenlp/ne_hgc_175m_600.xml
rename to t/corpus/A00/02873-meta/corenlp/ne_hgc_175m_600.xml
diff --git a/t/A00/02873-meta/corenlp/sentences.xml b/t/corpus/A00/02873-meta/corenlp/sentences.xml
similarity index 100%
rename from t/A00/02873-meta/corenlp/sentences.xml
rename to t/corpus/A00/02873-meta/corenlp/sentences.xml
diff --git a/t/A00/02873-meta/corenlp/tokens.xml b/t/corpus/A00/02873-meta/corenlp/tokens.xml
similarity index 100%
rename from t/A00/02873-meta/corenlp/tokens.xml
rename to t/corpus/A00/02873-meta/corenlp/tokens.xml
diff --git a/t/A00/02873-meta/data.xml b/t/corpus/A00/02873-meta/data.xml
similarity index 100%
rename from t/A00/02873-meta/data.xml
rename to t/corpus/A00/02873-meta/data.xml
diff --git a/t/A00/02873-meta/header.xml b/t/corpus/A00/02873-meta/header.xml
similarity index 100%
rename from t/A00/02873-meta/header.xml
rename to t/corpus/A00/02873-meta/header.xml
diff --git a/t/A00/02873-meta/mate/dependency.xml b/t/corpus/A00/02873-meta/mate/dependency.xml
similarity index 100%
rename from t/A00/02873-meta/mate/dependency.xml
rename to t/corpus/A00/02873-meta/mate/dependency.xml
diff --git a/t/A00/02873-meta/mate/morpho.xml b/t/corpus/A00/02873-meta/mate/morpho.xml
similarity index 100%
rename from t/A00/02873-meta/mate/morpho.xml
rename to t/corpus/A00/02873-meta/mate/morpho.xml
diff --git a/t/A00/02873-meta/mate/pipeline/one_token_per_line.txt b/t/corpus/A00/02873-meta/mate/pipeline/one_token_per_line.txt
similarity index 100%
rename from t/A00/02873-meta/mate/pipeline/one_token_per_line.txt
rename to t/corpus/A00/02873-meta/mate/pipeline/one_token_per_line.txt
diff --git a/t/A00/02873-meta/mate/pipeline/parsed.txt b/t/corpus/A00/02873-meta/mate/pipeline/parsed.txt
similarity index 100%
rename from t/A00/02873-meta/mate/pipeline/parsed.txt
rename to t/corpus/A00/02873-meta/mate/pipeline/parsed.txt
diff --git a/t/A00/02873-meta/mate/tokenSpans/number_tokenSpans.xml b/t/corpus/A00/02873-meta/mate/tokenSpans/number_tokenSpans.xml
similarity index 100%
rename from t/A00/02873-meta/mate/tokenSpans/number_tokenSpans.xml
rename to t/corpus/A00/02873-meta/mate/tokenSpans/number_tokenSpans.xml
diff --git a/t/A00/02873-meta/opennlp/morpho.xml b/t/corpus/A00/02873-meta/opennlp/morpho.xml
similarity index 100%
rename from t/A00/02873-meta/opennlp/morpho.xml
rename to t/corpus/A00/02873-meta/opennlp/morpho.xml
diff --git a/t/A00/02873-meta/opennlp/sentences.xml b/t/corpus/A00/02873-meta/opennlp/sentences.xml
similarity index 100%
rename from t/A00/02873-meta/opennlp/sentences.xml
rename to t/corpus/A00/02873-meta/opennlp/sentences.xml
diff --git a/t/A00/02873-meta/opennlp/tokens.xml b/t/corpus/A00/02873-meta/opennlp/tokens.xml
similarity index 100%
rename from t/A00/02873-meta/opennlp/tokens.xml
rename to t/corpus/A00/02873-meta/opennlp/tokens.xml
diff --git a/t/A00/02873-meta/struct/structure.xml b/t/corpus/A00/02873-meta/struct/structure.xml
similarity index 100%
rename from t/A00/02873-meta/struct/structure.xml
rename to t/corpus/A00/02873-meta/struct/structure.xml
diff --git a/t/A00/02873-meta/text.txt b/t/corpus/A00/02873-meta/text.txt
similarity index 100%
rename from t/A00/02873-meta/text.txt
rename to t/corpus/A00/02873-meta/text.txt
diff --git a/t/A00/02873-meta/tree_tagger/metadata.xml b/t/corpus/A00/02873-meta/tree_tagger/metadata.xml
similarity index 100%
rename from t/A00/02873-meta/tree_tagger/metadata.xml
rename to t/corpus/A00/02873-meta/tree_tagger/metadata.xml
diff --git a/t/A00/02873-meta/tree_tagger/morpho.xml b/t/corpus/A00/02873-meta/tree_tagger/morpho.xml
similarity index 100%
rename from t/A00/02873-meta/tree_tagger/morpho.xml
rename to t/corpus/A00/02873-meta/tree_tagger/morpho.xml
diff --git a/t/A00/02873-meta/tree_tagger/sentences.xml b/t/corpus/A00/02873-meta/tree_tagger/sentences.xml
similarity index 100%
rename from t/A00/02873-meta/tree_tagger/sentences.xml
rename to t/corpus/A00/02873-meta/tree_tagger/sentences.xml
diff --git a/t/A00/02873-meta/tree_tagger/tokens.xml b/t/corpus/A00/02873-meta/tree_tagger/tokens.xml
similarity index 100%
rename from t/A00/02873-meta/tree_tagger/tokens.xml
rename to t/corpus/A00/02873-meta/tree_tagger/tokens.xml
diff --git a/t/A00/02873-meta/xip/constituency.xml b/t/corpus/A00/02873-meta/xip/constituency.xml
similarity index 100%
rename from t/A00/02873-meta/xip/constituency.xml
rename to t/corpus/A00/02873-meta/xip/constituency.xml
diff --git a/t/A00/02873-meta/xip/dependency.xml b/t/corpus/A00/02873-meta/xip/dependency.xml
similarity index 100%
rename from t/A00/02873-meta/xip/dependency.xml
rename to t/corpus/A00/02873-meta/xip/dependency.xml
diff --git a/t/A00/02873-meta/xip/metadata.xml b/t/corpus/A00/02873-meta/xip/metadata.xml
similarity index 100%
rename from t/A00/02873-meta/xip/metadata.xml
rename to t/corpus/A00/02873-meta/xip/metadata.xml
diff --git a/t/A00/02873-meta/xip/morpho.xml b/t/corpus/A00/02873-meta/xip/morpho.xml
similarity index 100%
rename from t/A00/02873-meta/xip/morpho.xml
rename to t/corpus/A00/02873-meta/xip/morpho.xml
diff --git a/t/A00/02873-meta/xip/sentences.xml b/t/corpus/A00/02873-meta/xip/sentences.xml
similarity index 100%
rename from t/A00/02873-meta/xip/sentences.xml
rename to t/corpus/A00/02873-meta/xip/sentences.xml
diff --git a/t/A00/02873-meta/xip/tokens.xml b/t/corpus/A00/02873-meta/xip/tokens.xml
similarity index 100%
rename from t/A00/02873-meta/xip/tokens.xml
rename to t/corpus/A00/02873-meta/xip/tokens.xml
diff --git a/t/A00/05663-unbalanced/base/paragraph.xml b/t/corpus/A00/05663-unbalanced/base/paragraph.xml
similarity index 100%
rename from t/A00/05663-unbalanced/base/paragraph.xml
rename to t/corpus/A00/05663-unbalanced/base/paragraph.xml
diff --git a/t/A00/05663-unbalanced/base/sentences.xml b/t/corpus/A00/05663-unbalanced/base/sentences.xml
similarity index 100%
rename from t/A00/05663-unbalanced/base/sentences.xml
rename to t/corpus/A00/05663-unbalanced/base/sentences.xml
diff --git a/t/A00/05663-unbalanced/base/tokens_aggr.xml b/t/corpus/A00/05663-unbalanced/base/tokens_aggr.xml
similarity index 100%
rename from t/A00/05663-unbalanced/base/tokens_aggr.xml
rename to t/corpus/A00/05663-unbalanced/base/tokens_aggr.xml
diff --git a/t/A00/05663-unbalanced/base/tokens_conservative.xml b/t/corpus/A00/05663-unbalanced/base/tokens_conservative.xml
similarity index 100%
rename from t/A00/05663-unbalanced/base/tokens_conservative.xml
rename to t/corpus/A00/05663-unbalanced/base/tokens_conservative.xml
diff --git a/t/A00/05663-unbalanced/connexor/metadata.xml b/t/corpus/A00/05663-unbalanced/connexor/metadata.xml
similarity index 100%
rename from t/A00/05663-unbalanced/connexor/metadata.xml
rename to t/corpus/A00/05663-unbalanced/connexor/metadata.xml
diff --git a/t/A00/05663-unbalanced/connexor/morpho.xml b/t/corpus/A00/05663-unbalanced/connexor/morpho.xml
similarity index 100%
rename from t/A00/05663-unbalanced/connexor/morpho.xml
rename to t/corpus/A00/05663-unbalanced/connexor/morpho.xml
diff --git a/t/A00/05663-unbalanced/connexor/mpt.xml b/t/corpus/A00/05663-unbalanced/connexor/mpt.xml
similarity index 100%
rename from t/A00/05663-unbalanced/connexor/mpt.xml
rename to t/corpus/A00/05663-unbalanced/connexor/mpt.xml
diff --git a/t/A00/05663-unbalanced/connexor/phrase.xml b/t/corpus/A00/05663-unbalanced/connexor/phrase.xml
similarity index 100%
rename from t/A00/05663-unbalanced/connexor/phrase.xml
rename to t/corpus/A00/05663-unbalanced/connexor/phrase.xml
diff --git a/t/A00/05663-unbalanced/connexor/sentences.xml b/t/corpus/A00/05663-unbalanced/connexor/sentences.xml
similarity index 100%
rename from t/A00/05663-unbalanced/connexor/sentences.xml
rename to t/corpus/A00/05663-unbalanced/connexor/sentences.xml
diff --git a/t/A00/05663-unbalanced/connexor/syntax.xml b/t/corpus/A00/05663-unbalanced/connexor/syntax.xml
similarity index 100%
rename from t/A00/05663-unbalanced/connexor/syntax.xml
rename to t/corpus/A00/05663-unbalanced/connexor/syntax.xml
diff --git a/t/A00/05663-unbalanced/connexor/tokens.xml b/t/corpus/A00/05663-unbalanced/connexor/tokens.xml
similarity index 100%
rename from t/A00/05663-unbalanced/connexor/tokens.xml
rename to t/corpus/A00/05663-unbalanced/connexor/tokens.xml
diff --git a/t/A00/05663-unbalanced/corenlp/ne_dewac_175m_600.xml b/t/corpus/A00/05663-unbalanced/corenlp/ne_dewac_175m_600.xml
similarity index 100%
rename from t/A00/05663-unbalanced/corenlp/ne_dewac_175m_600.xml
rename to t/corpus/A00/05663-unbalanced/corenlp/ne_dewac_175m_600.xml
diff --git a/t/A00/05663-unbalanced/corenlp/ne_hgc_175m_600.xml b/t/corpus/A00/05663-unbalanced/corenlp/ne_hgc_175m_600.xml
similarity index 100%
rename from t/A00/05663-unbalanced/corenlp/ne_hgc_175m_600.xml
rename to t/corpus/A00/05663-unbalanced/corenlp/ne_hgc_175m_600.xml
diff --git a/t/A00/05663-unbalanced/corenlp/sentences.xml b/t/corpus/A00/05663-unbalanced/corenlp/sentences.xml
similarity index 100%
rename from t/A00/05663-unbalanced/corenlp/sentences.xml
rename to t/corpus/A00/05663-unbalanced/corenlp/sentences.xml
diff --git a/t/A00/05663-unbalanced/corenlp/tokens.xml b/t/corpus/A00/05663-unbalanced/corenlp/tokens.xml
similarity index 100%
rename from t/A00/05663-unbalanced/corenlp/tokens.xml
rename to t/corpus/A00/05663-unbalanced/corenlp/tokens.xml
diff --git a/t/A00/05663-unbalanced/data.xml b/t/corpus/A00/05663-unbalanced/data.xml
similarity index 100%
rename from t/A00/05663-unbalanced/data.xml
rename to t/corpus/A00/05663-unbalanced/data.xml
diff --git a/t/A00/05663-unbalanced/header.xml b/t/corpus/A00/05663-unbalanced/header.xml
similarity index 100%
rename from t/A00/05663-unbalanced/header.xml
rename to t/corpus/A00/05663-unbalanced/header.xml
diff --git a/t/A00/05663-unbalanced/mate/dependency.xml b/t/corpus/A00/05663-unbalanced/mate/dependency.xml
similarity index 100%
rename from t/A00/05663-unbalanced/mate/dependency.xml
rename to t/corpus/A00/05663-unbalanced/mate/dependency.xml
diff --git a/t/A00/05663-unbalanced/mate/morpho.xml b/t/corpus/A00/05663-unbalanced/mate/morpho.xml
similarity index 100%
rename from t/A00/05663-unbalanced/mate/morpho.xml
rename to t/corpus/A00/05663-unbalanced/mate/morpho.xml
diff --git a/t/A00/05663-unbalanced/mate/pipeline/one_token_per_line.txt b/t/corpus/A00/05663-unbalanced/mate/pipeline/one_token_per_line.txt
similarity index 100%
rename from t/A00/05663-unbalanced/mate/pipeline/one_token_per_line.txt
rename to t/corpus/A00/05663-unbalanced/mate/pipeline/one_token_per_line.txt
diff --git a/t/A00/05663-unbalanced/mate/pipeline/parsed.txt b/t/corpus/A00/05663-unbalanced/mate/pipeline/parsed.txt
similarity index 100%
rename from t/A00/05663-unbalanced/mate/pipeline/parsed.txt
rename to t/corpus/A00/05663-unbalanced/mate/pipeline/parsed.txt
diff --git a/t/A00/05663-unbalanced/mate/tokenSpans/number_tokenSpans.xml b/t/corpus/A00/05663-unbalanced/mate/tokenSpans/number_tokenSpans.xml
similarity index 100%
rename from t/A00/05663-unbalanced/mate/tokenSpans/number_tokenSpans.xml
rename to t/corpus/A00/05663-unbalanced/mate/tokenSpans/number_tokenSpans.xml
diff --git a/t/A00/05663-unbalanced/opennlp/morpho.xml b/t/corpus/A00/05663-unbalanced/opennlp/morpho.xml
similarity index 100%
rename from t/A00/05663-unbalanced/opennlp/morpho.xml
rename to t/corpus/A00/05663-unbalanced/opennlp/morpho.xml
diff --git a/t/A00/05663-unbalanced/opennlp/sentences.xml b/t/corpus/A00/05663-unbalanced/opennlp/sentences.xml
similarity index 100%
rename from t/A00/05663-unbalanced/opennlp/sentences.xml
rename to t/corpus/A00/05663-unbalanced/opennlp/sentences.xml
diff --git a/t/A00/05663-unbalanced/opennlp/tokens.xml b/t/corpus/A00/05663-unbalanced/opennlp/tokens.xml
similarity index 100%
rename from t/A00/05663-unbalanced/opennlp/tokens.xml
rename to t/corpus/A00/05663-unbalanced/opennlp/tokens.xml
diff --git a/t/A00/05663-unbalanced/struct/structure.xml b/t/corpus/A00/05663-unbalanced/struct/structure.xml
similarity index 100%
rename from t/A00/05663-unbalanced/struct/structure.xml
rename to t/corpus/A00/05663-unbalanced/struct/structure.xml
diff --git a/t/A00/05663-unbalanced/text.txt b/t/corpus/A00/05663-unbalanced/text.txt
similarity index 100%
rename from t/A00/05663-unbalanced/text.txt
rename to t/corpus/A00/05663-unbalanced/text.txt
diff --git a/t/A00/05663-unbalanced/tree_tagger/metadata.xml b/t/corpus/A00/05663-unbalanced/tree_tagger/metadata.xml
similarity index 100%
rename from t/A00/05663-unbalanced/tree_tagger/metadata.xml
rename to t/corpus/A00/05663-unbalanced/tree_tagger/metadata.xml
diff --git a/t/A00/05663-unbalanced/tree_tagger/morpho.xml b/t/corpus/A00/05663-unbalanced/tree_tagger/morpho.xml
similarity index 100%
rename from t/A00/05663-unbalanced/tree_tagger/morpho.xml
rename to t/corpus/A00/05663-unbalanced/tree_tagger/morpho.xml
diff --git a/t/A00/05663-unbalanced/tree_tagger/sentences.xml b/t/corpus/A00/05663-unbalanced/tree_tagger/sentences.xml
similarity index 100%
rename from t/A00/05663-unbalanced/tree_tagger/sentences.xml
rename to t/corpus/A00/05663-unbalanced/tree_tagger/sentences.xml
diff --git a/t/A00/05663-unbalanced/tree_tagger/tokens.xml b/t/corpus/A00/05663-unbalanced/tree_tagger/tokens.xml
similarity index 100%
rename from t/A00/05663-unbalanced/tree_tagger/tokens.xml
rename to t/corpus/A00/05663-unbalanced/tree_tagger/tokens.xml
diff --git a/t/A00/05663-unbalanced/xip/constituency.xml b/t/corpus/A00/05663-unbalanced/xip/constituency.xml
similarity index 100%
rename from t/A00/05663-unbalanced/xip/constituency.xml
rename to t/corpus/A00/05663-unbalanced/xip/constituency.xml
diff --git a/t/A00/05663-unbalanced/xip/dependency.xml b/t/corpus/A00/05663-unbalanced/xip/dependency.xml
similarity index 100%
rename from t/A00/05663-unbalanced/xip/dependency.xml
rename to t/corpus/A00/05663-unbalanced/xip/dependency.xml
diff --git a/t/A00/05663-unbalanced/xip/metadata.xml b/t/corpus/A00/05663-unbalanced/xip/metadata.xml
similarity index 100%
rename from t/A00/05663-unbalanced/xip/metadata.xml
rename to t/corpus/A00/05663-unbalanced/xip/metadata.xml
diff --git a/t/A00/05663-unbalanced/xip/morpho.xml b/t/corpus/A00/05663-unbalanced/xip/morpho.xml
similarity index 100%
rename from t/A00/05663-unbalanced/xip/morpho.xml
rename to t/corpus/A00/05663-unbalanced/xip/morpho.xml
diff --git a/t/A00/05663-unbalanced/xip/sentences.xml b/t/corpus/A00/05663-unbalanced/xip/sentences.xml
similarity index 100%
rename from t/A00/05663-unbalanced/xip/sentences.xml
rename to t/corpus/A00/05663-unbalanced/xip/sentences.xml
diff --git a/t/A00/05663-unbalanced/xip/tokens.xml b/t/corpus/A00/05663-unbalanced/xip/tokens.xml
similarity index 100%
rename from t/A00/05663-unbalanced/xip/tokens.xml
rename to t/corpus/A00/05663-unbalanced/xip/tokens.xml
diff --git a/t/A00/07452-deep/base/paragraph.xml b/t/corpus/A00/07452-deep/base/paragraph.xml
similarity index 100%
rename from t/A00/07452-deep/base/paragraph.xml
rename to t/corpus/A00/07452-deep/base/paragraph.xml
diff --git a/t/A00/07452-deep/base/sentences.xml b/t/corpus/A00/07452-deep/base/sentences.xml
similarity index 100%
rename from t/A00/07452-deep/base/sentences.xml
rename to t/corpus/A00/07452-deep/base/sentences.xml
diff --git a/t/A00/07452-deep/base/tokens_aggr.xml b/t/corpus/A00/07452-deep/base/tokens_aggr.xml
similarity index 100%
rename from t/A00/07452-deep/base/tokens_aggr.xml
rename to t/corpus/A00/07452-deep/base/tokens_aggr.xml
diff --git a/t/A00/07452-deep/base/tokens_conservative.xml b/t/corpus/A00/07452-deep/base/tokens_conservative.xml
similarity index 100%
rename from t/A00/07452-deep/base/tokens_conservative.xml
rename to t/corpus/A00/07452-deep/base/tokens_conservative.xml
diff --git a/t/A00/07452-deep/connexor/metadata.xml b/t/corpus/A00/07452-deep/connexor/metadata.xml
similarity index 100%
rename from t/A00/07452-deep/connexor/metadata.xml
rename to t/corpus/A00/07452-deep/connexor/metadata.xml
diff --git a/t/A00/07452-deep/connexor/morpho.xml b/t/corpus/A00/07452-deep/connexor/morpho.xml
similarity index 100%
rename from t/A00/07452-deep/connexor/morpho.xml
rename to t/corpus/A00/07452-deep/connexor/morpho.xml
diff --git a/t/A00/07452-deep/connexor/mpt.xml b/t/corpus/A00/07452-deep/connexor/mpt.xml
similarity index 100%
rename from t/A00/07452-deep/connexor/mpt.xml
rename to t/corpus/A00/07452-deep/connexor/mpt.xml
diff --git a/t/A00/07452-deep/connexor/phrase.xml b/t/corpus/A00/07452-deep/connexor/phrase.xml
similarity index 100%
rename from t/A00/07452-deep/connexor/phrase.xml
rename to t/corpus/A00/07452-deep/connexor/phrase.xml
diff --git a/t/A00/07452-deep/connexor/sentences.xml b/t/corpus/A00/07452-deep/connexor/sentences.xml
similarity index 100%
rename from t/A00/07452-deep/connexor/sentences.xml
rename to t/corpus/A00/07452-deep/connexor/sentences.xml
diff --git a/t/A00/07452-deep/connexor/syntax.xml b/t/corpus/A00/07452-deep/connexor/syntax.xml
similarity index 100%
rename from t/A00/07452-deep/connexor/syntax.xml
rename to t/corpus/A00/07452-deep/connexor/syntax.xml
diff --git a/t/A00/07452-deep/connexor/tokens.xml b/t/corpus/A00/07452-deep/connexor/tokens.xml
similarity index 100%
rename from t/A00/07452-deep/connexor/tokens.xml
rename to t/corpus/A00/07452-deep/connexor/tokens.xml
diff --git a/t/A00/07452-deep/corenlp/ne_dewac_175m_600.xml b/t/corpus/A00/07452-deep/corenlp/ne_dewac_175m_600.xml
similarity index 100%
rename from t/A00/07452-deep/corenlp/ne_dewac_175m_600.xml
rename to t/corpus/A00/07452-deep/corenlp/ne_dewac_175m_600.xml
diff --git a/t/A00/07452-deep/corenlp/ne_hgc_175m_600.xml b/t/corpus/A00/07452-deep/corenlp/ne_hgc_175m_600.xml
similarity index 100%
rename from t/A00/07452-deep/corenlp/ne_hgc_175m_600.xml
rename to t/corpus/A00/07452-deep/corenlp/ne_hgc_175m_600.xml
diff --git a/t/A00/07452-deep/corenlp/sentences.xml b/t/corpus/A00/07452-deep/corenlp/sentences.xml
similarity index 100%
rename from t/A00/07452-deep/corenlp/sentences.xml
rename to t/corpus/A00/07452-deep/corenlp/sentences.xml
diff --git a/t/A00/07452-deep/corenlp/tokens.xml b/t/corpus/A00/07452-deep/corenlp/tokens.xml
similarity index 100%
rename from t/A00/07452-deep/corenlp/tokens.xml
rename to t/corpus/A00/07452-deep/corenlp/tokens.xml
diff --git a/t/A00/07452-deep/data.xml b/t/corpus/A00/07452-deep/data.xml
similarity index 100%
rename from t/A00/07452-deep/data.xml
rename to t/corpus/A00/07452-deep/data.xml
diff --git a/t/A00/07452-deep/header.xml b/t/corpus/A00/07452-deep/header.xml
similarity index 100%
rename from t/A00/07452-deep/header.xml
rename to t/corpus/A00/07452-deep/header.xml
diff --git a/t/A00/07452-deep/mate/dependency.xml b/t/corpus/A00/07452-deep/mate/dependency.xml
similarity index 100%
rename from t/A00/07452-deep/mate/dependency.xml
rename to t/corpus/A00/07452-deep/mate/dependency.xml
diff --git a/t/A00/07452-deep/mate/morpho.xml b/t/corpus/A00/07452-deep/mate/morpho.xml
similarity index 100%
rename from t/A00/07452-deep/mate/morpho.xml
rename to t/corpus/A00/07452-deep/mate/morpho.xml
diff --git a/t/A00/07452-deep/mate/pipeline/one_token_per_line.txt b/t/corpus/A00/07452-deep/mate/pipeline/one_token_per_line.txt
similarity index 100%
rename from t/A00/07452-deep/mate/pipeline/one_token_per_line.txt
rename to t/corpus/A00/07452-deep/mate/pipeline/one_token_per_line.txt
diff --git a/t/A00/07452-deep/mate/pipeline/parsed.txt b/t/corpus/A00/07452-deep/mate/pipeline/parsed.txt
similarity index 100%
rename from t/A00/07452-deep/mate/pipeline/parsed.txt
rename to t/corpus/A00/07452-deep/mate/pipeline/parsed.txt
diff --git a/t/A00/07452-deep/mate/tokenSpans/number_tokenSpans.xml b/t/corpus/A00/07452-deep/mate/tokenSpans/number_tokenSpans.xml
similarity index 100%
rename from t/A00/07452-deep/mate/tokenSpans/number_tokenSpans.xml
rename to t/corpus/A00/07452-deep/mate/tokenSpans/number_tokenSpans.xml
diff --git a/t/A00/07452-deep/opennlp/morpho.xml b/t/corpus/A00/07452-deep/opennlp/morpho.xml
similarity index 100%
rename from t/A00/07452-deep/opennlp/morpho.xml
rename to t/corpus/A00/07452-deep/opennlp/morpho.xml
diff --git a/t/A00/07452-deep/opennlp/sentences.xml b/t/corpus/A00/07452-deep/opennlp/sentences.xml
similarity index 100%
rename from t/A00/07452-deep/opennlp/sentences.xml
rename to t/corpus/A00/07452-deep/opennlp/sentences.xml
diff --git a/t/A00/07452-deep/opennlp/tokens.xml b/t/corpus/A00/07452-deep/opennlp/tokens.xml
similarity index 100%
rename from t/A00/07452-deep/opennlp/tokens.xml
rename to t/corpus/A00/07452-deep/opennlp/tokens.xml
diff --git a/t/A00/07452-deep/struct/structure.xml b/t/corpus/A00/07452-deep/struct/structure.xml
similarity index 100%
rename from t/A00/07452-deep/struct/structure.xml
rename to t/corpus/A00/07452-deep/struct/structure.xml
diff --git a/t/A00/07452-deep/text.txt b/t/corpus/A00/07452-deep/text.txt
similarity index 100%
rename from t/A00/07452-deep/text.txt
rename to t/corpus/A00/07452-deep/text.txt
diff --git a/t/A00/07452-deep/tree_tagger/metadata.xml b/t/corpus/A00/07452-deep/tree_tagger/metadata.xml
similarity index 100%
rename from t/A00/07452-deep/tree_tagger/metadata.xml
rename to t/corpus/A00/07452-deep/tree_tagger/metadata.xml
diff --git a/t/A00/07452-deep/tree_tagger/morpho.xml b/t/corpus/A00/07452-deep/tree_tagger/morpho.xml
similarity index 100%
rename from t/A00/07452-deep/tree_tagger/morpho.xml
rename to t/corpus/A00/07452-deep/tree_tagger/morpho.xml
diff --git a/t/A00/07452-deep/tree_tagger/sentences.xml b/t/corpus/A00/07452-deep/tree_tagger/sentences.xml
similarity index 100%
rename from t/A00/07452-deep/tree_tagger/sentences.xml
rename to t/corpus/A00/07452-deep/tree_tagger/sentences.xml
diff --git a/t/A00/07452-deep/tree_tagger/tokens.xml b/t/corpus/A00/07452-deep/tree_tagger/tokens.xml
similarity index 100%
rename from t/A00/07452-deep/tree_tagger/tokens.xml
rename to t/corpus/A00/07452-deep/tree_tagger/tokens.xml
diff --git a/t/A00/07452-deep/xip/constituency.xml b/t/corpus/A00/07452-deep/xip/constituency.xml
similarity index 100%
rename from t/A00/07452-deep/xip/constituency.xml
rename to t/corpus/A00/07452-deep/xip/constituency.xml
diff --git a/t/A00/07452-deep/xip/dependency.xml b/t/corpus/A00/07452-deep/xip/dependency.xml
similarity index 100%
rename from t/A00/07452-deep/xip/dependency.xml
rename to t/corpus/A00/07452-deep/xip/dependency.xml
diff --git a/t/A00/07452-deep/xip/metadata.xml b/t/corpus/A00/07452-deep/xip/metadata.xml
similarity index 100%
rename from t/A00/07452-deep/xip/metadata.xml
rename to t/corpus/A00/07452-deep/xip/metadata.xml
diff --git a/t/A00/07452-deep/xip/morpho.xml b/t/corpus/A00/07452-deep/xip/morpho.xml
similarity index 100%
rename from t/A00/07452-deep/xip/morpho.xml
rename to t/corpus/A00/07452-deep/xip/morpho.xml
diff --git a/t/A00/07452-deep/xip/sentences.xml b/t/corpus/A00/07452-deep/xip/sentences.xml
similarity index 100%
rename from t/A00/07452-deep/xip/sentences.xml
rename to t/corpus/A00/07452-deep/xip/sentences.xml
diff --git a/t/A00/07452-deep/xip/tokens.xml b/t/corpus/A00/07452-deep/xip/tokens.xml
similarity index 100%
rename from t/A00/07452-deep/xip/tokens.xml
rename to t/corpus/A00/07452-deep/xip/tokens.xml
diff --git a/t/A01/13047/base/metadata.xml b/t/corpus/A01/13047/base/metadata.xml
similarity index 100%
rename from t/A01/13047/base/metadata.xml
rename to t/corpus/A01/13047/base/metadata.xml
diff --git a/t/A01/13047/base/paragraph.xml b/t/corpus/A01/13047/base/paragraph.xml
similarity index 100%
rename from t/A01/13047/base/paragraph.xml
rename to t/corpus/A01/13047/base/paragraph.xml
diff --git a/t/A01/13047/base/sentences.xml b/t/corpus/A01/13047/base/sentences.xml
similarity index 100%
rename from t/A01/13047/base/sentences.xml
rename to t/corpus/A01/13047/base/sentences.xml
diff --git a/t/A01/13047/base/tokens_aggr.xml b/t/corpus/A01/13047/base/tokens_aggr.xml
similarity index 100%
rename from t/A01/13047/base/tokens_aggr.xml
rename to t/corpus/A01/13047/base/tokens_aggr.xml
diff --git a/t/A01/13047/base/tokens_conservative.xml b/t/corpus/A01/13047/base/tokens_conservative.xml
similarity index 100%
rename from t/A01/13047/base/tokens_conservative.xml
rename to t/corpus/A01/13047/base/tokens_conservative.xml
diff --git a/t/A01/13047/connexor/metadata.xml b/t/corpus/A01/13047/connexor/metadata.xml
similarity index 100%
rename from t/A01/13047/connexor/metadata.xml
rename to t/corpus/A01/13047/connexor/metadata.xml
diff --git a/t/A01/13047/connexor/morpho.xml b/t/corpus/A01/13047/connexor/morpho.xml
similarity index 100%
rename from t/A01/13047/connexor/morpho.xml
rename to t/corpus/A01/13047/connexor/morpho.xml
diff --git a/t/A01/13047/connexor/mpt.xml b/t/corpus/A01/13047/connexor/mpt.xml
similarity index 100%
rename from t/A01/13047/connexor/mpt.xml
rename to t/corpus/A01/13047/connexor/mpt.xml
diff --git a/t/A01/13047/connexor/phrase.xml b/t/corpus/A01/13047/connexor/phrase.xml
similarity index 100%
rename from t/A01/13047/connexor/phrase.xml
rename to t/corpus/A01/13047/connexor/phrase.xml
diff --git a/t/A01/13047/connexor/sentences.xml b/t/corpus/A01/13047/connexor/sentences.xml
similarity index 100%
rename from t/A01/13047/connexor/sentences.xml
rename to t/corpus/A01/13047/connexor/sentences.xml
diff --git a/t/A01/13047/connexor/syntax.xml b/t/corpus/A01/13047/connexor/syntax.xml
similarity index 100%
rename from t/A01/13047/connexor/syntax.xml
rename to t/corpus/A01/13047/connexor/syntax.xml
diff --git a/t/A01/13047/connexor/tokens.xml b/t/corpus/A01/13047/connexor/tokens.xml
similarity index 100%
rename from t/A01/13047/connexor/tokens.xml
rename to t/corpus/A01/13047/connexor/tokens.xml
diff --git a/t/A01/13047/corenlp/constituency.xml b/t/corpus/A01/13047/corenlp/constituency.xml
similarity index 100%
rename from t/A01/13047/corenlp/constituency.xml
rename to t/corpus/A01/13047/corenlp/constituency.xml
diff --git a/t/A01/13047/corenlp/metadata.xml b/t/corpus/A01/13047/corenlp/metadata.xml
similarity index 100%
rename from t/A01/13047/corenlp/metadata.xml
rename to t/corpus/A01/13047/corenlp/metadata.xml
diff --git a/t/A01/13047/corenlp/morpho.xml b/t/corpus/A01/13047/corenlp/morpho.xml
similarity index 100%
rename from t/A01/13047/corenlp/morpho.xml
rename to t/corpus/A01/13047/corenlp/morpho.xml
diff --git a/t/A01/13047/corenlp/ne_dewac_175m_600.xml b/t/corpus/A01/13047/corenlp/ne_dewac_175m_600.xml
similarity index 100%
rename from t/A01/13047/corenlp/ne_dewac_175m_600.xml
rename to t/corpus/A01/13047/corenlp/ne_dewac_175m_600.xml
diff --git a/t/A01/13047/corenlp/ne_hgc_175m_600.xml b/t/corpus/A01/13047/corenlp/ne_hgc_175m_600.xml
similarity index 100%
rename from t/A01/13047/corenlp/ne_hgc_175m_600.xml
rename to t/corpus/A01/13047/corenlp/ne_hgc_175m_600.xml
diff --git a/t/A01/13047/corenlp/sentences.xml b/t/corpus/A01/13047/corenlp/sentences.xml
similarity index 100%
rename from t/A01/13047/corenlp/sentences.xml
rename to t/corpus/A01/13047/corenlp/sentences.xml
diff --git a/t/A01/13047/corenlp/tokens.xml b/t/corpus/A01/13047/corenlp/tokens.xml
similarity index 100%
rename from t/A01/13047/corenlp/tokens.xml
rename to t/corpus/A01/13047/corenlp/tokens.xml
diff --git a/t/A01/13047/data.xml b/t/corpus/A01/13047/data.xml
similarity index 100%
rename from t/A01/13047/data.xml
rename to t/corpus/A01/13047/data.xml
diff --git a/t/A01/13047/header.xml b/t/corpus/A01/13047/header.xml
similarity index 100%
rename from t/A01/13047/header.xml
rename to t/corpus/A01/13047/header.xml
diff --git a/t/A01/13047/mate/dependency.xml b/t/corpus/A01/13047/mate/dependency.xml
similarity index 100%
rename from t/A01/13047/mate/dependency.xml
rename to t/corpus/A01/13047/mate/dependency.xml
diff --git a/t/A01/13047/mate/metadata.xml b/t/corpus/A01/13047/mate/metadata.xml
similarity index 100%
rename from t/A01/13047/mate/metadata.xml
rename to t/corpus/A01/13047/mate/metadata.xml
diff --git a/t/A01/13047/mate/morpho.xml b/t/corpus/A01/13047/mate/morpho.xml
similarity index 100%
rename from t/A01/13047/mate/morpho.xml
rename to t/corpus/A01/13047/mate/morpho.xml
diff --git a/t/A01/13047/mate/pipeline/one_token_per_line.txt b/t/corpus/A01/13047/mate/pipeline/one_token_per_line.txt
similarity index 100%
rename from t/A01/13047/mate/pipeline/one_token_per_line.txt
rename to t/corpus/A01/13047/mate/pipeline/one_token_per_line.txt
diff --git a/t/A01/13047/mate/pipeline/parsed.txt b/t/corpus/A01/13047/mate/pipeline/parsed.txt
similarity index 100%
rename from t/A01/13047/mate/pipeline/parsed.txt
rename to t/corpus/A01/13047/mate/pipeline/parsed.txt
diff --git a/t/A01/13047/mate/tokenSpans/number_tokenSpans.xml b/t/corpus/A01/13047/mate/tokenSpans/number_tokenSpans.xml
similarity index 100%
rename from t/A01/13047/mate/tokenSpans/number_tokenSpans.xml
rename to t/corpus/A01/13047/mate/tokenSpans/number_tokenSpans.xml
diff --git a/t/A01/13047/metadata.xml b/t/corpus/A01/13047/metadata.xml
similarity index 100%
rename from t/A01/13047/metadata.xml
rename to t/corpus/A01/13047/metadata.xml
diff --git a/t/A01/13047/opennlp/morpho.xml b/t/corpus/A01/13047/opennlp/morpho.xml
similarity index 100%
rename from t/A01/13047/opennlp/morpho.xml
rename to t/corpus/A01/13047/opennlp/morpho.xml
diff --git a/t/A01/13047/opennlp/sentences.xml b/t/corpus/A01/13047/opennlp/sentences.xml
similarity index 100%
rename from t/A01/13047/opennlp/sentences.xml
rename to t/corpus/A01/13047/opennlp/sentences.xml
diff --git a/t/A01/13047/opennlp/tokens.xml b/t/corpus/A01/13047/opennlp/tokens.xml
similarity index 100%
rename from t/A01/13047/opennlp/tokens.xml
rename to t/corpus/A01/13047/opennlp/tokens.xml
diff --git a/t/A01/13047/struct/structure.xml b/t/corpus/A01/13047/struct/structure.xml
similarity index 100%
rename from t/A01/13047/struct/structure.xml
rename to t/corpus/A01/13047/struct/structure.xml
diff --git a/t/A01/13047/text.txt b/t/corpus/A01/13047/text.txt
similarity index 100%
rename from t/A01/13047/text.txt
rename to t/corpus/A01/13047/text.txt
diff --git a/t/A01/13047/tree_tagger/metadata.xml b/t/corpus/A01/13047/tree_tagger/metadata.xml
similarity index 100%
rename from t/A01/13047/tree_tagger/metadata.xml
rename to t/corpus/A01/13047/tree_tagger/metadata.xml
diff --git a/t/A01/13047/tree_tagger/morpho.xml b/t/corpus/A01/13047/tree_tagger/morpho.xml
similarity index 100%
rename from t/A01/13047/tree_tagger/morpho.xml
rename to t/corpus/A01/13047/tree_tagger/morpho.xml
diff --git a/t/A01/13047/tree_tagger/sentences.xml b/t/corpus/A01/13047/tree_tagger/sentences.xml
similarity index 100%
rename from t/A01/13047/tree_tagger/sentences.xml
rename to t/corpus/A01/13047/tree_tagger/sentences.xml
diff --git a/t/A01/13047/tree_tagger/tokens.xml b/t/corpus/A01/13047/tree_tagger/tokens.xml
similarity index 100%
rename from t/A01/13047/tree_tagger/tokens.xml
rename to t/corpus/A01/13047/tree_tagger/tokens.xml
diff --git a/t/BRZ13/00001/base/paragraph.xml b/t/corpus/BRZ13/00001/base/paragraph.xml
similarity index 100%
rename from t/BRZ13/00001/base/paragraph.xml
rename to t/corpus/BRZ13/00001/base/paragraph.xml
diff --git a/t/BRZ13/00001/base/sentences.xml b/t/corpus/BRZ13/00001/base/sentences.xml
similarity index 100%
rename from t/BRZ13/00001/base/sentences.xml
rename to t/corpus/BRZ13/00001/base/sentences.xml
diff --git a/t/BRZ13/00001/base/tokens_aggr.xml b/t/corpus/BRZ13/00001/base/tokens_aggr.xml
similarity index 100%
rename from t/BRZ13/00001/base/tokens_aggr.xml
rename to t/corpus/BRZ13/00001/base/tokens_aggr.xml
diff --git a/t/BRZ13/00001/base/tokens_conservative.xml b/t/corpus/BRZ13/00001/base/tokens_conservative.xml
similarity index 100%
rename from t/BRZ13/00001/base/tokens_conservative.xml
rename to t/corpus/BRZ13/00001/base/tokens_conservative.xml
diff --git a/t/BRZ13/00001/connexor/metadata.xml b/t/corpus/BRZ13/00001/connexor/metadata.xml
similarity index 100%
rename from t/BRZ13/00001/connexor/metadata.xml
rename to t/corpus/BRZ13/00001/connexor/metadata.xml
diff --git a/t/BRZ13/00001/connexor/morpho.xml b/t/corpus/BRZ13/00001/connexor/morpho.xml
similarity index 100%
rename from t/BRZ13/00001/connexor/morpho.xml
rename to t/corpus/BRZ13/00001/connexor/morpho.xml
diff --git a/t/BRZ13/00001/connexor/mpt.xml b/t/corpus/BRZ13/00001/connexor/mpt.xml
similarity index 100%
rename from t/BRZ13/00001/connexor/mpt.xml
rename to t/corpus/BRZ13/00001/connexor/mpt.xml
diff --git a/t/BRZ13/00001/connexor/phrase.xml b/t/corpus/BRZ13/00001/connexor/phrase.xml
similarity index 100%
rename from t/BRZ13/00001/connexor/phrase.xml
rename to t/corpus/BRZ13/00001/connexor/phrase.xml
diff --git a/t/BRZ13/00001/connexor/sentences.xml b/t/corpus/BRZ13/00001/connexor/sentences.xml
similarity index 100%
rename from t/BRZ13/00001/connexor/sentences.xml
rename to t/corpus/BRZ13/00001/connexor/sentences.xml
diff --git a/t/BRZ13/00001/connexor/syntax.xml b/t/corpus/BRZ13/00001/connexor/syntax.xml
similarity index 100%
rename from t/BRZ13/00001/connexor/syntax.xml
rename to t/corpus/BRZ13/00001/connexor/syntax.xml
diff --git a/t/BRZ13/00001/connexor/tokens.xml b/t/corpus/BRZ13/00001/connexor/tokens.xml
similarity index 100%
rename from t/BRZ13/00001/connexor/tokens.xml
rename to t/corpus/BRZ13/00001/connexor/tokens.xml
diff --git a/t/BRZ13/00001/corenlp/ne_dewac_175m_600.xml b/t/corpus/BRZ13/00001/corenlp/ne_dewac_175m_600.xml
similarity index 100%
rename from t/BRZ13/00001/corenlp/ne_dewac_175m_600.xml
rename to t/corpus/BRZ13/00001/corenlp/ne_dewac_175m_600.xml
diff --git a/t/BRZ13/00001/corenlp/ne_hgc_175m_600.xml b/t/corpus/BRZ13/00001/corenlp/ne_hgc_175m_600.xml
similarity index 100%
rename from t/BRZ13/00001/corenlp/ne_hgc_175m_600.xml
rename to t/corpus/BRZ13/00001/corenlp/ne_hgc_175m_600.xml
diff --git a/t/BRZ13/00001/corenlp/sentences.xml b/t/corpus/BRZ13/00001/corenlp/sentences.xml
similarity index 100%
rename from t/BRZ13/00001/corenlp/sentences.xml
rename to t/corpus/BRZ13/00001/corenlp/sentences.xml
diff --git a/t/BRZ13/00001/corenlp/tokens.xml b/t/corpus/BRZ13/00001/corenlp/tokens.xml
similarity index 100%
rename from t/BRZ13/00001/corenlp/tokens.xml
rename to t/corpus/BRZ13/00001/corenlp/tokens.xml
diff --git a/t/BRZ13/00001/data.xml b/t/corpus/BRZ13/00001/data.xml
similarity index 100%
rename from t/BRZ13/00001/data.xml
rename to t/corpus/BRZ13/00001/data.xml
diff --git a/t/BRZ13/00001/header.xml b/t/corpus/BRZ13/00001/header.xml
similarity index 100%
rename from t/BRZ13/00001/header.xml
rename to t/corpus/BRZ13/00001/header.xml
diff --git a/t/BRZ13/00001/mate/dependency.xml b/t/corpus/BRZ13/00001/mate/dependency.xml
similarity index 100%
rename from t/BRZ13/00001/mate/dependency.xml
rename to t/corpus/BRZ13/00001/mate/dependency.xml
diff --git a/t/BRZ13/00001/mate/morpho.xml b/t/corpus/BRZ13/00001/mate/morpho.xml
similarity index 100%
rename from t/BRZ13/00001/mate/morpho.xml
rename to t/corpus/BRZ13/00001/mate/morpho.xml
diff --git a/t/BRZ13/00001/mate/pipeline/one_token_per_line.txt b/t/corpus/BRZ13/00001/mate/pipeline/one_token_per_line.txt
similarity index 100%
rename from t/BRZ13/00001/mate/pipeline/one_token_per_line.txt
rename to t/corpus/BRZ13/00001/mate/pipeline/one_token_per_line.txt
diff --git a/t/BRZ13/00001/mate/pipeline/parsed.txt b/t/corpus/BRZ13/00001/mate/pipeline/parsed.txt
similarity index 100%
rename from t/BRZ13/00001/mate/pipeline/parsed.txt
rename to t/corpus/BRZ13/00001/mate/pipeline/parsed.txt
diff --git a/t/BRZ13/00001/mate/tokenSpans/number_tokenSpans.xml b/t/corpus/BRZ13/00001/mate/tokenSpans/number_tokenSpans.xml
similarity index 100%
rename from t/BRZ13/00001/mate/tokenSpans/number_tokenSpans.xml
rename to t/corpus/BRZ13/00001/mate/tokenSpans/number_tokenSpans.xml
diff --git a/t/BRZ13/00001/opennlp/morpho.xml b/t/corpus/BRZ13/00001/opennlp/morpho.xml
similarity index 100%
rename from t/BRZ13/00001/opennlp/morpho.xml
rename to t/corpus/BRZ13/00001/opennlp/morpho.xml
diff --git a/t/BRZ13/00001/opennlp/sentences.xml b/t/corpus/BRZ13/00001/opennlp/sentences.xml
similarity index 100%
rename from t/BRZ13/00001/opennlp/sentences.xml
rename to t/corpus/BRZ13/00001/opennlp/sentences.xml
diff --git a/t/BRZ13/00001/opennlp/tokens.xml b/t/corpus/BRZ13/00001/opennlp/tokens.xml
similarity index 100%
rename from t/BRZ13/00001/opennlp/tokens.xml
rename to t/corpus/BRZ13/00001/opennlp/tokens.xml
diff --git a/t/BRZ13/00001/struct/structure.xml b/t/corpus/BRZ13/00001/struct/structure.xml
similarity index 100%
rename from t/BRZ13/00001/struct/structure.xml
rename to t/corpus/BRZ13/00001/struct/structure.xml
diff --git a/t/BRZ13/00001/text.txt b/t/corpus/BRZ13/00001/text.txt
similarity index 100%
rename from t/BRZ13/00001/text.txt
rename to t/corpus/BRZ13/00001/text.txt
diff --git a/t/BRZ13/00001/tree_tagger/metadata.xml b/t/corpus/BRZ13/00001/tree_tagger/metadata.xml
similarity index 100%
rename from t/BRZ13/00001/tree_tagger/metadata.xml
rename to t/corpus/BRZ13/00001/tree_tagger/metadata.xml
diff --git a/t/BRZ13/00001/tree_tagger/morpho.xml b/t/corpus/BRZ13/00001/tree_tagger/morpho.xml
similarity index 100%
rename from t/BRZ13/00001/tree_tagger/morpho.xml
rename to t/corpus/BRZ13/00001/tree_tagger/morpho.xml
diff --git a/t/BRZ13/00001/tree_tagger/sentences.xml b/t/corpus/BRZ13/00001/tree_tagger/sentences.xml
similarity index 100%
rename from t/BRZ13/00001/tree_tagger/sentences.xml
rename to t/corpus/BRZ13/00001/tree_tagger/sentences.xml
diff --git a/t/BRZ13/00001/tree_tagger/tokens.xml b/t/corpus/BRZ13/00001/tree_tagger/tokens.xml
similarity index 100%
rename from t/BRZ13/00001/tree_tagger/tokens.xml
rename to t/corpus/BRZ13/00001/tree_tagger/tokens.xml
diff --git a/t/BRZ13/00001/xip/constituency.xml b/t/corpus/BRZ13/00001/xip/constituency.xml
similarity index 100%
rename from t/BRZ13/00001/xip/constituency.xml
rename to t/corpus/BRZ13/00001/xip/constituency.xml
diff --git a/t/BRZ13/00001/xip/dependency.xml b/t/corpus/BRZ13/00001/xip/dependency.xml
similarity index 100%
rename from t/BRZ13/00001/xip/dependency.xml
rename to t/corpus/BRZ13/00001/xip/dependency.xml
diff --git a/t/BRZ13/00001/xip/metadata.xml b/t/corpus/BRZ13/00001/xip/metadata.xml
similarity index 100%
rename from t/BRZ13/00001/xip/metadata.xml
rename to t/corpus/BRZ13/00001/xip/metadata.xml
diff --git a/t/BRZ13/00001/xip/morpho.xml b/t/corpus/BRZ13/00001/xip/morpho.xml
similarity index 100%
rename from t/BRZ13/00001/xip/morpho.xml
rename to t/corpus/BRZ13/00001/xip/morpho.xml
diff --git a/t/BRZ13/00001/xip/sentences.xml b/t/corpus/BRZ13/00001/xip/sentences.xml
similarity index 100%
rename from t/BRZ13/00001/xip/sentences.xml
rename to t/corpus/BRZ13/00001/xip/sentences.xml
diff --git a/t/BRZ13/00001/xip/tokens.xml b/t/corpus/BRZ13/00001/xip/tokens.xml
similarity index 100%
rename from t/BRZ13/00001/xip/tokens.xml
rename to t/corpus/BRZ13/00001/xip/tokens.xml
diff --git a/t/BZK/D59/00001/base/paragraph.xml b/t/corpus/BZK/D59/00001/base/paragraph.xml
similarity index 100%
rename from t/BZK/D59/00001/base/paragraph.xml
rename to t/corpus/BZK/D59/00001/base/paragraph.xml
diff --git a/t/BZK/D59/00001/base/sentences.xml b/t/corpus/BZK/D59/00001/base/sentences.xml
similarity index 100%
rename from t/BZK/D59/00001/base/sentences.xml
rename to t/corpus/BZK/D59/00001/base/sentences.xml
diff --git a/t/BZK/D59/00001/base/tokens_aggr.xml b/t/corpus/BZK/D59/00001/base/tokens_aggr.xml
similarity index 100%
rename from t/BZK/D59/00001/base/tokens_aggr.xml
rename to t/corpus/BZK/D59/00001/base/tokens_aggr.xml
diff --git a/t/BZK/D59/00001/base/tokens_conservative.xml b/t/corpus/BZK/D59/00001/base/tokens_conservative.xml
similarity index 100%
rename from t/BZK/D59/00001/base/tokens_conservative.xml
rename to t/corpus/BZK/D59/00001/base/tokens_conservative.xml
diff --git a/t/BZK/D59/00001/connexor/metadata.xml b/t/corpus/BZK/D59/00001/connexor/metadata.xml
similarity index 100%
rename from t/BZK/D59/00001/connexor/metadata.xml
rename to t/corpus/BZK/D59/00001/connexor/metadata.xml
diff --git a/t/BZK/D59/00001/connexor/morpho.xml b/t/corpus/BZK/D59/00001/connexor/morpho.xml
similarity index 100%
rename from t/BZK/D59/00001/connexor/morpho.xml
rename to t/corpus/BZK/D59/00001/connexor/morpho.xml
diff --git a/t/BZK/D59/00001/connexor/phrase.xml b/t/corpus/BZK/D59/00001/connexor/phrase.xml
similarity index 100%
rename from t/BZK/D59/00001/connexor/phrase.xml
rename to t/corpus/BZK/D59/00001/connexor/phrase.xml
diff --git a/t/BZK/D59/00001/connexor/sentences.xml b/t/corpus/BZK/D59/00001/connexor/sentences.xml
similarity index 100%
rename from t/BZK/D59/00001/connexor/sentences.xml
rename to t/corpus/BZK/D59/00001/connexor/sentences.xml
diff --git a/t/BZK/D59/00001/connexor/syntax.xml b/t/corpus/BZK/D59/00001/connexor/syntax.xml
similarity index 100%
rename from t/BZK/D59/00001/connexor/syntax.xml
rename to t/corpus/BZK/D59/00001/connexor/syntax.xml
diff --git a/t/BZK/D59/00001/connexor/tokens.xml b/t/corpus/BZK/D59/00001/connexor/tokens.xml
similarity index 100%
rename from t/BZK/D59/00001/connexor/tokens.xml
rename to t/corpus/BZK/D59/00001/connexor/tokens.xml
diff --git a/t/BZK/D59/00001/corenlp/constituency.xml b/t/corpus/BZK/D59/00001/corenlp/constituency.xml
similarity index 100%
rename from t/BZK/D59/00001/corenlp/constituency.xml
rename to t/corpus/BZK/D59/00001/corenlp/constituency.xml
diff --git a/t/BZK/D59/00001/corenlp/morpho.xml b/t/corpus/BZK/D59/00001/corenlp/morpho.xml
similarity index 100%
rename from t/BZK/D59/00001/corenlp/morpho.xml
rename to t/corpus/BZK/D59/00001/corenlp/morpho.xml
diff --git a/t/BZK/D59/00001/corenlp/ne_combined.xml b/t/corpus/BZK/D59/00001/corenlp/ne_combined.xml
similarity index 100%
rename from t/BZK/D59/00001/corenlp/ne_combined.xml
rename to t/corpus/BZK/D59/00001/corenlp/ne_combined.xml
diff --git a/t/BZK/D59/00001/corenlp/sentences.xml b/t/corpus/BZK/D59/00001/corenlp/sentences.xml
similarity index 100%
rename from t/BZK/D59/00001/corenlp/sentences.xml
rename to t/corpus/BZK/D59/00001/corenlp/sentences.xml
diff --git a/t/BZK/D59/00001/corenlp/tokens.xml b/t/corpus/BZK/D59/00001/corenlp/tokens.xml
similarity index 100%
rename from t/BZK/D59/00001/corenlp/tokens.xml
rename to t/corpus/BZK/D59/00001/corenlp/tokens.xml
diff --git a/t/BZK/D59/00001/data.xml b/t/corpus/BZK/D59/00001/data.xml
similarity index 100%
rename from t/BZK/D59/00001/data.xml
rename to t/corpus/BZK/D59/00001/data.xml
diff --git a/t/BZK/D59/00001/glemm/glemm.xml b/t/corpus/BZK/D59/00001/glemm/glemm.xml
similarity index 100%
rename from t/BZK/D59/00001/glemm/glemm.xml
rename to t/corpus/BZK/D59/00001/glemm/glemm.xml
diff --git a/t/BZK/D59/00001/header.xml b/t/corpus/BZK/D59/00001/header.xml
similarity index 100%
rename from t/BZK/D59/00001/header.xml
rename to t/corpus/BZK/D59/00001/header.xml
diff --git a/t/BZK/D59/00001/mate/pipeline/one_token_per_line.txt b/t/corpus/BZK/D59/00001/mate/pipeline/one_token_per_line.txt
similarity index 100%
rename from t/BZK/D59/00001/mate/pipeline/one_token_per_line.txt
rename to t/corpus/BZK/D59/00001/mate/pipeline/one_token_per_line.txt
diff --git a/t/BZK/D59/00001/mate/pipeline/parsed.txt b/t/corpus/BZK/D59/00001/mate/pipeline/parsed.txt
similarity index 100%
rename from t/BZK/D59/00001/mate/pipeline/parsed.txt
rename to t/corpus/BZK/D59/00001/mate/pipeline/parsed.txt
diff --git a/t/BZK/D59/00001/mate/tokenSpans/number_tokenSpans.xml b/t/corpus/BZK/D59/00001/mate/tokenSpans/number_tokenSpans.xml
similarity index 100%
rename from t/BZK/D59/00001/mate/tokenSpans/number_tokenSpans.xml
rename to t/corpus/BZK/D59/00001/mate/tokenSpans/number_tokenSpans.xml
diff --git a/t/BZK/D59/00001/opennlp/morpho.xml b/t/corpus/BZK/D59/00001/opennlp/morpho.xml
similarity index 100%
rename from t/BZK/D59/00001/opennlp/morpho.xml
rename to t/corpus/BZK/D59/00001/opennlp/morpho.xml
diff --git a/t/BZK/D59/00001/opennlp/sentences.xml b/t/corpus/BZK/D59/00001/opennlp/sentences.xml
similarity index 100%
rename from t/BZK/D59/00001/opennlp/sentences.xml
rename to t/corpus/BZK/D59/00001/opennlp/sentences.xml
diff --git a/t/BZK/D59/00001/opennlp/tokens.xml b/t/corpus/BZK/D59/00001/opennlp/tokens.xml
similarity index 100%
rename from t/BZK/D59/00001/opennlp/tokens.xml
rename to t/corpus/BZK/D59/00001/opennlp/tokens.xml
diff --git a/t/BZK/D59/00001/struct/structure.xml b/t/corpus/BZK/D59/00001/struct/structure.xml
similarity index 100%
rename from t/BZK/D59/00001/struct/structure.xml
rename to t/corpus/BZK/D59/00001/struct/structure.xml
diff --git a/t/BZK/D59/00001/text.txt b/t/corpus/BZK/D59/00001/text.txt
similarity index 100%
rename from t/BZK/D59/00001/text.txt
rename to t/corpus/BZK/D59/00001/text.txt
diff --git a/t/BZK/D59/00001/tree_tagger/metadata.xml b/t/corpus/BZK/D59/00001/tree_tagger/metadata.xml
similarity index 100%
rename from t/BZK/D59/00001/tree_tagger/metadata.xml
rename to t/corpus/BZK/D59/00001/tree_tagger/metadata.xml
diff --git a/t/BZK/D59/00001/tree_tagger/morpho.xml b/t/corpus/BZK/D59/00001/tree_tagger/morpho.xml
similarity index 100%
rename from t/BZK/D59/00001/tree_tagger/morpho.xml
rename to t/corpus/BZK/D59/00001/tree_tagger/morpho.xml
diff --git a/t/BZK/D59/00001/tree_tagger/sentences.xml b/t/corpus/BZK/D59/00001/tree_tagger/sentences.xml
similarity index 100%
rename from t/BZK/D59/00001/tree_tagger/sentences.xml
rename to t/corpus/BZK/D59/00001/tree_tagger/sentences.xml
diff --git a/t/BZK/D59/00001/tree_tagger/tokens.xml b/t/corpus/BZK/D59/00001/tree_tagger/tokens.xml
similarity index 100%
rename from t/BZK/D59/00001/tree_tagger/tokens.xml
rename to t/corpus/BZK/D59/00001/tree_tagger/tokens.xml
diff --git a/t/BZK/D59/00001/xip/constituency.xml b/t/corpus/BZK/D59/00001/xip/constituency.xml
similarity index 100%
rename from t/BZK/D59/00001/xip/constituency.xml
rename to t/corpus/BZK/D59/00001/xip/constituency.xml
diff --git a/t/BZK/D59/00001/xip/dependency.xml b/t/corpus/BZK/D59/00001/xip/dependency.xml
similarity index 100%
rename from t/BZK/D59/00001/xip/dependency.xml
rename to t/corpus/BZK/D59/00001/xip/dependency.xml
diff --git a/t/BZK/D59/00001/xip/metadata.xml b/t/corpus/BZK/D59/00001/xip/metadata.xml
similarity index 100%
rename from t/BZK/D59/00001/xip/metadata.xml
rename to t/corpus/BZK/D59/00001/xip/metadata.xml
diff --git a/t/BZK/D59/00001/xip/morpho.xml b/t/corpus/BZK/D59/00001/xip/morpho.xml
similarity index 100%
rename from t/BZK/D59/00001/xip/morpho.xml
rename to t/corpus/BZK/D59/00001/xip/morpho.xml
diff --git a/t/BZK/D59/00001/xip/sentences.xml b/t/corpus/BZK/D59/00001/xip/sentences.xml
similarity index 100%
rename from t/BZK/D59/00001/xip/sentences.xml
rename to t/corpus/BZK/D59/00001/xip/sentences.xml
diff --git a/t/BZK/D59/00001/xip/tokens.xml b/t/corpus/BZK/D59/00001/xip/tokens.xml
similarity index 100%
rename from t/BZK/D59/00001/xip/tokens.xml
rename to t/corpus/BZK/D59/00001/xip/tokens.xml
diff --git a/t/BZK/D59/00089/base/paragraph.xml b/t/corpus/BZK/D59/00089/base/paragraph.xml
similarity index 100%
rename from t/BZK/D59/00089/base/paragraph.xml
rename to t/corpus/BZK/D59/00089/base/paragraph.xml
diff --git a/t/BZK/D59/00089/base/sentences.xml b/t/corpus/BZK/D59/00089/base/sentences.xml
similarity index 100%
rename from t/BZK/D59/00089/base/sentences.xml
rename to t/corpus/BZK/D59/00089/base/sentences.xml
diff --git a/t/BZK/D59/00089/base/tokens_aggr.xml b/t/corpus/BZK/D59/00089/base/tokens_aggr.xml
similarity index 100%
rename from t/BZK/D59/00089/base/tokens_aggr.xml
rename to t/corpus/BZK/D59/00089/base/tokens_aggr.xml
diff --git a/t/BZK/D59/00089/base/tokens_conservative.xml b/t/corpus/BZK/D59/00089/base/tokens_conservative.xml
similarity index 100%
rename from t/BZK/D59/00089/base/tokens_conservative.xml
rename to t/corpus/BZK/D59/00089/base/tokens_conservative.xml
diff --git a/t/BZK/D59/00089/connexor/metadata.xml b/t/corpus/BZK/D59/00089/connexor/metadata.xml
similarity index 100%
rename from t/BZK/D59/00089/connexor/metadata.xml
rename to t/corpus/BZK/D59/00089/connexor/metadata.xml
diff --git a/t/BZK/D59/00089/connexor/morpho.xml b/t/corpus/BZK/D59/00089/connexor/morpho.xml
similarity index 100%
rename from t/BZK/D59/00089/connexor/morpho.xml
rename to t/corpus/BZK/D59/00089/connexor/morpho.xml
diff --git a/t/BZK/D59/00089/connexor/phrase.xml b/t/corpus/BZK/D59/00089/connexor/phrase.xml
similarity index 100%
rename from t/BZK/D59/00089/connexor/phrase.xml
rename to t/corpus/BZK/D59/00089/connexor/phrase.xml
diff --git a/t/BZK/D59/00089/connexor/sentences.xml b/t/corpus/BZK/D59/00089/connexor/sentences.xml
similarity index 100%
rename from t/BZK/D59/00089/connexor/sentences.xml
rename to t/corpus/BZK/D59/00089/connexor/sentences.xml
diff --git a/t/BZK/D59/00089/connexor/syntax.xml b/t/corpus/BZK/D59/00089/connexor/syntax.xml
similarity index 100%
rename from t/BZK/D59/00089/connexor/syntax.xml
rename to t/corpus/BZK/D59/00089/connexor/syntax.xml
diff --git a/t/BZK/D59/00089/connexor/tokens.xml b/t/corpus/BZK/D59/00089/connexor/tokens.xml
similarity index 100%
rename from t/BZK/D59/00089/connexor/tokens.xml
rename to t/corpus/BZK/D59/00089/connexor/tokens.xml
diff --git a/t/BZK/D59/00089/corenlp/constituency.xml b/t/corpus/BZK/D59/00089/corenlp/constituency.xml
similarity index 100%
rename from t/BZK/D59/00089/corenlp/constituency.xml
rename to t/corpus/BZK/D59/00089/corenlp/constituency.xml
diff --git a/t/BZK/D59/00089/corenlp/morpho.xml b/t/corpus/BZK/D59/00089/corenlp/morpho.xml
similarity index 100%
rename from t/BZK/D59/00089/corenlp/morpho.xml
rename to t/corpus/BZK/D59/00089/corenlp/morpho.xml
diff --git a/t/BZK/D59/00089/corenlp/ne_combined.xml b/t/corpus/BZK/D59/00089/corenlp/ne_combined.xml
similarity index 100%
rename from t/BZK/D59/00089/corenlp/ne_combined.xml
rename to t/corpus/BZK/D59/00089/corenlp/ne_combined.xml
diff --git a/t/BZK/D59/00089/corenlp/sentences.xml b/t/corpus/BZK/D59/00089/corenlp/sentences.xml
similarity index 100%
rename from t/BZK/D59/00089/corenlp/sentences.xml
rename to t/corpus/BZK/D59/00089/corenlp/sentences.xml
diff --git a/t/BZK/D59/00089/corenlp/tokens.xml b/t/corpus/BZK/D59/00089/corenlp/tokens.xml
similarity index 100%
rename from t/BZK/D59/00089/corenlp/tokens.xml
rename to t/corpus/BZK/D59/00089/corenlp/tokens.xml
diff --git a/t/BZK/D59/00089/data.xml b/t/corpus/BZK/D59/00089/data.xml
similarity index 100%
rename from t/BZK/D59/00089/data.xml
rename to t/corpus/BZK/D59/00089/data.xml
diff --git a/t/BZK/D59/00089/glemm/glemm.xml b/t/corpus/BZK/D59/00089/glemm/glemm.xml
similarity index 100%
rename from t/BZK/D59/00089/glemm/glemm.xml
rename to t/corpus/BZK/D59/00089/glemm/glemm.xml
diff --git a/t/BZK/D59/00089/header.xml b/t/corpus/BZK/D59/00089/header.xml
similarity index 100%
rename from t/BZK/D59/00089/header.xml
rename to t/corpus/BZK/D59/00089/header.xml
diff --git a/t/BZK/D59/00089/mate/dependency.xml b/t/corpus/BZK/D59/00089/mate/dependency.xml
similarity index 100%
rename from t/BZK/D59/00089/mate/dependency.xml
rename to t/corpus/BZK/D59/00089/mate/dependency.xml
diff --git a/t/BZK/D59/00089/mate/morpho.xml b/t/corpus/BZK/D59/00089/mate/morpho.xml
similarity index 100%
rename from t/BZK/D59/00089/mate/morpho.xml
rename to t/corpus/BZK/D59/00089/mate/morpho.xml
diff --git a/t/BZK/D59/00089/mate/pipeline/one_token_per_line.txt b/t/corpus/BZK/D59/00089/mate/pipeline/one_token_per_line.txt
similarity index 100%
rename from t/BZK/D59/00089/mate/pipeline/one_token_per_line.txt
rename to t/corpus/BZK/D59/00089/mate/pipeline/one_token_per_line.txt
diff --git a/t/BZK/D59/00089/mate/pipeline/parsed.txt b/t/corpus/BZK/D59/00089/mate/pipeline/parsed.txt
similarity index 100%
rename from t/BZK/D59/00089/mate/pipeline/parsed.txt
rename to t/corpus/BZK/D59/00089/mate/pipeline/parsed.txt
diff --git a/t/BZK/D59/00089/mate/tokenSpans/number_tokenSpans.xml b/t/corpus/BZK/D59/00089/mate/tokenSpans/number_tokenSpans.xml
similarity index 100%
rename from t/BZK/D59/00089/mate/tokenSpans/number_tokenSpans.xml
rename to t/corpus/BZK/D59/00089/mate/tokenSpans/number_tokenSpans.xml
diff --git a/t/BZK/D59/00089/opennlp/morpho.xml b/t/corpus/BZK/D59/00089/opennlp/morpho.xml
similarity index 100%
rename from t/BZK/D59/00089/opennlp/morpho.xml
rename to t/corpus/BZK/D59/00089/opennlp/morpho.xml
diff --git a/t/BZK/D59/00089/opennlp/sentences.xml b/t/corpus/BZK/D59/00089/opennlp/sentences.xml
similarity index 100%
rename from t/BZK/D59/00089/opennlp/sentences.xml
rename to t/corpus/BZK/D59/00089/opennlp/sentences.xml
diff --git a/t/BZK/D59/00089/opennlp/tokens.xml b/t/corpus/BZK/D59/00089/opennlp/tokens.xml
similarity index 100%
rename from t/BZK/D59/00089/opennlp/tokens.xml
rename to t/corpus/BZK/D59/00089/opennlp/tokens.xml
diff --git a/t/BZK/D59/00089/struct/structure.xml b/t/corpus/BZK/D59/00089/struct/structure.xml
similarity index 100%
rename from t/BZK/D59/00089/struct/structure.xml
rename to t/corpus/BZK/D59/00089/struct/structure.xml
diff --git a/t/BZK/D59/00089/text.txt b/t/corpus/BZK/D59/00089/text.txt
similarity index 100%
rename from t/BZK/D59/00089/text.txt
rename to t/corpus/BZK/D59/00089/text.txt
diff --git a/t/BZK/D59/00089/tree_tagger/metadata.xml b/t/corpus/BZK/D59/00089/tree_tagger/metadata.xml
similarity index 100%
rename from t/BZK/D59/00089/tree_tagger/metadata.xml
rename to t/corpus/BZK/D59/00089/tree_tagger/metadata.xml
diff --git a/t/BZK/D59/00089/tree_tagger/morpho.xml b/t/corpus/BZK/D59/00089/tree_tagger/morpho.xml
similarity index 100%
rename from t/BZK/D59/00089/tree_tagger/morpho.xml
rename to t/corpus/BZK/D59/00089/tree_tagger/morpho.xml
diff --git a/t/BZK/D59/00089/tree_tagger/sentences.xml b/t/corpus/BZK/D59/00089/tree_tagger/sentences.xml
similarity index 100%
rename from t/BZK/D59/00089/tree_tagger/sentences.xml
rename to t/corpus/BZK/D59/00089/tree_tagger/sentences.xml
diff --git a/t/BZK/D59/00089/tree_tagger/tokens.xml b/t/corpus/BZK/D59/00089/tree_tagger/tokens.xml
similarity index 100%
rename from t/BZK/D59/00089/tree_tagger/tokens.xml
rename to t/corpus/BZK/D59/00089/tree_tagger/tokens.xml
diff --git a/t/BZK/D59/00089/xip/constituency.xml b/t/corpus/BZK/D59/00089/xip/constituency.xml
similarity index 100%
rename from t/BZK/D59/00089/xip/constituency.xml
rename to t/corpus/BZK/D59/00089/xip/constituency.xml
diff --git a/t/BZK/D59/00089/xip/dependency.xml b/t/corpus/BZK/D59/00089/xip/dependency.xml
similarity index 100%
rename from t/BZK/D59/00089/xip/dependency.xml
rename to t/corpus/BZK/D59/00089/xip/dependency.xml
diff --git a/t/BZK/D59/00089/xip/metadata.xml b/t/corpus/BZK/D59/00089/xip/metadata.xml
similarity index 100%
rename from t/BZK/D59/00089/xip/metadata.xml
rename to t/corpus/BZK/D59/00089/xip/metadata.xml
diff --git a/t/BZK/D59/00089/xip/morpho.xml b/t/corpus/BZK/D59/00089/xip/morpho.xml
similarity index 100%
rename from t/BZK/D59/00089/xip/morpho.xml
rename to t/corpus/BZK/D59/00089/xip/morpho.xml
diff --git a/t/BZK/D59/00089/xip/sentences.xml b/t/corpus/BZK/D59/00089/xip/sentences.xml
similarity index 100%
rename from t/BZK/D59/00089/xip/sentences.xml
rename to t/corpus/BZK/D59/00089/xip/sentences.xml
diff --git a/t/BZK/D59/00089/xip/tokens.xml b/t/corpus/BZK/D59/00089/xip/tokens.xml
similarity index 100%
rename from t/BZK/D59/00089/xip/tokens.xml
rename to t/corpus/BZK/D59/00089/xip/tokens.xml
diff --git a/t/BZK/D59/header.xml b/t/corpus/BZK/D59/header.xml
similarity index 100%
rename from t/BZK/D59/header.xml
rename to t/corpus/BZK/D59/header.xml
diff --git a/t/BZK/header.xml b/t/corpus/BZK/header.xml
similarity index 100%
rename from t/BZK/header.xml
rename to t/corpus/BZK/header.xml
diff --git a/t/ERL/00001/base/paragraph.xml b/t/corpus/ERL/00001/base/paragraph.xml
similarity index 100%
rename from t/ERL/00001/base/paragraph.xml
rename to t/corpus/ERL/00001/base/paragraph.xml
diff --git a/t/ERL/00001/base/sentences.xml b/t/corpus/ERL/00001/base/sentences.xml
similarity index 100%
rename from t/ERL/00001/base/sentences.xml
rename to t/corpus/ERL/00001/base/sentences.xml
diff --git a/t/ERL/00001/base/tokens_aggr.xml b/t/corpus/ERL/00001/base/tokens_aggr.xml
similarity index 100%
rename from t/ERL/00001/base/tokens_aggr.xml
rename to t/corpus/ERL/00001/base/tokens_aggr.xml
diff --git a/t/ERL/00001/base/tokens_conservative.xml b/t/corpus/ERL/00001/base/tokens_conservative.xml
similarity index 100%
rename from t/ERL/00001/base/tokens_conservative.xml
rename to t/corpus/ERL/00001/base/tokens_conservative.xml
diff --git a/t/ERL/00001/connexor/metadata.xml b/t/corpus/ERL/00001/connexor/metadata.xml
similarity index 100%
rename from t/ERL/00001/connexor/metadata.xml
rename to t/corpus/ERL/00001/connexor/metadata.xml
diff --git a/t/ERL/00001/connexor/morpho.xml b/t/corpus/ERL/00001/connexor/morpho.xml
similarity index 100%
rename from t/ERL/00001/connexor/morpho.xml
rename to t/corpus/ERL/00001/connexor/morpho.xml
diff --git a/t/ERL/00001/connexor/mpt.xml b/t/corpus/ERL/00001/connexor/mpt.xml
similarity index 100%
rename from t/ERL/00001/connexor/mpt.xml
rename to t/corpus/ERL/00001/connexor/mpt.xml
diff --git a/t/ERL/00001/connexor/phrase.xml b/t/corpus/ERL/00001/connexor/phrase.xml
similarity index 100%
rename from t/ERL/00001/connexor/phrase.xml
rename to t/corpus/ERL/00001/connexor/phrase.xml
diff --git a/t/ERL/00001/connexor/sentences.xml b/t/corpus/ERL/00001/connexor/sentences.xml
similarity index 100%
rename from t/ERL/00001/connexor/sentences.xml
rename to t/corpus/ERL/00001/connexor/sentences.xml
diff --git a/t/ERL/00001/connexor/syntax.xml b/t/corpus/ERL/00001/connexor/syntax.xml
similarity index 100%
rename from t/ERL/00001/connexor/syntax.xml
rename to t/corpus/ERL/00001/connexor/syntax.xml
diff --git a/t/ERL/00001/connexor/tokens.xml b/t/corpus/ERL/00001/connexor/tokens.xml
similarity index 100%
rename from t/ERL/00001/connexor/tokens.xml
rename to t/corpus/ERL/00001/connexor/tokens.xml
diff --git a/t/ERL/00001/data.xml b/t/corpus/ERL/00001/data.xml
similarity index 100%
rename from t/ERL/00001/data.xml
rename to t/corpus/ERL/00001/data.xml
diff --git a/t/ERL/00001/header.xml b/t/corpus/ERL/00001/header.xml
similarity index 100%
rename from t/ERL/00001/header.xml
rename to t/corpus/ERL/00001/header.xml
diff --git a/t/ERL/00001/struct/structure.xml b/t/corpus/ERL/00001/struct/structure.xml
similarity index 100%
rename from t/ERL/00001/struct/structure.xml
rename to t/corpus/ERL/00001/struct/structure.xml
diff --git a/t/ERL/00001/text.txt b/t/corpus/ERL/00001/text.txt
similarity index 100%
rename from t/ERL/00001/text.txt
rename to t/corpus/ERL/00001/text.txt
diff --git a/t/ERL/00001/tree_tagger/metadata.xml b/t/corpus/ERL/00001/tree_tagger/metadata.xml
similarity index 100%
rename from t/ERL/00001/tree_tagger/metadata.xml
rename to t/corpus/ERL/00001/tree_tagger/metadata.xml
diff --git a/t/ERL/00001/tree_tagger/morpho.xml b/t/corpus/ERL/00001/tree_tagger/morpho.xml
similarity index 100%
rename from t/ERL/00001/tree_tagger/morpho.xml
rename to t/corpus/ERL/00001/tree_tagger/morpho.xml
diff --git a/t/ERL/00001/tree_tagger/sentences.xml b/t/corpus/ERL/00001/tree_tagger/sentences.xml
similarity index 100%
rename from t/ERL/00001/tree_tagger/sentences.xml
rename to t/corpus/ERL/00001/tree_tagger/sentences.xml
diff --git a/t/ERL/00001/tree_tagger/tokens.xml b/t/corpus/ERL/00001/tree_tagger/tokens.xml
similarity index 100%
rename from t/ERL/00001/tree_tagger/tokens.xml
rename to t/corpus/ERL/00001/tree_tagger/tokens.xml
diff --git a/t/ERL/00001/xip/constituency.xml b/t/corpus/ERL/00001/xip/constituency.xml
similarity index 100%
rename from t/ERL/00001/xip/constituency.xml
rename to t/corpus/ERL/00001/xip/constituency.xml
diff --git a/t/ERL/00001/xip/dependency.xml b/t/corpus/ERL/00001/xip/dependency.xml
similarity index 100%
rename from t/ERL/00001/xip/dependency.xml
rename to t/corpus/ERL/00001/xip/dependency.xml
diff --git a/t/ERL/00001/xip/metadata.xml b/t/corpus/ERL/00001/xip/metadata.xml
similarity index 100%
rename from t/ERL/00001/xip/metadata.xml
rename to t/corpus/ERL/00001/xip/metadata.xml
diff --git a/t/ERL/00001/xip/morpho.xml b/t/corpus/ERL/00001/xip/morpho.xml
similarity index 100%
rename from t/ERL/00001/xip/morpho.xml
rename to t/corpus/ERL/00001/xip/morpho.xml
diff --git a/t/ERL/00001/xip/sentences.xml b/t/corpus/ERL/00001/xip/sentences.xml
similarity index 100%
rename from t/ERL/00001/xip/sentences.xml
rename to t/corpus/ERL/00001/xip/sentences.xml
diff --git a/t/ERL/00001/xip/tokens.xml b/t/corpus/ERL/00001/xip/tokens.xml
similarity index 100%
rename from t/ERL/00001/xip/tokens.xml
rename to t/corpus/ERL/00001/xip/tokens.xml
diff --git a/t/GOE/AGA/03828/base/paragraph.xml b/t/corpus/GOE/AGA/03828/base/paragraph.xml
similarity index 100%
rename from t/GOE/AGA/03828/base/paragraph.xml
rename to t/corpus/GOE/AGA/03828/base/paragraph.xml
diff --git a/t/GOE/AGA/03828/base/sentences.xml b/t/corpus/GOE/AGA/03828/base/sentences.xml
similarity index 100%
rename from t/GOE/AGA/03828/base/sentences.xml
rename to t/corpus/GOE/AGA/03828/base/sentences.xml
diff --git a/t/GOE/AGA/03828/base/tokens_aggr.xml b/t/corpus/GOE/AGA/03828/base/tokens_aggr.xml
similarity index 100%
rename from t/GOE/AGA/03828/base/tokens_aggr.xml
rename to t/corpus/GOE/AGA/03828/base/tokens_aggr.xml
diff --git a/t/GOE/AGA/03828/base/tokens_conservative.xml b/t/corpus/GOE/AGA/03828/base/tokens_conservative.xml
similarity index 100%
rename from t/GOE/AGA/03828/base/tokens_conservative.xml
rename to t/corpus/GOE/AGA/03828/base/tokens_conservative.xml
diff --git a/t/GOE/AGA/03828/connexor/metadata.xml b/t/corpus/GOE/AGA/03828/connexor/metadata.xml
similarity index 100%
rename from t/GOE/AGA/03828/connexor/metadata.xml
rename to t/corpus/GOE/AGA/03828/connexor/metadata.xml
diff --git a/t/GOE/AGA/03828/connexor/morpho.xml b/t/corpus/GOE/AGA/03828/connexor/morpho.xml
similarity index 100%
rename from t/GOE/AGA/03828/connexor/morpho.xml
rename to t/corpus/GOE/AGA/03828/connexor/morpho.xml
diff --git a/t/GOE/AGA/03828/connexor/phrase.xml b/t/corpus/GOE/AGA/03828/connexor/phrase.xml
similarity index 100%
rename from t/GOE/AGA/03828/connexor/phrase.xml
rename to t/corpus/GOE/AGA/03828/connexor/phrase.xml
diff --git a/t/GOE/AGA/03828/connexor/sentences.xml b/t/corpus/GOE/AGA/03828/connexor/sentences.xml
similarity index 100%
rename from t/GOE/AGA/03828/connexor/sentences.xml
rename to t/corpus/GOE/AGA/03828/connexor/sentences.xml
diff --git a/t/GOE/AGA/03828/connexor/syntax.xml b/t/corpus/GOE/AGA/03828/connexor/syntax.xml
similarity index 100%
rename from t/GOE/AGA/03828/connexor/syntax.xml
rename to t/corpus/GOE/AGA/03828/connexor/syntax.xml
diff --git a/t/GOE/AGA/03828/connexor/tokens.xml b/t/corpus/GOE/AGA/03828/connexor/tokens.xml
similarity index 100%
rename from t/GOE/AGA/03828/connexor/tokens.xml
rename to t/corpus/GOE/AGA/03828/connexor/tokens.xml
diff --git a/t/GOE/AGA/03828/corenlp/constituency.xml b/t/corpus/GOE/AGA/03828/corenlp/constituency.xml
similarity index 100%
rename from t/GOE/AGA/03828/corenlp/constituency.xml
rename to t/corpus/GOE/AGA/03828/corenlp/constituency.xml
diff --git a/t/GOE/AGA/03828/corenlp/morpho.xml b/t/corpus/GOE/AGA/03828/corenlp/morpho.xml
similarity index 100%
rename from t/GOE/AGA/03828/corenlp/morpho.xml
rename to t/corpus/GOE/AGA/03828/corenlp/morpho.xml
diff --git a/t/GOE/AGA/03828/corenlp/ne_combined.xml b/t/corpus/GOE/AGA/03828/corenlp/ne_combined.xml
similarity index 100%
rename from t/GOE/AGA/03828/corenlp/ne_combined.xml
rename to t/corpus/GOE/AGA/03828/corenlp/ne_combined.xml
diff --git a/t/GOE/AGA/03828/corenlp/sentences.xml b/t/corpus/GOE/AGA/03828/corenlp/sentences.xml
similarity index 100%
rename from t/GOE/AGA/03828/corenlp/sentences.xml
rename to t/corpus/GOE/AGA/03828/corenlp/sentences.xml
diff --git a/t/GOE/AGA/03828/corenlp/tokens.xml b/t/corpus/GOE/AGA/03828/corenlp/tokens.xml
similarity index 100%
rename from t/GOE/AGA/03828/corenlp/tokens.xml
rename to t/corpus/GOE/AGA/03828/corenlp/tokens.xml
diff --git a/t/GOE/AGA/03828/data.xml b/t/corpus/GOE/AGA/03828/data.xml
similarity index 100%
rename from t/GOE/AGA/03828/data.xml
rename to t/corpus/GOE/AGA/03828/data.xml
diff --git a/t/GOE/AGA/03828/glemm/glemm.xml b/t/corpus/GOE/AGA/03828/glemm/glemm.xml
similarity index 100%
rename from t/GOE/AGA/03828/glemm/glemm.xml
rename to t/corpus/GOE/AGA/03828/glemm/glemm.xml
diff --git a/t/GOE/AGA/03828/header.xml b/t/corpus/GOE/AGA/03828/header.xml
similarity index 100%
rename from t/GOE/AGA/03828/header.xml
rename to t/corpus/GOE/AGA/03828/header.xml
diff --git a/t/GOE/AGA/03828/mate/dependency.xml b/t/corpus/GOE/AGA/03828/mate/dependency.xml
similarity index 100%
rename from t/GOE/AGA/03828/mate/dependency.xml
rename to t/corpus/GOE/AGA/03828/mate/dependency.xml
diff --git a/t/GOE/AGA/03828/mate/morpho.xml b/t/corpus/GOE/AGA/03828/mate/morpho.xml
similarity index 100%
rename from t/GOE/AGA/03828/mate/morpho.xml
rename to t/corpus/GOE/AGA/03828/mate/morpho.xml
diff --git a/t/GOE/AGA/03828/mate/pipeline/one_token_per_line.txt b/t/corpus/GOE/AGA/03828/mate/pipeline/one_token_per_line.txt
similarity index 100%
rename from t/GOE/AGA/03828/mate/pipeline/one_token_per_line.txt
rename to t/corpus/GOE/AGA/03828/mate/pipeline/one_token_per_line.txt
diff --git a/t/GOE/AGA/03828/mate/pipeline/parsed.txt b/t/corpus/GOE/AGA/03828/mate/pipeline/parsed.txt
similarity index 100%
rename from t/GOE/AGA/03828/mate/pipeline/parsed.txt
rename to t/corpus/GOE/AGA/03828/mate/pipeline/parsed.txt
diff --git a/t/GOE/AGA/03828/mate/tokenSpans/number_tokenSpans.xml b/t/corpus/GOE/AGA/03828/mate/tokenSpans/number_tokenSpans.xml
similarity index 100%
rename from t/GOE/AGA/03828/mate/tokenSpans/number_tokenSpans.xml
rename to t/corpus/GOE/AGA/03828/mate/tokenSpans/number_tokenSpans.xml
diff --git a/t/GOE/AGA/03828/opennlp/morpho.xml b/t/corpus/GOE/AGA/03828/opennlp/morpho.xml
similarity index 100%
rename from t/GOE/AGA/03828/opennlp/morpho.xml
rename to t/corpus/GOE/AGA/03828/opennlp/morpho.xml
diff --git a/t/GOE/AGA/03828/opennlp/sentences.xml b/t/corpus/GOE/AGA/03828/opennlp/sentences.xml
similarity index 100%
rename from t/GOE/AGA/03828/opennlp/sentences.xml
rename to t/corpus/GOE/AGA/03828/opennlp/sentences.xml
diff --git a/t/GOE/AGA/03828/opennlp/tokens.xml b/t/corpus/GOE/AGA/03828/opennlp/tokens.xml
similarity index 100%
rename from t/GOE/AGA/03828/opennlp/tokens.xml
rename to t/corpus/GOE/AGA/03828/opennlp/tokens.xml
diff --git a/t/GOE/AGA/03828/struct/structure.xml b/t/corpus/GOE/AGA/03828/struct/structure.xml
similarity index 100%
rename from t/GOE/AGA/03828/struct/structure.xml
rename to t/corpus/GOE/AGA/03828/struct/structure.xml
diff --git a/t/GOE/AGA/03828/text.txt b/t/corpus/GOE/AGA/03828/text.txt
similarity index 100%
rename from t/GOE/AGA/03828/text.txt
rename to t/corpus/GOE/AGA/03828/text.txt
diff --git a/t/GOE/AGA/03828/tree_tagger/metadata.xml b/t/corpus/GOE/AGA/03828/tree_tagger/metadata.xml
similarity index 100%
rename from t/GOE/AGA/03828/tree_tagger/metadata.xml
rename to t/corpus/GOE/AGA/03828/tree_tagger/metadata.xml
diff --git a/t/GOE/AGA/03828/tree_tagger/morpho.xml b/t/corpus/GOE/AGA/03828/tree_tagger/morpho.xml
similarity index 100%
rename from t/GOE/AGA/03828/tree_tagger/morpho.xml
rename to t/corpus/GOE/AGA/03828/tree_tagger/morpho.xml
diff --git a/t/GOE/AGA/03828/tree_tagger/sentences.xml b/t/corpus/GOE/AGA/03828/tree_tagger/sentences.xml
similarity index 100%
rename from t/GOE/AGA/03828/tree_tagger/sentences.xml
rename to t/corpus/GOE/AGA/03828/tree_tagger/sentences.xml
diff --git a/t/GOE/AGA/03828/tree_tagger/tokens.xml b/t/corpus/GOE/AGA/03828/tree_tagger/tokens.xml
similarity index 100%
rename from t/GOE/AGA/03828/tree_tagger/tokens.xml
rename to t/corpus/GOE/AGA/03828/tree_tagger/tokens.xml
diff --git a/t/GOE/AGA/03828/xip/constituency.xml b/t/corpus/GOE/AGA/03828/xip/constituency.xml
similarity index 100%
rename from t/GOE/AGA/03828/xip/constituency.xml
rename to t/corpus/GOE/AGA/03828/xip/constituency.xml
diff --git a/t/GOE/AGA/03828/xip/dependency.xml b/t/corpus/GOE/AGA/03828/xip/dependency.xml
similarity index 100%
rename from t/GOE/AGA/03828/xip/dependency.xml
rename to t/corpus/GOE/AGA/03828/xip/dependency.xml
diff --git a/t/GOE/AGA/03828/xip/metadata.xml b/t/corpus/GOE/AGA/03828/xip/metadata.xml
similarity index 100%
rename from t/GOE/AGA/03828/xip/metadata.xml
rename to t/corpus/GOE/AGA/03828/xip/metadata.xml
diff --git a/t/GOE/AGA/03828/xip/morpho.xml b/t/corpus/GOE/AGA/03828/xip/morpho.xml
similarity index 100%
rename from t/GOE/AGA/03828/xip/morpho.xml
rename to t/corpus/GOE/AGA/03828/xip/morpho.xml
diff --git a/t/GOE/AGA/03828/xip/sentences.xml b/t/corpus/GOE/AGA/03828/xip/sentences.xml
similarity index 100%
rename from t/GOE/AGA/03828/xip/sentences.xml
rename to t/corpus/GOE/AGA/03828/xip/sentences.xml
diff --git a/t/GOE/AGA/03828/xip/tokens.xml b/t/corpus/GOE/AGA/03828/xip/tokens.xml
similarity index 100%
rename from t/GOE/AGA/03828/xip/tokens.xml
rename to t/corpus/GOE/AGA/03828/xip/tokens.xml
diff --git a/t/GOE/AGA/header.xml b/t/corpus/GOE/AGA/header.xml
similarity index 100%
rename from t/GOE/AGA/header.xml
rename to t/corpus/GOE/AGA/header.xml
diff --git a/t/GOE/AGX/00006/base/paragraph.xml b/t/corpus/GOE/AGX/00006/base/paragraph.xml
similarity index 100%
rename from t/GOE/AGX/00006/base/paragraph.xml
rename to t/corpus/GOE/AGX/00006/base/paragraph.xml
diff --git a/t/GOE/AGX/00006/base/sentences.xml b/t/corpus/GOE/AGX/00006/base/sentences.xml
similarity index 100%
rename from t/GOE/AGX/00006/base/sentences.xml
rename to t/corpus/GOE/AGX/00006/base/sentences.xml
diff --git a/t/GOE/AGX/00006/base/tokens_aggr.xml b/t/corpus/GOE/AGX/00006/base/tokens_aggr.xml
similarity index 100%
rename from t/GOE/AGX/00006/base/tokens_aggr.xml
rename to t/corpus/GOE/AGX/00006/base/tokens_aggr.xml
diff --git a/t/GOE/AGX/00006/base/tokens_conservative.xml b/t/corpus/GOE/AGX/00006/base/tokens_conservative.xml
similarity index 100%
rename from t/GOE/AGX/00006/base/tokens_conservative.xml
rename to t/corpus/GOE/AGX/00006/base/tokens_conservative.xml
diff --git a/t/GOE/AGX/00006/connexor/metadata.xml b/t/corpus/GOE/AGX/00006/connexor/metadata.xml
similarity index 100%
rename from t/GOE/AGX/00006/connexor/metadata.xml
rename to t/corpus/GOE/AGX/00006/connexor/metadata.xml
diff --git a/t/GOE/AGX/00006/connexor/morpho.xml b/t/corpus/GOE/AGX/00006/connexor/morpho.xml
similarity index 100%
rename from t/GOE/AGX/00006/connexor/morpho.xml
rename to t/corpus/GOE/AGX/00006/connexor/morpho.xml
diff --git a/t/GOE/AGX/00006/connexor/phrase.xml b/t/corpus/GOE/AGX/00006/connexor/phrase.xml
similarity index 100%
rename from t/GOE/AGX/00006/connexor/phrase.xml
rename to t/corpus/GOE/AGX/00006/connexor/phrase.xml
diff --git a/t/GOE/AGX/00006/connexor/sentences.xml b/t/corpus/GOE/AGX/00006/connexor/sentences.xml
similarity index 100%
rename from t/GOE/AGX/00006/connexor/sentences.xml
rename to t/corpus/GOE/AGX/00006/connexor/sentences.xml
diff --git a/t/GOE/AGX/00006/connexor/syntax.xml b/t/corpus/GOE/AGX/00006/connexor/syntax.xml
similarity index 100%
rename from t/GOE/AGX/00006/connexor/syntax.xml
rename to t/corpus/GOE/AGX/00006/connexor/syntax.xml
diff --git a/t/GOE/AGX/00006/connexor/tokens.xml b/t/corpus/GOE/AGX/00006/connexor/tokens.xml
similarity index 100%
rename from t/GOE/AGX/00006/connexor/tokens.xml
rename to t/corpus/GOE/AGX/00006/connexor/tokens.xml
diff --git a/t/GOE/AGX/00006/corenlp/constituency.xml b/t/corpus/GOE/AGX/00006/corenlp/constituency.xml
similarity index 100%
rename from t/GOE/AGX/00006/corenlp/constituency.xml
rename to t/corpus/GOE/AGX/00006/corenlp/constituency.xml
diff --git a/t/GOE/AGX/00006/corenlp/morpho.xml b/t/corpus/GOE/AGX/00006/corenlp/morpho.xml
similarity index 100%
rename from t/GOE/AGX/00006/corenlp/morpho.xml
rename to t/corpus/GOE/AGX/00006/corenlp/morpho.xml
diff --git a/t/GOE/AGX/00006/corenlp/ne_combined.xml b/t/corpus/GOE/AGX/00006/corenlp/ne_combined.xml
similarity index 100%
rename from t/GOE/AGX/00006/corenlp/ne_combined.xml
rename to t/corpus/GOE/AGX/00006/corenlp/ne_combined.xml
diff --git a/t/GOE/AGX/00006/corenlp/sentences.xml b/t/corpus/GOE/AGX/00006/corenlp/sentences.xml
similarity index 100%
rename from t/GOE/AGX/00006/corenlp/sentences.xml
rename to t/corpus/GOE/AGX/00006/corenlp/sentences.xml
diff --git a/t/GOE/AGX/00006/corenlp/tokens.xml b/t/corpus/GOE/AGX/00006/corenlp/tokens.xml
similarity index 100%
rename from t/GOE/AGX/00006/corenlp/tokens.xml
rename to t/corpus/GOE/AGX/00006/corenlp/tokens.xml
diff --git a/t/GOE/AGX/00006/data.xml b/t/corpus/GOE/AGX/00006/data.xml
similarity index 100%
rename from t/GOE/AGX/00006/data.xml
rename to t/corpus/GOE/AGX/00006/data.xml
diff --git a/t/GOE/AGX/00006/glemm/glemm.xml b/t/corpus/GOE/AGX/00006/glemm/glemm.xml
similarity index 100%
rename from t/GOE/AGX/00006/glemm/glemm.xml
rename to t/corpus/GOE/AGX/00006/glemm/glemm.xml
diff --git a/t/GOE/AGX/00006/header.xml b/t/corpus/GOE/AGX/00006/header.xml
similarity index 100%
rename from t/GOE/AGX/00006/header.xml
rename to t/corpus/GOE/AGX/00006/header.xml
diff --git a/t/GOE/AGX/00006/mate/dependency.xml b/t/corpus/GOE/AGX/00006/mate/dependency.xml
similarity index 100%
rename from t/GOE/AGX/00006/mate/dependency.xml
rename to t/corpus/GOE/AGX/00006/mate/dependency.xml
diff --git a/t/GOE/AGX/00006/mate/morpho.xml b/t/corpus/GOE/AGX/00006/mate/morpho.xml
similarity index 100%
rename from t/GOE/AGX/00006/mate/morpho.xml
rename to t/corpus/GOE/AGX/00006/mate/morpho.xml
diff --git a/t/GOE/AGX/00006/mate/pipeline/one_token_per_line.txt b/t/corpus/GOE/AGX/00006/mate/pipeline/one_token_per_line.txt
similarity index 100%
rename from t/GOE/AGX/00006/mate/pipeline/one_token_per_line.txt
rename to t/corpus/GOE/AGX/00006/mate/pipeline/one_token_per_line.txt
diff --git a/t/GOE/AGX/00006/mate/pipeline/parsed.txt b/t/corpus/GOE/AGX/00006/mate/pipeline/parsed.txt
similarity index 100%
rename from t/GOE/AGX/00006/mate/pipeline/parsed.txt
rename to t/corpus/GOE/AGX/00006/mate/pipeline/parsed.txt
diff --git a/t/GOE/AGX/00006/mate/tokenSpans/number_tokenSpans.xml b/t/corpus/GOE/AGX/00006/mate/tokenSpans/number_tokenSpans.xml
similarity index 100%
rename from t/GOE/AGX/00006/mate/tokenSpans/number_tokenSpans.xml
rename to t/corpus/GOE/AGX/00006/mate/tokenSpans/number_tokenSpans.xml
diff --git a/t/GOE/AGX/00006/opennlp/morpho.xml b/t/corpus/GOE/AGX/00006/opennlp/morpho.xml
similarity index 100%
rename from t/GOE/AGX/00006/opennlp/morpho.xml
rename to t/corpus/GOE/AGX/00006/opennlp/morpho.xml
diff --git a/t/GOE/AGX/00006/opennlp/sentences.xml b/t/corpus/GOE/AGX/00006/opennlp/sentences.xml
similarity index 100%
rename from t/GOE/AGX/00006/opennlp/sentences.xml
rename to t/corpus/GOE/AGX/00006/opennlp/sentences.xml
diff --git a/t/GOE/AGX/00006/opennlp/tokens.xml b/t/corpus/GOE/AGX/00006/opennlp/tokens.xml
similarity index 100%
rename from t/GOE/AGX/00006/opennlp/tokens.xml
rename to t/corpus/GOE/AGX/00006/opennlp/tokens.xml
diff --git a/t/GOE/AGX/00006/struct/structure.xml b/t/corpus/GOE/AGX/00006/struct/structure.xml
similarity index 100%
rename from t/GOE/AGX/00006/struct/structure.xml
rename to t/corpus/GOE/AGX/00006/struct/structure.xml
diff --git a/t/GOE/AGX/00006/text.txt b/t/corpus/GOE/AGX/00006/text.txt
similarity index 100%
rename from t/GOE/AGX/00006/text.txt
rename to t/corpus/GOE/AGX/00006/text.txt
diff --git a/t/GOE/AGX/00006/tree_tagger/metadata.xml b/t/corpus/GOE/AGX/00006/tree_tagger/metadata.xml
similarity index 100%
rename from t/GOE/AGX/00006/tree_tagger/metadata.xml
rename to t/corpus/GOE/AGX/00006/tree_tagger/metadata.xml
diff --git a/t/GOE/AGX/00006/tree_tagger/morpho.xml b/t/corpus/GOE/AGX/00006/tree_tagger/morpho.xml
similarity index 100%
rename from t/GOE/AGX/00006/tree_tagger/morpho.xml
rename to t/corpus/GOE/AGX/00006/tree_tagger/morpho.xml
diff --git a/t/GOE/AGX/00006/tree_tagger/sentences.xml b/t/corpus/GOE/AGX/00006/tree_tagger/sentences.xml
similarity index 100%
rename from t/GOE/AGX/00006/tree_tagger/sentences.xml
rename to t/corpus/GOE/AGX/00006/tree_tagger/sentences.xml
diff --git a/t/GOE/AGX/00006/tree_tagger/tokens.xml b/t/corpus/GOE/AGX/00006/tree_tagger/tokens.xml
similarity index 100%
rename from t/GOE/AGX/00006/tree_tagger/tokens.xml
rename to t/corpus/GOE/AGX/00006/tree_tagger/tokens.xml
diff --git a/t/GOE/AGX/00006/xip/constituency.xml b/t/corpus/GOE/AGX/00006/xip/constituency.xml
similarity index 100%
rename from t/GOE/AGX/00006/xip/constituency.xml
rename to t/corpus/GOE/AGX/00006/xip/constituency.xml
diff --git a/t/GOE/AGX/00006/xip/dependency.xml b/t/corpus/GOE/AGX/00006/xip/dependency.xml
similarity index 100%
rename from t/GOE/AGX/00006/xip/dependency.xml
rename to t/corpus/GOE/AGX/00006/xip/dependency.xml
diff --git a/t/GOE/AGX/00006/xip/metadata.xml b/t/corpus/GOE/AGX/00006/xip/metadata.xml
similarity index 100%
rename from t/GOE/AGX/00006/xip/metadata.xml
rename to t/corpus/GOE/AGX/00006/xip/metadata.xml
diff --git a/t/GOE/AGX/00006/xip/morpho.xml b/t/corpus/GOE/AGX/00006/xip/morpho.xml
similarity index 100%
rename from t/GOE/AGX/00006/xip/morpho.xml
rename to t/corpus/GOE/AGX/00006/xip/morpho.xml
diff --git a/t/GOE/AGX/00006/xip/sentences.xml b/t/corpus/GOE/AGX/00006/xip/sentences.xml
similarity index 100%
rename from t/GOE/AGX/00006/xip/sentences.xml
rename to t/corpus/GOE/AGX/00006/xip/sentences.xml
diff --git a/t/GOE/AGX/00006/xip/tokens.xml b/t/corpus/GOE/AGX/00006/xip/tokens.xml
similarity index 100%
rename from t/GOE/AGX/00006/xip/tokens.xml
rename to t/corpus/GOE/AGX/00006/xip/tokens.xml
diff --git a/t/GOE/AGX/header.xml b/t/corpus/GOE/AGX/header.xml
similarity index 100%
rename from t/GOE/AGX/header.xml
rename to t/corpus/GOE/AGX/header.xml
diff --git a/t/GOE/header.xml b/t/corpus/GOE/header.xml
similarity index 100%
rename from t/GOE/header.xml
rename to t/corpus/GOE/header.xml
diff --git a/t/VDI/JAN/00001/data.xml b/t/corpus/VDI/JAN/00001/data.xml
similarity index 100%
rename from t/VDI/JAN/00001/data.xml
rename to t/corpus/VDI/JAN/00001/data.xml
diff --git a/t/VDI/JAN/00001/header.xml b/t/corpus/VDI/JAN/00001/header.xml
similarity index 100%
rename from t/VDI/JAN/00001/header.xml
rename to t/corpus/VDI/JAN/00001/header.xml
diff --git a/t/VDI/JAN/00001/text.txt b/t/corpus/VDI/JAN/00001/text.txt
similarity index 100%
rename from t/VDI/JAN/00001/text.txt
rename to t/corpus/VDI/JAN/00001/text.txt
diff --git a/t/VDI/JAN/header.xml b/t/corpus/VDI/JAN/header.xml
similarity index 100%
rename from t/VDI/JAN/header.xml
rename to t/corpus/VDI/JAN/header.xml
diff --git a/t/VDI/header.xml b/t/corpus/VDI/header.xml
similarity index 100%
rename from t/VDI/header.xml
rename to t/corpus/VDI/header.xml
diff --git a/t/WDD/G27/38989/base/paragraph.xml b/t/corpus/WDD/G27/38989/base/paragraph.xml
similarity index 100%
rename from t/WDD/G27/38989/base/paragraph.xml
rename to t/corpus/WDD/G27/38989/base/paragraph.xml
diff --git a/t/WDD/G27/38989/base/sentences.xml b/t/corpus/WDD/G27/38989/base/sentences.xml
similarity index 100%
rename from t/WDD/G27/38989/base/sentences.xml
rename to t/corpus/WDD/G27/38989/base/sentences.xml
diff --git a/t/WDD/G27/38989/base/tokens_aggr.xml b/t/corpus/WDD/G27/38989/base/tokens_aggr.xml
similarity index 100%
rename from t/WDD/G27/38989/base/tokens_aggr.xml
rename to t/corpus/WDD/G27/38989/base/tokens_aggr.xml
diff --git a/t/WDD/G27/38989/base/tokens_conservative.xml b/t/corpus/WDD/G27/38989/base/tokens_conservative.xml
similarity index 100%
rename from t/WDD/G27/38989/base/tokens_conservative.xml
rename to t/corpus/WDD/G27/38989/base/tokens_conservative.xml
diff --git a/t/WDD/G27/38989/connexor/metadata.xml b/t/corpus/WDD/G27/38989/connexor/metadata.xml
similarity index 100%
rename from t/WDD/G27/38989/connexor/metadata.xml
rename to t/corpus/WDD/G27/38989/connexor/metadata.xml
diff --git a/t/WDD/G27/38989/connexor/morpho.xml b/t/corpus/WDD/G27/38989/connexor/morpho.xml
similarity index 100%
rename from t/WDD/G27/38989/connexor/morpho.xml
rename to t/corpus/WDD/G27/38989/connexor/morpho.xml
diff --git a/t/WDD/G27/38989/connexor/phrase.xml b/t/corpus/WDD/G27/38989/connexor/phrase.xml
similarity index 100%
rename from t/WDD/G27/38989/connexor/phrase.xml
rename to t/corpus/WDD/G27/38989/connexor/phrase.xml
diff --git a/t/WDD/G27/38989/connexor/sentences.xml b/t/corpus/WDD/G27/38989/connexor/sentences.xml
similarity index 100%
rename from t/WDD/G27/38989/connexor/sentences.xml
rename to t/corpus/WDD/G27/38989/connexor/sentences.xml
diff --git a/t/WDD/G27/38989/connexor/syntax.xml b/t/corpus/WDD/G27/38989/connexor/syntax.xml
similarity index 100%
rename from t/WDD/G27/38989/connexor/syntax.xml
rename to t/corpus/WDD/G27/38989/connexor/syntax.xml
diff --git a/t/WDD/G27/38989/connexor/tokens.xml b/t/corpus/WDD/G27/38989/connexor/tokens.xml
similarity index 100%
rename from t/WDD/G27/38989/connexor/tokens.xml
rename to t/corpus/WDD/G27/38989/connexor/tokens.xml
diff --git a/t/WDD/G27/38989/data.xml b/t/corpus/WDD/G27/38989/data.xml
similarity index 100%
rename from t/WDD/G27/38989/data.xml
rename to t/corpus/WDD/G27/38989/data.xml
diff --git a/t/WDD/G27/38989/header.xml b/t/corpus/WDD/G27/38989/header.xml
similarity index 100%
rename from t/WDD/G27/38989/header.xml
rename to t/corpus/WDD/G27/38989/header.xml
diff --git a/t/WDD/G27/38989/mate/dependency.xml b/t/corpus/WDD/G27/38989/mate/dependency.xml
similarity index 100%
rename from t/WDD/G27/38989/mate/dependency.xml
rename to t/corpus/WDD/G27/38989/mate/dependency.xml
diff --git a/t/WDD/G27/38989/mate/morpho.xml b/t/corpus/WDD/G27/38989/mate/morpho.xml
similarity index 100%
rename from t/WDD/G27/38989/mate/morpho.xml
rename to t/corpus/WDD/G27/38989/mate/morpho.xml
diff --git a/t/WDD/G27/38989/mate/pipeline/one_token_per_line.txt b/t/corpus/WDD/G27/38989/mate/pipeline/one_token_per_line.txt
similarity index 100%
rename from t/WDD/G27/38989/mate/pipeline/one_token_per_line.txt
rename to t/corpus/WDD/G27/38989/mate/pipeline/one_token_per_line.txt
diff --git a/t/WDD/G27/38989/mate/pipeline/parsed.txt b/t/corpus/WDD/G27/38989/mate/pipeline/parsed.txt
similarity index 100%
rename from t/WDD/G27/38989/mate/pipeline/parsed.txt
rename to t/corpus/WDD/G27/38989/mate/pipeline/parsed.txt
diff --git a/t/WDD/G27/38989/mate/tokenSpans/number_tokenSpans.xml b/t/corpus/WDD/G27/38989/mate/tokenSpans/number_tokenSpans.xml
similarity index 100%
rename from t/WDD/G27/38989/mate/tokenSpans/number_tokenSpans.xml
rename to t/corpus/WDD/G27/38989/mate/tokenSpans/number_tokenSpans.xml
diff --git a/t/WDD/G27/38989/opennlp/morpho.xml b/t/corpus/WDD/G27/38989/opennlp/morpho.xml
similarity index 100%
rename from t/WDD/G27/38989/opennlp/morpho.xml
rename to t/corpus/WDD/G27/38989/opennlp/morpho.xml
diff --git a/t/WDD/G27/38989/opennlp/sentences.xml b/t/corpus/WDD/G27/38989/opennlp/sentences.xml
similarity index 100%
rename from t/WDD/G27/38989/opennlp/sentences.xml
rename to t/corpus/WDD/G27/38989/opennlp/sentences.xml
diff --git a/t/WDD/G27/38989/opennlp/tokens.xml b/t/corpus/WDD/G27/38989/opennlp/tokens.xml
similarity index 100%
rename from t/WDD/G27/38989/opennlp/tokens.xml
rename to t/corpus/WDD/G27/38989/opennlp/tokens.xml
diff --git a/t/WDD/G27/38989/struct/structure.xml b/t/corpus/WDD/G27/38989/struct/structure.xml
similarity index 100%
rename from t/WDD/G27/38989/struct/structure.xml
rename to t/corpus/WDD/G27/38989/struct/structure.xml
diff --git a/t/WDD/G27/38989/text.txt b/t/corpus/WDD/G27/38989/text.txt
similarity index 100%
rename from t/WDD/G27/38989/text.txt
rename to t/corpus/WDD/G27/38989/text.txt
diff --git a/t/WDD/G27/38989/tree_tagger/metadata.xml b/t/corpus/WDD/G27/38989/tree_tagger/metadata.xml
similarity index 100%
rename from t/WDD/G27/38989/tree_tagger/metadata.xml
rename to t/corpus/WDD/G27/38989/tree_tagger/metadata.xml
diff --git a/t/WDD/G27/38989/tree_tagger/morpho.xml b/t/corpus/WDD/G27/38989/tree_tagger/morpho.xml
similarity index 100%
rename from t/WDD/G27/38989/tree_tagger/morpho.xml
rename to t/corpus/WDD/G27/38989/tree_tagger/morpho.xml
diff --git a/t/WDD/G27/38989/tree_tagger/sentences.xml b/t/corpus/WDD/G27/38989/tree_tagger/sentences.xml
similarity index 100%
rename from t/WDD/G27/38989/tree_tagger/sentences.xml
rename to t/corpus/WDD/G27/38989/tree_tagger/sentences.xml
diff --git a/t/WDD/G27/38989/tree_tagger/tokens.xml b/t/corpus/WDD/G27/38989/tree_tagger/tokens.xml
similarity index 100%
rename from t/WDD/G27/38989/tree_tagger/tokens.xml
rename to t/corpus/WDD/G27/38989/tree_tagger/tokens.xml
diff --git a/t/WDD/G27/38989/xip/constituency.xml b/t/corpus/WDD/G27/38989/xip/constituency.xml
similarity index 100%
rename from t/WDD/G27/38989/xip/constituency.xml
rename to t/corpus/WDD/G27/38989/xip/constituency.xml
diff --git a/t/WDD/G27/38989/xip/dependency.xml b/t/corpus/WDD/G27/38989/xip/dependency.xml
similarity index 100%
rename from t/WDD/G27/38989/xip/dependency.xml
rename to t/corpus/WDD/G27/38989/xip/dependency.xml
diff --git a/t/WDD/G27/38989/xip/metadata.xml b/t/corpus/WDD/G27/38989/xip/metadata.xml
similarity index 100%
rename from t/WDD/G27/38989/xip/metadata.xml
rename to t/corpus/WDD/G27/38989/xip/metadata.xml
diff --git a/t/WDD/G27/38989/xip/morpho.xml b/t/corpus/WDD/G27/38989/xip/morpho.xml
similarity index 100%
rename from t/WDD/G27/38989/xip/morpho.xml
rename to t/corpus/WDD/G27/38989/xip/morpho.xml
diff --git a/t/WDD/G27/38989/xip/sentences.xml b/t/corpus/WDD/G27/38989/xip/sentences.xml
similarity index 100%
rename from t/WDD/G27/38989/xip/sentences.xml
rename to t/corpus/WDD/G27/38989/xip/sentences.xml
diff --git a/t/WDD/G27/38989/xip/tokens.xml b/t/corpus/WDD/G27/38989/xip/tokens.xml
similarity index 100%
rename from t/WDD/G27/38989/xip/tokens.xml
rename to t/corpus/WDD/G27/38989/xip/tokens.xml
diff --git a/t/WDD/G27/header.xml b/t/corpus/WDD/G27/header.xml
similarity index 100%
rename from t/WDD/G27/header.xml
rename to t/corpus/WDD/G27/header.xml
diff --git a/t/WDD/header.xml b/t/corpus/WDD/header.xml
similarity index 100%
rename from t/WDD/header.xml
rename to t/corpus/WDD/header.xml
diff --git a/t/WPD/00001/base/metadata.xml b/t/corpus/WPD/00001/base/metadata.xml
similarity index 100%
rename from t/WPD/00001/base/metadata.xml
rename to t/corpus/WPD/00001/base/metadata.xml
diff --git a/t/WPD/00001/base/paragraph.xml b/t/corpus/WPD/00001/base/paragraph.xml
similarity index 100%
rename from t/WPD/00001/base/paragraph.xml
rename to t/corpus/WPD/00001/base/paragraph.xml
diff --git a/t/WPD/00001/base/sentences.xml b/t/corpus/WPD/00001/base/sentences.xml
similarity index 100%
rename from t/WPD/00001/base/sentences.xml
rename to t/corpus/WPD/00001/base/sentences.xml
diff --git a/t/WPD/00001/base/tokens_aggr.xml b/t/corpus/WPD/00001/base/tokens_aggr.xml
similarity index 100%
rename from t/WPD/00001/base/tokens_aggr.xml
rename to t/corpus/WPD/00001/base/tokens_aggr.xml
diff --git a/t/WPD/00001/base/tokens_conservative.xml b/t/corpus/WPD/00001/base/tokens_conservative.xml
similarity index 100%
rename from t/WPD/00001/base/tokens_conservative.xml
rename to t/corpus/WPD/00001/base/tokens_conservative.xml
diff --git a/t/WPD/00001/connexor/metadata.xml b/t/corpus/WPD/00001/connexor/metadata.xml
similarity index 100%
rename from t/WPD/00001/connexor/metadata.xml
rename to t/corpus/WPD/00001/connexor/metadata.xml
diff --git a/t/WPD/00001/connexor/morpho.xml b/t/corpus/WPD/00001/connexor/morpho.xml
similarity index 100%
rename from t/WPD/00001/connexor/morpho.xml
rename to t/corpus/WPD/00001/connexor/morpho.xml
diff --git a/t/WPD/00001/connexor/phrase.xml b/t/corpus/WPD/00001/connexor/phrase.xml
similarity index 100%
rename from t/WPD/00001/connexor/phrase.xml
rename to t/corpus/WPD/00001/connexor/phrase.xml
diff --git a/t/WPD/00001/connexor/sentences.xml b/t/corpus/WPD/00001/connexor/sentences.xml
similarity index 100%
rename from t/WPD/00001/connexor/sentences.xml
rename to t/corpus/WPD/00001/connexor/sentences.xml
diff --git a/t/WPD/00001/connexor/syntax.xml b/t/corpus/WPD/00001/connexor/syntax.xml
similarity index 100%
rename from t/WPD/00001/connexor/syntax.xml
rename to t/corpus/WPD/00001/connexor/syntax.xml
diff --git a/t/WPD/00001/connexor/tokens.xml b/t/corpus/WPD/00001/connexor/tokens.xml
similarity index 100%
rename from t/WPD/00001/connexor/tokens.xml
rename to t/corpus/WPD/00001/connexor/tokens.xml
diff --git a/t/WPD/00001/corenlp/metadata.xml b/t/corpus/WPD/00001/corenlp/metadata.xml
similarity index 100%
rename from t/WPD/00001/corenlp/metadata.xml
rename to t/corpus/WPD/00001/corenlp/metadata.xml
diff --git a/t/WPD/00001/corenlp/ne_dewac_175m_600.xml b/t/corpus/WPD/00001/corenlp/ne_dewac_175m_600.xml
similarity index 100%
rename from t/WPD/00001/corenlp/ne_dewac_175m_600.xml
rename to t/corpus/WPD/00001/corenlp/ne_dewac_175m_600.xml
diff --git a/t/WPD/00001/corenlp/ne_hgc_175m_600.xml b/t/corpus/WPD/00001/corenlp/ne_hgc_175m_600.xml
similarity index 100%
rename from t/WPD/00001/corenlp/ne_hgc_175m_600.xml
rename to t/corpus/WPD/00001/corenlp/ne_hgc_175m_600.xml
diff --git a/t/WPD/00001/corenlp/sentences.xml b/t/corpus/WPD/00001/corenlp/sentences.xml
similarity index 100%
rename from t/WPD/00001/corenlp/sentences.xml
rename to t/corpus/WPD/00001/corenlp/sentences.xml
diff --git a/t/WPD/00001/corenlp/tokens.xml b/t/corpus/WPD/00001/corenlp/tokens.xml
similarity index 100%
rename from t/WPD/00001/corenlp/tokens.xml
rename to t/corpus/WPD/00001/corenlp/tokens.xml
diff --git a/t/WPD/00001/data.xml b/t/corpus/WPD/00001/data.xml
similarity index 100%
rename from t/WPD/00001/data.xml
rename to t/corpus/WPD/00001/data.xml
diff --git a/t/WPD/00001/header.xml b/t/corpus/WPD/00001/header.xml
similarity index 100%
rename from t/WPD/00001/header.xml
rename to t/corpus/WPD/00001/header.xml
diff --git a/t/WPD/00001/mate/dependency.xml b/t/corpus/WPD/00001/mate/dependency.xml
similarity index 100%
rename from t/WPD/00001/mate/dependency.xml
rename to t/corpus/WPD/00001/mate/dependency.xml
diff --git a/t/WPD/00001/mate/metadata.xml b/t/corpus/WPD/00001/mate/metadata.xml
similarity index 100%
rename from t/WPD/00001/mate/metadata.xml
rename to t/corpus/WPD/00001/mate/metadata.xml
diff --git a/t/WPD/00001/mate/morpho.xml b/t/corpus/WPD/00001/mate/morpho.xml
similarity index 100%
rename from t/WPD/00001/mate/morpho.xml
rename to t/corpus/WPD/00001/mate/morpho.xml
diff --git a/t/WPD/00001/mate/pipeline/one_token_per_line.txt b/t/corpus/WPD/00001/mate/pipeline/one_token_per_line.txt
similarity index 100%
rename from t/WPD/00001/mate/pipeline/one_token_per_line.txt
rename to t/corpus/WPD/00001/mate/pipeline/one_token_per_line.txt
diff --git a/t/WPD/00001/mate/pipeline/parsed.txt b/t/corpus/WPD/00001/mate/pipeline/parsed.txt
similarity index 100%
rename from t/WPD/00001/mate/pipeline/parsed.txt
rename to t/corpus/WPD/00001/mate/pipeline/parsed.txt
diff --git a/t/WPD/00001/mate/tokenSpans/number_tokenSpans.xml b/t/corpus/WPD/00001/mate/tokenSpans/number_tokenSpans.xml
similarity index 100%
rename from t/WPD/00001/mate/tokenSpans/number_tokenSpans.xml
rename to t/corpus/WPD/00001/mate/tokenSpans/number_tokenSpans.xml
diff --git a/t/WPD/00001/metadata.xml b/t/corpus/WPD/00001/metadata.xml
similarity index 100%
rename from t/WPD/00001/metadata.xml
rename to t/corpus/WPD/00001/metadata.xml
diff --git a/t/WPD/00001/opennlp/metadata.xml b/t/corpus/WPD/00001/opennlp/metadata.xml
similarity index 100%
rename from t/WPD/00001/opennlp/metadata.xml
rename to t/corpus/WPD/00001/opennlp/metadata.xml
diff --git a/t/WPD/00001/opennlp/morpho.xml b/t/corpus/WPD/00001/opennlp/morpho.xml
similarity index 100%
rename from t/WPD/00001/opennlp/morpho.xml
rename to t/corpus/WPD/00001/opennlp/morpho.xml
diff --git a/t/WPD/00001/opennlp/sentences.xml b/t/corpus/WPD/00001/opennlp/sentences.xml
similarity index 100%
rename from t/WPD/00001/opennlp/sentences.xml
rename to t/corpus/WPD/00001/opennlp/sentences.xml
diff --git a/t/WPD/00001/opennlp/tokens.xml b/t/corpus/WPD/00001/opennlp/tokens.xml
similarity index 100%
rename from t/WPD/00001/opennlp/tokens.xml
rename to t/corpus/WPD/00001/opennlp/tokens.xml
diff --git a/t/WPD/00001/struct/structure.xml b/t/corpus/WPD/00001/struct/structure.xml
similarity index 100%
rename from t/WPD/00001/struct/structure.xml
rename to t/corpus/WPD/00001/struct/structure.xml
diff --git a/t/WPD/00001/text.txt b/t/corpus/WPD/00001/text.txt
similarity index 100%
rename from t/WPD/00001/text.txt
rename to t/corpus/WPD/00001/text.txt
diff --git a/t/WPD/00001/tree_tagger/metadata.xml b/t/corpus/WPD/00001/tree_tagger/metadata.xml
similarity index 100%
rename from t/WPD/00001/tree_tagger/metadata.xml
rename to t/corpus/WPD/00001/tree_tagger/metadata.xml
diff --git a/t/WPD/00001/tree_tagger/morpho.xml b/t/corpus/WPD/00001/tree_tagger/morpho.xml
similarity index 100%
rename from t/WPD/00001/tree_tagger/morpho.xml
rename to t/corpus/WPD/00001/tree_tagger/morpho.xml
diff --git a/t/WPD/00001/tree_tagger/sentences.xml b/t/corpus/WPD/00001/tree_tagger/sentences.xml
similarity index 100%
rename from t/WPD/00001/tree_tagger/sentences.xml
rename to t/corpus/WPD/00001/tree_tagger/sentences.xml
diff --git a/t/WPD/00001/tree_tagger/tokens.xml b/t/corpus/WPD/00001/tree_tagger/tokens.xml
similarity index 100%
rename from t/WPD/00001/tree_tagger/tokens.xml
rename to t/corpus/WPD/00001/tree_tagger/tokens.xml
diff --git a/t/WPD/00001/xip/constituency.xml b/t/corpus/WPD/00001/xip/constituency.xml
similarity index 100%
rename from t/WPD/00001/xip/constituency.xml
rename to t/corpus/WPD/00001/xip/constituency.xml
diff --git a/t/WPD/00001/xip/dependency.xml b/t/corpus/WPD/00001/xip/dependency.xml
similarity index 100%
rename from t/WPD/00001/xip/dependency.xml
rename to t/corpus/WPD/00001/xip/dependency.xml
diff --git a/t/WPD/00001/xip/metadata.xml b/t/corpus/WPD/00001/xip/metadata.xml
similarity index 100%
rename from t/WPD/00001/xip/metadata.xml
rename to t/corpus/WPD/00001/xip/metadata.xml
diff --git a/t/WPD/00001/xip/morpho.xml b/t/corpus/WPD/00001/xip/morpho.xml
similarity index 100%
rename from t/WPD/00001/xip/morpho.xml
rename to t/corpus/WPD/00001/xip/morpho.xml
diff --git a/t/WPD/00001/xip/sentences.xml b/t/corpus/WPD/00001/xip/sentences.xml
similarity index 100%
rename from t/WPD/00001/xip/sentences.xml
rename to t/corpus/WPD/00001/xip/sentences.xml
diff --git a/t/WPD/00001/xip/tokens.xml b/t/corpus/WPD/00001/xip/tokens.xml
similarity index 100%
rename from t/WPD/00001/xip/tokens.xml
rename to t/corpus/WPD/00001/xip/tokens.xml
diff --git a/t/artificial/base/paragraph.xml b/t/corpus/artificial/base/paragraph.xml
similarity index 100%
rename from t/artificial/base/paragraph.xml
rename to t/corpus/artificial/base/paragraph.xml
diff --git a/t/artificial/base/sentences.xml b/t/corpus/artificial/base/sentences.xml
similarity index 100%
rename from t/artificial/base/sentences.xml
rename to t/corpus/artificial/base/sentences.xml
diff --git a/t/artificial/connexor/morpho.xml b/t/corpus/artificial/connexor/morpho.xml
similarity index 100%
rename from t/artificial/connexor/morpho.xml
rename to t/corpus/artificial/connexor/morpho.xml
diff --git a/t/artificial/connexor/phrase.xml b/t/corpus/artificial/connexor/phrase.xml
similarity index 100%
rename from t/artificial/connexor/phrase.xml
rename to t/corpus/artificial/connexor/phrase.xml
diff --git a/t/artificial/connexor/sentences.xml b/t/corpus/artificial/connexor/sentences.xml
similarity index 100%
rename from t/artificial/connexor/sentences.xml
rename to t/corpus/artificial/connexor/sentences.xml
diff --git a/t/artificial/connexor/syntax.xml b/t/corpus/artificial/connexor/syntax.xml
similarity index 100%
rename from t/artificial/connexor/syntax.xml
rename to t/corpus/artificial/connexor/syntax.xml
diff --git a/t/artificial/corenlp/constituency.xml b/t/corpus/artificial/corenlp/constituency.xml
similarity index 100%
rename from t/artificial/corenlp/constituency.xml
rename to t/corpus/artificial/corenlp/constituency.xml
diff --git a/t/artificial/corenlp/morpho.xml b/t/corpus/artificial/corenlp/morpho.xml
similarity index 100%
rename from t/artificial/corenlp/morpho.xml
rename to t/corpus/artificial/corenlp/morpho.xml
diff --git a/t/artificial/corenlp/ne_dewac_175m_600.xml b/t/corpus/artificial/corenlp/ne_dewac_175m_600.xml
similarity index 100%
rename from t/artificial/corenlp/ne_dewac_175m_600.xml
rename to t/corpus/artificial/corenlp/ne_dewac_175m_600.xml
diff --git a/t/artificial/corenlp/ne_hgc_175m_600.xml b/t/corpus/artificial/corenlp/ne_hgc_175m_600.xml
similarity index 100%
rename from t/artificial/corenlp/ne_hgc_175m_600.xml
rename to t/corpus/artificial/corenlp/ne_hgc_175m_600.xml
diff --git a/t/artificial/corenlp/sentences.xml b/t/corpus/artificial/corenlp/sentences.xml
similarity index 100%
rename from t/artificial/corenlp/sentences.xml
rename to t/corpus/artificial/corenlp/sentences.xml
diff --git a/t/artificial/corenlp/tokens.xml b/t/corpus/artificial/corenlp/tokens.xml
similarity index 100%
rename from t/artificial/corenlp/tokens.xml
rename to t/corpus/artificial/corenlp/tokens.xml
diff --git a/t/artificial/data.xml b/t/corpus/artificial/data.xml
similarity index 100%
rename from t/artificial/data.xml
rename to t/corpus/artificial/data.xml
diff --git a/t/artificial/header.xml b/t/corpus/artificial/header.xml
similarity index 100%
rename from t/artificial/header.xml
rename to t/corpus/artificial/header.xml
diff --git a/t/artificial/metadata.xml b/t/corpus/artificial/metadata.xml
similarity index 100%
rename from t/artificial/metadata.xml
rename to t/corpus/artificial/metadata.xml
diff --git a/t/artificial/opennlp/morpho.xml b/t/corpus/artificial/opennlp/morpho.xml
similarity index 100%
rename from t/artificial/opennlp/morpho.xml
rename to t/corpus/artificial/opennlp/morpho.xml
diff --git a/t/artificial/opennlp/sentences.xml b/t/corpus/artificial/opennlp/sentences.xml
similarity index 100%
rename from t/artificial/opennlp/sentences.xml
rename to t/corpus/artificial/opennlp/sentences.xml
diff --git a/t/artificial/opennlp/tokens.xml b/t/corpus/artificial/opennlp/tokens.xml
similarity index 100%
rename from t/artificial/opennlp/tokens.xml
rename to t/corpus/artificial/opennlp/tokens.xml
diff --git a/t/artificial/xip/constituency.xml b/t/corpus/artificial/xip/constituency.xml
similarity index 100%
rename from t/artificial/xip/constituency.xml
rename to t/corpus/artificial/xip/constituency.xml
diff --git a/t/artificial/xip/dependency.xml b/t/corpus/artificial/xip/dependency.xml
similarity index 100%
rename from t/artificial/xip/dependency.xml
rename to t/corpus/artificial/xip/dependency.xml
diff --git a/t/artificial/xip/morpho.xml b/t/corpus/artificial/xip/morpho.xml
similarity index 100%
rename from t/artificial/xip/morpho.xml
rename to t/corpus/artificial/xip/morpho.xml
diff --git a/t/artificial/xip/sentences.xml b/t/corpus/artificial/xip/sentences.xml
similarity index 100%
rename from t/artificial/xip/sentences.xml
rename to t/corpus/artificial/xip/sentences.xml
diff --git a/t/index/meta.t b/t/index/meta.t
index dadcb4c..e5a01ba 100644
--- a/t/index/meta.t
+++ b/t/index/meta.t
@@ -48,10 +48,10 @@
 ok(!$doc->doc_editor, 'Doc: editor');
 ok(!$doc->doc_author, 'Doc: author');
 
-is($doc->corpus_title, 'Beispiel-Corpus', 'Corpus: title');
+is($doc->corpus_title, 'Werke von Beispiel', 'Corpus: title');
 ok(!$doc->corpus_sub_title, 'Corpus: subtitle');
-ok(!$doc->corpus_editor, 'Corpus: editor');
-ok(!$doc->corpus_author, 'Corpus: author');
+is($doc->corpus_editor, 'Mustermann, Monika', 'Corpus: editor');
+is($doc->corpus_author, 'Mustermann, Max', 'Corpus: author');
 
 done_testing;
 
diff --git a/t/meta.t b/t/meta.t
index 3aa0f34..a51371a 100644
--- a/t/meta.t
+++ b/t/meta.t
@@ -1,6 +1,3 @@
-#!/usr/bin/env perl
-# source ~/perl5/perlbrew/etc/bashrc
-# perlbrew switch perl-blead@korap
 use strict;
 use warnings;
 use utf8;
@@ -11,12 +8,10 @@
 use File::Basename 'dirname';
 use File::Spec::Functions 'catdir';
 
-# TODO: Make 'text' -> 'primaryText'
-
 use_ok('KorAP::Document');
 
 # WPD/00001
-my $path = catdir(dirname(__FILE__), 'WPD/00001');
+my $path = catdir(dirname(__FILE__), 'corpus/WPD/00001');
 ok(my $doc = KorAP::Document->new( path => $path . '/' ), 'Load Korap::Document');
 like($doc->path, qr!$path/!, 'Path');
 
@@ -63,7 +58,7 @@
 #ok(!$doc->coll_author, 'Collection author');
 
 # BRZ13/00001
-$path = catdir(dirname(__FILE__), 'BRZ13/00001');
+$path = catdir(dirname(__FILE__), 'corpus/BRZ13/00001');
 ok($doc = KorAP::Document->new( path => $path . '/' ), 'Load Korap::Document');
 
 ok($doc->parse, 'Parse document');
@@ -92,7 +87,7 @@
 ok(!$doc->text_type_art, 'text_type art');
 
 # A01/13047
-$path = catdir(dirname(__FILE__), 'A01/13047');
+$path = catdir(dirname(__FILE__), 'corpus/A01/13047');
 ok($doc = KorAP::Document->new( path => $path . '/' ), 'Load Korap::Document');
 
 ok($doc->parse, 'Parse document');
@@ -119,11 +114,11 @@
 is($doc->text_type_art, 'Bericht', 'text_type art');
 
 # ERL/0001
-$path = catdir(dirname(__FILE__), 'ERL/00001');
+$path = catdir(dirname(__FILE__), 'corpus/ERL/00001');
 ok($doc = KorAP::Document->new( path => $path . '/' ), 'Load Korap::Document');
 
 ok($doc->parse, 'Parse document');
-is($doc->title, 'Amtsblatt des Landesbezirks Baden [diverse Erlasse], Hrsg. und Schriftleitung: Präsidialstelle der Landesverwaltung Baden in Karlsruhe. - Karlsruhe, o.J.', 'title'); # Amtsblatt des Landesbezirks Baden [diverse Erlasse]
+is($doc->title, 'Amtsblatt des Landesbezirks Baden [diverse Erlasse]', 'title'); # Amtsblatt des Landesbezirks Baden [diverse Erlasse]
 # MK2/ERL.00001
 
 ok(!$doc->sub_title, 'subTitle');
@@ -153,7 +148,7 @@
 ok(!$doc->text_type_art, 'text_type art');
 
 # A01/02035-substring
-$path = catdir(dirname(__FILE__), 'A00/02035-substring');
+$path = catdir(dirname(__FILE__), 'corpus/A00/02035-substring');
 ok($doc = KorAP::Document->new( path => $path . '/' ), 'Load Korap::Document');
 
 ok($doc->parse, 'Parse document');
@@ -180,7 +175,7 @@
 is($doc->text_type_art, 'Bericht', 'text_type art');
 
 # A01/02873-meta
-$path = catdir(dirname(__FILE__), 'A00/02873-meta');
+$path = catdir(dirname(__FILE__), 'corpus/A00/02873-meta');
 ok($doc = KorAP::Document->new( path => $path . '/' ), 'Load Korap::Document');
 
 ok($doc->parse, 'Parse document');
@@ -209,7 +204,7 @@
 
 
 # A01/05663-unbalanced
-$path = catdir(dirname(__FILE__), 'A00/05663-unbalanced');
+$path = catdir(dirname(__FILE__), 'corpus/A00/05663-unbalanced');
 ok($doc = KorAP::Document->new( path => $path . '/' ), 'Load Korap::Document');
 
 ok($doc->parse, 'Parse document');
@@ -238,7 +233,7 @@
 
 
 # A01/07452-deep
-$path = catdir(dirname(__FILE__), 'A00/07452-deep');
+$path = catdir(dirname(__FILE__), 'corpus/A00/07452-deep');
 ok($doc = KorAP::Document->new( path => $path . '/' ), 'Load Korap::Document');
 
 ok($doc->parse, 'Parse document');
@@ -266,7 +261,7 @@
 is($doc->text_type_art, 'Bericht', 'text_type art');
 
 # ART
-$path = catdir(dirname(__FILE__), 'artificial');
+$path = catdir(dirname(__FILE__), 'corpus/artificial');
 ok($doc = KorAP::Document->new( path => $path . '/' ), 'Load Korap::Document');
 #is($doc->path, $path . '/', 'Path');
 
@@ -303,7 +298,7 @@
 is($doc->text_type_art, 'Bericht', 'text_type art');
 
 # Multipath headers
-$path = catdir(dirname(__FILE__), 'VDI/JAN/00001');
+$path = catdir(dirname(__FILE__), 'corpus/VDI/JAN/00001');
 ok($doc = KorAP::Document->new( path => $path . '/' ), 'Load Korap::Document');
 like($doc->path, qr!$path/!, 'Path');
 
@@ -347,16 +342,16 @@
 ok(!$doc->doc_editor, 'Doc editor');
 ok(!$doc->doc_author, 'Doc author');
 
-is($doc->corpus_title, 'VDI nachrichten 2014', 'Corpus title');
+is($doc->corpus_title, 'VDI nachrichten', 'Corpus title');
 ok(!$doc->corpus_sub_title, 'Corpus Sub title');
-ok(!$doc->corpus_editor, 'Corpus editor');
+is($doc->corpus_editor, 'Verein Deutscher Ingenieure', 'Corpus editor');
 ok(!$doc->corpus_author, 'Corpus author');
 
 is($doc->keywords_string, '', 'Keywords');
 is($doc->text_class_string, 'Freizeit-Unterhaltung Reisen Politik Ausland', 'Text class');
 
 # WDD
-$path = catdir(dirname(__FILE__), 'WDD/G27/38989');
+$path = catdir(dirname(__FILE__), 'corpus/WDD/G27/38989');
 ok($doc = KorAP::Document->new( path => $path . '/' ), 'Load Korap::Document');
 like($doc->path, qr!$path/!, 'Path');
 ok($doc->parse, 'Parse document');
@@ -394,9 +389,9 @@
 ok(!$doc->doc_editor, 'Doc editor');
 ok(!$doc->doc_author, 'Doc author');
 
-is($doc->corpus_title, 'Wikipedia.de 2011 Diskussionen', 'Corpus title');
+is($doc->corpus_title, 'Wikipedia', 'Corpus title');
 ok(!$doc->corpus_sub_title, 'Corpus Sub title');
-ok(!$doc->corpus_editor, 'Corpus editor');
+is($doc->corpus_editor, 'wikipedia.org', 'Corpus editor');
 ok(!$doc->corpus_author, 'Corpus author');
 
 is($doc->keywords_string, '', 'Keywords');
diff --git a/t/range.t b/t/range.t
index b5921cc..bd2538f 100644
--- a/t/range.t
+++ b/t/range.t
@@ -35,7 +35,11 @@
 is($range->before(4), 0, 'Before is fine');
 is($range->before(15), 0, 'Before is fine');
 is($range->before(23), 1, 'Before is fine');
-ok(!$range->before(590), 'No range here');
+
+{
+  local $SIG{__WARN__} = sub {};
+  ok(!$range->before(590), 'No range here');
+};
 
 is($range->after(0), 0, 'After is fine');
 is($range->after(1), 0, 'After is fine');
@@ -47,5 +51,7 @@
 is($range->to_string,
    '[0,2,!-1:0][3,14,0][15,16,!0:1][17,20,1][21,28,2][29,100,...]...',
    'ToString is fine');
+
 done_testing;
+
 __END__
diff --git a/t/real_bzk.t b/t/real/bzk.t
similarity index 92%
rename from t/real_bzk.t
rename to t/real/bzk.t
index a590d44..3b39b25 100644
--- a/t/real_bzk.t
+++ b/t/real/bzk.t
@@ -19,7 +19,7 @@
 
 use_ok('KorAP::Document');
 
-my $path = catdir(dirname(__FILE__), 'BZK/D59/00001');
+my $path = catdir(dirname(__FILE__), '../corpus/BZK/D59/00001');
 
 ok(my $doc = KorAP::Document->new( path => $path . '/' ), 'Load Korap::Document');
 ok($doc->parse, 'Parse document');
@@ -63,7 +63,7 @@
 ok(!$doc->corpus_author, 'Correct Corpus author');
 ok(!$doc->corpus_editor, 'Correct Corpus editor');
 
-is($doc->doc_title, 'Neues Deutschland, Jahrgangsquerschnitt 1959', 'Correct Doc title');
+is($doc->doc_title, 'Neues Deutschland', 'Correct Doc title');
 is($doc->doc_sub_title, 'Organ des Zentralkomitees der Sozialistischen Einheitspartei Deutschlands', 'Correct Doc sub title');
 ok(!$doc->doc_author, 'Correct Doc author');
 ok(!$doc->doc_editor, 'Correct doc editor');
@@ -89,7 +89,7 @@
 is(substr($output->{data}->{text}, 0, 100), 'unser gemeinsames Werk wird siegreich sein Neujahrsbotschaft des Präsidenten der DeutschenDemokratis', 'Primary Data');
 is($output->{data}->{name}, 'tokens', 'tokenName');
 is($output->{data}->{tokenSource}, 'opennlp#tokens', 'tokenSource');
-is($output->{version}, '0.02', 'version');
+is($output->{version}, '0.03', 'version');
 is($output->{data}->{foundries}, '', 'Foundries');
 is($output->{data}->{layerInfos}, '', 'layerInfos');
 is($output->{data}->{stream}->[0]->[3], 's:unser', 'data');
@@ -127,7 +127,7 @@
 ok(!exists $output->{corpusAuthor}, 'Correct Corpus author');
 ok(!exists $output->{corpusEditor}, 'Correct Corpus editor');
 
-is($output->{docTitle}, 'Neues Deutschland, Jahrgangsquerschnitt 1959', 'Correct Doc title');
+is($output->{docTitle}, 'Neues Deutschland', 'Correct Doc title');
 is($output->{docSubTitle}, 'Organ des Zentralkomitees der Sozialistischen Einheitspartei Deutschlands', 'Correct Doc sub title');
 ok(!exists $output->{docAuthor}, 'Correct Doc author');
 ok(!exists $output->{docEditor}, 'Correct doc editor');
@@ -138,11 +138,12 @@
 
 $output = decode_json( $tokens->to_json );
 
+
 is($output->{data}->{foundries}, 'base base/paragraphs base/sentences', 'Foundries');
 is($output->{data}->{layerInfos}, 'base/s=spans', 'layerInfos');
 my $first_token = join('||', @{$output->{data}->{stream}->[0]});
 like($first_token, qr/s:unser/, 'data');
-like($first_token, qr/_0#0-5/, 'data');
+like($first_token, qr/_0\$<i>0<i>5/, 'data');
 
 ## OpenNLP
 $tokens->add('OpenNLP', 'Sentences');
@@ -161,6 +162,7 @@
    'Foundries');
 is($output->{data}->{layerInfos}, 'base/s=spans opennlp/p=tokens opennlp/s=spans', 'layerInfos');
 
+
 ## Treetagger
 $tokens->add('TreeTagger', 'Sentences');
 $output = decode_json( $tokens->to_json );
@@ -196,7 +198,6 @@
 like($output->{data}->{foundries}, qr!corenlp/morpho!, 'Foundries');
 like($output->{data}->{layerInfos}, qr!corenlp/p=tokens!, 'layerInfos');
 
-
 $tokens->add('CoreNLP', 'Constituency');
 $output = decode_json( $tokens->to_json );
 like($output->{data}->{foundries}, qr!corenlp/constituency!, 'Foundries');
@@ -231,15 +232,18 @@
 like($output->{data}->{foundries}, qr!connexor/syntax!, 'Foundries');
 like($output->{data}->{layerInfos}, qr!cnx/syn=tokens!, 'layerInfos');
 
-## Mate
-$tokens->add('Mate', 'Morpho');
-$output = decode_json( $tokens->to_json );
-unlike($output->{data}->{foundries}, qr!mate/morpho!, 'Foundries');
-unlike($output->{data}->{layerInfos}, qr!mate/p=tokens!, 'layerInfos');
-unlike($output->{data}->{layerInfos}, qr!mate/l=tokens!, 'layerInfos');
-unlike($output->{data}->{layerInfos}, qr!mate/m=tokens!, 'layerInfos');
+## Mate - not in existence
+{
+  local $SIG{__WARN__} = sub {};
+  $tokens->add('Mate', 'Morpho');
+  $output = decode_json( $tokens->to_json );
+  unlike($output->{data}->{foundries}, qr!mate/morpho!, 'Foundries');
+  unlike($output->{data}->{layerInfos}, qr!mate/p=tokens!, 'layerInfos');
+  unlike($output->{data}->{layerInfos}, qr!mate/l=tokens!, 'layerInfos');
+  unlike($output->{data}->{layerInfos}, qr!mate/m=tokens!, 'layerInfos');
+};
 
-diag "No test for mate dependency";
+# diag "No test for mate dependency";
 
 ## XIP
 $tokens->add('XIP', 'Sentences');
@@ -259,7 +263,7 @@
 like($output->{data}->{foundries}, qr!xip/constituency!, 'Foundries');
 like($output->{data}->{layerInfos}, qr!xip/c=spans!, 'layerInfos');
 
-diag "No test for xip dependency";
+# diag "No test for xip dependency";
 
 
 done_testing;
diff --git a/t/real_bzk_2.t b/t/real/bzk_2.t
similarity index 96%
rename from t/real_bzk_2.t
rename to t/real/bzk_2.t
index 89af4d8..62a1a34 100644
--- a/t/real_bzk_2.t
+++ b/t/real/bzk_2.t
@@ -1,6 +1,3 @@
-#!/usr/bin/env perl
-# source ~/perl5/perlbrew/etc/bashrc
-# perlbrew switch perl-blead@korap
 use strict;
 use warnings;
 use Test::More;
@@ -19,7 +16,7 @@
 
 use_ok('KorAP::Document');
 
-my $path = catdir(dirname(__FILE__), 'BZK/D59/00089');
+my $path = catdir(dirname(__FILE__), '../corpus/BZK/D59/00089');
 
 ok(my $doc = KorAP::Document->new( path => $path . '/' ), 'Load Korap::Document');
 ok($doc->parse, 'Parse document');
@@ -90,7 +87,7 @@
 is(substr($output->{data}->{text}, 0, 100), 'Saragat-Partei zerfällt Rom (ADN) die von dem Rechtssozialisten Saragat geführte Sozialdemokratische', 'Primary Data');
 is($output->{data}->{name}, 'tokens', 'tokenName');
 is($output->{data}->{tokenSource}, 'opennlp#tokens', 'tokenSource');
-is($output->{version}, '0.02', 'version');
+is($output->{version}, '0.03', 'version');
 is($output->{data}->{foundries}, '', 'Foundries');
 is($output->{data}->{layerInfos}, '', 'layerInfos');
 is($output->{data}->{stream}->[0]->[3], 's:Saragat-Partei', 'data');
@@ -144,7 +141,7 @@
 is($output->{data}->{layerInfos}, 'base/s=spans', 'layerInfos');
 my $first_token = join('||', @{$output->{data}->{stream}->[0]});
 like($first_token, qr/s:Saragat-Partei/, 'data');
-like($first_token, qr/_0#0-14/, 'data');
+like($first_token, qr/_0\$<i>0<i>14/, 'data');
 
 ## OpenNLP
 $tokens->add('OpenNLP', 'Sentences');
@@ -239,7 +236,7 @@
 like($output->{data}->{layerInfos}, qr!mate/l=tokens!, 'layerInfos');
 like($output->{data}->{layerInfos}, qr!mate/m=tokens!, 'layerInfos');
 
-diag "No test for mate dependency";
+# diag "No test for mate dependency";
 
 ## XIP
 $tokens->add('XIP', 'Sentences');
@@ -253,14 +250,12 @@
 like($output->{data}->{layerInfos}, qr!xip/l=tokens!, 'layerInfos');
 like($output->{data}->{layerInfos}, qr!xip/p=tokens!, 'layerInfos');
 
-
 $tokens->add('XIP', 'Constituency');
 $output = decode_json( $tokens->to_json );
 like($output->{data}->{foundries}, qr!xip/constituency!, 'Foundries');
 like($output->{data}->{layerInfos}, qr!xip/c=spans!, 'layerInfos');
 
-diag "No test for xip dependency";
-
+# diag "No test for xip dependency";
 
 done_testing;
 __END__
diff --git a/t/real_goethe.t b/t/real/goethe.t
similarity index 84%
rename from t/real_goethe.t
rename to t/real/goethe.t
index 9efe4c5..ae33e8d 100644
--- a/t/real_goethe.t
+++ b/t/real/goethe.t
@@ -1,6 +1,3 @@
-#!/usr/bin/env perl
-# source ~/perl5/perlbrew/etc/bashrc
-# perlbrew switch perl-blead@korap
 use strict;
 use warnings;
 use Test::More;
@@ -20,7 +17,7 @@
 use_ok('KorAP::Document');
 
 # GOE/AGA/03828
-my $path = catdir(dirname(__FILE__), 'GOE/AGA/03828');
+my $path = catdir(dirname(__FILE__), '../corpus/GOE/AGA/03828');
 # my $path = '/home/ndiewald/Repositories/korap/KorAP-sandbox/KorAP-lucene-indexer/t/GOE/AGA/03828';
 
 ok(my $doc = KorAP::Document->new( path => $path . '/' ), 'Load Korap::Document');
@@ -53,7 +50,8 @@
 REF
 is($doc->language, 'de', 'Language');
 
-is($doc->corpus_title, 'Goethe-Korpus', 'Correct Corpus title');
+
+is($doc->corpus_title, 'Goethes Werke', 'Correct Corpus title');
 ok(!$doc->corpus_sub_title, 'Correct Corpus Sub title');
 is($doc->corpus_author, 'Goethe, Johann Wolfgang von', 'Correct Corpus author');
 is($doc->corpus_editor, 'Trunz, Erich', 'Correct Corpus editor');
@@ -67,7 +65,6 @@
 # Tokenization
 use_ok('KorAP::Tokenizer');
 
-
 my ($token_base_foundry, $token_base_layer) = (qw/OpenNLP Tokens/);
 
 # Get tokenization
@@ -86,7 +83,7 @@
 is(substr($output->{data}->{text}, 0, 100), 'Autobiographische einzelheiten Selbstschilderung (1) immer tätiger, nach innen und außen fortwirkend', 'Primary Data');
 is($output->{data}->{name}, 'tokens', 'tokenName');
 is($output->{data}->{tokenSource}, 'opennlp#tokens', 'tokenSource');
-is($output->{version}, '0.02', 'version');
+is($output->{version}, '0.03', 'version');
 is($output->{data}->{foundries}, '', 'Foundries');
 is($output->{data}->{layerInfos}, '', 'layerInfos');
 is($output->{data}->{stream}->[0]->[3], 's:Autobiographische', 'data');
@@ -95,7 +92,6 @@
 is($output->{docSigle}, 'GOE_AGA', 'Correct document sigle');
 is($output->{corpusSigle}, 'GOE', 'Correct corpus sigle');
 
-
 is($output->{author}, 'Goethe, Johann Wolfgang von', 'Author');
 is($output->{pubPlace}, 'München', 'PubPlace');
 is($output->{pubDate}, '19820000', 'Creation Date');
@@ -119,7 +115,7 @@
 REF
 is($output->{language}, 'de', 'Language');
 
-is($output->{corpusTitle}, 'Goethe-Korpus', 'Correct Corpus title');
+is($output->{corpusTitle}, 'Goethes Werke', 'Correct Corpus title');
 ok(!exists $output->{corpusSubTitle}, 'Correct Text Type');
 is($output->{corpusAuthor}, 'Goethe, Johann Wolfgang von', 'Correct Corpus title');
 is($output->{corpusEditor}, 'Trunz, Erich', 'Editor');
@@ -139,9 +135,9 @@
 is($output->{data}->{layerInfos}, 'base/s=spans', 'layerInfos');
 my $first_token = join('||', @{$output->{data}->{stream}->[0]});
 like($first_token, qr/s:Autobiographische/, 'data');
-like($first_token, qr/_0#0-17/, 'data');
-like($first_token, qr!<>:base/s:s#0-30\$<i>2<b>2!, 'data');
-like($first_token, qr!<>:base\/s:t#0-35199\$<i>5226<b>0!, 'data');
+like($first_token, qr/_0\$<i>0<i>17/, 'data');
+like($first_token, qr!<>:base/s:s\$<b>64<i>0<i>30<i>2<b>2!, 'data');
+like($first_token, qr!<>:base\/s:t\$<b>64<i>0<i>35199<i>5226<b>0!, 'data');
 
 ## OpenNLP
 $tokens->add('OpenNLP', 'Sentences');
@@ -152,7 +148,7 @@
    'Foundries');
 is($output->{data}->{layerInfos}, 'base/s=spans opennlp/s=spans', 'layerInfos');
 $first_token = join('||', @{$output->{data}->{stream}->[0]});
-like($first_token, qr!<>:opennlp/s:s#0-254\$<i>32!, 'data');
+like($first_token, qr!<>:opennlp/s:s\$<b>64<i>0<i>254<i>32!, 'data');
 
 $tokens->add('OpenNLP', 'Morpho');
 $output = decode_json( $tokens->to_json );
@@ -171,19 +167,20 @@
    'Foundries');
 is($output->{data}->{layerInfos}, 'base/s=spans opennlp/p=tokens opennlp/s=spans tt/s=spans', 'layerInfos');
 $first_token = join('||', @{$output->{data}->{stream}->[0]});
-like($first_token, qr!<>:tt/s:s#0-179\$<i>21<b>2!, 'data');
+like($first_token, qr!<>:tt/s:s\$<b>64<i>0<i>179<i>21<b>0!, 'data');
 
 $tokens->add('TreeTagger', 'Morpho');
 $output = decode_json( $tokens->to_json );
 is($output->{data}->{foundries},
    'base base/paragraphs base/sentences opennlp opennlp/morpho opennlp/sentences treetagger treetagger/morpho treetagger/sentences',
    'Foundries');
+
 is($output->{data}->{layerInfos}, 'base/s=spans opennlp/p=tokens opennlp/s=spans tt/l=tokens tt/p=tokens tt/s=spans', 'layerInfos');
 $first_token = join('||', @{$output->{data}->{stream}->[0]});
-like($first_token, qr!tt/l:autobiographisch\$<b>165!, 'data');
-like($first_token, qr!tt/p:ADJA\$<b>165!, 'data');
-like($first_token, qr!tt/l:Autobiographische\$<b>89!, 'data');
-like($first_token, qr!tt/p:NN\$<b>89!, 'data');
+like($first_token, qr!tt/l:autobiographisch\$<b>129<b>165!, 'data');
+like($first_token, qr!tt/p:ADJA\$<b>129<b>165!, 'data');
+like($first_token, qr!tt/l:Autobiographische\$<b>129<b>89!, 'data');
+like($first_token, qr!tt/p:NN\$<b>129<b>89!, 'data');
 
 ## CoreNLP
 $tokens->add('CoreNLP', 'NamedEntities');
@@ -193,7 +190,7 @@
    'Foundries');
 is($output->{data}->{layerInfos}, 'base/s=spans corenlp/ne=tokens opennlp/p=tokens opennlp/s=spans tt/l=tokens tt/p=tokens tt/s=spans', 'layerInfos');
 
-diag "Missing test for NamedEntities";
+# diag "Missing test for NamedEntities";
 
 # Problematic:
 # diag Dumper $output->{data}->{stream}->[180];
@@ -206,7 +203,7 @@
    'Foundries');
 is($output->{data}->{layerInfos}, 'base/s=spans corenlp/ne=tokens corenlp/s=spans opennlp/p=tokens opennlp/s=spans tt/l=tokens tt/p=tokens tt/s=spans', 'layerInfos');
 $first_token = join('||', @{$output->{data}->{stream}->[0]});
-like($first_token, qr!<>:corenlp/s:s#0-254\$<i>32!, 'data');
+like($first_token, qr!<>:corenlp/s:s\$<b>64<i>0<i>254<i>32<b>0!, 'data');
 
 $tokens->add('CoreNLP', 'Morpho');
 $output = decode_json( $tokens->to_json );
@@ -220,16 +217,16 @@
 like($output->{data}->{foundries}, qr!corenlp/constituency!, 'Foundries');
 like($output->{data}->{layerInfos}, qr!corenlp/c=spans!, 'layerInfos');
 $first_token = join('||', @{$output->{data}->{stream}->[0]});
-like($first_token, qr!<>:corenlp/c:NP#0-17\$<i>1<b>6!, 'data');
-like($first_token, qr!<>:corenlp/c:CNP#0-17\$<i>1<b>7!, 'data');
-like($first_token, qr!<>:corenlp/c:NP#0-17\$<i>1<b>8!, 'data');
-like($first_token, qr!<>:corenlp/c:AP#0-17\$<i>1<b>9!, 'data');
-like($first_token, qr!<>:corenlp/c:PP#0-50\$<i>3<b>4!, 'data');
-like($first_token, qr!<>:corenlp/c:S#0-50\$<i>3<b>5!, 'data');
-like($first_token, qr!<>:corenlp/c:PP#0-58\$<i>5<b>2!, 'data');
-like($first_token, qr!<>:corenlp/c:S#0-58\$<i>5<b>3!, 'data');
-like($first_token, qr!<>:corenlp/c:ROOT#0-254\$<i>32<b>0!, 'data');
-like($first_token, qr!<>:corenlp/c:S#0-254\$<i>32<b>1!, 'data');
+like($first_token, qr!<>:corenlp/c:NP\$<b>64<i>0<i>17<i>1<b>6!, 'data');
+like($first_token, qr!<>:corenlp/c:CNP\$<b>64<i>0<i>17<i>1<b>7!, 'data');
+like($first_token, qr!<>:corenlp/c:NP\$<b>64<i>0<i>17<i>1<b>8!, 'data');
+like($first_token, qr!<>:corenlp/c:AP\$<b>64<i>0<i>17<i>1<b>9!, 'data');
+like($first_token, qr!<>:corenlp/c:PP\$<b>64<i>0<i>50<i>3<b>4!, 'data');
+like($first_token, qr!<>:corenlp/c:S\$<b>64<i>0<i>50<i>3<b>5!, 'data');
+like($first_token, qr!<>:corenlp/c:PP\$<b>64<i>0<i>58<i>5<b>2!, 'data');
+like($first_token, qr!<>:corenlp/c:S\$<b>64<i>0<i>58<i>5<b>3!, 'data');
+like($first_token, qr!<>:corenlp/c:ROOT\$<b>64<i>0<i>254<i>32<b>0!, 'data');
+like($first_token, qr!<>:corenlp/c:S\$<b>64<i>0<i>254<i>32<b>1!, 'data');
 
 ## Glemm
 $tokens->add('Glemm', 'Morpho');
@@ -249,7 +246,7 @@
 like($output->{data}->{foundries}, qr!connexor/sentences!, 'Foundries');
 like($output->{data}->{layerInfos}, qr!cnx/s=spans!, 'layerInfos');
 $first_token = join('||', @{$output->{data}->{stream}->[0]});
-like($first_token, qr!<>:cnx/s:s#0-179\$<i>21<b>0!, 'data');
+like($first_token, qr!<>:cnx/s:s\$<b>64<i>0<i>179<i>21<b>0!, 'data');
 
 $tokens->add('Connexor', 'Morpho');
 $output = decode_json( $tokens->to_json );
@@ -266,7 +263,7 @@
 like($output->{data}->{foundries}, qr!connexor/phrase!, 'Foundries');
 like($output->{data}->{layerInfos}, qr!cnx/c=spans!, 'layerInfos');
 $first_token = join('||', @{$output->{data}->{stream}->[0]});
-like($first_token, qr!<>:cnx/c:np#0-30\$<i>2!, 'data');
+like($first_token, qr!<>:cnx/c:np\$<b>64<i>0<i>30<i>2!, 'data');
 
 $tokens->add('Connexor', 'Syntax');
 $output = decode_json( $tokens->to_json );
@@ -289,8 +286,7 @@
 like($first_token, qr!mate/m:number:pl!, 'data');
 like($first_token, qr!mate/m:gender:\*!, 'data');
 
-
-diag "No test for mate dependency";
+# diag "No test for mate dependency";
 
 ## XIP
 $tokens->add('XIP', 'Sentences');
@@ -298,7 +294,7 @@
 like($output->{data}->{foundries}, qr!xip/sentences!, 'Foundries');
 like($output->{data}->{layerInfos}, qr!xip/s=spans!, 'layerInfos');
 $first_token = join('||', @{$output->{data}->{stream}->[0]});
-like($first_token, qr!<>:xip/s:s#0-179\$<i>21!, 'data');
+like($first_token, qr!<>:xip/s:s\$<b>64<i>0<i>179<i>21!, 'data');
 
 $tokens->add('XIP', 'Morpho');
 $output = decode_json( $tokens->to_json );
@@ -306,22 +302,19 @@
 like($output->{data}->{layerInfos}, qr!xip/l=tokens!, 'layerInfos');
 like($output->{data}->{layerInfos}, qr!xip/p=tokens!, 'layerInfos');
 $first_token = join('||', @{$output->{data}->{stream}->[0]});
-like($first_token, qr!<>:xip/s:s#0-179\$<i>21!, 'data');
-
+like($first_token, qr!<>:xip/s:s\$<b>64<i>0<i>179<i>21!, 'data');
 
 $tokens->add('XIP', 'Constituency');
 $output = decode_json( $tokens->to_json );
 like($output->{data}->{foundries}, qr!xip/constituency!, 'Foundries');
 like($output->{data}->{layerInfos}, qr!xip/c=spans!, 'layerInfos');
 $first_token = join('||', @{$output->{data}->{stream}->[0]});
-like($first_token, qr!<>:xip/c:NP#0-17\$<i>1<b>1!, 'data');
-like($first_token, qr!<>:xip/c:AP#0-17\$<i>1<b>2!, 'data');
-like($first_token, qr!<>:xip/c:ADJ#0-17\$<i>1<b>3!, 'data');
-like($first_token, qr!<>:xip/c:TOP#0-179\$<i>21<b>0!, 'data');
+like($first_token, qr!<>:xip/c:NP\$<b>64<i>0<i>17<i>1<b>1!, 'data');
+like($first_token, qr!<>:xip/c:AP\$<b>64<i>0<i>17<i>1<b>2!, 'data');
+like($first_token, qr!<>:xip/c:ADJ\$<b>64<i>0<i>17<i>1<b>3!, 'data');
+like($first_token, qr!<>:xip/c:TOP\$<b>64<i>0<i>179<i>21<b>0!, 'data');
 
-diag "No test for xip dependency";
-
-# diag Dumper $output->{data}->{stream}->[0];
+# diag "No test for xip dependency";
 
 # print timestr(timediff(Benchmark->new, $t));
 
diff --git a/t/real_goethe_benchmark.t b/t/real/real_goethe_benchmark.t
similarity index 100%
rename from t/real_goethe_benchmark.t
rename to t/real/real_goethe_benchmark.t
diff --git a/t/real_wdd.t b/t/real/wdd.t
similarity index 92%
rename from t/real_wdd.t
rename to t/real/wdd.t
index 944235d..4ed33d5 100644
--- a/t/real_wdd.t
+++ b/t/real/wdd.t
@@ -20,7 +20,7 @@
 use_ok('KorAP::Document');
 
 # GOE/AGA/03828
-my $path = catdir(dirname(__FILE__), 'WDD/G27/38989');
+my $path = catdir(dirname(__FILE__), '../corpus/WDD/G27/38989');
 
 ok(my $doc = KorAP::Document->new( path => $path . '/' ), 'Load Korap::Document');
 ok($doc->parse, 'Parse document');
@@ -32,7 +32,7 @@
 is($doc->title, 'Diskussion:Gunter A. Pilz', 'Title');
 ok(!$doc->sub_title, 'No SubTitle');
 is($doc->author, '€pa, u.a.', 'Author');
-is($doc->editor, 'wikipedia.org', 'Publisher');
+ok(!$doc->editor, 'Publisher');
 
 is($doc->pub_place, 'URL:http://de.wikipedia.org', 'PubPlace');
 is($doc->publisher, 'Wikipedia', 'Publisher');
@@ -81,7 +81,7 @@
 is(substr($output->{data}->{text}, 0, 100), '{{War Löschkandidat|6. Juli 2007|(erl., bleibt)}}', 'Primary Data');
 is($output->{data}->{name}, 'tokens', 'tokenName');
 is($output->{data}->{tokenSource}, 'opennlp#tokens', 'tokenSource');
-is($output->{version}, '0.02', 'version');
+is($output->{version}, '0.03', 'version');
 is($output->{data}->{foundries}, '', 'Foundries');
 is($output->{data}->{layerInfos}, '', 'layerInfos');
 is($output->{data}->{stream}->[0]->[3], 's:{War', 'data');
@@ -93,7 +93,7 @@
 is($output->{title}, 'Diskussion:Gunter A. Pilz', 'Title');
 ok(!$output->{subTitle}, 'No SubTitle');
 is($output->{author}, '€pa, u.a.', 'Author');
-is($output->{editor}, 'wikipedia.org', 'Publisher');
+ok(!$output->{editor}, 'Editor');
 
 is($output->{pubPlace}, 'URL:http://de.wikipedia.org', 'PubPlace');
 is($output->{publisher}, 'Wikipedia', 'Publisher');
@@ -132,7 +132,7 @@
 is($output->{data}->{layerInfos}, 'base/s=spans', 'layerInfos');
 my $first_token = join('||', @{$output->{data}->{stream}->[0]});
 like($first_token, qr/s:{War/, 'data');
-like($first_token, qr/_0#1-5/, 'data');
+like($first_token, qr/_0\$<i>1<i>5/, 'data');
 
 
 ## OpenNLP
@@ -152,6 +152,7 @@
    'Foundries');
 is($output->{data}->{layerInfos}, 'base/s=spans opennlp/p=tokens opennlp/s=spans', 'layerInfos');
 
+
 ## Treetagger
 $tokens->add('TreeTagger', 'Sentences');
 $output = decode_json( $tokens->to_json );
@@ -168,32 +169,48 @@
 is($output->{data}->{layerInfos}, 'base/s=spans opennlp/p=tokens opennlp/s=spans tt/l=tokens tt/p=tokens tt/s=spans', 'layerInfos');
 
 ## CoreNLP
-$tokens->add('CoreNLP', 'NamedEntities');
+{
+  local $SIG{__WARN__} = sub {};
+  $tokens->add('CoreNLP', 'NamedEntities');
+};
 $output = decode_json( $tokens->to_json );
 is($output->{data}->{foundries},
    'base base/paragraphs base/sentences opennlp opennlp/morpho opennlp/sentences treetagger treetagger/morpho treetagger/sentences',
    'Foundries');
 is($output->{data}->{layerInfos}, 'base/s=spans opennlp/p=tokens opennlp/s=spans tt/l=tokens tt/p=tokens tt/s=spans', 'layerInfos');
 
-$tokens->add('CoreNLP', 'Sentences');
+
+{
+  local $SIG{__WARN__} = sub {};
+  $tokens->add('CoreNLP', 'Sentences');
+};
 $output = decode_json( $tokens->to_json );
 is($output->{data}->{foundries},
    'base base/paragraphs base/sentences opennlp opennlp/morpho opennlp/sentences treetagger treetagger/morpho treetagger/sentences',
    'Foundries');
 is($output->{data}->{layerInfos}, 'base/s=spans opennlp/p=tokens opennlp/s=spans tt/l=tokens tt/p=tokens tt/s=spans', 'layerInfos');
 
-$tokens->add('CoreNLP', 'Morpho');
+{
+  local $SIG{__WARN__} = sub {};
+  $tokens->add('CoreNLP', 'Morpho');
+};
 $output = decode_json( $tokens->to_json );
 unlike($output->{data}->{foundries}, qr!corenlp/morpho!, 'Foundries');
 unlike($output->{data}->{layerInfos}, qr!corenlp/p=tokens!, 'layerInfos');
 
-$tokens->add('CoreNLP', 'Constituency');
+{
+  local $SIG{__WARN__} = sub {};
+  $tokens->add('CoreNLP', 'Constituency');
+};
 $output = decode_json( $tokens->to_json );
 unlike($output->{data}->{foundries}, qr!corenlp/constituency!, 'Foundries');
 unlike($output->{data}->{layerInfos}, qr!corenlp/c=spans!, 'layerInfos');
 
 ## Glemm
-$tokens->add('Glemm', 'Morpho');
+{
+  local $SIG{__WARN__} = sub {};
+  $tokens->add('Glemm', 'Morpho');
+};
 $output = decode_json( $tokens->to_json );
 unlike($output->{data}->{foundries}, qr!glemm/morpho!, 'Foundries');
 unlike($output->{data}->{layerInfos}, qr!glemm/l=tokens!, 'layerInfos');
@@ -229,7 +246,7 @@
 like($output->{data}->{layerInfos}, qr!mate/l=tokens!, 'layerInfos');
 like($output->{data}->{layerInfos}, qr!mate/m=tokens!, 'layerInfos');
 
-diag "No test for mate dependency";
+# diag "No test for mate dependency";
 
 ## XIP
 $tokens->add('XIP', 'Sentences');
@@ -243,14 +260,12 @@
 like($output->{data}->{layerInfos}, qr!xip/l=tokens!, 'layerInfos');
 like($output->{data}->{layerInfos}, qr!xip/p=tokens!, 'layerInfos');
 
-
 $tokens->add('XIP', 'Constituency');
 $output = decode_json( $tokens->to_json );
 like($output->{data}->{foundries}, qr!xip/constituency!, 'Foundries');
 like($output->{data}->{layerInfos}, qr!xip/c=spans!, 'layerInfos');
 
-diag "No test for xip dependency";
-
+# diag "No test for xip dependency";
 
 done_testing;
 __END__
diff --git a/t/real_goethe_corenlp_constituency.t b/t/real_goethe_corenlp_constituency.t
deleted file mode 100644
index 6dbe3ce..0000000
--- a/t/real_goethe_corenlp_constituency.t
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env perl
-# source ~/perl5/perlbrew/etc/bashrc
-# perlbrew switch perl-blead@korap
-use strict;
-use warnings;
-use Test::More;
-use Data::Dumper;
-use JSON::XS;
-
-use utf8;
-use lib 'lib', '../lib';
-
-use File::Basename 'dirname';
-use File::Spec::Functions 'catdir';
-
-use_ok('KorAP::Document');
-
-# GOE/AGA/03828
-my $path = catdir(dirname(__FILE__), 'GOE/AGA/03828');
-
-ok(my $doc = KorAP::Document->new( path => $path . '/' ), 'Load Korap::Document');
-ok($doc->parse, 'Parse document');
-
-# Tokenization
-use_ok('KorAP::Tokenizer');
-
-my ($token_base_foundry, $token_base_layer) = (qw/OpenNLP Tokens/);
-
-# Get tokenization
-my $tokens = KorAP::Tokenizer->new(
-  path => $doc->path,
-  doc => $doc,
-  foundry => $token_base_foundry,
-  layer => $token_base_layer,
-  name => 'tokens'
-);
-ok($tokens, 'Token Object is fine');
-ok($tokens->parse, 'Token parsing is fine');
-
-$tokens->add('CoreNLP', 'Constituency');
-my $output = decode_json( $tokens->to_json );
-is($output->{foundries}, 'corenlp corenlp/constituency', 'Foundries');
-is($output->{layerInfos}, 'corenlp/c=spans', 'layerInfos');
-my $first_token = join('||', @{$output->{data}->[0]});
-#like($first_token, qr!<>:xip/s:s#0-179\$<i>21!, 'data');
-
-diag Dumper $output->{data}->[0];
-diag Dumper $output->{data}->[3];
diff --git a/t/real_goethe_xip_constituency.t b/t/real_goethe_xip_constituency.t
deleted file mode 100644
index 78aea0e..0000000
--- a/t/real_goethe_xip_constituency.t
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env perl
-# source ~/perl5/perlbrew/etc/bashrc
-# perlbrew switch perl-blead@korap
-use strict;
-use warnings;
-use Test::More;
-use Data::Dumper;
-use JSON::XS;
-
-use utf8;
-use lib 'lib', '../lib';
-
-use File::Basename 'dirname';
-use File::Spec::Functions 'catdir';
-
-use_ok('KorAP::Document');
-
-# GOE/AGA/03828
-my $path = catdir(dirname(__FILE__), 'GOE/AGA/03828');
-
-ok(my $doc = KorAP::Document->new( path => $path . '/' ), 'Load Korap::Document');
-ok($doc->parse, 'Parse document');
-
-# Tokenization
-use_ok('KorAP::Tokenizer');
-
-my ($token_base_foundry, $token_base_layer) = (qw/OpenNLP Tokens/);
-
-# Get tokenization
-my $tokens = KorAP::Tokenizer->new(
-  path => $doc->path,
-  doc => $doc,
-  foundry => $token_base_foundry,
-  layer => $token_base_layer,
-  name => 'tokens'
-);
-ok($tokens, 'Token Object is fine');
-ok($tokens->parse, 'Token parsing is fine');
-
-$tokens->add('XIP', 'Constituency');
-my $output = decode_json( $tokens->to_json );
-is($output->{foundries}, 'xip xip/constituency', 'Foundries');
-is($output->{layerInfos}, 'xip/c=spans', 'layerInfos');
-my $first_token = join('||', @{$output->{data}->[0]});
-#like($first_token, qr!<>:xip/s:s#0-179\$<i>21!, 'data');
-
-diag Dumper $output->{data}->[0];
diff --git a/t/sort_tokens.t b/t/sort_tokens.t
index 3ecd5b0..011ab6d 100644
--- a/t/sort_tokens.t
+++ b/t/sort_tokens.t
@@ -44,7 +44,18 @@
 ok($mtt->add(term => '@:i=N',
 	     payload =>'<s>3'), 'Add token');
 
-is($mtt->to_string,'[(0-5)<>:b=N#0-5$<i>5|<>:f=N#0-5$<i>6<b>5<b>122|<>:e=ADJ#0-5$<i>6<b>6|<>:d=N#0-5$<i>6<b>7|@:i=N$<s>3|@:h=N$<s>5|@:j=N$<s>8|@:k=N$<s>9|a=N$<b>144|c=N$<b>144|g=N$<b>144]', 'Check string');
+is($mtt->to_string,
+   '[(0-5)<>:b=N$<i>0<i>5<i>5|'.
+     '<>:f=N$<i>0<i>5<i>6<b>5<b>122|'.
+       '<>:e=ADJ$<i>0<i>5<i>6<b>6|'.
+	 '<>:d=N$<i>0<i>5<i>6<b>7|'.
+	   '@:i=N$<s>3|'.
+	     '@:h=N$<s>5|'.
+	       '@:j=N$<s>8|'.
+		 '@:k=N$<s>9|'.
+		   'a=N$<b>144|'.
+		     'c=N$<b>144|'.
+		       'g=N$<b>144]', 'Check string');
 
 ok($mtt = KorAP::Field::MultiTermToken->new, 'New token');
 ok(defined $mtt->o_start(0), 'Set start character offset');
diff --git a/t/tokens.t b/t/tokens.t
index a640754..87fa584 100644
--- a/t/tokens.t
+++ b/t/tokens.t
@@ -25,7 +25,7 @@
 is($term->o_start, 34);
 is($term->o_end, 120);
 is($term->payload, '<i>56');
-is($term->to_string, 'Baum#34-120$<i>56<i>56');
+is($term->to_string, 'Baum$<i>34<i>120<i>56<i>56');
 
 ok($term = KorAP::Field::MultiTerm->new(
   term => 'Baum'
diff --git a/t/transform.t b/t/transform.t
index 6742e30..a0e7f74 100644
--- a/t/transform.t
+++ b/t/transform.t
@@ -58,7 +58,7 @@
 push(@layers, ['XIP', 'Sentences']);
 
 
-my $path = catdir(dirname(__FILE__), 'WPD/00001');
+my $path = catdir(dirname(__FILE__), 'corpus/WPD/00001');
 ok(my $doc = KorAP::Document->new( path => $path . '/' ), 'Load Korap::Document');
 like($doc->path, qr!$path/$!, 'Path');
 
@@ -81,10 +81,6 @@
 is($doc->text_class->[3], 'populaerwissenschaft', 'TextClass');
 ok(!$doc->text_class->[4], 'TextClass');
 is($doc->author, 'Ruru; Jens.Ol; Aglarech; u.a.', 'author');
-#is($doc->author->[0], 'Ruru', 'author');
-#is($doc->author->[1], 'Jens.Ol', 'author');
-#is($doc->author->[2], 'Aglarech', 'author');
-#ok(!$doc->author->[3], 'author');
 
 # Get tokens
 use_ok('KorAP::Tokenizer');
@@ -181,35 +177,10 @@
     'Startinfo');
 };
 
-done_testing;
-__END__
-
-
-#is($tokens->stream->pos(118)->to_string,
-#   '[(763-768)s:Linie|i:linie|_118#763-768|'.
-#     'mate/l:linie|mate/p:NN|mate/m:case:acc|mate/m:number:sg|mate/m:gender:fem|' .
-#     'opennlp/p:NN|'.
-#     'cnx/l:linie|cnx/p:N|cnx/syn:@NH|'.
-#     'tt/l:Linie|tt/p:NN|'.
-#     '<:mate/d:NK$<i>116|<:mate/d:NK$<i>117|>:mate/d:NK$<i>115|'.
-#     'xip/p:NOUN|xip/l:Linie|<>:xip/c:NOUN#763-768$<i>119|<:xip/d:DETERM$<i>116|<:xip/d:NMOD$<i>117]', 'with All');
-
-#[(763-768)s:Linie|i:linie|_118#763-768|mate/l:linie|mate/p:NN|mate/m:case:acc|mate/m:number:sg|mate/m:gender:fem|opennlp/p:NN|cnx/l:linie|cnx/p:N|cnx/syn:@NH|tt/l:Linie|tt/p:NN|<:mate/d:NK$<i>116|<:mate/d:NK$<i>117|>:mate/d:NK$<i>115|
-#      xip/p:NOUN|xip/l:Linie|<:xip/d:DETERM$<i>116|<:xip/d:NMOD$<i>117]
-
-is($tokens->layer_info, 'cnx/c=const cnx/l=lemma cnx/m=msd cnx/p=pos mate/d=dep mate/l=lemma mate/m=msd mate/p=pos opennlp/p=pos tt/l=lemma tt/p=pos xip/c=const xip/d=dep xip/l=lemma xip/p=pos', 'Layer info');
+is($tokens->layer_info,
+   'base/s=spans cnx/c=spans cnx/l=tokens cnx/m=tokens cnx/p=tokens cnx/s=spans cnx/syn=tokens corenlp/ne=tokens corenlp/s=spans mate/d=rels mate/l=tokens mate/m=tokens mate/p=tokens opennlp/p=tokens opennlp/s=spans tt/l=tokens tt/p=tokens tt/s=spans xip/c=spans xip/d=rels xip/l=tokens xip/p=tokens xip/s=spans', 'Layer info');
 
 is($tokens->support, 'base base/paragraphs base/sentences connexor connexor/morpho connexor/phrase connexor/sentences connexor/syntax corenlp corenlp/namedentities corenlp/namedentities corenlp/namedentities/ne_dewac_175m_600 corenlp/namedentities/ne_hgc_175m_600 corenlp/sentences mate mate/dependency mate/morpho opennlp opennlp/morpho opennlp/sentences treetagger treetagger/morpho treetagger/sentences xip xip/constituency xip/dependency xip/morpho xip/sentences', 'Support');
 
-
-
-
-# encode_json $tokens->stream->to_solr;
-
 done_testing;
-
-
-
-
-
 __END__
diff --git a/t/unique_ids.t b/t/unique_ids.t
deleted file mode 100644
index ac16422..0000000
--- a/t/unique_ids.t
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/env perl
-use strict;
-use warnings;
-use utf8;
-use Test::More;
-use Scalar::Util qw/weaken/;
-
-use_ok('KorAP::Document');
-
-use File::Basename 'dirname';
-use File::Spec::Functions 'catdir';
-
-my $path = catdir(dirname(__FILE__), 'GOE-2', 'AGX', '00002' );
-ok(my $doc = KorAP::Document->new( path => $path . '/' ), 'Load Korap::Document');
-like($doc->path, qr!$path/$!, 'Path');
-ok($doc->parse, 'Parse document');
-
-ok($doc->primary->data, 'Primary data in existence');
-is($doc->primary->data_length, 8888, 'Data length');
-
-use_ok('KorAP::Tokenizer');
-
-ok(my $tokens = KorAP::Tokenizer->new(
-  path => $doc->path,
-  doc => $doc,
-  foundry => 'Tree_Tagger',
-  layer => 'Tokens',
-  name => 'tokens'
-), 'New Tokenizer');
-
-ok($tokens->parse, 'Parse');
-
-ok($tokens->add('Struct', 'Structure'), 'Add Structure');
-
-
-done_testing;
-__END__
-
-
-sub new_tokenizer {
-  my $x = $doc;
-  weaken $x;
-  return KorAP::Tokenizer->new(
-    path => $x->path,
-    doc => $x,
-    foundry => 'DeReKo',
-    layer => 'Structure',
-    name => 'spans'
-  )
-};
-
-__END__