diff --git a/packages/message-encryption/src/ecies.ts b/packages/message-encryption/src/crypto/ecies.ts
similarity index 98%
rename from packages/message-encryption/src/ecies.ts
rename to packages/message-encryption/src/crypto/ecies.ts
index b83d2a1d72..ae3bc460d0 100644
--- a/packages/message-encryption/src/ecies.ts
+++ b/packages/message-encryption/src/crypto/ecies.ts
@@ -1,7 +1,7 @@
 import * as secp from "@noble/secp256k1";
 import { concat, hexToBytes } from "@waku/byte-utils";
 
-import { getSubtle, randomBytes, sha256 } from "./crypto.js";
+import { getSubtle, randomBytes, sha256 } from "./index.js";
 /**
  * HKDF as implemented in go-ethereum.
  */
diff --git a/packages/message-encryption/src/crypto.ts b/packages/message-encryption/src/crypto/index.ts
similarity index 97%
rename from packages/message-encryption/src/crypto.ts
rename to packages/message-encryption/src/crypto/index.ts
index 81344b02c1..91eaaca598 100644
--- a/packages/message-encryption/src/crypto.ts
+++ b/packages/message-encryption/src/crypto/index.ts
@@ -4,7 +4,7 @@ import * as secp from "@noble/secp256k1";
 import { concat } from "@waku/byte-utils";
 import sha3 from "js-sha3";
 
-import { Asymmetric, Symmetric } from "./constants.js";
+import { Asymmetric, Symmetric } from "../constants.js";
 
 declare const self: Record<string, any> | undefined;
 const crypto: { node?: any; web?: any } = {
diff --git a/packages/message-encryption/src/symmetric.ts b/packages/message-encryption/src/crypto/symmetric.ts
similarity index 89%
rename from packages/message-encryption/src/symmetric.ts
rename to packages/message-encryption/src/crypto/symmetric.ts
index 8f289324cc..35f69f4558 100644
--- a/packages/message-encryption/src/symmetric.ts
+++ b/packages/message-encryption/src/crypto/symmetric.ts
@@ -1,5 +1,6 @@
-import { Symmetric } from "./constants.js";
-import { getSubtle, randomBytes } from "./crypto.js";
+import { Symmetric } from "../constants.js";
+
+import { getSubtle, randomBytes } from "./index.js";
 
 export async function encrypt(
   iv: Uint8Array,
diff --git a/packages/message-encryption/src/index.ts b/packages/message-encryption/src/index.ts
index 997d49a3d7..cd02baaa55 100644
--- a/packages/message-encryption/src/index.ts
+++ b/packages/message-encryption/src/index.ts
@@ -15,6 +15,7 @@ import type {
 import debug from "debug";
 
 import { Symmetric } from "./constants.js";
+import * as ecies from "./crypto/ecies.js";
 import {
   generatePrivateKey,
   generateSymmetricKey,
@@ -22,9 +23,8 @@ import {
   keccak256,
   randomBytes,
   sign,
-} from "./crypto.js";
-import * as ecies from "./ecies.js";
-import * as symmetric from "./symmetric.js";
+} from "./crypto/index.js";
+import * as symmetric from "./crypto/symmetric.js";
 
 const log = debug("waku:message:version-1");