diff --git a/.eslintignore b/.eslintignore
index 77309ee877a..c810ffb50da 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -22,7 +22,6 @@ js/react/**/*.js
 !js/backup.js
 !js/database.js
 !js/logging.js
-!js/i18n.js
 !js/models/conversations.js
 !js/views/attachment_view.js
 !js/views/conversation_search_view.js
diff --git a/Gruntfile.js b/Gruntfile.js
index 07040945a05..c5f360d0873 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -101,7 +101,6 @@ module.exports = function(grunt) {
         '!js/backup.js',
         '!js/components.js',
         '!js/database.js',
-        '!js/i18n.js',
         '!js/jquery.js',
         '!js/libsignal-protocol-worker.js',
         '!js/libtextsecure.js',
diff --git a/js/i18n.js b/js/modules/i18n.js
similarity index 100%
rename from js/i18n.js
rename to js/modules/i18n.js
diff --git a/js/react/util/index.ts b/js/react/util/index.ts
index e8a8ba55014..c1a36aa29e9 100644
--- a/js/react/util/index.ts
+++ b/js/react/util/index.ts
@@ -51,7 +51,7 @@ const locale = urlOptions.locale || 'en';
 import localeMessages from '../../../_locales/en/messages.json';
 
 // @ts-ignore
-import { setup } from '../../i18n';
+import { setup } from '../../modules/i18n';
 
 const i18n = setup(locale, localeMessages);
 
diff --git a/preload.js b/preload.js
index 067a870ed46..60e59ec3adb 100644
--- a/preload.js
+++ b/preload.js
@@ -113,7 +113,7 @@ window.React = require('react');
 window.ReactDOM = require('react-dom');
 window.moment = require('moment');
 
-const { setup } = require('./js/i18n');
+const { setup } = require('./js/modules/i18n');
 
 const { locale, localeMessages } = window.config;
 window.i18n = setup(locale, localeMessages);