diff --git a/src/i18n/index.js b/src/i18n/index.js
index aa7736f51..b9d6410c6 100644
--- a/src/i18n/index.js
+++ b/src/i18n/index.js
@@ -29,7 +29,7 @@
  * @module I18n
  */
 import { keys, isUndefined } from 'underscore';
-import messages from './messages';
+import messages from './locale';
 
 export default () => {
   const { language } = window.navigator || {};
diff --git a/src/i18n/locale/en.js b/src/i18n/locale/en.js
new file mode 100644
index 000000000..f4384f45b
--- /dev/null
+++ b/src/i18n/locale/en.js
@@ -0,0 +1,3 @@
+export default {
+  hello: 'Hello'
+};
diff --git a/src/i18n/locale/index.js b/src/i18n/locale/index.js
new file mode 100644
index 000000000..7f4284fa1
--- /dev/null
+++ b/src/i18n/locale/index.js
@@ -0,0 +1,5 @@
+import en from './en';
+
+export default {
+  en
+};
diff --git a/src/i18n/messages.js b/src/i18n/messages.js
deleted file mode 100644
index c72ded396..000000000
--- a/src/i18n/messages.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export default {
-  en: {
-    hello: 'Hello'
-  }
-};