diff --git a/src/main/kotlin/org/briarproject/briar/desktop/BriarDesktopApp.kt b/src/main/kotlin/org/briarproject/briar/desktop/BriarDesktopApp.kt
index d4dcded3a9005e1514a1f207cca59f0a0fdffb2c..e3c001445756e302b2e26c0ab748728ec38a5bbb 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/BriarDesktopApp.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/BriarDesktopApp.kt
@@ -5,6 +5,7 @@ import org.briarproject.bramble.BrambleCoreEagerSingletons
 import org.briarproject.bramble.BrambleCoreModule
 import org.briarproject.briar.BriarCoreEagerSingletons
 import org.briarproject.briar.BriarCoreModule
+import org.briarproject.briar.desktop.ui.BriarUi
 import java.security.SecureRandom
 import javax.inject.Singleton
 
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/DesktopModule.kt b/src/main/kotlin/org/briarproject/briar/desktop/DesktopModule.kt
index 7a55917cd28a774785de504291c8dd6dc4895ba8..b84cad40217f3d620789c9ec70c4ded843b7f3b9 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/DesktopModule.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/DesktopModule.kt
@@ -24,6 +24,8 @@ import org.briarproject.bramble.system.DesktopSecureRandomModule
 import org.briarproject.bramble.system.JavaSystemModule
 import org.briarproject.bramble.util.OsUtils.isLinux
 import org.briarproject.bramble.util.OsUtils.isMac
+import org.briarproject.briar.desktop.ui.BriarUi
+import org.briarproject.briar.desktop.ui.BriarUiImpl
 import java.io.File
 import java.nio.file.Path
 import java.util.Collections.emptyList
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/contact/AddContactDialog.kt b/src/main/kotlin/org/briarproject/briar/desktop/contact/AddContactDialog.kt
index ec879bd3c4788bdd343a29c5e783fe4f1df549e0..2d2f5ae5b0d2c8485a73f838a60de3ce0ce4f911 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/contact/AddContactDialog.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/contact/AddContactDialog.kt
@@ -1,4 +1,4 @@
-package org.briarproject.briar.desktop.conversation
+package org.briarproject.briar.desktop.contact
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -29,7 +29,7 @@ import org.briarproject.bramble.api.db.ContactExistsException
 import org.briarproject.bramble.api.db.PendingContactExistsException
 import org.briarproject.bramble.api.identity.AuthorConstants
 import org.briarproject.bramble.util.StringUtils
-import org.briarproject.briar.desktop.CTM
+import org.briarproject.briar.desktop.ui.CTM
 import java.security.GeneralSecurityException
 
 @OptIn(ExperimentalMaterialApi::class)
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactCard.kt b/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactCard.kt
index 9af1d64f1fb90cd0ae981ce79fe003d6a6691f57..e66b88535187b55b52547fe3f5332b820e7bf145 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactCard.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactCard.kt
@@ -1,4 +1,4 @@
-package org.briarproject.briar.desktop.conversation
+package org.briarproject.briar.desktop.contact
 
 import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.clickable
@@ -20,12 +20,12 @@ import androidx.compose.ui.graphics.drawscope.withTransform
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import org.briarproject.bramble.api.contact.Contact
-import org.briarproject.briar.desktop.CVM
-import org.briarproject.briar.desktop.contact.ProfileCircle
 import org.briarproject.briar.desktop.theme.outline
 import org.briarproject.briar.desktop.theme.selectedCard
 import org.briarproject.briar.desktop.theme.surfaceVariant
+import org.briarproject.briar.desktop.ui.CVM
 import org.briarproject.briar.desktop.ui.Constants.HEADER_SIZE
+import org.briarproject.briar.desktop.ui.HorizontalDivider
 import org.briarproject.briar.desktop.utils.TimeUtils.getFormattedTimestamp
 
 @Composable
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactDrawerMakeIntro.kt b/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactDrawerMakeIntro.kt
index fcb166e9151a4359da2dc79e3bb270d4af5f3bd8..f8885da16c092b851415d2af2303b01d05c1f36c 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactDrawerMakeIntro.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactDrawerMakeIntro.kt
@@ -1,4 +1,4 @@
-package org.briarproject.briar.desktop.conversation
+package org.briarproject.briar.desktop.contact
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -31,8 +31,8 @@ import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import org.briarproject.bramble.api.contact.Contact
-import org.briarproject.briar.desktop.contact.ProfileCircle
 import org.briarproject.briar.desktop.ui.Constants.HEADER_SIZE
+import org.briarproject.briar.desktop.ui.HorizontalDivider
 
 @Composable
 fun ContactDrawerMakeIntro(contact: Contact, contacts: List<Contact>, setInfoDrawer: (Boolean) -> Unit) {
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactDropDown.kt b/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactDropDown.kt
index caaf8fad7dee40cc1a51ebafd09d9aa474d4fe95..9740a14c63c3154b05b92580b51069e55d12b489 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactDropDown.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactDropDown.kt
@@ -1,4 +1,4 @@
-package org.briarproject.briar.desktop.conversation
+package org.briarproject.briar.desktop.contact
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactInfoDrawer.kt b/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactInfoDrawer.kt
index 6c8ec6e06e35bb7881610792acfc00140e4a86e3..99f247b2d9995ae95e7568f56d8a6d3062b2e0fb 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactInfoDrawer.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactInfoDrawer.kt
@@ -3,7 +3,6 @@ package org.briarproject.briar.desktop.contact
 import androidx.compose.runtime.Composable
 import org.briarproject.bramble.api.contact.Contact
 import org.briarproject.briar.desktop.contact.ContactInfoDrawerState.MakeIntro
-import org.briarproject.briar.desktop.conversation.ContactDrawerMakeIntro
 
 // Right drawer state
 enum class ContactInfoDrawerState {
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactList.kt b/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactList.kt
index b25092841f3418706f8a3f02687872c63f96f8a2..ef1d1a5a112f1c8f3f7e048df4c300557fea29e7 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactList.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactList.kt
@@ -1,4 +1,4 @@
-package org.briarproject.briar.desktop.conversation
+package org.briarproject.briar.desktop.contact
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxHeight
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/contact/SearchTextField.kt b/src/main/kotlin/org/briarproject/briar/desktop/contact/SearchTextField.kt
index 824ef78bc17d39a113fcf4315fc006530d0475f3..29542dd7d07d47a172f63a06202775b3e9314a1b 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/contact/SearchTextField.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/contact/SearchTextField.kt
@@ -1,4 +1,4 @@
-package org.briarproject.briar.desktop.conversation
+package org.briarproject.briar.desktop.contact
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.fillMaxSize
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/conversation/ChatHistoryConversationVisitor.kt b/src/main/kotlin/org/briarproject/briar/desktop/conversation/ChatHistoryConversationVisitor.kt
index 18f19329c85ad64369b0b21742159346b3872b1d..4163d16c74135220a6766664988888d33e91ef2f 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/conversation/ChatHistoryConversationVisitor.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/conversation/ChatHistoryConversationVisitor.kt
@@ -27,7 +27,7 @@ class ChatHistoryConversationVisitor(
         private val LOG = Logger.getLogger(ChatHistoryConversationVisitor::class.java.name)
     }
 
-    fun appendMessage(header: ConversationMessageHeader) {
+    private fun appendMessage(header: ConversationMessageHeader) {
         try {
             val messageText = messagingManager.getMessageText(header.id)
             chat.appendMessage(header.isLocal, header.timestamp, messageText)
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/conversation/ChatState.kt b/src/main/kotlin/org/briarproject/briar/desktop/conversation/ChatState.kt
index 316df7dc3116c7ea805560acb00130f50ebff4fd..e996fd151858c8b9898d499d584aeadfa9a7cf71 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/conversation/ChatState.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/conversation/ChatState.kt
@@ -7,8 +7,8 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import org.briarproject.bramble.api.contact.ContactId
 import org.briarproject.briar.api.conversation.ConversationMessageHeader
-import org.briarproject.briar.desktop.CVM
-import org.briarproject.briar.desktop.MM
+import org.briarproject.briar.desktop.ui.CVM
+import org.briarproject.briar.desktop.ui.MM
 import org.briarproject.briar.desktop.ui.UiState
 import java.util.Collections
 
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/conversation/Conversation.kt b/src/main/kotlin/org/briarproject/briar/desktop/conversation/Conversation.kt
index 92c5988d8158b8375ec8a3ca1198a3ba78256a70..71f0cd34e0d8295041b8d35a331424c3cd62c2ed 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/conversation/Conversation.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/conversation/Conversation.kt
@@ -25,9 +25,9 @@ import androidx.compose.ui.unit.dp
 import org.briarproject.bramble.api.contact.Contact
 import org.briarproject.briar.desktop.contact.ContactInfoDrawer
 import org.briarproject.briar.desktop.contact.ContactInfoDrawerState
+import org.briarproject.briar.desktop.navigation.SIDEBAR_WIDTH
 import org.briarproject.briar.desktop.theme.surfaceVariant
 import org.briarproject.briar.desktop.ui.Constants.CONTACTLIST_WIDTH
-import org.briarproject.briar.desktop.views.SIDEBAR_WIDTH
 
 @Composable
 fun Conversation(
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationHeader.kt b/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationHeader.kt
index 0372dce4d2e517c30aabefc0bc1bddf211bc6d99..c8c45f0e05b09738cef58bafb7f40507901c3c9a 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationHeader.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationHeader.kt
@@ -20,9 +20,11 @@ import androidx.compose.ui.graphics.drawscope.withTransform
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import org.briarproject.bramble.api.contact.Contact
+import org.briarproject.briar.desktop.contact.ContactDropDown
 import org.briarproject.briar.desktop.contact.ProfileCircle
 import org.briarproject.briar.desktop.theme.outline
 import org.briarproject.briar.desktop.ui.Constants.HEADER_SIZE
+import org.briarproject.briar.desktop.ui.HorizontalDivider
 
 @Composable
 fun ConversationHeader(
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationInput.kt b/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationInput.kt
index 8864a041bc990d4f56fe9a07e406d871f04efdd7..54eef33b668b01b81873976936c8f7bd2c9dbd36 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationInput.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationInput.kt
@@ -29,6 +29,7 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import org.briarproject.briar.desktop.theme.DarkColors
+import org.briarproject.briar.desktop.ui.HorizontalDivider
 
 @Preview
 @Composable
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/conversation/PrivateMessageView.kt b/src/main/kotlin/org/briarproject/briar/desktop/conversation/PrivateMessageView.kt
index 6ab00cf5605f0812bee06ed7ddc1da94a9a6bced..929c3f076221676d3cdc5bf951174be5a5da055a 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/conversation/PrivateMessageView.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/conversation/PrivateMessageView.kt
@@ -9,8 +9,11 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import org.briarproject.bramble.api.contact.Contact
+import org.briarproject.briar.desktop.contact.AddContactDialog
 import org.briarproject.briar.desktop.contact.ContactInfoDrawerState.MakeIntro
+import org.briarproject.briar.desktop.contact.ContactList
 import org.briarproject.briar.desktop.contact.ContactsViewModel
+import org.briarproject.briar.desktop.ui.VerticalDivider
 
 @Composable
 fun PrivateMessageView(
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/conversation/TextBubbles.kt b/src/main/kotlin/org/briarproject/briar/desktop/conversation/TextBubbles.kt
index d8e157a418821fc6316cd600d67c92196c72c6bc..8d3f73fc5e310b8149294e089d8152db8e81939b 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/conversation/TextBubbles.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/conversation/TextBubbles.kt
@@ -6,6 +6,7 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.unit.dp
+import org.briarproject.briar.desktop.ui.Loader
 import org.briarproject.briar.desktop.ui.UiState
 
 @Composable
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/navigation/BriarSidebar.kt b/src/main/kotlin/org/briarproject/briar/desktop/navigation/BriarSidebar.kt
index f91bcf5008fd3bcf48bcd400d9ce2557227a7f11..60c1614b7b0c251f6f188414a64a0bf6cef005c4 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/navigation/BriarSidebar.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/navigation/BriarSidebar.kt
@@ -1,4 +1,4 @@
-package org.briarproject.briar.desktop.views
+package org.briarproject.briar.desktop.navigation
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -23,9 +23,9 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.unit.dp
-import org.briarproject.briar.desktop.IM
 import org.briarproject.briar.desktop.contact.ProfileCircle
 import org.briarproject.briar.desktop.theme.sidebarSurface
+import org.briarproject.briar.desktop.ui.IM
 import org.briarproject.briar.desktop.ui.UiMode
 
 val SIDEBAR_WIDTH = 56.dp
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/ui/BriarUi.kt b/src/main/kotlin/org/briarproject/briar/desktop/ui/BriarUi.kt
index e44791b91f7f92659bd76398f45a43e778543f6c..5fa8ea0d60bf2e40353233dd4e6b62f0a7017026 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/ui/BriarUi.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/ui/BriarUi.kt
@@ -1,4 +1,4 @@
-package org.briarproject.briar.desktop
+package org.briarproject.briar.desktop.ui
 
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.compositionLocalOf
@@ -21,7 +21,6 @@ import org.briarproject.briar.desktop.login.LoginViewModel
 import org.briarproject.briar.desktop.login.Registration
 import org.briarproject.briar.desktop.login.RegistrationViewModel
 import org.briarproject.briar.desktop.theme.BriarTheme
-import org.briarproject.briar.desktop.ui.MainScreen
 import java.awt.Dimension
 import java.util.logging.Logger
 import javax.annotation.concurrent.Immutable
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/ui/HorizontalDivider.kt b/src/main/kotlin/org/briarproject/briar/desktop/ui/HorizontalDivider.kt
index eca9e54199977bc2b51a5f911c773d28375f3cab..f9eea9fccf7c51082484b36ed615e857bc8c3350 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/ui/HorizontalDivider.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/ui/HorizontalDivider.kt
@@ -1,4 +1,4 @@
-package org.briarproject.briar.desktop.conversation
+package org.briarproject.briar.desktop.ui
 
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material.Divider
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/ui/Loader.kt b/src/main/kotlin/org/briarproject/briar/desktop/ui/Loader.kt
index 95323440b85d61a0ebca97f48f17be5e0081a7ae..0cfb9434ca0dd1ff4691d1684008cdedde84ff40 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/ui/Loader.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/ui/Loader.kt
@@ -1,4 +1,4 @@
-package org.briarproject.briar.desktop.conversation
+package org.briarproject.briar.desktop.ui
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxWidth
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/ui/MainScreen.kt b/src/main/kotlin/org/briarproject/briar/desktop/ui/MainScreen.kt
index deb9801ddf592a0b488bc5959a81d9bcecd940c4..9a27637bbebd2921e4f4149938f851db1476ecd6 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/ui/MainScreen.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/ui/MainScreen.kt
@@ -12,9 +12,8 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import org.briarproject.briar.desktop.contact.ContactsViewModel
 import org.briarproject.briar.desktop.conversation.PrivateMessageView
-import org.briarproject.briar.desktop.conversation.VerticalDivider
+import org.briarproject.briar.desktop.navigation.BriarSidebar
 import org.briarproject.briar.desktop.settings.PlaceHolderSettingsView
-import org.briarproject.briar.desktop.views.BriarSidebar
 
 /*
  * This is the root of the tree, all state is held here and passed down to stateless composables, which render the UI
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/ui/VerticalDivider.kt b/src/main/kotlin/org/briarproject/briar/desktop/ui/VerticalDivider.kt
index dc710e643412878a05e67b391448c0005ceea192..c58948e566a978b7af9630618d8ebe9956e179dd 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/ui/VerticalDivider.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/ui/VerticalDivider.kt
@@ -1,4 +1,4 @@
-package org.briarproject.briar.desktop.conversation
+package org.briarproject.briar.desktop.ui
 
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.width
diff --git a/src/test/kotlin/org/briarproject/briar/desktop/BriarDesktopTestApp.kt b/src/test/kotlin/org/briarproject/briar/desktop/BriarDesktopTestApp.kt
index 7265ea99041803a6139439011b07b5a10791fbfe..04210dd0cc272d44d2b1d4f6b02cde6e1d4f0ef1 100644
--- a/src/test/kotlin/org/briarproject/briar/desktop/BriarDesktopTestApp.kt
+++ b/src/test/kotlin/org/briarproject/briar/desktop/BriarDesktopTestApp.kt
@@ -10,6 +10,7 @@ import org.briarproject.briar.BriarCoreEagerSingletons
 import org.briarproject.briar.BriarCoreModule
 import org.briarproject.briar.api.test.TestDataCreator
 import org.briarproject.briar.desktop.testdata.DeterministicTestDataCreator
+import org.briarproject.briar.desktop.ui.BriarUi
 import java.security.SecureRandom
 import javax.inject.Singleton
 
diff --git a/src/test/kotlin/org/briarproject/briar/desktop/DesktopTestModule.kt b/src/test/kotlin/org/briarproject/briar/desktop/DesktopTestModule.kt
index dde9e5483f3bc1714a68b7d623029bb923ff4164..2253d221624e1b3dfdcb3a31e228becbb3242675 100644
--- a/src/test/kotlin/org/briarproject/briar/desktop/DesktopTestModule.kt
+++ b/src/test/kotlin/org/briarproject/briar/desktop/DesktopTestModule.kt
@@ -27,6 +27,8 @@ import org.briarproject.bramble.util.OsUtils.isMac
 import org.briarproject.briar.api.test.TestAvatarCreator
 import org.briarproject.briar.desktop.testdata.DeterministicTestDataCreator
 import org.briarproject.briar.desktop.testdata.DeterministicTestDataCreatorImpl
+import org.briarproject.briar.desktop.ui.BriarUi
+import org.briarproject.briar.desktop.ui.BriarUiImpl
 import org.briarproject.briar.test.TestModule
 import java.io.File
 import java.util.Collections.emptyList