Index: trunk/test/unit/org/openstreetmap/josm/gui/util/Tag2LinkTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/util/Tag2LinkTest.java	(revision 15683)
+++ 	(revision )
@@ -1,63 +1,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.util;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * Test {@link Tag2Link}
- */
-public class Tag2LinkTest {
-
-    List<String> links = new ArrayList<>();
-
-    void addLink(String name, String url) {
-        links.add(name + " // " + url);
-    }
-
-    void checkLinks(String... expected) {
-        Assert.assertEquals(Arrays.asList(expected), links);
-    }
-
-    /**
-     * Unit test of function {@link Tag2Link#getLinksForTag}.
-     */
-    @Test
-    public void testImageCommonsImage() {
-        Tag2Link.getLinksForTag("image", "File:Witten Brücke Gasstraße.jpg", this::addLink);
-        checkLinks("View image on Wikimedia Commons // https://commons.wikimedia.org/wiki/File:Witten Brücke Gasstraße.jpg");
-    }
-
-    /**
-     * Unit test of function {@link Tag2Link#getLinksForTag}.
-     */
-    @Test
-    public void testImageCommonsCategory() {
-        Tag2Link.getLinksForTag("image", "category:JOSM", this::addLink);
-        checkLinks("View category on Wikimedia Commons // https://commons.wikimedia.org/wiki/category:JOSM");
-    }
-
-    /**
-     * Unit test of function {@link Tag2Link#getLinksForTag}.
-     */
-    @Test
-    public void testBrandWikidata() {
-        Tag2Link.getLinksForTag("brand:wikidata", "Q259340", this::addLink);
-        checkLinks("View Wikidata item Q259340 // https://www.wikidata.org/wiki/Q259340");
-    }
-
-    /**
-     * Unit test of function {@link Tag2Link#getLinksForTag}.
-     */
-    @Test
-    public void testArchipelagoWikidata() {
-        Tag2Link.getLinksForTag("archipelago:wikidata", "Q756987;Q756988", this::addLink);
-        checkLinks("View Wikidata item Q756987 // https://www.wikidata.org/wiki/Q756987",
-                "View Wikidata item Q756988 // https://www.wikidata.org/wiki/Q756988");
-    }
-
-}
Index: trunk/test/unit/org/openstreetmap/josm/gui/util/Tag2LinkTestIT.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/util/Tag2LinkTestIT.java	(revision 15683)
+++ 	(revision )
@@ -1,30 +1,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.util;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import org.junit.Assert;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-/**
- * Integration tests for the {@link Tag2Link}
- */
-public class Tag2LinkTestIT {
-
-    /**
-     * Setup rule
-     */
-    @ClassRule
-    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public static JOSMTestRules test = new JOSMTestRules();
-
-    /**
-     * Integration test of function {@link Tag2Link#initialize()}.
-     */
-    @Test
-    public void testInitialize() {
-        Tag2Link.initialize();
-        Assert.assertTrue("obtails at least 40 rules", Tag2Link.wikidataRules.size() > 40);
-    }
-}
Index: trunk/test/unit/org/openstreetmap/josm/tools/Tag2LinkTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/Tag2LinkTest.java	(revision 15702)
+++ trunk/test/unit/org/openstreetmap/josm/tools/Tag2LinkTest.java	(revision 15702)
@@ -0,0 +1,63 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Test {@link Tag2Link}
+ */
+public class Tag2LinkTest {
+
+    List<String> links = new ArrayList<>();
+
+    void addLink(String name, String url) {
+        links.add(name + " // " + url);
+    }
+
+    void checkLinks(String... expected) {
+        Assert.assertEquals(Arrays.asList(expected), links);
+    }
+
+    /**
+     * Unit test of function {@link Tag2Link#getLinksForTag}.
+     */
+    @Test
+    public void testImageCommonsImage() {
+        Tag2Link.getLinksForTag("image", "File:Witten Brücke Gasstraße.jpg", this::addLink);
+        checkLinks("View image on Wikimedia Commons // https://commons.wikimedia.org/wiki/File:Witten Brücke Gasstraße.jpg");
+    }
+
+    /**
+     * Unit test of function {@link Tag2Link#getLinksForTag}.
+     */
+    @Test
+    public void testImageCommonsCategory() {
+        Tag2Link.getLinksForTag("image", "category:JOSM", this::addLink);
+        checkLinks("View category on Wikimedia Commons // https://commons.wikimedia.org/wiki/category:JOSM");
+    }
+
+    /**
+     * Unit test of function {@link Tag2Link#getLinksForTag}.
+     */
+    @Test
+    public void testBrandWikidata() {
+        Tag2Link.getLinksForTag("brand:wikidata", "Q259340", this::addLink);
+        checkLinks("View Wikidata item Q259340 // https://www.wikidata.org/wiki/Q259340");
+    }
+
+    /**
+     * Unit test of function {@link Tag2Link#getLinksForTag}.
+     */
+    @Test
+    public void testArchipelagoWikidata() {
+        Tag2Link.getLinksForTag("archipelago:wikidata", "Q756987;Q756988", this::addLink);
+        checkLinks("View Wikidata item Q756987 // https://www.wikidata.org/wiki/Q756987",
+                "View Wikidata item Q756988 // https://www.wikidata.org/wiki/Q756988");
+    }
+
+}
Index: trunk/test/unit/org/openstreetmap/josm/tools/Tag2LinkTestIT.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/Tag2LinkTestIT.java	(revision 15702)
+++ trunk/test/unit/org/openstreetmap/josm/tools/Tag2LinkTestIT.java	(revision 15702)
@@ -0,0 +1,30 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import org.junit.Assert;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+/**
+ * Integration tests for the {@link Tag2Link}
+ */
+public class Tag2LinkTestIT {
+
+    /**
+     * Setup rule
+     */
+    @ClassRule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public static JOSMTestRules test = new JOSMTestRules();
+
+    /**
+     * Integration test of function {@link org.openstreetmap.josm.tools.Tag2Link#initialize()}.
+     */
+    @Test
+    public void testInitialize() {
+        org.openstreetmap.josm.tools.Tag2Link.initialize();
+        Assert.assertTrue("obtails at least 40 rules", Tag2Link.wikidataRules.size() > 40);
+    }
+}