all: re-do package structure yet again

31 files changed, 54 insertions, 54 deletions

diff --git a/build-logic/android-plugins/build.gradle.kts b/build-logic/android-plugins/build.gradle.kts
index c30723c7..e3ab454f 100644
--- a/build-logic/android-plugins/build.gradle.kts
+++ b/build-logic/android-plugins/build.gradle.kts
@@ -28,27 +28,27 @@ gradlePlugin {
   plugins {
     register("versioning") {
       id = "com.github.android-password-store.versioning-plugin"
-      implementationClass = "dev.msfjarvis.aps.gradle.versioning.VersioningPlugin"
+      implementationClass = "app.passwordstore.gradle.versioning.VersioningPlugin"
     }
     register("android-application") {
       id = "com.github.android-password-store.android-application"
-      implementationClass = "dev.msfjarvis.aps.gradle.ApplicationPlugin"
+      implementationClass = "app.passwordstore.gradle.ApplicationPlugin"
     }
     register("android-library") {
       id = "com.github.android-password-store.android-library"
-      implementationClass = "dev.msfjarvis.aps.gradle.LibraryPlugin"
+      implementationClass = "app.passwordstore.gradle.LibraryPlugin"
     }
     register("published-android-library") {
       id = "com.github.android-password-store.published-android-library"
-      implementationClass = "dev.msfjarvis.aps.gradle.PublishedAndroidLibraryPlugin"
+      implementationClass = "app.passwordstore.gradle.PublishedAndroidLibraryPlugin"
     }
     register("rename-artifacts") {
       id = "com.github.android-password-store.rename-artifacts"
-      implementationClass = "dev.msfjarvis.aps.gradle.RenameArtifactsPlugin"
+      implementationClass = "app.passwordstore.gradle.RenameArtifactsPlugin"
     }
     register("sentry") {
       id = "com.github.android-password-store.sentry"
-      implementationClass = "dev.msfjarvis.aps.gradle.SentryPlugin"
+      implementationClass = "app.passwordstore.gradle.SentryPlugin"
     }
   }
 }
diff --git a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/AndroidCommon.kt b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/AndroidCommon.kt
index 9cf3b9f5..b90666c9 100644
--- a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/AndroidCommon.kt
+++ b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/AndroidCommon.kt
@@ -1,7 +1,7 @@
-package dev.msfjarvis.aps.gradle
+package app.passwordstore.gradle
 
+import app.passwordstore.gradle.flavors.configureSlimTests
 import com.android.build.gradle.TestedExtension
-import dev.msfjarvis.aps.gradle.flavors.configureSlimTests
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
diff --git a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/ApplicationPlugin.kt b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/ApplicationPlugin.kt
index 79c3a4a0..bf759b3c 100644
--- a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/ApplicationPlugin.kt
+++ b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/ApplicationPlugin.kt
@@ -1,13 +1,13 @@
 @file:Suppress("UnstableApiUsage")
 
-package dev.msfjarvis.aps.gradle
+package app.passwordstore.gradle
 
+import app.passwordstore.gradle.flavors.FlavorDimensions
+import app.passwordstore.gradle.flavors.ProductFlavors
+import app.passwordstore.gradle.signing.configureBuildSigning
+import app.passwordstore.gradle.snapshot.SnapshotExtension
 import com.android.build.gradle.AppPlugin
 import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
-import dev.msfjarvis.aps.gradle.flavors.FlavorDimensions
-import dev.msfjarvis.aps.gradle.flavors.ProductFlavors
-import dev.msfjarvis.aps.gradle.signing.configureBuildSigning
-import dev.msfjarvis.aps.gradle.snapshot.SnapshotExtension
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.apply
diff --git a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/LibraryPlugin.kt b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/LibraryPlugin.kt
index 4d2c7ee3..22cc8ca3 100644
--- a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/LibraryPlugin.kt
+++ b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/LibraryPlugin.kt
@@ -1,4 +1,4 @@
-package dev.msfjarvis.aps.gradle
+package app.passwordstore.gradle
 
 import com.android.build.gradle.LibraryPlugin
 import org.gradle.api.Plugin
diff --git a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/PublishedAndroidLibraryPlugin.kt b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/PublishedAndroidLibraryPlugin.kt
index fea0c022..acbb1eb2 100644
--- a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/PublishedAndroidLibraryPlugin.kt
+++ b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/PublishedAndroidLibraryPlugin.kt
@@ -1,6 +1,6 @@
 @file:Suppress("UnstableApiUsage")
 
-package dev.msfjarvis.aps.gradle
+package app.passwordstore.gradle
 
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
 import com.vanniktech.maven.publish.MavenPublishPlugin
diff --git a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/RenameArtifactsPlugin.kt b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/RenameArtifactsPlugin.kt
index 971e3245..04eb57e3 100644
--- a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/RenameArtifactsPlugin.kt
+++ b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/RenameArtifactsPlugin.kt
@@ -1,10 +1,10 @@
-package dev.msfjarvis.aps.gradle
+package app.passwordstore.gradle
 
+import app.passwordstore.gradle.artifacts.CollectApksTask
+import app.passwordstore.gradle.artifacts.CollectBundleTask
 import com.android.build.api.artifact.SingleArtifact
 import com.android.build.api.variant.ApplicationAndroidComponentsExtension
 import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
-import dev.msfjarvis.aps.gradle.artifacts.CollectApksTask
-import dev.msfjarvis.aps.gradle.artifacts.CollectBundleTask
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.getByType
diff --git a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/SentryPlugin.kt b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/SentryPlugin.kt
index 2e5991e4..c18e1b79 100644
--- a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/SentryPlugin.kt
+++ b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/SentryPlugin.kt
@@ -1,8 +1,8 @@
-package dev.msfjarvis.aps.gradle
+package app.passwordstore.gradle
 
+import app.passwordstore.gradle.flavors.FlavorDimensions
+import app.passwordstore.gradle.flavors.ProductFlavors
 import com.android.build.api.variant.ApplicationAndroidComponentsExtension
-import dev.msfjarvis.aps.gradle.flavors.FlavorDimensions
-import dev.msfjarvis.aps.gradle.flavors.ProductFlavors
 import io.sentry.android.gradle.SentryPlugin
 import io.sentry.android.gradle.extensions.InstrumentationFeature
 import io.sentry.android.gradle.extensions.SentryPluginExtension
diff --git a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/artifacts/CollectApksTask.kt b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/artifacts/CollectApksTask.kt
index 39c95a9e..4f74136c 100644
--- a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/artifacts/CollectApksTask.kt
+++ b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/artifacts/CollectApksTask.kt
@@ -1,4 +1,4 @@
-package dev.msfjarvis.aps.gradle.artifacts
+package app.passwordstore.gradle.artifacts
 
 import com.android.build.api.variant.BuiltArtifactsLoader
 import java.nio.file.Files
diff --git a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/artifacts/CollectBundleTask.kt b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/artifacts/CollectBundleTask.kt
index c454d49f..b627a674 100644
--- a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/artifacts/CollectBundleTask.kt
+++ b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/artifacts/CollectBundleTask.kt
@@ -1,4 +1,4 @@
-package dev.msfjarvis.aps.gradle.artifacts
+package app.passwordstore.gradle.artifacts
 
 import java.nio.file.Files
 import java.nio.file.StandardCopyOption
diff --git a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/flavors/ProductFlavors.kt b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/flavors/ProductFlavors.kt
index be474bce..e4b5c739 100644
--- a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/flavors/ProductFlavors.kt
+++ b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/flavors/ProductFlavors.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package dev.msfjarvis.aps.gradle.flavors
+package app.passwordstore.gradle.flavors
 
 object FlavorDimensions {
   const val FREE = "free"
diff --git a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/flavors/SlimTests.kt b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/flavors/SlimTests.kt
index d89d0ba7..8755a872 100644
--- a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/flavors/SlimTests.kt
+++ b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/flavors/SlimTests.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package dev.msfjarvis.aps.gradle.flavors
+package app.passwordstore.gradle.flavors
 
 import com.android.build.api.variant.ApplicationAndroidComponentsExtension
 import com.android.build.api.variant.LibraryAndroidComponentsExtension
diff --git a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/signing/AppSigning.kt b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/signing/AppSigning.kt
index 8da96230..4b5c7130 100644
--- a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/signing/AppSigning.kt
+++ b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/signing/AppSigning.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package dev.msfjarvis.aps.gradle.signing
+package app.passwordstore.gradle.signing
 
 import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
 import java.util.Properties
diff --git a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/snapshot/SnapshotExtension.kt b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/snapshot/SnapshotExtension.kt
index ba6265cd..191620d1 100644
--- a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/snapshot/SnapshotExtension.kt
+++ b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/snapshot/SnapshotExtension.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package dev.msfjarvis.aps.gradle.snapshot
+package app.passwordstore.gradle.snapshot
 
 abstract class SnapshotExtension {
   abstract var snapshot: Boolean
diff --git a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/versioning/Constants.kt b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/versioning/Constants.kt
index 0d6f5c67..52746c37 100644
--- a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/versioning/Constants.kt
+++ b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/versioning/Constants.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package dev.msfjarvis.aps.gradle.versioning
+package app.passwordstore.gradle.versioning
 
 const val VERSIONING_PROP_FILE = "version.properties"
 const val VERSIONING_PROP_VERSION_NAME = "versioning-plugin.versionName"
diff --git a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/versioning/VersioningPlugin.kt b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/versioning/VersioningPlugin.kt
index 5272dd8a..5fda1a25 100644
--- a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/versioning/VersioningPlugin.kt
+++ b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/versioning/VersioningPlugin.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package dev.msfjarvis.aps.gradle.versioning
+package app.passwordstore.gradle.versioning
 
 import com.android.build.api.variant.ApplicationAndroidComponentsExtension
 import com.android.build.api.variant.VariantOutputConfiguration
diff --git a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/versioning/VersioningTask.kt b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/versioning/VersioningTask.kt
index b39fdaa4..7eb19a89 100644
--- a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/versioning/VersioningTask.kt
+++ b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/versioning/VersioningTask.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package dev.msfjarvis.aps.gradle.versioning
+package app.passwordstore.gradle.versioning
 
 import com.vdurmont.semver4j.Semver
 import org.gradle.api.DefaultTask
diff --git a/build-logic/automation-plugins/build.gradle.kts b/build-logic/automation-plugins/build.gradle.kts
index 80b53e10..795066a5 100644
--- a/build-logic/automation-plugins/build.gradle.kts
+++ b/build-logic/automation-plugins/build.gradle.kts
@@ -28,15 +28,15 @@ gradlePlugin {
   plugins {
     register("crowdin") {
       id = "com.github.android-password-store.crowdin-plugin"
-      implementationClass = "dev.msfjarvis.aps.gradle.crowdin.CrowdinDownloadPlugin"
+      implementationClass = "app.passwordstore.gradle.crowdin.CrowdinDownloadPlugin"
     }
     register("psl") {
       id = "com.github.android-password-store.psl-plugin"
-      implementationClass = "dev.msfjarvis.aps.gradle.psl.PublicSuffixListPlugin"
+      implementationClass = "app.passwordstore.gradle.psl.PublicSuffixListPlugin"
     }
     register("git-hooks") {
       id = "com.github.android-password-store.git-hooks"
-      implementationClass = "dev.msfjarvis.aps.gradle.GitHooksPlugin"
+      implementationClass = "app.passwordstore.gradle.GitHooksPlugin"
     }
   }
 }
diff --git a/build-logic/automation-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/GitHooksPlugin.kt b/build-logic/automation-plugins/src/main/kotlin/app/passwordstore/gradle/GitHooksPlugin.kt
index 3ddb656b..0b2b299c 100644
--- a/build-logic/automation-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/GitHooksPlugin.kt
+++ b/build-logic/automation-plugins/src/main/kotlin/app/passwordstore/gradle/GitHooksPlugin.kt
@@ -1,6 +1,6 @@
-package dev.msfjarvis.aps.gradle
+package app.passwordstore.gradle
 
-import dev.msfjarvis.aps.gradle.tasks.GitHooks
+import app.passwordstore.gradle.tasks.GitHooks
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.register
diff --git a/build-logic/automation-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/crowdin/CrowdinExtension.kt b/build-logic/automation-plugins/src/main/kotlin/app/passwordstore/gradle/crowdin/CrowdinExtension.kt
index 7d32dc01..3d45aebc 100644
--- a/build-logic/automation-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/crowdin/CrowdinExtension.kt
+++ b/build-logic/automation-plugins/src/main/kotlin/app/passwordstore/gradle/crowdin/CrowdinExtension.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package dev.msfjarvis.aps.gradle.crowdin
+package app.passwordstore.gradle.crowdin
 
 /** Extension for configuring [CrowdinDownloadPlugin] */
 interface CrowdinExtension {
diff --git a/build-logic/automation-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/crowdin/CrowdinPlugin.kt b/build-logic/automation-plugins/src/main/kotlin/app/passwordstore/gradle/crowdin/CrowdinPlugin.kt
index 62d8e32d..98882af5 100644
--- a/build-logic/automation-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/crowdin/CrowdinPlugin.kt
+++ b/build-logic/automation-plugins/src/main/kotlin/app/passwordstore/gradle/crowdin/CrowdinPlugin.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package dev.msfjarvis.aps.gradle.crowdin
+package app.passwordstore.gradle.crowdin
 
 import de.undercouch.gradle.tasks.download.Download
 import java.io.File
diff --git a/build-logic/automation-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/psl/PSLUpdateTask.kt b/build-logic/automation-plugins/src/main/kotlin/app/passwordstore/gradle/psl/PSLUpdateTask.kt
index 7e137b2f..c5656d6c 100644
--- a/build-logic/automation-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/psl/PSLUpdateTask.kt
+++ b/build-logic/automation-plugins/src/main/kotlin/app/passwordstore/gradle/psl/PSLUpdateTask.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package dev.msfjarvis.aps.gradle.psl
+package app.passwordstore.gradle.psl
 
 import okio.buffer
 import okio.sink
diff --git a/build-logic/automation-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/psl/PublicSuffixListPlugin.kt b/build-logic/automation-plugins/src/main/kotlin/app/passwordstore/gradle/psl/PublicSuffixListPlugin.kt
index 775ec722..825c073f 100644
--- a/build-logic/automation-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/psl/PublicSuffixListPlugin.kt
+++ b/build-logic/automation-plugins/src/main/kotlin/app/passwordstore/gradle/psl/PublicSuffixListPlugin.kt
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package dev.msfjarvis.aps.gradle.psl
+package app.passwordstore.gradle.psl
 
 import java.io.Serializable
 import java.util.TreeSet
diff --git a/build-logic/automation-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/tasks/GitHooks.kt b/build-logic/automation-plugins/src/main/kotlin/app/passwordstore/gradle/tasks/GitHooks.kt
index 1eb8540f..f563ada0 100644
--- a/build-logic/automation-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/tasks/GitHooks.kt
+++ b/build-logic/automation-plugins/src/main/kotlin/app/passwordstore/gradle/tasks/GitHooks.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package dev.msfjarvis.aps.gradle.tasks
+package app.passwordstore.gradle.tasks
 
 import java.io.File
 import java.nio.file.Files
diff --git a/build-logic/kotlin-plugins/build.gradle.kts b/build-logic/kotlin-plugins/build.gradle.kts
index 393c6c8a..d7e798b7 100644
--- a/build-logic/kotlin-plugins/build.gradle.kts
+++ b/build-logic/kotlin-plugins/build.gradle.kts
@@ -28,31 +28,31 @@ gradlePlugin {
   plugins {
     register("binary-compatibility") {
       id = "com.github.android-password-store.binary-compatibility"
-      implementationClass = "dev.msfjarvis.aps.gradle.BinaryCompatibilityPlugin"
+      implementationClass = "app.passwordstore.gradle.BinaryCompatibilityPlugin"
     }
     register("kotlin-android") {
       id = "com.github.android-password-store.kotlin-android"
-      implementationClass = "dev.msfjarvis.aps.gradle.KotlinAndroidPlugin"
+      implementationClass = "app.passwordstore.gradle.KotlinAndroidPlugin"
     }
     register("kotlin-common") {
       id = "com.github.android-password-store.kotlin-common"
-      implementationClass = "dev.msfjarvis.aps.gradle.KotlinCommonPlugin"
+      implementationClass = "app.passwordstore.gradle.KotlinCommonPlugin"
     }
     register("kotlin-kapt") {
       id = "com.github.android-password-store.kotlin-kapt"
-      implementationClass = "dev.msfjarvis.aps.gradle.KotlinKaptPlugin"
+      implementationClass = "app.passwordstore.gradle.KotlinKaptPlugin"
     }
     register("kotlin-library") {
       id = "com.github.android-password-store.kotlin-library"
-      implementationClass = "dev.msfjarvis.aps.gradle.KotlinLibraryPlugin"
+      implementationClass = "app.passwordstore.gradle.KotlinLibraryPlugin"
     }
     register("spotless") {
       id = "com.github.android-password-store.spotless"
-      implementationClass = "dev.msfjarvis.aps.gradle.SpotlessPlugin"
+      implementationClass = "app.passwordstore.gradle.SpotlessPlugin"
     }
     register("versions") {
       id = "com.github.android-password-store.versions"
-      implementationClass = "dev.msfjarvis.aps.gradle.DependencyUpdatesPlugin"
+      implementationClass = "app.passwordstore.gradle.DependencyUpdatesPlugin"
     }
   }
 }
diff --git a/build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/BinaryCompatibilityPlugin.kt b/build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/BinaryCompatibilityPlugin.kt
index 9876ec36..a64d8fb3 100644
--- a/build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/BinaryCompatibilityPlugin.kt
+++ b/build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/BinaryCompatibilityPlugin.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package dev.msfjarvis.aps.gradle
+package app.passwordstore.gradle
 
 import kotlinx.validation.ApiValidationExtension
 import kotlinx.validation.BinaryCompatibilityValidatorPlugin
diff --git a/build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/DependencyUpdatesPlugin.kt b/build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/DependencyUpdatesPlugin.kt
index e3d6e761..6dff57a1 100644
--- a/build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/DependencyUpdatesPlugin.kt
+++ b/build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/DependencyUpdatesPlugin.kt
@@ -1,4 +1,4 @@
-package dev.msfjarvis.aps.gradle
+package app.passwordstore.gradle
 
 import com.github.benmanes.gradle.versions.VersionsPlugin
 import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
diff --git a/build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/KotlinAndroidPlugin.kt b/build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/KotlinAndroidPlugin.kt
index f874c137..49f207a1 100644
--- a/build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/KotlinAndroidPlugin.kt
+++ b/build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/KotlinAndroidPlugin.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package dev.msfjarvis.aps.gradle
+package app.passwordstore.gradle
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project
diff --git a/build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/KotlinCommonPlugin.kt b/build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt
index 3fd6815a..50d67e52 100644
--- a/build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/KotlinCommonPlugin.kt
+++ b/build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package dev.msfjarvis.aps.gradle
+package app.passwordstore.gradle
 
 import org.gradle.api.JavaVersion
 import org.gradle.api.Plugin
diff --git a/build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/KotlinKaptPlugin.kt b/build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/KotlinKaptPlugin.kt
index f057fbb3..a798ec8e 100644
--- a/build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/KotlinKaptPlugin.kt
+++ b/build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/KotlinKaptPlugin.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package dev.msfjarvis.aps.gradle
+package app.passwordstore.gradle
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project
diff --git a/build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/KotlinLibraryPlugin.kt b/build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/KotlinLibraryPlugin.kt
index 7c6e1aaa..ad6ffc0b 100644
--- a/build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/KotlinLibraryPlugin.kt
+++ b/build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/KotlinLibraryPlugin.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package dev.msfjarvis.aps.gradle
+package app.passwordstore.gradle
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project
diff --git a/build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/SpotlessPlugin.kt b/build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/SpotlessPlugin.kt
index 4ef94024..76b50bf7 100644
--- a/build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/SpotlessPlugin.kt
+++ b/build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/SpotlessPlugin.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package dev.msfjarvis.aps.gradle
+package app.passwordstore.gradle
 
 import com.diffplug.gradle.spotless.SpotlessExtension
 import com.diffplug.gradle.spotless.SpotlessPlugin