diff --git a/pgpainless-core/src/main/java/org/pgpainless/key/generation/type/ecc/ecdh/ECDH.java b/pgpainless-core/src/main/java/org/pgpainless/key/generation/type/ecc/ecdh/ECDH.java
deleted file mode 100644
index bb7e3f3c..00000000
--- a/pgpainless-core/src/main/java/org/pgpainless/key/generation/type/ecc/ecdh/ECDH.java
+++ /dev/null
@@ -1,46 +0,0 @@
-// SPDX-FileCopyrightText: 2020 Paul Schaub <vanitasvitae@fsfe.org>
-//
-// SPDX-License-Identifier: Apache-2.0
-
-package org.pgpainless.key.generation.type.ecc.ecdh;
-
-import javax.annotation.Nonnull;
-import java.security.spec.AlgorithmParameterSpec;
-
-import org.bouncycastle.jce.spec.ECNamedCurveGenParameterSpec;
-import org.pgpainless.algorithm.PublicKeyAlgorithm;
-import org.pgpainless.key.generation.type.KeyType;
-import org.pgpainless.key.generation.type.ecc.EllipticCurve;
-
-public final class ECDH implements KeyType {
-
-    private final EllipticCurve curve;
-
-    private ECDH(EllipticCurve curve) {
-        this.curve = curve;
-    }
-
-    public static ECDH fromCurve(@Nonnull EllipticCurve curve) {
-        return new ECDH(curve);
-    }
-
-    @Override
-    public String getName() {
-        return "ECDH";
-    }
-
-    @Override
-    public PublicKeyAlgorithm getAlgorithm() {
-        return PublicKeyAlgorithm.ECDH;
-    }
-
-    @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/ecc/ecdh/package-info.java b/pgpainless-core/src/main/java/org/pgpainless/key/generation/type/ecc/ecdh/package-info.java
deleted file mode 100644
index b1f2c882..00000000
--- a/pgpainless-core/src/main/java/org/pgpainless/key/generation/type/ecc/ecdh/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 ECDH.
- */
-package org.pgpainless.key.generation.type.ecc.ecdh;
diff --git a/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/type/ecc/ecdh/ECDH.kt b/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/type/ecc/ecdh/ECDH.kt
new file mode 100644
index 00000000..6bab2fcc
--- /dev/null
+++ b/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/type/ecc/ecdh/ECDH.kt
@@ -0,0 +1,22 @@
+// SPDX-FileCopyrightText: 2023 Paul Schaub <vanitasvitae@fsfe.org>
+//
+// SPDX-License-Identifier: Apache-2.0
+
+package org.pgpainless.key.generation.type.ecc.ecdh
+
+import org.bouncycastle.jce.spec.ECNamedCurveGenParameterSpec
+import org.pgpainless.algorithm.PublicKeyAlgorithm
+import org.pgpainless.key.generation.type.KeyType
+import org.pgpainless.key.generation.type.ecc.EllipticCurve
+
+class ECDH private constructor(val curve: EllipticCurve) : KeyType {
+    override val name = "ECDH"
+    override val algorithm = PublicKeyAlgorithm.ECDH
+    override val bitStrength = curve.bitStrength
+    override val algorithmSpec = ECNamedCurveGenParameterSpec(curve.curveName)
+
+    companion object {
+        @JvmStatic
+        fun fromCurve(curve: EllipticCurve) = ECDH(curve)
+    }
+}
\ No newline at end of file