Index: unk/test/unit/org/openstreetmap/josm/data/preferences/ListListSettingTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/preferences/ListListSettingTest.java	(revision 12883)
+++ 	(revision )
@@ -1,31 +1,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.data.preferences;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import nl.jqno.equalsverifier.EqualsVerifier;
-
-/**
- * Test {@link ListListSetting}.
- */
-public class ListListSettingTest {
-    /**
-     * This is a preference test
-     */
-    @Rule
-    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().preferences();
-
-    /**
-     * Unit test of methods {@link ListListSetting#equals} and {@link ListListSetting#hashCode}.
-     */
-    @Test
-    public void testEqualsContract() {
-        EqualsVerifier.forClass(ListListSetting.class).usingGetClass()
-            .withIgnoredFields("isNew", "time")
-            .verify();
-    }
-}
Index: unk/test/unit/org/openstreetmap/josm/data/preferences/ListSettingTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/preferences/ListSettingTest.java	(revision 12883)
+++ 	(revision )
@@ -1,31 +1,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.data.preferences;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import nl.jqno.equalsverifier.EqualsVerifier;
-
-/**
- * Test {@link ListSetting}.
- */
-public class ListSettingTest {
-    /**
-     * This is a preference test
-     */
-    @Rule
-    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().preferences();
-
-    /**
-     * Unit test of methods {@link ListSetting#equals} and {@link ListSetting#hashCode}.
-     */
-    @Test
-    public void testEqualsContract() {
-        EqualsVerifier.forClass(ListSetting.class).usingGetClass()
-            .withIgnoredFields("isNew", "time")
-            .verify();
-    }
-}
Index: unk/test/unit/org/openstreetmap/josm/data/preferences/MapListSettingTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/preferences/MapListSettingTest.java	(revision 12883)
+++ 	(revision )
@@ -1,31 +1,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.data.preferences;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import nl.jqno.equalsverifier.EqualsVerifier;
-
-/**
- * Test {@link MapListSetting}.
- */
-public class MapListSettingTest {
-    /**
-     * This is a preference test
-     */
-    @Rule
-    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().preferences();
-
-    /**
-     * Unit test of methods {@link MapListSetting#equals} and {@link MapListSetting#hashCode}.
-     */
-    @Test
-    public void testEqualsContract() {
-        EqualsVerifier.forClass(MapListSetting.class).usingGetClass()
-            .withIgnoredFields("isNew", "time")
-            .verify();
-    }
-}
Index: /trunk/test/unit/org/openstreetmap/josm/data/preferences/PreferencesWriterTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/preferences/PreferencesWriterTest.java	(revision 12883)
+++ /trunk/test/unit/org/openstreetmap/josm/data/preferences/PreferencesWriterTest.java	(revision 12884)
@@ -15,4 +15,10 @@
 import org.junit.Test;
 import org.openstreetmap.josm.data.Version;
+import org.openstreetmap.josm.spi.preferences.Setting;
+import org.openstreetmap.josm.spi.preferences.ListListSetting;
+import org.openstreetmap.josm.spi.preferences.ListSetting;
+import org.openstreetmap.josm.spi.preferences.AbstractSetting;
+import org.openstreetmap.josm.spi.preferences.StringSetting;
+import org.openstreetmap.josm.spi.preferences.MapListSetting;
 
 /**
Index: unk/test/unit/org/openstreetmap/josm/data/preferences/StringSettingTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/preferences/StringSettingTest.java	(revision 12883)
+++ 	(revision )
@@ -1,31 +1,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.data.preferences;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import nl.jqno.equalsverifier.EqualsVerifier;
-
-/**
- * Test {@link StringSetting}.
- */
-public class StringSettingTest {
-    /**
-     * This is a preference test
-     */
-    @Rule
-    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().preferences();
-
-    /**
-     * Unit test of methods {@link StringSetting#equals} and {@link StringSetting#hashCode}.
-     */
-    @Test
-    public void testEqualsContract() {
-        EqualsVerifier.forClass(StringSetting.class).usingGetClass()
-            .withIgnoredFields("isNew", "time")
-            .verify();
-    }
-}
Index: /trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/PrefEntryTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/PrefEntryTest.java	(revision 12883)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/PrefEntryTest.java	(revision 12884)
@@ -9,5 +9,5 @@
 import org.junit.Test;
 import org.openstreetmap.josm.JOSMFixture;
-import org.openstreetmap.josm.data.preferences.StringSetting;
+import org.openstreetmap.josm.spi.preferences.StringSetting;
 
 import nl.jqno.equalsverifier.EqualsVerifier;
Index: /trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTableTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTableTest.java	(revision 12883)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTableTest.java	(revision 12884)
@@ -12,5 +12,5 @@
 import org.junit.Test;
 import org.openstreetmap.josm.JOSMFixture;
-import org.openstreetmap.josm.data.preferences.StringSetting;
+import org.openstreetmap.josm.spi.preferences.StringSetting;
 import org.openstreetmap.josm.gui.preferences.advanced.PreferencesTable.AllSettingsTableModel;
 
Index: /trunk/test/unit/org/openstreetmap/josm/spi/preferences/ListListSettingTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/spi/preferences/ListListSettingTest.java	(revision 12884)
+++ /trunk/test/unit/org/openstreetmap/josm/spi/preferences/ListListSettingTest.java	(revision 12884)
@@ -0,0 +1,31 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.spi.preferences;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import nl.jqno.equalsverifier.EqualsVerifier;
+
+/**
+ * Test {@link ListListSetting}.
+ */
+public class ListListSettingTest {
+    /**
+     * This is a preference test
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences();
+
+    /**
+     * Unit test of methods {@link ListListSetting#equals} and {@link ListListSetting#hashCode}.
+     */
+    @Test
+    public void testEqualsContract() {
+        EqualsVerifier.forClass(ListListSetting.class).usingGetClass()
+            .withIgnoredFields("isNew", "time")
+            .verify();
+    }
+}
Index: /trunk/test/unit/org/openstreetmap/josm/spi/preferences/ListSettingTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/spi/preferences/ListSettingTest.java	(revision 12884)
+++ /trunk/test/unit/org/openstreetmap/josm/spi/preferences/ListSettingTest.java	(revision 12884)
@@ -0,0 +1,31 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.spi.preferences;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import nl.jqno.equalsverifier.EqualsVerifier;
+
+/**
+ * Test {@link ListSetting}.
+ */
+public class ListSettingTest {
+    /**
+     * This is a preference test
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences();
+
+    /**
+     * Unit test of methods {@link ListSetting#equals} and {@link ListSetting#hashCode}.
+     */
+    @Test
+    public void testEqualsContract() {
+        EqualsVerifier.forClass(ListSetting.class).usingGetClass()
+            .withIgnoredFields("isNew", "time")
+            .verify();
+    }
+}
Index: /trunk/test/unit/org/openstreetmap/josm/spi/preferences/MapListSettingTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/spi/preferences/MapListSettingTest.java	(revision 12884)
+++ /trunk/test/unit/org/openstreetmap/josm/spi/preferences/MapListSettingTest.java	(revision 12884)
@@ -0,0 +1,31 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.spi.preferences;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import nl.jqno.equalsverifier.EqualsVerifier;
+
+/**
+ * Test {@link MapListSetting}.
+ */
+public class MapListSettingTest {
+    /**
+     * This is a preference test
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences();
+
+    /**
+     * Unit test of methods {@link MapListSetting#equals} and {@link MapListSetting#hashCode}.
+     */
+    @Test
+    public void testEqualsContract() {
+        EqualsVerifier.forClass(MapListSetting.class).usingGetClass()
+            .withIgnoredFields("isNew", "time")
+            .verify();
+    }
+}
Index: /trunk/test/unit/org/openstreetmap/josm/spi/preferences/StringSettingTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/spi/preferences/StringSettingTest.java	(revision 12884)
+++ /trunk/test/unit/org/openstreetmap/josm/spi/preferences/StringSettingTest.java	(revision 12884)
@@ -0,0 +1,31 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.spi.preferences;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import nl.jqno.equalsverifier.EqualsVerifier;
+
+/**
+ * Test {@link StringSetting}.
+ */
+public class StringSettingTest {
+    /**
+     * This is a preference test
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences();
+
+    /**
+     * Unit test of methods {@link StringSetting#equals} and {@link StringSetting#hashCode}.
+     */
+    @Test
+    public void testEqualsContract() {
+        EqualsVerifier.forClass(StringSetting.class).usingGetClass()
+            .withIgnoredFields("isNew", "time")
+            .verify();
+    }
+}