diff --git a/briar-gtk/briar_gtk/add_contact/__init__.py b/briar-gtk/briar_gtk/add_contact/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..b0c99851d812323fdf3faeebc64da66c1ed96143
--- /dev/null
+++ b/briar-gtk/briar_gtk/add_contact/__init__.py
@@ -0,0 +1,6 @@
+# Copyright (c) 2021 Nico Alt
+# SPDX-License-Identifier: AGPL-3.0-only
+# License-Filename: LICENSE.md
+"""
+Adding contacts in Briar GTK
+"""
diff --git a/briar-gtk/briar_gtk/actions/add_contact.py b/briar-gtk/briar_gtk/add_contact/add_contact_actions.py
similarity index 97%
rename from briar-gtk/briar_gtk/actions/add_contact.py
rename to briar-gtk/briar_gtk/add_contact/add_contact_actions.py
index cf99b51ca3d697687da48f7273c613e52613602f..3477a463a6c16fe075452e7014fe135f475c7cbd 100644
--- a/briar-gtk/briar_gtk/actions/add_contact.py
+++ b/briar-gtk/briar_gtk/add_contact/add_contact_actions.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/add_contact.py b/briar-gtk/briar_gtk/add_contact/add_contact_view.py
similarity index 97%
rename from briar-gtk/briar_gtk/views/add_contact.py
rename to briar-gtk/briar_gtk/add_contact/add_contact_view.py
index 063a36c629efdd25d64ed769b33b656b987c5983..b1b90afe11bc73cb71f663162047b2bb81532dd3 100644
--- a/briar-gtk/briar_gtk/views/add_contact.py
+++ b/briar-gtk/briar_gtk/add_contact/add_contact_view.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Nico Alt
+# Copyright (c) 2019-2021 Nico Alt
 # SPDX-License-Identifier: AGPL-3.0-only
 # License-Filename: LICENSE.md
 import os
@@ -7,7 +7,7 @@ from gi.repository import Gtk
 
 from briar_wrapper.models.contacts import Contacts
 
-from briar_gtk.actions.add_contact import AddContactActions
+from briar_gtk.add_contact.add_contact_actions import AddContactActions
 from briar_gtk.actions.prefixes import ADD_CONTACT_PREFIX
 from briar_gtk.define import APP, RESOURCES_DIR
 
diff --git a/briar-gtk/briar_gtk/window.py b/briar-gtk/briar_gtk/window.py
index f72ba0988df410ebe27360d28edcf2d1a386ca87..d8fe3817f0a8b4cdd2eb7d0587101c280f922465 100644
--- a/briar-gtk/briar_gtk/window.py
+++ b/briar-gtk/briar_gtk/window.py
@@ -6,7 +6,7 @@ from gettext import gettext as _
 from gi.repository import Gio, Gtk
 
 from briar_gtk.actions.window import WindowActions
-from briar_gtk.views.add_contact import AddContactView
+from briar_gtk.add_contact.add_contact_view import AddContactView
 from briar_gtk.views.main_window import MainWindowView
 from briar_gtk.views.startup import StartupView
 from briar_gtk.define import APP, APPLICATION_ID, APPLICATION_NAME