diff --git a/deegree-tests/deegree-compliance-tests/pom.xml b/deegree-tests/deegree-compliance-tests/pom.xml
index 3b43a5b552..854b62a378 100644
--- a/deegree-tests/deegree-compliance-tests/pom.xml
+++ b/deegree-tests/deegree-compliance-tests/pom.xml
@@ -64,6 +64,7 @@
                   <groupId>org.deegree</groupId>
                   <artifactId>deegree-workspace-compliance-tests</artifactId>
                   <version>${project.version}</version>
+                  <type>zip</type>
                   <outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF/workspace/</outputDirectory>
                 </artifactItem>
               </artifactItems>
@@ -115,17 +116,6 @@
   </build>
 
   <dependencies>
-    <dependency>
-      <groupId>org.deegree</groupId>
-      <artifactId>deegree-workspace-compliance-tests</artifactId>
-      <version>${project.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>net.sf.saxon</groupId>
-          <artifactId>Saxon-HE</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <groupId>cite</groupId>
       <artifactId>teamengine</artifactId>
@@ -186,6 +176,38 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.deegree</groupId>
+      <artifactId>deegree-services-wms</artifactId>
+      <version>${project.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>xalan</groupId>
+          <artifactId>xalan</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.deegree</groupId>
+      <artifactId>deegree-services-wcs</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.deegree</groupId>
+      <artifactId>deegree-layers-feature</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.deegree</groupId>
+      <artifactId>deegree-layers-coverage</artifactId>
+      <version>${project.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.h2database</groupId>
+          <artifactId>h2</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
diff --git a/deegree-tests/deegree-workspace-tests/pom.xml b/deegree-tests/deegree-workspace-tests/pom.xml
index 9ad2ac5504..ac60c96676 100644
--- a/deegree-tests/deegree-workspace-tests/pom.xml
+++ b/deegree-tests/deegree-workspace-tests/pom.xml
@@ -42,38 +42,37 @@
                   <groupId>org.deegree</groupId>
                   <artifactId>deegree-workspace-wps</artifactId>
                   <version>${project.version}</version>
+                  <type>zip</type>
                   <outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF/workspaces/deegree-workspace-wps</outputDirectory>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.deegree</groupId>
                   <artifactId>deegree-workspace-utah</artifactId>
                   <version>${project.version}</version>
+                  <type>zip</type>
                   <outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF/workspaces/deegree-workspace-utah</outputDirectory>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.deegree</groupId>
                   <artifactId>deegree-workspace-aixm</artifactId>
                   <version>${project.version}</version>
+                  <type>zip</type>
                   <outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF/workspaces/deegree-workspace-aixm</outputDirectory>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.deegree</groupId>
                   <artifactId>deegree-workspace-geosciml</artifactId>
                   <version>${project.version}</version>
+                  <type>zip</type>
                   <outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF/workspaces/deegree-workspace-geosciml</outputDirectory>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.deegree</groupId>
                   <artifactId>deegree-workspace-wcts</artifactId>
                   <version>${project.version}</version>
+                  <type>zip</type>
                   <outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF/workspaces/deegree-workspace-wcts</outputDirectory>
                 </artifactItem>
-                <artifactItem>
-                  <groupId>org.deegree</groupId>
-                  <artifactId>deegree-workspace-xplan40</artifactId>
-                  <version>${project.version}</version>
-                  <outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF/workspaces/deegree-workspace-xplan40</outputDirectory>
-                </artifactItem>
               </artifactItems>
               <excludes>
               </excludes>
@@ -133,36 +132,6 @@
       <artifactId>deegree-protocol-wms</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.deegree</groupId>
-      <artifactId>deegree-workspace-wps</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.deegree</groupId>
-      <artifactId>deegree-workspace-utah</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.deegree</groupId>
-      <artifactId>deegree-workspace-aixm</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.deegree</groupId>
-      <artifactId>deegree-workspace-geosciml</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.deegree</groupId>
-      <artifactId>deegree-workspace-wcts</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.deegree</groupId>
-      <artifactId>deegree-workspace-xplan40</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
diff --git a/deegree-workspaces/deegree-workspace-aixm/pom.xml b/deegree-workspaces/deegree-workspace-aixm/pom.xml
index 8bd2be9b7a..f18bb157e2 100644
--- a/deegree-workspaces/deegree-workspace-aixm/pom.xml
+++ b/deegree-workspaces/deegree-workspace-aixm/pom.xml
@@ -2,6 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>deegree-workspace-aixm</artifactId>
   <name>deegree-workspace-aixm</name>
+  <packaging>pom</packaging>
   <description>Example configuration for deploying AIXM data via deegree WFS</description>
 
   <properties>
@@ -27,5 +28,13 @@
     </repository>
   </repositories>
 
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
 
diff --git a/deegree-workspaces/deegree-workspace-aixm/src/assembly/assembly.xml b/deegree-workspaces/deegree-workspace-aixm/src/assembly/assembly.xml
new file mode 100644
index 0000000000..14f6394ecc
--- /dev/null
+++ b/deegree-workspaces/deegree-workspace-aixm/src/assembly/assembly.xml
@@ -0,0 +1,14 @@
+<assembly>
+  <id>workspace-zip</id>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <formats>
+    <format>zip</format>
+  </formats>
+
+  <fileSets>
+    <fileSet>
+      <directory>src/main/resources</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>
diff --git a/deegree-workspaces/deegree-workspace-compliance-tests/pom.xml b/deegree-workspaces/deegree-workspace-compliance-tests/pom.xml
index fc5874fa35..98480acc24 100644
--- a/deegree-workspaces/deegree-workspace-compliance-tests/pom.xml
+++ b/deegree-workspaces/deegree-workspace-compliance-tests/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>deegree-workspace-compliance-tests</artifactId>
-  <packaging>jar</packaging>
+  <packaging>pom</packaging>
   <name>deegree-workspace-compliance-tests</name>
   <description>Configuration for the OGC CITE test suites</description>
 
@@ -28,39 +28,13 @@
     </repository>
   </repositories>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.deegree</groupId>
-      <artifactId>deegree-services-wms</artifactId>
-      <version>${project.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>xalan</groupId>
-          <artifactId>xalan</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.deegree</groupId>
-      <artifactId>deegree-services-wcs</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.deegree</groupId>
-      <artifactId>deegree-layers-feature</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.deegree</groupId>
-      <artifactId>deegree-layers-coverage</artifactId>
-      <version>${project.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>com.h2database</groupId>
-          <artifactId>h2</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
 
diff --git a/deegree-workspaces/deegree-workspace-compliance-tests/src/assembly/assembly.xml b/deegree-workspaces/deegree-workspace-compliance-tests/src/assembly/assembly.xml
new file mode 100644
index 0000000000..14f6394ecc
--- /dev/null
+++ b/deegree-workspaces/deegree-workspace-compliance-tests/src/assembly/assembly.xml
@@ -0,0 +1,14 @@
+<assembly>
+  <id>workspace-zip</id>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <formats>
+    <format>zip</format>
+  </formats>
+
+  <fileSets>
+    <fileSet>
+      <directory>src/main/resources</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>
diff --git a/deegree-workspaces/deegree-workspace-csw-memory-tests/pom.xml b/deegree-workspaces/deegree-workspace-csw-memory-tests/pom.xml
index 304f030149..006a62c101 100644
--- a/deegree-workspaces/deegree-workspace-csw-memory-tests/pom.xml
+++ b/deegree-workspaces/deegree-workspace-csw-memory-tests/pom.xml
@@ -2,6 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>deegree-workspace-csw-memory-tests</artifactId>
   <name>deegree-workspace-csw-memory-tests</name>
+  <packaging>pom</packaging>
   <description>Configuration for running the BKG CSW test suite with memory metadata store.</description>
 
   <properties>
@@ -27,5 +28,13 @@
     </repository>
   </repositories>
 
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
 
diff --git a/deegree-workspaces/deegree-workspace-csw-memory-tests/src/assembly/assembly.xml b/deegree-workspaces/deegree-workspace-csw-memory-tests/src/assembly/assembly.xml
new file mode 100644
index 0000000000..14f6394ecc
--- /dev/null
+++ b/deegree-workspaces/deegree-workspace-csw-memory-tests/src/assembly/assembly.xml
@@ -0,0 +1,14 @@
+<assembly>
+  <id>workspace-zip</id>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <formats>
+    <format>zip</format>
+  </formats>
+
+  <fileSets>
+    <fileSet>
+      <directory>src/main/resources</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>
diff --git a/deegree-workspaces/deegree-workspace-csw/pom.xml b/deegree-workspaces/deegree-workspace-csw/pom.xml
index 4c95586ae0..228d1d8a4a 100644
--- a/deegree-workspaces/deegree-workspace-csw/pom.xml
+++ b/deegree-workspaces/deegree-workspace-csw/pom.xml
@@ -2,6 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>deegree-workspace-csw</artifactId>
   <name>deegree-workspace-csw</name>
+  <packaging>pom</packaging>
   <description>Example configuration for deploying a deegree CSW that serves ISO metadata</description>
 
   <properties>
@@ -27,12 +28,13 @@
     </repository>
   </repositories>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 
 </project>
 
diff --git a/deegree-workspaces/deegree-workspace-csw/src/assembly/assembly.xml b/deegree-workspaces/deegree-workspace-csw/src/assembly/assembly.xml
new file mode 100644
index 0000000000..14f6394ecc
--- /dev/null
+++ b/deegree-workspaces/deegree-workspace-csw/src/assembly/assembly.xml
@@ -0,0 +1,14 @@
+<assembly>
+  <id>workspace-zip</id>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <formats>
+    <format>zip</format>
+  </formats>
+
+  <fileSets>
+    <fileSet>
+      <directory>src/main/resources</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>
diff --git a/deegree-workspaces/deegree-workspace-csw/src/main/java/org/deegree/client/csw/WebXmlInjector.java b/deegree-workspaces/deegree-workspace-csw/src/main/java/org/deegree/client/csw/WebXmlInjector.java
deleted file mode 100644
index 3425e6969a..0000000000
--- a/deegree-workspaces/deegree-workspace-csw/src/main/java/org/deegree/client/csw/WebXmlInjector.java
+++ /dev/null
@@ -1,180 +0,0 @@
-//$HeadURL$
-/*----------------------------------------------------------------------------
- This file is part of deegree, http://deegree.org/
- Copyright (C) 2001-2009 by:
- - Department of Geography, University of Bonn -
- and
- - lat/lon GmbH -
-
- This library is free software; you can redistribute it and/or modify it under
- the terms of the GNU Lesser General Public License as published by the Free
- Software Foundation; either version 2.1 of the License, or (at your option)
- any later version.
- This library is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- details.
- You should have received a copy of the GNU Lesser General Public License
- along with this library; if not, write to the Free Software Foundation, Inc.,
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
- Contact information:
-
- lat/lon GmbH
- Aennchenstr. 19, 53177 Bonn
- Germany
- http://lat-lon.de/
-
- Department of Geography, University of Bonn
- Prof. Dr. Klaus Greve
- Postfach 1147, 53001 Bonn
- Germany
- http://www.geographie.uni-bonn.de/deegree/
-
- e-mail: info@deegree.org
- ----------------------------------------------------------------------------*/
-package org.deegree.client.csw;
-
-import static javax.xml.stream.XMLStreamConstants.CDATA;
-import static javax.xml.stream.XMLStreamConstants.CHARACTERS;
-import static javax.xml.stream.XMLStreamConstants.END_DOCUMENT;
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_DOCUMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * TODO add class documentation here
- * 
- * @author <a href="mailto:thomas@lat-lon.de">Steffen Thomas</a>
- * @author last edited by: $Author$
- * 
- * @version $Revision$, $Date$
- */
-public class WebXmlInjector {
-    private static Logger LOG = LoggerFactory.getLogger( WebXmlInjector.class );
-
-    private static final String CLASSPATH_ROOT = WebXmlInjector.class.getResource( "/" ).getPath();
-
-    private static final String PROJECT_ROOT = new File( new File( CLASSPATH_ROOT ).getParent() ).getParent();
-
-    private static final String WEB_XML_PATH = PROJECT_ROOT + "/src/main/webapp/WEB-INF/web.xml";
-
-    private static final String NEW_WEB_XML_PATH = PROJECT_ROOT + "/src/main/webapp/WEB-INF/newweb.xml";
-
-    /**
-     * @param args
-     * @throws IOException
-     * @throws FactoryConfigurationError
-     * @throws XMLStreamException
-     */
-    public static void main( String[] args )
-                            throws XMLStreamException, FactoryConfigurationError, IOException {
-        File webxml = new File( WEB_XML_PATH );
-
-        File newwebxml = new File( NEW_WEB_XML_PATH );
-        XMLStreamWriter writer = XMLOutputFactory.newInstance().createXMLStreamWriter( new FileWriter( newwebxml ) );
-        XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader( new FileReader( webxml ) );
-
-        int openElements = 0;
-        boolean firstRun = true;
-        while ( firstRun || openElements > 0 ) {
-            firstRun = false;
-            int eventType = reader.getEventType();
-
-            switch ( eventType ) {
-            case START_DOCUMENT: {
-                writer.writeStartDocument();
-                openElements++;
-                break;
-            }
-            case END_DOCUMENT: {
-                writer.writeEndDocument();
-                openElements--;
-                break;
-            }
-            case CDATA: {
-                writer.writeCData( reader.getText() );
-                break;
-            }
-            case CHARACTERS: {
-                writer.writeCharacters( reader.getTextCharacters(), reader.getTextStart(), reader.getTextLength() );
-                break;
-            }
-            case END_ELEMENT: {
-
-                writer.writeEndElement();
-                openElements--;
-                break;
-            }
-            case START_ELEMENT: {
-                QName elName = reader.getName();
-                if ( "welcome-file-list".equals( elName.getLocalPart() ) ) {
-                    //skip it
-                    openElements--;
-                } else if ( "welcome-file".equals( elName.getLocalPart() ) ) {
-                    //skip that elements and replace just one new
-                    writer.writeStartElement( "welcome-file-list" );
-                    writer.writeStartElement( "welcome-file" );
-                    writer.writeCharacters( "console.xhtml" );
-                    writer.writeEndElement();
-                    writer.writeEndElement();
-                    writer.writeEndDocument();
-                    openElements--;
-                } else {
-
-                    writer.writeStartElement( reader.getPrefix(), reader.getLocalName(), reader.getNamespaceURI() );
-                    // copy all namespace bindings
-                    for ( int i = 0; i < reader.getNamespaceCount(); i++ ) {
-                        String nsPrefix = reader.getNamespacePrefix( i );
-                        String nsURI = reader.getNamespaceURI( i );
-                        writer.writeNamespace( nsPrefix, nsURI );
-                    }
-
-                    // copy all attributes
-                    for ( int i = 0; i < reader.getAttributeCount(); i++ ) {
-                        String localName = reader.getAttributeLocalName( i );
-                        String nsPrefix = reader.getAttributePrefix( i );
-                        String value = reader.getAttributeValue( i );
-                        String nsURI = reader.getAttributeNamespace( i );
-                        if ( nsURI == null ) {
-                            writer.writeAttribute( localName, value );
-                        } else {
-                            writer.writeAttribute( nsPrefix, nsURI, localName, value );
-                        }
-                    }
-
-                    openElements++;
-                }
-                break;
-            }
-            default: {
-                break;
-            }
-            }
-            if ( openElements > 0 ) {
-                reader.next();
-            }
-        }
-
-        reader.close();
-        writer.close();
-
-    }
-
-}
diff --git a/deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/datasources/metadata/iso19115.xml b/deegree-workspaces/deegree-workspace-csw/src/main/resources/datasources/metadata/iso19115.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/datasources/metadata/iso19115.xml
rename to deegree-workspaces/deegree-workspace-csw/src/main/resources/datasources/metadata/iso19115.xml
diff --git a/deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/jdbc/conn1.xml b/deegree-workspaces/deegree-workspace-csw/src/main/resources/jdbc/conn1.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/jdbc/conn1.xml
rename to deegree-workspaces/deegree-workspace-csw/src/main/resources/jdbc/conn1.xml
diff --git a/deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/DescribeRecord/xml/describeRecord_1.xml b/deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/DescribeRecord/xml/describeRecord_1.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/DescribeRecord/xml/describeRecord_1.xml
rename to deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/DescribeRecord/xml/describeRecord_1.xml
diff --git a/deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/DescribeRecord/xml/describeRecord_2.xml b/deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/DescribeRecord/xml/describeRecord_2.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/DescribeRecord/xml/describeRecord_2.xml
rename to deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/DescribeRecord/xml/describeRecord_2.xml
diff --git a/deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/DescribeRecord/xml/describeRecord_3.xml b/deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/DescribeRecord/xml/describeRecord_3.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/DescribeRecord/xml/describeRecord_3.xml
rename to deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/DescribeRecord/xml/describeRecord_3.xml
diff --git a/deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/DescribeRecord/xml/describeRecord_4.xml b/deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/DescribeRecord/xml/describeRecord_4.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/DescribeRecord/xml/describeRecord_4.xml
rename to deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/DescribeRecord/xml/describeRecord_4.xml
diff --git a/deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/GetCapabilities/xml/getCapabilities.xml b/deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/GetCapabilities/xml/getCapabilities.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/GetCapabilities/xml/getCapabilities.xml
rename to deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/GetCapabilities/xml/getCapabilities.xml
diff --git a/deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/GetCapabilities/xml/getCapabilitiesSOAP.xml b/deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/GetCapabilities/xml/getCapabilitiesSOAP.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/GetCapabilities/xml/getCapabilitiesSOAP.xml
rename to deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/GetCapabilities/xml/getCapabilitiesSOAP.xml
diff --git a/deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/GetRecordById/xml/1id_full.xml b/deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/GetRecordById/xml/1id_full.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/GetRecordById/xml/1id_full.xml
rename to deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/GetRecordById/xml/1id_full.xml
diff --git a/deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/GetRecords/xml/AND.xml b/deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/GetRecords/xml/AND.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/GetRecords/xml/AND.xml
rename to deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/GetRecords/xml/AND.xml
diff --git a/deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/GetRecords/xml/BoundingBox_1.xml b/deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/GetRecords/xml/BoundingBox_1.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/GetRecords/xml/BoundingBox_1.xml
rename to deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/GetRecords/xml/BoundingBox_1.xml
diff --git a/deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/GetRecords/xml/PropEqual.xml b/deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/GetRecords/xml/PropEqual.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/GetRecords/xml/PropEqual.xml
rename to deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/GetRecords/xml/PropEqual.xml
diff --git a/deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/GetRecords/xml/getAllRecords_DC.xml b/deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/GetRecords/xml/getAllRecords_DC.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/GetRecords/xml/getAllRecords_DC.xml
rename to deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/GetRecords/xml/getAllRecords_DC.xml
diff --git a/deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/GetRecords/xml/getAllRecords_ISO.xml b/deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/GetRecords/xml/getAllRecords_ISO.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/GetRecords/xml/getAllRecords_ISO.xml
rename to deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/GetRecords/xml/getAllRecords_ISO.xml
diff --git a/deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/GetRecords/xml/getRecordsComplex_1.xml b/deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/GetRecords/xml/getRecordsComplex_1.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/GetRecords/xml/getRecordsComplex_1.xml
rename to deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/GetRecords/xml/getRecordsComplex_1.xml
diff --git a/deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/GetRecords/xml/getRecordsElementName.xml b/deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/GetRecords/xml/getRecordsElementName.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/GetRecords/xml/getRecordsElementName.xml
rename to deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/GetRecords/xml/getRecordsElementName.xml
diff --git a/deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/Transaction/xml/complex_insert.xml b/deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/Transaction/xml/complex_insert.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/Transaction/xml/complex_insert.xml
rename to deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/Transaction/xml/complex_insert.xml
diff --git a/deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/Transaction/xml/delete_1.xml b/deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/Transaction/xml/delete_1.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/Transaction/xml/delete_1.xml
rename to deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/Transaction/xml/delete_1.xml
diff --git a/deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/Transaction/xml/delete_all.xml b/deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/Transaction/xml/delete_all.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/Transaction/xml/delete_all.xml
rename to deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/Transaction/xml/delete_all.xml
diff --git a/deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/Transaction/xml/insert_1.xml b/deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/Transaction/xml/insert_1.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/Transaction/xml/insert_1.xml
rename to deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/Transaction/xml/insert_1.xml
diff --git a/deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/Transaction/xml/service_loose.xml b/deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/Transaction/xml/service_loose.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/Transaction/xml/service_loose.xml
rename to deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/Transaction/xml/service_loose.xml
diff --git a/deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/Transaction/xml/update_1.xml b/deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/Transaction/xml/update_1.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/manager/requests/csw/examples/Transaction/xml/update_1.xml
rename to deegree-workspaces/deegree-workspace-csw/src/main/resources/manager/requests/csw/examples/Transaction/xml/update_1.xml
diff --git a/deegree-workspaces/deegree-workspace-csw/src/main/resources/org/deegree/console/i18n/custom_labels_en.properties b/deegree-workspaces/deegree-workspace-csw/src/main/resources/org/deegree/console/i18n/custom_labels_en.properties
deleted file mode 100644
index 1946f78651..0000000000
--- a/deegree-workspaces/deegree-workspace-csw/src/main/resources/org/deegree/console/i18n/custom_labels_en.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-intro=deegree 3 catalogueService 
-info=Read more:
\ No newline at end of file
diff --git a/deegree-workspaces/deegree-workspace-csw/src/main/resources/deegree3_CSW_CREATE.sql b/deegree-workspaces/deegree-workspace-csw/src/main/resources/scripts/deegree3_CSW_CREATE.sql
similarity index 100%
rename from deegree-workspaces/deegree-workspace-csw/src/main/resources/deegree3_CSW_CREATE.sql
rename to deegree-workspaces/deegree-workspace-csw/src/main/resources/scripts/deegree3_CSW_CREATE.sql
diff --git a/deegree-workspaces/deegree-workspace-csw/src/main/resources/deegree3_CSW_DROP.sql b/deegree-workspaces/deegree-workspace-csw/src/main/resources/scripts/deegree3_CSW_DROP.sql
similarity index 100%
rename from deegree-workspaces/deegree-workspace-csw/src/main/resources/deegree3_CSW_DROP.sql
rename to deegree-workspaces/deegree-workspace-csw/src/main/resources/scripts/deegree3_CSW_DROP.sql
diff --git a/deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/services/csw.xml b/deegree-workspaces/deegree-workspace-csw/src/main/resources/services/csw.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/services/csw.xml
rename to deegree-workspaces/deegree-workspace-csw/src/main/resources/services/csw.xml
diff --git a/deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/services/main.xml b/deegree-workspaces/deegree-workspace-csw/src/main/resources/services/main.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/services/main.xml
rename to deegree-workspaces/deegree-workspace-csw/src/main/resources/services/main.xml
diff --git a/deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/services/metadata.xml b/deegree-workspaces/deegree-workspace-csw/src/main/resources/services/metadata.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace/services/metadata.xml
rename to deegree-workspaces/deegree-workspace-csw/src/main/resources/services/metadata.xml
diff --git a/deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/web.xml b/deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index d139248240..0000000000
--- a/deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
-    <display-name>deegree 3 OGC services console + generic client</display-name>
-
-    <context-param>
-        <param-name>javax.faces.PROJECT_STAGE</param-name>
-        <param-value>Development</param-value>
-    </context-param>
-
-    <servlet>
-        <servlet-name>Faces Servlet</servlet-name>
-        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>Faces Servlet</servlet-name>
-        <url-pattern>*.jsf</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>Faces Servlet</servlet-name>
-        <url-pattern>*.xhtml</url-pattern>
-    </servlet-mapping>
-
-    <servlet>
-        <servlet-name>services</servlet-name>
-        <servlet-class>org.deegree.services.controller.OGCFrontController</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <servlet>
-        <servlet-name>resources</servlet-name>
-        <servlet-class>org.deegree.services.resources.ResourcesServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>services</servlet-name>
-        <url-pattern>/services</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>resources</servlet-name>
-        <url-pattern>/resources/*</url-pattern>
-    </servlet-mapping>
-
-    <welcome-file-list>
-        <welcome-file>index.xhtml</welcome-file>
-        <welcome-file>index.jsf</welcome-file>
-        <welcome-file>index.jsp</welcome-file>
-        <welcome-file>index.html</welcome-file>
-        <welcome-file>index.htm</welcome-file>
-        <welcome-file>console.xhtml</welcome-file>
-    </welcome-file-list>
-    
-    <!-- http basic auth enable -->
-    <!-- Define a security constraint on this application -->
-    <!-- User and role must be added to tomcat-users.xml  -->
-    <!-- 
-    <security-constraint>
-        <web-resource-collection>
-            <web-resource-name>Entire Application</web-resource-name>
-            <url-pattern>/*</url-pattern>
-        </web-resource-collection>
-        <auth-constraint>
-            <role-name>demoadmin</role-name>
-        </auth-constraint>
-    </security-constraint>
-
-    <login-config>
-        <auth-method>BASIC</auth-method>
-        <realm-name>Tomcat Manager Application</realm-name>
-    </login-config>
-
-    <security-role>
-        <description>The role that is required to log in to the Manager Application</description>
-        <role-name>demoadmin</role-name>
-    </security-role>
-    -->
-    <!-- end -->
-
-
-</web-app>
diff --git a/deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace_name b/deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace_name
deleted file mode 100644
index a0332588be..0000000000
--- a/deegree-workspaces/deegree-workspace-csw/src/main/webapp/WEB-INF/workspace_name
+++ /dev/null
@@ -1 +0,0 @@
-deegree-csw-demo
\ No newline at end of file
diff --git a/deegree-workspaces/deegree-workspace-csw/src/main/webapp/index.xhtml b/deegree-workspaces/deegree-workspace-csw/src/main/webapp/index.xhtml
deleted file mode 100644
index fd31bfceb9..0000000000
--- a/deegree-workspaces/deegree-workspace-csw/src/main/webapp/index.xhtml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
-  xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jsp/jstl/core"
-  xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:dg="http://deegree.org/jsf"
-  xmlns:dgc="http://java.sun.com/jsf/composite/deegree">
-<h:head>
-  <title>deegree 3 CSW demo</title>
-  <h:outputStylesheet name="indexstyle.css" />
-  <h:outputScript name="console.js" />
-</h:head>
-<h:body>
-
-  <!-- <pre><h:outputText value="#{applicationBean.logo}" /></pre> -->
-  <div id="wrapper" align="center">
-  <div id="apDivLogo"></div>
-  <div id="apDivMain">
-  <p class="welcome">This server is running deegree catalogueService <h:outputText value="#{applicationBean.baseVersion}" /></p>
-  <p class="inline">NOTE: Before you can use this service, you have to setup the data storage. Please refer to the <a
-    href="http://wiki.deegree.org/deegreeWiki/deegree3/CatalogueService">documentation</a> for instructions.</p>
-  <p class="inline">Use address below in CSW clients to access served metadata records.</p>
-  <br />
-  <p class="inline">OGC service address: <h:outputText styleClass="url"
-    value="#{facesContext.externalContext.requestScheme}://#{facesContext.externalContext.requestServerName}:#{facesContext.externalContext.requestServerPort}#{facesContext.externalContext.requestContextPath}/services" /></p>
-  <br />
-  <p class="explain"><a href="http://wiki.deegree.org/deegreeWiki/deegree3/CatalogueService">Documentation</a>&nbsp;<h:graphicImage styleClass="image" url="#{resource['images:link.png']}" /><br />
-  Access the documentation pages with help on setup and usage.</p>
-  <p class="explain"><a href="#{facesContext.externalContext.requestContextPath}/console.jsf"> Services
-  Console</a>&nbsp;<h:graphicImage styleClass="image" url="#{resource['images:link.png']}" /><br />
-  Configure the server settings such as web services and data access.</p>
-  <p class="explain"><a href="#{facesContext.externalContext.requestContextPath}/console/client/client.xhtml">Send
-  Example Requests</a>&nbsp;<h:graphicImage styleClass="image" url="#{resource['images:link.png']}" /><br />
-  Perform raw OGC services requests.</p>
-  </div>
-  <div id="apDivFooter"><a href="http://deegree.org/" target="_blank">deegree.org</a> &nbsp; &nbsp;<a
-    href="http://www.osgeo.org/deegree" target="_blank">OSGeo.org</a></div>
-  </div>
-</h:body>
-</html>
\ No newline at end of file
diff --git a/deegree-workspaces/deegree-workspace-geosciml/pom.xml b/deegree-workspaces/deegree-workspace-geosciml/pom.xml
index 27e8e7d220..36ae404817 100644
--- a/deegree-workspaces/deegree-workspace-geosciml/pom.xml
+++ b/deegree-workspaces/deegree-workspace-geosciml/pom.xml
@@ -2,6 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>deegree-workspace-geosciml</artifactId>
   <name>deegree-workspace-geosciml</name>
+  <packaging>pom</packaging>
   <description>Example configuration for deploying GeoSciML via deegree WFS and WMS</description>
 
   <properties>
@@ -27,5 +28,13 @@
     </repository>
   </repositories>
 
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
 
diff --git a/deegree-workspaces/deegree-workspace-geosciml/src/assembly/assembly.xml b/deegree-workspaces/deegree-workspace-geosciml/src/assembly/assembly.xml
new file mode 100644
index 0000000000..14f6394ecc
--- /dev/null
+++ b/deegree-workspaces/deegree-workspace-geosciml/src/assembly/assembly.xml
@@ -0,0 +1,14 @@
+<assembly>
+  <id>workspace-zip</id>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <formats>
+    <format>zip</format>
+  </formats>
+
+  <fileSets>
+    <fileSet>
+      <directory>src/main/resources</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>
diff --git a/deegree-workspaces/deegree-workspace-utah/pom.xml b/deegree-workspaces/deegree-workspace-utah/pom.xml
index f4d54b049f..e1a26e748c 100644
--- a/deegree-workspaces/deegree-workspace-utah/pom.xml
+++ b/deegree-workspaces/deegree-workspace-utah/pom.xml
@@ -2,6 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>deegree-workspace-utah</artifactId>
   <name>deegree-workspace-utah</name>
+  <packaging>pom</packaging>
   <description>Example configuration for a web mapping setup using deegree WMS, WMTS and WFS</description>
 
   <properties>
@@ -27,14 +28,13 @@
     </repository>
   </repositories>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.deegree</groupId>
-      <artifactId>utah-demodata</artifactId>
-      <version>3.2</version>
-      <type>zip</type>
-    </dependency>
-  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 
 </project>
 
diff --git a/deegree-workspaces/deegree-workspace-utah/src/assembly/assembly.xml b/deegree-workspaces/deegree-workspace-utah/src/assembly/assembly.xml
new file mode 100644
index 0000000000..14f6394ecc
--- /dev/null
+++ b/deegree-workspaces/deegree-workspace-utah/src/assembly/assembly.xml
@@ -0,0 +1,14 @@
+<assembly>
+  <id>workspace-zip</id>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <formats>
+    <format>zip</format>
+  </formats>
+
+  <fileSets>
+    <fileSet>
+      <directory>src/main/resources</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/remoteows/cascade_demo_deegree_wms.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/remoteows/cascade_demo_deegree_wms.xml
index cdb5018082..ae106e90a9 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/remoteows/cascade_demo_deegree_wms.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/remoteows/cascade_demo_deegree_wms.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <RemoteWMS configVersion="3.4.0" xmlns="http://www.deegree.org/remoteows/wms"  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/remoteows/wms http://schemas.deegree.org/remoteows/wms/3.4.0/remotewms.xsd">
-  <CapabilitiesDocumentLocation location="http://deegree3-demo.deegree.org/utah-workspace/services?request=GetCapabilities&amp;service=WMS&amp;version=1.1.1" />
+  <CapabilitiesDocumentLocation location="https://deegree3-demo.deegree.org/utah-workspace/services?request=GetCapabilities&amp;service=WMS&amp;version=1.1.1" />
 </RemoteWMS>
  
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/remoteows/cascade_utah_geology_wms.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/remoteows/cascade_utah_geology_wms.xml
index f934e67a1b..77a1f9c169 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/remoteows/cascade_utah_geology_wms.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/remoteows/cascade_utah_geology_wms.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <RemoteWMS configVersion="3.4.0" xmlns="http://www.deegree.org/remoteows/wms" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/remoteows/wms http://schemas.deegree.org/remoteows/wms/3.4.0/remotewms.xsd">
-  <CapabilitiesDocumentLocation location="http://mrdata.usgs.gov/cgi-bin/state/ut?request=GetCapabilities&amp;service=WMS&amp;version=1.1.1"/>
+  <CapabilitiesDocumentLocation location="https://mrdata.usgs.gov/services/sgmc2?service=WMS&amp;version=1.3.0&amp;request=GetCapabilities"/>
 </RemoteWMS>
\ No newline at end of file
diff --git a/deegree-workspaces/deegree-workspace-wcts/pom.xml b/deegree-workspaces/deegree-workspace-wcts/pom.xml
index 8b42760bba..2130911b16 100644
--- a/deegree-workspaces/deegree-workspace-wcts/pom.xml
+++ b/deegree-workspaces/deegree-workspace-wcts/pom.xml
@@ -30,6 +30,9 @@
 
   <build>
     <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/deegree-workspaces/deegree-workspace-wcts/src/assembly/assembly.xml b/deegree-workspaces/deegree-workspace-wcts/src/assembly/assembly.xml
new file mode 100644
index 0000000000..18df24128c
--- /dev/null
+++ b/deegree-workspaces/deegree-workspace-wcts/src/assembly/assembly.xml
@@ -0,0 +1,21 @@
+<assembly>
+  <id>workspace-zip</id>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <formats>
+    <format>zip</format>
+  </formats>
+
+  <fileSets>
+    <fileSet>
+      <directory>src/main/resources</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>${project.build.directory}</directory>
+      <outputDirectory>/modules</outputDirectory>
+      <includes>
+        <include>/${project.artifactId}-${project.version}.jar</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/deegree-workspaces/deegree-workspace-wps/pom.xml b/deegree-workspaces/deegree-workspace-wps/pom.xml
index aad735db6b..fdde92f791 100644
--- a/deegree-workspaces/deegree-workspace-wps/pom.xml
+++ b/deegree-workspaces/deegree-workspace-wps/pom.xml
@@ -30,6 +30,9 @@
 
   <build>
     <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/deegree-workspaces/deegree-workspace-wps/src/assembly/assembly.xml b/deegree-workspaces/deegree-workspace-wps/src/assembly/assembly.xml
new file mode 100644
index 0000000000..18df24128c
--- /dev/null
+++ b/deegree-workspaces/deegree-workspace-wps/src/assembly/assembly.xml
@@ -0,0 +1,21 @@
+<assembly>
+  <id>workspace-zip</id>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <formats>
+    <format>zip</format>
+  </formats>
+
+  <fileSets>
+    <fileSet>
+      <directory>src/main/resources</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>${project.build.directory}</directory>
+      <outputDirectory>/modules</outputDirectory>
+      <includes>
+        <include>/${project.artifactId}-${project.version}.jar</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/geometry/DescribeProcess/xml/DescribeAll.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/geometry/DescribeProcess/xml/DescribeAll.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/geometry/DescribeProcess/xml/DescribeAll.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/geometry/DescribeProcess/xml/DescribeAll.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/geometry/Execute/xml/Buffer.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/geometry/Execute/xml/Buffer.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/geometry/Execute/xml/Buffer.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/geometry/Execute/xml/Buffer.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/geometry/Execute/xml/Centroid.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/geometry/Execute/xml/Centroid.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/geometry/Execute/xml/Centroid.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/geometry/Execute/xml/Centroid.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/geometry/Execute/xml/Contains.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/geometry/Execute/xml/Contains.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/geometry/Execute/xml/Contains.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/geometry/Execute/xml/Contains.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/geometry/Execute/xml/ConvexHull.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/geometry/Execute/xml/ConvexHull.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/geometry/Execute/xml/ConvexHull.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/geometry/Execute/xml/ConvexHull.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/geometry/Execute/xml/Crosses.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/geometry/Execute/xml/Crosses.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/geometry/Execute/xml/Crosses.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/geometry/Execute/xml/Crosses.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/geometry/Execute/xml/Difference.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/geometry/Execute/xml/Difference.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/geometry/Execute/xml/Difference.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/geometry/Execute/xml/Difference.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/geometry/Execute/xml/Distance.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/geometry/Execute/xml/Distance.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/geometry/Execute/xml/Distance.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/geometry/Execute/xml/Distance.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/geometry/Execute/xml/Equals.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/geometry/Execute/xml/Equals.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/geometry/Execute/xml/Equals.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/geometry/Execute/xml/Equals.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/geometry/Execute/xml/Intersection.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/geometry/Execute/xml/Intersection.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/geometry/Execute/xml/Intersection.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/geometry/Execute/xml/Intersection.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/geometry/Execute/xml/Touches.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/geometry/Execute/xml/Touches.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/geometry/Execute/xml/Touches.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/geometry/Execute/xml/Touches.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/geometry/Execute/xml/Union.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/geometry/Execute/xml/Union.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/geometry/Execute/xml/Union.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/geometry/Execute/xml/Union.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/geometry/GetCapabilties/xml/GetCapabilities.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/geometry/GetCapabilties/xml/GetCapabilities.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/geometry/GetCapabilties/xml/GetCapabilities.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/geometry/GetCapabilties/xml/GetCapabilities.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/parameter/DescribeProcess/xml/DescribeAll.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/parameter/DescribeProcess/xml/DescribeAll.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/parameter/DescribeProcess/xml/DescribeAll.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/parameter/DescribeProcess/xml/DescribeAll.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/parameter/DescribeProcess/xml/DescribeAllSOAP.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/parameter/DescribeProcess/xml/DescribeAllSOAP.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/parameter/DescribeProcess/xml/DescribeAllSOAP.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/parameter/DescribeProcess/xml/DescribeAllSOAP.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/parameter/Execute/xml/ParameterDemo.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/parameter/Execute/xml/ParameterDemo.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/parameter/Execute/xml/ParameterDemo.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/parameter/Execute/xml/ParameterDemo.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/parameter/Execute/xml/ParameterDemoInputByReference.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/parameter/Execute/xml/ParameterDemoInputByReference.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/parameter/Execute/xml/ParameterDemoInputByReference.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/parameter/Execute/xml/ParameterDemoInputByReference.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/parameter/Execute/xml/ParameterDemoLineage.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/parameter/Execute/xml/ParameterDemoLineage.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/parameter/Execute/xml/ParameterDemoLineage.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/parameter/Execute/xml/ParameterDemoLineage.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/parameter/Execute/xml/ParameterDemoOutputsAsReferences.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/parameter/Execute/xml/ParameterDemoOutputsAsReferences.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/parameter/Execute/xml/ParameterDemoOutputsAsReferences.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/parameter/Execute/xml/ParameterDemoOutputsAsReferences.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/parameter/Execute/xml/ParameterDemoRawDataOutputBinary.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/parameter/Execute/xml/ParameterDemoRawDataOutputBinary.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/parameter/Execute/xml/ParameterDemoRawDataOutputBinary.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/parameter/Execute/xml/ParameterDemoRawDataOutputBinary.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/parameter/Execute/xml/ParameterDemoRawDataOutputXML.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/parameter/Execute/xml/ParameterDemoRawDataOutputXML.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/parameter/Execute/xml/ParameterDemoRawDataOutputXML.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/parameter/Execute/xml/ParameterDemoRawDataOutputXML.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/parameter/Execute/xml/ParameterDemoSOAP.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/parameter/Execute/xml/ParameterDemoSOAP.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/parameter/Execute/xml/ParameterDemoSOAP.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/parameter/Execute/xml/ParameterDemoSOAP.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/parameter/Execute/xml/ParameterDemoStoreResponseDocument.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/parameter/Execute/xml/ParameterDemoStoreResponseDocument.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/parameter/Execute/xml/ParameterDemoStoreResponseDocument.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/parameter/Execute/xml/ParameterDemoStoreResponseDocument.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/parameter/GetCapabilties/xml/GetCapabilities.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/parameter/GetCapabilties/xml/GetCapabilities.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/parameter/GetCapabilties/xml/GetCapabilities.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/parameter/GetCapabilties/xml/GetCapabilities.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/parameter/GetCapabilties/xml/GetCapabilitiesSOAP.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/parameter/GetCapabilties/xml/GetCapabilitiesSOAP.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/manager/requests/wps/parameter/GetCapabilties/xml/GetCapabilitiesSOAP.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/manager/requests/wps/parameter/GetCapabilties/xml/GetCapabilitiesSOAP.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/processes/BufferProcess.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/BufferProcess.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/processes/BufferProcess.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/BufferProcess.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/processes/CentroidProcess.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/CentroidProcess.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/processes/CentroidProcess.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/CentroidProcess.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/processes/ContainsProcess.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/ContainsProcess.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/processes/ContainsProcess.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/ContainsProcess.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/processes/ConvexHullProcess.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/ConvexHullProcess.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/processes/ConvexHullProcess.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/ConvexHullProcess.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/processes/CrossesProcess.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/CrossesProcess.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/processes/CrossesProcess.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/CrossesProcess.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/processes/DifferenceProcess.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/DifferenceProcess.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/processes/DifferenceProcess.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/DifferenceProcess.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/processes/DistanceProcess.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/DistanceProcess.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/processes/DistanceProcess.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/DistanceProcess.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/processes/EqualsProcess.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/EqualsProcess.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/processes/EqualsProcess.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/EqualsProcess.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/processes/IntersectionProcess.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/IntersectionProcess.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/processes/IntersectionProcess.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/IntersectionProcess.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/processes/ParameterDemoProcess.wsdl b/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/ParameterDemoProcess.wsdl
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/processes/ParameterDemoProcess.wsdl
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/ParameterDemoProcess.wsdl
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/processes/ParameterDemoProcess.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/ParameterDemoProcess.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/processes/ParameterDemoProcess.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/ParameterDemoProcess.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/processes/TouchesProcess.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/TouchesProcess.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/processes/TouchesProcess.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/TouchesProcess.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/processes/UnionProcess.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/UnionProcess.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/processes/UnionProcess.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/UnionProcess.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/services/main.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/services/main.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/services/main.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/services/main.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/services/metadata.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/services/metadata.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/services/metadata.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/services/metadata.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/services/wps.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/services/wps.xml
similarity index 100%
rename from deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace/services/wps.xml
rename to deegree-workspaces/deegree-workspace-wps/src/main/resources/services/wps.xml
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace_name b/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace_name
deleted file mode 100644
index 5d6a7ad1bf..0000000000
--- a/deegree-workspaces/deegree-workspace-wps/src/main/webapp/WEB-INF/workspace_name
+++ /dev/null
@@ -1 +0,0 @@
-deegree-wps-demo
\ No newline at end of file
diff --git a/deegree-workspaces/pom.xml b/deegree-workspaces/pom.xml
index 7b6a0e014b..392ed13d50 100644
--- a/deegree-workspaces/pom.xml
+++ b/deegree-workspaces/pom.xml
@@ -25,8 +25,29 @@
   </repositories>
 
   <build>
-    <plugins>
-    </plugins>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>3.3.0</version>
+          <configuration>
+            <descriptors>
+              <descriptor>src/assembly/assembly.xml</descriptor>
+            </descriptors>
+            <appendAssemblyId>false</appendAssemblyId>
+          </configuration>
+          <executions>
+            <execution>
+              <id>create-zip</id>
+              <phase>package</phase>
+              <goals>
+                <goal>single</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
   </build>
 
   <modules>