diff --git a/briar-gtk/briar_gtk/startup/__init__.py b/briar-gtk/briar_gtk/startup/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..829f866a453dd0fc8ce75441d7158ac6b1c96abc
--- /dev/null
+++ b/briar-gtk/briar_gtk/startup/__init__.py
@@ -0,0 +1,6 @@
+# Copyright (c) 2021 Nico Alt
+# SPDX-License-Identifier: AGPL-3.0-only
+# License-Filename: LICENSE.md
+"""
+Starting up Briar GTK
+"""
diff --git a/briar-gtk/briar_gtk/actions/login.py b/briar-gtk/briar_gtk/startup/login_actions.py
similarity index 94%
rename from briar-gtk/briar_gtk/actions/login.py
rename to briar-gtk/briar_gtk/startup/login_actions.py
index be8b9827d813ed0c3e5e3bfabc5c00e4d1248edf..1c6371f01c24a280d3895079091accc7469f1be4 100644
--- a/briar-gtk/briar_gtk/actions/login.py
+++ b/briar-gtk/briar_gtk/startup/login_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/login.py b/briar-gtk/briar_gtk/startup/login_view.py
similarity index 97%
rename from briar-gtk/briar_gtk/views/login.py
rename to briar-gtk/briar_gtk/startup/login_view.py
index 08127161d0810c13f0b5dd0831b30b43d9b614ff..58d781551cdb847e6db24bf8366bcb9b234bd6a1 100644
--- a/briar-gtk/briar_gtk/views/login.py
+++ b/briar-gtk/briar_gtk/startup/login_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
@@ -6,7 +6,7 @@ from gettext import gettext as _
 
 from gi.repository import GLib, Gtk
 
-from briar_gtk.actions.login import LoginActions
+from briar_gtk.startup.login_actions import LoginActions
 from briar_gtk.actions.prefixes import LOGIN_PREFIX
 from briar_gtk.define import APP, RESOURCES_DIR
 
diff --git a/briar-gtk/briar_gtk/actions/registration.py b/briar-gtk/briar_gtk/startup/registration_actions.py
similarity index 97%
rename from briar-gtk/briar_gtk/actions/registration.py
rename to briar-gtk/briar_gtk/startup/registration_actions.py
index a2bdbe4cdd8a2924cc60c06965891bbb08df43e7..6e867bc9c8f83b571d5e4a3515eb4af338fab62b 100644
--- a/briar-gtk/briar_gtk/actions/registration.py
+++ b/briar-gtk/briar_gtk/startup/registration_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/registration.py b/briar-gtk/briar_gtk/startup/registration_view.py
similarity index 98%
rename from briar-gtk/briar_gtk/views/registration.py
rename to briar-gtk/briar_gtk/startup/registration_view.py
index fc075da61f006ec2db23bdef25ab50e18be37233..8ca2d900060147e749b454f0b1748bb71801927c 100644
--- a/briar-gtk/briar_gtk/views/registration.py
+++ b/briar-gtk/briar_gtk/startup/registration_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
@@ -6,7 +6,7 @@ from gettext import gettext as _
 
 from gi.repository import GLib, Gtk
 
-from briar_gtk.actions.registration import RegistrationActions
+from briar_gtk.startup.registration_actions import RegistrationActions
 from briar_gtk.actions.prefixes import REGISTRATION_PREFIX
 from briar_gtk.define import APP, RESOURCES_DIR
 
diff --git a/briar-gtk/briar_gtk/views/startup.py b/briar-gtk/briar_gtk/startup/startup_view.py
similarity index 75%
rename from briar-gtk/briar_gtk/views/startup.py
rename to briar-gtk/briar_gtk/startup/startup_view.py
index 958e523ab8a39513d03a102de60515675ad441ee..335f3fa1bb951f6c5553185fd4aa21674d98905b 100644
--- a/briar-gtk/briar_gtk/views/startup.py
+++ b/briar-gtk/briar_gtk/startup/startup_view.py
@@ -1,11 +1,11 @@
-# Copyright (c) 2019 Nico Alt
+# Copyright (c) 2019-2021 Nico Alt
 # SPDX-License-Identifier: AGPL-3.0-only
 # License-Filename: LICENSE.md
 
 from gi.repository import Gtk
 
-from briar_gtk.views.login import LoginView
-from briar_gtk.views.registration import RegistrationView
+from briar_gtk.startup.login_view import LoginView
+from briar_gtk.startup.registration_view import RegistrationView
 from briar_gtk.define import APP
 
 
diff --git a/briar-gtk/briar_gtk/window.py b/briar-gtk/briar_gtk/window.py
index d8fe3817f0a8b4cdd2eb7d0587101c280f922465..002b68f74a2c54ea977864dd6f9942c562dee988 100644
--- a/briar-gtk/briar_gtk/window.py
+++ b/briar-gtk/briar_gtk/window.py
@@ -8,7 +8,7 @@ from gi.repository import Gio, Gtk
 from briar_gtk.actions.window import WindowActions
 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.startup.startup_view import StartupView
 from briar_gtk.define import APP, APPLICATION_ID, APPLICATION_NAME
 from briar_gtk.define import NOTIFICATION_CONTACT_ADDED
 from briar_gtk.define import NOTIFICATION_PRIVATE_MESSAGE