diff --git a/briar-gtk/briar_gtk/conversation/conversation_presenter.py b/briar-gtk/briar_gtk/conversation/conversation_presenter.py
index e66e49705a6050a54dbf6abf0d7205f14a2a2b23..9e40afb349a37071db70fedd0fe93302e3fb8503 100644
--- a/briar-gtk/briar_gtk/conversation/conversation_presenter.py
+++ b/briar-gtk/briar_gtk/conversation/conversation_presenter.py
@@ -6,7 +6,7 @@ from briar_gtk.handlers.notification import NotificationHandler
 from briar_gtk.presenters.private_chat import PrivateChatPresenter
 from briar_gtk.define import APP
 from briar_gtk.views.private_chat import PrivateChatView
-from briar_gtk.views.sidebar import SidebarView
+from briar_gtk.conversation_sidebar.conversation_sidebar_view import SidebarView
 from briar_gtk.conversation.about_dialog import AboutDialogWidget
 
 
diff --git a/briar-gtk/briar_gtk/conversation_sidebar/__init__.py b/briar-gtk/briar_gtk/conversation_sidebar/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..ea313da4a58b79fedc89473211238b9283076d5e
--- /dev/null
+++ b/briar-gtk/briar_gtk/conversation_sidebar/__init__.py
@@ -0,0 +1,6 @@
+# Copyright (c) 2021 Nico Alt
+# SPDX-License-Identifier: AGPL-3.0-only
+# License-Filename: LICENSE.md
+"""
+Conversation sidebar in Briar GTK
+"""
diff --git a/briar-gtk/briar_gtk/widgets/contact_row.py b/briar-gtk/briar_gtk/conversation_sidebar/contact_row.py
similarity index 98%
rename from briar-gtk/briar_gtk/widgets/contact_row.py
rename to briar-gtk/briar_gtk/conversation_sidebar/contact_row.py
index bd0d7fe6189a88dde2c37cd8b3375562da334e7f..d7e8897f879c7dccde14966fd4d26c06b504b82c 100644
--- a/briar-gtk/briar_gtk/widgets/contact_row.py
+++ b/briar-gtk/briar_gtk/conversation_sidebar/contact_row.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Nico Alt
+# Copyright (c) 2020-2021 Nico Alt
 # SPDX-License-Identifier: AGPL-3.0-only
 # License-Filename: LICENSE.md
 #
diff --git a/briar-gtk/briar_gtk/presenters/sidebar.py b/briar-gtk/briar_gtk/conversation_sidebar/conversation_sidebar_presenter.py
similarity index 98%
rename from briar-gtk/briar_gtk/presenters/sidebar.py
rename to briar-gtk/briar_gtk/conversation_sidebar/conversation_sidebar_presenter.py
index dfbecf6b1cc7e1cfb4a44e4bb63f58b0739218f6..e572928c54d56112faeb0471bb01a209047eaf4e 100644
--- a/briar-gtk/briar_gtk/presenters/sidebar.py
+++ b/briar-gtk/briar_gtk/conversation_sidebar/conversation_sidebar_presenter.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Nico Alt
+# Copyright (c) 2020-2021 Nico Alt
 # SPDX-License-Identifier: AGPL-3.0-only
 # License-Filename: LICENSE.md
 
diff --git a/briar-gtk/briar_gtk/views/sidebar.py b/briar-gtk/briar_gtk/conversation_sidebar/conversation_sidebar_view.py
similarity index 85%
rename from briar-gtk/briar_gtk/views/sidebar.py
rename to briar-gtk/briar_gtk/conversation_sidebar/conversation_sidebar_view.py
index d425300c6c039b2f5bb632c11b6e86ea5697aa1e..ab113121f841e83298636639e5737291c91bf4e7 100644
--- a/briar-gtk/briar_gtk/views/sidebar.py
+++ b/briar-gtk/briar_gtk/conversation_sidebar/conversation_sidebar_view.py
@@ -1,9 +1,9 @@
-# Copyright (c) 2020 Nico Alt
+# Copyright (c) 2020-2021 Nico Alt
 # SPDX-License-Identifier: AGPL-3.0-only
 # License-Filename: LICENSE.md
 from briar_gtk.define import APP
-from briar_gtk.presenters.sidebar import SidebarPresenter
-from briar_gtk.widgets.contact_row import ContactRowWidget
+from briar_gtk.conversation_sidebar.conversation_sidebar_presenter import SidebarPresenter
+from briar_gtk.conversation_sidebar.contact_row import ContactRowWidget
 
 
 class SidebarView: