diff --git a/package.json b/package.json
index ea3bb6d..2a1167e 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,10 @@
 {
   "name": "nostr-tools",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Tools for making a Nostr client.",
-  "main": "index.js",
+  "main": "dist/nostr-tools.esm.min.js",
+  "module": "dist/nostr-tools.esm.min.js",
+  "browser": "dist/nostr-tools.umd.min.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/fiatjaf/nostr-tools.git"
@@ -24,5 +26,14 @@
     "censorship",
     "censorship-resistance",
     "client"
-  ]
+  ],
+  "devDependencies": {
+    "rollup": "^2.61.1"
+  },
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "prepublish": "rollup -c"
+  }
 }
diff --git a/rollup.config.js b/rollup.config.js
new file mode 100644
index 0000000..a93ac40
--- /dev/null
+++ b/rollup.config.js
@@ -0,0 +1,16 @@
+import pkg from './package.json'
+
+export default {
+  input: 'src/index.js',
+  output: [
+    {
+      name: 'nostrtools',
+      file: pkg.browser,
+      format: 'umd'
+    },
+    {
+      file: pkg.module,
+      format: 'es'
+    }
+  ]
+}
diff --git a/event.js b/src/event.js
similarity index 96%
rename from event.js
rename to src/event.js
index 3e7770d..720b332 100644
--- a/event.js
+++ b/src/event.js
@@ -1,3 +1,4 @@
+import Buffer from 'buffer'
 import * as secp256k1 from '@noble/secp256k1'
 
 import {sha256} from './utils'
diff --git a/index.js b/src/index.js
similarity index 89%
rename from index.js
rename to src/index.js
index 5bfe865..c38b444 100644
--- a/index.js
+++ b/src/index.js
@@ -21,3 +21,5 @@ export {
   getPublicKey,
   getBlankEvent
 }
+export * from './nip04'
+export * from './nip05'
diff --git a/nip04.js b/src/nip04.js
similarity index 97%
rename from nip04.js
rename to src/nip04.js
index 4afbd93..64fddfe 100644
--- a/nip04.js
+++ b/src/nip04.js
@@ -1,3 +1,4 @@
+import Buffer from 'buffer'
 import * as secp256k1 from '@noble/secp256k1'
 
 export function encrypt(privkey, pubkey, text) {
diff --git a/nip05.js b/src/nip05.js
similarity index 97%
rename from nip05.js
rename to src/nip05.js
index 39d2986..42f1889 100644
--- a/nip05.js
+++ b/src/nip05.js
@@ -1,3 +1,4 @@
+import Buffer from 'buffer'
 import dnsPacket from 'dns-packet'
 
 const dohProviders = [
diff --git a/pool.js b/src/pool.js
similarity index 100%
rename from pool.js
rename to src/pool.js
diff --git a/relay.js b/src/relay.js
similarity index 100%
rename from relay.js
rename to src/relay.js
diff --git a/utils.js b/src/utils.js
similarity index 100%
rename from utils.js
rename to src/utils.js