diff --git a/pom.xml b/pom.xml
index 85ccf88efe088771b939ecb531080fccb50feae3..306bcdf74b66ad1468d0ad32efcfbeda9e81606b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -331,6 +331,10 @@
                                                                         <file>http://downloads.sourceforge.net/project/tei/Stylesheets/tei-xsl-${tei-xsl-version}.zip</file>
                                                                         <targetPath>${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF</targetPath>
                                                                         <unpack>true</unpack>
+                                                                        <preservePath>true</preservePath>
+                                                                        <zipEntry>xml/**/*</zipEntry>
+                                                                        <skipIdentical>true</skipIdentical>
+
                                                                 </resource>
                                                         </resources>
                                                 </configuration>
@@ -338,51 +342,6 @@
                                 </executions>
                         </plugin>
 			       
-                        <!--plugin>
-                                <groupId>org.codehaus.mojo</groupId>
-                                <artifactId>wagon-maven-plugin</artifactId>
-                                <version>1.0-beta-4</version>
-
-                                <executions>
-                                        <execution>
-                                                <id>download-tei-stylesheets</id>
-                                                <goals>
-                                                  <goal>download-single</goal>
-                                                </goals>
-                                                <phase>generate-resources</phase>
-                                                <configuration>
-                                                  <url>http://downloads.sourceforge.net/project/tei/Stylesheets/</url>
-                                                  <fromFile>tei-xsl-${tei-xsl-version}.zip</fromFile>
-                                                  <toDir>${project.build.directory}</toDir>
-                                                </configuration>
-                                        </execution>
-                                </executions>
-                        </plugin>
-
-                        <plugin>
-                                <groupId>org.codehaus.mojo</groupId>
-                                <artifactId>truezip-maven-plugin</artifactId>
-                                <version>1.1</version>
-                                <executions>
-                                        <execution>
-                                                <id>extract-tei-stylesheets</id>
-                                                <goals>
-                                                  <goal>copy</goal>
-                                                </goals>
-                                                <phase>generate-resources</phase>
-                                        </execution>
-                                </executions>
-                                <configuration>
-                                        <fileset>
-                                                <directory>${project.build.directory}/tei-xsl-${tei-xsl-version}.zip/xml</directory>
-                                                <outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF</outputDirectory>
-                                                <includes>
-                                                  <include>**/*</include>
-                                                </includes>
-                                        </fileset>
-                                </configuration>
-                        </plugin-->
-
                         <plugin>
                                 <groupId>org.apache.maven.plugins</groupId>
                                 <artifactId>maven-surefire-plugin</artifactId>
diff --git a/src/main/java/info/textgrid/services/aggregator/pdf/PDF.java b/src/main/java/info/textgrid/services/aggregator/pdf/PDF.java
index c2164a79c4c3fd1041e056b62c5f4983e55613ba..d37df11790a0044837c76274493bcf01a5ca639e 100644
--- a/src/main/java/info/textgrid/services/aggregator/pdf/PDF.java
+++ b/src/main/java/info/textgrid/services/aggregator/pdf/PDF.java
@@ -53,7 +53,7 @@
 		"this service is deployed.")
 public class PDF {
 
-	private static final String TO_PDF_XSL = "/WEB-INF/tei/stylesheet/latex2/tei.xsl";
+	private static final String TO_PDF_XSL = "/WEB-INF/xml/tei/stylesheet/latex2/tei.xsl";
 
 	final Logger logger = Logger
 			.getLogger("info.textgrid.services.aggregator.pdf");
diff --git a/src/main/webapp/WEB-INF/stylesheets/db2xhtml.xsl b/src/main/webapp/WEB-INF/stylesheets/db2xhtml.xsl
index 9f3149fdd1ab82b726e2c3f5ef6fb5ecb5b496fb..4f9e041fef0bcec79143ecfed4cc84e0c226b811 100644
--- a/src/main/webapp/WEB-INF/stylesheets/db2xhtml.xsl
+++ b/src/main/webapp/WEB-INF/stylesheets/db2xhtml.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:tgs="http://www.textgrid.info/namespaces/middleware/tgsearch" exclude-result-prefixes="xs tei tgs xi" xpath-default-namespace="http://www.tei-c.org/ns/1.0" version="2.0">
 
-   <xsl:import href="../tei/stylesheet/xhtml2/tei.xsl"/>
+   <xsl:import href="../xml/tei/stylesheet/xhtml2/tei.xsl"/>
 <!--    <xsl:import href="/db/xslt/tei/xhtml2/tei.xsl"/> -->
 
 
@@ -535,4 +535,4 @@
             allgemeinfreien Texte (Siehe auch Punkt 2 der Lizenzbestimmungen).
         </p>
     </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
diff --git a/src/main/webapp/WEB-INF/stylesheets/epub.xsl b/src/main/webapp/WEB-INF/stylesheets/epub.xsl
index 04d65e738336740a24ef506df8eb75708e245cd3..514945bf7999eb12617bbdffae17f535b84d9896 100644
--- a/src/main/webapp/WEB-INF/stylesheets/epub.xsl
+++ b/src/main/webapp/WEB-INF/stylesheets/epub.xsl
@@ -14,7 +14,7 @@
   version="2.0"
   exclude-result-prefixes="iso tei teix dc html opf ncx smil xs html">
 
-  <xsl:import href="../tei/stylesheet/epub/tei-to-epub.xsl"/>
+  <xsl:import href="../xml/tei/stylesheet/epub/tei-to-epub.xsl"/>
 
 
   <!-- ************************* Variablen und Parameter ******************************* -->