diff --git a/index.js b/index.js
index 4a74328..85a38f0 100644
--- a/index.js
+++ b/index.js
@@ -1,9 +1,9 @@
-exports.MemStore = require('./mem-store')
-exports.swarm = require('./swarm')
-exports.config = require('./config')
-exports.connectPeers = require('./connect-peers')
-exports.getIpfsPeerId = require('./get-ipfs-peer-id')
-exports.startIpfs = require('./start-ipfs')
-exports.stopIpfs = require('./stop-ipfs')
-exports.testAPIs = require('./test-apis.js')
-exports.waitForPeers = require('./wait-for-peers')
+exports.MemStore = require('./src/mem-store')
+exports.swarm = require('./src/swarm')
+exports.config = require('./src/config')
+exports.connectPeers = require('./src/connect-peers')
+exports.getIpfsPeerId = require('./src/get-ipfs-peer-id')
+exports.startIpfs = require('./src/start-ipfs')
+exports.stopIpfs = require('./src/stop-ipfs')
+exports.testAPIs = require('./src/test-apis.js')
+exports.waitForPeers = require('./src/wait-for-peers')
diff --git a/config/browser.js b/src/config/browser.js
similarity index 100%
rename from config/browser.js
rename to src/config/browser.js
diff --git a/config/factory.js b/src/config/factory.js
similarity index 100%
rename from config/factory.js
rename to src/config/factory.js
diff --git a/config/index.js b/src/config/index.js
similarity index 100%
rename from config/index.js
rename to src/config/index.js
diff --git a/config/node.js b/src/config/node.js
similarity index 100%
rename from config/node.js
rename to src/config/node.js
diff --git a/connect-peers.js b/src/connect-peers.js
similarity index 100%
rename from connect-peers.js
rename to src/connect-peers.js
diff --git a/get-ipfs-peer-id.js b/src/get-ipfs-peer-id.js
similarity index 100%
rename from get-ipfs-peer-id.js
rename to src/get-ipfs-peer-id.js
diff --git a/mem-store.js b/src/mem-store.js
similarity index 100%
rename from mem-store.js
rename to src/mem-store.js
diff --git a/start-ipfs.js b/src/start-ipfs.js
similarity index 100%
rename from start-ipfs.js
rename to src/start-ipfs.js
diff --git a/stop-ipfs.js b/src/stop-ipfs.js
similarity index 100%
rename from stop-ipfs.js
rename to src/stop-ipfs.js
diff --git a/swarm.js b/src/swarm.js
similarity index 100%
rename from swarm.js
rename to src/swarm.js
diff --git a/test-apis.js b/src/test-apis.js
similarity index 100%
rename from test-apis.js
rename to src/test-apis.js
diff --git a/wait-for-peers.js b/src/wait-for-peers.js
similarity index 100%
rename from wait-for-peers.js
rename to src/wait-for-peers.js
diff --git a/test/memstore.spec.js b/test/memstore.spec.js
index 09c36d6..8c7015d 100644
--- a/test/memstore.spec.js
+++ b/test/memstore.spec.js
@@ -1,5 +1,5 @@
 const assert = require('assert')
-const MemStore = require('../mem-store')
+const { MemStore } = require('../')
 
 describe('MemStore', function () {
   it('puts and gets values', async () => {