diff --git a/app/build.gradle b/app/build.gradle
index dace8855f73142315e4d13249220fedbd5215f2a..d918d521bec451f50483d3e66ffac11d7a56c648 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,7 +13,7 @@ android {
     buildToolsVersion '32.0.0'
 
     defaultConfig {
-        applicationId "at.bitfire.davdroid"
+        applicationId "foundation.e.accountmanager"
 
         versionCode 402020000
         versionName '4.2.2'
diff --git a/app/src/androidTest/java/at/bitfire/davdroid/resource/LocalAddressBookTest.kt b/app/src/androidTest/java/at/bitfire/davdroid/resource/LocalAddressBookTest.kt
index d8281384dcbba6a3e466a4d86ad9d3365b9e5fd0..3bd04d94d9097d21c1fa5a776dd9510183f2799c 100644
--- a/app/src/androidTest/java/at/bitfire/davdroid/resource/LocalAddressBookTest.kt
+++ b/app/src/androidTest/java/at/bitfire/davdroid/resource/LocalAddressBookTest.kt
@@ -7,7 +7,7 @@ package at.bitfire.davdroid.resource
 import android.accounts.Account
 import android.accounts.AccountManager
 import androidx.test.platform.app.InstrumentationRegistry
-import at.bitfire.davdroid.R
+import foundation.e.accountmanager.R
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
 import org.junit.After
diff --git a/app/src/androidTest/java/at/bitfire/davdroid/settings/AccountSettingsTest.kt b/app/src/androidTest/java/at/bitfire/davdroid/settings/AccountSettingsTest.kt
index 612f3899a26df368d32e1e3c91bb911cc29f5dcd..d17910d66f0b86b49330d2d76cbc385db23f899e 100644
--- a/app/src/androidTest/java/at/bitfire/davdroid/settings/AccountSettingsTest.kt
+++ b/app/src/androidTest/java/at/bitfire/davdroid/settings/AccountSettingsTest.kt
@@ -11,7 +11,7 @@ import android.os.Build
 import android.provider.CalendarContract
 import android.provider.ContactsContract
 import androidx.test.platform.app.InstrumentationRegistry
-import at.bitfire.davdroid.R
+import foundation.e.accountmanager.R
 import at.bitfire.davdroid.db.Credentials
 import at.bitfire.davdroid.syncadapter.AccountUtils
 import dagger.hilt.android.testing.HiltAndroidRule
diff --git a/app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/AccountUtilsTest.kt b/app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/AccountUtilsTest.kt
index bda06c6dc1c30a2576ad279476c4f388b816e7d7..0b255d1399d11f2e9c5f605ec9ded92d7052b1c0 100644
--- a/app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/AccountUtilsTest.kt
+++ b/app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/AccountUtilsTest.kt
@@ -8,7 +8,7 @@ import android.accounts.Account
 import android.accounts.AccountManager
 import android.os.Bundle
 import androidx.test.platform.app.InstrumentationRegistry
-import at.bitfire.davdroid.R
+import foundation.e.accountmanager.R
 import at.bitfire.davdroid.settings.SettingsManager
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
diff --git a/app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/SyncAdapterTest.kt b/app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/SyncAdapterTest.kt
index a4a7f03b150393ace17be0dd40ca7085f55501e3..ef40e7e40b04c544febc994d7394776145415984 100644
--- a/app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/SyncAdapterTest.kt
+++ b/app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/SyncAdapterTest.kt
@@ -11,7 +11,7 @@ import android.content.SyncResult
 import android.os.Bundle
 import androidx.test.platform.app.InstrumentationRegistry
 import at.bitfire.davdroid.HttpClient
-import at.bitfire.davdroid.R
+import foundation.e.accountmanager.R
 import at.bitfire.davdroid.db.AppDatabase
 import at.bitfire.davdroid.settings.SettingsManager
 import dagger.hilt.android.testing.HiltAndroidRule
diff --git a/app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/SyncManagerTest.kt b/app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/SyncManagerTest.kt
index b494110cdee3725e5ca180be7c3839a47982021b..c9026a2d303996a3e687aa92ff16a5179ee498ea 100644
--- a/app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/SyncManagerTest.kt
+++ b/app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/SyncManagerTest.kt
@@ -15,7 +15,7 @@ import at.bitfire.dav4jvm.Response
 import at.bitfire.dav4jvm.Response.HrefRelation
 import at.bitfire.dav4jvm.property.GetETag
 import at.bitfire.davdroid.HttpClient
-import at.bitfire.davdroid.R
+import foundation.e.accountmanager.R
 import at.bitfire.davdroid.db.Credentials
 import at.bitfire.davdroid.db.SyncState
 import at.bitfire.davdroid.settings.AccountSettings
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 99f49fac6d0757c45c4acfa29b39f6fc185a18a1..cdae79e680572c3c89cd2027221c54a2ee5217ea 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="at.bitfire.davdroid"
+<manifest package="foundation.e.accountmanager"
           xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           android:installLocation="internalOnly">
@@ -40,7 +40,7 @@
     <!-- ical4android declares task access permissions -->
 
     <application
-        android:name=".App"
+        android:name="at.bitfire.davdroid.App"
         android:allowBackup="false"
         android:networkSecurityConfig="@xml/network_security_config"
         android:icon="@mipmap/ic_launcher"
@@ -50,12 +50,12 @@
         tools:ignore="UnusedAttribute"
         android:supportsRtl="true">
 
-        <service android:name=".DavService"/>
-        <service android:name=".ForegroundService"/>
+        <service android:name="at.bitfire.davdroid.DavService"/>
+        <service android:name="at.bitfire.davdroid.ForegroundService"/>
 
-        <activity android:name=".ui.intro.IntroActivity" android:theme="@style/AppTheme.NoActionBar" />
+        <activity android:name="at.bitfire.davdroid.ui.intro.IntroActivity" android:theme="@style/AppTheme.NoActionBar" />
         <activity
-            android:name=".ui.AccountsActivity"
+            android:name="at.bitfire.davdroid.ui.AccountsActivity"
             android:label="@string/app_name"
             android:theme="@style/AppTheme.NoActionBar"
             android:exported="true">
@@ -66,15 +66,15 @@
         </activity>
 
         <activity
-            android:name=".ui.AboutActivity"
+            android:name="at.bitfire.davdroid.ui.AboutActivity"
             android:label="@string/navigation_drawer_about"
             android:theme="@style/AppTheme.NoActionBar"
-            android:parentActivityName=".ui.AccountsActivity"/>
+            android:parentActivityName="at.bitfire.davdroid.ui.AccountsActivity"/>
 
         <activity
-            android:name=".ui.AppSettingsActivity"
+            android:name="at.bitfire.davdroid.ui.AppSettingsActivity"
             android:label="@string/app_settings"
-            android:parentActivityName=".ui.AccountsActivity"
+            android:parentActivityName="at.bitfire.davdroid.ui.AccountsActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.APPLICATION_PREFERENCES"/>
@@ -82,8 +82,8 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".ui.DebugInfoActivity"
-            android:parentActivityName=".ui.AppSettingsActivity"
+            android:name="at.bitfire.davdroid.ui.DebugInfoActivity"
+            android:parentActivityName="at.bitfire.davdroid.ui.AppSettingsActivity"
             android:exported="true"
             android:label="@string/debug_info_title">
             <intent-filter>
@@ -92,18 +92,18 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".ui.PermissionsActivity"
+            android:name="at.bitfire.davdroid.ui.PermissionsActivity"
             android:label="@string/app_settings_security_app_permissions"
-            android:parentActivityName=".ui.AppSettingsActivity" />
+            android:parentActivityName="at.bitfire.davdroid.ui.AppSettingsActivity" />
         <activity
-            android:name=".ui.TasksActivity"
+            android:name="at.bitfire.davdroid.ui.TasksActivity"
             android:label="@string/intro_tasks_title"
-            android:parentActivityName=".ui.AppSettingsActivity" />
+            android:parentActivityName="at.bitfire.davdroid.ui.AppSettingsActivity" />
 
         <activity
-            android:name=".ui.setup.LoginActivity"
+            android:name="at.bitfire.davdroid.ui.setup.LoginActivity"
             android:label="@string/login_title"
-            android:parentActivityName=".ui.AccountsActivity"
+            android:parentActivityName="at.bitfire.davdroid.ui.AccountsActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -121,38 +121,38 @@
         </activity>
 
         <activity
-            android:name=".ui.account.AccountActivity"
-            android:parentActivityName=".ui.AccountsActivity"
+            android:name="at.bitfire.davdroid.ui.account.AccountActivity"
+            android:parentActivityName="at.bitfire.davdroid.ui.AccountsActivity"
             android:theme="@style/AppTheme.NoActionBar"/>
         <activity
-            android:name=".ui.account.CreateAddressBookActivity"
+            android:name="at.bitfire.davdroid.ui.account.CreateAddressBookActivity"
             android:label="@string/create_addressbook"
-            android:parentActivityName=".ui.account.AccountActivity" />
+            android:parentActivityName="at.bitfire.davdroid.ui.account.AccountActivity" />
         <activity
-            android:name=".ui.account.CreateCalendarActivity"
+            android:name="at.bitfire.davdroid.ui.account.CreateCalendarActivity"
             android:label="@string/create_calendar"
-            android:parentActivityName=".ui.account.AccountActivity" />
+            android:parentActivityName="at.bitfire.davdroid.ui.account.AccountActivity" />
         <activity
-            android:name=".ui.account.SettingsActivity"
-            android:parentActivityName=".ui.account.AccountActivity" />
+            android:name="at.bitfire.davdroid.ui.account.SettingsActivity"
+            android:parentActivityName="at.bitfire.davdroid.ui.account.AccountActivity" />
         <activity
-            android:name=".ui.account.WifiPermissionsActivity"
+            android:name="at.bitfire.davdroid.ui.account.WifiPermissionsActivity"
             android:label="@string/wifi_permissions_label"
-            android:parentActivityName=".ui.account.SettingsActivity" />
+            android:parentActivityName="at.bitfire.davdroid.ui.account.SettingsActivity" />
 
         <activity
-            android:name=".ui.webdav.WebdavMountsActivity"
+            android:name="at.bitfire.davdroid.ui.webdav.WebdavMountsActivity"
             android:label="@string/webdav_mounts_title"
-            android:parentActivityName=".ui.AccountsActivity"
+            android:parentActivityName="at.bitfire.davdroid.ui.AccountsActivity"
             android:exported="true" />
         <activity
-            android:name=".ui.webdav.AddWebdavMountActivity"
+            android:name="at.bitfire.davdroid.ui.webdav.AddWebdavMountActivity"
             android:label="@string/webdav_add_mount_title"
-            android:parentActivityName=".ui.webdav.WebdavMountsActivity" />
+            android:parentActivityName="at.bitfire.davdroid.ui.webdav.WebdavMountsActivity" />
 
         <!-- account type "Account manager" -->
         <service
-            android:name=".syncadapter.AccountAuthenticatorService"
+            android:name="at.bitfire.davdroid.syncadapter.AccountAuthenticatorService"
             android:exported="false">
             <intent-filter>
                 <action android:name="android.accounts.AccountAuthenticator"/>
@@ -162,7 +162,7 @@
                 android:resource="@xml/account_authenticator"/>
         </service>
         <service
-            android:name=".syncadapter.CalendarsSyncAdapterService"
+            android:name="at.bitfire.davdroid.syncadapter.CalendarsSyncAdapterService"
             android:exported="true"
             tools:ignore="ExportedService">
             <intent-filter>
@@ -173,7 +173,7 @@
                 android:resource="@xml/sync_calendars"/>
         </service>
         <service
-            android:name=".syncadapter.JtxSyncAdapterService"
+            android:name="at.bitfire.davdroid.syncadapter.JtxSyncAdapterService"
             android:exported="true"
             tools:ignore="ExportedService">
             <intent-filter>
@@ -184,7 +184,7 @@
                 android:resource="@xml/sync_notes"/>
         </service>
         <service
-            android:name=".syncadapter.OpenTasksSyncAdapterService"
+            android:name="at.bitfire.davdroid.syncadapter.OpenTasksSyncAdapterService"
             android:exported="true"
             tools:ignore="ExportedService">
             <intent-filter>
@@ -195,7 +195,7 @@
                 android:resource="@xml/sync_opentasks"/>
         </service>
         <service
-            android:name=".syncadapter.TasksOrgSyncAdapterService"
+            android:name="at.bitfire.davdroid.syncadapter.TasksOrgSyncAdapterService"
             android:exported="true"
             tools:ignore="ExportedService">
             <intent-filter>
@@ -207,7 +207,7 @@
         </service>
         <provider
             android:authorities="@string/webdav_authority"
-            android:name=".webdav.DavDocumentsProvider"
+            android:name="at.bitfire.davdroid.webdav.DavDocumentsProvider"
             android:exported="true"
             android:grantUriPermissions="true"
             android:permission="android.permission.MANAGE_DOCUMENTS">
@@ -218,7 +218,7 @@
 
         <!-- account type "Account manager Address book" -->
         <service
-            android:name=".syncadapter.AddressBookAuthenticatorService"
+            android:name="at.bitfire.davdroid.syncadapter.AddressBookAuthenticatorService"
             android:exported="true">   <!-- Since Android 11, this must be true so that Google Contacts shows the address book accounts -->
             <intent-filter>
                 <action android:name="android.accounts.AccountAuthenticator"/>
@@ -232,9 +232,9 @@
             android:authorities="@string/address_books_authority"
             android:exported="false"
             android:label="@string/address_books_authority_title"
-            android:name=".syncadapter.AddressBookProvider" />
+            android:name="at.bitfire.davdroid.syncadapter.AddressBookProvider" />
         <service
-            android:name=".syncadapter.AddressBooksSyncAdapterService"
+            android:name="at.bitfire.davdroid.syncadapter.AddressBooksSyncAdapterService"
             android:exported="true"
             tools:ignore="ExportedService">
             <intent-filter>
@@ -246,7 +246,7 @@
                 android:resource="@xml/sync_address_books"/>
         </service>
         <service
-            android:name=".syncadapter.ContactsSyncAdapterService"
+            android:name="at.bitfire.davdroid.syncadapter.ContactsSyncAdapterService"
             android:exported="true"
             tools:ignore="ExportedService">
             <intent-filter>
@@ -262,7 +262,7 @@
         </service>
 
         <receiver
-            android:name=".BootCompletedReceiver"
+            android:name="at.bitfire.davdroid.BootCompletedReceiver"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
diff --git a/app/src/main/java/at/bitfire/davdroid/App.kt b/app/src/main/java/at/bitfire/davdroid/App.kt
index c6aa1d245e1ad90f5af1b33bc968118986f2bb49..569efeb51dd0e6e64c5a0b9e564de50c95a37de2 100644
--- a/app/src/main/java/at/bitfire/davdroid/App.kt
+++ b/app/src/main/java/at/bitfire/davdroid/App.kt
@@ -18,6 +18,8 @@ import at.bitfire.davdroid.ui.DebugInfoActivity
 import at.bitfire.davdroid.ui.NotificationUtils
 import at.bitfire.davdroid.ui.UiUtils
 import dagger.hilt.android.HiltAndroidApp
+import foundation.e.accountmanager.BuildConfig
+import foundation.e.accountmanager.R
 import java.util.logging.Level
 import javax.inject.Inject
 import kotlin.concurrent.thread
diff --git a/app/src/main/java/at/bitfire/davdroid/DavService.kt b/app/src/main/java/at/bitfire/davdroid/DavService.kt
index eefa5c484e8e5bcb9bdfe117a48f8bc92f5b6d9b..beecb5687ad9d06290ee2f51d4e4109a55e28411 100644
--- a/app/src/main/java/at/bitfire/davdroid/DavService.kt
+++ b/app/src/main/java/at/bitfire/davdroid/DavService.kt
@@ -29,6 +29,7 @@ import at.bitfire.davdroid.settings.SettingsManager
 import at.bitfire.davdroid.ui.DebugInfoActivity
 import at.bitfire.davdroid.ui.NotificationUtils
 import dagger.hilt.android.AndroidEntryPoint
+import foundation.e.accountmanager.R
 import okhttp3.HttpUrl
 import okhttp3.OkHttpClient
 import java.lang.ref.WeakReference
diff --git a/app/src/main/java/at/bitfire/davdroid/DavUtils.kt b/app/src/main/java/at/bitfire/davdroid/DavUtils.kt
index db9a195bc009e298cd598e8ff8244574e726d682..4a265fe8803336c2c1e3da7958ac2033dd10fea8 100644
--- a/app/src/main/java/at/bitfire/davdroid/DavUtils.kt
+++ b/app/src/main/java/at/bitfire/davdroid/DavUtils.kt
@@ -22,7 +22,7 @@ import okhttp3.MediaType.Companion.toMediaType
 import org.xbill.DNS.*
 import java.net.InetAddress
 import java.util.*
-
+import foundation.e.accountmanager.R
 /**
  * Some WebDAV and related network utility methods
  */
diff --git a/app/src/main/java/at/bitfire/davdroid/ForegroundService.kt b/app/src/main/java/at/bitfire/davdroid/ForegroundService.kt
index b7460e95d801862eca66c8353fa96de99c07f899..25b6be2d8529a9369a017a866821ab9b2f5f8a6e 100644
--- a/app/src/main/java/at/bitfire/davdroid/ForegroundService.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ForegroundService.kt
@@ -20,6 +20,8 @@ import dagger.hilt.EntryPoint
 import dagger.hilt.InstallIn
 import dagger.hilt.android.EntryPointAccessors
 import dagger.hilt.components.SingletonComponent
+import foundation.e.accountmanager.BuildConfig
+import foundation.e.accountmanager.R
 
 class ForegroundService : Service() {
 
diff --git a/app/src/main/java/at/bitfire/davdroid/HttpClient.kt b/app/src/main/java/at/bitfire/davdroid/HttpClient.kt
index 9e1863bcef679b0ad713fe272334e3359a92a0b0..1ebf223347080c449f464bae56192cab3ab566ae 100644
--- a/app/src/main/java/at/bitfire/davdroid/HttpClient.kt
+++ b/app/src/main/java/at/bitfire/davdroid/HttpClient.kt
@@ -19,6 +19,7 @@ import dagger.hilt.EntryPoint
 import dagger.hilt.InstallIn
 import dagger.hilt.android.EntryPointAccessors
 import dagger.hilt.components.SingletonComponent
+import foundation.e.accountmanager.BuildConfig
 import okhttp3.*
 import okhttp3.brotli.BrotliInterceptor
 import okhttp3.internal.tls.OkHostnameVerifier
diff --git a/app/src/main/java/at/bitfire/davdroid/PermissionUtils.kt b/app/src/main/java/at/bitfire/davdroid/PermissionUtils.kt
index 44529956d96d63d9c721be7cf73879badd7b98ee..ce11b15ef204be7628568f92c80e724c4827d9c5 100644
--- a/app/src/main/java/at/bitfire/davdroid/PermissionUtils.kt
+++ b/app/src/main/java/at/bitfire/davdroid/PermissionUtils.kt
@@ -19,6 +19,8 @@ import androidx.core.location.LocationManagerCompat
 import at.bitfire.davdroid.log.Logger
 import at.bitfire.davdroid.ui.NotificationUtils
 import at.bitfire.davdroid.ui.PermissionsActivity
+import foundation.e.accountmanager.BuildConfig
+import foundation.e.accountmanager.R
 
 object PermissionUtils {
 
diff --git a/app/src/main/java/at/bitfire/davdroid/StorageLowReceiver.kt b/app/src/main/java/at/bitfire/davdroid/StorageLowReceiver.kt
index e6b34d662a3e9baee3aba71bf879971c93d8b915..832d8f2eacb7f61ef2543056847e6de2287894b6 100644
--- a/app/src/main/java/at/bitfire/davdroid/StorageLowReceiver.kt
+++ b/app/src/main/java/at/bitfire/davdroid/StorageLowReceiver.kt
@@ -21,6 +21,7 @@ import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import javax.inject.Singleton
+import foundation.e.accountmanager.R
 
 class StorageLowReceiver private constructor(
     val context: Context
diff --git a/app/src/main/java/at/bitfire/davdroid/db/AppDatabase.kt b/app/src/main/java/at/bitfire/davdroid/db/AppDatabase.kt
index 2ed99e26f96970406c7a01b99f944a0dcae858bf..8f204dc5b31bb9c995014f7138a354005114c579 100644
--- a/app/src/main/java/at/bitfire/davdroid/db/AppDatabase.kt
+++ b/app/src/main/java/at/bitfire/davdroid/db/AppDatabase.kt
@@ -15,7 +15,7 @@ import androidx.core.database.getStringOrNull
 import androidx.room.*
 import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
-import at.bitfire.davdroid.R
+import foundation.e.accountmanager.R
 import at.bitfire.davdroid.TextTable
 import at.bitfire.davdroid.log.Logger
 import at.bitfire.davdroid.ui.AccountsActivity
diff --git a/app/src/main/java/at/bitfire/davdroid/log/Logger.kt b/app/src/main/java/at/bitfire/davdroid/log/Logger.kt
index 444eae921adf336c2be7be99988def4c9a05359e..8b2a647e192becf7b428cb7fdb69bb77871e7682 100644
--- a/app/src/main/java/at/bitfire/davdroid/log/Logger.kt
+++ b/app/src/main/java/at/bitfire/davdroid/log/Logger.kt
@@ -14,11 +14,12 @@ import android.widget.Toast
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.preference.PreferenceManager
-import at.bitfire.davdroid.BuildConfig
-import at.bitfire.davdroid.R
+
+import foundation.e.accountmanager.R
 import at.bitfire.davdroid.ui.AppSettingsActivity
 import at.bitfire.davdroid.ui.DebugInfoActivity
 import at.bitfire.davdroid.ui.NotificationUtils
+import foundation.e.accountmanager.BuildConfig
 import java.io.File
 import java.io.IOException
 import java.util.*
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/LocalAddressBook.kt b/app/src/main/java/at/bitfire/davdroid/resource/LocalAddressBook.kt
index dfeb7e7273cd7a08ec9bc4ef114bd2c29ae15791..ce61559b1bb58e7d735194137208dcd2be7450fd 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/LocalAddressBook.kt
+++ b/app/src/main/java/at/bitfire/davdroid/resource/LocalAddressBook.kt
@@ -15,7 +15,7 @@ import android.provider.ContactsContract.Groups
 import android.provider.ContactsContract.RawContacts
 import android.util.Base64
 import at.bitfire.davdroid.DavUtils
-import at.bitfire.davdroid.R
+import foundation.e.accountmanager.R
 import at.bitfire.davdroid.db.Collection
 import at.bitfire.davdroid.db.SyncState
 import at.bitfire.davdroid.log.Logger
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/LocalContact.kt b/app/src/main/java/at/bitfire/davdroid/resource/LocalContact.kt
index a1c6afc20d1d645016ca02dbb3cef92210d0fbaf..4588c44841e142b5ee3c894a3851be9c015f233d 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/LocalContact.kt
+++ b/app/src/main/java/at/bitfire/davdroid/resource/LocalContact.kt
@@ -10,11 +10,12 @@ import android.os.RemoteException
 import android.provider.ContactsContract
 import android.provider.ContactsContract.CommonDataKinds.GroupMembership
 import android.provider.ContactsContract.RawContacts.Data
-import at.bitfire.davdroid.BuildConfig
+
 import at.bitfire.davdroid.log.Logger
 import at.bitfire.davdroid.resource.contactrow.*
 import at.bitfire.vcard4android.*
 import ezvcard.Ezvcard
+import foundation.e.accountmanager.BuildConfig
 import org.apache.commons.lang3.StringUtils
 import java.io.FileNotFoundException
 import java.util.*
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/LocalEvent.kt b/app/src/main/java/at/bitfire/davdroid/resource/LocalEvent.kt
index e5a64e0265308926bfb8c769abd9f951448bf51a..38bc04ea2628c5c033b9592c74105d7d61ae7d99 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/LocalEvent.kt
+++ b/app/src/main/java/at/bitfire/davdroid/resource/LocalEvent.kt
@@ -10,7 +10,7 @@ import android.content.ContentUris
 import android.content.ContentValues
 import android.provider.CalendarContract
 import android.provider.CalendarContract.Events
-import at.bitfire.davdroid.BuildConfig
+import foundation.e.accountmanager.BuildConfig
 import at.bitfire.ical4android.*
 import at.bitfire.ical4android.MiscUtils.UriHelper.asSyncAdapter
 import net.fortuna.ical4j.model.property.ProdId
diff --git a/app/src/main/java/at/bitfire/davdroid/settings/AccountSettings.kt b/app/src/main/java/at/bitfire/davdroid/settings/AccountSettings.kt
index 8d414c121ab07cd9c17585c76b5b4fa6f05ef8c1..f616d0cea1c96e963353e00a3afe0af3884735b5 100644
--- a/app/src/main/java/at/bitfire/davdroid/settings/AccountSettings.kt
+++ b/app/src/main/java/at/bitfire/davdroid/settings/AccountSettings.kt
@@ -22,7 +22,7 @@ import androidx.annotation.WorkerThread
 import androidx.core.content.ContextCompat
 import androidx.preference.PreferenceManager
 import at.bitfire.davdroid.InvalidAccountException
-import at.bitfire.davdroid.R
+import foundation.e.accountmanager.R
 import at.bitfire.davdroid.closeCompat
 import at.bitfire.davdroid.db.AppDatabase
 import at.bitfire.davdroid.db.Collection
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/AccountsUpdatedListener.kt b/app/src/main/java/at/bitfire/davdroid/syncadapter/AccountsUpdatedListener.kt
index 68804cb70514023f6077a67993f5f5217890d17b..039c93bbd7538a197c5ed525911de8cf8ab9ad93 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/AccountsUpdatedListener.kt
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/AccountsUpdatedListener.kt
@@ -9,7 +9,7 @@ import android.accounts.AccountManager
 import android.accounts.OnAccountsUpdateListener
 import android.content.Context
 import androidx.annotation.AnyThread
-import at.bitfire.davdroid.R
+import foundation.e.accountmanager.R
 import at.bitfire.davdroid.db.AppDatabase
 import at.bitfire.davdroid.log.Logger
 import at.bitfire.davdroid.resource.LocalAddressBook
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarSyncManager.kt b/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarSyncManager.kt
index c384005515b7185b0ab41549d1408bd1074452b2..97b87abd9a0f37ecaf83ec98a44536e08a45cce5 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarSyncManager.kt
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarSyncManager.kt
@@ -15,7 +15,7 @@ import at.bitfire.dav4jvm.exception.DavException
 import at.bitfire.dav4jvm.property.*
 import at.bitfire.davdroid.DavUtils
 import at.bitfire.davdroid.HttpClient
-import at.bitfire.davdroid.R
+import foundation.e.accountmanager.R
 import at.bitfire.davdroid.db.SyncState
 import at.bitfire.davdroid.log.Logger
 import at.bitfire.davdroid.resource.LocalCalendar
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.kt b/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.kt
index 2401a0a0d7adaf4141f13d94c961eee80d669f32..394af0862db64a44048a76dd016f1d94f3370605 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.kt
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.kt
@@ -19,7 +19,7 @@ import at.bitfire.dav4jvm.property.*
 import at.bitfire.davdroid.DavUtils
 import at.bitfire.davdroid.DavUtils.sameTypeAs
 import at.bitfire.davdroid.HttpClient
-import at.bitfire.davdroid.R
+import foundation.e.accountmanager.R
 import at.bitfire.davdroid.db.SyncState
 import at.bitfire.davdroid.log.Logger
 import at.bitfire.davdroid.resource.*
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/JtxSyncManager.kt b/app/src/main/java/at/bitfire/davdroid/syncadapter/JtxSyncManager.kt
index 5ecdc496a49c0f24181cb7b5beb2cc315d36ed1d..85898624a2f01dfdcdf0072a760232a1e690275f 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/JtxSyncManager.kt
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/JtxSyncManager.kt
@@ -15,7 +15,7 @@ import at.bitfire.dav4jvm.exception.DavException
 import at.bitfire.dav4jvm.property.*
 import at.bitfire.davdroid.DavUtils
 import at.bitfire.davdroid.HttpClient
-import at.bitfire.davdroid.R
+import foundation.e.accountmanager.R
 import at.bitfire.davdroid.db.SyncState
 import at.bitfire.davdroid.log.Logger
 import at.bitfire.davdroid.resource.LocalJtxCollection
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.kt b/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.kt
index 443f75ba77ea0a2bd5a289839c93fbf4687500ce..adbc45f30db6825d713f9594c0a1fd04ad150584 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.kt
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.kt
@@ -42,6 +42,7 @@ import dagger.hilt.EntryPoint
 import dagger.hilt.InstallIn
 import dagger.hilt.android.EntryPointAccessors
 import dagger.hilt.components.SingletonComponent
+import foundation.e.accountmanager.R
 import kotlinx.coroutines.*
 import okhttp3.HttpUrl
 import okhttp3.RequestBody
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncUtils.kt b/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncUtils.kt
index a808dd905906e5d30aac8588a635d8c946eba3a2..a327bb79e91f93e0253719bd0e0e13c60fd4a3c7 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncUtils.kt
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncUtils.kt
@@ -19,7 +19,7 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import at.bitfire.davdroid.InvalidAccountException
 import at.bitfire.davdroid.PermissionUtils
-import at.bitfire.davdroid.R
+import foundation.e.accountmanager.R
 import at.bitfire.davdroid.db.AppDatabase
 import at.bitfire.davdroid.db.Service
 import at.bitfire.davdroid.log.Logger
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/TasksSyncManager.kt b/app/src/main/java/at/bitfire/davdroid/syncadapter/TasksSyncManager.kt
index d1dbc363ea5d613e9374c1626853dc007a00564e..169966f02490b12a44521545b771a5f6c25a5cc6 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/TasksSyncManager.kt
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/TasksSyncManager.kt
@@ -15,7 +15,7 @@ import at.bitfire.dav4jvm.exception.DavException
 import at.bitfire.dav4jvm.property.*
 import at.bitfire.davdroid.DavUtils
 import at.bitfire.davdroid.HttpClient
-import at.bitfire.davdroid.R
+import foundation.e.accountmanager.R
 import at.bitfire.davdroid.db.SyncState
 import at.bitfire.davdroid.log.Logger
 import at.bitfire.davdroid.resource.LocalResource
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.kt b/app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.kt
index 036a648cdfdc7733e6d1f569a4ea722629639fd6..c1497658fb0b6afdd293f3d61d43e1a1a3d339a5 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.kt
@@ -26,12 +26,8 @@ import androidx.lifecycle.viewModelScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import at.bitfire.davdroid.App
-import at.bitfire.davdroid.BuildConfig
-import at.bitfire.davdroid.R
-import at.bitfire.davdroid.databinding.AboutBinding
-import at.bitfire.davdroid.databinding.AboutLanguagesBinding
-import at.bitfire.davdroid.databinding.AboutTranslationBinding
-import at.bitfire.davdroid.databinding.ActivityAboutBinding
+import foundation.e.accountmanager.BuildConfig
+import foundation.e.accountmanager.R
 import com.mikepenz.aboutlibraries.Libs
 import com.mikepenz.aboutlibraries.LibsBuilder
 import dagger.BindsOptionalOf
@@ -39,6 +35,10 @@ import dagger.Module
 import dagger.hilt.InstallIn
 import dagger.hilt.android.AndroidEntryPoint
 import dagger.hilt.android.components.ActivityComponent
+import foundation.e.accountmanager.databinding.AboutBinding
+import foundation.e.accountmanager.databinding.AboutLanguagesBinding
+import foundation.e.accountmanager.databinding.AboutTranslationBinding
+import foundation.e.accountmanager.databinding.ActivityAboutBinding
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.apache.commons.io.IOUtils
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/AccountListFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/AccountListFragment.kt
index a1fe1f1aeeb4b5afe55de2ee8e0546cc4d64f1cb..291c00e97172c93a369351601f50d14fc3e07e0f 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/AccountListFragment.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/AccountListFragment.kt
@@ -29,12 +29,12 @@ import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import at.bitfire.davdroid.DavUtils
 import at.bitfire.davdroid.DavUtils.SyncStatus
-import at.bitfire.davdroid.R
+import foundation.e.accountmanager.R
 import at.bitfire.davdroid.StorageLowReceiver
-import at.bitfire.davdroid.databinding.AccountListBinding
-import at.bitfire.davdroid.databinding.AccountListItemBinding
 import at.bitfire.davdroid.ui.account.AccountActivity
 import dagger.hilt.android.AndroidEntryPoint
+import foundation.e.accountmanager.databinding.AccountListBinding
+import foundation.e.accountmanager.databinding.AccountListItemBinding
 import java.text.Collator
 import javax.inject.Inject
 
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/AccountsActivity.kt b/app/src/main/java/at/bitfire/davdroid/ui/AccountsActivity.kt
index a38d1d0ad736994ff8d4d8f4656a2fe3717059c5..6012b4c9c66a3bc38fec26ea276a00a4b94f8bcd 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/AccountsActivity.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/AccountsActivity.kt
@@ -23,8 +23,8 @@ import androidx.core.view.GravityCompat
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import at.bitfire.davdroid.DavUtils
-import at.bitfire.davdroid.R
-import at.bitfire.davdroid.databinding.ActivityAccountsBinding
+import foundation.e.accountmanager.R
+
 import at.bitfire.davdroid.ui.intro.IntroActivity
 import at.bitfire.davdroid.ui.setup.LoginActivity
 import com.google.android.material.navigation.NavigationView
@@ -32,6 +32,7 @@ import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
+import foundation.e.accountmanager.databinding.ActivityAccountsBinding
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/AppSettingsActivity.kt b/app/src/main/java/at/bitfire/davdroid/ui/AppSettingsActivity.kt
index 78cdb1dda07cbb07ec4167f4b4aaebde78381923..e3aa6497f5ec5d8157de670019422498ccecdad0 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/AppSettingsActivity.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/AppSettingsActivity.kt
@@ -17,9 +17,9 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.preference.*
 import at.bitfire.cert4android.CustomCertManager
-import at.bitfire.davdroid.BuildConfig
+import foundation.e.accountmanager.BuildConfig
 import at.bitfire.davdroid.ForegroundService
-import at.bitfire.davdroid.R
+import foundation.e.accountmanager.R
 import at.bitfire.davdroid.resource.TaskUtils
 import at.bitfire.davdroid.settings.Settings
 import at.bitfire.davdroid.settings.SettingsManager
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/BaseAccountsDrawerHandler.kt b/app/src/main/java/at/bitfire/davdroid/ui/BaseAccountsDrawerHandler.kt
index fb8bb50f4dc7d12610b179d2696eb6d83120fd84..e11b5ead9129d221f7480c5d380741ceec50e3d7 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/BaseAccountsDrawerHandler.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/BaseAccountsDrawerHandler.kt
@@ -12,8 +12,8 @@ import android.view.Menu
 import android.view.MenuItem
 import android.widget.Toast
 import androidx.annotation.CallSuper
-import at.bitfire.davdroid.BuildConfig
-import at.bitfire.davdroid.R
+import foundation.e.accountmanager.BuildConfig
+import foundation.e.accountmanager.R
 
 /**
  * Default menu items control
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/DebugInfoActivity.kt b/app/src/main/java/at/bitfire/davdroid/ui/DebugInfoActivity.kt
index 8573047d7edc12db163756be1c6c951cb835583d..99ceb43c71c2cdb645cd1b69124fbd97d2f40a32 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/DebugInfoActivity.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/DebugInfoActivity.kt
@@ -33,11 +33,11 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import at.bitfire.dav4jvm.exception.DavException
 import at.bitfire.dav4jvm.exception.HttpException
-import at.bitfire.davdroid.BuildConfig
+import foundation.e.accountmanager.BuildConfig
 import at.bitfire.davdroid.InvalidAccountException
-import at.bitfire.davdroid.R
+import foundation.e.accountmanager.R
 import at.bitfire.davdroid.TextTable
-import at.bitfire.davdroid.databinding.ActivityDebugInfoBinding
+
 import at.bitfire.davdroid.db.AppDatabase
 import at.bitfire.davdroid.log.Logger
 import at.bitfire.davdroid.resource.LocalAddressBook
@@ -49,6 +49,7 @@ import at.techbee.jtx.JtxContract
 import dagger.hilt.android.AndroidEntryPoint
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
+import foundation.e.accountmanager.databinding.ActivityDebugInfoBinding
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/ExceptionInfoFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/ExceptionInfoFragment.kt
index 05df1bcf3c90743b6a7022de0689016eb8aa3a3c..1f70d8d2ff6fb667ee7e00bbe8f929115067932b 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/ExceptionInfoFragment.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/ExceptionInfoFragment.kt
@@ -9,7 +9,7 @@ import android.app.Dialog
 import android.os.Bundle
 import androidx.fragment.app.DialogFragment
 import at.bitfire.dav4jvm.exception.HttpException
-import at.bitfire.davdroid.R
+import foundation.e.accountmanager.R
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import java.io.IOException
 
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/HomeSetAdapter.kt b/app/src/main/java/at/bitfire/davdroid/ui/HomeSetAdapter.kt
index b8f50ca7374262883d0f55fe7b4cef2f853a7d73..2e25e3f9ba71a62023418a499e590e1f5bf069b1 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/HomeSetAdapter.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/HomeSetAdapter.kt
@@ -14,7 +14,7 @@ import android.widget.ArrayAdapter
 import android.widget.Filter
 import android.widget.TextView
 import at.bitfire.davdroid.DavUtils
-import at.bitfire.davdroid.R
+import foundation.e.accountmanager.R
 import at.bitfire.davdroid.db.HomeSet
 
 class HomeSetAdapter(
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/NotificationUtils.kt b/app/src/main/java/at/bitfire/davdroid/ui/NotificationUtils.kt
index 407f59a41a23635727e71c0465a68c184ae5ebc6..1b24743394bbe7b6c1fd7abee9c59994d916a090 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/NotificationUtils.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/NotificationUtils.kt
@@ -14,7 +14,7 @@ import androidx.core.app.NotificationCompat
 import androidx.core.content.getSystemService
 import androidx.core.content.res.ResourcesCompat
 import at.bitfire.davdroid.App
-import at.bitfire.davdroid.R
+import foundation.e.accountmanager.R
 
 object NotificationUtils {
 
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/OseAccountsDrawerHandler.kt b/app/src/main/java/at/bitfire/davdroid/ui/OseAccountsDrawerHandler.kt
index dd15c7bfc62ee167b288765b5ac430caf65d753f..c93c3de14f08653eac3622a37f76957ca0c38621 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/OseAccountsDrawerHandler.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/OseAccountsDrawerHandler.kt
@@ -9,7 +9,7 @@ import android.content.Intent
 import android.net.Uri
 import android.view.MenuItem
 import at.bitfire.davdroid.App
-import at.bitfire.davdroid.R
+import foundation.e.accountmanager.R
 import at.bitfire.davdroid.ui.webdav.WebdavMountsActivity
 import javax.inject.Inject
 
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/PermissionsFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/PermissionsFragment.kt
index 9a914b7ecdc0b85ac4820bc28cfcff3d03c653ba..2a74ee9fc5020cf5fd5823960c8f369e300ace05 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/PermissionsFragment.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/PermissionsFragment.kt
@@ -19,16 +19,17 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MutableLiveData
-import at.bitfire.davdroid.BuildConfig
+import foundation.e.accountmanager.BuildConfig
 import at.bitfire.davdroid.PackageChangedReceiver
 import at.bitfire.davdroid.PermissionUtils
 import at.bitfire.davdroid.PermissionUtils.CALENDAR_PERMISSIONS
 import at.bitfire.davdroid.PermissionUtils.CONTACT_PERMISSIONS
 import at.bitfire.davdroid.PermissionUtils.havePermissions
-import at.bitfire.davdroid.R
-import at.bitfire.davdroid.databinding.ActivityPermissionsBinding
+import foundation.e.accountmanager.R
+
 import at.bitfire.ical4android.TaskProvider
 import at.bitfire.ical4android.TaskProvider.ProviderName
+import foundation.e.accountmanager.databinding.ActivityPermissionsBinding
 
 class PermissionsFragment: Fragment() {
 
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/TasksFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/TasksFragment.kt
index 110152ea75b9c58c96520aa847c5ae234484c74e..57d58c46a98906cb6179fe4412bf9e56115079ff 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/TasksFragment.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/TasksFragment.kt
@@ -19,8 +19,8 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import at.bitfire.davdroid.PackageChangedReceiver
-import at.bitfire.davdroid.R
-import at.bitfire.davdroid.databinding.ActivityTasksBinding
+import foundation.e.accountmanager.R
+
 import at.bitfire.davdroid.resource.TaskUtils
 import at.bitfire.davdroid.settings.SettingsManager
 import at.bitfire.ical4android.TaskProvider.ProviderName
@@ -28,6 +28,7 @@ import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
+import foundation.e.accountmanager.databinding.ActivityTasksBinding
 import javax.inject.Inject
 
 @AndroidEntryPoint
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/UiUtils.kt b/app/src/main/java/at/bitfire/davdroid/ui/UiUtils.kt
index 1695203027c9e7f16fef135b1a8403e6c66227d0..695d2d29cbe58bae8a2fbca9bb4d8227cb24c80c 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/UiUtils.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/UiUtils.kt
@@ -15,7 +15,7 @@ import android.os.Build
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.getSystemService
-import at.bitfire.davdroid.R
+import foundation.e.accountmanager.R
 import at.bitfire.davdroid.log.Logger
 import at.bitfire.davdroid.settings.Settings
 import at.bitfire.davdroid.settings.SettingsManager
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/account/AccountActivity.kt b/app/src/main/java/at/bitfire/davdroid/ui/account/AccountActivity.kt
index 607f25afdc35e1c4a5ae4bde201203910110c3a9..fd4d08c953fee6c17c5db0e3dad7ca1659beec76 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/account/AccountActivity.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/account/AccountActivity.kt
@@ -21,8 +21,8 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentStatePagerAdapter
 import androidx.lifecycle.*
 import at.bitfire.davdroid.DavUtils
-import at.bitfire.davdroid.R
-import at.bitfire.davdroid.databinding.ActivityAccountBinding
+import foundation.e.accountmanager.R
+
 import at.bitfire.davdroid.db.AppDatabase
 import at.bitfire.davdroid.db.Collection
 import at.bitfire.davdroid.db.Service
@@ -35,6 +35,7 @@ import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import dagger.hilt.android.AndroidEntryPoint
 import dagger.hilt.android.qualifiers.ApplicationContext
+import foundation.e.accountmanager.databinding.ActivityAccountBinding
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.launch
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/account/AddressBooksFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/account/AddressBooksFragment.kt
index 4a8e2da8bc37339d370ef353777e9839bb052504..786e6f0055e6b4857ecd899691d906969289cf04 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/account/AddressBooksFragment.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/account/AddressBooksFragment.kt
@@ -8,9 +8,10 @@ import android.content.Intent
 import android.view.*
 import androidx.fragment.app.FragmentManager
 import at.bitfire.davdroid.PermissionUtils
-import at.bitfire.davdroid.R
-import at.bitfire.davdroid.databinding.AccountCarddavItemBinding
+import foundation.e.accountmanager.R
+
 import at.bitfire.davdroid.db.Collection
+import foundation.e.accountmanager.databinding.AccountCarddavItemBinding
 
 class AddressBooksFragment: CollectionsFragment() {
 
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/account/CalendarsFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/account/CalendarsFragment.kt
index a74d53a489b6496294708bca0865e908b34b93db..28659840ee3b064e3a91e902e795d57f63dc80dd 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/account/CalendarsFragment.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/account/CalendarsFragment.kt
@@ -9,10 +9,11 @@ import android.view.*
 import androidx.fragment.app.FragmentManager
 import at.bitfire.davdroid.Constants
 import at.bitfire.davdroid.PermissionUtils
-import at.bitfire.davdroid.R
-import at.bitfire.davdroid.databinding.AccountCaldavItemBinding
+import foundation.e.accountmanager.R
+
 import at.bitfire.davdroid.db.Collection
 import at.bitfire.davdroid.resource.TaskUtils
+import foundation.e.accountmanager.databinding.AccountCaldavItemBinding
 
 class CalendarsFragment: CollectionsFragment() {
 
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/account/CollectionInfoFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/account/CollectionInfoFragment.kt
index cecdf8f349b75fc44ab60abc5a1202500c4e3800..bab8d954d083b97887482eb9b8a888cf62a5d5d2 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/account/CollectionInfoFragment.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/account/CollectionInfoFragment.kt
@@ -12,12 +12,13 @@ import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
-import at.bitfire.davdroid.databinding.CollectionPropertiesBinding
+
 import at.bitfire.davdroid.db.AppDatabase
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import dagger.hilt.android.AndroidEntryPoint
+import foundation.e.accountmanager.databinding.CollectionPropertiesBinding
 import javax.inject.Inject
 
 @AndroidEntryPoint
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/account/CollectionsFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/account/CollectionsFragment.kt
index f4e197b46f34eea0d292f8fdf53a360b74a46e5b..7edd76774fd5ca9f528e769580ff2d5cb4cbf139 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/account/CollectionsFragment.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/account/CollectionsFragment.kt
@@ -25,8 +25,8 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import androidx.viewbinding.ViewBinding
 import at.bitfire.davdroid.Constants
 import at.bitfire.davdroid.DavService
-import at.bitfire.davdroid.R
-import at.bitfire.davdroid.databinding.AccountCollectionsBinding
+import foundation.e.accountmanager.R
+
 import at.bitfire.davdroid.db.AppDatabase
 import at.bitfire.davdroid.db.Collection
 import at.bitfire.davdroid.resource.LocalAddressBook
@@ -37,6 +37,7 @@ import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import dagger.hilt.android.AndroidEntryPoint
 import dagger.hilt.android.qualifiers.ApplicationContext
+import foundation.e.accountmanager.databinding.AccountCollectionsBinding
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.map
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/account/CreateAddressBookActivity.kt b/app/src/main/java/at/bitfire/davdroid/ui/account/CreateAddressBookActivity.kt
index 7611dfff1637d427a7c839b5d4189ed5a00080fa..3675303005d1ce5e284012d559f90161d46bb105 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/account/CreateAddressBookActivity.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/account/CreateAddressBookActivity.kt
@@ -18,8 +18,8 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewModelScope
-import at.bitfire.davdroid.R
-import at.bitfire.davdroid.databinding.ActivityCreateAddressBookBinding
+import foundation.e.accountmanager.R
+
 import at.bitfire.davdroid.db.AppDatabase
 import at.bitfire.davdroid.db.Collection
 import at.bitfire.davdroid.db.HomeSet
@@ -29,6 +29,7 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import dagger.hilt.android.AndroidEntryPoint
+import foundation.e.accountmanager.databinding.ActivityCreateAddressBookBinding
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.apache.commons.lang3.StringUtils
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/account/CreateCalendarActivity.kt b/app/src/main/java/at/bitfire/davdroid/ui/account/CreateCalendarActivity.kt
index 830368e85d8e13e37e1cdb778d04632e64426af4..61a6d1cdbe51bb43d46b36135a000bf608d95f14 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/account/CreateCalendarActivity.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/account/CreateCalendarActivity.kt
@@ -21,8 +21,8 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewModelScope
 import at.bitfire.davdroid.Constants
-import at.bitfire.davdroid.R
-import at.bitfire.davdroid.databinding.ActivityCreateCalendarBinding
+import foundation.e.accountmanager.R
+
 import at.bitfire.davdroid.db.AppDatabase
 import at.bitfire.davdroid.db.Collection
 import at.bitfire.davdroid.db.HomeSet
@@ -35,6 +35,7 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import dagger.hilt.android.AndroidEntryPoint
+import foundation.e.accountmanager.databinding.ActivityCreateCalendarBinding
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import net.fortuna.ical4j.model.Calendar
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/account/CreateCollectionFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/account/CreateCollectionFragment.kt
index 0414e0c61da7e89c1b41477c779d82f92480cec2..5c149577ee7869bda0963e471ecb45ed217e252b 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/account/CreateCollectionFragment.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/account/CreateCollectionFragment.kt
@@ -18,7 +18,7 @@ import at.bitfire.dav4jvm.XmlUtils
 import at.bitfire.davdroid.DavService
 import at.bitfire.davdroid.DavUtils
 import at.bitfire.davdroid.HttpClient
-import at.bitfire.davdroid.R
+import foundation.e.accountmanager.R
 import at.bitfire.davdroid.db.AppDatabase
 import at.bitfire.davdroid.db.Collection
 import at.bitfire.davdroid.log.Logger
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/account/DeleteCollectionFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/account/DeleteCollectionFragment.kt
index cfcec86c506b43f595ba2e432cec8a23103ce52b..ed7d3f784d9de6adb4e76682c66da567427f8bed 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/account/DeleteCollectionFragment.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/account/DeleteCollectionFragment.kt
@@ -15,7 +15,7 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.*
 import at.bitfire.dav4jvm.DavResource
 import at.bitfire.davdroid.HttpClient
-import at.bitfire.davdroid.databinding.DeleteCollectionBinding
+
 import at.bitfire.davdroid.db.AppDatabase
 import at.bitfire.davdroid.db.Collection
 import at.bitfire.davdroid.settings.AccountSettings
@@ -25,6 +25,7 @@ import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import dagger.hilt.android.AndroidEntryPoint
 import dagger.hilt.android.qualifiers.ApplicationContext
+import foundation.e.accountmanager.databinding.DeleteCollectionBinding
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.launch
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/account/RenameAccountFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/account/RenameAccountFragment.kt
index ca8c3985979f8108a8ca5dea728df3726810dd22..a11ce44348e3296549dd4ed6eaa7ad05ba19561a 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/account/RenameAccountFragment.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/account/RenameAccountFragment.kt
@@ -29,7 +29,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import at.bitfire.davdroid.DavUtils
 import at.bitfire.davdroid.InvalidAccountException
-import at.bitfire.davdroid.R
+import foundation.e.accountmanager.R
 import at.bitfire.davdroid.closeCompat
 import at.bitfire.davdroid.db.AppDatabase
 import at.bitfire.davdroid.log.Logger
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/account/SettingsActivity.kt b/app/src/main/java/at/bitfire/davdroid/ui/account/SettingsActivity.kt
index b4a58e02fe022d9eadafdacfefc434cbdc519986..ed2fe490e671e0cf67530887dc8c80d32c5974f4 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/account/SettingsActivity.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/account/SettingsActivity.kt
@@ -28,7 +28,7 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.preference.*
 import at.bitfire.davdroid.InvalidAccountException
 import at.bitfire.davdroid.PermissionUtils
-import at.bitfire.davdroid.R
+import foundation.e.accountmanager.R
 import at.bitfire.davdroid.db.Credentials
 import at.bitfire.davdroid.log.Logger
 import at.bitfire.davdroid.resource.TaskUtils
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/account/WebcalFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/account/WebcalFragment.kt
index b89bc0ca35e94f4af87388db72245540461b11bf..ae5c64f4714451eefd99cfed3558a8d339a7c0f8 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/account/WebcalFragment.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/account/WebcalFragment.kt
@@ -23,9 +23,9 @@ import androidx.room.Transaction
 import at.bitfire.dav4jvm.UrlUtils
 import at.bitfire.davdroid.Constants
 import at.bitfire.davdroid.PermissionUtils
-import at.bitfire.davdroid.R
+import foundation.e.accountmanager.R
 import at.bitfire.davdroid.closeCompat
-import at.bitfire.davdroid.databinding.AccountCaldavItemBinding
+
 import at.bitfire.davdroid.db.AppDatabase
 import at.bitfire.davdroid.db.Collection
 import at.bitfire.davdroid.log.Logger
@@ -35,6 +35,7 @@ import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import dagger.hilt.android.AndroidEntryPoint
 import dagger.hilt.android.qualifiers.ApplicationContext
+import foundation.e.accountmanager.databinding.AccountCaldavItemBinding
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import okhttp3.HttpUrl
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/account/WifiPermissionsActivity.kt b/app/src/main/java/at/bitfire/davdroid/ui/account/WifiPermissionsActivity.kt
index 679ce8fb3eb7f5f2a4fac45eed1d3a7ab5e5f24e..0c29d968814bd064bab2bc664c91ac2d4c4af866 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/account/WifiPermissionsActivity.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/account/WifiPermissionsActivity.kt
@@ -27,9 +27,10 @@ import androidx.core.text.HtmlCompat
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MutableLiveData
 import at.bitfire.davdroid.PermissionUtils
-import at.bitfire.davdroid.R
-import at.bitfire.davdroid.databinding.ActivityWifiPermissionsBinding
+import foundation.e.accountmanager.R
+
 import at.bitfire.davdroid.log.Logger
+import foundation.e.accountmanager.databinding.ActivityWifiPermissionsBinding
 
 class WifiPermissionsActivity: AppCompatActivity() {
 
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/intro/BatteryOptimizationsFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/intro/BatteryOptimizationsFragment.kt
index c578b2c6f380fce44375d73cdc479e92c487d9f0..1360d989c53fa208ade91f406d106aee404ee20f 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/intro/BatteryOptimizationsFragment.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/intro/BatteryOptimizationsFragment.kt
@@ -21,9 +21,9 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import at.bitfire.davdroid.App
-import at.bitfire.davdroid.BuildConfig
-import at.bitfire.davdroid.R
-import at.bitfire.davdroid.databinding.IntroBatteryOptimizationsBinding
+import foundation.e.accountmanager.BuildConfig
+import foundation.e.accountmanager.R
+
 import at.bitfire.davdroid.settings.SettingsManager
 import at.bitfire.davdroid.ui.UiUtils
 import at.bitfire.davdroid.ui.intro.BatteryOptimizationsFragment.Model.Companion.HINT_AUTOSTART_PERMISSION
@@ -36,6 +36,7 @@ import dagger.hilt.android.components.ActivityComponent
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.multibindings.IntoSet
+import foundation.e.accountmanager.databinding.IntroBatteryOptimizationsBinding
 import org.apache.commons.text.WordUtils
 import java.util.*
 import javax.inject.Inject
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/intro/IntroActivity.kt b/app/src/main/java/at/bitfire/davdroid/ui/intro/IntroActivity.kt
index bb259812c3208ba854274c2ced492bc86f5ff98f..bc9a910ae2c23672e6cb0149cf1c81e99e61d356 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/intro/IntroActivity.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/intro/IntroActivity.kt
@@ -8,7 +8,7 @@ import android.app.Activity
 import android.os.Bundle
 import androidx.core.content.res.ResourcesCompat
 import androidx.fragment.app.Fragment
-import at.bitfire.davdroid.R
+import foundation.e.accountmanager.R
 import at.bitfire.davdroid.log.Logger
 import com.github.appintro.AppIntro2
 import dagger.hilt.EntryPoint
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/intro/OpenSourceFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/intro/OpenSourceFragment.kt
index 30f01de01d61b5a1546ce6b44f2d1e14be88fc04..d04e961199080d9f8e70649e12ee90c342382dcc 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/intro/OpenSourceFragment.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/intro/OpenSourceFragment.kt
@@ -14,14 +14,15 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.ViewModel
 import at.bitfire.davdroid.App
-import at.bitfire.davdroid.R
-import at.bitfire.davdroid.databinding.IntroOpenSourceBinding
+import foundation.e.accountmanager.R
+
 import at.bitfire.davdroid.settings.SettingsManager
 import at.bitfire.davdroid.ui.UiUtils
 import at.bitfire.davdroid.ui.intro.OpenSourceFragment.Model.Companion.SETTING_NEXT_DONATION_POPUP
 import dagger.hilt.android.AndroidEntryPoint
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
+import foundation.e.accountmanager.databinding.IntroOpenSourceBinding
 import javax.inject.Inject
 
 @AndroidEntryPoint
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/intro/PermissionsIntroFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/intro/PermissionsIntroFragment.kt
index a3ec5d2faeff886e329a4cb7adbedf3894f2b01a..85b0f1b3590d20d485b668046da20ac15955c90f 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/intro/PermissionsIntroFragment.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/intro/PermissionsIntroFragment.kt
@@ -13,7 +13,7 @@ import androidx.fragment.app.Fragment
 import at.bitfire.davdroid.PermissionUtils
 import at.bitfire.davdroid.PermissionUtils.CALENDAR_PERMISSIONS
 import at.bitfire.davdroid.PermissionUtils.CONTACT_PERMISSIONS
-import at.bitfire.davdroid.R
+import foundation.e.accountmanager.R
 import at.bitfire.ical4android.TaskProvider
 import dagger.Binds
 import dagger.Module
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/intro/TasksIntroFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/intro/TasksIntroFragment.kt
index c61697fb9ea50a54248128da274569e9333b9036..ae659ea1b31ff6551acc09ef7e88701d904219f9 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/intro/TasksIntroFragment.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/intro/TasksIntroFragment.kt
@@ -12,8 +12,8 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import at.bitfire.davdroid.App
-import at.bitfire.davdroid.BuildConfig
-import at.bitfire.davdroid.R
+import foundation.e.accountmanager.BuildConfig
+import foundation.e.accountmanager.R
 import at.bitfire.davdroid.resource.TaskUtils
 import at.bitfire.davdroid.settings.SettingsManager
 import at.bitfire.davdroid.ui.TasksFragment
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/intro/WelcomeFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/intro/WelcomeFragment.kt
index 6203fe8ace7188ee2e182168aa9a9fdfcfac100d..3527fd531762f429e6e691517345baa720fe87c9 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/intro/WelcomeFragment.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/intro/WelcomeFragment.kt
@@ -10,14 +10,12 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import at.bitfire.davdroid.App
-import at.bitfire.davdroid.BuildConfig
-import at.bitfire.davdroid.databinding.IntroWelcomeBinding
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
 import dagger.hilt.android.components.ActivityComponent
 import dagger.multibindings.IntoSet
+import foundation.e.accountmanager.databinding.IntroWelcomeBinding
 import javax.inject.Inject
 
 class WelcomeFragment: Fragment() {
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt
index 074aabd3d99834b23b6109fe522527e1c95ae308..614ab209ffab66ff815763ed5f860a8e57063e99 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt
@@ -22,8 +22,8 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.*
 import at.bitfire.davdroid.DavService
 import at.bitfire.davdroid.InvalidAccountException
-import at.bitfire.davdroid.R
-import at.bitfire.davdroid.databinding.LoginAccountDetailsBinding
+import foundation.e.accountmanager.R
+
 import at.bitfire.davdroid.db.AppDatabase
 import at.bitfire.davdroid.db.Credentials
 import at.bitfire.davdroid.db.HomeSet
@@ -40,6 +40,7 @@ import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
+import foundation.e.accountmanager.databinding.LoginAccountDetailsBinding
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.launch
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/DefaultLoginCredentialsFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/setup/DefaultLoginCredentialsFragment.kt
index 445079025c282ff85b97e9a500042ca53e3c18fa..b182fce70c16a8c3b872b84d0bc9400eb8c2a811 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/setup/DefaultLoginCredentialsFragment.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/DefaultLoginCredentialsFragment.kt
@@ -16,8 +16,8 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
-import at.bitfire.davdroid.R
-import at.bitfire.davdroid.databinding.LoginCredentialsFragmentBinding
+import foundation.e.accountmanager.R
+
 import at.bitfire.davdroid.db.Credentials
 import com.google.android.material.snackbar.Snackbar
 import dagger.Binds
@@ -26,6 +26,7 @@ import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import dagger.multibindings.IntKey
 import dagger.multibindings.IntoMap
+import foundation.e.accountmanager.databinding.LoginCredentialsFragmentBinding
 import java.net.URI
 import java.net.URISyntaxException
 import javax.inject.Inject
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/DefaultLoginCredentialsModel.kt b/app/src/main/java/at/bitfire/davdroid/ui/setup/DefaultLoginCredentialsModel.kt
index 633310e9bd1c412192853467e801f9b59b9c2077..27dd2683ae4d09819a4531a5e5c0028743fe7e7a 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/setup/DefaultLoginCredentialsModel.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/DefaultLoginCredentialsModel.kt
@@ -17,7 +17,7 @@ import android.widget.RadioGroup
 import androidx.annotation.MainThread
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MutableLiveData
-import at.bitfire.davdroid.R
+import foundation.e.accountmanager.R
 import java.io.InputStreamReader
 import java.util.regex.Pattern
 
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/DetectConfigurationFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/setup/DetectConfigurationFragment.kt
index 48afdcfe5255fcd4bc00226fd37b3e19e566206c..e10e3d8b1103ddce8a6296a1092abafbfe531abb 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/setup/DetectConfigurationFragment.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/DetectConfigurationFragment.kt
@@ -17,7 +17,7 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import at.bitfire.davdroid.R
+import foundation.e.accountmanager.R
 import at.bitfire.davdroid.log.Logger
 import at.bitfire.davdroid.ui.DebugInfoActivity
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginActivity.kt b/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginActivity.kt
index 801f827297eb75c14ec9cdb4341dd31620d227ed..62a92913a712a12f266733c7f1cb944242a2e37d 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginActivity.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginActivity.kt
@@ -11,7 +11,7 @@ import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import at.bitfire.davdroid.App
-import at.bitfire.davdroid.R
+import foundation.e.accountmanager.R
 import at.bitfire.davdroid.log.Logger
 import at.bitfire.davdroid.ui.UiUtils
 import dagger.hilt.android.AndroidEntryPoint
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/NextcloudLoginFlowFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/setup/NextcloudLoginFlowFragment.kt
index 561d0d228dd635e9835c6ccc183492478b14cf63..3c7295d730fd85511f73d52f3324824bd8806749 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/setup/NextcloudLoginFlowFragment.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/NextcloudLoginFlowFragment.kt
@@ -25,7 +25,7 @@ import androidx.lifecycle.MutableLiveData
 import at.bitfire.dav4jvm.exception.DavException
 import at.bitfire.dav4jvm.exception.HttpException
 import at.bitfire.davdroid.HttpClient
-import at.bitfire.davdroid.R
+import foundation.e.accountmanager.R
 import at.bitfire.davdroid.db.Credentials
 import at.bitfire.davdroid.log.Logger
 import at.bitfire.davdroid.ui.DebugInfoActivity
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/webdav/AddWebdavMountActivity.kt b/app/src/main/java/at/bitfire/davdroid/ui/webdav/AddWebdavMountActivity.kt
index d90fc6397f6dc3f3fa539c4a9319222d250b6df9..220785df9b2d6c71e218f935af5f6acfd73e1d23 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/webdav/AddWebdavMountActivity.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/webdav/AddWebdavMountActivity.kt
@@ -19,8 +19,8 @@ import at.bitfire.dav4jvm.DavResource
 import at.bitfire.dav4jvm.UrlUtils
 import at.bitfire.davdroid.App
 import at.bitfire.davdroid.HttpClient
-import at.bitfire.davdroid.R
-import at.bitfire.davdroid.databinding.ActivityAddWebdavMountBinding
+
+
 import at.bitfire.davdroid.db.AppDatabase
 import at.bitfire.davdroid.db.Credentials
 import at.bitfire.davdroid.db.WebDavMount
@@ -32,6 +32,8 @@ import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
+import foundation.e.accountmanager.R
+import foundation.e.accountmanager.databinding.ActivityAddWebdavMountBinding
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import okhttp3.HttpUrl
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/webdav/WebdavMountsActivity.kt b/app/src/main/java/at/bitfire/davdroid/ui/webdav/WebdavMountsActivity.kt
index 149d76b94da89060f7862e9c467e0772de7d62dd..aafe01d2ea2486b5ff472dda91b2550b29fea920 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/webdav/WebdavMountsActivity.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/webdav/WebdavMountsActivity.kt
@@ -20,9 +20,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import at.bitfire.davdroid.App
-import at.bitfire.davdroid.R
-import at.bitfire.davdroid.databinding.ActivityWebdavMountsBinding
-import at.bitfire.davdroid.databinding.WebdavMountsItemBinding
+import foundation.e.accountmanager.R
 import at.bitfire.davdroid.db.AppDatabase
 import at.bitfire.davdroid.db.WebDavDocument
 import at.bitfire.davdroid.db.WebDavMount
@@ -32,6 +30,8 @@ import at.bitfire.davdroid.webdav.DavDocumentsProvider
 import dagger.hilt.android.AndroidEntryPoint
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
+import foundation.e.accountmanager.databinding.ActivityWebdavMountsBinding
+import foundation.e.accountmanager.databinding.WebdavMountsItemBinding
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.apache.commons.io.FileUtils
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/widget/CropImageView.kt b/app/src/main/java/at/bitfire/davdroid/ui/widget/CropImageView.kt
index 29e8431837ebd5bb927edaaf91eaac013ea89aea..be7ad9afc44319650051b6afe970a0700b50ad6d 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/widget/CropImageView.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/widget/CropImageView.kt
@@ -10,7 +10,7 @@ import android.graphics.RectF
 import android.util.AttributeSet
 import androidx.annotation.AttrRes
 import androidx.appcompat.widget.AppCompatImageView
-import at.bitfire.davdroid.R
+import foundation.e.accountmanager.R
 
 /**
  * [android.widget.ImageView] that supports directional cropping in both vertical and
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/DavDocumentsProvider.kt b/app/src/main/java/at/bitfire/davdroid/webdav/DavDocumentsProvider.kt
index 87b148239ca3408358ef06a661709338727e65f4..0a2f9380c75305cb711c0dc7bec54f6847700682 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/DavDocumentsProvider.kt
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/DavDocumentsProvider.kt
@@ -34,7 +34,7 @@ import at.bitfire.dav4jvm.exception.HttpException
 import at.bitfire.dav4jvm.property.*
 import at.bitfire.davdroid.HttpClient
 import at.bitfire.davdroid.MemoryCookieStore
-import at.bitfire.davdroid.R
+import foundation.e.accountmanager.R
 import at.bitfire.davdroid.db.AppDatabase
 import at.bitfire.davdroid.db.DaoTools
 import at.bitfire.davdroid.db.WebDavDocument
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/RandomAccessCallback.kt b/app/src/main/java/at/bitfire/davdroid/webdav/RandomAccessCallback.kt
index e0406f79575adbcfeb23507e213a2985c55fe6a0..9f625dd407db5646e41ffb740ca5f4e24ca94fec 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/RandomAccessCallback.kt
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/RandomAccessCallback.kt
@@ -25,6 +25,7 @@ import at.bitfire.davdroid.log.Logger
 import at.bitfire.davdroid.ui.NotificationUtils
 import at.bitfire.davdroid.webdav.cache.MemoryCache
 import at.bitfire.davdroid.webdav.cache.SegmentedCache
+import foundation.e.accountmanager.R
 import okhttp3.Headers
 import okhttp3.HttpUrl
 import okhttp3.MediaType
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/StreamingFileDescriptor.kt b/app/src/main/java/at/bitfire/davdroid/webdav/StreamingFileDescriptor.kt
index 4c91972eeb8ce5696891e0af61c96fbf3c04be9d..c2b47d6fa3cc7f0eaa65daac9e24f9e3f632278d 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/StreamingFileDescriptor.kt
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/StreamingFileDescriptor.kt
@@ -14,7 +14,7 @@ import at.bitfire.dav4jvm.DavResource
 import at.bitfire.dav4jvm.exception.HttpException
 import at.bitfire.davdroid.DavUtils
 import at.bitfire.davdroid.HttpClient
-import at.bitfire.davdroid.R
+import foundation.e.accountmanager.R
 import at.bitfire.davdroid.log.Logger
 import at.bitfire.davdroid.ui.NotificationUtils
 import okhttp3.HttpUrl
diff --git a/cert4android b/cert4android
index 7ae958dbedacf81b48e29c07b0f5073e181a843b..7814052eaf3072ad2c8ed29606cc9f18c3b7921d 160000
--- a/cert4android
+++ b/cert4android
@@ -1 +1 @@
-Subproject commit 7ae958dbedacf81b48e29c07b0f5073e181a843b
+Subproject commit 7814052eaf3072ad2c8ed29606cc9f18c3b7921d
diff --git a/ical4android b/ical4android
index 6dfe520be1795f71db2a36aa6864953d68599e72..41171b57fdc5f045b17d09df85853a6cc13ef4fd 160000
--- a/ical4android
+++ b/ical4android
@@ -1 +1 @@
-Subproject commit 6dfe520be1795f71db2a36aa6864953d68599e72
+Subproject commit 41171b57fdc5f045b17d09df85853a6cc13ef4fd