diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 88ce115d..3633c6ac 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -3,8 +3,6 @@ plugins {
     kotlin("android")
     kotlin("kapt")
     id("kotlin-parcelize")
-    id("dagger.hilt.android.plugin")
-    id("androidx.navigation.safeargs.kotlin")
 }
 
 android {
@@ -63,55 +61,9 @@ android {
 }
 
 dependencies {
-    implementation(libs.kotlin.stdlib)
-    implementation(libs.kotlinx.coroutines.android)
-    implementation(libs.kotlinx.coroutines.playServices)
-
-    implementation(libs.androidx.activity)
-    implementation(libs.androidx.autofill)
-    implementation(libs.androidx.biometric)
-    implementation(libs.androidx.browser)
-    implementation(libs.androidx.camera.core)
-    implementation(libs.androidx.camera.camera2)
-    implementation(libs.androidx.camera.lifecycle)
-    implementation(libs.androidx.camera.view)
-    implementation(libs.androidx.constraintlayout)
-    implementation(libs.androidx.core)
-    implementation(libs.androidx.concurrent)
-    implementation(libs.androidx.lifecycle.common)
-    implementation(libs.androidx.lifecycle.livedata)
-    implementation(libs.androidx.localBroadcastManager)
-    implementation(libs.androidx.navigation.fragment)
-    implementation(libs.androidx.navigation.ui)
-    implementation(libs.androidx.recyclerview)
-    implementation(libs.androidx.splashscreen)
-    implementation(libs.google.android.material)
-    implementation(libs.google.mlkit.barcode)
-    implementation(libs.google.firebase.messaging)
-
-    implementation(project(":data"))
 
     implementation(project(":core"))
 
-    implementation(libs.dagger.hilt.android)
-    implementation(libs.dagger.hilt.fragment)
-    kapt(libs.dagger.hilt.compiler)
-
-    implementation(libs.permission)
-    implementation(libs.coil)
-    implementation(libs.betterLink)
-
-    testImplementation(libs.junit)
-    androidTestImplementation(libs.junit)
-    androidTestImplementation(libs.androidx.testing.core)
-    androidTestImplementation(libs.androidx.testing.junit)
-    androidTestImplementation(libs.androidx.testing.rules)
-    androidTestImplementation(libs.androidx.testing.epsresso)
-    androidTestImplementation(libs.androidx.testing.uiautomator)
-    androidTestImplementation(libs.kotlinx.coroutines.test)
-
-    androidTestImplementation(libs.dagger.hilt.testing)
-    kaptAndroidTest(libs.dagger.hilt.compiler)
 }
 
 // Disable analytics
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fd5bec6c..c3405c1a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,7 +17,7 @@
     </queries>
 
     <application
-        android:name=".TiqrApplication"
+        android:name="org.tiqr.core.TiqrApplication"
         android:allowBackup="true"
         android:fullBackupContent="@xml/backup_descriptor"
         android:dataExtractionRules="@xml/backup_descriptor_v31"
@@ -28,7 +28,7 @@
         android:theme="@style/AppTheme">
 
         <activity
-            android:name=".MainActivity"
+            android:name="org.tiqr.core.MainActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.Splash"
             android:windowSoftInputMode="adjustResize"
@@ -51,7 +51,7 @@
         </activity>
 
         <service
-            android:name=".messaging.TiqrMessagingService"
+            android:name="org.tiqr.core.messaging.TiqrMessagingService"
             android:exported="false">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7f522c52..7e7c8041 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,118 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:locale="en">
     <string name="app_name" translatable="false">tiqr</string>
-
-    <!-- General buttons -->
-    <string name="button_ok">OK</string>
-    <string name="button_retry">Retry</string>
-    <string name="button_delete">Delete</string>
-    <string name="button_cancel">Cancel</string>
-
-    <!-- Main -->
-    <string name="button_info">About</string>
-    <string name="button_surfnet">Surfnet</string>
-
-    <!-- Start -->
-    <string name="start_welcome"><![CDATA[<b>Use tiqr on your smartphone to log in to websites easily and secure.</b><br/>
-    <br/>
-    Register your new tiqr account and follow the instructions for activation.<br/>
-    <br/>
-    Press <b>Scan</b> when asked.]]></string>
-    <string name="start_instructions"><![CDATA[<b>Use tiqr on your smartphone to log in</b> <br/>
-    <br/>
-    1. Press <b>Scan</b> and scan the QR-code on the website.<br/>
-    <br/>
-    <i>More than one ID? Select the relevant ID.</i> <br/>
-    <br/>
-    2. Scan your biometric or enter your PIN for tiqr and press <b>OK</b> <br/>
-    <br/>
-    3. You are logged in!]]></string>
-    <string name="start_blocked"><![CDATA[<b>Now what?</b><br/>
-    <br/>
-    Ask your identity provider(s) for a new activation code.
-    For a link to your identity provider(s) check your identities (accessible from the top right).<br/>
-    <br />
-    Together with your new activation code you will receive instructions for reactivating your account.
-    Press <b>Scan</b> if asked.]]></string>
-
-    <!-- Scan -->
-    <string name="scan_button">Scan</string>
-    <string name="scan_permission_required_title">Camera permission required</string>
-    <string name="scan_permission_required_message">For scanning a QR code, tiqr needs access to the camera.</string>
-    <string name="scan_permission_required_settings">Settings</string>
-    <string name="scan_permission_required_dismiss">Cancel</string>
-
-    <!-- Browser -->
-    <string name="browser_error_launch">Failed to launch the default browser</string>
-
-    <!-- About -->
-    <string name="about_label_version" translatable="false">%1s &#8226; v%2s</string>
-    <string name="about_label_provided_by">Provided by:</string>
-    <string name="about_label_developed_by">Developed by:</string>
-    <string name="about_label_interaction_by">Interaction design:</string>
-
-    <!-- Enroll (Confirm) -->
-    <string name="enroll_confirm_title">Confirm account activation</string>
-    <string name="enroll_confirm_subtitle">Do you want to activate the following account?</string>
-    <string name="enroll_confirm_details">Account details</string>
-    <string name="enroll_confirm_domain">You will enroll to the following domain:</string>
-
-    <!-- Enroll (PIN) -->
-    <string name="enroll_pin_title">Choose a unique PIN for tiqr</string>
-    <string name="enroll_pin_subtitle">Enter the PIN:</string>
-    <string name="enroll_pin_notice">Please remember this PIN, it cannot be changed!</string>
-
-    <!-- Enroll (PIN Verify) -->
-    <string name="enroll_pin_verify_title">Verify the unique PIN</string>
-    <string name="enroll_pin_verify_subtitle">Re-enter the PIN:</string>
-    <string name="enroll_pin_verify_no_match_title">PINs don\'t match</string>
-    <string name="enroll_pin_verify_no_match_message">The entered PINs don\'t match. Try again.\nChoose a PIN you can remember.</string>
-
-    <!-- Account -->
-    <string name="account_full_name">Full name</string>
-    <string name="account_id">Tiqr account id</string>
-    <string name="account_information">Information</string>
-    <string name="account_activated">Account activated!</string>
-    <string name="account_upgrade_biometric_title">Upgrade account</string>
-    <string name="account_upgrade_biometric_message">Do you want to use biometrics instead of PIN to log in with this account?</string>
-
-    <!-- Authentication (Confirm) -->
-    <string name="auth_confirm_title">Are you sure you want to log in?</string>
-    <string name="auth_confirm_subtitle">You will be logged in as:</string>
-    <string name="auth_confirm_to">to:</string>
-    <string name="auth_confirm_select_identity">Select identity</string>
-
-    <!-- Authentication (Biometric) -->
-    <string name="auth_biometric_title">Use your biometric</string>
-    <string name="auth_biometric_dialog_title">Do you want to use biometric to log in?</string>
-    <string name="auth_biometric_dialog_cancel">Use PIN</string>
-
-    <!-- Authentication (Pin) -->
-    <string name="auth_pin_title">Enter your PIN for tiqr</string>
-    <string name="auth_pin_subtitle">Enter the PIN and press OK:</string>
-
-    <!-- Authentication (Fallback) -->
-    <string name="auth_fallback_title">You appear to be offline</string>
-    <string name="auth_fallback_subtitle">Don\'t worry! Click the QR code on the website. You will be asked to enter the following one-time credentials:</string>
-    <string name="auth_fallback_id">Your ID is:</string>
-    <string name="auth_fallback_otp">One-time password:</string>
-    <string name="auth_fallback_pin_unverified_title">Note: your PIN has not been verified yet.</string>
-    <string name="auth_fallback_pin_unverified">If you can\'t login with the credentials above, scan again and enter the correct PIN code.</string>
-
-    <!-- Authentication (Summary) -->
-    <string name="auth_summary_title">You have successfully logged in!</string>
-    <string name="auth_summary_to">to:</string>
-
-    <!-- Identity -->
-    <string name="identity_title">Identities</string>
-    <string name="identity_blocked">Blocked</string>
-    <string name="identity_blocked_message">Warning: this account is blocked\nand needs to be reactivated.</string>
-    <string name="identity_delete_title">Are you sure?</string>
-    <string name="identity_delete_message">This account can no longer be used when deleted.</string>
-    <string name="identity_biometric_usage">Use biometrics</string>
-    <string name="identity_biometric_upgrade">Upgrade to biometrics usage</string>
-
-    <!-- Notification channel -->
-    <string name="notification_channel_name">Messages</string>
-    <string name="notification_channel_description">Notifications for messages from tiqr</string>
 </resources>
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index ba674757..aafe1dd7 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -3,6 +3,8 @@ plugins {
     kotlin("android")
     kotlin("kapt")
     id("kotlin-parcelize")
+    id("dagger.hilt.android.plugin")
+    id("androidx.navigation.safeargs.kotlin")
 }
 
 android {
@@ -51,7 +53,50 @@ android {
         implementation(libs.kotlinx.coroutines.core)
         implementation(libs.kotlinx.coroutines.android)
         implementation(libs.androidx.core)
+        implementation(libs.kotlinx.coroutines.playServices)
+
+        implementation(libs.androidx.activity)
+        implementation(libs.androidx.autofill)
+        implementation(libs.androidx.biometric)
+        implementation(libs.androidx.browser)
+        implementation(libs.androidx.camera.core)
+        implementation(libs.androidx.camera.camera2)
+        implementation(libs.androidx.camera.lifecycle)
+        implementation(libs.androidx.camera.view)
+        implementation(libs.androidx.constraintlayout)
+        implementation(libs.androidx.core)
+        implementation(libs.androidx.concurrent)
+        implementation(libs.androidx.lifecycle.common)
+        implementation(libs.androidx.lifecycle.livedata)
+        implementation(libs.androidx.localBroadcastManager)
+        implementation(libs.androidx.navigation.fragment)
+        implementation(libs.androidx.navigation.ui)
+        implementation(libs.androidx.recyclerview)
+        implementation(libs.androidx.splashscreen)
+        implementation(libs.google.android.material)
+        implementation(libs.google.mlkit.barcode)
+        implementation(libs.google.firebase.messaging)
 
         implementation(project(":data"))
+
+        implementation(libs.dagger.hilt.android)
+        implementation(libs.dagger.hilt.fragment)
+        kapt(libs.dagger.hilt.compiler)
+
+        implementation(libs.permission)
+        implementation(libs.coil)
+        implementation(libs.betterLink)
+
+        testImplementation(libs.junit)
+        androidTestImplementation(libs.junit)
+        androidTestImplementation(libs.androidx.testing.core)
+        androidTestImplementation(libs.androidx.testing.junit)
+        androidTestImplementation(libs.androidx.testing.rules)
+        androidTestImplementation(libs.androidx.testing.epsresso)
+        androidTestImplementation(libs.androidx.testing.uiautomator)
+        androidTestImplementation(libs.kotlinx.coroutines.test)
+
+        androidTestImplementation(libs.dagger.hilt.testing)
+        kaptAndroidTest(libs.dagger.hilt.compiler)
     }
 }
diff --git a/app/src/androidTest/java/org/tiqr/authenticator/AboutTest.kt b/core/src/androidTest/java/org/tiqr/authenticator/AboutTest.kt
similarity index 98%
rename from app/src/androidTest/java/org/tiqr/authenticator/AboutTest.kt
rename to core/src/androidTest/java/org/tiqr/authenticator/AboutTest.kt
index e57345ba..e8d1e619 100644
--- a/app/src/androidTest/java/org/tiqr/authenticator/AboutTest.kt
+++ b/core/src/androidTest/java/org/tiqr/authenticator/AboutTest.kt
@@ -51,6 +51,8 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.tiqr.authenticator.util.AnimationsRule
 import org.tiqr.authenticator.util.matchNavHost
+import org.tiqr.core.MainActivity
+import org.tiqr.core.R
 
 @LargeTest
 @HiltAndroidTest
diff --git a/app/src/androidTest/java/org/tiqr/authenticator/AuthenticateTest.kt b/core/src/androidTest/java/org/tiqr/authenticator/AuthenticateTest.kt
similarity index 99%
rename from app/src/androidTest/java/org/tiqr/authenticator/AuthenticateTest.kt
rename to core/src/androidTest/java/org/tiqr/authenticator/AuthenticateTest.kt
index 58d978be..c6d3da7a 100644
--- a/app/src/androidTest/java/org/tiqr/authenticator/AuthenticateTest.kt
+++ b/core/src/androidTest/java/org/tiqr/authenticator/AuthenticateTest.kt
@@ -47,6 +47,7 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.tiqr.authenticator.util.AnimationsRule
+import org.tiqr.core.MainActivity
 
 @LargeTest
 @HiltAndroidTest
diff --git a/app/src/androidTest/java/org/tiqr/authenticator/EnrollTest.kt b/core/src/androidTest/java/org/tiqr/authenticator/EnrollTest.kt
similarity index 94%
rename from app/src/androidTest/java/org/tiqr/authenticator/EnrollTest.kt
rename to core/src/androidTest/java/org/tiqr/authenticator/EnrollTest.kt
index eae8d495..aeb5b598 100644
--- a/app/src/androidTest/java/org/tiqr/authenticator/EnrollTest.kt
+++ b/core/src/androidTest/java/org/tiqr/authenticator/EnrollTest.kt
@@ -31,27 +31,23 @@ package org.tiqr.authenticator
 
 import android.content.Intent
 import android.net.Uri
-import androidx.test.core.app.ActivityScenario
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.core.app.launchActivity
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.RootMatchers.isDialog
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
-import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
 import androidx.test.rule.ActivityTestRule
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
-import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.tiqr.authenticator.util.AnimationsRule
+import org.tiqr.core.MainActivity
 
 @LargeTest
 @HiltAndroidTest
diff --git a/app/src/androidTest/java/org/tiqr/authenticator/di/module/TestRepositoryModule.kt b/core/src/androidTest/java/org/tiqr/authenticator/di/module/TestRepositoryModule.kt
similarity index 100%
rename from app/src/androidTest/java/org/tiqr/authenticator/di/module/TestRepositoryModule.kt
rename to core/src/androidTest/java/org/tiqr/authenticator/di/module/TestRepositoryModule.kt
diff --git a/app/src/androidTest/java/org/tiqr/authenticator/di/repository/TestTokenRepository.kt b/core/src/androidTest/java/org/tiqr/authenticator/di/repository/TestTokenRepository.kt
similarity index 100%
rename from app/src/androidTest/java/org/tiqr/authenticator/di/repository/TestTokenRepository.kt
rename to core/src/androidTest/java/org/tiqr/authenticator/di/repository/TestTokenRepository.kt
diff --git a/app/src/androidTest/java/org/tiqr/authenticator/runner/HiltAndroidTestRunner.kt b/core/src/androidTest/java/org/tiqr/authenticator/runner/HiltAndroidTestRunner.kt
similarity index 100%
rename from app/src/androidTest/java/org/tiqr/authenticator/runner/HiltAndroidTestRunner.kt
rename to core/src/androidTest/java/org/tiqr/authenticator/runner/HiltAndroidTestRunner.kt
diff --git a/app/src/androidTest/java/org/tiqr/authenticator/util/AnimationRule.kt b/core/src/androidTest/java/org/tiqr/authenticator/util/AnimationRule.kt
similarity index 100%
rename from app/src/androidTest/java/org/tiqr/authenticator/util/AnimationRule.kt
rename to core/src/androidTest/java/org/tiqr/authenticator/util/AnimationRule.kt
diff --git a/app/src/androidTest/java/org/tiqr/authenticator/util/Matchers.kt b/core/src/androidTest/java/org/tiqr/authenticator/util/Matchers.kt
similarity index 87%
rename from app/src/androidTest/java/org/tiqr/authenticator/util/Matchers.kt
rename to core/src/androidTest/java/org/tiqr/authenticator/util/Matchers.kt
index e0059301..783134c1 100644
--- a/app/src/androidTest/java/org/tiqr/authenticator/util/Matchers.kt
+++ b/core/src/androidTest/java/org/tiqr/authenticator/util/Matchers.kt
@@ -34,19 +34,12 @@ import android.app.Activity
 import androidx.fragment.app.FragmentContainerView
 import androidx.fragment.app.Fragment
 import androidx.navigation.NavHost
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.UiController
-import androidx.test.espresso.ViewAction
-import androidx.test.espresso.ViewInteraction
-import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withParent
 import org.hamcrest.Matcher
-import org.hamcrest.Matchers
 import org.hamcrest.Matchers.allOf
 import org.hamcrest.core.IsInstanceOf
-import org.tiqr.authenticator.R
-import java.util.concurrent.atomic.AtomicReference
+import org.tiqr.core.R
 
 /**
  * Match the [NavHost], which basically is the view where
diff --git a/app/src/main/java/org/tiqr/authenticator/MainActivity.kt b/core/src/main/java/org/tiqr/core/MainActivity.kt
similarity index 94%
rename from app/src/main/java/org/tiqr/authenticator/MainActivity.kt
rename to core/src/main/java/org/tiqr/core/MainActivity.kt
index 69d52007..d659cf36 100644
--- a/app/src/main/java/org/tiqr/authenticator/MainActivity.kt
+++ b/core/src/main/java/org/tiqr/core/MainActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2019 SURFnet bv
+ * Copyright (c) 2010-2021 SURFnet bv
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
  *    may be used to endorse or promote products derived from this
  *    software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator
+package org.tiqr.core
 
 import android.content.Intent
 import android.os.Bundle
@@ -50,12 +50,12 @@ import androidx.transition.TransitionListenerAdapter
 import androidx.transition.TransitionManager
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
-import org.tiqr.authenticator.base.BaseActivity
-import org.tiqr.authenticator.databinding.ActivityMainBinding
-import org.tiqr.authenticator.scan.ScanFragment
-import org.tiqr.authenticator.scan.ScanKeyEventsReceiver
-import org.tiqr.authenticator.util.extensions.currentNavigationFragment
-import org.tiqr.authenticator.util.extensions.getNavController
+import org.tiqr.core.base.BaseActivity
+import org.tiqr.core.databinding.ActivityMainBinding
+import org.tiqr.core.scan.ScanFragment
+import org.tiqr.core.scan.ScanKeyEventsReceiver
+import org.tiqr.core.util.extensions.currentNavigationFragment
+import org.tiqr.core.util.extensions.getNavController
 import org.tiqr.data.model.AuthenticationChallenge
 import org.tiqr.data.model.ChallengeParseResult
 import org.tiqr.data.model.EnrollmentChallenge
diff --git a/app/src/main/java/org/tiqr/authenticator/TiqrApplication.kt b/core/src/main/java/org/tiqr/core/TiqrApplication.kt
similarity index 98%
rename from app/src/main/java/org/tiqr/authenticator/TiqrApplication.kt
rename to core/src/main/java/org/tiqr/core/TiqrApplication.kt
index 8079f876..d10df363 100644
--- a/app/src/main/java/org/tiqr/authenticator/TiqrApplication.kt
+++ b/core/src/main/java/org/tiqr/core/TiqrApplication.kt
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator
+package org.tiqr.core
 
 import android.app.Application
 import coil.Coil
diff --git a/app/src/main/java/org/tiqr/authenticator/about/AboutFragment.kt b/core/src/main/java/org/tiqr/core/about/AboutFragment.kt
similarity index 90%
rename from app/src/main/java/org/tiqr/authenticator/about/AboutFragment.kt
rename to core/src/main/java/org/tiqr/core/about/AboutFragment.kt
index 4f42e1d1..c9a1f6cf 100644
--- a/app/src/main/java/org/tiqr/authenticator/about/AboutFragment.kt
+++ b/core/src/main/java/org/tiqr/core/about/AboutFragment.kt
@@ -27,12 +27,12 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.about
+package org.tiqr.core.about
 
 import androidx.annotation.LayoutRes
-import org.tiqr.authenticator.R
-import org.tiqr.authenticator.base.BaseFragment
-import org.tiqr.authenticator.databinding.FragmentAboutBinding
+import org.tiqr.core.R
+import org.tiqr.core.base.BaseFragment
+import org.tiqr.core.databinding.FragmentAboutBinding
 
 /**
  * Fragment to show the about screen.
diff --git a/app/src/main/java/org/tiqr/authenticator/authentication/AuthenticationBiometricComponent.kt b/core/src/main/java/org/tiqr/core/authentication/AuthenticationBiometricComponent.kt
similarity index 97%
rename from app/src/main/java/org/tiqr/authenticator/authentication/AuthenticationBiometricComponent.kt
rename to core/src/main/java/org/tiqr/core/authentication/AuthenticationBiometricComponent.kt
index a55fc780..078e5082 100644
--- a/app/src/main/java/org/tiqr/authenticator/authentication/AuthenticationBiometricComponent.kt
+++ b/core/src/main/java/org/tiqr/core/authentication/AuthenticationBiometricComponent.kt
@@ -27,13 +27,13 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.authentication
+package org.tiqr.core.authentication
 
 import android.content.Context
 import androidx.biometric.BiometricPrompt
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
-import org.tiqr.authenticator.R
+import org.tiqr.core.R
 import timber.log.Timber
 import java.util.concurrent.Executor
 
diff --git a/app/src/main/java/org/tiqr/authenticator/authentication/AuthenticationBiometricFragment.kt b/core/src/main/java/org/tiqr/core/authentication/AuthenticationBiometricFragment.kt
similarity index 96%
rename from app/src/main/java/org/tiqr/authenticator/authentication/AuthenticationBiometricFragment.kt
rename to core/src/main/java/org/tiqr/core/authentication/AuthenticationBiometricFragment.kt
index c672e80a..82554b2d 100644
--- a/app/src/main/java/org/tiqr/authenticator/authentication/AuthenticationBiometricFragment.kt
+++ b/core/src/main/java/org/tiqr/core/authentication/AuthenticationBiometricFragment.kt
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.authentication
+package org.tiqr.core.authentication
 
 import android.os.Bundle
 import android.view.View
@@ -36,9 +36,9 @@ import androidx.hilt.navigation.fragment.hiltNavGraphViewModels
 import androidx.navigation.fragment.findNavController
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
-import org.tiqr.authenticator.R
-import org.tiqr.authenticator.base.BaseFragment
-import org.tiqr.authenticator.databinding.FragmentAuthenticationBiometricBinding
+import org.tiqr.core.R
+import org.tiqr.core.base.BaseFragment
+import org.tiqr.core.databinding.FragmentAuthenticationBiometricBinding
 import org.tiqr.data.model.AuthenticationCompleteFailure
 import org.tiqr.data.model.ChallengeCompleteResult
 import org.tiqr.data.model.SecretCredential
diff --git a/app/src/main/java/org/tiqr/authenticator/authentication/AuthenticationConfirmFragment.kt b/core/src/main/java/org/tiqr/core/authentication/AuthenticationConfirmFragment.kt
similarity index 95%
rename from app/src/main/java/org/tiqr/authenticator/authentication/AuthenticationConfirmFragment.kt
rename to core/src/main/java/org/tiqr/core/authentication/AuthenticationConfirmFragment.kt
index 56273a73..6134c48a 100644
--- a/app/src/main/java/org/tiqr/authenticator/authentication/AuthenticationConfirmFragment.kt
+++ b/core/src/main/java/org/tiqr/core/authentication/AuthenticationConfirmFragment.kt
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.authentication
+package org.tiqr.core.authentication
 
 import android.os.Bundle
 import android.view.Menu
@@ -39,9 +39,9 @@ import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import androidx.navigation.navGraphViewModels
 import dagger.hilt.android.AndroidEntryPoint
-import org.tiqr.authenticator.R
-import org.tiqr.authenticator.base.BaseFragment
-import org.tiqr.authenticator.databinding.FragmentAuthenticationConfirmBinding
+import org.tiqr.core.R
+import org.tiqr.core.base.BaseFragment
+import org.tiqr.core.databinding.FragmentAuthenticationConfirmBinding
 import org.tiqr.data.viewmodel.AuthenticationViewModel
 import org.tiqr.data.viewmodel.challengeViewModel
 
diff --git a/app/src/main/java/org/tiqr/authenticator/authentication/AuthenticationFallbackFragment.kt b/core/src/main/java/org/tiqr/core/authentication/AuthenticationFallbackFragment.kt
similarity index 93%
rename from app/src/main/java/org/tiqr/authenticator/authentication/AuthenticationFallbackFragment.kt
rename to core/src/main/java/org/tiqr/core/authentication/AuthenticationFallbackFragment.kt
index cb22952f..02671434 100644
--- a/app/src/main/java/org/tiqr/authenticator/authentication/AuthenticationFallbackFragment.kt
+++ b/core/src/main/java/org/tiqr/core/authentication/AuthenticationFallbackFragment.kt
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.authentication
+package org.tiqr.core.authentication
 
 import android.os.Bundle
 import android.view.View
@@ -36,9 +36,9 @@ import androidx.navigation.fragment.navArgs
 import androidx.navigation.navGraphViewModels
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
-import org.tiqr.authenticator.R
-import org.tiqr.authenticator.base.BaseFragment
-import org.tiqr.authenticator.databinding.FragmentAuthenticationFallbackBinding
+import org.tiqr.core.R
+import org.tiqr.core.base.BaseFragment
+import org.tiqr.core.databinding.FragmentAuthenticationFallbackBinding
 import org.tiqr.data.model.ChallengeCompleteOtpResult
 import org.tiqr.data.viewmodel.AuthenticationViewModel
 
diff --git a/app/src/main/java/org/tiqr/authenticator/authentication/AuthenticationIdentityAdapter.kt b/core/src/main/java/org/tiqr/core/authentication/AuthenticationIdentityAdapter.kt
similarity index 95%
rename from app/src/main/java/org/tiqr/authenticator/authentication/AuthenticationIdentityAdapter.kt
rename to core/src/main/java/org/tiqr/core/authentication/AuthenticationIdentityAdapter.kt
index cec2340e..da450045 100644
--- a/app/src/main/java/org/tiqr/authenticator/authentication/AuthenticationIdentityAdapter.kt
+++ b/core/src/main/java/org/tiqr/core/authentication/AuthenticationIdentityAdapter.kt
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.authentication
+package org.tiqr.core.authentication
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -35,8 +35,8 @@ import androidx.databinding.DataBindingUtil
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
-import org.tiqr.authenticator.R
-import org.tiqr.authenticator.databinding.ListItemIdentitySelectBinding
+import org.tiqr.core.R
+import org.tiqr.core.databinding.ListItemIdentitySelectBinding
 import org.tiqr.data.model.Identity
 
 /**
diff --git a/app/src/main/java/org/tiqr/authenticator/authentication/AuthenticationIdentityFragment.kt b/core/src/main/java/org/tiqr/core/authentication/AuthenticationIdentityFragment.kt
similarity index 94%
rename from app/src/main/java/org/tiqr/authenticator/authentication/AuthenticationIdentityFragment.kt
rename to core/src/main/java/org/tiqr/core/authentication/AuthenticationIdentityFragment.kt
index 4dec241e..49470595 100644
--- a/app/src/main/java/org/tiqr/authenticator/authentication/AuthenticationIdentityFragment.kt
+++ b/core/src/main/java/org/tiqr/core/authentication/AuthenticationIdentityFragment.kt
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.authentication
+package org.tiqr.core.authentication
 
 import android.app.Dialog
 import android.content.DialogInterface
@@ -37,9 +37,9 @@ import androidx.hilt.navigation.fragment.hiltNavGraphViewModels
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import dagger.hilt.android.AndroidEntryPoint
-import org.tiqr.authenticator.R
-import org.tiqr.authenticator.base.BaseDialogFragment
-import org.tiqr.authenticator.databinding.FragmentAuthenticationIdentityBinding
+import org.tiqr.core.R
+import org.tiqr.core.base.BaseDialogFragment
+import org.tiqr.core.databinding.FragmentAuthenticationIdentityBinding
 import org.tiqr.data.model.Identity
 import org.tiqr.data.model.IdentityProvider
 import org.tiqr.data.viewmodel.AuthenticationViewModel
diff --git a/app/src/main/java/org/tiqr/authenticator/authentication/AuthenticationPinFragment.kt b/core/src/main/java/org/tiqr/core/authentication/AuthenticationPinFragment.kt
similarity index 96%
rename from app/src/main/java/org/tiqr/authenticator/authentication/AuthenticationPinFragment.kt
rename to core/src/main/java/org/tiqr/core/authentication/AuthenticationPinFragment.kt
index 3ac3233c..c013685f 100644
--- a/app/src/main/java/org/tiqr/authenticator/authentication/AuthenticationPinFragment.kt
+++ b/core/src/main/java/org/tiqr/core/authentication/AuthenticationPinFragment.kt
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.authentication
+package org.tiqr.core.authentication
 
 import android.os.Bundle
 import android.view.View
@@ -36,9 +36,9 @@ import androidx.hilt.navigation.fragment.hiltNavGraphViewModels
 import androidx.navigation.fragment.findNavController
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
-import org.tiqr.authenticator.R
-import org.tiqr.authenticator.base.BaseFragment
-import org.tiqr.authenticator.databinding.FragmentAuthenticationPinBinding
+import org.tiqr.core.R
+import org.tiqr.core.base.BaseFragment
+import org.tiqr.core.databinding.FragmentAuthenticationPinBinding
 import org.tiqr.data.model.AuthenticationCompleteFailure
 import org.tiqr.data.model.ChallengeCompleteResult
 import org.tiqr.data.model.SecretCredential
diff --git a/app/src/main/java/org/tiqr/authenticator/authentication/AuthenticationSummaryFragment.kt b/core/src/main/java/org/tiqr/core/authentication/AuthenticationSummaryFragment.kt
similarity index 92%
rename from app/src/main/java/org/tiqr/authenticator/authentication/AuthenticationSummaryFragment.kt
rename to core/src/main/java/org/tiqr/core/authentication/AuthenticationSummaryFragment.kt
index 1fc5878c..86edb48d 100644
--- a/app/src/main/java/org/tiqr/authenticator/authentication/AuthenticationSummaryFragment.kt
+++ b/core/src/main/java/org/tiqr/core/authentication/AuthenticationSummaryFragment.kt
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.authentication
+package org.tiqr.core.authentication
 
 import android.os.Bundle
 import android.view.View
@@ -37,10 +37,10 @@ import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
-import org.tiqr.authenticator.R
-import org.tiqr.authenticator.base.BaseFragment
-import org.tiqr.authenticator.databinding.FragmentAuthenticationSummaryBinding
-import org.tiqr.authenticator.util.extensions.biometricUsable
+import org.tiqr.core.R
+import org.tiqr.core.base.BaseFragment
+import org.tiqr.core.databinding.FragmentAuthenticationSummaryBinding
+import org.tiqr.core.util.extensions.biometricUsable
 import org.tiqr.data.viewmodel.AuthenticationViewModel
 
 /**
diff --git a/app/src/main/java/org/tiqr/authenticator/base/BaseActivity.kt b/core/src/main/java/org/tiqr/core/base/BaseActivity.kt
similarity index 98%
rename from app/src/main/java/org/tiqr/authenticator/base/BaseActivity.kt
rename to core/src/main/java/org/tiqr/core/base/BaseActivity.kt
index f4b2b938..306830a7 100644
--- a/app/src/main/java/org/tiqr/authenticator/base/BaseActivity.kt
+++ b/core/src/main/java/org/tiqr/core/base/BaseActivity.kt
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.base
+package org.tiqr.core.base
 
 import android.os.Bundle
 import androidx.annotation.LayoutRes
diff --git a/app/src/main/java/org/tiqr/authenticator/base/BaseDialogFragment.kt b/core/src/main/java/org/tiqr/core/base/BaseDialogFragment.kt
similarity index 97%
rename from app/src/main/java/org/tiqr/authenticator/base/BaseDialogFragment.kt
rename to core/src/main/java/org/tiqr/core/base/BaseDialogFragment.kt
index 4c05fe39..143f3711 100644
--- a/app/src/main/java/org/tiqr/authenticator/base/BaseDialogFragment.kt
+++ b/core/src/main/java/org/tiqr/core/base/BaseDialogFragment.kt
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.base
+package org.tiqr.core.base
 
 import android.app.Dialog
 import android.os.Bundle
@@ -39,7 +39,7 @@ import androidx.databinding.DataBindingUtil
 import androidx.databinding.ViewDataBinding
 import androidx.fragment.app.DialogFragment
 import dagger.hilt.android.EntryPointAccessors
-import org.tiqr.authenticator.R
+import org.tiqr.core.R
 import org.tiqr.data.viewmodel.ViewModelFactory
 
 /**
diff --git a/app/src/main/java/org/tiqr/authenticator/base/BaseFragment.kt b/core/src/main/java/org/tiqr/core/base/BaseFragment.kt
similarity index 98%
rename from app/src/main/java/org/tiqr/authenticator/base/BaseFragment.kt
rename to core/src/main/java/org/tiqr/core/base/BaseFragment.kt
index 8ac52b53..c340459b 100644
--- a/app/src/main/java/org/tiqr/authenticator/base/BaseFragment.kt
+++ b/core/src/main/java/org/tiqr/core/base/BaseFragment.kt
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.base
+package org.tiqr.core.base
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/app/src/main/java/org/tiqr/authenticator/base/BindingProvider.kt b/core/src/main/java/org/tiqr/core/base/BindingProvider.kt
similarity index 98%
rename from app/src/main/java/org/tiqr/authenticator/base/BindingProvider.kt
rename to core/src/main/java/org/tiqr/core/base/BindingProvider.kt
index 335f780a..49d6d3d0 100644
--- a/app/src/main/java/org/tiqr/authenticator/base/BindingProvider.kt
+++ b/core/src/main/java/org/tiqr/core/base/BindingProvider.kt
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.base
+package org.tiqr.core.base
 
 import androidx.databinding.ViewDataBinding
 
diff --git a/app/src/main/java/org/tiqr/authenticator/base/TiqrNavHostFragment.kt b/core/src/main/java/org/tiqr/core/base/TiqrNavHostFragment.kt
similarity index 95%
rename from app/src/main/java/org/tiqr/authenticator/base/TiqrNavHostFragment.kt
rename to core/src/main/java/org/tiqr/core/base/TiqrNavHostFragment.kt
index 908fcf0f..32339f03 100644
--- a/app/src/main/java/org/tiqr/authenticator/base/TiqrNavHostFragment.kt
+++ b/core/src/main/java/org/tiqr/core/base/TiqrNavHostFragment.kt
@@ -27,13 +27,13 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.base
+package org.tiqr.core.base
 
 import android.annotation.SuppressLint
 import androidx.navigation.NavController
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.plusAssign
-import org.tiqr.authenticator.browser.BrowserNavigator
+import org.tiqr.core.browser.BrowserNavigator
 
 /**
  * NavHostFragment with added support for browser destinations from [BrowserNavigator].
diff --git a/app/src/main/java/org/tiqr/authenticator/browser/BrowserNavigator.kt b/core/src/main/java/org/tiqr/core/browser/BrowserNavigator.kt
similarity index 98%
rename from app/src/main/java/org/tiqr/authenticator/browser/BrowserNavigator.kt
rename to core/src/main/java/org/tiqr/core/browser/BrowserNavigator.kt
index 4643c20a..7a5732f0 100644
--- a/app/src/main/java/org/tiqr/authenticator/browser/BrowserNavigator.kt
+++ b/core/src/main/java/org/tiqr/core/browser/BrowserNavigator.kt
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.browser
+package org.tiqr.core.browser
 
 import android.app.Activity
 import android.content.ActivityNotFoundException
@@ -46,7 +46,7 @@ import androidx.navigation.NavDestination.ClassType
 import androidx.navigation.NavOptions
 import androidx.navigation.Navigator
 import androidx.navigation.Navigator.Name
-import org.tiqr.authenticator.R
+import org.tiqr.core.R
 import timber.log.Timber
 
 /**
diff --git a/app/src/main/java/org/tiqr/authenticator/enrollment/EnrollmentConfirmFragment.kt b/core/src/main/java/org/tiqr/core/enrollment/EnrollmentConfirmFragment.kt
similarity index 93%
rename from app/src/main/java/org/tiqr/authenticator/enrollment/EnrollmentConfirmFragment.kt
rename to core/src/main/java/org/tiqr/core/enrollment/EnrollmentConfirmFragment.kt
index 2a3094ec..501deb03 100644
--- a/app/src/main/java/org/tiqr/authenticator/enrollment/EnrollmentConfirmFragment.kt
+++ b/core/src/main/java/org/tiqr/core/enrollment/EnrollmentConfirmFragment.kt
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.enrollment
+package org.tiqr.core.enrollment
 
 import android.os.Bundle
 import android.view.View
@@ -36,9 +36,9 @@ import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import androidx.navigation.navGraphViewModels
 import dagger.hilt.android.AndroidEntryPoint
-import org.tiqr.authenticator.R
-import org.tiqr.authenticator.base.BaseFragment
-import org.tiqr.authenticator.databinding.FragmentEnrollmentConfirmBinding
+import org.tiqr.core.R
+import org.tiqr.core.base.BaseFragment
+import org.tiqr.core.databinding.FragmentEnrollmentConfirmBinding
 import org.tiqr.data.viewmodel.EnrollmentViewModel
 import org.tiqr.data.viewmodel.challengeViewModel
 
diff --git a/app/src/main/java/org/tiqr/authenticator/enrollment/EnrollmentPinFragment.kt b/core/src/main/java/org/tiqr/core/enrollment/EnrollmentPinFragment.kt
similarity index 91%
rename from app/src/main/java/org/tiqr/authenticator/enrollment/EnrollmentPinFragment.kt
rename to core/src/main/java/org/tiqr/core/enrollment/EnrollmentPinFragment.kt
index fe23815e..bd721e85 100644
--- a/app/src/main/java/org/tiqr/authenticator/enrollment/EnrollmentPinFragment.kt
+++ b/core/src/main/java/org/tiqr/core/enrollment/EnrollmentPinFragment.kt
@@ -27,15 +27,15 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.enrollment
+package org.tiqr.core.enrollment
 
 import android.os.Bundle
 import android.view.View
 import androidx.annotation.LayoutRes
 import androidx.navigation.fragment.findNavController
-import org.tiqr.authenticator.R
-import org.tiqr.authenticator.base.BaseFragment
-import org.tiqr.authenticator.databinding.FragmentEnrollmentPinBinding
+import org.tiqr.core.R
+import org.tiqr.core.base.BaseFragment
+import org.tiqr.core.databinding.FragmentEnrollmentPinBinding
 
 /**
  * Fragment to enter the PIN code for the enrollment
diff --git a/app/src/main/java/org/tiqr/authenticator/enrollment/EnrollmentPinVerifyFragment.kt b/core/src/main/java/org/tiqr/core/enrollment/EnrollmentPinVerifyFragment.kt
similarity index 95%
rename from app/src/main/java/org/tiqr/authenticator/enrollment/EnrollmentPinVerifyFragment.kt
rename to core/src/main/java/org/tiqr/core/enrollment/EnrollmentPinVerifyFragment.kt
index ab64e651..b98e6a39 100644
--- a/app/src/main/java/org/tiqr/authenticator/enrollment/EnrollmentPinVerifyFragment.kt
+++ b/core/src/main/java/org/tiqr/core/enrollment/EnrollmentPinVerifyFragment.kt
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.enrollment
+package org.tiqr.core.enrollment
 
 import android.os.Bundle
 import android.view.View
@@ -37,10 +37,10 @@ import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
-import org.tiqr.authenticator.R
-import org.tiqr.authenticator.base.BaseFragment
-import org.tiqr.authenticator.databinding.FragmentEnrollmentPinVerifyBinding
-import org.tiqr.authenticator.util.extensions.biometricUsable
+import org.tiqr.core.R
+import org.tiqr.core.base.BaseFragment
+import org.tiqr.core.databinding.FragmentEnrollmentPinVerifyBinding
+import org.tiqr.core.util.extensions.biometricUsable
 import org.tiqr.data.model.ChallengeCompleteResult
 import org.tiqr.data.viewmodel.EnrollmentViewModel
 
diff --git a/app/src/main/java/org/tiqr/authenticator/enrollment/EnrollmentSummaryFragment.kt b/core/src/main/java/org/tiqr/core/enrollment/EnrollmentSummaryFragment.kt
similarity index 92%
rename from app/src/main/java/org/tiqr/authenticator/enrollment/EnrollmentSummaryFragment.kt
rename to core/src/main/java/org/tiqr/core/enrollment/EnrollmentSummaryFragment.kt
index b66be75d..a7077d4d 100644
--- a/app/src/main/java/org/tiqr/authenticator/enrollment/EnrollmentSummaryFragment.kt
+++ b/core/src/main/java/org/tiqr/core/enrollment/EnrollmentSummaryFragment.kt
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.enrollment
+package org.tiqr.core.enrollment
 
 import android.os.Bundle
 import android.view.View
@@ -35,9 +35,9 @@ import androidx.annotation.LayoutRes
 import androidx.hilt.navigation.fragment.hiltNavGraphViewModels
 import androidx.navigation.fragment.findNavController
 import dagger.hilt.android.AndroidEntryPoint
-import org.tiqr.authenticator.R
-import org.tiqr.authenticator.base.BaseFragment
-import org.tiqr.authenticator.databinding.FragmentEnrollmentSummaryBinding
+import org.tiqr.core.R
+import org.tiqr.core.base.BaseFragment
+import org.tiqr.core.databinding.FragmentEnrollmentSummaryBinding
 import org.tiqr.data.viewmodel.EnrollmentViewModel
 
 /**
diff --git a/app/src/main/java/org/tiqr/authenticator/identity/IdentityDetailFragment.kt b/core/src/main/java/org/tiqr/core/identity/IdentityDetailFragment.kt
similarity index 93%
rename from app/src/main/java/org/tiqr/authenticator/identity/IdentityDetailFragment.kt
rename to core/src/main/java/org/tiqr/core/identity/IdentityDetailFragment.kt
index e3a669cf..bc593811 100644
--- a/app/src/main/java/org/tiqr/authenticator/identity/IdentityDetailFragment.kt
+++ b/core/src/main/java/org/tiqr/core/identity/IdentityDetailFragment.kt
@@ -27,21 +27,21 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.identity
+package org.tiqr.core.identity
 
 import android.os.Bundle
 import android.view.View
 import androidx.annotation.LayoutRes
 import androidx.hilt.navigation.fragment.hiltNavGraphViewModels
 import androidx.navigation.fragment.navArgs
-import org.tiqr.authenticator.R
-import org.tiqr.authenticator.databinding.FragmentIdentityDetailBinding
+import org.tiqr.core.R
+import org.tiqr.core.databinding.FragmentIdentityDetailBinding
 import org.tiqr.data.viewmodel.IdentityViewModel
 import androidx.navigation.fragment.findNavController
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
-import org.tiqr.authenticator.base.BaseFragment
-import org.tiqr.authenticator.util.extensions.biometricUsable
+import org.tiqr.core.base.BaseFragment
+import org.tiqr.core.util.extensions.biometricUsable
 import org.tiqr.data.model.Identity
 
 /**
diff --git a/app/src/main/java/org/tiqr/authenticator/identity/IdentityListAdapter.kt b/core/src/main/java/org/tiqr/core/identity/IdentityListAdapter.kt
similarity index 95%
rename from app/src/main/java/org/tiqr/authenticator/identity/IdentityListAdapter.kt
rename to core/src/main/java/org/tiqr/core/identity/IdentityListAdapter.kt
index 15b578b2..ad6dad18 100644
--- a/app/src/main/java/org/tiqr/authenticator/identity/IdentityListAdapter.kt
+++ b/core/src/main/java/org/tiqr/core/identity/IdentityListAdapter.kt
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.identity
+package org.tiqr.core.identity
 
 import android.content.Context
 import android.graphics.Canvas
@@ -43,9 +43,9 @@ import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import org.tiqr.authenticator.R
-import org.tiqr.authenticator.databinding.ListItemIdentityBinding
-import org.tiqr.authenticator.util.extensions.getThemeColor
+import org.tiqr.core.R
+import org.tiqr.core.databinding.ListItemIdentityBinding
+import org.tiqr.core.util.extensions.getThemeColor
 import org.tiqr.data.model.IdentityWithProvider
 import kotlin.math.roundToInt
 
@@ -98,9 +98,9 @@ class IdentityListAdapter(
      * [ItemTouchHelper] to handle swipe to delete
      */
     class SwipeCallback(
-            context: Context,
-            private val adapter: IdentityListAdapter,
-            private val onCancel: (RecyclerView.ViewHolder) -> Unit
+        context: Context,
+        private val adapter: IdentityListAdapter,
+        private val onCancel: (RecyclerView.ViewHolder) -> Unit
     ) : ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT) {
         private val frameSize = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 80f, context.resources.displayMetrics)
         private val background = ColorDrawable(context.getThemeColor(R.attr.colorError))
diff --git a/app/src/main/java/org/tiqr/authenticator/identity/IdentityListFragment.kt b/core/src/main/java/org/tiqr/core/identity/IdentityListFragment.kt
similarity index 93%
rename from app/src/main/java/org/tiqr/authenticator/identity/IdentityListFragment.kt
rename to core/src/main/java/org/tiqr/core/identity/IdentityListFragment.kt
index 84ac8b39..cb0a7a6d 100644
--- a/app/src/main/java/org/tiqr/authenticator/identity/IdentityListFragment.kt
+++ b/core/src/main/java/org/tiqr/core/identity/IdentityListFragment.kt
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.identity
+package org.tiqr.core.identity
 
 import android.os.Bundle
 import android.view.View
@@ -36,10 +36,10 @@ import androidx.hilt.navigation.fragment.hiltNavGraphViewModels
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.ItemTouchHelper
 import dagger.hilt.android.AndroidEntryPoint
-import org.tiqr.authenticator.R
-import org.tiqr.authenticator.base.BaseFragment
-import org.tiqr.authenticator.databinding.FragmentIdentityListBinding
-import org.tiqr.authenticator.util.extensions.doOnCameraPermission
+import org.tiqr.core.R
+import org.tiqr.core.base.BaseFragment
+import org.tiqr.core.databinding.FragmentIdentityListBinding
+import org.tiqr.core.util.extensions.doOnCameraPermission
 import org.tiqr.data.model.IdentityWithProvider
 import org.tiqr.data.viewmodel.IdentityViewModel
 
diff --git a/app/src/main/java/org/tiqr/authenticator/messaging/TiqrMessagingService.kt b/core/src/main/java/org/tiqr/core/messaging/TiqrMessagingService.kt
similarity index 97%
rename from app/src/main/java/org/tiqr/authenticator/messaging/TiqrMessagingService.kt
rename to core/src/main/java/org/tiqr/core/messaging/TiqrMessagingService.kt
index 314ee2b7..0e1fa69f 100644
--- a/app/src/main/java/org/tiqr/authenticator/messaging/TiqrMessagingService.kt
+++ b/core/src/main/java/org/tiqr/core/messaging/TiqrMessagingService.kt
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.messaging
+package org.tiqr.core.messaging
 
 import android.app.Notification
 import android.app.NotificationChannel
@@ -47,7 +47,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
-import org.tiqr.authenticator.R
+import org.tiqr.core.R
 import org.tiqr.data.repository.base.TokenRegistrarRepository
 import javax.inject.Inject
 
@@ -95,7 +95,8 @@ class TiqrMessagingService : FirebaseMessagingService() {
 
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 notificationManager.createNotificationChannel(
-                        NotificationChannel(CHANNEL_ID,
+                        NotificationChannel(
+                            CHANNEL_ID,
                                 resources.getString(R.string.notification_channel_name),
                                 NotificationManager.IMPORTANCE_DEFAULT).also {
                             it.description = resources.getString(R.string.notification_channel_description)
diff --git a/app/src/main/java/org/tiqr/authenticator/scan/ScanAnalyzer.kt b/core/src/main/java/org/tiqr/core/scan/ScanAnalyzer.kt
similarity index 99%
rename from app/src/main/java/org/tiqr/authenticator/scan/ScanAnalyzer.kt
rename to core/src/main/java/org/tiqr/core/scan/ScanAnalyzer.kt
index 67c8a4e7..cc267ab6 100644
--- a/app/src/main/java/org/tiqr/authenticator/scan/ScanAnalyzer.kt
+++ b/core/src/main/java/org/tiqr/core/scan/ScanAnalyzer.kt
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.scan
+package org.tiqr.core.scan
 
 import android.graphics.Rect
 import androidx.camera.core.ExperimentalGetImage
diff --git a/app/src/main/java/org/tiqr/authenticator/scan/ScanComponent.kt b/core/src/main/java/org/tiqr/core/scan/ScanComponent.kt
similarity index 99%
rename from app/src/main/java/org/tiqr/authenticator/scan/ScanComponent.kt
rename to core/src/main/java/org/tiqr/core/scan/ScanComponent.kt
index 4bb4e6ee..f2d9064b 100644
--- a/app/src/main/java/org/tiqr/authenticator/scan/ScanComponent.kt
+++ b/core/src/main/java/org/tiqr/core/scan/ScanComponent.kt
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.scan
+package org.tiqr.core.scan
 
 import android.content.Context
 import android.media.AudioAttributes
@@ -50,7 +50,7 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import org.tiqr.authenticator.R
+import org.tiqr.core.R
 import kotlin.math.abs
 import kotlin.math.max
 import kotlin.math.min
diff --git a/app/src/main/java/org/tiqr/authenticator/scan/ScanFragment.kt b/core/src/main/java/org/tiqr/core/scan/ScanFragment.kt
similarity index 95%
rename from app/src/main/java/org/tiqr/authenticator/scan/ScanFragment.kt
rename to core/src/main/java/org/tiqr/core/scan/ScanFragment.kt
index 3e1e8284..08295b05 100644
--- a/app/src/main/java/org/tiqr/authenticator/scan/ScanFragment.kt
+++ b/core/src/main/java/org/tiqr/core/scan/ScanFragment.kt
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.scan
+package org.tiqr.core.scan
 
 import android.os.Bundle
 import android.view.View
@@ -38,10 +38,10 @@ import androidx.navigation.fragment.findNavController
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.delay
-import org.tiqr.authenticator.R
-import org.tiqr.authenticator.base.BaseFragment
-import org.tiqr.authenticator.databinding.FragmentScanBinding
-import org.tiqr.authenticator.util.extensions.hasCameraPermission
+import org.tiqr.core.R
+import org.tiqr.core.base.BaseFragment
+import org.tiqr.core.databinding.FragmentScanBinding
+import org.tiqr.core.util.extensions.hasCameraPermission
 import org.tiqr.data.model.AuthenticationChallenge
 import org.tiqr.data.model.ChallengeParseResult
 import org.tiqr.data.model.EnrollmentChallenge
diff --git a/app/src/main/java/org/tiqr/authenticator/scan/ScanFrameOverlay.kt b/core/src/main/java/org/tiqr/core/scan/ScanFrameOverlay.kt
similarity index 98%
rename from app/src/main/java/org/tiqr/authenticator/scan/ScanFrameOverlay.kt
rename to core/src/main/java/org/tiqr/core/scan/ScanFrameOverlay.kt
index cd97e561..f4f99b2f 100644
--- a/app/src/main/java/org/tiqr/authenticator/scan/ScanFrameOverlay.kt
+++ b/core/src/main/java/org/tiqr/core/scan/ScanFrameOverlay.kt
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.scan
+package org.tiqr.core.scan
 
 import android.content.Context
 import android.graphics.*
@@ -36,7 +36,7 @@ import android.util.TypedValue
 import android.view.View
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.*
-import org.tiqr.authenticator.R
+import org.tiqr.core.R
 
 /**
  * Overlay view for displaying a scan-frame.
diff --git a/app/src/main/java/org/tiqr/authenticator/scan/ScanKeyEventsReceiver.kt b/core/src/main/java/org/tiqr/core/scan/ScanKeyEventsReceiver.kt
similarity index 98%
rename from app/src/main/java/org/tiqr/authenticator/scan/ScanKeyEventsReceiver.kt
rename to core/src/main/java/org/tiqr/core/scan/ScanKeyEventsReceiver.kt
index 2c35033c..0da5f458 100644
--- a/app/src/main/java/org/tiqr/authenticator/scan/ScanKeyEventsReceiver.kt
+++ b/core/src/main/java/org/tiqr/core/scan/ScanKeyEventsReceiver.kt
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.scan
+package org.tiqr.core.scan
 
 import android.content.BroadcastReceiver
 import android.content.Context
diff --git a/app/src/main/java/org/tiqr/authenticator/scan/ScanUtil.kt b/core/src/main/java/org/tiqr/core/scan/ScanUtil.kt
similarity index 98%
rename from app/src/main/java/org/tiqr/authenticator/scan/ScanUtil.kt
rename to core/src/main/java/org/tiqr/core/scan/ScanUtil.kt
index ae14652e..51b97961 100644
--- a/app/src/main/java/org/tiqr/authenticator/scan/ScanUtil.kt
+++ b/core/src/main/java/org/tiqr/core/scan/ScanUtil.kt
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.scan
+package org.tiqr.core.scan
 
 import android.graphics.RectF
 
diff --git a/app/src/main/java/org/tiqr/authenticator/start/StartFragment.kt b/core/src/main/java/org/tiqr/core/start/StartFragment.kt
similarity index 93%
rename from app/src/main/java/org/tiqr/authenticator/start/StartFragment.kt
rename to core/src/main/java/org/tiqr/core/start/StartFragment.kt
index c26c3c77..77ca4e2f 100644
--- a/app/src/main/java/org/tiqr/authenticator/start/StartFragment.kt
+++ b/core/src/main/java/org/tiqr/core/start/StartFragment.kt
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.start
+package org.tiqr.core.start
 
 import android.os.Bundle
 import android.view.Menu
@@ -38,10 +38,10 @@ import androidx.annotation.LayoutRes
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import dagger.hilt.android.AndroidEntryPoint
-import org.tiqr.authenticator.R
-import org.tiqr.authenticator.base.BaseFragment
-import org.tiqr.authenticator.databinding.FragmentStartBinding
-import org.tiqr.authenticator.util.extensions.doOnCameraPermission
+import org.tiqr.core.R
+import org.tiqr.core.base.BaseFragment
+import org.tiqr.core.databinding.FragmentStartBinding
+import org.tiqr.core.util.extensions.doOnCameraPermission
 import org.tiqr.data.viewmodel.StartViewModel
 
 /**
diff --git a/app/src/main/java/org/tiqr/authenticator/util/Urls.kt b/core/src/main/java/org/tiqr/core/util/Urls.kt
similarity index 97%
rename from app/src/main/java/org/tiqr/authenticator/util/Urls.kt
rename to core/src/main/java/org/tiqr/core/util/Urls.kt
index 7ed7b921..23564870 100644
--- a/app/src/main/java/org/tiqr/authenticator/util/Urls.kt
+++ b/core/src/main/java/org/tiqr/core/util/Urls.kt
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.util
+package org.tiqr.core.util
 
 object Urls {
     const val URL_TIQR = "https://tiqr.org"
diff --git a/app/src/main/java/org/tiqr/authenticator/util/databinding/BindingAdapters.kt b/core/src/main/java/org/tiqr/core/util/databinding/BindingAdapters.kt
similarity index 94%
rename from app/src/main/java/org/tiqr/authenticator/util/databinding/BindingAdapters.kt
rename to core/src/main/java/org/tiqr/core/util/databinding/BindingAdapters.kt
index 5e305821..f38560d1 100644
--- a/app/src/main/java/org/tiqr/authenticator/util/databinding/BindingAdapters.kt
+++ b/core/src/main/java/org/tiqr/core/util/databinding/BindingAdapters.kt
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.util.databinding
+package org.tiqr.core.util.databinding
 
 import android.annotation.SuppressLint
 import android.text.Spanned
@@ -46,11 +46,11 @@ import androidx.navigation.findNavController
 import androidx.recyclerview.widget.RecyclerView
 import coil.load
 import me.saket.bettermovementmethod.BetterLinkMovementMethod
-import org.tiqr.authenticator.MainNavDirections
-import org.tiqr.authenticator.R
-import org.tiqr.authenticator.util.extensions.toHtmlLink
-import org.tiqr.authenticator.widget.recyclerview.HeaderViewDecoration
-import org.tiqr.authenticator.widget.recyclerview.DividerDecoration
+import org.tiqr.core.MainNavDirections
+import org.tiqr.core.R
+import org.tiqr.core.util.extensions.toHtmlLink
+import org.tiqr.core.widget.recyclerview.DividerDecoration
+import org.tiqr.core.widget.recyclerview.HeaderViewDecoration
 import timber.log.Timber
 
 /**
diff --git a/app/src/main/java/org/tiqr/authenticator/util/extensions/ContextExtensions.kt b/core/src/main/java/org/tiqr/core/util/extensions/ContextExtensions.kt
similarity index 97%
rename from app/src/main/java/org/tiqr/authenticator/util/extensions/ContextExtensions.kt
rename to core/src/main/java/org/tiqr/core/util/extensions/ContextExtensions.kt
index 70289495..6b351c35 100644
--- a/app/src/main/java/org/tiqr/authenticator/util/extensions/ContextExtensions.kt
+++ b/core/src/main/java/org/tiqr/core/util/extensions/ContextExtensions.kt
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.util.extensions
+package org.tiqr.core.util.extensions
 
 import android.content.Context
 import android.util.TypedValue
diff --git a/app/src/main/java/org/tiqr/authenticator/util/extensions/FragmentExtensions.kt b/core/src/main/java/org/tiqr/core/util/extensions/FragmentExtensions.kt
similarity index 98%
rename from app/src/main/java/org/tiqr/authenticator/util/extensions/FragmentExtensions.kt
rename to core/src/main/java/org/tiqr/core/util/extensions/FragmentExtensions.kt
index 1bf5e00a..c021d535 100644
--- a/app/src/main/java/org/tiqr/authenticator/util/extensions/FragmentExtensions.kt
+++ b/core/src/main/java/org/tiqr/core/util/extensions/FragmentExtensions.kt
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.util.extensions
+package org.tiqr.core.util.extensions
 
 import androidx.annotation.IdRes
 import androidx.fragment.app.Fragment
diff --git a/app/src/main/java/org/tiqr/authenticator/util/extensions/PermissionExtensions.kt b/core/src/main/java/org/tiqr/core/util/extensions/PermissionExtensions.kt
similarity index 98%
rename from app/src/main/java/org/tiqr/authenticator/util/extensions/PermissionExtensions.kt
rename to core/src/main/java/org/tiqr/core/util/extensions/PermissionExtensions.kt
index 8dcdf1cd..560c366a 100644
--- a/app/src/main/java/org/tiqr/authenticator/util/extensions/PermissionExtensions.kt
+++ b/core/src/main/java/org/tiqr/core/util/extensions/PermissionExtensions.kt
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.util.extensions
+package org.tiqr.core.util.extensions
 
 import android.Manifest
 import android.content.ActivityNotFoundException
@@ -42,7 +42,7 @@ import com.fondesa.kpermissions.anyGranted
 import com.fondesa.kpermissions.anyPermanentlyDenied
 import com.fondesa.kpermissions.extension.*
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import org.tiqr.authenticator.R
+import org.tiqr.core.R
 import timber.log.Timber
 
 /**
diff --git a/app/src/main/java/org/tiqr/authenticator/util/extensions/StringExtensions.kt b/core/src/main/java/org/tiqr/core/util/extensions/StringExtensions.kt
similarity index 97%
rename from app/src/main/java/org/tiqr/authenticator/util/extensions/StringExtensions.kt
rename to core/src/main/java/org/tiqr/core/util/extensions/StringExtensions.kt
index 83f90903..413655a4 100644
--- a/app/src/main/java/org/tiqr/authenticator/util/extensions/StringExtensions.kt
+++ b/core/src/main/java/org/tiqr/core/util/extensions/StringExtensions.kt
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.util.extensions
+package org.tiqr.core.util.extensions
 
 import android.webkit.URLUtil
 import androidx.core.net.toUri
diff --git a/app/src/main/java/org/tiqr/authenticator/widget/BottomBarView.kt b/core/src/main/java/org/tiqr/core/widget/BottomBarView.kt
similarity index 94%
rename from app/src/main/java/org/tiqr/authenticator/widget/BottomBarView.kt
rename to core/src/main/java/org/tiqr/core/widget/BottomBarView.kt
index 4e93c8bc..ecaddf97 100644
--- a/app/src/main/java/org/tiqr/authenticator/widget/BottomBarView.kt
+++ b/core/src/main/java/org/tiqr/core/widget/BottomBarView.kt
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.widget
+package org.tiqr.core.widget
 
 import android.animation.LayoutTransition
 import android.content.Context
@@ -35,9 +35,9 @@ import android.util.AttributeSet
 import androidx.core.content.withStyledAttributes
 import androidx.navigation.findNavController
 import com.google.android.material.bottomappbar.BottomAppBar
-import org.tiqr.authenticator.MainNavDirections
-import org.tiqr.authenticator.R
-import org.tiqr.authenticator.util.Urls.URL_SURFNET
+import org.tiqr.core.MainNavDirections
+import org.tiqr.core.R
+import org.tiqr.core.util.Urls.URL_SURFNET
 
 /**
  * Custom [BottomAppBar] to display and handle the Info and Surfnet actions.
diff --git a/app/src/main/java/org/tiqr/authenticator/widget/PinView.kt b/core/src/main/java/org/tiqr/core/widget/PinView.kt
similarity index 98%
rename from app/src/main/java/org/tiqr/authenticator/widget/PinView.kt
rename to core/src/main/java/org/tiqr/core/widget/PinView.kt
index b2c244b3..1679d784 100644
--- a/app/src/main/java/org/tiqr/authenticator/widget/PinView.kt
+++ b/core/src/main/java/org/tiqr/core/widget/PinView.kt
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.widget
+package org.tiqr.core.widget
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -54,7 +54,7 @@ import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.getSystemService
 import androidx.core.content.withStyledAttributes
 import androidx.core.os.postDelayed
-import org.tiqr.authenticator.R
+import org.tiqr.core.R
 
 /**
  * This composite view advertises itself as a text editor,
@@ -82,7 +82,7 @@ class PinView : ConstraintLayout {
     private val pins: List<TextView>
     private val fadeHandler = Handler(Looper.getMainLooper())
 
-    private val inputMethodManager = context.getSystemService<InputMethodManager>()
+    private val inputMethodManager: InputMethodManager? = context.getSystemService<InputMethodManager>()
     private val gestureDetector = GestureDetector(context, PinGestureDetector { focusAndShowKeyboard() })
     private val inputWatcher = PinInputWatcher { updatePinDisplay() }
     private var showKeyboardDelayed = false
diff --git a/app/src/main/java/org/tiqr/authenticator/widget/recyclerview/DividerDecoration.kt b/core/src/main/java/org/tiqr/core/widget/recyclerview/DividerDecoration.kt
similarity index 98%
rename from app/src/main/java/org/tiqr/authenticator/widget/recyclerview/DividerDecoration.kt
rename to core/src/main/java/org/tiqr/core/widget/recyclerview/DividerDecoration.kt
index 7a5b5493..9543ec1e 100644
--- a/app/src/main/java/org/tiqr/authenticator/widget/recyclerview/DividerDecoration.kt
+++ b/core/src/main/java/org/tiqr/core/widget/recyclerview/DividerDecoration.kt
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.widget.recyclerview
+package org.tiqr.core.widget.recyclerview
 
 import android.content.Context
 import android.graphics.Canvas
diff --git a/app/src/main/java/org/tiqr/authenticator/widget/recyclerview/HeaderViewDecoration.kt b/core/src/main/java/org/tiqr/core/widget/recyclerview/HeaderViewDecoration.kt
similarity index 98%
rename from app/src/main/java/org/tiqr/authenticator/widget/recyclerview/HeaderViewDecoration.kt
rename to core/src/main/java/org/tiqr/core/widget/recyclerview/HeaderViewDecoration.kt
index ef0db814..460bacbe 100644
--- a/app/src/main/java/org/tiqr/authenticator/widget/recyclerview/HeaderViewDecoration.kt
+++ b/core/src/main/java/org/tiqr/core/widget/recyclerview/HeaderViewDecoration.kt
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.tiqr.authenticator.widget.recyclerview
+package org.tiqr.core.widget.recyclerview
 
 import android.graphics.Canvas
 import android.graphics.Rect
diff --git a/app/src/main/res/anim/slide_in_left.xml b/core/src/main/res/anim/slide_in_left.xml
similarity index 100%
rename from app/src/main/res/anim/slide_in_left.xml
rename to core/src/main/res/anim/slide_in_left.xml
diff --git a/app/src/main/res/anim/slide_in_right.xml b/core/src/main/res/anim/slide_in_right.xml
similarity index 100%
rename from app/src/main/res/anim/slide_in_right.xml
rename to core/src/main/res/anim/slide_in_right.xml
diff --git a/app/src/main/res/anim/slide_out_left.xml b/core/src/main/res/anim/slide_out_left.xml
similarity index 100%
rename from app/src/main/res/anim/slide_out_left.xml
rename to core/src/main/res/anim/slide_out_left.xml
diff --git a/app/src/main/res/anim/slide_out_right.xml b/core/src/main/res/anim/slide_out_right.xml
similarity index 100%
rename from app/src/main/res/anim/slide_out_right.xml
rename to core/src/main/res/anim/slide_out_right.xml
diff --git a/app/src/main/res/drawable-anydpi-v23/launch_background.xml b/core/src/main/res/drawable-anydpi-v23/launch_background.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v23/launch_background.xml
rename to core/src/main/res/drawable-anydpi-v23/launch_background.xml
diff --git a/app/src/main/res/drawable-anydpi-v23/logo_tiqr_large.xml b/core/src/main/res/drawable-anydpi-v23/logo_tiqr_large.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v23/logo_tiqr_large.xml
rename to core/src/main/res/drawable-anydpi-v23/logo_tiqr_large.xml
diff --git a/app/src/main/res/drawable-anydpi-v23/logo_tiqr_small.xml b/core/src/main/res/drawable-anydpi-v23/logo_tiqr_small.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v23/logo_tiqr_small.xml
rename to core/src/main/res/drawable-anydpi-v23/logo_tiqr_small.xml
diff --git a/app/src/main/res/drawable-anydpi-v23/toolbar_background.xml b/core/src/main/res/drawable-anydpi-v23/toolbar_background.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v23/toolbar_background.xml
rename to core/src/main/res/drawable-anydpi-v23/toolbar_background.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_notification.xml b/core/src/main/res/drawable-anydpi-v24/ic_notification.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/ic_notification.xml
rename to core/src/main/res/drawable-anydpi-v24/ic_notification.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/logo_egeniq.xml b/core/src/main/res/drawable-anydpi-v24/logo_egeniq.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/logo_egeniq.xml
rename to core/src/main/res/drawable-anydpi-v24/logo_egeniq.xml
diff --git a/app/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml b/core/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml
rename to core/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml
diff --git a/app/src/main/res/drawable-hdpi/ic_notification.png b/core/src/main/res/drawable-hdpi/ic_notification.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_notification.png
rename to core/src/main/res/drawable-hdpi/ic_notification.png
diff --git a/app/src/main/res/drawable-hdpi/logo_egeniq.webp b/core/src/main/res/drawable-hdpi/logo_egeniq.webp
similarity index 100%
rename from app/src/main/res/drawable-hdpi/logo_egeniq.webp
rename to core/src/main/res/drawable-hdpi/logo_egeniq.webp
diff --git a/app/src/main/res/drawable-hdpi/logo_tiqr_large.webp b/core/src/main/res/drawable-hdpi/logo_tiqr_large.webp
similarity index 100%
rename from app/src/main/res/drawable-hdpi/logo_tiqr_large.webp
rename to core/src/main/res/drawable-hdpi/logo_tiqr_large.webp
diff --git a/app/src/main/res/drawable-hdpi/logo_tiqr_small.webp b/core/src/main/res/drawable-hdpi/logo_tiqr_small.webp
similarity index 100%
rename from app/src/main/res/drawable-hdpi/logo_tiqr_small.webp
rename to core/src/main/res/drawable-hdpi/logo_tiqr_small.webp
diff --git a/app/src/main/res/drawable-mdpi/ic_notification.png b/core/src/main/res/drawable-mdpi/ic_notification.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_notification.png
rename to core/src/main/res/drawable-mdpi/ic_notification.png
diff --git a/app/src/main/res/drawable-mdpi/logo_egeniq.webp b/core/src/main/res/drawable-mdpi/logo_egeniq.webp
similarity index 100%
rename from app/src/main/res/drawable-mdpi/logo_egeniq.webp
rename to core/src/main/res/drawable-mdpi/logo_egeniq.webp
diff --git a/app/src/main/res/drawable-mdpi/logo_tiqr_large.webp b/core/src/main/res/drawable-mdpi/logo_tiqr_large.webp
similarity index 100%
rename from app/src/main/res/drawable-mdpi/logo_tiqr_large.webp
rename to core/src/main/res/drawable-mdpi/logo_tiqr_large.webp
diff --git a/app/src/main/res/drawable-mdpi/logo_tiqr_small.webp b/core/src/main/res/drawable-mdpi/logo_tiqr_small.webp
similarity index 100%
rename from app/src/main/res/drawable-mdpi/logo_tiqr_small.webp
rename to core/src/main/res/drawable-mdpi/logo_tiqr_small.webp
diff --git a/app/src/main/res/drawable-xhdpi/ic_notification.png b/core/src/main/res/drawable-xhdpi/ic_notification.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_notification.png
rename to core/src/main/res/drawable-xhdpi/ic_notification.png
diff --git a/app/src/main/res/drawable-xhdpi/logo_egeniq.webp b/core/src/main/res/drawable-xhdpi/logo_egeniq.webp
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/logo_egeniq.webp
rename to core/src/main/res/drawable-xhdpi/logo_egeniq.webp
diff --git a/app/src/main/res/drawable-xhdpi/logo_tiqr_large.webp b/core/src/main/res/drawable-xhdpi/logo_tiqr_large.webp
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/logo_tiqr_large.webp
rename to core/src/main/res/drawable-xhdpi/logo_tiqr_large.webp
diff --git a/app/src/main/res/drawable-xhdpi/logo_tiqr_small.webp b/core/src/main/res/drawable-xhdpi/logo_tiqr_small.webp
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/logo_tiqr_small.webp
rename to core/src/main/res/drawable-xhdpi/logo_tiqr_small.webp
diff --git a/app/src/main/res/drawable-xxhdpi/ic_notification.png b/core/src/main/res/drawable-xxhdpi/ic_notification.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_notification.png
rename to core/src/main/res/drawable-xxhdpi/ic_notification.png
diff --git a/app/src/main/res/drawable-xxhdpi/logo_egeniq.webp b/core/src/main/res/drawable-xxhdpi/logo_egeniq.webp
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/logo_egeniq.webp
rename to core/src/main/res/drawable-xxhdpi/logo_egeniq.webp
diff --git a/app/src/main/res/drawable-xxhdpi/logo_tiqr_large.webp b/core/src/main/res/drawable-xxhdpi/logo_tiqr_large.webp
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/logo_tiqr_large.webp
rename to core/src/main/res/drawable-xxhdpi/logo_tiqr_large.webp
diff --git a/app/src/main/res/drawable-xxhdpi/logo_tiqr_small.webp b/core/src/main/res/drawable-xxhdpi/logo_tiqr_small.webp
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/logo_tiqr_small.webp
rename to core/src/main/res/drawable-xxhdpi/logo_tiqr_small.webp
diff --git a/app/src/main/res/drawable-xxxhdpi/logo_egeniq.webp b/core/src/main/res/drawable-xxxhdpi/logo_egeniq.webp
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/logo_egeniq.webp
rename to core/src/main/res/drawable-xxxhdpi/logo_egeniq.webp
diff --git a/app/src/main/res/drawable-xxxhdpi/logo_tiqr_large.webp b/core/src/main/res/drawable-xxxhdpi/logo_tiqr_large.webp
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/logo_tiqr_large.webp
rename to core/src/main/res/drawable-xxxhdpi/logo_tiqr_large.webp
diff --git a/app/src/main/res/drawable-xxxhdpi/logo_tiqr_small.webp b/core/src/main/res/drawable-xxxhdpi/logo_tiqr_small.webp
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/logo_tiqr_small.webp
rename to core/src/main/res/drawable-xxxhdpi/logo_tiqr_small.webp
diff --git a/app/src/main/res/drawable/divider_16dp.xml b/core/src/main/res/drawable/divider_16dp.xml
similarity index 100%
rename from app/src/main/res/drawable/divider_16dp.xml
rename to core/src/main/res/drawable/divider_16dp.xml
diff --git a/app/src/main/res/drawable/divider_32dp.xml b/core/src/main/res/drawable/divider_32dp.xml
similarity index 100%
rename from app/src/main/res/drawable/divider_32dp.xml
rename to core/src/main/res/drawable/divider_32dp.xml
diff --git a/app/src/main/res/drawable/ic_delete.xml b/core/src/main/res/drawable/ic_delete.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_delete.xml
rename to core/src/main/res/drawable/ic_delete.xml
diff --git a/app/src/main/res/drawable/ic_identity_add.xml b/core/src/main/res/drawable/ic_identity_add.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_identity_add.xml
rename to core/src/main/res/drawable/ic_identity_add.xml
diff --git a/app/src/main/res/drawable/ic_identity_blocked.xml b/core/src/main/res/drawable/ic_identity_blocked.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_identity_blocked.xml
rename to core/src/main/res/drawable/ic_identity_blocked.xml
diff --git a/app/src/main/res/drawable/ic_identity_list.xml b/core/src/main/res/drawable/ic_identity_list.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_identity_list.xml
rename to core/src/main/res/drawable/ic_identity_list.xml
diff --git a/app/src/main/res/drawable/ic_identity_select.xml b/core/src/main/res/drawable/ic_identity_select.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_identity_select.xml
rename to core/src/main/res/drawable/ic_identity_select.xml
diff --git a/app/src/main/res/drawable/ic_info.xml b/core/src/main/res/drawable/ic_info.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_info.xml
rename to core/src/main/res/drawable/ic_info.xml
diff --git a/app/src/main/res/drawable/ic_notification_large.xml b/core/src/main/res/drawable/ic_notification_large.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_notification_large.xml
rename to core/src/main/res/drawable/ic_notification_large.xml
diff --git a/app/src/main/res/drawable/ic_scan.xml b/core/src/main/res/drawable/ic_scan.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_scan.xml
rename to core/src/main/res/drawable/ic_scan.xml
diff --git a/app/src/main/res/drawable/ic_surfnet.xml b/core/src/main/res/drawable/ic_surfnet.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_surfnet.xml
rename to core/src/main/res/drawable/ic_surfnet.xml
diff --git a/app/src/main/res/drawable/launch_background.xml b/core/src/main/res/drawable/launch_background.xml
similarity index 100%
rename from app/src/main/res/drawable/launch_background.xml
rename to core/src/main/res/drawable/launch_background.xml
diff --git a/app/src/main/res/drawable/logo_keen_design.xml b/core/src/main/res/drawable/logo_keen_design.xml
similarity index 100%
rename from app/src/main/res/drawable/logo_keen_design.xml
rename to core/src/main/res/drawable/logo_keen_design.xml
diff --git a/app/src/main/res/drawable/logo_tiqr_splash.xml b/core/src/main/res/drawable/logo_tiqr_splash.xml
similarity index 100%
rename from app/src/main/res/drawable/logo_tiqr_splash.xml
rename to core/src/main/res/drawable/logo_tiqr_splash.xml
diff --git a/app/src/main/res/drawable/pin_input_background.xml b/core/src/main/res/drawable/pin_input_background.xml
similarity index 100%
rename from app/src/main/res/drawable/pin_input_background.xml
rename to core/src/main/res/drawable/pin_input_background.xml
diff --git a/app/src/main/res/drawable/toolbar_background.xml b/core/src/main/res/drawable/toolbar_background.xml
similarity index 100%
rename from app/src/main/res/drawable/toolbar_background.xml
rename to core/src/main/res/drawable/toolbar_background.xml
diff --git a/app/src/main/res/layout/activity_main.xml b/core/src/main/res/layout/activity_main.xml
similarity index 93%
rename from app/src/main/res/layout/activity_main.xml
rename to core/src/main/res/layout/activity_main.xml
index de6bd687..9f1a21f6 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/core/src/main/res/layout/activity_main.xml
@@ -2,7 +2,7 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".MainActivity">
+    tools:context="org.tiqr.core.MainActivity">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/container"
@@ -29,7 +29,7 @@
 
         <androidx.fragment.app.FragmentContainerView
             android:id="@+id/nav_host_fragment"
-            android:name="org.tiqr.authenticator.base.TiqrNavHostFragment"
+            android:name="org.tiqr.core.base.TiqrNavHostFragment"
             android:layout_width="0dp"
             android:layout_height="0dp"
             app:defaultNavHost="true"
@@ -39,7 +39,7 @@
             app:layout_constraintTop_toBottomOf="@id/appbar_layout"
             app:navGraph="@navigation/nav_graph" />
 
-    <org.tiqr.authenticator.widget.BottomBarView
+    <org.tiqr.core.widget.BottomBarView
         android:id="@+id/bottombar"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/destination_browser.xml b/core/src/main/res/layout/destination_browser.xml
similarity index 91%
rename from app/src/main/res/layout/destination_browser.xml
rename to core/src/main/res/layout/destination_browser.xml
index 075d5403..755f88c4 100644
--- a/app/src/main/res/layout/destination_browser.xml
+++ b/core/src/main/res/layout/destination_browser.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".browser.BrowserNavigator"
+    tools:context="org.tiqr.core.browser.BrowserNavigator"
     tools:background="@color/primaryLightColor">
 
     <TextView
diff --git a/app/src/main/res/layout/fragment_about.xml b/core/src/main/res/layout/fragment_about.xml
similarity index 98%
rename from app/src/main/res/layout/fragment_about.xml
rename to core/src/main/res/layout/fragment_about.xml
index 1ca29761..e543219a 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/core/src/main/res/layout/fragment_about.xml
@@ -2,11 +2,11 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".about.AboutFragment">
+    tools:context="org.tiqr.core.about.AboutFragment">
 
     <data>
 
-        <import type="org.tiqr.authenticator.util.Urls" />
+        <import type="org.tiqr.core.util.Urls" />
     </data>
 
     <androidx.core.widget.NestedScrollView
diff --git a/app/src/main/res/layout/fragment_authentication_biometric.xml b/core/src/main/res/layout/fragment_authentication_biometric.xml
similarity index 95%
rename from app/src/main/res/layout/fragment_authentication_biometric.xml
rename to core/src/main/res/layout/fragment_authentication_biometric.xml
index 1eb7fb11..9b8006e1 100644
--- a/app/src/main/res/layout/fragment_authentication_biometric.xml
+++ b/core/src/main/res/layout/fragment_authentication_biometric.xml
@@ -2,7 +2,7 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".authentication.AuthenticationBiometricFragment">
+    tools:context="org.tiqr.core.authentication.AuthenticationBiometricFragment">
 
     <data>
 
diff --git a/app/src/main/res/layout/fragment_authentication_confirm.xml b/core/src/main/res/layout/fragment_authentication_confirm.xml
similarity index 98%
rename from app/src/main/res/layout/fragment_authentication_confirm.xml
rename to core/src/main/res/layout/fragment_authentication_confirm.xml
index aae05b96..567fd1f1 100644
--- a/app/src/main/res/layout/fragment_authentication_confirm.xml
+++ b/core/src/main/res/layout/fragment_authentication_confirm.xml
@@ -2,7 +2,7 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".authentication.AuthenticationConfirmFragment">
+    tools:context="org.tiqr.core.authentication.AuthenticationConfirmFragment">
 
     <data>
 
diff --git a/app/src/main/res/layout/fragment_authentication_fallback.xml b/core/src/main/res/layout/fragment_authentication_fallback.xml
similarity index 98%
rename from app/src/main/res/layout/fragment_authentication_fallback.xml
rename to core/src/main/res/layout/fragment_authentication_fallback.xml
index ae89dd53..1a13ec41 100644
--- a/app/src/main/res/layout/fragment_authentication_fallback.xml
+++ b/core/src/main/res/layout/fragment_authentication_fallback.xml
@@ -2,7 +2,7 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".authentication.AuthenticationFallbackFragment">
+    tools:context="org.tiqr.core.authentication.AuthenticationFallbackFragment">
 
     <data>
 
diff --git a/app/src/main/res/layout/fragment_authentication_identity.xml b/core/src/main/res/layout/fragment_authentication_identity.xml
similarity index 96%
rename from app/src/main/res/layout/fragment_authentication_identity.xml
rename to core/src/main/res/layout/fragment_authentication_identity.xml
index f66ad3e8..c9ec32be 100644
--- a/app/src/main/res/layout/fragment_authentication_identity.xml
+++ b/core/src/main/res/layout/fragment_authentication_identity.xml
@@ -2,7 +2,7 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".authentication.AuthenticationIdentityFragment">
+    tools:context="org.tiqr.core.authentication.AuthenticationIdentityFragment">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_authentication_pin.xml b/core/src/main/res/layout/fragment_authentication_pin.xml
similarity index 95%
rename from app/src/main/res/layout/fragment_authentication_pin.xml
rename to core/src/main/res/layout/fragment_authentication_pin.xml
index 9bb4cdab..88e059a9 100644
--- a/app/src/main/res/layout/fragment_authentication_pin.xml
+++ b/core/src/main/res/layout/fragment_authentication_pin.xml
@@ -2,7 +2,7 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".authentication.AuthenticationPinFragment">
+    tools:context="org.tiqr.core.authentication.AuthenticationPinFragment">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -27,7 +27,7 @@
             app:layout_constraintStart_toStartOf="@+id/title"
             app:layout_constraintTop_toBottomOf="@+id/title" />
 
-        <org.tiqr.authenticator.widget.PinView
+        <org.tiqr.core.widget.PinView
             android:id="@+id/pin"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_authentication_summary.xml b/core/src/main/res/layout/fragment_authentication_summary.xml
similarity index 98%
rename from app/src/main/res/layout/fragment_authentication_summary.xml
rename to core/src/main/res/layout/fragment_authentication_summary.xml
index 4eb7efde..64c9df18 100644
--- a/app/src/main/res/layout/fragment_authentication_summary.xml
+++ b/core/src/main/res/layout/fragment_authentication_summary.xml
@@ -2,7 +2,7 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".authentication.AuthenticationSummaryFragment">
+    tools:context="org.tiqr.core.authentication.AuthenticationSummaryFragment">
 
     <data>
 
diff --git a/app/src/main/res/layout/fragment_enrollment_confirm.xml b/core/src/main/res/layout/fragment_enrollment_confirm.xml
similarity index 98%
rename from app/src/main/res/layout/fragment_enrollment_confirm.xml
rename to core/src/main/res/layout/fragment_enrollment_confirm.xml
index d2a5dd0c..1a67efc0 100644
--- a/app/src/main/res/layout/fragment_enrollment_confirm.xml
+++ b/core/src/main/res/layout/fragment_enrollment_confirm.xml
@@ -2,7 +2,7 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".enrollment.EnrollmentConfirmFragment">
+    tools:context="org.tiqr.core.enrollment.EnrollmentConfirmFragment">
 
     <data>
 
diff --git a/app/src/main/res/layout/fragment_enrollment_pin.xml b/core/src/main/res/layout/fragment_enrollment_pin.xml
similarity index 93%
rename from app/src/main/res/layout/fragment_enrollment_pin.xml
rename to core/src/main/res/layout/fragment_enrollment_pin.xml
index 443c5cf2..f30e1925 100644
--- a/app/src/main/res/layout/fragment_enrollment_pin.xml
+++ b/core/src/main/res/layout/fragment_enrollment_pin.xml
@@ -2,7 +2,7 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".enrollment.EnrollmentPinFragment">
+    tools:context="org.tiqr.core.enrollment.EnrollmentPinFragment">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -24,7 +24,7 @@
             android:layout_height="wrap_content"
             android:text="@string/enroll_pin_subtitle" />
 
-        <org.tiqr.authenticator.widget.PinView
+        <org.tiqr.core.widget.PinView
             android:id="@+id/pin"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_enrollment_pin_verify.xml b/core/src/main/res/layout/fragment_enrollment_pin_verify.xml
similarity index 96%
rename from app/src/main/res/layout/fragment_enrollment_pin_verify.xml
rename to core/src/main/res/layout/fragment_enrollment_pin_verify.xml
index 02b41692..01da8a61 100644
--- a/app/src/main/res/layout/fragment_enrollment_pin_verify.xml
+++ b/core/src/main/res/layout/fragment_enrollment_pin_verify.xml
@@ -2,7 +2,7 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".enrollment.EnrollmentPinVerifyFragment">
+    tools:context="org.tiqr.core.enrollment.EnrollmentPinVerifyFragment">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -29,7 +29,7 @@
             app:layout_constraintTop_toBottomOf="@+id/title"
             tools:ignore="UnusedAttribute" />
 
-        <org.tiqr.authenticator.widget.PinView
+        <org.tiqr.core.widget.PinView
             android:id="@+id/pin"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_enrollment_summary.xml b/core/src/main/res/layout/fragment_enrollment_summary.xml
similarity index 98%
rename from app/src/main/res/layout/fragment_enrollment_summary.xml
rename to core/src/main/res/layout/fragment_enrollment_summary.xml
index bf65f3f6..33880777 100644
--- a/app/src/main/res/layout/fragment_enrollment_summary.xml
+++ b/core/src/main/res/layout/fragment_enrollment_summary.xml
@@ -2,7 +2,7 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".enrollment.EnrollmentSummaryFragment">
+    tools:context="org.tiqr.core.enrollment.EnrollmentSummaryFragment">
 
     <data>
 
diff --git a/app/src/main/res/layout/fragment_identity_detail.xml b/core/src/main/res/layout/fragment_identity_detail.xml
similarity index 99%
rename from app/src/main/res/layout/fragment_identity_detail.xml
rename to core/src/main/res/layout/fragment_identity_detail.xml
index 782f65cf..23f43d29 100644
--- a/app/src/main/res/layout/fragment_identity_detail.xml
+++ b/core/src/main/res/layout/fragment_identity_detail.xml
@@ -2,7 +2,7 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".identity.IdentityDetailFragment">
+    tools:context="org.tiqr.core.identity.IdentityDetailFragment">
 
     <data>
 
diff --git a/app/src/main/res/layout/fragment_identity_list.xml b/core/src/main/res/layout/fragment_identity_list.xml
similarity index 96%
rename from app/src/main/res/layout/fragment_identity_list.xml
rename to core/src/main/res/layout/fragment_identity_list.xml
index b4081418..3f6d5d1b 100644
--- a/app/src/main/res/layout/fragment_identity_list.xml
+++ b/core/src/main/res/layout/fragment_identity_list.xml
@@ -2,7 +2,7 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".identity.IdentityListFragment">
+    tools:context="org.tiqr.core.identity.IdentityListFragment">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_scan.xml b/core/src/main/res/layout/fragment_scan.xml
similarity index 91%
rename from app/src/main/res/layout/fragment_scan.xml
rename to core/src/main/res/layout/fragment_scan.xml
index 73f67a6b..5b4d4863 100644
--- a/app/src/main/res/layout/fragment_scan.xml
+++ b/core/src/main/res/layout/fragment_scan.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".scan.ScanFragment">
+    tools:context="org.tiqr.core.scan.ScanFragment">
 
     <FrameLayout
         android:layout_width="match_parent"
@@ -13,7 +13,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
-        <org.tiqr.authenticator.scan.ScanFrameOverlay
+        <org.tiqr.core.scan.ScanFrameOverlay
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
diff --git a/app/src/main/res/layout/fragment_start.xml b/core/src/main/res/layout/fragment_start.xml
similarity index 97%
rename from app/src/main/res/layout/fragment_start.xml
rename to core/src/main/res/layout/fragment_start.xml
index ff532d7c..3b87d1ac 100644
--- a/app/src/main/res/layout/fragment_start.xml
+++ b/core/src/main/res/layout/fragment_start.xml
@@ -2,7 +2,7 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".start.StartFragment">
+    tools:context="org.tiqr.core.start.StartFragment">
 
     <data>
 
diff --git a/app/src/main/res/layout/list_item_identity.xml b/core/src/main/res/layout/list_item_identity.xml
similarity index 100%
rename from app/src/main/res/layout/list_item_identity.xml
rename to core/src/main/res/layout/list_item_identity.xml
diff --git a/app/src/main/res/layout/list_item_identity_header.xml b/core/src/main/res/layout/list_item_identity_header.xml
similarity index 100%
rename from app/src/main/res/layout/list_item_identity_header.xml
rename to core/src/main/res/layout/list_item_identity_header.xml
diff --git a/app/src/main/res/layout/list_item_identity_select.xml b/core/src/main/res/layout/list_item_identity_select.xml
similarity index 100%
rename from app/src/main/res/layout/list_item_identity_select.xml
rename to core/src/main/res/layout/list_item_identity_select.xml
diff --git a/app/src/main/res/layout/view_bottombar_icon.xml b/core/src/main/res/layout/view_bottombar_icon.xml
similarity index 100%
rename from app/src/main/res/layout/view_bottombar_icon.xml
rename to core/src/main/res/layout/view_bottombar_icon.xml
diff --git a/app/src/main/res/layout/view_pin.xml b/core/src/main/res/layout/view_pin.xml
similarity index 97%
rename from app/src/main/res/layout/view_pin.xml
rename to core/src/main/res/layout/view_pin.xml
index 12868923..d689b3b5 100644
--- a/app/src/main/res/layout/view_pin.xml
+++ b/core/src/main/res/layout/view_pin.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minWidth="280dp"
-    tools:context=".widget.PinView"
+    tools:context="org.tiqr.core.widget.PinView"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
 
     <androidx.constraintlayout.helper.widget.Flow
diff --git a/app/src/main/res/menu/menu_bottombar.xml b/core/src/main/res/menu/menu_bottombar.xml
similarity index 100%
rename from app/src/main/res/menu/menu_bottombar.xml
rename to core/src/main/res/menu/menu_bottombar.xml
diff --git a/app/src/main/res/menu/menu_identity.xml b/core/src/main/res/menu/menu_identity.xml
similarity index 100%
rename from app/src/main/res/menu/menu_identity.xml
rename to core/src/main/res/menu/menu_identity.xml
diff --git a/app/src/main/res/menu/menu_identity_select.xml b/core/src/main/res/menu/menu_identity_select.xml
similarity index 100%
rename from app/src/main/res/menu/menu_identity_select.xml
rename to core/src/main/res/menu/menu_identity_select.xml
diff --git a/app/src/main/res/navigation/nav_graph.xml b/core/src/main/res/navigation/nav_graph.xml
similarity index 87%
rename from app/src/main/res/navigation/nav_graph.xml
rename to core/src/main/res/navigation/nav_graph.xml
index 3e9aa90e..042f56a0 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/core/src/main/res/navigation/nav_graph.xml
@@ -8,7 +8,7 @@
 
     <fragment
         android:id="@+id/start"
-        android:name="org.tiqr.authenticator.start.StartFragment"
+        android:name="org.tiqr.core.start.StartFragment"
         tools:layout="@layout/fragment_start">
 
         <action
@@ -28,7 +28,7 @@
 
     <fragment
         android:id="@+id/scan"
-        android:name="org.tiqr.authenticator.scan.ScanFragment"
+        android:name="org.tiqr.core.scan.ScanFragment"
         tools:layout="@layout/fragment_scan">
     </fragment>
 
@@ -54,7 +54,7 @@
 
     <fragment
         android:id="@+id/about"
-        android:name="org.tiqr.authenticator.about.AboutFragment"
+        android:name="org.tiqr.core.about.AboutFragment"
         tools:layout="@layout/fragment_about" />
 
     <navigation
@@ -63,7 +63,7 @@
 
         <fragment
             android:id="@+id/authentication_confirm"
-            android:name="org.tiqr.authenticator.authentication.AuthenticationConfirmFragment"
+            android:name="org.tiqr.core.authentication.AuthenticationConfirmFragment"
             tools:layout="@layout/fragment_authentication_confirm">
 
             <argument
@@ -92,7 +92,7 @@
 
         <dialog
             android:id="@+id/authentication_identity"
-            android:name="org.tiqr.authenticator.authentication.AuthenticationIdentityFragment"
+            android:name="org.tiqr.core.authentication.AuthenticationIdentityFragment"
             tools:layout="@layout/fragment_authentication_identity">
 
             <argument
@@ -103,7 +103,7 @@
 
         <fragment
             android:id="@+id/authentication_biometric"
-            android:name="org.tiqr.authenticator.authentication.AuthenticationBiometricFragment"
+            android:name="org.tiqr.core.authentication.AuthenticationBiometricFragment"
             tools:layout="@layout/fragment_authentication_biometric">
 
             <action
@@ -127,7 +127,7 @@
 
         <fragment
             android:id="@+id/authentication_pin"
-            android:name="org.tiqr.authenticator.authentication.AuthenticationPinFragment"
+            android:name="org.tiqr.core.authentication.AuthenticationPinFragment"
             tools:layout="@layout/fragment_authentication_pin">
 
             <action
@@ -145,7 +145,7 @@
 
         <fragment
             android:id="@+id/authentication_fallback"
-            android:name="org.tiqr.authenticator.authentication.AuthenticationFallbackFragment"
+            android:name="org.tiqr.core.authentication.AuthenticationFallbackFragment"
             tools:layout="@layout/fragment_authentication_fallback">
 
             <argument
@@ -155,7 +155,7 @@
 
         <fragment
             android:id="@+id/authentication_summary"
-            android:name="org.tiqr.authenticator.authentication.AuthenticationSummaryFragment"
+            android:name="org.tiqr.core.authentication.AuthenticationSummaryFragment"
             tools:layout="@layout/fragment_authentication_summary">
 
             <argument
@@ -173,7 +173,7 @@
 
         <fragment
             android:id="@+id/enrollment_confirm"
-            android:name="org.tiqr.authenticator.enrollment.EnrollmentConfirmFragment"
+            android:name="org.tiqr.core.enrollment.EnrollmentConfirmFragment"
             tools:layout="@layout/fragment_enrollment_confirm">
 
             <argument
@@ -189,7 +189,7 @@
 
         <fragment
             android:id="@+id/enrollment_pin"
-            android:name="org.tiqr.authenticator.enrollment.EnrollmentPinFragment"
+            android:name="org.tiqr.core.enrollment.EnrollmentPinFragment"
             tools:layout="@layout/fragment_enrollment_pin">
 
             <action
@@ -201,7 +201,7 @@
 
         <fragment
             android:id="@+id/enrollment_pin_verify"
-            android:name="org.tiqr.authenticator.enrollment.EnrollmentPinVerifyFragment"
+            android:name="org.tiqr.core.enrollment.EnrollmentPinVerifyFragment"
             tools:layout="@layout/fragment_enrollment_pin_verify">
 
             <argument
@@ -219,7 +219,7 @@
 
         <fragment
             android:id="@+id/enrollment_summary"
-            android:name="org.tiqr.authenticator.enrollment.EnrollmentSummaryFragment"
+            android:name="org.tiqr.core.enrollment.EnrollmentSummaryFragment"
             tools:layout="@layout/fragment_enrollment_summary" />
     </navigation>
 
@@ -229,7 +229,7 @@
 
         <fragment
             android:id="@+id/identity_list"
-            android:name="org.tiqr.authenticator.identity.IdentityListFragment"
+            android:name="org.tiqr.core.identity.IdentityListFragment"
             tools:layout="@layout/fragment_identity_list">
 
             <action
@@ -247,7 +247,7 @@
 
         <fragment
             android:id="@+id/identity_detail"
-            android:name="org.tiqr.authenticator.identity.IdentityDetailFragment"
+            android:name="org.tiqr.core.identity.IdentityDetailFragment"
             tools:layout="@layout/fragment_identity_detail" >
 
             <argument
diff --git a/app/src/main/res/raw/beep.ogg b/core/src/main/res/raw/beep.ogg
similarity index 100%
rename from app/src/main/res/raw/beep.ogg
rename to core/src/main/res/raw/beep.ogg
diff --git a/app/src/main/res/values-da/strings.xml b/core/src/main/res/values-da/strings.xml
similarity index 100%
rename from app/src/main/res/values-da/strings.xml
rename to core/src/main/res/values-da/strings.xml
diff --git a/app/src/main/res/values-de/strings.xml b/core/src/main/res/values-de/strings.xml
similarity index 100%
rename from app/src/main/res/values-de/strings.xml
rename to core/src/main/res/values-de/strings.xml
diff --git a/app/src/main/res/values-es/strings.xml b/core/src/main/res/values-es/strings.xml
similarity index 100%
rename from app/src/main/res/values-es/strings.xml
rename to core/src/main/res/values-es/strings.xml
diff --git a/app/src/main/res/values-fr/strings.xml b/core/src/main/res/values-fr/strings.xml
similarity index 100%
rename from app/src/main/res/values-fr/strings.xml
rename to core/src/main/res/values-fr/strings.xml
diff --git a/app/src/main/res/values-fy/strings.xml b/core/src/main/res/values-fy/strings.xml
similarity index 100%
rename from app/src/main/res/values-fy/strings.xml
rename to core/src/main/res/values-fy/strings.xml
diff --git a/app/src/main/res/values-hr/strings.xml b/core/src/main/res/values-hr/strings.xml
similarity index 100%
rename from app/src/main/res/values-hr/strings.xml
rename to core/src/main/res/values-hr/strings.xml
diff --git a/app/src/main/res/values-ja/strings.xml b/core/src/main/res/values-ja/strings.xml
similarity index 100%
rename from app/src/main/res/values-ja/strings.xml
rename to core/src/main/res/values-ja/strings.xml
diff --git a/app/src/main/res/values-lt/strings.xml b/core/src/main/res/values-lt/strings.xml
similarity index 100%
rename from app/src/main/res/values-lt/strings.xml
rename to core/src/main/res/values-lt/strings.xml
diff --git a/app/src/main/res/values-nl/strings.xml b/core/src/main/res/values-nl/strings.xml
similarity index 100%
rename from app/src/main/res/values-nl/strings.xml
rename to core/src/main/res/values-nl/strings.xml
diff --git a/app/src/main/res/values-no/strings.xml b/core/src/main/res/values-no/strings.xml
similarity index 100%
rename from app/src/main/res/values-no/strings.xml
rename to core/src/main/res/values-no/strings.xml
diff --git a/app/src/main/res/values-ro/strings.xml b/core/src/main/res/values-ro/strings.xml
similarity index 100%
rename from app/src/main/res/values-ro/strings.xml
rename to core/src/main/res/values-ro/strings.xml
diff --git a/app/src/main/res/values-sk/strings.xml b/core/src/main/res/values-sk/strings.xml
similarity index 100%
rename from app/src/main/res/values-sk/strings.xml
rename to core/src/main/res/values-sk/strings.xml
diff --git a/app/src/main/res/values-sl/strings.xml b/core/src/main/res/values-sl/strings.xml
similarity index 100%
rename from app/src/main/res/values-sl/strings.xml
rename to core/src/main/res/values-sl/strings.xml
diff --git a/app/src/main/res/values-sr/strings.xml b/core/src/main/res/values-sr/strings.xml
similarity index 100%
rename from app/src/main/res/values-sr/strings.xml
rename to core/src/main/res/values-sr/strings.xml
diff --git a/app/src/main/res/values-tr/strings.xml b/core/src/main/res/values-tr/strings.xml
similarity index 100%
rename from app/src/main/res/values-tr/strings.xml
rename to core/src/main/res/values-tr/strings.xml
diff --git a/app/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
similarity index 100%
rename from app/src/main/res/values/attrs.xml
rename to core/src/main/res/values/attrs.xml
diff --git a/app/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
similarity index 100%
rename from app/src/main/res/values/colors.xml
rename to core/src/main/res/values/colors.xml
diff --git a/app/src/main/res/values/dimens.xml b/core/src/main/res/values/dimens.xml
similarity index 100%
rename from app/src/main/res/values/dimens.xml
rename to core/src/main/res/values/dimens.xml
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
new file mode 100644
index 00000000..7f522c52
--- /dev/null
+++ b/core/src/main/res/values/strings.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:locale="en">
+    <string name="app_name" translatable="false">tiqr</string>
+
+    <!-- General buttons -->
+    <string name="button_ok">OK</string>
+    <string name="button_retry">Retry</string>
+    <string name="button_delete">Delete</string>
+    <string name="button_cancel">Cancel</string>
+
+    <!-- Main -->
+    <string name="button_info">About</string>
+    <string name="button_surfnet">Surfnet</string>
+
+    <!-- Start -->
+    <string name="start_welcome"><![CDATA[<b>Use tiqr on your smartphone to log in to websites easily and secure.</b><br/>
+    <br/>
+    Register your new tiqr account and follow the instructions for activation.<br/>
+    <br/>
+    Press <b>Scan</b> when asked.]]></string>
+    <string name="start_instructions"><![CDATA[<b>Use tiqr on your smartphone to log in</b> <br/>
+    <br/>
+    1. Press <b>Scan</b> and scan the QR-code on the website.<br/>
+    <br/>
+    <i>More than one ID? Select the relevant ID.</i> <br/>
+    <br/>
+    2. Scan your biometric or enter your PIN for tiqr and press <b>OK</b> <br/>
+    <br/>
+    3. You are logged in!]]></string>
+    <string name="start_blocked"><![CDATA[<b>Now what?</b><br/>
+    <br/>
+    Ask your identity provider(s) for a new activation code.
+    For a link to your identity provider(s) check your identities (accessible from the top right).<br/>
+    <br />
+    Together with your new activation code you will receive instructions for reactivating your account.
+    Press <b>Scan</b> if asked.]]></string>
+
+    <!-- Scan -->
+    <string name="scan_button">Scan</string>
+    <string name="scan_permission_required_title">Camera permission required</string>
+    <string name="scan_permission_required_message">For scanning a QR code, tiqr needs access to the camera.</string>
+    <string name="scan_permission_required_settings">Settings</string>
+    <string name="scan_permission_required_dismiss">Cancel</string>
+
+    <!-- Browser -->
+    <string name="browser_error_launch">Failed to launch the default browser</string>
+
+    <!-- About -->
+    <string name="about_label_version" translatable="false">%1s &#8226; v%2s</string>
+    <string name="about_label_provided_by">Provided by:</string>
+    <string name="about_label_developed_by">Developed by:</string>
+    <string name="about_label_interaction_by">Interaction design:</string>
+
+    <!-- Enroll (Confirm) -->
+    <string name="enroll_confirm_title">Confirm account activation</string>
+    <string name="enroll_confirm_subtitle">Do you want to activate the following account?</string>
+    <string name="enroll_confirm_details">Account details</string>
+    <string name="enroll_confirm_domain">You will enroll to the following domain:</string>
+
+    <!-- Enroll (PIN) -->
+    <string name="enroll_pin_title">Choose a unique PIN for tiqr</string>
+    <string name="enroll_pin_subtitle">Enter the PIN:</string>
+    <string name="enroll_pin_notice">Please remember this PIN, it cannot be changed!</string>
+
+    <!-- Enroll (PIN Verify) -->
+    <string name="enroll_pin_verify_title">Verify the unique PIN</string>
+    <string name="enroll_pin_verify_subtitle">Re-enter the PIN:</string>
+    <string name="enroll_pin_verify_no_match_title">PINs don\'t match</string>
+    <string name="enroll_pin_verify_no_match_message">The entered PINs don\'t match. Try again.\nChoose a PIN you can remember.</string>
+
+    <!-- Account -->
+    <string name="account_full_name">Full name</string>
+    <string name="account_id">Tiqr account id</string>
+    <string name="account_information">Information</string>
+    <string name="account_activated">Account activated!</string>
+    <string name="account_upgrade_biometric_title">Upgrade account</string>
+    <string name="account_upgrade_biometric_message">Do you want to use biometrics instead of PIN to log in with this account?</string>
+
+    <!-- Authentication (Confirm) -->
+    <string name="auth_confirm_title">Are you sure you want to log in?</string>
+    <string name="auth_confirm_subtitle">You will be logged in as:</string>
+    <string name="auth_confirm_to">to:</string>
+    <string name="auth_confirm_select_identity">Select identity</string>
+
+    <!-- Authentication (Biometric) -->
+    <string name="auth_biometric_title">Use your biometric</string>
+    <string name="auth_biometric_dialog_title">Do you want to use biometric to log in?</string>
+    <string name="auth_biometric_dialog_cancel">Use PIN</string>
+
+    <!-- Authentication (Pin) -->
+    <string name="auth_pin_title">Enter your PIN for tiqr</string>
+    <string name="auth_pin_subtitle">Enter the PIN and press OK:</string>
+
+    <!-- Authentication (Fallback) -->
+    <string name="auth_fallback_title">You appear to be offline</string>
+    <string name="auth_fallback_subtitle">Don\'t worry! Click the QR code on the website. You will be asked to enter the following one-time credentials:</string>
+    <string name="auth_fallback_id">Your ID is:</string>
+    <string name="auth_fallback_otp">One-time password:</string>
+    <string name="auth_fallback_pin_unverified_title">Note: your PIN has not been verified yet.</string>
+    <string name="auth_fallback_pin_unverified">If you can\'t login with the credentials above, scan again and enter the correct PIN code.</string>
+
+    <!-- Authentication (Summary) -->
+    <string name="auth_summary_title">You have successfully logged in!</string>
+    <string name="auth_summary_to">to:</string>
+
+    <!-- Identity -->
+    <string name="identity_title">Identities</string>
+    <string name="identity_blocked">Blocked</string>
+    <string name="identity_blocked_message">Warning: this account is blocked\nand needs to be reactivated.</string>
+    <string name="identity_delete_title">Are you sure?</string>
+    <string name="identity_delete_message">This account can no longer be used when deleted.</string>
+    <string name="identity_biometric_usage">Use biometrics</string>
+    <string name="identity_biometric_upgrade">Upgrade to biometrics usage</string>
+
+    <!-- Notification channel -->
+    <string name="notification_channel_name">Messages</string>
+    <string name="notification_channel_description">Notifications for messages from tiqr</string>
+</resources>
diff --git a/app/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
similarity index 100%
rename from app/src/main/res/values/styles.xml
rename to core/src/main/res/values/styles.xml
diff --git a/app/src/main/res/xml/backup_descriptor.xml b/core/src/main/res/xml/backup_descriptor.xml
similarity index 100%
rename from app/src/main/res/xml/backup_descriptor.xml
rename to core/src/main/res/xml/backup_descriptor.xml
diff --git a/app/src/main/res/xml/backup_descriptor_v31.xml b/core/src/main/res/xml/backup_descriptor_v31.xml
similarity index 100%
rename from app/src/main/res/xml/backup_descriptor_v31.xml
rename to core/src/main/res/xml/backup_descriptor_v31.xml
diff --git a/app/src/main/res/xml/network_security_config.xml b/core/src/main/res/xml/network_security_config.xml
similarity index 100%
rename from app/src/main/res/xml/network_security_config.xml
rename to core/src/main/res/xml/network_security_config.xml