diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/TableDraftDefinitions.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/TableDraftDefinitions.java
index 047e9af8d..24b22451c 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/TableDraftDefinitions.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/TableDraftDefinitions.java
@@ -1,10 +1,10 @@
 package com.gempukku.lotro.draft3;
 
 import com.gempukku.lotro.collection.CollectionsManager;
-import com.gempukku.lotro.draft3.fotr.FotrTableDraftDefinition;
-import com.gempukku.lotro.draft3.fotr_mixed.FotrMixedTableDraftDefinition;
-import com.gempukku.lotro.draft3.ttt.TttTableDraftDefinition;
-import com.gempukku.lotro.draft3.ttt_mixed.TttMixedTableDraftDefinition;
+import com.gempukku.lotro.draft3.format.fotr.FotrTableDraftDefinition;
+import com.gempukku.lotro.draft3.format.fotr_mixed.FotrMixedTableDraftDefinition;
+import com.gempukku.lotro.draft3.format.ttt.TttTableDraftDefinition;
+import com.gempukku.lotro.draft3.format.ttt_mixed.TttMixedTableDraftDefinition;
 import com.gempukku.lotro.game.LotroCardBlueprintLibrary;
 import com.gempukku.lotro.game.formats.LotroFormatLibrary;
 
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/bot/WeightDraftBot.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/bot/WeightDraftBot.java
index 33129e088..26b04902b 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/bot/WeightDraftBot.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/bot/WeightDraftBot.java
@@ -48,7 +48,7 @@ public class WeightDraftBot extends DraftPlayer implements DraftBot {
     private double getTotalValue(List<String> topCards) {
         // Sum up the values of the top N cards
         return topCards.stream()
-                .mapToDouble(cardId -> cardValues.getOrDefault(cardId, 0.0))
+                .mapToDouble(cardId -> cardValues.getOrDefault(cardId, 0.1))
                 .sum();
     }
 
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/fotr/FotrDraftCardEvaluator.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/fotr/FotrDraftCardEvaluator.java
similarity index 99%
rename from gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/fotr/FotrDraftCardEvaluator.java
rename to gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/fotr/FotrDraftCardEvaluator.java
index aa16e15a8..fcbee8a40 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/fotr/FotrDraftCardEvaluator.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/fotr/FotrDraftCardEvaluator.java
@@ -1,4 +1,4 @@
-package com.gempukku.lotro.draft3.fotr;
+package com.gempukku.lotro.draft3.format.fotr;
 
 import com.gempukku.lotro.common.AppConfig;
 import com.gempukku.lotro.common.Side;
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/fotr/FotrTableDraftBoosterProducer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/fotr/FotrTableDraftBoosterProducer.java
similarity index 99%
rename from gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/fotr/FotrTableDraftBoosterProducer.java
rename to gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/fotr/FotrTableDraftBoosterProducer.java
index e67b3d86d..cd3450131 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/fotr/FotrTableDraftBoosterProducer.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/fotr/FotrTableDraftBoosterProducer.java
@@ -1,4 +1,4 @@
-package com.gempukku.lotro.draft3.fotr;
+package com.gempukku.lotro.draft3.format.fotr;
 
 import com.gempukku.lotro.collection.CollectionsManager;
 import com.gempukku.lotro.draft3.Booster;
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/fotr/FotrTableDraftDefinition.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/fotr/FotrTableDraftDefinition.java
similarity index 97%
rename from gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/fotr/FotrTableDraftDefinition.java
rename to gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/fotr/FotrTableDraftDefinition.java
index b00e19994..e241b607d 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/fotr/FotrTableDraftDefinition.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/fotr/FotrTableDraftDefinition.java
@@ -1,11 +1,10 @@
-package com.gempukku.lotro.draft3.fotr;
+package com.gempukku.lotro.draft3.format.fotr;
 
 import com.gempukku.lotro.collection.CollectionsManager;
 import com.gempukku.lotro.db.vo.CollectionType;
 import com.gempukku.lotro.draft3.*;
 import com.gempukku.lotro.draft3.timer.DraftTimer;
 import com.gempukku.lotro.draft3.timer.DraftTimerProducer;
-import com.gempukku.lotro.game.CardNotFoundException;
 import com.gempukku.lotro.game.LotroCardBlueprintLibrary;
 import com.gempukku.lotro.game.formats.LotroFormatLibrary;
 
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/fotr/FotrTableDraftStartingCollectionProducer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/fotr/FotrTableDraftStartingCollectionProducer.java
similarity index 96%
rename from gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/fotr/FotrTableDraftStartingCollectionProducer.java
rename to gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/fotr/FotrTableDraftStartingCollectionProducer.java
index 8feeff9a9..3957b56ee 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/fotr/FotrTableDraftStartingCollectionProducer.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/fotr/FotrTableDraftStartingCollectionProducer.java
@@ -1,4 +1,4 @@
-package com.gempukku.lotro.draft3.fotr;
+package com.gempukku.lotro.draft3.format.fotr;
 
 import com.gempukku.lotro.collection.CollectionsManager;
 import com.gempukku.lotro.draft3.StartingCollectionProducer;
@@ -39,7 +39,7 @@ public class FotrTableDraftStartingCollectionProducer implements StartingCollect
 
     @Override
     public MutableCardCollection getStartingCardCollection(String uniqueEventName, String playerName) {
-       long seed = uniqueEventName.hashCode() + (long) playerName.hashCode() * HIGH_ENOUGH_PRIME_NUMBER;
+        long seed = uniqueEventName.hashCode() + (long) playerName.hashCode() * HIGH_ENOUGH_PRIME_NUMBER;
         Random rnd = new Random(seed);
 
         final DefaultCardCollection startingCollection = new DefaultCardCollection();
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/fotr_mixed/FotrMixedTableDraftBoosterProducer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/fotr_mixed/FotrMixedTableDraftBoosterProducer.java
similarity index 98%
rename from gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/fotr_mixed/FotrMixedTableDraftBoosterProducer.java
rename to gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/fotr_mixed/FotrMixedTableDraftBoosterProducer.java
index a1c97d8d4..de861ac2e 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/fotr_mixed/FotrMixedTableDraftBoosterProducer.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/fotr_mixed/FotrMixedTableDraftBoosterProducer.java
@@ -1,4 +1,4 @@
-package com.gempukku.lotro.draft3.fotr_mixed;
+package com.gempukku.lotro.draft3.format.fotr_mixed;
 
 import com.gempukku.lotro.collection.CollectionsManager;
 import com.gempukku.lotro.draft3.Booster;
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/fotr_mixed/FotrMixedTableDraftDefinition.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/fotr_mixed/FotrMixedTableDraftDefinition.java
similarity index 90%
rename from gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/fotr_mixed/FotrMixedTableDraftDefinition.java
rename to gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/fotr_mixed/FotrMixedTableDraftDefinition.java
index 49e8722cd..48f3a8d3a 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/fotr_mixed/FotrMixedTableDraftDefinition.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/fotr_mixed/FotrMixedTableDraftDefinition.java
@@ -1,10 +1,10 @@
-package com.gempukku.lotro.draft3.fotr_mixed;
+package com.gempukku.lotro.draft3.format.fotr_mixed;
 
 import com.gempukku.lotro.collection.CollectionsManager;
 import com.gempukku.lotro.db.vo.CollectionType;
 import com.gempukku.lotro.draft3.*;
-import com.gempukku.lotro.draft3.fotr.FotrDraftCardEvaluator;
-import com.gempukku.lotro.draft3.fotr.FotrTableDraftStartingCollectionProducer;
+import com.gempukku.lotro.draft3.format.fotr.FotrDraftCardEvaluator;
+import com.gempukku.lotro.draft3.format.fotr.FotrTableDraftStartingCollectionProducer;
 import com.gempukku.lotro.draft3.timer.DraftTimer;
 import com.gempukku.lotro.draft3.timer.DraftTimerProducer;
 import com.gempukku.lotro.game.LotroCardBlueprintLibrary;
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/ttt/TttDraftCardEvaluator.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/ttt/TttDraftCardEvaluator.java
similarity index 99%
rename from gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/ttt/TttDraftCardEvaluator.java
rename to gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/ttt/TttDraftCardEvaluator.java
index c81db0a95..4d9ee2c1d 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/ttt/TttDraftCardEvaluator.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/ttt/TttDraftCardEvaluator.java
@@ -1,4 +1,4 @@
-package com.gempukku.lotro.draft3.ttt;
+package com.gempukku.lotro.draft3.format.ttt;
 
 import com.gempukku.lotro.common.AppConfig;
 import com.gempukku.lotro.common.Side;
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/ttt/TttTableDraftBoosterProducer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/ttt/TttTableDraftBoosterProducer.java
similarity index 99%
rename from gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/ttt/TttTableDraftBoosterProducer.java
rename to gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/ttt/TttTableDraftBoosterProducer.java
index 012b7855a..522908730 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/ttt/TttTableDraftBoosterProducer.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/ttt/TttTableDraftBoosterProducer.java
@@ -1,4 +1,4 @@
-package com.gempukku.lotro.draft3.ttt;
+package com.gempukku.lotro.draft3.format.ttt;
 
 import com.gempukku.lotro.collection.CollectionsManager;
 import com.gempukku.lotro.draft3.Booster;
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/ttt/TttTableDraftDefinition.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/ttt/TttTableDraftDefinition.java
similarity index 98%
rename from gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/ttt/TttTableDraftDefinition.java
rename to gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/ttt/TttTableDraftDefinition.java
index cdc86724a..161de488e 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/ttt/TttTableDraftDefinition.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/ttt/TttTableDraftDefinition.java
@@ -1,4 +1,4 @@
-package com.gempukku.lotro.draft3.ttt;
+package com.gempukku.lotro.draft3.format.ttt;
 
 import com.gempukku.lotro.collection.CollectionsManager;
 import com.gempukku.lotro.db.vo.CollectionType;
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/ttt/TttTableDraftStartingCollectionProducer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/ttt/TttTableDraftStartingCollectionProducer.java
similarity index 96%
rename from gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/ttt/TttTableDraftStartingCollectionProducer.java
rename to gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/ttt/TttTableDraftStartingCollectionProducer.java
index c90b7c11f..89764b8c7 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/ttt/TttTableDraftStartingCollectionProducer.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/ttt/TttTableDraftStartingCollectionProducer.java
@@ -1,4 +1,4 @@
-package com.gempukku.lotro.draft3.ttt;
+package com.gempukku.lotro.draft3.format.ttt;
 
 import com.gempukku.lotro.collection.CollectionsManager;
 import com.gempukku.lotro.draft3.StartingCollectionProducer;
@@ -40,7 +40,7 @@ public class TttTableDraftStartingCollectionProducer implements StartingCollecti
 
     @Override
     public MutableCardCollection getStartingCardCollection(String uniqueEventName, String playerName) {
-       long seed = uniqueEventName.hashCode() + (long) playerName.hashCode() * HIGH_ENOUGH_PRIME_NUMBER;
+        long seed = uniqueEventName.hashCode() + (long) playerName.hashCode() * HIGH_ENOUGH_PRIME_NUMBER;
         Random rnd = new Random(seed);
 
         final DefaultCardCollection startingCollection = new DefaultCardCollection();
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/ttt_mixed/TttMixedTableDraftBoosterProducer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/ttt_mixed/TttMixedTableDraftBoosterProducer.java
similarity index 98%
rename from gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/ttt_mixed/TttMixedTableDraftBoosterProducer.java
rename to gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/ttt_mixed/TttMixedTableDraftBoosterProducer.java
index 028c91dbd..ec6a6f8d9 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/ttt_mixed/TttMixedTableDraftBoosterProducer.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/ttt_mixed/TttMixedTableDraftBoosterProducer.java
@@ -1,4 +1,4 @@
-package com.gempukku.lotro.draft3.ttt_mixed;
+package com.gempukku.lotro.draft3.format.ttt_mixed;
 
 import com.gempukku.lotro.collection.CollectionsManager;
 import com.gempukku.lotro.draft3.Booster;
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/ttt_mixed/TttMixedTableDraftDefinition.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/ttt_mixed/TttMixedTableDraftDefinition.java
similarity index 91%
rename from gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/ttt_mixed/TttMixedTableDraftDefinition.java
rename to gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/ttt_mixed/TttMixedTableDraftDefinition.java
index 34dc6f366..76af23a2f 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/ttt_mixed/TttMixedTableDraftDefinition.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/ttt_mixed/TttMixedTableDraftDefinition.java
@@ -1,12 +1,12 @@
-package com.gempukku.lotro.draft3.ttt_mixed;
+package com.gempukku.lotro.draft3.format.ttt_mixed;
 
 import com.gempukku.lotro.collection.CollectionsManager;
 import com.gempukku.lotro.db.vo.CollectionType;
 import com.gempukku.lotro.draft3.*;
 import com.gempukku.lotro.draft3.timer.DraftTimer;
 import com.gempukku.lotro.draft3.timer.DraftTimerProducer;
-import com.gempukku.lotro.draft3.ttt.TttDraftCardEvaluator;
-import com.gempukku.lotro.draft3.ttt.TttTableDraftStartingCollectionProducer;
+import com.gempukku.lotro.draft3.format.ttt.TttDraftCardEvaluator;
+import com.gempukku.lotro.draft3.format.ttt.TttTableDraftStartingCollectionProducer;
 import com.gempukku.lotro.game.LotroCardBlueprintLibrary;
 import com.gempukku.lotro.game.formats.LotroFormatLibrary;