diff --git a/Gruntfile.js b/Gruntfile.js
index 3afa41486..98314928b 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -128,7 +128,7 @@ module.exports = function(grunt) {
         files: {
             'dist/ethers.js': './index.js',
             'dist/ethers-contracts.js': './contracts/index.js',
-            'dist/ethers-hdnode.js': './hdnode/index.js',
+//            'dist/ethers-hdnode.js': './hdnode/index.js',
             'dist/ethers-providers.js': './providers/index.js',
             'dist/ethers-utils.js': './utils/index.js',
             'dist/ethers-wallet.js': './wallet/index.js',
@@ -150,7 +150,7 @@ module.exports = function(grunt) {
         files: {
           'dist/ethers.min.js' : [ './dist/ethers.js' ],
           'dist/ethers-contracts.min.js' : [ './dist/ethers-contracts.js' ],
-          'dist/ethers-hdnode.min.js' : [ './dist/ethers-hdnode.js' ],
+//          'dist/ethers-hdnode.min.js' : [ './dist/ethers-hdnode.js' ],
           'dist/ethers-providers.min.js' : [ './dist/ethers-providers.js' ],
           'dist/ethers-utils.min.js' : [ './dist/ethers-utils.js' ],
           'dist/ethers-wallet.min.js' : [ './dist/ethers-wallet.js' ],
diff --git a/index.js b/index.js
index 36a5fab1b..7e0769830 100644
--- a/index.js
+++ b/index.js
@@ -9,15 +9,15 @@ var Wallet = require('ethers-wallet');
 */
 
 var contracts = require('./contracts/index.js');
-var HDNode = require('./hdnode/index.js');
+//var HDNode = require('./hdnode/index.js');
 var providers = require('./providers/index.js');
 var utils = require('./utils/index.js');
-var Wallet = require('./wallet/index.js');
+var wallet = require('./wallet/index.js');
 
 module.exports = {
-    Wallet: Wallet,
+    Wallet: wallet.Wallet,
 
-    HDNode: HDNode,
+    HDNode: wallet.HDNode,
 
     Contract: contracts.Contract,
     Interface: contracts.Interface,
@@ -35,6 +35,9 @@ module.exports = {
         getAddress: utils.getAddress,
         getContractAddress: utils.getContractAddress,
 
+        toUtf8Bytes: utils.toUtf8Bytes,
+        toUtf8String: utils.toUtf8String,
+
         keccak256: utils.keccak256,
         sha256: utils.sha256,
 
@@ -42,7 +45,7 @@ module.exports = {
     },
 
     _utils: utils,
-    _SigningKey: Wallet._SigningKey,
+    _SigningKey: wallet._SigningKey,
 };
 
 require('ethers-utils/standalone.js')(module.exports);
diff --git a/package.json b/package.json
index e56703312..1cee8e66c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "ethers-wallet",
-  "version": "1.0.11",
+  "name": "ethers",
+  "version": "2.0.0",
   "description": "Ethereum wallet library.",
   "main": "index.js",
   "scripts": {