diff --git a/src/lib/waku_message.spec.ts b/src/lib/waku_message/index.spec.ts
similarity index 93%
rename from src/lib/waku_message.spec.ts
rename to src/lib/waku_message/index.spec.ts
index cf37aa5e23..89f1f96ef3 100644
--- a/src/lib/waku_message.spec.ts
+++ b/src/lib/waku_message/index.spec.ts
@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 import fc from 'fast-check';
 
-import { WakuMessage } from './waku_message';
+import { WakuMessage } from './index';
 
 describe('Waku Message', function () {
   it('Waku message round trip binary serialization', function () {
diff --git a/src/lib/waku_message.ts b/src/lib/waku_message/index.ts
similarity index 97%
rename from src/lib/waku_message.ts
rename to src/lib/waku_message/index.ts
index 8d7936d877..753f9c5eb1 100644
--- a/src/lib/waku_message.ts
+++ b/src/lib/waku_message/index.ts
@@ -2,7 +2,7 @@
 import { Reader } from 'protobufjs/minimal';
 
 // Protecting the user from protobuf oddities
-import * as proto from '../proto/waku/v2/message';
+import * as proto from '../../proto/waku/v2/message';
 
 export const DefaultContentTopic = '/waku/2/default-content/proto';
 const DefaultVersion = 0;