diff --git a/gemp-lotr/gemp-lotr-async/pom.xml b/gemp-lotr/gemp-lotr-async/pom.xml
index 4717560c7..a13356241 100644
--- a/gemp-lotr/gemp-lotr-async/pom.xml
+++ b/gemp-lotr/gemp-lotr-async/pom.xml
@@ -13,7 +13,7 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>gemp-lotr-web-server</artifactId>
+            <artifactId>gemp-lotr-server</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -22,4 +22,43 @@
             <version>3.6.1.Final</version>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>com.gempukku.lotro.async.LotroAsyncServer</mainClass>
+                        </manifest>
+                    </archive>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                    <finalName>gemp-lotr-async</finalName>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <descriptors>
+                        <descriptor>zip-web-descriptor.xml</descriptor>
+                    </descriptors>
+                    <finalName>web</finalName>
+                    <appendAssemblyId>false</appendAssemblyId>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LotroAsyncServer.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LotroAsyncServer.java
index 7cfd1d5b7..65ace2b98 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LotroAsyncServer.java
+++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LotroAsyncServer.java
@@ -1,5 +1,6 @@
 package com.gempukku.lotro.async;
 
+import com.gempukku.lotro.common.ApplicationConfiguration;
 import org.jboss.netty.bootstrap.ServerBootstrap;
 import org.jboss.netty.channel.ChannelFactory;
 import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
@@ -21,6 +22,6 @@ public class LotroAsyncServer {
 
         bootstrap.setOption("child.tcpNoDelay", true);
         bootstrap.setOption("child.keepAlive", true);
-        bootstrap.bind(new InetSocketAddress(8080));
+        bootstrap.bind(new InetSocketAddress(Integer.parseInt(ApplicationConfiguration.getProperty("port"))));
     }
 }
diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LotroServerPipelineFactory.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LotroServerPipelineFactory.java
index 1bdc4f1a6..3498c1e9d 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LotroServerPipelineFactory.java
+++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LotroServerPipelineFactory.java
@@ -2,10 +2,10 @@ package com.gempukku.lotro.async;
 
 import com.gempukku.lotro.async.handler.RootUriRequestHandler;
 import com.gempukku.lotro.async.handler.UriRequestHandler;
+import com.gempukku.lotro.builder.DaoBuilder;
+import com.gempukku.lotro.builder.PacksStorageBuilder;
+import com.gempukku.lotro.builder.ServerBuilder;
 import com.gempukku.lotro.packs.PacksStorage;
-import com.gempukku.lotro.server.provider.DaoBuilder;
-import com.gempukku.lotro.server.provider.PacksStorageBuilder;
-import com.gempukku.lotro.server.provider.ServerBuilder;
 import org.jboss.netty.channel.ChannelPipeline;
 import org.jboss.netty.channel.ChannelPipelineFactory;
 import org.jboss.netty.channel.Channels;
diff --git a/gemp-lotr/gemp-lotr-async/zip-web-descriptor.xml b/gemp-lotr/gemp-lotr-async/zip-web-descriptor.xml
new file mode 100644
index 000000000..d1b1a2908
--- /dev/null
+++ b/gemp-lotr/gemp-lotr-async/zip-web-descriptor.xml
@@ -0,0 +1,16 @@
+<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 ">
+
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <fileSets>
+        <fileSet>
+            <directory>${basedir}/../gemp-lotr-web/src/main/webapp/</directory>
+            <outputDirectory></outputDirectory>
+            <filtered>false</filtered>
+        </fileSet>
+    </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/provider/DaoBuilder.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/builder/DaoBuilder.java
similarity index 96%
rename from gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/provider/DaoBuilder.java
rename to gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/builder/DaoBuilder.java
index 0e71796d2..b161a2d03 100644
--- a/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/provider/DaoBuilder.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/builder/DaoBuilder.java
@@ -1,4 +1,4 @@
-package com.gempukku.lotro.server.provider;
+package com.gempukku.lotro.builder;
 
 import com.gempukku.lotro.cache.CacheManager;
 import com.gempukku.lotro.collection.CachedCollectionDAO;
diff --git a/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/provider/PacksStorageBuilder.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/builder/PacksStorageBuilder.java
similarity index 97%
rename from gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/provider/PacksStorageBuilder.java
rename to gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/builder/PacksStorageBuilder.java
index 7935dc8c4..1ffdcf110 100644
--- a/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/provider/PacksStorageBuilder.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/builder/PacksStorageBuilder.java
@@ -1,4 +1,4 @@
-package com.gempukku.lotro.server.provider;
+package com.gempukku.lotro.builder;
 
 import com.gempukku.lotro.packs.*;
 import org.apache.log4j.Logger;
diff --git a/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/provider/ServerBuilder.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/builder/ServerBuilder.java
similarity index 97%
rename from gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/provider/ServerBuilder.java
rename to gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/builder/ServerBuilder.java
index 67decd945..a7dffa8f5 100644
--- a/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/provider/ServerBuilder.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/builder/ServerBuilder.java
@@ -1,4 +1,4 @@
-package com.gempukku.lotro.server.provider;
+package com.gempukku.lotro.builder;
 
 import com.gempukku.lotro.chat.ChatServer;
 import com.gempukku.lotro.collection.CollectionsManager;
diff --git a/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/provider/MapProvider.java b/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/provider/MapProvider.java
index 8e4d846cb..561d8953a 100644
--- a/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/provider/MapProvider.java
+++ b/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/provider/MapProvider.java
@@ -1,5 +1,8 @@
 package com.gempukku.lotro.server.provider;
 
+import com.gempukku.lotro.builder.DaoBuilder;
+import com.gempukku.lotro.builder.PacksStorageBuilder;
+import com.gempukku.lotro.builder.ServerBuilder;
 import com.gempukku.lotro.packs.PacksStorage;
 import com.sun.jersey.core.spi.component.ComponentContext;
 import com.sun.jersey.core.spi.component.ComponentScope;