diff --git a/pype/ftrack/__init__.py b/pype/ftrack/__init__.py
index 922de28e16..bf18979e91 100644
--- a/pype/ftrack/__init__.py
+++ b/pype/ftrack/__init__.py
@@ -1,7 +1,2 @@
 from .lib import *
 from .ftrack_server import *
-from .ftrack_module import FtrackModule
-
-
-def tray_init(tray_widget, main_widget):
-    return FtrackModule(main_widget, tray_widget)
diff --git a/pype/ftrack/tray/__init__.py b/pype/ftrack/tray/__init__.py
new file mode 100644
index 0000000000..bca0784c7f
--- /dev/null
+++ b/pype/ftrack/tray/__init__.py
@@ -0,0 +1,5 @@
+from .ftrack_module import FtrackModule
+
+
+def tray_init(tray_widget, main_widget):
+    return FtrackModule(main_widget, tray_widget)
diff --git a/pype/ftrack/ftrack_module.py b/pype/ftrack/tray/ftrack_module.py
similarity index 99%
rename from pype/ftrack/ftrack_module.py
rename to pype/ftrack/tray/ftrack_module.py
index fdce0535e8..dde7d1b3c4 100644
--- a/pype/ftrack/ftrack_module.py
+++ b/pype/ftrack/tray/ftrack_module.py
@@ -6,7 +6,8 @@ from Qt import QtCore, QtGui, QtWidgets
 
 from pype.vendor import ftrack_api
 from pypeapp import style
-from pype.ftrack import FtrackServer, credentials, login_dialog as login_dialog
+from pype.ftrack import FtrackServer, credentials
+from . import login_dialog
 
 from pype import api as pype
 
@@ -16,7 +17,6 @@ log = pype.Logger().get_logger("FtrackModule", "ftrack")
 
 class FtrackModule:
     def __init__(self, main_parent=None, parent=None):
-
         self.parent = parent
         self.widget_login = login_dialog.Login_Dialog_ui(self)
         self.action_server = FtrackServer('action')
diff --git a/pype/ftrack/login_dialog.py b/pype/ftrack/tray/login_dialog.py
similarity index 99%
rename from pype/ftrack/login_dialog.py
rename to pype/ftrack/tray/login_dialog.py
index 5520087032..4dcbec5ab3 100644
--- a/pype/ftrack/login_dialog.py
+++ b/pype/ftrack/tray/login_dialog.py
@@ -1,8 +1,9 @@
 import os
 import requests
-from Qt import QtCore, QtGui, QtWidgets
 from pypeapp import style
-from . import credentials, login_tools
+from pype.ftrack import credentials
+from . import login_tools
+from Qt import QtCore, QtGui, QtWidgets
 
 
 class Login_Dialog_ui(QtWidgets.QWidget):
diff --git a/pype/ftrack/login_tools.py b/pype/ftrack/tray/login_tools.py
similarity index 100%
rename from pype/ftrack/login_tools.py
rename to pype/ftrack/tray/login_tools.py