diff --git a/pom.xml b/pom.xml
index 2c9bc6dfb54b6eb614e2c212085a65d2f3d7066a..a2f04a7cc59e27e691487d673616827de259a470 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
         <properties>
                 <commons-io-version>2.4</commons-io-version>
-                <link-rewriter-version>0.2.0-SNAPSHOT</link-rewriter-version>
+                <link-rewriter-version>0.2.1-SNAPSHOT</link-rewriter-version>
                 <saxon-version>9.4.0.7</saxon-version>
                 <cxf-version>2.7.4</cxf-version>
                 <confclient-version>1.0-SNAPSHOT</confclient-version>
diff --git a/src/main/java/info/textgrid/services/aggregator/epub/EPUB.java b/src/main/java/info/textgrid/services/aggregator/epub/EPUB.java
index ea42ef7a9725b34558b03395730b9881436609cb..5aac6e44fb4c1159cf0b15eab0989632bbd24074 100644
--- a/src/main/java/info/textgrid/services/aggregator/epub/EPUB.java
+++ b/src/main/java/info/textgrid/services/aggregator/epub/EPUB.java
@@ -12,7 +12,7 @@
 import info.textgrid.services.aggregator.RESTUtils;
 import info.textgrid.services.aggregator.TextGridRepProvider;
 import info.textgrid.services.aggregator.teicorpus.TEICorpusSerializer;
-import info.textgrid.services.aggregator.tree.DefaultFilenamePolicy;
+import info.textgrid.utils.export.filenames.DefaultFilenamePolicy;
 
 import java.io.File;
 import java.io.FileNotFoundException;
diff --git a/src/main/java/info/textgrid/services/aggregator/tree/AggregationTreeFactory.java b/src/main/java/info/textgrid/services/aggregator/tree/AggregationTreeFactory.java
index b85e56d95dc6984c4d7ff44cc364e47ddd3cef4b..c3233f83b7d1343f310796f61c0556d9dd4b0aec 100644
--- a/src/main/java/info/textgrid/services/aggregator/tree/AggregationTreeFactory.java
+++ b/src/main/java/info/textgrid/services/aggregator/tree/AggregationTreeFactory.java
@@ -7,6 +7,8 @@
 import info.textgrid.namespaces.middleware.tgcrud.services.tgcrudservice.ObjectNotFoundFault;
 import info.textgrid.services.aggregator.AggregationTreeWalker;
 import info.textgrid.services.aggregator.ITextGridRep;
+import info.textgrid.utils.export.aggregations.Aggregation;
+import info.textgrid.utils.export.aggregations.AggregationEntry;
 
 import java.util.Deque;
 import java.util.logging.Level;
@@ -19,7 +21,7 @@ public class AggregationTreeFactory extends AggregationTreeWalker {
 
 	private final Deque<Aggregation> stack = Lists.newLinkedList();
 	private Aggregation root;
-	private static Logger logger = Logger.getLogger("info.textgrid.services.aggregator.tree");
+	private static Logger logger = Logger.getLogger("info.textgrid.utils.export.aggregations");
 
 	protected AggregationTreeFactory(final ObjectType root, final ITextGridRep repository, final String sid) {
 		super();
diff --git a/src/main/java/info/textgrid/services/aggregator/zip/ZIP.java b/src/main/java/info/textgrid/services/aggregator/zip/ZIP.java
index 82fa02a2c79597c42b6e1f6843ed8497745e5327..b371ca666636606e87d5cb54f0e082a4e491c7b0 100644
--- a/src/main/java/info/textgrid/services/aggregator/zip/ZIP.java
+++ b/src/main/java/info/textgrid/services/aggregator/zip/ZIP.java
@@ -9,7 +9,7 @@
 import info.textgrid.namespaces.middleware.tgcrud.services.tgcrudservice.TGCrudService;
 import info.textgrid.services.aggregator.ITextGridRep;
 import info.textgrid.services.aggregator.RESTUtils;
-import info.textgrid.services.aggregator.tree.DefaultFilenamePolicy;
+import info.textgrid.utils.export.filenames.DefaultFilenamePolicy;
 
 import java.net.URI;
 import java.text.MessageFormat;
diff --git a/src/main/java/info/textgrid/services/aggregator/zip/ZipResult.java b/src/main/java/info/textgrid/services/aggregator/zip/ZipResult.java
index ff5e99320b2136a59cb7d8f15a63b3f15b7d8894..a96103aa4ff328a2ba2233892d92305e12b87c09 100644
--- a/src/main/java/info/textgrid/services/aggregator/zip/ZipResult.java
+++ b/src/main/java/info/textgrid/services/aggregator/zip/ZipResult.java
@@ -4,14 +4,14 @@
 import info.textgrid._import.RewriteMethod;
 import info.textgrid.namespaces.metadata.core._2010.ObjectType;
 import info.textgrid.services.aggregator.ITextGridRep;
-import info.textgrid.services.aggregator.tree.Aggregation;
-import info.textgrid.services.aggregator.tree.AggregationEntry;
 import info.textgrid.services.aggregator.tree.AggregationTreeFactory;
-import info.textgrid.services.aggregator.tree.DefaultFilenamePolicy;
-import info.textgrid.services.aggregator.tree.DefaultMetaFilenamePolicy;
-import info.textgrid.services.aggregator.tree.IAggregation;
-import info.textgrid.services.aggregator.tree.IAggregationEntry;
-import info.textgrid.services.aggregator.tree.IFilenamePolicy;
+import info.textgrid.utils.export.aggregations.Aggregation;
+import info.textgrid.utils.export.aggregations.AggregationEntry;
+import info.textgrid.utils.export.aggregations.IAggregation;
+import info.textgrid.utils.export.aggregations.IAggregationEntry;
+import info.textgrid.utils.export.filenames.DefaultFilenamePolicy;
+import info.textgrid.utils.export.filenames.DefaultMetaFilenamePolicy;
+import info.textgrid.utils.export.filenames.IFilenamePolicy;
 import info.textgrid.utils.linkrewriter.ConfigurableXMLRewriter;
 import info.textgrid.utils.linkrewriter.ImportMapping;