diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild2.html b/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild2.html
deleted file mode 100644
index 1bf0f49f2..000000000
--- a/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild2.html
+++ /dev/null
@@ -1,141 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title>Gemp-LotR</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <meta http-equiv="pragma" content="no-cache"/>
-    <meta http-equiv="Cache-Control" content="no-cache"/>
-    <meta http-equiv="Expires" content="-1">
-
-    <style type="text/css">
-        body {
-            font-size: 12px;
-            color: #ffffff;
-        }
-
-        .panel {
-            overflow: hidden !important;
-        }
-
-        .card {
-            position: absolute;
-            overflow: hidden;
-        }
-
-        .card .img {
-            position: absolute;
-        }
-
-        .card .click {
-            position: absolute;
-        }
-
-        .card .border {
-            position: absolute;
-            border: solid #000000;
-        }
-
-        .card .count {
-            position: absolute;
-            font-weight: bolder;
-            display: table-cell;
-            text-align: right;
-            vertical-align: top;
-        }
-
-        .deckPart {
-            position: relative;
-        }
-
-    </style>
-    <link rel="stylesheet" type="text/css" href="css/dark-hive/jquery-ui-1.8.16.custom.css">
-    <link rel="stylesheet" type="text/css" href="js/jquery/styles/jquery.spinnercontrol.css">
-
-    <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/jquery/jquery.cookie.js"></script>
-    <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-022/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-022/common.js"></script>
-
-    <script type="text/javascript" src="/generic-tcg/js/CardContainer.js"></script>
-    <script type="text/javascript" src="/generic-tcg/js/CardGroup.js"></script>
-    <script type="text/javascript" src="/generic-tcg/js/RowCardLayoutCardGroup.js"></script>
-    <script type="text/javascript" src="/generic-tcg/js/AttachedCardsLayoutCardGroup.js"></script>
-    <script type="text/javascript" src="/generic-tcg/js/jquery/jquery-sizes.js"></script>
-
-    <script type="text/javascript" src="js/gemp-022/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-022/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-022/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-022/jCards.js"></script>
-    <script type="text/javascript" src="js/gemp-022/cardFilter2.js"></script>
-    <script type="text/javascript" src="js/gemp-022/DeckPanel.js"></script>
-    <script type="text/javascript" src="js/gemp-022/CardInformationDialog.js"></script>
-    <script type="text/javascript" src="js/gemp-022/deckBuildingUi2.js"></script>
-
-    <script type="text/javascript">
-
-        $(document).ready(
-                function () {
-                    var ui = new GempLotrDeckBuildingUI2(
-                            $("#collectionFilterDiv"),
-                            $("#paging"),
-                            $("#collectionContents"),
-                            $("#deckDiv")
-                            );
-
-                    var doLayout = function() {
-                        log("deckBuild2.html::doLayout");
-                        var collectionWidth = $("#collectionDiv").width();
-                        var collectionHeight = $("#collectionDiv").height();
-                        var deckWidth = $("#deckPanel").width();
-                        var deckHeight = $("#deckPanel").height();
-                        ui.layoutUI(collectionWidth, collectionHeight, deckWidth, deckHeight);
-                    };
-
-                    $('body').layout({
-                        applyDefaultStyles:true,
-                        onresize:function () {
-                            doLayout();
-                        },
-                        north__minSize: 230
-                    });
-
-                    $("#northPanel").layout({
-                        applyDefaultStyles:true,
-                        onresize:function() {
-                            doLayout();
-                        },
-                        west__minSize: 305
-
-                    });
-
-                    $(".ui-layout-pane").css({"background-color":"#000000"});
-
-                    $(window).resize(function () {
-                        doLayout();
-                    });
-
-                    doLayout();
-                });
-
-    </script>
-
-</head>
-<body>
-<div id='northPanel' class="ui-layout-north panel" style="padding: 0;">
-    <div id="collectionFilterDiv" class="ui-layout-west panel"></div>
-    <div id="collectionDiv" class="ui-layout-center panel">
-        <div id="paging"></div>
-        <div id="collectionContents" class="ui-widget-content" style="position: relative"></div>
-    </div>
-</div>
-<div id="deckPanel" class="ui-layout-center panel">
-    <div id="deckDiv" class="ui-widget-content">
-    </div>
-</div>
-</body>
-</html>
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/soloDraft.html b/gemp-lotr/gemp-lotr-async/src/main/web/soloDraft.html
index f40b674b4..09f094194 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/soloDraft.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/soloDraft.html
@@ -1,9 +1,10 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
     <title>GEMP: LotR-TCG - Draft</title>
-    
+
     <link rel="apple-touch-icon" sizes="180x180" href="images/icons/apple-touch-icon.png">
     <link rel="icon" type="image/png" sizes="32x32" href="images/icons/favicon-32x32.png">
     <link rel="icon" type="image/png" sizes="16x16" href="images/icons/favicon-16x16.png">
@@ -49,39 +50,19 @@
     <script type="text/javascript" src="js/gemp-022/merchantUi.js"></script>
     <script type="text/javascript" src="js/gemp-022/soloDraftUi.js"></script>
 
-    <script type="text/javascript">
-
-        $(document).ready(
-                function () {
-                    var ui = new GempLotrSoloDraftUI();
-
-                    $('body').layout({
-                        applyDefaultStyles:true,
-                        onresize:function () {
-                            ui.layoutUI(true);
-                        },
-                        north__minSize:"30%"
-                    });
-
-                    $(".ui-layout-pane").css({"background-color":"#000000"});
-
-                    $(window).resize(function () {
-                        ui.layoutUI(true);
-                    });
-
-                    ui.layoutUI(true);
-                });
-    </script>
-
+    <link rel="stylesheet" type="text/css" href="src/SoloDraft/index.css">
+    <script type="text/javascript" src="src/SoloDraft/soloDraft.js"></script>
 </head>
+
 <body>
 
-<div id="topDiv" class="ui-layout-north">
-    <div id="messageDiv"></div>
-    <div id="picksDiv"></div>
-</div>
-<div id="bottomDiv" class="ui-layout-center">
-    <div id="draftedDiv"></div>
-</div>
+    <div id="topDiv" class="ui-layout-north">
+        <div id="messageDiv"></div>
+        <div id="picksDiv"></div>
+    </div>
+    <div id="bottomDiv" class="ui-layout-center">
+        <div id="draftedDiv"></div>
+    </div>
 </body>
-</html>
+
+</html>
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/src/SoloDraft/index.css b/gemp-lotr/gemp-lotr-async/src/main/web/src/SoloDraft/index.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/src/SoloDraft/soloDraft.js b/gemp-lotr/gemp-lotr-async/src/main/web/src/SoloDraft/soloDraft.js
new file mode 100644
index 000000000..e9ce4a68a
--- /dev/null
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/src/SoloDraft/soloDraft.js
@@ -0,0 +1,20 @@
+$(document).ready(
+    function () {
+        var ui = new GempLotrSoloDraftUI();
+
+        $('body').layout({
+            applyDefaultStyles:true,
+            onresize:function () {
+                ui.layoutUI(true);
+            },
+            north__minSize:"30%"
+        });
+
+        $(".ui-layout-pane").css({"background-color":"#000000"});
+
+        $(window).resize(function () {
+            ui.layoutUI(true);
+        });
+
+        ui.layoutUI(true);
+    });
\ No newline at end of file
