diff --git a/pype/modules/clockify/widget_message.py b/pype/modules/clockify/widget_message.py
deleted file mode 100644
index 9e4fad1df1..0000000000
--- a/pype/modules/clockify/widget_message.py
+++ /dev/null
@@ -1,92 +0,0 @@
-from Qt import QtCore, QtGui, QtWidgets
-from avalon import style
-from pype.api import resources
-
-
-class MessageWidget(QtWidgets.QWidget):
-
-    SIZE_W = 300
-    SIZE_H = 130
-
-    closed = QtCore.Signal()
-
-    def __init__(self, parent=None, messages=[], title="Message"):
-
-        super(MessageWidget, self).__init__()
-
-        self._parent = parent
-
-        # Icon
-        if parent and hasattr(parent, 'icon'):
-            self.setWindowIcon(parent.icon)
-        else:
-            icon = QtGui.QIcon(resources.pype_icon_filepath())
-            self.setWindowIcon(icon)
-
-        self.setWindowFlags(
-            QtCore.Qt.WindowCloseButtonHint |
-            QtCore.Qt.WindowMinimizeButtonHint
-        )
-
-        # Font
-        self.font = QtGui.QFont()
-        self.font.setFamily("DejaVu Sans Condensed")
-        self.font.setPointSize(9)
-        self.font.setBold(True)
-        self.font.setWeight(50)
-        self.font.setKerning(True)
-
-        # Size setting
-        self.resize(self.SIZE_W, self.SIZE_H)
-        self.setMinimumSize(QtCore.QSize(self.SIZE_W, self.SIZE_H))
-        self.setMaximumSize(QtCore.QSize(self.SIZE_W+100, self.SIZE_H+100))
-
-        # Style
-        self.setStyleSheet(style.load_stylesheet())
-
-        self.setLayout(self._ui_layout(messages))
-        self.setWindowTitle(title)
-
-    def _ui_layout(self, messages):
-        if not messages:
-            messages = ["*Misssing messages (This is a bug)*", ]
-
-        elif not isinstance(messages, (tuple, list)):
-            messages = [messages, ]
-
-        main_layout = QtWidgets.QVBoxLayout(self)
-
-        labels = []
-        for message in messages:
-            label = QtWidgets.QLabel(message)
-            label.setFont(self.font)
-            label.setCursor(QtGui.QCursor(QtCore.Qt.ArrowCursor))
-            label.setTextFormat(QtCore.Qt.RichText)
-            label.setWordWrap(True)
-
-            labels.append(label)
-            main_layout.addWidget(label)
-
-        btn_close = QtWidgets.QPushButton("Close")
-        btn_close.setToolTip('Close this window')
-        btn_close.clicked.connect(self.on_close_clicked)
-
-        btn_group = QtWidgets.QHBoxLayout()
-        btn_group.addStretch(1)
-        btn_group.addWidget(btn_close)
-
-        main_layout.addLayout(btn_group)
-
-        self.labels = labels
-        self.btn_group = btn_group
-        self.btn_close = btn_close
-        self.main_layout = main_layout
-
-        return main_layout
-
-    def on_close_clicked(self):
-        self.close()
-
-    def close(self, *args, **kwargs):
-        self.closed.emit()
-        super(MessageWidget, self).close(*args, **kwargs)
diff --git a/pype/modules/clockify/widget_settings.py b/pype/modules/clockify/widgets.py
similarity index 66%
rename from pype/modules/clockify/widget_settings.py
rename to pype/modules/clockify/widgets.py
index 7e5ee300bb..dc57a48ecb 100644
--- a/pype/modules/clockify/widget_settings.py
+++ b/pype/modules/clockify/widgets.py
@@ -1,9 +1,97 @@
-import os
 from Qt import QtCore, QtGui, QtWidgets
 from avalon import style
 from pype.api import resources
 
 
+class MessageWidget(QtWidgets.QWidget):
+
+    SIZE_W = 300
+    SIZE_H = 130
+
+    closed = QtCore.Signal()
+
+    def __init__(self, parent=None, messages=[], title="Message"):
+
+        super(MessageWidget, self).__init__()
+
+        self._parent = parent
+
+        # Icon
+        if parent and hasattr(parent, 'icon'):
+            self.setWindowIcon(parent.icon)
+        else:
+            icon = QtGui.QIcon(resources.pype_icon_filepath())
+            self.setWindowIcon(icon)
+
+        self.setWindowFlags(
+            QtCore.Qt.WindowCloseButtonHint |
+            QtCore.Qt.WindowMinimizeButtonHint
+        )
+
+        # Font
+        self.font = QtGui.QFont()
+        self.font.setFamily("DejaVu Sans Condensed")
+        self.font.setPointSize(9)
+        self.font.setBold(True)
+        self.font.setWeight(50)
+        self.font.setKerning(True)
+
+        # Size setting
+        self.resize(self.SIZE_W, self.SIZE_H)
+        self.setMinimumSize(QtCore.QSize(self.SIZE_W, self.SIZE_H))
+        self.setMaximumSize(QtCore.QSize(self.SIZE_W+100, self.SIZE_H+100))
+
+        # Style
+        self.setStyleSheet(style.load_stylesheet())
+
+        self.setLayout(self._ui_layout(messages))
+        self.setWindowTitle(title)
+
+    def _ui_layout(self, messages):
+        if not messages:
+            messages = ["*Misssing messages (This is a bug)*", ]
+
+        elif not isinstance(messages, (tuple, list)):
+            messages = [messages, ]
+
+        main_layout = QtWidgets.QVBoxLayout(self)
+
+        labels = []
+        for message in messages:
+            label = QtWidgets.QLabel(message)
+            label.setFont(self.font)
+            label.setCursor(QtGui.QCursor(QtCore.Qt.ArrowCursor))
+            label.setTextFormat(QtCore.Qt.RichText)
+            label.setWordWrap(True)
+
+            labels.append(label)
+            main_layout.addWidget(label)
+
+        btn_close = QtWidgets.QPushButton("Close")
+        btn_close.setToolTip('Close this window')
+        btn_close.clicked.connect(self.on_close_clicked)
+
+        btn_group = QtWidgets.QHBoxLayout()
+        btn_group.addStretch(1)
+        btn_group.addWidget(btn_close)
+
+        main_layout.addLayout(btn_group)
+
+        self.labels = labels
+        self.btn_group = btn_group
+        self.btn_close = btn_close
+        self.main_layout = main_layout
+
+        return main_layout
+
+    def on_close_clicked(self):
+        self.close()
+
+    def close(self, *args, **kwargs):
+        self.closed.emit()
+        super(MessageWidget, self).close(*args, **kwargs)
+
+
 class ClockifySettings(QtWidgets.QWidget):
 
     SIZE_W = 300