diff --git a/src/components/category.js b/src/components/category.js
index 6108ccb..f2bca01 100644
--- a/src/components/category.js
+++ b/src/components/category.js
@@ -1,6 +1,6 @@
 import React from 'react'
 
-import {frequently} from '../utils'
+import frequently from '../utils/frequently'
 import {Emoji} from '.'
 
 const LABELS = {
diff --git a/src/components/picker.js b/src/components/picker.js
index e091151..827f154 100644
--- a/src/components/picker.js
+++ b/src/components/picker.js
@@ -3,7 +3,9 @@ import '../vendor/raf-polyfill'
 import React from 'react'
 import data from '../../data'
 
-import {store, frequently} from '../utils'
+import store from '../utils/store'
+import frequently from '../utils/frequently'
+
 import {Anchors, Category, Preview, Search} from '.'
 
 const RECENT_CATEGORY = { name: 'Recent', emojis: null }
diff --git a/src/components/search.js b/src/components/search.js
index e4f96e6..c3f064c 100644
--- a/src/components/search.js
+++ b/src/components/search.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import {emojiIndex} from '../utils'
+import emojiIndex from '../utils/emoji-index'
 
 export default class Search extends React.Component {
   handleChange() {
diff --git a/src/index.js b/src/index.js
index e0a8e42..0ade5dc 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,9 +1,5 @@
-export {
-  Picker,
-  Emoji,
-} from './components'
+import emojiIndex from './utils/emoji-index'
+import store from './utils/store'
 
-export {
-  emojiIndex,
-  store,
-} from './utils'
+export { Picker, Emoji } from './components'
+export { emojiIndex, store }
diff --git a/src/utils/frequently.js b/src/utils/frequently.js
index e3b1988..73692ef 100644
--- a/src/utils/frequently.js
+++ b/src/utils/frequently.js
@@ -1,4 +1,4 @@
-import {store} from '.'
+import store from './store'
 
 let frequently = store.get('frequently') || {}
 
diff --git a/src/utils/index.js b/src/utils/index.js
index e3de5c9..0d3c036 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -67,8 +67,4 @@ function getData(emoji, skin, sheetURL) {
   return emojiData
 }
 
-export {default as store} from './store'
-export {default as emojiIndex} from './emoji-index'
-export {default as frequently} from './frequently'
-
 export { getData, getSanitizedData }