diff --git a/examples/cli-chat/package-lock.json b/examples/cli-chat/package-lock.json
index 857319b744..6ce0f93968 100644
--- a/examples/cli-chat/package-lock.json
+++ b/examples/cli-chat/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "libp2p-tcp": "^0.15.4",
         "prompt-sync": "^4.2.0",
-        "waku": "../../build/main/lib"
+        "waku": "../../build/main"
       },
       "devDependencies": {
         "@istanbuljs/nyc-config-typescript": "^1.0.1",
@@ -41,7 +41,10 @@
         "node": ">=14"
       }
     },
-    "../../build/main/lib": {},
+    "../../build/main": {},
+    "../../build/main/lib": {
+      "extraneous": true
+    },
     "node_modules/@babel/code-frame": {
       "version": "7.12.11",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
@@ -7507,7 +7510,7 @@
       "dev": true
     },
     "node_modules/waku": {
-      "resolved": "../../build/main/lib",
+      "resolved": "../../build/main",
       "link": true
     },
     "node_modules/which": {
@@ -13561,7 +13564,7 @@
       "dev": true
     },
     "waku": {
-      "version": "file:../../build/main/lib"
+      "version": "file:../../build/main"
     },
     "which": {
       "version": "2.0.2",
diff --git a/examples/cli-chat/package.json b/examples/cli-chat/package.json
index 362586dbfe..2da2cf186d 100644
--- a/examples/cli-chat/package.json
+++ b/examples/cli-chat/package.json
@@ -33,7 +33,7 @@
   "dependencies": {
     "libp2p-tcp": "^0.15.4",
     "prompt-sync": "^4.2.0",
-    "waku": "../../build/main/lib"
+    "waku": "../../build/main"
   },
   "devDependencies": {
     "@istanbuljs/nyc-config-typescript": "^1.0.1",
diff --git a/examples/cli-chat/src/chat.spec.ts b/examples/cli-chat/src/chat.spec.ts
index 318bc7c971..542db920a4 100644
--- a/examples/cli-chat/src/chat.spec.ts
+++ b/examples/cli-chat/src/chat.spec.ts
@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import { ChatMessage } from 'waku/chat_message';
+import { ChatMessage } from 'waku';
 
 import { formatMessage } from './chat';
 
diff --git a/examples/cli-chat/src/chat.ts b/examples/cli-chat/src/chat.ts
index 82e924ce9a..bd83d3def8 100644
--- a/examples/cli-chat/src/chat.ts
+++ b/examples/cli-chat/src/chat.ts
@@ -3,10 +3,7 @@ import util from 'util';
 
 import TCP from 'libp2p-tcp';
 import { multiaddr, Multiaddr } from 'multiaddr';
-import { ChatMessage } from 'waku/chat_message';
-import Waku from 'waku/waku';
-import { WakuMessage } from 'waku/waku_message';
-import { StoreCodec } from 'waku/waku_store';
+import { ChatMessage, StoreCodec, Waku, WakuMessage } from 'waku';
 
 const ChatContentTopic = 'dingpu';
 
diff --git a/examples/web-chat/package-lock.json b/examples/web-chat/package-lock.json
index 7dee8bc327..c0578cdb3a 100644
--- a/examples/web-chat/package-lock.json
+++ b/examples/web-chat/package-lock.json
@@ -11,7 +11,7 @@
         "react": "^16.14.0",
         "react-dom": "^16.14.0",
         "server-name-generator": "^1.0.5",
-        "waku": "../../build/main/lib",
+        "waku": "../../build/main",
         "web-vitals": "^1.1.1"
       },
       "devDependencies": {
@@ -30,7 +30,10 @@
         "typescript": "^4.2.4"
       }
     },
-    "../../build/main/lib": {},
+    "../../build/main": {},
+    "../../build/main/lib": {
+      "extraneous": true
+    },
     "node_modules/@babel/code-frame": {
       "version": "7.12.13",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
@@ -22883,7 +22886,7 @@
       }
     },
     "node_modules/waku": {
-      "resolved": "../../build/main/lib",
+      "resolved": "../../build/main",
       "link": true
     },
     "node_modules/walker": {
@@ -43268,7 +43271,7 @@
       }
     },
     "waku": {
-      "version": "file:../../build/main/lib"
+      "version": "file:../../build/main"
     },
     "walker": {
       "version": "1.0.7",
diff --git a/examples/web-chat/package.json b/examples/web-chat/package.json
index 63b2151c74..fd0172eae6 100644
--- a/examples/web-chat/package.json
+++ b/examples/web-chat/package.json
@@ -8,7 +8,7 @@
     "react": "^16.14.0",
     "react-dom": "^16.14.0",
     "server-name-generator": "^1.0.5",
-    "waku": "../../build/main/lib",
+    "waku": "../../build/main",
     "web-vitals": "^1.1.1"
   },
   "devDependencies": {
diff --git a/examples/web-chat/src/App.tsx b/examples/web-chat/src/App.tsx
index face976aca..5288b0b667 100644
--- a/examples/web-chat/src/App.tsx
+++ b/examples/web-chat/src/App.tsx
@@ -2,12 +2,9 @@ import { multiaddr } from 'multiaddr';
 import PeerId from 'peer-id';
 import { useEffect, useState } from 'react';
 import './App.css';
-import { ChatMessage } from 'waku/chat_message';
-import { WakuMessage } from 'waku/waku_message';
-import { StoreCodec } from 'waku/waku_store';
+import { ChatMessage, WakuMessage, StoreCodec, Waku } from 'waku';
 import handleCommand from './command';
 import Room from './Room';
-import Waku from 'waku/waku';
 import { WakuContext } from './WakuContext';
 import { ThemeProvider } from '@livechat/ui-kit';
 import { generate } from 'server-name-generator';
diff --git a/examples/web-chat/src/ChatList.tsx b/examples/web-chat/src/ChatList.tsx
index 864799dd52..a714f86c70 100644
--- a/examples/web-chat/src/ChatList.tsx
+++ b/examples/web-chat/src/ChatList.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useRef, useState } from 'react';
-import { ChatMessage } from 'waku/chat_message';
+import { ChatMessage } from 'waku';
 import {
   Message,
   MessageText,
diff --git a/examples/web-chat/src/Room.tsx b/examples/web-chat/src/Room.tsx
index b25a150d75..25ff6f5859 100644
--- a/examples/web-chat/src/Room.tsx
+++ b/examples/web-chat/src/Room.tsx
@@ -1,5 +1,4 @@
-import { ChatMessage } from 'waku/chat_message';
-import { WakuMessage } from 'waku/waku_message';
+import { ChatMessage, WakuMessage } from 'waku';
 import { ChatContentTopic } from './App';
 import ChatList from './ChatList';
 import MessageInput from './MessageInput';
diff --git a/examples/web-chat/src/WakuContext.ts b/examples/web-chat/src/WakuContext.ts
index 6650c74f5c..eb72723e6d 100644
--- a/examples/web-chat/src/WakuContext.ts
+++ b/examples/web-chat/src/WakuContext.ts
@@ -1,5 +1,5 @@
 import { createContext, useContext } from 'react';
-import Waku from 'waku/waku';
+import { Waku } from 'waku';
 
 export type WakuContextType = {
   waku?: Waku;
diff --git a/examples/web-chat/src/command.ts b/examples/web-chat/src/command.ts
index 6704341da0..d59eea32db 100644
--- a/examples/web-chat/src/command.ts
+++ b/examples/web-chat/src/command.ts
@@ -1,6 +1,6 @@
 import { multiaddr } from 'multiaddr';
 import PeerId from 'peer-id';
-import Waku from 'waku/waku';
+import { Waku } from 'waku';
 
 function help(): string[] {
   return [
diff --git a/src/index.ts b/src/index.ts
new file mode 100644
index 0000000000..86d529950e
--- /dev/null
+++ b/src/index.ts
@@ -0,0 +1,10 @@
+export { Waku } from './lib/waku';
+export { WakuMessage } from './lib/waku_message';
+
+export { ChatMessage } from './lib/chat_message';
+
+export { WakuRelay, RelayCodec } from './lib/waku_relay';
+
+export { WakuStore, StoreCodec } from './lib/waku_store';
+
+export * as proto from './proto';
diff --git a/src/lib/chat_message/index.ts b/src/lib/chat_message/index.ts
index 49693251bf..e12db9462c 100644
--- a/src/lib/chat_message/index.ts
+++ b/src/lib/chat_message/index.ts
@@ -2,7 +2,6 @@ import { Reader } from 'protobufjs/minimal';
 
 import * as proto from '../../proto/chat/v2/chat_message';
 
-// TODO: Move to waku library?
 export class ChatMessage {
   public constructor(public proto: proto.ChatMessage) {}
 
diff --git a/src/lib/waku.spec.ts b/src/lib/waku.spec.ts
index a0ee871d85..c0fe3b982a 100644
--- a/src/lib/waku.spec.ts
+++ b/src/lib/waku.spec.ts
@@ -8,7 +8,7 @@ import {
   NOISE_KEY_2,
 } from '../test_utils/';
 
-import Waku from './waku';
+import { Waku } from './waku';
 import { RelayCodec } from './waku_relay';
 
 describe('Waku Dial', function () {
diff --git a/src/lib/waku.ts b/src/lib/waku.ts
index d00e04e337..ee194e2a86 100644
--- a/src/lib/waku.ts
+++ b/src/lib/waku.ts
@@ -21,7 +21,7 @@ export type CreateOptions =
     }
   | (Libp2pOptions & import('libp2p').CreateOptions);
 
-export default class Waku {
+export class Waku {
   public libp2p: Libp2p;
   public relay: WakuRelay;
   public store: WakuStore;
diff --git a/src/lib/waku_relay/index.spec.ts b/src/lib/waku_relay/index.spec.ts
index 1b5a3d4609..eb0303b2aa 100644
--- a/src/lib/waku_relay/index.spec.ts
+++ b/src/lib/waku_relay/index.spec.ts
@@ -8,7 +8,7 @@ import {
   NOISE_KEY_2,
 } from '../../test_utils';
 import { delay } from '../delay';
-import Waku from '../waku';
+import { Waku } from '../waku';
 import { WakuMessage } from '../waku_message';
 
 import { RelayCodec, RelayDefaultTopic } from './index';
diff --git a/src/lib/waku_relay/index.ts b/src/lib/waku_relay/index.ts
index 495bdda27b..2b21a42b3f 100644
--- a/src/lib/waku_relay/index.ts
+++ b/src/lib/waku_relay/index.ts
@@ -19,11 +19,11 @@ import PeerId from 'peer-id';
 import { WakuMessage } from '../waku_message';
 
 import * as constants from './constants';
+import { RelayCodec, RelayDefaultTopic } from './constants';
 import { getRelayPeers } from './get_relay_peers';
 import { RelayHeartbeat } from './relay_heartbeat';
 
-export * from './constants';
-export * from './relay_heartbeat';
+export { RelayCodec, RelayDefaultTopic };
 
 /**
  * See {GossipOptions} from libp2p-gossipsub
diff --git a/src/lib/waku_store/index.spec.ts b/src/lib/waku_store/index.spec.ts
index a4a20a2528..2f2d3f17f2 100644
--- a/src/lib/waku_store/index.spec.ts
+++ b/src/lib/waku_store/index.spec.ts
@@ -2,7 +2,7 @@ import { expect } from 'chai';
 import TCP from 'libp2p-tcp';
 
 import { makeLogFileName, NimWaku, NOISE_KEY_1 } from '../../test_utils';
-import Waku from '../waku';
+import { Waku } from '../waku';
 import { WakuMessage } from '../waku_message';
 
 describe('Waku Store', () => {
diff --git a/src/proto/index.ts b/src/proto/index.ts
new file mode 100644
index 0000000000..22440dad58
--- /dev/null
+++ b/src/proto/index.ts
@@ -0,0 +1,13 @@
+export { ChatMessage } from './chat/v2/chat_message';
+
+export { WakuMessage } from './waku/v2/message';
+
+export {
+  Index,
+  PagingInfo,
+  PagingInfo_Direction,
+  ContentFilter,
+  HistoryQuery,
+  HistoryResponse,
+  HistoryRPC,
+} from './waku/v2/store';