diff --git a/pgpainless-core/src/main/java/org/pgpainless/key/gnu_dummy_s2k/GnuPGDummyExtension.java b/pgpainless-core/src/main/java/org/gnupg/GnuPGDummyExtension.java
similarity index 93%
rename from pgpainless-core/src/main/java/org/pgpainless/key/gnu_dummy_s2k/GnuPGDummyExtension.java
rename to pgpainless-core/src/main/java/org/gnupg/GnuPGDummyExtension.java
index 9f75bf7e..d744e222 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/key/gnu_dummy_s2k/GnuPGDummyExtension.java
+++ b/pgpainless-core/src/main/java/org/gnupg/GnuPGDummyExtension.java
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package org.pgpainless.key.gnu_dummy_s2k;
+package org.gnupg;
 
 import org.bouncycastle.bcpg.S2K;
 
diff --git a/pgpainless-core/src/main/java/org/pgpainless/key/gnu_dummy_s2k/GnuPGDummyKeyUtil.java b/pgpainless-core/src/main/java/org/gnupg/GnuPGDummyKeyUtil.java
similarity index 99%
rename from pgpainless-core/src/main/java/org/pgpainless/key/gnu_dummy_s2k/GnuPGDummyKeyUtil.java
rename to pgpainless-core/src/main/java/org/gnupg/GnuPGDummyKeyUtil.java
index 64c7ed26..983d8e68 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/key/gnu_dummy_s2k/GnuPGDummyKeyUtil.java
+++ b/pgpainless-core/src/main/java/org/gnupg/GnuPGDummyKeyUtil.java
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package org.pgpainless.key.gnu_dummy_s2k;
+package org.gnupg;
 
 import org.bouncycastle.bcpg.PublicKeyPacket;
 import org.bouncycastle.bcpg.S2K;
diff --git a/pgpainless-core/src/main/java/org/pgpainless/key/gnu_dummy_s2k/package-info.java b/pgpainless-core/src/main/java/org/gnupg/package-info.java
similarity index 81%
rename from pgpainless-core/src/main/java/org/pgpainless/key/gnu_dummy_s2k/package-info.java
rename to pgpainless-core/src/main/java/org/gnupg/package-info.java
index 5c2a727e..03268619 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/key/gnu_dummy_s2k/package-info.java
+++ b/pgpainless-core/src/main/java/org/gnupg/package-info.java
@@ -5,4 +5,4 @@
 /**
  * Utility classes related to creating keys with GNU DUMMY S2K values.
  */
-package org.pgpainless.key.gnu_dummy_s2k;
+package org.gnupg;
diff --git a/pgpainless-core/src/test/java/org/pgpainless/key/gnu_dummy_s2k/GnuPGDummyKeyUtilTest.java b/pgpainless-core/src/test/java/org/gnupg/GnuPGDummyKeyUtilTest.java
similarity index 99%
rename from pgpainless-core/src/test/java/org/pgpainless/key/gnu_dummy_s2k/GnuPGDummyKeyUtilTest.java
rename to pgpainless-core/src/test/java/org/gnupg/GnuPGDummyKeyUtilTest.java
index e175e27f..b9562f60 100644
--- a/pgpainless-core/src/test/java/org/pgpainless/key/gnu_dummy_s2k/GnuPGDummyKeyUtilTest.java
+++ b/pgpainless-core/src/test/java/org/gnupg/GnuPGDummyKeyUtilTest.java
@@ -2,12 +2,14 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package org.pgpainless.key.gnu_dummy_s2k;
+package org.gnupg;
 
 import org.bouncycastle.bcpg.S2K;
 import org.bouncycastle.bcpg.SecretKeyPacket;
 import org.bouncycastle.openpgp.PGPSecretKey;
 import org.bouncycastle.openpgp.PGPSecretKeyRing;
+import org.gnupg.GnuPGDummyExtension;
+import org.gnupg.GnuPGDummyKeyUtil;
 import org.junit.jupiter.api.Test;
 import org.pgpainless.PGPainless;
 import org.pgpainless.key.SubkeyIdentifier;
diff --git a/pgpainless-core/src/test/java/org/pgpainless/decryption_verification/TryDecryptWithUnavailableGnuDummyKeyTest.java b/pgpainless-core/src/test/java/org/pgpainless/decryption_verification/TryDecryptWithUnavailableGnuDummyKeyTest.java
index 79fa7a8e..419c529d 100644
--- a/pgpainless-core/src/test/java/org/pgpainless/decryption_verification/TryDecryptWithUnavailableGnuDummyKeyTest.java
+++ b/pgpainless-core/src/test/java/org/pgpainless/decryption_verification/TryDecryptWithUnavailableGnuDummyKeyTest.java
@@ -13,7 +13,7 @@ import org.pgpainless.PGPainless;
 import org.pgpainless.encryption_signing.EncryptionOptions;
 import org.pgpainless.encryption_signing.EncryptionStream;
 import org.pgpainless.encryption_signing.ProducerOptions;
-import org.pgpainless.key.gnu_dummy_s2k.GnuPGDummyKeyUtil;
+import org.gnupg.GnuPGDummyKeyUtil;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;