diff --git a/setup.py b/setup.py
index 3edf7c8..72cd6dc 100644
--- a/setup.py
+++ b/setup.py
@@ -48,10 +48,10 @@ setup(
             'ui/app_styles.css',
             'ui/images/play-queue-play.png',
             'ui/images/default-album-art.png',
-            'mpris_specs/org.mpris.MediaPlayer2.xml',
-            'mpris_specs/org.mpris.MediaPlayer2.Player.xml',
-            'mpris_specs/org.mpris.MediaPlayer2.Playlists.xml',
-            'mpris_specs/org.mpris.MediaPlayer2.TrackList.xml',
+            'dbus/mpris_specs/org.mpris.MediaPlayer2.xml',
+            'dbus/mpris_specs/org.mpris.MediaPlayer2.Player.xml',
+            'dbus/mpris_specs/org.mpris.MediaPlayer2.Playlists.xml',
+            'dbus/mpris_specs/org.mpris.MediaPlayer2.TrackList.xml',
         ]
     },
     install_requires=[
diff --git a/sublime/app.py b/sublime/app.py
index 3ae5ba7..b307a1a 100644
--- a/sublime/app.py
+++ b/sublime/app.py
@@ -31,7 +31,7 @@ from .adapters import AdapterManager
 from .adapters.api_objects import Playlist
 from .cache_manager import CacheManager
 from .config import AppConfiguration, ReplayGainType
-from .dbus_manager import dbus_propagate, DBusManager
+from .dbus import dbus_propagate, DBusManager
 from .players import ChromecastPlayer, MPVPlayer, PlayerEvent
 from .server.api_objects import Child, Directory
 from .ui.configure_servers import ConfigureServersDialog
diff --git a/sublime/dbus/__init__.py b/sublime/dbus/__init__.py
new file mode 100644
index 0000000..ceb6278
--- /dev/null
+++ b/sublime/dbus/__init__.py
@@ -0,0 +1,3 @@
+from .manager import DBusManager, dbus_propagate
+
+__all__ = ('DBusManager', 'dbus_propagate')
diff --git a/sublime/dbus_manager.py b/sublime/dbus/manager.py
similarity index 100%
rename from sublime/dbus_manager.py
rename to sublime/dbus/manager.py
diff --git a/sublime/mpris_specs/org.mpris.MediaPlayer2.Player.xml b/sublime/dbus/mpris_specs/org.mpris.MediaPlayer2.Player.xml
similarity index 100%
rename from sublime/mpris_specs/org.mpris.MediaPlayer2.Player.xml
rename to sublime/dbus/mpris_specs/org.mpris.MediaPlayer2.Player.xml
diff --git a/sublime/mpris_specs/org.mpris.MediaPlayer2.Playlists.xml b/sublime/dbus/mpris_specs/org.mpris.MediaPlayer2.Playlists.xml
similarity index 100%
rename from sublime/mpris_specs/org.mpris.MediaPlayer2.Playlists.xml
rename to sublime/dbus/mpris_specs/org.mpris.MediaPlayer2.Playlists.xml
diff --git a/sublime/mpris_specs/org.mpris.MediaPlayer2.TrackList.xml b/sublime/dbus/mpris_specs/org.mpris.MediaPlayer2.TrackList.xml
similarity index 100%
rename from sublime/mpris_specs/org.mpris.MediaPlayer2.TrackList.xml
rename to sublime/dbus/mpris_specs/org.mpris.MediaPlayer2.TrackList.xml
diff --git a/sublime/mpris_specs/org.mpris.MediaPlayer2.xml b/sublime/dbus/mpris_specs/org.mpris.MediaPlayer2.xml
similarity index 100%
rename from sublime/mpris_specs/org.mpris.MediaPlayer2.xml
rename to sublime/dbus/mpris_specs/org.mpris.MediaPlayer2.xml