diff --git a/pgpainless-core/src/main/java/org/pgpainless/key/generation/type/eddsa/EdDSA.java b/pgpainless-core/src/main/java/org/pgpainless/key/generation/type/eddsa/EdDSA.java
deleted file mode 100644
index 2db57f57..00000000
--- a/pgpainless-core/src/main/java/org/pgpainless/key/generation/type/eddsa/EdDSA.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// SPDX-FileCopyrightText: 2020 Paul Schaub <vanitasvitae@fsfe.org>
-//
-// SPDX-License-Identifier: Apache-2.0
-
-package org.pgpainless.key.generation.type.eddsa;
-
-import java.security.spec.AlgorithmParameterSpec;
-
-import org.bouncycastle.jce.spec.ECNamedCurveGenParameterSpec;
-import org.pgpainless.algorithm.PublicKeyAlgorithm;
-import org.pgpainless.key.generation.type.KeyType;
-
-/**
- * Edwards-curve Digital Signature Algorithm (EdDSA).
- *
- * @see <a href="https://datatracker.ietf.org/doc/draft-koch-eddsa-for-openpgp/">EdDSA for OpenPGP</a>
- */
-public final class EdDSA implements KeyType {
-
-    private final EdDSACurve curve;
-
-    private EdDSA(EdDSACurve curve) {
-        this.curve = curve;
-    }
-
-    public static EdDSA fromCurve(EdDSACurve curve) {
-        return new EdDSA(curve);
-    }
-
-    @Override
-    public String getName() {
-        return "EdDSA";
-    }
-
-    @Override
-    public PublicKeyAlgorithm getAlgorithm() {
-        return PublicKeyAlgorithm.EDDSA;
-    }
-
-    @Override
-    public int getBitStrength() {
-        return curve.getBitStrength();
-    }
-
-    @Override
-    public AlgorithmParameterSpec getAlgorithmSpec() {
-        return new ECNamedCurveGenParameterSpec(curve.getName());
-    }
-
-}
diff --git a/pgpainless-core/src/main/java/org/pgpainless/key/generation/type/eddsa/package-info.java b/pgpainless-core/src/main/java/org/pgpainless/key/generation/type/eddsa/package-info.java
deleted file mode 100644
index cba16f54..00000000
--- a/pgpainless-core/src/main/java/org/pgpainless/key/generation/type/eddsa/package-info.java
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-FileCopyrightText: 2020 Paul Schaub <vanitasvitae@fsfe.org>
-//
-// SPDX-License-Identifier: Apache-2.0
-
-/**
- * Classes related to EdDSA.
- */
-package org.pgpainless.key.generation.type.eddsa;
diff --git a/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/type/eddsa/EdDSA.kt b/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/type/eddsa/EdDSA.kt
new file mode 100644
index 00000000..d1e51a8e
--- /dev/null
+++ b/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/type/eddsa/EdDSA.kt
@@ -0,0 +1,21 @@
+// SPDX-FileCopyrightText: 2023 Paul Schaub <vanitasvitae@fsfe.org>
+//
+// SPDX-License-Identifier: Apache-2.0
+
+package org.pgpainless.key.generation.type.eddsa
+
+import org.bouncycastle.jce.spec.ECNamedCurveGenParameterSpec
+import org.pgpainless.algorithm.PublicKeyAlgorithm
+import org.pgpainless.key.generation.type.KeyType
+
+class EdDSA private constructor(val curve: EdDSACurve) : KeyType {
+    override val name = "EdDSA"
+    override val algorithm = PublicKeyAlgorithm.EDDSA
+    override val bitStrength = curve.bitStrength
+    override val algorithmSpec = ECNamedCurveGenParameterSpec(curve.curveName)
+
+    companion object {
+        @JvmStatic
+        fun fromCurve(curve: EdDSACurve) = EdDSA(curve)
+    }
+}
\ No newline at end of file