diff --git a/pom.xml b/pom.xml
index 39cbaef7e5..3ed195ef56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,6 +17,7 @@
     <module>plugins</module>
     <module>scm-agent</module>
     <module>scm-webapp</module>
+    <module>scm-server</module>
   </modules>
 
   <repositories>
diff --git a/scm-server-jetty/src/main/java/sonia/scm/server/jetty/JettyServer.java b/scm-server-jetty/src/main/java/sonia/scm/server/jetty/JettyServer.java
index 8ac31adc4b..902f70d699 100644
--- a/scm-server-jetty/src/main/java/sonia/scm/server/jetty/JettyServer.java
+++ b/scm-server-jetty/src/main/java/sonia/scm/server/jetty/JettyServer.java
@@ -93,9 +93,9 @@ public class JettyServer implements Server
 
     wac.setContextPath(config.getContextPath());
     wac.setWar(webapp.getAbsolutePath());
-    wac.setExtractWAR(false);
-    server.setHandler(server);
-    server.setStopAtShutdown(true);
+    wac.setExtractWAR(true);
+    server.setHandler(wac);
+    //server.setStopAtShutdown(true);
 
     try
     {
diff --git a/scm-server/pom.xml b/scm-server/pom.xml
new file mode 100644
index 0000000000..abcc6e89f7
--- /dev/null
+++ b/scm-server/pom.xml
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+  <modelVersion>4.0.0</modelVersion>
+  
+  <parent>
+    <artifactId>scm</artifactId>
+    <groupId>sonia.scm</groupId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <groupId>sonia.scm</groupId>
+  <artifactId>scm-server</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <name>scm-server</name>
+  <packaging>pom</packaging>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>sonia.scm</groupId>
+      <artifactId>scm-core</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>sonia.scm</groupId>
+      <artifactId>scm-server-api</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>sonia.scm</groupId>
+      <artifactId>scm-server-jetty</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+
+  </dependencies>
+
+  <build>
+
+    <plugins>
+
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>appassembler-maven-plugin</artifactId>
+        <version>1.0</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>create-repository</goal>
+              <goal>generate-daemons</goal>
+            </goals>
+            <configuration>
+              <target>${project.build.directory}/appassembler</target>
+              <assembleDirectory>${project.build.directory}/appassembler/jsw/scm-server</assembleDirectory>
+              <repoPath>lib</repoPath>
+              <repositoryLayout>flat</repositoryLayout>
+              <includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>
+
+              <daemons>
+                <daemon>
+                  <id>scm-server</id>
+                  <mainClass>sonia.scm.server.ServerApplication</mainClass>
+                  <platforms>
+                    <platform>jsw</platform>
+                  </platforms>
+
+                  <jvmSettings>
+                    <initialMemorySize>256m</initialMemorySize>
+                    <maxMemorySize>256m</maxMemorySize>
+                  </jvmSettings>
+
+                  <generatorConfigurations>
+                    <generatorConfiguration>
+                      <generator>jsw</generator>
+                      <includes>
+                        <include>linux-x86-32</include>
+                        <include>linux-x86-64</include>
+                        <include>windows-32</include>
+                        <include>windows-64</include>
+                      </includes>
+                      <configuration>
+                        <property>
+                          <name>configuration.directory.in.classpath.first</name>
+                          <value>conf</value>
+                        </property>
+                        <property>
+                          <name>set.default.REPO_DIR</name>
+                          <value>lib</value>
+                          <property>
+                            <name>wrapper.logfile</name>
+                            <value>logs/wrapper.log</value>
+                          </property>
+                        </property>
+                      </configuration>
+                    </generatorConfiguration>
+                  </generatorConfigurations>
+
+                </daemon>
+              </daemons>
+
+
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>2.1</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>copy</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>${project.groupId}</groupId>
+                  <artifactId>scm-webapp</artifactId>
+                  <version>1.0-SNAPSHOT</version>
+                  <type>war</type>
+                  <outputDirectory>${project.build.directory}/appassembler/jsw/scm-server/webapp</outputDirectory>
+                  <destFileName>scm-webapp.war</destFileName>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2-beta-5</version>
+        <configuration>
+          <descriptors>
+            <descriptor>src/main/assembly/scm-server-jsw.xml</descriptor>
+          </descriptors>
+        </configuration>
+        <executions>
+          <execution>
+            <id>jsw</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+    </plugins>
+
+    <finalName>scm-server</finalName>
+  </build>
+
+</project>
diff --git a/scm-server/src/main/assembly/scm-server-jsw.xml b/scm-server/src/main/assembly/scm-server-jsw.xml
new file mode 100644
index 0000000000..0ca822fb12
--- /dev/null
+++ b/scm-server/src/main/assembly/scm-server-jsw.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    Document   : scm-server-jsw.xml
+    Created on : September 10, 2010, 11:59 AM
+    Author     : sdorra
+    Description:
+        Purpose of the document follows.
+-->
+
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+
+  <id>jsw</id>
+
+  <formats>
+    <format>zip</format>
+    <format>tar.gz</format>
+    <format>tar.bz2</format>
+  </formats>
+
+  <includeBaseDirectory>true</includeBaseDirectory>
+  
+  <fileSets>
+    <fileSet>
+      <directory>target/appassembler/jsw/scm-server/bin</directory>
+      <filtered>false</filtered>
+      <outputDirectory>bin</outputDirectory>
+      <directoryMode>0755</directoryMode>
+    </fileSet>
+    <fileSet>
+      <directory>target/appassembler/jsw/scm-server/conf</directory>
+      <filtered>true</filtered>
+      <outputDirectory>conf</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>target/appassembler/jsw/scm-server/lib</directory>
+      <filtered>false</filtered>
+      <outputDirectory>lib</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>target/appassembler/jsw/scm-server/webapp</directory>
+      <filtered>false</filtered>
+      <outputDirectory>webapp</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>target</directory>
+      <filtered>false</filtered>
+      <excludes>
+        <exclude>**/*</exclude>
+      </excludes>
+      <outputDirectory>logs</outputDirectory>
+    </fileSet>
+  </fileSets>
+
+  <files>
+    <file>
+      <source>src/main/conf/app-info.xml</source>
+      <filtered>true</filtered>
+      <outputDirectory>conf</outputDirectory>
+    </file>
+  </files>
+  
+</assembly>
\ No newline at end of file
diff --git a/scm-server/src/main/conf/app-info.xml b/scm-server/src/main/conf/app-info.xml
new file mode 100644
index 0000000000..931094da60
--- /dev/null
+++ b/scm-server/src/main/conf/app-info.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    Document   : app-info.xml
+    Created on : September 11, 2010, 6:14 PM
+    Author     : sdorra
+    Description:
+        Purpose of the document follows.
+-->
+
+<app-info>
+
+  <name>${pom.name}</name>
+  <version>${pom.version}</version>
+  <appName>scm-webapp.war</appName>
+
+</app-info>