15 files changed, 24 insertions, 24 deletions
diff --git a/.eslintrc.json b/.eslintrc.json
index 156b35b5..3557f83a 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -615,8 +615,8 @@
                 "ext/js/core.js",
                 "ext/js/core/extension-error.js",
                 "ext/js/**/sandbox/**/*.js",
-                "ext/js/language/japanese.js",
-                "ext/js/language/japanese-wanakana.js"
+                "ext/js/language/ja/japanese.js",
+                "ext/js/language/ja/japanese-wanakana.js"
             ],
             "env": {
                 "webextensions": false
diff --git a/ext/js/background/backend.js b/ext/js/background/backend.js
index af0b3039..85acac89 100644
--- a/ext/js/background/backend.js
+++ b/ext/js/background/backend.js
@@ -33,7 +33,7 @@ import {arrayBufferToBase64} from '../data/sandbox/array-buffer-util.js';
 import {DictionaryDatabase} from '../dictionary/dictionary-database.js';
 import {Environment} from '../extension/environment.js';
 import {ObjectPropertyAccessor} from '../general/object-property-accessor.js';
-import {distributeFuriganaInflected, isCodePointJapanese, isStringPartiallyJapanese, convertKatakanaToHiragana as jpConvertKatakanaToHiragana} from '../language/japanese.js';
+import {distributeFuriganaInflected, isCodePointJapanese, isStringPartiallyJapanese, convertKatakanaToHiragana as jpConvertKatakanaToHiragana} from '../language/ja/japanese.js';
 import {Translator} from '../language/translator.js';
 import {AudioDownloader} from '../media/audio-downloader.js';
 import {getFileExtensionFromAudioMediaType, getFileExtensionFromImageMediaType} from '../media/media-util.js';
diff --git a/ext/js/comm/clipboard-monitor.js b/ext/js/comm/clipboard-monitor.js
index a8e79a1b..6ee93f57 100644
--- a/ext/js/comm/clipboard-monitor.js
+++ b/ext/js/comm/clipboard-monitor.js
@@ -17,7 +17,7 @@
  */
 
 import {EventDispatcher} from '../core/event-dispatcher.js';
-import {isStringPartiallyJapanese} from '../language/japanese.js';
+import {isStringPartiallyJapanese} from '../language/ja/japanese.js';
 
 /**
  * @augments EventDispatcher<import('clipboard-monitor').Events>
diff --git a/ext/js/data/anki-note-builder.js b/ext/js/data/anki-note-builder.js
index a6e1aafc..52160abc 100644
--- a/ext/js/data/anki-note-builder.js
+++ b/ext/js/data/anki-note-builder.js
@@ -18,7 +18,7 @@
 
 import {ExtensionError} from '../core/extension-error.js';
 import {deferPromise} from '../core/utilities.js';
-import {convertHiraganaToKatakana, convertKatakanaToHiragana} from '../language/japanese.js';
+import {convertHiraganaToKatakana, convertKatakanaToHiragana} from '../language/ja/japanese.js';
 import {cloneFieldMarkerPattern, getRootDeckName} from './anki-util.js';
 
 export class AnkiNoteBuilder {
diff --git a/ext/js/data/sandbox/anki-note-data-creator.js b/ext/js/data/sandbox/anki-note-data-creator.js
index 79570532..f43595b6 100644
--- a/ext/js/data/sandbox/anki-note-data-creator.js
+++ b/ext/js/data/sandbox/anki-note-data-creator.js
@@ -17,7 +17,7 @@
  */
 
 import {getDisambiguations, getGroupedPronunciations, getPronunciationsOfType, getTermFrequency, groupTermTags} from '../../dictionary/dictionary-data-util.js';
-import {distributeFurigana} from '../../language/japanese.js';
+import {distributeFurigana} from '../../language/ja/japanese.js';
 
 /**
  * Creates a compatibility representation of the specified data.
diff --git a/ext/js/display/display-generator.js b/ext/js/display/display-generator.js
index fdfe3d4a..621ea833 100644
--- a/ext/js/display/display-generator.js
+++ b/ext/js/display/display-generator.js
@@ -20,7 +20,7 @@ import {ExtensionError} from '../core/extension-error.js';
 import {isObject} from '../core/utilities.js';
 import {getDisambiguations, getGroupedPronunciations, getTermFrequency, groupKanjiFrequencies, groupTermFrequencies, groupTermTags, isNonNounVerbOrAdjective} from '../dictionary/dictionary-data-util.js';
 import {HtmlTemplateCollection} from '../dom/html-template-collection.js';
-import {distributeFurigana, getKanaMorae, getPitchCategory, isCodePointKanji, isStringPartiallyJapanese} from '../language/japanese.js';
+import {distributeFurigana, getKanaMorae, getPitchCategory, isCodePointKanji, isStringPartiallyJapanese} from '../language/ja/japanese.js';
 import {createPronunciationDownstepPosition, createPronunciationGraph, createPronunciationText} from './sandbox/pronunciation-generator.js';
 import {StructuredContentGenerator} from './sandbox/structured-content-generator.js';
 
diff --git a/ext/js/display/query-parser.js b/ext/js/display/query-parser.js
index 6ec803a0..c864617b 100644
--- a/ext/js/display/query-parser.js
+++ b/ext/js/display/query-parser.js
@@ -19,7 +19,7 @@
 import {EventDispatcher} from '../core/event-dispatcher.js';
 import {log} from '../core/logger.js';
 import {querySelectorNotNull} from '../dom/query-selector.js';
-import {convertHiraganaToKatakana, convertKatakanaToHiragana, isStringEntirelyKana} from '../language/japanese.js';
+import {convertHiraganaToKatakana, convertKatakanaToHiragana, isStringEntirelyKana} from '../language/ja/japanese.js';
 import {TextScanner} from '../language/text-scanner.js';
 
 /**
@@ -67,9 +67,9 @@ export class QueryParser extends EventDispatcher {
             searchOnClick: true,
             textSourceGenerator
         });
-        /** @type {?(import('../language/japanese-wanakana.js'))} */
+        /** @type {?(import('../language/ja/japanese-wanakana.js'))} */
         this._japaneseWanakanaModule = null;
-        /** @type {?Promise<import('../language/japanese-wanakana.js')>} */
+        /** @type {?Promise<import('../language/ja/japanese-wanakana.js')>} */
         this._japaneseWanakanaModuleImport = null;
     }
 
@@ -409,7 +409,7 @@ export class QueryParser extends EventDispatcher {
     /** */
     _loadJapaneseWanakanaModule() {
         if (this._japaneseWanakanaModuleImport !== null) { return; }
-        this._japaneseWanakanaModuleImport = import('../language/japanese-wanakana.js');
+        this._japaneseWanakanaModuleImport = import('../language/ja/japanese-wanakana.js');
         this._japaneseWanakanaModuleImport.then((value) => { this._japaneseWanakanaModule = value; });
     }
 }
diff --git a/ext/js/display/sandbox/pronunciation-generator.js b/ext/js/display/sandbox/pronunciation-generator.js
index 373ec830..f28520be 100644
--- a/ext/js/display/sandbox/pronunciation-generator.js
+++ b/ext/js/display/sandbox/pronunciation-generator.js
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {getKanaDiacriticInfo, isMoraPitchHigh} from '../../language/japanese.js';
+import {getKanaDiacriticInfo, isMoraPitchHigh} from '../../language/ja/japanese.js';
 
 /**
  * @param {string[]} morae
diff --git a/ext/js/display/sandbox/structured-content-generator.js b/ext/js/display/sandbox/structured-content-generator.js
index ff05cc02..a04feaf2 100644
--- a/ext/js/display/sandbox/structured-content-generator.js
+++ b/ext/js/display/sandbox/structured-content-generator.js
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {isStringPartiallyJapanese} from '../../language/japanese.js';
+import {isStringPartiallyJapanese} from '../../language/ja/japanese.js';
 
 export class StructuredContentGenerator {
     /**
diff --git a/ext/js/language/japanese-wanakana.js b/ext/js/language/ja/japanese-wanakana.js
index b48ab6d6..32260489 100644
--- a/ext/js/language/japanese-wanakana.js
+++ b/ext/js/language/ja/japanese-wanakana.js
@@ -15,11 +15,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import * as wanakana from '../../lib/wanakana.js';
+import * as wanakana from '../../../lib/wanakana.js';
 
 /**
  * @param {string} text
- * @param {?import('../general/text-source-map.js').TextSourceMap} sourceMap
+ * @param {?import('../../general/text-source-map.js').TextSourceMap} sourceMap
  * @param {number} sourceMapStart
  * @returns {string}
  */
@@ -84,7 +84,7 @@ export function convertToRomaji(text) {
 
 /**
  * @param {string} text
- * @param {?import('../general/text-source-map.js').TextSourceMap} sourceMap
+ * @param {?import('../../general/text-source-map.js').TextSourceMap} sourceMap
  * @returns {string}
  */
 export function convertAlphabeticToKana(text, sourceMap = null) {
diff --git a/ext/js/language/japanese.js b/ext/js/language/ja/japanese.js
index 88eb5af5..a4508040 100644
--- a/ext/js/language/japanese.js
+++ b/ext/js/language/ja/japanese.js
@@ -539,7 +539,7 @@ export function convertNumericToFullWidth(text) {
 
 /**
  * @param {string} text
- * @param {?import('../general/text-source-map.js').TextSourceMap} [sourceMap]
+ * @param {?import('../../general/text-source-map.js').TextSourceMap} [sourceMap]
  * @returns {string}
  */
 export function convertHalfWidthKanaToFullWidth(text, sourceMap = null) {
@@ -705,7 +705,7 @@ export function distributeFuriganaInflected(term, reading, source) {
 /**
  * @param {string} text
  * @param {boolean} fullCollapse
- * @param {?import('../general/text-source-map.js').TextSourceMap} [sourceMap]
+ * @param {?import('../../general/text-source-map.js').TextSourceMap} [sourceMap]
  * @returns {string}
  */
 export function collapseEmphaticSequences(text, fullCollapse, sourceMap = null) {
diff --git a/ext/js/language/translator.js b/ext/js/language/translator.js
index 334eb5b7..007a7d1e 100644
--- a/ext/js/language/translator.js
+++ b/ext/js/language/translator.js
@@ -18,8 +18,8 @@
 
 import {applyTextReplacement} from '../general/regex-util.js';
 import {TextSourceMap} from '../general/text-source-map.js';
-import {convertAlphabeticToKana} from './japanese-wanakana.js';
-import {collapseEmphaticSequences, convertHalfWidthKanaToFullWidth, convertHiraganaToKatakana, convertKatakanaToHiragana, convertNumericToFullWidth, isCodePointJapanese} from './japanese.js';
+import {convertAlphabeticToKana} from './ja/japanese-wanakana.js';
+import {collapseEmphaticSequences, convertHalfWidthKanaToFullWidth, convertHiraganaToKatakana, convertKatakanaToHiragana, convertNumericToFullWidth, isCodePointJapanese} from './ja/japanese.js';
 import {LanguageTransformer} from './language-transformer.js';
 
 /**
diff --git a/ext/js/media/audio-downloader.js b/ext/js/media/audio-downloader.js
index 968c9353..b594db7f 100644
--- a/ext/js/media/audio-downloader.js
+++ b/ext/js/media/audio-downloader.js
@@ -23,7 +23,7 @@ import {JsonSchema} from '../data/json-schema.js';
 import {arrayBufferToBase64} from '../data/sandbox/array-buffer-util.js';
 import {NativeSimpleDOMParser} from '../dom/native-simple-dom-parser.js';
 import {SimpleDOMParser} from '../dom/simple-dom-parser.js';
-import {isStringEntirelyKana} from '../language/japanese.js';
+import {isStringEntirelyKana} from '../language/ja/japanese.js';
 
 export class AudioDownloader {
     /**
diff --git a/ext/js/templates/sandbox/anki-template-renderer.js b/ext/js/templates/sandbox/anki-template-renderer.js
index 26d3f336..8ece8e24 100644
--- a/ext/js/templates/sandbox/anki-template-renderer.js
+++ b/ext/js/templates/sandbox/anki-template-renderer.js
@@ -22,7 +22,7 @@ import {getPronunciationsOfType, isNonNounVerbOrAdjective} from '../../dictionar
 import {createPronunciationDownstepPosition, createPronunciationGraph, createPronunciationText} from '../../display/sandbox/pronunciation-generator.js';
 import {StructuredContentGenerator} from '../../display/sandbox/structured-content-generator.js';
 import {CssStyleApplier} from '../../dom/sandbox/css-style-applier.js';
-import {convertHiraganaToKatakana, convertKatakanaToHiragana, distributeFurigana, getKanaMorae, getPitchCategory, isMoraPitchHigh} from '../../language/japanese.js';
+import {convertHiraganaToKatakana, convertKatakanaToHiragana, distributeFurigana, getKanaMorae, getPitchCategory, isMoraPitchHigh} from '../../language/ja/japanese.js';
 import {AnkiTemplateRendererContentManager} from './anki-template-renderer-content-manager.js';
 import {TemplateRendererMediaProvider} from './template-renderer-media-provider.js';
 import {TemplateRenderer} from './template-renderer.js';
diff --git a/test/japanese-util.test.js b/test/japanese-util.test.js
index d7b05c3e..8997df73 100644
--- a/test/japanese-util.test.js
+++ b/test/japanese-util.test.js
@@ -18,8 +18,8 @@
 
 import {describe, expect, test} from 'vitest';
 import {TextSourceMap} from '../ext/js/general/text-source-map.js';
-import * as jpw from '../ext/js/language/japanese-wanakana.js';
-import * as jp from '../ext/js/language/japanese.js';
+import * as jpw from '../ext/js/language/ja/japanese-wanakana.js';
+import * as jp from '../ext/js/language/ja/japanese.js';
 
 /** */
 function testIsCodePointKanji() {