From 95d104627305f6a23dfbe0be96bf76b2de6831e8 Mon Sep 17 00:00:00 2001
From: Roman Krejcik <farin@farin.cz>
Date: Sat, 15 May 2021 15:43:19 +0200
Subject: [PATCH] keep tile definitions only at client side, use %load
 directive to point them

---
 .../jcloisterzone/board/TilePackBuilder.java  |  37 +--
 .../java/com/jcloisterzone/engine/Engine.java |  40 ++-
 .../game/state/GameStateBuilder.java          |   6 +-
 .../tile-definitions/abbey_and_mayor.xml      | 134 --------
 src/main/resources/tile-definitions/basic.xml | 261 ----------------
 .../bridges_castles_and_bazaars.xml           | 119 --------
 .../tile-definitions/corn_circles.xml         | 106 -------
 src/main/resources/tile-definitions/count.xml |  83 -----
 src/main/resources/tile-definitions/cult.xml  |  71 -----
 .../resources/tile-definitions/darmstadt.xml  |  41 ---
 .../tile-definitions/fan/wishing_wells.xml    | 126 --------
 .../resources/tile-definitions/ferries.xml    |  42 ---
 .../resources/tile-definitions/festival.xml   | 108 -------
 src/main/resources/tile-definitions/flier.xml |  74 -----
 .../resources/tile-definitions/goldmines.xml  |  80 -----
 src/main/resources/tile-definitions/gq11.xml  | 133 --------
 .../tile-definitions/hills_and_sheep.xml      | 174 -----------
 .../tile-definitions/inns_and_cathedrals.xml  | 189 ------------
 .../tile-definitions/king_and_robber.xml      |  75 -----
 .../resources/tile-definitions/labyrinth.xml  |  17 --
 .../tile-definitions/mage_and_witch.xml       | 118 -------
 .../tile-definitions/monasteries.xml          |  47 ---
 .../tile-definitions/princess_and_dragon.xml  | 280 -----------------
 src/main/resources/tile-definitions/river.xml | 219 -------------
 .../tile-definitions/russian_promos.xml       |  40 ---
 src/main/resources/tile-definitions/siege.xml |  85 ------
 .../resources/tile-definitions/spiel-doch.xml |  43 ---
 src/main/resources/tile-definitions/tower.xml | 184 -----------
 .../tile-definitions/traders_and_builders.xml | 289 ------------------
 .../resources/tile-definitions/tunnel.xml     |  44 ---
 .../resources/tile-definitions/wind_roses.xml |  49 ---
 .../resources/tile-definitions/winter.xml     | 144 ---------
 32 files changed, 32 insertions(+), 3426 deletions(-)
 delete mode 100644 src/main/resources/tile-definitions/abbey_and_mayor.xml
 delete mode 100644 src/main/resources/tile-definitions/basic.xml
 delete mode 100644 src/main/resources/tile-definitions/bridges_castles_and_bazaars.xml
 delete mode 100644 src/main/resources/tile-definitions/corn_circles.xml
 delete mode 100644 src/main/resources/tile-definitions/count.xml
 delete mode 100644 src/main/resources/tile-definitions/cult.xml
 delete mode 100644 src/main/resources/tile-definitions/darmstadt.xml
 delete mode 100644 src/main/resources/tile-definitions/fan/wishing_wells.xml
 delete mode 100644 src/main/resources/tile-definitions/ferries.xml
 delete mode 100644 src/main/resources/tile-definitions/festival.xml
 delete mode 100644 src/main/resources/tile-definitions/flier.xml
 delete mode 100644 src/main/resources/tile-definitions/goldmines.xml
 delete mode 100644 src/main/resources/tile-definitions/gq11.xml
 delete mode 100644 src/main/resources/tile-definitions/hills_and_sheep.xml
 delete mode 100644 src/main/resources/tile-definitions/inns_and_cathedrals.xml
 delete mode 100644 src/main/resources/tile-definitions/king_and_robber.xml
 delete mode 100644 src/main/resources/tile-definitions/labyrinth.xml
 delete mode 100644 src/main/resources/tile-definitions/mage_and_witch.xml
 delete mode 100644 src/main/resources/tile-definitions/monasteries.xml
 delete mode 100644 src/main/resources/tile-definitions/princess_and_dragon.xml
 delete mode 100644 src/main/resources/tile-definitions/river.xml
 delete mode 100644 src/main/resources/tile-definitions/russian_promos.xml
 delete mode 100644 src/main/resources/tile-definitions/siege.xml
 delete mode 100644 src/main/resources/tile-definitions/spiel-doch.xml
 delete mode 100644 src/main/resources/tile-definitions/tower.xml
 delete mode 100644 src/main/resources/tile-definitions/traders_and_builders.xml
 delete mode 100644 src/main/resources/tile-definitions/tunnel.xml
 delete mode 100644 src/main/resources/tile-definitions/wind_roses.xml
 delete mode 100644 src/main/resources/tile-definitions/winter.xml

diff --git a/src/main/java/com/jcloisterzone/board/TilePackBuilder.java b/src/main/java/com/jcloisterzone/board/TilePackBuilder.java
index f95a9323d..ae432c4ad 100644
--- a/src/main/java/com/jcloisterzone/board/TilePackBuilder.java
+++ b/src/main/java/com/jcloisterzone/board/TilePackBuilder.java
@@ -14,6 +14,7 @@
 import org.w3c.dom.NodeList;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
@@ -94,44 +95,14 @@ public Tile createTile(String tileId, Vector<Element> tileElements) throws Remov
     }
 
 
-    public TilePack createTilePack() throws IOException {
+    public TilePack createTilePack(java.util.List<String> definitions) throws IOException {
         java.util.Map<String, Integer> tilesCount = new java.util.HashMap<>();
         java.util.Set<String> removedTiles = new java.util.HashSet<>();
 
-        java.util.List<String> definitions = new ArrayList<>();
-
-        CodeSource src = TilePackBuilder.class.getProtectionDomain().getCodeSource();
-        if (src != null) {
-            URL jar = src.getLocation();
-            if (jar.toString().endsWith(".jar")) {
-                // invoked from bundled app
-                ZipInputStream zip = new ZipInputStream(jar.openStream());
-                while (true) {
-                    ZipEntry e = zip.getNextEntry();
-                    if (e == null)
-                        break;
-                    String name = e.getName();
-                    if (name.startsWith("tile-definitions/") && name.endsWith(".xml")) {
-                        definitions.add(name);
-                    }
-                }
-            } else {
-                // invoked in development
-                Path definitionsDir = new File(TilePackBuilder.class.getClassLoader().getResource("tile-definitions").getFile()).toPath();
-                Files.list(definitionsDir).forEach(path -> {
-                    definitions.add("tile-definitions/" + definitionsDir.relativize(path).toString());
-                });
-                Path fanDefinitionsDir = new File(TilePackBuilder.class.getClassLoader().getResource("tile-definitions/fan").getFile()).toPath();
-                Files.list(fanDefinitionsDir).forEach(path -> {
-                    definitions.add("tile-definitions/fan/" + fanDefinitionsDir.relativize(path).toString());
-                });
-            }
-        }
-
         definitions.forEach(path -> {
             InputStream defFile;
             try {
-                defFile = TilePackBuilder.class.getClassLoader().getResource(path).openStream();
+                defFile = new FileInputStream(new File(path));
             } catch (IOException e) {
                 logger.error(e.getMessage(), e);
                 return;
@@ -168,7 +139,7 @@ public TilePack createTilePack() throws IOException {
         definitions.forEach(path -> {
             InputStream defFile;
             try {
-                defFile = TilePackBuilder.class.getClassLoader().getResource(path).openStream();
+                defFile = new FileInputStream(new File(path));
             } catch (IOException e) {
                 logger.error(e.getMessage(), e);
                 return;
diff --git a/src/main/java/com/jcloisterzone/engine/Engine.java b/src/main/java/com/jcloisterzone/engine/Engine.java
index b63989814..08ae072cf 100644
--- a/src/main/java/com/jcloisterzone/engine/Engine.java
+++ b/src/main/java/com/jcloisterzone/engine/Engine.java
@@ -27,11 +27,8 @@
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.URL;
-import java.util.Arrays;
-import java.util.Enumeration;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.NoSuchElementException;
-import java.util.Scanner;
 import java.util.function.Predicate;
 import java.util.jar.Manifest;
 
@@ -57,6 +54,7 @@ public class Engine implements  Runnable {
     private boolean bulk;
 
     private boolean compatJavaRandom = false;
+    private ArrayList<String> tileDefinitions = new ArrayList<>();
 
     public Engine(InputStream in, PrintStream out, PrintStream err, PrintStream log) {
         this.in = new Scanner(in);
@@ -198,20 +196,30 @@ private GameSetup createSetupFromMessage(GameSetupMessage setupMsg) {
     }
 
     private void parseDirective(String line) {
-        if (line.equals("%bulk on")) {
-            bulk = true;
-        } else if (line.equals("%bulk off")) {
-            bulk = false;
-            out.println(gson.toJson(game));
-        } else if (line.startsWith("%compat")) {
-            Version compat = Version.valueOf(line.replace("%compat ", ""));
-            if (compat.lessThan(Version.valueOf("5.7.0"))) {
-                compatJavaRandom = true;
-            }
+        String[] s = line.split("\\s+", 2);
+        var directive = s[0];
+        var value = s[1];
+        switch (directive) {
+            case "%bulk":
+                bulk = "on".equals(value);
+                if (!bulk) {
+                    out.println(gson.toJson(game));
+                }
+                break;
+            case "%compat":
+                Version compat = Version.valueOf(value);
+                if (compat.lessThan(Version.valueOf("5.7.0"))) {
+                    compatJavaRandom = true;
+                }
+                break;
+            case "%load":
+                tileDefinitions.add(value);
+                break;
+            default:
+                err.println("#unknown directive " + line);
         }
     }
 
-
     @Override
     public void run() {
         String line;
@@ -235,7 +243,7 @@ public void run() {
         game = new Game(gameSetup);
 
         GameStatePhaseReducer phaseReducer = new GameStatePhaseReducer(gameSetup, initialSeed, compatJavaRandom);
-        GameStateBuilder builder = new GameStateBuilder(gameSetup, setupMsg.getPlayers());
+        GameStateBuilder builder = new GameStateBuilder(tileDefinitions, gameSetup, setupMsg.getPlayers());
 
         if (setupMsg.getGameAnnotations() != null) {
             builder.setGameAnnotations(setupMsg.getGameAnnotations());
diff --git a/src/main/java/com/jcloisterzone/game/state/GameStateBuilder.java b/src/main/java/com/jcloisterzone/game/state/GameStateBuilder.java
index 6b7217b62..05775b629 100644
--- a/src/main/java/com/jcloisterzone/game/state/GameStateBuilder.java
+++ b/src/main/java/com/jcloisterzone/game/state/GameStateBuilder.java
@@ -36,12 +36,14 @@ public class GameStateBuilder {
     private Map<String, Object> gameAnnotations;
 
     private GameState state;
+    java.util.List<String> definitions;
 
 
-    public GameStateBuilder(GameSetup setup, int playersCount) {
+    public GameStateBuilder(java.util.List<String> definitions, GameSetup setup, int playersCount) {
         if (playersCount < 1) {
             throw new IllegalArgumentException("No player in game");
         }
+        this.definitions = definitions;
         this.setup = setup;
         this.playersCount = playersCount;
     }
@@ -119,7 +121,7 @@ private void createTilePack() {
         tilePackBuilder.setTileSets(setup.getTileSets());
 
         try {
-            TilePack tilePack = tilePackBuilder.createTilePack();
+            TilePack tilePack = tilePackBuilder.createTilePack(definitions);
             state = state.setTilePack(tilePack);
         } catch (IOException e) {
             throw new RuntimeException("Can't parse tile definitions", e);
diff --git a/src/main/resources/tile-definitions/abbey_and_mayor.xml b/src/main/resources/tile-definitions/abbey_and_mayor.xml
deleted file mode 100644
index 91e8dc953..000000000
--- a/src/main/resources/tile-definitions/abbey_and_mayor.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pack>
-  <!-- expansion also contains Abbey tile, with id AM.A when placed
-       this is not part of tile pack and tile is created from code separately
-  -->
-  <tiles>
-    <tile id="AM/C++">
-      <city pennant="2">N E S W</city>
-    </tile>
-    <tile id="AM/CCcc+">
-      <city pennant="yes">N S</city>
-      <city>W E</city>
-      <farm city="N W">INNER_FARM</farm>
-      <farm city="N W">INNER_FARM_B</farm>
-    </tile>
-    <tile id="AM/CCc+">
-      <city pennant="yes" castle-base="false">N</city>
-      <city>W E</city>
-      <farm city="N W">INNER_FARM</farm>
-      <farm city="N W">SL SR</farm>
-    </tile>
-    <tile id="AM/CCRR">
-      <city>N</city>
-      <city>W</city>
-      <road>E</road>
-      <road>S</road>
-      <farm city="N">EL</farm>
-      <farm city="W">SR</farm>
-      <farm city="N W">ER SL</farm>
-      <wagon-move>
-        <neighbouring>N E</neighbouring>
-        <neighbouring>S W</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="AM/LRRRR">
-      <cloister />
-      <road>N</road>
-      <road>W</road>
-      <road>S</road>
-      <road>E</road>
-      <farm>WR NL</farm>
-      <farm>NR EL</farm>
-      <farm>ER SL</farm>
-      <farm>SR WL</farm>
-      <wagon-move>
-        <neighbouring>CLOISTER N</neighbouring>
-        <neighbouring>CLOISTER W</neighbouring>
-        <neighbouring>CLOISTER E</neighbouring>
-        <neighbouring>CLOISTER S</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="AM/RC">
-      <city>N</city>
-      <road>W</road>
-      <farm city="N">WR</farm>
-      <farm city="N">EL ER SL SR WL</farm>
-      <wagon-move>
-        <neighbouring>N W</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="AM/CRr">
-      <city>N</city>
-      <road>S E</road>
-      <farm city="N">WL WR SR</farm>
-      <farm city="N">EL</farm>
-      <farm>ER SL</farm>
-    </tile>
-    <tile id="AM/RrC">
-      <city>N</city>
-      <road>W S</road>
-      <farm city="N">EL ER SL</farm>
-      <farm city="N">WR</farm>
-      <farm>SR WL</farm>
-    </tile>
-    <tile id="AM/C!+">
-      <city pennant="yes" castle-base="false">W</city>
-      <farm city="W">NL NR</farm>
-      <farm city="W">EL ER</farm>
-      <farm city="W">SL SR</farm>
-    </tile>
-    <tile id="AM/R">
-      <road>S</road>
-      <farm>NL NR EL ER SL SR WL WR</farm>
-    </tile>
-    <tile id="AM/RG">
-      <garden/>
-      <road>S</road>
-      <farm>NL NR EL ER SL SR WL WR</farm>
-    </tile>
-    <tile id="AM/Rrr">
-      <road wells="1">N W E</road>
-      <farm>WR NL</farm>
-      <farm>NR EL</farm>
-      <farm>ER SL SR WL</farm>
-    </tile>
-    <tile id="AM/CRcr+">
-      <city pennant="yes">W E</city>
-      <road tunnel="yes">N S</road>
-      <farm city="W">SL SR</farm>
-      <farm city="W">NL</farm>
-      <farm city="W">NR</farm>
-    </tile>
-  </tiles>
-  <sets>
-    <tile-set id="abbey-and-mayor:1">
-      <ref count="1" tile="AM/C++" />
-      <ref count="1" tile="AM/CCcc+" />
-      <ref count="1" tile="AM/CCc+" />
-      <ref count="1" tile="AM/CCRR" />
-      <ref count="1" tile="AM/LRRRR" />
-      <ref count="1" tile="AM/RC" />
-      <ref count="1" tile="AM/CRr" />
-      <ref count="1" tile="AM/RrC" />
-      <ref count="1" tile="AM/C!+" />
-      <ref count="1" tile="AM/R" />
-      <ref count="1" tile="AM/Rrr" />
-      <ref count="1" tile="AM/CRcr+" />
-    </tile-set>
-    <tile-set id="abbey-and-mayor:2">
-      <ref count="1" tile="AM/C++" />
-      <ref count="1" tile="AM/CCcc+" />
-      <ref count="1" tile="AM/CCc+" />
-      <ref count="1" tile="AM/CCRR" />
-      <ref count="1" tile="AM/LRRRR" />
-      <ref count="1" tile="AM/RC" />
-      <ref count="1" tile="AM/CRr" />
-      <ref count="1" tile="AM/RrC" />
-      <ref count="1" tile="AM/C!+" />
-      <ref count="1" tile="AM/RG" />
-      <ref count="1" tile="AM/Rrr" />
-      <ref count="1" tile="AM/CRcr+" />
-    </tile-set>
-  </sets>
-</pack>
diff --git a/src/main/resources/tile-definitions/basic.xml b/src/main/resources/tile-definitions/basic.xml
deleted file mode 100644
index 867fe26a3..000000000
--- a/src/main/resources/tile-definitions/basic.xml
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pack>
-  <tiles>
-    <tile id="BA/L">
-      <cloister />
-      <farm>NL NR EL ER SL SR WL WR</farm>
-    </tile>
-    <tile id="BA/LR">
-      <cloister />
-      <road>S</road>
-      <farm>NL NR EL ER SL SR WL WR</farm>
-      <wagon-move>
-        <neighbouring>CLOISTER S</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="BA/RCr">
-      <road>W E</road>
-      <city>N</city>
-      <farm city="N">EL WR</farm>
-      <farm>ER SL SR WL</farm>
-    </tile>
-
-    <tile id="BA/Cccc+">
-      <city pennant="yes">N W S E</city>
-    </tile>
-    <tile id="BA/CccR+">
-      <road>S</road>
-      <city pennant="yes">N W E</city>
-      <farm city="N">SL</farm>
-      <farm city="N">SR</farm>
-      <wagon-move>
-        <neighbouring>N S</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="BA/CccR">
-      <road>S</road>
-      <city>N W E</city>
-      <farm city="N">SL</farm>
-      <farm city="N">SR</farm>
-      <wagon-move>
-        <neighbouring>N S</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="BA/CFc+">
-      <city pennant="yes">W E</city>
-      <farm city="W">NL NR</farm>
-      <farm city="W">SL SR</farm>
-    </tile>
-    <tile id="BA/CFc.1">
-      <city>W E</city>
-      <farm city="W">NL NR</farm>
-      <farm city="W">SL SR</farm>
-    </tile>
-    <tile id="BA/Cc.1">
-      <city>N W</city>
-      <farm city="N">SL SR EL ER</farm>
-    </tile>
-    <tile id="BA/CcG">
-      <garden />
-      <city>N W</city>
-      <farm city="N">SL SR EL ER</farm>
-    </tile>
-    <tile id="BA/Cc+">
-      <city pennant="yes">N W</city>
-      <farm city="N">SL SR EL ER</farm>
-    </tile>
-    <tile id="BA/Cc+G">
-      <garden />
-      <city pennant="yes">N W</city>
-      <farm city="N">SL SR EL ER</farm>
-    </tile>
-    <tile id="BA/CcRr">
-      <road>E S</road>
-      <city>N W</city>
-      <farm city="N">EL SR</farm>
-      <farm>ER SL</farm>
-    </tile>
-    <tile id="BA/CcRr+">
-      <road>E S</road>
-      <city pennant="yes">N W</city>
-      <farm city="N">EL SR</farm>
-      <farm>ER SL</farm>
-    </tile>
-    <tile id="BA/Ccc">
-      <city>N E W</city>
-      <farm city="N">SL SR</farm>
-    </tile>
-    <tile id="BA/CccG">
-      <garden />
-      <city>N E W</city>
-      <farm city="N">SL SR</farm>
-    </tile>
-    <tile id="BA/Ccc+">
-      <city pennant="yes">N E W</city>
-      <farm city="N">SL SR</farm>
-    </tile>
-    <tile id="BA/CRr">
-      <road>E S</road>
-      <city>N</city>
-      <farm city="N">EL WL WR SR</farm>
-      <farm>ER SL</farm>
-    </tile>
-    <tile id="BA/CRRR">
-      <road>E</road>
-      <road>S</road>
-      <road>W</road>
-      <city>N</city>
-      <farm city="N">WR EL</farm>
-      <farm>WL SR</farm>
-      <farm>ER SL</farm>
-      <wagon-move>
-        <neighbouring>W S E</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="BA/RrC">
-      <road>S W</road>
-      <city>N</city>
-      <farm city="N">WR EL ER SL</farm>
-      <farm>WL SR</farm>
-    </tile>
-    <tile id="BA/C">
-      <city>N</city>
-      <farm city="N">WL WR SL SR EL ER</farm>
-    </tile>
-    <tile id="BA/CG">
-      <garden />
-      <city>N</city>
-      <farm city="N">WL WR SL SR EL ER</farm>
-    </tile>
-    <tile id="BA/CFC.2">
-      <city>N</city>
-      <city>S</city>
-      <farm city="N S">WL WR EL ER</farm>
-    </tile>
-    <tile id="BA/CFCG">
-      <garden />
-      <city>N</city>
-      <city>S</city>
-      <farm city="N S">WL WR EL ER</farm>
-    </tile>
-    <tile id="BA/CC.2">
-      <city>N</city>
-      <city>W</city>
-      <farm city="N W">EL ER SL SR</farm>
-    </tile>
-    <tile id="BA/CCG">
-      <garden />
-      <city>N</city>
-      <city>W</city>
-      <farm city="N W">EL ER SL SR</farm>
-    </tile>
-    <tile id="BA/RRRR">
-      <road>N</road>
-      <road>E</road>
-      <road>S</road>
-      <road>W</road>
-      <farm>WR NL</farm>
-      <farm>NR EL</farm>
-      <farm>ER SL</farm>
-      <farm>SR WL</farm>
-      <wagon-move>
-        <neighbouring>N E S W</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="BA/RRR">
-      <road>E</road>
-      <road>S</road>
-      <road>W</road>
-      <farm>WR NL NR EL</farm>
-      <farm>ER SL</farm>
-      <farm>SR WL</farm>
-      <wagon-move>
-        <neighbouring>E S W</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="BA/Rr">
-      <road>W S</road>
-      <farm>WR NL NR EL ER SL</farm>
-      <farm>SR WL</farm>
-    </tile>
-    <tile id="BA/RrG">
-      <garden />
-      <road>W S</road>
-      <farm>WR NL NR EL ER SL</farm>
-      <farm>SR WL</farm>
-    </tile>
-    <tile id="BA/RFr">
-      <road>W E</road>
-      <farm>WR NL NR EL</farm>
-      <farm>ER SL SR WL</farm>
-    </tile>
-    <tile id="BA/RFrG">
-      <garden />
-      <road>W E</road>
-      <farm>WR NL NR EL</farm>
-      <farm>ER SL SR WL</farm>
-    </tile>
-  </tiles>
-  <sets>
-    <tile-set id="basic:1">
-      <ref count="4" tile="BA/L" />
-      <ref count="2" tile="BA/LR" />
-      <ref count="4" tile="BA/RCr" />
-      <ref count="1" tile="BA/Cccc+" />
-      <ref count="2" tile="BA/CccR+" />
-      <ref count="1" tile="BA/CccR" />
-      <ref count="2" tile="BA/CFc+" />
-      <ref count="1" tile="BA/CFc.1" />
-      <ref count="3" tile="BA/Cc.1" />
-      <ref count="2" tile="BA/Cc+" />
-      <ref count="3" tile="BA/CcRr" />
-      <ref count="2" tile="BA/CcRr+" />
-      <ref count="3" tile="BA/Ccc" />
-      <ref count="1" tile="BA/Ccc+" />
-      <ref count="3" tile="BA/CRr" />
-      <ref count="3" tile="BA/CRRR" />
-      <ref count="3" tile="BA/RrC" />
-      <ref count="5" tile="BA/C" />
-      <ref count="3" tile="BA/CFC.2" />
-      <ref count="2" tile="BA/CC.2" />
-      <ref count="1" tile="BA/RRRR" />
-      <ref count="4" tile="BA/RRR" />
-      <ref count="9" tile="BA/Rr" />
-      <ref count="8" tile="BA/RFr" />
-    </tile-set>
-    <tile-set id="basic:2">
-      <ref count="4" tile="BA/L" />
-      <ref count="2" tile="BA/LR" />
-      <ref count="4" tile="BA/RCr" />
-      <ref count="1" tile="BA/Cccc+" />
-      <ref count="2" tile="BA/CccR+" />
-      <ref count="1" tile="BA/CccR" />
-      <ref count="2" tile="BA/CFc+" />
-      <ref count="1" tile="BA/CFc.1" />
-      <ref count="2" tile="BA/Cc.1" />
-      <ref count="1" tile="BA/CcG" />
-      <ref count="1" tile="BA/Cc+" />
-      <ref count="1" tile="BA/Cc+G" />
-      <ref count="3" tile="BA/CcRr" />
-      <ref count="2" tile="BA/CcRr+" />
-      <ref count="2" tile="BA/Ccc" />
-      <ref count="1" tile="BA/CccG" />
-      <ref count="1" tile="BA/Ccc+" />
-      <ref count="3" tile="BA/CRr" />
-      <ref count="3" tile="BA/CRRR" />
-      <ref count="3" tile="BA/RrC" />
-      <ref count="4" tile="BA/C" />
-      <ref count="1" tile="BA/CG" />
-      <ref count="2" tile="BA/CFC.2" />
-      <ref count="1" tile="BA/CFCG" />
-      <ref count="1" tile="BA/CC.2" />
-      <ref count="1" tile="BA/CCG" />
-      <ref count="1" tile="BA/RRRR" />
-      <ref count="4" tile="BA/RRR" />
-      <ref count="8" tile="BA/Rr" />
-      <ref count="1" tile="BA/RrG" />
-      <ref count="7" tile="BA/RFr" />
-      <ref count="1" tile="BA/RFrG" />
-    </tile-set>
-  </sets>
-</pack>
diff --git a/src/main/resources/tile-definitions/bridges_castles_and_bazaars.xml b/src/main/resources/tile-definitions/bridges_castles_and_bazaars.xml
deleted file mode 100644
index cbdbfb7df..000000000
--- a/src/main/resources/tile-definitions/bridges_castles_and_bazaars.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pack>
-  <tiles>
-    <tile count="2" id="BB/Cccc.b">
-      <bazaar />
-      <city>N E S W</city>
-    </tile>
-    <tile id="BB/CCCR">
-      <city>W</city>
-      <city>N</city>
-      <city>E</city>
-      <road>S</road>
-      <farm city="W N E">SR</farm>
-      <farm city="E">SL</farm>
-      <wagon-move>
-        <neighbouring>S E</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="BB/CFc.b">
-      <bazaar />
-      <city>W E</city>
-      <farm city="W">NL NR</farm>
-      <farm city="W">SL SR</farm>
-    </tile>
-    <tile id="BB/CFR!">
-      <city castle-base="false">W</city>
-      <road>E</road>
-      <farm city="W">NL NR</farm>
-      <farm city="W">EL</farm>
-      <farm city="W">ER SL SR</farm>
-      <wagon-move>
-        <neighbouring>W E</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="BB/CFR!G">
-      <garden/>
-      <city>W</city>
-      <road>E</road>
-      <farm city="W">NL NR</farm>
-      <farm city="W">EL</farm>
-      <farm city="W">ER SL SR</farm>
-      <wagon-move>
-        <neighbouring>W E</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="BB/CFR.b">
-      <bazaar />
-      <city>N</city>
-      <road>S</road>
-      <farm city="N">EL ER SL SR WL WR</farm>
-    </tile>
-    <tile id="BB/F.b">
-      <bazaar />
-      <farm>NL NR EL ER SL SR WL WR</farm>
-    </tile>
-    <tile id="BB/LCFc">
-      <cloister />
-      <city>W E</city>
-      <farm city="W">NL NR</farm>
-      <farm city="W">SL SR</farm>
-      <wagon-move>
-        <neighbouring>CLOISTER W</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="BB/LRFr">
-      <cloister />
-      <road>W E</road>
-      <farm>WR NL NR EL</farm>
-      <farm>ER SL SR WL</farm>
-    </tile>
-    <tile id="BB/R.bi">
-      <bazaar />
-      <road inn="yes">S</road>
-      <farm>NL NR EL ER SL SR WL WR</farm>
-    </tile>
-    <tile id="BB/RFR.b">
-      <bazaar />
-      <road>N</road>
-      <road>S</road>
-      <farm>SR WL WR NL</farm>
-      <farm>NR EL ER SL</farm>
-    </tile>
-    <tile id="BB/RFR.bi">
-      <bazaar />
-      <road>N</road>
-      <road inn="yes">S</road>
-      <farm>SR WL WR NL</farm>
-      <farm>NR EL ER SL</farm>
-    </tile>
-  </tiles>
-  <sets>
-    <tile-set id="bridges-castles-and-bazaars:1">
-      <ref count="2" tile="BB/Cccc.b" />
-      <ref count="1" tile="BB/CCCR" />
-      <ref count="1" tile="BB/CFc.b" />
-      <ref count="1" tile="BB/CFR!" />
-      <ref count="1" tile="BB/CFR.b" />
-      <ref count="1" tile="BB/F.b" />
-      <ref count="1" tile="BB/LCFc" />
-      <ref count="1" tile="BB/LRFr" />
-      <ref count="1" tile="BB/R.bi" />
-      <ref count="1" tile="BB/RFR.b" />
-      <ref count="1" tile="BB/RFR.bi" />
-    </tile-set>
-    <tile-set id="bridges-castles-and-bazaars:2">
-      <ref count="2" tile="BB/Cccc.b" />
-      <ref count="1" tile="BB/CCCR" />
-      <ref count="1" tile="BB/CFc.b" />
-      <ref count="1" tile="BB/CFR!G" />
-      <ref count="1" tile="BB/CFR.b" />
-      <ref count="1" tile="BB/F.b" />
-      <ref count="1" tile="BB/LCFc" />
-      <ref count="1" tile="BB/LRFr" />
-      <ref count="1" tile="BB/R.bi" />
-      <ref count="1" tile="BB/RFR.b" />
-      <ref count="1" tile="BB/RFR.bi" />
-    </tile-set>
-  </sets>
-</pack>
diff --git a/src/main/resources/tile-definitions/corn_circles.xml b/src/main/resources/tile-definitions/corn_circles.xml
deleted file mode 100644
index 80acb8654..000000000
--- a/src/main/resources/tile-definitions/corn_circles.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pack>
-  <tiles>
-    <tile id="CC.1/Cc.1">
-      <corn-circle type="City" />
-      <city>N W</city>
-      <farm city="N">SL SR EL ER</farm>
-    </tile>
-    <tile id="CC.1/CC.2">
-      <corn-circle type="City" />
-      <city>N</city>
-      <city>E</city>
-      <farm city="N E">SL SR WL WR</farm>
-    </tile>
-    <tile id="CC.1/CR">
-      <corn-circle type="Farm" />
-      <city>N</city>
-      <road>E</road>
-      <farm city="N">WL WR SL SR EL ER</farm>
-    </tile>
-    <tile id="CC.1/Rr">
-      <corn-circle type="Road" />
-      <road>W S</road>
-      <farm>WR NL NR EL ER SL</farm>
-      <farm>SR WL</farm>
-    </tile>
-    <tile id="CC.1/RrC">
-      <corn-circle type="Farm" />
-      <road>S W</road>
-      <city>N</city>
-      <farm city="N">WR EL ER SL</farm>
-      <farm>WL SR</farm>
-    </tile>
-    <tile id="CC.1/RRR">
-      <corn-circle type="Road" />
-      <road>N</road>
-      <road>W</road>
-      <road>S</road>
-      <farm>NR EL ER SL</farm>
-      <farm>SR WL</farm>
-      <farm>WR NL</farm>
-    </tile>
-
-    <tile id="CC.2/RRr">
-      <corn-circle type="Road" />
-      <road>W S</road>
-      <road>E</road>
-      <farm>WR NL NR EL</farm>
-      <farm>ER SL</farm>
-      <farm>SR WL</farm>
-    </tile>
-    <tile id="CC.2/RRRr">
-      <corn-circle type="Road" />
-      <road>W S</road>
-      <road>N</road>
-      <road>E</road>
-      <farm>WR NL ER SL</farm>
-      <farm>NR EL</farm>
-      <farm>SR WL</farm>
-    </tile>
-    <tile id="CC.2/CFR">
-      <corn-circle type="Farm" />
-      <city>N</city>
-      <road>S</road>
-      <farm city="N">WR WL SL SR EL ER</farm>
-    </tile>
-    <tile id="CC.2/RCR">
-      <corn-circle type="Farm" />
-      <city>N</city>
-      <road>W</road>
-      <road>E</road>
-      <farm city="N">WR EL</farm>
-      <farm>ER SL SR WL</farm>
-    </tile>
-    <tile id="CC.2/CFC">
-      <corn-circle type="City" />
-      <city>N</city>
-      <city>S</city>
-      <farm city="N S">WL WR</farm>
-      <farm city="N S">EL ER</farm>
-    </tile>
-    <tile id="CC.2/CcCc">
-      <corn-circle type="City" />
-      <city>W N</city>
-      <city>E S</city>
-    </tile>
-  </tiles>
-  <sets>
-    <tile-set id="corn-circles/1">
-      <ref count="1" tile="CC.1/Cc.1" />
-      <ref count="1" tile="CC.1/CC.2" />
-      <ref count="1" tile="CC.1/CR" />
-      <ref count="1" tile="CC.1/Rr" />
-      <ref count="1" tile="CC.1/RrC" />
-      <ref count="1" tile="CC.1/RRR" />
-    </tile-set>
-    <tile-set id="corn-circles/2">
-      <ref count="1" tile="CC.2/RRr" />
-      <ref count="1" tile="CC.2/RRRr" />
-      <ref count="1" tile="CC.2/CFR" />
-      <ref count="1" tile="CC.2/RCR" />
-      <ref count="1" tile="CC.2/CFC" />
-      <ref count="1" tile="CC.2/CcCc" />
-    </tile-set>
-  </sets>
-</pack>
diff --git a/src/main/resources/tile-definitions/count.xml b/src/main/resources/tile-definitions/count.xml
deleted file mode 100644
index 453888a56..000000000
--- a/src/main/resources/tile-definitions/count.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pack>
-  <tiles>
-    <tile id="CO/1">
-      <road>W</road>
-      <farm>WR NL NR EL</farm>
-      <farm>WL SR</farm>
-    </tile>
-    <tile id="CO/2">
-      <farm>WR NL NR EL</farm>
-    </tile>
-    <tile id="CO/3">
-      <farm>WR NL NR EL</farm>
-    </tile>
-    <tile id="CO/4">
-      <road>N</road>
-      <farm>WR NL</farm>
-      <farm>NR EL ER SL</farm>
-    </tile>
-    <tile id="CO/5">
-      <farm>SR WL WR NL</farm>
-    </tile>
-    <tile id="CO/6">
-    </tile>
-    <tile id="CO/7">
-      <!-- all quarters are bound to this tile -->
-    </tile>
-    <tile id="CO/8">
-      <farm>NR EL ER SL</farm>
-    </tile>
-    <tile id="CO/9">
-      <city>S</city>
-      <farm city="S">WL WR NL ER</farm>
-    </tile>
-    <tile id="CO/10">
-      <farm>ER SL SR WL</farm>
-    </tile>
-    <tile id="CO/11">
-      <road>S</road>
-      <farm>ER SL</farm>
-      <farm>SR WL</farm>
-    </tile>
-    <tile id="CO/12">
-      <city>E</city>
-      <farm city="E">NR SL SR WL</farm>
-    </tile>
-  </tiles>
-
-  <!-- <multi-tiles>
-      <multi-tile id="CO/_" size="4x3">
-        <ref tile="CO/1" />
-        <ref tile="CO/2" />
-        <ref tile="CO/3" />
-        <ref tile="CO/4" />
-        <ref tile="CO/5" />
-        <ref tile="CO/6" />
-        <ref tile="CO/7" />
-        <ref tile="CO/8" />
-        <ref tile="CO/9" />
-        <ref tile="CO/10" />
-        <ref tile="CO/11" />
-        <ref tile="CO/12" />
-      </multi-tile>
-    </multi-tiles> -->
-
-  <sets>
-    <tile-set id="count" max="1">
-      <!--ref tile="CO/_" count="1" /-->
-      <ref count="1" tile="CO/1" />
-      <ref count="1" tile="CO/2" />
-      <ref count="1" tile="CO/3" />
-      <ref count="1" tile="CO/4" />
-      <ref count="1" tile="CO/5" />
-      <ref count="1" tile="CO/6" />
-      <ref count="1" tile="CO/7" />
-      <ref count="1" tile="CO/8" />
-      <ref count="1" tile="CO/9" />
-      <ref count="1" tile="CO/10" />
-      <ref count="1" tile="CO/11" />
-      <ref count="1" tile="CO/12" />
-    </tile-set>
-  </sets>
-</pack>
diff --git a/src/main/resources/tile-definitions/cult.xml b/src/main/resources/tile-definitions/cult.xml
deleted file mode 100644
index ffd0fe01a..000000000
--- a/src/main/resources/tile-definitions/cult.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pack>
-	<tiles>
-		<tile id="CU/S">
-			<cloister shrine="yes"/>
-			<farm>NL NR SL SR WL WR EL ER</farm>
-		</tile>
-		<tile id="CU/SC">
-			<cloister shrine="yes"/>
-			<city>N</city>
-			<farm city="N">SL SR WL WR EL ER</farm>
-		</tile>
-		<tile id="CU/SR">
-			<cloister shrine="yes"/>
-			<road>S</road>
-			<farm>NL NR SL SR WL WR EL ER</farm>
-			<wagon-move>
-				<neighbouring>CLOISTER S</neighbouring>
-			</wagon-move>
-		</tile>
-		<tile id="CU/SCFR">
-			<cloister shrine="yes"/>
-			<city>N</city>
-			<road>S</road>
-			<farm city="N">SL SR WL WR EL ER</farm>
-			<wagon-move>
-				<neighbouring>CLOISTER S</neighbouring>
-			</wagon-move>
-		</tile>
-		<tile id="CU/SRFR">
-			<cloister shrine="yes"/>
-			<road>N</road>
-			<road>S</road>
-			<farm>NL WL WR SR</farm>
-			<farm>NR EL ER SL</farm>
-			<wagon-move>
-				<neighbouring>CLOISTER N</neighbouring>
-				<neighbouring>CLOISTER S</neighbouring>
-			</wagon-move>
-		</tile>
-		<tile id="CU/SRCR">
-			<cloister shrine="yes"/>
-			<city>N</city>
-			<road>W</road>
-			<road>E</road>
-			<farm city="N">WR EL</farm>
-			<farm>WL SL SR ER</farm>
-			<wagon-move>
-				<neighbouring>CLOISTER W</neighbouring>
-				<neighbouring>CLOISTER E</neighbouring>
-			</wagon-move>
-		</tile>
-	</tiles>
-	<sets>
-    <tile-set id="cult/6">
-			<ref count="1" tile="CU/S" />
-			<ref count="1" tile="CU/SC" />
-			<ref count="1" tile="CU/SR" />
-			<ref count="1" tile="CU/SCFR" />
-			<ref count="1" tile="CU/SRFR" />
-			<ref count="1" tile="CU/SRCR" />
-        </tile-set>
-		<tile-set id="cult/5">
-			<ref count="1" tile="CU/S" />
-			<ref count="1" tile="CU/SC" />
-			<ref count="1" tile="CU/SR" />
-			<ref count="1" tile="CU/SCFR" />
-			<ref count="1" tile="CU/SRFR" />
-    </tile-set>
-  </sets>
-</pack>
diff --git a/src/main/resources/tile-definitions/darmstadt.xml b/src/main/resources/tile-definitions/darmstadt.xml
deleted file mode 100644
index 7064becfc..000000000
--- a/src/main/resources/tile-definitions/darmstadt.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pack>
-  <tiles>
-    <tile id="DA/Cccc">
-      <city extra-points="3">N W S E</city>
-    </tile>
-    <tile id="DA/LRRRR">
-      <cloister church="true"/>
-      <road>N</road>
-      <road>W</road>
-      <road>S</road>
-      <road>E</road>
-      <farm>WR NL</farm>
-      <farm>NR EL</farm>
-      <farm>ER SL</farm>
-      <farm>SR WL</farm>
-      <wagon-move>
-        <neighbouring>CLOISTER N</neighbouring>
-        <neighbouring>CLOISTER W</neighbouring>
-        <neighbouring>CLOISTER E</neighbouring>
-        <neighbouring>CLOISTER S</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="DA/LRR">
-      <cloister church="true" />
-      <road>E S</road>
-      <farm>NL NR EL SR WL WR</farm>
-      <farm>ER SL</farm>
-      <wagon-move>
-        <neighbouring>CLOISTER E</neighbouring>
-      </wagon-move>
-    </tile>
-  </tiles>
-  <sets>
-    <tile-set id="darmstadt">
-      <ref count="1" tile="DA/Cccc" />
-      <ref count="1" tile="DA/LRRRR" />
-      <ref count="1" tile="DA/LRR" />
-    </tile-set>
-  </sets>
-</pack>
diff --git a/src/main/resources/tile-definitions/fan/wishing_wells.xml b/src/main/resources/tile-definitions/fan/wishing_wells.xml
deleted file mode 100644
index c6aac0c32..000000000
--- a/src/main/resources/tile-definitions/fan/wishing_wells.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pack>
-  <tiles>
-    <tile id="WishingWells/CRrc.w">
-      <city>N W</city>
-      <road wells="1">S E</road>
-      <farm>SR</farm>
-      <farm>ER SL</farm>
-      <farm>EL</farm>
-      <wagon-move>
-        <neighbouring>S E N W</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="WishingWells/FCRC.w">
-      <city>W</city>
-      <city>E</city>
-      <road wells="1">S</road>
-      <farm>SR</farm>
-      <farm>SL</farm>
-      <farm>NL NR</farm>
-      <wagon-move>
-        <neighbouring>S W</neighbouring>
-        <neighbouring>E S</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="WishingWells/FIRi.w" group="river">
-      <road wells="1">S</road>
-      <river>W E</river>
-      <farm>ER SL</farm>
-      <farm>SR WL</farm>
-      <farm>NL NR EL WR</farm>
-    </tile>
-    <tile id="WishingWells/FRrC.w">
-      <city>W</city>
-      <road wells="1">S E</road>
-      <farm>SR</farm>
-      <farm>ER SL</farm>
-      <farm>NL NR EL</farm>
-      <wagon-move>
-        <neighbouring>S E W</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="WishingWells/IRir.w" group="river">
-      <river>N S</river>
-      <road wells="1">W E</road>
-      <farm>ER SL</farm>
-      <farm>SR WL</farm>
-      <farm>NL WR</farm>
-      <farm>NR EL</farm>
-    </tile>
-    <tile id="WishingWells/RCrc.w.s.p">
-      <city pennant="1">W E</city>
-      <farm>NL</farm>
-      <farm>NR</farm>
-      <farm>SL SR</farm>
-      <road tunnel="true">N S</road>
-    </tile>
-    <tile id="WishingWells/RfrC.w">
-      <road wells="1">N S</road>
-      <city>W</city>
-      <farm>NR EL ER SL</farm>
-      <farm>NL</farm>
-      <farm>SR</farm>
-      <wagon-move>
-        <neighbouring>N S W</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="WishingWells/RfrC.ws">
-      <road wells="1">N S</road>
-      <farm>NR EL ER SL</farm>
-      <city besieged="true">W</city>
-      <farm>NL SR</farm>
-    </tile>
-    <tile id="WishingWells/RFrf.w.t">
-      <road wells="1">S</road>
-      <road>N</road>
-      <farm>NL NR EL ER SL SR WL WR</farm>
-    </tile>
-    <tile id="WishingWells/RFRR.wwis">
-      <road wells="1" shed="1">S</road>
-      <road wells="1">W</road>
-      <road inn="true">N</road>
-      <farm>SR WL</farm>
-      <farm shed="1">NR EL ER SL</farm>
-      <farm>NL WR</farm>
-      <wagon-move>
-        <neighbouring>S W</neighbouring>
-        <neighbouring>N S</neighbouring>
-        <neighbouring>N W</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="WishingWells/Rfr.w.i">
-      <road inn="true" wells="1">N S</road>
-      <farm inn="true">NR EL ER SL</farm>
-      <farm wells="1">NL SR WL WR</farm>
-    </tile>
-    <tile id="WishingWells/RrFC.w">
-      <city>W</city>
-      <road wells="1">N E</road>
-      <farm>ER SL SR</farm>
-      <farm>NL</farm>
-      <farm>NR EL</farm>
-      <wagon-move>
-        <neighbouring>N E W</neighbouring>
-      </wagon-move>
-    </tile>
-  </tiles>
-  <sets>
-    <tile-set id="wishing-wells">
-      <ref count="1" tile="WishingWells/CRrc.w" />
-      <ref count="1" tile="WishingWells/FCRC.w" />
-      <ref count="1" tile="WishingWells/FRrC.w" />
-      <ref count="1" tile="WishingWells/RCrc.w.s.p" />
-      <ref count="1" tile="WishingWells/RfrC.w" />
-      <ref count="1" tile="WishingWells/RfrC.ws" />
-      <ref count="1" tile="WishingWells/RFrf.w.t" />
-      <ref count="1" tile="WishingWells/RFRR.wwis" />
-      <ref count="1" tile="WishingWells/Rfr.w.i" />
-      <ref count="1" tile="WishingWells/RrFC.w" />
-    </tile-set>
-    <tile-set id="wishing-wells/river">
-      <ref count="1" tile="WishingWells/FIRi.w" />
-      <ref count="1" tile="WishingWells/IRir.w" />
-    </tile-set>
-  </sets>
-</pack>
\ No newline at end of file
diff --git a/src/main/resources/tile-definitions/ferries.xml b/src/main/resources/tile-definitions/ferries.xml
deleted file mode 100644
index ab22c2f23..000000000
--- a/src/main/resources/tile-definitions/ferries.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pack>
-  <tiles>
-    <tile id="FR/CRRR">
-      <ferry />
-      <city>N</city>
-      <road>W</road>
-      <road>S</road>
-      <road>E</road>
-      <farm city="N">WR EL</farm>
-      <farm>ER SL</farm>
-      <farm>SR WL</farm>
-    </tile>
-    <tile id="FR/RRR">
-      <ferry />
-      <road>W</road>
-      <road>S</road>
-      <road>E</road>
-      <farm>WR NL NR EL</farm>
-      <farm>ER SL</farm>
-      <farm>SR WL</farm>
-    </tile>
-    <tile id="FR/RRRR">
-      <ferry />
-      <road>N</road>
-      <road>W</road>
-      <road>S</road>
-      <road>E</road>
-      <farm>WR NL</farm>
-      <farm>NR EL</farm>
-      <farm>ER SL</farm>
-      <farm>SR WL</farm>
-    </tile>
-  </tiles>
-  <sets>
-    <tile-set id="ferries">
-      <ref count="3" tile="FR/CRRR" />
-      <ref count="4" tile="FR/RRR" />
-      <ref count="1" tile="FR/RRRR" />
-    </tile-set>
-  </sets>
-</pack>
diff --git a/src/main/resources/tile-definitions/festival.xml b/src/main/resources/tile-definitions/festival.xml
deleted file mode 100644
index fe48e07db..000000000
--- a/src/main/resources/tile-definitions/festival.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pack>
-  <tile id="FE/CCc">
-    <festival />
-    <city>W E</city>
-    <city>S</city>
-    <farm city="W">NL NR</farm>
-    <farm city="W S">INNER_FARM</farm>
-  </tile>
-  <tile id="FE/CcCc">
-    <festival />
-    <city>N W</city>
-    <city>S E</city>
-    <farm city="N S">INNER_FARM</farm>
-  </tile>
-  <tile id="FE/CFR">
-    <festival />
-    <city>N</city>
-    <road>S</road>
-    <farm city="N">WL WR SR</farm>
-    <farm city="N">EL ER SL</farm>
-    <wagon-move>
-      <neighbouring>N S</neighbouring>
-    </wagon-move>
-  </tile>
-  <tile id="FE/CR">
-    <festival />
-    <city>N</city>
-    <road>E</road>
-    <farm city="N">EL</farm>
-    <farm city="N">WL WR SL SR ER</farm>
-    <wagon-move>
-      <neighbouring>N E</neighbouring>
-    </wagon-move>
-  </tile>
-  <tile id="FE/CRCR">
-    <festival />
-    <city>N</city>
-    <city>S</city>
-    <road>W</road>
-    <road>E</road>
-    <farm city="S">ER</farm>
-    <farm city="S">WL</farm>
-    <farm city="N">EL</farm>
-    <farm city="N">WR</farm>
-    <wagon-move>
-      <neighbouring>N S W E</neighbouring>
-    </wagon-move>
-  </tile>
-  <tile id="FE/CRr">
-    <festival />
-    <road>E S</road>
-    <city>N</city>
-    <farm city="N">EL WL WR SR</farm>
-    <farm>ER SL</farm>
-  </tile>
-  <tile id="FE/LRR">
-    <festival />
-    <cloister />
-    <road>S</road>
-    <road>W</road>
-    <farm>WR NL NR EL ER SL</farm>
-    <farm>WL SR</farm>
-    <wagon-move>
-      <neighbouring>CLOISTER W</neighbouring>
-      <neighbouring>CLOISTER S</neighbouring>
-    </wagon-move>
-  </tile>
-  <tile id="FE/RC">
-    <festival />
-    <city>N</city>
-    <road>W</road>
-    <farm city="N">WR</farm>
-    <farm city="N">EL ER SL SR WL</farm>
-    <wagon-move>
-      <neighbouring>N W</neighbouring>
-    </wagon-move>
-  </tile>
-  <tile id="FE/RrC">
-    <festival />
-    <road>S W</road>
-    <city>N</city>
-    <farm city="N">WR EL ER SL</farm>
-    <farm>WL SR</farm>
-  </tile>
-  <tile id="FE/RrRr">
-    <festival />
-    <road>N W</road>
-    <road>S E</road>
-    <farm>NL WR</farm>
-    <farm>SL ER</farm>
-    <farm>NR EL SR WL</farm>
-  </tile>
-  <sets>
-    <tile-set id="festival">
-      <ref count="1" tile="FE/CCc" />
-      <ref count="1" tile="FE/CcCc" />
-      <ref count="1" tile="FE/CFR" />
-      <ref count="1" tile="FE/CR" />
-      <ref count="1" tile="FE/CRCR" />
-      <ref count="1" tile="FE/CRr" />
-      <ref count="1" tile="FE/LRR" />
-      <ref count="1" tile="FE/RC" />
-      <ref count="1" tile="FE/RrC" />
-      <ref count="1" tile="FE/RrRr" />
-    </tile-set>
-  </sets>
-</pack>
diff --git a/src/main/resources/tile-definitions/flier.xml b/src/main/resources/tile-definitions/flier.xml
deleted file mode 100644
index f71f4e445..000000000
--- a/src/main/resources/tile-definitions/flier.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pack>
-  <tile id="FL/F.d">
-    <flying-machine direction="NW" />
-    <farm>NL NR SL SR WL WR EL ER</farm>
-  </tile>
-  <tile id="FL/F.dG">
-    <garden />
-    <flying-machine direction="NW" />
-    <farm>NL NR SL SR WL WR EL ER</farm>
-  </tile>
-  <tile id="FL/F.o">
-    <flying-machine direction="W" />
-    <farm>NL NR SL SR WL WR EL ER</farm>
-  </tile>
-  <tile id="FL/RFr.d">
-    <flying-machine direction="NW" />
-    <road>W E</road>
-    <farm>WR NL NR EL</farm>
-    <farm>ER SL SR WL</farm>
-  </tile>
-  <tile id="FL/RFr.NS.o">
-    <flying-machine direction="W" />
-    <road>N S</road>
-    <farm>SR WL WR NL</farm>
-    <farm>NR EL ER SL</farm>
-  </tile>
-  <tile id="FL/RFr.WE.o">
-    <flying-machine direction="W" />
-    <road>W E</road>
-    <farm>WR NL NR EL</farm>
-    <farm>ER SL SR WL</farm>
-  </tile>
-  <tile id="FL/Rr.d">
-    <flying-machine direction="NW" />
-    <road>S E</road>
-    <farm>SR WL WR NL NR EL</farm>
-    <farm>ER SL</farm>
-  </tile>
-  <tile id="FL/Rr.NW.o">
-    <flying-machine direction="W" />
-    <road>N W</road>
-    <farm>WR NL</farm>
-    <farm>NR EL ER SL SR WL</farm>
-  </tile>
-  <tile id="FL/Rr.SW.o">
-    <flying-machine direction="W" />
-    <road>S W</road>
-    <farm>SR WL</farm>
-    <farm>WR NL NR EL ER SL</farm>
-  </tile>
-  <sets>
-    <tile-set id="flier:1">
-      <ref count="1" tile="FL/F.d" />
-      <ref count="1" tile="FL/F.o" />
-      <ref count="1" tile="FL/RFr.d" />
-      <ref count="1" tile="FL/RFr.NS.o" />
-      <ref count="1" tile="FL/RFr.WE.o" />
-      <ref count="1" tile="FL/Rr.d" />
-      <ref count="1" tile="FL/Rr.NW.o" />
-      <ref count="1" tile="FL/Rr.SW.o" />
-    </tile-set>
-    <tile-set id="flier:2">
-      <ref count="1" tile="FL/F.dG" />
-      <ref count="1" tile="FL/F.o" />
-      <ref count="1" tile="FL/RFr.d" />
-      <ref count="1" tile="FL/RFr.NS.o" />
-      <ref count="1" tile="FL/RFr.WE.o" />
-      <ref count="1" tile="FL/Rr.d" />
-      <ref count="1" tile="FL/Rr.NW.o" />
-      <ref count="1" tile="FL/Rr.SW.o" />
-    </tile-set>
-  </sets>
-</pack>
diff --git a/src/main/resources/tile-definitions/goldmines.xml b/src/main/resources/tile-definitions/goldmines.xml
deleted file mode 100644
index b2da521e5..000000000
--- a/src/main/resources/tile-definitions/goldmines.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pack>
-  <tiles>
-    <tile id="GO/LRr">
-      <goldmine />
-      <cloister />
-      <road>E S</road>
-      <farm>NL NR EL SR WL WR</farm>
-      <farm>ER SL</farm>
-    </tile>
-    <tile id="GO/LCc">
-      <goldmine />
-      <cloister />
-      <city>N W</city>
-      <farm city="N">SL SR EL ER</farm>
-    </tile>
-    <tile id="GO/LCcRr">
-      <goldmine />
-      <cloister />
-      <road>E S</road>
-      <city>N W</city>
-      <farm city="N">EL SR</farm>
-      <farm>ER SL</farm>
-    </tile>
-    <tile id="GO/LRrRr">
-      <goldmine />
-      <cloister />
-      <road>N E</road>
-      <road>S W</road>
-      <farm>NR EL</farm>
-      <farm>SR WL</farm>
-      <farm>WR NL ER SL</farm>
-    </tile>
-    <tile id="GO/RrRr">
-      <goldmine />
-      <road>N W</road>
-      <road>S E</road>
-      <farm>NL WR</farm>
-      <farm>SL ER</farm>
-      <farm>NR EL SR WL</farm>
-    </tile>
-    <tile id="GO/CcRr">
-      <goldmine />
-      <road>E S</road>
-      <city>N W</city>
-      <farm city="N">EL SR</farm>
-      <farm>ER SL</farm>
-    </tile>
-    <tile id="GO/CRcr">
-      <goldmine />
-      <road>N S</road>
-      <city>W E</city>
-      <farm city="W">NL</farm>
-      <farm city="W">NR</farm>
-      <farm city="W">SL</farm>
-      <farm city="W">SR</farm>
-    </tile>
-    <tile id="GO/RRrr.X">
-      <goldmine />
-      <road>N S</road>
-      <road>W E</road>
-      <farm>WR NL</farm>
-      <farm>NR EL</farm>
-      <farm>ER SL</farm>
-      <farm>SR WL</farm>
-    </tile>
-  </tiles>
-  <sets>
-    <tile-set id="goldmines">
-      <ref count="1" tile="GO/LRr" />
-      <ref count="1" tile="GO/LCc" />
-      <ref count="1" tile="GO/LCcRr" />
-      <ref count="1" tile="GO/LRrRr" />
-      <ref count="1" tile="GO/RrRr" />
-      <ref count="1" tile="GO/CcRr" />
-      <ref count="1" tile="GO/CRcr" />
-      <ref count="1" tile="GO/RRrr.X" />
-    </tile-set>
-  </sets>
-</pack>
diff --git a/src/main/resources/tile-definitions/gq11.xml b/src/main/resources/tile-definitions/gq11.xml
deleted file mode 100644
index 7868e5b30..000000000
--- a/src/main/resources/tile-definitions/gq11.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pack>
-  <tiles>
-    <tile id="GQ/RFI" max="1" group="river-spring">
-      <river>E</river>
-      <road>W</road>
-      <farm>WR NL NR EL</farm>
-      <farm>ER SL SR WL</farm>
-    </tile>
-    <tile id="GQ/CICI" group="river">
-      <river>W E</river>
-      <city>N</city>
-      <city>S</city>
-      <farm city="N">WR EL</farm>
-      <farm city="S">WL ER</farm>
-    </tile>
-    <tile id="GQ/LRRRR">
-      <cloister />
-      <road>N</road>
-      <road>W</road>
-      <road>S</road>
-      <road>E</road>
-      <farm>WR NL</farm>
-      <farm>NR EL</farm>
-      <farm>ER SL</farm>
-      <farm>SR WL</farm>
-      <wagon-move>
-        <neighbouring>CLOISTER N</neighbouring>
-        <neighbouring>CLOISTER W</neighbouring>
-        <neighbouring>CLOISTER E</neighbouring>
-        <neighbouring>CLOISTER S</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="GQ/F">
-      <farm pig="yes">NL NR SL SR WL WR EL ER</farm>
-    </tile>
-    <tile id="GQ/CRc">
-      <city>W E</city>
-      <road>S</road>
-      <farm city="W">NL NR</farm>
-      <farm city="W">SR</farm>
-      <farm city="W">SL</farm>
-      <wagon-move>
-        <neighbouring>W S</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="GQ/CRcR.1">
-      <city>W E</city>
-      <road>S</road>
-      <road>N</road>
-      <farm city="W">NR</farm>
-      <farm city="W">NL</farm>
-      <farm city="W">SR</farm>
-      <farm city="W">SL</farm>
-      <wagon-move>
-        <neighbouring>W S</neighbouring>
-        <neighbouring>W N</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="GQ/CRCr.2">
-      <road>W E</road>
-      <city>N</city>
-      <city>S</city>
-      <farm city="N">WR EL</farm>
-      <farm city="S">ER WL</farm>
-    </tile>
-    <tile id="GQ/CRRr">
-      <road>E</road>
-      <road>S W</road>
-      <city>N</city>
-      <farm city="N">EL</farm>
-      <farm city="N">ER SL WR</farm>
-      <farm>SR WL</farm>
-      <wagon-move>
-        <neighbouring>N E</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="GQ/Cc!">
-      <city>N W</city>
-      <farm city="N">SL SR</farm>
-      <farm city="N">EL ER</farm>
-    </tile>
-    <tile id="GQ/RCc">
-      <city>N W</city>
-      <road>S</road>
-      <farm city="N">SR</farm>
-      <farm city="N">SL EL ER</farm>
-      <wagon-move>
-        <neighbouring>N S</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="GQ/CcRR">
-      <city>N W</city>
-      <road>S</road>
-      <road>E</road>
-      <farm city="N">SR</farm>
-      <farm city="N">EL</farm>
-      <farm city="N">SL ER</farm>
-      <wagon-move>
-        <neighbouring>N S</neighbouring>
-        <neighbouring>N E</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="GQ/CcCR">
-      <city>N W</city>
-      <city>E</city>
-      <road>S</road>
-      <farm city="N">SR</farm>
-      <farm city="N E">SL</farm>
-      <wagon-move>
-        <neighbouring>W S</neighbouring>
-      </wagon-move>
-    </tile>
-  </tiles>
-  <sets>
-    <tile-set id="gq11">
-      <ref count="1" tile="GQ/LRRRR" />
-      <ref count="1" tile="GQ/F" />
-      <ref count="1" tile="GQ/CRc" />
-      <ref count="1" tile="GQ/CRcR.1" />
-      <ref count="1" tile="GQ/CRCr.2" />
-      <ref count="1" tile="GQ/CRRr" />
-      <ref count="1" tile="GQ/Cc!" />
-      <ref count="1" tile="GQ/RCc" />
-      <ref count="1" tile="GQ/CcRR" />
-      <ref count="1" tile="GQ/CcCR" />
-    </tile-set>
-    <tile-set id="gq11/river">
-      <ref count="1" tile="GQ/RFI" />
-      <ref count="1" tile="GQ/CICI" />      
-    </tile-set>
-  </sets>
-</pack>
diff --git a/src/main/resources/tile-definitions/hills_and_sheep.xml b/src/main/resources/tile-definitions/hills_and_sheep.xml
deleted file mode 100644
index 0fb44e003..000000000
--- a/src/main/resources/tile-definitions/hills_and_sheep.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pack>
-  <tiles>
-    <tile id="HS/C!.v">
-      <vineyard />
-      <city castle-base="false">N</city>
-      <farm city="N">WR WL SR</farm>
-      <farm city="N">EL ER SL</farm>
-    </tile>
-    <tile id="HS/CC!.v">
-      <vineyard />
-      <city>N W</city>
-      <city multi-edge="N">E</city>
-      <farm city="N E">SL SR</farm>
-    </tile>
-    <tile id="HS/Cc.h.1">
-      <hill />
-      <city>N W</city>
-      <farm city="N">SL SR EL ER</farm>
-    </tile>
-    <tile id="HS/CC.h.2">
-      <hill />
-      <city>N</city>
-      <city>W</city>
-      <farm city="N W">EL ER SL SR</farm>
-    </tile>
-    <tile id="HS/Cc.v">
-      <vineyard />
-      <city>N W</city>
-      <farm city="N">SL SR EL ER</farm>
-    </tile>
-    <tile id="HS/CFC.h">
-      <hill />
-      <city>N</city>
-      <city>S</city>
-      <farm city="N S">WL WR EL ER</farm>
-    </tile>
-    <tile id="HS/CFC.v">
-      <vineyard />
-      <city castle-base="false">W</city>
-      <city castle-base="false">E</city>
-      <farm city="W E">NL NR</farm>
-      <farm city="W E">SL SR</farm>
-    </tile>
-    <tile id="HS/CFR.h">
-      <hill />
-      <city>N</city>
-      <road>S</road>
-      <farm city="N">WL WR SR</farm>
-      <farm city="N">EL ER SL</farm>
-      <wagon-move>
-        <neighbouring>N S</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="HS/CRr.h">
-      <hill />
-      <city>N</city>
-      <road>E S</road>
-      <farm city="N">EL WL WR SR</farm>
-      <farm>ER SL</farm>
-    </tile>
-    <tile id="HS/LCRr">
-      <cloister />
-      <city>N</city>
-      <road>E S</road>
-      <farm city="N">EL WL WR SR</farm>
-      <farm>ER SL</farm>
-    </tile>
-    <tile id="HS/LRrR">
-      <cloister />
-      <road>S</road>
-      <road>N E</road>
-      <farm>ER SL SR WL WR NL</farm>
-      <farm>NR EL</farm>
-      <wagon-move>
-        <neighbouring>CLOISTER S</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="HS/RCC.v">
-      <vineyard />
-      <city>N</city>
-      <city>W</city>
-      <road>S</road>
-      <farm city="N W">SR</farm>
-      <farm city="N">EL ER SL</farm>
-      <wagon-move>
-        <neighbouring>N S</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="HS/RFR.h">
-      <hill />
-      <road>N</road>
-      <road>S</road>
-      <farm>NR EL ER SL</farm>
-      <farm>SR WL WR NL</farm>
-      <wagon-move>
-        <neighbouring>N S</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="HS/RR.h">
-      <hill />
-      <road>W</road>
-      <road>S</road>
-      <farm>WR NL NR EL ER SL</farm>
-      <farm>SR WL</farm>
-      <wagon-move>
-        <neighbouring>W S</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="HS/RR.hG">
-      <hill />
-      <garden />
-      <road>W</road>
-      <road>S</road>
-      <farm>WR NL NR EL ER SL</farm>
-      <farm>SR WL</farm>
-      <wagon-move>
-        <neighbouring>W S</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="HS/RrC.h">
-      <hill />
-      <road>S W</road>
-      <city>N</city>
-      <farm city="N">WR EL ER SL</farm>
-      <farm>WL SR</farm>
-    </tile>
-    <tile id="HS/RRr.v">
-      <vineyard />
-      <road>W E</road>
-      <road>S</road>
-      <farm>WR NL NR EL</farm>
-      <farm>ER SL SR WL</farm>
-    </tile>
-  </tiles>
-  <sets>
-    <tile-set id="hills-and-sheep:1">
-      <ref count="2" tile="HS/C!.v" />
-      <ref count="2" tile="HS/CC!.v" />
-      <ref count="1" tile="HS/Cc.h.1" />
-      <ref count="1" tile="HS/CC.h.2" />
-      <ref count="1" tile="HS/Cc.v" />
-      <ref count="1" tile="HS/CFC.h" />
-      <ref count="1" tile="HS/CFC.v" />
-      <ref count="1" tile="HS/CFR.h" />
-      <ref count="1" tile="HS/CRr.h" />
-      <ref count="1" tile="HS/LCRr" />
-      <ref count="1" tile="HS/LRrR" />
-      <ref count="1" tile="HS/RCC.v" />
-      <ref count="1" tile="HS/RFR.h" />
-      <ref count="1" tile="HS/RR.h" />
-      <ref count="1" tile="HS/RrC.h" />
-      <ref count="1" tile="HS/RRr.v" />
-    </tile-set>
-    <tile-set id="hills-and-sheep:2">
-      <ref count="2" tile="HS/C!.v" />
-      <ref count="2" tile="HS/CC!.v" />
-      <ref count="1" tile="HS/Cc.h.1" />
-      <ref count="1" tile="HS/CC.h.2" />
-      <ref count="1" tile="HS/Cc.v" />
-      <ref count="1" tile="HS/CFC.h" />
-      <ref count="1" tile="HS/CFC.v" />
-      <ref count="1" tile="HS/CFR.h" />
-      <ref count="1" tile="HS/CRr.h" />
-      <ref count="1" tile="HS/LCRr" />
-      <ref count="1" tile="HS/LRrR" />
-      <ref count="1" tile="HS/RCC.v" />
-      <ref count="1" tile="HS/RFR.h" />
-      <ref count="1" tile="HS/RR.hG" />
-      <ref count="1" tile="HS/RrC.h" />
-      <ref count="1" tile="HS/RRr.v" />
-    </tile-set>
-  </sets>
-</pack>
diff --git a/src/main/resources/tile-definitions/inns_and_cathedrals.xml b/src/main/resources/tile-definitions/inns_and_cathedrals.xml
deleted file mode 100644
index 18b579c12..000000000
--- a/src/main/resources/tile-definitions/inns_and_cathedrals.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pack>
-  <tiles>
-    <tile id="IC/Cccc.c">
-      <city cathedral="yes">N W S E</city>
-    </tile>
-    <tile id="IC/LRFR">
-      <cloister />
-      <road>W</road>
-      <road>E</road>
-      <farm>ER SL SR WL</farm>
-      <farm>EL NL NR WR</farm>
-      <wagon-move>
-        <neighbouring>CLOISTER W</neighbouring>
-        <neighbouring>CLOISTER E</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="IC/CCCC">
-      <city>N</city>
-      <city>W</city>
-      <city>E</city>
-      <city>S</city>
-      <farm city="N W E S">INNER_FARM</farm>
-    </tile>
-    <tile id="IC/CCCCG">
-      <garden />
-      <city>N</city>
-      <city>W</city>
-      <city>E</city>
-      <city>S</city>
-      <farm city="N W E S">INNER_FARM</farm>
-    </tile>
-    <tile id="IC/CCC">
-      <city>N</city>
-      <city>W</city>
-      <city>E</city>
-      <farm city="N W E">SL SR</farm>
-    </tile>
-    <tile id="IC/CRCR">
-      <city>N</city>
-      <city>S</city>
-      <road>W</road>
-      <road>E</road>
-      <farm city="S">ER</farm>
-      <farm city="S">WL</farm>
-      <farm city="N">EL</farm>
-      <farm city="N">WR</farm>
-      <wagon-move>
-        <neighbouring>W E</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="IC/CCc+">
-      <city pennant="yes">N W</city>
-      <city>S</city>
-      <farm city="N S">EL ER</farm>
-    </tile>
-    <tile id="IC/C!">
-      <city castle-base="false">N</city>
-      <farm city="N">EL ER</farm>
-      <farm city="N">WL WR SL SR</farm>
-    </tile>
-    <tile id="IC/CFR">
-      <city>N</city>
-      <road>S</road>
-      <farm city="N">WL WR SR</farm>
-      <farm city="N">EL ER SL</farm>
-      <wagon-move>
-        <neighbouring>N S</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="IC/CcR">
-      <city>N W</city>
-      <road>E</road>
-      <farm city="W">EL</farm>
-      <farm city="W">ER SL SR</farm>
-      <wagon-move>
-        <neighbouring>N E</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="IC/CRcR+">
-      <city pennant="yes">E W</city>
-      <road>N</road>
-      <road>S</road>
-      <farm city="W">NL</farm>
-      <farm city="W">NR</farm>
-      <farm city="W">SL</farm>
-      <farm city="W">SR</farm>
-      <wagon-move>
-        <neighbouring>N W</neighbouring>
-        <neighbouring>S W</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="IC/RCc.i">
-      <city>N W</city>
-      <road inn="yes">S</road>
-      <farm city="W">SR</farm>
-      <farm city="W">SL EL ER</farm>
-      <wagon-move>
-        <neighbouring>N S</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="IC/RrC.i">
-      <city>N</city>
-      <road inn="yes">W S</road>
-      <farm>SR WL</farm>
-      <farm city="N">WR EL ER SL</farm>
-    </tile>
-    <tile id="IC/CcRr+.i">
-      <city pennant="yes">N W</city>
-      <road inn="yes">E S</road>
-      <farm>SL ER</farm>
-      <farm city="N">SR EL</farm>
-    </tile>
-    <tile id="IC/RRR.i">
-      <road inn="yes">E</road>
-      <road>W</road>
-      <road>S</road>
-      <farm>WR NL NR EL</farm>
-      <farm>WL SR</farm>
-      <farm>ER SL</farm>
-      <wagon-move>
-        <neighbouring>E W S</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="IC/RFr.i">
-      <road inn="yes">W E</road>
-      <farm>WR NL NR EL</farm>
-      <farm>ER SL SR WL</farm>
-    </tile>
-    <tile id="IC/RFr.iG">
-      <garden />
-      <road inn="yes">W E</road>
-      <farm>WR NL NR EL</farm>
-      <farm>ER SL SR WL</farm>
-    </tile>
-    <tile id="IC/Rr.i">
-      <road inn="yes">W S</road>
-      <farm>WR NL NR EL ER SL</farm>
-      <farm>SR WL</farm>
-    </tile>
-    <tile id="IC/RrRr">
-      <road>N W</road>
-      <road>S E</road>
-      <farm>NL WR</farm>
-      <farm>SL ER</farm>
-      <farm>NR EL SR WL</farm>
-    </tile>
-  </tiles>
-  <sets>
-    <tile-set id="inns-and-cathedrals:1">
-      <ref count="2" tile="IC/Cccc.c" />
-      <ref count="1" tile="IC/LRFR" />
-      <ref count="1" tile="IC/CCCC" />
-      <ref count="1" tile="IC/CCC" />
-      <ref count="1" tile="IC/CRCR" />
-      <ref count="1" tile="IC/CCc+" />
-      <ref count="1" tile="IC/C!" />
-      <ref count="1" tile="IC/CFR" />
-      <ref count="1" tile="IC/CcR" />
-      <ref count="1" tile="IC/CRcR+" />
-      <ref count="1" tile="IC/RCc.i" />
-      <ref count="1" tile="IC/RrC.i" />
-      <ref count="1" tile="IC/CcRr+.i" />
-      <ref count="1" tile="IC/RRR.i" />
-      <ref count="1" tile="IC/RFr.i" />
-      <ref count="1" tile="IC/Rr.i" />
-      <ref count="1" tile="IC/RrRr" />
-    </tile-set>
-    <tile-set id="inns-and-cathedrals:2">
-      <ref count="2" tile="IC/Cccc.c" />
-      <ref count="1" tile="IC/LRFR" />
-      <ref count="1" tile="IC/CCCCG" />
-      <ref count="1" tile="IC/CCC" />
-      <ref count="1" tile="IC/CRCR" />
-      <ref count="1" tile="IC/CCc+" />
-      <ref count="1" tile="IC/C!" />
-      <ref count="1" tile="IC/CFR" />
-      <ref count="1" tile="IC/CcR" />
-      <ref count="1" tile="IC/CRcR+" />
-      <ref count="1" tile="IC/RCc.i" />
-      <ref count="1" tile="IC/RrC.i" />
-      <ref count="1" tile="IC/CcRr+.i" />
-      <ref count="1" tile="IC/RRR.i" />
-      <ref count="1" tile="IC/RFr.iG" />
-      <ref count="1" tile="IC/Rr.i" />
-      <ref count="1" tile="IC/RrRr" />
-    </tile-set>
-  </sets>
-</pack>
diff --git a/src/main/resources/tile-definitions/king_and_robber.xml b/src/main/resources/tile-definitions/king_and_robber.xml
deleted file mode 100644
index 485e05cd9..000000000
--- a/src/main/resources/tile-definitions/king_and_robber.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pack>
-  <tiles>
-    <tile id="KR/LC">
-      <cloister />
-      <city>N</city>
-      <farm city="N">EL ER SL SR WL WR</farm>
-    </tile>
-    <tile id="KR/RC">
-      <road>W</road>
-      <city>N</city>
-      <farm city="N">WR</farm>
-      <farm city="N">EL ER SL SR WL</farm>
-      <wagon-move>
-        <neighbouring>N W</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="KR/RCG">
-      <garden/>
-      <road>W</road>
-      <city>N</city>
-      <farm city="N">WR</farm>
-      <farm city="N">EL ER SL SR WL</farm>
-      <wagon-move>
-        <neighbouring>N W</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="KR/CRrR">
-      <road>W</road>
-      <road>S E</road>
-      <city>N</city>
-      <farm city="N">WR</farm>
-      <farm city="N">EL SR WL</farm>
-      <farm>SL ER</farm>
-      <wagon-move>
-        <neighbouring>N W</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="KR/CcRR!">
-      <road>S</road>
-      <road>E</road>
-      <city>N W</city>
-      <farm city="N">SR</farm>
-      <farm city="N">SL</farm>
-      <farm city="N">ER</farm>
-      <farm city="N">EL</farm>
-      <wagon-move>
-        <neighbouring>N E</neighbouring>
-        <neighbouring>N S</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="KR/CCcc">
-      <city>W E</city>
-      <city>N S</city>
-      <farm city="N W">INNER_FARM</farm>
-      <farm city="N W">INNER_FARM_B</farm>
-    </tile>
-  </tiles>
-  <sets>
-    <tile-set id="king-and-robber:1">
-      <ref count="1" tile="KR/LC" />
-      <ref count="1" tile="KR/RC" />
-      <ref count="1" tile="KR/CRrR" />
-      <ref count="1" tile="KR/CcRR!" />
-      <ref count="1" tile="KR/CCcc" />
-    </tile-set>
-    <tile-set id="king-and-robber:2">
-      <ref count="1" tile="KR/LC" />
-      <ref count="1" tile="KR/RCG" />
-      <ref count="1" tile="KR/CRrR" />
-      <ref count="1" tile="KR/CcRR!" />
-      <ref count="1" tile="KR/CCcc" />
-    </tile-set>
-  </sets>
-</pack>
diff --git a/src/main/resources/tile-definitions/labyrinth.xml b/src/main/resources/tile-definitions/labyrinth.xml
deleted file mode 100644
index 1e6d94c2a..000000000
--- a/src/main/resources/tile-definitions/labyrinth.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pack>
-  <tiles>
-    <tile id="LA/Rrrr">
-      <road labyrinth="true">N W E S</road>
-      <farm>WR NL</farm>
-      <farm>NR EL</farm>
-      <farm>ER SL</farm>
-      <farm>SR WL</farm>
-    </tile>
-  </tiles>
-  <sets>
-    <tile-set id="labyrinth">
-      <ref count="1" tile="LA/Rrrr" />
-    </tile-set>
-  </sets>
-</pack>
diff --git a/src/main/resources/tile-definitions/mage_and_witch.xml b/src/main/resources/tile-definitions/mage_and_witch.xml
deleted file mode 100644
index 4cb205c89..000000000
--- a/src/main/resources/tile-definitions/mage_and_witch.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pack>
-  <tiles>
-    <tile id="MW/CRRR.3">
-      <mage></mage>
-      <road>E</road>
-      <road>S</road>
-      <road>W</road>
-      <city>N</city>
-      <farm city="N">WR EL</farm>
-      <farm>WL SR</farm>
-      <farm>ER SL</farm>
-      <wagon-move>
-        <neighbouring>W S E</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="MW/CcRr.1">
-      <mage></mage>
-      <road>E S</road>
-      <city>N W</city>
-      <farm city="N">EL SR</farm>
-      <farm>ER SL</farm>
-    </tile>
-    <tile id="MW/CCCR.3">
-      <mage></mage>
-      <city>W</city>
-      <city>N</city>
-      <city>E</city>
-      <road>S</road>
-      <farm city="W N E">SR</farm>
-      <farm city="E">SL</farm>
-      <wagon-move>
-        <neighbouring>S E</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="MW/CRcR">
-      <mage></mage>
-      <city>E W</city>
-      <road>N</road>
-      <road>S</road>
-      <farm city="W">NL</farm>
-      <farm city="W">NR</farm>
-      <farm city="W">SL</farm>
-      <farm city="W">SR</farm>
-      <wagon-move>
-        <neighbouring>N W</neighbouring>
-        <neighbouring>S W</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="MW/CFC">
-      <mage></mage>
-      <city>N</city>
-      <city>S</city>
-      <farm city="N S">WL WR EL ER</farm>
-    </tile>
-    <tile id="MW/CccR.1">
-      <mage></mage>
-      <road>S</road>
-      <city>N W E</city>
-      <farm city="N">SL</farm>
-      <farm city="N">SR</farm>
-      <wagon-move>
-        <neighbouring>N S</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="MW/CRRr.2">
-      <mage></mage>
-      <road>E</road>
-      <road>S W</road>
-      <city>N</city>
-      <farm city="N">EL</farm>
-      <farm city="N">ER SL WR</farm>
-      <farm>SR WL</farm>
-      <wagon-move>
-        <neighbouring>N E</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="MW/CCRr.2">
-      <mage></mage>
-      <city>N</city>
-      <city>W</city>
-      <road>S E</road>
-      <farm city="N W">EL SR</farm>
-      <farm>ER SL</farm>
-    </tile>
-    <tile id="MW/CCRrG">
-      <mage></mage>
-      <garden/>
-      <city>N</city>
-      <city>W</city>
-      <road>S E</road>
-      <farm city="N W">EL SR</farm>
-      <farm>ER SL</farm>
-    </tile>
-  </tiles>
-  <sets>
-    <tile-set id="mage-and-witch:1">
-      <ref count="1" tile="MW/CRRR.3" />
-      <ref count="1" tile="MW/CcRr.1" />
-      <ref count="1" tile="MW/CCCR.3" />
-      <ref count="1" tile="MW/CRcR" />
-      <ref count="1" tile="MW/CFC" />
-      <ref count="1" tile="MW/CccR.1" />
-      <ref count="1" tile="MW/CRRr.2" />
-      <ref count="1" tile="MW/CCRr.2" />
-    </tile-set>
-    <tile-set id="mage-and-witch:2">
-      <ref count="1" tile="MW/CRRR.3" />
-      <ref count="1" tile="MW/CcRr.1" />
-      <ref count="1" tile="MW/CCCR.3" />
-      <ref count="1" tile="MW/CRcR" />
-      <ref count="1" tile="MW/CFC" />
-      <ref count="1" tile="MW/CccR.1" />
-      <ref count="1" tile="MW/CRRr.2" />
-      <ref count="1" tile="MW/CCRrG" />
-    </tile-set>
-  </sets>
-</pack>
diff --git a/src/main/resources/tile-definitions/monasteries.xml b/src/main/resources/tile-definitions/monasteries.xml
deleted file mode 100644
index 730b7d793..000000000
--- a/src/main/resources/tile-definitions/monasteries.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pack>
-  <tiles>
-    <tile id="MO/M1">
-      <cloister monastery="yes" />
-      <farm>NL NR EL ER SL SR WL WR</farm>
-    </tile>
-    <tile id="MO/M2">
-      <cloister monastery="yes" />
-      <farm>NL NR EL ER SL SR WL WR</farm>
-    </tile>
-    <tile id="MO/M3">
-      <cloister monastery="yes" />
-      <farm>NL NR EL ER SL SR WL WR</farm>
-    </tile>
-    <tile id="MO/M4">
-      <cloister monastery="yes" />
-      <farm>NL NR EL ER SL SR WL WR</farm>
-    </tile>
-    <tile id="MO/MR1">
-      <cloister monastery="yes" />
-      <road>S</road>
-      <farm>NL NR EL ER SL SR WL WR</farm>
-      <wagon-move>
-        <neighbouring>CLOISTER S</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="MO/MR2">
-      <cloister monastery="yes" />
-      <road>S</road>
-      <farm>NL NR EL ER SL SR WL WR</farm>
-      <wagon-move>
-        <neighbouring>CLOISTER S</neighbouring>
-      </wagon-move>
-    </tile>
-  </tiles>
-  <sets>
-    <tile-set id="monasteries">
-      <ref count="1" tile="MO/M1" />
-      <ref count="1" tile="MO/M2" />
-      <ref count="1" tile="MO/M3" />
-      <ref count="1" tile="MO/M4" />
-      <ref count="1" tile="MO/MR1" />
-      <ref count="1" tile="MO/MR2" />
-    </tile-set>
-  </sets>
-</pack>
diff --git a/src/main/resources/tile-definitions/princess_and_dragon.xml b/src/main/resources/tile-definitions/princess_and_dragon.xml
deleted file mode 100644
index 2842fdad3..000000000
--- a/src/main/resources/tile-definitions/princess_and_dragon.xml
+++ /dev/null
@@ -1,280 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pack>
-  <tiles>
-    <tile id="DG/F.v">
-      <volcano />
-      <farm>NL NR EL ER SL SR WL WR</farm>
-    </tile>
-    <tile id="DG/RrRr.g">
-      <portal />
-      <road>N W</road>
-      <road>S E</road>
-      <farm>NL WR</farm>
-      <farm>SL ER</farm>
-      <farm>NR EL SR WL</farm>
-    </tile>
-    <tile id="DG/R.v">
-      <volcano />
-      <road>S</road>
-      <farm>NL NR EL ER SL SR WL WR</farm>
-    </tile>
-    <tile id="DG/C.d">
-      <dragon />
-      <city>N</city>
-      <farm city="N">EL ER SL SR WL WR</farm>
-    </tile>
-    <tile id="DG/C.dG">
-      <dragon />
-      <garden />
-      <city>N</city>
-      <farm city="N">EL ER SL SR WL WR</farm>
-    </tile>
-    <tile id="DG/C.v">
-      <volcano />
-      <city>N</city>
-      <farm city="N">EL ER SL SR WL WR</farm>
-    </tile>
-    <tile id="DG/LRRR.d">
-      <dragon />
-      <cloister />
-      <road>E</road>
-      <road>S</road>
-      <road>W</road>
-      <farm>WR NL NR EL</farm>
-      <farm>ER SL</farm>
-      <farm>WL SR</farm>
-      <wagon-move>
-        <neighbouring>CLOISTER W</neighbouring>
-        <neighbouring>CLOISTER S</neighbouring>
-        <neighbouring>CLOISTER E</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="DG/RRR.d">
-      <dragon />
-      <road>E</road>
-      <road>S</road>
-      <road>W</road>
-      <farm>WR NL NR EL</farm>
-      <farm>ER SL</farm>
-      <farm>SR WL</farm>
-      <wagon-move>
-        <neighbouring>E S W</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="DG/RRR.g">
-      <portal />
-      <road>E</road>
-      <road>S</road>
-      <road>W</road>
-      <farm>WR NL NR EL</farm>
-      <farm>ER SL</farm>
-      <farm>SR WL</farm>
-      <wagon-move>
-        <neighbouring>E S W</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="DG/CRRR.p">
-      <road>E</road>
-      <road>S</road>
-      <road>W</road>
-      <city princess="yes">N</city>
-      <farm city="N">WR EL</farm>
-      <farm>WL SR</farm>
-      <farm>ER SL</farm>
-      <wagon-move>
-        <neighbouring>E S W</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="DG/CCc+.p">
-      <city princess="yes" castle-base="false">N</city>
-      <city pennant="yes">E S</city>
-      <farm city="N">WL WR</farm>
-      <farm city="N S">INNER_FARM</farm>
-    </tile>
-    <tile id="DG/Ccc.p">
-      <city princess="yes">N E W</city>
-      <farm city="N">SL SR</farm>
-    </tile>
-    <tile id="DG/Ccc+.g">
-      <portal />
-      <city pennant="yes">N E W</city>
-      <farm city="N">SL SR</farm>
-    </tile>
-    <tile id="DG/LCcc.d">
-      <dragon />
-      <cloister />
-      <city>N E W</city>
-      <farm city="N">SL SR</farm>
-      <wagon-move>
-        <neighbouring>CLOISTER N</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="DG/Rr.d">
-      <dragon />
-      <road>W S</road>
-      <farm>WR NL NR EL ER SL</farm>
-      <farm>SR WL</farm>
-    </tile>
-    <tile id="DG/Rr.v">
-      <volcano />
-      <road>W S</road>
-      <farm>WR NL NR EL ER SL</farm>
-      <farm>SR WL</farm>
-    </tile>
-    <tile id="DG/RFr.d">
-      <dragon />
-      <road>W E</road>
-      <farm>WR NL NR EL</farm>
-      <farm>WL SL SR ER</farm>
-    </tile>
-    <tile id="DG/RFr.v">
-      <volcano />
-      <road>W E</road>
-      <farm>WR NL NR EL</farm>
-      <farm>WL SL SR ER</farm>
-    </tile>
-    <tile id="DG/Cc!.p">
-      <city princess="yes">N W</city>
-      <farm city="N">EL ER</farm>
-      <farm city="N">SL SR</farm>
-    </tile>
-    <tile id="DG/Cc.d">
-      <dragon />
-      <city>N W</city>
-      <farm city="N">SL SR EL ER</farm>
-    </tile>
-    <tile id="DG/Cc.p">
-      <city princess="yes">N W</city>
-      <farm city="N">SL SR EL ER</farm>
-    </tile>
-    <tile id="DG/Cc.pG">
-      <garden />
-      <city princess="yes">N W</city>
-      <farm city="N">SL SR EL ER</farm>
-    </tile>
-    <tile id="DG/CC.v">
-      <volcano />
-      <city>E</city>
-      <city>N</city>
-      <farm city="N E">WL WR SL SR</farm>
-    </tile>
-    <tile id="DG/CFc+.d">
-      <dragon />
-      <city pennant="yes">W E</city>
-      <farm city="W">NL NR</farm>
-      <farm city="W">SL SR</farm>
-    </tile>
-    <tile id="DG/CcRr.p">
-      <road>E S</road>
-      <city princess="yes">N W</city>
-      <farm city="N">EL SR</farm>
-      <farm>ER SL</farm>
-    </tile>
-    <tile id="DG/CcRr.g">
-      <portal />
-      <road>E S</road>
-      <city>N W</city>
-      <farm city="N">EL SR</farm>
-      <farm>ER SL</farm>
-    </tile>
-    <tile id="DG/CRcr.d">
-      <dragon />
-      <city>E W</city>
-      <road tunnel="yes">N S</road>
-      <farm city="W">NL NR</farm>
-      <farm city="W">SL SR</farm>
-    </tile>
-    <tile id="DG/RrC.d">
-      <dragon />
-      <road>S W</road>
-      <city>N</city>
-      <farm city="N">WR EL ER SL</farm>
-      <farm>WL SR</farm>
-    </tile>
-    <tile id="DG/RrC.g">
-      <portal />
-      <road>S W</road>
-      <city>N</city>
-      <farm city="N">WR EL ER SL</farm>
-      <farm>WL SR</farm>
-    </tile>
-    <tile id="DG/CRr.d">
-      <dragon />
-      <road>E S</road>
-      <city>N</city>
-      <farm city="N">EL WL WR SR</farm>
-      <farm>ER SL</farm>
-    </tile>
-    <tile id="DG/CRr.g">
-      <portal />
-      <road>E S</road>
-      <city>N</city>
-      <farm city="N">EL WL WR SR</farm>
-      <farm>ER SL</farm>
-    </tile>
-  </tiles>
-  <sets>
-    <tile-set id="princess-and-dragon:1">
-      <ref count="1" tile="DG/F.v" />
-      <ref count="1" tile="DG/RrRr.g" />
-      <ref count="1" tile="DG/R.v" />
-      <ref count="1" tile="DG/C.d" />
-      <ref count="1" tile="DG/C.v" />
-      <ref count="1" tile="DG/LRRR.d" />
-      <ref count="1" tile="DG/RRR.d" />
-      <ref count="1" tile="DG/RRR.g" />
-      <ref count="1" tile="DG/CRRR.p" />
-      <ref count="1" tile="DG/CCc+.p" />
-      <ref count="1" tile="DG/Ccc.p" />
-      <ref count="1" tile="DG/Ccc+.g" />
-      <ref count="1" tile="DG/LCcc.d" />
-      <ref count="2" tile="DG/Rr.d" />
-      <ref count="1" tile="DG/Rr.v" />
-      <ref count="1" tile="DG/RFr.d" />
-      <ref count="1" tile="DG/RFr.v" />
-      <ref count="1" tile="DG/Cc!.p" />
-      <ref count="1" tile="DG/Cc.d" />
-      <ref count="1" tile="DG/Cc.p" />
-      <ref count="1" tile="DG/CC.v" />
-      <ref count="1" tile="DG/CFc+.d" />
-      <ref count="1" tile="DG/CcRr.p" />
-      <ref count="1" tile="DG/CcRr.g" />
-      <ref count="1" tile="DG/CRcr.d" />
-      <ref count="1" tile="DG/RrC.d" />
-      <ref count="1" tile="DG/RrC.g" />
-      <ref count="1" tile="DG/CRr.d" />
-      <ref count="1" tile="DG/CRr.g" />
-    </tile-set>
-    <tile-set id="princess-and-dragon:2">
-      <ref count="1" tile="DG/F.v" />
-      <ref count="1" tile="DG/RrRr.g" />
-      <ref count="1" tile="DG/R.v" />
-      <ref count="1" tile="DG/C.dG" />
-      <ref count="1" tile="DG/C.v" />
-      <ref count="1" tile="DG/LRRR.d" />
-      <ref count="1" tile="DG/RRR.d" />
-      <ref count="1" tile="DG/RRR.g" />
-      <ref count="1" tile="DG/CRRR.p" />
-      <ref count="1" tile="DG/CCc+.p" />
-      <ref count="1" tile="DG/Ccc.p" />
-      <ref count="1" tile="DG/Ccc+.g" />
-      <ref count="1" tile="DG/LCcc.d" />
-      <ref count="2" tile="DG/Rr.d" />
-      <ref count="1" tile="DG/Rr.v" />
-      <ref count="1" tile="DG/RFr.d" />
-      <ref count="1" tile="DG/RFr.v" />
-      <ref count="1" tile="DG/Cc!.p" />
-      <ref count="1" tile="DG/Cc.d" />
-      <ref count="1" tile="DG/Cc.pG" />
-      <ref count="1" tile="DG/CC.v" />
-      <ref count="1" tile="DG/CFc+.d" />
-      <ref count="1" tile="DG/CcRr.p" />
-      <ref count="1" tile="DG/CcRr.g" />
-      <ref count="1" tile="DG/CRcr.d" />
-      <ref count="1" tile="DG/RrC.d" />
-      <ref count="1" tile="DG/RrC.g" />
-      <ref count="1" tile="DG/CRr.d" />
-      <ref count="1" tile="DG/CRr.g" />
-    </tile-set>
-  </sets>
-</pack>
diff --git a/src/main/resources/tile-definitions/river.xml b/src/main/resources/tile-definitions/river.xml
deleted file mode 100644
index 6a0dd0f3d..000000000
--- a/src/main/resources/tile-definitions/river.xml
+++ /dev/null
@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pack>
-  <tiles>
-    <tile id="RI/s" max="1" group="river-spring">
-      <farm>NL NR EL ER SL SR WL WR</farm>
-      <river>E</river>
-    </tile>
-    <tile id="RI.1/I.e" max="1" group="river-lake">
-      <farm>NL NR EL ER SL SR WL WR</farm>
-      <river>W</river>
-    </tile>
-    <tile id="RI.1/CICI" group="river">
-      <city>N</city>
-      <city>S</city>
-      <farm city="N">EL WR</farm>
-      <farm city="S">ER WL</farm>
-      <river>W E</river>
-    </tile>
-    <tile id="RI.1/CIRI" group="river">
-      <city>N</city>
-      <road>S</road>
-      <farm city="N">EL</farm>
-      <farm city="N">WR</farm>
-      <farm>ER SL</farm>
-      <farm>WL SR</farm>
-      <river>W E</river>
-      <wagon-move>
-        <neighbouring>N S</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="RI.1/LIRI" group="river">
-      <cloister />
-      <road>S</road>
-      <farm>WR NL NR EL</farm>
-      <farm>ER SL</farm>
-      <farm>WL SR</farm>
-      <river>W E</river>
-      <wagon-move>
-        <neighbouring>CLOISTER S</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="RI.1/RIrI" group="river">
-      <road>W E</road>
-      <farm>WR NL</farm>
-      <farm>NR EL</farm>
-      <farm>ER SL</farm>
-      <farm>WL SR</farm>
-      <river>N S</river>
-    </tile>
-    <tile id="RI.1/IFI" group="river">
-      <farm>WR NL NR EL</farm>
-      <farm>WL SL SR ER</farm>
-      <river>W E</river>
-    </tile>
-    <tile id="RI.1/CcII" group="river">
-      <city>N W</city>
-      <farm city="N">SR EL</farm>
-      <farm>ER SL</farm>
-      <river>S E</river>
-    </tile>
-    <tile id="RI.1/RrII" group="river">
-      <road>N E</road>
-      <farm>WR NL ER SL</farm>
-      <farm>NR EL</farm>
-      <farm>WL SR</farm>
-      <river>W S</river>
-    </tile>
-    <tile id="RI.1/II" group="river">
-      <farm>WR NL NR EL ER SL</farm>
-      <farm>WL SR</farm>
-      <river>W S</river>
-    </tile>
-    <tile id="RI.1/IIG" group="river">
-      <garden />
-      <farm>WR NL NR EL ER SL</farm>
-      <farm>WL SR</farm>
-      <river>W S</river>
-    </tile>
-
-    <tile id="RI.2/IFC" group="river">
-      <city>E</city>
-      <farm city="E">NL NR WR</farm>
-      <farm city="E">SL SR WL</farm>
-      <river>W</river>
-    </tile>
-    <tile id="RI.2/I.v" max="1" group="river-lake">
-      <volcano />
-      <farm>NL NR EL ER SL SR WL WR</farm>
-      <river>W</river>
-    </tile>
-    <tile id="RI.2/III" group="river-fork">
-      <farm>WR NL</farm>
-      <farm>NR EL</farm>
-      <farm>ER SL SR WL</farm>
-      <river>W N E</river>
-    </tile>
-    <tile id="RI.2/CIcI" group="river">
-      <city>W E</city>
-      <farm city="W">NR SL</farm>
-      <farm city="W">NL SR</farm>
-      <river>N S</river>
-    </tile>
-    <tile id="RI.2/LIFI" group="river">
-      <cloister />
-      <farm>WR NL NR EL</farm>
-      <farm>WL SL SR ER</farm>
-      <river>W E</river>
-    </tile>
-    <tile id="RI.2/RIrI" group="river">
-      <road inn="yes">W E</road>
-      <farm>WR NL</farm>
-      <farm>NR EL</farm>
-      <farm>ER SL</farm>
-      <farm>WL SR</farm>
-      <river>N S</river>
-    </tile>
-    <tile id="RI.2/CIRI" group="river">
-      <city>N</city>
-      <road>S</road>
-      <farm city="N">EL</farm>
-      <farm city="N">WR</farm>
-      <farm>ER SL</farm>
-      <farm>WL SR</farm>
-      <river>W E</river>
-      <wagon-move>
-        <neighbouring>N S</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="RI.2/II" group="river">
-      <farm>WR NL NR EL ER SL</farm>
-      <farm>WL SR</farm>
-      <river>W S</river>
-    </tile>
-    <tile id="RI.2/IIG" group="river">
-      <garden />
-      <farm>WR NL NR EL ER SL</farm>
-      <farm>WL SR</farm>
-      <river>W S</river>
-    </tile>
-    <tile id="RI.2/CcII+" group="river">
-      <city pennant="yes">N W</city>
-      <farm city="N">SR EL</farm>
-      <farm>ER SL</farm>
-      <river>S E</river>
-    </tile>
-    <tile id="RI.2/II+" group="river">
-      <farm pig="yes">WL SL SR EL ER NR</farm>
-      <farm>WR NL</farm>
-      <river>W N</river>
-    </tile>
-    <tile id="RI.2/RrII" group="river">
-      <road>N E</road>
-      <farm>WR NL ER SL</farm>
-      <farm>NR EL</farm>
-      <farm>WL SR</farm>
-      <river>W S</river>
-    </tile>
-  </tiles>
-  <sets>
-    <tile-set id="river/1:1">
-      <ref count="1" tile="RI/s" />
-      <ref count="1" tile="RI.1/I.e" />
-      <ref count="1" tile="RI.1/CICI" />
-      <ref count="1" tile="RI.1/CIRI" />
-      <ref count="1" tile="RI.1/LIRI" />
-      <ref count="1" tile="RI.1/RIrI" />
-      <ref count="2" tile="RI.1/IFI" />
-      <ref count="1" tile="RI.1/CcII" />
-      <ref count="1" tile="RI.1/RrII" />
-      <ref count="2" tile="RI.1/II" />
-    </tile-set>
-    <tile-set id="river/1:2">
-      <ref count="1" tile="RI/s" />
-      <ref count="1" tile="RI.1/I.e" />
-      <ref count="1" tile="RI.1/CICI" />
-      <ref count="1" tile="RI.1/CIRI" />
-      <ref count="1" tile="RI.1/LIRI" />
-      <ref count="1" tile="RI.1/RIrI" />
-      <ref count="2" tile="RI.1/IFI" />
-      <ref count="1" tile="RI.1/CcII" />
-      <ref count="1" tile="RI.1/RrII" />
-      <ref count="1" tile="RI.1/II" />
-      <ref count="1" tile="RI.1/IIG" />
-    </tile-set>
-
-    <tile-set id="river/2:1" max="1">
-      <remove tile="RI.1/I.e" />
-
-      <ref count="1" tile="RI/s" />
-      <ref count="1" tile="RI.2/IFC" />
-      <ref count="1" tile="RI.2/I.v" />
-      <ref count="1" tile="RI.2/III" />
-      <ref count="1" tile="RI.2/CIcI" />
-      <ref count="1" tile="RI.2/LIFI" />
-      <ref count="1" tile="RI.2/RIrI" />
-      <ref count="1" tile="RI.2/CIRI" />
-      <ref count="1" tile="RI.2/II" />
-      <ref count="1" tile="RI.2/CcII+" />
-      <ref count="1" tile="RI.2/II+" />
-      <ref count="1" tile="RI.2/RrII" />
-    </tile-set>
-    <tile-set id="river/2:2" max="1">
-      <remove tile="RI.1/I.e" />
-
-      <ref count="1" tile="RI/s" />
-      <ref count="1" tile="RI.2/IFC" />
-      <ref count="1" tile="RI.2/I.v" />
-      <ref count="1" tile="RI.2/III" />
-      <ref count="1" tile="RI.2/CIcI" />
-      <ref count="1" tile="RI.2/LIFI" />
-      <ref count="1" tile="RI.2/RIrI" />
-      <ref count="1" tile="RI.2/CIRI" />
-      <ref count="1" tile="RI.2/IIG" />
-      <ref count="1" tile="RI.2/CcII+" />
-      <ref count="1" tile="RI.2/II+" />
-      <ref count="1" tile="RI.2/RrII" />
-    </tile-set>
-  </sets>
-</pack>
diff --git a/src/main/resources/tile-definitions/russian_promos.xml b/src/main/resources/tile-definitions/russian_promos.xml
deleted file mode 100644
index cbf0c9e64..000000000
--- a/src/main/resources/tile-definitions/russian_promos.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pack>
-  <tiles>
-    <tile id="RU/L">
-      <yaga-hut />
-      <farm>NL NR EL ER SL SR WL WR</farm>
-    </tile>
-    <tile id="RU/RRrr">
-      <road>N</road>
-      <road>E S W</road>
-      <farm>WR NL</farm>
-      <farm>NR EL</farm>
-      <farm>ER SL</farm>
-      <farm>SR WL</farm>
-      <wagon-move>
-        <neighbouring>N S</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="RU/SR">
-      <razboynik></razboynik>
-      <road>W E</road>
-      <farm>WR NL NR EL</farm>
-      <farm>ER SL SR WL</farm>
-    </tile>
-    <tile id="RU/V">
-      <vodyanoy></vodyanoy>
-      <farm pig="yes">NL NR SL SR WL WR EL ER</farm>
-    </tile>
-  </tiles>
-  <sets>
-    <tile-set id="russian-promos/2013">
-      <ref count="1" tile="RU/L" />
-      <ref count="1" tile="RU/RRrr" />
-    </tile-set>
-    <tile-set id="russian-promos/2016">
-      <ref count="1" tile="RU/SR" />
-      <ref count="1" tile="RU/V" />
-    </tile-set>
-  </sets>
-</pack>
diff --git a/src/main/resources/tile-definitions/siege.xml b/src/main/resources/tile-definitions/siege.xml
deleted file mode 100644
index 6f112df14..000000000
--- a/src/main/resources/tile-definitions/siege.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pack>
-  <tiles>
-    <tile id="SI.BE/Ccc">
-      <city besieged="yes">N E W</city>
-      <farm city="N">SL SR</farm>
-    </tile>
-    <tile id="SI.BE/CcR">
-      <city besieged="yes">N W</city>
-      <road>E</road>
-      <farm city="W">EL</farm>
-      <farm city="W">ER SL SR</farm>
-      <wagon-move>
-        <neighbouring>N E</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="SI.BE/CFR">
-      <city besieged="yes">N</city>
-      <road>S</road>
-      <farm city="N">WL WR SR</farm>
-      <farm city="N">EL ER SL</farm>
-      <wagon-move>
-        <neighbouring>N S</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="SI.BE/CRr">
-      <road>E S</road>
-      <city besieged="yes">N</city>
-      <farm city="N">EL WL WR SR</farm>
-      <farm>ER SL</farm>
-    </tile>
-    <tile id="SI.BE/RCc">
-      <city besieged="yes">N W</city>
-      <road>S</road>
-      <farm city="W">SR</farm>
-      <farm city="W">SL EL ER</farm>
-      <wagon-move>
-        <neighbouring>N S</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="SI.BE/RrC">
-      <road>S W</road>
-      <city besieged="yes">N</city>
-      <farm city="N">WR EL ER SL</farm>
-      <farm>WL SR</farm>
-    </tile>
-
-    <tile id="SI.CA/C">
-      <city besieged="yes">N</city>
-      <farm city="N">WL WR SL SR EL ER</farm>
-    </tile>
-    <tile id="SI.CA/RCr">
-      <city besieged="yes">N</city>
-      <road>W E</road>
-      <farm city="N">WR EL</farm>
-      <farm>WL SL SR ER</farm>
-    </tile>
-    <tile id="SI.CA/Cc">
-      <city besieged="yes">N W</city>
-      <farm city="N">EL ER SL SR</farm>
-    </tile>
-    <tile id="SI.CA/CcRr">
-      <city besieged="yes">N W</city>
-      <road>S E</road>
-      <farm city="N">EL SR</farm>
-      <farm>ER SL</farm>
-    </tile>
-  </tiles>
-  <sets>
-    <tile-set id="siege/besiegers">
-      <ref count="1" tile="SI.BE/Ccc" />
-      <ref count="1" tile="SI.BE/CcR" />
-      <ref count="1" tile="SI.BE/CFR" />
-      <ref count="1" tile="SI.BE/CRr" />
-      <ref count="1" tile="SI.BE/RCc" />
-      <ref count="1" tile="SI.BE/RrC" />
-    </tile-set>
-    <tile-set id="siege/cathars">
-      <ref count="1" tile="SI.CA/C" />
-      <ref count="1" tile="SI.CA/RCr" />
-      <ref count="1" tile="SI.CA/Cc" />
-      <ref count="1" tile="SI.CA/CcRr" />
-    </tile-set>
-  </sets>
-</pack>
diff --git a/src/main/resources/tile-definitions/spiel-doch.xml b/src/main/resources/tile-definitions/spiel-doch.xml
deleted file mode 100644
index 01586f769..000000000
--- a/src/main/resources/tile-definitions/spiel-doch.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pack>
-  <tiles>
-    <tile id="SD/CC">
-      <city>N</city>
-      <city>W</city>
-      <farm city="N W">EL ER SL SR</farm>
-    </tile>
-    <tile id="SD/RRR">
-      <road>E</road>
-      <road>S</road>
-      <road>W</road>
-      <farm>WR NL NR EL</farm>
-      <farm>ER SL</farm>
-      <farm>SR WL</farm>
-      <wagon-move>
-        <neighbouring>E S W</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="SD/RRRG">
-      <garden/>
-      <road>E</road>
-      <road>S</road>
-      <road>W</road>
-      <farm>WR NL NR EL</farm>
-      <farm>ER SL</farm>
-      <farm>SR WL</farm>
-      <wagon-move>
-        <neighbouring>E S W</neighbouring>
-      </wagon-move>
-    </tile>
-  </tiles>
-  <sets>
-    <tile-set id="spiel-doch:1">
-      <ref count="1" tile="SD/CC" />
-      <ref count="1" tile="SD/RRR" />      
-    </tile-set>
-    <tile-set id="spiel-doch:2">
-      <ref count="1" tile="SD/CC" />
-      <ref count="1" tile="SD/RRRG" />      
-    </tile-set>    
-  </sets>
-</pack>
diff --git a/src/main/resources/tile-definitions/tower.xml b/src/main/resources/tile-definitions/tower.xml
deleted file mode 100644
index 6f4ba51c3..000000000
--- a/src/main/resources/tile-definitions/tower.xml
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pack>
-  <tiles>
-    <tile id="TO/C">
-      <tower />
-      <city>N</city>
-      <farm city="N">WL WR SL SR EL ER</farm>
-    </tile>
-    <tile id="TO/F">
-      <tower />
-      <farm>NL NR EL ER SL SR WL WR</farm>
-    </tile>
-    <tile id="TO/FG">
-      <garden/>
-      <tower />
-      <farm>NL NR EL ER SL SR WL WR</farm>
-    </tile>
-    <tile id="TO/L">
-      <tower />
-      <cloister />
-      <farm>NL NR EL ER SL SR WL WR</farm>
-    </tile>
-    <tile id="TO/RR">
-      <tower />
-      <road>W</road>
-      <road>S</road>
-      <farm>WR NL NR EL ER SL</farm>
-      <farm>WL SR</farm>
-    </tile>
-    <tile id="TO/RRG">
-      <garden/>
-      <tower />
-      <road>W</road>
-      <road>S</road>
-      <farm>WR NL NR EL ER SL</farm>
-      <farm>WL SR</farm>
-    </tile>
-    <tile id="TO/RRR">
-      <tower />
-      <road>W</road>
-      <road>N</road>
-      <road>E</road>
-      <farm>WR NL</farm>
-      <farm>NR EL</farm>
-      <farm>ER SL SR WL</farm>
-    </tile>
-    <tile id="TO/RrRr.2">
-      <tower />
-      <road>N W</road>
-      <road>S E</road>
-      <farm>NL WR</farm>
-      <farm>SL ER</farm>
-      <farm>NR EL SR WL</farm>
-    </tile>
-    <tile id="TO/RRRR.1">
-      <tower />
-      <road>N</road>
-      <road>E</road>
-      <road>S</road>
-      <road>W</road>
-      <farm>WR NL</farm>
-      <farm>NR EL</farm>
-      <farm>ER SL</farm>
-      <farm>SR WL</farm>
-    </tile>
-    <tile id="TO/CRcr">
-      <tower />
-      <road>N S</road>
-      <city>W E</city>
-      <farm city="W">NL</farm>
-      <farm city="W">NR</farm>
-      <farm city="W">SL</farm>
-      <farm city="W">SR</farm>
-    </tile>
-    <tile id="TO/CFR">
-      <tower />
-      <city>N</city>
-      <road>S</road>
-      <farm city="N">WL WR SR</farm>
-      <farm city="N">EL ER SL</farm>
-    </tile>
-    <tile id="TO/RrC">
-      <tower />
-      <road>S W</road>
-      <city>N</city>
-      <farm city="N">WR EL ER SL</farm>
-      <farm>WL SR</farm>
-    </tile>
-    <tile id="TO/RCr">
-      <tower />
-      <city>N</city>
-      <road>W E</road>
-      <farm city="N">WR</farm>
-      <farm city="N">EL</farm>
-      <farm>WL SL SR ER</farm>
-    </tile>
-    <tile id="TO/Cc">
-      <tower />
-      <city>N W</city>
-      <farm city="N">SL SR EL ER</farm>
-    </tile>
-    <tile id="TO/CcR!">
-      <tower />
-      <road>E</road>
-      <city>N W</city>
-      <farm city="N">EL</farm>
-      <farm city="N">ER</farm>
-      <farm city="N">SL SR</farm>
-      <wagon-move>
-        <neighbouring>N E</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="TO/CC.2">
-      <tower />
-      <city>N</city>
-      <city>W</city>
-      <farm city="N W">EL ER SL SR</farm>
-    </tile>
-    <tile id="TO/CRCr.2">
-      <tower />
-      <road>W E</road>
-      <city>N</city> <!-- tower in city - no castle base -->
-      <city>S</city>
-      <farm city="N">WR EL</farm>
-      <farm city="S">ER WL</farm>
-    </tile>
-    <tile id="TO/CccR">
-      <tower />
-      <road>S</road>
-      <city>N W E</city>
-      <farm city="N">SL</farm>
-      <farm city="N">SR</farm>
-      <wagon-move>
-        <neighbouring>N S</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="TO/CccC+">
-      <tower />
-      <city pennant="yes">N W E</city>
-      <city>S</city>
-      <farm city="W S">INNER_FARM</farm>
-    </tile>
-  </tiles>
-  <sets>
-    <tile-set id="tower:1">
-      <ref count="2" tile="TO/C" />
-      <ref count="1" tile="TO/F" />
-      <ref count="1" tile="TO/L" />
-      <ref count="1" tile="TO/RR" />
-      <ref count="1" tile="TO/RRR" />
-      <ref count="1" tile="TO/RrRr.2" />
-      <ref count="1" tile="TO/RRRR.1" />
-      <ref count="1" tile="TO/CRcr" />
-      <ref count="1" tile="TO/CFR" />
-      <ref count="1" tile="TO/RrC" />
-      <ref count="1" tile="TO/RCr" />
-      <ref count="1" tile="TO/Cc" />
-      <ref count="1" tile="TO/CcR!" />
-      <ref count="1" tile="TO/CC.2" />
-      <ref count="1" tile="TO/CRCr.2" />
-      <ref count="1" tile="TO/CccR" />
-      <ref count="1" tile="TO/CccC+" />
-    </tile-set>
-    <tile-set id="tower:2">
-      <ref count="2" tile="TO/C" />
-      <ref count="1" tile="TO/FG" />
-      <ref count="1" tile="TO/L" />
-      <ref count="1" tile="TO/RRG" />
-      <ref count="1" tile="TO/RRR" />
-      <ref count="1" tile="TO/RrRr.2" />
-      <ref count="1" tile="TO/RRRR.1" />
-      <ref count="1" tile="TO/CRcr" />
-      <ref count="1" tile="TO/CFR" />
-      <ref count="1" tile="TO/RrC" />
-      <ref count="1" tile="TO/RCr" />
-      <ref count="1" tile="TO/Cc" />
-      <ref count="1" tile="TO/CcR!" />
-      <ref count="1" tile="TO/CC.2" />
-      <ref count="1" tile="TO/CRCr.2" />
-      <ref count="1" tile="TO/CccR" />
-      <ref count="1" tile="TO/CccC+" />
-    </tile-set>
-  </sets>
-</pack>
diff --git a/src/main/resources/tile-definitions/traders_and_builders.xml b/src/main/resources/tile-definitions/traders_and_builders.xml
deleted file mode 100644
index 1c784d01d..000000000
--- a/src/main/resources/tile-definitions/traders_and_builders.xml
+++ /dev/null
@@ -1,289 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pack>
-	<tiles>
-		<tile id="TB/Cc.g">
-			<city resource="grain">N W</city>
-			<farm city="N">SL SR EL ER</farm>
-		</tile>
-		<tile id="TB/Cc.w">
-			<city resource="wine">N W</city>
-			<farm city="N">SL SR EL ER</farm>
-		</tile>
-		<tile id="TB/CCc.c">
-			<city resource="cloth">W E</city>
-			<city>S</city>
-			<farm city="W">NL NR</farm>
-			<farm city="W S">INNER_FARM</farm>
-		</tile>
-		<tile id="TB/CCc.w">
-			<city resource="wine">W E</city>
-			<city>S</city>
-			<farm city="W">NL NR</farm>
-			<farm city="W S">INNER_FARM</farm>
-		</tile>
-		<tile id="TB/Ccc.g">
-			<city resource="grain">N W E</city>
-			<farm city="N">SL SR</farm>
-		</tile>
-		<tile id="TB/CcCC.c">
-			<city resource="cloth">N W</city>
-			<city>S</city>
-			<city>E</city>
-			<farm city="N E S">INNER_FARM</farm>
-		</tile>
-		<tile id="TB/CcRR!.c">
-			<road>S</road>
-			<road>E</road>
-			<city resource="cloth">N W</city>
-			<farm city="N">SR</farm>
-			<farm city="N">SL</farm>
-			<farm city="N">ER</farm>
-			<farm city="N">EL</farm>
-			<wagon-move>
-				<neighbouring>N E</neighbouring>
-				<neighbouring>N S</neighbouring>
-			</wagon-move>
-		</tile>
-		<tile id="TB/CcRR.w">
-			<city resource="wine">N W</city>
-			<road>S</road>
-			<road>E</road>
-			<farm city="N">SR</farm>
-			<farm city="N">SL ER</farm>
-			<farm city="N">EL</farm>
-			<wagon-move>
-				<neighbouring>N E</neighbouring>
-				<neighbouring>N S</neighbouring>
-			</wagon-move>
-    </tile>
-    <tile id="TB/CcRR.wG">
-      <garden />
-			<city resource="wine">N W</city>
-			<road>S</road>
-			<road>E</road>
-			<farm city="N">SR</farm>
-			<farm city="N">SL ER</farm>
-			<farm city="N">EL</farm>
-			<wagon-move>
-				<neighbouring>N E</neighbouring>
-				<neighbouring>N S</neighbouring>
-			</wagon-move>
-		</tile>
-		<tile id="TB/CcRC.c">
-			<city resource="cloth">N W</city>
-			<city>S</city>
-			<road>E</road>
-			<farm city="N">EL</farm>
-			<farm city="N S">ER</farm>
-			<wagon-move>
-				<neighbouring>N E</neighbouring>
-			</wagon-move>
-		</tile>
-		<tile id="TB/CcRC.g">
-			<city resource="grain">N W</city>
-			<city>S</city>
-			<road>E</road>
-			<farm city="N">EL</farm>
-			<farm city="N S">ER</farm>
-			<wagon-move>
-				<neighbouring>N E</neighbouring>
-			</wagon-move>
-		</tile>
-		<tile id="TB/CcR.c">
-			<city resource="cloth">N W</city>
-			<road>E</road>
-			<farm city="N">EL</farm>
-			<farm city="N">ER SL SR</farm>
-			<wagon-move>
-				<neighbouring>N E</neighbouring>
-			</wagon-move>
-    </tile>
-    <tile id="TB/CcR.cG">
-      <garden />
-			<city resource="cloth">N W</city>
-			<road>E</road>
-			<farm city="N">EL</farm>
-			<farm city="N">ER SL SR</farm>
-			<wagon-move>
-				<neighbouring>N E</neighbouring>
-			</wagon-move>
-		</tile>
-		<tile id="TB/CcR!.w">
-			<road>E</road>
-			<city resource="wine">N W</city>
-			<farm city="N">EL</farm>
-			<farm city="N">ER</farm>
-			<farm city="N">SL SR</farm>
-			<wagon-move>
-				<neighbouring>N E</neighbouring>
-			</wagon-move>
-		</tile>
-		<tile id="TB/CccR.w">
-			<city resource="wine">N W E</city>
-			<road>S</road>
-			<farm city="N">SR</farm>
-			<farm city="N">SL</farm>
-			<wagon-move>
-				<neighbouring>N S</neighbouring>
-			</wagon-move>
-		</tile>
-		<tile id="TB/CcCc.w">
-			<city resource="wine">N W</city>
-			<city>E S</city>
-			<farm city="N S">INNER_FARM</farm>
-		</tile>
-		<tile id="TB/CFc.w">
-			<city resource="wine">W E</city>
-			<farm city="W">NL NR</farm>
-			<farm city="W">SL SR</farm>
-		</tile>
-		<tile id="TB/CR">
-			<city>N</city>
-			<road>E</road>
-			<farm city="N">EL</farm>
-			<farm city="N">WL WR SL SR ER</farm>
-			<wagon-move>
-				<neighbouring>N E</neighbouring>
-			</wagon-move>
-		</tile>
-		<tile id="TB/CRc.g">
-			<city resource="grain">W E</city>
-			<road>S</road>
-			<farm city="W">NL NR</farm>
-			<farm city="W">SR</farm>
-			<farm city="W">SL</farm>
-			<wagon-move>
-				<neighbouring>W S</neighbouring>
-			</wagon-move>
-		</tile>
-		<tile id="TB/CRc.w">
-			<city resource="wine">W E</city>
-			<road>S</road>
-			<farm city="W">NL NR</farm>
-			<farm city="W">SR</farm>
-			<farm city="W">SL</farm>
-			<wagon-move>
-				<neighbouring>W S</neighbouring>
-			</wagon-move>
-		</tile>
-		<tile id="TB/CRcR.w">
-			<city resource="wine">E W</city>
-			<road>N</road>
-			<road>S</road>
-			<farm city="W">NL</farm>
-			<farm city="W">NR</farm>
-			<farm city="W">SL</farm>
-			<farm city="W">SR</farm>
-			<wagon-move>
-				<neighbouring>W N</neighbouring>
-				<neighbouring>W S</neighbouring>
-			</wagon-move>
-		</tile>
-		<tile id="TB/LRRR">
-			<cloister/>
-			<road>E</road>
-			<road>S</road>
-			<road>W</road>
-			<farm>WR NL NR EL</farm>
-			<farm>ER SL</farm>
-			<farm>WL SR</farm>
-			<wagon-move>
-				<neighbouring>CLOISTER W</neighbouring>
-				<neighbouring>CLOISTER S</neighbouring>
-				<neighbouring>CLOISTER E</neighbouring>
-			</wagon-move>
-		</tile>
-		<tile id="TB/RCc.g">
-			<city resource="grain">N W</city>
-			<road>S</road>
-			<farm city="N">SR</farm>
-			<farm city="N">SL EL ER</farm>
-			<wagon-move>
-				<neighbouring>N S</neighbouring>
-			</wagon-move>
-		</tile>
-		<tile id="TB/RCc!.g">
-			<road>S</road>
-			<city resource="grain">N W</city>
-			<farm city="N">SR</farm>
-			<farm city="N">SL</farm>
-			<farm city="N">EL ER</farm>
-			<wagon-move>
-				<neighbouring>N S</neighbouring>
-			</wagon-move>
-		</tile>
-		<tile id="TB/RRC">
-			<city>N</city>
-			<road>W</road>
-			<road>S</road>
-			<farm city="N">WR</farm>
-			<farm>WL SR</farm>
-			<farm city="N">EL ER SL</farm>
-			<wagon-move>
-				<neighbouring>N S</neighbouring>
-			</wagon-move>
-		</tile>
-		<tile id="TB/RRrr">
-			<road>N S</road>
-			<road>W E</road>
-			<farm>WR NL</farm>
-			<farm>NR EL</farm>
-			<farm>ER SL</farm>
-			<farm>SR WL</farm>
-		</tile>
-	</tiles>
-  <sets>
-    <tile-set id="traders-and-builders:1">
-      <ref count="1" tile="TB/Cc.g" />
-      <ref count="1" tile="TB/Cc.w" />
-      <ref count="1" tile="TB/CCc.c" />
-      <ref count="1" tile="TB/CCc.w" />
-      <ref count="1" tile="TB/Ccc.g" />
-      <ref count="1" tile="TB/CcCC.c" />
-      <ref count="1" tile="TB/CcRR!.c" />
-      <ref count="1" tile="TB/CcRR.w" />
-      <ref count="1" tile="TB/CcRC.c" />
-      <ref count="1" tile="TB/CcRC.g" />
-      <ref count="1" tile="TB/CcR.c" />
-      <ref count="1" tile="TB/CcR!.w" />
-      <ref count="1" tile="TB/CccR.w" />
-      <ref count="1" tile="TB/CcCc.w" />
-      <ref count="1" tile="TB/CFc.w" />
-      <ref count="1" tile="TB/CR" />
-      <ref count="1" tile="TB/CRc.g" />
-      <ref count="1" tile="TB/CRc.w" />
-      <ref count="1" tile="TB/CRcR.w" />
-      <ref count="1" tile="TB/LRRR" />
-      <ref count="1" tile="TB/RCc.g" />
-      <ref count="1" tile="TB/RCc!.g" />
-      <ref count="1" tile="TB/RRC" />
-      <ref count="1" tile="TB/RRrr" />
-    </tile-set>
-    <tile-set id="traders-and-builders:2">
-      <ref count="1" tile="TB/Cc.g" />
-      <ref count="1" tile="TB/Cc.w" />
-      <ref count="1" tile="TB/CCc.c" />
-      <ref count="1" tile="TB/CCc.w" />
-      <ref count="1" tile="TB/Ccc.g" />
-      <ref count="1" tile="TB/CcCC.c" />
-      <ref count="1" tile="TB/CcRR!.c" />
-      <ref count="1" tile="TB/CcRR.wG" />
-      <ref count="1" tile="TB/CcRC.c" />
-      <ref count="1" tile="TB/CcRC.g" />
-      <ref count="1" tile="TB/CcR.cG" />
-      <ref count="1" tile="TB/CcR!.w" />
-      <ref count="1" tile="TB/CccR.w" />
-      <ref count="1" tile="TB/CcCc.w" />
-      <ref count="1" tile="TB/CFc.w" />
-      <ref count="1" tile="TB/CR" />
-      <ref count="1" tile="TB/CRc.g" />
-      <ref count="1" tile="TB/CRc.w" />
-      <ref count="1" tile="TB/CRcR.w" />
-      <ref count="1" tile="TB/LRRR" />
-      <ref count="1" tile="TB/RCc.g" />
-      <ref count="1" tile="TB/RCc!.g" />
-      <ref count="1" tile="TB/RRC" />
-      <ref count="1" tile="TB/RRrr" />
-    </tile-set>
-  </sets>
-</pack>
diff --git a/src/main/resources/tile-definitions/tunnel.xml b/src/main/resources/tile-definitions/tunnel.xml
deleted file mode 100644
index d4366708b..000000000
--- a/src/main/resources/tile-definitions/tunnel.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pack>
-	<tiles>
-		<tile id="TU/CRRR">
-			<city>N</city>
-			<road tunnel="yes">W</road>
-			<road tunnel="yes">E</road>
-			<road tunnel="yes">S</road>
-			<farm city="N">WR EL</farm>
-			<farm>ER SL</farm>
-			<farm>SR WL</farm>
-		</tile>
-		<tile id="TU/RCR">
-			<city>N</city>
-			<road tunnel="yes">W</road>
-			<road tunnel="yes">E</road>
-			<farm city="N">WR EL</farm>
-			<farm>ER SL SR WL</farm>
-		</tile>
-		<tile id="TU/RR">
-			<road tunnel="yes">E</road>
-			<road tunnel="yes">S</road>
-			<farm>SR WL WR NL NR EL</farm>
-			<farm>ER SL</farm>
-		</tile>
-		<tile id="TU/RRRR">
-			<road>N</road>
-			<road tunnel="yes">W</road>
-			<road tunnel="yes">E</road>
-			<road tunnel="yes">S</road>
-			<farm>WR NL NR EL</farm>
-			<farm>ER SL</farm>
-			<farm>SR WL</farm>
-		</tile>
-	</tiles>
-	<sets>
-    <tile-set id="tunnel">
-      <ref count="1" tile="TU/CRRR" />
-      <ref count="1" tile="TU/RCR" />
-      <ref count="1" tile="TU/RR" />
-      <ref count="1" tile="TU/RRRR" />
-    </tile-set>
-  </sets>
-</pack>
diff --git a/src/main/resources/tile-definitions/wind_roses.xml b/src/main/resources/tile-definitions/wind_roses.xml
deleted file mode 100644
index a615c58c5..000000000
--- a/src/main/resources/tile-definitions/wind_roses.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pack>
-  <tiles>
-    <tile id="WR/Cc.1" wind-rose="NE">
-      <city>N W</city>
-      <farm city="N">SL SR EL ER</farm>
-    </tile>
-    <tile id="WR/CC.2" wind-rose="SE">
-      <city>N</city>
-      <city>W</city>
-      <farm city="N W">EL ER SL SR</farm>
-    </tile>
-    <tile id="WR/CFc" wind-rose="NW">
-      <city>N S</city>
-      <farm city="N">WL WR</farm>
-      <farm city="N">EL ER</farm>
-    </tile>
-    <tile id="WR/CFR" wind-rose="NWSE">
-      <city>E</city>
-      <road>W</road>
-      <farm city="E">WR NL NR</farm>
-      <farm city="E">WL SL SR</farm>
-      <wagon-move>
-        <neighbouring>W E</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="WR/Rr" wind-rose="NWSE">
-      <road>S W</road>
-      <farm>WR NL NR EL ER SL</farm>
-      <farm>SR WL</farm>
-    </tile>
-    <tile id="WR/RrC" wind-rose="SW">
-      <city>N</city>
-      <road>S W</road>
-      <farm city="N">WR EL ER SL</farm>
-      <farm>WL SR</farm>
-    </tile>
-  </tiles>
-  <sets>
-    <tile-set id="wind-roses">
-      <ref count="1" tile="WR/Cc.1" />
-      <ref count="1" tile="WR/CC.2" />
-      <ref count="1" tile="WR/CFc" />
-      <ref count="1" tile="WR/CFR" />
-      <ref count="1" tile="WR/Rr" />
-      <ref count="1" tile="WR/RrC" />
-    </tile-set>
-  </sets>
-</pack>
diff --git a/src/main/resources/tile-definitions/winter.xml b/src/main/resources/tile-definitions/winter.xml
deleted file mode 100644
index cd6dd60f7..000000000
--- a/src/main/resources/tile-definitions/winter.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pack>
-  <tiles>
-    <tile id="WI/RRR">
-      <road>E</road>
-      <road>S</road>
-      <road>W</road>
-      <farm>WR NL NR EL</farm>
-      <farm>ER SL</farm>
-      <farm>SR WL</farm>
-      <wagon-move>
-        <neighbouring>E S W</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="WI/RC">
-      <city>N</city>
-      <road>W</road>
-      <farm city="N">WR</farm>
-      <farm city="N">EL ER SL SR WL</farm>
-      <wagon-move>
-        <neighbouring>N W</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="WI/CR">
-      <city>N</city>
-      <road>E</road>
-      <farm city="N">EL</farm>
-      <farm city="N">WL WR SL SR ER</farm>
-      <wagon-move>
-        <neighbouring>N E</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="WI/LR">
-      <cloister />
-      <road>S</road>
-      <farm>NL NR EL ER SL SR WL WR</farm>
-      <wagon-move>
-        <neighbouring>CLOISTER S</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="WI/RCc.i">
-      <city>N W</city>
-      <road inn="yes">S</road>
-      <farm city="W">SR</farm>
-      <farm city="W">SL EL ER</farm>
-      <wagon-move>
-        <neighbouring>N S</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="WI/LRFR">
-      <cloister />
-      <road>W</road>
-      <road>E</road>
-      <farm>ER SL SR WL</farm>
-      <farm>EL NL NR WR</farm>
-      <wagon-move>
-        <neighbouring>CLOISTER W</neighbouring>
-        <neighbouring>CLOISTER E</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="WI/CRr">
-      <city>N</city>
-      <road>S E</road>
-      <farm city="N">SR WL WR EL</farm>
-      <farm>ER SL</farm>
-    </tile>
-    <tile id="WI/CFR">
-      <city>N</city>
-      <road>S</road>
-      <farm city="N">WL WR SR</farm>
-      <farm city="N">EL ER SL</farm>
-      <wagon-move>
-        <neighbouring>N S</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="WI/RrRr">
-      <road>N W</road>
-      <road>S E</road>
-      <farm>NL WR</farm>
-      <farm>SL ER</farm>
-      <farm>NR EL SR WL</farm>
-    </tile>
-    <tile id="WI/CcR">
-      <city>N W</city>
-      <road>E</road>
-      <farm city="W">EL</farm>
-      <farm city="W">ER SL SR</farm>
-      <wagon-move>
-        <neighbouring>N E</neighbouring>
-      </wagon-move>
-    </tile>
-    <tile id="WI/R">
-      <road>S</road>
-      <farm>NL NR EL ER SL SR WL WR</farm>
-    </tile>
-    <tile id="WI/RrC">
-      <city>N</city>
-      <road>W S</road>
-      <farm>SR WL</farm>
-      <farm city="N">WR EL ER SL</farm>
-    </tile>
-  </tiles>
-  <sets>
-    <tile-set id="winter">
-      <ref count="4" tile="BA/L" />
-      <ref count="2" tile="BA/LR" />
-      <ref count="4" tile="BA/RCr" />
-      <ref count="1" tile="BA/Cccc+" />
-      <ref count="2" tile="BA/CccR+" />
-      <ref count="1" tile="BA/CccR" />
-      <ref count="2" tile="BA/CFc+" />
-      <ref count="1" tile="BA/CFc.1" />
-      <ref count="3" tile="BA/Cc.1" />
-      <ref count="2" tile="BA/Cc+" />
-      <ref count="3" tile="BA/CcRr" />
-      <ref count="2" tile="BA/CcRr+" />
-      <ref count="3" tile="BA/Ccc" />
-      <ref count="1" tile="BA/Ccc+" />
-      <ref count="3" tile="BA/CRr" />
-      <ref count="3" tile="BA/CRRR" />
-      <ref count="3" tile="BA/RrC" />
-      <ref count="5" tile="BA/C" />
-      <ref count="3" tile="BA/CFC.2" />
-      <ref count="2" tile="BA/CC.2" />
-      <ref count="1" tile="BA/RRRR" />
-      <ref count="4" tile="BA/RRR" />
-      <ref count="9" tile="BA/Rr" />
-      <ref count="8" tile="BA/RFr" />
-
-      <ref count="1" tile="WI/RRR" />
-      <ref count="1" tile="WI/RC" />
-      <ref count="1" tile="WI/CR" />
-      <ref count="1" tile="WI/LR" />
-      <ref count="1" tile="WI/RCc.i" />
-      <ref count="1" tile="WI/LRFR" />
-      <ref count="1" tile="WI/CRr" />
-      <ref count="1" tile="WI/CFR" />
-      <ref count="1" tile="WI/RrRr" />
-      <ref count="1" tile="WI/CcR" />
-      <ref count="1" tile="WI/R" />
-      <ref count="1" tile="WI/RrC" />
-    </tile-set>
-  </sets>
-</pack>