diff --git a/vector-app/build.gradle b/vector-app/build.gradle
index 5f039dfbd5..783f8e0a4a 100644
--- a/vector-app/build.gradle
+++ b/vector-app/build.gradle
@@ -353,6 +353,16 @@ dependencies {
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation "androidx.sharetarget:sharetarget:1.1.0"
 
+    // Flipper, debug builds only
+    debugImplementation(libs.flipper.flipper) {
+        exclude group: 'com.facebook.fbjni', module: 'fbjni'
+    }
+    debugImplementation(libs.flipper.flipperNetworkPlugin) {
+        exclude group: 'com.facebook.fbjni', module: 'fbjni'
+    }
+    debugImplementation 'com.facebook.soloader:soloader:0.10.4'
+    debugImplementation "com.kgurgul.flipper:flipper-realm-android:2.2.0"
+
     kapt libs.dagger.hiltCompiler
 
     androidTestImplementation libs.androidx.testCore
@@ -378,5 +388,6 @@ dependencies {
     androidTestImplementation libs.androidx.fragmentTesting
     androidTestImplementation "org.jetbrains.kotlin:kotlin-reflect:1.7.10"
     debugImplementation libs.androidx.fragmentTesting
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1'
 }
 
diff --git a/vector/src/debug/AndroidManifest.xml b/vector-app/src/debug/AndroidManifest.xml
similarity index 100%
rename from vector/src/debug/AndroidManifest.xml
rename to vector-app/src/debug/AndroidManifest.xml
diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsActivity.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsActivity.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsActivity.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsFragment.kt b/vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsFragment.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsFragment.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsFragment.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewActions.kt b/vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewActions.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewActions.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewActions.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewModel.kt b/vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewModel.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewModel.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewModel.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewState.kt b/vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewState.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewState.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewState.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/di/DebugModule.kt b/vector-app/src/debug/java/im/vector/app/features/debug/di/DebugModule.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/di/DebugModule.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/di/DebugModule.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/di/FeaturesModule.kt b/vector-app/src/debug/java/im/vector/app/features/debug/di/FeaturesModule.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/di/FeaturesModule.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/di/FeaturesModule.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/di/MavericksViewModelDebugModule.kt b/vector-app/src/debug/java/im/vector/app/features/debug/di/MavericksViewModelDebugModule.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/di/MavericksViewModelDebugModule.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/di/MavericksViewModelDebugModule.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/features/BooleanFeatureItem.kt b/vector-app/src/debug/java/im/vector/app/features/debug/features/BooleanFeatureItem.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/features/BooleanFeatureItem.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/features/BooleanFeatureItem.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesSettingsActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesSettingsActivity.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesSettingsActivity.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesSettingsActivity.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt b/vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt b/vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorOverrides.kt b/vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorOverrides.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorOverrides.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorOverrides.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/features/EnumFeatureItem.kt b/vector-app/src/debug/java/im/vector/app/features/debug/features/EnumFeatureItem.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/features/EnumFeatureItem.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/features/EnumFeatureItem.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/features/FeaturesController.kt b/vector-app/src/debug/java/im/vector/app/features/debug/features/FeaturesController.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/features/FeaturesController.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/features/FeaturesController.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksActivity.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksActivity.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksActivity.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksFragment.kt b/vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksFragment.kt
similarity index 96%
rename from vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksFragment.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksFragment.kt
index 2abf6487e2..d62dc5dc4d 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksFragment.kt
+++ b/vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksFragment.kt
@@ -26,6 +26,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.epoxy.onClick
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentDebugMemoryLeaksBinding
+import im.vector.application.databinding.FragmentDebugMemoryLeaksBinding
 
 @AndroidEntryPoint
 class DebugMemoryLeaksFragment :
diff --git a/vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewActions.kt b/vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewActions.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewActions.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewActions.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewModel.kt b/vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewModel.kt
similarity index 98%
rename from vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewModel.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewModel.kt
index 5432cb0888..26eb1c1025 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewModel.kt
+++ b/vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewModel.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 New Vector Ltd
+ * Copyright (c) 2022 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewState.kt b/vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewState.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewState.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewState.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/sas/DebugSasEmojiActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/sas/DebugSasEmojiActivity.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/sas/DebugSasEmojiActivity.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/sas/DebugSasEmojiActivity.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiController.kt b/vector-app/src/debug/java/im/vector/app/features/debug/sas/SasEmojiController.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiController.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/sas/SasEmojiController.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt b/vector-app/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsActivity.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsActivity.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsActivity.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsFragment.kt b/vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsFragment.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsFragment.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsFragment.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewActions.kt b/vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewActions.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewActions.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewActions.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewModel.kt b/vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewModel.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewModel.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewModel.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewState.kt b/vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewState.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewState.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewState.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/OverrideDropdownView.kt b/vector-app/src/debug/java/im/vector/app/features/debug/settings/OverrideDropdownView.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/settings/OverrideDropdownView.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/settings/OverrideDropdownView.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/PrivateSettingOverrides.kt b/vector-app/src/debug/java/im/vector/app/features/debug/settings/PrivateSettingOverrides.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/settings/PrivateSettingOverrides.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/settings/PrivateSettingOverrides.kt
diff --git a/vector/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt b/vector-app/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt
rename to vector-app/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt
diff --git a/vector/src/debug/java/im/vector/app/leakcanary/LeakCanaryLeakDetector.kt b/vector-app/src/debug/java/im/vector/app/leakcanary/LeakCanaryLeakDetector.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/leakcanary/LeakCanaryLeakDetector.kt
rename to vector-app/src/debug/java/im/vector/app/leakcanary/LeakCanaryLeakDetector.kt
diff --git a/vector/src/debug/java/im/vector/app/receivers/VectorDebugReceiver.kt b/vector-app/src/debug/java/im/vector/app/receivers/VectorDebugReceiver.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/receivers/VectorDebugReceiver.kt
rename to vector-app/src/debug/java/im/vector/app/receivers/VectorDebugReceiver.kt
diff --git a/vector/src/debug/res/layout/activity_debug_menu.xml b/vector-app/src/debug/res/layout/activity_debug_menu.xml
similarity index 100%
rename from vector/src/debug/res/layout/activity_debug_menu.xml
rename to vector-app/src/debug/res/layout/activity_debug_menu.xml
diff --git a/vector/src/debug/res/layout/activity_debug_permission.xml b/vector-app/src/debug/res/layout/activity_debug_permission.xml
similarity index 100%
rename from vector/src/debug/res/layout/activity_debug_permission.xml
rename to vector-app/src/debug/res/layout/activity_debug_permission.xml
diff --git a/vector/src/debug/res/layout/activity_test_linkify.xml b/vector-app/src/debug/res/layout/activity_test_linkify.xml
similarity index 100%
rename from vector/src/debug/res/layout/activity_test_linkify.xml
rename to vector-app/src/debug/res/layout/activity_test_linkify.xml
diff --git a/vector/src/debug/res/layout/demo_theme_sample.xml b/vector-app/src/debug/res/layout/demo_theme_sample.xml
similarity index 100%
rename from vector/src/debug/res/layout/demo_theme_sample.xml
rename to vector-app/src/debug/res/layout/demo_theme_sample.xml
diff --git a/vector/src/debug/res/layout/demo_themes.xml b/vector-app/src/debug/res/layout/demo_themes.xml
similarity index 100%
rename from vector/src/debug/res/layout/demo_themes.xml
rename to vector-app/src/debug/res/layout/demo_themes.xml
diff --git a/vector/src/debug/res/layout/fragment_debug_analytics.xml b/vector-app/src/debug/res/layout/fragment_debug_analytics.xml
similarity index 100%
rename from vector/src/debug/res/layout/fragment_debug_analytics.xml
rename to vector-app/src/debug/res/layout/fragment_debug_analytics.xml
diff --git a/vector/src/debug/res/layout/fragment_debug_memory_leaks.xml b/vector-app/src/debug/res/layout/fragment_debug_memory_leaks.xml
similarity index 100%
rename from vector/src/debug/res/layout/fragment_debug_memory_leaks.xml
rename to vector-app/src/debug/res/layout/fragment_debug_memory_leaks.xml
diff --git a/vector/src/debug/res/layout/fragment_debug_private_settings.xml b/vector-app/src/debug/res/layout/fragment_debug_private_settings.xml
similarity index 100%
rename from vector/src/debug/res/layout/fragment_debug_private_settings.xml
rename to vector-app/src/debug/res/layout/fragment_debug_private_settings.xml
diff --git a/vector/src/debug/res/layout/item_feature.xml b/vector-app/src/debug/res/layout/item_feature.xml
similarity index 100%
rename from vector/src/debug/res/layout/item_feature.xml
rename to vector-app/src/debug/res/layout/item_feature.xml
diff --git a/vector/src/debug/res/layout/item_sas_emoji.xml b/vector-app/src/debug/res/layout/item_sas_emoji.xml
similarity index 100%
rename from vector/src/debug/res/layout/item_sas_emoji.xml
rename to vector-app/src/debug/res/layout/item_sas_emoji.xml
diff --git a/vector/src/debug/res/layout/item_test_linkify.xml b/vector-app/src/debug/res/layout/item_test_linkify.xml
similarity index 100%
rename from vector/src/debug/res/layout/item_test_linkify.xml
rename to vector-app/src/debug/res/layout/item_test_linkify.xml
diff --git a/vector/src/debug/res/layout/view_boolean_dropdown.xml b/vector-app/src/debug/res/layout/view_boolean_dropdown.xml
similarity index 100%
rename from vector/src/debug/res/layout/view_boolean_dropdown.xml
rename to vector-app/src/debug/res/layout/view_boolean_dropdown.xml
diff --git a/vector/src/debug/res/values/strings.xml b/vector-app/src/debug/res/values/strings.xml
similarity index 100%
rename from vector/src/debug/res/values/strings.xml
rename to vector-app/src/debug/res/values/strings.xml
diff --git a/vector/src/debug/res/xml/shortcuts.xml b/vector-app/src/debug/res/xml/shortcuts.xml
similarity index 100%
rename from vector/src/debug/res/xml/shortcuts.xml
rename to vector-app/src/debug/res/xml/shortcuts.xml
diff --git a/vector/build.gradle b/vector/build.gradle
index 0e9e03f31a..b84f9f96d1 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -66,7 +66,6 @@ android {
                 testCoverageEnabled = coverage.enableTestCoverage
             }
         }
-        release
     }
 
     flavorDimensions "store"
@@ -311,20 +310,7 @@ dependencies {
     testImplementation(libs.jetbrains.coroutinesTest) {
         exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-debug"
     }
-
-    // Flipper, debug builds only
-    debugImplementation(libs.flipper.flipper) {
-        exclude group: 'com.facebook.fbjni', module: 'fbjni'
-    }
-    debugImplementation(libs.flipper.flipperNetworkPlugin) {
-        exclude group: 'com.facebook.fbjni', module: 'fbjni'
-    }
-    debugImplementation 'com.facebook.soloader:soloader:0.10.4'
-    debugImplementation "com.kgurgul.flipper:flipper-realm-android:2.2.0"
-
-    // Activate when you want to check for leaks, from time to time.
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1'
-
+    
     androidTestImplementation libs.androidx.testCore
     androidTestImplementation libs.androidx.testRunner
     androidTestImplementation libs.androidx.testRules