diff --git a/tuhi/gui/tuhi.py b/tuhi/dbusclient.py
similarity index 99%
rename from tuhi/gui/tuhi.py
rename to tuhi/dbusclient.py
index 6d871dd..eb4ff25 100644
--- a/tuhi/gui/tuhi.py
+++ b/tuhi/dbusclient.py
@@ -18,7 +18,7 @@ import os
 import logging
 import re
 
-logger = logging.getLogger('tuhi.gui.dbus')
+logger = logging.getLogger('tuhi.dbusclient')
 
 TUHI_DBUS_NAME = 'org.freedesktop.tuhi1'
 ORG_FREEDESKTOP_TUHI1_MANAGER = 'org.freedesktop.tuhi1.Manager'
diff --git a/tuhi/gui/window.py b/tuhi/gui/window.py
index 85a11f9..8de588f 100644
--- a/tuhi/gui/window.py
+++ b/tuhi/gui/window.py
@@ -15,8 +15,8 @@ from gettext import gettext as _
 from gi.repository import Gtk, Gio, GLib, GObject
 
 from .drawingperspective import DrawingPerspective
-from .tuhi import TuhiKeteManager
 from .config import Config
+from tuhi.dbusclient import TuhiKeteManager
 
 import logging
 import gi