chore: use npm install for examples

2025-07-08 05:11:33 +00:00 · 2021-11-12 17:48:09 +01:00
355 changed files with 25560 additions and 19608 deletions
--- a/.aegir.js
+++ b/.aegir.js
@ -1,63 +1,70 @@
-import { WebSockets } from '@libp2p/websockets'
-import { Mplex } from '@libp2p/mplex'
-import { NOISE } from '@chainsafe/libp2p-noise'
-import { pipe } from 'it-pipe'
-import { createFromJSON } from '@libp2p/peer-id-factory'
+'use strict'
+
+const path = require('path')
+const Libp2p = require('./src')
+const { MULTIADDRS_WEBSOCKETS } = require('./test/fixtures/browser')
+const Peers = require('./test/fixtures/peers')
+const PeerId = require('peer-id')
+const WebSockets = require('libp2p-websockets')
+const Muxer = require('libp2p-mplex')
+const { NOISE: Crypto } = require('@chainsafe/libp2p-noise')
+const pipe = require('it-pipe')
+let libp2p
+
+const before = async () => {
+  // Use the last peer
+  const peerId = await PeerId.createFromJSON(Peers[Peers.length - 1])
+
+  libp2p = new Libp2p({
+    addresses: {
+      listen: [MULTIADDRS_WEBSOCKETS[0]]
+    },
+    peerId,
+    modules: {
+      transport: [WebSockets],
+      streamMuxer: [Muxer],
+      connEncryption: [Crypto]
+    },
+    config: {
+      relay: {
+        enabled: true,
+        hop: {
+          enabled: true,
+          active: false
+        }
+      },
+      nat: {
+        enabled: false
+      }
+    }
+  })
+  // Add the echo protocol
+  libp2p.handle('/echo/1.0.0', ({ stream }) => pipe(stream, stream))
+
+  await libp2p.start()
+}
+
+const after = async () => {
+  await libp2p.stop()
+}
+
+/** @type {import('aegir').Options["build"]["config"]} */
+const esbuild = {
+  inject: [path.join(__dirname, './scripts/node-globals.js')]
+}

 /** @type {import('aegir').PartialOptions} */
-export default {
+module.exports = {
  build: {
-    bundlesizeMax: '147kB'
+    bundlesizeMax: '253kB'
  },
  test: {
-    before: async () => {
-      // use dynamic import because we only want to reference these files during the test run, e.g. after building
-      const { createLibp2p } = await import('./dist/src/index.js')
-      const { MULTIADDRS_WEBSOCKETS } = await import('./dist/test/fixtures/browser.js')
-      const { Plaintext } = await import('./dist/src/insecure/index.js')
-      const { default: Peers } = await import('./dist/test/fixtures/peers.js')
-
-      // Use the last peer
-      const peerId = await createFromJSON(Peers[Peers.length - 1])
-      const libp2p = await createLibp2p({
-        addresses: {
-          listen: [MULTIADDRS_WEBSOCKETS[0]]
-        },
-        peerId,
-        transports: [
-          new WebSockets()
-        ],
-        streamMuxers: [
-          new Mplex()
-        ],
-        connectionEncryption: [
-          NOISE,
-          new Plaintext()
-        ],
-        relay: {
-          enabled: true,
-          hop: {
-            enabled: true,
-            active: false
-          }
-        },
-        nat: {
-          enabled: false
-        }
-      })
-      // Add the echo protocol
-      await libp2p.handle('/echo/1.0.0', ({ stream }) => {
-        pipe(stream, stream)
-          .catch() // sometimes connections are closed before multistream-select finishes which causes an error
-      })
-      await libp2p.start()
-
-      return {
-        libp2p
+    before,
+    after,
+    browser: {
+      config: {
+        buildConfig: esbuild
      }
-    },
-    after: async (_, before) => {
-      await before.libp2p.stop()
    }
  }
 }
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -4,5 +4,5 @@ updates:
  directory: "/"
  schedule:
    interval: daily
-    time: "10:00"
+    time: "11:00"
  open-pull-requests-limit: 10
--- a/.github/workflows/examples.yml
+++ b/.github/workflows/examples.yml
@ -8,59 +8,95 @@ on:
      - '**'

 jobs:
-
-  build:
+  check:
    runs-on: ubuntu-latest
    steps:
    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v2
-      with:
-        node-version: lts/*
-    - uses: ipfs/aegir/actions/cache-node-modules@master
-      with:
-        directories: |
-          ./examples/node_modules
-          ~/.cache
-        build: |
-          cd examples
-          npm i
-          npx playwright install
-        cache_name: cache-examples
-
-  test-example:
-    needs: build
+    - run: npm install
+    - run: npx aegir lint
+    - run: npx aegir ts -p check
+    - run: npx aegir build
+  test-auto-relay-example:
+    needs: check
    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        example: [
-          chat,
-          connection-encryption,
-          discovery-mechanisms,
-          echo,
-          libp2p-in-the-browser,
-          peer-and-content-routing,
-          pnet,
-          protocol-and-stream-muxing,
-          pubsub,
-          transports,
-          webrtc-direct
-        ]
-      fail-fast: true
    steps:
      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: lts/*
-      - uses: ipfs/aegir/actions/cache-node-modules@master
-        with:
-          directories: |
-            ./examples/node_modules
-            ~/.cache
-          build: |
-            cd examples
-            npm i
-            npx playwright install
-          cache_name: cache-examples
-      - run: |
-          cd examples
-          npm run test -- ${{ matrix.example }}
+      - run: npm install
+      - run: cd examples && npm install && npm run test -- auto-relay
+  test-chat-example:
+    needs: check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: npm install
+      - run: cd examples && npm install && npm run test -- chat
+  test-connection-encryption-example:
+    needs: check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: npm install
+      - run: cd examples && npm install && npm run test -- connection-encryption
+  test-discovery-mechanisms-example:
+    needs: check
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: npm install
+      - run: cd examples && npm install && npm run test -- discovery-mechanisms
+  test-echo-example:
+    needs: check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: npm install
+      - run: cd examples && npm install && npm run test -- echo
+  test-libp2p-in-the-browser-example:
+    needs: check
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: npm install
+      - run: cd examples && npm install && npm run test -- libp2p-in-the-browser
+  test-peer-and-content-routing-example:
+    needs: check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: npm install
+      - run: cd examples && npm install && npm run test -- peer-and-content-routing
+  test-pnet-example:
+    needs: check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: npm install
+      - run: cd examples && npm install && npm run test -- pnet
+  test-protocol-and-stream-muxing-example:
+    needs: check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: npm install
+      - run: cd examples && npm install && npm run test -- protocol-and-stream-muxing
+  test-pubsub-example:
+    needs: check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: npm install
+      - run: cd examples && npm install && npm run test -- pubsub
+  test-transports-example:
+    needs: check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: npm install
+      - run: cd examples && npm install && npm run test -- transports
+  test-webrtc-direct-example:
+    needs: check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: npm install
+      - run: cd examples && npm install && npm run test -- webrtc-direct
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@ -8,165 +8,63 @@ on:
      - '**'

 jobs:
-
  check:
    runs-on: ubuntu-latest
    steps:
    - uses: actions/checkout@v2
    - uses: actions/setup-node@v2
      with:
-        node-version: lts/*
-    - uses: ipfs/aegir/actions/cache-node-modules@master
-    - run: npm run --if-present lint
-    - run: npm run --if-present dep-check
-
+        node-version: 14
+    - run: npm install
+    - run: npx aegir lint
+    - uses: gozala/typescript-error-reporter-action@v1.0.8
+    - run: npx aegir build
+    - run: npx aegir dep-check
+    - uses: ipfs/aegir/actions/bundle-size@v32.1.0
+      name: size
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
  test-node:
    needs: check
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
        os: [windows-latest, ubuntu-latest, macos-latest]
-        node: [16]
+        node: [14, 16]
      fail-fast: true
    steps:
      - uses: actions/checkout@v2
      - uses: actions/setup-node@v2
        with:
          node-version: ${{ matrix.node }}
-      - uses: ipfs/aegir/actions/cache-node-modules@master
-      - run: npm run --if-present test:node
-      - uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0
-        with:
-          directory: ./.nyc_output
-          flags: node
-
+      - run: npm install
+      - run: npx aegir test -t node --cov --bail
+      - uses: codecov/codecov-action@v1
  test-chrome:
    needs: check
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: lts/*
-      - uses: ipfs/aegir/actions/cache-node-modules@master
-      - run: npm run --if-present test:chrome
-      - uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0
-        with:
-          directory: ./.nyc_output
-          flags: chrome
-
-  test-chrome-webworker:
-    needs: check
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: lts/*
-      - uses: ipfs/aegir/actions/cache-node-modules@master
-      - run: npm run --if-present test:chrome-webworker
-      - uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0
-        with:
-          directory: ./.nyc_output
-          flags: chrome-webworker
-
+      - run: npm install
+      - run: npx aegir test -t browser -t webworker --bail
  test-firefox:
    needs: check
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: lts/*
-      - uses: ipfs/aegir/actions/cache-node-modules@master
-      - run: npm run --if-present test:firefox
-      - uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0
-        with:
-          directory: ./.nyc_output
-          flags: firefox
-
-  test-firefox-webworker:
+      - run: npm install
+      - run: npx aegir test -t browser -t webworker --bail -- --browser firefox
+  test-ts:
    needs: check
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: lts/*
-      - uses: ipfs/aegir/actions/cache-node-modules@master
-      - run: npm run --if-present test:firefox-webworker
-      - uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0
-        with:
-          directory: ./.nyc_output
-          flags: firefox-webworker
-
-  test-electron-main:
-    needs: check
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: lts/*
-      - uses: ipfs/aegir/actions/cache-node-modules@master
-      - run: npx xvfb-maybe npm run --if-present test:electron-main
-      - uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0
-        with:
-          directory: ./.nyc_output
-          flags: electron-main
-
-  test-electron-renderer:
-    needs: check
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: lts/*
-      - uses: ipfs/aegir/actions/cache-node-modules@master
-      - run: npx xvfb-maybe npm run --if-present test:electron-renderer
-      - uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0
-        with:
-          directory: ./.nyc_output
-          flags: electron-renderer
-
+      - run: npm install
+      - run: npm run test:ts
  test-interop:
    needs: check
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: lts/*
-      - uses: ipfs/aegir/actions/cache-node-modules@master
-      - run: npm run test:interop -- --bail
-
-  release:
-    runs-on: ubuntu-latest
-    needs: [test-node, test-chrome, test-chrome-webworker, test-firefox, test-firefox-webworker, test-electron-main, test-electron-renderer, test-interop]
-    if: github.event_name == 'push' && github.ref == 'refs/heads/master'
-    steps:
-      - uses: GoogleCloudPlatform/release-please-action@v2
-        id: release
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          release-type: node
-          bump-minor-pre-major: true
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: lts/*
-          registry-url: 'https://registry.npmjs.org'
-      - uses: ipfs/aegir/actions/cache-node-modules@master
-      - if: ${{ steps.release.outputs.release_created }}
-        name: Run release version
-        run: npm publish
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-      - if: ${{ !steps.release.outputs.release_created }}
-        name: Run release rc
-        run: |
-            npm version `node -p -e "require('./package.json').version"`-`git rev-parse --short HEAD` --no-git-tag-version
-            npm publish --tag next
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+      - run: npm install
+      - run: cd node_modules/interop-libp2p && yarn && LIBP2P_JS=${GITHUB_WORKSPACE}/src/index.js npx aegir test -t node --bail -- --exit
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,211 +1,3 @@
-## [0.35.8](https://github.com/libp2p/js-libp2p/compare/v0.35.7...v0.35.8) (2021-12-29)
-
-
-### Bug Fixes
-
-* do not wait for autodial start ([#1089](https://github.com/libp2p/js-libp2p/issues/1089)) ([79b3cfc](https://github.com/libp2p/js-libp2p/commit/79b3cfc6ad02ecc76fe23a3c3ff2d0b32a0ae4a8))
-* increase listeners on any-signal ([#1084](https://github.com/libp2p/js-libp2p/issues/1084)) ([f18fc80](https://github.com/libp2p/js-libp2p/commit/f18fc80b70bf7b6b26fffa70b0a8d0502a6c4801))
-* look for final peer event instead of peer response ([#1092](https://github.com/libp2p/js-libp2p/issues/1092)) ([d2b7ec0](https://github.com/libp2p/js-libp2p/commit/d2b7ec0f6be0ee80f2c963279a8ec2385059a889))
-* record tracked map clears ([#1085](https://github.com/libp2p/js-libp2p/issues/1085)) ([b4b4324](https://github.com/libp2p/js-libp2p/commit/b4b432406ebc08ef2fc3a1922c64cde7c9060cae))
-
-
-
-## [0.37.0](https://www.github.com/libp2p/js-libp2p/compare/v0.36.2...v0.37.0) (2022-05-16)
-
-
-### ⚠ BREAKING CHANGES
-
-* types are no longer hand crafted, this module is now ESM only
-
-### Features
-
-* convert to typescript ([#1172](https://www.github.com/libp2p/js-libp2p/issues/1172)) ([199395d](https://www.github.com/libp2p/js-libp2p/commit/199395de4d8139cc77d0b408626f37c9b8520d28))
-
-
-### Bug Fixes
-
-* add transport manager to exports map and fix docs ([#1182](https://www.github.com/libp2p/js-libp2p/issues/1182)) ([cc60cfd](https://www.github.com/libp2p/js-libp2p/commit/cc60cfde1a0907ca68f658f6de5362a708189222))
-* emit peer:connect after all ([#1171](https://www.github.com/libp2p/js-libp2p/issues/1171)) ([d16817c](https://www.github.com/libp2p/js-libp2p/commit/d16817ca443443e88803ee8096d45debb14af91b))
-* encode enums correctly ([#1210](https://www.github.com/libp2p/js-libp2p/issues/1210)) ([4837430](https://www.github.com/libp2p/js-libp2p/commit/4837430d8bcdbee0865eeba6fe694bc71fc6c9bb))
-* expose getPublicKey ([#1188](https://www.github.com/libp2p/js-libp2p/issues/1188)) ([1473044](https://www.github.com/libp2p/js-libp2p/commit/147304449e5f8d3acb8b00bdd9588b56830667c6))
-* expose metrics and registrar, use dht for peer discovery ([#1183](https://www.github.com/libp2p/js-libp2p/issues/1183)) ([64bfcee](https://www.github.com/libp2p/js-libp2p/commit/64bfcee5093b368df0b381f78afc2ddff3d339a9))
-* simplify pnet exports ([#1213](https://www.github.com/libp2p/js-libp2p/issues/1213)) ([3148060](https://www.github.com/libp2p/js-libp2p/commit/31480603f3e17d838d2685573995218a1e678e7a))
-* update deps ([#1181](https://www.github.com/libp2p/js-libp2p/issues/1181)) ([8cca8e4](https://www.github.com/libp2p/js-libp2p/commit/8cca8e4bfc6a339e58b5a5efa8a84fd891aa08ee))
-* update interfaces ([#1207](https://www.github.com/libp2p/js-libp2p/issues/1207)) ([da3d19b](https://www.github.com/libp2p/js-libp2p/commit/da3d19b30977fd2c7e77d92aa8914b13e3179aaa))
-* update pubsub interfaces ([#1194](https://www.github.com/libp2p/js-libp2p/issues/1194)) ([fab4f13](https://www.github.com/libp2p/js-libp2p/commit/fab4f1385cf61b7b16719b9aacdfe03146a3f260))
-* update to new interfaces ([#1206](https://www.github.com/libp2p/js-libp2p/issues/1206)) ([a15254f](https://www.github.com/libp2p/js-libp2p/commit/a15254fdd478a336edf1e1196b721dc56888b2ea))
-* use placeholder dht/pubsub ([#1193](https://www.github.com/libp2p/js-libp2p/issues/1193)) ([5397137](https://www.github.com/libp2p/js-libp2p/commit/5397137c654dfdec431e0c9ba4b1ff9dee19abf1))
-
-### [0.36.2](https://www.github.com/libp2p/js-libp2p/compare/v0.36.1...v0.36.2) (2022-01-26)
-
-
-### Bug Fixes
-
-* reject connections when not running ([#1146](https://www.github.com/libp2p/js-libp2p/issues/1146)) ([902f10d](https://www.github.com/libp2p/js-libp2p/commit/902f10d58d1062e812eb27aa0e2256e3fde5d3f6))
-
-### [0.36.1](https://www.github.com/libp2p/js-libp2p/compare/v0.36.0...v0.36.1) (2022-01-25)
-
-
-### Bug Fixes
-
-* await unhandle of protocols ([#1144](https://www.github.com/libp2p/js-libp2p/issues/1144)) ([d44bd90](https://www.github.com/libp2p/js-libp2p/commit/d44bd9094fe9545054eb8eff68f81bc52ece03e7))
-
-## [0.36.0](https://www.github.com/libp2p/js-libp2p/compare/v0.35.8...v0.36.0) (2022-01-25)
-
-
-### ⚠ BREAKING CHANGES
-
-* abort-controller dep is gone from dependency tree
-* `libp2p.handle`, `libp2p.registrar.register` and the peerstore methods have become async
-
-### Features
-
-* add fetch protocol ([#1036](https://www.github.com/libp2p/js-libp2p/issues/1036)) ([d8ceb0b](https://www.github.com/libp2p/js-libp2p/commit/d8ceb0bc66fe225d1335d3f05b9a3a30983c2a57))
-* async peerstore backed by datastores ([#1058](https://www.github.com/libp2p/js-libp2p/issues/1058)) ([978eb36](https://www.github.com/libp2p/js-libp2p/commit/978eb3676fad5d5d50ddb28d1a7868f448cbb20b))
-* connection gater ([#1142](https://www.github.com/libp2p/js-libp2p/issues/1142)) ([ff32eba](https://www.github.com/libp2p/js-libp2p/commit/ff32eba6a0fa222af1a7a46775d5e0346ad6ebdf))
-
-
-### Bug Fixes
-
-* cache build artefacts ([#1091](https://www.github.com/libp2p/js-libp2p/issues/1091)) ([5043cd5](https://www.github.com/libp2p/js-libp2p/commit/5043cd56435a264e83db4fb8388d33e9a0442fff))
-* catch errors during identify ([#1138](https://www.github.com/libp2p/js-libp2p/issues/1138)) ([12f1bb0](https://www.github.com/libp2p/js-libp2p/commit/12f1bb0aeec4b639bd2af05807215f3b4284e379))
-* import uint8arrays package in example ([#1083](https://www.github.com/libp2p/js-libp2p/issues/1083)) ([c3700f5](https://www.github.com/libp2p/js-libp2p/commit/c3700f55d5a0b62182d683ca37258887b24065b9))
-* make tests more reliable ([#1139](https://www.github.com/libp2p/js-libp2p/issues/1139)) ([b7e8706](https://www.github.com/libp2p/js-libp2p/commit/b7e87066a69970f1adca4ba552c7fdf624916a7e))
-* prevent auto-dialer from dialing self ([#1104](https://www.github.com/libp2p/js-libp2p/issues/1104)) ([9b22c6e](https://www.github.com/libp2p/js-libp2p/commit/9b22c6e2f987a20c6639cd07f31fe9c824e24923))
-* remove abort-controller dep ([#1095](https://www.github.com/libp2p/js-libp2p/issues/1095)) ([0a4dc54](https://www.github.com/libp2p/js-libp2p/commit/0a4dc54d084c901df47cce1788bd5922090ee037))
-* try all peer addresses when dialing a relay ([#1140](https://www.github.com/libp2p/js-libp2p/issues/1140)) ([63aa480](https://www.github.com/libp2p/js-libp2p/commit/63aa480800974515f44d3b7e013da9c8ccaae8ad))
-* update any-signal and timeout-abort-controller ([#1128](https://www.github.com/libp2p/js-libp2p/issues/1128)) ([e0354b4](https://www.github.com/libp2p/js-libp2p/commit/e0354b4c6b95bb90656b868849182eb3efddf096))
-* update multistream select ([#1136](https://www.github.com/libp2p/js-libp2p/issues/1136)) ([00e4959](https://www.github.com/libp2p/js-libp2p/commit/00e49592a356e39b20c889d5f40b9bb37d4bf293))
-* update node-forge ([#1133](https://www.github.com/libp2p/js-libp2p/issues/1133)) ([a4bba35](https://www.github.com/libp2p/js-libp2p/commit/a4bba35948e1cd8dbe5147f2c8d6385b1fbb6fae))
-
-## [0.35.7](https://github.com/libp2p/js-libp2p/compare/v0.35.2...v0.35.7) (2021-12-24)
-
-
-### Bug Fixes
-
-* add tracked map ([#1069](https://github.com/libp2p/js-libp2p/issues/1069)) ([b425fa1](https://github.com/libp2p/js-libp2p/commit/b425fa12304def2a007d43a0aa445c28b766ed02))
-* clean up pending dial targets ([#1059](https://github.com/libp2p/js-libp2p/issues/1059)) ([bdc9f16](https://github.com/libp2p/js-libp2p/commit/bdc9f16d0cbe56ccf26822f11068e7795bcef046))
-* fix uncaught promise rejection when finding peers ([#1044](https://github.com/libp2p/js-libp2p/issues/1044)) ([3b683e7](https://github.com/libp2p/js-libp2p/commit/3b683e715686163e229b7b5c3a892327dfd4fc63))
-* increase the maxlisteners for timeout controllers ([#1065](https://github.com/libp2p/js-libp2p/issues/1065)) ([09a0f94](https://github.com/libp2p/js-libp2p/commit/09a0f940df7fdb4ece34604e85693709df5c213e))
-* main ci ([#1079](https://github.com/libp2p/js-libp2p/issues/1079)) ([d1c48dc](https://github.com/libp2p/js-libp2p/commit/d1c48dcbeded828f2dd3044cc9aed3f17f02846d))
-* make error codes consistent ([#1054](https://github.com/libp2p/js-libp2p/issues/1054)) ([b25e0fe](https://github.com/libp2p/js-libp2p/commit/b25e0fe5312db58a06c39500ae84c50fed3a93bd))
-* type definitions for big dialrequest and persistent peerstore ([#1078](https://github.com/libp2p/js-libp2p/issues/1078)) ([cb0d7d6](https://github.com/libp2p/js-libp2p/commit/cb0d7d6c99d179498f04e76df76e70e4f7d41c4c))
-
-
-### Features
-
-* allow per-component metrics to be collected ([#1061](https://github.com/libp2p/js-libp2p/issues/1061)) ([2f0b311](https://github.com/libp2p/js-libp2p/commit/2f0b311df7127aa44512c2008142d4ca30268986)), closes [#1060](https://github.com/libp2p/js-libp2p/issues/1060)
-
-
-
-## [0.35.6](https://github.com/libp2p/js-libp2p/compare/v0.35.5...v0.35.6) (2021-12-18)
-
-
-### Bug Fixes
-
-* increase the maxlisteners for timeout controllers ([#1065](https://github.com/libp2p/js-libp2p/issues/1065)) ([09a0f94](https://github.com/libp2p/js-libp2p/commit/09a0f940df7fdb4ece34604e85693709df5c213e))
-
-
-
-## [0.35.5](https://github.com/libp2p/js-libp2p/compare/v0.35.4...v0.35.5) (2021-12-15)
-
-
-
-## [0.35.4](https://github.com/libp2p/js-libp2p/compare/v0.35.3...v0.35.4) (2021-12-15)
-
-
-### Features
-
-* allow per-component metrics to be collected ([#1061](https://github.com/libp2p/js-libp2p/issues/1061)) ([2f0b311](https://github.com/libp2p/js-libp2p/commit/2f0b311df7127aa44512c2008142d4ca30268986)), closes [#1060](https://github.com/libp2p/js-libp2p/issues/1060)
-
-
-
-## [0.35.3](https://github.com/libp2p/js-libp2p/compare/v0.35.2...v0.35.3) (2021-12-13)
-
-
-### Bug Fixes
-
-* clean up pending dial targets ([#1059](https://github.com/libp2p/js-libp2p/issues/1059)) ([bdc9f16](https://github.com/libp2p/js-libp2p/commit/bdc9f16d0cbe56ccf26822f11068e7795bcef046))
-* fix uncaught promise rejection when finding peers ([#1044](https://github.com/libp2p/js-libp2p/issues/1044)) ([3b683e7](https://github.com/libp2p/js-libp2p/commit/3b683e715686163e229b7b5c3a892327dfd4fc63))
-* make error codes consistent ([#1054](https://github.com/libp2p/js-libp2p/issues/1054)) ([b25e0fe](https://github.com/libp2p/js-libp2p/commit/b25e0fe5312db58a06c39500ae84c50fed3a93bd))
-
-
-
-## [0.35.2](https://github.com/libp2p/js-libp2p/compare/v0.33.0...v0.35.2) (2021-12-06)
-
-
-### Bug Fixes
-
-* do not let closest peers run forever ([#1047](https://github.com/libp2p/js-libp2p/issues/1047)) ([91c2ec9](https://github.com/libp2p/js-libp2p/commit/91c2ec9856a3e972b7b2c9c4d9a4eda1d431c7ef))
-* increase maxlisteners on event target ([#1050](https://github.com/libp2p/js-libp2p/issues/1050)) ([b70fb43](https://github.com/libp2p/js-libp2p/commit/b70fb43427b47df079b55929ec8956f69cbda966)), closes [#900](https://github.com/libp2p/js-libp2p/issues/900)
-* private ip ts compile has no call signatures ([#1020](https://github.com/libp2p/js-libp2p/issues/1020)) ([77d7cb8](https://github.com/libp2p/js-libp2p/commit/77d7cb8f0815f2cdd3bfdfa8b641a7a186fe9520))
-* stop dht before connection manager ([#1041](https://github.com/libp2p/js-libp2p/issues/1041)) ([3a9d5f6](https://github.com/libp2p/js-libp2p/commit/3a9d5f64d96719ebb4d3b083c4f5832db4fa0816)), closes [#1039](https://github.com/libp2p/js-libp2p/issues/1039)
-
-
-### chore
-
-* update peer id and libp2p crypto ([#1042](https://github.com/libp2p/js-libp2p/issues/1042)) ([9cbf36f](https://github.com/libp2p/js-libp2p/commit/9cbf36fcb54099e6fed35ceccc4a2376f0926c1f))
-
-
-### Features
-
-* update dht ([#1009](https://github.com/libp2p/js-libp2p/issues/1009)) ([2f598eb](https://github.com/libp2p/js-libp2p/commit/2f598eba09cff4301474af08196158065e3602d8))
-
-
-### BREAKING CHANGES
-
-* requires node 15+
-* libp2p-kad-dht has a new event-based API which is exposed as `_dht`
-
-
-
-## [0.35.1](https://github.com/libp2p/js-libp2p/compare/v0.35.0...v0.35.1) (2021-12-03)
-
-
-### Bug Fixes
-
-* do not let closest peers run forever ([#1047](https://github.com/libp2p/js-libp2p/issues/1047)) ([91c2ec9](https://github.com/libp2p/js-libp2p/commit/91c2ec9856a3e972b7b2c9c4d9a4eda1d431c7ef))
-
-
-
-# [0.35.0](https://github.com/libp2p/js-libp2p/compare/v0.34.0...v0.35.0) (2021-12-02)
-
-
-### Bug Fixes
-
-* stop dht before connection manager ([#1041](https://github.com/libp2p/js-libp2p/issues/1041)) ([3a9d5f6](https://github.com/libp2p/js-libp2p/commit/3a9d5f64d96719ebb4d3b083c4f5832db4fa0816)), closes [#1039](https://github.com/libp2p/js-libp2p/issues/1039)
-
-
-### chore
-
-* update peer id and libp2p crypto ([#1042](https://github.com/libp2p/js-libp2p/issues/1042)) ([9cbf36f](https://github.com/libp2p/js-libp2p/commit/9cbf36fcb54099e6fed35ceccc4a2376f0926c1f))
-
-
-### BREAKING CHANGES
-
-* requires node 15+
-
-
-
-# [0.34.0](https://github.com/libp2p/js-libp2p/compare/v0.33.0...v0.34.0) (2021-11-25)
-
-
-### Bug Fixes
-
-* private ip ts compile has no call signatures ([#1020](https://github.com/libp2p/js-libp2p/issues/1020)) ([77d7cb8](https://github.com/libp2p/js-libp2p/commit/77d7cb8f0815f2cdd3bfdfa8b641a7a186fe9520))
-
-
-### Features
-
-* update dht ([#1009](https://github.com/libp2p/js-libp2p/issues/1009)) ([2f598eb](https://github.com/libp2p/js-libp2p/commit/2f598eba09cff4301474af08196158065e3602d8))
-
-
-### BREAKING CHANGES
-
-* libp2p-kad-dht has a new event-based API which is exposed as `_dht`
-
-
-
 # [0.33.0](https://github.com/libp2p/js-libp2p/compare/v0.32.5...v0.33.0) (2021-09-24)


@ -1829,3 +1621,6 @@ for subscribe to see how it should be used.

 <a name="0.5.5"></a>
 ## [0.5.5](https://github.com/libp2p/js-libp2p/compare/v0.5.4...v0.5.5) (2017-03-21)
+
+
+
--- a/24
+++ b/24
@ -1,4 +1,22 @@
-This project is dual licensed under MIT and Apache-2.0.
+The MIT License (MIT)
+
+Copyright (c) 2015 David Dias
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

-MIT: https://www.opensource.org/licenses/mit
-Apache-2.0: https://www.apache.org/licenses/license-2.0
--- a/5
+++ b/5
@ -1,5 +0,0 @@
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
--- a/19
+++ b/19
@ -1,19 +0,0 @@
-The MIT License (MIT)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--- a/README.md
+++ b/README.md
@ -23,8 +23,8 @@
  <a href="https://david-dm.org/libp2p/js-libp2p"><img src="https://david-dm.org/libp2p/js-libp2p.svg?style=flat-square" /></a>
  <a href="https://github.com/feross/standard"><img src="https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square"></a>
  <a href="https://github.com/RichardLitt/standard-readme"><img src="https://img.shields.io/badge/standard--readme-OK-green.svg?style=flat-square" /></a>
-  <a href=""><img src="https://img.shields.io/badge/npm-%3E%3D7.0.0-orange.svg?style=flat-square" /></a>
-  <a href=""><img src="https://img.shields.io/badge/Node.js-%3E%3D15.0.0-orange.svg?style=flat-square" /></a>
+  <a href=""><img src="https://img.shields.io/badge/npm-%3E%3D6.0.0-orange.svg?style=flat-square" /></a>
+  <a href=""><img src="https://img.shields.io/badge/Node.js-%3E%3D12.0.0-orange.svg?style=flat-square" /></a>
  <br>
 </p>

@ -39,22 +39,26 @@ If you are looking for the documentation of the latest release, you can view the

 **Want to update libp2p in your project?** Check our [migrations folder](./doc/migrations).

-## Table of Contents <!-- omit in toc -->
+[**`Weekly Core Dev Calls`**](https://github.com/libp2p/team-mgmt/issues/16)
+
+## Lead Maintainer
+
+[Jacob Heun](https://github.com/jacobheun/)
+
+## Table of Contents

 - [Background](#background)
 - [Install](#install)
 - [Usage](#usage)
  - [Configuration](#configuration)
  - [API](#api)
-  - [Getting started](#getting-started)
+  - [Getting Started](#getting-started)
  - [Tutorials and Examples](#tutorials-and-examples)
 - [Development](#development)
  - [Tests](#tests)
-    - [Run unit tests](#run-unit-tests)
  - [Packages](#packages)
 - [Contribute](#contribute)
 - [License](#license)
-  - [Contribution](#contribution)

 ## Background

@ -119,7 +123,7 @@ You can find multiple examples on the [examples folder](./examples) that will gu
 > npm run test:node

 # run just Browser tests (Chrome)
-> npm run test:chrome
+> npm run test:browser
 ```

 ### Packages
@ -179,11 +183,4 @@ The libp2p implementation in JavaScript is a work in progress. As such, there ar

 ## License

-Licensed under either of
-
- * Apache 2.0, ([LICENSE-APACHE](LICENSE-APACHE) / http://www.apache.org/licenses/LICENSE-2.0)
- * MIT ([LICENSE-MIT](LICENSE-MIT) / http://opensource.org/licenses/MIT)
-
-### Contribution
-
-Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions.
+[MIT](LICENSE) © Protocol Labs
--- a/doc/API.md
+++ b/doc/API.md
@ -3,7 +3,6 @@
 * [Static Functions](#static-functions)
  * [`create`](#create)
 * [Instance Methods](#libp2p-instance-methods)
-  * [`loadkeychain`](#loadkeychain)
  * [`start`](#start)
  * [`stop`](#stop)
  * [`dial`](#dial)
@ -12,9 +11,6 @@
  * [`handle`](#handle)
  * [`unhandle`](#unhandle)
  * [`ping`](#ping)
-  * [`fetch`](#fetch)
-  * [`fetchService.registerLookupFunction`](#fetchserviceregisterlookupfunction)
-  * [`fetchService.unRegisterLookupFunction`](#fetchserviceunregisterlookupfunction)
  * [`multiaddrs`](#multiaddrs)
  * [`addressManager.getListenAddrs`](#addressmanagergetlistenaddrs)
  * [`addressManager.getAnnounceAddrs`](#addressmanagergetannounceaddrs)
@ -119,21 +115,23 @@ For Libp2p configurations and modules details read the [Configuration Document](
 #### Example

 ```js
-import { createLibp2p } from 'libp2p'
-import { TCP } from '@libp2p/tcp'
-import { Mplex } from '@libp2p/mplex'
-import { Noise } from '@chainsafe/libp2p-noise'
+const Libp2p = require('libp2p')
+const TCP = require('libp2p-tcp')
+const MPLEX = require('libp2p-mplex')
+const { NOISE } = require('libp2p-noise')

 async function main () {
  // specify options
  const options = {
-    transports: [new TCP()],
-    streamMuxers: [new Mplex()],
-    connectionEncryption: [new Noise()]
+    modules: {
+      transport: [TCP],
+      streamMuxer: [MPLEX],
+      connEncryption: [NOISE]
+    }
  }

  // create libp2p
-  const libp2p = await createLibp2p(options)
+  const libp2p = await Libp2p.create(options)
 }

 main()
@ -147,11 +145,11 @@ As an alternative, it is possible to create a Libp2p instance with the construct
 #### Example

 ```js
-import { createLibp2p } from 'libp2p'
-import { TCP } from '@libp2p/tcp'
-import { Mplex } from '@libp2p/mplex'
-import { Noise } from '@chainsafe/libp2p-noise'
-
+const Libp2p = require('libp2p')
+const TCP = require('libp2p-tcp')
+const MPLEX = require('libp2p-mplex')
+const { NOISE } = require('libp2p-noise')
+const PeerId = require('peer-id')

 async function main () {
  const peerId = await PeerId.create();
@ -160,9 +158,11 @@ async function main () {
  // peerId is required when Libp2p is instantiated via the constructor
  const options = {
    peerId,
-    transports: [new TCP()],
-    streamMuxers: [new Mplex()],
-    connectionEncryption: [new Noise()]
+    modules: {
+      transport: [TCP],
+      streamMuxer: [MPLEX],
+      connEncryption: [NOISE]
+    }
  }

  // create libp2p
@ -196,11 +196,11 @@ Load keychain keys from the datastore, importing the private key as 'self', if n
 #### Example

 ```js
-import { createLibp2p } from 'libp2p'
+const Libp2p = require('libp2p')

 // ...

-const libp2p = await createLibp2p({
+const libp2p = await Libp2p.create({
  // ...
  keychain: {
    pass: '0123456789pass1234567890'
@ -226,11 +226,11 @@ Starts the libp2p node.
 #### Example

 ```js
-import { createLibp2p } from 'libp2p'
+const Libp2p = require('libp2p')

 // ...

-const libp2p = await createLibp2p(options)
+const libp2p = await Libp2p.create(options)

 // start libp2p
 await libp2p.start()
@ -251,10 +251,10 @@ Stops the libp2p node.
 #### Example

 ```js
-import { createLibp2p } from 'libp2p'
+const Libp2p = require('libp2p')

 // ...
-const libp2p = await createLibp2p(options)
+const libp2p = await Libp2p.create(options)
 // ...

 // stop libp2p
@ -350,7 +350,7 @@ Dials to another peer in the network and selects a protocol to communicate with

 ```js
 // ...
-import { pipe } from 'it-pipe'
+const pipe = require('it-pipe')

 const { stream, protocol } = await libp2p.dialProtocol(remotePeerId, protocols)

@ -454,72 +454,6 @@ Pings a given peer and get the operation's latency.
 const latency = await libp2p.ping(otherPeerId)
 ```

-## fetch
-
-Fetch a value from a remote node
-
-`libp2p.fetch(peer, key)`
-
-#### Parameters
-
-| Name | Type | Description |
-|------|------|-------------|
-| peer | [`PeerId`][peer-id]\|[`Multiaddr`][multiaddr]\|`string` | peer to ping |
-| key | `string` | A key that corresponds to a value on the remote node |
-
-#### Returns
-
-| Type | Description |
-|------|-------------|
-| `Promise<Uint8Array | null>` | The value for the key or null if it cannot be found |
-
-#### Example
-
-```js
-// ...
-const value = await libp2p.fetch(otherPeerId, '/some/key')
-```
-
-## fetchService.registerLookupFunction
-
-Register a function to look up values requested by remote nodes
-
-`libp2p.fetchService.registerLookupFunction(prefix, lookup)`
-
-#### Parameters
-
-| Name | Type | Description |
-|------|------|-------------|
-| prefix | `string` | All queries below this prefix will be passed to the lookup function |
-| lookup | `(key: string) => Promise<Uint8Array | null>` | A function that takes a key and returns a Uint8Array or null |
-
-#### Example
-
-```js
-// ...
-const value = await libp2p.fetchService.registerLookupFunction('/prefix', (key) => { ... })
-```
-
-## fetchService.unregisterLookupFunction
-
-Removes the passed lookup function or any function registered for the passed prefix
-
-`libp2p.fetchService.unregisterLookupFunction(prefix, lookup)`
-
-#### Parameters
-
-| Name | Type | Description |
-|------|------|-------------|
-| prefix | `string` | All queries below this prefix will be passed to the lookup function |
-| lookup | `(key: string) => Promise<Uint8Array | null>` | Optional: A function that takes a key and returns a Uint8Array or null |
-
-#### Example
-
-```js
-// ...
-libp2p.fetchService.unregisterLookupFunction('/prefix')
-```
-
 ## multiaddrs

 Gets the multiaddrs the libp2p node announces to the network. This computes the advertising multiaddrs
@ -2152,7 +2086,7 @@ the NatManager performing NAT hole punching.

 [address]: https://github.com/libp2p/js-libp2p/tree/master/src/peer-store/address-book.js
 [cid]: https://github.com/multiformats/js-cid
-[connection]: https://github.com/libp2p/js-libp2p-interfaces/tree/master/packages/interfaces/src/connection
+[connection]: https://github.com/libp2p/js-interfaces/tree/master/src/connection
 [multiaddr]: https://github.com/multiformats/js-multiaddr
 [peer-id]: https://github.com/libp2p/js-peer-id
 [keys]: https://github.com/libp2p/js-libp2p-crypto/tree/master/src/keys
--- a/doc/CONFIGURATION.md
+++ b/doc/CONFIGURATION.md
@ -1,40 +1,37 @@
-#
+# 

- [Overview](#overview)
- [Modules](#modules)
-  - [Transport](#transport)
-  - [Stream Multiplexing](#stream-multiplexing)
-  - [Connection Encryption](#connection-encryption)
-  - [Peer Discovery](#peer-discovery)
-  - [Content Routing](#content-routing)
-  - [Peer Routing](#peer-routing)
-  - [DHT](#dht)
-  - [Pubsub](#pubsub)
- [Customizing libp2p](#customizing-libp2p)
-  - [Examples](#examples)
-    - [Basic setup](#basic-setup)
-    - [Customizing Peer Discovery](#customizing-peer-discovery)
-    - [Setup webrtc transport and discovery](#setup-webrtc-transport-and-discovery)
-    - [Customizing Pubsub](#customizing-pubsub)
-    - [Customizing DHT](#customizing-dht)
-    - [Setup with Content and Peer Routing](#setup-with-content-and-peer-routing)
-    - [Setup with Relay](#setup-with-relay)
-    - [Setup with Auto Relay](#setup-with-auto-relay)
-    - [Setup with Keychain](#setup-with-keychain)
-    - [Configuring Dialing](#configuring-dialing)
-    - [Configuring Connection Manager](#configuring-connection-manager)
-    - [Configuring Connection Gater](#configuring-connection-gater)
-      - [Outgoing connections](#outgoing-connections)
-      - [Incoming connections](#incoming-connections)
-    - [Configuring Transport Manager](#configuring-transport-manager)
-    - [Configuring Metrics](#configuring-metrics)
-    - [Configuring PeerStore](#configuring-peerstore)
-    - [Customizing Transports](#customizing-transports)
-    - [Configuring the NAT Manager](#configuring-the-nat-manager)
-      - [Browser support](#browser-support)
-      - [UPnP and NAT-PMP](#upnp-and-nat-pmp)
-    - [Configuring protocol name](#configuring-protocol-name)
- [Configuration examples](#configuration-examples)
+- [Configuration](#configuration)
+  - [Overview](#overview)
+  - [Modules](#modules)
+    - [Transport](#transport)
+    - [Stream Multiplexing](#stream-multiplexing)
+    - [Connection Encryption](#connection-encryption)
+    - [Peer Discovery](#peer-discovery)
+    - [Content Routing](#content-routing)
+    - [Peer Routing](#peer-routing)
+    - [DHT](#dht)
+    - [Pubsub](#pubsub)
+  - [Customizing libp2p](#customizing-libp2p)
+    - [Examples](#examples)
+      - [Basic setup](#basic-setup)
+      - [Customizing Peer Discovery](#customizing-peer-discovery)
+      - [Setup webrtc transport and discovery](#setup-webrtc-transport-and-discovery)
+      - [Customizing Pubsub](#customizing-pubsub)
+      - [Customizing DHT](#customizing-dht)
+      - [Setup with Content and Peer Routing](#setup-with-content-and-peer-routing)
+      - [Setup with Relay](#setup-with-relay)
+      - [Setup with Auto Relay](#setup-with-auto-relay)
+      - [Setup with Keychain](#setup-with-keychain)
+      - [Configuring Dialing](#configuring-dialing)
+      - [Configuring Connection Manager](#configuring-connection-manager)
+      - [Configuring Transport Manager](#configuring-transport-manager)
+      - [Configuring Metrics](#configuring-metrics)
+      - [Configuring PeerStore](#configuring-peerstore)
+      - [Customizing Transports](#customizing-transports)
+      - [Configuring the NAT Manager](#configuring-the-nat-manager)
+        - [Browser support](#browser-support)
+        - [UPnP and NAT-PMP](#upnp-and-nat-pmp)
+  - [Configuration examples](#configuration-examples)

 ## Overview

@ -199,9 +196,9 @@ When [creating a libp2p node](./API.md#create), the modules needed should be spe

 ```js
 const modules = {
-  transports: [],
-  streamMuxers: [],
-  connectionEncryption: [],
+  transport: [],
+  streamMuxer: [],
+  connEncryption: [],
  contentRouting: [],
  peerRouting: [],
  peerDiscovery: [],
@ -235,59 +232,67 @@ Besides the `modules` and `config`, libp2p allows other internal options and con
 //   dht: kad-dht
 //   pubsub: gossipsub

-import { createLibp2p } from 'libp2p'
-import { TCP } from '@libp2p/tcp'
-import { WebSockets } from '@libp2p/websockets'
-import { Mplex } from '@libp2p/mplex'
-import { Noise } from '@chainsafe/libp2p-noise'
-import { MulticastDNS } from '@libp2p/mdns'
-import { KadDHT } from '@libp2p/kad-dht'
-import { GossipSub } from 'libp2p-gossipsub'
+const Libp2p = require('libp2p')
+const TCP = require('libp2p-tcp')
+const WS = require('libp2p-websockets')
+const MPLEX = require('libp2p-mplex')
+const { NOISE } = require('libp2p-noise')
+const MulticastDNS = require('libp2p-mdns')
+const DHT = require('libp2p-kad-dht')
+const GossipSub = require('libp2p-gossipsub')

-const node = await createLibp2p({
-  transports: [
-    new TCP(),
-    new WS()
-  ],
-  streamMuxers: [new Mplex()],
-  connectionEncryption: [new Noise()],
-  peerDiscovery: [MulticastDNS],
-  dht: DHT,
-  pubsub: GossipSub
+const node = await Libp2p.create({
+  modules: {
+    transport: [
+      TCP,
+      new WS() // It can take instances too!
+    ],
+    streamMuxer: [MPLEX],
+    connEncryption: [NOISE],
+    peerDiscovery: [MulticastDNS],
+    dht: DHT,
+    pubsub: GossipSub
+  }
 })
 ```

 #### Customizing Peer Discovery

 ```js
-import { createLibp2p } from 'libp2p'
-import { TCP } from '@libp2p/tcp'
-import { Mplex } from '@libp2p/mplex'
-import { Noise } from '@chainsafe/libp2p-noise'
-import { MulticastDNS } from '@libp2p/mdns'
-import { Bootstrap } from '@libp2p/bootstrap'
+const Libp2p = require('libp2p')
+const TCP = require('libp2p-tcp')
+const MPLEX = require('libp2p-mplex')
+const { NOISE } = require('libp2p-noise')
+const MulticastDNS = require('libp2p-mdns')
+const Bootstrap = require('libp2p-bootstrap')

-const node = await createLibp2p({
-  transports: [new TCP()],
-  streamMuxers: [new Mplex()],
-  connectionEncryption: [new Noise()],
-  peerDiscovery: [
-    new MulticastDNS({
-      interval: 1000
-    }),
-    new Bootstrap(
-      list: [ // A list of bootstrap peers to connect to starting up the node
-        "/ip4/104.131.131.82/tcp/4001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ",
-        "/dnsaddr/bootstrap.libp2p.io/ipfs/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN",
-        "/dnsaddr/bootstrap.libp2p.io/ipfs/QmQCU2EcMqAqQPR2i9bChDtGNJchTbq5TbXJJ16u19uLTa",
-      ],
-      interval: 2000
-    )
-  ],
-  connectionManager: {
-    autoDial: true             // Auto connect to discovered peers (limited by ConnectionManager minConnections)
-    // The `tag` property will be searched when creating the instance of your Peer Discovery service.
-    // The associated object, will be passed to the service when it is instantiated.
+const node = await Libp2p.create({
+  modules: {
+    transport: [TCP],
+    streamMuxer: [MPLEX],
+    connEncryption: [NOISE],
+    peerDiscovery: [MulticastDNS, Bootstrap]
+  },
+  config: {
+    peerDiscovery: {
+      autoDial: true,             // Auto connect to discovered peers (limited by ConnectionManager minConnections)
+      // The `tag` property will be searched when creating the instance of your Peer Discovery service.
+      // The associated object, will be passed to the service when it is instantiated.
+      [MulticastDNS.tag]: {
+        interval: 1000,
+        enabled: true
+      },
+      [Bootstrap.tag]: {
+        list: [ // A list of bootstrap peers to connect to starting up the node
+          "/ip4/104.131.131.82/tcp/4001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ",
+          "/dnsaddr/bootstrap.libp2p.io/ipfs/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN",
+          "/dnsaddr/bootstrap.libp2p.io/ipfs/QmQCU2EcMqAqQPR2i9bChDtGNJchTbq5TbXJJ16u19uLTa",
+        ],
+        interval: 2000,
+        enabled: true
+      }
+      // .. other discovery module options.
+    }
  }
 })
 ```
@ -295,50 +300,56 @@ const node = await createLibp2p({
 #### Setup webrtc transport and discovery

 ```js
-import { createLibp2p } from 'libp2p'
-import { WebSockets } from '@libp2p/websockets'
-import { WebRTCStar } from '@libp2p/webrtc-star'
-import { Mplex } from '@libp2p/mplex'
-import { Noise } from '@chainsafe/libp2p-noise'

-const node = await createLibp2p({
-  transports: [
-    new WebSockets(),
-    new WebRTCStar()
-  ],
-  streamMuxers: [
-    new Mplex()
-  ],
-  connectionEncryption: [
-    new Noise()
-  ]
+const Libp2p = require('libp2p')
+const WS = require('libp2p-websockets')
+const WebRTCStar = require('libp2p-webrtc-star')
+const MPLEX = require('libp2p-mplex')
+const { NOISE } = require('libp2p-noise')
+
+const node = await Libp2p.create({
+  modules: {
+    transport: [
+      WS,
+      WebRTCStar
+    ],
+    streamMuxer: [MPLEX],
+    connEncryption: [NOISE],
+  },
+  config: {
+    peerDiscovery: {
+      [WebRTCStar.tag]: {
+        enabled: true
+      }
+    }
+  }
 })
 ```

 #### Customizing Pubsub

 ```js
-import { createLibp2p } from 'libp2p'
-import { TCP } from '@libp2p/tcp'
-import { Mplex } from '@libp2p/mplex'
-import { Noise } from '@chainsafe/libp2p-noise'
-import { GossipSub } from 'libp2p-gossipsub'
-import { SignaturePolicy } from '@libp2p/interfaces/pubsub'
+const Libp2p = require('libp2p')
+const TCP = require('libp2p-tcp')
+const MPLEX = require('libp2p-mplex')
+const { NOISE } = require('libp2p-noise')
+const GossipSub = require('libp2p-gossipsub')

-const node = await createLibp2p({
-    transports: [
-      new TCP()
-    ],
-    streamMuxers: [
-      new Mplex()
-    ],
-    connectionEncryption: [
-      new Noise()
-    ],
-    pubsub: new GossipSub({
+const { SignaturePolicy } = require('libp2p-interfaces/src/pubsub/signature-policy')
+
+const node = await Libp2p.create({
+  modules: {
+    transport: [TCP],
+    streamMuxer: [MPLEX],
+    connEncryption: [NOISE],
+    pubsub: GossipSub
+  },
+  config: {
+    pubsub: {                     // The pubsub options (and defaults) can be found in the pubsub router documentation
+      enabled: true,
      emitSelf: false,                                  // whether the node should emit to self on publish
      globalSignaturePolicy: SignaturePolicy.StrictSign // message signing policy
-    })
+    }
  }
 })
 ```
@ -346,66 +357,68 @@ const node = await createLibp2p({
 #### Customizing DHT

 ```js
-import { createLibp2p } from 'libp2p'
-import { TCP } from '@libp2p/tcp'
-import { Mplex } from '@libp2p/mplex'
-import { Noise } from '@chainsafe/libp2p-noise'
-import { KadDHT } from '@libp2p/kad-dht'
+const Libp2p = require('libp2p')
+const TCP = require('libp2p-tcp')
+const MPLEX = require('libp2p-mplex')
+const { NOISE } = require('libp2p-noise')
+const DHT = require('libp2p-kad-dht')

-const node = await createLibp2p({
-  transports: [
-    new TCP()
-  ],
-  streamMuxers: [
-    new Mplex()
-  ],
-  connectionEncryption: [
-    new Noise()
-  ],
-  dht: new KadDHT({
-    kBucketSize: 20,
-    clientMode: false           // Whether to run the WAN DHT in client or server mode (default: client mode)
-  })
+const node = await Libp2p.create({
+  modules: {
+    transport: [TCP],
+    streamMuxer: [MPLEX],
+    connEncryption: [NOISE],
+    dht: DHT
+  },
+  config: {
+    dht: {                        // The DHT options (and defaults) can be found in its documentation
+      kBucketSize: 20,
+      enabled: true,              // This flag is required for DHT to run (disabled by default)
+      randomWalk: {
+        enabled: true,            // Allows to disable discovery (enabled by default)
+        interval: 300e3,
+        timeout: 10e3
+      }
+    }
+  }
 })
 ```

 #### Setup with Content and Peer Routing

 ```js
-import { createLibp2p } from 'libp2p'
-import { TCP } from '@libp2p/tcp'
-import { Mplex } from '@libp2p/mplex'
-import { Noise } from '@chainsafe/libp2p-noise'
-import { create as ipfsHttpClient } from 'ipfs-http-client'
-import { DelegatedPeerRouting } from '@libp2p/delegated-peer-routing'
-import { DelegatedContentRouting} from '@libp2p/delegated-content-routing'
-
+const Libp2p = require('libp2p')
+const TCP = require('libp2p-tcp')
+const MPLEX = require('libp2p-mplex')
+const { NOISE } = require('libp2p-noise')
+const ipfsHttpClient = require('ipfs-http-client')
+const DelegatedPeerRouter = require('libp2p-delegated-peer-routing')
+const DelegatedContentRouter = require('libp2p-delegated-content-routing')
+const PeerId = require('peer-id')

 // create a peerId
 const peerId = await PeerId.create()

-const delegatedPeerRouting = new DelegatedPeerRouting(ipfsHttpClient.create({
+const delegatedPeerRouting = new DelegatedPeerRouter(ipfsHttpClient.create({
  host: 'node0.delegate.ipfs.io', // In production you should setup your own delegates
  protocol: 'https',
  port: 443
 }))

-const delegatedContentRouting = new DelegatedContentRouting(peerId, ipfsHttpClient.create({
+const delegatedContentRouting = new DelegatedContentRouter(peerId, ipfsHttpClient.create({
  host: 'node0.delegate.ipfs.io', // In production you should setup your own delegates
  protocol: 'https',
  port: 443
 }))

-const node = await createLibp2p({
-  transports: [new TCP()],
-  streamMuxers: [new Mplex()],
-  connectionEncryption: [new Noise()],
-  contentRouting: [
-    delegatedContentRouting
-  ],
-  peerRouting: [
-    delegatedPeerRouting
-  ],
+const node = await Libp2p.create({
+  modules: {
+    transport: [TCP],
+    streamMuxer: [MPLEX],
+    connEncryption: [NOISE],
+    contentRouting: [delegatedContentRouting],
+    peerRouting: [delegatedPeerRouting],
+  },
  peerId,
  peerRouting: { // Peer routing configuration
    refreshManager: { // Refresh known and connected closest peers
@ -420,25 +433,29 @@ const node = await createLibp2p({
 #### Setup with Relay

 ```js
-import { createLibp2p } from 'libp2p'
-import { TCP } from '@libp2p/tcp'
-import { Mplex } from '@libp2p/mplex'
-import { Noise } from '@chainsafe/libp2p-noise'
+const Libp2p = require('libp2p')
+const TCP = require('libp2p-tcp')
+const MPLEX = require('libp2p-mplex')
+const { NOISE } = require('libp2p-noise')

-const node = await createLibp2p({
-  transports: [new TCP()],
-  streamMuxers: [new Mplex()],
-  connectionEncryption: [new Noise()],
-  relay: {                   // Circuit Relay options (this config is part of libp2p core configurations)
-    enabled: true,           // Allows you to dial and accept relayed connections. Does not make you a relay.
-    hop: {
-      enabled: true,         // Allows you to be a relay for other peers
-      active: true           // You will attempt to dial destination peers if you are not connected to them
-    },
-    advertise: {
-      bootDelay: 15 * 60 * 1000, // Delay before HOP relay service is advertised on the network
-      enabled: true,          // Allows you to disable the advertise of the Hop service
-      ttl: 30 * 60 * 1000     // Delay Between HOP relay service advertisements on the network
+const node = await Libp2p.create({
+  modules: {
+    transport: [TCP],
+    streamMuxer: [MPLEX],
+    connEncryption: [NOISE]
+  },
+  config: {
+    relay: {                   // Circuit Relay options (this config is part of libp2p core configurations)
+      enabled: true,           // Allows you to dial and accept relayed connections. Does not make you a relay.
+      hop: {
+        enabled: true,         // Allows you to be a relay for other peers
+        active: true           // You will attempt to dial destination peers if you are not connected to them
+      },
+      advertise: {
+        bootDelay: 15 * 60 * 1000, // Delay before HOP relay service is advertised on the network
+        enabled: true,          // Allows you to disable the advertise of the Hop service
+        ttl: 30 * 60 * 1000     // Delay Between HOP relay service advertisements on the network
+      }
    }
  }
 })
@ -447,20 +464,24 @@ const node = await createLibp2p({
 #### Setup with Auto Relay

 ```js
-import { createLibp2p } from 'libp2p'
-import { TCP } from '@libp2p/tcp'
-import { Mplex } from '@libp2p/mplex'
-import { Noise } from '@chainsafe/libp2p-noise'
+const Libp2p = require('libp2p')
+const TCP = require('libp2p-tcp')
+const MPLEX = require('libp2p-mplex')
+const { NOISE } = require('libp2p-noise')

-const node = await createLibp2p({
-  transports: [new TCP()],
-  streamMuxers: [new Mplex()],
-  connectionEncryption: [new Noise()]
-  relay: {                   // Circuit Relay options (this config is part of libp2p core configurations)
-    enabled: true,           // Allows you to dial and accept relayed connections. Does not make you a relay.
-    autoRelay: {
-      enabled: true,         // Allows you to bind to relays with HOP enabled for improving node dialability
-      maxListeners: 2         // Configure maximum number of HOP relays to use
+const node = await Libp2p.create({
+  modules: {
+    transport: [TCP],
+    streamMuxer: [MPLEX],
+    connEncryption: [NOISE]
+  },
+  config: {
+    relay: {                   // Circuit Relay options (this config is part of libp2p core configurations)
+      enabled: true,           // Allows you to dial and accept relayed connections. Does not make you a relay.
+      autoRelay: {
+        enabled: true,         // Allows you to bind to relays with HOP enabled for improving node dialability
+        maxListeners: 2         // Configure maximum number of HOP relays to use
+      }
    }
  }
 })
@ -476,19 +497,21 @@ Libp2p allows you to setup a secure keychain to manage your keys. The keychain c
 | datastore | `object` | must implement [ipfs/interface-datastore](https://github.com/ipfs/interface-datastore) |

 ```js
-import { createLibp2p } from 'libp2p'
-import { TCP } from '@libp2p/tcp'
-import { Mplex } from '@libp2p/mplex'
-import { Noise } from '@chainsafe/libp2p-noise'
-import { LevelDatastore } from 'datastore-level'
+const Libp2p = require('libp2p')
+const TCP = require('libp2p-tcp')
+const MPLEX = require('libp2p-mplex')
+const { NOISE } = require('libp2p-noise')
+const LevelStore = require('datastore-level')

-const datastore = new LevelDatastore('path/to/store')
+const datastore = new LevelStore('path/to/store')
 await datastore.open()

-const node = await createLibp2p({
-  transports: [new TCP()],
-  streamMuxers: [new Mplex()],
-  connectionEncryption: [new Noise()],
+const node = await Libp2p.create({
+  modules: {
+    transport: [TCP],
+    streamMuxer: [MPLEX],
+    connEncryption: [NOISE]
+  },
  keychain: {
    pass: 'notsafepassword123456789',
    datastore: dsInstant,
@ -514,18 +537,20 @@ Dialing in libp2p can be configured to limit the rate of dialing, and how long d
 The below configuration example shows how the dialer should be configured, with the current defaults:

 ```js
-import { createLibp2p } from 'libp2p'
-import { TCP } from '@libp2p/tcp'
-import { Mplex } from '@libp2p/mplex'
-import { Noise } from '@chainsafe/libp2p-noise'
+const Libp2p = require('libp2p')
+const TCP = require('libp2p-tcp')
+const MPLEX = require('libp2p-mplex')
+const { NOISE } = require('libp2p-noise')

-import { dnsaddrResolver } from '@multiformats/multiaddr/resolvers'
-import { publicAddressesFirst } from '@libp2p-utils/address-sort'
+const { dnsaddrResolver } = require('multiaddr/src/resolvers')
+const { publicAddressesFirst } = require('libp2p-utils/src/address-sort')

-const node = await createLibp2p({
-  transports: [new TCP()],
-  streamMuxers: [new Mplex()],
-  connectionEncryption: [new Noise()],
+const node = await Libp2p.create({
+  modules: {
+    transport: [TCP],
+    streamMuxer: [MPLEX],
+    connEncryption: [NOISE]
+  },
  dialer: {
    maxParallelDials: 100,
    maxAddrsToDial: 25,
@ -543,15 +568,17 @@ const node = await createLibp2p({
 The Connection Manager prunes Connections in libp2p whenever certain limits are exceeded. If Metrics are enabled, you can also configure the Connection Manager to monitor the bandwidth of libp2p and prune connections as needed. You can read more about what Connection Manager does at [./CONNECTION_MANAGER.md](./CONNECTION_MANAGER.md). The configuration values below show the defaults for Connection Manager. See [./CONNECTION_MANAGER.md](./CONNECTION_MANAGER.md#options) for a full description of the parameters.

 ```js
-import { createLibp2p } from 'libp2p'
-import { TCP } from '@libp2p/tcp'
-import { Mplex } from '@libp2p/mplex'
-import { Noise } from '@chainsafe/libp2p-noise'
+const Libp2p = require('libp2p')
+const TCP = require('libp2p-tcp')
+const MPLEX = require('libp2p-mplex')
+const { NOISE } = require('libp2p-noise')

-const node = await createLibp2p({
-  transports: [new TCP()],
-  streamMuxers: [new Mplex()],
-  connectionEncryption: [new Noise()],
+const node = await Libp2p.create({
+  modules: {
+    transport: [TCP],
+    streamMuxer: [MPLEX],
+    connEncryption: [NOISE]
+  },
  connectionManager: {
    maxConnections: Infinity,
    minConnections: 0,
@ -567,142 +594,24 @@ const node = await createLibp2p({
 })
 ```

-#### Configuring Connection Gater
-
-The Connection Gater allows us to prevent making incoming and outgoing connections to peers and storing
-multiaddrs in the address book.
-
-The order in which methods are called is as follows:
-
-##### Outgoing connections
-
-1. `connectionGater.denyDialPeer(...)`
-2. `connectionGater.denyDialMultiaddr(...)`
-3. `connectionGater.denyOutboundConnection(...)`
-4. `connectionGater.denyOutboundEncryptedConnection(...)`
-5. `connectionGater.denyOutboundUpgradedConnection(...)`
-
-##### Incoming connections
-
-1. `connectionGater.denyInboundConnection(...)`
-2. `connectionGater.denyInboundEncryptedConnection(...)`
-3. `connectionGater.denyInboundUpgradedConnection(...)`
-
-```js
-const node = await createLibp2p({
-  // .. other config
-  connectionGater: {
-    /**
-     * denyDialMultiaddr tests whether we're permitted to Dial the
-     * specified peer.
-     *
-     * This is called by the dialer.connectToPeer implementation before
-     * dialling a peer.
-     *
-     * Return true to prevent dialing the passed peer.
-     */
-    denyDialPeer: (peerId: PeerId) => Promise<boolean>
-
-    /**
-     * denyDialMultiaddr tests whether we're permitted to dial the specified
-     * multiaddr for the given peer.
-     *
-     * This is called by the dialer.connectToPeer implementation after it has
-     * resolved the peer's addrs, and prior to dialling each.
-     *
-     * Return true to prevent dialing the passed peer on the passed multiaddr.
-     */
-    denyDialMultiaddr: (peerId: PeerId, multiaddr: Multiaddr) => Promise<boolean>
-
-    /**
-     * denyInboundConnection tests whether an incipient inbound connection is allowed.
-     *
-     * This is called by the upgrader, or by the transport directly (e.g. QUIC,
-     * Bluetooth), straight after it has accepted a connection from its socket.
-     *
-     * Return true to deny the incoming passed connection.
-     */
-    denyInboundConnection: (maConn: MultiaddrConnection) => Promise<boolean>
-
-    /**
-     * denyOutboundConnection tests whether an incipient outbound connection is allowed.
-     *
-     * This is called by the upgrader, or by the transport directly (e.g. QUIC,
-     * Bluetooth), straight after it has created a connection with its socket.
-     *
-     * Return true to deny the incoming passed connection.
-     */
-    denyOutboundConnection: (peerId: PeerId, maConn: MultiaddrConnection) => Promise<boolean>
-
-    /**
-     * denyInboundEncryptedConnection tests whether a given connection, now encrypted,
-     * is allowed.
-     *
-     * This is called by the upgrader, after it has performed the security
-     * handshake, and before it negotiates the muxer, or by the directly by the
-     * transport, at the exact same checkpoint.
-     *
-     * Return true to deny the passed secured connection.
-     */
-    denyInboundEncryptedConnection: (peerId: PeerId, maConn: MultiaddrConnection) => Promise<boolean>
-
-    /**
-     * denyOutboundEncryptedConnection tests whether a given connection, now encrypted,
-     * is allowed.
-     *
-     * This is called by the upgrader, after it has performed the security
-     * handshake, and before it negotiates the muxer, or by the directly by the
-     * transport, at the exact same checkpoint.
-     *
-     * Return true to deny the passed secured connection.
-     */
-    denyOutboundEncryptedConnection: (peerId: PeerId, maConn: MultiaddrConnection) => Promise<boolean>
-
-    /**
-     * denyInboundUpgradedConnection tests whether a fully capable connection is allowed.
-     *
-     * This is called after encryption has been negotiated and the connection has been
-     * multiplexed, if a multiplexer is configured.
-     *
-     * Return true to deny the passed upgraded connection.
-     */
-    denyInboundUpgradedConnection: (peerId: PeerId, maConn: MultiaddrConnection) => Promise<boolean>
-
-    /**
-     * denyOutboundUpgradedConnection tests whether a fully capable connection is allowed.
-     *
-     * This is called after encryption has been negotiated and the connection has been
-     * multiplexed, if a multiplexer is configured.
-     *
-     * Return true to deny the passed upgraded connection.
-     */
-    denyOutboundUpgradedConnection: (peerId: PeerId, maConn: MultiaddrConnection) => Promise<boolean>
-
-    /**
-     * Used by the address book to filter passed addresses.
-     *
-     * Return true to allow storing the passed multiaddr for the passed peer.
-     */
-    filterMultiaddrForPeer: (peer: PeerId, multiaddr: Multiaddr) => Promise<boolean>
-  }
-})
-```
-
 #### Configuring Transport Manager

-The Transport Manager is responsible for managing the libp2p transports life cycle. This includes starting listeners for the provided listen addresses, closing these listeners and dialing using the provided transports. By default, if a libp2p node has a list of multiaddrs for listening on and there are no valid transports for those multiaddrs, libp2p will throw an error on startup and shutdown. However, for some applications it is perfectly acceptable for libp2p nodes to start in dial only mode if all the listen multiaddrs failed. This error tolerance can be enabled as follows:
+The Transport Manager is responsible for managing the libp2p transports life cycle. This includes starting listeners for the provided listen addresses, closing these listeners and dialing using the provided transports. By default, if a libp2p node has a list of multiaddrs for listenning on and there are no valid transports for those multiaddrs, libp2p will throw an error on startup and shutdown. However, for some applications it is perfectly acceptable for libp2p nodes to start in dial only mode if all the listen multiaddrs failed. This error tolerance can be enabled as follows:

 ```js
-import { createLibp2p } from 'libp2p'
-import { TCP } from '@libp2p/tcp'
-import { Mplex } from '@libp2p/mplex'
-import { Noise } from '@chainsafe/libp2p-noise'
-import { FaultTolerance } from 'libp2p/transport-manager'
+const Libp2p = require('libp2p')
+const TCP = require('libp2p-tcp')
+const MPLEX = require('libp2p-mplex')
+const { NOISE } = require('libp2p-noise')

-const node = await createLibp2p({
-  transports: [new TCP()],
-  streamMuxers: [new Mplex()],
-  connectionEncryption: [new Noise()],
+const { FaultTolerance } = require('libp2p/src/transport-manager')
+
+const node = await Libp2p.create({
+  modules: {
+    transport: [TCP],
+    streamMuxer: [MPLEX],
+    connEncryption: [NOISE]
+  },
  transportManager: {
    faultTolerance: FaultTolerance.NO_FATAL
  }
@ -724,15 +633,17 @@ Metrics are disabled in libp2p by default. You can enable and configure them as
 The below configuration example shows how the metrics should be configured. Aside from enabled being `false` by default, the following default configuration options are listed below:

 ```js
-import { createLibp2p } from 'libp2p'
-import { TCP } from '@libp2p/tcp'
-import { Mplex } from '@libp2p/mplex'
-import { Noise } from '@chainsafe/libp2p-noise'
+const Libp2p = require('libp2p')
+const TCP = require('libp2p-tcp')
+const MPLEX = require('libp2p-mplex')
+const { NOISE } = require('libp2p-noise')

-const node = await createLibp2p({
-  transports: [new TCP()],
-  streamMuxers: [new Mplex()],
-  connectionEncryption: [new Noise()]
+const node = await Libp2p.create({
+  modules: {
+    transport: [TCP],
+    streamMuxer: [MPLEX],
+    connEncryption: [NOISE]
+  },
  metrics: {
    enabled: true,
    computeThrottleMaxQueueSize: 1000,
@ -761,20 +672,22 @@ The threshold number represents the maximum number of "dirty peers" allowed in t
 The below configuration example shows how the PeerStore should be configured. Aside from persistence being `false` by default, the following default configuration options are listed below:

 ```js
-import { createLibp2p } from 'libp2p'
-import { TCP } from '@libp2p/tcp'
-import { Mplex } from '@libp2p/mplex'
-import { Noise } from '@chainsafe/libp2p-noise'
-import { LevelDatastore } from 'datastore-level'
+const Libp2p = require('libp2p')
+const TCP = require('libp2p-tcp')
+const MPLEX = require('libp2p-mplex')
+const { NOISE } = require('libp2p-noise')
+const LevelStore = require('datastore-level')

-const datastore = new LevelDatastore('path/to/store')
-await datastore.open() // level database must be ready before node boot
+const datastore = new LevelStore('path/to/store')
+const dsInstant = await datastore.open()

-const node = await createLibp2p({
-  datastore, // pass the opened datastore
-  transports: [new TCP()],
-  streamMuxers: [new Mplex()],
-  connectionEncryption: [new Noise()],
+const node = await Libp2p.create({
+  modules: {
+    transport: [TCP],
+    streamMuxer: [MPLEX],
+    connEncryption: [NOISE]
+  },
+  datastore: dsInstant,
  peerStore: {
    persistence: true,
    threshold: 5
@ -787,23 +700,19 @@ const node = await createLibp2p({
 Some Transports can be passed additional options when they are created. For example, `libp2p-webrtc-star` accepts an optional, custom `wrtc` implementation. In addition to libp2p passing itself and an `Upgrader` to handle connection upgrading, libp2p will also pass the options, if they are provided, from `config.transport`.

 ```js
-import { createLibp2p } from 'libp2p'
-import { WebRTCStar } from '@libp2p/webrtc-star'
-import { Mplex } from '@libp2p/mplex'
-import { Noise } from '@chainsafe/libp2p-noise'
-import wrtc from 'wrtc'
+const Libp2p = require('libp2p')
+const WebRTCStar = require('libp2p-webrtc-star')
+const MPLEX = require('libp2p-mplex')
+const { NOISE } = require('libp2p-noise')
+const wrtc = require('wrtc')

 const transportKey = WebRTCStar.prototype[Symbol.toStringTag]
-const node = await createLibp2p({
-  transports: [
-    new WebRTCStar()
-  ],
-  streamMuxers: [
-    new Mplex()
-  ],
-  connectionEncryption: [
-    new Noise()
-  ],
+const node = await Libp2p.create({
+  modules: {
+    transport: [WebRTCStar],
+    streamMuxer: [MPLEX],
+    connEncryption: [NOISE]
+  },
  config: {
    transport: {
      [transportKey]: {
@ -818,16 +727,12 @@ During Libp2p startup, transport listeners will be created for the configured li

 ```js
 const transportKey = WebRTCStar.prototype[Symbol.toStringTag]
-const node = await createLibp2p({
-  transports: [
-    new WebRTCStar()
-  ],
-  streamMuxers: [
-    new Mplex()
-  ],
-  connectionEncryption: [
-    new Noise()
-  ],
+const node = await Libp2p.create({
+  modules: {
+    transport: [WebRTCStar],
+    streamMuxer: [MPLEX],
+    connEncryption: [NOISE]
+  },
  addresses: {
    listen: ['/dns4/your-wrtc-star.pub/tcp/443/wss/p2p-webrtc-star'] // your webrtc dns multiaddr
  },
@ -854,16 +759,18 @@ Network Address Translation (NAT) is a function performed by your router to enab
 The NAT manager can be configured as follows:

 ```js
-const node = await createLibp2p({
+const node = await Libp2p.create({
  config: {
    nat: {
      description: 'my-node', // set as the port mapping description on the router, defaults the current libp2p version and your peer id
      enabled: true, // defaults to true
      gateway: '192.168.1.1', // leave unset to auto-discover
      externalIp: '80.1.1.1', // leave unset to auto-discover
-      localAddress: '129.168.1.123', // leave unset to auto-discover
      ttl: 7200, // TTL for port mappings (min 20 minutes)
      keepAlive: true, // Refresh port mapping after TTL expires
+      pmp: {
+        enabled: false, // defaults to false
+      }
    }
  }
 })
@ -881,11 +788,13 @@ By default under nodejs libp2p will attempt to use [UPnP](https://en.wikipedia.o

 #### Configuring protocol name

-Changing the protocol name prefix can isolate default public network (IPFS) for custom purposes.
+Changing the protocol name prefix can isolate default public network (IPFS) for custom purposes. 

 ```js
-const node = await createLibp2p({
-  protocolPrefix: 'ipfs' // default
+const node = await Libp2p.create({
+  config: {
+    protocolPrefix: 'ipfs' // default
+  }
 })
 /*
 protocols: [
@ -896,12 +805,13 @@ protocols: [
 */
 ```

+
 ## Configuration examples

 As libp2p is designed to be a modular networking library, its usage will vary based on individual project needs. We've included links to some existing project configurations for your reference, in case you wish to replicate their configuration:

- [libp2p-ipfs-nodejs](https://github.com/ipfs/js-ipfs/blob/master/packages/ipfs-core-config/src/libp2p.js) - libp2p configuration used by js-ipfs when running in Node.js
- [libp2p-ipfs-browser](https://github.com/ipfs/js-ipfs/blob/master/packages/ipfs-core-config/src/libp2p.browser.js) - libp2p configuration used by js-ipfs when running in a Browser (that supports WebRTC)
+- [libp2p-ipfs-nodejs](https://github.com/ipfs/js-ipfs/blob/master/packages/ipfs/src/core/runtime/libp2p-nodejs.js) - libp2p configuration used by js-ipfs when running in Node.js
+- [libp2p-ipfs-browser](https://github.com/ipfs/js-ipfs/blob/master/packages/ipfs/src/core/runtime/libp2p-browser.js) - libp2p configuration used by js-ipfs when running in a Browser (that supports WebRTC)

 If you have developed a project using `js-libp2p`, please consider submitting your configuration to this list so that it can be found easily by other users.

--- a/doc/GETTING_STARTED.md
+++ b/doc/GETTING_STARTED.md
@ -12,6 +12,7 @@ Welcome to libp2p! This guide will walk you through setting up a fully functiona
      - [Running Libp2p](#running-libp2p)
    - [Custom setup](#custom-setup)
      - [Peer Discovery](#peer-discovery)
+      - [Pubsub](#pubsub)
  - [What is next](#what-is-next)

 ## Install
@ -45,11 +46,13 @@ npm install libp2p-websockets
 Now that we have the module installed, let's configure libp2p to use the Transport. We'll use the [`Libp2p.create`](./API.md#create) method, which takes a single configuration object as its only parameter. We can add the Transport by passing it into the `modules.transport` array:

 ```js
-import { createLibp2p } from 'libp2p'
-import { WebSockets } from '@libp2p/websockets'
+const Libp2p = require('libp2p')
+const WebSockets = require('libp2p-websockets')

-const node = await createLibp2p({
-  transports: [new WebSockets()]
+const node = await Libp2p.create({
+  modules: {
+    transport: [WebSockets]
+  }
 })
 ```

@ -75,13 +78,15 @@ npm install libp2p-noise
 With `libp2p-noise` installed, we can add it to our existing configuration by importing it and adding it to the `modules.connEncryption` array:

 ```js
-import { createLibp2p } from 'libp2p'
-import { WebSockets } from '@libp2p/websockets'
-import { Noise } from '@chainsafe/libp2p-noise'
+const Libp2p = require('libp2p')
+const WebSockets = require('libp2p-websockets')
+const { NOISE } = require('libp2p-noise')

-const node = await createLibp2p({
-  transports: [new WebSockets()],
-  connectionEncryption: [new Noise()]
+const node = await Libp2p.create({
+  modules: {
+    transport: [WebSockets],
+    connEncryption: [NOISE]
+  }
 })
 ```

@ -105,15 +110,17 @@ npm install libp2p-mplex
 ```

 ```js
-import { createLibp2p } from 'libp2p'
-import { WebSockets } from '@libp2p/websockets'
-import { Noise } from '@chainsafe/libp2p-noise'
-import { Mplex } from '@libp2p/mplex'
+const Libp2p = require('libp2p')
+const WebSockets = require('libp2p-websockets')
+const { NOISE } = require('libp2p-noise')
+const MPLEX = require('libp2p-mplex')

-const node = await createLibp2p({
-  transports: [new WebSockets()],
-  connectionEncryption: [new Noise()],
-  streamMuxers: [new Mplex()]
+const node = await Libp2p.create({
+  modules: {
+    transport: [WebSockets],
+    connEncryption: [NOISE],
+    streamMuxer: [MPLEX]
+  }
 })
 ```

@ -130,18 +137,20 @@ If you want to know more about libp2p stream multiplexing, you should read the f
 Now that you have configured a [**Transport**][transport], [**Crypto**][crypto] and [**Stream Multiplexer**](streamMuxer) module, you can start your libp2p node. We can start and stop libp2p using the [`libp2p.start()`](./API.md#start) and [`libp2p.stop()`](./API.md#stop) methods.

 ```js
-import { createLibp2p } from 'libp2p'
-import { WebSockets } from '@libp2p/websockets'
-import { Noise } from '@chainsafe/libp2p-noise'
-import { Mplex } from '@libp2p/mplex'
+const Libp2p = require('libp2p')
+const WebSockets = require('libp2p-websockets')
+const { NOISE } = require('libp2p-noise')
+const MPLEX = require('libp2p-mplex')

-const node = await createLibp2p({
+const node = await Libp2p.create({
  addresses: {
    listen: ['/ip4/127.0.0.1/tcp/8000/ws']
  },
-  transports: [new WebSockets()],
-  connectionEncryption: [new Noise()],
-  streamMuxers: [new Mplex()]
+  modules: {
+    transport: [WebSockets],
+    connEncryption: [NOISE],
+    streamMuxer: [MPLEX]
+  }
 })

 // start libp2p
@ -186,12 +195,12 @@ npm install libp2p-bootstrap
 We can provide specific configurations for each protocol within a `config.peerDiscovery` property in the options as shown below.

 ```js
-import { createLibp2p } from 'libp2p'
-import { WebSockets } from '@libp2p/websockets'
-import { Noise } from '@chainsafe/libp2p-noise'
-import { Mplex } from '@libp2p/mplex'
+const Libp2p = require('libp2p')
+const WebSockets = require('libp2p-websockets')
+const { NOISE } = require('libp2p-noise')
+const MPLEX = require('libp2p-mplex')

-import { Bootstrap } from '@libp2p/bootstrap'
+const Bootstrap = require('libp2p-bootstrap')

 // Known peers addresses
 const bootstrapMultiaddrs = [
@ -199,25 +208,23 @@ const bootstrapMultiaddrs = [
  '/dnsaddr/bootstrap.libp2p.io/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN'
 ]

-const node = await createLibp2p({
-  transports: [
-    new WebSockets()
-  ],
-  connectionEncryption: [
-    new Noise()
-  ],
-  streamMuxers: [
-    new Mplex()
-  ],
-  peerDiscovery: [
-    new Bootstrap({
-      list: bootstrapMultiaddrs // provide array of multiaddrs
-    })
-  ],
-  connectionManager: {
-    autoDial: true, // Auto connect to discovered peers (limited by ConnectionManager minConnections)
-    // The `tag` property will be searched when creating the instance of your Peer Discovery service.
-    // The associated object, will be passed to the service when it is instantiated.
+const node = await Libp2p.create({
+  modules: {
+    transport: [WebSockets],
+    connEncryption: [NOISE],
+    streamMuxer: [MPLEX],
+    peerDiscovery: [Bootstrap]
+  },
+  config: {
+    peerDiscovery: {
+      autoDial: true, // Auto connect to discovered peers (limited by ConnectionManager minConnections)
+      // The `tag` property will be searched when creating the instance of your Peer Discovery service.
+      // The associated object, will be passed to the service when it is instantiated.
+      [Bootstrap.tag]: {
+        enabled: true,
+        list: bootstrapMultiaddrs // provide array of multiaddrs
+      }
+    }
  }
 })

--- a/doc/PEER_DISCOVERY.md
+++ b/doc/PEER_DISCOVERY.md
@ -3,7 +3,7 @@
 **Synopsis**:
 * All peers discovered are emitted via `peer:discovery` so applications can take any desired action.
 * Libp2p defaults to automatically connecting to new peers, when under the [ConnectionManager](https://github.com/libp2p/js-libp2p-connection-manager) low watermark (minimum peers).
-  * Applications can disable this via the `connectionManager.autoDial` config property, and handle connections themselves.
+  * Applications can disable this via the `peerDiscovery.autoDial` config property, and handle connections themselves.
  * Applications who have not disabled this should **never** connect on peer discovery. Applications should use the `peer:connect` event if they wish to take a specific action on new peers.

 ## Scenarios
--- a/doc/STREAMING_ITERABLES.md
+++ b/doc/STREAMING_ITERABLES.md
@ -22,8 +22,8 @@
 Sometimes you may need to wrap an existing duplex stream in order to perform incoming and outgoing [transforms](#transform) on data. This type of wrapping is commonly used in stream encryption/decryption. Using [it-pair][it-pair] and [it-pipe][it-pipe], we can do this rather easily, given an existing [duplex iterable](#duplex).

 ```js
-import { duplexPair } from 'it-pair/duplex'
-import { pipe } from 'it-pipe'
+const duplexPair = require('it-pair/duplex')
+const pipe = require('it-pipe')

 // Wrapper is what we will write and read from
 // This gives us two duplex iterables that are internally connected
--- a/doc/migrations/v0.26-v0.27.md
+++ b/doc/migrations/v0.26-v0.27.md
@ -4,18 +4,16 @@ A migration guide for refactoring your application code from libp2p v0.26.x to v

 ## Table of Contents

- [Migrating to the libp2p@0.27 API](#migrating-to-the-libp2p027-api)
-  - [Table of Contents](#table-of-contents)
-  - [Migrating from callbacks](#migrating-from-callbacks)
-  - [Pull Streams to Streaming Iterables](#pull-streams-to-streaming-iterables)
-  - [Sample API Migrations](#sample-api-migrations)
-    - [Registering Protocol Handlers](#registering-protocol-handlers)
-    - [Dialing and Sending Data](#dialing-and-sending-data)
-    - [Checking if a peer is connected](#checking-if-a-peer-is-connected)
-    - [Pinging another peer](#pinging-another-peer)
-    - [Pubsub](#pubsub)
-      - [Getting subscribers](#getting-subscribers)
-      - [Getting subscribed topics](#getting-subscribed-topics)
+- [Migrating from callbacks](#migrating-from-callbacks)
+- [Pull Streams to Streaming Iterables](#pull-streams-to-streaming-iterables)
+- [Sample API Migrations](#sample-api-migrations)
+  - [Registering Protocol Handlers](#registering-protocol-handlers)
+  - [Dialing and Sending Data](#dialing-and-sending-data)
+  - [Checking if a peer is connected](#checking-if-a-peer-is-connected)
+  - [Pinging another peer](#pinging-another-peer)
+  - [Pubsub](#pubsub)
+    - [Getting subscribers](#getting-subscribers)
+    - [Getting subscribed topics](#getting-subscribed-topics)

 ## Migrating from callbacks

--- a/doc/migrations/v0.27-v0.28.md
+++ b/doc/migrations/v0.27-v0.28.md
@ -16,7 +16,7 @@ A migration guide for refactoring your application code from libp2p v0.27.x to v

 In `libp2p@0.27` we integrated the PeerStore (former [peer-book](https://github.com/libp2p/js-peer-book)) into the codebase. By that time, it was not documented in the [API DOC](../API.md) since it kept the same API as the `peer-book` and it was expected to be completelly rewritten in `libp2p@0.28`.

-Moving towards a separation of concerns regarding known peers' data, as well as enabling PeerStore persistence, the PeerStore is now divided into four main components: `AddressBook`, `ProtoBook`, `KeyBook` and `MetadataBook`. This resulted in API changes in the PeerStore, since each type of peer data should now be added in an atomic fashion.
+Moving towards a separation of concerns regarding known peers' data, as well as enabling PeerStore persistence, the PeerStore is now divided into four main components: `AddressBook`, `ProtoBook`, `KeyBook` and `MetadataBook`. This resulted in API changes in the PeerStore, since each type of peer data should now be added in an atomic fashion. 

 ### Adding a Peer

@ -109,7 +109,7 @@ const peers = libp2p.peerStore.peers

 Since this PeerInfo instances were navigating through the entire codebases, some data inconsistencies could be observed in libp2p. Different libp2p subsystems were running with different visions of the known peers data. For instance, a libp2p subsystem receives a copy of this instance with the peer multiaddrs and protocols, but if new data of the peer is obtained from other subsystem, it would not be updated on the former. Moreover, considering that several subsystems were modifying the peer data, libp2p had no way to determine the accurate data.

-Considering the complete revamp of the libp2p PeerStore towards its second version, the PeerStore now acts as the single source of truth, we do not need to carry [`PeerInfo`][peer-info] instances around. This also solves all the problems stated above, since subsystems will report new observations to the PeerStore.
+Considering the complete revamp of the libp2p PeerStore towards its second version, the PeerStore now acts as the single source of truth, we do not need to carry [`PeerInfo`][peer-info] instances around. This also solves all the problems stated above, since subsystems will report new observations to the PeerStore. 

 ### Create

@ -211,7 +211,7 @@ await libp2p.start()

 #### Peer Dialing, Hangup and Ping

-`libp2p.dial`, `libp2p.dialProtocol`, `libp2p.hangup` and `libp2p.ping` supported as the target parameter a [`PeerInfo`](peer-info), a [`PeerId`](peer-id), a [`Multiaddr`][multiaddr] and a string representation of the multiaddr. Considering that [`PeerInfo`](peer-info) is being removed from libp2p, all these methods will now support the other 3 possibilities.
+`libp2p.dial`, `libp2p.dialProtocol`, `libp2p.hangup` and `libp2p.ping` supported as the target parameter a [`PeerInfo`](peer-info), a [`PeerId`](peer-id), a [`Multiaddr`][multiaddr] and a string representation of the multiaddr. Considering that [`PeerInfo`](peer-info) is being removed from libp2p, all these methods will now support the other 3 possibilities. 

 There is one relevant aspect to consider with this change. When using a [`PeerId`](peer-id), the PeerStore **MUST** have known addresses for that peer in its AddressBook, so that it can perform the request. This was also true in the past, but it is important pointing it out because it might not be enough to switch from using [`PeerInfo`](peer-info) to [`PeerId`](peer-id). When using a [`PeerInfo`](peer-info), the PeerStore was not required to have the multiaddrs when they existed on the PeerInfo instance.

--- a/doc/migrations/v0.28-v0.29.md
+++ b/doc/migrations/v0.28-v0.29.md
@ -46,18 +46,18 @@ Publish uses `Uint8Array` data instead of `Buffer`.
 const topic = 'topic'
 const data = Buffer.from('data')

-await libp2p.pubsub.publish(topic, data)
+await libp2p.pubsub.publish(topic, data)	
 ```

 **After**

 ```js
-const uint8ArrayFromString from 'uint8arrays/from-string')
+const uint8ArrayFromString = require('uint8arrays/from-string')

 const topic = 'topic'
 const data = uint8ArrayFromString('data')

-await libp2p.pubsub.publish(topic, data)
+await libp2p.pubsub.publish(topic, data)	
 ```

 #### Subscribe
@ -79,7 +79,7 @@ libp2p.pubsub.subscribe(topic, handler)
 **After**

 ```js
-const uint8ArrayToString from 'uint8arrays/to-string')
+const uint8ArrayToString = require('uint8arrays/to-string')

 const topic = 'topic'
 const handler = (msg) => {
@ -106,7 +106,7 @@ libp2p.pubsub.subscribe(topics, handler)
 **After**

 ```js
-const uint8ArrayToString from 'uint8arrays/to-string')
+const uint8ArrayToString = require('uint8arrays/to-string')

 const topics = ['a', 'b']
 const handler = (msg) => {
@ -177,8 +177,8 @@ Aiming to improve libp2p browser support, we are moving away from node core modu
 We use the [uint8arrays](https://www.npmjs.com/package/uint8arrays) utilities module to deal with `Uint8Arrays` easily and we recommend its usage in the application layer. Thanks for the module [@achingbrain](https://github.com/achingbrain)! It includes utilities like `compare`, `concat`, `equals`, `fromString` and `toString`. In this migration examples, we will be using the following:

 ```js
-const uint8ArrayFromString from 'uint8arrays/from-string')
-const uint8ArrayToString from 'uint8arrays/to-string')
+const uint8ArrayFromString = require('uint8arrays/from-string')
+const uint8ArrayToString = require('uint8arrays/to-string')
 ```

 #### contentRouting.put
--- a/doc/migrations/v0.29-v0.30.md
+++ b/doc/migrations/v0.29-v0.30.md
@ -5,13 +5,9 @@ A migration guide for refactoring your application code from libp2p v0.29.x to v

 ## Table of Contents

- [Migrating to libp2p@30](#migrating-to-libp2p30)
-  - [Table of Contents](#table-of-contents)
-  - [API](#api)
-    - [Pubsub](#pubsub)
-    - [Addresses](#addresses)
-  - [Development and Testing](#development-and-testing)
-  - [Module Updates](#module-updates)
+- [API](#api)
+- [Development and Testing](#development-and-testing)
+- [Module Updates](#module-updates)

 ## API

@ -24,8 +20,8 @@ Now `js-libp2p` does not overwrite the pubsub router options anymore. Upstream p
 **Before**

 ```js
-const Gossipsub from 'libp2p-gossipsub')
-const Libp2p from 'libp2p')
+const Gossipsub = require('libp2p-gossipsub')
+const Libp2p = require('libp2p')

 const libp2p = await Libp2p.create({
  modules: {
@ -38,8 +34,8 @@ const libp2p = await Libp2p.create({
 **After**

 ```js
-const Gossipsub from 'libp2p-gossipsub')
-const Libp2p from 'libp2p')
+const Gossipsub = require('libp2p-gossipsub')
+const Libp2p = require('libp2p')

 const libp2p = await Libp2p.create({
  modules: {
@ -61,8 +57,8 @@ The signing property is now based on a `globalSignaturePolicy` option instead of
 **Before**

 ```js
-const Gossipsub from 'libp2p-gossipsub')
-const Libp2p from 'libp2p')
+const Gossipsub = require('libp2p-gossipsub')
+const Libp2p = require('libp2p')

 const libp2p = await Libp2p.create({
  modules: {
@ -81,9 +77,9 @@ const libp2p = await Libp2p.create({
 **After**

 ```js
-const Gossipsub from 'libp2p-gossipsub')
-const { SignaturePolicy } from 'libp2p-interfaces/src/pubsub/signature-policy')
-const Libp2p from 'libp2p')
+const Gossipsub = require('libp2p-gossipsub')
+const { SignaturePolicy } = require('libp2p-interfaces/src/pubsub/signature-policy')
+const Libp2p = require('libp2p')

 const libp2p = await Libp2p.create({
  modules: {
@ -105,7 +101,7 @@ Libp2p has supported `noAnnounce` addresses configuration for some time now. How
 **Before**

 ```js
-const Libp2p from 'libp2p')
+const Libp2p = require('libp2p')

 const libp2p = await Libp2p.create({
  addresses: {
@ -119,10 +115,10 @@ const libp2p = await Libp2p.create({
 **After**

 ```js
-const Libp2p from 'libp2p')
+const Libp2p = require('libp2p')

 // Libp2p utils has several multiaddr utils you can leverage
-const isPrivate from 'libp2p-utils/src/multiaddr/is-private')
+const isPrivate = require('libp2p-utils/src/multiaddr/is-private')

 const libp2p = await Libp2p.create({
  addresses: {
@ -135,7 +131,7 @@ const libp2p = await Libp2p.create({
 ```

 It is important pointing out another change regarding address advertising. This is not an API breaking change, but it might have influence on your libp2p setup.
-Previously, when using the addresses `announce` property, its multiaddrs were concatenated with the `listen` multiaddrs and then they were filtered out by the `noAnnounce` multiaddrs, in order to create the list of multiaddrs to advertise.
+Previously, when using the addresses `announce` property, its multiaddrs were concatenated with the `listen` multiaddrs and then they were filtered out by the `noAnnounce` multiaddrs, in order to create the list of multiaddrs to advertise. 
 In `libp2p@0.30` the logic now operates as follows:

 - If `announce` addresses are provided, only they will be announced (no filters are applied)
@ -149,9 +145,9 @@ While this is not an API breaking change, there was a behavioral breaking change
 With this new behavior, if you need to use non DNS addresses, you can configure your libp2p node as follows:

 ```js
-const Websockets from 'libp2p-websockets')
-const filters from 'libp2p-websockets/src/filters')
-const Libp2p from 'libp2p')
+const Websockets = require('libp2p-websockets')
+const filters = require('libp2p-websockets/src/filters')
+const Libp2p = require('libp2p')

 const transportKey = Websockets.prototype[Symbol.toStringTag]
 const libp2p = await Libp2p.create({
@ -174,7 +170,7 @@ const libp2p = await Libp2p.create({
 With this release you should update the following libp2p modules if you are relying on them:

 <!--Specify module versions in JSON for migration below.
-It's recommended to check package.json changes for this:
+It's recommended to check package.json changes for this: 
 `git diff <release> <prev> -- package.json`
 -->

--- a/doc/migrations/v0.30-v0.31.md
+++ b/doc/migrations/v0.30-v0.31.md
@ -100,7 +100,7 @@ const keychain = new Keychain(datastore, {
 With this release you should update the following libp2p modules if you are relying on them:

 <!--Specify module versions in JSON for migration below.
-It's recommended to check package.json changes for this:
+It's recommended to check package.json changes for this: 
 `git diff <release> <prev> -- package.json`
 -->

--- a/doc/migrations/v0.36-v.037.md
+++ b/doc/migrations/v0.36-v.037.md
@ -1,256 +0,0 @@
-<!--Specify versions for migration below-->
-# Migrating to libp2p@37 <!-- omit in toc -->
-
-A migration guide for refactoring your application code from libp2p v0.36.x to v0.37.0.
-
-## Table of Contents <!-- omit in toc -->
-
- [ESM](#esm)
- [TypeScript](#typescript)
- [Config](#config)
- [Bundled modules](#bundled-modules)
- [Events](#events)
-
-## ESM
-
-The biggest change to `libp2p@0.37.0` is that the module is now [ESM-only](https://gist.github.com/sindresorhus/a39789f98801d908bbc7ff3ecc99d99c).
-
-ESM is the module system for JavaScript, it allows us to structure our code in separate files without polluting a global namespace.
-
-Other systems have tried to fill this gap, notably CommonJS, AMD, RequireJS and others, but ESM is [the official standard format](https://tc39.es/ecma262/#sec-modules) to package JavaScript code for reuse.
-
-## TypeScript
-
-The core `libp2p` module and all supporting modules have now been ported to TypeScript in a complete ground-up rewrite. This will not have a huge impact on most application code, but those that are type-aware, either by being written in TypeScript themselves or using JSDoc comments will notice full type completion and better error message when coding against the libp2p API.
-
-To reflect the updated nature of these modules, all ecosystem modules have been moved to the `@libp2p` org on npm, so `libp2p-tcp` has become `@libp2p/tcp`, `libp2p-mplex` has become `@libp2p/mplex` and so on. `@chainsafe/libp2p-noise` and `libp2p-gossipsub` are unaffected.
-
-## Config
-
-Because libp2p is now fully typed it was necessary to refactor the configuration object passed to the libp2p constructor. The reason being, it previously accepted config objects to pass to the constructors of the various modules - to type those we'd need to know the types of all possible modules in advance which isn't possible.
-
-The following changes have been made to the configuration object:
-
-1. It now takes instances of modules rather than their classes
-2. Keys from the `config` and `modules` objects have been migrated to the root of the object
-3. Use of the `enabled` flag has been removed - if you don't want a particular feature enabled, don't pass a module implementing that feature
-4. Some keys have been renamed = `transport` -> `transports`, `streamMuxer` -> `streamMuxers`, `connEncryption` -> `connectionEncryption`, etc
-5. Keys from `config.dialer` have been moved to `config.connectionManager` as the connection manager is now responsible for managing connections
-
-**Before**
-
-```js
-import Libp2p from 'libp2p'
-import TCP from 'libp2p-tcp'
-import Mplex from 'libp2p-mplex'
-import { NOISE } from '@chainsafe/libp2p-noise'
-import Gossipsub from 'libp2p-gossipsub'
-import KadDHT from 'libp2p-kad-dht'
-import Bootstrap from 'libp2p-bootstrap'
-import MulticastDNS from 'libp2p-mdns'
-
-const node = await Libp2p.create({
-  addresses: {
-    listen: ['/ip4/127.0.0.1/tcp/8000']
-  },
-  modules: {
-    transport: [
-      TCP
-    ],
-    streamMuxer: [
-      Mplex
-    ],
-    connEncryption: [
-      NOISE
-    ],
-    dht: KadDHT,
-    pubsub: Gossipsub,
-    peerDiscovery: [
-      Bootstrap,
-      MulticastDNS
-    ]
-  },
-  config: {
-    peerDiscovery: {
-      autoDial: true,
-      [MulticastDNS.tag]: {
-        interval: 1000,
-        enabled: true
-      },
-      [Bootstrap.tag]: {
-        list: [
-          // .. multiaddrs here
-        ],
-        interval: 2000,
-        enabled: true
-      }
-    },
-    dialer: {
-      dialTimeout: 60000
-    }
-  }
-})
-```
-
-**After**
-
-```js
-import { createLibp2p } from 'libp2p'
-import { TCP } from '@libp2p/tcp'
-import { Mplex } from '@libp2p/mplex'
-import { Noise } from '@chainsafe/libp2p-noise'
-import Gossipsub from '@chainsafe/libp2p-gossipsub'
-import { KadDHT } from '@libp2p/kad-dht'
-import { Bootstrap } from '@libp2p/bootstrap'
-import { MulticastDNS } from '@libp2p/mdns'
-
-const node = await createLibp2p({
-  addresses: {
-    listen: ['/ip4/127.0.0.1/tcp/8000']
-  },
-  addressManager: {
-    autoDial: true
-  },
-  connectionManager: {
-    dialTimeout: 60000
-  },
-  transports: [
-    new TCP()
-  ],
-  streamMuxers: [
-    new Mplex()
-  ],
-  connectionEncryption: [
-    new Noise()
-  ],
-  dht: new KadDHT(),
-  pubsub: new Gossipsub(),
-  peerDiscovery: [
-    new Bootstrap({
-      list: [
-        // .. multiaddrs here
-      ],
-      interval: 2000
-    }),
-    new MulticastDNS({
-      interval: 1000
-    })
-  ]
-})
-```
-
-## Bundled modules
-
-Previously you'd have to use deep import paths to get at bundled modules such as the private network module.
-
-Access to these modules is now controlled by the package.json export map so your import paths will need to be updated:
-
-**Before**
-
-```js
-import plaintext from 'libp2p/src/insecure/plaintext.js'
-import Protector from 'libp2p/src/pnet/index.js'
-import generateKey from 'libp2p/src/pnet/key-generator.js'
-import TransportManager from 'libp2p/src/transport-manager.js'
-```
-
-**After**
-
-```js
-import { Plaintext } from 'libp2p/insecure'
-import { PreSharedKeyConnectionProtector, generateKey } from 'libp2p/pnet'
-import { TransportManager } from 'libp2p/transport-manager'
-```
-
-## Events
-
-To reduce our dependency on Node.js internals, use of [EventEmitter](https://nodejs.org/api/events.html#class-eventemitter) has been replaced with the standard [EventTarget](https://developer.mozilla.org/en-US/docs/Web/API/EventTarget).
-
-The EventTarget API is very similar to [HTML DOM Events](https://developer.mozilla.org/en-US/docs/Web/API/Event) used by the browser.
-
-All events are instances of the [CustomEvent](https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent) class. Event-specific information can be accessed via the `.detail` property of the passed event.
-
-They type of event emitted can be inferred from the types for each event emitter.
-
-**Before**
-
-```js
-const handler = (peerInfo) => {
-  //...
-}
-
-// listen for event
-libp2p.on('peer:discovery', handler)
-
-// stop listening for event
-libp2p.removeListener('peer:discovery', handler)
-libp2p.off('peer:discovery', handler)
-```
-
-**After**
-
-```js
-const handler = (event) => {
-  const peerInfo = event.detail
-  //...
-}
-
-// listen for event
-libp2p.addEventListener('peer:discovery', handler)
-
-// stop listening for event
-libp2p.removeEventListener('peer:discovery', handler)
-```
-
-## Pubsub
-
-Similar to the events refactor above, pubsub is now driven by the standard [EventTarget](https://developer.mozilla.org/en-US/docs/Web/API/EventTarget) API.
-
-You can still subscribe to events without a listener with `.subscribe` but all other uses now use the standard API.
-
-Similar to the other events emitted by libp2p the event type is [CustomEvent](https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent). This is part of the js language but at the time of writing Node.js [does not support](https://github.com/nodejs/node/issues/40678) `CustomEvent`, so a polyfill is supplied as part of the `@libp2p/interfaces`
-
-**Before**
-
-```js
-const handler = (message: Message) => {
-  const topic = message.topic
-
-  //...
-}
-
-// listen for event
-libp2p.pubsub.subscribe('my-topic')
-libp2p.pubsub.on('my-topic', handler)
-
-// send event
-libp2p.pubsub.emit('my-topic', Uint8Array.from([0, 1, 2, 3]))
-
-// stop listening for event
-libp2p.unsubscribe('my-topic', handler)
-libp2p.pubsub.off('my-topic', handler)
-```
-
-**After**
-
-```js
-import type { Message } from '@libp2p/interfaces/pubsub'
-
-const handler = (event: CustomEvent<Message>) => {
-  const message = event.detail
-  const topic = message.topic
-
-  //...
-}
-
-// listen for event
-libp2p.pubsub.subscribe('my-topic')
-libp2p.pubsub.addEventListener('message', handler)
-
-// send event
-libp2p.pubsub.publish('my-topic', Uint8Array.from([0, 1, 2, 3]))
-
-// stop listening for event
-libp2p.pubsub.unsubscribe('my-topic')
-libp2p.pubsub.removeEventListener('message', handler)
-```
--- a/examples/auto-relay/README.md
+++ b/examples/auto-relay/README.md
@ -16,27 +16,31 @@ In the first step of this example, we need to configure and run a relay node in
 The relay node will need to have its relay subsystem enabled, as well as its HOP capability. It can be configured as follows:

 ```js
-import { createLibp2p } from 'libp2p'
-import { WebSockets } from '@libp2p/websockets'
-import { Noise } from '@chainsafe/libp2p-noise'
-import { Mplex } from '@libp2p/mplex'
+const Libp2p = require('libp2p')
+const Websockets = require('libp2p-websockets')
+const { NOISE } = require('@chainsafe/libp2p-noise')
+const MPLEX = require('libp2p-mplex')

-const node = await createLibp2p({
-  transports: [new WebSockets()],
-  connectionEncryption: [new Noise()],
-  streamMuxers: [new Mplex()]
+const node = await Libp2p.create({
+  modules: {
+    transport: [Websockets],
+    connEncryption: [NOISE],
+    streamMuxer: [MPLEX]
+  },
  addresses: {
    listen: ['/ip4/0.0.0.0/tcp/0/ws']
    // TODO check "What is next?" section
    // announce: ['/dns4/auto-relay.libp2p.io/tcp/443/wss/p2p/QmWDn2LY8nannvSWJzruUYoLZ4vV83vfCBwd8DipvdgQc3']
  },
-  relay: {
-    enabled: true,
-    hop: {
-      enabled: true
-    },
-    advertise: {
+  config: {
+    relay: {
      enabled: true,
+      hop: {
+        enabled: true
+      },
+      advertise: {
+        enabled: true,
+      }
    }
  }
 })
@ -70,25 +74,29 @@ Listening on:
 One of the typical use cases for Auto Relay is nodes behind a NAT or browser nodes due to their inability to expose a public address. For running a libp2p node that automatically binds itself to connected HOP relays, you can see the following:

 ```js
-import { createLibp2p } from 'libp2p'
-import { WebSockets } from '@libp2p/websockets'
-import { Noise } from '@chainsafe/libp2p-noise'
-import { Mplex } from '@libp2p/mplex'
+const Libp2p = require('libp2p')
+const Websockets = require('libp2p-websockets')
+const { NOISE } = require('@chainsafe/libp2p-noise')
+const MPLEX = require('libp2p-mplex')

 const relayAddr = process.argv[2]
 if (!relayAddr) {
  throw new Error('the relay address needs to be specified as a parameter')
 }

-const node = await createLibp2p({
-  transports: [new WebSockets()],
-  connectionEncryption: [new Noise()],
-  streamMuxers: [new Mplex()],
-  relay: {
-    enabled: true,
-    autoRelay: {
+const node = await Libp2p.create({
+  modules: {
+    transport: [Websockets],
+    connEncryption: [NOISE],
+    streamMuxer: [MPLEX]
+  },
+  config: {
+    relay: {
      enabled: true,
-      maxListeners: 2
+      autoRelay: {
+        enabled: true,
+        maxListeners: 2
+      }
    }
  }
 })
@ -98,15 +106,18 @@ console.log(`Node started with id ${node.peerId.toB58String()}`)

 const conn = await node.dial(relayAddr)

-console.log(`Connected to the HOP relay ${conn.remotePeer.toString()}`)
-
 // Wait for connection and relay to be bind for the example purpose
-node.peerStore.on('change:multiaddrs', ({ peerId }) => {
-  // Updated self multiaddrs?
-  if (peerId.equals(node.peerId)) {
-    console.log(`Advertising with a relay address of ${node.multiaddrs[0].toString()}/p2p/${node.peerId.toB58String()}`)
-  }
+await new Promise((resolve) => {
+  node.peerStore.on('change:multiaddrs', ({ peerId }) => {
+    // Updated self multiaddrs?
+    if (peerId.equals(node.peerId)) {
+      resolve()
+    }
+  })
 })
+
+console.log(`Connected to the HOP relay ${conn.remotePeer.toString()}`)
+console.log(`Advertising with a relay address of ${node.multiaddrs[0].toString()}/p2p/${node.peerId.toB58String()}`)
 ```

 As you can see in the code, we need to provide the relay address, `relayAddr`, as a process argument. This node will dial the provided relay address and automatically bind to it.
@ -134,20 +145,22 @@ Instead of dialing this relay manually, you could set up this node with the Boot
 Now that you have a relay node and a node bound to that relay, you can test connecting to the auto relay node via the relay.

 ```js
-import { createLibp2p } from 'libp2p'
-import { WebSockets } from '@libp2p/websockets'
-import { Noise } from '@chainsafe/libp2p-noise'
-import { Mplex } from '@libp2p/mplex'
+const Libp2p = require('libp2p')
+const Websockets = require('libp2p-websockets')
+const { NOISE } = require('@chainsafe/libp2p-noise')
+const MPLEX = require('libp2p-mplex')

 const autoRelayNodeAddr = process.argv[2]
 if (!autoRelayNodeAddr) {
  throw new Error('the auto relay node address needs to be specified')
 }

-const node = await createLibp2p({
-  transports: [new WebSockets()],
-  connectionEncryption: [new Noise()],
-  streamMuxers: [new Mplex()]
+const node = await Libp2p.create({
+  modules: {
+    transport: [Websockets],
+    connEncryption: [NOISE],
+    streamMuxer: [MPLEX]
+  }
 })

 await node.start()
@ -176,4 +189,4 @@ As you can see from the output, the remote address of the established connection

 Before moving into production, there are a few things that you should take into account.

-A relay node should not advertise its private address in a real world scenario, as the node would not be reachable by others. You should provide an array of public addresses in the libp2p `addresses.announce` option. If you are using websockets, bear in mind that due to browser’s security policies you cannot establish unencrypted connection from secure context. The simplest solution is to setup SSL with nginx and proxy to the node and setup a domain name for the certificate.
+A relay node should not advertise its private address in a real world scenario, as the node would not be reachable by others. You should provide an array of public addresses in the libp2p `addresses.announce` option. If you are using websockets, bear in mind that due to browser’s security policies you cannot establish unencrypted connection from secure context. The simplest solution is to setup SSL with nginx and proxy to the node and setup a domain name for the certificate.
--- a/examples/auto-relay/dialer.js
+++ b/examples/auto-relay/dialer.js
@ -1,7 +1,9 @@
-import { createLibp2p } from 'libp2p'
-import { WebSockets } from '@libp2p/websockets'
-import { Noise } from '@chainsafe/libp2p-noise'
-import { Mplex } from '@libp2p/mplex'
+'use strict'
+
+const Libp2p = require('libp2p')
+const Websockets = require('libp2p-websockets')
+const { NOISE } = require('@chainsafe/libp2p-noise')
+const MPLEX = require('libp2p-mplex')

 async function main () {
  const autoRelayNodeAddr = process.argv[2]
@ -9,20 +11,16 @@ async function main () {
    throw new Error('the auto relay node address needs to be specified')
  }

-  const node = await createLibp2p({
-    transports: [
-      new WebSockets()
-    ],
-    connectionEncryption: [
-      new Noise()
-    ],
-    streamMuxers: [
-      new Mplex()
-    ]
+  const node = await Libp2p.create({
+    modules: {
+      transport: [Websockets],
+      connEncryption: [NOISE],
+      streamMuxer: [MPLEX]
+    }
  })

  await node.start()
-  console.log(`Node started with id ${node.peerId.toString()}`)
+  console.log(`Node started with id ${node.peerId.toB58String()}`)

  const conn = await node.dial(autoRelayNodeAddr)
  console.log(`Connected to the auto relay node via ${conn.remoteAddr.toString()}`)
--- a/examples/auto-relay/listener.js
+++ b/examples/auto-relay/listener.js
@ -1,7 +1,9 @@
-import { createLibp2p } from 'libp2p'
-import { WebSockets } from '@libp2p/websockets'
-import { Noise } from '@chainsafe/libp2p-noise'
-import { Mplex } from '@libp2p/mplex'
+'use strict'
+
+const Libp2p = require('libp2p')
+const Websockets = require('libp2p-websockets')
+const { NOISE } = require('@chainsafe/libp2p-noise')
+const MPLEX = require('libp2p-mplex')

 async function main () {
  const relayAddr = process.argv[2]
@ -9,41 +11,37 @@ async function main () {
    throw new Error('the relay address needs to be specified as a parameter')
  }

-  const node = await createLibp2p({
-    transports: [
-      new WebSockets()
-    ],
-    connectionEncryption: [
-      new Noise()
-    ],
-    streamMuxers: [
-      new Mplex()
-    ],
-    relay: {
-      enabled: true,
-      autoRelay: {
+  const node = await Libp2p.create({
+    modules: {
+      transport: [Websockets],
+      connEncryption: [NOISE],
+      streamMuxer: [MPLEX]
+    },
+    config: {
+      relay: {
        enabled: true,
-        maxListeners: 2
+        autoRelay: {
+          enabled: true,
+          maxListeners: 2
+        }
      }
    }
  })

  await node.start()
-  console.log(`Node started with id ${node.peerId.toString()}`)
+  console.log(`Node started with id ${node.peerId.toB58String()}`)

  const conn = await node.dial(relayAddr)

  console.log(`Connected to the HOP relay ${conn.remotePeer.toString()}`)

  // Wait for connection and relay to be bind for the example purpose
-  node.peerStore.addEventListener('change:multiaddrs', (evt) => {
-    const { peerId } = evt.detail
-
+  node.peerStore.on('change:multiaddrs', ({ peerId }) => {
    // Updated self multiaddrs?
    if (peerId.equals(node.peerId)) {
-      console.log(`Advertising with a relay address of ${node.getMultiaddrs()[0].toString()}`)
+      console.log(`Advertising with a relay address of ${node.multiaddrs[0].toString()}/p2p/${node.peerId.toB58String()}`)
    }
-  })
+  })  
 }

 main()
--- a/examples/auto-relay/relay.js
+++ b/examples/auto-relay/relay.js
@ -1,40 +1,40 @@
-import { createLibp2p } from 'libp2p'
-import { WebSockets } from '@libp2p/websockets'
-import { Noise } from '@chainsafe/libp2p-noise'
-import { Mplex } from '@libp2p/mplex'
+'use strict'
+
+const Libp2p = require('libp2p')
+const Websockets = require('libp2p-websockets')
+const { NOISE } = require('@chainsafe/libp2p-noise')
+const MPLEX = require('libp2p-mplex')

 async function main () {
-  const node = await createLibp2p({
+  const node = await Libp2p.create({
+    modules: {
+      transport: [Websockets],
+      connEncryption: [NOISE],
+      streamMuxer: [MPLEX]
+    },
    addresses: {
      listen: ['/ip4/0.0.0.0/tcp/0/ws']
      // TODO check "What is next?" section
      // announce: ['/dns4/auto-relay.libp2p.io/tcp/443/wss/p2p/QmWDn2LY8nannvSWJzruUYoLZ4vV83vfCBwd8DipvdgQc3']
    },
-    transports: [
-      new WebSockets()
-    ],
-    connectionEncryption: [
-      new Noise()
-    ],
-    streamMuxers: [
-      new Mplex()
-    ],
-    relay: {
-      enabled: true,
-      hop: {
-        enabled: true
-      },
-      advertise: {
+    config: {
+      relay: {
        enabled: true,
+        hop: {
+          enabled: true
+        },
+        advertise: {
+          enabled: true,
+        }
      }
    }
  })

  await node.start()

-  console.log(`Node started with id ${node.peerId.toString()}`)
+  console.log(`Node started with id ${node.peerId.toB58String()}`)
  console.log('Listening on:')
-  node.getMultiaddrs().forEach((ma) => console.log(ma.toString()))
+  node.multiaddrs.forEach((ma) => console.log(`${ma.toString()}/p2p/${node.peerId.toB58String()}`))
 }

 main()
--- a/examples/auto-relay/test.js
+++ b/examples/auto-relay/test.js
@ -1,10 +1,9 @@
-import path from 'path'
-import execa from 'execa'
-import pDefer from 'p-defer'
-import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
-import { fileURLToPath } from 'url'
+'use strict'

-const __dirname = path.dirname(fileURLToPath(import.meta.url))
+const path = require('path')
+const execa = require('execa')
+const pDefer = require('p-defer')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')

 function startProcess (name, args = []) {
  return execa('node', [path.join(__dirname, name), ...args], {
@ -13,7 +12,7 @@ function startProcess (name, args = []) {
  })
 }

-export async function test () {
+async function test () {
  let output1 = ''
  let output2 = ''
  let output3 = ''
@ -51,7 +50,7 @@ export async function test () {
    output2 += uint8ArrayToString(data)

    if (output2.includes('Advertising with a relay address of') && output2.includes('/p2p/')) {
-      autoRelayAddr = output2.trim().split('Advertising with a relay address of ')[1].trim()
+      autoRelayAddr = output2.trim().split('Advertising with a relay address of ')[1]
      proc2Ready.resolve()
    }
  })
@ -91,3 +90,5 @@ export async function test () {
    }
  })
 }
+
+module.exports = test
--- a/examples/chat/src/dialer.js
+++ b/examples/chat/src/dialer.js
@ -1,16 +1,15 @@
+'use strict'
 /* eslint-disable no-console */

-import { Multiaddr } from '@multiformats/multiaddr'
-import { createLibp2p } from './libp2p.js'
-import { stdinToStream, streamToConsole } from './stream.js'
-import { createFromJSON } from '@libp2p/peer-id-factory'
-import peerIdDialerJson from './peer-id-dialer.js'
-import peerIdListenerJson from './peer-id-listener.js'
+const PeerId = require('peer-id')
+const { Multiaddr } = require('multiaddr')
+const createLibp2p = require('./libp2p')
+const { stdinToStream, streamToConsole } = require('./stream')

 async function run () {
  const [idDialer, idListener] = await Promise.all([
-    createFromJSON(peerIdDialerJson),
-    createFromJSON(peerIdListenerJson)
+    PeerId.createFromJSON(require('./peer-id-dialer')),
+    PeerId.createFromJSON(require('./peer-id-listener'))
  ])

  // Create a new libp2p node on localhost with a randomly chosen port
@ -26,12 +25,12 @@ async function run () {

  // Output this node's address
  console.log('Dialer ready, listening on:')
-  nodeDialer.getMultiaddrs().forEach((ma) => {
-    console.log(ma.toString())
+  nodeDialer.multiaddrs.forEach((ma) => {
+    console.log(ma.toString() + '/p2p/' + idDialer.toB58String())
  })

  // Dial to the remote peer (the "listener")
-  const listenerMa = new Multiaddr(`/ip4/127.0.0.1/tcp/10333/p2p/${idListener.toString()}`)
+  const listenerMa = new Multiaddr(`/ip4/127.0.0.1/tcp/10333/p2p/${idListener.toB58String()}`)
  const { stream } = await nodeDialer.dialProtocol(listenerMa, '/chat/1.0.0')

  console.log('Dialer dialed to listener on protocol: /chat/1.0.0')
--- a/examples/chat/src/libp2p.js
+++ b/examples/chat/src/libp2p.js
@ -1,23 +1,22 @@
-import { TCP } from '@libp2p/tcp'
-import { WebSockets } from '@libp2p/websockets'
-import { Mplex } from '@libp2p/mplex'
-import { Noise } from '@chainsafe/libp2p-noise'
-import defaultsDeep from '@nodeutils/defaults-deep'
-import { createLibp2p as create } from 'libp2p'
+'use strict'

-export async function createLibp2p(_options) {
+const TCP = require('libp2p-tcp')
+const WS = require('libp2p-websockets')
+const mplex = require('libp2p-mplex')
+const { NOISE } = require('@chainsafe/libp2p-noise')
+const defaultsDeep = require('@nodeutils/defaults-deep')
+const libp2p = require('../../..')
+
+async function createLibp2p(_options) {
  const defaults = {
-    transports: [
-      new TCP(),
-      new WebSockets()
-    ],
-    streamMuxers: [
-      new Mplex()
-    ],
-    connectionEncryption: [
-      new Noise()
-    ]
+    modules: {
+      transport: [TCP, WS],
+      streamMuxer: [mplex],
+      connEncryption: [NOISE],
+    },
  }

-  return create(defaultsDeep(_options, defaults))
+  return libp2p.create(defaultsDeep(_options, defaults))
 }
+
+module.exports = createLibp2p
--- a/examples/chat/src/listener.js
+++ b/examples/chat/src/listener.js
@ -1,13 +1,13 @@
+'use strict'
 /* eslint-disable no-console */

-import { createLibp2p } from './libp2p.js'
-import { stdinToStream, streamToConsole } from './stream.js'
-import { createFromJSON } from '@libp2p/peer-id-factory'
-import peerIdListenerJson from './peer-id-listener.js'
+const PeerId = require('peer-id')
+const createLibp2p = require('./libp2p.js')
+const { stdinToStream, streamToConsole } = require('./stream')

 async function run () {
  // Create a new libp2p node with the given multi-address
-  const idListener = await createFromJSON(peerIdListenerJson)
+  const idListener = await PeerId.createFromJSON(require('./peer-id-listener'))
  const nodeListener = await createLibp2p({
    peerId: idListener,
    addresses: {
@ -16,9 +16,8 @@ async function run () {
  })

  // Log a message when a remote peer connects to us
-  nodeListener.connectionManager.addEventListener('peer:connect', (evt) => {
-    const connection = evt.detail
-    console.log('connected to: ', connection.remotePeer.toString())
+  nodeListener.connectionManager.on('peer:connect', (connection) => {
+    console.log('connected to: ', connection.remotePeer.toB58String())
  })

  // Handle messages for the protocol
@ -34,8 +33,8 @@ async function run () {

  // Output listen addresses to the console
  console.log('Listener ready, listening on:')
-  nodeListener.getMultiaddrs().forEach((ma) => {
-    console.log(ma.toString())
+  nodeListener.multiaddrs.forEach((ma) => {
+    console.log(ma.toString() + '/p2p/' + idListener.toB58String())
  })
 }

--- a/examples/chat/src/peer-id-dialer.json
+++ b/examples/chat/src/peer-id-dialer.json
@ -1,4 +1,4 @@
-export default {
+{
  "id": "Qma3GsJmB47xYuyahPZPSadh1avvxfyYQwk8R3UnFrQ6aP",
  "privKey": "CAASpwkwggSjAgEAAoIBAQCaNSDOjPz6T8HZsf7LDpxiQRiN2OjeyIHUS05p8QWOr3EFUCFsC31R4moihE5HN+FxNalUyyFZU//yjf1pdnlMJqrVByJSMa+y2y4x2FucpoCAO97Tx+iWzwlZ2UXEUXM1Y81mhPbeWXy+wP2xElTgIER0Tsn/thoA0SD2u9wJuVvM7dB7cBcHYmqV6JH+KWCedRTum6O1BssqP/4Lbm2+rkrbZ4+oVRoU2DRLoFhKqwqLtylrbuj4XOI3XykMXV5+uQXz1JzubNOB9lsc6K+eRC+w8hhhDuFMgzkZ4qomCnx3uhO67KaICd8yqqBa6PJ/+fBM5Xk4hjyR40bwcf41AgMBAAECggEAZnrCJ6IYiLyyRdr9SbKXCNDb4YByGYPEi/HT1aHgIJfFE1PSMjxcdytxfyjP4JJpVtPjiT9JFVU2ddoYu5qJN6tGwjVwgJEWg1UXmPaAw1T/drjS94kVsAs82qICtFmwp52Apg3dBZ0Qwq/8qE1XbG7lLyohIbfCBiL0tiPYMfkcsN9gnFT/kFCX0LVs2pa9fHCRMY9rqCc4/rWJa1w8sMuQ23y4lDaxKF9OZVvOHFQkbBDrkquWHE4r55fchCz/rJklkPJUNENuncBRu0/2X+p4IKFD1DnttXNwb8j4LPiSlLro1T0hiUr5gO2QmdYwXFF63Q3mjQy0+5I4eNbjjQKBgQDZvZy3gUKS/nQNkYfq9za80uLbIj/cWbO+ZZjXCsj0fNIcQFJcKMBoA7DjJvu2S/lf86/41YHkPdmrLAEQAkJ+5BBNOycjYK9minTEjIMMmZDTXXugZ62wnU6F46uLkgEChTqEP57Y6xwwV+JaEDFEsW5N1eE9lEVX9nGIr4phMwKBgQC1TazLuEt1WBx/iUT83ita7obXqoKNzwsS/MWfY2innzYZKDOqeSYZzLtt9uTtp4X4uLyPbYs0qFYhXLsUYMoGHNN8+NdjoyxCjQRJRBkMtaNR0lc5lVDWl3bTuJovjFCgAr9uqJrmI5OHcCIk/cDpdWb3nWaMihVlePmiTcTy9wKBgQCU0u7c1jKkudqks4XM6a+2HAYGdUBk4cLjLhnrUWnNAcuyl5wzdX8dGPi8KZb+IKuQE8WBNJ2VXVj7kBYh1QmSJVunDflQSvNYCOaKuOeRoxzD+y9Wkca74qkbBmPn/6FFEb7PSZTO+tPHjyodGNgz9XpJJRjQuBk1aDJtlF3m1QKBgE5SAr5ym65SZOU3UGUIOKRsfDW4Q/OsqDUImvpywCgBICaX9lHDShFFHwau7FA52ScL7vDquoMB4UtCOtLfyQYA9995w9oYCCurrVlVIJkb8jSLcADBHw3EmqF1kq3NqJqm9TmBfoDCh52vdCCUufxgKh33kfBOSlXuf7B8dgMbAoGAZ3r0/mBQX6S+s5+xCETMTSNv7TQzxgtURIpVs+ZVr2cMhWhiv+n0Omab9X9Z50se8cWl5lkvx8vn3D/XHHIPrMF6qk7RAXtvReb+PeitNvm0odqjFv0J2qki6fDs0HKwq4kojAXI1Md8Th0eobNjsy21fEEJT7uKMJdovI/SErI=",
  "pubKey": "CAASpgIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCaNSDOjPz6T8HZsf7LDpxiQRiN2OjeyIHUS05p8QWOr3EFUCFsC31R4moihE5HN+FxNalUyyFZU//yjf1pdnlMJqrVByJSMa+y2y4x2FucpoCAO97Tx+iWzwlZ2UXEUXM1Y81mhPbeWXy+wP2xElTgIER0Tsn/thoA0SD2u9wJuVvM7dB7cBcHYmqV6JH+KWCedRTum6O1BssqP/4Lbm2+rkrbZ4+oVRoU2DRLoFhKqwqLtylrbuj4XOI3XykMXV5+uQXz1JzubNOB9lsc6K+eRC+w8hhhDuFMgzkZ4qomCnx3uhO67KaICd8yqqBa6PJ/+fBM5Xk4hjyR40bwcf41AgMBAAE="
--- a/examples/chat/src/peer-id-listener.json
+++ b/examples/chat/src/peer-id-listener.json
@ -1,4 +1,4 @@
-export default {
+{
  "id": "QmcrQZ6RJdpYuGvZqD5QEHAv6qX4BrQLJLQPQUrTrzdcgm",
  "privKey": "CAASqAkwggSkAgEAAoIBAQDLZZcGcbe4urMBVlcHgN0fpBymY+xcr14ewvamG70QZODJ1h9sljlExZ7byLiqRB3SjGbfpZ1FweznwNxWtWpjHkQjTVXeoM4EEgDSNO/Cg7KNlU0EJvgPJXeEPycAZX9qASbVJ6EECQ40VR/7+SuSqsdL1hrmG1phpIju+D64gLyWpw9WEALfzMpH5I/KvdYDW3N4g6zOD2mZNp5y1gHeXINHWzMF596O72/6cxwyiXV1eJ000k1NVnUyrPjXtqWdVLRk5IU1LFpoQoXZU5X1hKj1a2qt/lZfH5eOrF/ramHcwhrYYw1txf8JHXWO/bbNnyemTHAvutZpTNrsWATfAgMBAAECggEAQj0obPnVyjxLFZFnsFLgMHDCv9Fk5V5bOYtmxfvcm50us6ye+T8HEYWGUa9RrGmYiLweuJD34gLgwyzE1RwptHPj3tdNsr4NubefOtXwixlWqdNIjKSgPlaGULQ8YF2tm/kaC2rnfifwz0w1qVqhPReO5fypL+0ShyANVD3WN0Fo2ugzrniCXHUpR2sHXSg6K+2+qWdveyjNWog34b7CgpV73Ln96BWae6ElU8PR5AWdMnRaA9ucA+/HWWJIWB3Fb4+6uwlxhu2L50Ckq1gwYZCtGw63q5L4CglmXMfIKnQAuEzazq9T4YxEkp+XDnVZAOgnQGUBYpetlgMmkkh9qQKBgQDvsEs0ThzFLgnhtC2Jy//ZOrOvIAKAZZf/mS08AqWH3L0/Rjm8ZYbLsRcoWU78sl8UFFwAQhMRDBP9G+RPojWVahBL/B7emdKKnFR1NfwKjFdDVaoX5uNvZEKSl9UubbC4WZJ65u/cd5jEnj+w3ir9G8n+P1gp/0yBz02nZXFgSwKBgQDZPQr4HBxZL7Kx7D49ormIlB7CCn2i7mT11Cppn5ifUTrp7DbFJ2t9e8UNk6tgvbENgCKXvXWsmflSo9gmMxeEOD40AgAkO8Pn2R4OYhrwd89dECiKM34HrVNBzGoB5+YsAno6zGvOzLKbNwMG++2iuNXqXTk4uV9GcI8OnU5ZPQKBgCZUGrKSiyc85XeiSGXwqUkjifhHNh8yH8xPwlwGUFIZimnD4RevZI7OEtXw8iCWpX2gg9XGuyXOuKORAkF5vvfVriV4e7c9Ad4Igbj8mQFWz92EpV6NHXGCpuKqRPzXrZrNOA9PPqwSs+s9IxI1dMpk1zhBCOguWx2m+NP79NVhAoGBAI6WSoTfrpu7ewbdkVzTWgQTdLzYNe6jmxDf2ZbKclrf7lNr/+cYIK2Ud5qZunsdBwFdgVcnu/02czeS42TvVBgs8mcgiQc/Uy7yi4/VROlhOnJTEMjlU2umkGc3zLzDgYiRd7jwRDLQmMrYKNyEr02HFKFn3w8kXSzW5I8rISnhAoGBANhchHVtJd3VMYvxNcQb909FiwTnT9kl9pkjhwivx+f8/K8pDfYCjYSBYCfPTM5Pskv5dXzOdnNuCj6Y2H/9m2SsObukBwF0z5Qijgu1DsxvADVIKZ4rzrGb4uSEmM6200qjJ/9U98fVM7rvOraakrhcf9gRwuspguJQnSO9cLj6",
  "pubKey": "CAASpgIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDLZZcGcbe4urMBVlcHgN0fpBymY+xcr14ewvamG70QZODJ1h9sljlExZ7byLiqRB3SjGbfpZ1FweznwNxWtWpjHkQjTVXeoM4EEgDSNO/Cg7KNlU0EJvgPJXeEPycAZX9qASbVJ6EECQ40VR/7+SuSqsdL1hrmG1phpIju+D64gLyWpw9WEALfzMpH5I/KvdYDW3N4g6zOD2mZNp5y1gHeXINHWzMF596O72/6cxwyiXV1eJ000k1NVnUyrPjXtqWdVLRk5IU1LFpoQoXZU5X1hKj1a2qt/lZfH5eOrF/ramHcwhrYYw1txf8JHXWO/bbNnyemTHAvutZpTNrsWATfAgMBAAE="
--- a/examples/chat/src/stream.js
+++ b/examples/chat/src/stream.js
@ -1,19 +1,15 @@
+'use strict'
 /* eslint-disable no-console */

-import { pipe } from 'it-pipe'
-import * as lp from 'it-length-prefixed'
-import map from 'it-map'
-import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
-import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
+const pipe = require('it-pipe')
+const lp = require('it-length-prefixed')

-export function stdinToStream(stream) {
+function stdinToStream(stream) {
  // Read utf-8 from stdin
  process.stdin.setEncoding('utf8')
  pipe(
    // Read from stdin (the source)
    process.stdin,
-    // Turn strings into buffers
-    (source) => map(source, (string) => uint8ArrayFromString(string)),
    // Encode with length prefix (so receiving side knows how much data is coming)
    lp.encode(),
    // Write to the stream (the sink)
@ -21,14 +17,12 @@ export function stdinToStream(stream) {
  )
 }

-export function streamToConsole(stream) {
+function streamToConsole(stream) {
  pipe(
    // Read from the stream (the source)
    stream.source,
    // Decode length-prefixed data
    lp.decode(),
-    // Turn buffers into strings
-    (source) => map(source, (buf) => uint8ArrayToString(buf)),
    // Sink function
    async function (source) {
      // For each chunk of data
@ -39,3 +33,8 @@ export function streamToConsole(stream) {
    }
  )
 }
+
+module.exports = {
+  stdinToStream,
+  streamToConsole
+}
--- a/examples/chat/test.js
+++ b/examples/chat/test.js
@ -1,10 +1,9 @@
-import path from 'path'
-import execa from 'execa'
-import pDefer from 'p-defer'
-import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
-import { fileURLToPath } from 'url'
+'use strict'

-const __dirname = path.dirname(fileURLToPath(import.meta.url))
+const path = require('path')
+const execa = require('execa')
+const pDefer = require('p-defer')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')

 function startProcess(name) {
  return execa('node', [path.join(__dirname, name)], {
@ -13,7 +12,7 @@ function startProcess(name) {
  })
 }

-export async function test () {
+async function test () {
  const message = 'test message'
  let listenerOutput = ''
  let dialerOutput = ''
@ -74,3 +73,5 @@ export async function test () {
    }
  })
 }
+
+module.exports = test
--- a/examples/connection-encryption/1.js
+++ b/examples/connection-encryption/1.js
@ -1,19 +1,22 @@
-import { createLibp2p } from '../../dist/src/index.js'
-import { TCP } from '@libp2p/tcp'
-import { Mplex } from '@libp2p/mplex'
-import { Noise } from '@chainsafe/libp2p-noise'
-import { pipe } from 'it-pipe'
-import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
-import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
+'use strict'
+
+const Libp2p = require('../..')
+const TCP = require('libp2p-tcp')
+const Mplex = require('libp2p-mplex')
+const { NOISE } = require('@chainsafe/libp2p-noise')
+
+const pipe = require('it-pipe')

 const createNode = async () => {
-  const node = await createLibp2p({
+  const node = await Libp2p.create({
    addresses: {
      listen: ['/ip4/0.0.0.0/tcp/0']
    },
-    transports: [new TCP()],
-    streamMuxers: [new Mplex()],
-    connectionEncryption: [new Noise()]
+    modules: {
+      transport: [TCP],
+      streamMuxer: [Mplex],
+      connEncryption: [NOISE]
+    }
  })

  await node.start()
@ -27,14 +30,14 @@ const createNode = async () => {
    createNode()
  ])

-  await node1.peerStore.addressBook.set(node2.peerId, node2.getMultiaddrs())
+  node1.peerStore.addressBook.set(node2.peerId, node2.multiaddrs)

  node2.handle('/a-protocol', ({ stream }) => {
    pipe(
      stream,
      async function (source) {
        for await (const msg of source) {
-          console.log(uint8ArrayToString(msg))
+          console.log(msg.toString())
        }
      }
    )
@ -43,7 +46,7 @@ const createNode = async () => {
  const { stream } = await node1.dialProtocol(node2.peerId, '/a-protocol')

  await pipe(
-    [uint8ArrayFromString('This information is sent out encrypted to the other peer')],
+    ['This information is sent out encrypted to the other peer'],
    stream
  )
 })();
--- a/examples/connection-encryption/README.md
+++ b/examples/connection-encryption/README.md
@ -13,17 +13,17 @@ We will build this example on top of example for [Protocol and Stream Multiplexi
 To add them to your libp2p configuration, all you have to do is:

 ```JavaScript
-import { createLibp2p } from 'libp2p'
-import { TCP } from '@libp2p/tcp'
-import { Mplex } from '@libp2p/mplex'
-import { Noise } from '@chainsafe/libp2p-noise'
+const Libp2p = require('libp2p')
+const { NOISE } = require('@chainsafe/libp2p-noise')

-const createNode = async () => {
-  return await createLibp2p({
-    transports: [ new TCP() ],
-    streamMuxers: [ new Mplex() ],
-    // Attach noise as the crypto channel to use
-    conectionEncrypters: [ new Noise() ]
+const createNode = () => {
+  return Libp2p.create({
+    modules: {
+      transport: [ TCP ],
+      streamMuxer: [ Mplex ],
+      // Attach noise as the crypto channel to use
+      connEncryption: [ NOISE ]
+    }
  })
 }
 ```
--- a/examples/connection-encryption/test.js
+++ b/examples/connection-encryption/test.js
@ -1,14 +1,30 @@
+'use strict'

-import path from 'path'
-import { waitForOutput } from '../utils.js'
-import { fileURLToPath } from 'url'
+const path = require('path')
+const execa = require('execa')
+const pDefer = require('p-defer')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')

-const __dirname = path.dirname(fileURLToPath(import.meta.url))
-
-export async function test () {
+async function test () {
+  const messageReceived = pDefer()
  process.stdout.write('1.js\n')

-  await waitForOutput('This information is sent out encrypted to the other peer', 'node', [path.join(__dirname, '1.js')], {
-    cwd: __dirname
+  const proc = execa('node', [path.join(__dirname, '1.js')], {
+    cwd: path.resolve(__dirname),
+    all: true
  })
+
+  proc.all.on('data', async (data) => {
+    process.stdout.write(data)
+
+    const s = uint8ArrayToString(data)
+    if (s.includes('This information is sent out encrypted to the other peer')) {
+      messageReceived.resolve()
+    }
+  })
+
+  await messageReceived.promise
+  proc.kill()
 }
+
+module.exports = test
--- a/examples/delegated-routing/package.json
+++ b/examples/delegated-routing/package.json
@ -3,18 +3,19 @@
  "version": "0.1.0",
  "private": true,
  "dependencies": {
-    "@chainsafe/libp2p-noise": "^6.1.1",
-    "ipfs-core": "^0.14.1",
-    "libp2p": "../../",
-    "@libp2p/delegated-content-routing": "^1.0.1",
-    "@libp2p/delegated-peer-routing": "^1.0.1",
-    "@libp2p/kad-dht": "^1.0.9",
-    "@libp2p/mplex": "^1.0.4",
-    "@libp2p/webrtc-star": "^1.0.8",
-    "@libp2p/websockets": "^1.0.7",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "react-scripts": "5.0.0"
+    "ipfs": "~0.34.4",
+    "libp2p": "github:libp2p/js-libp2p#master",
+    "libp2p-delegated-content-routing": "~0.2.2",
+    "libp2p-delegated-peer-routing": "~0.2.2",
+    "libp2p-kad-dht": "~0.14.12",
+    "libp2p-mplex": "~0.8.5",
+    "libp2p-secio": "~0.11.1",
+    "libp2p-webrtc-star": "~0.15.8",
+    "libp2p-websocket-star": "~0.10.2",
+    "libp2p-websockets": "~0.12.2",
+    "react": "^16.8.6",
+    "react-dom": "^16.8.6",
+    "react-scripts": "2.1.8"
  },
  "scripts": {
    "start": "react-scripts start"
--- a/examples/delegated-routing/src/App.js
+++ b/examples/delegated-routing/src/App.js
@ -2,7 +2,7 @@
 'use strict'

 import React from 'react'
-import Ipfs from 'ipfs-core'
+import Ipfs from 'ipfs'
 import libp2pBundle from './libp2p-bundle'
 const Component = React.Component

@ -70,7 +70,7 @@ class App extends Component {
  }

  componentDidMount () {
-    window.ipfs = this.ipfs = Ipfs.create({
+    window.ipfs = this.ipfs = new Ipfs({
      config: {
        Addresses: {
          Swarm: []
--- a/examples/delegated-routing/src/libp2p-bundle.js
+++ b/examples/delegated-routing/src/libp2p-bundle.js
@ -1,23 +1,26 @@
 // eslint-disable-next-line
 'use strict'

-import { createLibp2p } from 'libp2p'
-import { WebSockets } from '@libp2p/websockets'
-import { WebRTCStar } from '@libp2p/webrtc-star'
-import { Mplex } from '@libp2p/mplex'
-import { Noise } from '@chainsafe/libp2p-noise'
-import { DelegatedPeerRouting } from '@libp2p/delegated-peer-routing'
-import { DelegatedContentRouting } from '@libp2p/delegated-content-routing'
+const Libp2p = require('libp2p')
+const Websockets = require('libp2p-websockets')
+const WebSocketStar = require('libp2p-websocket-star')
+const WebRTCStar = require('libp2p-webrtc-star')
+const MPLEX = require('libp2p-mplex')
+const SECIO = require('libp2p-secio')
+const KadDHT = require('libp2p-kad-dht')
+const DelegatedPeerRouter = require('libp2p-delegated-peer-routing')
+const DelegatedContentRouter = require('libp2p-delegated-content-routing')

 export default function Libp2pBundle ({peerInfo, peerBook}) {
-  const wrtcstar = new WebRTCStar()
+  const wrtcstar = new WebRTCStar({id: peerInfo.id})
+  const wsstar = new WebSocketStar({id: peerInfo.id})
  const delegatedApiOptions = {
    host: '0.0.0.0',
    protocol: 'http',
    port: '8080'
  }

-  return createLibp2p({
+  return new Libp2p({
    peerInfo,
    peerBook,
    // Lets limit the connection managers peers and have it check peer health less frequently
@ -25,29 +28,48 @@ export default function Libp2pBundle ({peerInfo, peerBook}) {
      maxPeers: 10,
      pollInterval: 5000
    },
-    contentRouting: [
-      new DelegatedPeerRouting(peerInfo.id, delegatedApiOptions)
-    ],
-    peerRouting: [
-      new DelegatedContentRouting(delegatedApiOptions)
-    ],
-    transports: [
-      wrtcstar,
-      new WebSockets()
-    ],
-    streamMuxers: [
-      new Mplex()
-    ],
-    connectionEncryption: [
-      new Noise()
-    ],
-    connectionManager: {
-      autoDial: false
+    modules: {
+      contentRouting: [
+        new DelegatedContentRouter(peerInfo.id, delegatedApiOptions)
+      ],
+      peerRouting: [
+        new DelegatedPeerRouter(delegatedApiOptions)
+      ],
+      peerDiscovery: [
+        wrtcstar.discovery,
+        wsstar.discovery
+      ],
+      transport: [
+        wrtcstar,
+        wsstar,
+        Websockets
+      ],
+      streamMuxer: [
+        MPLEX
+      ],
+      connEncryption: [
+        SECIO
+      ],
+      dht: KadDHT
    },
-    relay: {
-      enabled: true,
-      hop: {
+    config: {
+      peerDiscovery: {
+        autoDial: false,
+        webrtcStar: {
+          enabled: false
+        },
+        websocketStar: {
+          enabled: false
+        }
+      },
+      dht: {
        enabled: false
+      },
+      relay: {
+        enabled: true,
+        hop: {
+          enabled: false
+        }
      }
    }
  })
--- a/examples/discovery-mechanisms/1.js
+++ b/examples/discovery-mechanisms/1.js
@ -1,37 +1,43 @@
 /* eslint-disable no-console */
+'use strict'

-import { createLibp2p } from 'libp2p'
-import { TCP } from '@libp2p/tcp'
-import { Mplex } from '@libp2p/mplex'
-import { Noise } from '@chainsafe/libp2p-noise'
-import { Bootstrap } from '@libp2p/bootstrap'
-import bootstrapers from './bootstrappers.js'
+const Libp2p = require('../../')
+const TCP = require('libp2p-tcp')
+const Mplex = require('libp2p-mplex')
+const { NOISE } = require('@chainsafe/libp2p-noise')
+const Bootstrap = require('libp2p-bootstrap')
+
+const bootstrapers = require('./bootstrapers')

 ;(async () => {
-  const node = await createLibp2p({
+  const node = await Libp2p.create({
    addresses: {
      listen: ['/ip4/0.0.0.0/tcp/0']
    },
-    transports: [new TCP()],
-    streamMuxers: [new Mplex()],
-    connectionEncryption: [new Noise()],
-    peerDiscovery: [
-      new Bootstrap({
-        interval: 60e3,
-        list: bootstrapers
-      })
-    ]
+    modules: {
+      transport: [TCP],
+      streamMuxer: [Mplex],
+      connEncryption: [NOISE],
+      peerDiscovery: [Bootstrap]
+    },
+    config: {
+      peerDiscovery: {
+        bootstrap: {
+          interval: 60e3,
+          enabled: true,
+          list: bootstrapers
+        }
+      }
+    }
  })

-  node.connectionManager.addEventListener('peer:connect', (evt) => {
-    const connection = evt.detail
-    console.log('Connection established to:', connection.remotePeer.toString())	// Emitted when a peer has been found
+  node.connectionManager.on('peer:connect', (connection) => {
+    console.log('Connection established to:', connection.remotePeer.toB58String())	// Emitted when a peer has been found
  })

-  node.addEventListener('peer:discovery', (evt) => {
-    const peer = evt.detail
+  node.on('peer:discovery', (peerId) => {
    // No need to dial, autoDial is on
-    console.log('Discovered:', peer.id.toString())
+    console.log('Discovered:', peerId.toB58String())
  })

  await node.start()
--- a/examples/discovery-mechanisms/2.js
+++ b/examples/discovery-mechanisms/2.js
@ -1,30 +1,31 @@
 /* eslint-disable no-console */
+'use strict'

-import { createLibp2p } from 'libp2p'
-import { TCP } from '@libp2p/tcp'
-import { Mplex } from '@libp2p/mplex'
-import { Noise } from '@chainsafe/libp2p-noise'
-import { MulticastDNS } from '@libp2p/mdns'
+const Libp2p = require('../../')
+const TCP = require('libp2p-tcp')
+const Mplex = require('libp2p-mplex')
+const { NOISE } = require('@chainsafe/libp2p-noise')
+const MulticastDNS = require('libp2p-mdns')

 const createNode = async () => {
-  const node = await createLibp2p({
+  const node = await Libp2p.create({
    addresses: {
      listen: ['/ip4/0.0.0.0/tcp/0']
    },
-    transports: [
-      new TCP()
-    ],
-    streamMuxers: [
-      new Mplex()
-    ],
-    connectionEncryption: [
-      new Noise()
-    ],
-    peerDiscovery: [
-      new MulticastDNS({
-        interval: 20e3
-      })
-    ]
+    modules: {
+      transport: [TCP],
+      streamMuxer: [Mplex],
+      connEncryption: [NOISE],
+      peerDiscovery: [MulticastDNS]
+    },
+    config: {
+      peerDiscovery: {
+        [MulticastDNS.tag]: {
+          interval: 20e3,
+          enabled: true
+        }
+      }
+    }
  })

  return node
@ -36,8 +37,8 @@ const createNode = async () => {
    createNode()
  ])

-  node1.addEventListener('peer:discovery', (evt) => console.log('Discovered:', evt.detail.id.toString()))
-  node2.addEventListener('peer:discovery', (evt) => console.log('Discovered:', evt.detail.id.toString()))
+  node1.on('peer:discovery', (peerId) => console.log('Discovered:', peerId.toB58String()))
+  node2.on('peer:discovery', (peerId) => console.log('Discovered:', peerId.toB58String()))

  await Promise.all([
    node1.start(),
--- a/examples/discovery-mechanisms/3.js
+++ b/examples/discovery-mechanisms/3.js
@ -1,78 +1,66 @@
 /* eslint-disable no-console */
+'use strict'

-import { createLibp2p } from 'libp2p'
-import { TCP } from '@libp2p/tcp'
-import { Mplex } from '@libp2p/mplex'
-import { Noise } from '@chainsafe/libp2p-noise'
-import { FloodSub } from '@libp2p/floodsub'
-import { Bootstrap } from '@libp2p/bootstrap'
-import { PubSubPeerDiscovery } from '@libp2p/pubsub-peer-discovery'
+const Libp2p = require('../../')
+const TCP = require('libp2p-tcp')
+const Mplex = require('libp2p-mplex')
+const { NOISE } = require('@chainsafe/libp2p-noise')
+const Gossipsub = require('libp2p-gossipsub')
+const Bootstrap = require('libp2p-bootstrap')
+const PubsubPeerDiscovery = require('libp2p-pubsub-peer-discovery')

-const createNode = async (bootstrappers) => {
-  const node = await createLibp2p({
+const createRelayServer = require('libp2p-relay-server')
+
+const createNode = async (bootstrapers) => {
+  const node = await Libp2p.create({
    addresses: {
      listen: ['/ip4/0.0.0.0/tcp/0']
    },
-    transports: [new TCP()],
-    streamMuxers: [new Mplex()],
-    connectionEncryption: [new Noise()],
-    pubsub: new FloodSub(),
-    peerDiscovery: [
-      new Bootstrap({
-        list: bootstrappers
-      }),
-      new PubSubPeerDiscovery({
-        interval: 1000
-      })
-    ]
+    modules: {
+      transport: [TCP],
+      streamMuxer: [Mplex],
+      connEncryption: [NOISE],
+      pubsub: Gossipsub,
+      peerDiscovery: [Bootstrap, PubsubPeerDiscovery]
+    },
+    config: {
+      peerDiscovery: {
+        [PubsubPeerDiscovery.tag]: {
+          interval: 1000,
+          enabled: true
+        },
+        [Bootstrap.tag]: {
+          enabled: true,
+          list: bootstrapers
+        }
+      }
+    }
  })

  return node
 }

 ;(async () => {
-  const relay = await createLibp2p({
-    addresses: {
-      listen: [
-        '/ip4/0.0.0.0/tcp/0'
-      ]
-    },
-    transports: [new TCP()],
-    streamMuxers: [new Mplex()],
-    connectionEncryption: [new Noise()],
-    pubsub: new FloodSub(),
-    peerDiscovery: [
-      new PubSubPeerDiscovery({
-        interval: 1000
-      })
-    ],
-    relay: {
-      enabled: true, // Allows you to dial and accept relayed connections. Does not make you a relay.
-      hop: {
-        enabled: true // Allows you to be a relay for other peers
-      }
-    }
+  const relay = await createRelayServer({
+    listenAddresses: ['/ip4/0.0.0.0/tcp/0']
  })
-  console.log(`libp2p relay starting with id: ${relay.peerId.toString()}`)
+  console.log(`libp2p relay starting with id: ${relay.peerId.toB58String()}`)
  await relay.start()
-
-  const relayMultiaddrs = relay.getMultiaddrs().map((m) => m.toString())
+  const relayMultiaddrs = relay.multiaddrs.map((m) => `${m.toString()}/p2p/${relay.peerId.toB58String()}`)

  const [node1, node2] = await Promise.all([
    createNode(relayMultiaddrs),
    createNode(relayMultiaddrs)
  ])

-  node1.addEventListener('peer:discovery', (evt) => {
-    const peer = evt.detail
-    console.log(`Peer ${node1.peerId.toString()} discovered: ${peer.id.toString()}`)
+  node1.on('peer:discovery', (peerId) => {
+    console.log(`Peer ${node1.peerId.toB58String()} discovered: ${peerId.toB58String()}`)
  })
-  node2.addEventListener('peer:discovery',(evt) => {
-    const peer = evt.detail
-    console.log(`Peer ${node2.peerId.toString()} discovered: ${peer.id.toString()}`)
+  node2.on('peer:discovery', (peerId) => {
+    console.log(`Peer ${node2.peerId.toB58String()} discovered: ${peerId.toB58String()}`)
  })

-  ;[node1, node2].forEach((node, index) => console.log(`Node ${index} starting with id: ${node.peerId.toString()}`))
+  ;[node1, node2].forEach((node, index) => console.log(`Node ${index} starting with id: ${node.peerId.toB58String()}`))
  await Promise.all([
    node1.start(),
    node2.start()
--- a/examples/discovery-mechanisms/README.md
+++ b/examples/discovery-mechanisms/README.md
@ -13,25 +13,25 @@ For this demo, we will connect to IPFS default bootstrapper nodes and so, we wil
 First, we create our libp2p node.

 ```JavaScript
-import { createLibp2p } from 'libp2p'
-import { Bootstrap } from '@libp2p/bootstrap'
+const Libp2p = require('libp2p')
+const Bootstrap = require('libp2p-bootstrap')

-const node = await createLibp2p({
-  transports: [
-    new TCP()
-  ],
-  streamMuxers: [
-    new Mplex()
-  ],
-  connectionEncryption: [
-    new Noise()
-  ],
-  peerDiscovery: [
-    new Bootstrap({
-      interval: 60e3,
-      list: bootstrapers
-    })
-  ]
+const node = await Libp2p.create({
+  modules: {
+    transport: [ TCP ],
+    streamMuxer: [ Mplex ],
+    connEncryption: [ NOISE ],
+    peerDiscovery: [ Bootstrap ]
+  },
+  config: {
+    peerDiscovery: {
+      bootstrap: {
+        interval: 60e3,
+        enabled: true,
+        list: bootstrapers
+      }
+    }
+  }
 })
 ```

@ -51,26 +51,26 @@ const bootstrapers = [
 Now, once we create and start the node, we can listen for events such as `peer:discovery` and `peer:connect`, these events tell us when we found a peer, independently of the discovery mechanism used and when we actually dialed to that peer.

 ```JavaScript
-const node = await createLibp2p({
+const node = await Libp2p.create({
  peerId,
  addresses: {
    listen: ['/ip4/0.0.0.0/tcp/0']
+  }
+  modules: {
+    transport: [ TCP ],
+    streamMuxer: [ Mplex ],
+    connEncryption: [ NOISE ],
+    peerDiscovery: [ Bootstrap ]
  },
-  transports: [
-    new TCP()
-  ],
-  streamMuxers: [
-    new Mplex()
-  ],
-  connectionEncryption: [
-    new Noise()
-  ],
-  peerDiscovery: [
-    new Bootstrap({
-      interval: 60e3,
-      list: bootstrapers
-    })
-  ]
+  config: {
+    peerDiscovery: {
+      bootstrap: {
+        interval: 60e3,
+        enabled: true,
+        list: bootstrapers
+      }
+    }
+  }
 })

 node.connectionManager.on('peer:connect', (connection) => {
@ -110,28 +110,28 @@ For this example, we need `libp2p-mdns`, go ahead and `npm install` it. You can
 Update your libp2p configuration to include MulticastDNS.

 ```JavaScript
-import { createLibp2p } from 'libp2p'
-import { MulticastDNS } from '@libp2p/mdns'
+const Libp2p = require('libp2p')
+const MulticastDNS = require('libp2p-mdns')

 const createNode = () => {
  return Libp2p.create({
    addresses: {
      listen: ['/ip4/0.0.0.0/tcp/0']
+    }
+    modules: {
+      transport: [ TCP ],
+      streamMuxer: [ Mplex ],
+      connEncryption: [ NOISE ],
+      peerDiscovery: [ MulticastDNS ]
    },
-    transports: [
-      new TCP()
-    ],
-    streamMuxers: [
-      new Mplex()
-    ],
-    connectionEncryption: [
-      new Noise()
-    ],
-    peerDiscovery: [
-      new MulticastDNS({
-        interval: 20e3
-      })
-    ]
+    config: {
+      peerDiscovery: {
+        mdns: {
+          interval: 20e3,
+          enabled: true
+        }
+      }
+    }
  })
 }
 ```
@ -144,13 +144,8 @@ const [node1, node2] = await Promise.all([
  createNode()
 ])

-node1.on('peer:discovery', (peer) => console.log('Discovered:', peerId.toB58String()))
-node2.on('peer:discovery', (peer) => console.log('Discovered:', peerId.toB58String()))
-
-await Promise.all([
-  node1.start(),
-  node2.start()
-])
+node1.on('peer:discovery', (peer) => console.log('Discovered:', peer.id.toB58String()))
+node2.on('peer:discovery', (peer) => console.log('Discovered:', peer.id.toB58String()))
 ```

 If you run this example, you will see the other peers being discovered.
@ -170,37 +165,39 @@ In the context of this example, we will create and run the `libp2p-relay-server`
 You can create your libp2p nodes as follows:

 ```js
-import { createLibp2p } from 'libp2p'
-import { TCP } from '@libp2p/tcp'
-import { Mplex } from '@libp2p/mplex'
-import { Noise } from '@chainsafe/libp2p-noise'
-import { Gossipsub } from 'libp2p-gossipsub'
-import { Bootstrap } from '@libp2p/bootstrap'
-const PubsubPeerDiscovery from 'libp2p-pubsub-peer-discovery')
+const Libp2p = require('libp2p')
+const TCP = require('libp2p-tcp')
+const Mplex = require('libp2p-mplex')
+const { NOISE } = require('@chainsafe/libp2p-noise')
+const Gossipsub = require('libp2p-gossipsub')
+const Bootstrap = require('libp2p-bootstrap')
+const PubsubPeerDiscovery = require('libp2p-pubsub-peer-discovery')

 const createNode = async (bootstrapers) => {
-  const node = await createLibp2p({
+  const node = await Libp2p.create({
    addresses: {
      listen: ['/ip4/0.0.0.0/tcp/0']
    },
-    transports: [
-    new TCP()
-  ],
-  streamMuxers: [
-    new Mplex()
-  ],
-  connectionEncryption: [
-    new Noise()
-  ],
-  peerDiscovery: [
-    new Bootstrap({
-      interval: 60e3,
-      list: bootstrapers
-    }),
-    new PubsubPeerDiscovery({
-      interval: 1000
-    })
-  ])
+    modules: {
+      transport: [TCP],
+      streamMuxer: [Mplex],
+      connEncryption: [NOISE],
+      pubsub: Gossipsub,
+      peerDiscovery: [Bootstrap, PubsubPeerDiscovery]
+    },
+    config: {
+      peerDiscovery: {
+        [PubsubPeerDiscovery.tag]: {
+          interval: 1000,
+          enabled: true
+        },
+        [Bootstrap.tag]: {
+          enabled: true,
+          list: bootstrapers
+        }
+      }
+    }
+  })

  return node
 }
@ -210,9 +207,7 @@ We will use the `libp2p-relay-server` as bootstrap nodes for the libp2p nodes, s

 ```js
 const relay = await createRelayServer({
-  addresses: {
-    listen: ['/ip4/0.0.0.0/tcp/0']
-  }
+  listenAddresses: ['/ip4/0.0.0.0/tcp/0']
 })
 console.log(`libp2p relay starting with id: ${relay.peerId.toB58String()}`)
 await relay.start()
--- a/examples/discovery-mechanisms/bootstrappers.js
+++ b/examples/discovery-mechanisms/bootstrappers.js
@ -1,9 +1,13 @@
-// Find this list at: https://github.com/ipfs/js-ipfs/blob/master/packages/ipfs-core-config/src/config.js
-export default [
+'use strict'
+
+// Find this list at: https://github.com/ipfs/js-ipfs/blob/master/packages/ipfs-core/src/runtime/config-nodejs.js
+const bootstrapers = [
  '/ip4/104.131.131.82/tcp/4001/p2p/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ',
  '/dnsaddr/bootstrap.libp2p.io/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN',
  '/dnsaddr/bootstrap.libp2p.io/p2p/QmbLHAnMoJPWSCR5Zhtx6BHJX9KiKNN6tpvbUcqanj75Nb',
  '/dnsaddr/bootstrap.libp2p.io/p2p/QmZa1sAxajnQjVM8WjWXoMbmPd7NsWhfKsPkErzpm9wGkp',
  '/dnsaddr/bootstrap.libp2p.io/p2p/QmQCU2EcMqAqQPR2i9bChDtGNJchTbq5TbXJJ16u19uLTa',
-  '/dnsaddr/bootstrap.libp2p.io/p2p/QmcZf59bWwK5XFi76CZX8cbJ4BhTzzA3gU1ZjYZcYW3dwt',
+  '/dnsaddr/bootstrap.libp2p.io/p2p/QmcZf59bWwK5XFi76CZX8cbJ4BhTzzA3gU1ZjYZcYW3dwt'
 ]
+
+module.exports = bootstrapers
--- a/examples/discovery-mechanisms/test-1.js
+++ b/examples/discovery-mechanisms/test-1.js
@ -1,13 +1,42 @@
-import path from 'path'
-import { waitForOutput } from '../utils.js'
-import { fileURLToPath } from 'url'
+'use strict'

-const __dirname = path.dirname(fileURLToPath(import.meta.url))
+const path = require('path')
+const execa = require('execa')
+const pWaitFor = require('p-wait-for')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
+const bootstrapers = require('./bootstrapers')
+
+const discoveredCopy = 'Discovered:'
+const connectedCopy = 'Connection established to:'
+
+async function test () {
+  const discoveredNodes = []
+  const connectedNodes = []

-export async function test () {
  process.stdout.write('1.js\n')

-  await waitForOutput('Connection established to:', 'node', [path.join(__dirname, '1.js')], {
-    cwd: __dirname
+  const proc = execa('node', [path.join(__dirname, '1.js')], {
+    cwd: path.resolve(__dirname),
+    all: true
  })
+
+  proc.all.on('data', async (data) => {
+    process.stdout.write(data)
+    const line = uint8ArrayToString(data)
+
+    // Discovered or Connected
+    if (line.includes(discoveredCopy)) {
+      const id = line.trim().split(discoveredCopy)[1]
+      discoveredNodes.push(id)
+    } else if (line.includes(connectedCopy)) {
+      const id = line.trim().split(connectedCopy)[1]
+      connectedNodes.push(id)
+    }
+  })
+
+  await pWaitFor(() => discoveredNodes.length === bootstrapers.length && connectedNodes.length === bootstrapers.length)
+
+  proc.kill()
 }
+
+module.exports = test
--- a/examples/discovery-mechanisms/test-2.js
+++ b/examples/discovery-mechanisms/test-2.js
@ -1,13 +1,14 @@
-import path from 'path'
-import execa from 'execa'
-import pWaitFor from 'p-wait-for'
-import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
-import { fileURLToPath } from 'url'
+'use strict'

-const __dirname = path.dirname(fileURLToPath(import.meta.url))
+const path = require('path')
+const execa = require('execa')
+const pWaitFor = require('p-wait-for')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')

-export async function test () {
-  let discoveredNodes = 0
+const discoveredCopy = 'Discovered:'
+
+async function test() {
+  const discoveredNodes = []

  process.stdout.write('2.js\n')

@ -18,16 +19,17 @@ export async function test () {

  proc.all.on('data', async (data) => {
    process.stdout.write(data)
-    const str = uint8ArrayToString(data)
+    const line = uint8ArrayToString(data)

-    str.split('\n').forEach(line => {
-      if (line.includes('Discovered:')) {
-        discoveredNodes++
-      }
-    })
+    if (line.includes(discoveredCopy)) {
+      const id = line.trim().split(discoveredCopy)[1]
+      discoveredNodes.push(id)
+    }
  })

-  await pWaitFor(() => discoveredNodes > 1)
+  await pWaitFor(() => discoveredNodes.length === 2)

  proc.kill()
 }
+
+module.exports = test
--- a/examples/discovery-mechanisms/test-3.js
+++ b/examples/discovery-mechanisms/test-3.js
@ -1,13 +1,14 @@
-import path from 'path'
-import execa from 'execa'
-import pWaitFor from 'p-wait-for'
-import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
-import { fileURLToPath } from 'url'
+'use strict'

-const __dirname = path.dirname(fileURLToPath(import.meta.url))
+const path = require('path')
+const execa = require('execa')
+const pWaitFor = require('p-wait-for')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')

-export async function test () {
-  let discoveredNodes = 0
+const discoveredCopy = 'discovered:'
+
+async function test() {
+  let discoverCount = 0

  process.stdout.write('3.js\n')

@ -18,16 +19,17 @@ export async function test () {

  proc.all.on('data', async (data) => {
    process.stdout.write(data)
-    const str = uint8ArrayToString(data)
+    const line = uint8ArrayToString(data)

-    str.split('\n').forEach(line => {
-      if (line.includes('discovered:')) {
-        discoveredNodes++
-      }
-    })
+    // Discovered or Connected
+    if (line.includes(discoveredCopy)) {
+      discoverCount++
+    }
  })

-  await pWaitFor(() => discoveredNodes > 3)
+  await pWaitFor(() => discoverCount === 4)

  proc.kill()
 }
+
+module.exports = test
--- a/examples/discovery-mechanisms/test.js
+++ b/examples/discovery-mechanisms/test.js
@ -1,9 +1,13 @@
-import { test as test1 } from './test-1.js'
-import { test as test2 } from './test-2.js'
-import { test as test3 } from './test-3.js'
+'use strict'

-export async function test () {
+const test1 = require('./test-1')
+const test2 = require('./test-2')
+const test3 = require('./test-3')
+
+async function test () {
  await test1()
  await test2()
  await test3()
 }
+
+module.exports = test
--- a/examples/echo/src/dialer.js
+++ b/examples/echo/src/dialer.js
@ -1,21 +1,18 @@
+'use strict'
 /* eslint-disable no-console */

 /*
 * Dialer Node
 */

-import { createLibp2p } from './libp2p.js'
-import { pipe } from 'it-pipe'
-import idd from './id-d.js'
-import idl from './id-l.js'
-import { createFromJSON } from '@libp2p/peer-id-factory'
-import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
-import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
+const PeerId = require('peer-id')
+const createLibp2p = require('./libp2p')
+const pipe = require('it-pipe')

 async function run() {
  const [dialerId, listenerId] = await Promise.all([
-    createFromJSON(idd),
-    createFromJSON(idl)
+    PeerId.createFromJSON(require('./id-d')),
+    PeerId.createFromJSON(require('./id-l'))
  ])

  // Dialer
@ -27,13 +24,14 @@ async function run() {
  })

  // Add peer to Dial (the listener) into the PeerStore
-  const listenerMultiaddr = '/ip4/127.0.0.1/tcp/10333/p2p/' + listenerId.toString()
+  const listenerMultiaddr = '/ip4/127.0.0.1/tcp/10333/p2p/' + listenerId.toB58String()

  // Start the dialer libp2p node
  await dialerNode.start()

  console.log('Dialer ready, listening on:')
-  dialerNode.getMultiaddrs().forEach((ma) => console.log(ma.toString()))
+  dialerNode.multiaddrs.forEach((ma) => console.log(ma.toString() +
+        '/p2p/' + dialerId.toB58String()))

  // Dial the listener node
  console.log('Dialing to peer:', listenerMultiaddr)
@ -43,7 +41,7 @@ async function run() {

  pipe(
    // Source data
-    [uint8ArrayFromString('hey')],
+    ['hey'],
    // Write to the stream, and pass its output to the next function
    stream,
    // Sink function
@ -51,7 +49,7 @@ async function run() {
      // For each chunk of data
      for await (const data of source) {
        // Output the data
-        console.log('received echo:', uint8ArrayToString(data))
+        console.log('received echo:', data.toString())
      }
    }
  )
--- a/examples/chat/src/peer-id-dialer.js
+++ b/examples/chat/src/peer-id-dialer.js
@ -1,4 +1,4 @@
-export default {
+{
  "id": "Qma3GsJmB47xYuyahPZPSadh1avvxfyYQwk8R3UnFrQ6aP",
  "privKey": "CAASpwkwggSjAgEAAoIBAQCaNSDOjPz6T8HZsf7LDpxiQRiN2OjeyIHUS05p8QWOr3EFUCFsC31R4moihE5HN+FxNalUyyFZU//yjf1pdnlMJqrVByJSMa+y2y4x2FucpoCAO97Tx+iWzwlZ2UXEUXM1Y81mhPbeWXy+wP2xElTgIER0Tsn/thoA0SD2u9wJuVvM7dB7cBcHYmqV6JH+KWCedRTum6O1BssqP/4Lbm2+rkrbZ4+oVRoU2DRLoFhKqwqLtylrbuj4XOI3XykMXV5+uQXz1JzubNOB9lsc6K+eRC+w8hhhDuFMgzkZ4qomCnx3uhO67KaICd8yqqBa6PJ/+fBM5Xk4hjyR40bwcf41AgMBAAECggEAZnrCJ6IYiLyyRdr9SbKXCNDb4YByGYPEi/HT1aHgIJfFE1PSMjxcdytxfyjP4JJpVtPjiT9JFVU2ddoYu5qJN6tGwjVwgJEWg1UXmPaAw1T/drjS94kVsAs82qICtFmwp52Apg3dBZ0Qwq/8qE1XbG7lLyohIbfCBiL0tiPYMfkcsN9gnFT/kFCX0LVs2pa9fHCRMY9rqCc4/rWJa1w8sMuQ23y4lDaxKF9OZVvOHFQkbBDrkquWHE4r55fchCz/rJklkPJUNENuncBRu0/2X+p4IKFD1DnttXNwb8j4LPiSlLro1T0hiUr5gO2QmdYwXFF63Q3mjQy0+5I4eNbjjQKBgQDZvZy3gUKS/nQNkYfq9za80uLbIj/cWbO+ZZjXCsj0fNIcQFJcKMBoA7DjJvu2S/lf86/41YHkPdmrLAEQAkJ+5BBNOycjYK9minTEjIMMmZDTXXugZ62wnU6F46uLkgEChTqEP57Y6xwwV+JaEDFEsW5N1eE9lEVX9nGIr4phMwKBgQC1TazLuEt1WBx/iUT83ita7obXqoKNzwsS/MWfY2innzYZKDOqeSYZzLtt9uTtp4X4uLyPbYs0qFYhXLsUYMoGHNN8+NdjoyxCjQRJRBkMtaNR0lc5lVDWl3bTuJovjFCgAr9uqJrmI5OHcCIk/cDpdWb3nWaMihVlePmiTcTy9wKBgQCU0u7c1jKkudqks4XM6a+2HAYGdUBk4cLjLhnrUWnNAcuyl5wzdX8dGPi8KZb+IKuQE8WBNJ2VXVj7kBYh1QmSJVunDflQSvNYCOaKuOeRoxzD+y9Wkca74qkbBmPn/6FFEb7PSZTO+tPHjyodGNgz9XpJJRjQuBk1aDJtlF3m1QKBgE5SAr5ym65SZOU3UGUIOKRsfDW4Q/OsqDUImvpywCgBICaX9lHDShFFHwau7FA52ScL7vDquoMB4UtCOtLfyQYA9995w9oYCCurrVlVIJkb8jSLcADBHw3EmqF1kq3NqJqm9TmBfoDCh52vdCCUufxgKh33kfBOSlXuf7B8dgMbAoGAZ3r0/mBQX6S+s5+xCETMTSNv7TQzxgtURIpVs+ZVr2cMhWhiv+n0Omab9X9Z50se8cWl5lkvx8vn3D/XHHIPrMF6qk7RAXtvReb+PeitNvm0odqjFv0J2qki6fDs0HKwq4kojAXI1Md8Th0eobNjsy21fEEJT7uKMJdovI/SErI=",
  "pubKey": "CAASpgIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCaNSDOjPz6T8HZsf7LDpxiQRiN2OjeyIHUS05p8QWOr3EFUCFsC31R4moihE5HN+FxNalUyyFZU//yjf1pdnlMJqrVByJSMa+y2y4x2FucpoCAO97Tx+iWzwlZ2UXEUXM1Y81mhPbeWXy+wP2xElTgIER0Tsn/thoA0SD2u9wJuVvM7dB7cBcHYmqV6JH+KWCedRTum6O1BssqP/4Lbm2+rkrbZ4+oVRoU2DRLoFhKqwqLtylrbuj4XOI3XykMXV5+uQXz1JzubNOB9lsc6K+eRC+w8hhhDuFMgzkZ4qomCnx3uhO67KaICd8yqqBa6PJ/+fBM5Xk4hjyR40bwcf41AgMBAAE="
--- a/examples/echo/src/id-l.json
+++ b/examples/echo/src/id-l.json
@ -1,4 +1,4 @@
-export default {
+{
  "id": "QmcrQZ6RJdpYuGvZqD5QEHAv6qX4BrQLJLQPQUrTrzdcgm",
  "privKey": "CAASqAkwggSkAgEAAoIBAQDLZZcGcbe4urMBVlcHgN0fpBymY+xcr14ewvamG70QZODJ1h9sljlExZ7byLiqRB3SjGbfpZ1FweznwNxWtWpjHkQjTVXeoM4EEgDSNO/Cg7KNlU0EJvgPJXeEPycAZX9qASbVJ6EECQ40VR/7+SuSqsdL1hrmG1phpIju+D64gLyWpw9WEALfzMpH5I/KvdYDW3N4g6zOD2mZNp5y1gHeXINHWzMF596O72/6cxwyiXV1eJ000k1NVnUyrPjXtqWdVLRk5IU1LFpoQoXZU5X1hKj1a2qt/lZfH5eOrF/ramHcwhrYYw1txf8JHXWO/bbNnyemTHAvutZpTNrsWATfAgMBAAECggEAQj0obPnVyjxLFZFnsFLgMHDCv9Fk5V5bOYtmxfvcm50us6ye+T8HEYWGUa9RrGmYiLweuJD34gLgwyzE1RwptHPj3tdNsr4NubefOtXwixlWqdNIjKSgPlaGULQ8YF2tm/kaC2rnfifwz0w1qVqhPReO5fypL+0ShyANVD3WN0Fo2ugzrniCXHUpR2sHXSg6K+2+qWdveyjNWog34b7CgpV73Ln96BWae6ElU8PR5AWdMnRaA9ucA+/HWWJIWB3Fb4+6uwlxhu2L50Ckq1gwYZCtGw63q5L4CglmXMfIKnQAuEzazq9T4YxEkp+XDnVZAOgnQGUBYpetlgMmkkh9qQKBgQDvsEs0ThzFLgnhtC2Jy//ZOrOvIAKAZZf/mS08AqWH3L0/Rjm8ZYbLsRcoWU78sl8UFFwAQhMRDBP9G+RPojWVahBL/B7emdKKnFR1NfwKjFdDVaoX5uNvZEKSl9UubbC4WZJ65u/cd5jEnj+w3ir9G8n+P1gp/0yBz02nZXFgSwKBgQDZPQr4HBxZL7Kx7D49ormIlB7CCn2i7mT11Cppn5ifUTrp7DbFJ2t9e8UNk6tgvbENgCKXvXWsmflSo9gmMxeEOD40AgAkO8Pn2R4OYhrwd89dECiKM34HrVNBzGoB5+YsAno6zGvOzLKbNwMG++2iuNXqXTk4uV9GcI8OnU5ZPQKBgCZUGrKSiyc85XeiSGXwqUkjifhHNh8yH8xPwlwGUFIZimnD4RevZI7OEtXw8iCWpX2gg9XGuyXOuKORAkF5vvfVriV4e7c9Ad4Igbj8mQFWz92EpV6NHXGCpuKqRPzXrZrNOA9PPqwSs+s9IxI1dMpk1zhBCOguWx2m+NP79NVhAoGBAI6WSoTfrpu7ewbdkVzTWgQTdLzYNe6jmxDf2ZbKclrf7lNr/+cYIK2Ud5qZunsdBwFdgVcnu/02czeS42TvVBgs8mcgiQc/Uy7yi4/VROlhOnJTEMjlU2umkGc3zLzDgYiRd7jwRDLQmMrYKNyEr02HFKFn3w8kXSzW5I8rISnhAoGBANhchHVtJd3VMYvxNcQb909FiwTnT9kl9pkjhwivx+f8/K8pDfYCjYSBYCfPTM5Pskv5dXzOdnNuCj6Y2H/9m2SsObukBwF0z5Qijgu1DsxvADVIKZ4rzrGb4uSEmM6200qjJ/9U98fVM7rvOraakrhcf9gRwuspguJQnSO9cLj6",
  "pubKey": "CAASpgIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDLZZcGcbe4urMBVlcHgN0fpBymY+xcr14ewvamG70QZODJ1h9sljlExZ7byLiqRB3SjGbfpZ1FweznwNxWtWpjHkQjTVXeoM4EEgDSNO/Cg7KNlU0EJvgPJXeEPycAZX9qASbVJ6EECQ40VR/7+SuSqsdL1hrmG1phpIju+D64gLyWpw9WEALfzMpH5I/KvdYDW3N4g6zOD2mZNp5y1gHeXINHWzMF596O72/6cxwyiXV1eJ000k1NVnUyrPjXtqWdVLRk5IU1LFpoQoXZU5X1hKj1a2qt/lZfH5eOrF/ramHcwhrYYw1txf8JHXWO/bbNnyemTHAvutZpTNrsWATfAgMBAAE="
--- a/examples/echo/src/libp2p.js
+++ b/examples/echo/src/libp2p.js
@ -1,23 +1,23 @@
-import { TCP } from '@libp2p/tcp'
-import { WebSockets } from '@libp2p/websockets'
-import { Mplex } from '@libp2p/mplex'
-import { Noise } from '@chainsafe/libp2p-noise'
-import defaultsDeep from '@nodeutils/defaults-deep'
-import { createLibp2p as createNode } from 'libp2p'
+'use strict'

-export async function createLibp2p(_options) {
+const TCP = require('libp2p-tcp')
+const WS = require('libp2p-websockets')
+const mplex = require('libp2p-mplex')
+const { NOISE } = require('@chainsafe/libp2p-noise')
+
+const defaultsDeep = require('@nodeutils/defaults-deep')
+const libp2p = require('../../..')
+
+async function createLibp2p(_options) {
  const defaults = {
-    transports: [
-      new TCP(),
-      new WebSockets()
-    ],
-    streamMuxers: [
-      new Mplex()
-    ],
-    connectionEncryption: [
-      new Noise()
-    ]
+    modules: {
+      transport: [TCP, WS],
+      streamMuxer: [mplex],
+      connEncryption: [NOISE],
+    },
  }

-  return createNode(defaultsDeep(_options, defaults))
+  return libp2p.create(defaultsDeep(_options, defaults))
 }
+
+module.exports = createLibp2p
--- a/examples/echo/src/listener.js
+++ b/examples/echo/src/listener.js
@ -1,16 +1,16 @@
+'use strict'
 /* eslint-disable no-console */

 /*
 * Listener Node
 */

-import { createLibp2p } from './libp2p.js'
-import { pipe } from 'it-pipe'
-import { createFromJSON } from '@libp2p/peer-id-factory'
-import idl from './id-l.js'
+const PeerId = require('peer-id')
+const createLibp2p = require('./libp2p')
+const pipe = require('it-pipe')

 async function run() {
-  const listenerId = await createFromJSON(idl)
+  const listenerId = await PeerId.createFromJSON(require('./id-l'))

  // Listener libp2p node
  const listenerNode = await createLibp2p({
@ -21,9 +21,8 @@ async function run() {
  })

  // Log a message when we receive a connection
-  listenerNode.connectionManager.addEventListener('peer:connect', (evt) => {
-    const connection = evt.detail
-    console.log('received dial to me from:', connection.remotePeer.toString())
+  listenerNode.connectionManager.on('peer:connect', (connection) => {
+    console.log('received dial to me from:', connection.remotePeer.toB58String())
  })

  // Handle incoming connections for the protocol by piping from the stream
@ -34,8 +33,8 @@ async function run() {
  await listenerNode.start()

  console.log('Listener ready, listening on:')
-  listenerNode.getMultiaddrs().forEach((ma) => {
-    console.log(ma.toString())
+  listenerNode.multiaddrs.forEach((ma) => {
+    console.log(ma.toString() + '/p2p/' + listenerId.toB58String())
  })
 }

--- a/examples/echo/test.js
+++ b/examples/echo/test.js
@ -1,10 +1,9 @@
-import path from 'path'
-import execa from 'execa'
-import pDefer from 'p-defer'
-import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
-import { fileURLToPath } from 'url'
+'use strict'

-const __dirname = path.dirname(fileURLToPath(import.meta.url))
+const path = require('path')
+const execa = require('execa')
+const pDefer = require('p-defer')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')

 function startProcess(name) {
  return execa('node', [path.join(__dirname, name)], {
@ -13,7 +12,7 @@ function startProcess(name) {
  })
 }

-export async function test () {
+async function test () {
  const listenerReady = pDefer()
  const messageReceived = pDefer()

@ -58,3 +57,5 @@ export async function test () {
    }
  })
 }
+
+module.exports = test
--- a/examples/libp2p-in-the-browser/.babelrc
+++ b/examples/libp2p-in-the-browser/.babelrc
@ -0,0 +1,4 @@
+{
+  "presets": ["@babel/preset-env"],
+  "plugins": ["syntax-async-functions","transform-regenerator"]
+}
--- a/examples/libp2p-in-the-browser/index.js
+++ b/examples/libp2p-in-the-browser/index.js
@ -1,15 +1,14 @@
-import { createLibp2p } from 'libp2p'
-import { WebSockets } from '@libp2p/websockets'
-import { WebRTCStar } from '@libp2p/webrtc-star'
-import { Noise } from '@chainsafe/libp2p-noise'
-import { Mplex } from '@libp2p/mplex'
-import { Bootstrap } from '@libp2p/bootstrap'
+import 'babel-polyfill'
+import Libp2p from 'libp2p'
+import Websockets from 'libp2p-websockets'
+import WebRTCStar from 'libp2p-webrtc-star'
+import { NOISE } from '@chainsafe/libp2p-noise'
+import Mplex from 'libp2p-mplex'
+import Bootstrap from 'libp2p-bootstrap'

 document.addEventListener('DOMContentLoaded', async () => {
-  const webRtcStar = new WebRTCStar()
-
  // Create our libp2p node
-  const libp2p = await createLibp2p({
+  const libp2p = await Libp2p.create({
    addresses: {
      // Add the signaling server address, along with our PeerId to our multiaddrs list
      // libp2p will automatically attempt to dial to the signaling server so that it can
@ -19,24 +18,28 @@ document.addEventListener('DOMContentLoaded', async () => {
        '/dns4/wrtc-star2.sjc.dwebops.pub/tcp/443/wss/p2p-webrtc-star'
      ]
    },
-    transports: [
-      new WebSockets(),
-      webRtcStar
-    ],
-    connectionEncryption: [new Noise()],
-    streamMuxers: [new Mplex()],
-    peerDiscovery: [
-      webRtcStar.discovery,
-      new Bootstrap({
-        list: [
-          '/dnsaddr/bootstrap.libp2p.io/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN',
-          '/dnsaddr/bootstrap.libp2p.io/p2p/QmbLHAnMoJPWSCR5Zhtx6BHJX9KiKNN6tpvbUcqanj75Nb',
-          '/dnsaddr/bootstrap.libp2p.io/p2p/QmZa1sAxajnQjVM8WjWXoMbmPd7NsWhfKsPkErzpm9wGkp',
-          '/dnsaddr/bootstrap.libp2p.io/p2p/QmQCU2EcMqAqQPR2i9bChDtGNJchTbq5TbXJJ16u19uLTa',
-          '/dnsaddr/bootstrap.libp2p.io/p2p/QmcZf59bWwK5XFi76CZX8cbJ4BhTzzA3gU1ZjYZcYW3dwt'
-        ]
-      })
-    ]
+    modules: {
+      transport: [Websockets, WebRTCStar],
+      connEncryption: [NOISE],
+      streamMuxer: [Mplex],
+      peerDiscovery: [Bootstrap]
+    },
+    config: {
+      peerDiscovery: {
+        // The `tag` property will be searched when creating the instance of your Peer Discovery service.
+        // The associated object, will be passed to the service when it is instantiated.
+        [Bootstrap.tag]: {
+          enabled: true,
+          list: [
+            '/dnsaddr/bootstrap.libp2p.io/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN',
+            '/dnsaddr/bootstrap.libp2p.io/p2p/QmbLHAnMoJPWSCR5Zhtx6BHJX9KiKNN6tpvbUcqanj75Nb',
+            '/dnsaddr/bootstrap.libp2p.io/p2p/QmZa1sAxajnQjVM8WjWXoMbmPd7NsWhfKsPkErzpm9wGkp',
+            '/dnsaddr/bootstrap.libp2p.io/p2p/QmQCU2EcMqAqQPR2i9bChDtGNJchTbq5TbXJJ16u19uLTa',
+            '/dnsaddr/bootstrap.libp2p.io/p2p/QmcZf59bWwK5XFi76CZX8cbJ4BhTzzA3gU1ZjYZcYW3dwt'
+          ]
+        }
+      }
+    }
  })

  // UI elements
@ -51,26 +54,23 @@ document.addEventListener('DOMContentLoaded', async () => {
  }

  // Listen for new peers
-  libp2p.addEventListener('peer:discovery', (evt) => {
-    const peer = evt.detail
-    log(`Found peer ${peer.id.toString()}`)
+  libp2p.on('peer:discovery', (peerId) => {
+    log(`Found peer ${peerId.toB58String()}`)
  })

  // Listen for new connections to peers
-  libp2p.connectionManager.addEventListener('peer:connect', (evt) => {
-    const connection = evt.detail
-    log(`Connected to ${connection.remotePeer.toString()}`)
+  libp2p.connectionManager.on('peer:connect', (connection) => {
+    log(`Connected to ${connection.remotePeer.toB58String()}`)
  })

  // Listen for peers disconnecting
-  libp2p.connectionManager.addEventListener('peer:disconnect', (evt) => {
-    const connection = evt.detail
-    log(`Disconnected from ${connection.remotePeer.toString()}`)
+  libp2p.connectionManager.on('peer:disconnect', (connection) => {
+    log(`Disconnected from ${connection.remotePeer.toB58String()}`)
  })

  await libp2p.start()
  status.innerText = 'libp2p started!'
-  log(`libp2p id is ${libp2p.peerId.toString()}`)
+  log(`libp2p id is ${libp2p.peerId.toB58String()}`)

  // Export libp2p to the window so you can play with the API
  window.libp2p = libp2p
--- a/examples/libp2p-in-the-browser/package.json
+++ b/examples/libp2p-in-the-browser/package.json
@ -2,21 +2,32 @@
  "name": "libp2p-in-browser",
  "version": "1.0.0",
  "description": "A libp2p node running in the browser",
-  "type": "module",
+  "browserslist": [
+    "last 2 Chrome versions"
+  ],
  "scripts": {
    "test": "echo \"Error: no test specified\" && exit 1",
-    "start": "vite"
+    "build": "parcel build index.html",
+    "start": "parcel index.html"
  },
+  "keywords": [],
+  "author": "",
  "license": "ISC",
  "dependencies": {
-    "@chainsafe/libp2p-noise": "^6.1.1",
-    "@libp2p/bootstrap": "^1.0.4",
-    "@libp2p/mplex": "^1.0.4",
-    "@libp2p/webrtc-star": "^1.0.8",
-    "@libp2p/websockets": "^1.0.7",
-    "libp2p": "../../"
+    "@babel/preset-env": "^7.13.0",
+    "libp2p": "../../",
+    "libp2p-bootstrap": "^0.13.0",
+    "libp2p-mplex": "^0.10.4",
+    "@chainsafe/libp2p-noise": "^4.1.0",
+    "libp2p-webrtc-star": "^0.23.0",
+    "libp2p-websockets": "^0.16.1"
  },
  "devDependencies": {
-    "vite": "^2.8.6"
+    "@babel/cli": "^7.13.10",
+    "@babel/core": "^7.13.0",
+    "babel-plugin-syntax-async-functions": "^6.13.0",
+    "babel-plugin-transform-regenerator": "^6.26.0",
+    "babel-polyfill": "^6.26.0",
+    "parcel": "next"
  }
 }
--- a/examples/libp2p-in-the-browser/test.js
+++ b/examples/libp2p-in-the-browser/test.js
@ -1,14 +1,11 @@
-import execa from 'execa'
-import { chromium } from 'playwright'
-import path from 'path'
-import { fileURLToPath } from 'url'
+'use strict'

-const __dirname = path.dirname(fileURLToPath(import.meta.url))
+const execa = require('execa')
+const { chromium } = require('playwright');

-export async function test () {
-  let url = 'http://localhost:3000'
-
-  const proc = execa('vite', [], {
+async function run() {
+  let url = ''
+  const proc = execa('parcel', ['./index.html'], {
    preferLocal: true,
    localDir: __dirname,
    cwd: __dirname,
@ -19,7 +16,11 @@ export async function test () {
    /**@type {string} */
    const out = chunk.toString()

-    if (out.includes('ready in')) {
+    if (out.includes('Server running at')) {
+      url = out.split('Server running at ')[1]
+    }
+
+    if (out.includes('Built in')) {
      try {
        const browser = await chromium.launch();
        const page = await browser.newPage();
@ -35,7 +36,8 @@ export async function test () {
          '#output',
          { timeout: 5000 }
        )
-        await browser.close()
+        await browser.close();
+
      } catch (err) {
        console.error(err)
        process.exit(1)
@ -44,4 +46,7 @@ export async function test () {
      }
    }
  })
+
 }
+
+module.exports = run
--- a/examples/libp2p-in-the-browser/vite.config.js
+++ b/examples/libp2p-in-the-browser/vite.config.js
@ -1,5 +0,0 @@
-export default {
-  build: {
-    target: 'es2020'
-  }
-}
--- a/examples/package.json
+++ b/examples/package.json
@ -2,18 +2,18 @@
  "name": "libp2p-examples",
  "version": "1.0.0",
  "description": "Examples of how to use libp2p",
-  "type": "module",
  "scripts": {
    "test": "node ./test.js",
    "test:all": "node ./test-all.js"
  },
  "license": "MIT",
  "dependencies": {
-    "@libp2p/pubsub-peer-discovery": "^5.0.2",
-    "@libp2p/floodsub": "^1.0.6",
    "execa": "^2.1.0",
    "fs-extra": "^8.1.0",
-    "libp2p": "../",
+    "libp2p": "../src",
+    "libp2p-pubsub-peer-discovery": "^4.0.0",
+    "libp2p-relay-server": "^0.3.0",
+    "libp2p-gossipsub": "^0.11.0",
    "p-defer": "^3.0.0",
    "uint8arrays": "^3.0.0",
    "which": "^2.0.1"
--- a/examples/peer-and-content-routing/1.js
+++ b/examples/peer-and-content-routing/1.js
@ -1,21 +1,30 @@
 /* eslint-disable no-console */
+'use strict'

-import { createLibp2p } from 'libp2p'
-import { TCP } from '@libp2p/tcp'
-import { Mplex } from '@libp2p/mplex'
-import { Noise } from '@chainsafe/libp2p-noise'
-import { KadDHT } from '@libp2p/kad-dht'
-import delay from 'delay'
+const Libp2p = require('../../')
+const TCP = require('libp2p-tcp')
+const Mplex = require('libp2p-mplex')
+const { NOISE } = require('@chainsafe/libp2p-noise')
+const KadDHT = require('libp2p-kad-dht')
+
+const delay = require('delay')

 const createNode = async () => {
-  const node = await createLibp2p({
+  const node = await Libp2p.create({
    addresses: {
      listen: ['/ip4/0.0.0.0/tcp/0']
    },
-    transports: [new TCP()],
-    streamMuxers: [new Mplex()],
-    connectionEncryption: [new Noise()],
-    dht: new KadDHT()
+    modules: {
+      transport: [TCP],
+      streamMuxer: [Mplex],
+      connEncryption: [NOISE],
+      dht: KadDHT
+    },
+    config: {
+      dht: {
+        enabled: true
+      }
+    }
  })

  await node.start()
@ -29,8 +38,8 @@ const createNode = async () => {
    createNode()
  ])

-  await node1.peerStore.addressBook.set(node2.peerId, node2.getMultiaddrs())
-  await node2.peerStore.addressBook.set(node3.peerId, node3.getMultiaddrs())
+  node1.peerStore.addressBook.set(node2.peerId, node2.multiaddrs)
+  node2.peerStore.addressBook.set(node3.peerId, node3.multiaddrs)

  await Promise.all([
    node1.dial(node2.peerId),
@ -43,5 +52,5 @@ const createNode = async () => {
  const peer = await node1.peerRouting.findPeer(node3.peerId)

  console.log('Found it, multiaddrs are:')
-  peer.multiaddrs.forEach((ma) => console.log(ma.toString()))
+  peer.multiaddrs.forEach((ma) => console.log(`${ma.toString()}/p2p/${peer.id.toB58String()}`))
 })();
--- a/examples/peer-and-content-routing/2.js
+++ b/examples/peer-and-content-routing/2.js
@ -1,23 +1,32 @@
 /* eslint-disable no-console */
+'use strict'

-import { createLibp2p } from 'libp2p'
-import { TCP } from '@libp2p/tcp'
-import { Mplex } from '@libp2p/mplex'
-import { Noise } from '@chainsafe/libp2p-noise'
-import { CID } from 'multiformats/cid'
-import { KadDHT } from '@libp2p/kad-dht'
-import all from 'it-all'
-import delay from 'delay'
+const Libp2p = require('../../')
+const TCP = require('libp2p-tcp')
+const Mplex = require('libp2p-mplex')
+const { NOISE } = require('@chainsafe/libp2p-noise')
+const { CID } = require('multiformats/cid')
+const KadDHT = require('libp2p-kad-dht')
+
+const all = require('it-all')
+const delay = require('delay')

 const createNode = async () => {
-  const node = await createLibp2p({
+  const node = await Libp2p.create({
    addresses: {
      listen: ['/ip4/0.0.0.0/tcp/0']
    },
-    transports: [new TCP()],
-    streamMuxers: [new Mplex()],
-    connectionEncryption: [new Noise()],
-    dht: new KadDHT()
+    modules: {
+      transport: [TCP],
+      streamMuxer: [Mplex],
+      connEncryption: [NOISE],
+      dht: KadDHT
+    },
+    config: {
+      dht: {
+        enabled: true
+      }
+    }
  })

  await node.start()
@ -31,8 +40,8 @@ const createNode = async () => {
    createNode()
  ])

-  await node1.peerStore.addressBook.set(node2.peerId, node2.getMultiaddrs())
-  await node2.peerStore.addressBook.set(node3.peerId, node3.getMultiaddrs())
+  node1.peerStore.addressBook.set(node2.peerId, node2.multiaddrs)
+  node2.peerStore.addressBook.set(node3.peerId, node3.multiaddrs)

  await Promise.all([
    node1.dial(node2.peerId),
@ -45,12 +54,12 @@ const createNode = async () => {
  const cid = CID.parse('QmTp9VkYvnHyrqKQuFPiuZkiX9gPcqj6x5LJ1rmWuSySnL')
  await node1.contentRouting.provide(cid)

-  console.log('Node %s is providing %s', node1.peerId.toString(), cid.toString())
+  console.log('Node %s is providing %s', node1.peerId.toB58String(), cid.toString())

  // wait for propagation
  await delay(300)

  const providers = await all(node3.contentRouting.findProviders(cid, { timeout: 3000 }))

-  console.log('Found provider:', providers[0].id.toString())
+  console.log('Found provider:', providers[0].id.toB58String())
 })();
--- a/examples/peer-and-content-routing/README.md
+++ b/examples/peer-and-content-routing/README.md
@ -13,24 +13,26 @@ This example builds on top of the [Protocol and Stream Muxing](../protocol-and-s
 First, let's update our config to support Peer Routing and Content Routing.

 ```JavaScript
-import { createLibp2p } from 'libp2p'
-import { KadDHT } from '@libp2p/kad-dht'
+const Libp2p = require('libp2p')
+const KadDHT = require('libp2p-kad-dht')

-const node = await createLibp2p({
+const node = await Libp2p.create({
  addresses: {
    listen: ['/ip4/0.0.0.0/tcp/0']
  },
-  transports: [
-    new TCP()
-  ],
-  streamMuxers: [
-    new Mplex()
-  ],
-  connEncryption: [
-    new Noise()
-  ],
-  // we add the DHT module that will enable Peer and Content Routing
-  dht: KadDHT
+  modules: {
+    transport: [ TCP ],
+    streamMuxer: [ Mplex ],
+    connEncryption: [ NOISE ],
+    // we add the DHT module that will enable Peer and Content Routing
+    dht: KadDHT
+  },
+  config: {
+    dht: {
+      // dht must be enabled
+      enabled: true
+    }
+  }
 })
 ```

@ -41,8 +43,8 @@ const node1 = nodes[0]
 const node2 = nodes[1]
 const node3 = nodes[2]

-await node1.peerStore.addressBook.set(node2.peerId, node2.multiaddrs)
-await node2.peerStore.addressBook.set(node3.peerId, node3.multiaddrs)
+node1.peerStore.addressBook.set(node2.peerId, node2.multiaddrs)
+node2.peerStore.addressBook.set(node3.peerId, node3.multiaddrs)

 await Promise.all([
  node1.dial(node2.peerId),
--- a/examples/peer-and-content-routing/test-1.js
+++ b/examples/peer-and-content-routing/test-1.js
@ -1,13 +1,36 @@
-import path from 'path'
-import { waitForOutput } from '../utils.js'
-import { fileURLToPath } from 'url'
+'use strict'

-const __dirname = path.dirname(fileURLToPath(import.meta.url))
+const path = require('path')
+const execa = require('execa')
+const pWaitFor = require('p-wait-for')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')

-export async function test () {
+async function test() {
  process.stdout.write('1.js\n')

-  await waitForOutput('Found it, multiaddrs are:', 'node', [path.join(__dirname, '1.js')], {
-    cwd: __dirname
+  const addrs = []
+  let foundIt = false
+  const proc = execa('node', [path.join(__dirname, '1.js')], {
+    cwd: path.resolve(__dirname),
+    all: true
  })
+
+  proc.all.on('data', async (data) => {
+    process.stdout.write(data)
+
+    const line = uint8ArrayToString(data)
+
+    // Discovered peer
+    if (!foundIt && line.includes('Found it, multiaddrs are:')) {
+      foundIt = true
+    }
+
+    addrs.push(line)
+  })
+
+  await pWaitFor(() => addrs.length === 2)
+
+  proc.kill()
 }
+
+module.exports = test
--- a/examples/peer-and-content-routing/test-2.js
+++ b/examples/peer-and-content-routing/test-2.js
@ -1,13 +1,40 @@
-import path from 'path'
-import { waitForOutput } from '../utils.js'
-import { fileURLToPath } from 'url'
+'use strict'

-const __dirname = path.dirname(fileURLToPath(import.meta.url))
+const path = require('path')
+const execa = require('execa')
+const pDefer = require('p-defer')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')

-export async function test () {
+const providedCopy = 'is providing'
+const foundCopy = 'Found provider:'
+
+async function test() {
  process.stdout.write('2.js\n')
+  const providedDefer = pDefer()
+  const foundDefer = pDefer()

-  await waitForOutput('Found provider:', 'node', [path.join(__dirname, '2.js')], {
-    cwd: __dirname
+  const proc = execa('node', [path.join(__dirname, '2.js')], {
+    cwd: path.resolve(__dirname),
+    all: true
  })
+
+  proc.all.on('data', async (data) => {
+    process.stdout.write(data)
+
+    const line = uint8ArrayToString(data)
+
+    if (line.includes(providedCopy)) {
+      providedDefer.resolve()
+    } else if (line.includes(foundCopy)) {
+      foundDefer.resolve()
+    }
+  })
+
+  await Promise.all([
+    providedDefer.promise,
+    foundDefer.promise
+  ])
+  proc.kill()
 }
+
+module.exports = test
--- a/examples/peer-and-content-routing/test.js
+++ b/examples/peer-and-content-routing/test.js
@ -1,7 +1,11 @@
-import { test as test1 } from './test-1.js'
-import { test as test2 } from './test-2.js'
+'use strict'

-export async function test() {
+const test1 = require('./test-1')
+const test2 = require('./test-2')
+
+async function test() {
  await test1()
  await test2()
 }
+
+module.exports = test
--- a/examples/pnet/index.js
+++ b/examples/pnet/index.js
@ -1,18 +1,18 @@
 /* eslint no-console: ["off"] */
+'use strict'

-import { generateKey } from 'libp2p/pnet'
-import { privateLibp2pNode } from './libp2p-node.js'
-import { pipe } from 'it-pipe'
-import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
-import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
+const { generate } = require('libp2p/src/pnet')
+const privateLibp2pNode = require('./libp2p-node')
+
+const pipe = require('it-pipe')

 // Create a Uint8Array and write the swarm key to it
 const swarmKey = new Uint8Array(95)
-generateKey(swarmKey)
+generate(swarmKey)

 // This key is for testing a different key not working
 const otherSwarmKey = new Uint8Array(95)
-generateKey(otherSwarmKey)
+generate(otherSwarmKey)

 ;(async () => {
  const node1 = await privateLibp2pNode(swarmKey)
@ -29,7 +29,7 @@ generateKey(otherSwarmKey)
  console.log('nodes started...')

  // Add node 2 data to node1's PeerStore
-  await node1.peerStore.addressBook.set(node2.peerId, node2.getMultiaddrs())
+  node1.peerStore.addressBook.set(node2.peerId, node2.multiaddrs)
  await node1.dial(node2.peerId)

  node2.handle('/private', ({ stream }) => {
@ -37,7 +37,7 @@ generateKey(otherSwarmKey)
      stream,
      async function (source) {
        for await (const msg of source) {
-          console.log(uint8ArrayToString(msg))
+          console.log(msg.toString())
        }
      }
    )
@ -46,7 +46,7 @@ generateKey(otherSwarmKey)
  const { stream } = await node1.dialProtocol(node2.peerId, '/private')

  await pipe(
-    [uint8ArrayFromString('This message is sent on a private network')],
+    ['This message is sent on a private network'],
    stream
  )
 })()
--- a/examples/pnet/libp2p-node.js
+++ b/examples/pnet/libp2p-node.js
@ -1,31 +1,38 @@
-import { createLibp2p } from 'libp2p'
-import { TCP } from '@libp2p/tcp'
-import { Mplex } from '@libp2p/mplex'
-import { Noise } from '@chainsafe/libp2p-noise'
-import { PreSharedKeyConnectionProtector } from 'libp2p/pnet'
+'use strict'
+
+const Libp2p = require('libp2p')
+const TCP = require('libp2p-tcp')
+const MPLEX = require('libp2p-mplex')
+const { NOISE } = require('@chainsafe/libp2p-noise')
+const Protector = require('libp2p/src/pnet')

 /**
 * privateLibp2pNode returns a libp2p node function that will use the swarm
 * key with the given `swarmKey` to create the Protector
+ *
+ * @param {Uint8Array} swarmKey
+ * @returns {Promise<libp2p>} Returns a libp2pNode function for use in IPFS creation
 */
-export async function privateLibp2pNode (swarmKey) {
-  const node = await createLibp2p({
+const privateLibp2pNode = async (swarmKey) => {
+  const node = await Libp2p.create({
    addresses: {
      listen: ['/ip4/0.0.0.0/tcp/0']
    },
-    transports: [new TCP()], // We're only using the TCP transport for this example
-    streamMuxers: [new Mplex()], // We're only using mplex muxing
-    // Let's make sure to use identifying crypto in our pnet since the protector doesn't
-    // care about node identity, and only the presence of private keys
-    connectionEncryption: [new Noise()],
-    // Leave peer discovery empty, we don't want to find peers. We could omit the property, but it's
-    // being left in for explicit readability.
-    // We should explicitly dial pnet peers, or use a custom discovery service for finding nodes in our pnet
-    peerDiscovery: [],
-    connectionProtector: new PreSharedKeyConnectionProtector({
-      psk: swarmKey
-    })
+    modules: {
+      transport: [TCP], // We're only using the TCP transport for this example
+      streamMuxer: [MPLEX], // We're only using mplex muxing
+      // Let's make sure to use identifying crypto in our pnet since the protector doesn't
+      // care about node identity, and only the presence of private keys
+      connEncryption: [NOISE],
+      // Leave peer discovery empty, we don't want to find peers. We could omit the property, but it's
+      // being left in for explicit readability.
+      // We should explicitly dial pnet peers, or use a custom discovery service for finding nodes in our pnet
+      peerDiscovery: [],
+      connProtector: new Protector(swarmKey)
+    }
  })

  return node
 }
+
+module.exports = privateLibp2pNode
--- a/examples/pnet/test.js
+++ b/examples/pnet/test.js
@ -1,12 +1,30 @@
-import path from 'path'
-import { waitForOutput } from '../utils.js'
-import { fileURLToPath } from 'url'
+'use strict'

-const __dirname = path.dirname(fileURLToPath(import.meta.url))
+const path = require('path')
+const execa = require('execa')
+const pDefer = require('p-defer')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')

-export async function test () {
-  await waitForOutput('This message is sent on a private network', 'node', [path.join(__dirname, 'index.js')], {
-    cwd: __dirname
+async function test () {
+  const messageReceived = pDefer()
+  process.stdout.write('index.js\n')
+
+  const proc = execa('node', [path.join(__dirname, 'index.js')], {
+    cwd: path.resolve(__dirname),
+    all: true
  })
+
+  proc.all.on('data', async (data) => {
+    process.stdout.write(data)
+
+    const s = uint8ArrayToString(data)
+    if (s.includes('This message is sent on a private network')) {
+      messageReceived.resolve()
+    }
+  })
+
+  await messageReceived.promise
+  proc.kill()
 }

+module.exports = test
--- a/examples/pnet/utils.js
+++ b/examples/pnet/utils.js
@ -1,6 +1,6 @@
 'use strict'
-const fs from 'fs')
-import path from 'path'
+const fs = require('fs')
+const path = require('path')

 /**
 * mkdirp recursively creates needed folders for the given dir path
--- a/examples/protocol-and-stream-muxing/1.js
+++ b/examples/protocol-and-stream-muxing/1.js
@ -1,19 +1,22 @@
-import { createLibp2p } from 'libp2p'
-import { TCP } from '@libp2p/tcp'
-import { Mplex } from '@libp2p/mplex'
-import { Noise } from '@chainsafe/libp2p-noise'
-import { pipe } from 'it-pipe'
-import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
-import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
+'use strict'
+
+const Libp2p = require('../../')
+const TCP = require('libp2p-tcp')
+const MPLEX = require('libp2p-mplex')
+const { NOISE } = require('@chainsafe/libp2p-noise')
+
+const pipe = require('it-pipe')

 const createNode = async () => {
-  const node = await createLibp2p({
+  const node = await Libp2p.create({
    addresses: {
      listen: ['/ip4/0.0.0.0/tcp/0']
    },
-    transports: [new TCP()],
-    streamMuxers: [new Mplex()],
-    connectionEncryption: [new Noise()]
+    modules: {
+      transport: [TCP],
+      streamMuxer: [MPLEX],
+      connEncryption: [NOISE]
+    }
  })

  await node.start()
@ -28,7 +31,7 @@ const createNode = async () => {
  ])

  // Add node's 2 data to the PeerStore
-  await node1.peerStore.addressBook.set(node2.peerId, node2.getMultiaddrs())
+  node1.peerStore.addressBook.set(node2.peerId, node2.multiaddrs)

  // exact matching
  node2.handle('/your-protocol', ({ stream }) => {
@ -36,7 +39,7 @@ const createNode = async () => {
      stream,
      async function (source) {
        for await (const msg of source) {
-          console.log(uint8ArrayToString(msg))
+          console.log(msg.toString())
        }
      }
    )
@ -53,7 +56,7 @@ const createNode = async () => {
      stream,
      async function (source) {
        for await (const msg of source) {
-          console.log(uint8ArrayToString(msg))
+          console.log(msg.toString())
        }
      }
    )
@ -62,7 +65,7 @@ const createNode = async () => {

  const { stream } = await node1.dialProtocol(node2.peerId, ['/your-protocol'])
  await pipe(
-    [uint8ArrayFromString('my own protocol, wow!')],
+    ['my own protocol, wow!'],
    stream
  )

--- a/examples/protocol-and-stream-muxing/2.js
+++ b/examples/protocol-and-stream-muxing/2.js
@ -1,19 +1,22 @@
-import { createLibp2p } from 'libp2p'
-import { TCP } from '@libp2p/tcp'
-import { Mplex } from '@libp2p/mplex'
-import { Noise } from '@chainsafe/libp2p-noise'
-import { pipe } from 'it-pipe'
-import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
-import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
+'use strict'
+
+const Libp2p = require('../../')
+const TCP = require('libp2p-tcp')
+const MPLEX = require('libp2p-mplex')
+const { NOISE } = require('@chainsafe/libp2p-noise')
+
+const pipe = require('it-pipe')

 const createNode = async () => {
-  const node = await createLibp2p({
+  const node = await Libp2p.create({
    addresses: {
      listen: ['/ip4/0.0.0.0/tcp/0']
    },
-    transports: [new TCP()],
-    streamMuxers: [new Mplex()],
-    connectionEncryption: [new Noise()]
+    modules: {
+      transport: [TCP],
+      streamMuxer: [MPLEX],
+      connEncryption: [NOISE]
+    }
  })

  await node.start()
@ -28,14 +31,14 @@ const createNode = async () => {
  ])

  // Add node's 2 data to the PeerStore
-  await node1.peerStore.addressBook.set(node2.peerId, node2.getMultiaddrs())
+  node1.peerStore.addressBook.set(node2.peerId, node2.multiaddrs)

  node2.handle(['/a', '/b'], ({ protocol, stream }) => {
    pipe(
      stream,
      async function (source) {
        for await (const msg of source) {
-          console.log(`from: ${protocol}, msg: ${uint8ArrayToString(msg)}`)
+          console.log(`from: ${protocol}, msg: ${msg.toString()}`)
        }
      }
    )
@ -43,19 +46,19 @@ const createNode = async () => {

  const { stream: stream1 } = await node1.dialProtocol(node2.peerId, ['/a'])
  await pipe(
-    [uint8ArrayFromString('protocol (a)')],
+    ['protocol (a)'],
    stream1
  )

  const { stream: stream2 } = await node1.dialProtocol(node2.peerId, ['/b'])
  await pipe(
-    [uint8ArrayFromString('protocol (b)')],
+    ['protocol (b)'],
    stream2
  )

  const { stream: stream3 } = await node1.dialProtocol(node2.peerId, ['/b'])
  await pipe(
-    [uint8ArrayFromString('another stream on protocol (b)')],
+    ['another stream on protocol (b)'],
    stream3
  )
 })();
--- a/examples/protocol-and-stream-muxing/3.js
+++ b/examples/protocol-and-stream-muxing/3.js
@ -1,21 +1,23 @@
 /* eslint-disable no-console */
+'use strict'

-import { createLibp2p } from 'libp2p'
-import { TCP } from '@libp2p/tcp'
-import { Mplex } from '@libp2p/mplex'
-import { Noise } from '@chainsafe/libp2p-noise'
-import { pipe } from 'it-pipe'
-import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
-import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
+const Libp2p = require('../../')
+const TCP = require('libp2p-tcp')
+const MPLEX = require('libp2p-mplex')
+const { NOISE } = require('@chainsafe/libp2p-noise')
+
+const pipe = require('it-pipe')

 const createNode = async () => {
-  const node = await createLibp2p({
+  const node = await Libp2p.create({
    addresses: {
      listen: ['/ip4/0.0.0.0/tcp/0']
    },
-    transports: [new TCP()],
-    streamMuxers: [new Mplex()],
-    connectionEncryption: [new Noise()]
+    modules: {
+      transport: [TCP],
+      streamMuxer: [MPLEX],
+      connEncryption: [NOISE]
+    }
  })

  await node.start()
@ -30,14 +32,14 @@ const createNode = async () => {
  ])

  // Add node's 2 data to the PeerStore
-  await node1.peerStore.addressBook.set(node2.peerId, node2.getMultiaddrs())
-
+  node1.peerStore.addressBook.set(node2.peerId, node2.multiaddrs)
+  
  node1.handle('/node-1', ({ stream }) => {
    pipe(
      stream,
      async function (source) {
        for await (const msg of source) {
-          console.log(uint8ArrayToString(msg))
+          console.log(msg.toString())
        }
      }
    )
@ -48,7 +50,7 @@ const createNode = async () => {
      stream,
      async function (source) {
        for await (const msg of source) {
-          console.log(uint8ArrayToString(msg))
+          console.log(msg.toString())
        }
      }
    )
@ -56,13 +58,13 @@ const createNode = async () => {

  const { stream: stream1 } = await node1.dialProtocol(node2.peerId, ['/node-2'])
  await pipe(
-    [uint8ArrayFromString('from 1 to 2')],
+    ['from 1 to 2'],
    stream1
  )

  const { stream: stream2 } = await node2.dialProtocol(node1.peerId, ['/node-1'])
  await pipe(
-    [uint8ArrayFromString('from 2 to 1')],
+    ['from 2 to 1'],
    stream2
  )
 })();
--- a/examples/protocol-and-stream-muxing/README.md
+++ b/examples/protocol-and-stream-muxing/README.md
@ -11,16 +11,16 @@ Let's see _protocol multiplexing_ in action! You will need the following modules
 After creating the nodes, we need to tell libp2p which protocols to handle.

 ```JavaScript
-import { pipe } from 'it-pipe'
-const { map } from 'streaming-iterables')
-const { toBuffer } from 'it-buffer')
+const pipe = require('it-pipe')
+const { map } = require('streaming-iterables')
+const { toBuffer } = require('it-buffer')

 // ...
 const node1 = nodes[0]
 const node2 = nodes[1]

 // Add node's 2 data to the PeerStore
-await node1.peerStore.addressBook.set(node2.peerId, node2.multiaddrs)
+node1.peerStore.addressBook.set(node2.peerId, node2.multiaddrs)

 // Here we are telling libp2p that if someone dials this node to talk with the `/your-protocol`
 // multicodec, the protocol identifier, please call this handler and give it the stream
@ -102,19 +102,17 @@ Stream multiplexing is an old concept, in fact it happens in many of the layers
 Currently, we have [libp2p-mplex](https://github.com/libp2p/js-libp2p-mplex) and pluging it in is as easy as adding a transport. Let's revisit our libp2p configuration.

 ```JavaScript
-import { createLibp2p } from 'libp2p'
-import { TCP } from '@libp2p/tcp'
-import { Mplex } from '@libp2p/mplex'
+const Libp2p = require('libp2p')
+const TCP = require('libp2p-tcp')
+const MPLEX = require('libp2p-mplex')
 //...

 const createNode = () => {
  return Libp2p.create({
-    transports: [
-      new TCP()
-    ],
-    streamMuxers: [
-      new Mplex()
-    ]
+    modules: {
+      transport: [ TCP ],
+      streamMuxer: [ Mplex ]
+    }
  })
 }
 ```
--- a/examples/protocol-and-stream-muxing/test-1.js
+++ b/examples/protocol-and-stream-muxing/test-1.js
@ -1,13 +1,31 @@
-import path from 'path'
-import { waitForOutput } from '../utils.js'
-import { fileURLToPath } from 'url'
+'use strict'

-const __dirname = path.dirname(fileURLToPath(import.meta.url))
+const path = require('path')
+const execa = require('execa')
+const pDefer = require('p-defer')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')

-export async function test () {
+async function test() {
+  const messageDefer = pDefer()
  process.stdout.write('1.js\n')

-  await waitForOutput('my own protocol, wow!', 'node', [path.join(__dirname, '1.js')], {
-    cwd: __dirname
+  const proc = execa('node', [path.join(__dirname, '1.js')], {
+    cwd: path.resolve(__dirname),
+    all: true
  })
+
+  proc.all.on('data', async (data) => {
+    process.stdout.write(data)
+
+    const line = uint8ArrayToString(data)
+
+    if (line.includes('my own protocol, wow!')) {
+      messageDefer.resolve()
+    }
+  })
+
+  await messageDefer.promise
+  proc.kill()
 }
+
+module.exports = test
--- a/examples/protocol-and-stream-muxing/test-2.js
+++ b/examples/protocol-and-stream-muxing/test-2.js
@ -1,13 +1,38 @@
-import path from 'path'
-import { waitForOutput } from '../utils.js'
-import { fileURLToPath } from 'url'
+'use strict'

-const __dirname = path.dirname(fileURLToPath(import.meta.url))
+const path = require('path')
+const execa = require('execa')
+const pWaitFor = require('p-wait-for')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')

-export async function test () {
+const messages = [
+  'protocol (a)',
+  'protocol (b)',
+  'another stream on protocol (b)'
+]
+
+async function test() {
  process.stdout.write('2.js\n')

-  await waitForOutput('another stream on protocol (b)', 'node', [path.join(__dirname, '2.js')], {
-    cwd: __dirname
+  let count = 0
+  const proc = execa('node', [path.join(__dirname, '2.js')], {
+    cwd: path.resolve(__dirname),
+    all: true
  })
+
+  proc.all.on('data', async (data) => {
+    process.stdout.write(data)
+
+    const line = uint8ArrayToString(data)
+
+    if (messages.find((m) => line.includes(m))) {
+      count += 1
+    }
+  })
+
+  await pWaitFor(() => count === messages.length)
+
+  proc.kill()
 }
+
+module.exports = test
--- a/examples/protocol-and-stream-muxing/test-3.js
+++ b/examples/protocol-and-stream-muxing/test-3.js
@ -1,13 +1,37 @@
-import path from 'path'
-import { waitForOutput } from '../utils.js'
-import { fileURLToPath } from 'url'
+'use strict'

-const __dirname = path.dirname(fileURLToPath(import.meta.url))
+const path = require('path')
+const execa = require('execa')
+const pWaitFor = require('p-wait-for')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')

-export async function test () {
+const messages = [
+  'from 1 to 2',
+  'from 2 to 1'
+]
+
+async function test() {
  process.stdout.write('3.js\n')

-  await waitForOutput('from 2 to 1', 'node', [path.join(__dirname, '3.js')], {
-    cwd: __dirname
+  let count = 0
+  const proc = execa('node', [path.join(__dirname, '3.js')], {
+    cwd: path.resolve(__dirname),
+    all: true
  })
+
+  proc.all.on('data', async (data) => {
+    process.stdout.write(data)
+
+    const line = uint8ArrayToString(data)
+
+    if (messages.find((m) => line.includes(m))) {
+      count += 1
+    }
+  })
+
+  await pWaitFor(() => count === messages.length)
+
+  proc.kill()
 }
+
+module.exports = test
--- a/examples/protocol-and-stream-muxing/test.js
+++ b/examples/protocol-and-stream-muxing/test.js
@ -1,9 +1,13 @@
-import { test as test1 } from './test-1.js'
-import { test as test2 } from './test-2.js'
-import { test as test3 } from './test-3.js'
+'use strict'

-export async function test() {
+const test1 = require('./test-1')
+const test2 = require('./test-2')
+const test3 = require('./test-3')
+
+async function test() {
  await test1()
  await test2()
  await test3()
 }
+
+module.exports = test
--- a/examples/pubsub/1.js
+++ b/examples/pubsub/1.js
@ -1,22 +1,25 @@
 /* eslint-disable no-console */
+'use strict'

-import { createLibp2p } from 'libp2p'
-import { TCP } from '@libp2p/tcp'
-import { Mplex } from '@libp2p/mplex'
-import { Noise } from '@chainsafe/libp2p-noise'
-import { FloodSub } from '@libp2p/floodsub'
-import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
-import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
+const Libp2p = require('../../')
+const TCP = require('libp2p-tcp')
+const Mplex = require('libp2p-mplex')
+const { NOISE } = require('@chainsafe/libp2p-noise')
+const Gossipsub = require('libp2p-gossipsub')
+const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')

 const createNode = async () => {
-  const node = await createLibp2p({
+  const node = await Libp2p.create({
    addresses: {
      listen: ['/ip4/0.0.0.0/tcp/0']
    },
-    transports: [new TCP()],
-    streamMuxers: [new Mplex()],
-    connectionEncryption: [new Noise()],
-    pubsub: new FloodSub()
+    modules: {
+      transport: [TCP],
+      streamMuxer: [Mplex],
+      connEncryption: [NOISE],
+      pubsub: Gossipsub
+    }
  })

  await node.start()
@ -32,24 +35,22 @@ const createNode = async () => {
  ])

  // Add node's 2 data to the PeerStore
-  await node1.peerStore.addressBook.set(node2.peerId, node2.getMultiaddrs())
+  node1.peerStore.addressBook.set(node2.peerId, node2.multiaddrs)
  await node1.dial(node2.peerId)

-  node1.pubsub.subscribe(topic)
-  node1.pubsub.addEventListener('message', (evt) => {
-    console.log(`node1 received: ${uint8ArrayToString(evt.detail.data)} on topic ${evt.detail.topic}`)
+  node1.pubsub.on(topic, (msg) => {
+    console.log(`node1 received: ${uint8ArrayToString(msg.data)}`)
  })
+  await node1.pubsub.subscribe(topic)

  // Will not receive own published messages by default
-  node2.pubsub.subscribe(topic)
-  node2.pubsub.addEventListener('message', (evt) => {
-    console.log(`node2 received: ${uint8ArrayToString(evt.detail.data)} on topic ${evt.detail.topic}`)
+  node2.pubsub.on(topic, (msg) => {
+    console.log(`node2 received: ${uint8ArrayToString(msg.data)}`)
  })
+  await node2.pubsub.subscribe(topic)

  // node2 publishes "news" every second
  setInterval(() => {
-    node2.pubsub.publish(topic, uint8ArrayFromString('Bird bird bird, bird is the word!')).catch(err => {
-      console.error(err)
-    })
+    node2.pubsub.publish(topic, uint8ArrayFromString('Bird bird bird, bird is the word!'))
  }, 1000)
 })()
--- a/examples/pubsub/README.md
+++ b/examples/pubsub/README.md
@ -21,57 +21,49 @@ Using PubSub is super simple, you only need to provide the implementation of you
 First, let's update our libp2p configuration with a pubsub implementation.

 ```JavaScript
-import { createLibp2p } from 'libp2p'
-import { Gossipsub } from 'libp2p-gossipsub'
+const Libp2p = require('libp2p')
+const Gossipsub = require('libp2p-gossipsub')

-const node = await createLibp2p({
+const node = await Libp2p.create({
  addresses: {
    listen: ['/ip4/0.0.0.0/tcp/0']
  },
-  transports: [
-    new TCP()
-  ],
-  streamMuxers: [
-    new Mplex()
-  ],
-  connectionEncryption: [
-    new Noise()
-  ],
-  // we add the Pubsub module we want
-  pubsub: new Gossipsub()
+  modules: {
+    transport: [ TCP ],
+    streamMuxer: [ Mplex ],
+    connEncryption: [ NOISE ],
+    // we add the Pubsub module we want
+    pubsub: Gossipsub
+  }
 })
 ```

 Once that is done, we only need to create a few libp2p nodes, connect them and everything is ready to start using pubsub.

 ```JavaScript
-const { fromString } from 'uint8arrays/from-string')
-const { toString } from 'uint8arrays/to-string')
 const topic = 'news'

 const node1 = nodes[0]
 const node2 = nodes[1]

 // Add node's 2 data to the PeerStore
-await node1.peerStore.addressBook.set(node2.peerId, node2.multiaddrs)
+node1.peerStore.addressBook.set(node2.peerId, node2.multiaddrs)
 await node1.dial(node2.peerId)

 node1.pubsub.on(topic, (msg) => {
-  console.log(`node1 received: ${toString(msg.data)}`)
+  console.log(`node1 received: ${uint8ArrayToString(msg.data)}`)
 })
 await node1.pubsub.subscribe(topic)

 // Will not receive own published messages by default
 node2.pubsub.on(topic, (msg) => {
-  console.log(`node2 received: ${toString(msg.data)}`)
+  console.log(`node2 received: ${uint8ArrayToString(msg.data)}`)
 })
 await node2.pubsub.subscribe(topic)

 // node2 publishes "news" every second
 setInterval(() => {
-  node2.pubsub.publish(topic, fromString('Bird bird bird, bird is the word!')).catch(err => {
-    console.error(err)
-  })
+  node2.pubsub.publish(topic, uint8ArrayFromString('Bird bird bird, bird is the word!'))
 }, 1000)
 ```

--- a/examples/pubsub/message-filtering/1.js
+++ b/examples/pubsub/message-filtering/1.js
@ -1,22 +1,25 @@
 /* eslint-disable no-console */
+'use strict'

-import { createLibp2p } from 'libp2p'
-import { TCP } from '@libp2p/tcp'
-import { Mplex } from '@libp2p/mplex'
-import { Noise } from '@chainsafe/libp2p-noise'
-import { FloodSub } from '@libp2p/floodsub'
-import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
-import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
+const Libp2p = require('../../../')
+const TCP = require('libp2p-tcp')
+const Mplex = require('libp2p-mplex')
+const { NOISE } = require('@chainsafe/libp2p-noise')
+const Gossipsub = require('libp2p-gossipsub')
+const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')

 const createNode = async () => {
-  const node = await createLibp2p({
+  const node = await Libp2p.create({
    addresses: {
      listen: ['/ip4/0.0.0.0/tcp/0']
    },
-    transports: [new TCP()],
-    streamMuxers: [new Mplex()],
-    connectionEncryption: [new Noise()],
-    pubsub: new FloodSub()
+    modules: {
+      transport: [TCP],
+      streamMuxer: [Mplex],
+      connEncryption: [NOISE],
+      pubsub: Gossipsub
+    }
  })

  await node.start()
@ -33,26 +36,28 @@ const createNode = async () => {
  ])

  // node1 conect to node2 and node2 conect to node3
-  await node1.peerStore.addressBook.set(node2.peerId, node2.getMultiaddrs())
+  node1.peerStore.addressBook.set(node2.peerId, node2.multiaddrs)
  await node1.dial(node2.peerId)

-  await node2.peerStore.addressBook.set(node3.peerId, node3.getMultiaddrs())
+  node2.peerStore.addressBook.set(node3.peerId, node3.multiaddrs)
  await node2.dial(node3.peerId)

  //subscribe
-  node1.pubsub.addEventListener(topic, (evt) => {
+  node1.pubsub.on(topic, (msg) => {
    // Will not receive own published messages by default
-    console.log(`node1 received: ${uint8ArrayToString(evt.detail.data)}`)
+    console.log(`node1 received: ${uint8ArrayToString(msg.data)}`)
  })
-  node1.pubsub.subscribe(topic)
+  await node1.pubsub.subscribe(topic)

-  node2.pubsub.addEventListener(topic, (evt) => {
-    console.log(`node2 received: ${uint8ArrayToString(evt.detail.data)}`)
+  node2.pubsub.on(topic, (msg) => {
+    console.log(`node2 received: ${uint8ArrayToString(msg.data)}`)
  })
+  await node2.pubsub.subscribe(topic)

-  node3.pubsub.addEventListener(topic, (evt) => {
-    console.log(`node3 received: ${uint8ArrayToString(evt.detail.data)}`)
+  node3.pubsub.on(topic, (msg) => {
+    console.log(`node3 received: ${uint8ArrayToString(msg.data)}`)
  })
+  await node3.pubsub.subscribe(topic)

  const validateFruit = (msgTopic, msg) => {
    const fruit = uint8ArrayToString(msg.data)
@ -74,9 +79,7 @@ const createNode = async () => {
  // car is not a fruit !
  setInterval(() => {
    console.log('############## fruit ' + myFruits[count] + ' ##############')
-    node1.pubsub.publish(topic, uint8ArrayFromString(myFruits[count])).catch(err => {
-      console.info(err)
-    })
+    node1.pubsub.publish(topic, uint8ArrayFromString(myFruits[count]))
    count++
    if (count == myFruits.length) {
      count = 0
--- a/examples/pubsub/message-filtering/README.md
+++ b/examples/pubsub/message-filtering/README.md
@ -7,23 +7,19 @@ To prevent undesired data from being propagated on the network, we can apply a f
 First, let's update our libp2p configuration with a pubsub implementation.

 ```JavaScript
-import { createLibp2p } from 'libp2p'
-import { Gossipsub } from 'libp2p-gossipsub'
+const Libp2p = require('libp2p')
+const Gossipsub = require('libp2p-gossipsub')

-const node = await createLibp2p({
+const node = await Libp2p.create({
  addresses: {
    listen: ['/ip4/0.0.0.0/tcp/0']
  },
-  transports: [
-    new TCP()
-  ],
-  streamMuxers: [
-    new Mplex()
-  ],
-  connectionEncryption: [
-    new Noise()
-  ],
-  pubsub: new Gossipsub()
+  modules: {
+    transport: [ TCP ],
+    streamMuxer: [ Mplex ],
+    connEncryption: [ NOISE ],
+    pubsub: Gossipsub
+  }
 })
 ```

@ -36,10 +32,10 @@ const [node1, node2, node3] = await Promise.all([
  createNode(),
 ])

-await node1.peerStore.addressBook.set(node2.peerId, node2.multiaddrs)
+node1.peerStore.addressBook.set(node2.peerId, node2.multiaddrs)
 await node1.dial(node2.peerId)

-await node2.peerStore.addressBook.set(node3.peerId, node3.multiaddrs)
+node2.peerStore.addressBook.set(node3.peerId, node3.multiaddrs)
 await node2.dial(node3.peerId)
 ```

@ -88,9 +84,7 @@ const myFruits = ['banana', 'apple', 'car', 'orange'];

 setInterval(() => {
  console.log('############## fruit ' + myFruits[count] + ' ##############')
-  node1.pubsub.publish(topic, new TextEncoder().encode(myFruits[count])).catch(err => {
-    console.error(err)
-  })
+  node1.pubsub.publish(topic, new TextEncoder().encode(myFruits[count]))
  count++
  if (count == myFruits.length) {
    count = 0
--- a/examples/pubsub/message-filtering/test.js
+++ b/examples/pubsub/message-filtering/test.js
@ -1,10 +1,9 @@
-import path from 'path'
-import execa from 'execa'
-import pDefer from 'p-defer'
-import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
-import { fileURLToPath } from 'url'
+'use strict'

-const __dirname = path.dirname(fileURLToPath(import.meta.url))
+const path = require('path')
+const execa = require('execa')
+const pDefer = require('p-defer')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')

 const stdout = [
  {
@ -25,7 +24,7 @@ const stdout = [
  },
 ]

-export async function test () {
+async function test () {
  const defer = pDefer()
  let topicCount = 0
  let topicMessageCount = 0
@ -64,3 +63,5 @@ export async function test () {
  await defer.promise
  proc.kill()
 }
+
+module.exports = test
--- a/examples/pubsub/test-1.js
+++ b/examples/pubsub/test-1.js
@ -1,12 +1,11 @@
-import path from 'path'
-import execa from 'execa'
-import pDefer from 'p-defer'
-import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
-import { fileURLToPath } from 'url'
+'use strict'

-const __dirname = path.dirname(fileURLToPath(import.meta.url))
+const path = require('path')
+const execa = require('execa')
+const pDefer = require('p-defer')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')

-export async function test () {
+async function test () {
  const defer = pDefer()
  process.stdout.write('1.js\n')

@ -27,3 +26,5 @@ export async function test () {
  await defer.promise
  proc.kill()
 }
+
+module.exports = test
--- a/examples/pubsub/test.js
+++ b/examples/pubsub/test.js
@ -1,7 +1,11 @@
-import { test as test1 } from './test-1.js'
-import { test as testMessageFiltering } from './message-filtering/test.js'
+'use strict'

-export async function test() {
+const test1 = require('./test-1')
+const testMessageFiltering = require('./message-filtering/test')
+
+async function test() {
  await test1()
  await testMessageFiltering()
 }
+
+module.exports = test
--- a/examples/test-all.js
+++ b/examples/test-all.js
@ -1,3 +1,4 @@
+'use strict'

 process.on('unhandedRejection', (err) => {
  console.error(err)
@ -5,14 +6,11 @@ process.on('unhandedRejection', (err) => {
  process.exit(1)
 })

-import path from 'path'
-import fs from 'fs'
-import {
+const path = require('path')
+const fs = require('fs')
+const {
  waitForOutput
-} from './utils.js'
-import { fileURLToPath } from 'url'
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url))
+} = require('./utils')

 async function testAll () {
  for (const dir of fs.readdirSync(__dirname)) {
@ -26,7 +24,7 @@ async function testAll () {
      continue
    }

-    await waitForOutput('npm info ok', 'npm', ['--loglevel', 'info', 'run', 'test', '--', dir], {
+    await waitForOutput('npm info ok', 'npm', ['test', '--', dir], {
      cwd: __dirname
    })
  }
--- a/examples/test.js
+++ b/examples/test.js
@ -1,12 +1,11 @@
+'use strict'
+
 process.env.NODE_ENV = 'test'
 process.env.CI = true // needed for some "clever" build tools

-import fs from 'fs-extra'
-import path from 'path'
-import execa from 'execa'
-import { fileURLToPath } from 'url'
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url))
+const fs = require('fs-extra')
+const path = require('path')
+const execa = require('execa')
 const dir = path.join(__dirname, process.argv[2])

 testExample(dir)
@ -54,7 +53,7 @@ async function build (dir) {
    return
  }

-  const pkg = JSON.parse(fs.readFileSync(pkgJson))
+  const pkg = require(pkgJson)
  let build

  if (pkg.scripts.bundle) {
@ -89,7 +88,7 @@ async function runTest (dir) {
    return
  }

-  const { test } = await import(testFile)
+  const test = require(testFile)

  await test()
 }
--- a/examples/transports/1.js
+++ b/examples/transports/1.js
@ -1,24 +1,21 @@
 /* eslint-disable no-console */
+'use strict'

-import { createLibp2p } from 'libp2p'
-import { TCP } from '@libp2p/tcp'
-import { Noise } from '@chainsafe/libp2p-noise'
+const Libp2p = require('../..')
+const TCP = require('libp2p-tcp')
+const { NOISE } = require('@chainsafe/libp2p-noise')

 const createNode = async () => {
-  const node = await createLibp2p({
+  const node = await Libp2p.create({
    addresses: {
      // To signal the addresses we want to be available, we use
      // the multiaddr format, a self describable address
-      listen: [
-        '/ip4/0.0.0.0/tcp/0'
-      ]
+      listen: ['/ip4/0.0.0.0/tcp/0']
    },
-    transports: [
-      new TCP()
-    ],
-    connectionEncryption: [
-      new Noise()
-    ]
+    modules: {
+      transport: [TCP],
+      connEncryption: [NOISE]
+    }
  })

  await node.start()
@ -30,5 +27,5 @@ const createNode = async () => {

  console.log('node has started (true/false):', node.isStarted())
  console.log('listening on:')
-  node.getMultiaddrs().forEach((ma) => console.log(ma.toString()))
+  node.multiaddrs.forEach((ma) => console.log(`${ma.toString()}/p2p/${node.peerId.toB58String()}`))
 })();
--- a/examples/transports/2.js
+++ b/examples/transports/2.js
@ -1,24 +1,26 @@
 /* eslint-disable no-console */
+'use strict'

-import { createLibp2p } from 'libp2p'
-import { TCP } from '@libp2p/tcp'
-import { Noise } from '@chainsafe/libp2p-noise'
-import { Mplex } from '@libp2p/mplex'
-import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
-import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
-import { pipe } from 'it-pipe'
-import toBuffer from 'it-to-buffer'
+const Libp2p = require('../..')
+const TCP = require('libp2p-tcp')
+const { NOISE } = require('@chainsafe/libp2p-noise')
+const MPLEX = require('libp2p-mplex')
+
+const pipe = require('it-pipe')
+const concat = require('it-concat')

 const createNode = async () => {
-  const node = await createLibp2p({
+  const node = await Libp2p.create({
    addresses: {
      // To signal the addresses we want to be available, we use
      // the multiaddr format, a self describable address
      listen: ['/ip4/0.0.0.0/tcp/0']
    },
-    transports: [new TCP()],
-    connectionEncryption: [new Noise()],
-    streamMuxers: [new Mplex()]
+    modules: {
+      transport: [TCP],
+      connEncryption: [NOISE],
+      streamMuxer: [MPLEX]
+    }
  })

  await node.start()
@ -27,7 +29,7 @@ const createNode = async () => {

 function printAddrs (node, number) {
  console.log('node %s is listening on:', number)
-  node.getMultiaddrs().forEach((ma) => console.log(ma.toString()))
+  node.multiaddrs.forEach((ma) => console.log(`${ma.toString()}/p2p/${node.peerId.toB58String()}`))
 }

 ;(async () => {
@ -42,16 +44,16 @@ function printAddrs (node, number) {
  node2.handle('/print', async ({ stream }) => {
    const result = await pipe(
      stream,
-      toBuffer
+      concat
    )
-    console.log(uint8ArrayToString(result))
+    console.log(result.toString())
  })

-  await node1.peerStore.addressBook.set(node2.peerId, node2.getMultiaddrs())
+  node1.peerStore.addressBook.set(node2.peerId, node2.multiaddrs)
  const { stream } = await node1.dialProtocol(node2.peerId, '/print')

  await pipe(
-    ['Hello', ' ', 'p2p', ' ', 'world', '!'].map(str => uint8ArrayFromString(str)),
+    ['Hello', ' ', 'p2p', ' ', 'world', '!'],
    stream
  )
 })();
--- a/examples/transports/3.js
+++ b/examples/transports/3.js
@ -1,26 +1,28 @@
 /* eslint-disable no-console */
+'use strict'

-import { createLibp2p } from 'libp2p'
-import { TCP } from '@libp2p/tcp'
-import { WebSockets } from '@libp2p/websockets'
-import { Noise } from '@chainsafe/libp2p-noise'
-import { Mplex } from '@libp2p/mplex'
-import { pipe } from 'it-pipe'
-import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
-import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
+const Libp2p = require('../..')
+const TCP = require('libp2p-tcp')
+const WebSockets = require('libp2p-websockets')
+const { NOISE } = require('@chainsafe/libp2p-noise')
+const MPLEX = require('libp2p-mplex')
+
+const pipe = require('it-pipe')

 const createNode = async (transports, addresses = []) => {
  if (!Array.isArray(addresses)) {
    addresses = [addresses]
  }

-  const node = await createLibp2p({
+  const node = await Libp2p.create({
    addresses: {
      listen: addresses
    },
-    transports: transports,
-    connectionEncryption: [new Noise()],
-    streamMuxers: [new Mplex()]
+    modules: {
+      transport: transports,
+      connEncryption: [NOISE],
+      streamMuxer: [MPLEX]
+    }
  })

  await node.start()
@ -29,7 +31,7 @@ const createNode = async (transports, addresses = []) => {

 function printAddrs(node, number) {
  console.log('node %s is listening on:', number)
-  node.getMultiaddrs().forEach((ma) => console.log(ma.toString()))
+  node.multiaddrs.forEach((ma) => console.log(`${ma.toString()}/p2p/${node.peerId.toB58String()}`))
 }

 function print ({ stream }) {
@ -37,7 +39,7 @@ function print ({ stream }) {
    stream,
    async function (source) {
      for await (const msg of source) {
-        console.log(uint8ArrayToString(msg))
+        console.log(msg.toString())
      }
    }
  )
@ -45,9 +47,9 @@ function print ({ stream }) {

 ;(async () => {
  const [node1, node2, node3] = await Promise.all([
-    createNode([new TCP()], '/ip4/0.0.0.0/tcp/0'),
-    createNode([new TCP(), new WebSockets()], ['/ip4/0.0.0.0/tcp/0', '/ip4/127.0.0.1/tcp/10000/ws']),
-    createNode([new WebSockets()], '/ip4/127.0.0.1/tcp/20000/ws')
+    createNode([TCP], '/ip4/0.0.0.0/tcp/0'),
+    createNode([TCP, WebSockets], ['/ip4/0.0.0.0/tcp/0', '/ip4/127.0.0.1/tcp/10000/ws']),
+    createNode([WebSockets], '/ip4/127.0.0.1/tcp/20000/ws')
  ])

  printAddrs(node1, '1')
@ -58,21 +60,21 @@ function print ({ stream }) {
  node2.handle('/print', print)
  node3.handle('/print', print)

-  await node1.peerStore.addressBook.set(node2.peerId, node2.getMultiaddrs())
-  await node2.peerStore.addressBook.set(node3.peerId, node3.getMultiaddrs())
-  await node3.peerStore.addressBook.set(node1.peerId, node1.getMultiaddrs())
+  node1.peerStore.addressBook.set(node2.peerId, node2.multiaddrs)
+  node2.peerStore.addressBook.set(node3.peerId, node3.multiaddrs)
+  node3.peerStore.addressBook.set(node1.peerId, node1.multiaddrs)

  // node 1 (TCP) dials to node 2 (TCP+WebSockets)
  const { stream } = await node1.dialProtocol(node2.peerId, '/print')
  await pipe(
-    [uint8ArrayFromString('node 1 dialed to node 2 successfully')],
+    ['node 1 dialed to node 2 successfully'],
    stream
  )

  // node 2 (TCP+WebSockets) dials to node 2 (WebSockets)
  const { stream: stream2 } = await node2.dialProtocol(node3.peerId, '/print')
  await pipe(
-    [uint8ArrayFromString('node 2 dialed to node 3 successfully')],
+    ['node 2 dialed to node 3 successfully'],
    stream2
  )

--- a/examples/transports/4.js
+++ b/examples/transports/4.js
@ -1,15 +1,17 @@
 /* eslint-disable no-console */
+'use strict'

-import { createLibp2p } from 'libp2p'
-import { TCP } from '@libp2p/tcp'
-import { WebSockets } from '@libp2p/websockets'
-import { Noise } from '@chainsafe/libp2p-noise'
-import { Mplex } from '@libp2p/mplex'
-import fs from 'fs'
-import https from 'https'
-import { pipe } from 'it-pipe'
-import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
-import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
+const Libp2p = require('../..')
+const TCP = require('libp2p-tcp')
+const WebSockets = require('libp2p-websockets')
+const { NOISE } = require('@chainsafe/libp2p-noise')
+const MPLEX = require('libp2p-mplex')
+
+const fs = require('fs');
+const https = require('https');
+const pipe = require('it-pipe')
+
+const transportKey = WebSockets.prototype[Symbol.toStringTag];

 const httpServer = https.createServer({
  cert: fs.readFileSync('./test_certs/cert.pem'),
@ -21,25 +23,26 @@ const createNode = async (addresses = []) => {
    addresses = [addresses]
  }

-  const node = await createLibp2p({
+  const node = await Libp2p.create({
    addresses: {
      listen: addresses
    },
-    transports: [
-      new TCP(),
-      new WebSockets({
-        server: httpServer,
-        websocket: {
-          rejectUnauthorized: false
-        }
-      })
-    ],
-    connectionEncryption: [new Noise()],
-    streamMuxers: [new Mplex()],
-    connectionManager: {
-      // Disable autoDial as it would fail because we are using a self-signed cert.
-      // `dialProtocol` does not fail because we pass `rejectUnauthorized: false`.
-      autoDial: false
+    modules: {
+      transport: [WebSockets],
+      connEncryption: [NOISE],
+      streamMuxer: [MPLEX]
+    },
+    config: {
+      peerDiscovery: {
+        // Disable autoDial as it would fail because we are using a self-signed cert.
+        // `dialProtocol` does not fail because we pass `rejectUnauthorized: false`.
+        autoDial: false
+      },
+      transport: {
+        [transportKey]: {
+          listenerOptions: { server: httpServer },
+        },
+      },
    }
  })

@ -49,7 +52,7 @@ const createNode = async (addresses = []) => {

 function printAddrs(node, number) {
  console.log('node %s is listening on:', number)
-  node.getMultiaddrs().forEach((ma) => console.log(ma.toString()))
+  node.multiaddrs.forEach((ma) => console.log(`${ma.toString()}/p2p/${node.peerId.toB58String()}`))
 }

 function print ({ stream }) {
@ -57,7 +60,7 @@ function print ({ stream }) {
    stream,
    async function (source) {
      for await (const msg of source) {
-        console.log(uint8ArrayToString(msg))
+        console.log(msg.toString())
      }
    }
  )
@ -75,12 +78,12 @@ function print ({ stream }) {
  node1.handle('/print', print)
  node2.handle('/print', print)

-  const targetAddr = node1.getMultiaddrs()[0];
+  const targetAddr = `${node1.multiaddrs[0]}/p2p/${node1.peerId.toB58String()}`;

  // node 2 (Secure WebSockets) dials to node 1 (Secure Websockets)
-  const { stream } = await node2.dialProtocol(targetAddr, '/print')
+  const { stream } = await node2.dialProtocol(targetAddr, '/print',  { websocket: { rejectUnauthorized: false } })
  await pipe(
-    [uint8ArrayFromString('node 2 dialed to node 1 successfully')],
+    ['node 2 dialed to node 1 successfully'],
    stream
  )
 })();
--- a/examples/transports/README.md
+++ b/examples/transports/README.md
@ -1,10 +1,10 @@
 # [Transports](http://libp2p.io/implementations/#transports)

-libp2p doesn't make assumptions for you, instead, it enables you as the developer of the application to pick the modules you need to run your application, which can vary depending on the runtime you are executing. A libp2p node can use one or more Transports to dial and listen for Connections. These transports are modules that offer a clean interface for dialing and listening, defined by the [interface-transport] specification. Some examples of possible transports are: TCP, UTP, WebRTC, QUIC, HTTP, Pigeon and so on.
+libp2p doesn't make assumptions for you, instead, it enables you as the developer of the application to pick the modules you need to run your application, which can vary depending on the runtime you are executing. A libp2p node can use one or more Transports to dial and listen for Connections. These transports are modules that offer a clean interface for dialing and listening, defined by the [interface-transport](https://github.com/libp2p/js-interfaces/tree/master/src/transport) specification. Some examples of possible transports are: TCP, UTP, WebRTC, QUIC, HTTP, Pigeon and so on.

-A more complete definition of what is a transport can be found on the [interface-transport] specification. A way to recognize a candidate transport is through the badge:
+A more complete definition of what is a transport can be found on the [interface-transport](https://github.com/libp2p/js-interfaces/tree/master/src/transport) specification. A way to recognize a candidate transport is through the badge:

-![][interface-transport badge]
+[![](https://raw.githubusercontent.com/diasdavid/interface-transport/master/img/badge.png)](https://raw.githubusercontent.com/diasdavid/interface-transport/master/img/badge.png)

 ## 1. Creating a libp2p node with TCP

@ -21,23 +21,23 @@ Then, in your favorite text editor create a file with the `.js` extension. I've
 First thing is to create our own libp2p node! Insert:

 ```JavaScript
-import { createLibp2p } from 'libp2p'
-import { TCP } from '@libp2p/tcp'
-import { Noise } from '@chainsafe/libp2p-noise'
+'use strict'
+
+const Libp2p = require('libp2p')
+const TCP = require('libp2p-tcp')
+const { NOISE } = require('@chainsafe/libp2p-noise')

 const createNode = async () => {
-  const node = await createLibp2p({
+  const node = await Libp2p.create({
    addresses: {
      // To signal the addresses we want to be available, we use
      // the multiaddr format, a self describable address
      listen: ['/ip4/0.0.0.0/tcp/0']
    },
-    transports: [
-      new TCP()
-    ],
-    connectionEncryption: [
-      new Noise()
-    ]
+    modules: {
+      transport: [ TCP ],
+      connEncryption: [ NOISE ]
+    }
  })

  await node.start()
@ -80,29 +80,31 @@ Now that we have our `createNode` function, let's create two nodes and make them
 For this step, we will need some more dependencies.

 ```bash
-> npm install it-pipe it-to-buffer @libp2p/mplex
+> npm install it-pipe it-concat libp2p-mplex
 ```

 And we also need to import the modules on our .js file:

 ```js
-import { pipe } from 'it-pipe'
-import toBuffer from 'it-to-buffer'
-import { Mplex } from '@libp2p/mplex'
+const pipe = require('it-pipe')
+const concat = require('it-concat')
+const MPLEX = require('libp2p-mplex')
 ```

-We are going to reuse the `createNode` function from step 1, but this time add a stream multiplexer from `libp2p-mplex`.
+We are going to reuse the `createNode` function from step 1, but this time add a stream multiplexer from `libp2p-mplex`. 
 ```js
 const createNode = async () => {
-  const node = await createLibp2p({
+  const node = await Libp2p.create({
    addresses: {
      // To signal the addresses we want to be available, we use
      // the multiaddr format, a self describable address
      listen: ['/ip4/0.0.0.0/tcp/0']
    },
-    transports: [new TCP()],
-    connectionEncryption: [new Noise()],
-    streamMuxers: [new Mplex()] // <--- Add this line
+    modules: {
+      transport: [TCP],
+      connEncryption: [NOISE],
+      streamMuxer: [MPLEX] // <--- Add this line
+    }
  })

  await node.start()
@ -133,12 +135,12 @@ Then add,
  node2.handle('/print', async ({ stream }) => {
    const result = await pipe(
      stream,
-      toBuffer
+      concat
    )
    console.log(result.toString())
  })

-  await node1.peerStore.addressBook.set(node2.peerId, node2.multiaddrs)
+  node1.peerStore.addressBook.set(node2.peerId, node2.multiaddrs)
  const { stream } = await node1.dialProtocol(node2.peerId, '/print')

  await pipe(
@ -184,13 +186,15 @@ const createNode = async (transports, addresses = []) => {
    addresses = [addresses]
  }

-  const node = await createLibp2p({
+  const node = await Libp2p.create({
    addresses: {
      listen: addresses
    },
-    transport: transports,
-    connectionEncryption: [new Noise()],
-    streamMuxers: [new Mplex()]
+    modules: {
+      transport: transports,
+      connEncryption: [NOISE],
+      streamMuxer: [MPLEX]
+    }
  })

  await node.start()
@ -203,8 +207,8 @@ As a rule, a libp2p node will only be capable of using a transport if: a) it has
 Let's update our flow to create nodes and see how they behave when dialing to each other:

 ```JavaScript
-import { WebSockets } from '@libp2p/websockets'
-import { TCP } from '@libp2p/tcp'
+const WebSockets = require('libp2p-websockets')
+const TCP = require('libp2p-tcp')

 const [node1, node2, node3] = await Promise.all([
  createNode([TCP], '/ip4/0.0.0.0/tcp/0'),
@ -220,9 +224,9 @@ node1.handle('/print', print)
 node2.handle('/print', print)
 node3.handle('/print', print)

-await node1.peerStore.addressBook.set(node2.peerId, node2.multiaddrs)
-await node2.peerStore.addressBook.set(node3.peerId, node3.multiaddrs)
-await node3.peerStore.addressBook.set(node1.peerId, node1.multiaddrs)
+node1.peerStore.addressBook.set(node2.peerId, node2.multiaddrs)
+node2.peerStore.addressBook.set(node3.peerId, node3.multiaddrs)
+node3.peerStore.addressBook.set(node1.peerId, node1.multiaddrs)

 // node 1 (TCP) dials to node 2 (TCP+WebSockets)
 const { stream } = await node1.dialProtocol(node2.peerId, '/print')
@ -284,15 +288,10 @@ As expected, we created 3 nodes: node 1 with TCP, node 2 with TCP+WebSockets and

 ## 4. How to create a new libp2p transport

-Today there are already several transports available and plenty to come. You can find these at [interface-transport implementations] list.
+Today there are already several transports available and plenty to come. You can find these at [interface-transport implementations](https://github.com/libp2p/js-interfaces/tree/master/src/transport#modules-that-implement-the-interface) list.

-Adding more transports is done through the same way as you added TCP and WebSockets. Some transports might offer extra functionalities, but as far as libp2p is concerned, if it follows the interface defined in the [spec][interface-transport api] it will be able to use it.
+Adding more transports is done through the same way as you added TCP and WebSockets. Some transports might offer extra functionalities, but as far as libp2p is concerned, if it follows the interface defined in the [spec](https://github.com/libp2p/js-interfaces/tree/master/src/transport#api) it will be able to use it.

 If you decide to implement a transport yourself, please consider adding to the list so that others can use it as well.

 Hope this tutorial was useful. We are always looking to improve it, so contributions are welcome!
-
-[interface-transport]: https://github.com/libp2p/js-libp2p-interfaces/tree/master/packages/libp2p-interfaces/src/transport
-[interface-transport badge]: https://raw.githubusercontent.com/libp2p/js-libp2p-interfaces/master/packages/libp2p-interfaces/src/transport/img/badge.png
-[interface-transport implementations]: https://github.com/libp2p/js-libp2p-interfaces/tree/master/packages/libp2p-interfaces/src/transport#modules-that-implement-the-interface
-[interface-transport api]: https://github.com/libp2p/js-libp2p-interfaces/tree/master/packages/libp2p-interfaces/src/transport#api
--- a/examples/transports/test-1.js
+++ b/examples/transports/test-1.js
@ -1,13 +1,38 @@
-import path from 'path'
-import { waitForOutput } from '../utils.js'
-import { fileURLToPath } from 'url'
+'use strict'

-const __dirname = path.dirname(fileURLToPath(import.meta.url))
+const path = require('path')
+const execa = require('execa')
+const pDefer = require('p-defer')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
+
+async function test () {
+  const deferStarted = pDefer()
+  const deferListen = pDefer()

-export async function test () {
  process.stdout.write('1.js\n')

-  await waitForOutput('/p2p/', 'node', [path.join(__dirname, '1.js')], {
-    cwd: __dirname
+  const proc = execa('node', [path.join(__dirname, '1.js')], {
+    cwd: path.resolve(__dirname),
+    all: true
  })
+
+  proc.all.on('data', async (data) => {
+    process.stdout.write(data)
+    const line = uint8ArrayToString(data)
+
+
+    if (line.includes('node has started (true/false): true')) {
+      deferStarted.resolve()
+    } else if (line.includes('p2p')) {
+      deferListen.resolve()
+    }
+  })
+
+  await Promise.all([
+    deferStarted.promise,
+    deferListen.promise
+  ])
+  proc.kill()
 }
+
+module.exports = test
--- a/examples/transports/test-2.js
+++ b/examples/transports/test-2.js
@ -1,13 +1,30 @@
-import path from 'path'
-import { waitForOutput } from '../utils.js'
-import { fileURLToPath } from 'url'
+'use strict'

-const __dirname = path.dirname(fileURLToPath(import.meta.url))
+const path = require('path')
+const execa = require('execa')
+const pDefer = require('p-defer')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')

-export async function test () {
+async function test () {
+  const defer = pDefer()
  process.stdout.write('2.js\n')

-  await waitForOutput('Hello p2p world!', 'node', [path.join(__dirname, '2.js')], {
-    cwd: __dirname
+  const proc = execa('node', [path.join(__dirname, '2.js')], {
+    cwd: path.resolve(__dirname),
+    all: true
  })
+
+  proc.all.on('data', async (data) => {
+    process.stdout.write(data)
+    const line = uint8ArrayToString(data)
+
+    if (line.includes('Hello p2p world!')) {
+      defer.resolve()
+    }
+  })
+
+  await defer.promise
+  proc.kill()
 }
+
+module.exports = test
--- a/examples/transports/test-3.js
+++ b/examples/transports/test-3.js
@ -1,13 +1,41 @@
-import path from 'path'
-import { waitForOutput } from '../utils.js'
-import { fileURLToPath } from 'url'
+'use strict'

-const __dirname = path.dirname(fileURLToPath(import.meta.url))
+const path = require('path')
+const execa = require('execa')
+const pDefer = require('p-defer')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
+
+async function test () {
+  const deferNode1 = pDefer()
+  const deferNode2 = pDefer()
+  const deferNode3 = pDefer()

-export async function test () {
  process.stdout.write('3.js\n')

-  await waitForOutput('node 3 failed to dial to node 1 with:', 'node', [path.join(__dirname, '3.js')], {
-    cwd: __dirname
+  const proc = execa('node', [path.join(__dirname, '3.js')], {
+    cwd: path.resolve(__dirname),
+    all: true
  })
+
+  proc.all.on('data', async (data) => {
+    process.stdout.write(data)
+    const line = uint8ArrayToString(data)
+
+    if (line.includes('node 1 dialed to node 2 successfully')) {
+      deferNode1.resolve()
+    } else if (line.includes('node 2 dialed to node 3 successfully')) {
+      deferNode2.resolve()
+    } else if (line.includes('node 3 failed to dial to node 1 with:')) {
+      deferNode3.resolve()
+    }
+  })
+
+  await Promise.all([
+    deferNode1.promise,
+    deferNode2.promise,
+    deferNode3.promise
+  ])
+  proc.kill()
 }
+
+module.exports = test
--- a/examples/transports/test-4.js
+++ b/examples/transports/test-4.js
@ -1,13 +1,33 @@
-import path from 'path'
-import { waitForOutput } from '../utils.js'
-import { fileURLToPath } from 'url'
+'use strict'

-const __dirname = path.dirname(fileURLToPath(import.meta.url))
+const path = require('path')
+const execa = require('execa')
+const pDefer = require('p-defer')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
+
+async function test () {
+  const deferNode1 = pDefer()

-export async function test () {
  process.stdout.write('4.js\n')

-  await waitForOutput('node 2 dialed to node 1 successfully', 'node', [path.join(__dirname, '4.js')], {
-    cwd: __dirname
+  const proc = execa('node', [path.join(__dirname, '4.js')], {
+    cwd: path.resolve(__dirname),
+    all: true
  })
+
+  proc.all.on('data', async (data) => {
+    process.stdout.write(data)
+    const line = uint8ArrayToString(data)
+
+    if (line.includes('node 2 dialed to node 1 successfully')) {
+      deferNode1.resolve()
+    }
+  })
+
+  await Promise.all([
+    deferNode1.promise,
+  ])
+  proc.kill()
 }
+
+module.exports = test
--- a/examples/transports/test.js
+++ b/examples/transports/test.js
@ -1,11 +1,15 @@
-import { test as test1 } from './test-1.js'
-import { test as test2 } from './test-2.js'
-import { test as test3 } from './test-3.js'
-import { test as test4 } from './test-4.js'
+'use strict'

-export async function test() {
+const test1 = require('./test-1')
+const test2 = require('./test-2')
+const test3 = require('./test-3')
+const test4 = require('./test-4')
+
+async function test() {
  await test1()
  await test2()
  await test3()
  await test4()
 }
+
+module.exports = test
--- a/examples/utils.js
+++ b/examples/utils.js
@ -1,6 +1,8 @@
-import execa from 'execa'
-import fs from 'fs-extra'
-import which from 'which'
+'use strict'
+
+const execa = require('execa')
+const fs = require('fs-extra')
+const which = require('which')

 async function isExecutable (command) {
  try {
@ -20,7 +22,7 @@ async function isExecutable (command) {
  }
 }

-export async function waitForOutput (expectedOutput, command, args = [], opts = {}) {
+async function waitForOutput (expectedOutput, command, args = [], opts = {}) {
  if (!await isExecutable(command)) {
    args.unshift(command)
    command = 'node'
@ -28,7 +30,7 @@ export async function waitForOutput (expectedOutput, command, args = [], opts =

  const proc = execa(command, args, opts)
  let output = ''
-  let time = 600000
+  let time = 120000

  let timeout = setTimeout(() => {
    throw new Error(`Did not see "${expectedOutput}" in output from "${[command].concat(args).join(' ')}" after ${time/1000}s`)
@ -53,3 +55,7 @@ export async function waitForOutput (expectedOutput, command, args = [], opts =
    }
  }
 }
+
+module.exports = {
+  waitForOutput
+}
--- a/examples/webrtc-direct/README.md
+++ b/examples/webrtc-direct/README.md
@ -9,7 +9,7 @@ When in the root folder of this example, type `node listener.js` in terminal. Yo
 incoming connections. Below is just an example of such address. In your case the suffix hash (`peerId`) will be different.

 ```bash
-$ node listener.js
+$ node listener.js 
 Listening on:
 /ip4/127.0.0.1/tcp/9090/http/p2p-webrtc-direct/p2p/QmUKQCzEUhhhobcNSrXU5uzxTqbvF1BjMCGNGZzZU14Kgd
 ```
@ -18,15 +18,16 @@ Listening on:
 Confirm that the above address is the same as the field `list` in `public/dialer.js`:
 ```js
    peerDiscovery: {
-      new Bootstrap({
+      [Bootstrap.tag]: {
+        enabled: true,
        // paste the address into `list`
        list: ['/ip4/127.0.0.1/tcp/9090/http/p2p-webrtc-direct/p2p/QmUKQCzEUhhhobcNSrXU5uzxTqbvF1BjMCGNGZzZU14Kgd']
-      })
+      }
    }
 ```

 ## 2. Run a browser libp2p dialer
-When in the root folder of this example, type `npm start` in terminal. You should see an address where you can browse
+When in the root folder of this example, type `npm run dev` in terminal. You should see an address where you can browse
 the running client. Open this address in your browser. In console
 logs you should see logs about successful connection with the node client. In the output of node client you should see
 a log message about successful connection as well.
--- a/examples/webrtc-direct/dialer.js
+++ b/examples/webrtc-direct/dialer.js
@ -1,21 +1,28 @@
-import { createLibp2p } from 'libp2p'
-import { WebRTCDirect } from '@achingbrain/webrtc-direct'
-import { Mplex } from '@libp2p/mplex'
-import { Noise } from '@chainsafe/libp2p-noise'
-import { Bootstrap } from '@libp2p/bootstrap'
+import 'babel-polyfill'
+const Libp2p = require('libp2p')
+const WebRTCDirect = require('libp2p-webrtc-direct')
+const Mplex = require('libp2p-mplex')
+const { NOISE } = require('@chainsafe/libp2p-noise')
+const Bootstrap = require('libp2p-bootstrap')

 document.addEventListener('DOMContentLoaded', async () => {
  // use the same peer id as in `listener.js` to avoid copy-pasting of listener's peer id into `peerDiscovery`
  const hardcodedPeerId = '12D3KooWCuo3MdXfMgaqpLC5Houi1TRoFqgK9aoxok4NK5udMu8m'
-  const libp2p = await createLibp2p({
-    transports: [new WebRTCDirect()],
-    streamMuxers: [new Mplex()],
-    connectionEncryption: [new Noise()],
-    peerDiscovery: [
-      new Bootstrap({
-        list: [`/ip4/127.0.0.1/tcp/9090/http/p2p-webrtc-direct/p2p/${hardcodedPeerId}`]
-      })
-    ]
+  const libp2p = await Libp2p.create({
+    modules: {
+      transport: [WebRTCDirect],
+      streamMuxer: [Mplex],
+      connEncryption: [NOISE],
+      peerDiscovery: [Bootstrap]
+    },
+    config: {
+      peerDiscovery: {
+        [Bootstrap.tag]: {
+          enabled: true,
+          list: [`/ip4/127.0.0.1/tcp/9090/http/p2p-webrtc-direct/p2p/${hardcodedPeerId}`]
+        }
+      }
+    }
  })

  const status = document.getElementById('status')
@ -29,21 +36,22 @@ document.addEventListener('DOMContentLoaded', async () => {
  }

  // Listen for new peers
-  libp2p.addEventListener('peer:discovery', (evt) => {
-    log(`Found peer ${evt.detail.id.toString()}`)
+  libp2p.on('peer:discovery', (peerId) => {
+    log(`Found peer ${peerId.toB58String()}`)
  })

  // Listen for new connections to peers
-  libp2p.connectionManager.addEventListener('peer:connect', (evt) => {
-    log(`Connected to ${evt.detail.remotePeer.toString()}`)
+  libp2p.connectionManager.on('peer:connect', (connection) => {
+    log(`Connected to ${connection.remotePeer.toB58String()}`)
  })

  // Listen for peers disconnecting
-  libp2p.connectionManager.addEventListener('peer:disconnect', (evt) => {
-    log(`Disconnected from ${evt.detail.remotePeer.toString()}`)
+  libp2p.connectionManager.on('peer:disconnect', (connection) => {
+    log(`Disconnected from ${connection.remotePeer.toB58String()}`)
  })

  await libp2p.start()
  status.innerText = 'libp2p started!'
-  log(`libp2p id is ${libp2p.peerId.toString()}`)
+  log(`libp2p id is ${libp2p.peerId.toB58String()}`)
+
 })
--- a/examples/webrtc-direct/index.html
+++ b/examples/webrtc-direct/index.html
@ -12,6 +12,6 @@
  <main>
    <pre id="output"></pre>
  </main>
-  <script src="./dialer.js" type="module"></script>
+  <script src="./dialer.js"></script>
 </body>
 </html>
--- a/Show More
+++ b/Show More