diff --git a/.babelrc b/.babelrc
index 7347f66f20..4e8db7d68b 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,3 +1,27 @@
{
- stage: 0
-}
\ No newline at end of file
+ "presets": [
+ ["env", { "targets": { "node": 6 }, "useBuiltIns": true }],
+ "stage-0",
+ "react"
+ ],
+ "plugins": ["add-module-exports"],
+ "env": {
+ "production": {
+ "presets": ["react-optimize"],
+ "plugins": ["babel-plugin-dev-expression"]
+ },
+ "development": {
+ "plugins": [
+ "transform-class-properties",
+ "transform-es2015-classes",
+ "tcomb"
+ ],
+ "presets": ["react-hmre"]
+ },
+ "test": {
+ "plugins": [
+ ["webpack-loaders", { "config": "webpack.config.test.js", "verbose": false }]
+ ]
+ }
+ }
+}
diff --git a/app/actions/async.js b/app/actions/async.js
index a6e594d759..e75d4b4146 100644
--- a/app/actions/async.js
+++ b/app/actions/async.js
@@ -31,7 +31,7 @@ import * as metrics from '../constants/metrics';
import * as syncActions from './sync';
import * as actionUtils from './utils';
-import personUtils from '../../core/personUtils';
+import personUtils from '../../lib/core/personUtils';
let services = {};
let versionInfo = {};
diff --git a/app/actions/sync.js b/app/actions/sync.js
index 85aa012a30..6e10c529bd 100644
--- a/app/actions/sync.js
+++ b/app/actions/sync.js
@@ -28,7 +28,7 @@ import { addInfoToError, getAppInitErrorMessage, getLoginErrorMessage, getLogout
import errorText from '../constants/errors';
import * as actionUtils from './utils';
-import personUtils from '../../core/personUtils';
+import personUtils from '../../lib/core/personUtils';
export function addTargetDevice(userId, deviceKey) {
return {
diff --git a/app/app.html b/app/app.html
index 42185ac8a8..3b01934c30 100755
--- a/app/app.html
+++ b/app/app.html
@@ -16,11 +16,11 @@
-
+