diff --git a/webpack.config.js b/webpack.config.js
index 8690e36..fd2a381 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -13,12 +13,6 @@ module.exports = {
     process: 'mock',
     Buffer: 'buffer'
   },
-  // plugins: [
-  //   new webpack.optimize.UglifyJsPlugin({
-  //     mangle: false,
-  //     compress: { warnings: false }
-  //   })
-  // ],
   resolveLoader: {
     root: path.join(__dirname, 'node_modules')
   },
@@ -27,6 +21,7 @@ module.exports = {
       path.join(__dirname, 'node_modules')
     ],
     alias: {
+      'orbit-db-stre': require.resolve('./node_modules/orbit-db-store'),
       fs: require.resolve('./node_modules/logplease/src/fs-mock'),
       http: 'stream-http',
       https: 'https-browserify',
@@ -34,7 +29,8 @@ module.exports = {
     }
   },
   module: {
-    loaders: [{
+    loaders: [
+    {
       test: /\.js$/,
       exclude: /node_modules/,
       loader: 'babel',
@@ -42,7 +38,8 @@ module.exports = {
         presets: require.resolve('babel-preset-es2015'),
         plugins: require.resolve('babel-plugin-transform-runtime')
       }
-    }, {
+    },
+    {
       test: /\.js$/,
       include: /node_modules\/(hoek|qs|wreck|boom)/,
       loader: 'babel',
@@ -50,7 +47,8 @@ module.exports = {
         presets: require.resolve('babel-preset-es2015'),
         plugins: require.resolve('babel-plugin-transform-runtime')
       }
-    }, {
+    },
+    {
       test: /\.json$/,
       loader: 'json'
     }]
diff --git a/webpack.config.minified.js b/webpack.config.minified.js
new file mode 100644
index 0000000..4b674ec
--- /dev/null
+++ b/webpack.config.minified.js
@@ -0,0 +1,67 @@
+const webpack = require('webpack');
+const path = require('path');
+
+module.exports = {
+  entry: './src/OrbitDB.js',
+  output: {
+    libraryTarget: 'var',
+    library: 'OrbitDB',
+    filename: './dist/orbitdb.min.js'
+  },
+  node: {
+    console: false,
+    process: 'mock',
+    Buffer: 'buffer'
+  },
+  plugins: [
+    new webpack.optimize.UglifyJsPlugin({
+      mangle: false,
+      compress: { warnings: false }
+    })
+  ],
+  resolveLoader: {
+    root: path.join(__dirname, 'node_modules')
+  },
+  resolve: {
+    modulesDirectories: [
+      path.join(__dirname, 'node_modules')
+    ],
+    alias: {
+      fs: require.resolve('./node_modules/logplease/src/fs-mock'),
+      http: 'stream-http',
+      https: 'https-browserify',
+      Buffer: 'buffer'
+    }
+  },
+  module: {
+    loaders: [
+    {
+      test: /\.js$/,
+      exclude: /node_modules/,
+      loader: 'babel',
+      query: {
+        presets: require.resolve('babel-preset-es2015'),
+        plugins: require.resolve('babel-plugin-transform-runtime')
+      }
+    },
+    {
+      test: /\.js$/,
+      include: /node_modules\/(hoek|qs|wreck|boom|ipfs-.+|orbit-db-.+|logplease|crdts)/,
+      loader: 'babel',
+      query: {
+        presets: require.resolve('babel-preset-es2015'),
+        plugins: require.resolve('babel-plugin-transform-runtime')
+      }
+    },
+    {
+      test: /\.json$/,
+      loader: 'json'
+    }
+    ]
+  },
+  externals: {
+    net: '{}',
+    tls: '{}',
+    'require-dir': '{}'
+  }
+};
diff --git a/webpack.example.config.js b/webpack.example.config.js
index 5ad0b24..c6963bc 100644
--- a/webpack.example.config.js
+++ b/webpack.example.config.js
@@ -2,15 +2,21 @@ const webpack = require('webpack');
 const path = require('path');
 
 module.exports = {
-  entry: './examples/browser.js',
+  entry: './examples/browser/browser.js',
   output: {
-    filename: './examples/bundle.js'
+    filename: './examples/browser/bundle.js'
   },
   node: {
     console: false,
     process: 'mock',
     Buffer: 'buffer'
   },
+  plugins: [
+    new webpack.optimize.UglifyJsPlugin({
+      mangle: false,
+      compress: { warnings: false }
+    })
+  ],
   resolveLoader: {
     root: path.join(__dirname, 'node_modules')
   },
@@ -26,7 +32,8 @@ module.exports = {
     }
   },
   module: {
-    loaders: [{
+    loaders: [
+    {
       test: /\.js$/,
       exclude: /node_modules/,
       loader: 'babel',
@@ -34,18 +41,21 @@ module.exports = {
         presets: require.resolve('babel-preset-es2015'),
         plugins: require.resolve('babel-plugin-transform-runtime')
       }
-    }, {
+    },
+    {
       test: /\.js$/,
-      include: /node_modules\/(hoek|qs|wreck|boom)/,
+      include: /node_modules\/(hoek|qs|wreck|boom|ipfs-.+|orbit-db-.+|logplease|crdts)/,
       loader: 'babel',
       query: {
         presets: require.resolve('babel-preset-es2015'),
         plugins: require.resolve('babel-plugin-transform-runtime')
       }
-    }, {
+    },
+    {
       test: /\.json$/,
       loader: 'json'
-    }]
+    }
+    ]
   },
   externals: {
     net: '{}',