diff --git a/.gitignore b/.gitignore
index d53a58d4f..e85ad96de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,7 +23,7 @@ build/
 coverage.xml
 dist/
 installer/picard-setup.nsi
-installer/languages/out/*.nsh
+installer/i18n/out/*.nsh
 locale/
 org.musicbrainz.Picard.appdata.xml
 picard.egg-info
diff --git a/.tx/config b/.tx/config
index 28f1bf48b..4a5facbca 100644
--- a/.tx/config
+++ b/.tx/config
@@ -14,8 +14,8 @@ source_lang = en
 type = PO
 
 [musicbrainz.picard_installer]
-file_filter = installer/languages/sources/<lang>.json
-source_file = installer/languages/sources/en.json
+file_filter = installer/i18n/sources/<lang>.json
+source_file = installer/i18n/sources/en.json
 source_lang = en
 type = KEYVALUEJSON
 
diff --git a/installer/languages/json2nsh.py b/installer/i18n/json2nsh.py
similarity index 100%
rename from installer/languages/json2nsh.py
rename to installer/i18n/json2nsh.py
diff --git a/installer/languages/nsh2json.py b/installer/i18n/nsh2json.py
similarity index 100%
rename from installer/languages/nsh2json.py
rename to installer/i18n/nsh2json.py
diff --git a/installer/languages/nshutil.py b/installer/i18n/nshutil.py
similarity index 100%
rename from installer/languages/nshutil.py
rename to installer/i18n/nshutil.py
diff --git a/installer/languages/sources/de.json b/installer/i18n/sources/de.json
similarity index 100%
rename from installer/languages/sources/de.json
rename to installer/i18n/sources/de.json
diff --git a/installer/languages/sources/en.json b/installer/i18n/sources/en.json
similarity index 100%
rename from installer/languages/sources/en.json
rename to installer/i18n/sources/en.json
diff --git a/installer/languages/sources/fr.json b/installer/i18n/sources/fr.json
similarity index 100%
rename from installer/languages/sources/fr.json
rename to installer/i18n/sources/fr.json
diff --git a/installer/languages/sources/it.json b/installer/i18n/sources/it.json
similarity index 100%
rename from installer/languages/sources/it.json
rename to installer/i18n/sources/it.json
diff --git a/installer/languages/sources/nl.json b/installer/i18n/sources/nl.json
similarity index 100%
rename from installer/languages/sources/nl.json
rename to installer/i18n/sources/nl.json
diff --git a/installer/picard-setup.nsi.in b/installer/picard-setup.nsi.in
index d7201496e..e30bd5e85 100644
--- a/installer/picard-setup.nsi.in
+++ b/installer/picard-setup.nsi.in
@@ -80,7 +80,7 @@ ReserveFile "${NSISDIR}\Plugins\x86-unicode\InstallOptions.dll"
 ; Language handling
 !macro LOAD_LANGUAGE LANGUAGE
   !insertmacro MUI_LANGUAGE "${LANGUAGE}"
-  !include "languages\out\${LANGUAGE}.nsh"
+  !include "i18n\out\${LANGUAGE}.nsh"
 !macroend
 
 ; Language files
diff --git a/setup.py b/setup.py
index 2d8893699..3b800989d 100644
--- a/setup.py
+++ b/setup.py
@@ -275,7 +275,7 @@ class picard_build(build):
             if os.path.isfile('installer/picard-setup.nsi.in'):
                 generate_file('installer/picard-setup.nsi.in', 'installer/picard-setup.nsi', {**args, **installer_args})
                 log.info('generating NSIS translation files')
-                self.spawn(['python', 'installer/languages/json2nsh.py'])
+                self.spawn(['python', 'installer/i18n/json2nsh.py'])
 
             version_args = {
                 'filevers': str(file_version),