diff --git a/cryptography-core/api/cryptography-core.api b/cryptography-core/api/cryptography-core.api
index d888ab2f..85c0c7eb 100644
--- a/cryptography-core/api/cryptography-core.api
+++ b/cryptography-core/api/cryptography-core.api
@@ -74,11 +74,135 @@ public abstract interface class dev/whyoleg/cryptography/CryptographyProviderCon
 public abstract interface annotation class dev/whyoleg/cryptography/DelicateCryptographyApi : java/lang/annotation/Annotation {
 }
 
+public abstract interface class dev/whyoleg/cryptography/algorithms/AES : dev/whyoleg/cryptography/CryptographyAlgorithm {
+	public abstract fun keyDecoder ()Ldev/whyoleg/cryptography/materials/key/KeyDecoder;
+	public abstract fun keyGenerator-6q1zMKY (I)Ldev/whyoleg/cryptography/materials/key/KeyGenerator;
+	public static synthetic fun keyGenerator-6q1zMKY$default (Ldev/whyoleg/cryptography/algorithms/AES;IILjava/lang/Object;)Ldev/whyoleg/cryptography/materials/key/KeyGenerator;
+	public fun keyGenerator-__FLmac (I)Ldev/whyoleg/cryptography/materials/key/KeyGenerator;
+	public static synthetic fun keyGenerator-__FLmac$default (Ldev/whyoleg/cryptography/algorithms/AES;IILjava/lang/Object;)Ldev/whyoleg/cryptography/materials/key/KeyGenerator;
+}
+
+public abstract interface class dev/whyoleg/cryptography/algorithms/AES$CBC : dev/whyoleg/cryptography/algorithms/AES {
+	public static final field Companion Ldev/whyoleg/cryptography/algorithms/AES$CBC$Companion;
+	public fun getId ()Ldev/whyoleg/cryptography/CryptographyAlgorithmId;
+}
+
+public final class dev/whyoleg/cryptography/algorithms/AES$CBC$Companion : dev/whyoleg/cryptography/CryptographyAlgorithmId {
+}
+
+public abstract interface class dev/whyoleg/cryptography/algorithms/AES$CBC$Key : dev/whyoleg/cryptography/algorithms/AES$Key {
+	public abstract fun cipher (Z)Ldev/whyoleg/cryptography/algorithms/AES$IvCipher;
+	public static synthetic fun cipher$default (Ldev/whyoleg/cryptography/algorithms/AES$CBC$Key;ZILjava/lang/Object;)Ldev/whyoleg/cryptography/algorithms/AES$IvCipher;
+}
+
+public abstract interface class dev/whyoleg/cryptography/algorithms/AES$CTR : dev/whyoleg/cryptography/algorithms/AES {
+	public static final field Companion Ldev/whyoleg/cryptography/algorithms/AES$CTR$Companion;
+	public fun getId ()Ldev/whyoleg/cryptography/CryptographyAlgorithmId;
+}
+
+public final class dev/whyoleg/cryptography/algorithms/AES$CTR$Companion : dev/whyoleg/cryptography/CryptographyAlgorithmId {
+}
+
+public abstract interface class dev/whyoleg/cryptography/algorithms/AES$CTR$Key : dev/whyoleg/cryptography/algorithms/AES$Key {
+	public abstract fun cipher ()Ldev/whyoleg/cryptography/algorithms/AES$IvCipher;
+}
+
+public abstract interface class dev/whyoleg/cryptography/algorithms/AES$ECB : dev/whyoleg/cryptography/algorithms/AES {
+	public static final field Companion Ldev/whyoleg/cryptography/algorithms/AES$ECB$Companion;
+	public fun getId ()Ldev/whyoleg/cryptography/CryptographyAlgorithmId;
+}
+
+public final class dev/whyoleg/cryptography/algorithms/AES$ECB$Companion : dev/whyoleg/cryptography/CryptographyAlgorithmId {
+}
+
+public abstract interface class dev/whyoleg/cryptography/algorithms/AES$ECB$Key : dev/whyoleg/cryptography/algorithms/AES$Key {
+	public abstract fun cipher (Z)Ldev/whyoleg/cryptography/operations/Cipher;
+	public static synthetic fun cipher$default (Ldev/whyoleg/cryptography/algorithms/AES$ECB$Key;ZILjava/lang/Object;)Ldev/whyoleg/cryptography/operations/Cipher;
+}
+
+public abstract interface class dev/whyoleg/cryptography/algorithms/AES$GCM : dev/whyoleg/cryptography/algorithms/AES {
+	public static final field Companion Ldev/whyoleg/cryptography/algorithms/AES$GCM$Companion;
+	public fun getId ()Ldev/whyoleg/cryptography/CryptographyAlgorithmId;
+}
+
+public final class dev/whyoleg/cryptography/algorithms/AES$GCM$Companion : dev/whyoleg/cryptography/CryptographyAlgorithmId {
+}
+
+public abstract interface class dev/whyoleg/cryptography/algorithms/AES$GCM$Key : dev/whyoleg/cryptography/algorithms/AES$Key {
+	public abstract fun cipher-6q1zMKY (I)Ldev/whyoleg/cryptography/operations/AuthenticatedCipher;
+	public static synthetic fun cipher-6q1zMKY$default (Ldev/whyoleg/cryptography/algorithms/AES$GCM$Key;IILjava/lang/Object;)Ldev/whyoleg/cryptography/operations/AuthenticatedCipher;
+}
+
+public abstract interface class dev/whyoleg/cryptography/algorithms/AES$IvCipher : dev/whyoleg/cryptography/algorithms/AES$IvDecryptor, dev/whyoleg/cryptography/algorithms/AES$IvEncryptor {
+}
+
+public abstract interface class dev/whyoleg/cryptography/algorithms/AES$IvDecryptor : dev/whyoleg/cryptography/operations/Decryptor {
+	public fun decrypt (Lkotlinx/io/bytestring/ByteString;Lkotlinx/io/bytestring/ByteString;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun decrypt ([B[BLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun decrypt$suspendImpl (Ldev/whyoleg/cryptography/algorithms/AES$IvDecryptor;Lkotlinx/io/bytestring/ByteString;Lkotlinx/io/bytestring/ByteString;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun decrypt$suspendImpl (Ldev/whyoleg/cryptography/algorithms/AES$IvDecryptor;[B[BLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun decryptBlocking (Lkotlinx/io/bytestring/ByteString;Lkotlinx/io/bytestring/ByteString;)Lkotlinx/io/bytestring/ByteString;
+	public abstract fun decryptBlocking ([B[B)[B
+}
+
+public abstract interface class dev/whyoleg/cryptography/algorithms/AES$IvEncryptor : dev/whyoleg/cryptography/operations/Encryptor {
+	public fun encrypt (Lkotlinx/io/bytestring/ByteString;Lkotlinx/io/bytestring/ByteString;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun encrypt ([B[BLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun encrypt$suspendImpl (Ldev/whyoleg/cryptography/algorithms/AES$IvEncryptor;Lkotlinx/io/bytestring/ByteString;Lkotlinx/io/bytestring/ByteString;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun encrypt$suspendImpl (Ldev/whyoleg/cryptography/algorithms/AES$IvEncryptor;[B[BLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun encryptBlocking (Lkotlinx/io/bytestring/ByteString;Lkotlinx/io/bytestring/ByteString;)Lkotlinx/io/bytestring/ByteString;
+	public abstract fun encryptBlocking ([B[B)[B
+}
+
+public abstract interface class dev/whyoleg/cryptography/algorithms/AES$Key : dev/whyoleg/cryptography/materials/key/EncodableKey {
+}
+
+public final class dev/whyoleg/cryptography/algorithms/AES$Key$Format : java/lang/Enum, dev/whyoleg/cryptography/materials/key/KeyFormat {
+	public static final field JWK Ldev/whyoleg/cryptography/algorithms/AES$Key$Format;
+	public static final field RAW Ldev/whyoleg/cryptography/algorithms/AES$Key$Format;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
+	public synthetic fun getName ()Ljava/lang/String;
+	public static fun valueOf (Ljava/lang/String;)Ldev/whyoleg/cryptography/algorithms/AES$Key$Format;
+	public static fun values ()[Ldev/whyoleg/cryptography/algorithms/AES$Key$Format;
+}
+
+public final class dev/whyoleg/cryptography/algorithms/AES$Key$Size {
+	public static final field INSTANCE Ldev/whyoleg/cryptography/algorithms/AES$Key$Size;
+	public final fun getB128-XsYwlU8 ()I
+	public final fun getB192-XsYwlU8 ()I
+	public final fun getB256-XsYwlU8 ()I
+}
+
 public abstract interface class dev/whyoleg/cryptography/algorithms/Digest : dev/whyoleg/cryptography/CryptographyAlgorithm {
 	public abstract fun getId ()Ldev/whyoleg/cryptography/CryptographyAlgorithmId;
 	public abstract fun hasher ()Ldev/whyoleg/cryptography/operations/Hasher;
 }
 
+public abstract interface class dev/whyoleg/cryptography/algorithms/HMAC : dev/whyoleg/cryptography/CryptographyAlgorithm {
+	public static final field Companion Ldev/whyoleg/cryptography/algorithms/HMAC$Companion;
+	public fun getId ()Ldev/whyoleg/cryptography/CryptographyAlgorithmId;
+	public abstract fun keyDecoder (Ldev/whyoleg/cryptography/CryptographyAlgorithmId;)Ldev/whyoleg/cryptography/materials/key/KeyDecoder;
+	public abstract fun keyGenerator (Ldev/whyoleg/cryptography/CryptographyAlgorithmId;)Ldev/whyoleg/cryptography/materials/key/KeyGenerator;
+	public static synthetic fun keyGenerator$default (Ldev/whyoleg/cryptography/algorithms/HMAC;Ldev/whyoleg/cryptography/CryptographyAlgorithmId;ILjava/lang/Object;)Ldev/whyoleg/cryptography/materials/key/KeyGenerator;
+}
+
+public final class dev/whyoleg/cryptography/algorithms/HMAC$Companion : dev/whyoleg/cryptography/CryptographyAlgorithmId {
+}
+
+public abstract interface class dev/whyoleg/cryptography/algorithms/HMAC$Key : dev/whyoleg/cryptography/materials/key/EncodableKey {
+	public abstract fun signatureGenerator ()Ldev/whyoleg/cryptography/operations/SignatureGenerator;
+	public abstract fun signatureVerifier ()Ldev/whyoleg/cryptography/operations/SignatureVerifier;
+}
+
+public final class dev/whyoleg/cryptography/algorithms/HMAC$Key$Format : java/lang/Enum, dev/whyoleg/cryptography/materials/key/KeyFormat {
+	public static final field JWK Ldev/whyoleg/cryptography/algorithms/HMAC$Key$Format;
+	public static final field RAW Ldev/whyoleg/cryptography/algorithms/HMAC$Key$Format;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
+	public synthetic fun getName ()Ljava/lang/String;
+	public static fun valueOf (Ljava/lang/String;)Ldev/whyoleg/cryptography/algorithms/HMAC$Key$Format;
+	public static fun values ()[Ldev/whyoleg/cryptography/algorithms/HMAC$Key$Format;
+}
+
 public final class dev/whyoleg/cryptography/algorithms/MD5 : dev/whyoleg/cryptography/CryptographyAlgorithmId {
 	public static final field INSTANCE Ldev/whyoleg/cryptography/algorithms/MD5;
 }
@@ -473,130 +597,6 @@ public abstract interface class dev/whyoleg/cryptography/algorithms/asymmetric/R
 	public abstract fun encryptor ()Ldev/whyoleg/cryptography/operations/Encryptor;
 }
 
-public abstract interface class dev/whyoleg/cryptography/algorithms/symmetric/AES : dev/whyoleg/cryptography/CryptographyAlgorithm {
-	public abstract fun keyDecoder ()Ldev/whyoleg/cryptography/materials/key/KeyDecoder;
-	public abstract fun keyGenerator-6q1zMKY (I)Ldev/whyoleg/cryptography/materials/key/KeyGenerator;
-	public static synthetic fun keyGenerator-6q1zMKY$default (Ldev/whyoleg/cryptography/algorithms/symmetric/AES;IILjava/lang/Object;)Ldev/whyoleg/cryptography/materials/key/KeyGenerator;
-	public fun keyGenerator-__FLmac (I)Ldev/whyoleg/cryptography/materials/key/KeyGenerator;
-	public static synthetic fun keyGenerator-__FLmac$default (Ldev/whyoleg/cryptography/algorithms/symmetric/AES;IILjava/lang/Object;)Ldev/whyoleg/cryptography/materials/key/KeyGenerator;
-}
-
-public abstract interface class dev/whyoleg/cryptography/algorithms/symmetric/AES$CBC : dev/whyoleg/cryptography/algorithms/symmetric/AES {
-	public static final field Companion Ldev/whyoleg/cryptography/algorithms/symmetric/AES$CBC$Companion;
-	public fun getId ()Ldev/whyoleg/cryptography/CryptographyAlgorithmId;
-}
-
-public final class dev/whyoleg/cryptography/algorithms/symmetric/AES$CBC$Companion : dev/whyoleg/cryptography/CryptographyAlgorithmId {
-}
-
-public abstract interface class dev/whyoleg/cryptography/algorithms/symmetric/AES$CBC$Key : dev/whyoleg/cryptography/algorithms/symmetric/AES$Key {
-	public abstract fun cipher (Z)Ldev/whyoleg/cryptography/algorithms/symmetric/AES$IvCipher;
-	public static synthetic fun cipher$default (Ldev/whyoleg/cryptography/algorithms/symmetric/AES$CBC$Key;ZILjava/lang/Object;)Ldev/whyoleg/cryptography/algorithms/symmetric/AES$IvCipher;
-}
-
-public abstract interface class dev/whyoleg/cryptography/algorithms/symmetric/AES$CTR : dev/whyoleg/cryptography/algorithms/symmetric/AES {
-	public static final field Companion Ldev/whyoleg/cryptography/algorithms/symmetric/AES$CTR$Companion;
-	public fun getId ()Ldev/whyoleg/cryptography/CryptographyAlgorithmId;
-}
-
-public final class dev/whyoleg/cryptography/algorithms/symmetric/AES$CTR$Companion : dev/whyoleg/cryptography/CryptographyAlgorithmId {
-}
-
-public abstract interface class dev/whyoleg/cryptography/algorithms/symmetric/AES$CTR$Key : dev/whyoleg/cryptography/algorithms/symmetric/AES$Key {
-	public abstract fun cipher ()Ldev/whyoleg/cryptography/algorithms/symmetric/AES$IvCipher;
-}
-
-public abstract interface class dev/whyoleg/cryptography/algorithms/symmetric/AES$ECB : dev/whyoleg/cryptography/algorithms/symmetric/AES {
-	public static final field Companion Ldev/whyoleg/cryptography/algorithms/symmetric/AES$ECB$Companion;
-	public fun getId ()Ldev/whyoleg/cryptography/CryptographyAlgorithmId;
-}
-
-public final class dev/whyoleg/cryptography/algorithms/symmetric/AES$ECB$Companion : dev/whyoleg/cryptography/CryptographyAlgorithmId {
-}
-
-public abstract interface class dev/whyoleg/cryptography/algorithms/symmetric/AES$ECB$Key : dev/whyoleg/cryptography/algorithms/symmetric/AES$Key {
-	public abstract fun cipher (Z)Ldev/whyoleg/cryptography/operations/Cipher;
-	public static synthetic fun cipher$default (Ldev/whyoleg/cryptography/algorithms/symmetric/AES$ECB$Key;ZILjava/lang/Object;)Ldev/whyoleg/cryptography/operations/Cipher;
-}
-
-public abstract interface class dev/whyoleg/cryptography/algorithms/symmetric/AES$GCM : dev/whyoleg/cryptography/algorithms/symmetric/AES {
-	public static final field Companion Ldev/whyoleg/cryptography/algorithms/symmetric/AES$GCM$Companion;
-	public fun getId ()Ldev/whyoleg/cryptography/CryptographyAlgorithmId;
-}
-
-public final class dev/whyoleg/cryptography/algorithms/symmetric/AES$GCM$Companion : dev/whyoleg/cryptography/CryptographyAlgorithmId {
-}
-
-public abstract interface class dev/whyoleg/cryptography/algorithms/symmetric/AES$GCM$Key : dev/whyoleg/cryptography/algorithms/symmetric/AES$Key {
-	public abstract fun cipher-6q1zMKY (I)Ldev/whyoleg/cryptography/operations/AuthenticatedCipher;
-	public static synthetic fun cipher-6q1zMKY$default (Ldev/whyoleg/cryptography/algorithms/symmetric/AES$GCM$Key;IILjava/lang/Object;)Ldev/whyoleg/cryptography/operations/AuthenticatedCipher;
-}
-
-public abstract interface class dev/whyoleg/cryptography/algorithms/symmetric/AES$IvCipher : dev/whyoleg/cryptography/algorithms/symmetric/AES$IvDecryptor, dev/whyoleg/cryptography/algorithms/symmetric/AES$IvEncryptor {
-}
-
-public abstract interface class dev/whyoleg/cryptography/algorithms/symmetric/AES$IvDecryptor : dev/whyoleg/cryptography/operations/Decryptor {
-	public fun decrypt (Lkotlinx/io/bytestring/ByteString;Lkotlinx/io/bytestring/ByteString;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun decrypt ([B[BLkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun decrypt$suspendImpl (Ldev/whyoleg/cryptography/algorithms/symmetric/AES$IvDecryptor;Lkotlinx/io/bytestring/ByteString;Lkotlinx/io/bytestring/ByteString;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun decrypt$suspendImpl (Ldev/whyoleg/cryptography/algorithms/symmetric/AES$IvDecryptor;[B[BLkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun decryptBlocking (Lkotlinx/io/bytestring/ByteString;Lkotlinx/io/bytestring/ByteString;)Lkotlinx/io/bytestring/ByteString;
-	public abstract fun decryptBlocking ([B[B)[B
-}
-
-public abstract interface class dev/whyoleg/cryptography/algorithms/symmetric/AES$IvEncryptor : dev/whyoleg/cryptography/operations/Encryptor {
-	public fun encrypt (Lkotlinx/io/bytestring/ByteString;Lkotlinx/io/bytestring/ByteString;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun encrypt ([B[BLkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun encrypt$suspendImpl (Ldev/whyoleg/cryptography/algorithms/symmetric/AES$IvEncryptor;Lkotlinx/io/bytestring/ByteString;Lkotlinx/io/bytestring/ByteString;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun encrypt$suspendImpl (Ldev/whyoleg/cryptography/algorithms/symmetric/AES$IvEncryptor;[B[BLkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun encryptBlocking (Lkotlinx/io/bytestring/ByteString;Lkotlinx/io/bytestring/ByteString;)Lkotlinx/io/bytestring/ByteString;
-	public abstract fun encryptBlocking ([B[B)[B
-}
-
-public abstract interface class dev/whyoleg/cryptography/algorithms/symmetric/AES$Key : dev/whyoleg/cryptography/materials/key/EncodableKey {
-}
-
-public final class dev/whyoleg/cryptography/algorithms/symmetric/AES$Key$Format : java/lang/Enum, dev/whyoleg/cryptography/materials/key/KeyFormat {
-	public static final field JWK Ldev/whyoleg/cryptography/algorithms/symmetric/AES$Key$Format;
-	public static final field RAW Ldev/whyoleg/cryptography/algorithms/symmetric/AES$Key$Format;
-	public static fun getEntries ()Lkotlin/enums/EnumEntries;
-	public synthetic fun getName ()Ljava/lang/String;
-	public static fun valueOf (Ljava/lang/String;)Ldev/whyoleg/cryptography/algorithms/symmetric/AES$Key$Format;
-	public static fun values ()[Ldev/whyoleg/cryptography/algorithms/symmetric/AES$Key$Format;
-}
-
-public final class dev/whyoleg/cryptography/algorithms/symmetric/AES$Key$Size {
-	public static final field INSTANCE Ldev/whyoleg/cryptography/algorithms/symmetric/AES$Key$Size;
-	public final fun getB128-XsYwlU8 ()I
-	public final fun getB192-XsYwlU8 ()I
-	public final fun getB256-XsYwlU8 ()I
-}
-
-public abstract interface class dev/whyoleg/cryptography/algorithms/symmetric/HMAC : dev/whyoleg/cryptography/CryptographyAlgorithm {
-	public static final field Companion Ldev/whyoleg/cryptography/algorithms/symmetric/HMAC$Companion;
-	public fun getId ()Ldev/whyoleg/cryptography/CryptographyAlgorithmId;
-	public abstract fun keyDecoder (Ldev/whyoleg/cryptography/CryptographyAlgorithmId;)Ldev/whyoleg/cryptography/materials/key/KeyDecoder;
-	public abstract fun keyGenerator (Ldev/whyoleg/cryptography/CryptographyAlgorithmId;)Ldev/whyoleg/cryptography/materials/key/KeyGenerator;
-	public static synthetic fun keyGenerator$default (Ldev/whyoleg/cryptography/algorithms/symmetric/HMAC;Ldev/whyoleg/cryptography/CryptographyAlgorithmId;ILjava/lang/Object;)Ldev/whyoleg/cryptography/materials/key/KeyGenerator;
-}
-
-public final class dev/whyoleg/cryptography/algorithms/symmetric/HMAC$Companion : dev/whyoleg/cryptography/CryptographyAlgorithmId {
-}
-
-public abstract interface class dev/whyoleg/cryptography/algorithms/symmetric/HMAC$Key : dev/whyoleg/cryptography/materials/key/EncodableKey {
-	public abstract fun signatureGenerator ()Ldev/whyoleg/cryptography/operations/SignatureGenerator;
-	public abstract fun signatureVerifier ()Ldev/whyoleg/cryptography/operations/SignatureVerifier;
-}
-
-public final class dev/whyoleg/cryptography/algorithms/symmetric/HMAC$Key$Format : java/lang/Enum, dev/whyoleg/cryptography/materials/key/KeyFormat {
-	public static final field JWK Ldev/whyoleg/cryptography/algorithms/symmetric/HMAC$Key$Format;
-	public static final field RAW Ldev/whyoleg/cryptography/algorithms/symmetric/HMAC$Key$Format;
-	public static fun getEntries ()Lkotlin/enums/EnumEntries;
-	public synthetic fun getName ()Ljava/lang/String;
-	public static fun valueOf (Ljava/lang/String;)Ldev/whyoleg/cryptography/algorithms/symmetric/HMAC$Key$Format;
-	public static fun values ()[Ldev/whyoleg/cryptography/algorithms/symmetric/HMAC$Key$Format;
-}
-
 public final class dev/whyoleg/cryptography/algorithms/symmetric/SymmetricKeySize {
 	public static final field Companion Ldev/whyoleg/cryptography/algorithms/symmetric/SymmetricKeySize$Companion;
 	public static final synthetic fun box-impl (I)Ldev/whyoleg/cryptography/algorithms/symmetric/SymmetricKeySize;
diff --git a/cryptography-core/api/cryptography-core.klib.api b/cryptography-core/api/cryptography-core.klib.api
index a05cbc07..59419b72 100644
--- a/cryptography-core/api/cryptography-core.klib.api
+++ b/cryptography-core/api/cryptography-core.klib.api
@@ -310,90 +310,90 @@ abstract interface <#A: dev.whyoleg.cryptography.algorithms.asymmetric/RSA.Publi
     }
 }
 
-abstract interface <#A: dev.whyoleg.cryptography.algorithms.symmetric/AES.Key> dev.whyoleg.cryptography.algorithms.symmetric/AES : dev.whyoleg.cryptography/CryptographyAlgorithm { // dev.whyoleg.cryptography.algorithms.symmetric/AES|null[0]
-    abstract fun keyDecoder(): dev.whyoleg.cryptography.materials.key/KeyDecoder<dev.whyoleg.cryptography.algorithms.symmetric/AES.Key.Format, #A> // dev.whyoleg.cryptography.algorithms.symmetric/AES.keyDecoder|keyDecoder(){}[0]
-    abstract fun keyGenerator(dev.whyoleg.cryptography/BinarySize = ...): dev.whyoleg.cryptography.materials.key/KeyGenerator<#A> // dev.whyoleg.cryptography.algorithms.symmetric/AES.keyGenerator|keyGenerator(dev.whyoleg.cryptography.BinarySize){}[0]
-    open fun keyGenerator(dev.whyoleg.cryptography.algorithms.symmetric/SymmetricKeySize = ...): dev.whyoleg.cryptography.materials.key/KeyGenerator<#A> // dev.whyoleg.cryptography.algorithms.symmetric/AES.keyGenerator|keyGenerator(dev.whyoleg.cryptography.algorithms.symmetric.SymmetricKeySize){}[0]
+abstract interface <#A: dev.whyoleg.cryptography.algorithms/AES.Key> dev.whyoleg.cryptography.algorithms/AES : dev.whyoleg.cryptography/CryptographyAlgorithm { // dev.whyoleg.cryptography.algorithms/AES|null[0]
+    abstract fun keyDecoder(): dev.whyoleg.cryptography.materials.key/KeyDecoder<dev.whyoleg.cryptography.algorithms/AES.Key.Format, #A> // dev.whyoleg.cryptography.algorithms/AES.keyDecoder|keyDecoder(){}[0]
+    abstract fun keyGenerator(dev.whyoleg.cryptography/BinarySize = ...): dev.whyoleg.cryptography.materials.key/KeyGenerator<#A> // dev.whyoleg.cryptography.algorithms/AES.keyGenerator|keyGenerator(dev.whyoleg.cryptography.BinarySize){}[0]
+    open fun keyGenerator(dev.whyoleg.cryptography.algorithms.symmetric/SymmetricKeySize = ...): dev.whyoleg.cryptography.materials.key/KeyGenerator<#A> // dev.whyoleg.cryptography.algorithms/AES.keyGenerator|keyGenerator(dev.whyoleg.cryptography.algorithms.symmetric.SymmetricKeySize){}[0]
 
-    abstract interface CBC : dev.whyoleg.cryptography.algorithms.symmetric/AES<dev.whyoleg.cryptography.algorithms.symmetric/AES.CBC.Key> { // dev.whyoleg.cryptography.algorithms.symmetric/AES.CBC|null[0]
-        open val id // dev.whyoleg.cryptography.algorithms.symmetric/AES.CBC.id|{}id[0]
-            open fun <get-id>(): dev.whyoleg.cryptography/CryptographyAlgorithmId<dev.whyoleg.cryptography.algorithms.symmetric/AES.CBC> // dev.whyoleg.cryptography.algorithms.symmetric/AES.CBC.id.<get-id>|<get-id>(){}[0]
+    abstract interface CBC : dev.whyoleg.cryptography.algorithms/AES<dev.whyoleg.cryptography.algorithms/AES.CBC.Key> { // dev.whyoleg.cryptography.algorithms/AES.CBC|null[0]
+        open val id // dev.whyoleg.cryptography.algorithms/AES.CBC.id|{}id[0]
+            open fun <get-id>(): dev.whyoleg.cryptography/CryptographyAlgorithmId<dev.whyoleg.cryptography.algorithms/AES.CBC> // dev.whyoleg.cryptography.algorithms/AES.CBC.id.<get-id>|<get-id>(){}[0]
 
-        abstract interface Key : dev.whyoleg.cryptography.algorithms.symmetric/AES.Key { // dev.whyoleg.cryptography.algorithms.symmetric/AES.CBC.Key|null[0]
-            abstract fun cipher(kotlin/Boolean = ...): dev.whyoleg.cryptography.algorithms.symmetric/AES.IvCipher // dev.whyoleg.cryptography.algorithms.symmetric/AES.CBC.Key.cipher|cipher(kotlin.Boolean){}[0]
+        abstract interface Key : dev.whyoleg.cryptography.algorithms/AES.Key { // dev.whyoleg.cryptography.algorithms/AES.CBC.Key|null[0]
+            abstract fun cipher(kotlin/Boolean = ...): dev.whyoleg.cryptography.algorithms/AES.IvCipher // dev.whyoleg.cryptography.algorithms/AES.CBC.Key.cipher|cipher(kotlin.Boolean){}[0]
         }
 
-        final object Companion : dev.whyoleg.cryptography/CryptographyAlgorithmId<dev.whyoleg.cryptography.algorithms.symmetric/AES.CBC> // dev.whyoleg.cryptography.algorithms.symmetric/AES.CBC.Companion|null[0]
+        final object Companion : dev.whyoleg.cryptography/CryptographyAlgorithmId<dev.whyoleg.cryptography.algorithms/AES.CBC> // dev.whyoleg.cryptography.algorithms/AES.CBC.Companion|null[0]
     }
 
-    abstract interface CTR : dev.whyoleg.cryptography.algorithms.symmetric/AES<dev.whyoleg.cryptography.algorithms.symmetric/AES.CTR.Key> { // dev.whyoleg.cryptography.algorithms.symmetric/AES.CTR|null[0]
-        open val id // dev.whyoleg.cryptography.algorithms.symmetric/AES.CTR.id|{}id[0]
-            open fun <get-id>(): dev.whyoleg.cryptography/CryptographyAlgorithmId<dev.whyoleg.cryptography.algorithms.symmetric/AES.CTR> // dev.whyoleg.cryptography.algorithms.symmetric/AES.CTR.id.<get-id>|<get-id>(){}[0]
+    abstract interface CTR : dev.whyoleg.cryptography.algorithms/AES<dev.whyoleg.cryptography.algorithms/AES.CTR.Key> { // dev.whyoleg.cryptography.algorithms/AES.CTR|null[0]
+        open val id // dev.whyoleg.cryptography.algorithms/AES.CTR.id|{}id[0]
+            open fun <get-id>(): dev.whyoleg.cryptography/CryptographyAlgorithmId<dev.whyoleg.cryptography.algorithms/AES.CTR> // dev.whyoleg.cryptography.algorithms/AES.CTR.id.<get-id>|<get-id>(){}[0]
 
-        abstract interface Key : dev.whyoleg.cryptography.algorithms.symmetric/AES.Key { // dev.whyoleg.cryptography.algorithms.symmetric/AES.CTR.Key|null[0]
-            abstract fun cipher(): dev.whyoleg.cryptography.algorithms.symmetric/AES.IvCipher // dev.whyoleg.cryptography.algorithms.symmetric/AES.CTR.Key.cipher|cipher(){}[0]
+        abstract interface Key : dev.whyoleg.cryptography.algorithms/AES.Key { // dev.whyoleg.cryptography.algorithms/AES.CTR.Key|null[0]
+            abstract fun cipher(): dev.whyoleg.cryptography.algorithms/AES.IvCipher // dev.whyoleg.cryptography.algorithms/AES.CTR.Key.cipher|cipher(){}[0]
         }
 
-        final object Companion : dev.whyoleg.cryptography/CryptographyAlgorithmId<dev.whyoleg.cryptography.algorithms.symmetric/AES.CTR> // dev.whyoleg.cryptography.algorithms.symmetric/AES.CTR.Companion|null[0]
+        final object Companion : dev.whyoleg.cryptography/CryptographyAlgorithmId<dev.whyoleg.cryptography.algorithms/AES.CTR> // dev.whyoleg.cryptography.algorithms/AES.CTR.Companion|null[0]
     }
 
-    abstract interface ECB : dev.whyoleg.cryptography.algorithms.symmetric/AES<dev.whyoleg.cryptography.algorithms.symmetric/AES.ECB.Key> { // dev.whyoleg.cryptography.algorithms.symmetric/AES.ECB|null[0]
-        open val id // dev.whyoleg.cryptography.algorithms.symmetric/AES.ECB.id|{}id[0]
-            open fun <get-id>(): dev.whyoleg.cryptography/CryptographyAlgorithmId<dev.whyoleg.cryptography.algorithms.symmetric/AES.ECB> // dev.whyoleg.cryptography.algorithms.symmetric/AES.ECB.id.<get-id>|<get-id>(){}[0]
+    abstract interface ECB : dev.whyoleg.cryptography.algorithms/AES<dev.whyoleg.cryptography.algorithms/AES.ECB.Key> { // dev.whyoleg.cryptography.algorithms/AES.ECB|null[0]
+        open val id // dev.whyoleg.cryptography.algorithms/AES.ECB.id|{}id[0]
+            open fun <get-id>(): dev.whyoleg.cryptography/CryptographyAlgorithmId<dev.whyoleg.cryptography.algorithms/AES.ECB> // dev.whyoleg.cryptography.algorithms/AES.ECB.id.<get-id>|<get-id>(){}[0]
 
-        abstract interface Key : dev.whyoleg.cryptography.algorithms.symmetric/AES.Key { // dev.whyoleg.cryptography.algorithms.symmetric/AES.ECB.Key|null[0]
-            abstract fun cipher(kotlin/Boolean = ...): dev.whyoleg.cryptography.operations/Cipher // dev.whyoleg.cryptography.algorithms.symmetric/AES.ECB.Key.cipher|cipher(kotlin.Boolean){}[0]
+        abstract interface Key : dev.whyoleg.cryptography.algorithms/AES.Key { // dev.whyoleg.cryptography.algorithms/AES.ECB.Key|null[0]
+            abstract fun cipher(kotlin/Boolean = ...): dev.whyoleg.cryptography.operations/Cipher // dev.whyoleg.cryptography.algorithms/AES.ECB.Key.cipher|cipher(kotlin.Boolean){}[0]
         }
 
-        final object Companion : dev.whyoleg.cryptography/CryptographyAlgorithmId<dev.whyoleg.cryptography.algorithms.symmetric/AES.ECB> // dev.whyoleg.cryptography.algorithms.symmetric/AES.ECB.Companion|null[0]
+        final object Companion : dev.whyoleg.cryptography/CryptographyAlgorithmId<dev.whyoleg.cryptography.algorithms/AES.ECB> // dev.whyoleg.cryptography.algorithms/AES.ECB.Companion|null[0]
     }
 
-    abstract interface GCM : dev.whyoleg.cryptography.algorithms.symmetric/AES<dev.whyoleg.cryptography.algorithms.symmetric/AES.GCM.Key> { // dev.whyoleg.cryptography.algorithms.symmetric/AES.GCM|null[0]
-        open val id // dev.whyoleg.cryptography.algorithms.symmetric/AES.GCM.id|{}id[0]
-            open fun <get-id>(): dev.whyoleg.cryptography/CryptographyAlgorithmId<dev.whyoleg.cryptography.algorithms.symmetric/AES.GCM> // dev.whyoleg.cryptography.algorithms.symmetric/AES.GCM.id.<get-id>|<get-id>(){}[0]
+    abstract interface GCM : dev.whyoleg.cryptography.algorithms/AES<dev.whyoleg.cryptography.algorithms/AES.GCM.Key> { // dev.whyoleg.cryptography.algorithms/AES.GCM|null[0]
+        open val id // dev.whyoleg.cryptography.algorithms/AES.GCM.id|{}id[0]
+            open fun <get-id>(): dev.whyoleg.cryptography/CryptographyAlgorithmId<dev.whyoleg.cryptography.algorithms/AES.GCM> // dev.whyoleg.cryptography.algorithms/AES.GCM.id.<get-id>|<get-id>(){}[0]
 
-        abstract interface Key : dev.whyoleg.cryptography.algorithms.symmetric/AES.Key { // dev.whyoleg.cryptography.algorithms.symmetric/AES.GCM.Key|null[0]
-            abstract fun cipher(dev.whyoleg.cryptography/BinarySize = ...): dev.whyoleg.cryptography.operations/AuthenticatedCipher // dev.whyoleg.cryptography.algorithms.symmetric/AES.GCM.Key.cipher|cipher(dev.whyoleg.cryptography.BinarySize){}[0]
+        abstract interface Key : dev.whyoleg.cryptography.algorithms/AES.Key { // dev.whyoleg.cryptography.algorithms/AES.GCM.Key|null[0]
+            abstract fun cipher(dev.whyoleg.cryptography/BinarySize = ...): dev.whyoleg.cryptography.operations/AuthenticatedCipher // dev.whyoleg.cryptography.algorithms/AES.GCM.Key.cipher|cipher(dev.whyoleg.cryptography.BinarySize){}[0]
         }
 
-        final object Companion : dev.whyoleg.cryptography/CryptographyAlgorithmId<dev.whyoleg.cryptography.algorithms.symmetric/AES.GCM> // dev.whyoleg.cryptography.algorithms.symmetric/AES.GCM.Companion|null[0]
+        final object Companion : dev.whyoleg.cryptography/CryptographyAlgorithmId<dev.whyoleg.cryptography.algorithms/AES.GCM> // dev.whyoleg.cryptography.algorithms/AES.GCM.Companion|null[0]
     }
 
-    abstract interface IvCipher : dev.whyoleg.cryptography.algorithms.symmetric/AES.IvDecryptor, dev.whyoleg.cryptography.algorithms.symmetric/AES.IvEncryptor // dev.whyoleg.cryptography.algorithms.symmetric/AES.IvCipher|null[0]
+    abstract interface IvCipher : dev.whyoleg.cryptography.algorithms/AES.IvDecryptor, dev.whyoleg.cryptography.algorithms/AES.IvEncryptor // dev.whyoleg.cryptography.algorithms/AES.IvCipher|null[0]
 
-    abstract interface IvDecryptor : dev.whyoleg.cryptography.operations/Decryptor { // dev.whyoleg.cryptography.algorithms.symmetric/AES.IvDecryptor|null[0]
-        abstract fun decryptBlocking(kotlin/ByteArray, kotlin/ByteArray): kotlin/ByteArray // dev.whyoleg.cryptography.algorithms.symmetric/AES.IvDecryptor.decryptBlocking|decryptBlocking(kotlin.ByteArray;kotlin.ByteArray){}[0]
-        open fun decryptBlocking(kotlinx.io.bytestring/ByteString, kotlinx.io.bytestring/ByteString): kotlinx.io.bytestring/ByteString // dev.whyoleg.cryptography.algorithms.symmetric/AES.IvDecryptor.decryptBlocking|decryptBlocking(kotlinx.io.bytestring.ByteString;kotlinx.io.bytestring.ByteString){}[0]
-        open suspend fun decrypt(kotlin/ByteArray, kotlin/ByteArray): kotlin/ByteArray // dev.whyoleg.cryptography.algorithms.symmetric/AES.IvDecryptor.decrypt|decrypt(kotlin.ByteArray;kotlin.ByteArray){}[0]
-        open suspend fun decrypt(kotlinx.io.bytestring/ByteString, kotlinx.io.bytestring/ByteString): kotlinx.io.bytestring/ByteString // dev.whyoleg.cryptography.algorithms.symmetric/AES.IvDecryptor.decrypt|decrypt(kotlinx.io.bytestring.ByteString;kotlinx.io.bytestring.ByteString){}[0]
+    abstract interface IvDecryptor : dev.whyoleg.cryptography.operations/Decryptor { // dev.whyoleg.cryptography.algorithms/AES.IvDecryptor|null[0]
+        abstract fun decryptBlocking(kotlin/ByteArray, kotlin/ByteArray): kotlin/ByteArray // dev.whyoleg.cryptography.algorithms/AES.IvDecryptor.decryptBlocking|decryptBlocking(kotlin.ByteArray;kotlin.ByteArray){}[0]
+        open fun decryptBlocking(kotlinx.io.bytestring/ByteString, kotlinx.io.bytestring/ByteString): kotlinx.io.bytestring/ByteString // dev.whyoleg.cryptography.algorithms/AES.IvDecryptor.decryptBlocking|decryptBlocking(kotlinx.io.bytestring.ByteString;kotlinx.io.bytestring.ByteString){}[0]
+        open suspend fun decrypt(kotlin/ByteArray, kotlin/ByteArray): kotlin/ByteArray // dev.whyoleg.cryptography.algorithms/AES.IvDecryptor.decrypt|decrypt(kotlin.ByteArray;kotlin.ByteArray){}[0]
+        open suspend fun decrypt(kotlinx.io.bytestring/ByteString, kotlinx.io.bytestring/ByteString): kotlinx.io.bytestring/ByteString // dev.whyoleg.cryptography.algorithms/AES.IvDecryptor.decrypt|decrypt(kotlinx.io.bytestring.ByteString;kotlinx.io.bytestring.ByteString){}[0]
     }
 
-    abstract interface IvEncryptor : dev.whyoleg.cryptography.operations/Encryptor { // dev.whyoleg.cryptography.algorithms.symmetric/AES.IvEncryptor|null[0]
-        abstract fun encryptBlocking(kotlin/ByteArray, kotlin/ByteArray): kotlin/ByteArray // dev.whyoleg.cryptography.algorithms.symmetric/AES.IvEncryptor.encryptBlocking|encryptBlocking(kotlin.ByteArray;kotlin.ByteArray){}[0]
-        open fun encryptBlocking(kotlinx.io.bytestring/ByteString, kotlinx.io.bytestring/ByteString): kotlinx.io.bytestring/ByteString // dev.whyoleg.cryptography.algorithms.symmetric/AES.IvEncryptor.encryptBlocking|encryptBlocking(kotlinx.io.bytestring.ByteString;kotlinx.io.bytestring.ByteString){}[0]
-        open suspend fun encrypt(kotlin/ByteArray, kotlin/ByteArray): kotlin/ByteArray // dev.whyoleg.cryptography.algorithms.symmetric/AES.IvEncryptor.encrypt|encrypt(kotlin.ByteArray;kotlin.ByteArray){}[0]
-        open suspend fun encrypt(kotlinx.io.bytestring/ByteString, kotlinx.io.bytestring/ByteString): kotlinx.io.bytestring/ByteString // dev.whyoleg.cryptography.algorithms.symmetric/AES.IvEncryptor.encrypt|encrypt(kotlinx.io.bytestring.ByteString;kotlinx.io.bytestring.ByteString){}[0]
+    abstract interface IvEncryptor : dev.whyoleg.cryptography.operations/Encryptor { // dev.whyoleg.cryptography.algorithms/AES.IvEncryptor|null[0]
+        abstract fun encryptBlocking(kotlin/ByteArray, kotlin/ByteArray): kotlin/ByteArray // dev.whyoleg.cryptography.algorithms/AES.IvEncryptor.encryptBlocking|encryptBlocking(kotlin.ByteArray;kotlin.ByteArray){}[0]
+        open fun encryptBlocking(kotlinx.io.bytestring/ByteString, kotlinx.io.bytestring/ByteString): kotlinx.io.bytestring/ByteString // dev.whyoleg.cryptography.algorithms/AES.IvEncryptor.encryptBlocking|encryptBlocking(kotlinx.io.bytestring.ByteString;kotlinx.io.bytestring.ByteString){}[0]
+        open suspend fun encrypt(kotlin/ByteArray, kotlin/ByteArray): kotlin/ByteArray // dev.whyoleg.cryptography.algorithms/AES.IvEncryptor.encrypt|encrypt(kotlin.ByteArray;kotlin.ByteArray){}[0]
+        open suspend fun encrypt(kotlinx.io.bytestring/ByteString, kotlinx.io.bytestring/ByteString): kotlinx.io.bytestring/ByteString // dev.whyoleg.cryptography.algorithms/AES.IvEncryptor.encrypt|encrypt(kotlinx.io.bytestring.ByteString;kotlinx.io.bytestring.ByteString){}[0]
     }
 
-    abstract interface Key : dev.whyoleg.cryptography.materials.key/EncodableKey<dev.whyoleg.cryptography.algorithms.symmetric/AES.Key.Format> { // dev.whyoleg.cryptography.algorithms.symmetric/AES.Key|null[0]
-        final enum class Format : dev.whyoleg.cryptography.materials.key/KeyFormat, kotlin/Enum<dev.whyoleg.cryptography.algorithms.symmetric/AES.Key.Format> { // dev.whyoleg.cryptography.algorithms.symmetric/AES.Key.Format|null[0]
-            enum entry JWK // dev.whyoleg.cryptography.algorithms.symmetric/AES.Key.Format.JWK|null[0]
-            enum entry RAW // dev.whyoleg.cryptography.algorithms.symmetric/AES.Key.Format.RAW|null[0]
+    abstract interface Key : dev.whyoleg.cryptography.materials.key/EncodableKey<dev.whyoleg.cryptography.algorithms/AES.Key.Format> { // dev.whyoleg.cryptography.algorithms/AES.Key|null[0]
+        final enum class Format : dev.whyoleg.cryptography.materials.key/KeyFormat, kotlin/Enum<dev.whyoleg.cryptography.algorithms/AES.Key.Format> { // dev.whyoleg.cryptography.algorithms/AES.Key.Format|null[0]
+            enum entry JWK // dev.whyoleg.cryptography.algorithms/AES.Key.Format.JWK|null[0]
+            enum entry RAW // dev.whyoleg.cryptography.algorithms/AES.Key.Format.RAW|null[0]
 
-            final val entries // dev.whyoleg.cryptography.algorithms.symmetric/AES.Key.Format.entries|#static{}entries[0]
-                final fun <get-entries>(): kotlin.enums/EnumEntries<dev.whyoleg.cryptography.algorithms.symmetric/AES.Key.Format> // dev.whyoleg.cryptography.algorithms.symmetric/AES.Key.Format.entries.<get-entries>|<get-entries>#static(){}[0]
+            final val entries // dev.whyoleg.cryptography.algorithms/AES.Key.Format.entries|#static{}entries[0]
+                final fun <get-entries>(): kotlin.enums/EnumEntries<dev.whyoleg.cryptography.algorithms/AES.Key.Format> // dev.whyoleg.cryptography.algorithms/AES.Key.Format.entries.<get-entries>|<get-entries>#static(){}[0]
 
-            final fun valueOf(kotlin/String): dev.whyoleg.cryptography.algorithms.symmetric/AES.Key.Format // dev.whyoleg.cryptography.algorithms.symmetric/AES.Key.Format.valueOf|valueOf#static(kotlin.String){}[0]
-            final fun values(): kotlin/Array<dev.whyoleg.cryptography.algorithms.symmetric/AES.Key.Format> // dev.whyoleg.cryptography.algorithms.symmetric/AES.Key.Format.values|values#static(){}[0]
+            final fun valueOf(kotlin/String): dev.whyoleg.cryptography.algorithms/AES.Key.Format // dev.whyoleg.cryptography.algorithms/AES.Key.Format.valueOf|valueOf#static(kotlin.String){}[0]
+            final fun values(): kotlin/Array<dev.whyoleg.cryptography.algorithms/AES.Key.Format> // dev.whyoleg.cryptography.algorithms/AES.Key.Format.values|values#static(){}[0]
         }
 
-        final object Size { // dev.whyoleg.cryptography.algorithms.symmetric/AES.Key.Size|null[0]
-            final val B128 // dev.whyoleg.cryptography.algorithms.symmetric/AES.Key.Size.B128|{}B128[0]
-                final fun <get-B128>(): dev.whyoleg.cryptography/BinarySize // dev.whyoleg.cryptography.algorithms.symmetric/AES.Key.Size.B128.<get-B128>|<get-B128>(){}[0]
-            final val B192 // dev.whyoleg.cryptography.algorithms.symmetric/AES.Key.Size.B192|{}B192[0]
-                final fun <get-B192>(): dev.whyoleg.cryptography/BinarySize // dev.whyoleg.cryptography.algorithms.symmetric/AES.Key.Size.B192.<get-B192>|<get-B192>(){}[0]
-            final val B256 // dev.whyoleg.cryptography.algorithms.symmetric/AES.Key.Size.B256|{}B256[0]
-                final fun <get-B256>(): dev.whyoleg.cryptography/BinarySize // dev.whyoleg.cryptography.algorithms.symmetric/AES.Key.Size.B256.<get-B256>|<get-B256>(){}[0]
+        final object Size { // dev.whyoleg.cryptography.algorithms/AES.Key.Size|null[0]
+            final val B128 // dev.whyoleg.cryptography.algorithms/AES.Key.Size.B128|{}B128[0]
+                final fun <get-B128>(): dev.whyoleg.cryptography/BinarySize // dev.whyoleg.cryptography.algorithms/AES.Key.Size.B128.<get-B128>|<get-B128>(){}[0]
+            final val B192 // dev.whyoleg.cryptography.algorithms/AES.Key.Size.B192|{}B192[0]
+                final fun <get-B192>(): dev.whyoleg.cryptography/BinarySize // dev.whyoleg.cryptography.algorithms/AES.Key.Size.B192.<get-B192>|<get-B192>(){}[0]
+            final val B256 // dev.whyoleg.cryptography.algorithms/AES.Key.Size.B256|{}B256[0]
+                final fun <get-B256>(): dev.whyoleg.cryptography/BinarySize // dev.whyoleg.cryptography.algorithms/AES.Key.Size.B256.<get-B256>|<get-B256>(){}[0]
         }
     }
 }
@@ -471,37 +471,37 @@ abstract interface dev.whyoleg.cryptography.algorithms.asymmetric/ECDSA : dev.wh
     final object Companion : dev.whyoleg.cryptography/CryptographyAlgorithmId<dev.whyoleg.cryptography.algorithms.asymmetric/ECDSA> // dev.whyoleg.cryptography.algorithms.asymmetric/ECDSA.Companion|null[0]
 }
 
-abstract interface dev.whyoleg.cryptography.algorithms.symmetric/HMAC : dev.whyoleg.cryptography/CryptographyAlgorithm { // dev.whyoleg.cryptography.algorithms.symmetric/HMAC|null[0]
-    open val id // dev.whyoleg.cryptography.algorithms.symmetric/HMAC.id|{}id[0]
-        open fun <get-id>(): dev.whyoleg.cryptography/CryptographyAlgorithmId<dev.whyoleg.cryptography.algorithms.symmetric/HMAC> // dev.whyoleg.cryptography.algorithms.symmetric/HMAC.id.<get-id>|<get-id>(){}[0]
+abstract interface dev.whyoleg.cryptography.algorithms/Digest : dev.whyoleg.cryptography/CryptographyAlgorithm { // dev.whyoleg.cryptography.algorithms/Digest|null[0]
+    abstract val id // dev.whyoleg.cryptography.algorithms/Digest.id|{}id[0]
+        abstract fun <get-id>(): dev.whyoleg.cryptography/CryptographyAlgorithmId<dev.whyoleg.cryptography.algorithms/Digest> // dev.whyoleg.cryptography.algorithms/Digest.id.<get-id>|<get-id>(){}[0]
 
-    abstract fun keyDecoder(dev.whyoleg.cryptography/CryptographyAlgorithmId<dev.whyoleg.cryptography.algorithms/Digest>): dev.whyoleg.cryptography.materials.key/KeyDecoder<dev.whyoleg.cryptography.algorithms.symmetric/HMAC.Key.Format, dev.whyoleg.cryptography.algorithms.symmetric/HMAC.Key> // dev.whyoleg.cryptography.algorithms.symmetric/HMAC.keyDecoder|keyDecoder(dev.whyoleg.cryptography.CryptographyAlgorithmId<dev.whyoleg.cryptography.algorithms.Digest>){}[0]
-    abstract fun keyGenerator(dev.whyoleg.cryptography/CryptographyAlgorithmId<dev.whyoleg.cryptography.algorithms/Digest> = ...): dev.whyoleg.cryptography.materials.key/KeyGenerator<dev.whyoleg.cryptography.algorithms.symmetric/HMAC.Key> // dev.whyoleg.cryptography.algorithms.symmetric/HMAC.keyGenerator|keyGenerator(dev.whyoleg.cryptography.CryptographyAlgorithmId<dev.whyoleg.cryptography.algorithms.Digest>){}[0]
+    abstract fun hasher(): dev.whyoleg.cryptography.operations/Hasher // dev.whyoleg.cryptography.algorithms/Digest.hasher|hasher(){}[0]
+}
 
-    abstract interface Key : dev.whyoleg.cryptography.materials.key/EncodableKey<dev.whyoleg.cryptography.algorithms.symmetric/HMAC.Key.Format> { // dev.whyoleg.cryptography.algorithms.symmetric/HMAC.Key|null[0]
-        abstract fun signatureGenerator(): dev.whyoleg.cryptography.operations/SignatureGenerator // dev.whyoleg.cryptography.algorithms.symmetric/HMAC.Key.signatureGenerator|signatureGenerator(){}[0]
-        abstract fun signatureVerifier(): dev.whyoleg.cryptography.operations/SignatureVerifier // dev.whyoleg.cryptography.algorithms.symmetric/HMAC.Key.signatureVerifier|signatureVerifier(){}[0]
+abstract interface dev.whyoleg.cryptography.algorithms/HMAC : dev.whyoleg.cryptography/CryptographyAlgorithm { // dev.whyoleg.cryptography.algorithms/HMAC|null[0]
+    open val id // dev.whyoleg.cryptography.algorithms/HMAC.id|{}id[0]
+        open fun <get-id>(): dev.whyoleg.cryptography/CryptographyAlgorithmId<dev.whyoleg.cryptography.algorithms/HMAC> // dev.whyoleg.cryptography.algorithms/HMAC.id.<get-id>|<get-id>(){}[0]
 
-        final enum class Format : dev.whyoleg.cryptography.materials.key/KeyFormat, kotlin/Enum<dev.whyoleg.cryptography.algorithms.symmetric/HMAC.Key.Format> { // dev.whyoleg.cryptography.algorithms.symmetric/HMAC.Key.Format|null[0]
-            enum entry JWK // dev.whyoleg.cryptography.algorithms.symmetric/HMAC.Key.Format.JWK|null[0]
-            enum entry RAW // dev.whyoleg.cryptography.algorithms.symmetric/HMAC.Key.Format.RAW|null[0]
+    abstract fun keyDecoder(dev.whyoleg.cryptography/CryptographyAlgorithmId<dev.whyoleg.cryptography.algorithms/Digest>): dev.whyoleg.cryptography.materials.key/KeyDecoder<dev.whyoleg.cryptography.algorithms/HMAC.Key.Format, dev.whyoleg.cryptography.algorithms/HMAC.Key> // dev.whyoleg.cryptography.algorithms/HMAC.keyDecoder|keyDecoder(dev.whyoleg.cryptography.CryptographyAlgorithmId<dev.whyoleg.cryptography.algorithms.Digest>){}[0]
+    abstract fun keyGenerator(dev.whyoleg.cryptography/CryptographyAlgorithmId<dev.whyoleg.cryptography.algorithms/Digest> = ...): dev.whyoleg.cryptography.materials.key/KeyGenerator<dev.whyoleg.cryptography.algorithms/HMAC.Key> // dev.whyoleg.cryptography.algorithms/HMAC.keyGenerator|keyGenerator(dev.whyoleg.cryptography.CryptographyAlgorithmId<dev.whyoleg.cryptography.algorithms.Digest>){}[0]
 
-            final val entries // dev.whyoleg.cryptography.algorithms.symmetric/HMAC.Key.Format.entries|#static{}entries[0]
-                final fun <get-entries>(): kotlin.enums/EnumEntries<dev.whyoleg.cryptography.algorithms.symmetric/HMAC.Key.Format> // dev.whyoleg.cryptography.algorithms.symmetric/HMAC.Key.Format.entries.<get-entries>|<get-entries>#static(){}[0]
+    abstract interface Key : dev.whyoleg.cryptography.materials.key/EncodableKey<dev.whyoleg.cryptography.algorithms/HMAC.Key.Format> { // dev.whyoleg.cryptography.algorithms/HMAC.Key|null[0]
+        abstract fun signatureGenerator(): dev.whyoleg.cryptography.operations/SignatureGenerator // dev.whyoleg.cryptography.algorithms/HMAC.Key.signatureGenerator|signatureGenerator(){}[0]
+        abstract fun signatureVerifier(): dev.whyoleg.cryptography.operations/SignatureVerifier // dev.whyoleg.cryptography.algorithms/HMAC.Key.signatureVerifier|signatureVerifier(){}[0]
 
-            final fun valueOf(kotlin/String): dev.whyoleg.cryptography.algorithms.symmetric/HMAC.Key.Format // dev.whyoleg.cryptography.algorithms.symmetric/HMAC.Key.Format.valueOf|valueOf#static(kotlin.String){}[0]
-            final fun values(): kotlin/Array<dev.whyoleg.cryptography.algorithms.symmetric/HMAC.Key.Format> // dev.whyoleg.cryptography.algorithms.symmetric/HMAC.Key.Format.values|values#static(){}[0]
-        }
-    }
+        final enum class Format : dev.whyoleg.cryptography.materials.key/KeyFormat, kotlin/Enum<dev.whyoleg.cryptography.algorithms/HMAC.Key.Format> { // dev.whyoleg.cryptography.algorithms/HMAC.Key.Format|null[0]
+            enum entry JWK // dev.whyoleg.cryptography.algorithms/HMAC.Key.Format.JWK|null[0]
+            enum entry RAW // dev.whyoleg.cryptography.algorithms/HMAC.Key.Format.RAW|null[0]
 
-    final object Companion : dev.whyoleg.cryptography/CryptographyAlgorithmId<dev.whyoleg.cryptography.algorithms.symmetric/HMAC> // dev.whyoleg.cryptography.algorithms.symmetric/HMAC.Companion|null[0]
-}
+            final val entries // dev.whyoleg.cryptography.algorithms/HMAC.Key.Format.entries|#static{}entries[0]
+                final fun <get-entries>(): kotlin.enums/EnumEntries<dev.whyoleg.cryptography.algorithms/HMAC.Key.Format> // dev.whyoleg.cryptography.algorithms/HMAC.Key.Format.entries.<get-entries>|<get-entries>#static(){}[0]
 
-abstract interface dev.whyoleg.cryptography.algorithms/Digest : dev.whyoleg.cryptography/CryptographyAlgorithm { // dev.whyoleg.cryptography.algorithms/Digest|null[0]
-    abstract val id // dev.whyoleg.cryptography.algorithms/Digest.id|{}id[0]
-        abstract fun <get-id>(): dev.whyoleg.cryptography/CryptographyAlgorithmId<dev.whyoleg.cryptography.algorithms/Digest> // dev.whyoleg.cryptography.algorithms/Digest.id.<get-id>|<get-id>(){}[0]
+            final fun valueOf(kotlin/String): dev.whyoleg.cryptography.algorithms/HMAC.Key.Format // dev.whyoleg.cryptography.algorithms/HMAC.Key.Format.valueOf|valueOf#static(kotlin.String){}[0]
+            final fun values(): kotlin/Array<dev.whyoleg.cryptography.algorithms/HMAC.Key.Format> // dev.whyoleg.cryptography.algorithms/HMAC.Key.Format.values|values#static(){}[0]
+        }
+    }
 
-    abstract fun hasher(): dev.whyoleg.cryptography.operations/Hasher // dev.whyoleg.cryptography.algorithms/Digest.hasher|hasher(){}[0]
+    final object Companion : dev.whyoleg.cryptography/CryptographyAlgorithmId<dev.whyoleg.cryptography.algorithms/HMAC> // dev.whyoleg.cryptography.algorithms/HMAC.Companion|null[0]
 }
 
 abstract interface dev.whyoleg.cryptography.algorithms/PBKDF2 : dev.whyoleg.cryptography/CryptographyAlgorithm { // dev.whyoleg.cryptography.algorithms/PBKDF2|null[0]
diff --git a/cryptography-core/src/commonMain/kotlin/algorithms/symmetric/AES.kt b/cryptography-core/src/commonMain/kotlin/algorithms/AES.kt
similarity index 97%
rename from cryptography-core/src/commonMain/kotlin/algorithms/symmetric/AES.kt
rename to cryptography-core/src/commonMain/kotlin/algorithms/AES.kt
index f184a2d8..f4e5d4e7 100644
--- a/cryptography-core/src/commonMain/kotlin/algorithms/symmetric/AES.kt
+++ b/cryptography-core/src/commonMain/kotlin/algorithms/AES.kt
@@ -2,10 +2,11 @@
  * Copyright (c) 2023-2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package dev.whyoleg.cryptography.algorithms.symmetric
+package dev.whyoleg.cryptography.algorithms
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.BinarySize.Companion.bits
+import dev.whyoleg.cryptography.algorithms.symmetric.*
 import dev.whyoleg.cryptography.materials.key.*
 import dev.whyoleg.cryptography.operations.*
 import kotlinx.io.bytestring.*
diff --git a/cryptography-core/src/commonMain/kotlin/algorithms/symmetric/HMAC.kt b/cryptography-core/src/commonMain/kotlin/algorithms/HMAC.kt
similarity index 90%
rename from cryptography-core/src/commonMain/kotlin/algorithms/symmetric/HMAC.kt
rename to cryptography-core/src/commonMain/kotlin/algorithms/HMAC.kt
index dd75f80e..b9bf1fed 100644
--- a/cryptography-core/src/commonMain/kotlin/algorithms/symmetric/HMAC.kt
+++ b/cryptography-core/src/commonMain/kotlin/algorithms/HMAC.kt
@@ -2,10 +2,9 @@
  * Copyright (c) 2023-2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package dev.whyoleg.cryptography.algorithms.symmetric
+package dev.whyoleg.cryptography.algorithms
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.materials.key.*
 import dev.whyoleg.cryptography.operations.*
 
diff --git a/cryptography-core/src/commonMain/kotlin/algorithms/symmetric/SymmetricKeySize.kt b/cryptography-core/src/commonMain/kotlin/algorithms/symmetric/SymmetricKeySize.kt
index 339e5ef9..59a2e15c 100644
--- a/cryptography-core/src/commonMain/kotlin/algorithms/symmetric/SymmetricKeySize.kt
+++ b/cryptography-core/src/commonMain/kotlin/algorithms/symmetric/SymmetricKeySize.kt
@@ -24,7 +24,7 @@ public value class SymmetricKeySize
 constructor(public val value: BinarySize) {
     @Deprecated(
         "Replaced by AES.Key.Size as it's not really needed outside of AES",
-        ReplaceWith("AES.Key.Size", "dev.whyoleg.cryptography.algorithms.symmetric.AES"),
+        ReplaceWith("AES.Key.Size", "dev.whyoleg.cryptography.algorithms.AES"),
         DeprecationLevel.ERROR
     )
     public companion object {
diff --git a/cryptography-core/src/commonMain/kotlin/algorithms/symmetric/deprecated.kt b/cryptography-core/src/commonMain/kotlin/algorithms/symmetric/deprecated.kt
new file mode 100644
index 00000000..1b96b558
--- /dev/null
+++ b/cryptography-core/src/commonMain/kotlin/algorithms/symmetric/deprecated.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.whyoleg.cryptography.algorithms.symmetric
+
+@Deprecated(
+    "Moved to another package",
+    ReplaceWith("AES", "dev.whyoleg.cryptography.algorithms.AES"),
+    DeprecationLevel.ERROR
+)
+public typealias AES<K> = dev.whyoleg.cryptography.algorithms.AES<K>
+
+@Deprecated(
+    "Moved to another package",
+    ReplaceWith("HMAC", "dev.whyoleg.cryptography.algorithms.HMAC"),
+    DeprecationLevel.ERROR
+)
+public typealias HMAC = dev.whyoleg.cryptography.algorithms.HMAC
diff --git a/cryptography-providers-tests-api/src/commonMain/kotlin/generators.kt b/cryptography-providers-tests-api/src/commonMain/kotlin/generators.kt
index bcacb6b5..22381c79 100644
--- a/cryptography-providers-tests-api/src/commonMain/kotlin/generators.kt
+++ b/cryptography-providers-tests-api/src/commonMain/kotlin/generators.kt
@@ -7,7 +7,6 @@ package dev.whyoleg.cryptography.providers.tests.api
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.BinarySize.Companion.bits
 import dev.whyoleg.cryptography.algorithms.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
 import dev.whyoleg.cryptography.materials.key.*
 
 inline fun generateSymmetricKeySize(block: (keySize: BinarySize) -> Unit) {
diff --git a/cryptography-providers-tests-api/src/commonMain/kotlin/support.kt b/cryptography-providers-tests-api/src/commonMain/kotlin/support.kt
index 91a71ed0..cc67e5ef 100644
--- a/cryptography-providers-tests-api/src/commonMain/kotlin/support.kt
+++ b/cryptography-providers-tests-api/src/commonMain/kotlin/support.kt
@@ -7,7 +7,6 @@ package dev.whyoleg.cryptography.providers.tests.api
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.algorithms.asymmetric.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
 import dev.whyoleg.cryptography.materials.key.*
 import dev.whyoleg.cryptography.serialization.asn1.*
 import dev.whyoleg.cryptography.serialization.asn1.modules.*
diff --git a/cryptography-providers-tests/src/commonMain/kotlin/SupportedAlgorithmsTest.kt b/cryptography-providers-tests/src/commonMain/kotlin/SupportedAlgorithmsTest.kt
index 95ecc746..f5d614e3 100644
--- a/cryptography-providers-tests/src/commonMain/kotlin/SupportedAlgorithmsTest.kt
+++ b/cryptography-providers-tests/src/commonMain/kotlin/SupportedAlgorithmsTest.kt
@@ -7,7 +7,6 @@ package dev.whyoleg.cryptography.providers.tests
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.algorithms.asymmetric.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
 import dev.whyoleg.cryptography.providers.tests.api.*
 import kotlin.test.*
 
diff --git a/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesBasedCompatibilityTest.kt b/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesBasedCompatibilityTest.kt
index 60b3a98a..2a546e07 100644
--- a/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesBasedCompatibilityTest.kt
+++ b/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesBasedCompatibilityTest.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.tests.algorithms.symmetric
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.providers.tests.api.*
 import dev.whyoleg.cryptography.providers.tests.api.compatibility.*
 import kotlinx.serialization.*
diff --git a/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesBasedTest.kt b/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesBasedTest.kt
index ec708d22..aea4d0d0 100644
--- a/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesBasedTest.kt
+++ b/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesBasedTest.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.tests.algorithms.symmetric
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.providers.tests.api.*
 
 abstract class AesBasedTest<A : AES<*>>(
diff --git a/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesCbcCompatibilityTest.kt b/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesCbcCompatibilityTest.kt
index 76ce4cd2..b8007d63 100644
--- a/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesCbcCompatibilityTest.kt
+++ b/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesCbcCompatibilityTest.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.tests.algorithms.symmetric
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.providers.tests.api.*
 import dev.whyoleg.cryptography.providers.tests.api.compatibility.*
 import dev.whyoleg.cryptography.random.*
diff --git a/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesCbcTest.kt b/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesCbcTest.kt
index 3e6a8be2..34e315c5 100644
--- a/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesCbcTest.kt
+++ b/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesCbcTest.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.tests.algorithms.symmetric
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.providers.tests.api.*
 import dev.whyoleg.cryptography.random.*
 import kotlin.test.*
diff --git a/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesCtrCompatibilityTest.kt b/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesCtrCompatibilityTest.kt
index 650aefda..3b398a95 100644
--- a/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesCtrCompatibilityTest.kt
+++ b/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesCtrCompatibilityTest.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.tests.algorithms.symmetric
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.providers.tests.api.*
 import dev.whyoleg.cryptography.providers.tests.api.compatibility.*
 import dev.whyoleg.cryptography.random.*
diff --git a/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesEcbCompatibilityTest.kt b/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesEcbCompatibilityTest.kt
index 1fdcff74..c884c298 100644
--- a/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesEcbCompatibilityTest.kt
+++ b/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesEcbCompatibilityTest.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.tests.algorithms.symmetric
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.providers.tests.api.*
 import dev.whyoleg.cryptography.providers.tests.api.compatibility.*
 import dev.whyoleg.cryptography.random.*
diff --git a/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesGcmCompatibilityTest.kt b/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesGcmCompatibilityTest.kt
index c9444a1f..fd60fcaf 100644
--- a/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesGcmCompatibilityTest.kt
+++ b/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesGcmCompatibilityTest.kt
@@ -6,7 +6,7 @@ package dev.whyoleg.cryptography.providers.tests.algorithms.symmetric
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.BinarySize.Companion.bits
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.providers.tests.api.*
 import dev.whyoleg.cryptography.providers.tests.api.compatibility.*
 import dev.whyoleg.cryptography.random.*
diff --git a/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesGcmTest.kt b/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesGcmTest.kt
index c41cf228..4ce64311 100644
--- a/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesGcmTest.kt
+++ b/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/AesGcmTest.kt
@@ -6,7 +6,7 @@ package dev.whyoleg.cryptography.providers.tests.algorithms.symmetric
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.BinarySize.Companion.bits
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.random.*
 import kotlin.test.*
 
diff --git a/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/HmacCompatibilityTest.kt b/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/HmacCompatibilityTest.kt
index 9d002485..8e0bfe54 100644
--- a/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/HmacCompatibilityTest.kt
+++ b/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/HmacCompatibilityTest.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.tests.algorithms.symmetric
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.providers.tests.api.*
 import dev.whyoleg.cryptography.providers.tests.api.compatibility.*
 import dev.whyoleg.cryptography.random.*
diff --git a/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/HmacTest.kt b/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/HmacTest.kt
index 771b3c5f..f4264e74 100644
--- a/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/HmacTest.kt
+++ b/cryptography-providers-tests/src/commonMain/kotlin/algorithms/symmetric/HmacTest.kt
@@ -6,7 +6,6 @@ package dev.whyoleg.cryptography.providers.tests.algorithms.symmetric
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.algorithms.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
 import dev.whyoleg.cryptography.providers.tests.api.*
 import dev.whyoleg.cryptography.random.*
 import kotlin.math.*
diff --git a/cryptography-providers/apple/src/commonMain/kotlin/AppleCryptographyProvider.kt b/cryptography-providers/apple/src/commonMain/kotlin/AppleCryptographyProvider.kt
index eb04c4f8..9564019c 100644
--- a/cryptography-providers/apple/src/commonMain/kotlin/AppleCryptographyProvider.kt
+++ b/cryptography-providers/apple/src/commonMain/kotlin/AppleCryptographyProvider.kt
@@ -7,7 +7,6 @@ package dev.whyoleg.cryptography.providers.apple
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.algorithms.asymmetric.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
 import dev.whyoleg.cryptography.providers.apple.algorithms.*
 
 private val defaultProvider = lazy { AppleCryptographyProvider }
@@ -25,11 +24,11 @@ internal object AppleCryptographyProvider : CryptographyProvider() {
         SHA256    -> CCDigest(CCHashAlgorithm.SHA256, SHA256)
         SHA384    -> CCDigest(CCHashAlgorithm.SHA384, SHA384)
         SHA512    -> CCDigest(CCHashAlgorithm.SHA512, SHA512)
-        HMAC      -> CCHmac
-        AES.CBC   -> CCAesCbc
+        HMAC    -> CCHmac
+        AES.CBC -> CCAesCbc
         AES.CTR -> CCAesCtr
         AES.ECB -> CCAesEcb
-        RSA.PSS   -> SecRsaPss
+        RSA.PSS -> SecRsaPss
         RSA.PKCS1 -> SecRsaPkcs1
         RSA.OAEP  -> SecRsaOaep
         RSA.RAW -> SecRsaRaw
diff --git a/cryptography-providers/apple/src/commonMain/kotlin/algorithms/CCAes.kt b/cryptography-providers/apple/src/commonMain/kotlin/algorithms/CCAes.kt
index 61e9bbc4..b3184a94 100644
--- a/cryptography-providers/apple/src/commonMain/kotlin/algorithms/CCAes.kt
+++ b/cryptography-providers/apple/src/commonMain/kotlin/algorithms/CCAes.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.apple.algorithms
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.materials.key.*
 import dev.whyoleg.cryptography.random.*
 
diff --git a/cryptography-providers/apple/src/commonMain/kotlin/algorithms/CCAesCbc.kt b/cryptography-providers/apple/src/commonMain/kotlin/algorithms/CCAesCbc.kt
index 970343fb..94a8ac70 100644
--- a/cryptography-providers/apple/src/commonMain/kotlin/algorithms/CCAesCbc.kt
+++ b/cryptography-providers/apple/src/commonMain/kotlin/algorithms/CCAesCbc.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.apple.algorithms
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.providers.apple.internal.*
 import dev.whyoleg.cryptography.random.*
 import platform.CoreCrypto.*
diff --git a/cryptography-providers/apple/src/commonMain/kotlin/algorithms/CCAesCtr.kt b/cryptography-providers/apple/src/commonMain/kotlin/algorithms/CCAesCtr.kt
index 0169345c..5068db5c 100644
--- a/cryptography-providers/apple/src/commonMain/kotlin/algorithms/CCAesCtr.kt
+++ b/cryptography-providers/apple/src/commonMain/kotlin/algorithms/CCAesCtr.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.apple.algorithms
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.providers.apple.internal.*
 import dev.whyoleg.cryptography.random.*
 import kotlinx.cinterop.*
diff --git a/cryptography-providers/apple/src/commonMain/kotlin/algorithms/CCAesEcb.kt b/cryptography-providers/apple/src/commonMain/kotlin/algorithms/CCAesEcb.kt
index cf1fd44b..0b71aa3a 100644
--- a/cryptography-providers/apple/src/commonMain/kotlin/algorithms/CCAesEcb.kt
+++ b/cryptography-providers/apple/src/commonMain/kotlin/algorithms/CCAesEcb.kt
@@ -4,7 +4,7 @@
 
 package dev.whyoleg.cryptography.providers.apple.algorithms
 
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.operations.*
 import dev.whyoleg.cryptography.providers.apple.internal.*
 import platform.CoreCrypto.*
diff --git a/cryptography-providers/apple/src/commonMain/kotlin/algorithms/CCHmac.kt b/cryptography-providers/apple/src/commonMain/kotlin/algorithms/CCHmac.kt
index 3871b01f..bd4cffca 100644
--- a/cryptography-providers/apple/src/commonMain/kotlin/algorithms/CCHmac.kt
+++ b/cryptography-providers/apple/src/commonMain/kotlin/algorithms/CCHmac.kt
@@ -6,7 +6,6 @@ package dev.whyoleg.cryptography.providers.apple.algorithms
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.algorithms.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
 
 import dev.whyoleg.cryptography.materials.key.*
 import dev.whyoleg.cryptography.operations.*
diff --git a/cryptography-providers/jdk/src/jvmMain/kotlin/JdkCryptographyProvider.kt b/cryptography-providers/jdk/src/jvmMain/kotlin/JdkCryptographyProvider.kt
index 507408c6..9745537e 100644
--- a/cryptography-providers/jdk/src/jvmMain/kotlin/JdkCryptographyProvider.kt
+++ b/cryptography-providers/jdk/src/jvmMain/kotlin/JdkCryptographyProvider.kt
@@ -7,7 +7,6 @@ package dev.whyoleg.cryptography.providers.jdk
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.algorithms.asymmetric.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
 import dev.whyoleg.cryptography.providers.jdk.algorithms.*
 import dev.whyoleg.cryptography.random.*
 import java.security.*
@@ -79,12 +78,12 @@ internal class JdkCryptographyProvider(
             SHA3_256  -> JdkDigest(state, "SHA3-256", SHA3_256)
             SHA3_384  -> JdkDigest(state, "SHA3-384", SHA3_384)
             SHA3_512  -> JdkDigest(state, "SHA3-512", SHA3_512)
-            HMAC      -> JdkHmac(state)
-            AES.CBC   -> JdkAesCbc(state)
-            AES.CTR -> JdkAesCtr(state)
-            AES.ECB -> JdkAesEcb(state)
-            AES.GCM   -> JdkAesGcm(state)
-            RSA.OAEP  -> JdkRsaOaep(state)
+            HMAC     -> JdkHmac(state)
+            AES.CBC  -> JdkAesCbc(state)
+            AES.CTR  -> JdkAesCtr(state)
+            AES.ECB  -> JdkAesEcb(state)
+            AES.GCM  -> JdkAesGcm(state)
+            RSA.OAEP -> JdkRsaOaep(state)
             RSA.PSS   -> JdkRsaPss(state)
             RSA.PKCS1 -> JdkRsaPkcs1(state)
             RSA.RAW -> JdkRsaRaw(state)
diff --git a/cryptography-providers/jdk/src/jvmMain/kotlin/algorithms/JdkAesCbc.kt b/cryptography-providers/jdk/src/jvmMain/kotlin/algorithms/JdkAesCbc.kt
index dce68169..0adf9077 100644
--- a/cryptography-providers/jdk/src/jvmMain/kotlin/algorithms/JdkAesCbc.kt
+++ b/cryptography-providers/jdk/src/jvmMain/kotlin/algorithms/JdkAesCbc.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.jdk.algorithms
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.materials.key.*
 import dev.whyoleg.cryptography.operations.signature.*
 import dev.whyoleg.cryptography.providers.jdk.*
diff --git a/cryptography-providers/jdk/src/jvmMain/kotlin/algorithms/JdkAesCtr.kt b/cryptography-providers/jdk/src/jvmMain/kotlin/algorithms/JdkAesCtr.kt
index c455cfb8..1e4c0341 100644
--- a/cryptography-providers/jdk/src/jvmMain/kotlin/algorithms/JdkAesCtr.kt
+++ b/cryptography-providers/jdk/src/jvmMain/kotlin/algorithms/JdkAesCtr.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.jdk.algorithms
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.materials.key.*
 import dev.whyoleg.cryptography.providers.jdk.*
 import dev.whyoleg.cryptography.providers.jdk.materials.*
diff --git a/cryptography-providers/jdk/src/jvmMain/kotlin/algorithms/JdkAesEcb.kt b/cryptography-providers/jdk/src/jvmMain/kotlin/algorithms/JdkAesEcb.kt
index 02103e67..2c35a906 100644
--- a/cryptography-providers/jdk/src/jvmMain/kotlin/algorithms/JdkAesEcb.kt
+++ b/cryptography-providers/jdk/src/jvmMain/kotlin/algorithms/JdkAesEcb.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.jdk.algorithms
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.materials.key.*
 import dev.whyoleg.cryptography.operations.*
 import dev.whyoleg.cryptography.providers.jdk.*
diff --git a/cryptography-providers/jdk/src/jvmMain/kotlin/algorithms/JdkAesGcm.kt b/cryptography-providers/jdk/src/jvmMain/kotlin/algorithms/JdkAesGcm.kt
index a6b99e89..c84384fd 100644
--- a/cryptography-providers/jdk/src/jvmMain/kotlin/algorithms/JdkAesGcm.kt
+++ b/cryptography-providers/jdk/src/jvmMain/kotlin/algorithms/JdkAesGcm.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.jdk.algorithms
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.materials.key.*
 import dev.whyoleg.cryptography.operations.*
 import dev.whyoleg.cryptography.providers.jdk.*
diff --git a/cryptography-providers/jdk/src/jvmMain/kotlin/algorithms/JdkHmac.kt b/cryptography-providers/jdk/src/jvmMain/kotlin/algorithms/JdkHmac.kt
index 56ff765a..483b49d8 100644
--- a/cryptography-providers/jdk/src/jvmMain/kotlin/algorithms/JdkHmac.kt
+++ b/cryptography-providers/jdk/src/jvmMain/kotlin/algorithms/JdkHmac.kt
@@ -6,7 +6,6 @@ package dev.whyoleg.cryptography.providers.jdk.algorithms
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.algorithms.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
 import dev.whyoleg.cryptography.materials.key.*
 import dev.whyoleg.cryptography.operations.*
 import dev.whyoleg.cryptography.providers.jdk.*
diff --git a/cryptography-providers/openssl3/api/src/commonMain/kotlin/Openssl3CryptographyProvider.kt b/cryptography-providers/openssl3/api/src/commonMain/kotlin/Openssl3CryptographyProvider.kt
index 7afef894..ad2e4698 100644
--- a/cryptography-providers/openssl3/api/src/commonMain/kotlin/Openssl3CryptographyProvider.kt
+++ b/cryptography-providers/openssl3/api/src/commonMain/kotlin/Openssl3CryptographyProvider.kt
@@ -8,7 +8,6 @@ import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.algorithms.asymmetric.*
 import dev.whyoleg.cryptography.algorithms.asymmetric.RSA
-import dev.whyoleg.cryptography.algorithms.symmetric.*
 import dev.whyoleg.cryptography.providers.openssl3.algorithms.*
 import dev.whyoleg.cryptography.providers.openssl3.internal.cinterop.*
 import kotlinx.cinterop.*
@@ -32,12 +31,12 @@ internal object Openssl3CryptographyProvider : CryptographyProvider() {
         SHA3_256  -> Openssl3Digest("SHA3-256", SHA3_256)
         SHA3_384  -> Openssl3Digest("SHA3-384", SHA3_384)
         SHA3_512  -> Openssl3Digest("SHA3-512", SHA3_512)
-        HMAC      -> Openssl3Hmac
-        AES.CBC   -> Openssl3AesCbc
+        HMAC    -> Openssl3Hmac
+        AES.CBC -> Openssl3AesCbc
         AES.CTR -> Openssl3AesCtr
         AES.ECB -> Openssl3AesEcb
-        AES.GCM   -> Openssl3AesGcm
-        ECDSA     -> Openssl3Ecdsa
+        AES.GCM -> Openssl3AesGcm
+        ECDSA   -> Openssl3Ecdsa
         ECDH    -> Openssl3Ecdh
         RSA.PSS   -> Openssl3RsaPss
         RSA.PKCS1 -> Openssl3RsaPkcs1
diff --git a/cryptography-providers/openssl3/api/src/commonMain/kotlin/algorithms/Openssl3Aes.kt b/cryptography-providers/openssl3/api/src/commonMain/kotlin/algorithms/Openssl3Aes.kt
index 93a220b6..7643a4a3 100644
--- a/cryptography-providers/openssl3/api/src/commonMain/kotlin/algorithms/Openssl3Aes.kt
+++ b/cryptography-providers/openssl3/api/src/commonMain/kotlin/algorithms/Openssl3Aes.kt
@@ -6,7 +6,7 @@ package dev.whyoleg.cryptography.providers.openssl3.algorithms
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.BinarySize.Companion.bytes
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.materials.key.*
 import dev.whyoleg.cryptography.random.*
 
diff --git a/cryptography-providers/openssl3/api/src/commonMain/kotlin/algorithms/Openssl3AesCbc.kt b/cryptography-providers/openssl3/api/src/commonMain/kotlin/algorithms/Openssl3AesCbc.kt
index 045b0bea..031cf038 100644
--- a/cryptography-providers/openssl3/api/src/commonMain/kotlin/algorithms/Openssl3AesCbc.kt
+++ b/cryptography-providers/openssl3/api/src/commonMain/kotlin/algorithms/Openssl3AesCbc.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.openssl3.algorithms
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.providers.openssl3.internal.*
 import dev.whyoleg.cryptography.providers.openssl3.internal.cinterop.*
 import dev.whyoleg.cryptography.random.*
@@ -21,7 +21,7 @@ internal object Openssl3AesCbc : AES.CBC, Openssl3Aes<AES.CBC.Key>() {
             AES.Key.Size.B128 -> "AES-128-CBC"
             AES.Key.Size.B192 -> "AES-192-CBC"
             AES.Key.Size.B256 -> "AES-256-CBC"
-            else                  -> error("Unsupported key size")
+            else -> error("Unsupported key size")
         }
 
         override fun cipher(padding: Boolean): AES.IvCipher = AesCbcCipher(algorithm, key, padding)
diff --git a/cryptography-providers/openssl3/api/src/commonMain/kotlin/algorithms/Openssl3AesCtr.kt b/cryptography-providers/openssl3/api/src/commonMain/kotlin/algorithms/Openssl3AesCtr.kt
index 54be1f1c..7d607e41 100644
--- a/cryptography-providers/openssl3/api/src/commonMain/kotlin/algorithms/Openssl3AesCtr.kt
+++ b/cryptography-providers/openssl3/api/src/commonMain/kotlin/algorithms/Openssl3AesCtr.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.openssl3.algorithms
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.providers.openssl3.internal.*
 import dev.whyoleg.cryptography.providers.openssl3.internal.cinterop.*
 import dev.whyoleg.cryptography.random.*
diff --git a/cryptography-providers/openssl3/api/src/commonMain/kotlin/algorithms/Openssl3AesEcb.kt b/cryptography-providers/openssl3/api/src/commonMain/kotlin/algorithms/Openssl3AesEcb.kt
index dbc26309..0df2f129 100644
--- a/cryptography-providers/openssl3/api/src/commonMain/kotlin/algorithms/Openssl3AesEcb.kt
+++ b/cryptography-providers/openssl3/api/src/commonMain/kotlin/algorithms/Openssl3AesEcb.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.openssl3.algorithms
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.operations.*
 import dev.whyoleg.cryptography.providers.openssl3.internal.*
 import dev.whyoleg.cryptography.providers.openssl3.internal.cinterop.*
diff --git a/cryptography-providers/openssl3/api/src/commonMain/kotlin/algorithms/Openssl3AesGcm.kt b/cryptography-providers/openssl3/api/src/commonMain/kotlin/algorithms/Openssl3AesGcm.kt
index 4d0039b2..2138dcc1 100644
--- a/cryptography-providers/openssl3/api/src/commonMain/kotlin/algorithms/Openssl3AesGcm.kt
+++ b/cryptography-providers/openssl3/api/src/commonMain/kotlin/algorithms/Openssl3AesGcm.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.openssl3.algorithms
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.operations.*
 import dev.whyoleg.cryptography.providers.openssl3.internal.*
 import dev.whyoleg.cryptography.providers.openssl3.internal.cinterop.*
diff --git a/cryptography-providers/openssl3/api/src/commonMain/kotlin/algorithms/Openssl3Hmac.kt b/cryptography-providers/openssl3/api/src/commonMain/kotlin/algorithms/Openssl3Hmac.kt
index ab6253fa..393210b8 100644
--- a/cryptography-providers/openssl3/api/src/commonMain/kotlin/algorithms/Openssl3Hmac.kt
+++ b/cryptography-providers/openssl3/api/src/commonMain/kotlin/algorithms/Openssl3Hmac.kt
@@ -6,7 +6,6 @@ package dev.whyoleg.cryptography.providers.openssl3.algorithms
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.algorithms.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
 import dev.whyoleg.cryptography.materials.key.*
 import dev.whyoleg.cryptography.operations.*
 import dev.whyoleg.cryptography.providers.openssl3.internal.*
diff --git a/cryptography-providers/webcrypto/src/commonMain/kotlin/WebCryptoCryptographyProvider.kt b/cryptography-providers/webcrypto/src/commonMain/kotlin/WebCryptoCryptographyProvider.kt
index 11418097..559428ed 100644
--- a/cryptography-providers/webcrypto/src/commonMain/kotlin/WebCryptoCryptographyProvider.kt
+++ b/cryptography-providers/webcrypto/src/commonMain/kotlin/WebCryptoCryptographyProvider.kt
@@ -7,7 +7,6 @@ package dev.whyoleg.cryptography.providers.webcrypto
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.algorithms.asymmetric.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
 import dev.whyoleg.cryptography.providers.webcrypto.algorithms.*
 
 internal val defaultProvider = lazy { WebCryptoCryptographyProvider }
@@ -23,11 +22,11 @@ internal object WebCryptoCryptographyProvider : CryptographyProvider() {
         SHA256    -> WebCryptoDigest.sha256
         SHA384    -> WebCryptoDigest.sha384
         SHA512    -> WebCryptoDigest.sha512
-        HMAC      -> WebCryptoHmac
-        AES.CBC   -> WebCryptoAesCbc
-        AES.CTR -> WebCryptoAesCtr
-        AES.GCM   -> WebCryptoAesGcm
-        RSA.OAEP  -> WebCryptoRsaOaep
+        HMAC     -> WebCryptoHmac
+        AES.CBC  -> WebCryptoAesCbc
+        AES.CTR  -> WebCryptoAesCtr
+        AES.GCM  -> WebCryptoAesGcm
+        RSA.OAEP -> WebCryptoRsaOaep
         RSA.PSS   -> WebCryptoRsaPss
         RSA.PKCS1 -> WebCryptoRsaPkcs1
         ECDSA     -> WebCryptoEcdsa
diff --git a/cryptography-providers/webcrypto/src/commonMain/kotlin/algorithms/WebCryptoAes.kt b/cryptography-providers/webcrypto/src/commonMain/kotlin/algorithms/WebCryptoAes.kt
index 0767a99b..874a06f8 100644
--- a/cryptography-providers/webcrypto/src/commonMain/kotlin/algorithms/WebCryptoAes.kt
+++ b/cryptography-providers/webcrypto/src/commonMain/kotlin/algorithms/WebCryptoAes.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.webcrypto.algorithms
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.materials.key.*
 import dev.whyoleg.cryptography.providers.webcrypto.internal.*
 import dev.whyoleg.cryptography.providers.webcrypto.materials.*
diff --git a/cryptography-providers/webcrypto/src/commonMain/kotlin/algorithms/WebCryptoAesCbc.kt b/cryptography-providers/webcrypto/src/commonMain/kotlin/algorithms/WebCryptoAesCbc.kt
index 29ac6c83..79d35210 100644
--- a/cryptography-providers/webcrypto/src/commonMain/kotlin/algorithms/WebCryptoAesCbc.kt
+++ b/cryptography-providers/webcrypto/src/commonMain/kotlin/algorithms/WebCryptoAesCbc.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.webcrypto.algorithms
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.providers.webcrypto.internal.*
 import dev.whyoleg.cryptography.providers.webcrypto.materials.*
 import dev.whyoleg.cryptography.random.*
diff --git a/cryptography-providers/webcrypto/src/commonMain/kotlin/algorithms/WebCryptoAesCtr.kt b/cryptography-providers/webcrypto/src/commonMain/kotlin/algorithms/WebCryptoAesCtr.kt
index 0fcacb55..1bf79b23 100644
--- a/cryptography-providers/webcrypto/src/commonMain/kotlin/algorithms/WebCryptoAesCtr.kt
+++ b/cryptography-providers/webcrypto/src/commonMain/kotlin/algorithms/WebCryptoAesCtr.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.webcrypto.algorithms
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.providers.webcrypto.internal.*
 import dev.whyoleg.cryptography.providers.webcrypto.materials.*
 import dev.whyoleg.cryptography.random.*
diff --git a/cryptography-providers/webcrypto/src/commonMain/kotlin/algorithms/WebCryptoAesGcm.kt b/cryptography-providers/webcrypto/src/commonMain/kotlin/algorithms/WebCryptoAesGcm.kt
index 8416a1ad..37bd66e4 100644
--- a/cryptography-providers/webcrypto/src/commonMain/kotlin/algorithms/WebCryptoAesGcm.kt
+++ b/cryptography-providers/webcrypto/src/commonMain/kotlin/algorithms/WebCryptoAesGcm.kt
@@ -5,7 +5,7 @@
 package dev.whyoleg.cryptography.providers.webcrypto.algorithms
 
 import dev.whyoleg.cryptography.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
+import dev.whyoleg.cryptography.algorithms.*
 import dev.whyoleg.cryptography.operations.*
 import dev.whyoleg.cryptography.providers.webcrypto.internal.*
 import dev.whyoleg.cryptography.providers.webcrypto.materials.*
diff --git a/cryptography-providers/webcrypto/src/commonMain/kotlin/algorithms/WebCryptoHmac.kt b/cryptography-providers/webcrypto/src/commonMain/kotlin/algorithms/WebCryptoHmac.kt
index 069638f8..51ac5b90 100644
--- a/cryptography-providers/webcrypto/src/commonMain/kotlin/algorithms/WebCryptoHmac.kt
+++ b/cryptography-providers/webcrypto/src/commonMain/kotlin/algorithms/WebCryptoHmac.kt
@@ -6,7 +6,6 @@ package dev.whyoleg.cryptography.providers.webcrypto.algorithms
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.algorithms.*
-import dev.whyoleg.cryptography.algorithms.symmetric.*
 import dev.whyoleg.cryptography.materials.key.*
 import dev.whyoleg.cryptography.operations.*
 import dev.whyoleg.cryptography.providers.webcrypto.internal.*