diff --git a/src/net/i2p/itoopie/Main.java b/src/net/i2p/itoopie/Main.java
index 11d65aa8b..4bfdc2317 100644
--- a/src/net/i2p/itoopie/Main.java
+++ b/src/net/i2p/itoopie/Main.java
@@ -23,6 +23,7 @@ import com.thetransactioncompany.jsonrpc2.JSONRPC2Error;
 import com.thetransactioncompany.jsonrpc2.client.JSONRPC2SessionException;
 
 import net.i2p.itoopie.configuration.ConfigurationManager;
+import net.i2p.itoopie.gui.TrayManager;
 import net.i2p.itoopie.i2pcontrol.InvalidParametersException;
 import net.i2p.itoopie.i2pcontrol.InvalidPasswordException;
 import net.i2p.itoopie.i2pcontrol.JSONRPC2Interface;
diff --git a/src/net/i2p/itoopie/TrayManager.java b/src/net/i2p/itoopie/gui/TrayManager.java
similarity index 94%
rename from src/net/i2p/itoopie/TrayManager.java
rename to src/net/i2p/itoopie/gui/TrayManager.java
index b2e278074..4ffbd82ab 100644
--- a/src/net/i2p/itoopie/TrayManager.java
+++ b/src/net/i2p/itoopie/gui/TrayManager.java
@@ -1,4 +1,4 @@
-package net.i2p.itoopie;
+package net.i2p.itoopie.gui;
 
 import java.awt.AWTException;
 import java.awt.Image;
@@ -17,7 +17,7 @@ import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 import javax.swing.SwingWorker;
 
-import net.i2p.itoopie.gui.WindowHandler;
+import net.i2p.itoopie.Main;
 import net.i2p.itoopie.i18n.Transl;
 import net.i2p.itoopie.util.IconLoader;
 import net.i2p.itoopie.util.IsJar;
@@ -39,7 +39,7 @@ public class TrayManager {
      */
     protected TrayManager() {}
     
-    protected static synchronized TrayManager getInstance() {
+    public static synchronized TrayManager getInstance() {
         if(instance == null) {
                instance = new TrayManager();
         }
@@ -49,7 +49,7 @@ public class TrayManager {
     /**
      * Add the tray icon to the system tray and start everything up.
      */
-    protected void startManager() {
+    public void startManager() {
     	SwingUtilities.invokeLater(new Runnable(){
     		public void run(){
 		        if(SystemTray.isSupported()) {