diff --git a/src/components/CoreComponent/index.js b/src/components/CoreComponent/index.js
index f1ce55a5..c0deaa6a 100644
--- a/src/components/CoreComponent/index.js
+++ b/src/components/CoreComponent/index.js
@@ -1,3 +1,42 @@
-import CoreComponent from './modules/CoreComponent'
+import React, { PropTypes } from 'react'
+import restyle from './modules/restyle'
+import stylePropTypes from './modules/stylePropTypes'
+
+class CoreComponent extends React.Component {
+  static propTypes = {
+    className: PropTypes.string,
+    component: PropTypes.oneOfType([
+      PropTypes.func,
+      PropTypes.string
+    ]),
+    style: PropTypes.object,
+    testID: PropTypes.string
+  }
+
+  static stylePropTypes = stylePropTypes;
+
+  static defaultProps = {
+    className: '',
+    component: 'div'
+  }
+
+  render() {
+    const {
+      className,
+      component: Component,
+      style,
+      testID,
+      ...other
+    } = this.props
+
+    return (
+      <Component
+        {...other}
+        {...restyle({ className, style })}
+        data-testid={process.env.NODE_ENV === 'production' ? null : testID}
+      />
+    )
+  }
+}
 
 export default CoreComponent
diff --git a/src/components/CoreComponent/modules/CoreComponent.js b/src/components/CoreComponent/modules/CoreComponent.js
deleted file mode 100644
index 6a319d66..00000000
--- a/src/components/CoreComponent/modules/CoreComponent.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import React, { PropTypes } from 'react'
-import restyle from './restyle'
-import stylePropTypes from './stylePropTypes'
-
-class CoreComponent extends React.Component {
-  static propTypes = {
-    className: PropTypes.string,
-    component: PropTypes.oneOfType([
-      PropTypes.func,
-      PropTypes.string
-    ]),
-    style: PropTypes.object,
-    testID: PropTypes.string
-  }
-
-  static stylePropTypes = stylePropTypes;
-
-  static defaultProps = {
-    className: '',
-    component: 'div'
-  }
-
-  render() {
-    const {
-      className,
-      component: Component,
-      style,
-      testID,
-      ...other
-    } = this.props
-
-    return (
-      <Component
-        {...other}
-        {...restyle({ className, style })}
-        data-testid={process.env.NODE_ENV === 'production' ? null : testID}
-      />
-    )
-  }
-}
-
-export default CoreComponent