diff --git a/pgpainless-core/src/main/java/org/pgpainless/certificate_store/CertificateFactory.java b/pgpainless-cert-d/src/main/java/org/pgpainless/certificate_store/CertificateFactory.java
similarity index 100%
rename from pgpainless-core/src/main/java/org/pgpainless/certificate_store/CertificateFactory.java
rename to pgpainless-cert-d/src/main/java/org/pgpainless/certificate_store/CertificateFactory.java
diff --git a/pgpainless-core/src/main/java/org/pgpainless/certificate_store/CertificateReader.java b/pgpainless-cert-d/src/main/java/org/pgpainless/certificate_store/CertificateReader.java
similarity index 100%
rename from pgpainless-core/src/main/java/org/pgpainless/certificate_store/CertificateReader.java
rename to pgpainless-cert-d/src/main/java/org/pgpainless/certificate_store/CertificateReader.java
diff --git a/pgpainless-core/src/main/java/org/pgpainless/certificate_store/package-info.java b/pgpainless-core/src/main/java/org/pgpainless/certificate_store/package-info.java
deleted file mode 100644
index 1c6f056a..00000000
--- a/pgpainless-core/src/main/java/org/pgpainless/certificate_store/package-info.java
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-FileCopyrightText: 2022 Paul Schaub <vanitasvitae@fsfe.org>
-//
-// SPDX-License-Identifier: Apache-2.0
-
-/**
- * Implementations of the module pgp-certificate-store using pgpainless-core.
- */
-package org.pgpainless.certificate_store;