diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild.html
index af689cba9..8fcb227cb 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild.html
@@ -95,16 +95,16 @@
     <script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
     <script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
 
-    <script type="text/javascript" src="js/gemp-003/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-003/common.js"></script>
-    <script type="text/javascript" src="js/gemp-003/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-003/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-003/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-003/jCards.js"></script>
-    <script type="text/javascript" src="js/gemp-003/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-003/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-003/deckBuildingUi.js"></script>
-    <script type="text/javascript" src="js/gemp-003/cardFilter.js"></script>
+    <script type="text/javascript" src="js/gemp-004/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-004/common.js"></script>
+    <script type="text/javascript" src="js/gemp-004/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-004/deliveryService.js"></script>
+    <script type="text/javascript" src="js/gemp-004/jCardGroup.js"></script>
+    <script type="text/javascript" src="js/gemp-004/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-004/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-004/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-004/deckBuildingUi.js"></script>
+    <script type="text/javascript" src="js/gemp-004/cardFilter.js"></script>
 
     <script type="text/javascript">
 
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 7d811a577..5cbcbd7d8 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html
@@ -320,16 +320,16 @@ body {
 <script type="text/javascript" src="js/jquery/jquery.spinnercontrol.js"></script>
 <script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
 
-<script type="text/javascript" src="js/gemp-003/inheritance.js"></script>
-<script type="text/javascript" src="js/gemp-003/communication.js"></script>
-<script type="text/javascript" src="js/gemp-003/common.js"></script>
-<script type="text/javascript" src="js/gemp-003/chat.js"></script>
-<script type="text/javascript" src="js/gemp-003/commonUi.js"></script>
-<script type="text/javascript" src="js/gemp-003/gameUi.js"></script>
-<script type="text/javascript" src="js/gemp-003/gameAnimations.js"></script>
-<script type="text/javascript" src="js/gemp-003/jCardGroup.js"></script>
-<script type="text/javascript" src="js/gemp-003/jCards.js"></script>
-<script type="text/javascript" src="js/gemp-003/logging.js"></script>
+<script type="text/javascript" src="js/gemp-004/inheritance.js"></script>
+<script type="text/javascript" src="js/gemp-004/communication.js"></script>
+<script type="text/javascript" src="js/gemp-004/common.js"></script>
+<script type="text/javascript" src="js/gemp-004/chat.js"></script>
+<script type="text/javascript" src="js/gemp-004/commonUi.js"></script>
+<script type="text/javascript" src="js/gemp-004/gameUi.js"></script>
+<script type="text/javascript" src="js/gemp-004/gameAnimations.js"></script>
+<script type="text/javascript" src="js/gemp-004/jCardGroup.js"></script>
+<script type="text/javascript" src="js/gemp-004/jCards.js"></script>
+<script type="text/javascript" src="js/gemp-004/logging.js"></script>
 
 <script type="text/javascript">
     var ui;
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 133496930..a7242cf7e 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html
@@ -162,19 +162,19 @@
 <script type="text/javascript" src="js/jquery/jquery-1.6.2.js"></script>
 <script type="text/javascript" src="js/jquery/jquery-ui-1.8.16.custom.min.js"></script>
 
-<script type="text/javascript" src="js/gemp-003/inheritance.js"></script>
-<script type="text/javascript" src="js/gemp-003/common.js"></script>
-<script type="text/javascript" src="js/gemp-003/logging.js"></script>
-<script type="text/javascript" src="js/gemp-003/chat.js"></script>
-<script type="text/javascript" src="js/gemp-003/commonUi.js"></script>
-<script type="text/javascript" src="js/gemp-003/hallUi.js"></script>
-<script type="text/javascript" src="js/gemp-003/leagueResultsUi.js"></script>
-<script type="text/javascript" src="js/gemp-003/gameHistoryUi.js"></script>
-<script type="text/javascript" src="js/gemp-003/communication.js"></script>
+<script type="text/javascript" src="js/gemp-004/inheritance.js"></script>
+<script type="text/javascript" src="js/gemp-004/common.js"></script>
+<script type="text/javascript" src="js/gemp-004/logging.js"></script>
+<script type="text/javascript" src="js/gemp-004/chat.js"></script>
+<script type="text/javascript" src="js/gemp-004/commonUi.js"></script>
+<script type="text/javascript" src="js/gemp-004/hallUi.js"></script>
+<script type="text/javascript" src="js/gemp-004/leagueResultsUi.js"></script>
+<script type="text/javascript" src="js/gemp-004/gameHistoryUi.js"></script>
+<script type="text/javascript" src="js/gemp-004/communication.js"></script>
 <!-- This is needed for delivery -->
-<script type="text/javascript" src="js/gemp-003/deliveryService.js"></script>
-<script type="text/javascript" src="js/gemp-003/jCardGroup.js"></script>
-<script type="text/javascript" src="js/gemp-003/jCards.js"></script>
+<script type="text/javascript" src="js/gemp-004/deliveryService.js"></script>
+<script type="text/javascript" src="js/gemp-004/jCardGroup.js"></script>
+<script type="text/javascript" src="js/gemp-004/jCards.js"></script>
 
 <script type="text/javascript">
     var chat;
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 b1cfdd903..33b06d68e 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/index.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/index.html
@@ -23,9 +23,9 @@
     <script type="text/javascript" src="js/jquery/jquery-1.6.2.js"></script>
     <script type="text/javascript" src="js/jquery/jquery-ui-1.8.16.custom.min.js"></script>
 
-    <script type="text/javascript" src="js/gemp-003/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-003/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-003/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-004/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-004/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-004/communication.js"></script>
 
     <script type="text/javascript">
         function getUrlParam(param) {
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/cardFilter.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-004/cardFilter.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/cardFilter.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-004/cardFilter.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/chat.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-004/chat.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/chat.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-004/chat.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/common.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-004/common.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/common.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-004/common.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/commonUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-004/commonUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/commonUi.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-004/commonUi.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/communication.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-004/communication.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/communication.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-004/communication.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/deckBuildingUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-004/deckBuildingUi.js
similarity index 94%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/deckBuildingUi.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-004/deckBuildingUi.js
index a807a0a9d..edea53d8c 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/deckBuildingUi.js
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-004/deckBuildingUi.js
@@ -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("");
 
@@ -421,14 +421,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;
@@ -667,10 +667,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-003/deliveryService.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-004/deliveryService.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/deliveryService.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-004/deliveryService.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/gameAnimations.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-004/gameAnimations.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/gameAnimations.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-004/gameAnimations.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/gameHistoryUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-004/gameHistoryUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/gameHistoryUi.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-004/gameHistoryUi.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/gameUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-004/gameUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/gameUi.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-004/gameUi.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/hallUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-004/hallUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/hallUi.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-004/hallUi.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/inheritance.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-004/inheritance.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/inheritance.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-004/inheritance.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/jCardGroup.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-004/jCardGroup.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/jCardGroup.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-004/jCardGroup.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/jCards.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-004/jCards.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/jCards.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-004/jCards.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/leagueResultsUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-004/leagueResultsUi.js
similarity index 95%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/leagueResultsUi.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-004/leagueResultsUi.js
index 8e51c31bd..0e0feab3e 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/leagueResultsUi.js
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-004/leagueResultsUi.js
@@ -9,12 +9,12 @@ var LeagueResultsUI = Class.extend({
 
         this.questionDialog = $("<div></div>")
                 .dialog({
-            autoOpen: false,
-            closeOnEscape: true,
-            resizable: false,
-            modal: true,
-            title: "League operation"
-        });
+                    autoOpen: false,
+                    closeOnEscape: true,
+                    resizable: false,
+                    modal: true,
+                    title: "League operation"
+                });
 
         this.loadResults();
     },
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/logging.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-004/logging.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/logging.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-004/logging.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/merchantUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-004/merchantUi.js
similarity index 94%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/merchantUi.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-004/merchantUi.js
index ca144a84a..1ec723fda 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/merchantUi.js
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-004/merchantUi.js
@@ -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/gemp-lotr-web/src/main/webapp/merchant.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/merchant.html
index a1fe3871c..881077adf 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/merchant.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/merchant.html
@@ -95,16 +95,16 @@
     <script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
     <script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
 
-    <script type="text/javascript" src="js/gemp-003/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-003/common.js"></script>
-    <script type="text/javascript" src="js/gemp-003/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-003/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-003/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-003/jCards.js"></script>
-    <script type="text/javascript" src="js/gemp-003/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-003/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-003/merchantUi.js"></script>
-    <script type="text/javascript" src="js/gemp-003/cardFilter.js"></script>
+    <script type="text/javascript" src="js/gemp-004/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-004/common.js"></script>
+    <script type="text/javascript" src="js/gemp-004/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-004/deliveryService.js"></script>
+    <script type="text/javascript" src="js/gemp-004/jCardGroup.js"></script>
+    <script type="text/javascript" src="js/gemp-004/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-004/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-004/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-004/merchantUi.js"></script>
+    <script type="text/javascript" src="js/gemp-004/cardFilter.js"></script>
 
     <script type="text/javascript">