diff --git a/common/web/types/src/util/compiler-interfaces.ts b/common/web/types/src/util/compiler-interfaces.ts
index 55a3f9a77a..a58484298a 100644
--- a/common/web/types/src/util/compiler-interfaces.ts
+++ b/common/web/types/src/util/compiler-interfaces.ts
@@ -36,13 +36,13 @@ export function compilerErrorSeverityName(code: number): string {
  * Defines the error code ranges for various compilers. Once defined, these
  * ranges must not be changed as external modules may depend on specific error
  * codes. Individual errors are defined at a compiler level, for example,
- * kmn-keyboard/src/compiler/messages.ts.
+ * kmc-ldml/src/compiler/messages.ts.
  */
 export enum CompilerErrorNamespace {
   /**
-   * kmc-keyboard errors between 0x0000…0x0FFF
+   * kmc-ldml errors between 0x0000…0x0FFF
    */
-  KeyboardCompiler = 0x0000,
+  LdmlKeyboardCompiler = 0x0000,
   /**
    * common/web/types errors between 0x1000…0x1FFF
    */
diff --git a/core/src/ldml/C7532_ldml_updating.md b/core/src/ldml/C7532_ldml_updating.md
index 62f30ad4df..168d205cea 100644
--- a/core/src/ldml/C7532_ldml_updating.md
+++ b/core/src/ldml/C7532_ldml_updating.md
@@ -46,11 +46,11 @@ working on ‘layr’, using ‘disp’ as a model from https://github.com/keyma
 ## In-memory data: Phase 2
 
 - first the compiler tests
-    - add a section in `developer/src/kmc-keyboard/test/fixtures/sections` if needed
-    - add a test case such as `developer/src/kmc-keyboard/test/test-key2.ts`
+    - add a section in `developer/src/kmc-ldml/test/fixtures/sections` if needed
+    - add a test case such as `developer/src/kmc-ldml/test/test-key2.ts`
 - add a compiler
-    - `developer/src/kmc-keyboard/compiler/key2.ts`
-    - link it in to `developer/src/kmc-keyboard/src/compiler/compiler.ts`
+    - `developer/src/kmc-ldml/compiler/key2.ts`
+    - link it in to `developer/src/kmc-ldml/src/compiler/compiler.ts`
         - add the import
         - add to `SECTION_COMPILERS`
 
@@ -68,10 +68,10 @@ working on ‘layr’, using ‘disp’ as a model from https://github.com/keyma
         - Also note that restructure will happily ignore (write zeros for) any fields where the BUILDER_* fields don't match the COMP_PLUS_* fields.
 
 - update basic.xml and basic.txt
-    - Tweak `eveloper/src/kmc-keyboard/test/fixtures/basic.xml` as needed
-    - You can use `developer/src/kmc-keyboard/build.sh build-fixtures` which will generate these. The two .kmx files are supposed to match: if not, fix `basic.txt` or fix other bugs.
-        - `developer/src/kmc-keyboard/build/test/fixtures/basic-txt.kmx` - KMX generated from basic.txt.
-        - `developer/src/kmc-keyboard/build/test/fixtures/basic-xml.kmx` - KMX generated from basic.xml.
-        - `developer/src/kmc-keyboard/build/test/fixtures/basic-xml.kvk` - KVK generated from basic.xml.
+    - Tweak `eveloper/src/kmc-ldml/test/fixtures/basic.xml` as needed
+    - You can use `developer/src/kmc-ldml/build.sh build-fixtures` which will generate these. The two .kmx files are supposed to match: if not, fix `basic.txt` or fix other bugs.
+        - `developer/src/kmc-ldml/build/test/fixtures/basic-txt.kmx` - KMX generated from basic.txt.
+        - `developer/src/kmc-ldml/build/test/fixtures/basic-xml.kmx` - KMX generated from basic.xml.
+        - `developer/src/kmc-ldml/build/test/fixtures/basic-xml.kvk` - KVK generated from basic.xml.
 
 ## more to come
diff --git a/developer/build.sh b/developer/build.sh
index 07442bab54..76fc3c94a7 100755
--- a/developer/build.sh
+++ b/developer/build.sh
@@ -28,8 +28,8 @@ builder_describe \
   build \
   test \
   ":kmcmplib=src/kmcmplib                   Compiler - .kmn compiler" \
-  ":kmc-keyboard=src/kmc-keyboard           Compiler - LDML Keyboard Module" \
   ":kmc-kmn=src/kmc-kmn                     Compiler - .kmn wrapper Keyboard Module" \
+  ":kmc-ldml=src/kmc-ldml                   Compiler - LDML Keyboard Module" \
   ":kmc-model=src/kmc-model                 Compiler - Lexical Model Module" \
   ":kmc-model-info=src/kmc-model-info       Compiler - .model_info Module" \
   ":kmc-package=src/kmc-package             Compiler - Package Module" \
diff --git a/developer/src/Makefile b/developer/src/Makefile
index c1ab53cce0..d4c6bd9384 100644
--- a/developer/src/Makefile
+++ b/developer/src/Makefile
@@ -69,12 +69,12 @@ server: .virtual
     cd $(DEVELOPER_ROOT)\src\server
     $(MAKE) $(TARGET)
 
-kmc: kmc-keyboard kmc-kmn kmc-model kmc-model-info kmc-package
+kmc: kmc-ldml kmc-kmn kmc-model kmc-model-info kmc-package
     cd $(DEVELOPER_ROOT)\src\kmc
     $(MAKE) $(TARGET)
 
-kmc-keyboard: .virtual
-    cd $(DEVELOPER_ROOT)\src\kmc-keyboard
+kmc-ldml: .virtual
+    cd $(DEVELOPER_ROOT)\src\kmc-ldml
     $(MAKE) $(TARGET)
 
 kmc-kmn: .virtual
diff --git a/developer/src/README.md b/developer/src/README.md
index e4de6c1328..95b33c36f4 100644
--- a/developer/src/README.md
+++ b/developer/src/README.md
@@ -70,7 +70,7 @@ details.
 
 node-based next generation compiler, hosts kmc, kmlmi, kmlmc, kmlmp
 
-### src/kmc-keyboard - LDML Keyboard Compiler
+### src/kmc-ldml - LDML Keyboard Compiler
 
 Next Generation keyboard compiler package - LDML keyboards only at present.
 Command line access through kmc.
diff --git a/developer/src/common/web/test-helpers/index.ts b/developer/src/common/web/test-helpers/index.ts
index 53c21ec590..e79271227e 100644
--- a/developer/src/common/web/test-helpers/index.ts
+++ b/developer/src/common/web/test-helpers/index.ts
@@ -3,9 +3,9 @@ import * as path from 'path';
 import { CompilerEvent, CompilerCallbacks, CompilerSchema, CompilerPathCallbacks, CompilerFileSystemCallbacks } from '@keymanapp/common-types';
 export { verifyCompilerMessagesObject } from './verifyCompilerMessagesObject.js';
 
-// TODO: schemas are only used by kmc-keyboard for now, so this works at this
+// TODO: schemas are only used by kmc-ldml for now, so this works at this
 // time, but it's a little fragile if we need them elsewhere in the future
-const SCHEMA_BASE = '../../../../kmc-keyboard/build/src/';
+const SCHEMA_BASE = '../../../../kmc-ldml/build/src/';
 
 /**
  * A CompilerCallbacks implementation for testing
diff --git a/developer/src/kmc-keyboard/.eslintrc.cjs b/developer/src/kmc-ldml/.eslintrc.cjs
similarity index 100%
rename from developer/src/kmc-keyboard/.eslintrc.cjs
rename to developer/src/kmc-ldml/.eslintrc.cjs
diff --git a/developer/src/kmc-keyboard/Makefile b/developer/src/kmc-ldml/Makefile
similarity index 100%
rename from developer/src/kmc-keyboard/Makefile
rename to developer/src/kmc-ldml/Makefile
diff --git a/developer/src/kmc-keyboard/build.sh b/developer/src/kmc-ldml/build.sh
similarity index 98%
rename from developer/src/kmc-keyboard/build.sh
rename to developer/src/kmc-ldml/build.sh
index edcb229e2a..71f146e835 100755
--- a/developer/src/kmc-keyboard/build.sh
+++ b/developer/src/kmc-ldml/build.sh
@@ -30,7 +30,7 @@ builder_describe "Build Keyman kmc Keyboard Compiler module" \
   "--dry-run,-n              don't actually publish, just dry run"
 builder_describe_outputs \
   configure     /node_modules \
-  build         /developer/src/kmc-keyboard/build/src/main.js
+  build         /developer/src/kmc-ldml/build/src/main.js
 
 builder_parse "$@"
 
diff --git a/developer/src/kmc-keyboard/package.json b/developer/src/kmc-ldml/package.json
similarity index 94%
rename from developer/src/kmc-keyboard/package.json
rename to developer/src/kmc-ldml/package.json
index 829acf29f8..fda0b44272 100644
--- a/developer/src/kmc-keyboard/package.json
+++ b/developer/src/kmc-ldml/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "@keymanapp/kmc-keyboard",
-  "description": "Keyman Developer keyboard compiler",
+  "name": "@keymanapp/kmc-ldml",
+  "description": "Keyman Developer LDML keyboard compiler",
   "keywords": [
     "keyboard",
     "keyman",
diff --git a/developer/src/kmc-keyboard/src/compiler/compiler-options.ts b/developer/src/kmc-ldml/src/compiler/compiler-options.ts
similarity index 100%
rename from developer/src/kmc-keyboard/src/compiler/compiler-options.ts
rename to developer/src/kmc-ldml/src/compiler/compiler-options.ts
diff --git a/developer/src/kmc-keyboard/src/compiler/compiler.ts b/developer/src/kmc-ldml/src/compiler/compiler.ts
similarity index 100%
rename from developer/src/kmc-keyboard/src/compiler/compiler.ts
rename to developer/src/kmc-ldml/src/compiler/compiler.ts
diff --git a/developer/src/kmc-keyboard/src/compiler/disp.ts b/developer/src/kmc-ldml/src/compiler/disp.ts
similarity index 100%
rename from developer/src/kmc-keyboard/src/compiler/disp.ts
rename to developer/src/kmc-ldml/src/compiler/disp.ts
diff --git a/developer/src/kmc-keyboard/src/compiler/keymanweb-compiler.ts b/developer/src/kmc-ldml/src/compiler/keymanweb-compiler.ts
similarity index 100%
rename from developer/src/kmc-keyboard/src/compiler/keymanweb-compiler.ts
rename to developer/src/kmc-ldml/src/compiler/keymanweb-compiler.ts
diff --git a/developer/src/kmc-keyboard/src/compiler/keys.ts b/developer/src/kmc-ldml/src/compiler/keys.ts
similarity index 100%
rename from developer/src/kmc-keyboard/src/compiler/keys.ts
rename to developer/src/kmc-ldml/src/compiler/keys.ts
diff --git a/developer/src/kmc-keyboard/src/compiler/layr.ts b/developer/src/kmc-ldml/src/compiler/layr.ts
similarity index 100%
rename from developer/src/kmc-keyboard/src/compiler/layr.ts
rename to developer/src/kmc-ldml/src/compiler/layr.ts
diff --git a/developer/src/kmc-keyboard/src/compiler/loca.ts b/developer/src/kmc-ldml/src/compiler/loca.ts
similarity index 100%
rename from developer/src/kmc-keyboard/src/compiler/loca.ts
rename to developer/src/kmc-ldml/src/compiler/loca.ts
diff --git a/developer/src/kmc-keyboard/src/compiler/messages.ts b/developer/src/kmc-ldml/src/compiler/messages.ts
similarity index 98%
rename from developer/src/kmc-keyboard/src/compiler/messages.ts
rename to developer/src/kmc-ldml/src/compiler/messages.ts
index 610f7732e7..32eb943a68 100644
--- a/developer/src/kmc-keyboard/src/compiler/messages.ts
+++ b/developer/src/kmc-ldml/src/compiler/messages.ts
@@ -1,10 +1,10 @@
 import { CompilerErrorNamespace, CompilerErrorSeverity, CompilerMessageSpec as m } from "@keymanapp/common-types";
 
-const SevInfo = CompilerErrorSeverity.Info | CompilerErrorNamespace.KeyboardCompiler;
-const SevHint = CompilerErrorSeverity.Hint | CompilerErrorNamespace.KeyboardCompiler;
+const SevInfo = CompilerErrorSeverity.Info | CompilerErrorNamespace.LdmlKeyboardCompiler;
+const SevHint = CompilerErrorSeverity.Hint | CompilerErrorNamespace.LdmlKeyboardCompiler;
 // const SevWarn = CompilerErrorSeverity.Warn | CompilerErrorNamespace.KeyboardCompiler;
-const SevError = CompilerErrorSeverity.Error | CompilerErrorNamespace.KeyboardCompiler;
-const SevFatal = CompilerErrorSeverity.Fatal | CompilerErrorNamespace.KeyboardCompiler;
+const SevError = CompilerErrorSeverity.Error | CompilerErrorNamespace.LdmlKeyboardCompiler;
+const SevFatal = CompilerErrorSeverity.Fatal | CompilerErrorNamespace.LdmlKeyboardCompiler;
 
 export class CompilerMessages {
   static Error_InvalidNormalization = (o:{form: string}) => m(this.ERROR_InvalidNormalization, `Invalid normalization form '${o.form}`);
diff --git a/developer/src/kmc-keyboard/src/compiler/meta.ts b/developer/src/kmc-ldml/src/compiler/meta.ts
similarity index 100%
rename from developer/src/kmc-keyboard/src/compiler/meta.ts
rename to developer/src/kmc-ldml/src/compiler/meta.ts
diff --git a/developer/src/kmc-keyboard/src/compiler/metadata-compiler.ts b/developer/src/kmc-ldml/src/compiler/metadata-compiler.ts
similarity index 100%
rename from developer/src/kmc-keyboard/src/compiler/metadata-compiler.ts
rename to developer/src/kmc-ldml/src/compiler/metadata-compiler.ts
diff --git a/developer/src/kmc-keyboard/src/compiler/name.ts b/developer/src/kmc-ldml/src/compiler/name.ts
similarity index 100%
rename from developer/src/kmc-keyboard/src/compiler/name.ts
rename to developer/src/kmc-ldml/src/compiler/name.ts
diff --git a/developer/src/kmc-keyboard/src/compiler/ordr.ts b/developer/src/kmc-ldml/src/compiler/ordr.ts
similarity index 100%
rename from developer/src/kmc-keyboard/src/compiler/ordr.ts
rename to developer/src/kmc-ldml/src/compiler/ordr.ts
diff --git a/developer/src/kmc-keyboard/src/compiler/section-compiler.ts b/developer/src/kmc-ldml/src/compiler/section-compiler.ts
similarity index 100%
rename from developer/src/kmc-keyboard/src/compiler/section-compiler.ts
rename to developer/src/kmc-ldml/src/compiler/section-compiler.ts
diff --git a/developer/src/kmc-keyboard/src/compiler/touch-layout-compiler.ts b/developer/src/kmc-ldml/src/compiler/touch-layout-compiler.ts
similarity index 100%
rename from developer/src/kmc-keyboard/src/compiler/touch-layout-compiler.ts
rename to developer/src/kmc-ldml/src/compiler/touch-layout-compiler.ts
diff --git a/developer/src/kmc-keyboard/src/compiler/tran.ts b/developer/src/kmc-ldml/src/compiler/tran.ts
similarity index 100%
rename from developer/src/kmc-keyboard/src/compiler/tran.ts
rename to developer/src/kmc-ldml/src/compiler/tran.ts
diff --git a/developer/src/kmc-keyboard/src/compiler/visual-keyboard-compiler.ts b/developer/src/kmc-ldml/src/compiler/visual-keyboard-compiler.ts
similarity index 100%
rename from developer/src/kmc-keyboard/src/compiler/visual-keyboard-compiler.ts
rename to developer/src/kmc-ldml/src/compiler/visual-keyboard-compiler.ts
diff --git a/developer/src/kmc-keyboard/src/compiler/vkey.ts b/developer/src/kmc-ldml/src/compiler/vkey.ts
similarity index 100%
rename from developer/src/kmc-keyboard/src/compiler/vkey.ts
rename to developer/src/kmc-ldml/src/compiler/vkey.ts
diff --git a/developer/src/kmc-keyboard/src/main.ts b/developer/src/kmc-ldml/src/main.ts
similarity index 100%
rename from developer/src/kmc-keyboard/src/main.ts
rename to developer/src/kmc-ldml/src/main.ts
diff --git a/developer/src/kmc-keyboard/src/util/util.ts b/developer/src/kmc-ldml/src/util/util.ts
similarity index 100%
rename from developer/src/kmc-keyboard/src/util/util.ts
rename to developer/src/kmc-ldml/src/util/util.ts
diff --git a/developer/src/kmc-keyboard/test/README.md b/developer/src/kmc-ldml/test/README.md
similarity index 100%
rename from developer/src/kmc-keyboard/test/README.md
rename to developer/src/kmc-ldml/test/README.md
diff --git a/developer/src/kmc-keyboard/test/fixtures/basic-kvk.txt b/developer/src/kmc-ldml/test/fixtures/basic-kvk.txt
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/basic-kvk.txt
rename to developer/src/kmc-ldml/test/fixtures/basic-kvk.txt
diff --git a/developer/src/kmc-keyboard/test/fixtures/basic-no-debug.js b/developer/src/kmc-ldml/test/fixtures/basic-no-debug.js
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/basic-no-debug.js
rename to developer/src/kmc-ldml/test/fixtures/basic-no-debug.js
diff --git a/developer/src/kmc-keyboard/test/fixtures/basic.js b/developer/src/kmc-ldml/test/fixtures/basic.js
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/basic.js
rename to developer/src/kmc-ldml/test/fixtures/basic.js
diff --git a/developer/src/kmc-keyboard/test/fixtures/basic.txt b/developer/src/kmc-ldml/test/fixtures/basic.txt
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/basic.txt
rename to developer/src/kmc-ldml/test/fixtures/basic.txt
diff --git a/developer/src/kmc-keyboard/test/fixtures/basic.xml b/developer/src/kmc-ldml/test/fixtures/basic.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/basic.xml
rename to developer/src/kmc-ldml/test/fixtures/basic.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/bksp/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/bksp/minimal.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/bksp/minimal.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/bksp/minimal.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/disp/escaped.xml b/developer/src/kmc-ldml/test/fixtures/sections/disp/escaped.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/disp/escaped.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/disp/escaped.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/disp/invalid-dupto.xml b/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-dupto.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/disp/invalid-dupto.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-dupto.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/disp/maximal.xml b/developer/src/kmc-ldml/test/fixtures/sections/disp/maximal.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/disp/maximal.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/disp/maximal.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/disp/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/disp/minimal.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/disp/minimal.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/disp/minimal.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/disp/options-only.xml b/developer/src/kmc-ldml/test/fixtures/sections/disp/options-only.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/disp/options-only.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/disp/options-only.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/disp/typical.xml b/developer/src/kmc-ldml/test/fixtures/sections/disp/typical.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/disp/typical.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/disp/typical.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/finl/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/finl/minimal.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/finl/minimal.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/finl/minimal.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/keys/escaped.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/escaped.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/keys/escaped.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/keys/escaped.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/keys/escaped2.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/escaped2.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/keys/escaped2.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/keys/escaped2.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/keys/gap-switch.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/gap-switch.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/keys/gap-switch.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/keys/gap-switch.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/keys/hardware.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/keys/hardware.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/keys/hardware.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/keys/hardware_iso.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware_iso.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/keys/hardware_iso.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/keys/hardware_iso.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/keys/hardware_us.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware_us.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/keys/hardware_us.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/keys/hardware_us.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/keys/invalid-bad-modifier.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-bad-modifier.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/keys/invalid-bad-modifier.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-bad-modifier.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/keys/invalid-hardware-too-many-keys.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-hardware-too-many-keys.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/keys/invalid-hardware-too-many-keys.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-hardware-too-many-keys.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/keys/invalid-hardware-too-many-rows.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-hardware-too-many-rows.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/keys/invalid-hardware-too-many-rows.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-hardware-too-many-rows.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/keys/invalid-key-missing-attrs.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-key-missing-attrs.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/keys/invalid-key-missing-attrs.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-key-missing-attrs.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/keys/invalid-missing-flick.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-missing-flick.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/keys/invalid-missing-flick.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-missing-flick.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/keys/invalid-undefined-key.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-undefined-key.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/keys/invalid-undefined-key.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-undefined-key.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/keys/maximal.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/maximal.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/keys/maximal.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/keys/maximal.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/keys/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/minimal.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/keys/minimal.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/keys/minimal.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/layr/invalid-invalid-form.xml b/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-invalid-form.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/layr/invalid-invalid-form.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-invalid-form.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/layr/invalid-missing-hardware.xml b/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-hardware.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/layr/invalid-missing-hardware.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-hardware.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/layr/invalid-missing-layer.xml b/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-layer.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/layr/invalid-missing-layer.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-layer.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/layr/invalid-missing-layer2.xml b/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-layer2.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/layr/invalid-missing-layer2.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-layer2.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/layr/invalid-multi-hardware.xml b/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-multi-hardware.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/layr/invalid-multi-hardware.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-multi-hardware.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/loca/invalid-locale.xml b/developer/src/kmc-ldml/test/fixtures/sections/loca/invalid-locale.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/loca/invalid-locale.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/loca/invalid-locale.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/loca/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/loca/minimal.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/loca/minimal.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/loca/minimal.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/loca/multiple.xml b/developer/src/kmc-ldml/test/fixtures/sections/loca/multiple.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/loca/multiple.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/loca/multiple.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/meta/invalid-normalization.xml b/developer/src/kmc-ldml/test/fixtures/sections/meta/invalid-normalization.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/meta/invalid-normalization.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/meta/invalid-normalization.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/meta/invalid-version-1.0.xml b/developer/src/kmc-ldml/test/fixtures/sections/meta/invalid-version-1.0.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/meta/invalid-version-1.0.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/meta/invalid-version-1.0.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/meta/invalid-version-v1.0.3.xml b/developer/src/kmc-ldml/test/fixtures/sections/meta/invalid-version-v1.0.3.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/meta/invalid-version-v1.0.3.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/meta/invalid-version-v1.0.3.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/meta/maximal.xml b/developer/src/kmc-ldml/test/fixtures/sections/meta/maximal.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/meta/maximal.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/meta/maximal.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/meta/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/meta/minimal.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/meta/minimal.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/meta/minimal.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/name/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/name/minimal.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/name/minimal.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/name/minimal.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/name/multiple.xml b/developer/src/kmc-ldml/test/fixtures/sections/name/multiple.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/name/multiple.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/name/multiple.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/ordr/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/ordr/minimal.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/ordr/minimal.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/ordr/minimal.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/tran/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/minimal.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/tran/minimal.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/tran/minimal.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/vkey/invalid-from-vkey.xml b/developer/src/kmc-ldml/test/fixtures/sections/vkey/invalid-from-vkey.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/vkey/invalid-from-vkey.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/vkey/invalid-from-vkey.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/vkey/invalid-repeated-vkey.xml b/developer/src/kmc-ldml/test/fixtures/sections/vkey/invalid-repeated-vkey.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/vkey/invalid-repeated-vkey.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/vkey/invalid-repeated-vkey.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/vkey/invalid-to-vkey.xml b/developer/src/kmc-ldml/test/fixtures/sections/vkey/invalid-to-vkey.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/vkey/invalid-to-vkey.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/vkey/invalid-to-vkey.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/vkey/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/vkey/minimal.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/vkey/minimal.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/vkey/minimal.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/vkey/redundant.xml b/developer/src/kmc-ldml/test/fixtures/sections/vkey/redundant.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/vkey/redundant.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/vkey/redundant.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/sections/vkey/same-target.xml b/developer/src/kmc-ldml/test/fixtures/sections/vkey/same-target.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/sections/vkey/same-target.xml
rename to developer/src/kmc-ldml/test/fixtures/sections/vkey/same-target.xml
diff --git a/developer/src/kmc-keyboard/test/fixtures/test-fr.json b/developer/src/kmc-ldml/test/fixtures/test-fr.json
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/test-fr.json
rename to developer/src/kmc-ldml/test/fixtures/test-fr.json
diff --git a/developer/src/kmc-keyboard/test/fixtures/test-fr.xml b/developer/src/kmc-ldml/test/fixtures/test-fr.xml
similarity index 100%
rename from developer/src/kmc-keyboard/test/fixtures/test-fr.xml
rename to developer/src/kmc-ldml/test/fixtures/test-fr.xml
diff --git a/developer/src/kmc-keyboard/test/helpers/index.ts b/developer/src/kmc-ldml/test/helpers/index.ts
similarity index 100%
rename from developer/src/kmc-keyboard/test/helpers/index.ts
rename to developer/src/kmc-ldml/test/helpers/index.ts
diff --git a/developer/src/kmc-keyboard/test/test-bksp.ts b/developer/src/kmc-ldml/test/test-bksp.ts
similarity index 100%
rename from developer/src/kmc-keyboard/test/test-bksp.ts
rename to developer/src/kmc-ldml/test/test-bksp.ts
diff --git a/developer/src/kmc-keyboard/test/test-compiler-e2e.ts b/developer/src/kmc-ldml/test/test-compiler-e2e.ts
similarity index 100%
rename from developer/src/kmc-keyboard/test/test-compiler-e2e.ts
rename to developer/src/kmc-ldml/test/test-compiler-e2e.ts
diff --git a/developer/src/kmc-keyboard/test/test-disp.ts b/developer/src/kmc-ldml/test/test-disp.ts
similarity index 100%
rename from developer/src/kmc-keyboard/test/test-disp.ts
rename to developer/src/kmc-ldml/test/test-disp.ts
diff --git a/developer/src/kmc-keyboard/test/test-finl.ts b/developer/src/kmc-ldml/test/test-finl.ts
similarity index 100%
rename from developer/src/kmc-keyboard/test/test-finl.ts
rename to developer/src/kmc-ldml/test/test-finl.ts
diff --git a/developer/src/kmc-keyboard/test/test-keymanweb-compiler.ts b/developer/src/kmc-ldml/test/test-keymanweb-compiler.ts
similarity index 100%
rename from developer/src/kmc-keyboard/test/test-keymanweb-compiler.ts
rename to developer/src/kmc-ldml/test/test-keymanweb-compiler.ts
diff --git a/developer/src/kmc-keyboard/test/test-keys.ts b/developer/src/kmc-ldml/test/test-keys.ts
similarity index 100%
rename from developer/src/kmc-keyboard/test/test-keys.ts
rename to developer/src/kmc-ldml/test/test-keys.ts
diff --git a/developer/src/kmc-keyboard/test/test-layr.ts b/developer/src/kmc-ldml/test/test-layr.ts
similarity index 100%
rename from developer/src/kmc-keyboard/test/test-layr.ts
rename to developer/src/kmc-ldml/test/test-layr.ts
diff --git a/developer/src/kmc-keyboard/test/test-loca.ts b/developer/src/kmc-ldml/test/test-loca.ts
similarity index 100%
rename from developer/src/kmc-keyboard/test/test-loca.ts
rename to developer/src/kmc-ldml/test/test-loca.ts
diff --git a/developer/src/kmc-keyboard/test/test-messages.ts b/developer/src/kmc-ldml/test/test-messages.ts
similarity index 100%
rename from developer/src/kmc-keyboard/test/test-messages.ts
rename to developer/src/kmc-ldml/test/test-messages.ts
diff --git a/developer/src/kmc-keyboard/test/test-meta.ts b/developer/src/kmc-ldml/test/test-meta.ts
similarity index 100%
rename from developer/src/kmc-keyboard/test/test-meta.ts
rename to developer/src/kmc-ldml/test/test-meta.ts
diff --git a/developer/src/kmc-keyboard/test/test-metadata-compiler.ts b/developer/src/kmc-ldml/test/test-metadata-compiler.ts
similarity index 100%
rename from developer/src/kmc-keyboard/test/test-metadata-compiler.ts
rename to developer/src/kmc-ldml/test/test-metadata-compiler.ts
diff --git a/developer/src/kmc-keyboard/test/test-name.ts b/developer/src/kmc-ldml/test/test-name.ts
similarity index 100%
rename from developer/src/kmc-keyboard/test/test-name.ts
rename to developer/src/kmc-ldml/test/test-name.ts
diff --git a/developer/src/kmc-keyboard/test/test-ordr.ts b/developer/src/kmc-ldml/test/test-ordr.ts
similarity index 100%
rename from developer/src/kmc-keyboard/test/test-ordr.ts
rename to developer/src/kmc-ldml/test/test-ordr.ts
diff --git a/developer/src/kmc-keyboard/test/test-testdata-e2e.ts b/developer/src/kmc-ldml/test/test-testdata-e2e.ts
similarity index 100%
rename from developer/src/kmc-keyboard/test/test-testdata-e2e.ts
rename to developer/src/kmc-ldml/test/test-testdata-e2e.ts
diff --git a/developer/src/kmc-keyboard/test/test-tran.ts b/developer/src/kmc-ldml/test/test-tran.ts
similarity index 100%
rename from developer/src/kmc-keyboard/test/test-tran.ts
rename to developer/src/kmc-ldml/test/test-tran.ts
diff --git a/developer/src/kmc-keyboard/test/test-utils.ts b/developer/src/kmc-ldml/test/test-utils.ts
similarity index 100%
rename from developer/src/kmc-keyboard/test/test-utils.ts
rename to developer/src/kmc-ldml/test/test-utils.ts
diff --git a/developer/src/kmc-keyboard/test/test-virtual-key-constants.ts b/developer/src/kmc-ldml/test/test-virtual-key-constants.ts
similarity index 100%
rename from developer/src/kmc-keyboard/test/test-virtual-key-constants.ts
rename to developer/src/kmc-ldml/test/test-virtual-key-constants.ts
diff --git a/developer/src/kmc-keyboard/test/test-visual-keyboard-compiler-e2e.ts b/developer/src/kmc-ldml/test/test-visual-keyboard-compiler-e2e.ts
similarity index 100%
rename from developer/src/kmc-keyboard/test/test-visual-keyboard-compiler-e2e.ts
rename to developer/src/kmc-ldml/test/test-visual-keyboard-compiler-e2e.ts
diff --git a/developer/src/kmc-keyboard/test/test-vkey.ts b/developer/src/kmc-ldml/test/test-vkey.ts
similarity index 100%
rename from developer/src/kmc-keyboard/test/test-vkey.ts
rename to developer/src/kmc-ldml/test/test-vkey.ts
diff --git a/developer/src/kmc-keyboard/test/tsconfig.json b/developer/src/kmc-ldml/test/tsconfig.json
similarity index 100%
rename from developer/src/kmc-keyboard/test/tsconfig.json
rename to developer/src/kmc-ldml/test/tsconfig.json
diff --git a/developer/src/kmc-keyboard/tsconfig.json b/developer/src/kmc-ldml/tsconfig.json
similarity index 100%
rename from developer/src/kmc-keyboard/tsconfig.json
rename to developer/src/kmc-ldml/tsconfig.json
diff --git a/developer/src/kmc-model-info/Makefile b/developer/src/kmc-model-info/Makefile
index f3e73efd12..878d77f184 100644
--- a/developer/src/kmc-model-info/Makefile
+++ b/developer/src/kmc-model-info/Makefile
@@ -4,7 +4,7 @@
 
 !include ..\Defines.mak
 
-# We don't depend on configure here because kmc-keyboard does that already
+# We don't depend on configure here because kmc-ldml does that already
 build: .virtual
     $(GIT_BASH_FOR_KEYMAN) build.sh build
 
diff --git a/developer/src/kmc-model/Makefile b/developer/src/kmc-model/Makefile
index 353d923bd4..b41bbe8184 100644
--- a/developer/src/kmc-model/Makefile
+++ b/developer/src/kmc-model/Makefile
@@ -4,7 +4,7 @@
 
 !include ..\Defines.mak
 
-# We don't depend on configure here because kmc-keyboard does that already
+# We don't depend on configure here because kmc-ldml does that already
 build: .virtual
     $(GIT_BASH_FOR_KEYMAN) build.sh build
 
diff --git a/developer/src/kmc-package/Makefile b/developer/src/kmc-package/Makefile
index 02bf07dc02..0a5ba6a1c1 100644
--- a/developer/src/kmc-package/Makefile
+++ b/developer/src/kmc-package/Makefile
@@ -4,7 +4,7 @@
 
 !include ..\Defines.mak
 
-# We don't depend on configure here because kmc-keyboard does that already
+# We don't depend on configure here because kmc-ldml does that already
 build: .virtual
     $(GIT_BASH_FOR_KEYMAN) build.sh build
 
diff --git a/developer/src/kmc/Makefile b/developer/src/kmc/Makefile
index 8e8dc7d5f3..1078ab1a67 100644
--- a/developer/src/kmc/Makefile
+++ b/developer/src/kmc/Makefile
@@ -4,7 +4,7 @@
 
 !include ..\Defines.mak
 
-# We don't depend on configure here because kmc-keyboard does that already,
+# We don't depend on configure here because kmc-ldml does that already,
 # called from parent folder Makefile
 build: .virtual
     $(GIT_BASH_FOR_KEYMAN) build.sh build
diff --git a/developer/src/kmc/build.sh b/developer/src/kmc/build.sh
index b6022ff6cf..61ccd3bdca 100755
--- a/developer/src/kmc/build.sh
+++ b/developer/src/kmc/build.sh
@@ -20,8 +20,8 @@ builder_describe "Build Keyman Keyboard Compiler kmc" \
   "@/common/include" \
   "@/common/web/keyman-version" \
   "@/common/web/types" \
-  "@/developer/src/kmc-keyboard" \
   "@/developer/src/kmc-kmn" \
+  "@/developer/src/kmc-ldml" \
   "@/developer/src/kmc-model" \
   "@/developer/src/kmc-model-info" \
   "@/developer/src/kmc-package" \
@@ -112,8 +112,8 @@ readonly PACKAGES=(
   common/web/types
   common/models/types
   core/include/ldml
-  developer/src/kmc-keyboard
   developer/src/kmc-kmn
+  developer/src/kmc-ldml
   developer/src/kmc-model
   developer/src/kmc-model-info
   developer/src/kmc-package
diff --git a/developer/src/kmc/package.json b/developer/src/kmc/package.json
index 5adeb15691..695ebc96e3 100644
--- a/developer/src/kmc/package.json
+++ b/developer/src/kmc/package.json
@@ -39,8 +39,8 @@
   "dependencies": {
     "@keymanapp/keyman-version": "*",
     "@keymanapp/common-types": "*",
-    "@keymanapp/kmc-keyboard": "*",
     "@keymanapp/kmc-kmn": "*",
+    "@keymanapp/kmc-ldml": "*",
     "@keymanapp/kmc-model": "*",
     "@keymanapp/kmc-model-info": "*",
     "@keymanapp/kmc-package": "*",
diff --git a/developer/src/kmc/src/commands/build/BuildLdmlKeyboard.ts b/developer/src/kmc/src/commands/build/BuildLdmlKeyboard.ts
index 8f11465584..4ccb55c122 100644
--- a/developer/src/kmc/src/commands/build/BuildLdmlKeyboard.ts
+++ b/developer/src/kmc/src/commands/build/BuildLdmlKeyboard.ts
@@ -1,6 +1,6 @@
 import * as path from 'path';
 import * as fs from 'fs';
-import * as kmc from '@keymanapp/kmc-keyboard';
+import * as kmc from '@keymanapp/kmc-ldml';
 import { KvkFileWriter, CompilerCallbacks } from '@keymanapp/common-types';
 import { BuildActivity, BuildActivityOptions } from './BuildActivity.js';
 
diff --git a/developer/src/kmc/src/commands/buildTestData/index.ts b/developer/src/kmc/src/commands/buildTestData/index.ts
index 2341b11082..89674efbef 100644
--- a/developer/src/kmc/src/commands/buildTestData/index.ts
+++ b/developer/src/kmc/src/commands/buildTestData/index.ts
@@ -1,6 +1,6 @@
 import * as fs from 'fs';
 import * as path from 'path';
-import * as kmc from '@keymanapp/kmc-keyboard';
+import * as kmc from '@keymanapp/kmc-ldml';
 import { CompilerCallbacks, LDMLKeyboardTestDataXMLSourceFile } from '@keymanapp/common-types';
 import { NodeCompilerCallbacks } from '../../messages/NodeCompilerCallbacks.js';
 
diff --git a/developer/src/kmc/tsconfig.json b/developer/src/kmc/tsconfig.json
index 41d2ab3428..9b6eb601ac 100644
--- a/developer/src/kmc/tsconfig.json
+++ b/developer/src/kmc/tsconfig.json
@@ -7,7 +7,8 @@
     "baseUrl": ".",
     "paths": {
       "@keymanapp/common-types": [ "../../../common/web/types/src/main" ],
-      "@keymanapp/kmc-keyboard": [ "../kmc-keyboard/src/main" ],
+      "@keymanapp/kmc-kmn": [ "../kmc-kmn/src/main" ],
+      "@keymanapp/kmc-ldml": [ "../kmc-ldml/src/main" ],
       "@keymanapp/kmc-model": [ "../kmc-model/src/main" ],
       "@keymanapp/kmc-model-info": [ "../kmc-model-info/src/model-info-compiler" ],
       "@keymanapp/kmc-package": [ "../kmc-package/src/kmp-compiler" ],
@@ -19,7 +20,8 @@
   "references": [
     { "path": "../../../common/web/keyman-version/tsconfig.esm.json" },
     { "path": "../../../common/web/types" },
-    { "path": "../kmc-keyboard" },
+    { "path": "../kmc-kmn" },
+    { "path": "../kmc-ldml" },
     { "path": "../kmc-model" },
     { "path": "../kmc-model-info" },
     { "path": "../kmc-package" },
diff --git a/developer/src/test/auto/Makefile b/developer/src/test/auto/Makefile
index 635d933bd1..ebbdf29016 100644
--- a/developer/src/test/auto/Makefile
+++ b/developer/src/test/auto/Makefile
@@ -26,7 +26,7 @@ developer-tests: \
   model-ts-parser \
   package-info \
   kmc \
-  kmc-keyboard \
+  kmc-ldml \
   kmc-model \
   kmc-model-info \
   kmc-package
@@ -87,8 +87,8 @@ kmc: .virtual
   cd $(DEVELOPER_ROOT)\src\kmc
   $(MAKE) $(TARGET)
 
-kmc-keyboard: .virtual
-  cd $(DEVELOPER_ROOT)\src\kmc-keyboard
+kmc-ldml: .virtual
+  cd $(DEVELOPER_ROOT)\src\kmc-ldml
   $(MAKE) $(TARGET)
 
 kmc-model: .virtual
diff --git a/docs/npm-packages.md b/docs/npm-packages.md
index 57fbfb839f..040a6e11cc 100644
--- a/docs/npm-packages.md
+++ b/docs/npm-packages.md
@@ -13,8 +13,8 @@ Packages are **never** published from a developer's machine.
 * `@keymanapp/common-types` -- located at `common/web/types`
 * `@keymanapp/keyman-version` -- located at `common/web/keyman-version`
 * `@keymanapp/kmc` -- located at `developer/src/kmc`
-* `@keymanapp/kmc-keyboard` -- located at `developer/src/kmc-keyboard`
 * `@keymanapp/kmc-kmn` -- located at `developer/src/kmc-kmn`
+* `@keymanapp/kmc-ldml` -- located at `developer/src/kmc-ldml`
 * `@keymanapp/kmc-model` -- located at `developer/src/kmc-model`
 * `@keymanapp/kmc-model-info` -- located at `developer/src/kmc-model-info`
 * `@keymanapp/kmc-package` -- located at `developer/src/kmc-package`
diff --git a/package-lock.json b/package-lock.json
index 173ea2605f..b39f76b2ce 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,8 +10,8 @@
         "resources/build/version",
         "core/include/ldml",
         "developer/src/common/web/test-helpers",
-        "developer/src/kmc-keyboard",
         "developer/src/kmc-kmn",
+        "developer/src/kmc-ldml",
         "developer/src/kmc-model",
         "developer/src/kmc-model-info",
         "developer/src/kmc-package",
@@ -634,8 +634,8 @@
       "dependencies": {
         "@keymanapp/common-types": "*",
         "@keymanapp/keyman-version": "*",
-        "@keymanapp/kmc-keyboard": "*",
         "@keymanapp/kmc-kmn": "*",
+        "@keymanapp/kmc-ldml": "*",
         "@keymanapp/kmc-model": "*",
         "@keymanapp/kmc-model-info": "*",
         "@keymanapp/kmc-package": "*",
@@ -664,6 +664,7 @@
     },
     "developer/src/kmc-keyboard": {
       "name": "@keymanapp/kmc-keyboard",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@keymanapp/keyman-version": "*",
@@ -688,220 +689,6 @@
         "typescript": "^4.9.5"
       }
     },
-    "developer/src/kmc-keyboard/node_modules/@types/mocha": {
-      "version": "5.2.7",
-      "dev": true,
-      "license": "MIT"
-    },
-    "developer/src/kmc-keyboard/node_modules/@types/node": {
-      "version": "10.17.60",
-      "dev": true,
-      "license": "MIT"
-    },
-    "developer/src/kmc-keyboard/node_modules/ajv": {
-      "version": "8.11.2",
-      "license": "MIT",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "developer/src/kmc-keyboard/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "developer/src/kmc-keyboard/node_modules/chalk": {
-      "version": "2.4.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "developer/src/kmc-keyboard/node_modules/color-convert": {
-      "version": "1.9.3",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "developer/src/kmc-keyboard/node_modules/color-name": {
-      "version": "1.1.3",
-      "dev": true,
-      "license": "MIT"
-    },
-    "developer/src/kmc-keyboard/node_modules/js-yaml": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "developer/src/kmc-keyboard/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "license": "MIT"
-    },
-    "developer/src/kmc-keyboard/node_modules/minimatch": {
-      "version": "3.0.4",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "developer/src/kmc-keyboard/node_modules/mocha": {
-      "version": "8.4.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@ungap/promise-all-settled": "1.1.2",
-        "ansi-colors": "4.1.1",
-        "browser-stdout": "1.3.1",
-        "chokidar": "3.5.1",
-        "debug": "4.3.1",
-        "diff": "5.0.0",
-        "escape-string-regexp": "4.0.0",
-        "find-up": "5.0.0",
-        "glob": "7.1.6",
-        "growl": "1.10.5",
-        "he": "1.2.0",
-        "js-yaml": "4.0.0",
-        "log-symbols": "4.0.0",
-        "minimatch": "3.0.4",
-        "ms": "2.1.3",
-        "nanoid": "3.1.20",
-        "serialize-javascript": "5.0.1",
-        "strip-json-comments": "3.1.1",
-        "supports-color": "8.1.1",
-        "which": "2.0.2",
-        "wide-align": "1.1.3",
-        "workerpool": "6.1.0",
-        "yargs": "16.2.0",
-        "yargs-parser": "20.2.4",
-        "yargs-unparser": "2.0.0"
-      },
-      "bin": {
-        "_mocha": "bin/_mocha",
-        "mocha": "bin/mocha"
-      },
-      "engines": {
-        "node": ">= 10.12.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mochajs"
-      }
-    },
-    "developer/src/kmc-keyboard/node_modules/mocha/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "developer/src/kmc-keyboard/node_modules/mocha/node_modules/supports-color": {
-      "version": "8.1.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
-    "developer/src/kmc-keyboard/node_modules/ms": {
-      "version": "2.1.3",
-      "dev": true,
-      "license": "MIT"
-    },
-    "developer/src/kmc-keyboard/node_modules/supports-color": {
-      "version": "5.5.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "developer/src/kmc-keyboard/node_modules/supports-color/node_modules/has-flag": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "developer/src/kmc-keyboard/node_modules/ts-node": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-9.1.1.tgz",
-      "integrity": "sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg==",
-      "dev": true,
-      "dependencies": {
-        "arg": "^4.1.0",
-        "create-require": "^1.1.0",
-        "diff": "^4.0.1",
-        "make-error": "^1.1.1",
-        "source-map-support": "^0.5.17",
-        "yn": "3.1.1"
-      },
-      "bin": {
-        "ts-node": "dist/bin.js",
-        "ts-node-script": "dist/bin-script.js",
-        "ts-node-transpile-only": "dist/bin-transpile.js",
-        "ts-script": "dist/bin-script-deprecated.js"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "typescript": ">=2.7"
-      }
-    },
-    "developer/src/kmc-keyboard/node_modules/ts-node/node_modules/diff": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.3.1"
-      }
-    },
     "developer/src/kmc-kmn": {
       "name": "@keymanapp/kmc-kmn",
       "license": "MIT",
@@ -1242,6 +1029,261 @@
         "node": ">=0.3.1"
       }
     },
+    "developer/src/kmc-ldml": {
+      "license": "MIT",
+      "dependencies": {
+        "@keymanapp/keyman-version": "*",
+        "@keymanapp/ldml-keyboard-constants": "*",
+        "ajv": "^8.11.0",
+        "restructure": "git+https://github.com/keymanapp/dependency-restructure.git#49d129cf0916d082a7278bb09296fb89cecfcc50",
+        "semver": "^7.3.7",
+        "xml2js": "git+https://github.com/keymanapp/dependency-node-xml2js#535fe732dc408d697e0f847c944cc45f0baf0829"
+      },
+      "devDependencies": {
+        "@keymanapp/developer-test-helpers": "*",
+        "@types/chai": "^4.1.7",
+        "@types/mocha": "^5.2.7",
+        "@types/node": "^10.14.6",
+        "@types/semver": "^7.3.12",
+        "@types/xml2js": "^0.4.5",
+        "c8": "^7.12.0",
+        "chai": "^4.3.4",
+        "chalk": "^2.4.2",
+        "mocha": "^8.4.0",
+        "ts-node": "^9.1.1",
+        "typescript": "^4.9.5"
+      }
+    },
+    "developer/src/kmc-ldml/node_modules/@types/mocha": {
+      "version": "5.2.7",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-5.2.7.tgz",
+      "integrity": "sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ==",
+      "dev": true
+    },
+    "developer/src/kmc-ldml/node_modules/@types/node": {
+      "version": "10.17.60",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.60.tgz",
+      "integrity": "sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==",
+      "dev": true
+    },
+    "developer/src/kmc-ldml/node_modules/ajv": {
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "developer/src/kmc-ldml/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "developer/src/kmc-ldml/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "developer/src/kmc-ldml/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "developer/src/kmc-ldml/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true
+    },
+    "developer/src/kmc-ldml/node_modules/js-yaml": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz",
+      "integrity": "sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "developer/src/kmc-ldml/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+    },
+    "developer/src/kmc-ldml/node_modules/minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "developer/src/kmc-ldml/node_modules/mocha": {
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.4.0.tgz",
+      "integrity": "sha512-hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ==",
+      "dev": true,
+      "dependencies": {
+        "@ungap/promise-all-settled": "1.1.2",
+        "ansi-colors": "4.1.1",
+        "browser-stdout": "1.3.1",
+        "chokidar": "3.5.1",
+        "debug": "4.3.1",
+        "diff": "5.0.0",
+        "escape-string-regexp": "4.0.0",
+        "find-up": "5.0.0",
+        "glob": "7.1.6",
+        "growl": "1.10.5",
+        "he": "1.2.0",
+        "js-yaml": "4.0.0",
+        "log-symbols": "4.0.0",
+        "minimatch": "3.0.4",
+        "ms": "2.1.3",
+        "nanoid": "3.1.20",
+        "serialize-javascript": "5.0.1",
+        "strip-json-comments": "3.1.1",
+        "supports-color": "8.1.1",
+        "which": "2.0.2",
+        "wide-align": "1.1.3",
+        "workerpool": "6.1.0",
+        "yargs": "16.2.0",
+        "yargs-parser": "20.2.4",
+        "yargs-unparser": "2.0.0"
+      },
+      "bin": {
+        "_mocha": "bin/_mocha",
+        "mocha": "bin/mocha"
+      },
+      "engines": {
+        "node": ">= 10.12.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/mochajs"
+      }
+    },
+    "developer/src/kmc-ldml/node_modules/mocha/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "developer/src/kmc-ldml/node_modules/mocha/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "developer/src/kmc-ldml/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true
+    },
+    "developer/src/kmc-ldml/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "developer/src/kmc-ldml/node_modules/supports-color/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "developer/src/kmc-ldml/node_modules/ts-node": {
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-9.1.1.tgz",
+      "integrity": "sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg==",
+      "dev": true,
+      "dependencies": {
+        "arg": "^4.1.0",
+        "create-require": "^1.1.0",
+        "diff": "^4.0.1",
+        "make-error": "^1.1.1",
+        "source-map-support": "^0.5.17",
+        "yn": "3.1.1"
+      },
+      "bin": {
+        "ts-node": "dist/bin.js",
+        "ts-node-script": "dist/bin-script.js",
+        "ts-node-transpile-only": "dist/bin-transpile.js",
+        "ts-script": "dist/bin-script-deprecated.js"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "typescript": ">=2.7"
+      }
+    },
+    "developer/src/kmc-ldml/node_modules/ts-node/node_modules/diff": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
     "developer/src/kmc-model": {
       "name": "@keymanapp/kmc-model",
       "license": "MIT",
@@ -1553,6 +1595,7 @@
       "name": "@keymanapp/kmc-package",
       "license": "MIT",
       "dependencies": {
+        "@keymanapp/common-types": "*",
         "jszip": "^3.7.0"
       },
       "devDependencies": {
@@ -2275,14 +2318,14 @@
       "resolved": "developer/src/kmc",
       "link": true
     },
-    "node_modules/@keymanapp/kmc-keyboard": {
-      "resolved": "developer/src/kmc-keyboard",
-      "link": true
-    },
     "node_modules/@keymanapp/kmc-kmn": {
       "resolved": "developer/src/kmc-kmn",
       "link": true
     },
+    "node_modules/@keymanapp/kmc-ldml": {
+      "resolved": "developer/src/kmc-ldml",
+      "link": true
+    },
     "node_modules/@keymanapp/kmc-model": {
       "resolved": "developer/src/kmc-model",
       "link": true
diff --git a/package.json b/package.json
index d2e87ab82c..7a2b53d50d 100644
--- a/package.json
+++ b/package.json
@@ -20,8 +20,8 @@
     "resources/build/version",
     "core/include/ldml",
     "developer/src/common/web/test-helpers",
-    "developer/src/kmc-keyboard",
     "developer/src/kmc-kmn",
+    "developer/src/kmc-ldml",
     "developer/src/kmc-model",
     "developer/src/kmc-model-info",
     "developer/src/kmc-package",
diff --git a/tsconfig.esm.json b/tsconfig.esm.json
index 6d286efd53..44bf4011df 100644
--- a/tsconfig.esm.json
+++ b/tsconfig.esm.json
@@ -10,10 +10,10 @@
     //{ "path": "./developer/src/kmc/test/tsconfig.json" },
     { "path": "./developer/src/kmc/tsconfig.json" },
 
-    { "path": "./developer/src/kmc-keyboard/test/tsconfig.json" },
-    { "path": "./developer/src/kmc-keyboard/tsconfig.json" },
     { "path": "./developer/src/kmc-kmn/test/tsconfig.json" },
     { "path": "./developer/src/kmc-kmn/tsconfig.json" },
+    { "path": "./developer/src/kmc-ldml/test/tsconfig.json" },
+    { "path": "./developer/src/kmc-ldml/tsconfig.json" },
     { "path": "./developer/src/kmc-model/test/tsconfig.json" },
     { "path": "./developer/src/kmc-model/tsconfig.json" },
     //{ "path": "./developer/src/kmc-model-info/test/tsconfig.json" },