diff --git a/app-common/build.gradle.kts b/app-common/build.gradle.kts
index 43746959203..fb259a3cde3 100644
--- a/app-common/build.gradle.kts
+++ b/app-common/build.gradle.kts
@@ -9,8 +9,14 @@ android {
 dependencies {
     api(projects.legacy.common)
 
+    api(projects.legacy.ui.legacy)
+
     api(projects.feature.account.core)
 
+    api(projects.feature.launcher)
+
+    api(projects.feature.navigation.drawer.api)
+
     implementation(projects.legacy.core)
     implementation(projects.legacy.account)
 
diff --git a/legacy/common/src/main/java/com/fsck/k9/feature/AccountSetupFinishedLauncher.kt b/app-common/src/main/kotlin/net/thunderbird/app/common/feature/AccountSetupFinishedLauncher.kt
similarity index 91%
rename from legacy/common/src/main/java/com/fsck/k9/feature/AccountSetupFinishedLauncher.kt
rename to app-common/src/main/kotlin/net/thunderbird/app/common/feature/AccountSetupFinishedLauncher.kt
index 1f717f517b1..9324615fb20 100644
--- a/legacy/common/src/main/java/com/fsck/k9/feature/AccountSetupFinishedLauncher.kt
+++ b/app-common/src/main/kotlin/net/thunderbird/app/common/feature/AccountSetupFinishedLauncher.kt
@@ -1,4 +1,4 @@
-package com.fsck.k9.feature
+package net.thunderbird.app.common.feature
 
 import android.content.Context
 import app.k9mail.feature.launcher.FeatureLauncherExternalContract
diff --git a/legacy/common/src/main/java/com/fsck/k9/feature/FeatureModule.kt b/app-common/src/main/kotlin/net/thunderbird/app/common/feature/FeatureModule.kt
similarity index 93%
rename from legacy/common/src/main/java/com/fsck/k9/feature/FeatureModule.kt
rename to app-common/src/main/kotlin/net/thunderbird/app/common/feature/FeatureModule.kt
index d71c0cad3e2..c03304c44e6 100644
--- a/legacy/common/src/main/java/com/fsck/k9/feature/FeatureModule.kt
+++ b/app-common/src/main/kotlin/net/thunderbird/app/common/feature/FeatureModule.kt
@@ -1,4 +1,4 @@
-package com.fsck.k9.feature
+package net.thunderbird.app.common.feature
 
 import app.k9mail.feature.launcher.FeatureLauncherExternalContract
 import net.thunderbird.feature.navigation.drawer.api.NavigationDrawerExternalContract
diff --git a/app-common/src/main/kotlin/net/thunderbird/app/common/feature/NavigationDrawerConfigLoader.kt b/app-common/src/main/kotlin/net/thunderbird/app/common/feature/NavigationDrawerConfigLoader.kt
new file mode 100644
index 00000000000..a0a232c6c20
--- /dev/null
+++ b/app-common/src/main/kotlin/net/thunderbird/app/common/feature/NavigationDrawerConfigLoader.kt
@@ -0,0 +1,12 @@
+package net.thunderbird.app.common.feature
+
+import com.fsck.k9.preferences.DrawerConfigManager
+import kotlinx.coroutines.flow.Flow
+import net.thunderbird.feature.navigation.drawer.api.NavigationDrawerExternalContract
+
+class NavigationDrawerConfigLoader(private val drawerConfigManager: DrawerConfigManager) :
+    NavigationDrawerExternalContract.DrawerConfigLoader {
+    override fun loadDrawerConfigFlow(): Flow<NavigationDrawerExternalContract.DrawerConfig> {
+        return drawerConfigManager.getConfigFlow()
+    }
+}
diff --git a/legacy/common/src/main/java/com/fsck/k9/feature/NavigationDrawerConfigWriter.kt b/app-common/src/main/kotlin/net/thunderbird/app/common/feature/NavigationDrawerConfigWriter.kt
similarity index 92%
rename from legacy/common/src/main/java/com/fsck/k9/feature/NavigationDrawerConfigWriter.kt
rename to app-common/src/main/kotlin/net/thunderbird/app/common/feature/NavigationDrawerConfigWriter.kt
index 4686a7095d4..d0f2c0eda54 100644
--- a/legacy/common/src/main/java/com/fsck/k9/feature/NavigationDrawerConfigWriter.kt
+++ b/app-common/src/main/kotlin/net/thunderbird/app/common/feature/NavigationDrawerConfigWriter.kt
@@ -1,4 +1,4 @@
-package com.fsck.k9.feature
+package net.thunderbird.app.common.feature
 
 import com.fsck.k9.preferences.DrawerConfigManager
 import net.thunderbird.feature.navigation.drawer.api.NavigationDrawerExternalContract
diff --git a/app-k9mail/src/main/kotlin/app/k9mail/feature/FeatureModule.kt b/app-k9mail/src/main/kotlin/app/k9mail/feature/FeatureModule.kt
index d8e0a07acb8..d9558ee3c4c 100644
--- a/app-k9mail/src/main/kotlin/app/k9mail/feature/FeatureModule.kt
+++ b/app-k9mail/src/main/kotlin/app/k9mail/feature/FeatureModule.kt
@@ -5,7 +5,7 @@ import app.k9mail.feature.funding.featureFundingModule
 import app.k9mail.feature.migration.launcher.featureMigrationModule
 import app.k9mail.feature.onboarding.migration.onboardingMigrationModule
 import app.k9mail.feature.telemetry.telemetryModule
-import com.fsck.k9.feature.featureLauncherModule
+import net.thunderbird.app.common.feature.featureLauncherModule
 import net.thunderbird.feature.account.settings.featureAccountSettingsModule
 import org.koin.dsl.module
 
diff --git a/app-thunderbird/src/main/kotlin/net/thunderbird/android/feature/FeatureModule.kt b/app-thunderbird/src/main/kotlin/net/thunderbird/android/feature/FeatureModule.kt
index d8371ba8a42..5f21be56110 100644
--- a/app-thunderbird/src/main/kotlin/net/thunderbird/android/feature/FeatureModule.kt
+++ b/app-thunderbird/src/main/kotlin/net/thunderbird/android/feature/FeatureModule.kt
@@ -5,7 +5,7 @@ import app.k9mail.feature.funding.featureFundingModule
 import app.k9mail.feature.migration.launcher.featureMigrationModule
 import app.k9mail.feature.onboarding.migration.onboardingMigrationModule
 import app.k9mail.feature.telemetry.telemetryModule
-import com.fsck.k9.feature.featureLauncherModule
+import net.thunderbird.app.common.feature.featureLauncherModule
 import net.thunderbird.feature.account.settings.featureAccountSettingsModule
 import org.koin.dsl.module
 
diff --git a/legacy/common/src/main/java/com/fsck/k9/CommonKoinModule.kt b/legacy/common/src/main/java/com/fsck/k9/CommonKoinModule.kt
index 4d85cf72439..6e3d79d32fa 100644
--- a/legacy/common/src/main/java/com/fsck/k9/CommonKoinModule.kt
+++ b/legacy/common/src/main/java/com/fsck/k9/CommonKoinModule.kt
@@ -2,6 +2,7 @@ package com.fsck.k9
 
 import app.k9mail.core.featureflag.FeatureFlagProvider
 import app.k9mail.core.featureflag.InMemoryFeatureFlagProvider
+import app.k9mail.feature.launcher.di.featureLauncherModule
 import app.k9mail.feature.widget.message.list.messageListWidgetModule
 import app.k9mail.feature.widget.unread.UnreadWidgetUpdateListener
 import app.k9mail.feature.widget.unread.unreadWidgetModule
@@ -10,7 +11,6 @@ import com.fsck.k9.backends.backendsModule
 import com.fsck.k9.controller.ControllerExtension
 import com.fsck.k9.crypto.EncryptionExtractor
 import com.fsck.k9.crypto.openpgp.OpenPgpEncryptionExtractor
-import com.fsck.k9.feature.featureLauncherModule
 import com.fsck.k9.notification.notificationModule
 import com.fsck.k9.preferences.K9StoragePersister
 import com.fsck.k9.preferences.StoragePersister
diff --git a/legacy/common/src/main/java/com/fsck/k9/feature/NavigationDrawerConfigLoader.kt b/legacy/common/src/main/java/com/fsck/k9/feature/NavigationDrawerConfigLoader.kt
deleted file mode 100644
index b5fbefa7d4a..00000000000
--- a/legacy/common/src/main/java/com/fsck/k9/feature/NavigationDrawerConfigLoader.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.fsck.k9.feature
-
-import com.fsck.k9.preferences.DrawerConfigManager
-import kotlinx.coroutines.flow.Flow
-import net.thunderbird.feature.navigation.drawer.api.NavigationDrawerExternalContract.DrawerConfig
-import net.thunderbird.feature.navigation.drawer.api.NavigationDrawerExternalContract.DrawerConfigLoader
-
-class NavigationDrawerConfigLoader(private val drawerConfigManager: DrawerConfigManager) : DrawerConfigLoader {
-    override fun loadDrawerConfigFlow(): Flow<DrawerConfig> {
-        return drawerConfigManager.getConfigFlow()
-    }
-}