diff --git a/.gitignore b/.gitignore
index 832d443..743e2b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 docs
 todo.org
 tools
+build
 fixtures.txt
 node_modules
 log
diff --git a/MANIFEST b/MANIFEST
index 5fff770..a63f2e9 100755
--- a/MANIFEST
+++ b/MANIFEST
@@ -28,6 +28,7 @@
 lib/KorAP/XML/Index/Malt/Dependency.pm
 lib/KorAP/XML/Index/Mate/Dependency.pm
 lib/KorAP/XML/Index/Mate/Morpho.pm
+lib/KorAP/XML/Index/Mate/MorphoAttr.pm
 lib/KorAP/XML/Index/OpenNLP/Morpho.pm
 lib/KorAP/XML/Index/OpenNLP/Sentences.pm
 lib/KorAP/XML/Index/OpenNLP/Morpho.pm
diff --git a/Makefile.PL b/Makefile.PL
index f278586..1b99119 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -37,5 +37,5 @@
 	  't/sgbr/*.t ' .
 	    't/real/*.t'
 	  },
-  EXE_FILES => ['script/korapxml2krill']
+  EXE_FILES => ['script/korapxml2krill', 'script/korapxml2krill_dir']
 );
diff --git a/t/primary.t b/t/primary.t
index 831124e..eb6d20e 100644
--- a/t/primary.t
+++ b/t/primary.t
@@ -6,11 +6,11 @@
 use utf8;
 use lib 'lib', '../lib';
 
-use_ok('KorAP::Document::Primary');
+use_ok('KorAP::XML::Document::Primary');
 
 my $t = "Der März ging vorüber und demnächst würde es Herbstblätter regnen.";
 
-ok(my $p = KorAP::Document::Primary->new($t), 'Constructor');
+ok(my $p = KorAP::XML::Document::Primary->new($t), 'Constructor');
 
 is($p->data_length, 66, 'Text has correct length');
 
@@ -39,7 +39,7 @@
 
 $t = 'Er dächte, daß dies „für alle Elemente gilt“.';
 
-ok($p = KorAP::Document::Primary->new($t), 'Constructor');
+ok($p = KorAP::XML::Document::Primary->new($t), 'Constructor');
 
 is($p->data_length, 45, 'Text has correct length');
 
diff --git a/t/real/wdd.t b/t/real/wdd.t
index 30059cd..88e36de 100644
--- a/t/real/wdd.t
+++ b/t/real/wdd.t
@@ -128,7 +128,7 @@
 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:{War/, 'data');
+like($first_token, qr/s:\{War/, 'data');
 like($first_token, qr/_0\$<i>1<i>5/, 'data');