diff --git a/src/components/index.js b/src/components/index.js
deleted file mode 100644
index 9c4c019f8..000000000
--- a/src/components/index.js
+++ /dev/null
@@ -1,14 +0,0 @@
-export { default as Anchors } from './anchors'
-export { default as Category } from './category'
-export { default as Preview } from './preview'
-export { default as NotFound } from './not-found'
-export { default as Search } from './search'
-export { default as Skins } from './skins'
-export { default as SkinsEmoji } from './skins-emoji'
-export { default as SkinsDot } from './skins-dot'
-
-export { default as Emoji } from './emoji/emoji'
-export { default as NimbleEmoji } from './emoji/nimble-emoji'
-
-export { default as Picker } from './picker/picker'
-export { default as NimblePicker } from './picker/nimble-picker'
diff --git a/src/components/not-found.js b/src/components/not-found.js
index 7ffda0146..46c8af6f3 100644
--- a/src/components/not-found.js
+++ b/src/components/not-found.js
@@ -1,6 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import { NimbleEmoji } from '.'
+
+import NimbleEmoji from './emoji/nimble-emoji'
 
 export default class NotFound extends React.PureComponent {
   render() {
diff --git a/src/components/skins-dot.js b/src/components/skins-dot.js
index bc923ff24..c9efece65 100644
--- a/src/components/skins-dot.js
+++ b/src/components/skins-dot.js
@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 
-import { Skins } from '.'
+import Skins from './skins'
 
 export default class SkinsDot extends Skins {
   constructor(props) {
diff --git a/src/components/skins-emoji.js b/src/components/skins-emoji.js
index 192f3b9d5..8de2d1963 100644
--- a/src/components/skins-emoji.js
+++ b/src/components/skins-emoji.js
@@ -1,7 +1,8 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 
-import { NimbleEmoji, Skins } from '.'
+import NimbleEmoji from './emoji/nimble-emoji'
+import Skins from './skins'
 
 export default class SkinsEmoji extends Skins {
   constructor(props) {
diff --git a/src/components/skins.js b/src/components/skins.js
index 51942bb01..dd2b96feb 100644
--- a/src/components/skins.js
+++ b/src/components/skins.js
@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 
-import { NimbleEmoji } from '.'
+import NimbleEmoji from './emoji/nimble-emoji'
 
 export default class Skins extends React.PureComponent {
   constructor(props) {
diff --git a/src/index.js b/src/index.js
index 73ce9dc87..7df17f8d9 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,14 +1,10 @@
-import emojiIndex from './utils/emoji-index/emoji-index'
-import store from './utils/store'
-import frequently from './utils/frequently'
-
-export {
-  Picker,
-  NimblePicker,
-  Emoji,
-  NimbleEmoji,
-  Category,
-} from './components'
-
+export { default as emojiIndex } from './utils/emoji-index/emoji-index'
 export { default as NimbleEmojiIndex } from './utils/emoji-index/nimble-emoji-index'
-export { emojiIndex, store, frequently }
+export { default as store } from './utils/store'
+export { default as frequently } from './utils/frequently'
+
+export { default as Picker } from './components/picker/picker'
+export { default as NimblePicker } from './components/picker/nimble-picker'
+export { default as Emoji } from './components/emoji/emoji'
+export { default as NimbleEmoji } from './components/emoji/nimble-emoji'
+export { default as Category } from './components/category'