Index: applications/editors/josm/plugins/ImportImagePlugin/.settings/org.sonarlint.eclipse.core.prefs
===================================================================
--- applications/editors/josm/plugins/ImportImagePlugin/.settings/org.sonarlint.eclipse.core.prefs	(revision 32402)
+++ applications/editors/josm/plugins/ImportImagePlugin/.settings/org.sonarlint.eclipse.core.prefs	(revision 32402)
@@ -0,0 +1,5 @@
+autoEnabled=true
+eclipse.preferences.version=1
+extraProperties=
+moduleKey=josm-plugins
+serverId=josm
Index: applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImageFileImporter.java
===================================================================
--- applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImageFileImporter.java	(revision 32391)
+++ applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImageFileImporter.java	(revision 32402)
@@ -58,5 +58,5 @@
 
             // Add layer:
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
             BoundingXYVisitor boundingXYVisitor = new BoundingXYVisitor();
             layer.visitBoundingBox(boundingXYVisitor);
Index: applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImagePlugin.java
===================================================================
--- applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImagePlugin.java	(revision 32391)
+++ applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImagePlugin.java	(revision 32402)
@@ -19,4 +19,5 @@
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -123,5 +124,5 @@
             File pluginDir = new File(PLUGIN_DIR);
             if(!pluginDir.exists()){
-                pluginDir.mkdir();
+                Utils.mkDirs(pluginDir);
             }
 
@@ -129,5 +130,5 @@
             File libDir = new File(PLUGINLIBRARIES_DIR);
             if(!libDir.exists()){
-                libDir.mkdir();
+                Utils.mkDirs(libDir);
             }
 
Index: applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java
===================================================================
--- applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java	(revision 32391)
+++ applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java	(revision 32402)
@@ -56,5 +56,5 @@
 
             // Add layer:
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
             BoundingXYVisitor boundingXYVisitor = new BoundingXYVisitor();
             layer.visitBoundingBox(boundingXYVisitor);
Index: applications/editors/josm/plugins/ImportImagePlugin/test/unit/org/openstreetmap/josm/plugins/ImportImagePlugin/GeoTiffReaderTest.java
===================================================================
--- applications/editors/josm/plugins/ImportImagePlugin/test/unit/org/openstreetmap/josm/plugins/ImportImagePlugin/GeoTiffReaderTest.java	(revision 32391)
+++ applications/editors/josm/plugins/ImportImagePlugin/test/unit/org/openstreetmap/josm/plugins/ImportImagePlugin/GeoTiffReaderTest.java	(revision 32402)
@@ -14,5 +14,4 @@
 
 import org.geotools.coverage.grid.GridCoverage2D;
-import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -32,9 +31,4 @@
     @Rule
     public JOSMTestRules rules = new JOSMTestRules().preferences();
-
-    @Before
-    public void setUp() throws Exception {
-        new ImportImagePlugin(null);
-    }
 
     @Test