diff --git a/.babelrc b/.babelrc
new file mode 100644
index 0000000..760c650
--- /dev/null
+++ b/.babelrc
@@ -0,0 +1,3 @@
+{
+	"presets": [ "react", "es2015", "stage-0" ]
+}
\ No newline at end of file
diff --git a/__tests__/zoomcontrol-test.js b/__tests__/zoomcontrol-test.js
index a8bc3d2..0cd06de 100644
--- a/__tests__/zoomcontrol-test.js
+++ b/__tests__/zoomcontrol-test.js
@@ -1,13 +1,9 @@
-import {
-  default as React
-} from 'react';
+import React from 'react';
 
-import {
-  default as TestUtils
-} from 'react-addons-test-utils';
+import TestUtils from 'react-addons-test-utils';
 
-const expect = require('expect');
-const ZoomControl = require('../lib/zoomControl');
+import expect from 'expect';
+import ZoomControl from '../src/zoomControl';
 
 describe('ZoomControl', () => {
 
diff --git a/karma.conf.js b/karma.conf.js
index 46e89b1..1d416f6 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -17,13 +17,15 @@ module.exports = function (config) {
       devtool: 'inline-source-map',
       module: {
         loaders: [
-          { test: /\.js$/, loaders: ['babel'], exclude: /node_modules/ }
+          { 
+            test: /\.jsx?$/,         // Match both .js and .jsx files
+            exclude: /node_modules/, 
+            loader: "babel-loader"
+          }
         ]
       },
       resolve: {
-        alias: {
-          'react-d3-map-core': path.join(__dirname, './lib')
-        }
+        extensions: ['.webpack.js', '.web.js', '.js', '.jsx']
       }
     },
     webpackServer: {
diff --git a/package.json b/package.json
index 261aca1..2535caa 100644
--- a/package.json
+++ b/package.json
@@ -8,41 +8,49 @@
     "build": "rm -rf ./lib && babel -w --stage 0 src --out-dir lib"
   },
   "author": "ElixirDoc team",
-  "license": "Apache 2.0",
+  "license": "Apache-2.0",
+    "repository": {
+    "type": "git",
+    "url": "react-d3/react-d3-map-core"
+  },
   "devDependencies": {
-    "babel-core": "^5.8.24",
-    "babel-jest": "^5.3.0",
-    "babel-loader": "^5.3.2",
+    "babel-core": "^6.24.0",
+    "babel-jest": "^19.0.0",
+    "babel-loader": "^6.4.1",
+    "babel-preset-react": "^6.23.0",
+    "babel-preset-es2015": "^6.24.0",
+    "babel-preset-stage-0": "^6.22.0",
     "css-loader": "^0.18.0",
     "dsv-loader": "^1.0.0",
     "expect": "^1.13.3",
     "json-loader": "^0.5.3",
     "jsx-loader": "^0.13.2",
-    "karma": "^0.13.15",
-    "karma-chrome-launcher": "^0.2.1",
-    "karma-cli": "^0.1.1",
-    "karma-mocha": "^0.2.0",
-    "karma-sourcemap-loader": "^0.3.6",
-    "karma-webpack": "^1.7.0",
-    "mocha": "^2.2.5",
-    "react": "^0.14.3",
-    "react-addons-test-utils": "^0.14.0",
-    "react-dom": "^0.14.0",
+    "karma": "^1.5.0",
+    "karma-chrome-launcher": "^2.0.0",
+    "karma-cli": "^1.0.1",
+    "karma-mocha": "^1.3.0",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-webpack": "^2.0.3",
+    "mocha": "^3.2.0",
+    "react": "^15.4.1",
+    "react-addons-test-utils": "^15.4.1",
+    "react-addons-transition-group": "^15.4.1",
+    "react-dom": "^15.4.1",
     "react-hot-loader": "^1.3.0",
     "style-loader": "^0.12.4",
-    "topojson": "^1.6.19",
-    "webpack": "^1.12.2",
-    "webpack-dev-server": "^1.11.0"
+    "topojson": "^2.2.0",
+    "webpack": "^2.3.0",
+    "webpack-dev-server": "^2.4.2"
   },
-  "peerDepencies": {
-    "react": "^0.14.2"
+  "peerDependencies": {
+    "react": "^0.14.0 || ^15.0.0",
+    "react-dom": "^0.14.0 || ^15.0.0",
+    "react-addons-transition-group": "^0.14.0 || ^15.0.0"
   },
   "dependencies": {
     "d3": "^3.5.11",
     "queue-async": "^1.0.7",
-    "react": "^0.14.3",
-    "react-addons-css-transition-group": "^0.14.2",
-    "react-faux-dom": "^2.1.0"
+    "react-faux-dom": "^3.0.1"
   },
   "jest": {
     "scriptPreprocessor": "./node_modules/babel-jest",
diff --git a/webpack.config.js b/webpack.config.js
index 6312d48..cb995a8 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -43,7 +43,7 @@ module.exports = [{
       {
         test: [/\.jsx$/, /\.js$/],
         exclude: /node_modules/,
-        loaders: ["jsx-loader"],
+        loaders: ["babel-loader"],
       },
       {
         test: /\.css$/,
@@ -53,6 +53,6 @@ module.exports = [{
   },
 
   resolve: {
-    extensions: ['', '.webpack.js', '.web.js', '.js', '.jsx']
+    extensions: ['.webpack.js', '.web.js', '.js', '.jsx']
   }
 }];