diff --git a/app/build.gradle b/app/build.gradle
index 1c9be1e9dcc4bfccfb8163accd9db6c68cebb791..66f3414527e3a8e058478d06b6a84bb29bf252df 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/db/CollectionTest.kt b/app/src/androidTest/java/at/bitfire/davdroid/db/CollectionTest.kt
index addf472574510bea3ec65ebe1f4d0789248cd398..349deb20f2ab42bc38679a330a434ce141e9df06 100644
--- a/app/src/androidTest/java/at/bitfire/davdroid/db/CollectionTest.kt
+++ b/app/src/androidTest/java/at/bitfire/davdroid/db/CollectionTest.kt
@@ -6,8 +6,8 @@ package at.bitfire.davdroid.db
 
 import android.security.NetworkSecurityPolicy
 import androidx.test.filters.SmallTest
-import at.bitfire.dav4jvm.DavResource
-import at.bitfire.dav4jvm.property.ResourceType
+import foundation.e.dav4jvm.DavResource
+import foundation.e.dav4jvm.property.ResourceType
 import at.bitfire.davdroid.HttpClient
 import at.bitfire.davdroid.settings.SettingsManager
 import dagger.hilt.android.testing.HiltAndroidRule
diff --git a/app/src/androidTest/java/at/bitfire/davdroid/ui/setup/DavResourceFinderTest.kt b/app/src/androidTest/java/at/bitfire/davdroid/ui/setup/DavResourceFinderTest.kt
index 5f0546e928406c8c94fa0b9060fde339a6016e62..d9be356ad9978144c90f6266596183073efef8e2 100644
--- a/app/src/androidTest/java/at/bitfire/davdroid/ui/setup/DavResourceFinderTest.kt
+++ b/app/src/androidTest/java/at/bitfire/davdroid/ui/setup/DavResourceFinderTest.kt
@@ -7,9 +7,9 @@ package at.bitfire.davdroid.ui.setup
 import android.security.NetworkSecurityPolicy
 import androidx.test.filters.SmallTest
 import androidx.test.platform.app.InstrumentationRegistry
-import at.bitfire.dav4jvm.DavResource
-import at.bitfire.dav4jvm.property.AddressbookHomeSet
-import at.bitfire.dav4jvm.property.ResourceType
+import foundation.e.dav4jvm.DavResource
+import foundation.e.dav4jvm.property.AddressbookHomeSet
+import foundation.e.dav4jvm.property.ResourceType
 import at.bitfire.davdroid.HttpClient
 import at.bitfire.davdroid.db.Credentials
 import at.bitfire.davdroid.log.Logger
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 957d808596442ee0805a85ab42faad734f3f211a..c867faddbe9731b8c96e4c00c9cbefd82e5411e8 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">
diff --git a/app/src/main/java/at/bitfire/davdroid/DavService.kt b/app/src/main/java/at/bitfire/davdroid/DavService.kt
index eefa5c484e8e5bcb9bdfe117a48f8bc92f5b6d9b..29cf4d82f5953cc7eb801fd06e7470753d547dd6 100644
--- a/app/src/main/java/at/bitfire/davdroid/DavService.kt
+++ b/app/src/main/java/at/bitfire/davdroid/DavService.kt
@@ -15,11 +15,11 @@ import android.os.Bundle
 import androidx.annotation.WorkerThread
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
-import at.bitfire.dav4jvm.DavResource
-import at.bitfire.dav4jvm.Response
-import at.bitfire.dav4jvm.UrlUtils
-import at.bitfire.dav4jvm.exception.HttpException
-import at.bitfire.dav4jvm.property.*
+import foundation.e.dav4jvm.DavResource
+import foundation.e.dav4jvm.Response
+import foundation.e.dav4jvm.UrlUtils
+import foundation.e.dav4jvm.exception.HttpException
+import foundation.e.dav4jvm.property.*
 import at.bitfire.davdroid.db.*
 import at.bitfire.davdroid.db.Collection
 import at.bitfire.davdroid.log.Logger
diff --git a/app/src/main/java/at/bitfire/davdroid/HttpClient.kt b/app/src/main/java/at/bitfire/davdroid/HttpClient.kt
index 9e1863bcef679b0ad713fe272334e3359a92a0b0..69f6c17de4bba6f1e2a3e124d89d8e85dc56178c 100644
--- a/app/src/main/java/at/bitfire/davdroid/HttpClient.kt
+++ b/app/src/main/java/at/bitfire/davdroid/HttpClient.kt
@@ -7,9 +7,9 @@ package at.bitfire.davdroid
 import android.content.Context
 import android.os.Build
 import android.security.KeyChain
-import at.bitfire.cert4android.CustomCertManager
-import at.bitfire.dav4jvm.BasicDigestAuthHandler
-import at.bitfire.dav4jvm.UrlUtils
+import foundation.e.cert4android.CustomCertManager
+import foundation.e.dav4jvm.BasicDigestAuthHandler
+import foundation.e.dav4jvm.UrlUtils
 import at.bitfire.davdroid.db.Credentials
 import at.bitfire.davdroid.log.Logger
 import at.bitfire.davdroid.settings.AccountSettings
diff --git a/app/src/main/java/at/bitfire/davdroid/db/Collection.kt b/app/src/main/java/at/bitfire/davdroid/db/Collection.kt
index eee29ed14a87e531c9e0a466a21250aa5c7f0019..414c4d23ea233d8aac192281f2c0c1cee2237190 100644
--- a/app/src/main/java/at/bitfire/davdroid/db/Collection.kt
+++ b/app/src/main/java/at/bitfire/davdroid/db/Collection.kt
@@ -5,9 +5,10 @@
 package at.bitfire.davdroid.db
 
 import androidx.room.*
-import at.bitfire.dav4jvm.Response
-import at.bitfire.dav4jvm.UrlUtils
-import at.bitfire.dav4jvm.property.*
+import foundation.e.dav4jvm.Response
+import foundation.e.dav4jvm.UrlUtils
+import foundation.e.dav4jvm.property.*
+
 import at.bitfire.davdroid.DavUtils
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
diff --git a/app/src/main/java/at/bitfire/davdroid/db/SyncState.kt b/app/src/main/java/at/bitfire/davdroid/db/SyncState.kt
index 9c89ef7aa602f0acff1cf93f176713877bd5653e..dcdec48ddf68bbcc1cedc7a27912da4d5e9db9d1 100644
--- a/app/src/main/java/at/bitfire/davdroid/db/SyncState.kt
+++ b/app/src/main/java/at/bitfire/davdroid/db/SyncState.kt
@@ -4,7 +4,7 @@
 
 package at.bitfire.davdroid.db
 
-import at.bitfire.dav4jvm.property.SyncToken
+import foundation.e.dav4jvm.property.SyncToken
 import org.json.JSONException
 import org.json.JSONObject
 
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/LocalAddress.kt b/app/src/main/java/at/bitfire/davdroid/resource/LocalAddress.kt
index 206cba0d656cf2271e8625b4f1689db8d216556d..9117f6914c2caa1e18b46204b0d36bdaf6082e8d 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/LocalAddress.kt
+++ b/app/src/main/java/at/bitfire/davdroid/resource/LocalAddress.kt
@@ -4,7 +4,7 @@
 
 package at.bitfire.davdroid.resource
 
-import at.bitfire.vcard4android.Contact
+import foundation.e.vcard4android.Contact
 
 interface LocalAddress: LocalResource<Contact> {
 
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..84c1d02b4b7fc814b6f5d465377a82b08078d804 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/LocalAddressBook.kt
+++ b/app/src/main/java/at/bitfire/davdroid/resource/LocalAddressBook.kt
@@ -22,7 +22,7 @@ import at.bitfire.davdroid.log.Logger
 import at.bitfire.davdroid.settings.AccountSettings
 import at.bitfire.davdroid.syncadapter.AccountUtils
 import at.bitfire.davdroid.syncadapter.SyncUtils
-import at.bitfire.vcard4android.*
+import foundation.e.vcard4android.*
 import java.io.ByteArrayOutputStream
 import java.util.*
 import java.util.logging.Level
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..8965b883ae572fa277e8bcf4359027620c6490fa 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/LocalContact.kt
+++ b/app/src/main/java/at/bitfire/davdroid/resource/LocalContact.kt
@@ -13,7 +13,7 @@ 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 foundation.e.vcard4android.*
 import ezvcard.Ezvcard
 import org.apache.commons.lang3.StringUtils
 import java.io.FileNotFoundException
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..84699d65a8e29f488ace24e77b225557d7f5f5d5 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/LocalEvent.kt
+++ b/app/src/main/java/at/bitfire/davdroid/resource/LocalEvent.kt
@@ -11,8 +11,8 @@ import android.content.ContentValues
 import android.provider.CalendarContract
 import android.provider.CalendarContract.Events
 import at.bitfire.davdroid.BuildConfig
-import at.bitfire.ical4android.*
-import at.bitfire.ical4android.MiscUtils.UriHelper.asSyncAdapter
+import foundation.e.ical4android.*
+import foundation.e.ical4android.MiscUtils.UriHelper.asSyncAdapter
 import net.fortuna.ical4j.model.property.ProdId
 import org.apache.commons.lang3.StringUtils
 import java.util.*
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/LocalGroup.kt b/app/src/main/java/at/bitfire/davdroid/resource/LocalGroup.kt
index 56e555a97af0961c2c06b28e62fdad7b647a2b99..efefc1f8b84981fb106845c81780f24562e1c7a3 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/LocalGroup.kt
+++ b/app/src/main/java/at/bitfire/davdroid/resource/LocalGroup.kt
@@ -15,7 +15,9 @@ import android.provider.ContactsContract.Groups
 import android.provider.ContactsContract.RawContacts
 import android.provider.ContactsContract.RawContacts.Data
 import at.bitfire.davdroid.log.Logger
-import at.bitfire.vcard4android.*
+import foundation.e.dav4jvm.Constants
+import foundation.e.vcard4android.*
+
 import org.apache.commons.lang3.StringUtils
 import java.util.*
 
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/LocalTask.kt b/app/src/main/java/at/bitfire/davdroid/resource/LocalTask.kt
index 20632582420d7569938bf3529dabd0f668b2d0b9..c2e7116707f96165f8611551e371581e0197374e 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/LocalTask.kt
+++ b/app/src/main/java/at/bitfire/davdroid/resource/LocalTask.kt
@@ -5,7 +5,11 @@
 package at.bitfire.davdroid.resource
 
 import android.content.ContentValues
-import at.bitfire.ical4android.*
+import foundation.e.ical4android.AndroidTask
+import foundation.e.ical4android.AndroidTaskFactory
+import foundation.e.ical4android.AndroidTaskList
+import foundation.e.ical4android.Task
+
 import org.dmfs.tasks.contract.TaskContract.Tasks
 import java.util.*
 
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/LocalTaskList.kt b/app/src/main/java/at/bitfire/davdroid/resource/LocalTaskList.kt
index 20ea115a1e207f5f5a6325f04409249b5fcb8056..c691343296b5e03cabfddf12dc749335c39531a5 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/LocalTaskList.kt
+++ b/app/src/main/java/at/bitfire/davdroid/resource/LocalTaskList.kt
@@ -14,9 +14,10 @@ import at.bitfire.davdroid.DavUtils
 import at.bitfire.davdroid.db.Collection
 import at.bitfire.davdroid.db.SyncState
 import at.bitfire.davdroid.log.Logger
-import at.bitfire.ical4android.AndroidTaskList
-import at.bitfire.ical4android.AndroidTaskListFactory
-import at.bitfire.ical4android.TaskProvider
+import foundation.e.ical4android.AndroidTaskList
+import foundation.e.ical4android.AndroidTaskListFactory
+import foundation.e.ical4android.TaskProvider
+
 import org.dmfs.tasks.contract.TaskContract.TaskLists
 import org.dmfs.tasks.contract.TaskContract.Tasks
 import java.util.logging.Level
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..eb009afb55e2e8cbb4aded1425e8801d9bc0783a 100644
--- a/app/src/main/java/at/bitfire/davdroid/settings/AccountSettings.kt
+++ b/app/src/main/java/at/bitfire/davdroid/settings/AccountSettings.kt
@@ -33,13 +33,13 @@ import at.bitfire.davdroid.resource.LocalAddressBook
 import at.bitfire.davdroid.resource.LocalTask
 import at.bitfire.davdroid.resource.TaskUtils
 import at.bitfire.davdroid.syncadapter.SyncUtils
-import at.bitfire.ical4android.AndroidCalendar
-import at.bitfire.ical4android.AndroidEvent
-import at.bitfire.ical4android.TaskProvider
-import at.bitfire.ical4android.TaskProvider.ProviderName.OpenTasks
-import at.bitfire.ical4android.UnknownProperty
-import at.bitfire.vcard4android.ContactsStorageException
-import at.bitfire.vcard4android.GroupMethod
+
+import foundation.e.ical4android.AndroidCalendar
+import foundation.e.ical4android.TaskProvider
+import foundation.e.ical4android.TaskProvider.ProviderName.OpenTasks
+import foundation.e.vcard4android.ContactsStorageException
+import foundation.e.vcard4android.GroupMethod
+
 import at.techbee.jtx.JtxContract.asSyncAdapter
 import dagger.hilt.EntryPoint
 import dagger.hilt.InstallIn
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..6564f3adbf78c5d9670460a22a9b50c79487f1cf 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarSyncManager.kt
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarSyncManager.kt
@@ -8,11 +8,13 @@ import android.accounts.Account
 import android.content.Context
 import android.content.SyncResult
 import android.os.Bundle
-import at.bitfire.dav4jvm.DavCalendar
-import at.bitfire.dav4jvm.DavResponseCallback
-import at.bitfire.dav4jvm.Response
-import at.bitfire.dav4jvm.exception.DavException
-import at.bitfire.dav4jvm.property.*
+import foundation.e.dav4jvm.DavCalendar
+import foundation.e.dav4jvm.DavResource
+import foundation.e.dav4jvm.DavResponseCallback
+import foundation.e.dav4jvm.Response
+import foundation.e.dav4jvm.exception.DavException
+import foundation.e.dav4jvm.property.*
+
 import at.bitfire.davdroid.DavUtils
 import at.bitfire.davdroid.HttpClient
 import at.bitfire.davdroid.R
@@ -22,9 +24,9 @@ import at.bitfire.davdroid.resource.LocalCalendar
 import at.bitfire.davdroid.resource.LocalEvent
 import at.bitfire.davdroid.resource.LocalResource
 import at.bitfire.davdroid.settings.AccountSettings
-import at.bitfire.ical4android.DateUtils
-import at.bitfire.ical4android.Event
-import at.bitfire.ical4android.InvalidCalendarException
+import foundation.e.ical4android.Event
+import foundation.e.ical4android.InvalidCalendarException
+
 import net.fortuna.ical4j.model.Component
 import net.fortuna.ical4j.model.component.VAlarm
 import okhttp3.HttpUrl
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarsSyncAdapterService.kt b/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarsSyncAdapterService.kt
index 83633b5ba525045d54c2c6b7f2813b317da9b906..28e759c0412c83fafe421c69c81c37016e85145f 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarsSyncAdapterService.kt
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarsSyncAdapterService.kt
@@ -17,7 +17,7 @@ import at.bitfire.davdroid.db.Service
 import at.bitfire.davdroid.log.Logger
 import at.bitfire.davdroid.resource.LocalCalendar
 import at.bitfire.davdroid.settings.AccountSettings
-import at.bitfire.ical4android.AndroidCalendar
+import foundation.e.ical4android.AndroidCalendar
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import java.util.logging.Level
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..cd64d1c7f03026b8c79e06c980ea52e04e8470d0 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.kt
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.kt
@@ -11,11 +11,13 @@ import android.content.Context
 import android.content.SyncResult
 import android.os.Build
 import android.os.Bundle
-import at.bitfire.dav4jvm.DavAddressBook
-import at.bitfire.dav4jvm.DavResponseCallback
-import at.bitfire.dav4jvm.Response
-import at.bitfire.dav4jvm.exception.DavException
-import at.bitfire.dav4jvm.property.*
+import foundation.e.dav4jvm.DavAddressBook
+import foundation.e.dav4jvm.DavResource
+import foundation.e.dav4jvm.DavResponseCallback
+import foundation.e.dav4jvm.Response
+import foundation.e.dav4jvm.exception.DavException
+import foundation.e.dav4jvm.property.*
+
 import at.bitfire.davdroid.DavUtils
 import at.bitfire.davdroid.DavUtils.sameTypeAs
 import at.bitfire.davdroid.HttpClient
@@ -26,8 +28,10 @@ import at.bitfire.davdroid.resource.*
 import at.bitfire.davdroid.settings.AccountSettings
 import at.bitfire.davdroid.syncadapter.groups.CategoriesStrategy
 import at.bitfire.davdroid.syncadapter.groups.VCard4Strategy
-import at.bitfire.vcard4android.Contact
-import at.bitfire.vcard4android.GroupMethod
+import foundation.e.vcard4android.BatchOperation
+import foundation.e.vcard4android.Contact
+import foundation.e.vcard4android.GroupMethod
+
 import ezvcard.VCardVersion
 import ezvcard.io.CannotParseException
 import okhttp3.HttpUrl
@@ -67,7 +71,7 @@ import java.util.logging.Level
  *   then have to check whether the group memberships have actually changed, and if so,
  *   all affected groups have to be set to dirty. To detect changes in group memberships,
  *   DAVx5 always mirrors all [android.provider.ContactsContract.CommonDataKinds.GroupMembership]
- *   data rows in respective [at.bitfire.vcard4android.CachedGroupMembership] rows.
+ *   data rows in respective [foundation.e.vcard4android.CachedGroupMembership] rows.
  *   If the cached group memberships are not the same as the current group member ships, the
  *   difference set (in our example G, because its in the cached memberships, but not in the
  *   actual ones) is marked as dirty. This is done in [uploadDirty].
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..2256e609a3b25df4f5c6e4b1a4dda4035366856e 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.kt
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.kt
@@ -17,12 +17,12 @@ import android.provider.CalendarContract
 import android.provider.ContactsContract
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
-import at.bitfire.dav4jvm.*
-import at.bitfire.dav4jvm.exception.*
-import at.bitfire.dav4jvm.property.GetCTag
-import at.bitfire.dav4jvm.property.GetETag
-import at.bitfire.dav4jvm.property.ScheduleTag
-import at.bitfire.dav4jvm.property.SyncToken
+import foundation.e.dav4jvm.*
+import foundation.e.dav4jvm.exception.*
+import foundation.e.dav4jvm.property.GetCTag
+import foundation.e.dav4jvm.property.GetETag
+import foundation.e.dav4jvm.property.SyncToken
+
 import at.bitfire.davdroid.*
 import at.bitfire.davdroid.db.AppDatabase
 import at.bitfire.davdroid.db.SyncState
@@ -33,11 +33,10 @@ import at.bitfire.davdroid.settings.AccountSettings
 import at.bitfire.davdroid.ui.DebugInfoActivity
 import at.bitfire.davdroid.ui.NotificationUtils
 import at.bitfire.davdroid.ui.account.SettingsActivity
-import at.bitfire.ical4android.CalendarStorageException
-import at.bitfire.ical4android.Ical4Android
-import at.bitfire.ical4android.TaskProvider
-import at.bitfire.ical4android.UsesThreadContextClassLoader
-import at.bitfire.vcard4android.ContactsStorageException
+import foundation.e.ical4android.CalendarStorageException
+import foundation.e.ical4android.TaskProvider
+import foundation.e.vcard4android.ContactsStorageException
+
 import dagger.hilt.EntryPoint
 import dagger.hilt.InstallIn
 import dagger.hilt.android.EntryPointAccessors
@@ -546,7 +545,7 @@ abstract class SyncManager<ResourceType: LocalResource<*>, out CollectionType: L
                         return@listRemote
 
                     // ignore collections
-                    if (response[at.bitfire.dav4jvm.property.ResourceType::class.java]?.types?.contains(at.bitfire.dav4jvm.property.ResourceType.COLLECTION) == true)
+                    if (response[foundation.e.dav4jvm.property.ResourceType::class.java]?.types?.contains(foundation.e.dav4jvm.property.ResourceType.COLLECTION) == true)
                         return@listRemote
 
                     val name = response.hrefName()
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/TasksSyncAdapterService.kt b/app/src/main/java/at/bitfire/davdroid/syncadapter/TasksSyncAdapterService.kt
index 8b03e8035134f0e7908a924e6cf90494ff373ee6..22a0c71f228aa211d65f1602648636617acb7d77 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/TasksSyncAdapterService.kt
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/TasksSyncAdapterService.kt
@@ -18,8 +18,9 @@ import at.bitfire.davdroid.db.Service
 import at.bitfire.davdroid.log.Logger
 import at.bitfire.davdroid.resource.LocalTaskList
 import at.bitfire.davdroid.settings.AccountSettings
-import at.bitfire.ical4android.AndroidTaskList
-import at.bitfire.ical4android.TaskProvider
+import foundation.e.ical4android.AndroidTaskList
+import foundation.e.ical4android.TaskProvider
+
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import org.dmfs.tasks.contract.TaskContract
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..74c403ba6a3188a1b0f0cccb05c1d1b2a2b65f8d 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/TasksSyncManager.kt
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/TasksSyncManager.kt
@@ -8,11 +8,16 @@ import android.accounts.Account
 import android.content.Context
 import android.content.SyncResult
 import android.os.Bundle
-import at.bitfire.dav4jvm.DavCalendar
-import at.bitfire.dav4jvm.DavResponseCallback
-import at.bitfire.dav4jvm.Response
-import at.bitfire.dav4jvm.exception.DavException
-import at.bitfire.dav4jvm.property.*
+import foundation.e.dav4jvm.DavCalendar
+import foundation.e.dav4jvm.DavResource
+import foundation.e.dav4jvm.DavResponseCallback
+import foundation.e.dav4jvm.Response
+import foundation.e.dav4jvm.exception.DavException
+import foundation.e.dav4jvm.property.CalendarData
+import foundation.e.dav4jvm.property.GetCTag
+import foundation.e.dav4jvm.property.GetETag
+import foundation.e.dav4jvm.property.SyncToken
+
 import at.bitfire.davdroid.DavUtils
 import at.bitfire.davdroid.HttpClient
 import at.bitfire.davdroid.R
@@ -22,8 +27,10 @@ import at.bitfire.davdroid.resource.LocalResource
 import at.bitfire.davdroid.resource.LocalTask
 import at.bitfire.davdroid.resource.LocalTaskList
 import at.bitfire.davdroid.settings.AccountSettings
-import at.bitfire.ical4android.InvalidCalendarException
-import at.bitfire.ical4android.Task
+import foundation.e.ical4android.Constants
+import foundation.e.ical4android.InvalidCalendarException
+import foundation.e.ical4android.Task
+
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.RequestBody
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..12bad19b8aa2a5d8be061d67c8b9c9955cf46c36 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/AppSettingsActivity.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/AppSettingsActivity.kt
@@ -16,7 +16,7 @@ import androidx.annotation.UiThread
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.preference.*
-import at.bitfire.cert4android.CustomCertManager
+import foundation.e.cert4android.CustomCertManager
 import at.bitfire.davdroid.BuildConfig
 import at.bitfire.davdroid.ForegroundService
 import at.bitfire.davdroid.R
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..3b55f7b9a48a60dac249143e64675c0c4e343538 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/DebugInfoActivity.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/DebugInfoActivity.kt
@@ -31,8 +31,9 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import at.bitfire.dav4jvm.exception.DavException
-import at.bitfire.dav4jvm.exception.HttpException
+
+import foundation.e.dav4jvm.exception.DavException
+import foundation.e.dav4jvm.exception.HttpException
 import at.bitfire.davdroid.BuildConfig
 import at.bitfire.davdroid.InvalidAccountException
 import at.bitfire.davdroid.R
@@ -43,8 +44,8 @@ import at.bitfire.davdroid.log.Logger
 import at.bitfire.davdroid.resource.LocalAddressBook
 import at.bitfire.davdroid.settings.AccountSettings
 import at.bitfire.davdroid.settings.SettingsManager
-import at.bitfire.ical4android.MiscUtils.ContentProviderClientHelper.closeCompat
-import at.bitfire.ical4android.TaskProvider.ProviderName
+import foundation.e.ical4android.MiscUtils.ContentProviderClientHelper.closeCompat
+import foundation.e.ical4android.TaskProvider.ProviderName
 import at.techbee.jtx.JtxContract
 import dagger.hilt.android.AndroidEntryPoint
 import dagger.hilt.android.lifecycle.HiltViewModel
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..f7d98353382b883da8f678a14851ebf8c612cc44 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
@@ -28,7 +28,7 @@ import at.bitfire.davdroid.db.Collection
 import at.bitfire.davdroid.db.HomeSet
 import at.bitfire.davdroid.db.Service
 import at.bitfire.davdroid.ui.HomeSetAdapter
-import at.bitfire.ical4android.DateUtils
+import foundation.e.ical4android.DateUtils
 import com.jaredrummler.android.colorpicker.ColorPickerDialog
 import com.jaredrummler.android.colorpicker.ColorPickerDialogListener
 import dagger.assisted.Assisted
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..d319b546d85fca5b34c9aed49a48a2e7f7497ae5 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
@@ -13,8 +13,9 @@ import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.*
-import at.bitfire.dav4jvm.DavResource
-import at.bitfire.dav4jvm.XmlUtils
+import foundation.e.dav4jvm.DavResource
+import foundation.e.dav4jvm.XmlUtils
+
 import at.bitfire.davdroid.DavService
 import at.bitfire.davdroid.DavUtils
 import at.bitfire.davdroid.HttpClient
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..c6b885487e6dd0586038e6c7ecf51b73df707ee9 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
@@ -13,7 +13,7 @@ import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.*
-import at.bitfire.dav4jvm.DavResource
+import foundation.e.dav4jvm.DavResource
 import at.bitfire.davdroid.HttpClient
 import at.bitfire.davdroid.databinding.DeleteCollectionBinding
 import at.bitfire.davdroid.db.AppDatabase
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..0b237ca6ce6a30791c1f3496ce190e7abc9f10ad 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
@@ -36,7 +36,7 @@ import at.bitfire.davdroid.log.Logger
 import at.bitfire.davdroid.resource.LocalAddressBook
 import at.bitfire.davdroid.resource.LocalTaskList
 import at.bitfire.davdroid.settings.AccountSettings
-import at.bitfire.ical4android.TaskProvider
+import foundation.e.ical4android.TaskProvider
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import dagger.hilt.android.lifecycle.HiltViewModel
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..d596abdb75cb1832cd7bf7cc693b79611e45c187 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
@@ -36,8 +36,9 @@ import at.bitfire.davdroid.settings.AccountSettings
 import at.bitfire.davdroid.settings.SettingsManager
 import at.bitfire.davdroid.syncadapter.SyncAdapterService
 import at.bitfire.davdroid.ui.UiUtils
-import at.bitfire.ical4android.TaskProvider
-import at.bitfire.vcard4android.GroupMethod
+import foundation.e.ical4android.TaskProvider
+import foundation.e.vcard4android.GroupMethod
+
 import com.google.android.material.snackbar.Snackbar
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
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..e4b6ef2eb3ffb795886d3509728b648b46e01475 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
@@ -20,7 +20,7 @@ import androidx.core.content.ContextCompat
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.*
 import androidx.room.Transaction
-import at.bitfire.dav4jvm.UrlUtils
+import foundation.e.dav4jvm.UrlUtils
 import at.bitfire.davdroid.Constants
 import at.bitfire.davdroid.PermissionUtils
 import at.bitfire.davdroid.R
@@ -142,7 +142,7 @@ class WebcalFragment: CollectionsFragment() {
             else {
                 val snack = Snackbar.make(parent, R.string.account_no_webcal_handler_found, Snackbar.LENGTH_LONG)
 
-                val installIntent = Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=at.bitfire.icsdroid"))
+                val installIntent = Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=foundation.e.icsdroid"))
                 if (activity.packageManager.resolveActivity(installIntent, 0) != null)
                     snack.setAction(R.string.account_install_icsx5) {
                         activity.startActivityForResult(installIntent, 0)
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..2e37a4e521392d8a869748c3e267b7c35434b0a9 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
@@ -35,7 +35,9 @@ import at.bitfire.davdroid.settings.Settings
 import at.bitfire.davdroid.settings.SettingsManager
 import at.bitfire.davdroid.syncadapter.AccountUtils
 import at.bitfire.davdroid.ui.account.AccountActivity
-import at.bitfire.vcard4android.GroupMethod
+import foundation.e.ical4android.TaskProvider
+import foundation.e.vcard4android.GroupMethod
+
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import dagger.hilt.android.lifecycle.HiltViewModel
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/DavResourceFinder.kt b/app/src/main/java/at/bitfire/davdroid/ui/setup/DavResourceFinder.kt
index f4f4b7bc01d5422af27ff5f49d2c516e0c34b494..6074304790d3fac8c0ce1aadc4129b3760f4deec 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/setup/DavResourceFinder.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/DavResourceFinder.kt
@@ -4,13 +4,13 @@
 package at.bitfire.davdroid.ui.setup
 
 import android.content.Context
-import at.bitfire.dav4jvm.DavResource
-import at.bitfire.dav4jvm.Response
-import at.bitfire.dav4jvm.UrlUtils
-import at.bitfire.dav4jvm.exception.DavException
-import at.bitfire.dav4jvm.exception.HttpException
-import at.bitfire.dav4jvm.exception.UnauthorizedException
-import at.bitfire.dav4jvm.property.*
+import foundation.e.dav4jvm.DavResource
+import foundation.e.dav4jvm.Response
+import foundation.e.dav4jvm.UrlUtils
+import foundation.e.dav4jvm.exception.DavException
+import foundation.e.dav4jvm.exception.HttpException
+import foundation.e.dav4jvm.property.*
+
 import at.bitfire.davdroid.DavUtils
 import at.bitfire.davdroid.HttpClient
 import at.bitfire.davdroid.db.Collection