diff --git a/.gitignore b/.gitignore
index ae273b8..8ab84ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 sandbox
 Sandbox
 examples
+benchmark
 docs
 todo.org
 fixtures.txt
@@ -11,7 +12,6 @@
 MYMETA*
 Makefile
 pm_to_blib
-t/schreibgebrauch
 *.tar.gz
 *~
 *.sqlite
diff --git a/Changes b/Changes
index 033ccaa..4cf41ea 100644
--- a/Changes
+++ b/Changes
@@ -1,7 +1,9 @@
-0.04 2016-01-17
+0.04 2016-01-28
         - Added PTI to all payloads.
 	- Added support for empty elements.
 	- Added support for element attributes in struct.
+	- Added meta data support for Schreibgebrauch.
+	- Fixed test suite for meta data.
 
 0.03 2014-11-03
         - Added new metadata scheme.
diff --git a/D59-00089.json b/D59-00089.json
deleted file mode 100644
index 0fe3bfe..0000000
--- a/D59-00089.json
+++ /dev/null
@@ -1 +0,0 @@
-{"textType":"Zeitung: Tageszeitung","textColumn":"POLITIK","docSigle":"BZK_D59","reference":"Neues Deutschland, [Tageszeitung], 19.02.1959, Jg. 14, Berliner Ausgabe, S. 7. - Sachgebiet: Politik, Originalressort: POLITIK; Saragat-Partei zerfällt","pubPlace":"Berlin","textClass":"politik ausland","corpusTitle":"Bonner Zeitungskorpus","language":"de","version":"0.03","data":{"tokenSource":"opennlp#tokens","foundries":"base base/paragraphs base/sentences corenlp corenlp/constituency corenlp/morpho corenlp/namedentities corenlp/sentences glemm glemm/morpho mate mate/morpho opennlp opennlp/morpho opennlp/sentences treetagger treetagger/morpho treetagger/sentences","layerInfos":"base/s=spans corenlp/c=spans corenlp/ne=tokens corenlp/p=tokens corenlp/s=spans glemm/l=tokens mate/l=tokens mate/m=tokens mate/p=tokens opennlp/p=tokens opennlp/s=spans tt/l=tokens tt/p=tokens tt/s=spans","text":"Saragat-Partei zerfällt Rom (ADN) die von dem Rechtssozialisten Saragat geführte Sozialdemokratische Partei Italiens fällt immer mehr auseinander, nachdem vor einiger Zeit mehrere prominente Mitglieder ihren Austritt erklärt und unter dem Namen \"Einheitsbewegung der sozialistischen Initiative\" eine neue politische Gruppierung ins Leben gerufen hatten. Pressemeldungen zufolge haben sich in den letzten Tagen acht Provinzorganisationen der Sozialdemokratischen Partei der \"Einheitsbewegung\" angeschlossen. zu ihnen gehören die Organisation von Trient, Bozen und Triest. die Provinzorganisationen Treviso, Bergamo und Sondrio beschlossen mit überwältigender Mehrheit den Austritt aus der Saragat-Partei. von den 98 Jugendorganisationen der Sozialdemokratischen Partei haben sich inzwischen 90 der neuen \"Einheitsbewegung\" angeschlossen.","stream":[["-:base/paragraphs$<i>1","-:base/sentences$<i>7","-:corenlp/sentences$<i>5","-:opennlp/sentences$<i>5","-:tokens$<i>99","-:tt/sentences$<i>5","<>:base/s:s$<b>64<i>0<i>23<i>2<b>2","<>:corenlp/c:S$<b>64<i>0<i>29<i>3<b>2","<>:corenlp/c:ROOT$<b>64<i>0<i>353<i>43<b>0","<>:corenlp/s:s$<b>64<i>0<i>353<i>43<b>0","<>:opennlp/s:s$<b>64<i>0<i>353<i>43<b>0","<>:tt/s:s$<b>64<i>0<i>353<i>43<b>0","<>:corenlp/c:CS$<b>64<i>0<i>353<i>43<b>1","<>:base/s:t$<b>64<i>0<i>836<i>98<b>0","_0$<i>0<i>14","corenlp/p:NN","glemm/l:__Partei","glemm/l:__Saragat","i:saragat-partei","mate/l:saragat-partei","mate/m:case:nom","mate/m:gender:*","mate/m:number:sg","mate/p:NE","opennlp/p:NE","s:Saragat-Partei","tt/p:NE$<b>129<b>28","tt/p:NN$<b>129<b>215"],["<>:corenlp/c:NP-SB$<b>64<i>20<i>23<i>2<b>3","_1$<i>15<i>23","glemm/l:_+fallen","glemm/l:_+fällen","glemm/l:_+zer-","glemm/l:__zerfallen","i:zerfällt","mate/l:zerfallen","mate/m:mood:ind","mate/m:number:sg","mate/m:person:3","mate/m:tense:pres","mate/p:VVFIN","opennlp/p:VVFIN","s:zerfällt","tt/l:zerfallen$<b>129<b>255","tt/p:VVFIN$<b>129<b>255"],["<>:corenlp/c:NP-OA$<b>64<i>24<i>29<i>3<b>3","<>:corenlp/c:MPN$<b>64<i>24<i>29<i>3<b>4","<>:base/s:s$<b>64<i>24<i>33<i>4<b>2","_2$<i>24<i>27","corenlp/ne:I-LOC","corenlp/p:NE","glemm/l:__Rom","i:rom","mate/l:rom","mate/m:case:acc","mate/m:gender:*","mate/m:number:sg","mate/p:NE","opennlp/p:NE","s:Rom","tt/l:Rom$<b>129<b>255","tt/p:NE$<b>129<b>255"],["<>:corenlp/c:NP-OA$<b>64<i>29<i>33<i>4<b>3","<>:corenlp/c:MPN$<b>64<i>29<i>33<i>4<b>4","<>:corenlp/c:S$<b>64<i>29<i>118<i>13<b>2","_3$<i>29<i>32","corenlp/ne:I-ORG","corenlp/p:NE","glemm/l:__ADN","glemm/l:__Adn","i:adn","mate/l:adn","mate/p:NE","opennlp/p:NE","s:ADN","tt/l:ADN$<b>129<b>255","tt/p:NE$<b>129<b>255"],["<>:corenlp/c:NP-SB$<b>64<i>34<i>116<i>13<b>3","<>:base/s:s$<b>64<i>34<i>353<i>43<b>2","<>:base/s:p$<b>64<i>34<i>836<i>98<b>1","_4$<i>34<i>37","corenlp/p:ART","glemm/l:__d-","i:die","mate/l:der","mate/m:case:acc","mate/m:gender:fem","mate/m:number:pl","mate/p:ART","opennlp/p:ART","s:die","tt/l:die$<b>129<b>123","tt/l:die$<b>129<b>107","tt/l:die$<b>129<b>23","tt/p:ART$<b>129<b>107","tt/p:PDS$<b>129<b>23","tt/p:PRELS$<b>129<b>123"],["<>:corenlp/c:PP$<b>64<i>38<i>75<i>9<b>5","<>:corenlp/c:AP$<b>64<i>38<i>80<i>10<b>4","_5$<i>38<i>41","corenlp/p:APPR","glemm/l:__von","i:von","mate/l:von","mate/p:APPR","opennlp/p:APPR","s:von","tt/l:von$<b>129<b>254","tt/p:APPR$<b>129<b>254"],["_6$<i>42<i>45","corenlp/p:ART","glemm/l:__d-","i:dem","mate/l:der","mate/m:case:dat","mate/m:gender:neut","mate/m:number:sg","mate/p:ART","opennlp/p:ART","s:dem","tt/l:die$<b>129<b>254","tt/p:ART$<b>129<b>254"],["_7$<i>46<i>63","corenlp/p:NN","glemm/l:++-ist","glemm/l:++sozial","glemm/l:+_Recht","glemm/l:+_Sozialist","glemm/l:+_rechts","glemm/l:__Rechtssozialist","i:rechtssozialisten","mate/l:rechtssozialist","mate/m:case:dat","mate/m:degree:sup","mate/m:gender:neut","mate/m:number:sg","mate/p:NN","opennlp/p:NN","s:Rechtssozialisten","tt/p:ADJA$<b>129<b>37","tt/p:NN$<b>129<b>210"],["<>:corenlp/c:MPN$<b>64<i>64<i>75<i>9<b>6","_8$<i>64<i>71","corenlp/p:NE","glemm/l:__Saragat","i:saragat","mate/l:saragat","mate/m:case:nom","mate/m:gender:*","mate/m:number:sg","mate/p:NE","opennlp/p:NE","s:Saragat","tt/p:NE$<b>129<b>213","tt/p:NN$<b>129<b>41"],["_9$<i>72<i>80","glemm/l:_+führen","glemm/l:__geführt","i:geführte","mate/l:geführt","mate/m:case:acc","mate/m:degree:pos","mate/m:gender:fem","mate/m:number:sg","mate/p:ADJA","opennlp/p:ADJA","s:geführte","tt/l:geführt$<b>129<b>255","tt/p:ADJA$<b>129<b>255"],["_10$<i>81<i>100","corenlp/ne:I-MISC","corenlp/p:ADJA","glemm/l:++Demokrat","glemm/l:+_demokratisch","glemm/l:+_sozial","glemm/l:_+-isch","glemm/l:_+Sozialdemokrat","glemm/l:__sozialdemokratisch","i:sozialdemokratische","mate/l:sozialdemokratisch","mate/m:case:acc","mate/m:degree:pos","mate/m:gender:fem","mate/m:number:sg","mate/p:ADJA","opennlp/p:ADJA","s:Sozialdemokratische","tt/l:Sozialdemokratische$<b>129<b>56","tt/l:sozialdemokratisch$<b>129<b>198","tt/p:ADJA$<b>129<b>198","tt/p:NN$<b>129<b>56"],["_11$<i>101<i>107","corenlp/p:NN","glemm/l:__Partei","i:partei","mate/l:partei","mate/m:case:acc","mate/m:gender:fem","mate/m:number:sg","mate/p:NN","opennlp/p:NN","s:Partei","tt/l:Partei$<b>129<b>255","tt/p:NN$<b>129<b>255"],["_12$<i>108<i>116","corenlp/ne:I-LOC","corenlp/p:NE","glemm/l:__Italien","i:italiens","mate/l:italien","mate/m:case:gen","mate/m:gender:neut","mate/m:number:sg","mate/p:NE","opennlp/p:NE","s:Italiens","tt/l:Italien$<b>129<b>255","tt/p:NE$<b>129<b>255"],["<>:corenlp/c:S$<b>64<i>119<i>224<i>27<b>2","_13$<i>117<i>122","glemm/l:__fallen","glemm/l:__fällen","i:fällt","mate/l:fallen","mate/m:mood:ind","mate/m:number:sg","mate/m:person:3","mate/m:tense:pres","mate/p:VVFIN","opennlp/p:VVFIN","s:fällt","tt/l:fallen|fällen$<b>129<b>255","tt/p:VVFIN$<b>129<b>255"],["<>:corenlp/c:AVP$<b>64<i>123<i>133<i>16<b>3","_14$<i>123<i>128","corenlp/p:ADV","glemm/l:__immer","i:immer","mate/l:immer","mate/p:ADV","opennlp/p:ADV","s:immer","tt/l:immer$<b>129<b>255","tt/p:ADV$<b>129<b>255"],["_15$<i>129<i>133","corenlp/p:PIAT","glemm/l:__mehr","i:mehr","mate/l:mehr","mate/p:PIS","opennlp/p:PIAT","s:mehr","tt/l:mehr$<b>129<b>211","tt/l:mehr$<b>129<b>34","tt/p:ADV$<b>129<b>211","tt/p:PIAT$<b>129<b>34"],["_16$<i>134<i>145","corenlp/p:PTKVZ","glemm/l:__auseinander","i:auseinander","mate/l:auseinander","mate/p:PTKVZ","opennlp/p:PTKVZ","s:auseinander","tt/l:auseinander$<b>129<b>249","tt/p:PTKVZ$<b>129<b>249"],["<>:corenlp/c:S$<b>64<i>147<i>224<i>27<b>3","_17$<i>147<i>154","corenlp/p:KOUS","glemm/l:__nachdem","i:nachdem","mate/l:nachdem","mate/p:KOUS","opennlp/p:KOUS","s:nachdem","tt/l:nachdem$<b>129<b>255","tt/p:KOUS$<b>129<b>255"],["<>:corenlp/c:PP$<b>64<i>155<i>171<i>21<b>4","_18$<i>155<i>158","corenlp/p:APPR","glemm/l:__vor","i:vor","mate/l:vor","mate/p:APPR","opennlp/p:APPR","s:vor","tt/l:vor$<b>129<b>246","tt/p:APPR$<b>129<b>246"],["_19$<i>159<i>166","corenlp/p:PIAT","glemm/l:__einig","glemm/l:__einig-","i:einiger","mate/l:einiger","mate/m:case:dat","mate/m:gender:fem","mate/m:number:sg","mate/p:PIAT","opennlp/p:PIAT","s:einiger","tt/l:einige$<b>129<b>254","tt/p:PIAT$<b>129<b>254"],["_20$<i>167<i>171","corenlp/p:NN","glemm/l:__Zeit","glemm/l:__zeit","i:zeit","mate/l:zeit","mate/m:case:dat","mate/m:gender:fem","mate/m:number:sg","mate/p:NN","opennlp/p:NN","s:Zeit","tt/l:Zeit$<b>129<b>254","tt/p:NN$<b>129<b>254"],["<>:corenlp/c:NP-OA$<b>64<i>172<i>216<i>26<b>4","_21$<i>172<i>179","corenlp/p:PIAT","glemm/l:__mehrer-","i:mehrere","mate/l:mehrere","mate/m:case:acc","mate/m:gender:masc","mate/m:number:pl","mate/p:PIAT","opennlp/p:PIAT","s:mehrere","tt/l:mehrere$<b>129<b>254","tt/p:PIAT$<b>129<b>254"],["_22$<i>180<i>190","corenlp/p:ADJA","glemm/l:__prominent","i:prominente","mate/l:prominent","mate/m:case:acc","mate/m:degree:pos","mate/m:gender:masc","mate/m:number:pl","mate/p:ADJA","opennlp/p:ADJA","s:prominente","tt/l:prominent$<b>129<b>255","tt/p:ADJA$<b>129<b>255"],["_23$<i>191<i>201","corenlp/p:NN","glemm/l:_+Glied","glemm/l:_+mit-","glemm/l:__Mitglied","i:mitglieder","mate/l:mitglied","mate/m:case:acc","mate/m:gender:neut","mate/m:number:pl","mate/p:NN","opennlp/p:NN","s:Mitglieder","tt/l:Mitglied$<b>129<b>255","tt/p:NN$<b>129<b>255"],["<>:corenlp/c:NP$<b>64<i>202<i>216<i>26<b>5","_24$<i>202<i>207","corenlp/p:PPOSAT","glemm/l:__ihr","glemm/l:__ihr-","i:ihren","mate/l:ihr","mate/m:case:acc","mate/m:gender:masc","mate/m:number:sg","mate/p:PPOSAT","opennlp/p:PPOSAT","s:ihren","tt/l:ihr$<b>129<b>254","tt/p:PPOSAT$<b>129<b>254"],["_25$<i>208<i>216","corenlp/p:NN","glemm/l:_+Tritt","glemm/l:_+aus-","glemm/l:__Austritt","i:austritt","mate/l:austritt","mate/m:case:acc","mate/m:gender:masc","mate/m:number:sg","mate/p:NN","opennlp/p:NN","s:Austritt","tt/l:Austritt$<b>129<b>255","tt/p:NN$<b>129<b>255"],["_26$<i>217<i>224","glemm/l:__erklären","i:erklärt","mate/l:erklären","mate/p:VVPP","opennlp/p:VVFIN","s:erklärt","tt/l:erklären$<b>129<b>189","tt/l:erklären$<b>129<b>65","tt/p:VVFIN$<b>129<b>65","tt/p:VVPP$<b>129<b>189"],["_27$<i>225<i>228","corenlp/p:KON","glemm/l:__und","i:und","mate/l:und","mate/p:KON","opennlp/p:KON","s:und","tt/l:und$<b>129<b>255","tt/p:KON$<b>129<b>255"],["<>:corenlp/c:PP$<b>64<i>229<i>293<i>34<b>3","<>:corenlp/c:S$<b>64<i>229<i>352<i>43<b>2","_28$<i>229<i>234","corenlp/p:APPR","glemm/l:__unter","i:unter","mate/l:unter","mate/p:APPR","opennlp/p:APPR","s:unter","tt/l:unter$<b>129<b>254","tt/p:APPR$<b>129<b>254"],["_29$<i>235<i>238","corenlp/p:ART","glemm/l:__d-","i:dem","mate/l:der","mate/m:case:dat","mate/m:gender:masc","mate/m:number:sg","mate/p:ART","opennlp/p:ART","s:dem","tt/l:die$<b>129<b>254","tt/p:ART$<b>129<b>254"],["_30$<i>239<i>244","corenlp/p:NN","glemm/l:__Name","i:namen","mate/l:name","mate/m:case:dat","mate/m:gender:masc","mate/m:number:sg","mate/p:NN","opennlp/p:NN","s:Namen","tt/l:Name$<b>129<b>255","tt/p:NN$<b>129<b>255"],["<>:corenlp/c:NP$<b>64<i>245<i>293<i>34<b>4","_31$<i>245<i>262","glemm/l:++-ung","glemm/l:++bewegen","glemm/l:+_Bewegung","glemm/l:+_Einheit","glemm/l:__Einheitsbewegung","i:\"einheitsbewegung","mate/l:\"einheitsbewegung","mate/m:case:nom","mate/m:gender:fem","mate/m:number:sg","mate/p:NN","opennlp/p:NN","s:\"Einheitsbewegung"],["<>:corenlp/c:NP$<b>64<i>263<i>293<i>34<b>5","_32$<i>263<i>266","corenlp/p:ART","glemm/l:__d-","i:der","mate/l:der","mate/m:case:gen","mate/m:gender:fem","mate/m:number:sg","mate/p:ART","opennlp/p:ART","s:der","tt/l:die$<b>129<b>254","tt/p:ART$<b>129<b>254"],["_33$<i>267<i>282","corenlp/p:ADJA","glemm/l:_+-al","glemm/l:_+-isch","glemm/l:_+-ist","glemm/l:_+Sozi","glemm/l:_+Sozialist","glemm/l:_+sozial","glemm/l:__sozialistisch","i:sozialistischen","mate/l:sozialistisch","mate/m:case:gen","mate/m:degree:pos","mate/m:gender:fem","mate/m:number:sg","mate/p:ADJA","opennlp/p:ADJA","s:sozialistischen","tt/l:sozialistisch$<b>129<b>255","tt/p:ADJA$<b>129<b>255"],["_34$<i>283<i>294","glemm/l:__Initiative","glemm/l:__initiativ","i:initiative\"","mate/l:initiative\"","mate/m:case:gen","mate/m:gender:fem","mate/m:number:sg","mate/p:NN","opennlp/p:NN","s:Initiative\""],["<>:corenlp/c:NP-SB$<b>64<i>295<i>327<i>39<b>4","<>:corenlp/c:S-SB$<b>64<i>295<i>352<i>43<b>3","_35$<i>295<i>299","corenlp/p:ART","glemm/l:__ein","glemm/l:__eine","glemm/l:__einen","i:eine","mate/l:ein","mate/m:case:acc","mate/m:gender:fem","mate/m:number:sg","mate/p:ART","opennlp/p:ART","s:eine","tt/l:eine$<b>129<b>253","tt/p:ART$<b>129<b>253"],["_36$<i>300<i>304","corenlp/p:ADJA","glemm/l:__neu","i:neue","mate/l:neu","mate/m:case:acc","mate/m:degree:pos","mate/m:gender:fem","mate/m:number:sg","mate/p:ADJA","opennlp/p:ADJA","s:neue","tt/l:neu$<b>129<b>255","tt/p:ADJA$<b>129<b>255"],["_37$<i>305<i>315","corenlp/p:ADJA","glemm/l:__Politi","glemm/l:__politisch","glemm/l:__sch","i:politische","mate/l:politisch","mate/m:case:acc","mate/m:degree:pos","mate/m:gender:fem","mate/m:number:sg","mate/p:ADJA","opennlp/p:ADJA","s:politische","tt/l:politisch$<b>129<b>255","tt/p:ADJA$<b>129<b>255"],["_38$<i>316<i>327","corenlp/p:NN","glemm/l:_+-ung","glemm/l:_+gruppieren","glemm/l:__Gruppierung","i:gruppierung","mate/l:gruppierung","mate/m:case:acc","mate/m:gender:fem","mate/m:number:sg","mate/p:NN","opennlp/p:NN","s:Gruppierung","tt/l:Gruppierung$<b>129<b>255","tt/p:NN$<b>129<b>255"],["<>:corenlp/c:PP$<b>64<i>328<i>337<i>41<b>5","<>:corenlp/c:VP$<b>64<i>328<i>345<i>42<b>4","_39$<i>328<i>331","corenlp/p:APPRART","glemm/l:__in","i:ins","mate/l:in","mate/m:case:acc","mate/m:gender:neut","mate/m:number:sg","mate/p:APPRART","opennlp/p:APPRART","s:ins","tt/l:ins$<b>129<b>255","tt/p:APPRART$<b>129<b>255"],["_40$<i>332<i>337","corenlp/p:NN","glemm/l:__Leben","glemm/l:__leben","i:leben","mate/l:leben","mate/m:case:acc","mate/m:gender:neut","mate/m:number:sg","mate/p:NN","opennlp/p:NN","s:Leben","tt/l:Leben$<b>129<b>255","tt/p:NN$<b>129<b>255"],["_41$<i>338<i>345","corenlp/p:VVPP","glemm/l:_+ge-","glemm/l:__rufen","i:gerufen","mate/l:rufen","mate/p:VVPP","opennlp/p:VVPP","s:gerufen","tt/l:rufen$<b>129<b>255","tt/p:VVPP$<b>129<b>255"],["_42$<i>346<i>352","corenlp/p:VAFIN","glemm/l:__haben","i:hatten","mate/l:haben","mate/m:mood:ind","mate/m:number:pl","mate/m:person:3","mate/m:tense:past","mate/p:VAFIN","opennlp/p:VAFIN","s:hatten","tt/l:haben$<b>129<b>255","tt/p:VAFIN$<b>129<b>255"],["<>:corenlp/c:PP$<b>64<i>354<i>377<i>45<b>2","<>:corenlp/c:ROOT$<b>64<i>354<i>506<i>59<b>0","<>:corenlp/s:s$<b>64<i>354<i>506<i>59<b>0","<>:tt/s:s$<b>64<i>354<i>506<i>59<b>0","<>:opennlp/s:s$<b>64<i>354<i>506<i>59<b>0","<>:corenlp/c:S$<b>64<i>354<i>506<i>59<b>1","<>:base/s:s$<b>64<i>354<i>506<i>59<b>2","_43$<i>354<i>369","corenlp/p:NN","glemm/l:++-ung","glemm/l:++melden","glemm/l:+_Meldung","glemm/l:+_Presse","glemm/l:__Pressemeldung","i:pressemeldungen","mate/l:pressemeldung","mate/m:case:dat","mate/m:gender:fem","mate/m:number:pl","mate/p:NN","opennlp/p:NN","s:Pressemeldungen","tt/l:Pressemeldung$<b>129<b>255","tt/p:NN$<b>129<b>255"],["_44$<i>370<i>377","corenlp/p:APPO","glemm/l:__zufolge","i:zufolge","mate/l:zufolge","mate/p:APPO","opennlp/p:APPO","s:zufolge","tt/l:zufolge$<b>129<b>254","tt/p:APPO$<b>129<b>254"],["_45$<i>378<i>383","corenlp/p:VAFIN","glemm/l:__haben","i:haben","mate/l:haben","mate/m:mood:ind","mate/m:number:pl","mate/m:person:3","mate/m:tense:pres","mate/p:VAFIN","opennlp/p:VAFIN","s:haben","tt/l:haben$<b>129<b>222","tt/l:haben$<b>129<b>32","tt/p:VAFIN$<b>129<b>222","tt/p:VAINF$<b>129<b>32"],["_46$<i>384<i>388","corenlp/p:PRF","glemm/l:__er/sie/es/sie","i:sich","mate/l:sich","mate/m:case:acc","mate/m:number:pl","mate/m:person:3","mate/p:PRF","opennlp/p:PRF","s:sich","tt/l:er|es|sie$<b>129<b>255","tt/p:PRF$<b>129<b>255"],["<>:corenlp/c:PP$<b>64<i>389<i>436<i>53<b>2","_47$<i>389<i>391","corenlp/p:APPR","glemm/l:__in","i:in","mate/l:in","mate/p:APPR","opennlp/p:APPR","s:in","tt/l:in$<b>129<b>255","tt/p:APPR$<b>129<b>255"],["_48$<i>392<i>395","corenlp/p:ART","glemm/l:__d-","i:den","mate/l:der","mate/m:case:dat","mate/m:gender:neut","mate/m:number:pl","mate/p:ART","opennlp/p:ART","s:den","tt/l:die$<b>129<b>254","tt/p:ART$<b>129<b>254"],["_49$<i>396<i>403","corenlp/p:ADJA","glemm/l:__letzt-","i:letzten","mate/l:letzter","mate/m:case:dat","mate/m:degree:pos","mate/m:gender:neut","mate/m:number:pl","mate/p:ADJA","opennlp/p:ADJA","s:letzten","tt/l:letzt$<b>129<b>255","tt/p:ADJA$<b>129<b>255"],["_50$<i>404<i>409","corenlp/p:NN","glemm/l:__Tag","glemm/l:__tagen","i:tagen","mate/l:tag","mate/m:case:dat","mate/m:gender:neut","mate/m:number:pl","mate/p:NN","opennlp/p:NN","s:Tagen","tt/l:Tag$<b>129<b>255","tt/p:NN$<b>129<b>255"],["<>:corenlp/c:NP$<b>64<i>410<i>436<i>53<b>3","_51$<i>410<i>414","corenlp/p:CARD","glemm/l:__acht","i:acht","mate/l:acht","mate/p:CARD","opennlp/p:CARD","s:acht","tt/l:acht$<b>129<b>254","tt/p:CARD$<b>129<b>254"],["_52$<i>415<i>436","corenlp/p:NN","glemm/l:+_Organisation","glemm/l:+_Provinz","glemm/l:__Provinzorganisation","i:provinzorganisationen","mate/l:provinzorganisation","mate/m:case:acc","mate/m:gender:fem","mate/m:number:pl","mate/p:NN","opennlp/p:NN","s:Provinzorganisationen","tt/p:NN$<b>129<b>254"],["<>:corenlp/c:NP-SB$<b>64<i>437<i>491<i>58<b>2","_53$<i>437<i>440","corenlp/p:ART","glemm/l:__d-","i:der","mate/l:der","mate/m:case:gen","mate/m:gender:fem","mate/m:number:sg","mate/p:ART","opennlp/p:ART","s:der","tt/l:die$<b>129<b>254","tt/p:ART$<b>129<b>254"],["_54$<i>441<i>461","corenlp/ne:I-MISC","corenlp/p:ADJA","glemm/l:++Demokrat","glemm/l:+_demokratisch","glemm/l:+_sozial","glemm/l:_+-isch","glemm/l:_+Sozialdemokrat","glemm/l:__sozialdemokratisch","i:sozialdemokratischen","mate/l:sozialdemokratisch","mate/m:case:gen","mate/m:degree:pos","mate/m:gender:fem","mate/m:number:sg","mate/p:ADJA","opennlp/p:ADJA","s:Sozialdemokratischen","tt/l:sozialdemokratisch$<b>129<b>245","tt/p:ADJA$<b>129<b>245"],["_55$<i>462<i>468","corenlp/p:NN","glemm/l:__Partei","i:partei","mate/l:partei","mate/m:case:gen","mate/m:gender:fem","mate/m:number:sg","mate/p:NN","opennlp/p:NN","s:Partei","tt/l:Partei$<b>129<b>255","tt/p:NN$<b>129<b>255"],["<>:corenlp/c:NP$<b>64<i>469<i>491<i>58<b>3","_56$<i>469<i>472","corenlp/p:ART","glemm/l:__d-","i:der","mate/l:der","mate/m:case:gen","mate/m:gender:fem","mate/m:number:sg","mate/p:ART","opennlp/p:ART","s:der","tt/l:die$<b>129<b>253","tt/p:ART$<b>129<b>253"],["_57$<i>473<i>491","glemm/l:++-ung","glemm/l:++bewegen","glemm/l:+_Bewegung","glemm/l:+_Einheit","glemm/l:__Einheitsbewegung","i:\"einheitsbewegung\"","mate/l:\"einheitsbewegung\"","mate/m:case:gen","mate/m:gender:fem","mate/m:number:sg","mate/p:NN","opennlp/p:NN","s:\"Einheitsbewegung\""],["<>:corenlp/c:VP$<b>64<i>492<i>505<i>59<b>2","_58$<i>492<i>505","corenlp/p:VVPP","glemm/l:_+an-","glemm/l:_+geschlossen","glemm/l:_+schliessen","glemm/l:__angeschlossen","glemm/l:__anschliessen","i:angeschlossen","mate/l:anschließen","mate/p:VVPP","opennlp/p:VVPP","s:angeschlossen","tt/l:anschließen$<b>129<b>255","tt/p:VVPP$<b>129<b>255"],["<>:corenlp/c:PP$<b>64<i>507<i>519<i>61<b>2","<>:corenlp/c:ROOT$<b>64<i>507<i>570<i>69<b>0","<>:corenlp/s:s$<b>64<i>507<i>570<i>69<b>0","<>:tt/s:s$<b>64<i>507<i>570<i>69<b>0","<>:opennlp/s:s$<b>64<i>507<i>570<i>69<b>0","<>:corenlp/c:S$<b>64<i>507<i>570<i>69<b>1","<>:base/s:s$<b>64<i>507<i>570<i>69<b>2","_59$<i>507<i>509","corenlp/p:APPR","glemm/l:__zu","i:zu","mate/l:zu","mate/p:APPR","opennlp/p:APPR","s:zu","tt/l:zu$<b>129<b>141","tt/l:zu$<b>129<b>108","tt/p:APPR$<b>129<b>141","tt/p:PTKA$<b>129<b>108"],["_60$<i>510<i>515","corenlp/p:PPER","glemm/l:__sie","i:ihnen","mate/l:ihnen","mate/m:case:dat","mate/m:gender:*","mate/m:number:pl","mate/m:person:3","mate/p:PPER","opennlp/p:PPER","s:ihnen","tt/l:sie$<b>129<b>255","tt/p:PPER$<b>129<b>255"],["_61$<i>516<i>523","glemm/l:_+ge-","glemm/l:_+hören","glemm/l:__gehören","i:gehören","mate/l:gehören","mate/m:mood:ind","mate/m:number:pl","mate/m:person:3","mate/m:tense:pres","mate/p:VVFIN","opennlp/p:VVFIN","s:gehören","tt/l:gehören$<b>129<b>252","tt/p:VVFIN$<b>129<b>252"],["<>:corenlp/c:NP-SB$<b>64<i>524<i>540<i>64<b>2","_62$<i>524<i>527","corenlp/p:ART","glemm/l:__d-","i:die","mate/l:der","mate/m:case:acc","mate/m:gender:fem","mate/m:number:sg","mate/p:ART","opennlp/p:ART","s:die","tt/l:die$<b>129<b>254","tt/p:ART$<b>129<b>254"],["_63$<i>528<i>540","corenlp/p:NN","glemm/l:__Organisation","i:organisation","mate/l:organisation","mate/m:case:acc","mate/m:gender:fem","mate/m:number:sg","mate/p:NN","opennlp/p:NN","s:Organisation","tt/l:Organisation$<b>129<b>255","tt/p:NN$<b>129<b>255"],["<>:corenlp/c:PP$<b>64<i>541<i>569<i>69<b>2","_64$<i>541<i>544","corenlp/p:APPR","glemm/l:__von","i:von","mate/l:von","mate/p:APPR","opennlp/p:APPR","s:von","tt/l:von$<b>129<b>254","tt/p:APPR$<b>129<b>254"],["<>:corenlp/c:CNP$<b>64<i>545<i>569<i>69<b>3","_65$<i>545<i>551","corenlp/ne:I-LOC","corenlp/p:NE","glemm/l:__Trient","i:trient","mate/l:trient","mate/m:case:dat","mate/m:gender:neut","mate/m:number:sg","mate/p:NE","opennlp/p:NN","s:Trient","tt/l:Trient$<b>129<b>255","tt/p:NE$<b>129<b>255"],["_66$<i>553<i>558","corenlp/ne:I-LOC","corenlp/p:NE","glemm/l:__Bozen","i:bozen","mate/l:bozen","mate/m:case:dat","mate/m:gender:neut","mate/m:number:sg","mate/p:NN","opennlp/p:NN","s:Bozen","tt/l:Bozen$<b>129<b>255","tt/p:NE$<b>129<b>255"],["_67$<i>559<i>562","corenlp/p:KON","glemm/l:__und","i:und","mate/l:und","mate/p:KON","opennlp/p:KON","s:und","tt/l:und$<b>129<b>255","tt/p:KON$<b>129<b>255"],["_68$<i>563<i>569","corenlp/ne:I-LOC","corenlp/p:NE","glemm/l:__Triest","i:triest","mate/l:triest","mate/m:case:dat","mate/m:gender:neut","mate/m:number:sg","mate/p:NN","opennlp/p:NN","s:Triest","tt/l:Triest$<b>129<b>255","tt/p:NE$<b>129<b>255"],["<>:corenlp/c:NP-SB$<b>64<i>571<i>625<i>75<b>2","<>:corenlp/c:ROOT$<b>64<i>571<i>703<i>84<b>0","<>:corenlp/s:s$<b>64<i>571<i>703<i>84<b>0","<>:tt/s:s$<b>64<i>571<i>703<i>84<b>0","<>:opennlp/s:s$<b>64<i>571<i>703<i>84<b>0","<>:corenlp/c:S$<b>64<i>571<i>703<i>84<b>1","<>:base/s:s$<b>64<i>571<i>703<i>84<b>2","_69$<i>571<i>574","corenlp/p:ART","glemm/l:__d-","i:die","mate/l:der","mate/m:case:acc","mate/m:gender:fem","mate/m:number:pl","mate/p:ART","opennlp/p:ART","s:die","tt/l:die$<b>129<b>254","tt/p:ART$<b>129<b>254"],["_70$<i>575<i>596","corenlp/p:NN","glemm/l:+_Organisation","glemm/l:+_Provinz","glemm/l:__Provinzorganisation","i:provinzorganisationen","mate/l:provinzorganisation","mate/m:case:acc","mate/m:gender:fem","mate/m:number:pl","mate/p:NN","opennlp/p:NN","s:Provinzorganisationen","tt/p:NN$<b>129<b>254"],["<>:corenlp/c:CNP$<b>64<i>597<i>625<i>75<b>3","_71$<i>597<i>604","corenlp/ne:I-ORG","corenlp/p:NE","glemm/l:__Treviso","i:treviso","mate/l:treviso","mate/m:case:nom","mate/m:gender:masc","mate/m:number:sg","mate/p:NE","opennlp/p:NE","s:Treviso","tt/l:Treviso$<b>129<b>255","tt/p:NE$<b>129<b>255"],["_72$<i>606<i>613","corenlp/ne:I-LOC","corenlp/p:NE","glemm/l:__Bergamo","i:bergamo","mate/l:bergamo","mate/m:case:nom","mate/m:gender:masc","mate/m:number:sg","mate/p:NE","opennlp/p:NE","s:Bergamo","tt/l:Bergamo$<b>129<b>255","tt/p:NE$<b>129<b>255"],["_73$<i>614<i>617","corenlp/p:KON","glemm/l:__und","i:und","mate/l:und","mate/p:KON","opennlp/p:KON","s:und","tt/l:und$<b>129<b>255","tt/p:KON$<b>129<b>255"],["_74$<i>618<i>625","corenlp/ne:I-LOC","corenlp/p:NE","i:sondrio","mate/l:sondrio","mate/m:case:nom","mate/m:gender:masc","mate/m:number:sg","mate/p:NE","opennlp/p:NE","s:Sondrio","tt/p:NE$<b>129<b>212","tt/p:NN$<b>129<b>42"],["_75$<i>626<i>637","corenlp/p:VVFIN","glemm/l:_+be-","glemm/l:_+schliessen","glemm/l:__beschliessen","i:beschlossen","mate/l:beschließen","mate/p:VVPP","opennlp/p:VVPP","s:beschlossen","tt/l:beschließen$<b>129<b>174","tt/l:beschließen$<b>129<b>80","tt/p:VVFIN$<b>129<b>174","tt/p:VVPP$<b>129<b>80"],["<>:corenlp/c:PP$<b>64<i>638<i>666<i>79<b>2","_76$<i>638<i>641","corenlp/p:APPR","glemm/l:__mit","i:mit","mate/l:mit","mate/p:APPR","opennlp/p:APPR","s:mit","tt/l:mit$<b>129<b>253","tt/p:APPR$<b>129<b>253"],["<>:corenlp/c:AP$<b>64<i>643<i>657<i>78<b>3","_77$<i>642<i>657","glemm/l:_+überwältigen","glemm/l:__überwältigend","i:überwältigender","mate/l:überwältigend","mate/m:case:dat","mate/m:degree:pos","mate/m:gender:fem","mate/m:number:sg","mate/p:ADJA","opennlp/p:ADJA","s:überwältigender","tt/l:überwältigend$<b>129<b>254","tt/p:ADJA$<b>129<b>254"],["_78$<i>658<i>666","corenlp/p:NN","glemm/l:_+-heit","glemm/l:_+Mehr","glemm/l:__Mehrheit","i:mehrheit","mate/l:mehrheit","mate/m:case:dat","mate/m:gender:fem","mate/m:number:sg","mate/p:NN","opennlp/p:NN","s:Mehrheit","tt/l:Mehrheit$<b>129<b>255","tt/p:NN$<b>129<b>255"],["<>:corenlp/c:NP-OA$<b>64<i>667<i>702<i>84<b>2","_79$<i>667<i>670","corenlp/p:ART","glemm/l:__d-","i:den","mate/l:der","mate/m:case:acc","mate/m:gender:masc","mate/m:number:sg","mate/p:ART","opennlp/p:ART","s:den","tt/l:die$<b>129<b>254","tt/p:ART$<b>129<b>254"],["_80$<i>671<i>679","corenlp/p:NN","glemm/l:_+Tritt","glemm/l:_+aus-","glemm/l:__Austritt","i:austritt","mate/l:austritt","mate/m:case:acc","mate/m:gender:masc","mate/m:number:sg","mate/p:NN","opennlp/p:NN","s:Austritt","tt/l:Austritt$<b>129<b>255","tt/p:NN$<b>129<b>255"],["<>:corenlp/c:PP$<b>64<i>680<i>702<i>84<b>3","_81$<i>680<i>683","corenlp/p:APPR","glemm/l:__aus","i:aus","mate/l:aus","mate/p:APPR","opennlp/p:APPR","s:aus","tt/l:aus$<b>129<b>247","tt/p:APPR$<b>129<b>247"],["_82$<i>684<i>687","corenlp/p:ART","glemm/l:__d-","i:der","mate/l:der","mate/m:case:dat","mate/m:gender:fem","mate/m:number:sg","mate/p:ART","opennlp/p:ART","s:der","tt/l:die$<b>129<b>254","tt/p:ART$<b>129<b>254"],["_83$<i>688<i>702","corenlp/p:NN","glemm/l:__Partei","glemm/l:__Saragat","i:saragat-partei","mate/l:saragat-partei","mate/m:case:dat","mate/m:gender:fem","mate/m:number:sg","mate/p:NN","opennlp/p:NN","s:Saragat-Partei","tt/p:NN$<b>129<b>252"],["<>:corenlp/c:PP$<b>64<i>704<i>767<i>91<b>2","<>:corenlp/c:ROOT$<b>64<i>704<i>836<i>98<b>0","<>:corenlp/s:s$<b>64<i>704<i>836<i>98<b>0","<>:tt/s:s$<b>64<i>704<i>836<i>98<b>0","<>:opennlp/s:s$<b>64<i>704<i>836<i>98<b>0","<>:corenlp/c:S$<b>64<i>704<i>836<i>98<b>1","<>:base/s:s$<b>64<i>704<i>836<i>98<b>2","_84$<i>704<i>707","corenlp/p:APPR","glemm/l:__von","i:von","mate/l:von","mate/p:APPR","opennlp/p:APPR","s:von","tt/l:von$<b>129<b>254","tt/p:APPR$<b>129<b>254"],["_85$<i>708<i>711","corenlp/p:ART","glemm/l:__d-","i:den","mate/l:der","mate/m:case:dat","mate/m:gender:masc","mate/m:number:pl","mate/p:ART","opennlp/p:ART","s:den","tt/l:die$<b>129<b>254","tt/p:ART$<b>129<b>254"],["_86$<i>712<i>714","corenlp/p:CARD","i:98","mate/l:98","mate/p:CARD","opennlp/p:CARD","s:98","tt/l:98$<b>129<b>255","tt/p:CARD$<b>129<b>255"],["_87$<i>715<i>735","corenlp/p:NN","glemm/l:+_Jugend","glemm/l:+_Organisation","glemm/l:__Jugendorganisation","i:jugendorganisationen","mate/l:jugendorganisation","mate/m:case:dat","mate/m:gender:fem","mate/m:number:pl","mate/p:NN","opennlp/p:NN","s:Jugendorganisationen","tt/l:Jugendorganisation$<b>129<b>255","tt/p:NN$<b>129<b>255"],["<>:corenlp/c:NP$<b>64<i>736<i>767<i>91<b>3","_88$<i>736<i>739","corenlp/p:ART","glemm/l:__d-","i:der","mate/l:der","mate/m:case:gen","mate/m:gender:fem","mate/m:number:sg","mate/p:ART","opennlp/p:ART","s:der","tt/l:die$<b>129<b>254","tt/p:ART$<b>129<b>254"],["_89$<i>740<i>760","corenlp/ne:I-MISC","corenlp/p:ADJA","glemm/l:++Demokrat","glemm/l:+_demokratisch","glemm/l:+_sozial","glemm/l:_+-isch","glemm/l:_+Sozialdemokrat","glemm/l:__sozialdemokratisch","i:sozialdemokratischen","mate/l:sozialdemokratisch","mate/m:case:gen","mate/m:degree:pos","mate/m:gender:fem","mate/m:number:sg","mate/p:ADJA","opennlp/p:ADJA","s:Sozialdemokratischen","tt/l:sozialdemokratisch$<b>129<b>245","tt/p:ADJA$<b>129<b>245"],["_90$<i>761<i>767","corenlp/p:NN","glemm/l:__Partei","i:partei","mate/l:partei","mate/m:case:gen","mate/m:gender:fem","mate/m:number:sg","mate/p:NN","opennlp/p:NN","s:Partei","tt/l:Partei$<b>129<b>255","tt/p:NN$<b>129<b>255"],["_91$<i>768<i>773","corenlp/p:VAFIN","glemm/l:__haben","i:haben","mate/l:haben","mate/m:mood:ind","mate/m:number:pl","mate/m:person:3","mate/m:tense:pres","mate/p:VAFIN","opennlp/p:VAFIN","s:haben","tt/l:haben$<b>129<b>233","tt/p:VAFIN$<b>129<b>233"],["_92$<i>774<i>778","corenlp/p:PRF","glemm/l:__er/sie/es/sie","i:sich","mate/l:sich","mate/m:case:acc","mate/m:number:pl","mate/m:person:3","mate/p:PRF","opennlp/p:PRF","s:sich","tt/l:er|es|sie$<b>129<b>255","tt/p:PRF$<b>129<b>255"],["<>:corenlp/c:NP-SB$<b>64<i>779<i>821<i>98<b>2","_93$<i>779<i>789","corenlp/p:ADV","glemm/l:__inzwischen","i:inzwischen","mate/l:inzwischen","mate/p:ADV","opennlp/p:ADV","s:inzwischen","tt/l:inzwischen$<b>129<b>255","tt/p:ADV$<b>129<b>255"],["_94$<i>790<i>792","corenlp/p:CARD","i:90","mate/l:90","mate/p:CARD","opennlp/p:CARD","s:90","tt/l:90$<b>129<b>255","tt/p:CARD$<b>129<b>255"],["<>:corenlp/c:NP$<b>64<i>793<i>821<i>98<b>3","_95$<i>793<i>796","corenlp/p:ART","glemm/l:__d-","i:der","mate/l:der","mate/m:case:gen","mate/m:gender:masc","mate/m:number:pl","mate/p:ART","opennlp/p:ART","s:der","tt/l:die$<b>129<b>254","tt/p:ART$<b>129<b>254"],["_96$<i>797<i>802","corenlp/p:ADJA","glemm/l:__neu","i:neuen","mate/l:neu","mate/m:case:gen","mate/m:degree:pos","mate/m:gender:masc","mate/m:number:pl","mate/p:ADJA","opennlp/p:ADJA","s:neuen","tt/l:neu$<b>129<b>255","tt/p:ADJA$<b>129<b>255"],["_97$<i>803<i>821","glemm/l:++-ung","glemm/l:++bewegen","glemm/l:+_Bewegung","glemm/l:+_Einheit","glemm/l:__Einheitsbewegung","i:\"einheitsbewegung\"","mate/l:\"einheitsbewegung\"","mate/m:case:gen","mate/m:gender:masc","mate/m:number:pl","mate/p:NN","opennlp/p:NN","s:\"Einheitsbewegung\""],["<>:corenlp/c:VP$<b>64<i>822<i>835<i>99<b>2","_98$<i>822<i>835","corenlp/p:VVPP","glemm/l:_+an-","glemm/l:_+geschlossen","glemm/l:_+schliessen","glemm/l:__angeschlossen","glemm/l:__anschliessen","i:angeschlossen","mate/l:anschließen","mate/p:VVPP","opennlp/p:VVPP","s:angeschlossen","tt/l:anschließen$<b>129<b>255","tt/p:VVPP$<b>129<b>255"]],"name":"tokens"},"corpusSigle":"BZK","license":"ACA-NC-LC","textDomain":"Politik","docTitle":"Neues Deutschland, Jahrgangsquerschnitt 1959","textSigle":"BZK_D59.00089","creationDate":"19590219","title":"Saragat-Partei zerfällt","pubDate":"19590219","textTypeRef":"Tageszeitung"}
\ No newline at end of file
diff --git a/Makefile.PL b/Makefile.PL
index 79ab3b1..9818ad1 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -30,6 +30,10 @@
   },
   MIN_PERL_VERSION => '5.014',
   test => {
-    TESTS => 't/*.t'
-  }
+    TESTS =>
+      't/*.t '.
+	't/index/*.t ' .
+	  't/sgbr/*.t ' .
+	    't/real/*.t'
+	  }
 );
diff --git a/lib/KorAP/Document.pm b/lib/KorAP/Document.pm
index 74a3d8c..8bf9fe7 100644
--- a/lib/KorAP/Document.pm
+++ b/lib/KorAP/Document.pm
@@ -315,7 +315,7 @@
   my $dom = shift;
   my $type = shift;
 
-  my $analytic = $dom->at('analytic');
+  my $analytic = $dom->at('analytic') || $dom->at('monogr');
 
   # There is an analytic element
   if ($analytic) {
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__