Index: applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/AbstractTest.java
===================================================================
--- applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/AbstractTest.java	(revision 31455)
+++ applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/AbstractTest.java	(revision 31456)
@@ -2,5 +2,5 @@
 
 import org.junit.BeforeClass;
-import org.openstreetmap.josm.plugins.mapillary.util.TestUtil;
+import org.openstreetmap.josm.plugins.mapillary.utils.TestUtil;
 
 /**
Index: applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/ImportTest.java
===================================================================
--- applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/ImportTest.java	(revision 31455)
+++ applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/ImportTest.java	(revision 31456)
@@ -14,4 +14,5 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.plugins.mapillary.actions.MapillaryImportAction;
+import org.openstreetmap.josm.plugins.mapillary.utils.MapillaryUtils;
 
 /**
@@ -61,12 +62,11 @@
     num[2] = new RationalNumber(0, 1);
     String ref = GpsTagConstants.GPS_TAG_GPS_LATITUDE_REF_VALUE_NORTH;
-    assertEquals(1, MapillaryImportAction.degMinSecToDouble(num, ref), 0.01);
+    assertEquals(1, MapillaryUtils.degMinSecToDouble(num, ref), 0.01);
     ref = GpsTagConstants.GPS_TAG_GPS_LATITUDE_REF_VALUE_SOUTH;
-    assertEquals(-1, MapillaryImportAction.degMinSecToDouble(num, ref), 0.01);
+    assertEquals(-1, MapillaryUtils.degMinSecToDouble(num, ref), 0.01);
     num[0] = new RationalNumber(180, 1);
-    assertEquals(-180, MapillaryImportAction.degMinSecToDouble(num, ref), 0.01);
+    assertEquals(-180, MapillaryUtils.degMinSecToDouble(num, ref), 0.01);
     num[0] = new RationalNumber(190, 1);
-    assertEquals(170, MapillaryImportAction.degMinSecToDouble(num, ref), 0.01);
+    assertEquals(170, MapillaryUtils.degMinSecToDouble(num, ref), 0.01);
   }
-
 }
Index: applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/UploadTest.java
===================================================================
--- applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/UploadTest.java	(revision 31455)
+++ applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/UploadTest.java	(revision 31456)
@@ -19,5 +19,6 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.plugins.mapillary.actions.MapillaryImportAction;
-import org.openstreetmap.josm.plugins.mapillary.oauth.OAuthUtils;
+import org.openstreetmap.josm.plugins.mapillary.oauth.UploadUtils;
+import org.openstreetmap.josm.plugins.mapillary.utils.MapillaryUtils;
 
 public class UploadTest extends AbstractTest {
@@ -33,5 +34,5 @@
     File updatedFile = null;
     try {
-      updatedFile = OAuthUtils.updateFile(img);
+      updatedFile = UploadUtils.updateFile(img);
       ImageMetadata metadata = Imaging.getMetadata(updatedFile);
       final JpegImageMetadata jpegMetadata = (JpegImageMetadata) metadata;
@@ -48,5 +49,5 @@
       assertTrue(jpegMetadata
           .findEXIFValueWithExactMatch(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL) != null);
-      assertEquals(0, MapillaryImportAction.degMinSecToDouble(
+      assertEquals(0, MapillaryUtils.degMinSecToDouble(
           (RationalNumber[]) jpegMetadata.findEXIFValueWithExactMatch(
               GpsTagConstants.GPS_TAG_GPS_LATITUDE).getValue(),
@@ -55,5 +56,5 @@
                   GpsTagConstants.GPS_TAG_GPS_LATITUDE_REF).getValue()
               .toString()), 0.01);
-      assertEquals(0, MapillaryImportAction.degMinSecToDouble(
+      assertEquals(0, MapillaryUtils.degMinSecToDouble(
           (RationalNumber[]) jpegMetadata.findEXIFValueWithExactMatch(
               GpsTagConstants.GPS_TAG_GPS_LONGITUDE).getValue(),
Index: applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/util/TestUtil.java
===================================================================
--- applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/util/TestUtil.java	(revision 31455)
+++ 	(revision )
@@ -1,47 +1,0 @@
-package org.openstreetmap.josm.plugins.mapillary.util;
-
-import java.io.File;
-
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.projection.Projections;
-import org.openstreetmap.josm.plugins.PluginException;
-import org.openstreetmap.josm.plugins.PluginInformation;
-import org.openstreetmap.josm.plugins.mapillary.MapillaryLayer;
-import org.openstreetmap.josm.plugins.mapillary.MapillaryPlugin;
-import org.openstreetmap.josm.tools.I18n;
-
-/**
- *
- * Utilities for tests.
- *
- * @author floscher
- */
-public class TestUtil {
-  private static boolean isInitialized;
-
-  private TestUtil() {
-    // Prevent instantiation
-  }
-
-  /**
-   * Initializes the {@link Main} class of JOSM and the mapillary plugin with
-   * the preferences from test/data/preferences.
-   *
-   * That is needed e.g. to use {@link MapillaryLayer#getInstance()}
-   */
-  public static final void initPlugin() {
-    if (!isInitialized) {
-      System.setProperty("josm.home", "test/data/preferences");
-      Main.initApplicationPreferences();
-      Main.pref.enableSaveOnPut(false);
-      I18n.init();
-      Main.determinePlatformHook();
-      Main.platform.preStartupHook();
-      Main.pref.init(false);
-      I18n.set(Main.pref.get("language", "en"));
-      Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
-      isInitialized = true;
-    }
-  }
-
-}
Index: applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/utils/TestUtil.java
===================================================================
--- applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/utils/TestUtil.java	(revision 31456)
+++ applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/utils/TestUtil.java	(revision 31456)
@@ -0,0 +1,47 @@
+package org.openstreetmap.josm.plugins.mapillary.utils;
+
+import java.io.File;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.projection.Projections;
+import org.openstreetmap.josm.plugins.PluginException;
+import org.openstreetmap.josm.plugins.PluginInformation;
+import org.openstreetmap.josm.plugins.mapillary.MapillaryLayer;
+import org.openstreetmap.josm.plugins.mapillary.MapillaryPlugin;
+import org.openstreetmap.josm.tools.I18n;
+
+/**
+ *
+ * Utilities for tests.
+ *
+ * @author floscher
+ */
+public class TestUtil {
+  private static boolean isInitialized;
+
+  private TestUtil() {
+    // Prevent instantiation
+  }
+
+  /**
+   * Initializes the {@link Main} class of JOSM and the mapillary plugin with
+   * the preferences from test/data/preferences.
+   *
+   * That is needed e.g. to use {@link MapillaryLayer#getInstance()}
+   */
+  public static final void initPlugin() {
+    if (!isInitialized) {
+      System.setProperty("josm.home", "test/data/preferences");
+      Main.initApplicationPreferences();
+      Main.pref.enableSaveOnPut(false);
+      I18n.init();
+      Main.determinePlatformHook();
+      Main.platform.preStartupHook();
+      Main.pref.init(false);
+      I18n.set(Main.pref.get("language", "en"));
+      Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
+      isInitialized = true;
+    }
+  }
+
+}