diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/GempukkuServer.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/GempukkuServer.java
index 333913266..78ab9b8cc 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/GempukkuServer.java
+++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/GempukkuServer.java
@@ -7,6 +7,7 @@ import com.gempukku.lotro.game.CardSets;
 import com.gempukku.lotro.packs.PacksStorage;
 import com.gempukku.lotro.service.LoggedUserHolder;
 
+import java.io.IOException;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.Map;
@@ -14,7 +15,7 @@ import java.util.Map;
 public class GempukkuServer {
     private final Map<Type, Object> context;
 
-    public GempukkuServer() {
+    public GempukkuServer() throws IOException {
         Map<Type, Object> objects = new HashMap<>();
         final CardSets cardSets = new CardSets();
 
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 1e3732caa..3b890bdc5 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,7 +1,7 @@
 package com.gempukku.lotro.async;
 
 import com.gempukku.lotro.async.handler.RootUriRequestHandler;
-import com.gempukku.lotro.common.ApplicationConfiguration;
+import com.gempukku.lotro.common.AppConfig;
 import com.gempukku.polling.LongPollingSystem;
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.ChannelFuture;
@@ -20,7 +20,7 @@ import io.netty.handler.logging.LoggingHandler;
 
 public class LotroAsyncServer {
     public static void main(String[] server) throws InterruptedException {
-        int httpPort = Integer.parseInt(ApplicationConfiguration.getProperty("port"));
+        int httpPort = Integer.parseInt(AppConfig.getProperty("port"));
 
         GempukkuServer gempukkuServer = new GempukkuServer();
 
diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/AdminRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/AdminRequestHandler.java
index 67b76b356..b60d037c4 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/AdminRequestHandler.java
+++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/AdminRequestHandler.java
@@ -5,7 +5,7 @@ import com.gempukku.lotro.async.HttpProcessingException;
 import com.gempukku.lotro.async.ResponseWriter;
 import com.gempukku.lotro.cache.CacheManager;
 import com.gempukku.lotro.collection.CollectionsManager;
-import com.gempukku.lotro.common.ApplicationConfiguration;
+import com.gempukku.lotro.common.AppConfig;
 import com.gempukku.lotro.db.LeagueDAO;
 import com.gempukku.lotro.db.PlayerDAO;
 import com.gempukku.lotro.db.vo.CollectionType;
@@ -21,7 +21,6 @@ import com.gempukku.lotro.service.AdminService;
 import com.gempukku.lotro.tournament.TournamentService;
 import io.netty.handler.codec.http.HttpMethod;
 import io.netty.handler.codec.http.HttpRequest;
-import io.netty.handler.codec.http.QueryStringDecoder;
 import io.netty.handler.codec.http.multipart.HttpPostRequestDecoder;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -687,10 +686,10 @@ public class AdminRequestHandler extends LotroServerRequestHandler implements Ur
         }
     }
 
-    private void reloadCards(HttpRequest request, ResponseWriter responseWriter) throws HttpProcessingException {
+    private void reloadCards(HttpRequest request, ResponseWriter responseWriter) throws HttpProcessingException, IOException {
         validateAdmin(request);
 
-        lotroCardBlueprintLibrary.reloadCards(new java.io.File(ApplicationConfiguration.getProperty("card.path")));
+        lotroCardBlueprintLibrary.reloadCards(AppConfig.getResourceFile("cards"));
 
         responseWriter.writeHtmlResponse("OK");
     }
diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/RootUriRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/RootUriRequestHandler.java
index 979ea57f5..c12cc9fc1 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/RootUriRequestHandler.java
+++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/RootUriRequestHandler.java
@@ -2,7 +2,7 @@ package com.gempukku.lotro.async.handler;
 
 import com.gempukku.lotro.async.HttpProcessingException;
 import com.gempukku.lotro.async.ResponseWriter;
-import com.gempukku.lotro.common.ApplicationConfiguration;
+import com.gempukku.lotro.common.AppConfig;
 import com.gempukku.polling.LongPollingSystem;
 import io.netty.handler.codec.http.HttpRequest;
 
@@ -39,8 +39,8 @@ public class RootUriRequestHandler implements UriRequestHandler {
     private final Pattern originPattern;
 
     public RootUriRequestHandler(Map<Type, Object> context, LongPollingSystem longPollingSystem) {
-        _webRequestHandler = new WebRequestHandler(ApplicationConfiguration.getProperty("web.path"));
-        String originAllowedPattern = ApplicationConfiguration.getProperty("origin.allowed.pattern");
+        _webRequestHandler = new WebRequestHandler(AppConfig.getWebPath());
+        String originAllowedPattern = AppConfig.getProperty("origin.allowed.pattern");
         originPattern = Pattern.compile(originAllowedPattern);
         _hallRequestHandler = new HallRequestHandler(context, longPollingSystem);
         _deckRequestHandler = new DeckRequestHandler(context);
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set10/set10-dwarven.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set10/set10-dwarven.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set10/set10-dwarven.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set10/set10-dwarven.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set10/set10-elven.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set10/set10-elven.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set10/set10-elven.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set10/set10-elven.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set10/set10-gandalf.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set10/set10-gandalf.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set10/set10-gandalf.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set10/set10-gandalf.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set10/set10-gollum.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set10/set10-gollum.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set10/set10-gollum.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set10/set10-gollum.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set10/set10-gondor.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set10/set10-gondor.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set10/set10-gondor.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set10/set10-gondor.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set10/set10-isengard.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set10/set10-isengard.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set10/set10-isengard.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set10/set10-isengard.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set10/set10-raider.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set10/set10-raider.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set10/set10-raider.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set10/set10-raider.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set10/set10-rohan.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set10/set10-rohan.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set10/set10-rohan.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set10/set10-rohan.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set10/set10-sauron.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set10/set10-sauron.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set10/set10-sauron.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set10/set10-sauron.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set10/set10-shire.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set10/set10-shire.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set10/set10-shire.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set10/set10-shire.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set10/set10-site.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set10/set10-site.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set10/set10-site.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set10/set10-site.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set10/set10-wraith.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set10/set10-wraith.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set10/set10-wraith.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set10/set10-wraith.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set11/set11-dwarven.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set11/set11-dwarven.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set11/set11-dwarven.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set11/set11-dwarven.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set11/set11-elven.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set11/set11-elven.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set11/set11-elven.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set11/set11-elven.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set11/set11-gandalf.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set11/set11-gandalf.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set11/set11-gandalf.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set11/set11-gandalf.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set11/set11-gollum.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set11/set11-gollum.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set11/set11-gollum.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set11/set11-gollum.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set11/set11-gondor.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set11/set11-gondor.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set11/set11-gondor.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set11/set11-gondor.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set11/set11-men.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set11/set11-men.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set11/set11-men.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set11/set11-men.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set11/set11-orc.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set11/set11-orc.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set11/set11-orc.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set11/set11-orc.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set11/set11-ring.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set11/set11-ring.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set11/set11-ring.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set11/set11-ring.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set11/set11-rohan.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set11/set11-rohan.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set11/set11-rohan.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set11/set11-rohan.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set11/set11-shire.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set11/set11-shire.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set11/set11-shire.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set11/set11-shire.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set11/set11-site.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set11/set11-site.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set11/set11-site.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set11/set11-site.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set11/set11-uruk-hai.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set11/set11-uruk-hai.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set11/set11-uruk-hai.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set11/set11-uruk-hai.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set11/set11-wraith.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set11/set11-wraith.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set11/set11-wraith.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set11/set11-wraith.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set12/set12-dwarven.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set12/set12-dwarven.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set12/set12-dwarven.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set12/set12-dwarven.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set12/set12-elven.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set12/set12-elven.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set12/set12-elven.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set12/set12-elven.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set12/set12-gandalf.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set12/set12-gandalf.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set12/set12-gandalf.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set12/set12-gandalf.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set12/set12-gollum.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set12/set12-gollum.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set12/set12-gollum.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set12/set12-gollum.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set12/set12-gondor.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set12/set12-gondor.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set12/set12-gondor.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set12/set12-gondor.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set12/set12-isengard.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set12/set12-isengard.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set12/set12-isengard.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set12/set12-isengard.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set12/set12-men.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set12/set12-men.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set12/set12-men.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set12/set12-men.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set12/set12-moria.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set12/set12-moria.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set12/set12-moria.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set12/set12-moria.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set12/set12-orc.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set12/set12-orc.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set12/set12-orc.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set12/set12-orc.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set12/set12-rohan.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set12/set12-rohan.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set12/set12-rohan.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set12/set12-rohan.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set12/set12-sauron.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set12/set12-sauron.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set12/set12-sauron.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set12/set12-sauron.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set12/set12-shire.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set12/set12-shire.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set12/set12-shire.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set12/set12-shire.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set12/set12-site.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set12/set12-site.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set12/set12-site.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set12/set12-site.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set12/set12-uruk-hai.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set12/set12-uruk-hai.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set12/set12-uruk-hai.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set12/set12-uruk-hai.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set12/set12-wraith.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set12/set12-wraith.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set12/set12-wraith.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set12/set12-wraith.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set13/set13-dwarven.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set13/set13-dwarven.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set13/set13-dwarven.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set13/set13-dwarven.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set13/set13-elven.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set13/set13-elven.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set13/set13-elven.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set13/set13-elven.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set13/set13-gandalf.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set13/set13-gandalf.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set13/set13-gandalf.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set13/set13-gandalf.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set13/set13-gollum.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set13/set13-gollum.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set13/set13-gollum.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set13/set13-gollum.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set13/set13-gondor.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set13/set13-gondor.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set13/set13-gondor.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set13/set13-gondor.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set13/set13-isengard.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set13/set13-isengard.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set13/set13-isengard.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set13/set13-isengard.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set13/set13-men.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set13/set13-men.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set13/set13-men.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set13/set13-men.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set13/set13-orc.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set13/set13-orc.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set13/set13-orc.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set13/set13-orc.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set13/set13-rohan.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set13/set13-rohan.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set13/set13-rohan.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set13/set13-rohan.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set13/set13-sauron.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set13/set13-sauron.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set13/set13-sauron.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set13/set13-sauron.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set13/set13-shire.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set13/set13-shire.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set13/set13-shire.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set13/set13-shire.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set13/set13-site.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set13/set13-site.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set13/set13-site.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set13/set13-site.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set13/set13-uruk-hai.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set13/set13-uruk-hai.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set13/set13-uruk-hai.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set13/set13-uruk-hai.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set13/set13-wraith.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set13/set13-wraith.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set13/set13-wraith.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set13/set13-wraith.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set15/set15-dwarven.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set15/set15-dwarven.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set15/set15-dwarven.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set15/set15-dwarven.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set15/set15-elven.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set15/set15-elven.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set15/set15-elven.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set15/set15-elven.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set15/set15-gandalf.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set15/set15-gandalf.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set15/set15-gandalf.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set15/set15-gandalf.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set15/set15-gollum.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set15/set15-gollum.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set15/set15-gollum.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set15/set15-gollum.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set15/set15-gondor.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set15/set15-gondor.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set15/set15-gondor.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set15/set15-gondor.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set15/set15-men.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set15/set15-men.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set15/set15-men.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set15/set15-men.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set15/set15-orc.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set15/set15-orc.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set15/set15-orc.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set15/set15-orc.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set15/set15-ring.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set15/set15-ring.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set15/set15-ring.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set15/set15-ring.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set15/set15-rohan.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set15/set15-rohan.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set15/set15-rohan.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set15/set15-rohan.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set15/set15-shire.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set15/set15-shire.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set15/set15-shire.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set15/set15-shire.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set15/set15-site.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set15/set15-site.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set15/set15-site.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set15/set15-site.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set15/set15-uruk-hai.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set15/set15-uruk-hai.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set15/set15-uruk-hai.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set15/set15-uruk-hai.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set15/set15-wraith.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set15/set15-wraith.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set15/set15-wraith.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set15/set15-wraith.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set17/set17-dwarven.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set17/set17-dwarven.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set17/set17-dwarven.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set17/set17-dwarven.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set17/set17-elven.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set17/set17-elven.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set17/set17-elven.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set17/set17-elven.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set17/set17-gandalf.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set17/set17-gandalf.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set17/set17-gandalf.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set17/set17-gandalf.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set17/set17-gondor.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set17/set17-gondor.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set17/set17-gondor.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set17/set17-gondor.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set17/set17-isengard.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set17/set17-isengard.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set17/set17-isengard.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set17/set17-isengard.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set17/set17-men.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set17/set17-men.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set17/set17-men.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set17/set17-men.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set17/set17-orc.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set17/set17-orc.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set17/set17-orc.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set17/set17-orc.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set17/set17-rohan.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set17/set17-rohan.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set17/set17-rohan.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set17/set17-rohan.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set17/set17-sauron.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set17/set17-sauron.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set17/set17-sauron.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set17/set17-sauron.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set17/set17-shire.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set17/set17-shire.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set17/set17-shire.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set17/set17-shire.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set17/set17-site.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set17/set17-site.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set17/set17-site.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set17/set17-site.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set17/set17-uruk-hai.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set17/set17-uruk-hai.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set17/set17-uruk-hai.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set17/set17-uruk-hai.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set17/set17-wraith.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set17/set17-wraith.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set17/set17-wraith.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set17/set17-wraith.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set18/set18-dwarven.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set18/set18-dwarven.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set18/set18-dwarven.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set18/set18-dwarven.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set18/set18-elven.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set18/set18-elven.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set18/set18-elven.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set18/set18-elven.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set18/set18-gandalf.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set18/set18-gandalf.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set18/set18-gandalf.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set18/set18-gandalf.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set18/set18-gollum.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set18/set18-gollum.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set18/set18-gollum.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set18/set18-gollum.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set18/set18-gondor.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set18/set18-gondor.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set18/set18-gondor.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set18/set18-gondor.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set18/set18-men.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set18/set18-men.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set18/set18-men.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set18/set18-men.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set18/set18-orc.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set18/set18-orc.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set18/set18-orc.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set18/set18-orc.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set18/set18-rohan.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set18/set18-rohan.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set18/set18-rohan.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set18/set18-rohan.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set18/set18-shire.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set18/set18-shire.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set18/set18-shire.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set18/set18-shire.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set18/set18-site.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set18/set18-site.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set18/set18-site.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set18/set18-site.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set18/set18-uruk-hai.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set18/set18-uruk-hai.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set18/set18-uruk-hai.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set18/set18-uruk-hai.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set18/set18-wraith.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set18/set18-wraith.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set18/set18-wraith.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set18/set18-wraith.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set2/set2-moria.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set2/set2-moria.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set2/set2-moria.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set2/set2-moria.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set2/set2-sauron.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set2/set2-sauron.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set2/set2-sauron.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set2/set2-sauron.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set2/set2-shire.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set2/set2-shire.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set2/set2-shire.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set2/set2-shire.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set2/set2-site.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set2/set2-site.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set2/set2-site.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set2/set2-site.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set2/set2-wraith.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set2/set2-wraith.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set2/set2-wraith.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set2/set2-wraith.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set3/set3-dwarven.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set3/set3-dwarven.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set3/set3-dwarven.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set3/set3-dwarven.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set3/set3-elven.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set3/set3-elven.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set3/set3-elven.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set3/set3-elven.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set3/set3-gandalf.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set3/set3-gandalf.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set3/set3-gandalf.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set3/set3-gandalf.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set3/set3-gondor.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set3/set3-gondor.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set3/set3-gondor.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set3/set3-gondor.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set3/set3-isengard.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set3/set3-isengard.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set3/set3-isengard.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set3/set3-isengard.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set3/set3-moria.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set3/set3-moria.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set3/set3-moria.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set3/set3-moria.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set3/set3-sauron.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set3/set3-sauron.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set3/set3-sauron.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set3/set3-sauron.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set3/set3-shire.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set3/set3-shire.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set3/set3-shire.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set3/set3-shire.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set3/set3-site.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set3/set3-site.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set3/set3-site.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set3/set3-site.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set3/set3-wraith.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set3/set3-wraith.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set3/set3-wraith.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set3/set3-wraith.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set31/set31-dwarven.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set31/set31-dwarven.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set31/set31-dwarven.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set31/set31-dwarven.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set31/set31-shire.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set31/set31-shire.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set31/set31-shire.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set31/set31-shire.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set4/set4-dunland.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set4/set4-dunland.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set4/set4-dunland.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set4/set4-dunland.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set4/set4-dwarven.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set4/set4-dwarven.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set4/set4-dwarven.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set4/set4-dwarven.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set4/set4-elven.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set4/set4-elven.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set4/set4-elven.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set4/set4-elven.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set4/set4-gandalf.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set4/set4-gandalf.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set4/set4-gandalf.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set4/set4-gandalf.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set4/set4-gondor.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set4/set4-gondor.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set4/set4-gondor.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set4/set4-gondor.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set4/set4-isengard.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set4/set4-isengard.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set4/set4-isengard.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set4/set4-isengard.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set4/set4-raider.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set4/set4-raider.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set4/set4-raider.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set4/set4-raider.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set4/set4-ring.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set4/set4-ring.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set4/set4-ring.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set4/set4-ring.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set4/set4-rohan.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set4/set4-rohan.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set4/set4-rohan.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set4/set4-rohan.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set4/set4-shire.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set4/set4-shire.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set4/set4-shire.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set4/set4-shire.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set4/set4-site.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set4/set4-site.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set4/set4-site.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set4/set4-site.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set5/set5-dunland.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set5/set5-dunland.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set5/set5-dunland.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set5/set5-dunland.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set5/set5-dwarven.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set5/set5-dwarven.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set5/set5-dwarven.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set5/set5-dwarven.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set5/set5-elven.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set5/set5-elven.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set5/set5-elven.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set5/set5-elven.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set5/set5-gandalf.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set5/set5-gandalf.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set5/set5-gandalf.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set5/set5-gandalf.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set5/set5-gollum.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set5/set5-gollum.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set5/set5-gollum.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set5/set5-gollum.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set5/set5-gondor.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set5/set5-gondor.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set5/set5-gondor.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set5/set5-gondor.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set5/set5-isengard.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set5/set5-isengard.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set5/set5-isengard.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set5/set5-isengard.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set5/set5-raider.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set5/set5-raider.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set5/set5-raider.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set5/set5-raider.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set5/set5-rohan.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set5/set5-rohan.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set5/set5-rohan.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set5/set5-rohan.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set5/set5-sauron.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set5/set5-sauron.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set5/set5-sauron.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set5/set5-sauron.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set5/set5-shire.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set5/set5-shire.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set5/set5-shire.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set5/set5-shire.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set5/set5-site.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set5/set5-site.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set5/set5-site.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set5/set5-site.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set6/set6-dunland.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set6/set6-dunland.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set6/set6-dunland.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set6/set6-dunland.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set6/set6-dwarven.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set6/set6-dwarven.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set6/set6-dwarven.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set6/set6-dwarven.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set6/set6-elven.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set6/set6-elven.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set6/set6-elven.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set6/set6-elven.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set6/set6-gandalf.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set6/set6-gandalf.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set6/set6-gandalf.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set6/set6-gandalf.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set6/set6-gollum.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set6/set6-gollum.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set6/set6-gollum.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set6/set6-gollum.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set6/set6-gondor.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set6/set6-gondor.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set6/set6-gondor.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set6/set6-gondor.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set6/set6-isengard.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set6/set6-isengard.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set6/set6-isengard.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set6/set6-isengard.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set6/set6-moria.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set6/set6-moria.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set6/set6-moria.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set6/set6-moria.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set6/set6-raider.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set6/set6-raider.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set6/set6-raider.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set6/set6-raider.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set6/set6-rohan.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set6/set6-rohan.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set6/set6-rohan.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set6/set6-rohan.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set6/set6-sauron.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set6/set6-sauron.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set6/set6-sauron.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set6/set6-sauron.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set6/set6-shire.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set6/set6-shire.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set6/set6-shire.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set6/set6-shire.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set6/set6-site.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set6/set6-site.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set6/set6-site.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set6/set6-site.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set6/set6-wraith.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set6/set6-wraith.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set6/set6-wraith.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set6/set6-wraith.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set7/set7-dwarven.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set7/set7-dwarven.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set7/set7-dwarven.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set7/set7-dwarven.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set7/set7-elven.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set7/set7-elven.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set7/set7-elven.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set7/set7-elven.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set7/set7-gandalf.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set7/set7-gandalf.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set7/set7-gandalf.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set7/set7-gandalf.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set7/set7-gollum.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set7/set7-gollum.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set7/set7-gollum.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set7/set7-gollum.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set7/set7-gondor.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set7/set7-gondor.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set7/set7-gondor.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set7/set7-gondor.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set7/set7-raider.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set7/set7-raider.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set7/set7-raider.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set7/set7-raider.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set7/set7-ring.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set7/set7-ring.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set7/set7-ring.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set7/set7-ring.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set7/set7-rohan.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set7/set7-rohan.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set7/set7-rohan.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set7/set7-rohan.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set7/set7-sauron.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set7/set7-sauron.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set7/set7-sauron.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set7/set7-sauron.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set7/set7-shire.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set7/set7-shire.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set7/set7-shire.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set7/set7-shire.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set7/set7-site.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set7/set7-site.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set7/set7-site.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set7/set7-site.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set7/set7-wraith.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set7/set7-wraith.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set7/set7-wraith.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set7/set7-wraith.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set8/set8-dwarven.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set8/set8-dwarven.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set8/set8-dwarven.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set8/set8-dwarven.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set8/set8-elven.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set8/set8-elven.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set8/set8-elven.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set8/set8-elven.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set8/set8-gandalf.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set8/set8-gandalf.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set8/set8-gandalf.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set8/set8-gandalf.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set8/set8-gollum.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set8/set8-gollum.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set8/set8-gollum.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set8/set8-gollum.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set8/set8-gondor.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set8/set8-gondor.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set8/set8-gondor.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set8/set8-gondor.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set8/set8-raider.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set8/set8-raider.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set8/set8-raider.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set8/set8-raider.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set8/set8-rohan.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set8/set8-rohan.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set8/set8-rohan.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set8/set8-rohan.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set8/set8-sauron.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set8/set8-sauron.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set8/set8-sauron.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set8/set8-sauron.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set8/set8-shire.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set8/set8-shire.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set8/set8-shire.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set8/set8-shire.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set8/set8-site.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set8/set8-site.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set8/set8-site.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set8/set8-site.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set8/set8-wraith.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set8/set8-wraith.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards-stub/set8/set8-wraith.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards-stub/set8/set8-wraith.json
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set00/set0.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set00/set0.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set00/set0.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set00/set0.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set01/set1-dwarven.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-dwarven.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set01/set1-dwarven.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-dwarven.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set01/set1-elven.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-elven.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set01/set1-elven.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-elven.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set01/set1-gandalf.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-gandalf.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set01/set1-gandalf.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-gandalf.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set01/set1-gondor.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-gondor.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set01/set1-gondor.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-gondor.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set01/set1-isengard.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-isengard.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set01/set1-isengard.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-isengard.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set01/set1-moria.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-moria.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set01/set1-moria.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-moria.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set01/set1-sauron.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-sauron.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set01/set1-sauron.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-sauron.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set01/set1-shire.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-shire.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set01/set1-shire.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-shire.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set01/set1-wraith.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-wraith.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set01/set1-wraith.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-wraith.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set01/set1.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set01/set1.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set02/set2-dwarven.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set02/set2-dwarven.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set02/set2-dwarven.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set02/set2-dwarven.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set02/set2-elven.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set02/set2-elven.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set02/set2-elven.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set02/set2-elven.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set02/set2-gandalf.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set02/set2-gandalf.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set02/set2-gandalf.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set02/set2-gandalf.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set02/set2-gondor.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set02/set2-gondor.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set02/set2-gondor.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set02/set2-gondor.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set02/set2-isengard.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set02/set2-isengard.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set02/set2-isengard.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set02/set2-isengard.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set02/set2-moria.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set02/set2-moria.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set02/set2-moria.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set02/set2-moria.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set03/set3-elven.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set03/set3-elven.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set03/set3-elven.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set03/set3-elven.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set04/set4-dwarven.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set4-dwarven.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set04/set4-dwarven.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set4-dwarven.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set04/set4.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set4.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set04/set4.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set4.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set05/set5.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set05/set5.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set05/set5.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set05/set5.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set08/set08-raider.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-raider.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set08/set08-raider.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-raider.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set09/set9-1.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set09/set9-1.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set09/set9-1.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set09/set9-1.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set09/set9-2.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set09/set9-2.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set09/set9-2.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set09/set9-2.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set10/set10-gondor.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set10/set10-gondor.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set10/set10-gondor.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set10/set10-gondor.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set10/set10.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set10/set10.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set10/set10.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set10/set10.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set11/set11-site.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set11/set11-site.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set11/set11-site.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set11/set11-site.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set14/set14.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set14/set14.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set14/set14.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set14/set14.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set15/set15-orc.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-orc.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set15/set15-orc.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-orc.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set16/set16.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set16/set16.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set16/set16.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set16/set16.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set17/set17-wraith.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-wraith.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set17/set17-wraith.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-wraith.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set18/set18-wraith.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set18/set18-wraith.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set18/set18-wraith.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set18/set18-wraith.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set19/set19.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set19/set19.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set19/set19.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set19/set19.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set30/set30-fp.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set30/set30-fp.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set30/set30-fp.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set30/set30-fp.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set30/set30-shadow.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set30/set30-shadow.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set30/set30-shadow.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set30/set30-shadow.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set30/set30-sites.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set30/set30-sites.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set30/set30-sites.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set30/set30-sites.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set31/set31-fp.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set31/set31-fp.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set31/set31-fp.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set31/set31-fp.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set31/set31-shadow.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set31/set31-shadow.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set31/set31-shadow.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set31/set31-shadow.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set31/set31-sites.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set31/set31-sites.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set31/set31-sites.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set31/set31-sites.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set32/set32-fp.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set32/set32-fp.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set32/set32-fp.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set32/set32-fp.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set32/set32-shadow.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set32/set32-shadow.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set32/set32-shadow.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set32/set32-shadow.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set32/set32-site.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set32/set32-site.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set32/set32-site.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set32/set32-site.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set33/set33-fp.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set33/set33-fp.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set33/set33-fp.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set33/set33-fp.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set33/set33-shadow.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set33/set33-shadow.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set33/set33-shadow.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set33/set33-shadow.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set33/set33-sites.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set33/set33-sites.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set33/set33-sites.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set33/set33-sites.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set01/set01-Dwarven-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Dwarven-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set01/set01-Dwarven-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Dwarven-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set01/set01-Elven-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Elven-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set01/set01-Elven-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Elven-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set01/set01-Gandalf-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Gandalf-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set01/set01-Gandalf-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Gandalf-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set01/set01-Gondor-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Gondor-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set01/set01-Gondor-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Gondor-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set01/set01-Isengard-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Isengard-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set01/set01-Isengard-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Isengard-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set01/set01-Moria-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Moria-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set01/set01-Moria-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Moria-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set01/set01-Ringwraith-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Ringwraith-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set01/set01-Ringwraith-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Ringwraith-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set01/set01-Sauron-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Sauron-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set01/set01-Sauron-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Sauron-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set01/set01-Shire-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Shire-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set01/set01-Shire-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Shire-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set02/set02-Dwarven-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set02/set02-Dwarven-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set02/set02-Dwarven-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set02/set02-Dwarven-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set02/set02-Gondor-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set02/set02-Gondor-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set02/set02-Gondor-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set02/set02-Gondor-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set02/set02-Ringwraith-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set02/set02-Ringwraith-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set02/set02-Ringwraith-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set02/set02-Ringwraith-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set02/set02-Shire-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set02/set02-Shire-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set02/set02-Shire-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set02/set02-Shire-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set03/set03-Elven-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Elven-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set03/set03-Elven-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Elven-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set03/set03-Gondor-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Gondor-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set03/set03-Gondor-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Gondor-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set03/set03-Isengard-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Isengard-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set03/set03-Isengard-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Isengard-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set03/set03-Shire-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Shire-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set03/set03-Shire-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Shire-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set03/set03-Sites-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Sites-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set03/set03-Sites-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Sites-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set04/set04-Elven-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set04/set04-Elven-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set04/set04-Elven-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set04/set04-Elven-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set04/set04-Isengard-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set04/set04-Isengard-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set04/set04-Isengard-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set04/set04-Isengard-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set04/set04-Rohan-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set04/set04-Rohan-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set04/set04-Rohan-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set04/set04-Rohan-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set04/set04-Shire-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set04/set04-Shire-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set04/set04-Shire-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set04/set04-Shire-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set07/set07-Gandalf-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set07/set07-Gandalf-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set07/set07-Gandalf-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set07/set07-Gandalf-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set07/set07-Gondor-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set07/set07-Gondor-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set07/set07-Gondor-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set07/set07-Gondor-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set07/set07-Sites-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set07/set07-Sites-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set07/set07-Sites-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set07/set07-Sites-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set08/set08-Dwarven-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set08/set08-Dwarven-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set08/set08-Dwarven-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set08/set08-Dwarven-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set08/set08-Gollum-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set08/set08-Gollum-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set08/set08-Gollum-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set08/set08-Gollum-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set08/set08-Raider-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set08/set08-Raider-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set08/set08-Raider-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set08/set08-Raider-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set08/set08-Sauron-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set08/set08-Sauron-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set08/set08-Sauron-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set08/set08-Sauron-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set10/set10-Dwarven-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set10/set10-Dwarven-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set10/set10-Dwarven-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set10/set10-Dwarven-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set10/set10-Elven-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set10/set10-Elven-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set10/set10-Elven-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set10/set10-Elven-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set10/set10-Gandalf-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set10/set10-Gandalf-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set10/set10-Gandalf-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set10/set10-Gandalf-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set10/set10-Sauron-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set10/set10-Sauron-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set10/set10-Sauron-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set10/set10-Sauron-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set11/set11-Gandalf-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set11/set11-Gandalf-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set11/set11-Gandalf-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set11/set11-Gandalf-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set11/set11-Men-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set11/set11-Men-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set11/set11-Men-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set11/set11-Men-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set11/set11-Orc-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set11/set11-Orc-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set11/set11-Orc-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set11/set11-Orc-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set11/set11-Sites-errata-playtest.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set11/set11-Sites-errata-playtest.hjson
similarity index 99%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set11/set11-Sites-errata-playtest.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set11/set11-Sites-errata-playtest.hjson
index 6682e8b46..5705e7b39 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set11/set11-Sites-errata-playtest.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set11/set11-Sites-errata-playtest.hjson
@@ -168,10 +168,6 @@
 		type: Site
 		block: Shadows
 		direction: Left
-		requires: {
-			type: canSpot
-			filter: orc
-		}
 		effects: [
 			{
 				type: modifier
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set13/set13-Sites-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set13/set13-Sites-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set13/set13-Sites-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set13/set13-Sites-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set15/set15-Elven-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set15/set15-Elven-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set15/set15-Elven-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set15/set15-Elven-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set15/set15-Gondor-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set15/set15-Gondor-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set15/set15-Gondor-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set15/set15-Gondor-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set15/set15-Orc-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set15/set15-Orc-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set15/set15-Orc-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set15/set15-Orc-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set18/set18-Elven-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set18/set18-Elven-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set18/set18-Elven-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set18/set18-Elven-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set18/set18-Gollum-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set18/set18-Gollum-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set18/set18-Gollum-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set18/set18-Gollum-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set18/set18-Gondor-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set18/set18-Gondor-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set18/set18-Gondor-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set18/set18-Gondor-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set18/set18-Orc-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set18/set18-Orc-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set18/set18-Orc-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set18/set18-Orc-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set18/set18-Rohan-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set18/set18-Rohan-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set18/set18-Rohan-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set18/set18-Rohan-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set18/set18-Shire-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set18/set18-Shire-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set18/set18-Shire-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set18/set18-Shire-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set18/set18-Sites-errata-playtest.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set18/set18-Sites-errata-playtest.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set18/set18-Sites-errata-playtest.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set18/set18-Sites-errata-playtest.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set19/set19-Ringwraith-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set19/set19-Ringwraith-errata.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set19/set19-Ringwraith-errata.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set19/set19-Ringwraith-errata.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/setV01/V1_dwarven_playtest.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_dwarven_playtest.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/setV01/V1_dwarven_playtest.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_dwarven_playtest.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/setV01/V1_elven_playtest.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_elven_playtest.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/setV01/V1_elven_playtest.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_elven_playtest.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/setV01/V1_gandalf_playtest.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_gandalf_playtest.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/setV01/V1_gandalf_playtest.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_gandalf_playtest.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/setV01/V1_gondor_playtest.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_gondor_playtest.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/setV01/V1_gondor_playtest.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_gondor_playtest.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/setV01/V1_isengard_playtest.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_isengard_playtest.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/setV01/V1_isengard_playtest.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_isengard_playtest.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/setV01/V1_moria_playtest.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_moria_playtest.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/setV01/V1_moria_playtest.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_moria_playtest.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/setV01/V1_ringwraith_playtest.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_ringwraith_playtest.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/setV01/V1_ringwraith_playtest.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_ringwraith_playtest.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/setV01/V1_sauron_playtest.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_sauron_playtest.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/setV01/V1_sauron_playtest.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_sauron_playtest.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/setV01/V1_shire_playtest.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_shire_playtest.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/setV01/V1_shire_playtest.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_shire_playtest.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/setV01/V1_sites_playtest.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_sites_playtest.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/setV01/V1_sites_playtest.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_sites_playtest.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/second-edition/set40/set40-dwarven.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-dwarven.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/second-edition/set40/set40-dwarven.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-dwarven.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/second-edition/set40/set40-elven.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-elven.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/second-edition/set40/set40-elven.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-elven.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/second-edition/set40/set40-gandalf.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-gandalf.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/second-edition/set40/set40-gandalf.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-gandalf.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/second-edition/set40/set40-gondor.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-gondor.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/second-edition/set40/set40-gondor.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-gondor.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/second-edition/set40/set40-isengard.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-isengard.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/second-edition/set40/set40-isengard.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-isengard.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/second-edition/set40/set40-moria.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-moria.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/second-edition/set40/set40-moria.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-moria.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/second-edition/set40/set40-sauron.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-sauron.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/second-edition/set40/set40-sauron.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-sauron.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/second-edition/set40/set40-shire.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-shire.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/second-edition/set40/set40-shire.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-shire.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/second-edition/set40/set40-wraith.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-wraith.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/second-edition/set40/set40-wraith.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-wraith.hjson
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/second-edition/set40/set40.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40.hjson
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/second-edition/set40/set40.hjson
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40.hjson
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/draft/fellowshipDraft.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/draft/fellowshipDraft.json
similarity index 96%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/draft/fellowshipDraft.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/draft/fellowshipDraft.json
index 227626b61..f7c97bc35 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/draft/fellowshipDraft.json
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/draft/fellowshipDraft.json
@@ -1,295 +1,295 @@
-{
-  "format": "limited_fotr",
-  "startingPool": {
-    "type": "boosterDraftRun",
-    "data": {
-      "runLength": 14,
-      "coreCards": ["1_2","1_290"],
-      "freePeoplesRuns": [
-        ["1_296", "2_110", "1_12", "1_365", "1_112", "1_365", "1_311", "1_317", "2_104", "3_122", "1_364", "3_35", "1_78", "1_364", "2_114", "1_299", "1_303", "3_121", "1_365", "1_112", "1_365", "2_110", "1_298", "2_104", "1_51", "1_364", "3_35", "1_76", "1_364", "2_114"],
-        ["1_26", "1_7", "1_9", "1_11", "1_5", "2_121", "1_97", "2_37", "1_97", "1_51", "1_37", "1_48", "1_32", "1_51", "1_97", "2_121", "1_5", "2_6", "1_9", "1_7", "1_6", "2_121", "1_97", "3_7", "1_37", "1_48", "2_18", "3_7", "1_97", "2_121"]
-      ],
-      "shadowRuns": [
-        ["3_96", "1_270", "2_89", "1_262", "1_262", "2_89", "1_270", "3_96", "1_231", "2_61", "1_179", "2_63", "1_184", "2_62", "2_62", "1_184", "2_63", "1_179", "2_61", "1_234", "1_158", "1_152", "1_154", "1_151", "1_145", "1_151", "1_154", "1_152", "1_158", "1_231", "3_100", "1_267", "1_270", "1_271", "1_271", "1_270", "1_267", "3_100", "1_234", "1_177", "2_67", "1_178", "1_176", "2_60", "2_60", "1_176", "1_178", "2_67", "1_177", "1_231", "3_57", "3_58", "3_59", "3_62", "3_69", "3_62", "3_59", "3_58", "3_57", "1_234"]
-      ]
-    }
-  },
-  "choices": [
-    {
-      "type": "filterPick",
-      "repeat": 1,
-      "data": {
-        "optionCount": 5,
-        "filter": "side:FREE_PEOPLE set:1,2,3 rarity:R"
-      }
-    },
-    {
-      "type": "weightedSwitch",
-      "repeat": 10,
-      "data": {
-        "switchResult": [
-          {
-            "weight": 0.1,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 5,
-              "filter": "side:FREE_PEOPLE set:1 rarity:R"
-            }
-          },
-          {
-            "weight": 0.3,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 8,
-              "filter": "side:FREE_PEOPLE set:1 rarity:U,P"
-            }
-          },
-          {
-            "weight": 0.6,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 10,
-              "filter": "side:FREE_PEOPLE set:1 rarity:C"
-            }
-          }
-        ]
-      }
-    },{
-      "type": "weightedSwitch",
-      "repeat": 10,
-      "data": {
-        "switchResult": [
-          {
-            "weight": 0.1,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 5,
-              "filter": "side:FREE_PEOPLE set:2 rarity:R"
-            }
-          },
-          {
-            "weight": 0.3,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 8,
-              "filter": "side:FREE_PEOPLE set:2 rarity:U,P"
-            }
-          },
-          {
-            "weight": 0.6,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 10,
-              "filter": "side:FREE_PEOPLE set:2 rarity:C"
-            }
-          }
-        ]
-      }
-    },{
-      "type": "weightedSwitch",
-      "repeat": 10,
-      "data": {
-        "switchResult": [
-          {
-            "weight": 0.1,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 5,
-              "filter": "side:FREE_PEOPLE set:3 rarity:R"
-            }
-          },
-          {
-            "weight": 0.3,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 8,
-              "filter": "side:FREE_PEOPLE set:3 rarity:U,P"
-            }
-          },
-          {
-            "weight": 0.6,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 10,
-              "filter": "side:FREE_PEOPLE set:3 rarity:C"
-            }
-          }
-        ]
-      }
-    },
-    {
-      "type": "filterPick",
-      "repeat": 1,
-      "data": {
-        "optionCount": 5,
-        "filter": "side:SHADOW set:1,2,3 rarity:R"
-      }
-    },
-    {
-      "type": "weightedSwitch",
-      "repeat": 10,
-      "data": {
-        "switchResult": [
-          {
-            "weight": 0.1,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 5,
-              "filter": "side:SHADOW set:1 rarity:R"
-            }
-          },
-          {
-            "weight": 0.3,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 8,
-              "filter": "side:SHADOW set:1 rarity:U,P"
-            }
-          },
-          {
-            "weight": 0.6,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 10,
-              "filter": "side:SHADOW set:1 rarity:C"
-            }
-          }
-        ]
-      }
-    },{
-      "type": "weightedSwitch",
-      "repeat": 10,
-      "data": {
-        "switchResult": [
-          {
-            "weight": 0.1,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 5,
-              "filter": "side:SHADOW set:2 rarity:R"
-            }
-          },
-          {
-            "weight": 0.3,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 8,
-              "filter": "side:SHADOW set:2 rarity:U,P"
-            }
-          },
-          {
-            "weight": 0.6,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 10,
-              "filter": "side:SHADOW set:2 rarity:C"
-            }
-          }
-        ]
-      }
-    },{
-      "type": "weightedSwitch",
-      "repeat": 10,
-      "data": {
-        "switchResult": [
-          {
-            "weight": 0.1,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 5,
-              "filter": "side:SHADOW set:3 rarity:R"
-            }
-          },
-          {
-            "weight": 0.3,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 8,
-              "filter": "side:SHADOW set:3 rarity:U,P"
-            }
-          },
-          {
-            "weight": 0.6,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 10,
-              "filter": "side:SHADOW set:3 rarity:C"
-            }
-          }
-        ]
-      }
-    },
-    {
-      "type": "filterPick",
-      "repeat": 1,
-      "data": {
-        "optionCount": 3,
-        "filter": "cardType:SITE set:1,2,3 siteNumber:1"
-      }
-    },
-    {
-      "type": "filterPick",
-      "repeat": 1,
-      "data": {
-        "optionCount": 3,
-        "filter": "cardType:SITE set:1,2,3 siteNumber:2"
-      }
-    },
-    {
-      "type": "filterPick",
-      "repeat": 1,
-      "data": {
-        "optionCount": 3,
-        "filter": "cardType:SITE set:1,2,3 siteNumber:3"
-      }
-    },
-    {
-      "type": "filterPick",
-      "repeat": 1,
-      "data": {
-        "optionCount": 3,
-        "filter": "cardType:SITE set:1,2,3 siteNumber:4"
-      }
-    },
-    {
-      "type": "filterPick",
-      "repeat": 1,
-      "data": {
-        "optionCount": 3,
-        "filter": "cardType:SITE set:1,2,3 siteNumber:5"
-      }
-    },
-    {
-      "type": "filterPick",
-      "repeat": 1,
-      "data": {
-        "optionCount": 3,
-        "filter": "cardType:SITE set:1,2,3 siteNumber:6"
-      }
-    },
-    {
-      "type": "filterPick",
-      "repeat": 1,
-      "data": {
-        "optionCount": 3,
-        "filter": "cardType:SITE set:1,2,3 siteNumber:7"
-      }
-    },
-    {
-      "type": "filterPick",
-      "repeat": 1,
-      "data": {
-        "optionCount": 3,
-        "filter": "cardType:SITE set:1,2,3 siteNumber:8"
-      }
-    },
-    {
-      "type": "filterPick",
-      "repeat": 1,
-      "data": {
-        "optionCount": 3,
-        "filter": "cardType:SITE set:1,2,3 siteNumber:9"
-      }
-    }
-  ]
-}
+{
+  "format": "limited_fotr",
+  "startingPool": {
+    "type": "boosterDraftRun",
+    "data": {
+      "runLength": 14,
+      "coreCards": ["1_2","1_290"],
+      "freePeoplesRuns": [
+        ["1_296", "2_110", "1_12", "1_365", "1_112", "1_365", "1_311", "1_317", "2_104", "3_122", "1_364", "3_35", "1_78", "1_364", "2_114", "1_299", "1_303", "3_121", "1_365", "1_112", "1_365", "2_110", "1_298", "2_104", "1_51", "1_364", "3_35", "1_76", "1_364", "2_114"],
+        ["1_26", "1_7", "1_9", "1_11", "1_5", "2_121", "1_97", "2_37", "1_97", "1_51", "1_37", "1_48", "1_32", "1_51", "1_97", "2_121", "1_5", "2_6", "1_9", "1_7", "1_6", "2_121", "1_97", "3_7", "1_37", "1_48", "2_18", "3_7", "1_97", "2_121"]
+      ],
+      "shadowRuns": [
+        ["3_96", "1_270", "2_89", "1_262", "1_262", "2_89", "1_270", "3_96", "1_231", "2_61", "1_179", "2_63", "1_184", "2_62", "2_62", "1_184", "2_63", "1_179", "2_61", "1_234", "1_158", "1_152", "1_154", "1_151", "1_145", "1_151", "1_154", "1_152", "1_158", "1_231", "3_100", "1_267", "1_270", "1_271", "1_271", "1_270", "1_267", "3_100", "1_234", "1_177", "2_67", "1_178", "1_176", "2_60", "2_60", "1_176", "1_178", "2_67", "1_177", "1_231", "3_57", "3_58", "3_59", "3_62", "3_69", "3_62", "3_59", "3_58", "3_57", "1_234"]
+      ]
+    }
+  },
+  "choices": [
+    {
+      "type": "filterPick",
+      "repeat": 1,
+      "data": {
+        "optionCount": 5,
+        "filter": "side:FREE_PEOPLE set:1,2,3 rarity:R"
+      }
+    },
+    {
+      "type": "weightedSwitch",
+      "repeat": 10,
+      "data": {
+        "switchResult": [
+          {
+            "weight": 0.1,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 5,
+              "filter": "side:FREE_PEOPLE set:1 rarity:R"
+            }
+          },
+          {
+            "weight": 0.3,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 8,
+              "filter": "side:FREE_PEOPLE set:1 rarity:U,P"
+            }
+          },
+          {
+            "weight": 0.6,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 10,
+              "filter": "side:FREE_PEOPLE set:1 rarity:C"
+            }
+          }
+        ]
+      }
+    },{
+      "type": "weightedSwitch",
+      "repeat": 10,
+      "data": {
+        "switchResult": [
+          {
+            "weight": 0.1,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 5,
+              "filter": "side:FREE_PEOPLE set:2 rarity:R"
+            }
+          },
+          {
+            "weight": 0.3,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 8,
+              "filter": "side:FREE_PEOPLE set:2 rarity:U,P"
+            }
+          },
+          {
+            "weight": 0.6,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 10,
+              "filter": "side:FREE_PEOPLE set:2 rarity:C"
+            }
+          }
+        ]
+      }
+    },{
+      "type": "weightedSwitch",
+      "repeat": 10,
+      "data": {
+        "switchResult": [
+          {
+            "weight": 0.1,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 5,
+              "filter": "side:FREE_PEOPLE set:3 rarity:R"
+            }
+          },
+          {
+            "weight": 0.3,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 8,
+              "filter": "side:FREE_PEOPLE set:3 rarity:U,P"
+            }
+          },
+          {
+            "weight": 0.6,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 10,
+              "filter": "side:FREE_PEOPLE set:3 rarity:C"
+            }
+          }
+        ]
+      }
+    },
+    {
+      "type": "filterPick",
+      "repeat": 1,
+      "data": {
+        "optionCount": 5,
+        "filter": "side:SHADOW set:1,2,3 rarity:R"
+      }
+    },
+    {
+      "type": "weightedSwitch",
+      "repeat": 10,
+      "data": {
+        "switchResult": [
+          {
+            "weight": 0.1,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 5,
+              "filter": "side:SHADOW set:1 rarity:R"
+            }
+          },
+          {
+            "weight": 0.3,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 8,
+              "filter": "side:SHADOW set:1 rarity:U,P"
+            }
+          },
+          {
+            "weight": 0.6,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 10,
+              "filter": "side:SHADOW set:1 rarity:C"
+            }
+          }
+        ]
+      }
+    },{
+      "type": "weightedSwitch",
+      "repeat": 10,
+      "data": {
+        "switchResult": [
+          {
+            "weight": 0.1,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 5,
+              "filter": "side:SHADOW set:2 rarity:R"
+            }
+          },
+          {
+            "weight": 0.3,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 8,
+              "filter": "side:SHADOW set:2 rarity:U,P"
+            }
+          },
+          {
+            "weight": 0.6,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 10,
+              "filter": "side:SHADOW set:2 rarity:C"
+            }
+          }
+        ]
+      }
+    },{
+      "type": "weightedSwitch",
+      "repeat": 10,
+      "data": {
+        "switchResult": [
+          {
+            "weight": 0.1,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 5,
+              "filter": "side:SHADOW set:3 rarity:R"
+            }
+          },
+          {
+            "weight": 0.3,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 8,
+              "filter": "side:SHADOW set:3 rarity:U,P"
+            }
+          },
+          {
+            "weight": 0.6,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 10,
+              "filter": "side:SHADOW set:3 rarity:C"
+            }
+          }
+        ]
+      }
+    },
+    {
+      "type": "filterPick",
+      "repeat": 1,
+      "data": {
+        "optionCount": 3,
+        "filter": "cardType:SITE set:1,2,3 siteNumber:1"
+      }
+    },
+    {
+      "type": "filterPick",
+      "repeat": 1,
+      "data": {
+        "optionCount": 3,
+        "filter": "cardType:SITE set:1,2,3 siteNumber:2"
+      }
+    },
+    {
+      "type": "filterPick",
+      "repeat": 1,
+      "data": {
+        "optionCount": 3,
+        "filter": "cardType:SITE set:1,2,3 siteNumber:3"
+      }
+    },
+    {
+      "type": "filterPick",
+      "repeat": 1,
+      "data": {
+        "optionCount": 3,
+        "filter": "cardType:SITE set:1,2,3 siteNumber:4"
+      }
+    },
+    {
+      "type": "filterPick",
+      "repeat": 1,
+      "data": {
+        "optionCount": 3,
+        "filter": "cardType:SITE set:1,2,3 siteNumber:5"
+      }
+    },
+    {
+      "type": "filterPick",
+      "repeat": 1,
+      "data": {
+        "optionCount": 3,
+        "filter": "cardType:SITE set:1,2,3 siteNumber:6"
+      }
+    },
+    {
+      "type": "filterPick",
+      "repeat": 1,
+      "data": {
+        "optionCount": 3,
+        "filter": "cardType:SITE set:1,2,3 siteNumber:7"
+      }
+    },
+    {
+      "type": "filterPick",
+      "repeat": 1,
+      "data": {
+        "optionCount": 3,
+        "filter": "cardType:SITE set:1,2,3 siteNumber:8"
+      }
+    },
+    {
+      "type": "filterPick",
+      "repeat": 1,
+      "data": {
+        "optionCount": 3,
+        "filter": "cardType:SITE set:1,2,3 siteNumber:9"
+      }
+    }
+  ]
+}
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/draft/hobbitDraft.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/draft/hobbitDraft.json
similarity index 96%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/draft/hobbitDraft.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/draft/hobbitDraft.json
index 5d5965962..46d1c05fb 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/draft/hobbitDraft.json
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/draft/hobbitDraft.json
@@ -1,221 +1,221 @@
-{
-  "format": "limited_hobbit",
-  "startingPool": {
-    "type": "randomCardPool",
-    "data": {
-      "randomResult": [
-        ["30_1", "30_2", "30_3", "30_4", "30_5", "30_6", "30_7", "30_8", "30_9", "30_10", "30_11", "30_12", "30_13", "30_14", "30_15", "30_16", "30_17", "30_18", "30_19", "30_20", "30_21", "30_22", "30_23", "30_24", "30_29", "30_30", "30_31", "30_47", "30_48", "30_32", "30_32", "30_32", "30_33", "30_33", "30_34", "30_34", "30_35", "30_35", "30_35", "30_35", "30_36", "30_36", "30_37", "30_37", "30_38", "30_38", "30_39", "30_39", "30_39", "30_40", "30_40", "30_40", "30_41", "30_41", "30_42", "30_42", "30_42", "30_42", "30_58", "30_49", "30_50", "30_51", "30_52", "30_53", "30_54", "30_55", "30_56", "30_57"]
-      ]
-    }
-  },
-  "choices": [
-    {
-      "type": "filterPick",
-      "repeat": 1,
-      "data": {
-        "optionCount": 1,
-        "filter": "side:FREE_PEOPLE name:Bilbo set:30"
-      }
-    },
-    {
-      "type": "filterPick",
-      "repeat": 1,
-      "data": {
-        "optionCount": 1,
-        "filter": "side:FREE_PEOPLE name:Gandalf set:30"
-      }
-    },
-    {
-      "type": "filterPick",
-      "repeat": 1,
-      "data": {
-        "optionCount": 2,
-        "filter": "side:SHADOW set:31 rarity:R"
-      }
-    },
-    {
-      "type": "weightedSwitch",
-      "repeat": 5,
-      "data": {
-        "switchResult": [
-          {
-            "weight": 0.4,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 3,
-              "filter": "side:SHADOW set:31 rarity:X"
-            }
-          },
-          {
-            "weight": 0.4,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 4,
-              "filter": "side:SHADOW set:31 rarity:U,R"
-            }
-          },
-          {
-            "weight": 0.2,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 6,
-              "filter": "side:SHADOW set:31 rarity:U"
-            }
-          }
-        ]
-      }
-    },
-    {
-      "type": "weightedSwitch",
-      "repeat": 5,
-      "data": {
-        "switchResult": [
-          {
-            "weight": 0.2,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 2,
-              "filter": "side:SHADOW set:31 rarity:X"
-            }
-          },
-          {
-            "weight": 0.25,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 3,
-              "filter": "side:SHADOW set:31 rarity:U,R"
-            }
-          },
-          {
-            "weight": 0.35,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 5,
-              "filter": "side:SHADOW set:31 rarity:U"
-            }
-          },
-          {
-            "weight": 0.2,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 8,
-              "filter": "side:SHADOW set:31 rarity:C"
-            }
-          }
-        ]
-      }
-    },
-    {
-      "type": "weightedSwitch",
-      "repeat": 5,
-      "data": {
-        "switchResult": [
-          {
-            "weight": 0.45,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 3,
-              "filter": "side:SHADOW set:31 rarity:U"
-            }
-          },
-          {
-            "weight": 0.55,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 5,
-              "filter": "side:SHADOW set:31 rarity:C"
-            }
-          }
-        ]
-      }
-    },
-    {
-      "type": "weightedSwitch",
-      "repeat": 5,
-      "data": {
-        "switchResult": [
-          {
-            "weight": 0.2,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 3,
-              "filter": "side:SHADOW set:31 rarity:U"
-            }
-          },
-          {
-            "weight": 0.8,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 4,
-              "filter": "side:SHADOW set:31 rarity:C"
-            }
-          }
-        ]
-      }
-    },
-    {
-      "type": "filterPick",
-      "repeat": 3,
-      "data": {
-        "optionCount": 5,
-        "filter": "set:30,31 rarity:C"
-      }
-    },
-    {
-      "type": "weightedSwitch",
-      "repeat": 16,
-      "data": {
-        "switchResult": [
-          {
-            "weight": 0.2,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 3,
-              "filter": "side:FREE_PEOPLE set:30,31 rarity:X"
-            }
-          },
-          {
-            "weight": 0.3,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 4,
-              "filter": "side:FREE_PEOPLE set:30,31 rarity:R"
-            }
-          },
-          {
-            "weight": 0.5,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 3,
-              "filter": "side:FREE_PEOPLE set:30,31 rarity:C"
-            }
-          }
-        ]
-      }
-    },
-    {
-      "type": "weightedSwitch",
-      "repeat": 5,
-      "data": {
-        "switchResult": [
-          {
-            "weight": 0.2,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 3,
-              "filter": "cardType:SITE set:30,31 rarity:X"
-            }
-          },
-          {
-            "weight": 0.8,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 4,
-              "filter": "cardType:SITE set:30,31 rarity:R"
-            }
-          }
-        ]
-      }
-    }
-  ]
-}
+{
+  "format": "limited_hobbit",
+  "startingPool": {
+    "type": "randomCardPool",
+    "data": {
+      "randomResult": [
+        ["30_1", "30_2", "30_3", "30_4", "30_5", "30_6", "30_7", "30_8", "30_9", "30_10", "30_11", "30_12", "30_13", "30_14", "30_15", "30_16", "30_17", "30_18", "30_19", "30_20", "30_21", "30_22", "30_23", "30_24", "30_29", "30_30", "30_31", "30_47", "30_48", "30_32", "30_32", "30_32", "30_33", "30_33", "30_34", "30_34", "30_35", "30_35", "30_35", "30_35", "30_36", "30_36", "30_37", "30_37", "30_38", "30_38", "30_39", "30_39", "30_39", "30_40", "30_40", "30_40", "30_41", "30_41", "30_42", "30_42", "30_42", "30_42", "30_58", "30_49", "30_50", "30_51", "30_52", "30_53", "30_54", "30_55", "30_56", "30_57"]
+      ]
+    }
+  },
+  "choices": [
+    {
+      "type": "filterPick",
+      "repeat": 1,
+      "data": {
+        "optionCount": 1,
+        "filter": "side:FREE_PEOPLE name:Bilbo set:30"
+      }
+    },
+    {
+      "type": "filterPick",
+      "repeat": 1,
+      "data": {
+        "optionCount": 1,
+        "filter": "side:FREE_PEOPLE name:Gandalf set:30"
+      }
+    },
+    {
+      "type": "filterPick",
+      "repeat": 1,
+      "data": {
+        "optionCount": 2,
+        "filter": "side:SHADOW set:31 rarity:R"
+      }
+    },
+    {
+      "type": "weightedSwitch",
+      "repeat": 5,
+      "data": {
+        "switchResult": [
+          {
+            "weight": 0.4,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 3,
+              "filter": "side:SHADOW set:31 rarity:X"
+            }
+          },
+          {
+            "weight": 0.4,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 4,
+              "filter": "side:SHADOW set:31 rarity:U,R"
+            }
+          },
+          {
+            "weight": 0.2,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 6,
+              "filter": "side:SHADOW set:31 rarity:U"
+            }
+          }
+        ]
+      }
+    },
+    {
+      "type": "weightedSwitch",
+      "repeat": 5,
+      "data": {
+        "switchResult": [
+          {
+            "weight": 0.2,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 2,
+              "filter": "side:SHADOW set:31 rarity:X"
+            }
+          },
+          {
+            "weight": 0.25,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 3,
+              "filter": "side:SHADOW set:31 rarity:U,R"
+            }
+          },
+          {
+            "weight": 0.35,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 5,
+              "filter": "side:SHADOW set:31 rarity:U"
+            }
+          },
+          {
+            "weight": 0.2,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 8,
+              "filter": "side:SHADOW set:31 rarity:C"
+            }
+          }
+        ]
+      }
+    },
+    {
+      "type": "weightedSwitch",
+      "repeat": 5,
+      "data": {
+        "switchResult": [
+          {
+            "weight": 0.45,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 3,
+              "filter": "side:SHADOW set:31 rarity:U"
+            }
+          },
+          {
+            "weight": 0.55,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 5,
+              "filter": "side:SHADOW set:31 rarity:C"
+            }
+          }
+        ]
+      }
+    },
+    {
+      "type": "weightedSwitch",
+      "repeat": 5,
+      "data": {
+        "switchResult": [
+          {
+            "weight": 0.2,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 3,
+              "filter": "side:SHADOW set:31 rarity:U"
+            }
+          },
+          {
+            "weight": 0.8,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 4,
+              "filter": "side:SHADOW set:31 rarity:C"
+            }
+          }
+        ]
+      }
+    },
+    {
+      "type": "filterPick",
+      "repeat": 3,
+      "data": {
+        "optionCount": 5,
+        "filter": "set:30,31 rarity:C"
+      }
+    },
+    {
+      "type": "weightedSwitch",
+      "repeat": 16,
+      "data": {
+        "switchResult": [
+          {
+            "weight": 0.2,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 3,
+              "filter": "side:FREE_PEOPLE set:30,31 rarity:X"
+            }
+          },
+          {
+            "weight": 0.3,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 4,
+              "filter": "side:FREE_PEOPLE set:30,31 rarity:R"
+            }
+          },
+          {
+            "weight": 0.5,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 3,
+              "filter": "side:FREE_PEOPLE set:30,31 rarity:C"
+            }
+          }
+        ]
+      }
+    },
+    {
+      "type": "weightedSwitch",
+      "repeat": 5,
+      "data": {
+        "switchResult": [
+          {
+            "weight": 0.2,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 3,
+              "filter": "cardType:SITE set:30,31 rarity:X"
+            }
+          },
+          {
+            "weight": 0.8,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 4,
+              "filter": "cardType:SITE set:30,31 rarity:R"
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/draft/hobbitRandomDraft.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/draft/hobbitRandomDraft.json
similarity index 98%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/draft/hobbitRandomDraft.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/draft/hobbitRandomDraft.json
index 70e4f3157..d45646fd1 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/draft/hobbitRandomDraft.json
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/draft/hobbitRandomDraft.json
@@ -1,194 +1,194 @@
-{
-  "format": "limited_hobbit",
-  "startingPool": {
-    "type": "randomCardPool",
-    "data": {
-      "randomResult": [
-        ["30_1", "30_2", "30_3", "30_4", "30_5", "30_6", "30_7", "30_8", "30_9", "30_10", "30_11", "30_12", "30_13", "30_14", "30_15", "30_16", "30_17", "30_18", "30_19", "30_20", "30_21", "30_22", "30_23", "30_24", "30_29", "30_30", "30_31", "30_47", "30_48", "30_32", "30_32", "30_32", "30_33", "30_33", "30_34", "30_34", "30_35", "30_35", "30_35", "30_35", "30_36", "30_36", "30_37", "30_37", "30_38", "30_38", "30_39", "30_39", "30_39", "30_40", "30_40", "30_40", "30_41", "30_41", "30_42", "30_42", "30_42", "30_42", "30_66", "30_49", "30_50", "30_51", "30_52", "30_53", "30_54", "30_55", "30_56", "30_57"]
-      ]
-    }
-  },
-  "draftPool": [
-    {
-      "type": "sharedDraft",
-      "data": {
-        "choose": 1,
-        "packs": [
-          ["30_1", "30_1", "30_1", "30_1", "30_1", "30_1", "30_1", "30_1", "30_3", "30_3", "30_3", "30_3", "30_3", "30_3", "30_3", "30_3", "30_4", "30_4", "30_4", "30_4", "30_4", "30_4", "30_4", "30_4", "30_13", "30_13", "30_13", "30_13", "30_13", "30_13", "30_13", "30_13", "30_14", "30_14", "30_14", "30_14", "30_14", "30_14", "30_14", "30_14", "30_20", "30_20", "30_20", "30_20", "30_20", "30_20", "30_20", "30_20", "30_23", "30_23", "30_23", "30_23", "30_23", "30_23", "30_23", "30_23", "30_24", "30_24", "30_24", "30_24", "30_24", "30_24", "30_24", "30_24", "30_30", "30_30", "30_30", "30_30", "30_30", "30_30", "30_30", "30_30", "30_31", "30_31", "30_31", "30_31", "30_31", "30_31", "30_31", "30_31","30_58", "30_58", "30_58", "30_58", "30_59", "30_59", "30_59", "30_59", "30_60", "30_60", "30_60", "30_60", "30_61", "30_61", "30_61", "30_61", "30_62", "30_62", "30_62", "30_62", "30_63", "30_63", "30_63", "30_63", "30_64", "30_64", "30_64", "30_64", "30_65", "30_65", "30_65", "30_65"]
-        ]
-      }
-    },
-    {
-      "type": "sharedDraft",
-      "data": {
-        "choose": 4,
-        "packs": [
-          ["31_1", "31_1", "31_2", "31_2", "31_2", "31_4", "31_4", "31_5", "31_5", "31_5", "31_6", "31_6", "31_7", "31_7", "31_7", "31_33", "31_33", "31_33", "31_48", "31_48", "31_47", "31_47"],
-          ["31_3", "31_3", "31_3", "31_8", "31_8", "31_9", "31_9", "31_10", "31_10", "31_11", "31_11", "31_11", "31_12", "31_12", "31_12", "31_29", "31_29", "31_37", "31_37", "31_37", "31_46", "31_46"],
-          ["31_13", "31_13", "31_13", "31_14", "31_14", "31_15", "31_15", "31_16", "31_16", "31_17", "31_17", "31_17", "31_18", "31_18", "31_18", "31_25", "31_25", "31_25", "31_50", "31_50", "31_44", "31_44"],
-          ["31_38", "31_38", "31_38", "31_39", "31_39", "31_40", "31_40", "31_41", "31_41", "31_41", "31_42", "31_42", "31_42", "31_43", "31_43", "31_22", "31_22", "31_22", "31_57", "31_57", "31_45", "31_45"],
-          ["32_1", "32_1", "32_1", "32_2", "32_2", "32_2", "32_4", "32_4", "32_5", "32_5", "32_6", "32_6", "32_8", "32_8", "32_8", "32_26", "32_26", "32_30", "32_30", "32_30", "32_49", "32_49"],
-          ["32_3", "32_3", "32_3", "32_7", "32_7", "32_9", "32_9", "32_9", "32_10", "32_10", "32_11", "32_11", "32_11", "32_12", "32_12", "32_29", "32_29", "32_35", "32_35", "32_35", "32_48", "32_48"],
-          ["32_13", "32_13", "32_13", "32_14", "32_14", "32_21", "32_21", "32_22", "32_22", "32_23", "32_23", "32_23", "32_24", "32_24", "32_24", "32_39", "32_39", "32_57", "32_57", "32_57", "32_46", "32_46"],
-          ["32_15", "32_15", "32_15", "32_16", "32_16", "32_17", "32_17", "32_18", "32_18", "32_19", "32_19", "32_19", "32_20", "32_20", "32_20", "32_25", "32_25", "32_25", "32_53", "32_53", "32_47", "32_47"],
-          ["33_1", "33_1", "33_3", "33_3", "33_3", "33_4", "33_4", "33_10", "33_10", "33_10", "33_11", "33_11", "33_11", "33_12", "33_12", "33_36", "33_36", "33_36", "33_59", "33_59", "33_56", "33_56"],
-          ["33_2", "33_2", "33_5", "33_5", "33_5", "33_6", "33_6", "33_6", "33_7", "33_7", "33_8", "33_8", "33_9", "33_9", "33_9", "33_37", "33_37", "33_37", "33_60", "33_60", "33_58", "33_58"],
-          ["33_13", "33_13", "33_13", "33_14", "33_14", "33_14", "33_15", "33_15", "33_16", "33_16", "33_17", "33_17", "33_17", "33_18", "33_18", "33_33", "33_33", "33_33", "33_61", "33_61", "33_57", "33_57"],
-          ["33_19", "33_19", "33_20", "33_20", "33_21", "33_21", "33_52", "33_52", "33_52", "33_53", "33_53", "33_53", "33_54", "33_54", "33_54", "33_22", "33_22", "33_23", "33_23", "33_23", "33_55", "33_55"]
-        ]
-      }
-    },
-    {
-      "type": "singleDraft",
-      "data": {
-        "choose": 1,
-        "packs": [
-          ["31_30", "31_30", "31_30", "31_30", "31_30", "31_30", "31_30", "31_30", "31_31", "31_31", "31_31", "31_31", "31_31", "31_31", "31_31", "31_31", "31_32", "31_32", "31_32", "31_32", "31_32", "31_32", "31_32", "31_32", "31_34", "31_34", "31_34", "31_34", "31_35", "31_35", "31_35", "31_35", "31_35", "31_35", "31_35", "31_35", "31_36", "31_36", "31_36", "31_36", "31_49", "31_49", "31_49", "31_49", "31_49", "31_49", "31_51", "31_51", "31_51", "31_51", "31_51", "31_51", "31_51", "31_51", "31_52", "31_52", "31_52", "31_52", "31_52", "31_52", "31_53", "31_53", "31_53", "31_53", "31_53", "31_53", "31_53", "31_53", "31_54", "31_54", "31_54", "31_54", "31_55", "31_55", "31_55", "31_55", "31_55", "31_55", "31_55", "31_55"],
-          ["32_27", "32_27", "32_27", "32_27", "32_27", "32_27", "32_27", "32_27", "32_28", "32_28", "32_28", "32_28", "32_28", "32_28", "32_28", "32_28", "32_31", "32_31", "32_31", "32_31", "32_31", "32_31", "32_32", "32_32", "32_32", "32_32", "32_32", "32_32", "32_33", "32_33", "32_33", "32_33", "32_33", "32_33", "32_34", "32_34", "32_34", "32_34", "32_34", "32_34", "32_36", "32_36", "32_36", "32_36", "32_36", "32_36", "32_38", "32_38", "32_38", "32_38", "32_40", "32_40", "32_40", "32_40", "32_40", "32_40", "32_41", "32_41", "32_41", "32_41", "32_41", "32_41", "32_41", "32_41", "32_42", "32_42", "32_42", "32_42", "32_42", "32_42", "32_42", "32_42", "32_43", "32_43", "32_43", "32_43", "32_43", "32_43", "32_43", "32_43"],
-          ["33_38", "33_38", "33_38", "33_38", "33_38", "33_38", "33_38", "33_38", "33_39", "33_39", "33_39", "33_39", "33_39", "33_39", "33_39", "33_39", "33_40", "33_40", "33_40", "33_40", "33_40", "33_40", "33_41", "33_41", "33_41", "33_41", "33_41", "33_41", "33_43", "33_43", "33_43", "33_43", "33_45", "33_45", "33_45", "33_45", "33_45", "33_45", "33_45", "33_45", "33_46", "33_46", "33_46", "33_46", "33_46", "33_46", "33_47", "33_47", "33_47", "33_47", "33_47", "33_47", "33_47", "33_47", "33_48", "33_48", "33_48", "33_48", "33_48", "33_48", "33_49", "33_49", "33_49", "33_49", "33_49", "33_49", "33_49", "33_49", "33_50", "33_50", "33_50", "33_50", "33_50", "33_50", "33_51", "33_51", "33_51", "33_51", "33_51", "33_51"]
-        ]
-      }
-    },
-    {
-      "type": "singleDraft",
-      "data": {
-        "choose": 1,
-        "packs": [
-          ["31_19", "31_19", "31_19", "31_19", "31_19", "31_19", "31_19", "31_19", "31_20", "31_20", "31_20", "31_20", "31_20", "31_20", "31_21", "31_21", "31_21", "31_21", "31_21", "31_21", "31_23", "31_23", "31_23", "31_23", "31_23", "31_23", "31_24", "31_24", "31_24", "31_24", "31_26", "31_26", "31_26", "31_26", "31_26", "31_26", "31_27", "31_27", "31_27", "31_27", "31_27", "31_27", "31_27", "31_27", "31_28", "31_28", "31_28", "31_28", "31_28", "31_28", "31_56", "31_56", "31_56", "31_56", "31_56", "31_56", "31_58", "31_58", "31_58", "31_58", "31_58", "31_58", "31_59", "31_59", "31_59", "31_59", "31_59", "31_59", "31_60", "31_60", "31_60", "31_60", "31_60", "31_60", "31_61", "31_61", "31_61", "31_61", "31_61", "31_61"],
-          ["32_37", "32_37", "32_37", "32_37", "32_37", "32_37", "32_37", "32_37", "32_44", "32_44", "32_44", "32_44", "32_45", "32_45", "32_45", "32_45", "32_45", "32_45", "32_45", "32_45", "32_50", "32_50", "32_50", "32_50", "32_51", "32_51", "32_51", "32_51", "32_51", "32_51", "32_51", "32_51", "32_52", "32_52", "32_52", "32_52", "32_52", "32_52", "32_52", "32_52", "32_54", "32_54", "32_54", "32_54", "32_54", "32_54", "32_55", "32_55", "32_55", "32_55", "32_56", "32_56", "32_56", "32_56", "32_56", "32_56", "32_58", "32_58", "32_58", "32_58", "32_58", "32_58", "32_59", "32_59", "32_60", "32_60", "32_61", "32_61", "32_62", "32_62", "32_63", "32_63", "32_64", "32_64", "32_65", "32_65", "32_66", "32_66", "32_67", "32_67"],
-          ["33_24", "33_24", "33_24", "33_24", "33_24", "33_24", "33_25", "33_25", "33_25", "33_25", "33_25", "33_25", "33_26", "33_26", "33_26", "33_26", "33_26", "33_26", "33_27", "33_27", "33_27", "33_27", "33_27", "33_27", "33_28", "33_28", "33_28", "33_28", "33_28", "33_28", "33_29", "33_29", "33_29", "33_29", "33_29", "33_29", "33_30", "33_30", "33_30", "33_30", "33_30", "33_30", "33_31", "33_31", "33_31", "33_31", "33_31", "33_31", "33_32", "33_32", "33_32", "33_32", "33_32", "33_32", "33_34", "33_34", "33_34", "33_34", "33_34", "33_34", "33_35", "33_35", "33_35", "33_35", "33_35", "33_35", "33_42", "33_42", "33_42", "33_42", "33_42", "33_42", "33_42", "33_42", "33_44", "33_44", "33_44", "33_44", "33_44", "33_44"]
-        ]
-      }
-    }
-  ],
-  "choices": [
-    {
-      "type": "filterPick",
-      "repeat": 1,
-      "data": {
-        "optionCount": 1,
-        "filter": "side:FREE_PEOPLE name:Bilbo set:30"
-      }
-    },
-    {
-      "type": "filterPick",
-      "repeat": 1,
-      "data": {
-        "optionCount": 1,
-        "filter": "side:FREE_PEOPLE name:Gandalf set:30"
-      }
-    },
-    {
-      "type": "draftPoolFilterPluck",
-      "repeat": 1,
-      "data": {
-        "optionCount": 5,
-        "filter": "side:FREE_PEOPLE rarity:R,X"
-      }
-    },
-    {
-      "type": "draftPoolFilterPluck",
-      "repeat": 4,
-      "data": {
-        "optionCount": 7,
-        "filter": "side:FREE_PEOPLE"
-      }
-    },
-    {
-      "type": "draftPoolFilterPluck",
-      "repeat": 4,
-      "data": {
-        "optionCount": 6,
-        "filter": "side:FREE_PEOPLE"
-      }
-    },
-    {
-      "type": "draftPoolFilterPluck",
-      "repeat": 8,
-      "data": {
-        "optionCount": 4,
-        "filter": "side:FREE_PEOPLE rarity:C"
-      }
-    },
-    {
-      "type": "draftPoolFilterPluck",
-      "repeat": 1,
-      "data": {
-        "optionCount": 4,
-        "filter": "side:SHADOW rarity:R,X"
-      }
-    },
-    {
-      "type": "draftPoolFilterPluck",
-      "repeat": 1,
-      "data": {
-        "optionCount": 8,
-        "filter": "side:SHADOW"
-      }
-    },
-    {
-      "type": "draftPoolFilterPluck",
-      "repeat": 3,
-      "data": {
-        "optionCount": 7,
-        "filter": "side:SHADOW"
-      }
-    },
-    {
-      "type": "draftPoolFilterPluck",
-      "repeat": 3,
-      "data": {
-        "optionCount": 6,
-        "filter": "side:SHADOW"
-      }
-    },
-    {
-      "type": "draftPoolFilterPluck",
-      "repeat": 3,
-      "data": {
-        "optionCount": 5,
-        "filter": "side:SHADOW"
-      }
-    },
-    {
-      "type": "draftPoolFilterPluck",
-      "repeat": 3,
-      "data": {
-        "optionCount": 4,
-        "filter": "side:SHADOW"
-      }
-    },
-    {
-      "type": "draftPoolFilterPluck",
-      "repeat": 4,
-      "data": {
-        "optionCount": 3,
-        "filter": "side:SHADOW"
-      }
-    },
-    {
-      "type": "draftPoolFilterPluck",
-      "repeat": 3,
-      "data": {
-        "optionCount": 4,
-        "filter": "side:SHADOW rarity:C,U,P"
-      }
-    },
-    {
-      "type": "draftPoolFilterPluck",
-      "repeat": 5,
-      "data": {
-        "optionCount": 4,
-        "filter": "cardType:SITE"
-      }
-    },
-    {
-      "type": "draftPoolFilterPluck",
-      "repeat": 3,
-      "data": {
-        "optionCount": 5,
-        "filter": "rarity:C,U,P"
-      }
-    }
-  ]
-}
+{
+  "format": "limited_hobbit",
+  "startingPool": {
+    "type": "randomCardPool",
+    "data": {
+      "randomResult": [
+        ["30_1", "30_2", "30_3", "30_4", "30_5", "30_6", "30_7", "30_8", "30_9", "30_10", "30_11", "30_12", "30_13", "30_14", "30_15", "30_16", "30_17", "30_18", "30_19", "30_20", "30_21", "30_22", "30_23", "30_24", "30_29", "30_30", "30_31", "30_47", "30_48", "30_32", "30_32", "30_32", "30_33", "30_33", "30_34", "30_34", "30_35", "30_35", "30_35", "30_35", "30_36", "30_36", "30_37", "30_37", "30_38", "30_38", "30_39", "30_39", "30_39", "30_40", "30_40", "30_40", "30_41", "30_41", "30_42", "30_42", "30_42", "30_42", "30_66", "30_49", "30_50", "30_51", "30_52", "30_53", "30_54", "30_55", "30_56", "30_57"]
+      ]
+    }
+  },
+  "draftPool": [
+    {
+      "type": "sharedDraft",
+      "data": {
+        "choose": 1,
+        "packs": [
+          ["30_1", "30_1", "30_1", "30_1", "30_1", "30_1", "30_1", "30_1", "30_3", "30_3", "30_3", "30_3", "30_3", "30_3", "30_3", "30_3", "30_4", "30_4", "30_4", "30_4", "30_4", "30_4", "30_4", "30_4", "30_13", "30_13", "30_13", "30_13", "30_13", "30_13", "30_13", "30_13", "30_14", "30_14", "30_14", "30_14", "30_14", "30_14", "30_14", "30_14", "30_20", "30_20", "30_20", "30_20", "30_20", "30_20", "30_20", "30_20", "30_23", "30_23", "30_23", "30_23", "30_23", "30_23", "30_23", "30_23", "30_24", "30_24", "30_24", "30_24", "30_24", "30_24", "30_24", "30_24", "30_30", "30_30", "30_30", "30_30", "30_30", "30_30", "30_30", "30_30", "30_31", "30_31", "30_31", "30_31", "30_31", "30_31", "30_31", "30_31","30_58", "30_58", "30_58", "30_58", "30_59", "30_59", "30_59", "30_59", "30_60", "30_60", "30_60", "30_60", "30_61", "30_61", "30_61", "30_61", "30_62", "30_62", "30_62", "30_62", "30_63", "30_63", "30_63", "30_63", "30_64", "30_64", "30_64", "30_64", "30_65", "30_65", "30_65", "30_65"]
+        ]
+      }
+    },
+    {
+      "type": "sharedDraft",
+      "data": {
+        "choose": 4,
+        "packs": [
+          ["31_1", "31_1", "31_2", "31_2", "31_2", "31_4", "31_4", "31_5", "31_5", "31_5", "31_6", "31_6", "31_7", "31_7", "31_7", "31_33", "31_33", "31_33", "31_48", "31_48", "31_47", "31_47"],
+          ["31_3", "31_3", "31_3", "31_8", "31_8", "31_9", "31_9", "31_10", "31_10", "31_11", "31_11", "31_11", "31_12", "31_12", "31_12", "31_29", "31_29", "31_37", "31_37", "31_37", "31_46", "31_46"],
+          ["31_13", "31_13", "31_13", "31_14", "31_14", "31_15", "31_15", "31_16", "31_16", "31_17", "31_17", "31_17", "31_18", "31_18", "31_18", "31_25", "31_25", "31_25", "31_50", "31_50", "31_44", "31_44"],
+          ["31_38", "31_38", "31_38", "31_39", "31_39", "31_40", "31_40", "31_41", "31_41", "31_41", "31_42", "31_42", "31_42", "31_43", "31_43", "31_22", "31_22", "31_22", "31_57", "31_57", "31_45", "31_45"],
+          ["32_1", "32_1", "32_1", "32_2", "32_2", "32_2", "32_4", "32_4", "32_5", "32_5", "32_6", "32_6", "32_8", "32_8", "32_8", "32_26", "32_26", "32_30", "32_30", "32_30", "32_49", "32_49"],
+          ["32_3", "32_3", "32_3", "32_7", "32_7", "32_9", "32_9", "32_9", "32_10", "32_10", "32_11", "32_11", "32_11", "32_12", "32_12", "32_29", "32_29", "32_35", "32_35", "32_35", "32_48", "32_48"],
+          ["32_13", "32_13", "32_13", "32_14", "32_14", "32_21", "32_21", "32_22", "32_22", "32_23", "32_23", "32_23", "32_24", "32_24", "32_24", "32_39", "32_39", "32_57", "32_57", "32_57", "32_46", "32_46"],
+          ["32_15", "32_15", "32_15", "32_16", "32_16", "32_17", "32_17", "32_18", "32_18", "32_19", "32_19", "32_19", "32_20", "32_20", "32_20", "32_25", "32_25", "32_25", "32_53", "32_53", "32_47", "32_47"],
+          ["33_1", "33_1", "33_3", "33_3", "33_3", "33_4", "33_4", "33_10", "33_10", "33_10", "33_11", "33_11", "33_11", "33_12", "33_12", "33_36", "33_36", "33_36", "33_59", "33_59", "33_56", "33_56"],
+          ["33_2", "33_2", "33_5", "33_5", "33_5", "33_6", "33_6", "33_6", "33_7", "33_7", "33_8", "33_8", "33_9", "33_9", "33_9", "33_37", "33_37", "33_37", "33_60", "33_60", "33_58", "33_58"],
+          ["33_13", "33_13", "33_13", "33_14", "33_14", "33_14", "33_15", "33_15", "33_16", "33_16", "33_17", "33_17", "33_17", "33_18", "33_18", "33_33", "33_33", "33_33", "33_61", "33_61", "33_57", "33_57"],
+          ["33_19", "33_19", "33_20", "33_20", "33_21", "33_21", "33_52", "33_52", "33_52", "33_53", "33_53", "33_53", "33_54", "33_54", "33_54", "33_22", "33_22", "33_23", "33_23", "33_23", "33_55", "33_55"]
+        ]
+      }
+    },
+    {
+      "type": "singleDraft",
+      "data": {
+        "choose": 1,
+        "packs": [
+          ["31_30", "31_30", "31_30", "31_30", "31_30", "31_30", "31_30", "31_30", "31_31", "31_31", "31_31", "31_31", "31_31", "31_31", "31_31", "31_31", "31_32", "31_32", "31_32", "31_32", "31_32", "31_32", "31_32", "31_32", "31_34", "31_34", "31_34", "31_34", "31_35", "31_35", "31_35", "31_35", "31_35", "31_35", "31_35", "31_35", "31_36", "31_36", "31_36", "31_36", "31_49", "31_49", "31_49", "31_49", "31_49", "31_49", "31_51", "31_51", "31_51", "31_51", "31_51", "31_51", "31_51", "31_51", "31_52", "31_52", "31_52", "31_52", "31_52", "31_52", "31_53", "31_53", "31_53", "31_53", "31_53", "31_53", "31_53", "31_53", "31_54", "31_54", "31_54", "31_54", "31_55", "31_55", "31_55", "31_55", "31_55", "31_55", "31_55", "31_55"],
+          ["32_27", "32_27", "32_27", "32_27", "32_27", "32_27", "32_27", "32_27", "32_28", "32_28", "32_28", "32_28", "32_28", "32_28", "32_28", "32_28", "32_31", "32_31", "32_31", "32_31", "32_31", "32_31", "32_32", "32_32", "32_32", "32_32", "32_32", "32_32", "32_33", "32_33", "32_33", "32_33", "32_33", "32_33", "32_34", "32_34", "32_34", "32_34", "32_34", "32_34", "32_36", "32_36", "32_36", "32_36", "32_36", "32_36", "32_38", "32_38", "32_38", "32_38", "32_40", "32_40", "32_40", "32_40", "32_40", "32_40", "32_41", "32_41", "32_41", "32_41", "32_41", "32_41", "32_41", "32_41", "32_42", "32_42", "32_42", "32_42", "32_42", "32_42", "32_42", "32_42", "32_43", "32_43", "32_43", "32_43", "32_43", "32_43", "32_43", "32_43"],
+          ["33_38", "33_38", "33_38", "33_38", "33_38", "33_38", "33_38", "33_38", "33_39", "33_39", "33_39", "33_39", "33_39", "33_39", "33_39", "33_39", "33_40", "33_40", "33_40", "33_40", "33_40", "33_40", "33_41", "33_41", "33_41", "33_41", "33_41", "33_41", "33_43", "33_43", "33_43", "33_43", "33_45", "33_45", "33_45", "33_45", "33_45", "33_45", "33_45", "33_45", "33_46", "33_46", "33_46", "33_46", "33_46", "33_46", "33_47", "33_47", "33_47", "33_47", "33_47", "33_47", "33_47", "33_47", "33_48", "33_48", "33_48", "33_48", "33_48", "33_48", "33_49", "33_49", "33_49", "33_49", "33_49", "33_49", "33_49", "33_49", "33_50", "33_50", "33_50", "33_50", "33_50", "33_50", "33_51", "33_51", "33_51", "33_51", "33_51", "33_51"]
+        ]
+      }
+    },
+    {
+      "type": "singleDraft",
+      "data": {
+        "choose": 1,
+        "packs": [
+          ["31_19", "31_19", "31_19", "31_19", "31_19", "31_19", "31_19", "31_19", "31_20", "31_20", "31_20", "31_20", "31_20", "31_20", "31_21", "31_21", "31_21", "31_21", "31_21", "31_21", "31_23", "31_23", "31_23", "31_23", "31_23", "31_23", "31_24", "31_24", "31_24", "31_24", "31_26", "31_26", "31_26", "31_26", "31_26", "31_26", "31_27", "31_27", "31_27", "31_27", "31_27", "31_27", "31_27", "31_27", "31_28", "31_28", "31_28", "31_28", "31_28", "31_28", "31_56", "31_56", "31_56", "31_56", "31_56", "31_56", "31_58", "31_58", "31_58", "31_58", "31_58", "31_58", "31_59", "31_59", "31_59", "31_59", "31_59", "31_59", "31_60", "31_60", "31_60", "31_60", "31_60", "31_60", "31_61", "31_61", "31_61", "31_61", "31_61", "31_61"],
+          ["32_37", "32_37", "32_37", "32_37", "32_37", "32_37", "32_37", "32_37", "32_44", "32_44", "32_44", "32_44", "32_45", "32_45", "32_45", "32_45", "32_45", "32_45", "32_45", "32_45", "32_50", "32_50", "32_50", "32_50", "32_51", "32_51", "32_51", "32_51", "32_51", "32_51", "32_51", "32_51", "32_52", "32_52", "32_52", "32_52", "32_52", "32_52", "32_52", "32_52", "32_54", "32_54", "32_54", "32_54", "32_54", "32_54", "32_55", "32_55", "32_55", "32_55", "32_56", "32_56", "32_56", "32_56", "32_56", "32_56", "32_58", "32_58", "32_58", "32_58", "32_58", "32_58", "32_59", "32_59", "32_60", "32_60", "32_61", "32_61", "32_62", "32_62", "32_63", "32_63", "32_64", "32_64", "32_65", "32_65", "32_66", "32_66", "32_67", "32_67"],
+          ["33_24", "33_24", "33_24", "33_24", "33_24", "33_24", "33_25", "33_25", "33_25", "33_25", "33_25", "33_25", "33_26", "33_26", "33_26", "33_26", "33_26", "33_26", "33_27", "33_27", "33_27", "33_27", "33_27", "33_27", "33_28", "33_28", "33_28", "33_28", "33_28", "33_28", "33_29", "33_29", "33_29", "33_29", "33_29", "33_29", "33_30", "33_30", "33_30", "33_30", "33_30", "33_30", "33_31", "33_31", "33_31", "33_31", "33_31", "33_31", "33_32", "33_32", "33_32", "33_32", "33_32", "33_32", "33_34", "33_34", "33_34", "33_34", "33_34", "33_34", "33_35", "33_35", "33_35", "33_35", "33_35", "33_35", "33_42", "33_42", "33_42", "33_42", "33_42", "33_42", "33_42", "33_42", "33_44", "33_44", "33_44", "33_44", "33_44", "33_44"]
+        ]
+      }
+    }
+  ],
+  "choices": [
+    {
+      "type": "filterPick",
+      "repeat": 1,
+      "data": {
+        "optionCount": 1,
+        "filter": "side:FREE_PEOPLE name:Bilbo set:30"
+      }
+    },
+    {
+      "type": "filterPick",
+      "repeat": 1,
+      "data": {
+        "optionCount": 1,
+        "filter": "side:FREE_PEOPLE name:Gandalf set:30"
+      }
+    },
+    {
+      "type": "draftPoolFilterPluck",
+      "repeat": 1,
+      "data": {
+        "optionCount": 5,
+        "filter": "side:FREE_PEOPLE rarity:R,X"
+      }
+    },
+    {
+      "type": "draftPoolFilterPluck",
+      "repeat": 4,
+      "data": {
+        "optionCount": 7,
+        "filter": "side:FREE_PEOPLE"
+      }
+    },
+    {
+      "type": "draftPoolFilterPluck",
+      "repeat": 4,
+      "data": {
+        "optionCount": 6,
+        "filter": "side:FREE_PEOPLE"
+      }
+    },
+    {
+      "type": "draftPoolFilterPluck",
+      "repeat": 8,
+      "data": {
+        "optionCount": 4,
+        "filter": "side:FREE_PEOPLE rarity:C"
+      }
+    },
+    {
+      "type": "draftPoolFilterPluck",
+      "repeat": 1,
+      "data": {
+        "optionCount": 4,
+        "filter": "side:SHADOW rarity:R,X"
+      }
+    },
+    {
+      "type": "draftPoolFilterPluck",
+      "repeat": 1,
+      "data": {
+        "optionCount": 8,
+        "filter": "side:SHADOW"
+      }
+    },
+    {
+      "type": "draftPoolFilterPluck",
+      "repeat": 3,
+      "data": {
+        "optionCount": 7,
+        "filter": "side:SHADOW"
+      }
+    },
+    {
+      "type": "draftPoolFilterPluck",
+      "repeat": 3,
+      "data": {
+        "optionCount": 6,
+        "filter": "side:SHADOW"
+      }
+    },
+    {
+      "type": "draftPoolFilterPluck",
+      "repeat": 3,
+      "data": {
+        "optionCount": 5,
+        "filter": "side:SHADOW"
+      }
+    },
+    {
+      "type": "draftPoolFilterPluck",
+      "repeat": 3,
+      "data": {
+        "optionCount": 4,
+        "filter": "side:SHADOW"
+      }
+    },
+    {
+      "type": "draftPoolFilterPluck",
+      "repeat": 4,
+      "data": {
+        "optionCount": 3,
+        "filter": "side:SHADOW"
+      }
+    },
+    {
+      "type": "draftPoolFilterPluck",
+      "repeat": 3,
+      "data": {
+        "optionCount": 4,
+        "filter": "side:SHADOW rarity:C,U,P"
+      }
+    },
+    {
+      "type": "draftPoolFilterPluck",
+      "repeat": 5,
+      "data": {
+        "optionCount": 4,
+        "filter": "cardType:SITE"
+      }
+    },
+    {
+      "type": "draftPoolFilterPluck",
+      "repeat": 3,
+      "data": {
+        "optionCount": 5,
+        "filter": "rarity:C,U,P"
+      }
+    }
+  ]
+}
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/draft/testDraft.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/draft/testDraft.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/draft/testDraft.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/draft/testDraft.json
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/draft/twoTowersDraft.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/draft/twoTowersDraft.json
similarity index 96%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/draft/twoTowersDraft.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/draft/twoTowersDraft.json
index 9b3183bd0..807ac790f 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/draft/twoTowersDraft.json
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/draft/twoTowersDraft.json
@@ -1,295 +1,295 @@
-{
-  "format": "limited_ttt",
-  "startingPool": {
-    "type": "boosterDraftRun",
-    "data": {
-      "runLength": 14,
-      "coreCards": ["4_2","4_302"],
-      "freePeoplesRuns": [
-        ["4_90", "4_105", "4_97", "4_98", "4_97", "4_105", "4_90", "4_109", "4_115", "4_112", "4_115", "4_109", "4_71", "4_83", "4_76", "4_78", "4_83", "4_71", "4_74", "4_87", "4_70", "4_87", "4_74", "4_117", "4_135", "4_112", "4_128", "4_130", "4_135", "4_117"],
-        ["4_266", "4_278", "4_277", "4_273", "4_273", "4_281", "4_283", "4_266", "4_270", "4_287", "4_265", "4_297", "4_265", "4_287", "4_270", "4_49", "4_44", "4_42", "4_58", "4_42", "4_44", "4_49", "4_310", "4_322", "4_308", "4_314", "4_310", "4_308", "4_322", "4_314"]
-      ],
-      "shadowRuns": [
-        ["4_248", "4_221", "4_222", "4_227", "4_226", "4_224", "4_228", "4_258", "4_228", "4_224", "4_226", "4_227", "4_222", "4_221", "4_248", "4_165", "4_191", "4_184", "4_206", "4_204", "4_180", "4_198", "4_137", "4_198", "4_180", "4_204", "4_206", "4_184", "4_191", "4_165", "4_4", "4_17", "4_16", "4_25", "4_10", "4_14", "4_12", "4_21", "4_12", "4_14", "4_10", "4_25", "4_16", "4_17", "4_4", "4_207", "4_181", "4_193", "4_189", "4_187", "4_190", "4_178", "4_153", "4_178", "4_190", "4_187", "4_189", "4_193", "4_181", "4_207"]
-      ]
-    }
-  },
-  "choices": [
-    {
-      "type": "filterPick",
-      "repeat": 1,
-      "data": {
-        "optionCount": 5,
-        "filter": "side:FREE_PEOPLE set:4,5,6 rarity:R"
-      }
-    },
-    {
-      "type": "weightedSwitch",
-      "repeat": 10,
-      "data": {
-        "switchResult": [
-          {
-            "weight": 0.1,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 5,
-              "filter": "side:FREE_PEOPLE set:4 rarity:R"
-            }
-          },
-          {
-            "weight": 0.3,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 8,
-              "filter": "side:FREE_PEOPLE set:4 rarity:U,P"
-            }
-          },
-          {
-            "weight": 0.6,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 10,
-              "filter": "side:FREE_PEOPLE set:4 rarity:C"
-            }
-          }
-        ]
-      }
-    },{
-      "type": "weightedSwitch",
-      "repeat": 10,
-      "data": {
-        "switchResult": [
-          {
-            "weight": 0.1,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 5,
-              "filter": "side:FREE_PEOPLE set:5 rarity:R"
-            }
-          },
-          {
-            "weight": 0.3,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 8,
-              "filter": "side:FREE_PEOPLE set:5 rarity:U,P"
-            }
-          },
-          {
-            "weight": 0.6,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 10,
-              "filter": "side:FREE_PEOPLE set:5 rarity:C"
-            }
-          }
-        ]
-      }
-    },{
-      "type": "weightedSwitch",
-      "repeat": 10,
-      "data": {
-        "switchResult": [
-          {
-            "weight": 0.1,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 5,
-              "filter": "side:FREE_PEOPLE set:6 rarity:R"
-            }
-          },
-          {
-            "weight": 0.3,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 8,
-              "filter": "side:FREE_PEOPLE set:6 rarity:U,P"
-            }
-          },
-          {
-            "weight": 0.6,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 10,
-              "filter": "side:FREE_PEOPLE set:6 rarity:C"
-            }
-          }
-        ]
-      }
-    },
-    {
-      "type": "filterPick",
-      "repeat": 1,
-      "data": {
-        "optionCount": 5,
-        "filter": "side:SHADOW set:4,5,6 rarity:R"
-      }
-    },
-    {
-      "type": "weightedSwitch",
-      "repeat": 10,
-      "data": {
-        "switchResult": [
-          {
-            "weight": 0.1,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 5,
-              "filter": "side:SHADOW set:4 rarity:R"
-            }
-          },
-          {
-            "weight": 0.3,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 8,
-              "filter": "side:SHADOW set:4 rarity:U,P"
-            }
-          },
-          {
-            "weight": 0.6,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 10,
-              "filter": "side:SHADOW set:4 rarity:C"
-            }
-          }
-        ]
-      }
-    },{
-      "type": "weightedSwitch",
-      "repeat": 10,
-      "data": {
-        "switchResult": [
-          {
-            "weight": 0.1,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 5,
-              "filter": "side:SHADOW set:5 rarity:R"
-            }
-          },
-          {
-            "weight": 0.3,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 8,
-              "filter": "side:SHADOW set:5 rarity:U,P"
-            }
-          },
-          {
-            "weight": 0.6,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 10,
-              "filter": "side:SHADOW set:5 rarity:C"
-            }
-          }
-        ]
-      }
-    },{
-      "type": "weightedSwitch",
-      "repeat": 10,
-      "data": {
-        "switchResult": [
-          {
-            "weight": 0.1,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 5,
-              "filter": "side:SHADOW set:6 rarity:R"
-            }
-          },
-          {
-            "weight": 0.3,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 8,
-              "filter": "side:SHADOW set:6 rarity:U,P"
-            }
-          },
-          {
-            "weight": 0.6,
-            "type": "filterPick",
-            "data": {
-              "optionCount": 10,
-              "filter": "side:SHADOW set:6 rarity:C"
-            }
-          }
-        ]
-      }
-    },
-    {
-      "type": "filterPick",
-      "repeat": 1,
-      "data": {
-        "optionCount": 3,
-        "filter": "cardType:SITE set:4,5,6 siteNumber:1"
-      }
-    },
-    {
-      "type": "filterPick",
-      "repeat": 1,
-      "data": {
-        "optionCount": 3,
-        "filter": "cardType:SITE set:4,5,6 siteNumber:2"
-      }
-    },
-    {
-      "type": "filterPick",
-      "repeat": 1,
-      "data": {
-        "optionCount": 3,
-        "filter": "cardType:SITE set:4,5,6 siteNumber:3"
-      }
-    },
-    {
-      "type": "filterPick",
-      "repeat": 1,
-      "data": {
-        "optionCount": 3,
-        "filter": "cardType:SITE set:4,5,6 siteNumber:4"
-      }
-    },
-    {
-      "type": "filterPick",
-      "repeat": 1,
-      "data": {
-        "optionCount": 3,
-        "filter": "cardType:SITE set:4,5,6 siteNumber:5"
-      }
-    },
-    {
-      "type": "filterPick",
-      "repeat": 1,
-      "data": {
-        "optionCount": 3,
-        "filter": "cardType:SITE set:4,5,6 siteNumber:6"
-      }
-    },
-    {
-      "type": "filterPick",
-      "repeat": 1,
-      "data": {
-        "optionCount": 3,
-        "filter": "cardType:SITE set:4,5,6 siteNumber:7"
-      }
-    },
-    {
-      "type": "filterPick",
-      "repeat": 1,
-      "data": {
-        "optionCount": 3,
-        "filter": "cardType:SITE set:4,5,6 siteNumber:8"
-      }
-    },
-    {
-      "type": "filterPick",
-      "repeat": 1,
-      "data": {
-        "optionCount": 3,
-        "filter": "cardType:SITE set:4,5,6 siteNumber:9"
-      }
-    }
-  ]
+{
+  "format": "limited_ttt",
+  "startingPool": {
+    "type": "boosterDraftRun",
+    "data": {
+      "runLength": 14,
+      "coreCards": ["4_2","4_302"],
+      "freePeoplesRuns": [
+        ["4_90", "4_105", "4_97", "4_98", "4_97", "4_105", "4_90", "4_109", "4_115", "4_112", "4_115", "4_109", "4_71", "4_83", "4_76", "4_78", "4_83", "4_71", "4_74", "4_87", "4_70", "4_87", "4_74", "4_117", "4_135", "4_112", "4_128", "4_130", "4_135", "4_117"],
+        ["4_266", "4_278", "4_277", "4_273", "4_273", "4_281", "4_283", "4_266", "4_270", "4_287", "4_265", "4_297", "4_265", "4_287", "4_270", "4_49", "4_44", "4_42", "4_58", "4_42", "4_44", "4_49", "4_310", "4_322", "4_308", "4_314", "4_310", "4_308", "4_322", "4_314"]
+      ],
+      "shadowRuns": [
+        ["4_248", "4_221", "4_222", "4_227", "4_226", "4_224", "4_228", "4_258", "4_228", "4_224", "4_226", "4_227", "4_222", "4_221", "4_248", "4_165", "4_191", "4_184", "4_206", "4_204", "4_180", "4_198", "4_137", "4_198", "4_180", "4_204", "4_206", "4_184", "4_191", "4_165", "4_4", "4_17", "4_16", "4_25", "4_10", "4_14", "4_12", "4_21", "4_12", "4_14", "4_10", "4_25", "4_16", "4_17", "4_4", "4_207", "4_181", "4_193", "4_189", "4_187", "4_190", "4_178", "4_153", "4_178", "4_190", "4_187", "4_189", "4_193", "4_181", "4_207"]
+      ]
+    }
+  },
+  "choices": [
+    {
+      "type": "filterPick",
+      "repeat": 1,
+      "data": {
+        "optionCount": 5,
+        "filter": "side:FREE_PEOPLE set:4,5,6 rarity:R"
+      }
+    },
+    {
+      "type": "weightedSwitch",
+      "repeat": 10,
+      "data": {
+        "switchResult": [
+          {
+            "weight": 0.1,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 5,
+              "filter": "side:FREE_PEOPLE set:4 rarity:R"
+            }
+          },
+          {
+            "weight": 0.3,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 8,
+              "filter": "side:FREE_PEOPLE set:4 rarity:U,P"
+            }
+          },
+          {
+            "weight": 0.6,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 10,
+              "filter": "side:FREE_PEOPLE set:4 rarity:C"
+            }
+          }
+        ]
+      }
+    },{
+      "type": "weightedSwitch",
+      "repeat": 10,
+      "data": {
+        "switchResult": [
+          {
+            "weight": 0.1,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 5,
+              "filter": "side:FREE_PEOPLE set:5 rarity:R"
+            }
+          },
+          {
+            "weight": 0.3,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 8,
+              "filter": "side:FREE_PEOPLE set:5 rarity:U,P"
+            }
+          },
+          {
+            "weight": 0.6,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 10,
+              "filter": "side:FREE_PEOPLE set:5 rarity:C"
+            }
+          }
+        ]
+      }
+    },{
+      "type": "weightedSwitch",
+      "repeat": 10,
+      "data": {
+        "switchResult": [
+          {
+            "weight": 0.1,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 5,
+              "filter": "side:FREE_PEOPLE set:6 rarity:R"
+            }
+          },
+          {
+            "weight": 0.3,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 8,
+              "filter": "side:FREE_PEOPLE set:6 rarity:U,P"
+            }
+          },
+          {
+            "weight": 0.6,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 10,
+              "filter": "side:FREE_PEOPLE set:6 rarity:C"
+            }
+          }
+        ]
+      }
+    },
+    {
+      "type": "filterPick",
+      "repeat": 1,
+      "data": {
+        "optionCount": 5,
+        "filter": "side:SHADOW set:4,5,6 rarity:R"
+      }
+    },
+    {
+      "type": "weightedSwitch",
+      "repeat": 10,
+      "data": {
+        "switchResult": [
+          {
+            "weight": 0.1,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 5,
+              "filter": "side:SHADOW set:4 rarity:R"
+            }
+          },
+          {
+            "weight": 0.3,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 8,
+              "filter": "side:SHADOW set:4 rarity:U,P"
+            }
+          },
+          {
+            "weight": 0.6,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 10,
+              "filter": "side:SHADOW set:4 rarity:C"
+            }
+          }
+        ]
+      }
+    },{
+      "type": "weightedSwitch",
+      "repeat": 10,
+      "data": {
+        "switchResult": [
+          {
+            "weight": 0.1,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 5,
+              "filter": "side:SHADOW set:5 rarity:R"
+            }
+          },
+          {
+            "weight": 0.3,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 8,
+              "filter": "side:SHADOW set:5 rarity:U,P"
+            }
+          },
+          {
+            "weight": 0.6,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 10,
+              "filter": "side:SHADOW set:5 rarity:C"
+            }
+          }
+        ]
+      }
+    },{
+      "type": "weightedSwitch",
+      "repeat": 10,
+      "data": {
+        "switchResult": [
+          {
+            "weight": 0.1,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 5,
+              "filter": "side:SHADOW set:6 rarity:R"
+            }
+          },
+          {
+            "weight": 0.3,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 8,
+              "filter": "side:SHADOW set:6 rarity:U,P"
+            }
+          },
+          {
+            "weight": 0.6,
+            "type": "filterPick",
+            "data": {
+              "optionCount": 10,
+              "filter": "side:SHADOW set:6 rarity:C"
+            }
+          }
+        ]
+      }
+    },
+    {
+      "type": "filterPick",
+      "repeat": 1,
+      "data": {
+        "optionCount": 3,
+        "filter": "cardType:SITE set:4,5,6 siteNumber:1"
+      }
+    },
+    {
+      "type": "filterPick",
+      "repeat": 1,
+      "data": {
+        "optionCount": 3,
+        "filter": "cardType:SITE set:4,5,6 siteNumber:2"
+      }
+    },
+    {
+      "type": "filterPick",
+      "repeat": 1,
+      "data": {
+        "optionCount": 3,
+        "filter": "cardType:SITE set:4,5,6 siteNumber:3"
+      }
+    },
+    {
+      "type": "filterPick",
+      "repeat": 1,
+      "data": {
+        "optionCount": 3,
+        "filter": "cardType:SITE set:4,5,6 siteNumber:4"
+      }
+    },
+    {
+      "type": "filterPick",
+      "repeat": 1,
+      "data": {
+        "optionCount": 3,
+        "filter": "cardType:SITE set:4,5,6 siteNumber:5"
+      }
+    },
+    {
+      "type": "filterPick",
+      "repeat": 1,
+      "data": {
+        "optionCount": 3,
+        "filter": "cardType:SITE set:4,5,6 siteNumber:6"
+      }
+    },
+    {
+      "type": "filterPick",
+      "repeat": 1,
+      "data": {
+        "optionCount": 3,
+        "filter": "cardType:SITE set:4,5,6 siteNumber:7"
+      }
+    },
+    {
+      "type": "filterPick",
+      "repeat": 1,
+      "data": {
+        "optionCount": 3,
+        "filter": "cardType:SITE set:4,5,6 siteNumber:8"
+      }
+    },
+    {
+      "type": "filterPick",
+      "repeat": 1,
+      "data": {
+        "optionCount": 3,
+        "filter": "cardType:SITE set:4,5,6 siteNumber:9"
+      }
+    }
+  ]
 }
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/lotrDrafts.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/lotrDrafts.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/lotrDrafts.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/lotrDrafts.json
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/lotrFormats.json
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/lotrFormats.json
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)BL - Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)BL - Starter.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/(S)BL - Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)BL - Starter.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)BR - Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)BR - Starter.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/(S)BR - Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)BR - Starter.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)BoHD - Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)BoHD - Starter.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/(S)BoHD - Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)BoHD - Starter.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)Booster Choice.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)Booster Choice.pack
similarity index 94%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/(S)Booster Choice.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)Booster Choice.pack
index 1a94d8fa2..49424f049 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)Booster Choice.pack	
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)Booster Choice.pack	
@@ -1,15 +1,15 @@
-1xFotR - Booster
-1xMoM - Booster
-1xRotEL - Booster
-1xTTT - Booster
-1xBoHD - Booster
-1xEoF - Booster
-1xRotK - Booster
-1xSoG - Booster
-1xMD - Booster
-1xSH - Booster
-1xBR - Booster
-1xBL - Booster
-1xHU - Booster
-1xRoS - Booster
+1xFotR - Booster
+1xMoM - Booster
+1xRotEL - Booster
+1xTTT - Booster
+1xBoHD - Booster
+1xEoF - Booster
+1xRotK - Booster
+1xSoG - Booster
+1xMD - Booster
+1xSH - Booster
+1xBR - Booster
+1xBL - Booster
+1xHU - Booster
+1xRoS - Booster
 1xTaD - Booster
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)EoF - Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)EoF - Starter.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/(S)EoF - Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)EoF - Starter.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)FotR - Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)FotR - Starter.pack
similarity index 98%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/(S)FotR - Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)FotR - Starter.pack
index 5b54af206..84c61c529 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)FotR - Starter.pack	
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)FotR - Starter.pack	
@@ -1,2 +1,2 @@
-1xFotR - Gandalf Starter
+1xFotR - Gandalf Starter
 1xFotR - Aragorn Starter
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)FotR - Tengwar.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)FotR - Tengwar.pack
similarity index 89%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/(S)FotR - Tengwar.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)FotR - Tengwar.pack
index e63cbe986..36b7bdc64 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)FotR - Tengwar.pack	
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)FotR - Tengwar.pack	
@@ -1,18 +1,18 @@
-1x1_1T
-1x1_13T
-1x1_14T
-1x1_30T
-1x1_50T
-1x1_72T
-1x1_83T
-1x1_89T
-1x1_96T
-1x1_114T
-1x1_127T
-1x1_165T
-1x1_231T
-1x1_237T
-1x1_256T
-1x2_52T
-1x2_102T
+1x1_1T
+1x1_13T
+1x1_14T
+1x1_30T
+1x1_50T
+1x1_72T
+1x1_83T
+1x1_89T
+1x1_96T
+1x1_114T
+1x1_127T
+1x1_165T
+1x1_231T
+1x1_237T
+1x1_256T
+1x2_52T
+1x2_102T
 1x2_105T
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)HU - Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)HU - Starter.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/(S)HU - Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)HU - Starter.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)MD - Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)MD - Starter.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/(S)MD - Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)MD - Starter.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)MoM - Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)MoM - Starter.pack
similarity index 97%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/(S)MoM - Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)MoM - Starter.pack
index cf758e802..e358e7663 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)MoM - Starter.pack	
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)MoM - Starter.pack	
@@ -1,2 +1,2 @@
-1xMoM - Gandalf Starter
+1xMoM - Gandalf Starter
 1xMoM - Gimli Starter
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)Movie Booster Choice.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)Movie Booster Choice.pack
similarity index 94%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/(S)Movie Booster Choice.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)Movie Booster Choice.pack
index 5398e488e..dc30d1852 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)Movie Booster Choice.pack	
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)Movie Booster Choice.pack	
@@ -1,9 +1,9 @@
-1xFotR - Booster
-1xMoM - Booster
-1xRotEL - Booster
-1xTTT - Booster
-1xBoHD - Booster
-1xEoF - Booster
-1xRotK - Booster
-1xSoG - Booster
+1xFotR - Booster
+1xMoM - Booster
+1xRotEL - Booster
+1xTTT - Booster
+1xBoHD - Booster
+1xEoF - Booster
+1xRotK - Booster
+1xSoG - Booster
 1xMD - Booster
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)RoS - Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)RoS - Starter.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/(S)RoS - Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)RoS - Starter.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)RotEL - Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)RotEL - Starter.pack
similarity index 98%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/(S)RotEL - Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)RotEL - Starter.pack
index 780b164c3..3ad3eb470 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)RotEL - Starter.pack	
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)RotEL - Starter.pack	
@@ -1,2 +1,2 @@
-1xRotEL - Boromir Starter
+1xRotEL - Boromir Starter
 1xRotEL - Legolas Starter
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)RotK - Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)RotK - Starter.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/(S)RotK - Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)RotK - Starter.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)SH - Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)SH - Starter.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/(S)SH - Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)SH - Starter.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)SoG - Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)SoG - Starter.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/(S)SoG - Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)SoG - Starter.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)Special-1-3.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)Special-1-3.pack
similarity index 95%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/(S)Special-1-3.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)Special-1-3.pack
index 02ed30783..56bc8d9c7 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)Special-1-3.pack
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)Special-1-3.pack
@@ -1,3 +1,3 @@
-1xSpecial-01
-1xSpecial-02
+1xSpecial-01
+1xSpecial-02
 1xSpecial-03
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)Special-4-6.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)Special-4-6.pack
similarity index 95%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/(S)Special-4-6.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)Special-4-6.pack
index ffd17e6e3..72669eacf 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)Special-4-6.pack
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)Special-4-6.pack
@@ -1,3 +1,3 @@
-1xSpecial-04
-1xSpecial-05
+1xSpecial-04
+1xSpecial-05
 1xSpecial-06
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)Special-7-9.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)Special-7-9.pack
similarity index 95%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/(S)Special-7-9.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)Special-7-9.pack
index 075d5318b..99aeba800 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)Special-7-9.pack
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)Special-7-9.pack
@@ -1,3 +1,3 @@
-1xSpecial-07
-1xSpecial-08
+1xSpecial-07
+1xSpecial-08
 1xSpecial-09
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)TSBoosterChoice.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)TSBoosterChoice.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/(S)TSBoosterChoice.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)TSBoosterChoice.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)TSSealed-S1.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)TSSealed-S1.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/(S)TSSealed-S1.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)TSSealed-S1.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)TSSealed-S2.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)TSSealed-S2.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/(S)TSSealed-S2.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)TSSealed-S2.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)TSSealed-S3.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)TSSealed-S3.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/(S)TSSealed-S3.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)TSSealed-S3.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)TTT - Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)TTT - Starter.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/(S)TTT - Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)TTT - Starter.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)TTT - Tengwar.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)TTT - Tengwar.pack
similarity index 90%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/(S)TTT - Tengwar.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)TTT - Tengwar.pack
index dcd01aef8..b6140b87a 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)TTT - Tengwar.pack	
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/(S)TTT - Tengwar.pack	
@@ -1,18 +1,18 @@
-1x4_19T
-1x4_73T
-1x4_90T
-1x4_100T
-1x4_103T
-1x4_154T
-1x4_173T
-1x4_176T
-1x4_219T
-1x4_225T
-1x4_289T
-1x4_301T
-1x4_364T
-1x5_25T
-1x5_29T
-1x5_100T
-1x5_116T
+1x4_19T
+1x4_73T
+1x4_90T
+1x4_100T
+1x4_103T
+1x4_154T
+1x4_173T
+1x4_176T
+1x4_219T
+1x4_225T
+1x4_289T
+1x4_301T
+1x4_364T
+1x5_25T
+1x5_29T
+1x5_100T
+1x5_116T
 1x6_88T
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/AgesEnd.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/AgesEnd.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/AgesEnd.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/AgesEnd.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/BL - Arwen Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/BL - Arwen Starter.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/BL - Arwen Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/BL - Arwen Starter.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/BL - Boromir Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/BL - Boromir Starter.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/BL - Boromir Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/BL - Boromir Starter.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/BR - Mouth Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/BR - Mouth Starter.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/BR - Mouth Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/BR - Mouth Starter.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/BR - Saruman Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/BR - Saruman Starter.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/BR - Saruman Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/BR - Saruman Starter.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/BoHD - Eowyn Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/BoHD - Eowyn Starter.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/BoHD - Eowyn Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/BoHD - Eowyn Starter.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/BoHD - Legolas Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/BoHD - Legolas Starter.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/BoHD - Legolas Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/BoHD - Legolas Starter.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/EoF - Faramir Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/EoF - Faramir Starter.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/EoF - Faramir Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/EoF - Faramir Starter.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/EoF - Witch-king Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/EoF - Witch-king Starter.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/EoF - Witch-king Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/EoF - Witch-king Starter.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/Expanded.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/Expanded.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/Expanded.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/Expanded.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/FotR - Aragorn Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/FotR - Aragorn Starter.pack
similarity index 94%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/FotR - Aragorn Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/FotR - Aragorn Starter.pack
index 36d412b67..548298bb1 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/FotR - Aragorn Starter.pack	
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/FotR - Aragorn Starter.pack	
@@ -1,82 +1,82 @@
-#Ring-bearer (2 cards)
-#    Frodo, Son of Drogo
-#    The One Ring, The Ruling Ring
-1x1_290
-1x1_2
-#Adventure Deck (9 cards)
-#    East Road
-#    Bree Gate
-#    Rivendell Terrace
-#    Moria Lake
-#    The Bridge of Khazad-dûm
-#    Galadriel's Glade
-#    Silverlode Banks
-#    Pillars of the Kings
-#    Slopes of Amon Hen 
-1x1_320
-1x1_327
-1x1_340
-1x1_346
-1x1_349
-1x1_351
-1x1_355
-1x1_358
-1x1_361
-#Free Peoples (30 cards)
-#    Aragorn, King in Exile (starting) x2
-#    Armor
-#    Athelas x2
-#    Boromir, Son of Denethor x2
-#    Coat of Mail
-#    Eregion's Trails x2
-#    Gondor's Vengeance
-#    Great Shield x2
-#    Hobbit Intuition x2
-#    Hobbit Sword x2
-#    Legolas, Prince of Mirkwood
-#    No Stranger to the Shadows x2
-#    Pathfinder x2
-#    Rosie Cotton
-#    Sam, Son of Hamfast
-#    Swordarm of the White Tower x3
-#    Swordsman of the Northern Kingdom x3
-2x1_365
-1x1_92
-2x1_94
-2x1_97
-1x1_101
-2x1_104
-1x1_106
-2x1_107
-2x1_296
-2x1_299
-1x1_51
-2x1_108
-2x1_110
-1x1_309
-1x1_311
-3x1_116
-3x1_117
-#Shadow (30 cards)
-#    Bred for Battle x3
-#    Saruman's Ambition x2
-#    Their Arrows Enrage x2
-#    Uruk Brood
-#    Uruk Rager x4
-#    Uruk Savage x4
-#    Uruk Shaman x4
-#    Uruk Slayer x4
-#    Uruk Soldier x4
-#    Uruk-hai Armory x2
-#    Uruk-hai Raiding Party x2
-3x1_121
-2x1_133
-2x1_141
-1x1_145
-4x1_150
-4x1_151
-3x1_152
-4x1_153
-3x1_154
-2x1_157
+#Ring-bearer (2 cards)
+#    Frodo, Son of Drogo
+#    The One Ring, The Ruling Ring
+1x1_290
+1x1_2
+#Adventure Deck (9 cards)
+#    East Road
+#    Bree Gate
+#    Rivendell Terrace
+#    Moria Lake
+#    The Bridge of Khazad-dûm
+#    Galadriel's Glade
+#    Silverlode Banks
+#    Pillars of the Kings
+#    Slopes of Amon Hen 
+1x1_320
+1x1_327
+1x1_340
+1x1_346
+1x1_349
+1x1_351
+1x1_355
+1x1_358
+1x1_361
+#Free Peoples (30 cards)
+#    Aragorn, King in Exile (starting) x2
+#    Armor
+#    Athelas x2
+#    Boromir, Son of Denethor x2
+#    Coat of Mail
+#    Eregion's Trails x2
+#    Gondor's Vengeance
+#    Great Shield x2
+#    Hobbit Intuition x2
+#    Hobbit Sword x2
+#    Legolas, Prince of Mirkwood
+#    No Stranger to the Shadows x2
+#    Pathfinder x2
+#    Rosie Cotton
+#    Sam, Son of Hamfast
+#    Swordarm of the White Tower x3
+#    Swordsman of the Northern Kingdom x3
+2x1_365
+1x1_92
+2x1_94
+2x1_97
+1x1_101
+2x1_104
+1x1_106
+2x1_107
+2x1_296
+2x1_299
+1x1_51
+2x1_108
+2x1_110
+1x1_309
+1x1_311
+3x1_116
+3x1_117
+#Shadow (30 cards)
+#    Bred for Battle x3
+#    Saruman's Ambition x2
+#    Their Arrows Enrage x2
+#    Uruk Brood
+#    Uruk Rager x4
+#    Uruk Savage x4
+#    Uruk Shaman x4
+#    Uruk Slayer x4
+#    Uruk Soldier x4
+#    Uruk-hai Armory x2
+#    Uruk-hai Raiding Party x2
+3x1_121
+2x1_133
+2x1_141
+1x1_145
+4x1_150
+4x1_151
+3x1_152
+4x1_153
+3x1_154
+2x1_157
 2x1_158
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/FotR - Gandalf Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/FotR - Gandalf Starter.pack
similarity index 94%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/FotR - Gandalf Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/FotR - Gandalf Starter.pack
index f7e88f915..8beddd9d8 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/FotR - Gandalf Starter.pack	
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/FotR - Gandalf Starter.pack	
@@ -1,78 +1,78 @@
-#Ring-bearer (2 cards)
-#    Frodo, Son of Drogo
-#    The One Ring, The Ruling Ring
-1x1_290
-1x1_2
-#Adventure Deck (9 cards)
-#    Westfarthing
-#    Ettenmoors
-#    Council Courtyard
-#    Mithril Mine
-#    The Bridge of Khazad-dûm
-#    Dimrill Dale
-#    Anduin Confluence
-#    Shores of Nen Hithoel
-#    Emyn Muil
-1x1_326
-1x1_331
-1x1_337
-1x1_345
-1x1_349
-1x1_350
-1x1_353
-1x1_359
-1x1_360
-#Free Peoples (30 cards)
-#    Barliman Butterbur, Prancing Pony Proprietor
-#    Boromir, Son of Denethor
-#    Bounder x3
-#    Defiance x2
-#    Gandalf, The Grey Wizard (starting) x2
-#    Gimli, Dwarf of Erebor x2
-#    Hobbit Intuition x2
-#    Hobbit Sword
-#    Intimidate x3
-#    Legolas, Prince of Mirkwood x2
-#    Mysterious Wizard x4
-#    Noble Intentions x2
-#    Sleep, Caradhras
-#    Sorry About Everything
-#    Their Halls of Stone x2
-#    Treachery Deeper Than You Know
-1x1_70
-1x1_97
-3x1_286
-2x1_37
-2x1_364
-2x1_12
-2x1_296
-1x1_299
-3x1_76
-2x1_51
-4x1_78
-2x1_304
-1x1_84
-1x1_312
-2x1_26
-1x1_86
-#Shadow (30 cards)
-#    Drums in the Deep x3
-#    Goblin Marksman x4
-#    Goblin Runner x4
-#    Goblin Patrol Troop
-#    Goblin Scavengers x3
-#    Goblin Scimitar x4
-#    Goblin Sneak x3
-#    Host of Thousands x3
-#    Moria Scout x3
-#    They Are Coming x2
-3x1_168
-4x1_176
-4x1_178
-1x1_177
-3x1_179
-4x1_180
-3x1_181
-3x1_187
-3x1_191
+#Ring-bearer (2 cards)
+#    Frodo, Son of Drogo
+#    The One Ring, The Ruling Ring
+1x1_290
+1x1_2
+#Adventure Deck (9 cards)
+#    Westfarthing
+#    Ettenmoors
+#    Council Courtyard
+#    Mithril Mine
+#    The Bridge of Khazad-dûm
+#    Dimrill Dale
+#    Anduin Confluence
+#    Shores of Nen Hithoel
+#    Emyn Muil
+1x1_326
+1x1_331
+1x1_337
+1x1_345
+1x1_349
+1x1_350
+1x1_353
+1x1_359
+1x1_360
+#Free Peoples (30 cards)
+#    Barliman Butterbur, Prancing Pony Proprietor
+#    Boromir, Son of Denethor
+#    Bounder x3
+#    Defiance x2
+#    Gandalf, The Grey Wizard (starting) x2
+#    Gimli, Dwarf of Erebor x2
+#    Hobbit Intuition x2
+#    Hobbit Sword
+#    Intimidate x3
+#    Legolas, Prince of Mirkwood x2
+#    Mysterious Wizard x4
+#    Noble Intentions x2
+#    Sleep, Caradhras
+#    Sorry About Everything
+#    Their Halls of Stone x2
+#    Treachery Deeper Than You Know
+1x1_70
+1x1_97
+3x1_286
+2x1_37
+2x1_364
+2x1_12
+2x1_296
+1x1_299
+3x1_76
+2x1_51
+4x1_78
+2x1_304
+1x1_84
+1x1_312
+2x1_26
+1x1_86
+#Shadow (30 cards)
+#    Drums in the Deep x3
+#    Goblin Marksman x4
+#    Goblin Runner x4
+#    Goblin Patrol Troop
+#    Goblin Scavengers x3
+#    Goblin Scimitar x4
+#    Goblin Sneak x3
+#    Host of Thousands x3
+#    Moria Scout x3
+#    They Are Coming x2
+3x1_168
+4x1_176
+4x1_178
+1x1_177
+3x1_179
+4x1_180
+3x1_181
+3x1_187
+3x1_191
 2x1_196
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/HU - Aragorn Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/HU - Aragorn Starter.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/HU - Aragorn Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/HU - Aragorn Starter.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/HU - Mauhur Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/HU - Mauhur Starter.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/HU - Mauhur Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/HU - Mauhur Starter.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/MD - Frodo Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/MD - Frodo Starter.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/MD - Frodo Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/MD - Frodo Starter.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/MD - Sam Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/MD - Sam Starter.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/MD - Sam Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/MD - Sam Starter.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/MoM - Gandalf Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/MoM - Gandalf Starter.pack
similarity index 94%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/MoM - Gandalf Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/MoM - Gandalf Starter.pack
index 3e3cba04d..0819b49fb 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/MoM - Gandalf Starter.pack	
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/MoM - Gandalf Starter.pack	
@@ -1,74 +1,74 @@
-#Ring-bearer (2 cards)
-#    Frodo, Reluctant Adventurer
-#    The One Ring, The Ruling Ring
-1x2_102
-1x1_2
-#Adventure Deck (9 cards)
-#    Farmer Maggot's Fields
-1x1_321
-#    Trollshaw Forest
-1x1_334
-#    Frodo's Bedroom
-1x1_339
-#    Moria Lake
-1x1_346
-#    The Bridge of Khazad-dum
-1x1_349
-#    Dimrill Dale
-1x1_350
-#    Anduin Confluence
-1x1_353
-#    Shores of Nen Hithoel
-1x1_359
-#    Summit of Amon Hen
-1x1_362
-#Free Peoples (30 cards)
-#    Gandalf, The Grey Pilgrim x2
-2x2_122
-#    Merry, From O'er the Brandywine x2
-2x1_303
-#    Legolas, Prince of Mirkwood x2
-2x1_51
-#    Boromir, Son of Denethor x2
-2x1_97
-#    Barliman Butterbur, Prancing Pony Proprietor
-1x1_70
-#    Wizard Staff x2
-2x2_29
-#    Hobbit Intuition x2
-2x1_296
-#    Hobbit Sword x2
-2x1_299
-#    Strength of Spirit x4
-4x1_85
-#    Intimidate x3
-3x1_76
-#    Mysterious Wizard x4
-4x1_78
-#    Stand Against Darkness
-1x1_63
-#    Swordarm of the White Tower x2
-2x1_116
-#    Elendil's Valor
-1x1_103
-#Shadow (30 cards)
-#    Goblin Flankers x3
-3x2_61
-#    Goblin Pursuer x4
-4x2_62
-#    Goblin Spearman x4
-4x2_65
-#    Goblin Runner x3
-3x1_178
-#    Goblin Scavengers x4
-4x1_179
-#    Goblin Spear x4
-4x1_182
-#    The Long Dark x2
-2x1_188
-#    Old Differences x2
-2x2_69
-#    Drums in the Deep x2
-2x1_168
-#    Host of Thousands x2
+#Ring-bearer (2 cards)
+#    Frodo, Reluctant Adventurer
+#    The One Ring, The Ruling Ring
+1x2_102
+1x1_2
+#Adventure Deck (9 cards)
+#    Farmer Maggot's Fields
+1x1_321
+#    Trollshaw Forest
+1x1_334
+#    Frodo's Bedroom
+1x1_339
+#    Moria Lake
+1x1_346
+#    The Bridge of Khazad-dum
+1x1_349
+#    Dimrill Dale
+1x1_350
+#    Anduin Confluence
+1x1_353
+#    Shores of Nen Hithoel
+1x1_359
+#    Summit of Amon Hen
+1x1_362
+#Free Peoples (30 cards)
+#    Gandalf, The Grey Pilgrim x2
+2x2_122
+#    Merry, From O'er the Brandywine x2
+2x1_303
+#    Legolas, Prince of Mirkwood x2
+2x1_51
+#    Boromir, Son of Denethor x2
+2x1_97
+#    Barliman Butterbur, Prancing Pony Proprietor
+1x1_70
+#    Wizard Staff x2
+2x2_29
+#    Hobbit Intuition x2
+2x1_296
+#    Hobbit Sword x2
+2x1_299
+#    Strength of Spirit x4
+4x1_85
+#    Intimidate x3
+3x1_76
+#    Mysterious Wizard x4
+4x1_78
+#    Stand Against Darkness
+1x1_63
+#    Swordarm of the White Tower x2
+2x1_116
+#    Elendil's Valor
+1x1_103
+#Shadow (30 cards)
+#    Goblin Flankers x3
+3x2_61
+#    Goblin Pursuer x4
+4x2_62
+#    Goblin Spearman x4
+4x2_65
+#    Goblin Runner x3
+3x1_178
+#    Goblin Scavengers x4
+4x1_179
+#    Goblin Spear x4
+4x1_182
+#    The Long Dark x2
+2x1_188
+#    Old Differences x2
+2x2_69
+#    Drums in the Deep x2
+2x1_168
+#    Host of Thousands x2
 2x1_187
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/MoM - Gimli Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/MoM - Gimli Starter.pack
similarity index 94%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/MoM - Gimli Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/MoM - Gimli Starter.pack
index 22d29467d..78f52b3ba 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/MoM - Gimli Starter.pack	
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/MoM - Gimli Starter.pack	
@@ -1,76 +1,76 @@
-#Ring-bearer (2 cards)
-#    Frodo, Reluctant Adventurer
-#    The One Ring, The Ruling Ring
-1x2_102
-1x1_2
-#Adventure Deck (9 cards) 
-#    Westfarthing
-1x1_326
-#    Ettenmoors
-1x1_331
-#    Council Courtyard
-1x1_337
-#    Dwarrowdelf Chamber
-1x1_344
-#    The Bridge of Khazad-dum
-1x1_349
-#    Lothlorien Woods
-1x1_352
-#    Anduin Wilderland
-1x1_354
-#    Anduin Banks
-1x1_356
-#    Tol Brandir
-1x1_363
-#Free Peoples (30 cards)
-#    Gimli, Dwarf of the Mountain-race x2
-2x2_121
-#    Farin, Dwarven Emissary x2
-2x1_11
-#    Dwarf Guard x3
-3x1_7
-#    Thrarin, Dwarven Smith
-1x1_27
-#    Hand Axe x2
-2x2_10
-#    Hobbit Intuition x2
-2x1_296
-#    Hobbit Sword
-1x1_299
-#    Dwarven Axe x2
-2x1_9
-#    Dwarven Armor
-1x1_8
-#    Stairs of Khazad-dum x2
-2x1_24
-#    Flurry of Blows x4
-4x2_5
-#    Lord of Moria
-1x1_21
-#    Axe Strike x3
-3x1_3
-#    Still Draws Breath x2
-2x1_25
-#    Here Lies Balin, Son of Fundin x2
-2x1_19
-#Shadow (30 cards)
-#    Orc Scout x4
-4x2_89
-#    Orc Ambusher x4
-4x1_261
-#    Orc Assassin x4
-4x1_262
-#    Orc Chieftain x3
-3x1_266
-#    Orc Hunters x2
-2x1_267
-#    Orc Inquisitor x2
-2x1_268
-#    Vile Blade x4
-4x2_95
-#    Spies of Mordor x2
-2x2_92
-#    Mordor's Strength x3
-3x1_255
-#    Under the Watching Eye x2
+#Ring-bearer (2 cards)
+#    Frodo, Reluctant Adventurer
+#    The One Ring, The Ruling Ring
+1x2_102
+1x1_2
+#Adventure Deck (9 cards) 
+#    Westfarthing
+1x1_326
+#    Ettenmoors
+1x1_331
+#    Council Courtyard
+1x1_337
+#    Dwarrowdelf Chamber
+1x1_344
+#    The Bridge of Khazad-dum
+1x1_349
+#    Lothlorien Woods
+1x1_352
+#    Anduin Wilderland
+1x1_354
+#    Anduin Banks
+1x1_356
+#    Tol Brandir
+1x1_363
+#Free Peoples (30 cards)
+#    Gimli, Dwarf of the Mountain-race x2
+2x2_121
+#    Farin, Dwarven Emissary x2
+2x1_11
+#    Dwarf Guard x3
+3x1_7
+#    Thrarin, Dwarven Smith
+1x1_27
+#    Hand Axe x2
+2x2_10
+#    Hobbit Intuition x2
+2x1_296
+#    Hobbit Sword
+1x1_299
+#    Dwarven Axe x2
+2x1_9
+#    Dwarven Armor
+1x1_8
+#    Stairs of Khazad-dum x2
+2x1_24
+#    Flurry of Blows x4
+4x2_5
+#    Lord of Moria
+1x1_21
+#    Axe Strike x3
+3x1_3
+#    Still Draws Breath x2
+2x1_25
+#    Here Lies Balin, Son of Fundin x2
+2x1_19
+#Shadow (30 cards)
+#    Orc Scout x4
+4x2_89
+#    Orc Ambusher x4
+4x1_261
+#    Orc Assassin x4
+4x1_262
+#    Orc Chieftain x3
+3x1_266
+#    Orc Hunters x2
+2x1_267
+#    Orc Inquisitor x2
+2x1_268
+#    Vile Blade x4
+4x2_95
+#    Spies of Mordor x2
+2x2_92
+#    Mordor's Strength x3
+3x1_255
+#    Under the Watching Eye x2
 2x1_281
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/RoS - Evil Man Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/RoS - Evil Man Starter.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/RoS - Evil Man Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/RoS - Evil Man Starter.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/RoS - Uruk Rampage Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/RoS - Uruk Rampage Starter.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/RoS - Uruk Rampage Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/RoS - Uruk Rampage Starter.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/RotEL - Boromir Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/RotEL - Boromir Starter.pack
similarity index 94%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/RotEL - Boromir Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/RotEL - Boromir Starter.pack
index c416332b0..2af3f0549 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/RotEL - Boromir Starter.pack	
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/RotEL - Boromir Starter.pack	
@@ -1,80 +1,80 @@
-#Ring-bearer (2 cards)
-#    Frodo, Reluctant Adventurer
-#    The One Ring, The Ruling Ring
-1x2_102
-1x1_2
-#Adventure Deck (9 cards)
-#    Hobbiton Woods
-1x2_116
-#    Bree Gate
-1x1_327
-#    Rivendell Terrace
-1x1_340
-#    Eregion Hills
-1x3_116
-#    The Bridge of Khazad-dûm
-1x1_349
-#    Galadriel's Glade
-1x1_351
-#    Anduin Wilderland
-1x1_354
-#    Pillars of the Kings
-1x1_358
-#    Emyn Muil
-1x1_360
-#Free Peoples (30 cards)
-#    Boromir, Defender of Minas Tirith x2 (starting)
-2x3_122
-#    Boromir's Cloak
-1x1_98
-#    Coat of Mail
-1x1_101
-#    Flee in Terror
-1x2_33
-#    Foes of Mordor x2
-2x1_105
-#    Gimli, Dwarf of Erebor x2
-2x1_12
-#    Hobbit Sword x2
-2x1_299
-#    Hobbit Intuition x2
-2x1_296
-#    Legolas, Prince of Mirkwood x2
-2x1_51
-#    Merry, From O'er the Brandywine (starting)
-1x1_303
-#    No Stranger to the Shadows
-1x1_108
-#    Answering the Cries x2
-2x3_37
-#    Seek and Hide
-1x3_112
-#    Sentinels of Númenor x3
-3x2_37
-#    Swordsman of the Northern Kingdom x3
-3x1_117
-#    Might of Númenor x2
-2x3_43
-#    What Are They? x2
-2x1_119
-#Shadow (30 cards)
-#    Massing in the East x3
-3x3_92
-#    Mordor's Strength x3
-3x1_255
-#    Orc Butcher x4
-4x3_94
-#    Orc Scimitar x4
-4x1_269
-#    Orc Soldier x3
-3x1_271
-#    Orc Swordsman x4
-4x3_98
-#    Orc Warrior x4
-4x3_101
-#    Spies of Mordor
-1x2_92
-#    Strength Born of Fear x2
-2x1_278
-#    Tower Lieutenant x2
+#Ring-bearer (2 cards)
+#    Frodo, Reluctant Adventurer
+#    The One Ring, The Ruling Ring
+1x2_102
+1x1_2
+#Adventure Deck (9 cards)
+#    Hobbiton Woods
+1x2_116
+#    Bree Gate
+1x1_327
+#    Rivendell Terrace
+1x1_340
+#    Eregion Hills
+1x3_116
+#    The Bridge of Khazad-dûm
+1x1_349
+#    Galadriel's Glade
+1x1_351
+#    Anduin Wilderland
+1x1_354
+#    Pillars of the Kings
+1x1_358
+#    Emyn Muil
+1x1_360
+#Free Peoples (30 cards)
+#    Boromir, Defender of Minas Tirith x2 (starting)
+2x3_122
+#    Boromir's Cloak
+1x1_98
+#    Coat of Mail
+1x1_101
+#    Flee in Terror
+1x2_33
+#    Foes of Mordor x2
+2x1_105
+#    Gimli, Dwarf of Erebor x2
+2x1_12
+#    Hobbit Sword x2
+2x1_299
+#    Hobbit Intuition x2
+2x1_296
+#    Legolas, Prince of Mirkwood x2
+2x1_51
+#    Merry, From O'er the Brandywine (starting)
+1x1_303
+#    No Stranger to the Shadows
+1x1_108
+#    Answering the Cries x2
+2x3_37
+#    Seek and Hide
+1x3_112
+#    Sentinels of Númenor x3
+3x2_37
+#    Swordsman of the Northern Kingdom x3
+3x1_117
+#    Might of Númenor x2
+2x3_43
+#    What Are They? x2
+2x1_119
+#Shadow (30 cards)
+#    Massing in the East x3
+3x3_92
+#    Mordor's Strength x3
+3x1_255
+#    Orc Butcher x4
+4x3_94
+#    Orc Scimitar x4
+4x1_269
+#    Orc Soldier x3
+3x1_271
+#    Orc Swordsman x4
+4x3_98
+#    Orc Warrior x4
+4x3_101
+#    Spies of Mordor
+1x2_92
+#    Strength Born of Fear x2
+2x1_278
+#    Tower Lieutenant x2
 2x1_280
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/RotEL - Legolas Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/RotEL - Legolas Starter.pack
similarity index 94%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/RotEL - Legolas Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/RotEL - Legolas Starter.pack
index 66c92d91e..5a7072689 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/RotEL - Legolas Starter.pack	
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/RotEL - Legolas Starter.pack	
@@ -1,76 +1,76 @@
-#Ring-bearer (2 cards)
-#    Frodo, Son of Drogo
-1x1_290
-#    The One Ring, The Ruling Ring
-1x1_2
-#Adventure Deck (9 cards)
-#    Westfarthing
-1x1_326
-#    Breeland Forest
-1x1_329
-#    House of Elrond
-1x3_119
-#    Pass of Caradhras
-1x1_348
-#    The Bridge of Khazad-dûm
-1x1_349
-#    Lothlórien Woods
-1x1_352
-#    Silverlode Banks
-1x1_355
-#    Anduin Banks
-1x1_356
-#    Tol Brandir
-1x1_363
-#Free Peoples (30 cards)
-#    Border Defenses x2
-2x1_32
-#    Boromir, Son of Denethor x2
-2x1_97
-#    Defiance x3
-3x1_37
-#    Far-seeing Eyes x2
-2x1_43
-#    Fryin Pan
-1x3_108
-#    Foul Creation x3
-3x1_44
-#    Galdor
-1x3_18
-#    Gimli, Dwarf of Erebor x2 (starting)
-2x1_12
-#    Golradir, Councilor of Imladris x2
-2x3_20
-#    Haldir x2
-2x1_48
-#    Hobbit Intuition x2
-2x1_296
-#    Hosts of the Last Alliance x4
-4x2_18
-#    Legolas, Son of Thranduil x2 (starting)
-2x3_121
-#    Saelbeth, Elven Councilor x2
-2x3_25
-#Shadow (30 cards)
-#    Abandoning Reason for Madness x2
-2x3_49
-#    Bred for Battle x2
-2x1_121
-#    Isengard Forger x3
-3x3_56
-#    One of You Must Do This x2
-2x3_63
-#    Saruman's Snows
-1x1_138
-#    Uruk Raider x3
-3x3_74
-#    Uruk Rager x2
-2x1_150
-#    Uruk Savage x4
-4x1_151
-#    Uruk Scout x4
-4x2_47
-#    Uruk-hai Raiding Party x4
-4x1_158
-#    Uruk-hai Sword x3
+#Ring-bearer (2 cards)
+#    Frodo, Son of Drogo
+1x1_290
+#    The One Ring, The Ruling Ring
+1x1_2
+#Adventure Deck (9 cards)
+#    Westfarthing
+1x1_326
+#    Breeland Forest
+1x1_329
+#    House of Elrond
+1x3_119
+#    Pass of Caradhras
+1x1_348
+#    The Bridge of Khazad-dûm
+1x1_349
+#    Lothlórien Woods
+1x1_352
+#    Silverlode Banks
+1x1_355
+#    Anduin Banks
+1x1_356
+#    Tol Brandir
+1x1_363
+#Free Peoples (30 cards)
+#    Border Defenses x2
+2x1_32
+#    Boromir, Son of Denethor x2
+2x1_97
+#    Defiance x3
+3x1_37
+#    Far-seeing Eyes x2
+2x1_43
+#    Fryin Pan
+1x3_108
+#    Foul Creation x3
+3x1_44
+#    Galdor
+1x3_18
+#    Gimli, Dwarf of Erebor x2 (starting)
+2x1_12
+#    Golradir, Councilor of Imladris x2
+2x3_20
+#    Haldir x2
+2x1_48
+#    Hobbit Intuition x2
+2x1_296
+#    Hosts of the Last Alliance x4
+4x2_18
+#    Legolas, Son of Thranduil x2 (starting)
+2x3_121
+#    Saelbeth, Elven Councilor x2
+2x3_25
+#Shadow (30 cards)
+#    Abandoning Reason for Madness x2
+2x3_49
+#    Bred for Battle x2
+2x1_121
+#    Isengard Forger x3
+3x3_56
+#    One of You Must Do This x2
+2x3_63
+#    Saruman's Snows
+1x1_138
+#    Uruk Raider x3
+3x3_74
+#    Uruk Rager x2
+2x1_150
+#    Uruk Savage x4
+4x1_151
+#    Uruk Scout x4
+4x2_47
+#    Uruk-hai Raiding Party x4
+4x1_158
+#    Uruk-hai Sword x3
 3x1_160
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/RotK - Aragorn Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/RotK - Aragorn Starter.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/RotK - Aragorn Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/RotK - Aragorn Starter.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/RotK - Eomer Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/RotK - Eomer Starter.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/RotK - Eomer Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/RotK - Eomer Starter.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/SH - Aragorn Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/SH - Aragorn Starter.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/SH - Aragorn Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/SH - Aragorn Starter.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/SH - Eowyn Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/SH - Eowyn Starter.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/SH - Eowyn Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/SH - Eowyn Starter.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/SH - Gandalf Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/SH - Gandalf Starter.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/SH - Gandalf Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/SH - Gandalf Starter.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/SH - Legolas Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/SH - Legolas Starter.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/SH - Legolas Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/SH - Legolas Starter.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/SoG - Merry Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/SoG - Merry Starter.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/SoG - Merry Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/SoG - Merry Starter.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/SoG - Pippin Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/SoG - Pippin Starter.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/SoG - Pippin Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/SoG - Pippin Starter.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/Special-01.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/Special-01.pack
similarity index 94%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/Special-01.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/Special-01.pack
index 0182eb01e..08503f0e9 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/Special-01.pack
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/Special-01.pack
@@ -1,100 +1,100 @@
-#Ring-bearer 0P67 � Frodo, Mr. Underhill
-1x0_67
-#The One Ring 7C1 � The One Ring, The Ruling Ring
-1x7_1
-
-#Adventure Deck
-#1 7U333 Sleeping Quarters
-#2 7U337 West Road
-#3 7U339 Hall of the Kings
-#4 7U343 Pelennor Plain
-#5 10U119 Steward's Tomb
-#6 7U346 Minas Tirith Fifth Circle
-#7 7U354 Pelennor Grassland
-#8 7U356 Cross Roads
-#9 7U360 Dagorlad
-1x7_333
-1x7_337
-1x7_339
-1x7_343
-1x10_119
-1x7_346
-1x7_354
-1x7_356
-1x7_360
-
-#Free Peoples Draw Deck
-
-#1x 6C33 � Quickbeam, Bregalad
-1x6_33
-#3x 7C36 � Gandalf, Defender of the West
-3x7_36
-#1x 2C29 Wizard Staff
-1x2_29
-#1x 2C23 Gandalf's Wisdom
-1x2_23
-#2x 3U35 Trust Me as You Once Did
-2x3_35
-#1x 4U88 � Behold the White Rider
-1x4_88
-#2x 8U18 Not the First Halfling
-2x8_18
-#2x 1C76 Intimidate
-2x1_76
-#2x 7C31 All Save One
-2x7_31
-#2x 8C87 � Eomer, Keeper of Oaths
-2x8_87
-#1x 7C320 � Merry, Rohirrim Squire
-1x7_320
-#1x 7C323 � Pippin, Sworn to Service
-1x7_323
-#2x 10P122 � Sam, Great Elf Warrior
-2x10_122
-#1x 10C113 Orc Armor
-1x10_113
-#3x 1C299 Hobbit Sword
-3x1_299
-#1x 1U316 � A Talent for Not Being Seen
-1x1_316
-#1x 8C109 Closer and Closer He Bent
-1x8_109
-#1x 8U112 Song of the Shire
-1x8_112
-#2x 10U111 Narrow Escape
-2x10_111
-
-#Free Peoples Total 30
-
-#Shadow Draw Deck
-
-#2x 7U168 Southron Thief
-2x7_168
-#3x 8U60 � Haradrim Marksman
-3x8_60
-#2x 4U249 Southron Commander
-2x4_249
-#3x 4U232 Elite Archer
-3x4_232
-#4x 4C248 Southron Bowman
-4x4_248
-#2x 10C42 Far Harad Mercenaries
-2x10_42
-#2x 5C76 Southron Traveler
-2x5_76
-#2x 7C172 Troop of Haradrim
-2x7_172
-#2x 6C81 Southron Invaders
-2x6_81
-#2x 7C155 Raider Bow
-2x7_155
-#2x 4C255 Southron Spear
-2x4_255
-#1x 4U216 � Arrow From the South
-1x4_216
-#1x 10U47 Rallying Call
-1x10_47
-#2x 4C260 Whirling Strike
-2x4_260
-
+#Ring-bearer 0P67 � Frodo, Mr. Underhill
+1x0_67
+#The One Ring 7C1 � The One Ring, The Ruling Ring
+1x7_1
+
+#Adventure Deck
+#1 7U333 Sleeping Quarters
+#2 7U337 West Road
+#3 7U339 Hall of the Kings
+#4 7U343 Pelennor Plain
+#5 10U119 Steward's Tomb
+#6 7U346 Minas Tirith Fifth Circle
+#7 7U354 Pelennor Grassland
+#8 7U356 Cross Roads
+#9 7U360 Dagorlad
+1x7_333
+1x7_337
+1x7_339
+1x7_343
+1x10_119
+1x7_346
+1x7_354
+1x7_356
+1x7_360
+
+#Free Peoples Draw Deck
+
+#1x 6C33 � Quickbeam, Bregalad
+1x6_33
+#3x 7C36 � Gandalf, Defender of the West
+3x7_36
+#1x 2C29 Wizard Staff
+1x2_29
+#1x 2C23 Gandalf's Wisdom
+1x2_23
+#2x 3U35 Trust Me as You Once Did
+2x3_35
+#1x 4U88 � Behold the White Rider
+1x4_88
+#2x 8U18 Not the First Halfling
+2x8_18
+#2x 1C76 Intimidate
+2x1_76
+#2x 7C31 All Save One
+2x7_31
+#2x 8C87 � Eomer, Keeper of Oaths
+2x8_87
+#1x 7C320 � Merry, Rohirrim Squire
+1x7_320
+#1x 7C323 � Pippin, Sworn to Service
+1x7_323
+#2x 10P122 � Sam, Great Elf Warrior
+2x10_122
+#1x 10C113 Orc Armor
+1x10_113
+#3x 1C299 Hobbit Sword
+3x1_299
+#1x 1U316 � A Talent for Not Being Seen
+1x1_316
+#1x 8C109 Closer and Closer He Bent
+1x8_109
+#1x 8U112 Song of the Shire
+1x8_112
+#2x 10U111 Narrow Escape
+2x10_111
+
+#Free Peoples Total 30
+
+#Shadow Draw Deck
+
+#2x 7U168 Southron Thief
+2x7_168
+#3x 8U60 � Haradrim Marksman
+3x8_60
+#2x 4U249 Southron Commander
+2x4_249
+#3x 4U232 Elite Archer
+3x4_232
+#4x 4C248 Southron Bowman
+4x4_248
+#2x 10C42 Far Harad Mercenaries
+2x10_42
+#2x 5C76 Southron Traveler
+2x5_76
+#2x 7C172 Troop of Haradrim
+2x7_172
+#2x 6C81 Southron Invaders
+2x6_81
+#2x 7C155 Raider Bow
+2x7_155
+#2x 4C255 Southron Spear
+2x4_255
+#1x 4U216 � Arrow From the South
+1x4_216
+#1x 10U47 Rallying Call
+1x10_47
+#2x 4C260 Whirling Strike
+2x4_260
+
 #Shadow Total 30
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/Special-02.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/Special-02.pack
similarity index 94%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/Special-02.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/Special-02.pack
index 31476f231..264f78905 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/Special-02.pack
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/Special-02.pack
@@ -1,95 +1,95 @@
-#Ring-bearer 15C144 • Frodo, Weary From the Journey
-1x15_144
-#The One Ring 7C1 • The One Ring, The Ruling Ring
-1x7_1
-
-#Adventure Deck
-#1 7U332 Rohirrim Road
-#2 7U335 King's Tent
-#3 7U338 Beacon of Minas Tirith
-#4 7U341 Anduin Banks
-#5 8U119 Crashed Gate
-#6 7U350 Minas Tirith Seventh Circle
-#7 8U120 Osgiliath Channel
-#8 7U358 Morgulduin
-#9 7U361 Haunted Pass
-1x7_332
-1x7_335
-1x7_338
-1x7_341
-1x8_119
-1x7_350
-1x8_120
-1x7_358
-1x7_361
-
-
-#Free Peoples Draw Deck
-
-#2x 12U15 • Thrarin, Smith of Erebor
-2x12_15
-#1x 8C5 • Gimli, Counter of Foes
-1x8_5
-#2x 4C71 • Haldir, Emissary of the Galadhrim
-2x4_71
-#1x 5P121 • Legolas, Archer of Mirkwood
-1x5_121
-#2x 10U5 • Arwen, Echo of Luthien
-2x10_5
-#2x 4U86 • Thonnas, Naith Captain
-2x4_86
-#1x 2U3 Dwarven Bracers
-1x2_3
-#1x 7U8 • Gimli's Armor
-1x7_8
-#2x 1C9 Dwarven Axe
-2x1_9
-#2x 2C10 Hand Axe
-2x2_10
-#1x 6C21 Naith Longbow
-1x6_21
-#2x 8U8 Wish For Our Kinfolk
-2x8_8
-#1x 8U13 Shake Off the Shadow
-1x8_13
-#3x 2U4 Endurance of Dwarves
-3x2_4
-#2x 6U9 Lend Us Your Aid
-2x6_9
-#3x 4U53 Quick As May Be
-3x4_53
-#2x 1C299 Hobbit Sword
-2x1_299
-
-#Free Peoples Total 30
-
-#Shadow Draw Deck
-
-#3x 6C2 Dunlending Elder
-3x6_2
-#2x 6C4 Dunlending Headman
-2x6_4
-#3x 4C25 Hillman Tribe
-3x4_25
-#3x 4C21 Hillman Band
-3x4_21
-#2x 4U9 Dunlending Arsonist
-2x4_9
-#2x 4U11 Dunlending Looter
-2x4_11
-#3x 4C17 Dunlending Savage
-3x4_17
-#2x 4C18 Dunlending Warrior
-2x4_18
-#2x 6C3 Dunlending Footmen
-2x6_3
-#2x 4U36 War Club
-2x4_36
-#2x 6C1 • Bound By Rage
-2x6_1
-#2x 4C5 Burn Every Village
-2x4_5
-#1x 6U8 Too Long Have These Peasants Stood
-1x6_8
-#1x 1U231 • Ulaire Enquea, Lieutenant of Morgul
+#Ring-bearer 15C144 • Frodo, Weary From the Journey
+1x15_144
+#The One Ring 7C1 • The One Ring, The Ruling Ring
+1x7_1
+
+#Adventure Deck
+#1 7U332 Rohirrim Road
+#2 7U335 King's Tent
+#3 7U338 Beacon of Minas Tirith
+#4 7U341 Anduin Banks
+#5 8U119 Crashed Gate
+#6 7U350 Minas Tirith Seventh Circle
+#7 8U120 Osgiliath Channel
+#8 7U358 Morgulduin
+#9 7U361 Haunted Pass
+1x7_332
+1x7_335
+1x7_338
+1x7_341
+1x8_119
+1x7_350
+1x8_120
+1x7_358
+1x7_361
+
+
+#Free Peoples Draw Deck
+
+#2x 12U15 • Thrarin, Smith of Erebor
+2x12_15
+#1x 8C5 • Gimli, Counter of Foes
+1x8_5
+#2x 4C71 • Haldir, Emissary of the Galadhrim
+2x4_71
+#1x 5P121 • Legolas, Archer of Mirkwood
+1x5_121
+#2x 10U5 • Arwen, Echo of Luthien
+2x10_5
+#2x 4U86 • Thonnas, Naith Captain
+2x4_86
+#1x 2U3 Dwarven Bracers
+1x2_3
+#1x 7U8 • Gimli's Armor
+1x7_8
+#2x 1C9 Dwarven Axe
+2x1_9
+#2x 2C10 Hand Axe
+2x2_10
+#1x 6C21 Naith Longbow
+1x6_21
+#2x 8U8 Wish For Our Kinfolk
+2x8_8
+#1x 8U13 Shake Off the Shadow
+1x8_13
+#3x 2U4 Endurance of Dwarves
+3x2_4
+#2x 6U9 Lend Us Your Aid
+2x6_9
+#3x 4U53 Quick As May Be
+3x4_53
+#2x 1C299 Hobbit Sword
+2x1_299
+
+#Free Peoples Total 30
+
+#Shadow Draw Deck
+
+#3x 6C2 Dunlending Elder
+3x6_2
+#2x 6C4 Dunlending Headman
+2x6_4
+#3x 4C25 Hillman Tribe
+3x4_25
+#3x 4C21 Hillman Band
+3x4_21
+#2x 4U9 Dunlending Arsonist
+2x4_9
+#2x 4U11 Dunlending Looter
+2x4_11
+#3x 4C17 Dunlending Savage
+3x4_17
+#2x 4C18 Dunlending Warrior
+2x4_18
+#2x 6C3 Dunlending Footmen
+2x6_3
+#2x 4U36 War Club
+2x4_36
+#2x 6C1 • Bound By Rage
+2x6_1
+#2x 4C5 Burn Every Village
+2x4_5
+#1x 6U8 Too Long Have These Peasants Stood
+1x6_8
+#1x 1U231 • Ulaire Enquea, Lieutenant of Morgul
 1x1_231
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/Special-03.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/Special-03.pack
similarity index 94%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/Special-03.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/Special-03.pack
index 890370fb7..e48cb4ec0 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/Special-03.pack
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/Special-03.pack
@@ -1,102 +1,102 @@
-#Ring-bearer 10P121 � Frodo, Resolute Hobbit
-1x10_121
-#The One Ring 1C2 � The One Ring, The Ruling Ring
-1x1_2
-
-#Adventure Deck
-#1 7U334 Steps of Edoras
-1x7_334
-#2 7U336 Rohirrim Camp
-1x7_336
-#3 10U117 Base of Mindolluin
-1x10_117
-#4 10U118 Pelennor Prairie
-1x10_118
-#5 7U345 Pelennor Flat
-1x7_345
-#6 7U351 Minas Tirith Sixth Circle
-1x7_351
-#7 7U355 Ruined Capitol
-1x7_355
-#8 7U357 Morgul Vale
-1x7_357
-#9 7U363 Slag Mounds
-1x7_363
-
-#Free Peoples Draw Deck
-
-#2x 3P122 � Boromir, Defender of Minas Tirith
-2x3_122
-#2x 4C109 � Aragorn, Heir of Elendil
-2x4_109
-#1x 7U110 � Madril, Faramir's Aide
-1x7_110
-#1x 4C270 � Eowyn, Lady of Rohan
-1x4_270
-#2x 6C95 � Hrethel, Rider of Rohan
-2x6_95
-#2x 7U254 � Theoden, Leader of Spears
-2x7_254
-#1x 1C92 Armor
-1x1_92
-#1x 7U93 Footman's Armor
-1x7_93
-#1x 1U112 � Ranger's Sword
-1x1_112
-#1x 7C108 Knight's Spear
-1x7_108
-#1x 4U268 � Eomer's Spear
-1x4_268
-#1x 4U280 � Herugrim
-1x4_280
-#2x 1C299 Hobbit Sword
-2x1_299
-#1x 4U263 � Brego
-1x4_263
-#1x 5C88 Rohirrim Bow
-1x5_88
-#1x 4U126 � Ithilien Trap
-1x4_126
-#1x 5C32 � Citadel of the Stars
-1x5_32
-#1x 7U126 � Unexpected Visitor
-1x7_126
-#1x 8U42 A Path Appointed
-1x8_42
-#2x 8U86 Doom Drove Them
-2x8_86
-#2x 1C102 Dagger Strike
-2x1_102
-#2x 4U282 An Honorable Charge
-2x4_282
-
-#Free Peoples Total 30
-
-#Shadow Draw Deck
-
-#3x 5C61 Uruk Engineer
-3x5_61
-#3x 5C62 Uruk Sapper
-3x5_62
-#2x 1C146 Uruk Fighter
-2x1_146
-#2x 1C158 Uruk-hai Raiding Party
-2x1_158
-#1x 4U136 Advance Uruk Patrol
-1x4_136
-#2x 4C191 Uruk Rear Guard
-2x4_191
-#3x 10C81 Cirith Ungol Guard
-3x10_81
-#3x 10U82 Cirith Ungol Patroller
-3x10_82
-#3x 10C84 Cirith Ungol Sentry
-3x10_84
-#3x 6U58 Assault Ladder
-3x6_58
-#1x 1U260 The Number Must Be Few
-1x1_260
-#2x 10U35 Suffered Much Loss
-2x10_35
-#2x 4C151 Ferocity
+#Ring-bearer 10P121 � Frodo, Resolute Hobbit
+1x10_121
+#The One Ring 1C2 � The One Ring, The Ruling Ring
+1x1_2
+
+#Adventure Deck
+#1 7U334 Steps of Edoras
+1x7_334
+#2 7U336 Rohirrim Camp
+1x7_336
+#3 10U117 Base of Mindolluin
+1x10_117
+#4 10U118 Pelennor Prairie
+1x10_118
+#5 7U345 Pelennor Flat
+1x7_345
+#6 7U351 Minas Tirith Sixth Circle
+1x7_351
+#7 7U355 Ruined Capitol
+1x7_355
+#8 7U357 Morgul Vale
+1x7_357
+#9 7U363 Slag Mounds
+1x7_363
+
+#Free Peoples Draw Deck
+
+#2x 3P122 � Boromir, Defender of Minas Tirith
+2x3_122
+#2x 4C109 � Aragorn, Heir of Elendil
+2x4_109
+#1x 7U110 � Madril, Faramir's Aide
+1x7_110
+#1x 4C270 � Eowyn, Lady of Rohan
+1x4_270
+#2x 6C95 � Hrethel, Rider of Rohan
+2x6_95
+#2x 7U254 � Theoden, Leader of Spears
+2x7_254
+#1x 1C92 Armor
+1x1_92
+#1x 7U93 Footman's Armor
+1x7_93
+#1x 1U112 � Ranger's Sword
+1x1_112
+#1x 7C108 Knight's Spear
+1x7_108
+#1x 4U268 � Eomer's Spear
+1x4_268
+#1x 4U280 � Herugrim
+1x4_280
+#2x 1C299 Hobbit Sword
+2x1_299
+#1x 4U263 � Brego
+1x4_263
+#1x 5C88 Rohirrim Bow
+1x5_88
+#1x 4U126 � Ithilien Trap
+1x4_126
+#1x 5C32 � Citadel of the Stars
+1x5_32
+#1x 7U126 � Unexpected Visitor
+1x7_126
+#1x 8U42 A Path Appointed
+1x8_42
+#2x 8U86 Doom Drove Them
+2x8_86
+#2x 1C102 Dagger Strike
+2x1_102
+#2x 4U282 An Honorable Charge
+2x4_282
+
+#Free Peoples Total 30
+
+#Shadow Draw Deck
+
+#3x 5C61 Uruk Engineer
+3x5_61
+#3x 5C62 Uruk Sapper
+3x5_62
+#2x 1C146 Uruk Fighter
+2x1_146
+#2x 1C158 Uruk-hai Raiding Party
+2x1_158
+#1x 4U136 Advance Uruk Patrol
+1x4_136
+#2x 4C191 Uruk Rear Guard
+2x4_191
+#3x 10C81 Cirith Ungol Guard
+3x10_81
+#3x 10U82 Cirith Ungol Patroller
+3x10_82
+#3x 10C84 Cirith Ungol Sentry
+3x10_84
+#3x 6U58 Assault Ladder
+3x6_58
+#1x 1U260 The Number Must Be Few
+1x1_260
+#2x 10U35 Suffered Much Loss
+2x10_35
+#2x 4C151 Ferocity
 2x4_151
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/Special-04.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/Special-04.pack
similarity index 94%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/Special-04.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/Special-04.pack
index 4abe6c18a..090852e06 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/Special-04.pack
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/Special-04.pack
@@ -1,95 +1,95 @@
-#Ring-bearer 7C317 • Frodo, Hope of Free Peoples
-1x7_317
-#The One Ring 1C2 • The One Ring, The Ruling Ring
-1x1_2
-
-#Adventure Deck
-#1 7U331 Isengard Ruined
-#2 7U336 Rohirrim Camp
-#3 7U339 Hall of the Kings
-#4 7U342 Osgiliath Fallen
-#5 7U344 City Gates
-#6 7U350 Minas Tirith Seventh Circle
-#7 7U353 Osgiliath Crossing
-#8 7U358 Morgulduin
-#9 7U363 Slag Mounds
-1x7_331
-1x7_336
-1x7_339
-1x7_342
-1x7_344
-1x7_350
-1x7_353
-1x7_358
-1x7_363
-
-
-#Free Peoples Draw Deck
-
-#2x 10U4 • Aegnor, Elven Escort
-2x10_4
-#1x 0P63 • Arwen, Maiden of Rivendell
-1x0_63
-#3x 2P122 • Gandalf, The Grey Pilgrim
-3x2_122
-#1x 8C10 • Legolas, Elven Stalwart
-1x8_10
-#1x 4C71 • Haldir, Emissary of the Galadhrim
-1x4_71
-#2x 12C22 • Rumil, Brother of Haldir
-2x12_22
-#3x 1C41 Elven Bow
-3x1_41
-#1x 2C29 Wizard Staff
-1x2_29
-#2x 4C64 Elven Sword
-2x4_64
-#2x 1C299 Hobbit Sword
-2x1_299
-#1x 3U10 • Calaglin, Elf of Lorien
-1x3_10
-#1x 3U12 • Dinendal, Silent Scout
-1x3_12
-#2x 8U13 Shake Off the Shadow
-2x8_13
-#1x 8U18 Not the First Halfling
-1x8_18
-#1x 1U27 • Thrarin, Dwarven Smith
-1x1_27
-#2x 1C78 Mysterious Wizard
-2x1_78
-#2x 4C87 Valor
-2x4_87
-#2x 4C102 Task Was Not Done
-2x4_102
-
-#Free Peoples Total 30
-
-#Shadow Draw Deck
-
-#3x 2C47 Uruk Scout
-3x2_47
-#2x 4C187 Uruk Foot Soldier
-2x4_187
-#3x 4C189 Uruk Plains Runner
-3x4_189
-#3x 4C193 Uruk Runner
-3x4_193
-#3x 4C195 Uruk Seeker
-3x4_195
-#2x 4U194 Uruk Searcher
-2x4_194
-#2x 4U188 Uruk Hunter
-2x4_188
-#2x 3C69 • Saruman, Servant of the Eye
-2x3_69
-#2x 4C196 Uruk Spear
-2x4_196
-#3x 4U159 Many Riddles
-3x4_159
-#2x 3C63 One of You Must Do This
-2x3_63
-#2x 4C156 Kill Them Now
-2x4_156
-#1x 1U231 • Ulaire Enquea, Lieutenant of Morgul
+#Ring-bearer 7C317 • Frodo, Hope of Free Peoples
+1x7_317
+#The One Ring 1C2 • The One Ring, The Ruling Ring
+1x1_2
+
+#Adventure Deck
+#1 7U331 Isengard Ruined
+#2 7U336 Rohirrim Camp
+#3 7U339 Hall of the Kings
+#4 7U342 Osgiliath Fallen
+#5 7U344 City Gates
+#6 7U350 Minas Tirith Seventh Circle
+#7 7U353 Osgiliath Crossing
+#8 7U358 Morgulduin
+#9 7U363 Slag Mounds
+1x7_331
+1x7_336
+1x7_339
+1x7_342
+1x7_344
+1x7_350
+1x7_353
+1x7_358
+1x7_363
+
+
+#Free Peoples Draw Deck
+
+#2x 10U4 • Aegnor, Elven Escort
+2x10_4
+#1x 0P63 • Arwen, Maiden of Rivendell
+1x0_63
+#3x 2P122 • Gandalf, The Grey Pilgrim
+3x2_122
+#1x 8C10 • Legolas, Elven Stalwart
+1x8_10
+#1x 4C71 • Haldir, Emissary of the Galadhrim
+1x4_71
+#2x 12C22 • Rumil, Brother of Haldir
+2x12_22
+#3x 1C41 Elven Bow
+3x1_41
+#1x 2C29 Wizard Staff
+1x2_29
+#2x 4C64 Elven Sword
+2x4_64
+#2x 1C299 Hobbit Sword
+2x1_299
+#1x 3U10 • Calaglin, Elf of Lorien
+1x3_10
+#1x 3U12 • Dinendal, Silent Scout
+1x3_12
+#2x 8U13 Shake Off the Shadow
+2x8_13
+#1x 8U18 Not the First Halfling
+1x8_18
+#1x 1U27 • Thrarin, Dwarven Smith
+1x1_27
+#2x 1C78 Mysterious Wizard
+2x1_78
+#2x 4C87 Valor
+2x4_87
+#2x 4C102 Task Was Not Done
+2x4_102
+
+#Free Peoples Total 30
+
+#Shadow Draw Deck
+
+#3x 2C47 Uruk Scout
+3x2_47
+#2x 4C187 Uruk Foot Soldier
+2x4_187
+#3x 4C189 Uruk Plains Runner
+3x4_189
+#3x 4C193 Uruk Runner
+3x4_193
+#3x 4C195 Uruk Seeker
+3x4_195
+#2x 4U194 Uruk Searcher
+2x4_194
+#2x 4U188 Uruk Hunter
+2x4_188
+#2x 3C69 • Saruman, Servant of the Eye
+2x3_69
+#2x 4C196 Uruk Spear
+2x4_196
+#3x 4U159 Many Riddles
+3x4_159
+#2x 3C63 One of You Must Do This
+2x3_63
+#2x 4C156 Kill Them Now
+2x4_156
+#1x 1U231 • Ulaire Enquea, Lieutenant of Morgul
 1x1_231
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/Special-05.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/Special-05.pack
similarity index 94%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/Special-05.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/Special-05.pack
index 6927efa3d..6a136ce71 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/Special-05.pack
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/Special-05.pack
@@ -1,98 +1,98 @@
-#Ring-bearer 1C290 • Frodo, Son of Drogo
-1x1_290
-#The One Ring 1C2 • The One Ring, The Ruling Ring
-1x1_2
-
-#Adventure Deck
-#1 7U329 Dunharrow Plateau
-#2 7U337 West Road
-#3 7U340 Tower of Ecthelion
-#4 7U341 Anduin Banks
-#5 7U345 Pelennor Flat
-#6 7U347 Minas Tirith First Circle
-#7 8U120 Osgiliath Channel
-#8 7U356 Cross Roads
-#9 7U362 Narchost
-1x7_329
-1x7_337
-1x7_340
-1x7_341
-1x7_345
-1x7_347
-1x8_120
-1x7_356
-1x7_362
-
-#Free Peoples Draw Deck
-
-#2x 2C6 • Fror, Gimli's Kinsman
-2x2_6
-#1x 7C6 • Gimli, Faithful Companion
-1x7_6
-#2x 0P16 • Faramir, Son of Denethor
-2x0_16
-#3x 0P23 • Aragorn, Captain of Gondor
-3x0_23
-#1x 0P25 • Denethor, Wizened Steward
-1x0_25
-#1x 0P58 • Anarion, Lord of Anorien
-1x0_58
-#1x 1U27 • Thrarin, Dwarven Smith
-1x1_27
-#1x 1C92 Armor
-1x1_92
-#1x 2U3 Dwarven Bracers
-1x2_3
-#2x 1C9 Dwarven Axe
-2x1_9
-#2x 7U98 Gondorian Sword
-2x7_98
-#2x 1C299 Hobbit Sword
-2x1_299
-#1x 4U57 • Stout and Strong
-1x4_57
-#1x 5C32 • Citadel of the Stars
-1x5_32
-#1x 7U126 • Unexpected Visitor
-1x7_126
-#1x 8U8 Wish For Our Kinfolk
-1x8_8
-#2x 8U42 A Path Appointed
-2x8_42
-#2x 1C3 Axe Strike
-2x1_3
-#3x 4C135 War and Valor
-3x4_135
-
-#Free Peoples Total 30
-
-#Shadow Draw Deck
-
-#2x 4C224 Easterling Axeman
-2x4_224
-#3x 4C226 Easterling Guard
-3x4_226
-#2x 4C227 Easterling Infantry
-2x4_227
-#3x 4C228 Easterling Lieutenant
-3x4_228
-#2x 7C139 Easterling Aggressor
-2x7_139
-#2x 7C140 Easterling Assailant
-2x7_140
-#2x 7C141 Easterling Attacker
-2x7_141
-#2x 7C142 Easterling Blademaster
-2x7_142
-#3x 10C41 • Easterling Pillager
-3x10_41
-#2x 6U79 Easterling Polearm
-2x6_79
-#2x 4C235 Gathering to the Summons
-2x4_235
-#2x 4C239 Men of Rhun
-2x4_239
-#1x 4C260 Whirling Strike
-1x4_260
-#2x 7C173 War Towers
+#Ring-bearer 1C290 • Frodo, Son of Drogo
+1x1_290
+#The One Ring 1C2 • The One Ring, The Ruling Ring
+1x1_2
+
+#Adventure Deck
+#1 7U329 Dunharrow Plateau
+#2 7U337 West Road
+#3 7U340 Tower of Ecthelion
+#4 7U341 Anduin Banks
+#5 7U345 Pelennor Flat
+#6 7U347 Minas Tirith First Circle
+#7 8U120 Osgiliath Channel
+#8 7U356 Cross Roads
+#9 7U362 Narchost
+1x7_329
+1x7_337
+1x7_340
+1x7_341
+1x7_345
+1x7_347
+1x8_120
+1x7_356
+1x7_362
+
+#Free Peoples Draw Deck
+
+#2x 2C6 • Fror, Gimli's Kinsman
+2x2_6
+#1x 7C6 • Gimli, Faithful Companion
+1x7_6
+#2x 0P16 • Faramir, Son of Denethor
+2x0_16
+#3x 0P23 • Aragorn, Captain of Gondor
+3x0_23
+#1x 0P25 • Denethor, Wizened Steward
+1x0_25
+#1x 0P58 • Anarion, Lord of Anorien
+1x0_58
+#1x 1U27 • Thrarin, Dwarven Smith
+1x1_27
+#1x 1C92 Armor
+1x1_92
+#1x 2U3 Dwarven Bracers
+1x2_3
+#2x 1C9 Dwarven Axe
+2x1_9
+#2x 7U98 Gondorian Sword
+2x7_98
+#2x 1C299 Hobbit Sword
+2x1_299
+#1x 4U57 • Stout and Strong
+1x4_57
+#1x 5C32 • Citadel of the Stars
+1x5_32
+#1x 7U126 • Unexpected Visitor
+1x7_126
+#1x 8U8 Wish For Our Kinfolk
+1x8_8
+#2x 8U42 A Path Appointed
+2x8_42
+#2x 1C3 Axe Strike
+2x1_3
+#3x 4C135 War and Valor
+3x4_135
+
+#Free Peoples Total 30
+
+#Shadow Draw Deck
+
+#2x 4C224 Easterling Axeman
+2x4_224
+#3x 4C226 Easterling Guard
+3x4_226
+#2x 4C227 Easterling Infantry
+2x4_227
+#3x 4C228 Easterling Lieutenant
+3x4_228
+#2x 7C139 Easterling Aggressor
+2x7_139
+#2x 7C140 Easterling Assailant
+2x7_140
+#2x 7C141 Easterling Attacker
+2x7_141
+#2x 7C142 Easterling Blademaster
+2x7_142
+#3x 10C41 • Easterling Pillager
+3x10_41
+#2x 6U79 Easterling Polearm
+2x6_79
+#2x 4C235 Gathering to the Summons
+2x4_235
+#2x 4C239 Men of Rhun
+2x4_239
+#1x 4C260 Whirling Strike
+1x4_260
+#2x 7C173 War Towers
 2x7_173
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/Special-06.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/Special-06.pack
similarity index 95%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/Special-06.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/Special-06.pack
index 485e10259..dff37eff2 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/Special-06.pack
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/Special-06.pack
@@ -1,100 +1,100 @@
-#Ring-bearer 4C302 � Frodo, Tired Traveller
-1x4_302
-#The One Ring 1C2 � The One Ring, The Ruling Ring
-1x1_2
-
-#Adventure Deck
-#1 7U330 Edoras Hall
-#2 7U337 West Road
-#3 7U339 Hall of the Kings
-#4 10U118 Pelennor Prairie
-#5 7U344 City Gates
-#6 7U352 Minas Tirith Third Circle
-#7 7U355 Ruined Capitol
-#8 7U358 Morgulduin
-#9 7U361 Haunted Pass
-1x7_330
-1x7_337
-1x7_339
-1x10_118
-1x7_344
-1x7_352
-1x7_355
-1x7_358
-1x7_361
-
-#Free Peoples Draw Deck
-
-#1x 1C303 � Merry, From O'er the Brandywine
-1x1_303
-#3x 4C314 � Pippin, Woolly-footed Rascal
-3x4_314
-#1x 7C225 Elite Rider
-1x7_225
-#2x 0P66 � Eomer, Forthwith Banished
-2x0_66
-#1x 7C229 � Eowyn, Restless Maiden
-1x7_229
-#2x 7U254 � Theoden, Leader of Spears
-2x7_254
-#1x 4U263 � Brego
-1x4_263
-#1x 4C287 Rider's Mount
-1x4_287
-#2x 4C288 Rider's Spear
-2x4_288
-#2x 1C299 Hobbit Sword
-2x1_299
-#1x 3C108 Frying Pan
-1x3_108
-#3x 10U114 Shadowplay
-3x10_114
-#2x 8U112 Song of the Shire
-2x8_112
-#1x 8U86 Doom Drove Them
-1x8_86
-#1x 1C317 � There and Back Again
-1x1_317
-#1x 6C97 � We Left None Alive
-1x6_97
-#1x 1C294 Hobbit Appetite
-1x1_294
-#2x 10C109 Make Haste
-2x10_109
-#2x 7U231 Fey He Seemed
-2x7_231
-
-#Free Peoples Total 30
-
-#Shadow Draw Deck
-
-#2x 6P122 � The Witch-king, Deathless Lord
-2x6_122
-#3x 8U79 � Ulaire Attea, Thrall of The One
-3x8_79
-#1x 7U212 � Ulaire Enquea, Faster Than Winds
-1x7_212
-#1x 1U231 � Ulaire Enquea, Lieutenant of Morgul
-1x1_231
-#1x 2U83 � Ulaire Enquea, Ringwraith in Twilight
-1x2_83
-#3x 1U232 � Ulaire Lemenya, Lieutenant of Morgul
-3x1_232
-#3x 7U216 � Ulaire Nelya, Black-Mantled Wraith
-3x7_216
-#2x 7U217 � Ulaire Nertea, Black-Mantled Wraith
-2x7_217
-#2x 1U235 � Ulaire Otsea, Lieutenant of Morgul
-2x1_235
-#2x 7U218 � Ulaire Otsea, Black-Mantled Wraith
-2x7_218
-#3x 1U207 Black Breath
-3x1_207
-#2x 1U209 Blade Tip
-2x1_209
-#1x 10C64 � Stooping to the Kill
-1x10_64
-#2x 10C61 Houses of Lamentation
-2x10_61
-#2x 1U203 All Blades Perish
-2x1_203
+#Ring-bearer 4C302 � Frodo, Tired Traveller
+1x4_302
+#The One Ring 1C2 � The One Ring, The Ruling Ring
+1x1_2
+
+#Adventure Deck
+#1 7U330 Edoras Hall
+#2 7U337 West Road
+#3 7U339 Hall of the Kings
+#4 10U118 Pelennor Prairie
+#5 7U344 City Gates
+#6 7U352 Minas Tirith Third Circle
+#7 7U355 Ruined Capitol
+#8 7U358 Morgulduin
+#9 7U361 Haunted Pass
+1x7_330
+1x7_337
+1x7_339
+1x10_118
+1x7_344
+1x7_352
+1x7_355
+1x7_358
+1x7_361
+
+#Free Peoples Draw Deck
+
+#1x 1C303 � Merry, From O'er the Brandywine
+1x1_303
+#3x 4C314 � Pippin, Woolly-footed Rascal
+3x4_314
+#1x 7C225 Elite Rider
+1x7_225
+#2x 0P66 � Eomer, Forthwith Banished
+2x0_66
+#1x 7C229 � Eowyn, Restless Maiden
+1x7_229
+#2x 7U254 � Theoden, Leader of Spears
+2x7_254
+#1x 4U263 � Brego
+1x4_263
+#1x 4C287 Rider's Mount
+1x4_287
+#2x 4C288 Rider's Spear
+2x4_288
+#2x 1C299 Hobbit Sword
+2x1_299
+#1x 3C108 Frying Pan
+1x3_108
+#3x 10U114 Shadowplay
+3x10_114
+#2x 8U112 Song of the Shire
+2x8_112
+#1x 8U86 Doom Drove Them
+1x8_86
+#1x 1C317 � There and Back Again
+1x1_317
+#1x 6C97 � We Left None Alive
+1x6_97
+#1x 1C294 Hobbit Appetite
+1x1_294
+#2x 10C109 Make Haste
+2x10_109
+#2x 7U231 Fey He Seemed
+2x7_231
+
+#Free Peoples Total 30
+
+#Shadow Draw Deck
+
+#2x 6P122 � The Witch-king, Deathless Lord
+2x6_122
+#3x 8U79 � Ulaire Attea, Thrall of The One
+3x8_79
+#1x 7U212 � Ulaire Enquea, Faster Than Winds
+1x7_212
+#1x 1U231 � Ulaire Enquea, Lieutenant of Morgul
+1x1_231
+#1x 2U83 � Ulaire Enquea, Ringwraith in Twilight
+1x2_83
+#3x 1U232 � Ulaire Lemenya, Lieutenant of Morgul
+3x1_232
+#3x 7U216 � Ulaire Nelya, Black-Mantled Wraith
+3x7_216
+#2x 7U217 � Ulaire Nertea, Black-Mantled Wraith
+2x7_217
+#2x 1U235 � Ulaire Otsea, Lieutenant of Morgul
+2x1_235
+#2x 7U218 � Ulaire Otsea, Black-Mantled Wraith
+2x7_218
+#3x 1U207 Black Breath
+3x1_207
+#2x 1U209 Blade Tip
+2x1_209
+#1x 10C64 � Stooping to the Kill
+1x10_64
+#2x 10C61 Houses of Lamentation
+2x10_61
+#2x 1U203 All Blades Perish
+2x1_203
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/Special-07.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/Special-07.pack
similarity index 94%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/Special-07.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/Special-07.pack
index 60707db46..55c575d0c 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/Special-07.pack
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/Special-07.pack
@@ -1,108 +1,108 @@
-#Ring-bearer 4C302 • Frodo, Tired Traveller
-1x4_302
-#The One Ring 1C2 • The One Ring, The Ruling Ring
-1x1_2
-#Adventure Deck
-#1 7U334 Steps of Edoras
-#2 7U336 Rohirrim Camp
-#3 7U339 Hall of the Kings
-#4 10U118 Pelennor Prairie
-#5 10U119 Steward's Tomb
-#6 7U347 Minas Tirith First Circle
-#7 7U353 Osgiliath Crossing
-#8 7U358 Morgulduin
-#9 7U360 Dagorlad
-1x7_334
-1x7_336
-1x7_339
-1x10_118
-1x10_119
-1x7_347
-1x7_353
-1x7_358
-1x7_360
-
-
-#Free Peoples Draw Deck
-
-#3x 0P16 • Faramir, Son of Denethor
-3x0_16
-#1x 5U115 • Sam, Nice Sensible Hobbit
-1x5_115
-#1x 2C114 • Sam, Proper Poet
-1x2_114
-#1x 6P121 • Faramir, Ithilien Ranger
-1x6_121
-#1x 6C45 • Smeagol, Poor Creature
-1x6_45
-#2x 2P122 • Gandalf, The Grey Pilgrim
-2x2_122
-#1x 7U110 • Madril, Faramir's Aide
-1x7_110
-#1x 11U59 Gondorian Blade
-1x11_59
-#1x 7U93 Footman's Armor
-1x7_93
-#1x 4C112 • Boromir's Gauntlets
-1x4_112
-#1x 3C108 Frying Pan
-1x3_108
-#2x 10C113 Orc Armor
-2x10_113
-#1x 1C286 Bounder
-1x1_286
-#1x 2U96 • Bilbo Baggins, Well-spoken Gentlehobbit
-1x2_96
-#1x 10U116 • The Tale of the Great Ring
-1x10_116
-#1x 1C317 • There and Back Again
-1x1_317
-#1x 13U53 Naked Waste
-1x13_53
-#2x 7U78 Where Shall We Go
-2x7_78
-#1x 8U29 Still Far Ahead
-1x8_29
-#2x 6C38 Don't Follow The Lights
-2x6_38
-#1x 6C43 Not Listening
-1x6_43
-#1x 1U309 • Rosie Cotton, Hobbiton Lass
-1x1_309
-#2x 4U309 Light Shining Faintly
-2x4_309
-
-#Free Peoples Total 30
-
-#Shadow Draw Deck
-
-#3x 3U58 Isengard Servant
-3x3_58
-#2x 3U60 Isengard Smith
-2x3_60
-#2x 3U61 Isengard Warrior
-2x3_61
-#2x 3U57 Isengard Retainer
-2x3_57
-#3x 3C56 Isengard Forger
-3x3_56
-#2x 2C42 Goblin Man
-2x2_42
-#3x 6C67 Isengard Journeyman
-3x6_67
-#2x 3C59 Isengard Shaman
-2x3_59
-#2x 3C62 Isengard Worker
-2x3_62
-#2x 3C55 Isengard Axe
-2x3_55
-#2x 3U72 Trapped and Alone
-2x3_72
-#2x 1U142 Traitor's Voice
-2x1_142
-#1x 2U48 Wizard Storm
-1x2_48
-#2x 3C69 • Saruman, Servant of the Eye
-2x3_69
-
+#Ring-bearer 4C302 • Frodo, Tired Traveller
+1x4_302
+#The One Ring 1C2 • The One Ring, The Ruling Ring
+1x1_2
+#Adventure Deck
+#1 7U334 Steps of Edoras
+#2 7U336 Rohirrim Camp
+#3 7U339 Hall of the Kings
+#4 10U118 Pelennor Prairie
+#5 10U119 Steward's Tomb
+#6 7U347 Minas Tirith First Circle
+#7 7U353 Osgiliath Crossing
+#8 7U358 Morgulduin
+#9 7U360 Dagorlad
+1x7_334
+1x7_336
+1x7_339
+1x10_118
+1x10_119
+1x7_347
+1x7_353
+1x7_358
+1x7_360
+
+
+#Free Peoples Draw Deck
+
+#3x 0P16 • Faramir, Son of Denethor
+3x0_16
+#1x 5U115 • Sam, Nice Sensible Hobbit
+1x5_115
+#1x 2C114 • Sam, Proper Poet
+1x2_114
+#1x 6P121 • Faramir, Ithilien Ranger
+1x6_121
+#1x 6C45 • Smeagol, Poor Creature
+1x6_45
+#2x 2P122 • Gandalf, The Grey Pilgrim
+2x2_122
+#1x 7U110 • Madril, Faramir's Aide
+1x7_110
+#1x 11U59 Gondorian Blade
+1x11_59
+#1x 7U93 Footman's Armor
+1x7_93
+#1x 4C112 • Boromir's Gauntlets
+1x4_112
+#1x 3C108 Frying Pan
+1x3_108
+#2x 10C113 Orc Armor
+2x10_113
+#1x 1C286 Bounder
+1x1_286
+#1x 2U96 • Bilbo Baggins, Well-spoken Gentlehobbit
+1x2_96
+#1x 10U116 • The Tale of the Great Ring
+1x10_116
+#1x 1C317 • There and Back Again
+1x1_317
+#1x 13U53 Naked Waste
+1x13_53
+#2x 7U78 Where Shall We Go
+2x7_78
+#1x 8U29 Still Far Ahead
+1x8_29
+#2x 6C38 Don't Follow The Lights
+2x6_38
+#1x 6C43 Not Listening
+1x6_43
+#1x 1U309 • Rosie Cotton, Hobbiton Lass
+1x1_309
+#2x 4U309 Light Shining Faintly
+2x4_309
+
+#Free Peoples Total 30
+
+#Shadow Draw Deck
+
+#3x 3U58 Isengard Servant
+3x3_58
+#2x 3U60 Isengard Smith
+2x3_60
+#2x 3U61 Isengard Warrior
+2x3_61
+#2x 3U57 Isengard Retainer
+2x3_57
+#3x 3C56 Isengard Forger
+3x3_56
+#2x 2C42 Goblin Man
+2x2_42
+#3x 6C67 Isengard Journeyman
+3x6_67
+#2x 3C59 Isengard Shaman
+2x3_59
+#2x 3C62 Isengard Worker
+2x3_62
+#2x 3C55 Isengard Axe
+2x3_55
+#2x 3U72 Trapped and Alone
+2x3_72
+#2x 1U142 Traitor's Voice
+2x1_142
+#1x 2U48 Wizard Storm
+1x2_48
+#2x 3C69 • Saruman, Servant of the Eye
+2x3_69
+
 #Shadow Total 30
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/Special-08.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/Special-08.pack
similarity index 94%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/Special-08.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/Special-08.pack
index fdda94aee..6f6886396 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/Special-08.pack
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/Special-08.pack
@@ -1,101 +1,101 @@
-#Ring-bearer 10P121 � Frodo, Resolute Hobbit
-1x10_121
-#The One Ring 1C2 � The One Ring, The Ruling Ring
-1x1_2
-
-#Adventure Deck
-#1 7U334 Steps of Edoras
-#2 7U335 King's Tent
-#3 7U339 Hall of the Kings
-#4 8U118 City of the Dead
-#5 7U345 Pelennor Flat
-#6 7U346 Minas Tirith Fifth Circle
-#7 7U355 Ruined Capitol
-#8 7U359 Northern Ithilien
-#9 7U363 Slag Mounds
-1x7_334
-1x7_335
-1x7_339
-1x8_118
-1x7_345
-1x7_346
-1x7_355
-1x7_359
-1x7_363
-
-
-#Free Peoples Draw Deck
-
-#1x 1U285 � Bilbo's Pipe
-1x1_285
-#2x 3U107 � Frodo's Pipe
-2x3_107
-#2x 1U74 � Gandalf's Pipe
-2x1_74
-#1x 1U292 � The Gaffer's Pipe
-1x1_292
-#1x 3U2 � Gimli's Pipe
-1x3_2
-#2x 1U91 � Aragorn's Pipe
-2x1_91
-#3x 1C300 Longbottom Leaf
-3x1_300
-#3x 1C305 Old Toby
-3x1_305
-#2x 1C286 Bounder
-2x1_286
-#1x 1U309 � Rosie Cotton, Hobbiton Lass
-1x1_309
-#1x 1U301 � Master Proudfoot, Distant Relative of Bilbo
-1x1_301
-#2x 0P64 � Gandalf, Stormcrow
-2x0_64
-#1x 7C6 � Gimli, Faithful Companion
-1x7_6
-#2x 7C81 � Aragorn, Captain of Gondor
-2x7_81
-#2x 1U97 � Boromir, Son of Denethor
-2x1_97
-#2x 7U98 Gondorian Sword
-2x7_98
-#1x 1C9 Dwarven Axe
-1x1_9
-#1x 2C10 Hand Axe
-1x2_10
-
-#Free Peoples Total 30
-
-#Shadow Draw Deck
-
-#1x 5C24 � Gollum, Nasty Treacherous Creature
-1x5_24
-#1x 6C40 � Gollum, Old Villain
-1x6_40
-#1x 7C59 � Gollum, Vile Creature
-1x7_59
-#3x 8C26 � Shelob, Last Child of Ungoliant
-3x8_26
-#3x 8U23 Larder
-3x8_23
-#3x 8C28 Spider Poison
-3x8_28
-#2x 8C30 Web
-2x8_30
-#1x 5U22 Evil-smelling Fens
-1x5_22
-#1x 10U20 Final Strike
-1x10_20
-#1x 10C24 � Unabated in Malice
-1x10_24
-#2x 7C53 Captured by the Ring
-2x7_53
-#3x 5C99 Gate Veteran
-3x5_99
-#2x 1C191 Moria Scout
-2x1_191
-#3x 10C62 Morgul Banner-bearer
-3x10_62
-#3x 3U58 Isengard Servant
-3x3_58
-
+#Ring-bearer 10P121 � Frodo, Resolute Hobbit
+1x10_121
+#The One Ring 1C2 � The One Ring, The Ruling Ring
+1x1_2
+
+#Adventure Deck
+#1 7U334 Steps of Edoras
+#2 7U335 King's Tent
+#3 7U339 Hall of the Kings
+#4 8U118 City of the Dead
+#5 7U345 Pelennor Flat
+#6 7U346 Minas Tirith Fifth Circle
+#7 7U355 Ruined Capitol
+#8 7U359 Northern Ithilien
+#9 7U363 Slag Mounds
+1x7_334
+1x7_335
+1x7_339
+1x8_118
+1x7_345
+1x7_346
+1x7_355
+1x7_359
+1x7_363
+
+
+#Free Peoples Draw Deck
+
+#1x 1U285 � Bilbo's Pipe
+1x1_285
+#2x 3U107 � Frodo's Pipe
+2x3_107
+#2x 1U74 � Gandalf's Pipe
+2x1_74
+#1x 1U292 � The Gaffer's Pipe
+1x1_292
+#1x 3U2 � Gimli's Pipe
+1x3_2
+#2x 1U91 � Aragorn's Pipe
+2x1_91
+#3x 1C300 Longbottom Leaf
+3x1_300
+#3x 1C305 Old Toby
+3x1_305
+#2x 1C286 Bounder
+2x1_286
+#1x 1U309 � Rosie Cotton, Hobbiton Lass
+1x1_309
+#1x 1U301 � Master Proudfoot, Distant Relative of Bilbo
+1x1_301
+#2x 0P64 � Gandalf, Stormcrow
+2x0_64
+#1x 7C6 � Gimli, Faithful Companion
+1x7_6
+#2x 7C81 � Aragorn, Captain of Gondor
+2x7_81
+#2x 1U97 � Boromir, Son of Denethor
+2x1_97
+#2x 7U98 Gondorian Sword
+2x7_98
+#1x 1C9 Dwarven Axe
+1x1_9
+#1x 2C10 Hand Axe
+1x2_10
+
+#Free Peoples Total 30
+
+#Shadow Draw Deck
+
+#1x 5C24 � Gollum, Nasty Treacherous Creature
+1x5_24
+#1x 6C40 � Gollum, Old Villain
+1x6_40
+#1x 7C59 � Gollum, Vile Creature
+1x7_59
+#3x 8C26 � Shelob, Last Child of Ungoliant
+3x8_26
+#3x 8U23 Larder
+3x8_23
+#3x 8C28 Spider Poison
+3x8_28
+#2x 8C30 Web
+2x8_30
+#1x 5U22 Evil-smelling Fens
+1x5_22
+#1x 10U20 Final Strike
+1x10_20
+#1x 10C24 � Unabated in Malice
+1x10_24
+#2x 7C53 Captured by the Ring
+2x7_53
+#3x 5C99 Gate Veteran
+3x5_99
+#2x 1C191 Moria Scout
+2x1_191
+#3x 10C62 Morgul Banner-bearer
+3x10_62
+#3x 3U58 Isengard Servant
+3x3_58
+
 #Shadow Total 30
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/Special-09.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/Special-09.pack
similarity index 94%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/Special-09.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/Special-09.pack
index f8779177d..dda07a013 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/Special-09.pack
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/Special-09.pack
@@ -1,100 +1,100 @@
-#Ring-bearer 2C102 • Frodo, Reluctant Adventurer
-1x2_102
-#The One Ring 1C2 • The One Ring, The Ruling Ring
-1x1_2
-
-#Adventure Deck
-#1 7U334 Steps of Edoras
-#2 7U336 Rohirrim Camp
-#3 10U117 Base of Mindolluin
-#4 7U343 Pelennor Plain
-#5 8U119 Crashed Gate
-#6 7U347 Minas Tirith First Circle
-#7 7U354 Pelennor Grassland
-#8 7U356 Cross Roads
-#9 7U360 Dagorlad
-1x7_334
-1x7_336
-1x10_117
-1x7_343
-1x8_119
-1x7_347
-1x7_354
-1x7_356
-1x7_360
-
-#Free Peoples Draw Deck
-
-#2x 4C109 • Aragorn, Heir of Elendil
-2x4_109
-#2x 3P122 • Boromir, Defender of Minas Tirith
-2x3_122
-#2x 7C90 • Faramir, Stout Captain
-2x7_90
-#1x 3U7 • Arwen, Elven Rider
-1x3_7
-#2x 8C10 • Legolas, Elven Stalwart
-2x8_10
-#1x 4C71 • Haldir, Emissary of the Galadhrim
-1x4_71
-#1x 3U10 • Calaglin, Elf of Lorien
-1x3_10
-#1x 3U12 • Dinendal, Silent Scout
-1x3_12
-#1x 1U56 • Orophin, Lorien Bowman
-1x1_56
-#1x 1U57 • Rumil, Elven Protector
-1x1_57
-#2x 1U65 Swan-ship of the Galadhrim
-2x1_65
-#1x 1C286 Bounder
-1x1_286
-#1x 1U31 • Asfaloth
-1x1_31
-#1x 1C41 Elven Bow
-1x1_41
-#1x 1U112 • Ranger's Sword
-1x1_112
-#1x 6U51 Banner of Westernesse
-1x6_51
-#1x 5U12 • Legolas' Sword
-1x5_12
-#1x 4C134 Sword of Gondor
-1x4_134
-#1x 5C32 • Citadel of the Stars
-1x5_32
-#1x 6C52 • Garrison of Osgiliath
-1x6_52
-#1x 1U108 No Stranger to the Shadows
-1x1_108
-#3x 1C117 Swordsman of the Northern Kingdom
-3x1_117
-#1x 4C129 Pathfinder
-1x4_129
-
-#Free Peoples Total 30
-
-#Shadow Draw Deck
-
-#3x 1C176 Goblin Marksman
-3x1_176
-#3x 4C248 Southron Bowman
-3x4_248
-#3x 4C183 Uruk Crossbowman
-3x4_183
-#3x 4U232 Elite Archer
-3x4_232
-#3x 2U67 Moria Archer Troop
-3x2_67
-#3x 4U138 Band of Uruk Bowmen
-3x4_138
-#3x 2C60 Goblin Bowman
-3x2_60
-#3x 8C76 Morgul Lurker
-3x8_76
-#3x 8C75 Morgul Creeper
-3x8_75
-#3x 8C74 Morgul Ambusher
-3x8_74
-
+#Ring-bearer 2C102 • Frodo, Reluctant Adventurer
+1x2_102
+#The One Ring 1C2 • The One Ring, The Ruling Ring
+1x1_2
+
+#Adventure Deck
+#1 7U334 Steps of Edoras
+#2 7U336 Rohirrim Camp
+#3 10U117 Base of Mindolluin
+#4 7U343 Pelennor Plain
+#5 8U119 Crashed Gate
+#6 7U347 Minas Tirith First Circle
+#7 7U354 Pelennor Grassland
+#8 7U356 Cross Roads
+#9 7U360 Dagorlad
+1x7_334
+1x7_336
+1x10_117
+1x7_343
+1x8_119
+1x7_347
+1x7_354
+1x7_356
+1x7_360
+
+#Free Peoples Draw Deck
+
+#2x 4C109 • Aragorn, Heir of Elendil
+2x4_109
+#2x 3P122 • Boromir, Defender of Minas Tirith
+2x3_122
+#2x 7C90 • Faramir, Stout Captain
+2x7_90
+#1x 3U7 • Arwen, Elven Rider
+1x3_7
+#2x 8C10 • Legolas, Elven Stalwart
+2x8_10
+#1x 4C71 • Haldir, Emissary of the Galadhrim
+1x4_71
+#1x 3U10 • Calaglin, Elf of Lorien
+1x3_10
+#1x 3U12 • Dinendal, Silent Scout
+1x3_12
+#1x 1U56 • Orophin, Lorien Bowman
+1x1_56
+#1x 1U57 • Rumil, Elven Protector
+1x1_57
+#2x 1U65 Swan-ship of the Galadhrim
+2x1_65
+#1x 1C286 Bounder
+1x1_286
+#1x 1U31 • Asfaloth
+1x1_31
+#1x 1C41 Elven Bow
+1x1_41
+#1x 1U112 • Ranger's Sword
+1x1_112
+#1x 6U51 Banner of Westernesse
+1x6_51
+#1x 5U12 • Legolas' Sword
+1x5_12
+#1x 4C134 Sword of Gondor
+1x4_134
+#1x 5C32 • Citadel of the Stars
+1x5_32
+#1x 6C52 • Garrison of Osgiliath
+1x6_52
+#1x 1U108 No Stranger to the Shadows
+1x1_108
+#3x 1C117 Swordsman of the Northern Kingdom
+3x1_117
+#1x 4C129 Pathfinder
+1x4_129
+
+#Free Peoples Total 30
+
+#Shadow Draw Deck
+
+#3x 1C176 Goblin Marksman
+3x1_176
+#3x 4C248 Southron Bowman
+3x4_248
+#3x 4C183 Uruk Crossbowman
+3x4_183
+#3x 4U232 Elite Archer
+3x4_232
+#3x 2U67 Moria Archer Troop
+3x2_67
+#3x 4U138 Band of Uruk Bowmen
+3x4_138
+#3x 2C60 Goblin Bowman
+3x2_60
+#3x 8C76 Morgul Lurker
+3x8_76
+#3x 8C75 Morgul Creeper
+3x8_75
+#3x 8C74 Morgul Ambusher
+3x8_74
+
 #Shadow Total 30
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/TSSealedS1D1.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/TSSealedS1D1.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/TSSealedS1D1.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/TSSealedS1D1.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/TSSealedS1D2.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/TSSealedS1D2.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/TSSealedS1D2.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/TSSealedS1D2.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/TSSealedS1D3.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/TSSealedS1D3.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/TSSealedS1D3.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/TSSealedS1D3.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/TSSealedS2D1.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/TSSealedS2D1.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/TSSealedS2D1.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/TSSealedS2D1.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/TSSealedS2D2.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/TSSealedS2D2.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/TSSealedS2D2.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/TSSealedS2D2.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/TSSealedS2D3.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/TSSealedS2D3.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/TSSealedS2D3.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/TSSealedS2D3.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/TSSealedS3D1.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/TSSealedS3D1.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/TSSealedS3D1.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/TSSealedS3D1.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/TSSealedS3D2.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/TSSealedS3D2.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/TSSealedS3D2.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/TSSealedS3D2.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/TSSealedS3D3.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/TSSealedS3D3.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/TSSealedS3D3.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/TSSealedS3D3.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/TTT - Aragorn Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/TTT - Aragorn Starter.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/TTT - Aragorn Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/TTT - Aragorn Starter.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/TTT - Theoden Starter.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/TTT - Theoden Starter.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/TTT - Theoden Starter.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/TTT - Theoden Starter.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/Wraith.pack b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/Wraith.pack
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/Wraith.pack
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/Wraith.pack
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/packs.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/packs.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-server/src/main/resources/packs.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/product/packs.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set50-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set50-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set50-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set50-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set51-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set51-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set51-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set51-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set52-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set52-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set52-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set52-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set53-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set53-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set53-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set53-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set54-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set54-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set54-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set54-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set55-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set55-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set55-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set55-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set56-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set56-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set56-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set56-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set57-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set57-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set57-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set57-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set58-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set58-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set58-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set58-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set59-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set59-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set59-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set59-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set60-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set60-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set60-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set60-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set61-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set61-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set61-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set61-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set62-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set62-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set62-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set62-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set63-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set63-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set63-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set63-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set64-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set64-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set64-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set64-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set65-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set65-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set65-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set65-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set66-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set66-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set66-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set66-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set67-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set67-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set67-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set67-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set68-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set68-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set68-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set68-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set69-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set69-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set69-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set69-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set70-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set70-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set70-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set70-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set71-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set71-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set71-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set71-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set72-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set72-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set72-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set72-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set73-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set73-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set73-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set73-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set74-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set74-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set74-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set74-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set75-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set75-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set75-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set75-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set76-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set76-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set76-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set76-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set77-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set77-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set77-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set77-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set78-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set78-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set78-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set78-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set79-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set79-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set79-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set79-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set80-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set80-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set80-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set80-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set81-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set81-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set81-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set81-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set82-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set82-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set82-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set82-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set83-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set83-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set83-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set83-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set84-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set84-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set84-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set84-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set85-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set85-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set85-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set85-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set86-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set86-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set86-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set86-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set87-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set87-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set87-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set87-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set88-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set88-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set88-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set88-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set89-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set89-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/errata/set89-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/errata/set89-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set0-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set0-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/set0-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set0-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set1-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set1-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/set1-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set1-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set10-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set10-rarity.txt
similarity index 86%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/set10-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set10-rarity.txt
index 18cf87857..9c518f24a 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/set10-rarity.txt
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set10-rarity.txt
@@ -1,127 +1,127 @@
-10R1
-10U2
-10R3
-10U4
-10U5
-10R6
-10R6T
-10R7
-10R8
-10R9
-10R9T
-10C10
-10R11
-10U12
-10R13
-10R14
-10U15
-10C16
-10R17
-10R18
-10R19
-10U20
-10R21
-10U22
-10R23
-10C24
-10R25
-10R25T
-10U26
-10C27
-10R28
-10R29
-10C30
-10C31
-10U32
-10U33
-10C34
-10U35
-10C36
-10C37
-10R38
-10U39
-10R40
-10C41
-10C42
-10U43
-10U44
-10R45
-10R46
-10U47
-10R48
-10C49
-10C50
-10R51
-10C52
-10U53
-10U54
-10C55
-10C56
-10U57
-10R58
-10R59
-10R60
-10C61
-10C62
-10R63
-10C64
-10C65
-10C66
-10R67
-10R68
-10U69
-10U70
-10R71
-10R72
-10U73
-10U74
-10R75
-10C76
-10C77
-10U78
-10C79
-10C80
-10C81
-10U82
-10U83
-10C84
-10C85
-10C86
-10C87
-10R88
-10R88T
-10R89
-10C90
-10C91
-10U92
-10U93
-10R94
-10R95
-10U96
-10U97
-10U98
-10R99
-10R100
-10R101
-10C102
-10C103
-10R104
-10U105
-10C106
-10C107
-10U108
-10C109
-10C110
-10U111
-10C112
-10C113
-10U114
-10U115
-10U116
-10U117
-10U118
-10U119
-10U120
-10P121
-10P122
+10R1
+10U2
+10R3
+10U4
+10U5
+10R6
+10R6T
+10R7
+10R8
+10R9
+10R9T
+10C10
+10R11
+10U12
+10R13
+10R14
+10U15
+10C16
+10R17
+10R18
+10R19
+10U20
+10R21
+10U22
+10R23
+10C24
+10R25
+10R25T
+10U26
+10C27
+10R28
+10R29
+10C30
+10C31
+10U32
+10U33
+10C34
+10U35
+10C36
+10C37
+10R38
+10U39
+10R40
+10C41
+10C42
+10U43
+10U44
+10R45
+10R46
+10U47
+10R48
+10C49
+10C50
+10R51
+10C52
+10U53
+10U54
+10C55
+10C56
+10U57
+10R58
+10R59
+10R60
+10C61
+10C62
+10R63
+10C64
+10C65
+10C66
+10R67
+10R68
+10U69
+10U70
+10R71
+10R72
+10U73
+10U74
+10R75
+10C76
+10C77
+10U78
+10C79
+10C80
+10C81
+10U82
+10U83
+10C84
+10C85
+10C86
+10C87
+10R88
+10R88T
+10R89
+10C90
+10C91
+10U92
+10U93
+10R94
+10R95
+10U96
+10U97
+10U98
+10R99
+10R100
+10R101
+10C102
+10C103
+10R104
+10U105
+10C106
+10C107
+10U108
+10C109
+10C110
+10U111
+10C112
+10C113
+10U114
+10U115
+10U116
+10U117
+10U118
+10U119
+10U120
+10P121
+10P122
 10P122T
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set101-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set101-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/set101-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set101-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set11-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set11-rarity.txt
similarity index 86%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/set11-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set11-rarity.txt
index fc6fa7cdf..1a989d5f3 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/set11-rarity.txt
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set11-rarity.txt
@@ -1,272 +1,272 @@
-11R1
-11R1T
-11S2
-11U3
-11C4
-11C5
-11U6
-11C7
-11U8
-11R9
-11R10
-11R11
-11U12
-11C13
-11R14
-11U15
-11U16
-11R17
-11S18
-11C19
-11S20
-11S21
-11R22
-11R23
-11R24
-11U25
-11U26
-11C27
-11U28
-11U29
-11R30
-11C31
-11S32
-11S33
-11S33T
-11R34
-11R35
-11C36
-11U37
-11U38
-11C39
-11U40
-11U41
-11R42
-11R43
-11R44
-11U45
-11C46
-11U47
-11R48
-11U49
-11R50
-11R51
-11U52
-11S53
-11R54
-11R54T
-11U55
-11S56
-11R57
-11R57T
-11U58
-11U59
-11R60
-11U61
-11C62
-11C63
-11S64
-11S65
-11R66
-11U67
-11R68
-11U69
-11R70
-11C71
-11C72
-11C73
-11U74
-11R75
-11C76
-11S77
-11R78
-11C79
-11U80
-11R81
-11S82
-11C83
-11S84
-11C85
-11C86
-11U87
-11C88
-11C89
-11S90
-11R91
-11S92
-11C93
-11C94
-11S95
-11R96
-11S97
-11C98
-11U99
-11R100
-11C101
-11C102
-11C103
-11U104
-11U105
-11U106
-11C107
-11R108
-11U109
-11U110
-11C111
-11S112
-11C113
-11U114
-11S115
-11S116
-11S117
-11U118
-11R119
-11C120
-11C121
-11C122
-11R123
-11R123T
-11U124
-11C125
-11S126
-11C127
-11C128
-11C129
-11S130
-11C131
-11C132
-11R133
-11R134
-11R135
-11C136
-11U137
-11S138
-11U139
-11C140
-11R141
-11S142
-11R143
-11U144
-11U145
-11S146
-11R147
-11C148
-11U149
-11S150
-11U151
-11S152
-11S153
-11R154
-11C155
-11U156
-11C157
-11R158
-11U159
-11S160
-11S161
-11C162
-11U163
-11S164
-11R165
-11S166
-11C167
-11C168
-11C169
-11R170
-11R171
-11U172
-11R173
-11S174
-11U175
-11S176
-11R177
-11S178
-11R179
-11S180
-11R181
-11U182
-11S183
-11R184
-11U185
-11R186
-11S187
-11S188
-11U189
-11S190
-11U191
-11C192
-11S193
-11R194
-11C195
-11C196
-11U197
-11C198
-11C199
-11C200
-11C201
-11C202
-11C203
-11C204
-11R205
-11C206
-11R207
-11U208
-11S209
-11U210
-11R211
-11U212
-11S213
-11R214
-11S215
-11R216
-11R217
-11U218
-11R219
-11S220
-11S221
-11S222
-11S223
-11R224
-11S225
-11R226
-11R226T
-11U227
-11S228
-11S229
-11S230
-11S231
-11S232
-11S233
-11S234
-11U235
-11S236
-11S237
-11S238
-11S239
-11S240
-11S241
-11S242
-11S243
-11U244
-11S245
-11U246
-11S247
-11S248
-11S249
-11S250
-11S251
-11S252
-11S253
-11S254
-11S255
-11S256
-11S257
-11S258
-11S259
-11S260
-11S261
-11S262
-11S263
-11S264
-11S265
+11R1
+11R1T
+11S2
+11U3
+11C4
+11C5
+11U6
+11C7
+11U8
+11R9
+11R10
+11R11
+11U12
+11C13
+11R14
+11U15
+11U16
+11R17
+11S18
+11C19
+11S20
+11S21
+11R22
+11R23
+11R24
+11U25
+11U26
+11C27
+11U28
+11U29
+11R30
+11C31
+11S32
+11S33
+11S33T
+11R34
+11R35
+11C36
+11U37
+11U38
+11C39
+11U40
+11U41
+11R42
+11R43
+11R44
+11U45
+11C46
+11U47
+11R48
+11U49
+11R50
+11R51
+11U52
+11S53
+11R54
+11R54T
+11U55
+11S56
+11R57
+11R57T
+11U58
+11U59
+11R60
+11U61
+11C62
+11C63
+11S64
+11S65
+11R66
+11U67
+11R68
+11U69
+11R70
+11C71
+11C72
+11C73
+11U74
+11R75
+11C76
+11S77
+11R78
+11C79
+11U80
+11R81
+11S82
+11C83
+11S84
+11C85
+11C86
+11U87
+11C88
+11C89
+11S90
+11R91
+11S92
+11C93
+11C94
+11S95
+11R96
+11S97
+11C98
+11U99
+11R100
+11C101
+11C102
+11C103
+11U104
+11U105
+11U106
+11C107
+11R108
+11U109
+11U110
+11C111
+11S112
+11C113
+11U114
+11S115
+11S116
+11S117
+11U118
+11R119
+11C120
+11C121
+11C122
+11R123
+11R123T
+11U124
+11C125
+11S126
+11C127
+11C128
+11C129
+11S130
+11C131
+11C132
+11R133
+11R134
+11R135
+11C136
+11U137
+11S138
+11U139
+11C140
+11R141
+11S142
+11R143
+11U144
+11U145
+11S146
+11R147
+11C148
+11U149
+11S150
+11U151
+11S152
+11S153
+11R154
+11C155
+11U156
+11C157
+11R158
+11U159
+11S160
+11S161
+11C162
+11U163
+11S164
+11R165
+11S166
+11C167
+11C168
+11C169
+11R170
+11R171
+11U172
+11R173
+11S174
+11U175
+11S176
+11R177
+11S178
+11R179
+11S180
+11R181
+11U182
+11S183
+11R184
+11U185
+11R186
+11S187
+11S188
+11U189
+11S190
+11U191
+11C192
+11S193
+11R194
+11C195
+11C196
+11U197
+11C198
+11C199
+11C200
+11C201
+11C202
+11C203
+11C204
+11R205
+11C206
+11R207
+11U208
+11S209
+11U210
+11R211
+11U212
+11S213
+11R214
+11S215
+11R216
+11R217
+11U218
+11R219
+11S220
+11S221
+11S222
+11S223
+11R224
+11S225
+11R226
+11R226T
+11U227
+11S228
+11S229
+11S230
+11S231
+11S232
+11S233
+11S234
+11U235
+11S236
+11S237
+11S238
+11S239
+11S240
+11S241
+11S242
+11S243
+11U244
+11S245
+11U246
+11S247
+11S248
+11S249
+11S250
+11S251
+11S252
+11S253
+11S254
+11S255
+11S256
+11S257
+11S258
+11S259
+11S260
+11S261
+11S262
+11S263
+11S264
+11S265
 11S266
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set12-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set12-rarity.txt
similarity index 86%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/set12-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set12-rarity.txt
index 778c5f481..b53c77e46 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/set12-rarity.txt
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set12-rarity.txt
@@ -1,209 +1,209 @@
-12U1
-12U2
-12U3
-12C4
-12U5
-12C6
-12C7
-12C8
-12R9
-12R10
-12U11
-12U12
-12U13
-12U14
-12U15
-12C16
-12R17
-12R17T
-12R18
-12R19
-12C20
-12U21
-12C22
-12U23
-12U24
-12U25
-12R26
-12R27
-12R28
-12U29
-12R30
-12C31
-12C32
-12C33
-12C34
-12R35
-12R35T
-12U36
-12R37
-12R38
-12U39
-12C40
-12U41
-12R42
-12U43
-12C44
-12C45
-12C46
-12R47
-12R48
-12U49
-12U50
-12U51
-12C52
-12C53
-12R54
-12R54T
-12S55
-12R56
-12R57
-12U58
-12C59
-12C60
-12C61
-12U62
-12U63
-12C64
-12S65
-12U66
-12C67
-12R68
-12R69
-12C70
-12U71
-12R72
-12S73
-12S73T
-12R74
-12R75
-12U76
-12C77
-12C78
-12R79
-12U79T
-12R80
-12R81
-12R82
-12R83
-12C84
-12R85
-12R86
-12C87
-12C88
-12U89
-12U90
-12R91
-12C92
-12C93
-12U94
-12C95
-12C96
-12U97
-12C98
-12U99
-12R100
-12R101
-12C102
-12U103
-12U104
-12R105
-12C106
-12C107
-12R108
-12C109
-12C110
-12R111
-12U112
-12S113
-12C114
-12C115
-12R116
-12U117
-12R118
-12R119
-12R120
-12C121
-12C122
-12C123
-12R124
-12S125
-12S126
-12R127
-12R128
-12R129
-12U130
-12U131
-12U132
-12S133
-12C134
-12U135
-12U136
-12C137
-12U138
-12R139
-12U140
-12R141
-12C142
-12C143
-12S144
-12C145
-12C146
-12U147
-12U148
-12C149
-12R150
-12S151
-12S152
-12C153
-12R154
-12R155
-12R156
-12R157
-12U158
-12C159
-12C160
-12U161
-12R162
-12R163
-12C164
-12U165
-12U166
-12U167
-12C168
-12R169
-12U170
-12R171
-12C172
-12R173
-12R174
-12R174T
-12R175
-12U176
-12C177
-12C178
-12R179
-12U180
-12C181
-12C182
-12R183
-12U184
-12U185
-12U186
-12S187
-12S188
-12S189
-12S190
-12U191
-12U192
-12U193
-12U194
-12A195
-12A196
-12A197
-12A198
-12A199
-12A200
-12A201
-12A202
+12U1
+12U2
+12U3
+12C4
+12U5
+12C6
+12C7
+12C8
+12R9
+12R10
+12U11
+12U12
+12U13
+12U14
+12U15
+12C16
+12R17
+12R17T
+12R18
+12R19
+12C20
+12U21
+12C22
+12U23
+12U24
+12U25
+12R26
+12R27
+12R28
+12U29
+12R30
+12C31
+12C32
+12C33
+12C34
+12R35
+12R35T
+12U36
+12R37
+12R38
+12U39
+12C40
+12U41
+12R42
+12U43
+12C44
+12C45
+12C46
+12R47
+12R48
+12U49
+12U50
+12U51
+12C52
+12C53
+12R54
+12R54T
+12S55
+12R56
+12R57
+12U58
+12C59
+12C60
+12C61
+12U62
+12U63
+12C64
+12S65
+12U66
+12C67
+12R68
+12R69
+12C70
+12U71
+12R72
+12S73
+12S73T
+12R74
+12R75
+12U76
+12C77
+12C78
+12R79
+12U79T
+12R80
+12R81
+12R82
+12R83
+12C84
+12R85
+12R86
+12C87
+12C88
+12U89
+12U90
+12R91
+12C92
+12C93
+12U94
+12C95
+12C96
+12U97
+12C98
+12U99
+12R100
+12R101
+12C102
+12U103
+12U104
+12R105
+12C106
+12C107
+12R108
+12C109
+12C110
+12R111
+12U112
+12S113
+12C114
+12C115
+12R116
+12U117
+12R118
+12R119
+12R120
+12C121
+12C122
+12C123
+12R124
+12S125
+12S126
+12R127
+12R128
+12R129
+12U130
+12U131
+12U132
+12S133
+12C134
+12U135
+12U136
+12C137
+12U138
+12R139
+12U140
+12R141
+12C142
+12C143
+12S144
+12C145
+12C146
+12U147
+12U148
+12C149
+12R150
+12S151
+12S152
+12C153
+12R154
+12R155
+12R156
+12R157
+12U158
+12C159
+12C160
+12U161
+12R162
+12R163
+12C164
+12U165
+12U166
+12U167
+12C168
+12R169
+12U170
+12R171
+12C172
+12R173
+12R174
+12R174T
+12R175
+12U176
+12C177
+12C178
+12R179
+12U180
+12C181
+12C182
+12R183
+12U184
+12U185
+12U186
+12S187
+12S188
+12S189
+12S190
+12U191
+12U192
+12U193
+12U194
+12A195
+12A196
+12A197
+12A198
+12A199
+12A200
+12A201
+12A202
 12A203
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set13-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set13-rarity.txt
similarity index 86%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/set13-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set13-rarity.txt
index dddf68bc7..8d2a8d57b 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/set13-rarity.txt
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set13-rarity.txt
@@ -1,209 +1,209 @@
-13R1
-13C2
-13U3
-13U4
-13R5
-13R5T
-13C6
-13C7
-13R8
-13S9
-13R10
-13R11
-13C12
-13C13
-13C14
-13R15
-13C16
-13U17
-13R18
-13U19
-13S20
-13C21
-13R22
-13C23
-13C24
-13C25
-13R26
-13U27
-13U28
-13C29
-13C30
-13U31
-13C32
-13R33
-13U34
-13C35
-13R36
-13R37
-13R38
-13C39
-13R40
-13C41
-13R42
-13U43
-13R44
-13U45
-13R46
-13R46T
-13C47
-13R48
-13R49
-13U50
-13C51
-13U52
-13U53
-13C54
-13U55
-13U56
-13R57
-13R58
-13R59
-13U60
-13U61
-13S62
-13R63
-13R64
-13R65
-13C66
-13U67
-13C68
-13C69
-13U70
-13U71
-13U72
-13C73
-13S74
-13U75
-13R76
-13C77
-13R78
-13U79
-13R80
-13R81
-13C82
-13C83
-13R84
-13S85
-13R86
-13C87
-13U88
-13U89
-13C90
-13U91
-13U92
-13R93
-13U94
-13U95
-13C96
-13C97
-13U98
-13S99
-13S100
-13R101
-13C102
-13U103
-13R104
-13U105
-13U106
-13C107
-13R108
-13S109
-13U110
-13C111
-13R112
-13R112T
-13C113
-13S114
-13R115
-13C116
-13R117
-13S118
-13C119
-13C120
-13C121
-13U122
-13R123
-13U124
-13C125
-13R126
-13C127
-13U128
-13C129
-13U130
-13U131
-13C132
-13C133
-13C134
-13U135
-13R136
-13R137
-13R137T
-13R138
-13R139
-13R140
-13R141
-13R142
-13R143
-13U144
-13C145
-13U146
-13C147
-13U148
-13R149
-13U150
-13U151
-13R152
-13R153
-13U154
-13R155
-13R156
-13R156T
-13C157
-13R158
-13C159
-13C160
-13C161
-13C162
-13C163
-13C164
-13U165
-13U166
-13U167
-13C168
-13R169
-13U170
-13R171
-13C172
-13C173
-13R174
-13R174T
-13C175
-13C176
-13U177
-13R178
-13U179
-13R180
-13U181
-13R182
-13U183
-13C184
-13U185
-13S186
-13U187
-13U188
-13S189
-13U190
-13S191
-13S192
-13U193
-13U194
-13A195
-13A196
-13A197
-13A198
-13A199
-13A200
-13A201
-13A202
+13R1
+13C2
+13U3
+13U4
+13R5
+13R5T
+13C6
+13C7
+13R8
+13S9
+13R10
+13R11
+13C12
+13C13
+13C14
+13R15
+13C16
+13U17
+13R18
+13U19
+13S20
+13C21
+13R22
+13C23
+13C24
+13C25
+13R26
+13U27
+13U28
+13C29
+13C30
+13U31
+13C32
+13R33
+13U34
+13C35
+13R36
+13R37
+13R38
+13C39
+13R40
+13C41
+13R42
+13U43
+13R44
+13U45
+13R46
+13R46T
+13C47
+13R48
+13R49
+13U50
+13C51
+13U52
+13U53
+13C54
+13U55
+13U56
+13R57
+13R58
+13R59
+13U60
+13U61
+13S62
+13R63
+13R64
+13R65
+13C66
+13U67
+13C68
+13C69
+13U70
+13U71
+13U72
+13C73
+13S74
+13U75
+13R76
+13C77
+13R78
+13U79
+13R80
+13R81
+13C82
+13C83
+13R84
+13S85
+13R86
+13C87
+13U88
+13U89
+13C90
+13U91
+13U92
+13R93
+13U94
+13U95
+13C96
+13C97
+13U98
+13S99
+13S100
+13R101
+13C102
+13U103
+13R104
+13U105
+13U106
+13C107
+13R108
+13S109
+13U110
+13C111
+13R112
+13R112T
+13C113
+13S114
+13R115
+13C116
+13R117
+13S118
+13C119
+13C120
+13C121
+13U122
+13R123
+13U124
+13C125
+13R126
+13C127
+13U128
+13C129
+13U130
+13U131
+13C132
+13C133
+13C134
+13U135
+13R136
+13R137
+13R137T
+13R138
+13R139
+13R140
+13R141
+13R142
+13R143
+13U144
+13C145
+13U146
+13C147
+13U148
+13R149
+13U150
+13U151
+13R152
+13R153
+13U154
+13R155
+13R156
+13R156T
+13C157
+13R158
+13C159
+13C160
+13C161
+13C162
+13C163
+13C164
+13U165
+13U166
+13U167
+13C168
+13R169
+13U170
+13R171
+13C172
+13C173
+13R174
+13R174T
+13C175
+13C176
+13U177
+13R178
+13U179
+13R180
+13U181
+13R182
+13U183
+13C184
+13U185
+13S186
+13U187
+13U188
+13S189
+13U190
+13S191
+13S192
+13U193
+13U194
+13A195
+13A196
+13A197
+13A198
+13A199
+13A200
+13A201
+13A202
 13A203
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set14-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set14-rarity.txt
similarity index 85%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/set14-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set14-rarity.txt
index 0f1b31297..028f466c8 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/set14-rarity.txt
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set14-rarity.txt
@@ -1,15 +1,15 @@
-14R1
-14R2
-14R3
-14R4
-14R5
-14R6
-14R7
-14R8
-14R9
-14R10
-14R11
-14R12
-14R13
-14R14
+14R1
+14R2
+14R3
+14R4
+14R5
+14R6
+14R7
+14R8
+14R9
+14R10
+14R11
+14R12
+14R13
+14R14
 14R15
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set15-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set15-rarity.txt
similarity index 86%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/set15-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set15-rarity.txt
index a80bb6c47..ba0dd5aa7 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/set15-rarity.txt
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set15-rarity.txt
@@ -1,206 +1,206 @@
-15R1
-15S2
-15U3
-15U4
-15C5
-15R6
-15U7
-15C8
-15R9
-15C10
-15R11
-15R12
-15C13
-15C14
-15C15
-15U16
-15U17
-15S18
-15R19
-15U20
-15U21
-15R22
-15C23
-15R24
-15C25
-15U26
-15U27
-15C28
-15R29
-15R30
-15U31
-15U32
-15R33
-15R34
-15U35
-15R36
-15U37
-15R38
-15U39
-15R40
-15U41
-15R42
-15R43
-15U44
-15C45
-15C46
-15R47
-15C48
-15R49
-15U50
-15U51
-15U52
-15R53
-15S54
-15R55
-15R56
-15U57
-15R58
-15C59
-15U61
-15C62
-15U63
-15R64
-15C65
-15U66
-15U67
-15C68
-15C69
-15R70
-15C71
-15R72
-15C73
-15R74
-15C75
-15R76
-15C77
-15U78
-15U79
-15C80
-15U81
-15C82
-15C83
-15R84
-15U85
-15R86
-15R87
-15U88
-15U89
-15U90
-15C91
-15U92
-15C93
-15U94
-15S95
-15S96
-15C97
-15U98
-15R99
-15C100
-15C101
-15U102
-15C103
-15R104
-15C105
-15U106
-15C107
-15C108
-15R109
-15C110
-15U111
-15R112
-15U113
-15U114
-15U115
-15C116
-15R117
-15U118
-15R119
-15C120
-15C121
-15R122
-15R123
-15R124
-15C125
-15S126
-15C127
-15U128
-15U129
-15C130
-15C131
-15U132
-15C133
-15U134
-15R135
-15C136
-15U137
-15S138
-15U139
-15U140
-15R141
-15U142
-15C143
-15C144
-15C145
-15R146
-15C147
-15R148
-15C149
-15C150
-15C151
-15R152
-15U153
-15R154
-15R155
-15C156
-15C157
-15C158
-15U159
-15U160
-15C161
-15R162
-15R163
-15S164
-15R165
-15U166
-15C167
-15U168
-15C169
-15R170
-15S171
-15R172
-15R173
-15R174
-15U175
-15C176
-15U177
-15C178
-15C179
-15R180
-15U181
-15R182
-15U183
-15R184
-15R185
-15R186
-15U187
-15S188
-15S189
-15S190
-15S191
-15U192
-15R193
-15S194
-15A195
-15A196
-15A197
-15A198
-15A199
-15A200
-15A201
-15A202
-15A203
-15C204
-15C205
-15C206
-15A207
+15R1
+15S2
+15U3
+15U4
+15C5
+15R6
+15U7
+15C8
+15R9
+15C10
+15R11
+15R12
+15C13
+15C14
+15C15
+15U16
+15U17
+15S18
+15R19
+15U20
+15U21
+15R22
+15C23
+15R24
+15C25
+15U26
+15U27
+15C28
+15R29
+15R30
+15U31
+15U32
+15R33
+15R34
+15U35
+15R36
+15U37
+15R38
+15U39
+15R40
+15U41
+15R42
+15R43
+15U44
+15C45
+15C46
+15R47
+15C48
+15R49
+15U50
+15U51
+15U52
+15R53
+15S54
+15R55
+15R56
+15U57
+15R58
+15C59
+15U61
+15C62
+15U63
+15R64
+15C65
+15U66
+15U67
+15C68
+15C69
+15R70
+15C71
+15R72
+15C73
+15R74
+15C75
+15R76
+15C77
+15U78
+15U79
+15C80
+15U81
+15C82
+15C83
+15R84
+15U85
+15R86
+15R87
+15U88
+15U89
+15U90
+15C91
+15U92
+15C93
+15U94
+15S95
+15S96
+15C97
+15U98
+15R99
+15C100
+15C101
+15U102
+15C103
+15R104
+15C105
+15U106
+15C107
+15C108
+15R109
+15C110
+15U111
+15R112
+15U113
+15U114
+15U115
+15C116
+15R117
+15U118
+15R119
+15C120
+15C121
+15R122
+15R123
+15R124
+15C125
+15S126
+15C127
+15U128
+15U129
+15C130
+15C131
+15U132
+15C133
+15U134
+15R135
+15C136
+15U137
+15S138
+15U139
+15U140
+15R141
+15U142
+15C143
+15C144
+15C145
+15R146
+15C147
+15R148
+15C149
+15C150
+15C151
+15R152
+15U153
+15R154
+15R155
+15C156
+15C157
+15C158
+15U159
+15U160
+15C161
+15R162
+15R163
+15S164
+15R165
+15U166
+15C167
+15U168
+15C169
+15R170
+15S171
+15R172
+15R173
+15R174
+15U175
+15C176
+15U177
+15C178
+15C179
+15R180
+15U181
+15R182
+15U183
+15R184
+15R185
+15R186
+15U187
+15S188
+15S189
+15S190
+15S191
+15U192
+15R193
+15S194
+15A195
+15A196
+15A197
+15A198
+15A199
+15A200
+15A201
+15A202
+15A203
+15C204
+15C205
+15C206
+15A207
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set151-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set151-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/set151-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set151-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set16-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set16-rarity.txt
similarity index 85%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/set16-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set16-rarity.txt
index fb82db52d..0e25a7bf2 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/set16-rarity.txt
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set16-rarity.txt
@@ -1,6 +1,6 @@
-16R1
-16R2
-16R3
-16R4
-16R5
+16R1
+16R2
+16R3
+16R4
+16R5
 16R6
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set17-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set17-rarity.txt
similarity index 86%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/set17-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set17-rarity.txt
index 52c7091c1..f2119b36a 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/set17-rarity.txt
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set17-rarity.txt
@@ -1,157 +1,157 @@
-17U1
-17R2
-17U3
-17R4
-17U5
-17R6
-17S7
-17U8
-17U9
-17U10
-17S11
-17S12
-17R13
-17U14
-17U15
-17U16
-17R17
-17R18
-17U19
-17R20
-17U21
-17U22
-17R23
-17R24
-17U25
-17U26
-17R27
-17R28
-17R29
-17S30
-17R31
-17U32
-17S33
-17U34
-17S35
-17R36
-17R37
-17R38
-17R39
-17U40
-17R41
-17U42
-17R43
-17R44
-17R45
-17C46
-17C47
-17S48
-17R49
-17U50
-17C51
-17R52
-17C53
-17C54
-17C55
-17R56
-17C57
-17R58
-17C59
-17C60
-17R61
-17C62
-17C63
-17C64
-17R65
-17C66
-17R67
-17C68
-17C69
-17C70
-17R71
-17C72
-17R73
-17R74
-17C75
-17R76
-17C77
-17C78
-17R79
-17C80
-17C81
-17R82
-17C83
-17R84
-17C85
-17R86
-17R87
-17U88
-17R89
-17U90
-17U91
-17C92
-17R93
-17U94
-17R95
-17R96
-17U97
-17R98
-17R99
-17U100
-17U101
-17R102
-17U103
-17U104
-17R105
-17U106
-17U107
-17U108
-17U109
-17U110
-17U111
-17U112
-17C113
-17R114
-17S115
-17R116
-17U117
-17C118
-17C119
-17C120
-17R121
-17C122
-17R123
-17R124
-17C125
-17C126
-17C127
-17C128
-17R129
-17C130
-17C131
-17R132
-17C133
-17C134
-17R135
-17C136
-17R137
-17U138
-17R139
-17R140
-17R141
-17R142
-17R143
-17R144
-17U145
-17U146
-17U147
-17U148
-17A149
-17A150
-17A151
-17A152
-17A153
-17A154
-17A155
-17A156
-17A157
+17U1
+17R2
+17U3
+17R4
+17U5
+17R6
+17S7
+17U8
+17U9
+17U10
+17S11
+17S12
+17R13
+17U14
+17U15
+17U16
+17R17
+17R18
+17U19
+17R20
+17U21
+17U22
+17R23
+17R24
+17U25
+17U26
+17R27
+17R28
+17R29
+17S30
+17R31
+17U32
+17S33
+17U34
+17S35
+17R36
+17R37
+17R38
+17R39
+17U40
+17R41
+17U42
+17R43
+17R44
+17R45
+17C46
+17C47
+17S48
+17R49
+17U50
+17C51
+17R52
+17C53
+17C54
+17C55
+17R56
+17C57
+17R58
+17C59
+17C60
+17R61
+17C62
+17C63
+17C64
+17R65
+17C66
+17R67
+17C68
+17C69
+17C70
+17R71
+17C72
+17R73
+17R74
+17C75
+17R76
+17C77
+17C78
+17R79
+17C80
+17C81
+17R82
+17C83
+17R84
+17C85
+17R86
+17R87
+17U88
+17R89
+17U90
+17U91
+17C92
+17R93
+17U94
+17R95
+17R96
+17U97
+17R98
+17R99
+17U100
+17U101
+17R102
+17U103
+17U104
+17R105
+17U106
+17U107
+17U108
+17U109
+17U110
+17U111
+17U112
+17C113
+17R114
+17S115
+17R116
+17U117
+17C118
+17C119
+17C120
+17R121
+17C122
+17R123
+17R124
+17C125
+17C126
+17C127
+17C128
+17R129
+17C130
+17C131
+17R132
+17C133
+17C134
+17R135
+17C136
+17R137
+17U138
+17R139
+17R140
+17R141
+17R142
+17R143
+17R144
+17U145
+17U146
+17U147
+17U148
+17A149
+17A150
+17A151
+17A152
+17A153
+17A154
+17A155
+17A156
+17A157
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set18-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set18-rarity.txt
similarity index 86%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/set18-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set18-rarity.txt
index 801805e31..7473acc71 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/set18-rarity.txt
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set18-rarity.txt
@@ -1,149 +1,149 @@
-18R1
-18U2
-18C3
-18R4
-18R5
-18R6
-18R7
-18U8
-18C9
-18U10
-18R11
-18R12
-18R13
-18R14
-18R15
-18C16
-18C17
-18R18
-18C19
-18C20
-18U21
-18C22
-18U23
-18R24
-18U25
-18R26
-18U27
-18R28
-18R29
-18U30
-18R31
-18R32
-18U33
-18R34
-18R35
-18C36
-18U37
-18R38
-18C39
-18R40
-18R41
-18R42
-18R43
-18C44
-18U45
-18U46
-18R47
-18R48
-18C49
-18R50
-18C51
-18R52
-18R53
-18R54
-18R55
-18C56
-18C57
-18U58
-18R59
-18U60
-18U61
-18U62
-18U63
-18U64
-18C65
-18R66
-18R67
-18C68
-18R69
-18C70
-18R71
-18C72
-18C73
-18C74
-18U75
-18R76
-18C77
-18U78
-18U79
-18R80
-18R81
-18R82
-18R83
-18C84
-18C85
-18U86
-18C87
-18C88
-18C89
-18C90
-18C91
-18U92
-18U93
-18C94
-18R95
-18R96
-18R97
-18R98
-18R99
-18R100
-18C101
-18R102
-18C103
-18U104
-18R105
-18C106
-18R107
-18U108
-18C109
-18U110
-18U111
-18R112
-18R113
-18R114
-18R115
-18C116
-18C117
-18R118
-18R119
-18U120
-18U121
-18R122
-18U123
-18C124
-18C125
-18R126
-18R127
-18C128
-18C129
-18U130
-18C131
-18U132
-18R133
-18U134
-18U135
-18U136
-18U137
-18U138
-18U139
-18U140
-18A141
-18A142
-18A143
-18A144
-18A145
-18A146
-18A147
-18A148
+18R1
+18U2
+18C3
+18R4
+18R5
+18R6
+18R7
+18U8
+18C9
+18U10
+18R11
+18R12
+18R13
+18R14
+18R15
+18C16
+18C17
+18R18
+18C19
+18C20
+18U21
+18C22
+18U23
+18R24
+18U25
+18R26
+18U27
+18R28
+18R29
+18U30
+18R31
+18R32
+18U33
+18R34
+18R35
+18C36
+18U37
+18R38
+18C39
+18R40
+18R41
+18R42
+18R43
+18C44
+18U45
+18U46
+18R47
+18R48
+18C49
+18R50
+18C51
+18R52
+18R53
+18R54
+18R55
+18C56
+18C57
+18U58
+18R59
+18U60
+18U61
+18U62
+18U63
+18U64
+18C65
+18R66
+18R67
+18C68
+18R69
+18C70
+18R71
+18C72
+18C73
+18C74
+18U75
+18R76
+18C77
+18U78
+18U79
+18R80
+18R81
+18R82
+18R83
+18C84
+18C85
+18U86
+18C87
+18C88
+18C89
+18C90
+18C91
+18U92
+18U93
+18C94
+18R95
+18R96
+18R97
+18R98
+18R99
+18R100
+18C101
+18R102
+18C103
+18U104
+18R105
+18C106
+18R107
+18U108
+18C109
+18U110
+18U111
+18R112
+18R113
+18R114
+18R115
+18C116
+18C117
+18R118
+18R119
+18U120
+18U121
+18R122
+18U123
+18C124
+18C125
+18R126
+18R127
+18C128
+18C129
+18U130
+18C131
+18U132
+18R133
+18U134
+18U135
+18U136
+18U137
+18U138
+18U139
+18U140
+18A141
+18A142
+18A143
+18A144
+18A145
+18A146
+18A147
+18A148
 18A149
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set19-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set19-rarity.txt
similarity index 85%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/set19-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set19-rarity.txt
index 6122bfdf5..ea7582dd8 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/set19-rarity.txt
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set19-rarity.txt
@@ -1,40 +1,40 @@
-19P1
-19P2
-19P3
-19P4
-19P5
-19P6
-19P7
-19P8
-19P9
-19P10
-19P11
-19P12
-19P13
-19P14
-19P15
-19P16
-19P17
-19P18
-19P19
-19P20
-19P21
-19P22
-19P23
-19P24
-19P25
-19P26
-19P27
-19P28
-19P29
-19P30
-19P31
-19P32
-19P33
-19P34
-19P35
-19P36
-19P37
-19P38
-19P39
+19P1
+19P2
+19P3
+19P4
+19P5
+19P6
+19P7
+19P8
+19P9
+19P10
+19P11
+19P12
+19P13
+19P14
+19P15
+19P16
+19P17
+19P18
+19P19
+19P20
+19P21
+19P22
+19P23
+19P24
+19P25
+19P26
+19P27
+19P28
+19P29
+19P30
+19P31
+19P32
+19P33
+19P34
+19P35
+19P36
+19P37
+19P38
+19P39
 19P40
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set2-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set2-rarity.txt
similarity index 83%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/set2-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set2-rarity.txt
index 3fd137933..9564ec1c2 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/set2-rarity.txt
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set2-rarity.txt
@@ -1,125 +1,125 @@
-2R1
-2C2
-2U3
-2U4
-2C5
-2C6
-2R7
-2U8
-2C9
-2C10
-2R11
-2R12
-2U13
-2C14
-2R15
-2U16
-2U17
-2U18
-2R19
-2R20
-2C21
-2R22
-2C23
-2C24
-2R25
-2C26
-2R27
-2U28
-2C29
-2U30
-2U31
-2R32
-2U33
-2U34
-2C35
-2R36
-2C37
-2R38
-2R39
-2C40
-2U41
-2C42
-2R43
-2C44
-2R45
-2R46
-2C47
-2U48
-2R49
-2R50
-2C51
-2R52
-2R52T
-2R53
-2U54
-2C55
-2U56
-2R57
-2C58
-2U59
-2C60
-2C61
-2C62
-2C63
-2C64
-2C65
-2R66
-2U67
-2U68
-2C69
-2U70
-2U71
-2U72
-2R73
-2R74
-2R75
-2U76
-2R77
-2U78
-2U79
-2R80
-2U81
-2U82
-2U83
-2R84
-2R85
-2R86
-2U87
-2C88
-2C89
-2C90
-2C91
-2U92
-2R93
-2R94
-2C95
-2U96
-2R97
-2U98
-2C99
-2R100
-2C101
-2C102
-2C102T
-2U103
-2C104
-2R105
-2R105T
-2U106
-2U107
-2R108
-2R109
-2C110
-2U111
-2R112
-2R113
-2C114
-2U115
-2U116
-2C117
-2U118
-2C119
-2U120
-2P121
+2R1
+2C2
+2U3
+2U4
+2C5
+2C6
+2R7
+2U8
+2C9
+2C10
+2R11
+2R12
+2U13
+2C14
+2R15
+2U16
+2U17
+2U18
+2R19
+2R20
+2C21
+2R22
+2C23
+2C24
+2R25
+2C26
+2R27
+2U28
+2C29
+2U30
+2U31
+2R32
+2U33
+2U34
+2C35
+2R36
+2C37
+2R38
+2R39
+2C40
+2U41
+2C42
+2R43
+2C44
+2R45
+2R46
+2C47
+2U48
+2R49
+2R50
+2C51
+2R52
+2R52T
+2R53
+2U54
+2C55
+2U56
+2R57
+2C58
+2U59
+2C60
+2C61
+2C62
+2C63
+2C64
+2C65
+2R66
+2U67
+2U68
+2C69
+2U70
+2U71
+2U72
+2R73
+2R74
+2R75
+2U76
+2R77
+2U78
+2U79
+2R80
+2U81
+2U82
+2U83
+2R84
+2R85
+2R86
+2U87
+2C88
+2C89
+2C90
+2C91
+2U92
+2R93
+2R94
+2C95
+2U96
+2R97
+2U98
+2C99
+2R100
+2C101
+2C102
+2C102T
+2U103
+2C104
+2R105
+2R105T
+2U106
+2U107
+2R108
+2R109
+2C110
+2U111
+2R112
+2R113
+2C114
+2U115
+2U116
+2C117
+2U118
+2C119
+2U120
+2P121
 2P122
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set3-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set3-rarity.txt
similarity index 83%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/set3-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set3-rarity.txt
index a20eeea5e..940677676 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/set3-rarity.txt
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set3-rarity.txt
@@ -1,122 +1,122 @@
-3R1
-3U2
-3R3
-3U4
-3U5
-3C6
-3U7
-3R8
-3U9
-3U10
-3C11
-3U12
-3R13
-3C14
-3R15
-3C16
-3R17
-3U18
-3R19
-3U20
-3R21
-3C22
-3R23
-3U24
-3U25
-3U26
-3R27
-3C28
-3R29
-3C30
-3C31
-3C32
-3C33
-3R34
-3U35
-3C36
-3C37
-3R38
-3R39
-3R40
-3R41
-3R42
-3C43
-3R44
-3U45
-3U46
-3U47
-3C48
-3C49
-3R50
-3C51
-3R52
-3U53
-3R54
-3C55
-3C56
-3U57
-3U58
-3C59
-3U60
-3U61
-3C62
-3C63
-3R64
-3R65
-3R66
-3R67
-3R68
-3C69
-3C70
-3R71
-3U72
-3U73
-3C74
-3U75
-3C76
-3R77
-3C78
-3U79
-3R80
-3R81
-3U82
-3U83
-3C84
-3R85
-3U86
-3C87
-3U88
-3U89
-3C90
-3R91
-3U92
-3R93
-3C94
-3C95
-3U96
-3U97
-3C98
-3R99
-3U100
-3C101
-3R102
-3R103
-3R104
-3R105
-3U106
-3U107
-3C108
-3C109
-3R110
-3C111
-3C112
-3R113
-3C114
-3U115
-3U116
-3C117
-3C118
-3U119
-3U120
-3P121
+3R1
+3U2
+3R3
+3U4
+3U5
+3C6
+3U7
+3R8
+3U9
+3U10
+3C11
+3U12
+3R13
+3C14
+3R15
+3C16
+3R17
+3U18
+3R19
+3U20
+3R21
+3C22
+3R23
+3U24
+3U25
+3U26
+3R27
+3C28
+3R29
+3C30
+3C31
+3C32
+3C33
+3R34
+3U35
+3C36
+3C37
+3R38
+3R39
+3R40
+3R41
+3R42
+3C43
+3R44
+3U45
+3U46
+3U47
+3C48
+3C49
+3R50
+3C51
+3R52
+3U53
+3R54
+3C55
+3C56
+3U57
+3U58
+3C59
+3U60
+3U61
+3C62
+3C63
+3R64
+3R65
+3R66
+3R67
+3R68
+3C69
+3C70
+3R71
+3U72
+3U73
+3C74
+3U75
+3C76
+3R77
+3C78
+3U79
+3R80
+3R81
+3U82
+3U83
+3C84
+3R85
+3U86
+3C87
+3U88
+3U89
+3C90
+3R91
+3U92
+3R93
+3C94
+3C95
+3U96
+3U97
+3C98
+3R99
+3U100
+3C101
+3R102
+3R103
+3R104
+3R105
+3U106
+3U107
+3C108
+3C109
+3R110
+3C111
+3C112
+3R113
+3C114
+3U115
+3U116
+3C117
+3C118
+3U119
+3U120
+3P121
 3P122
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set30-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set30-rarity.txt
similarity index 85%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/set30-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set30-rarity.txt
index 53c3537a1..b05d13b56 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/set30-rarity.txt
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set30-rarity.txt
@@ -1,66 +1,66 @@
-30C1
-30S2
-30C3
-30C4
-30S5
-30S6
-30S7
-30S8
-30S9
-30S10
-30S11
-30S12
-30C13
-30C14
-30S15
-30S16
-30S17
-30S18
-30S19
-30C20
-30S21
-30S22
-30C23
-30C24
-30S25
-30S26
-30S27
-30S28
-30S29
-30C30
-30C31
-30S32
-30S33
-30S34
-30S35
-30S36
-30S37
-30S38
-30S39
-30S40
-30S41
-30S42
-30S43
-30S44
-30S45
-30S46
-30S47
-30S48
-30S49
-30S50
-30S51
-30S52
-30S53
-30S54
-30S55
-30S56
-30S57
-30R58
-30R59
-30R60
-30R61
-30R62
-30R63
-30R64
-30R65
-30S66
+30C1
+30S2
+30C3
+30C4
+30S5
+30S6
+30S7
+30S8
+30S9
+30S10
+30S11
+30S12
+30C13
+30C14
+30S15
+30S16
+30S17
+30S18
+30S19
+30C20
+30S21
+30S22
+30C23
+30C24
+30S25
+30S26
+30S27
+30S28
+30S29
+30C30
+30C31
+30S32
+30S33
+30S34
+30S35
+30S36
+30S37
+30S38
+30S39
+30S40
+30S41
+30S42
+30S43
+30S44
+30S45
+30S46
+30S47
+30S48
+30S49
+30S50
+30S51
+30S52
+30S53
+30S54
+30S55
+30S56
+30S57
+30R58
+30R59
+30R60
+30R61
+30R62
+30R63
+30R64
+30R65
+30S66
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set31-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set31-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/set31-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set31-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set32-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set32-rarity.txt
similarity index 85%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/set32-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set32-rarity.txt
index 3e7b28237..e7ca34ead 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/set32-rarity.txt
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set32-rarity.txt
@@ -1,67 +1,67 @@
-32R1
-32R2
-32R3
-32X4
-32X5
-32X6
-32X7
-32R8
-32R9
-32X10
-32R11
-32X12
-32R13
-32X14
-32R15
-32X16
-32X17
-32X18
-32R19
-32R20
-32X21
-32X22
-32R23
-32R24
-32X25
-32X26
-32C27
-32C28
-32X29
-32X30
-32U31
-32U32
-32U33
-32U34
-32X35
-32U36
-32C37
-32R38
-32X39
-32U40
-32C41
-32C42
-32C43
-32R44
-32C45
-32X46
-32X47
-32X48
-32X49
-32R50
-32C51
-32C52
-32X53
-32U54
-32R55
-32U56
-32X57
-32U58
-32X59
-32X60
-32X61
-32X62
-32X63
-32X64
-32X65
-32X66
-32X67
+32R1
+32R2
+32R3
+32X4
+32X5
+32X6
+32X7
+32R8
+32R9
+32X10
+32R11
+32X12
+32R13
+32X14
+32R15
+32X16
+32X17
+32X18
+32R19
+32R20
+32X21
+32X22
+32R23
+32R24
+32X25
+32X26
+32C27
+32C28
+32X29
+32X30
+32U31
+32U32
+32U33
+32U34
+32X35
+32U36
+32C37
+32R38
+32X39
+32U40
+32C41
+32C42
+32C43
+32R44
+32C45
+32X46
+32X47
+32X48
+32X49
+32R50
+32C51
+32C52
+32X53
+32U54
+32R55
+32U56
+32X57
+32U58
+32X59
+32X60
+32X61
+32X62
+32X63
+32X64
+32X65
+32X66
+32X67
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set33-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set33-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/set33-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set33-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set4-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set4-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/set4-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set4-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set40-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set40-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/set40-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set40-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set5-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set5-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/set5-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set5-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set6-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set6-rarity.txt
similarity index 100%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/set6-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set6-rarity.txt
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set7-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set7-rarity.txt
similarity index 85%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/set7-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set7-rarity.txt
index 3716c4440..d60f059ae 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/set7-rarity.txt
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set7-rarity.txt
@@ -1,372 +1,372 @@
-7C1
-7R2
-7R2T
-7U3
-7C4
-7R5
-7C6
-7R7
-7U8
-7R9
-7R10
-7C11
-7R12
-7U13
-7U14
-7U15
-7R16
-7R17
-7R18
-7U19
-7C20
-7R21
-7R22
-7C23
-7R24
-7R25
-7C26
-7R27
-7R28
-7C29
-7C30
-7C31
-7R32
-7R33
-7C34
-7U35
-7C36
-7R37
-7R38
-7R39
-7C40
-7C41
-7U42
-7R43
-7R44
-7U45
-7C46
-7U47
-7R48
-7U49
-7R50
-7C51
-7C52
-7C53
-7U54
-7U55
-7R56
-7R57
-7R58
-7C59
-7U60
-7R61
-7C62
-7R63
-7U64
-7C65
-7R66
-7R67
-7R68
-7R69
-7R70
-7R71
-7C72
-7R73
-7R74
-7C75
-7C76
-7U77
-7U78
-7R79
-7R79T
-7R80
-7C81
-7C82
-7C83
-7C84
-7R85
-7C86
-7R87
-7U88
-7C89
-7C90
-7R91
-7C92
-7U93
-7U94
-7R95
-7C96
-7R97
-7U98
-7C99
-7R100
-7R101
-7U102
-7R103
-7R104
-7C105
-7C106
-7U107
-7C108
-7U109
-7U110
-7C111
-7R112
-7R113
-7R114
-7C115
-7C116
-7C117
-7C118
-7R119
-7U120
-7C121
-7R122
-7U123
-7C124
-7U125
-7U126
-7R127
-7U128
-7R129
-7C130
-7C131
-7C132
-7C133
-7U134
-7C135
-7U136
-7C137
-7U138
-7C139
-7C140
-7C141
-7C142
-7R143
-7C144
-7R145
-7U146
-7U147
-7R148
-7C149
-7C150
-7U151
-7R152
-7C153
-7C154
-7C155
-7C156
-7U157
-7R158
-7R159
-7U160
-7C161
-7U162
-7R163
-7R164
-7R165
-7R166
-7R167
-7U168
-7R169
-7R170
-7U171
-7C172
-7C173
-7U174
-7U175
-7U176
-7R177
-7U178
-7R179
-7R180
-7R181
-7R182
-7R183
-7C184
-7U185
-7C186
-7U187
-7R188
-7C189
-7U190
-7R191
-7C192
-7C193
-7C194
-7U195
-7C196
-7R197
-7C198
-7C199
-7C200
-7C201
-7U202
-7U203
-7R204
-7R205
-7R206
-7U207
-7C208
-7C209
-7R210
-7R211
-7R211T
-7U212
-7R213
-7U214
-7R215
-7U216
-7U217
-7U218
-7R219
-7C220
-7R221
-7R221T
-7C222
-7R223
-7U224
-7C225
-7C226
-7R227
-7R227T
-7R228
-7C229
-7R230
-7U231
-7R232
-7R233
-7U234
-7C235
-7R236
-7C237
-7U238
-7R239
-7C240
-7R241
-7R242
-7C243
-7U244
-7U245
-7C246
-7C247
-7C248
-7R249
-7R250
-7R251
-7U252
-7C253
-7U254
-7R255
-7C256
-7C257
-7U258
-7C259
-7R260
-7R261
-7C262
-7C263
-7U264
-7C265
-7R266
-7R267
-7R268
-7R269
-7U270
-7U271
-7U272
-7C273
-7R274
-7C275
-7C276
-7C277
-7U278
-7R279
-7U280
-7U281
-7U282
-7R283
-7R284
-7C285
-7R286
-7C287
-7C288
-7U289
-7C290
-7C291
-7U292
-7U293
-7U294
-7U295
-7C296
-7C297
-7C298
-7C299
-7C300
-7U301
-7U302
-7C303
-7C304
-7U305
-7R306
-7U307
-7R308
-7U309
-7U310
-7R311
-7C312
-7C313
-7R314
-7C315
-7R316
-7C317
-7R318
-7C319
-7C320
-7R321
-7R321T
-7C322
-7C323
-7R324
-7R324T
-7R325
-7C326
-7R327
-7U328
-7U329
-7U330
-7U331
-7U332
-7U333
-7U334
-7U335
-7U336
-7U337
-7U338
-7U339
-7U340
-7U341
-7U342
-7U343
-7U344
-7U345
-7U346
-7U347
-7U348
-7U349
-7U350
-7U351
-7U352
-7U353
-7U354
-7U355
-7U356
-7U357
-7U358
-7U359
-7U360
-7U361
-7U362
-7U363
-7P364
+7C1
+7R2
+7R2T
+7U3
+7C4
+7R5
+7C6
+7R7
+7U8
+7R9
+7R10
+7C11
+7R12
+7U13
+7U14
+7U15
+7R16
+7R17
+7R18
+7U19
+7C20
+7R21
+7R22
+7C23
+7R24
+7R25
+7C26
+7R27
+7R28
+7C29
+7C30
+7C31
+7R32
+7R33
+7C34
+7U35
+7C36
+7R37
+7R38
+7R39
+7C40
+7C41
+7U42
+7R43
+7R44
+7U45
+7C46
+7U47
+7R48
+7U49
+7R50
+7C51
+7C52
+7C53
+7U54
+7U55
+7R56
+7R57
+7R58
+7C59
+7U60
+7R61
+7C62
+7R63
+7U64
+7C65
+7R66
+7R67
+7R68
+7R69
+7R70
+7R71
+7C72
+7R73
+7R74
+7C75
+7C76
+7U77
+7U78
+7R79
+7R79T
+7R80
+7C81
+7C82
+7C83
+7C84
+7R85
+7C86
+7R87
+7U88
+7C89
+7C90
+7R91
+7C92
+7U93
+7U94
+7R95
+7C96
+7R97
+7U98
+7C99
+7R100
+7R101
+7U102
+7R103
+7R104
+7C105
+7C106
+7U107
+7C108
+7U109
+7U110
+7C111
+7R112
+7R113
+7R114
+7C115
+7C116
+7C117
+7C118
+7R119
+7U120
+7C121
+7R122
+7U123
+7C124
+7U125
+7U126
+7R127
+7U128
+7R129
+7C130
+7C131
+7C132
+7C133
+7U134
+7C135
+7U136
+7C137
+7U138
+7C139
+7C140
+7C141
+7C142
+7R143
+7C144
+7R145
+7U146
+7U147
+7R148
+7C149
+7C150
+7U151
+7R152
+7C153
+7C154
+7C155
+7C156
+7U157
+7R158
+7R159
+7U160
+7C161
+7U162
+7R163
+7R164
+7R165
+7R166
+7R167
+7U168
+7R169
+7R170
+7U171
+7C172
+7C173
+7U174
+7U175
+7U176
+7R177
+7U178
+7R179
+7R180
+7R181
+7R182
+7R183
+7C184
+7U185
+7C186
+7U187
+7R188
+7C189
+7U190
+7R191
+7C192
+7C193
+7C194
+7U195
+7C196
+7R197
+7C198
+7C199
+7C200
+7C201
+7U202
+7U203
+7R204
+7R205
+7R206
+7U207
+7C208
+7C209
+7R210
+7R211
+7R211T
+7U212
+7R213
+7U214
+7R215
+7U216
+7U217
+7U218
+7R219
+7C220
+7R221
+7R221T
+7C222
+7R223
+7U224
+7C225
+7C226
+7R227
+7R227T
+7R228
+7C229
+7R230
+7U231
+7R232
+7R233
+7U234
+7C235
+7R236
+7C237
+7U238
+7R239
+7C240
+7R241
+7R242
+7C243
+7U244
+7U245
+7C246
+7C247
+7C248
+7R249
+7R250
+7R251
+7U252
+7C253
+7U254
+7R255
+7C256
+7C257
+7U258
+7C259
+7R260
+7R261
+7C262
+7C263
+7U264
+7C265
+7R266
+7R267
+7R268
+7R269
+7U270
+7U271
+7U272
+7C273
+7R274
+7C275
+7C276
+7C277
+7U278
+7R279
+7U280
+7U281
+7U282
+7R283
+7R284
+7C285
+7R286
+7C287
+7C288
+7U289
+7C290
+7C291
+7U292
+7U293
+7U294
+7U295
+7C296
+7C297
+7C298
+7C299
+7C300
+7U301
+7U302
+7C303
+7C304
+7U305
+7R306
+7U307
+7R308
+7U309
+7U310
+7R311
+7C312
+7C313
+7R314
+7C315
+7R316
+7C317
+7R318
+7C319
+7C320
+7R321
+7R321T
+7C322
+7C323
+7R324
+7R324T
+7R325
+7C326
+7R327
+7U328
+7U329
+7U330
+7U331
+7U332
+7U333
+7U334
+7U335
+7U336
+7U337
+7U338
+7U339
+7U340
+7U341
+7U342
+7U343
+7U344
+7U345
+7U346
+7U347
+7U348
+7U349
+7U350
+7U351
+7U352
+7U353
+7U354
+7U355
+7U356
+7U357
+7U358
+7U359
+7U360
+7U361
+7U362
+7U363
+7P364
 7P365
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set8-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set8-rarity.txt
similarity index 83%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/set8-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set8-rarity.txt
index 855e7172a..c05245f43 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/set8-rarity.txt
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set8-rarity.txt
@@ -1,128 +1,128 @@
-8C1
-8R2
-8R3
-8U4
-8C5
-8C6
-8R7
-8U8
-8U9
-8C10
-8R11
-8R12
-8U13
-8C14
-8R15
-8R15T
-8U16
-8U17
-8U18
-8U19
-8R20
-8R21
-8C22
-8U23
-8R24
-8R25
-8R25T
-8C26
-8R27
-8C28
-8U29
-8C30
-8C31
-8R32
-8R33
-8C34
-8C35
-8R36
-8R37
-8R38
-8R38T
-8C39
-8C40
-8C41
-8U42
-8R43
-8U44
-8U45
-8U46
-8C47
-8C48
-8R49
-8C50
-8R51
-8R51T
-8C52
-8C53
-8C54
-8C55
-8U56
-8R57
-8R57T
-8C58
-8U59
-8U60
-8C61
-8R62
-8C63
-8U64
-8R65
-8C66
-8R67
-8R68
-8U69
-8R70
-8U71
-8R72
-8U73
-8C74
-8C75
-8C76
-8R77
-8U78
-8U79
-8U80
-8R81
-8U82
-8U83
-8R84
-8U85
-8U86
-8C87
-8R88
-8C89
-8C90
-8R91
-8R92
-8R93
-8U94
-8R95
-8R96
-8U97
-8U98
-8U99
-8U100
-8C101
-8C102
-8R103
-8R103T
-8C104
-8R105
-8C106
-8U107
-8R108
-8C109
-8U110
-8C111
-8U112
-8R113
-8C114
-8R115
-8C116
-8U117
-8U118
-8U119
-8U120
-8P121
+8C1
+8R2
+8R3
+8U4
+8C5
+8C6
+8R7
+8U8
+8U9
+8C10
+8R11
+8R12
+8U13
+8C14
+8R15
+8R15T
+8U16
+8U17
+8U18
+8U19
+8R20
+8R21
+8C22
+8U23
+8R24
+8R25
+8R25T
+8C26
+8R27
+8C28
+8U29
+8C30
+8C31
+8R32
+8R33
+8C34
+8C35
+8R36
+8R37
+8R38
+8R38T
+8C39
+8C40
+8C41
+8U42
+8R43
+8U44
+8U45
+8U46
+8C47
+8C48
+8R49
+8C50
+8R51
+8R51T
+8C52
+8C53
+8C54
+8C55
+8U56
+8R57
+8R57T
+8C58
+8U59
+8U60
+8C61
+8R62
+8C63
+8U64
+8R65
+8C66
+8R67
+8R68
+8U69
+8R70
+8U71
+8R72
+8U73
+8C74
+8C75
+8C76
+8R77
+8U78
+8U79
+8U80
+8R81
+8U82
+8U83
+8R84
+8U85
+8U86
+8C87
+8R88
+8C89
+8C90
+8R91
+8R92
+8R93
+8U94
+8R95
+8R96
+8U97
+8U98
+8U99
+8U100
+8C101
+8C102
+8R103
+8R103T
+8C104
+8R105
+8C106
+8U107
+8R108
+8C109
+8U110
+8C111
+8U112
+8R113
+8C114
+8R115
+8C116
+8U117
+8U118
+8U119
+8U120
+8P121
 8P122
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set9-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set9-rarity.txt
similarity index 83%
rename from gemp-lotr/gemp-lotr-cards/src/main/resources/set9-rarity.txt
rename to gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set9-rarity.txt
index ca676204f..582df5b37 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/set9-rarity.txt
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/rarities/set9-rarity.txt
@@ -1,52 +1,52 @@
-9X1
-9X2
-9X3
-9X4
-9R5
-9R6
-9X7
-9R8
-9R9
-9R10
-9R11
-9X12
-9R13
-9X14
-9X15
-9X16
-9X17
-9R18
-9R19
-9R20
-9R21
-9R22
-9R23
-9R24
-9R25
-9X26
-9R27
-9X28
-9X29
-9X30
-9X31
-9X32
-9X33
-9X34
-9R35
-9R36
-9R37
-9R38
-9X39
-9R40
-9X41
-9R42
-9X43
-9R44
-9R45
-9R46
-9X47
-9X48
-9X49
-9R50
-9X51
+9X1
+9X2
+9X3
+9X4
+9R5
+9R6
+9X7
+9R8
+9R9
+9R10
+9R11
+9X12
+9R13
+9X14
+9X15
+9X16
+9X17
+9R18
+9R19
+9R20
+9R21
+9R22
+9R23
+9R24
+9R25
+9X26
+9R27
+9X28
+9X29
+9X30
+9X31
+9X32
+9X33
+9X34
+9R35
+9R36
+9R37
+9R38
+9X39
+9R40
+9X41
+9R42
+9X43
+9R44
+9R45
+9R46
+9X47
+9X48
+9X49
+9R50
+9X51
 9X52
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/sealed/sealed_formats.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/sealed/sealed_formats.hjson
new file mode 100644
index 000000000..a453dc4ad
--- /dev/null
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/sealed/sealed_formats.hjson
@@ -0,0 +1,56 @@
+{
+	fotr_block: {
+		name: Fellowship Block Sealed
+		format: limited_fotr
+		weekly_product: [
+			[
+				{
+					type: Selection
+					name: Movie Starter
+					count: 1
+				}
+				{
+					type: Product
+					item: FotR - Booster
+					count: 6
+				}
+				{
+					//Shotgun Enquea
+					type: Card
+					item: 1_231
+					count: 1
+				}
+			],
+			[
+				{
+					type: Selection
+					item: (S)MoM - Starter
+					count: 1
+				}
+				{
+					type: Product
+					item: MoM - Booster
+					count: 3
+				}
+				{
+					//The Balrog, Durin's Bane
+					type: Card
+					item: 2_51
+					count: 1
+				}
+			]
+			[
+				{
+					type: Selection
+					item: (S)RotEL - Starter
+					count: 1
+				}
+				{
+					type: Product
+					item: RotEL - Booster
+					count: 3
+				}
+			]
+		]
+	}
+}
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/AppConfig.java b/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/AppConfig.java
new file mode 100644
index 000000000..20fb503bc
--- /dev/null
+++ b/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/AppConfig.java
@@ -0,0 +1,74 @@
+package com.gempukku.lotro.common;
+
+import org.apache.log4j.Logger;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.nio.file.Paths;
+import java.util.Properties;
+
+public class AppConfig {
+    private static final Logger LOGGER = Logger.getLogger(AppConfig.class);
+    private static Properties _properties;
+    private static File _root;
+
+    private synchronized static Properties getProperties() {
+        if (_properties == null) {
+            Properties props = new Properties();
+            try {
+                props.load(AppConfig.class.getResourceAsStream("/gemp-lotr.properties"));
+                String gempPropertiesOverride = System.getProperty("gemp-lotr.override");
+                if (gempPropertiesOverride != null)
+                    props.load(AppConfig.class.getResourceAsStream(gempPropertiesOverride));
+                _properties = props;
+            } catch (Exception exp) {
+                LOGGER.error("Can't load application configuration", exp);
+                throw new RuntimeException("Unable to load application configuration", exp);
+            }
+        }
+        return _properties;
+    }
+
+    public static String getProperty(String property) {
+        return getProperties().getProperty(property);
+    }
+
+
+    private static boolean AppInIDE() {
+        String classPath = System.getProperty("java.class.path");
+        return classPath.contains("idea_rt.jar");
+    }
+
+    private static boolean AppInUnitTest() {
+        for (StackTraceElement element : Thread.currentThread().getStackTrace()) {
+            if (element.getClassName().startsWith("org.junit.")) {
+                return true;
+            }
+        }
+        return false;
+    }
+    public static String getResourcePath() throws IOException {
+        if(AppInIDE())
+            return getProperties().getProperty("dev.resources.path");
+
+        if(AppInUnitTest())
+            return getProperties().getProperty("test.resources.path");
+
+        return getProperties().getProperty("resources.path");
+    }
+
+    public static File getResourceFile(String subPath) throws IOException {
+        String path = Paths.get(getResourcePath(), subPath).toString();
+        return new File(path);
+    }
+
+    public static FileInputStream getResourceStream(String subPath) throws IOException {
+        String path = Paths.get(getResourcePath(), subPath).toString();
+        return new FileInputStream(path);
+    }
+
+    public static String getWebPath() { return getProperty("web.path"); }
+
+}
diff --git a/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/ApplicationConfiguration.java b/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/ApplicationConfiguration.java
deleted file mode 100644
index 2f37bfa3c..000000000
--- a/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/ApplicationConfiguration.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.gempukku.lotro.common;
-
-import org.apache.log4j.Logger;
-
-import java.io.File;
-import java.util.Properties;
-
-public class ApplicationConfiguration {
-    private static final Logger LOGGER = Logger.getLogger(ApplicationConfiguration.class);
-    private static Properties _properties;
-    private static File _root;
-
-    private synchronized static Properties getProperties() {
-        if (_properties == null) {
-            Properties props = new Properties();
-            try {
-                props.load(ApplicationConfiguration.class.getResourceAsStream("/gemp-lotr.properties"));
-                String gempPropertiesOverride = System.getProperty("gemp-lotr.override");
-                if (gempPropertiesOverride != null)
-                    props.load(ApplicationConfiguration.class.getResourceAsStream(gempPropertiesOverride));
-                _properties = props;
-            } catch (Exception exp) {
-                LOGGER.error("Can't load application configuration", exp);
-                throw new RuntimeException("Unable to load application configuration", exp);
-            }
-        }
-        return _properties;
-    }
-
-    public static String getProperty(String property) {
-        return getProperties().getProperty(property);
-    }
-}
diff --git a/gemp-lotr/gemp-lotr-common/src/main/resources/gemp-lotr.properties b/gemp-lotr/gemp-lotr-common/src/main/resources/gemp-lotr.properties
index 2ec663464..f0fc1ba76 100644
--- a/gemp-lotr/gemp-lotr-common/src/main/resources/gemp-lotr.properties
+++ b/gemp-lotr/gemp-lotr-common/src/main/resources/gemp-lotr.properties
@@ -11,6 +11,8 @@ db.connection.validateQuery=/* ping */ select 1
 port=80
 websocket.port=8080
 web.path=/etc/gemp-lotr/web/
-card.path=/etc/gemp-lotr/web/cards/
+resources.path=/etc/gemp-lotr/gemp-lotr-cards/src/main/resources/
+dev.resources.path=../gemp-lotr-cards/src/main/resources/
+test.resources.path=../gemp-lotr-cards/src/main/resources/
 
 origin.allowed.pattern=^.*$
diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/CardSets.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/CardSets.java
index 5ee978b0f..031faafde 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/CardSets.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/CardSets.java
@@ -1,5 +1,6 @@
 package com.gempukku.lotro.game;
 
+import com.gempukku.lotro.common.AppConfig;
 import com.gempukku.lotro.game.packs.DefaultSetDefinition;
 import com.gempukku.lotro.game.packs.SetDefinition;
 import org.apache.commons.io.IOUtils;
@@ -11,14 +12,17 @@ import org.json.simple.parser.ParseException;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 
+import static org.apache.log4j.helpers.Loader.getResource;
+
 public class CardSets {
     private final Map<String, SetDefinition> _allSets = new LinkedHashMap<>();
 
     public CardSets() {
         try {
-            final InputStreamReader reader = new InputStreamReader(CardSets.class.getResourceAsStream("/setConfig.json"), "UTF-8");
+            final InputStreamReader reader = new InputStreamReader(AppConfig.getResourceStream("setConfig.json"), StandardCharsets.UTF_8);
             try {
                 JSONParser parser = new JSONParser();
                 JSONArray object = (JSONArray) parser.parse(reader);
@@ -46,7 +50,7 @@ public class CardSets {
         } catch (ParseException e) {
             throw new RuntimeException("Unable to parse setConfig.json file");
         } catch (IOException exp) {
-            throw new RuntimeException("Unable to read card rarities");
+            throw new RuntimeException("Unable to read card rarities: " + exp);
         }
     }
 
@@ -75,7 +79,7 @@ public class CardSets {
     }
 
     private void readSetRarityFile(DefaultSetDefinition rarity, String setNo, String rarityFile) throws IOException {
-        BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(CardSets.class.getResourceAsStream(rarityFile), "UTF-8"));
+        BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(AppConfig.getResourceStream("rarities/" + rarityFile), StandardCharsets.UTF_8));
         try {
             String line;
 
diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprintLibrary.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprintLibrary.java
index 707b38ab7..11ac352fd 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprintLibrary.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprintLibrary.java
@@ -2,6 +2,7 @@ package com.gempukku.lotro.game;
 
 import com.gempukku.lotro.cards.build.InvalidCardDefinitionException;
 import com.gempukku.lotro.cards.build.LotroCardBlueprintBuilder;
+import com.gempukku.lotro.common.AppConfig;
 import com.gempukku.lotro.game.packs.SetDefinition;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.log4j.Logger;
@@ -12,6 +13,7 @@ import org.json.simple.parser.ParseException;
 
 import java.io.*;
 import java.lang.reflect.InvocationTargetException;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.concurrent.CountDownLatch;
 
@@ -37,7 +39,7 @@ public class LotroCardBlueprintLibrary {
 
     public LotroCardBlueprintLibrary() {
         try {
-            try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(LotroCardBlueprintLibrary.class.getResourceAsStream("/blueprintMapping.txt"), "UTF-8"))) {
+            try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(AppConfig.getResourceStream("blueprintMapping.txt"), StandardCharsets.UTF_8))) {
                 String line;
 
                 while ((line = bufferedReader.readLine()) != null) {
@@ -49,7 +51,7 @@ public class LotroCardBlueprintLibrary {
                 }
             }
         } catch (IOException exp) {
-            throw new RuntimeException("Problem loading blueprint mapping", exp);
+            throw new RuntimeException("Problem loading blueprintMapping.txt", exp);
         }
     }
 
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/builder/DaoBuilder.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/builder/DaoBuilder.java
index f4288b314..0ea001a0d 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/builder/DaoBuilder.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/builder/DaoBuilder.java
@@ -5,7 +5,7 @@ import com.gempukku.lotro.collection.CachedCollectionDAO;
 import com.gempukku.lotro.collection.CachedTransferDAO;
 import com.gempukku.lotro.collection.CollectionSerializer;
 import com.gempukku.lotro.collection.TransferDAO;
-import com.gempukku.lotro.common.ApplicationConfiguration;
+import com.gempukku.lotro.common.AppConfig;
 import com.gempukku.lotro.db.*;
 import com.gempukku.lotro.game.CardSets;
 import com.gempukku.lotro.game.LotroCardBlueprintLibrary;
@@ -15,16 +15,17 @@ import com.gempukku.lotro.tournament.TournamentMatchDAO;
 import com.gempukku.lotro.tournament.TournamentPlayerDAO;
 
 import java.io.File;
+import java.io.IOException;
 import java.lang.reflect.Type;
 import java.util.Map;
 
 public class DaoBuilder {
-    public static void fillObjectMap(Map<Type, Object> objectMap) {
+    public static void fillObjectMap(Map<Type, Object> objectMap) throws IOException {
         DbAccess dbAccess = new DbAccess();
         CollectionSerializer collectionSerializer = new CollectionSerializer();
 
         LotroCardBlueprintLibrary library = new LotroCardBlueprintLibrary();
-        library.init(new File(ApplicationConfiguration.getProperty("card.path")), (CardSets) objectMap.get(CardSets.class));
+        library.init(AppConfig.getResourceFile("cards"), (CardSets) objectMap.get(CardSets.class));
         objectMap.put(LotroCardBlueprintLibrary.class, library);
         objectMap.put(LeagueParticipationDAO.class, LoggingProxy.createLoggingProxy(LeagueParticipationDAO.class, new DbLeagueParticipationDAO(dbAccess)));
         objectMap.put(LeagueMatchDAO.class, LoggingProxy.createLoggingProxy(LeagueMatchDAO.class, new DbLeagueMatchDAO(dbAccess)));
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/collection/CollectionSerializer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/collection/CollectionSerializer.java
index e55e515e3..4df27d953 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/collection/CollectionSerializer.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/collection/CollectionSerializer.java
@@ -1,5 +1,6 @@
 package com.gempukku.lotro.collection;
 
+import com.gempukku.lotro.common.AppConfig;
 import com.gempukku.lotro.game.CardCollection;
 import com.gempukku.lotro.game.DefaultCardCollection;
 import com.gempukku.lotro.game.MutableCardCollection;
@@ -8,6 +9,7 @@ import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
 
 import java.io.*;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -110,7 +112,7 @@ public class CollectionSerializer {
     }
 
     private void fillDoubleByteItems() throws IOException {
-        try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(CollectionSerializer.class.getResourceAsStream("/packs.txt"), "UTF-8"))) {
+        try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(AppConfig.getResourceStream("product/packs.txt"), StandardCharsets.UTF_8))) {
             String line;
             while ((line = bufferedReader.readLine()) != null)
                 _doubleByteCountItems.add(line);
@@ -118,7 +120,7 @@ public class CollectionSerializer {
     }
 
     private void loadSet(String setId) throws IOException {
-        try (BufferedReader cardReader = new BufferedReader(new InputStreamReader(CollectionSerializer.class.getResourceAsStream("/set" + setId + "-rarity.txt"), "UTF-8"))) {
+        try (BufferedReader cardReader = new BufferedReader(new InputStreamReader(AppConfig.getResourceStream("rarities/set" + setId + "-rarity.txt"), StandardCharsets.UTF_8))) {
             String line;
 
             while ((line = cardReader.readLine()) != null) {
@@ -186,7 +188,7 @@ public class CollectionSerializer {
         JSONObject json = new JSONObject();
         json.putAll(extraInformation);
 
-        OutputStreamWriter writer = new OutputStreamWriter(outputStream, "UTF-8");
+        OutputStreamWriter writer = new OutputStreamWriter(outputStream, StandardCharsets.UTF_8);
         writer.write(json.toJSONString());
         writer.flush();
     }
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbAccess.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbAccess.java
index 9dcaac5ec..d274e97b7 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbAccess.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbAccess.java
@@ -1,6 +1,6 @@
 package com.gempukku.lotro.db;
 
-import com.gempukku.lotro.common.ApplicationConfiguration;
+import com.gempukku.lotro.common.AppConfig;
 import org.apache.commons.dbcp.ConnectionFactory;
 import org.apache.commons.dbcp.DriverManagerConnectionFactory;
 import org.apache.commons.dbcp.PoolableConnectionFactory;
@@ -14,12 +14,12 @@ public class DbAccess {
 
     public DbAccess() {
         try {
-            Class.forName(ApplicationConfiguration.getProperty("db.connection.class"));
+            Class.forName(AppConfig.getProperty("db.connection.class"));
         } catch (ClassNotFoundException e) {
             throw new RuntimeException("Couldn't find the DB driver", e);
         }
 
-        _dataSource = setupDataSource(ApplicationConfiguration.getProperty("db.connection.url"));
+        _dataSource = setupDataSource(AppConfig.getProperty("db.connection.url"));
     }
 
     public DataSource getDataSource() {
@@ -35,8 +35,8 @@ public class DbAccess {
         // arguments.
         //
         ConnectionFactory connectionFactory =
-                new DriverManagerConnectionFactory(connectURI, ApplicationConfiguration.getProperty("db.connection.username"),
-                        ApplicationConfiguration.getProperty("db.connection.password"));
+                new DriverManagerConnectionFactory(connectURI, AppConfig.getProperty("db.connection.username"),
+                        AppConfig.getProperty("db.connection.password"));
 
         //
         // Now we'll need a ObjectPool that serves as the
@@ -55,7 +55,7 @@ public class DbAccess {
         // the classes that implement the pooling functionality.
         //
         PoolableConnectionFactory poolableConnectionFactory =
-                new PoolableConnectionFactory(connectionFactory, connectionPool, null, ApplicationConfiguration.getProperty("db.connection.validateQuery"), false, true);
+                new PoolableConnectionFactory(connectionFactory, connectionPool, null, AppConfig.getProperty("db.connection.validateQuery"), false, true);
 
         connectionPool.setFactory(poolableConnectionFactory);
 
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft2/SoloDraftDefinitions.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft2/SoloDraftDefinitions.java
index cee82a561..ecbc9de4e 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft2/SoloDraftDefinitions.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft2/SoloDraftDefinitions.java
@@ -1,6 +1,7 @@
 package com.gempukku.lotro.draft2;
 
 import com.gempukku.lotro.collection.CollectionsManager;
+import com.gempukku.lotro.common.AppConfig;
 import com.gempukku.lotro.draft2.builder.CardCollectionProducer;
 import com.gempukku.lotro.draft2.builder.DraftChoiceBuilder;
 import com.gempukku.lotro.draft2.builder.DraftPoolBuilder;
@@ -17,6 +18,7 @@ import org.json.simple.parser.ParseException;
 
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 
 public class SoloDraftDefinitions {
@@ -30,7 +32,7 @@ public class SoloDraftDefinitions {
                                 LotroFormatLibrary formatLibrary, Map<String, SetDefinition> rarities) {
         draftChoiceBuilder = new DraftChoiceBuilder(collectionsManager, cardLibrary, formatLibrary, rarities);
         try {
-            final InputStreamReader reader = new InputStreamReader(LotroFormatLibrary.class.getResourceAsStream("/lotrDrafts.json"), "UTF-8");
+            final InputStreamReader reader = new InputStreamReader(AppConfig.getResourceStream("lotrDrafts.json"), StandardCharsets.UTF_8);
             try {
                 JSONParser parser = new JSONParser();
                 JSONArray object = (JSONArray) parser.parse(reader);
@@ -49,7 +51,7 @@ public class SoloDraftDefinitions {
 
     private SoloDraft loadDraft(String file) {
         try {
-            final InputStreamReader reader = new InputStreamReader(LotroFormatLibrary.class.getResourceAsStream(file), "UTF-8");
+            final InputStreamReader reader = new InputStreamReader(LotroFormatLibrary.class.getResourceAsStream(file), StandardCharsets.UTF_8);
             try {
                 JSONParser parser = new JSONParser();
                 JSONObject object = (JSONObject) parser.parse(reader);
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/GameRecorder.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/GameRecorder.java
index a89f67761..24c0ac297 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/GameRecorder.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/GameRecorder.java
@@ -1,6 +1,6 @@
 package com.gempukku.lotro.game;
 
-import com.gempukku.lotro.common.ApplicationConfiguration;
+import com.gempukku.lotro.common.AppConfig;
 import com.gempukku.lotro.game.state.EventSerializer;
 import com.gempukku.lotro.game.state.GameCommunicationChannel;
 import com.gempukku.lotro.game.state.GameEvent;
@@ -79,7 +79,7 @@ public class GameRecorder {
     }
 
     private File getRecordingFile(String playerId, String gameId) {
-        File gameReplayFolder = new File(ApplicationConfiguration.getProperty("application.root"), "replay");
+        File gameReplayFolder = new File(AppConfig.getProperty("application.root"), "replay");
         File playerReplayFolder = new File(gameReplayFolder, playerId);
         return new File(playerReplayFolder, gameId + ".xml.gz");
     }
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/LotroFormatLibrary.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/LotroFormatLibrary.java
index e7a7083eb..395059452 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/LotroFormatLibrary.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/LotroFormatLibrary.java
@@ -1,5 +1,6 @@
 package com.gempukku.lotro.game.formats;
 
+import com.gempukku.lotro.common.AppConfig;
 import com.gempukku.lotro.game.AdventureLibrary;
 import com.gempukku.lotro.game.LotroCardBlueprintLibrary;
 import com.gempukku.lotro.game.LotroFormat;
@@ -7,6 +8,7 @@ import com.alibaba.fastjson.JSON;
 import org.sql2o.tools.IOUtils;
 
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 
 public class LotroFormatLibrary {
@@ -54,7 +56,7 @@ public class LotroFormatLibrary {
 
     public LotroFormatLibrary(AdventureLibrary adventureLibrary, LotroCardBlueprintLibrary bpLibrary) {
         try {
-            try (InputStreamReader reader = new InputStreamReader(LotroFormatLibrary.class.getResourceAsStream("/lotrFormats.json"), "UTF-8")) {
+            try (InputStreamReader reader = new InputStreamReader(AppConfig.getResourceStream("lotrFormats.json"), StandardCharsets.UTF_8)) {
                 String json = IOUtils.toString(reader);
 
                 FormatDefinition[] formatDefs = JSON.parseObject(json, FormatDefinition[].class);
diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/AbstractAtTest.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/AbstractAtTest.java
index b6af39204..68759b2b8 100644
--- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/AbstractAtTest.java
+++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/AbstractAtTest.java
@@ -1,5 +1,6 @@
 package com.gempukku.lotro.at;
 
+import com.gempukku.lotro.common.AppConfig;
 import com.gempukku.lotro.common.Zone;
 import com.gempukku.lotro.game.*;
 import com.gempukku.lotro.game.formats.LotroFormatLibrary;
@@ -13,6 +14,7 @@ import com.gempukku.lotro.logic.timing.Effect;
 import com.gempukku.lotro.logic.vo.LotroDeck;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.*;
 
 import static org.junit.Assert.fail;
@@ -26,7 +28,12 @@ public abstract class AbstractAtTest {
         final String property = System.getProperty("user.dir");
         String projectRoot = new File(property).getParentFile().getAbsolutePath();
 
-        _library.init(new File(projectRoot + "/gemp-lotr-async/src/main/web/cards"), new CardSets());
+        //_library.init(new File(projectRoot + "/gemp-lotr-cards/src/main/resources/cards"), new CardSets());
+        try {
+            _library.init(AppConfig.getResourceFile("cards"), new CardSets());
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     protected DefaultLotroGame _game;