diff --git a/gemp-lotr/gemp-lotr-web-server/pom.xml b/gemp-lotr/gemp-lotr-web-server/pom.xml
new file mode 100644
index 000000000..7615636b1
--- /dev/null
+++ b/gemp-lotr/gemp-lotr-web-server/pom.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>gemp-lotr</artifactId>
+        <groupId>com.gempukku.lotro</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.gempukku.lotro</groupId>
+    <artifactId>gemp-lotr-web-server</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>war</packaging>
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>gemp-lotr-server</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.6</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.4</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-server</artifactId>
+            <version>1.8</version>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/AbstractResource.java b/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/AbstractResource.java
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/AbstractResource.java
rename to gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/AbstractResource.java
diff --git a/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/AdminResource.java b/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/AdminResource.java
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/AdminResource.java
rename to gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/AdminResource.java
diff --git a/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/ChatResource.java b/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/ChatResource.java
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/ChatResource.java
rename to gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/ChatResource.java
diff --git a/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/CollectionResource.java b/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/CollectionResource.java
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/CollectionResource.java
rename to gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/CollectionResource.java
diff --git a/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/DeckResource.java b/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/DeckResource.java
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/DeckResource.java
rename to gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/DeckResource.java
diff --git a/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/DeliveryResource.java b/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/DeliveryResource.java
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/DeliveryResource.java
rename to gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/DeliveryResource.java
diff --git a/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/GameResource.java b/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/GameResource.java
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/GameResource.java
rename to gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/GameResource.java
diff --git a/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/HallResource.java b/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/HallResource.java
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/HallResource.java
rename to gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/HallResource.java
diff --git a/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/LeagueResource.java b/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/LeagueResource.java
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/LeagueResource.java
rename to gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/LeagueResource.java
diff --git a/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/MerchantResource.java b/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/MerchantResource.java
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/MerchantResource.java
rename to gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/MerchantResource.java
diff --git a/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/ServerResource.java b/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/ServerResource.java
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/ServerResource.java
rename to gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/ServerResource.java
diff --git a/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/TradeResource.java b/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/TradeResource.java
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/TradeResource.java
rename to gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/TradeResource.java
diff --git a/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/provider/CardLibraryProvider.java b/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/provider/CardLibraryProvider.java
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/provider/CardLibraryProvider.java
rename to gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/provider/CardLibraryProvider.java
diff --git a/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/provider/DaoProvider.java b/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/provider/DaoProvider.java
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/provider/DaoProvider.java
rename to gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/provider/DaoProvider.java
diff --git a/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/provider/PacksStorageProvider.java b/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/provider/PacksStorageProvider.java
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/provider/PacksStorageProvider.java
rename to gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/provider/PacksStorageProvider.java
diff --git a/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/provider/ServerProvider.java b/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/provider/ServerProvider.java
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/provider/ServerProvider.java
rename to gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/provider/ServerProvider.java
diff --git a/gemp-lotr/gemp-lotr-web/src/main/resources/log4j.xml b/gemp-lotr/gemp-lotr-web-server/src/main/resources/log4j.xml
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/resources/log4j.xml
rename to gemp-lotr/gemp-lotr-web-server/src/main/resources/log4j.xml
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/WEB-INF/web.xml b/gemp-lotr/gemp-lotr-web-server/src/main/webapp/WEB-INF/web.xml
similarity index 92%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/WEB-INF/web.xml
rename to gemp-lotr/gemp-lotr-web-server/src/main/webapp/WEB-INF/web.xml
index 960b29e76..467883405 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/WEB-INF/web.xml
+++ b/gemp-lotr/gemp-lotr-web-server/src/main/webapp/WEB-INF/web.xml
@@ -13,6 +13,6 @@
 
     <servlet-mapping>
         <servlet-name>jersey</servlet-name>
-        <url-pattern>/server/*</url-pattern>
+        <url-pattern>/*</url-pattern>
     </servlet-mapping>
 </web-app>
diff --git a/gemp-lotr/gemp-lotr-web/pom.xml b/gemp-lotr/gemp-lotr-web/pom.xml
index af76c3393..d1febc942 100644
--- a/gemp-lotr/gemp-lotr-web/pom.xml
+++ b/gemp-lotr/gemp-lotr-web/pom.xml
@@ -11,27 +11,4 @@
     <artifactId>gemp-lotr-web</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>war</packaging>
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>gemp-lotr-server</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.6</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.4</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-server</artifactId>
-            <version>1.8</version>
-        </dependency>
-    </dependencies>
 </project>
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html
index c7f68a88e..6e5dedecb 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html
@@ -362,7 +362,7 @@ body {
             function () {
                 var replay = getUrlParam("replayId");
 
-                ui = new GempLotrGameUI("/gemp-lotr/server", replay != null);
+                ui = new GempLotrGameUI("/gemp-lotr-server", replay != null);
 
                 $(window).resize(function() {
                     ui.windowResized();
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html
index 2f7b2c852..d55c15064 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html
@@ -190,11 +190,11 @@
                 $("#latestNews").append("<b>All sets are available to play.</b> "
                         + "If you find any problems with specific card or rules in general, please report it <a href='http://lotrtcgdb.com/forums/index.php/topic,7592.0.html'>at the TLHH forums</a>.");
 
-                chat = new ChatBoxUI("Game Hall", $("#chat"), "/gemp-lotr/server", true, null, true);
+                chat = new ChatBoxUI("Game Hall", $("#chat"), "/gemp-lotr-server", true, null, true);
                 chat.setBounds(2, 2, 780 - 4, 200 - 4);
                 chat.showTimestamps = true;
 
-                hall = new GempLotrHallUI($("#hall"), "/gemp-lotr/server", chat);
+                hall = new GempLotrHallUI($("#hall"), "/gemp-lotr-server", chat);
 
                 $("#tabs").tabs();
 
@@ -284,7 +284,7 @@
             document.write('<li><a href="includes/leagueRules.html?_=' + (new Date().getTime()) + '">League Rules (updated)</a></li>');
         </script>
         <li><a href="includes/instruction.html">Manual</a></li>
-        <li><a href="/gemp-lotr/server/hall/formats/html">Format Rules</a></li>
+        <li><a href="/gemp-lotr-server/hall/formats/html">Format Rules</a></li>
         <li><a href="includes/contribute.html">Contribute</a></li>
         <script type="text/javascript">
             document.write('<li><a href="includes/changeLog.html?_=' + (new Date().getTime()) + '">Change Log</a></li>');
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/gameHistory.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/gameHistory.html
index 2f8819457..3498d433b 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/gameHistory.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/gameHistory.html
@@ -1,7 +1,7 @@
 <script type="text/javascript">
     $(document).ready(
             function () {
-                var ui = new GameHistoryUI("/gemp-lotr/server");
+                var ui = new GameHistoryUI("/gemp-lotr-server");
             });
 
 </script>
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/leagueResults.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/leagueResults.html
index 7e1642ff3..ac413178c 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/leagueResults.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/leagueResults.html
@@ -1,7 +1,7 @@
 <script type="text/javascript">
     $(document).ready(
             function () {
-                var ui = new LeagueResultsUI("/gemp-lotr/server");
+                var ui = new LeagueResultsUI("/gemp-lotr-server");
             });
 
 </script>
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/index.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/index.html
index a7f281f9f..73bb92b8d 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/index.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/index.html
@@ -50,7 +50,7 @@
             return this;
         };
 
-        var comm = new GempLotrCommunication("/gemp-lotr/server", function() {
+        var comm = new GempLotrCommunication("/gemp-lotr-server", function() {
             alert("Unable to contact the server");
         });
 
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/deckBuildingUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/deckBuildingUi.js
index 0fcfbcea3..93569ef28 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/deckBuildingUi.js
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/deckBuildingUi.js
@@ -48,7 +48,7 @@ var GempLotrDeckBuildingUI = Class.extend({
     init: function() {
         var that = this;
 
-        this.comm = new GempLotrCommunication("/gemp-lotr/server", that.processError);
+        this.comm = new GempLotrCommunication("/gemp-lotr-server", that.processError);
 
         this.cardFilter = new CardFilter($("#collectionDiv"),
                 function(filter, start, count, callback) {
@@ -145,10 +145,10 @@ var GempLotrDeckBuildingUI = Class.extend({
                                     if (confirm("Do you wish to save this deck?"))
                                         that.saveDeck(false);
                                 }, {
-                                    "404": function() {
-                                        alert("Couldn't find the deck to rename on the server.");
-                                    }
-                                });
+                            "404": function() {
+                                alert("Couldn't find the deck to rename on the server.");
+                            }
+                        });
                     }
                 });
 
@@ -244,11 +244,11 @@ var GempLotrDeckBuildingUI = Class.extend({
 
         this.infoDialog = $("<div></div>")
                 .dialog({
-                    autoOpen: false,
-                    closeOnEscape: true,
-                    resizable: false,
-                    title: "Card information"
-                });
+            autoOpen: false,
+            closeOnEscape: true,
+            resizable: false,
+            title: "Card information"
+        });
 
         var swipeOptions = {
             threshold: 20,
@@ -296,14 +296,14 @@ var GempLotrDeckBuildingUI = Class.extend({
             if (that.deckListDialog == null) {
                 that.deckListDialog = $("<div></div>")
                         .dialog({
-                            title: "Your stored decks",
-                            autoOpen: false,
-                            closeOnEscape: true,
-                            resizable: true,
-                            width: 400,
-                            height: 400,
-                            modal: true
-                        });
+                    title: "Your stored decks",
+                    autoOpen: false,
+                    closeOnEscape: true,
+                    resizable: true,
+                    width: 400,
+                    height: 400,
+                    modal: true
+                });
             }
             that.deckListDialog.html("");
 
@@ -338,7 +338,7 @@ var GempLotrDeckBuildingUI = Class.extend({
                     deckListBut.click(
                             (function(deckName) {
                                 return function() {
-                                    window.open('/gemp-lotr/server/deck/html?deckName=' + encodeURIComponent(deckName), "_blank");
+                                    window.open('/gemp-lotr-server/deck/html?deckName=' + encodeURIComponent(deckName), "_blank");
                                 };
                             })(deckName));
 
@@ -418,14 +418,14 @@ var GempLotrDeckBuildingUI = Class.extend({
                             if (this.selectionDialog == null) {
                                 this.selectionDialog = $("<div></div>")
                                         .dialog({
-                                            title: "Choose one",
-                                            autoOpen: false,
-                                            closeOnEscape: true,
-                                            resizable: true,
-                                            width: 400,
-                                            height: 200,
-                                            modal: true
-                                        });
+                                    title: "Choose one",
+                                    autoOpen: false,
+                                    closeOnEscape: true,
+                                    resizable: true,
+                                    width: 400,
+                                    height: 200,
+                                    modal: true
+                                });
 
                                 this.selectionGroup = new NormalCardGroup(this.selectionDialog, function(card) {
                                     return true;
@@ -662,10 +662,10 @@ var GempLotrDeckBuildingUI = Class.extend({
                                     that.checkDeckStatsDirty();
                                 }, that.checkDirtyInterval);
                     }, {
-                        "400": function() {
-                            alert("Invalid deck for getting stats.");
-                        }
-                    });
+                "400": function() {
+                    alert("Invalid deck for getting stats.");
+                }
+            });
         } else {
             $("#deckStats").html("Deck has no Ring, Ring-bearer or all 9 sites");
             setTimeout(
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/merchantUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/merchantUi.js
index 6d0908571..d64cb2bdf 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/merchantUi.js
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/merchantUi.js
@@ -21,7 +21,7 @@ var GempLotrMerchantUI = Class.extend({
     init: function(cardListElem, cardFilterElem) {
         var that = this;
 
-        this.comm = new GempLotrCommunication("/gemp-lotr/server", that.processError);
+        this.comm = new GempLotrCommunication("/gemp-lotr-server", that.processError);
 
         this.cardFilter = new CardFilter(cardFilterElem,
                 function(filter, start, count, callback) {
@@ -70,20 +70,20 @@ var GempLotrMerchantUI = Class.extend({
 
         this.infoDialog = $("<div></div>")
                 .dialog({
-                    autoOpen: false,
-                    closeOnEscape: true,
-                    resizable: false,
-                    title: "Card information"
-                });
+            autoOpen: false,
+            closeOnEscape: true,
+            resizable: false,
+            title: "Card information"
+        });
 
         this.questionDialog = $("<div></div>")
                 .dialog({
-                    autoOpen: false,
-                    closeOnEscape: true,
-                    resizable: false,
-                    modal: true,
-                    title: "Merchant operation"
-                });
+            autoOpen: false,
+            closeOnEscape: true,
+            resizable: false,
+            modal: true,
+            title: "Merchant operation"
+        });
 
         var swipeOptions = {
             threshold: 20,
diff --git a/gemp-lotr/pom.xml b/gemp-lotr/pom.xml
index 05b1dd878..3dbe743a1 100644
--- a/gemp-lotr/pom.xml
+++ b/gemp-lotr/pom.xml
@@ -13,6 +13,7 @@
     <modules>
         <module>gemp-lotr-server</module>
         <module>gemp-lotr-web</module>
+        <module>gemp-lotr-web-server</module>
         <module>gemp-lotr-logic</module>
         <module>gemp-lotr-common</module>
         <module>gemp-lotr-cards</module>