diff --git a/.gitignore b/.gitignore
index f1db726..a74e2b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 node_modules/
-data/data.js
 dist/
 bundle.js
diff --git a/package.json b/package.json
index f61cf5d..95e2096 100644
--- a/package.json
+++ b/package.json
@@ -61,11 +61,10 @@
     "webpack": "^3.6.0"
   },
   "scripts": {
-    "clean": "rimraf data/data.js dist/",
-    "clean:dist": "rm -rf dist/",
+    "clean": "rm -rf dist/",
     "build:data": "node scripts/build-data",
-    "build:dist": "npm run clean:dist && babel src --out-dir dist --copy-files --ignore webpack.config.js",
-    "build": "npm run build:data && npm run build:dist",
+    "build:dist": "npm run clean && babel src --out-dir dist --copy-files --ignore webpack.config.js",
+    "build": "npm run build:dist && npm run build:data",
     "watch": "babel src --watch --out-dir dist --copy-files --ignore webpack.config.js",
     "start": "npm run storybook",
     "stats": "webpack --config ./src/webpack.config.js --json > stats.json",
diff --git a/scripts/build-data.js b/scripts/build-data.js
index ded3fff..20330a5 100644
--- a/scripts/build-data.js
+++ b/scripts/build-data.js
@@ -136,11 +136,7 @@ emojiData.forEach((datum) => {
 var flags = data.categories[categoriesIndex['Flags']]
 flags.emojis.sort()
 
-mkdirp('data', (err) => {
+const stringified = JSON.stringify(data).replace(/\"([A-Za-z_]+)\":/g, '$1:')
+fs.writeFile('dist/data/data.js', `module.exports = ${stringified}`, (err) => {
   if (err) throw err
-
-  const stringified = JSON.stringify(data).replace(/\"([A-Za-z_]+)\":/g, '$1:')
-  fs.writeFile('data/data.js', `module.exports = ${stringified}`, (err) => {
-    if (err) throw err
-  })
 })
diff --git a/src/components/emoji.js b/src/components/emoji.js
index ae6dc2b..eee0124 100644
--- a/src/components/emoji.js
+++ b/src/components/emoji.js
@@ -1,6 +1,6 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import data from '../../data'
+import data from '../data'
 
 import { getData, getSanitizedData, unifiedToNative } from '../utils'
 
diff --git a/src/components/picker.js b/src/components/picker.js
index dd65d48..3feb0db 100644
--- a/src/components/picker.js
+++ b/src/components/picker.js
@@ -3,7 +3,7 @@ import '../vendor/raf-polyfill'
 import React from 'react'
 import PropTypes from 'prop-types'
 import measureScrollbar from 'measure-scrollbar'
-import data from '../../data'
+import data from '../data'
 
 import store from '../utils/store'
 import frequently from '../utils/frequently'
diff --git a/data/index.js b/src/data/index.js
similarity index 86%
rename from data/index.js
rename to src/data/index.js
index f94997b..9f71768 100644
--- a/data/index.js
+++ b/src/data/index.js
@@ -1,5 +1,5 @@
-var buildSearch = require('../src/utils/build-search')
-var data = require('./data')
+import buildSearch from '../utils/build-search'
+import data from './data'
 
 function uncompress (list) {
   for (var short_name in list) {
@@ -29,4 +29,4 @@ function uncompress (list) {
 uncompress(data.emojis)
 uncompress(data.skins)
 
-module.exports = data
+export default data
diff --git a/src/utils/emoji-index.js b/src/utils/emoji-index.js
index 161595e..e6089b4 100644
--- a/src/utils/emoji-index.js
+++ b/src/utils/emoji-index.js
@@ -1,4 +1,4 @@
-import data from '../../data'
+import data from '../data'
 import { getData, getSanitizedData, uniq } from '.'
 
 var index = {}
diff --git a/src/utils/index.js b/src/utils/index.js
index 123e040..462a067 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -1,5 +1,5 @@
 import buildSearch from './build-search'
-import data from '../../data'
+import data from '../data'
 import stringFromCodePoint from '../polyfills/stringFromCodePoint'
 
 const _JSON = JSON