@@ -10,7 +10,6 @@
 import subprocess
 import sys
 import time
-import threading
 
 gettext.install("mintupdate", "/usr/share/locale")
 
@@ -33,21 +32,6 @@
 
 CONFIG_PATH = os.path.expanduser("~/.linuxmint/mintupdate")
 
-# Used as a decorator to run things in the background
-def _async(func):
-    def wrapper(*args, **kwargs):
-        thread = threading.Thread(target=func, args=args, kwargs=kwargs)
-        thread.daemon = True
-        thread.start()
-        return thread
-    return wrapper
-
-# Used as a decorator to run things in the main loop, from another thread
-def _idle(func):
-    def wrapper(*args):
-        GLib.idle_add(func, *args)
-    return wrapper
-
 def get_release_dates():
     """ Get distro release dates for support duration calculation """
     release_dates = {}
 
@@ -25,8 +25,8 @@
 from multiprocess import Process, Queue
 
 from Classes import (CONFIG_PATH, CONFIGURED_KERNEL_TYPE, KERNEL_PKG_NAMES,
-                     PRIORITY_UPDATES, SUPPORTED_KERNEL_TYPES, Alias, KernelVersion, Update,
-                     _idle)
+                     PRIORITY_UPDATES, SUPPORTED_KERNEL_TYPES, Alias, KernelVersion, Update)
+from util import _idle
 
 gettext.install("mintupdate", "/usr/share/locale")
 
 
@@ -17,7 +17,8 @@
 from apt.utils import get_maintenance_end_date
 
 from Classes import CONFIGURED_KERNEL_TYPE, KERNEL_PKG_NAMES, \
-                     SUPPORTED_KERNEL_TYPES, get_release_dates, _idle, _async
+                     SUPPORTED_KERNEL_TYPES, get_release_dates
+from util import _idle, _async
 
 # i18n
 APP = 'mintupdate'
 
@@ -33,8 +33,8 @@
 from kernelwindow import KernelWindow
 from preferences import PreferencesWindow
 
-from Classes import MainloopTimer, Update, PRIORITY_UPDATES, UpdateTracker, _idle, _async
-from util import on_battery
+from Classes import MainloopTimer, Update, PRIORITY_UPDATES, UpdateTracker
+from util import on_battery, _idle, _async
 
 
 settings = Gio.Settings(schema_id="com.linuxmint.updates")
 
@@ -10,7 +10,7 @@
 
 gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk, Gio
-from Classes import _idle, _async
+from util import _idle, _async
 gettext.install("mintupdate", "/usr/share/locale")
 
 class Assistant:
 
@@ -4,6 +4,23 @@
 from gi.repository import Gio, GLib
 
 
+# Used as a decorator to run things in the background
+def _async(func):
+    def wrapper(*args, **kwargs):
+        thread = threading.Thread(target=func, args=args, kwargs=kwargs)
+        thread.daemon = True
+        thread.start()
+        return thread
+    return wrapper
+
+
+# Used as a decorator to run things in the main loop, from another thread
+def _idle(func):
+    def wrapper(*args):
+        GLib.idle_add(func, *args)
+    return wrapper
+
+
 def on_battery():
     # Query UPower over the system D-Bus. Works for both root (system services)
     # and user contexts; UPower's default policy allows property reads from any uid.