diff --git a/windows/src/global/delphi/keyboards/Keyman.System.KMXFileLanguages.pas b/developer/src/common/delphi/keyboards/Keyman.System.KMXFileLanguages.pas
similarity index 100%
rename from windows/src/global/delphi/keyboards/Keyman.System.KMXFileLanguages.pas
rename to developer/src/common/delphi/keyboards/Keyman.System.KMXFileLanguages.pas
diff --git a/windows/src/global/delphi/keyboards/Keyman.System.KeyboardInfoFile.pas b/developer/src/common/delphi/keyboards/Keyman.System.KeyboardInfoFile.pas
similarity index 100%
rename from windows/src/global/delphi/keyboards/Keyman.System.KeyboardInfoFile.pas
rename to developer/src/common/delphi/keyboards/Keyman.System.KeyboardInfoFile.pas
diff --git a/windows/src/global/delphi/keyboards/Keyman.System.KeyboardJSInfo.pas b/developer/src/common/delphi/keyboards/Keyman.System.KeyboardJSInfo.pas
similarity index 100%
rename from windows/src/global/delphi/keyboards/Keyman.System.KeyboardJSInfo.pas
rename to developer/src/common/delphi/keyboards/Keyman.System.KeyboardJSInfo.pas
diff --git a/windows/src/global/delphi/keyboards/Keyman.System.KeyboardUtils.pas b/developer/src/common/delphi/keyboards/Keyman.System.KeyboardUtils.pas
similarity index 100%
rename from windows/src/global/delphi/keyboards/Keyman.System.KeyboardUtils.pas
rename to developer/src/common/delphi/keyboards/Keyman.System.KeyboardUtils.pas
diff --git a/windows/src/global/delphi/lexicalmodels/Keyman.Developer.System.LexicalModelCompile.pas b/developer/src/common/delphi/lexicalmodels/Keyman.Developer.System.LexicalModelCompile.pas
similarity index 100%
rename from windows/src/global/delphi/lexicalmodels/Keyman.Developer.System.LexicalModelCompile.pas
rename to developer/src/common/delphi/lexicalmodels/Keyman.Developer.System.LexicalModelCompile.pas
diff --git a/windows/src/global/delphi/lexicalmodels/Keyman.System.LexicalModelUtils.pas b/developer/src/common/delphi/lexicalmodels/Keyman.System.LexicalModelUtils.pas
similarity index 100%
rename from windows/src/global/delphi/lexicalmodels/Keyman.System.LexicalModelUtils.pas
rename to developer/src/common/delphi/lexicalmodels/Keyman.System.LexicalModelUtils.pas
diff --git a/windows/src/global/delphi/lexicalmodels/Keyman.System.WordlistTsvFile.pas b/developer/src/common/delphi/lexicalmodels/Keyman.System.WordlistTsvFile.pas
similarity index 100%
rename from windows/src/global/delphi/lexicalmodels/Keyman.System.WordlistTsvFile.pas
rename to developer/src/common/delphi/lexicalmodels/Keyman.System.WordlistTsvFile.pas
diff --git a/windows/src/global/delphi/packages/Keyman.System.PackageInfoRefreshKeyboards.pas b/developer/src/common/delphi/packages/Keyman.System.PackageInfoRefreshKeyboards.pas
similarity index 100%
rename from windows/src/global/delphi/packages/Keyman.System.PackageInfoRefreshKeyboards.pas
rename to developer/src/common/delphi/packages/Keyman.System.PackageInfoRefreshKeyboards.pas
diff --git a/windows/src/global/delphi/packages/Keyman.System.PackageInfoRefreshLexicalModels.pas b/developer/src/common/delphi/packages/Keyman.System.PackageInfoRefreshLexicalModels.pas
similarity index 100%
rename from windows/src/global/delphi/packages/Keyman.System.PackageInfoRefreshLexicalModels.pas
rename to developer/src/common/delphi/packages/Keyman.System.PackageInfoRefreshLexicalModels.pas
diff --git a/developer/src/kmcomp/kmcomp.dpr b/developer/src/kmcomp/kmcomp.dpr
index 293ba63dd2..79a41b534b 100644
--- a/developer/src/kmcomp/kmcomp.dpr
+++ b/developer/src/kmcomp/kmcomp.dpr
@@ -89,13 +89,13 @@ uses
   ValidateKeyboardInfo in '..\tike\compile\ValidateKeyboardInfo.pas',
   MergeKeyboardInfo in '..\tike\compile\MergeKeyboardInfo.pas',
   JsonExtractKeyboardInfo in '..\tike\compile\JsonExtractKeyboardInfo.pas',
-  Keyman.System.PackageInfoRefreshKeyboards in '..\..\..\windows\src\global\delphi\packages\Keyman.System.PackageInfoRefreshKeyboards.pas',
-  Keyman.System.KeyboardJSInfo in '..\..\..\windows\src\global\delphi\keyboards\Keyman.System.KeyboardJSInfo.pas',
-  Keyman.System.KeyboardUtils in '..\..\..\windows\src\global\delphi\keyboards\Keyman.System.KeyboardUtils.pas',
-  Keyman.System.KMXFileLanguages in '..\..\..\windows\src\global\delphi\keyboards\Keyman.System.KMXFileLanguages.pas',
+  Keyman.System.PackageInfoRefreshKeyboards in '..\common\delphi\packages\Keyman.System.PackageInfoRefreshKeyboards.pas',
+  Keyman.System.KeyboardJSInfo in '..\common\delphi\keyboards\Keyman.System.KeyboardJSInfo.pas',
+  Keyman.System.KeyboardUtils in '..\common\delphi\keyboards\Keyman.System.KeyboardUtils.pas',
+  Keyman.System.KMXFileLanguages in '..\common\delphi\keyboards\Keyman.System.KMXFileLanguages.pas',
   Keyman.System.Standards.ISO6393ToBCP47Registry in '..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.ISO6393ToBCP47Registry.pas',
   Keyman.System.Standards.LCIDToBCP47Registry in '..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.LCIDToBCP47Registry.pas',
-  Keyman.System.KeyboardInfoFile in '..\..\..\windows\src\global\delphi\keyboards\Keyman.System.KeyboardInfoFile.pas',
+  Keyman.System.KeyboardInfoFile in '..\common\delphi\keyboards\Keyman.System.KeyboardInfoFile.pas',
   BCP47Tag in '..\..\..\windows\src\global\delphi\general\BCP47Tag.pas',
   Keyman.System.LanguageCodeUtils in '..\..\..\windows\src\global\delphi\general\Keyman.System.LanguageCodeUtils.pas',
   Keyman.System.RegExGroupHelperRSP19902 in '..\..\..\windows\src\global\delphi\general\Keyman.System.RegExGroupHelperRSP19902.pas',
@@ -104,11 +104,11 @@ uses
   TextFileFormat in '..\tike\main\TextFileFormat.pas',
   Keyman.Developer.System.Project.kmnProjectFileAction in '..\tike\project\Keyman.Developer.System.Project.kmnProjectFileAction.pas',
   Keyman.Developer.System.Project.kpsProjectFileAction in '..\tike\project\Keyman.Developer.System.Project.kpsProjectFileAction.pas',
-  Keyman.System.PackageInfoRefreshLexicalModels in '..\..\..\windows\src\global\delphi\packages\Keyman.System.PackageInfoRefreshLexicalModels.pas',
+  Keyman.System.PackageInfoRefreshLexicalModels in '..\common\delphi\packages\Keyman.System.PackageInfoRefreshLexicalModels.pas',
   Keyman.Developer.System.Project.modelTsProjectFile in '..\tike\project\Keyman.Developer.System.Project.modelTsProjectFile.pas',
   Keyman.Developer.System.Project.modelTsProjectFileAction in '..\tike\project\Keyman.Developer.System.Project.modelTsProjectFileAction.pas',
-  Keyman.Developer.System.LexicalModelCompile in '..\..\..\windows\src\global\delphi\lexicalmodels\Keyman.Developer.System.LexicalModelCompile.pas',
-  Keyman.System.LexicalModelUtils in '..\..\..\windows\src\global\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas',
+  Keyman.Developer.System.LexicalModelCompile in '..\common\delphi\lexicalmodels\Keyman.Developer.System.LexicalModelCompile.pas',
+  Keyman.System.LexicalModelUtils in '..\common\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas',
   Keyman.Developer.System.Project.ProjectLogConsole in 'Keyman.Developer.System.Project.ProjectLogConsole.pas',
   Sentry.Client in '..\..\..\common\windows\delphi\ext\sentry\Sentry.Client.pas',
   Sentry.Client.Console in '..\..\..\common\windows\delphi\ext\sentry\Sentry.Client.Console.pas',
diff --git a/developer/src/kmcomp/kmcomp.dproj b/developer/src/kmcomp/kmcomp.dproj
index fe85135e4c..ea5fec0db0 100644
--- a/developer/src/kmcomp/kmcomp.dproj
+++ b/developer/src/kmcomp/kmcomp.dproj
@@ -240,13 +240,13 @@
         <DCCReference Include="..\TIKE\compile\ValidateKeyboardInfo.pas"/>
         <DCCReference Include="..\TIKE\compile\MergeKeyboardInfo.pas"/>
         <DCCReference Include="..\TIKE\compile\JsonExtractKeyboardInfo.pas"/>
-        <DCCReference Include="..\..\..\windows\src\global\delphi\packages\Keyman.System.PackageInfoRefreshKeyboards.pas"/>
-        <DCCReference Include="..\..\..\windows\src\global\delphi\keyboards\Keyman.System.KeyboardJSInfo.pas"/>
-        <DCCReference Include="..\..\..\windows\src\global\delphi\keyboards\Keyman.System.KeyboardUtils.pas"/>
-        <DCCReference Include="..\..\..\windows\src\global\delphi\keyboards\Keyman.System.KMXFileLanguages.pas"/>
+        <DCCReference Include="..\common\delphi\packages\Keyman.System.PackageInfoRefreshKeyboards.pas"/>
+        <DCCReference Include="..\common\delphi\keyboards\Keyman.System.KeyboardJSInfo.pas"/>
+        <DCCReference Include="..\common\delphi\keyboards\Keyman.System.KeyboardUtils.pas"/>
+        <DCCReference Include="..\common\delphi\keyboards\Keyman.System.KMXFileLanguages.pas"/>
         <DCCReference Include="..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.ISO6393ToBCP47Registry.pas"/>
         <DCCReference Include="..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.LCIDToBCP47Registry.pas"/>
-        <DCCReference Include="..\..\..\windows\src\global\delphi\keyboards\Keyman.System.KeyboardInfoFile.pas"/>
+        <DCCReference Include="..\common\delphi\keyboards\Keyman.System.KeyboardInfoFile.pas"/>
         <DCCReference Include="..\..\..\windows\src\global\delphi\general\BCP47Tag.pas"/>
         <DCCReference Include="..\..\..\windows\src\global\delphi\general\Keyman.System.LanguageCodeUtils.pas"/>
         <DCCReference Include="..\..\..\windows\src\global\delphi\general\Keyman.System.RegExGroupHelperRSP19902.pas"/>
@@ -255,11 +255,11 @@
         <DCCReference Include="..\TIKE\main\TextFileFormat.pas"/>
         <DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.kmnProjectFileAction.pas"/>
         <DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.kpsProjectFileAction.pas"/>
-        <DCCReference Include="..\..\..\windows\src\global\delphi\packages\Keyman.System.PackageInfoRefreshLexicalModels.pas"/>
+        <DCCReference Include="..\common\delphi\packages\Keyman.System.PackageInfoRefreshLexicalModels.pas"/>
         <DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.modelTsProjectFile.pas"/>
         <DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.modelTsProjectFileAction.pas"/>
-        <DCCReference Include="..\..\..\windows\src\global\delphi\lexicalmodels\Keyman.Developer.System.LexicalModelCompile.pas"/>
-        <DCCReference Include="..\..\..\windows\src\global\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas"/>
+        <DCCReference Include="..\common\delphi\lexicalmodels\Keyman.Developer.System.LexicalModelCompile.pas"/>
+        <DCCReference Include="..\common\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas"/>
         <DCCReference Include="Keyman.Developer.System.Project.ProjectLogConsole.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\ext\sentry\Sentry.Client.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\ext\sentry\Sentry.Client.Console.pas"/>
diff --git a/developer/src/kmconvert/kmconvert.dpr b/developer/src/kmconvert/kmconvert.dpr
index dd7ce60aa9..2ced802fd0 100644
--- a/developer/src/kmconvert/kmconvert.dpr
+++ b/developer/src/kmconvert/kmconvert.dpr
@@ -36,15 +36,15 @@ uses
   BCP47Tag in '..\..\..\windows\src\global\delphi\general\BCP47Tag.pas',
   Keyman.System.CanonicalLanguageCodeUtils in '..\..\..\windows\src\global\delphi\general\Keyman.System.CanonicalLanguageCodeUtils.pas',
   Keyman.System.LanguageCodeUtils in '..\..\..\windows\src\global\delphi\general\Keyman.System.LanguageCodeUtils.pas',
-  Keyman.System.KeyboardJSInfo in '..\..\..\windows\src\global\delphi\keyboards\Keyman.System.KeyboardJSInfo.pas',
-  Keyman.System.KeyboardUtils in '..\..\..\windows\src\global\delphi\keyboards\Keyman.System.KeyboardUtils.pas',
-  Keyman.System.KMXFileLanguages in '..\..\..\windows\src\global\delphi\keyboards\Keyman.System.KMXFileLanguages.pas',
+  Keyman.System.KeyboardJSInfo in '..\common\delphi\keyboards\Keyman.System.KeyboardJSInfo.pas',
+  Keyman.System.KeyboardUtils in '..\common\delphi\keyboards\Keyman.System.KeyboardUtils.pas',
+  Keyman.System.KMXFileLanguages in '..\common\delphi\keyboards\Keyman.System.KMXFileLanguages.pas',
   Keyman.System.Standards.BCP47SubtagRegistry in '..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.BCP47SubtagRegistry.pas',
   Keyman.System.Standards.BCP47SuppressScriptRegistry in '..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.BCP47SuppressScriptRegistry.pas',
   Keyman.System.Standards.ISO6393ToBCP47Registry in '..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.ISO6393ToBCP47Registry.pas',
   Keyman.System.Standards.LCIDToBCP47Registry in '..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.LCIDToBCP47Registry.pas',
   Keyman.System.RegExGroupHelperRSP19902 in '..\..\..\windows\src\global\delphi\general\Keyman.System.RegExGroupHelperRSP19902.pas',
-  Keyman.System.PackageInfoRefreshKeyboards in '..\..\..\windows\src\global\delphi\packages\Keyman.System.PackageInfoRefreshKeyboards.pas',
+  Keyman.System.PackageInfoRefreshKeyboards in '..\common\delphi\packages\Keyman.System.PackageInfoRefreshKeyboards.pas',
   Keyman.Developer.System.Project.ProjectFile in '..\TIKE\project\Keyman.Developer.System.Project.ProjectFile.pas',
   Keyman.Developer.System.Project.ProjectFiles in '..\TIKE\project\Keyman.Developer.System.Project.ProjectFiles.pas',
   Keyman.Developer.System.Project.ProjectSaver in '..\TIKE\project\Keyman.Developer.System.Project.ProjectSaver.pas',
@@ -88,7 +88,7 @@ uses
   KeymanPaths in '..\..\..\windows\src\global\delphi\general\KeymanPaths.pas',
   Keyman.System.Standards.LangTagsRegistry in '..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.LangTagsRegistry.pas',
   Keyman.Developer.System.Project.UrlRenderer in '..\TIKE\project\Keyman.Developer.System.Project.UrlRenderer.pas',
-  Keyman.System.LexicalModelUtils in '..\..\..\windows\src\global\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas';
+  Keyman.System.LexicalModelUtils in '..\common\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas';
 
 {$R icons.RES}
 {$R version.res}
diff --git a/developer/src/kmconvert/kmconvert.dproj b/developer/src/kmconvert/kmconvert.dproj
index ed9d1ebc0f..c33a8d922e 100644
--- a/developer/src/kmconvert/kmconvert.dproj
+++ b/developer/src/kmconvert/kmconvert.dproj
@@ -142,15 +142,15 @@
         <DCCReference Include="..\..\..\windows\src\global\delphi\general\BCP47Tag.pas"/>
         <DCCReference Include="..\..\..\windows\src\global\delphi\general\Keyman.System.CanonicalLanguageCodeUtils.pas"/>
         <DCCReference Include="..\..\..\windows\src\global\delphi\general\Keyman.System.LanguageCodeUtils.pas"/>
-        <DCCReference Include="..\..\..\windows\src\global\delphi\keyboards\Keyman.System.KeyboardJSInfo.pas"/>
-        <DCCReference Include="..\..\..\windows\src\global\delphi\keyboards\Keyman.System.KeyboardUtils.pas"/>
-        <DCCReference Include="..\..\..\windows\src\global\delphi\keyboards\Keyman.System.KMXFileLanguages.pas"/>
+        <DCCReference Include="..\common\delphi\keyboards\Keyman.System.KeyboardJSInfo.pas"/>
+        <DCCReference Include="..\common\delphi\keyboards\Keyman.System.KeyboardUtils.pas"/>
+        <DCCReference Include="..\common\delphi\keyboards\Keyman.System.KMXFileLanguages.pas"/>
         <DCCReference Include="..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.BCP47SubtagRegistry.pas"/>
         <DCCReference Include="..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.BCP47SuppressScriptRegistry.pas"/>
         <DCCReference Include="..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.ISO6393ToBCP47Registry.pas"/>
         <DCCReference Include="..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.LCIDToBCP47Registry.pas"/>
         <DCCReference Include="..\..\..\windows\src\global\delphi\general\Keyman.System.RegExGroupHelperRSP19902.pas"/>
-        <DCCReference Include="..\..\..\windows\src\global\delphi\packages\Keyman.System.PackageInfoRefreshKeyboards.pas"/>
+        <DCCReference Include="..\common\delphi\packages\Keyman.System.PackageInfoRefreshKeyboards.pas"/>
         <DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.ProjectFile.pas"/>
         <DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.ProjectFiles.pas"/>
         <DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.ProjectSaver.pas"/>
@@ -197,7 +197,7 @@
         <DCCReference Include="..\..\..\windows\src\global\delphi\general\KeymanPaths.pas"/>
         <DCCReference Include="..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.LangTagsRegistry.pas"/>
         <DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.UrlRenderer.pas"/>
-        <DCCReference Include="..\..\..\windows\src\global\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas"/>
+        <DCCReference Include="..\common\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas"/>
         <BuildConfiguration Include="Release">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>
diff --git a/developer/src/test/auto/Makefile b/developer/src/test/auto/Makefile
index b0c6b68419..e8570c8718 100644
--- a/developer/src/test/auto/Makefile
+++ b/developer/src/test/auto/Makefile
@@ -16,11 +16,13 @@ test:
 developer-tests: \
   compile-supplementary-support \
   keyboard-info \
+  keyboard-js-info \
   keyboard-package-versions \
   kmcomp \
   kmcomp-empty-store-names \
   kmcomp-x64-structures \
   kmconvert \
+  kmx-file-languages \
   lexical-model-compiler \
   model-ts-parser
 
@@ -34,6 +36,14 @@ keyboard-info: .virtual
   cd $(DEVELOPER_ROOT)\src\test\auto\keyboard-info
   $(MAKE) $(TARGET)
 
+keyboard-js-info: .virtual
+    cd $(DEVELOPER_ROOT)\src\test\auto\keyboard-js-info
+    $(MAKE) $(TARGET)
+
+kmx-file-languages: .virtual
+    cd $(DEVELOPER_ROOT)\src\test\auto\kmx-file-languages
+    $(MAKE) $(TARGET)
+
 keyboard-package-versions: .virtual
   cd $(DEVELOPER_ROOT)\src\test\auto\keyboard-package-versions
   $(MAKE) $(TARGET)
diff --git a/windows/src/test/unit-tests/keyboard-js-info/KeyboardJSInfoTestSuite.dpr b/developer/src/test/auto/keyboard-js-info/KeyboardJSInfoTestSuite.dpr
similarity index 81%
rename from windows/src/test/unit-tests/keyboard-js-info/KeyboardJSInfoTestSuite.dpr
rename to developer/src/test/auto/keyboard-js-info/KeyboardJSInfoTestSuite.dpr
index 59ef52c823..149969c732 100644
--- a/windows/src/test/unit-tests/keyboard-js-info/KeyboardJSInfoTestSuite.dpr
+++ b/developer/src/test/auto/keyboard-js-info/KeyboardJSInfoTestSuite.dpr
@@ -12,10 +12,10 @@ uses
   DUnitX.Loggers.Xml.NUnit,
   DUnitX.TestFramework,
   Keyman.Test.System.KeyboardJSInfoTest in 'Keyman.Test.System.KeyboardJSInfoTest.pas',
-  Keyman.System.KeyboardJSInfo in '..\..\..\global\delphi\keyboards\Keyman.System.KeyboardJSInfo.pas',
-  Keyman.System.RegExGroupHelperRSP19902 in '..\..\..\global\delphi\general\Keyman.System.RegExGroupHelperRSP19902.pas',
-  DUnitX.Loggers.TeamCity in '..\..\..\global\delphi\general\DUnitX.Loggers.TeamCity.pas',
-  KeymanVersion in '..\..\..\global\delphi\general\KeymanVersion.pas';
+  Keyman.System.KeyboardJSInfo in '..\..\..\common\delphi\keyboards\Keyman.System.KeyboardJSInfo.pas',
+  Keyman.System.RegExGroupHelperRSP19902 in '..\..\..\..\..\windows\src\global\delphi\general\Keyman.System.RegExGroupHelperRSP19902.pas',
+  DUnitX.Loggers.TeamCity in '..\..\..\..\..\windows\src\global\delphi\general\DUnitX.Loggers.TeamCity.pas',
+  KeymanVersion in '..\..\..\..\..\windows\src\global\delphi\general\KeymanVersion.pas';
 
 var
   runner : ITestRunner;
diff --git a/windows/src/test/unit-tests/keyboard-js-info/KeyboardJSInfoTestSuite.dproj b/developer/src/test/auto/keyboard-js-info/KeyboardJSInfoTestSuite.dproj
similarity index 99%
rename from windows/src/test/unit-tests/keyboard-js-info/KeyboardJSInfoTestSuite.dproj
rename to developer/src/test/auto/keyboard-js-info/KeyboardJSInfoTestSuite.dproj
index 2eb0e13e94..8fa81fda60 100644
--- a/windows/src/test/unit-tests/keyboard-js-info/KeyboardJSInfoTestSuite.dproj
+++ b/developer/src/test/auto/keyboard-js-info/KeyboardJSInfoTestSuite.dproj
@@ -92,10 +92,10 @@
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
         <DCCReference Include="Keyman.Test.System.KeyboardJSInfoTest.pas"/>
-        <DCCReference Include="..\..\..\global\delphi\keyboards\Keyman.System.KeyboardJSInfo.pas"/>
-        <DCCReference Include="..\..\..\global\delphi\general\Keyman.System.RegExGroupHelperRSP19902.pas"/>
-        <DCCReference Include="..\..\..\global\delphi\general\DUnitX.Loggers.TeamCity.pas"/>
-        <DCCReference Include="..\..\..\global\delphi\general\KeymanVersion.pas"/>
+        <DCCReference Include="..\..\..\common\delphi\keyboards\Keyman.System.KeyboardJSInfo.pas"/>
+        <DCCReference Include="..\..\..\..\..\windows\src\global\delphi\general\Keyman.System.RegExGroupHelperRSP19902.pas"/>
+        <DCCReference Include="..\..\..\..\..\windows\src\global\delphi\general\DUnitX.Loggers.TeamCity.pas"/>
+        <DCCReference Include="..\..\..\..\..\windows\src\global\delphi\general\KeymanVersion.pas"/>
         <BuildConfiguration Include="Release">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>
diff --git a/windows/src/test/unit-tests/keyboard-js-info/KeyboardJSInfoTestSuite.res b/developer/src/test/auto/keyboard-js-info/KeyboardJSInfoTestSuite.res
similarity index 100%
rename from windows/src/test/unit-tests/keyboard-js-info/KeyboardJSInfoTestSuite.res
rename to developer/src/test/auto/keyboard-js-info/KeyboardJSInfoTestSuite.res
diff --git a/windows/src/test/unit-tests/keyboard-js-info/Keyman.Test.System.KeyboardJSInfoTest.pas b/developer/src/test/auto/keyboard-js-info/Keyman.Test.System.KeyboardJSInfoTest.pas
similarity index 100%
rename from windows/src/test/unit-tests/keyboard-js-info/Keyman.Test.System.KeyboardJSInfoTest.pas
rename to developer/src/test/auto/keyboard-js-info/Keyman.Test.System.KeyboardJSInfoTest.pas
diff --git a/windows/src/test/unit-tests/keyboard-js-info/Makefile b/developer/src/test/auto/keyboard-js-info/Makefile
similarity index 100%
rename from windows/src/test/unit-tests/keyboard-js-info/Makefile
rename to developer/src/test/auto/keyboard-js-info/Makefile
diff --git a/windows/src/test/unit-tests/keyboard-js-info/test/balochi_phonetic-1.1-debug.js b/developer/src/test/auto/keyboard-js-info/test/balochi_phonetic-1.1-debug.js
similarity index 100%
rename from windows/src/test/unit-tests/keyboard-js-info/test/balochi_phonetic-1.1-debug.js
rename to developer/src/test/auto/keyboard-js-info/test/balochi_phonetic-1.1-debug.js
diff --git a/windows/src/test/unit-tests/keyboard-js-info/test/balochi_phonetic-1.1.js b/developer/src/test/auto/keyboard-js-info/test/balochi_phonetic-1.1.js
similarity index 100%
rename from windows/src/test/unit-tests/keyboard-js-info/test/balochi_phonetic-1.1.js
rename to developer/src/test/auto/keyboard-js-info/test/balochi_phonetic-1.1.js
diff --git a/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dpr b/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dpr
index 8f68ba4f44..795a43eefb 100644
--- a/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dpr
+++ b/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dpr
@@ -42,10 +42,10 @@ uses
   CRC32 in '..\..\..\..\..\windows\src\global\delphi\general\CRC32.pas',
   KeyNames in '..\..\..\..\..\windows\src\global\delphi\general\KeyNames.pas',
   KeymanDeveloperOptions in '..\..\..\tike\main\KeymanDeveloperOptions.pas',
-  Keyman.System.PackageInfoRefreshKeyboards in '..\..\..\..\..\windows\src\global\delphi\packages\Keyman.System.PackageInfoRefreshKeyboards.pas',
-  Keyman.System.KeyboardJSInfo in '..\..\..\..\..\windows\src\global\delphi\keyboards\Keyman.System.KeyboardJSInfo.pas',
-  Keyman.System.KeyboardUtils in '..\..\..\..\..\windows\src\global\delphi\keyboards\Keyman.System.KeyboardUtils.pas',
-  Keyman.System.KMXFileLanguages in '..\..\..\..\..\windows\src\global\delphi\keyboards\Keyman.System.KMXFileLanguages.pas',
+  Keyman.System.PackageInfoRefreshKeyboards in '..\..\..\common\delphi\packages\Keyman.System.PackageInfoRefreshKeyboards.pas',
+  Keyman.System.KeyboardJSInfo in '..\..\..\common\delphi\keyboards\Keyman.System.KeyboardJSInfo.pas',
+  Keyman.System.KeyboardUtils in '..\..\..\common\delphi\keyboards\Keyman.System.KeyboardUtils.pas',
+  Keyman.System.KMXFileLanguages in '..\..\..\common\delphi\keyboards\Keyman.System.KMXFileLanguages.pas',
   Keyman.System.Standards.ISO6393ToBCP47Registry in '..\..\..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.ISO6393ToBCP47Registry.pas',
   Keyman.System.Standards.LCIDToBCP47Registry in '..\..\..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.LCIDToBCP47Registry.pas',
   TempFileManager in '..\..\..\..\..\windows\src\global\delphi\general\TempFileManager.pas',
@@ -93,8 +93,8 @@ uses
   Keyman.System.Standards.BCP47SuppressScriptRegistry in '..\..\..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.BCP47SuppressScriptRegistry.pas',
   Keyman.System.CanonicalLanguageCodeUtils in '..\..\..\..\..\windows\src\global\delphi\general\Keyman.System.CanonicalLanguageCodeUtils.pas',
   TextFileFormat in '..\..\..\tike\main\TextFileFormat.pas',
-  Keyman.System.LexicalModelUtils in '..\..\..\..\..\windows\src\global\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas',
-  Keyman.System.PackageInfoRefreshLexicalModels in '..\..\..\..\..\windows\src\global\delphi\packages\Keyman.System.PackageInfoRefreshLexicalModels.pas',
+  Keyman.System.LexicalModelUtils in '..\..\..\common\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas',
+  Keyman.System.PackageInfoRefreshLexicalModels in '..\..\..\common\delphi\packages\Keyman.System.PackageInfoRefreshLexicalModels.pas',
   Keyman.System.Standards.LangTagsRegistry in '..\..\..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.LangTagsRegistry.pas',
   Keyman.Developer.System.Project.UrlRenderer in '..\..\..\tike\project\Keyman.Developer.System.Project.UrlRenderer.pas',
   KeymanPaths in '..\..\..\..\..\windows\src\global\delphi\general\KeymanPaths.pas',
diff --git a/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dproj b/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dproj
index 2c1d91a1c5..a25548ef54 100644
--- a/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dproj
+++ b/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dproj
@@ -122,10 +122,10 @@
         <DCCReference Include="..\..\..\global\delphi\general\CRC32.pas"/>
         <DCCReference Include="..\..\..\global\delphi\general\KeyNames.pas"/>
         <DCCReference Include="..\..\..\developer\TIKE\main\KeymanDeveloperOptions.pas"/>
-        <DCCReference Include="..\..\..\global\delphi\packages\Keyman.System.PackageInfoRefreshKeyboards.pas"/>
-        <DCCReference Include="..\..\..\global\delphi\keyboards\Keyman.System.KeyboardJSInfo.pas"/>
-        <DCCReference Include="..\..\..\global\delphi\keyboards\Keyman.System.KeyboardUtils.pas"/>
-        <DCCReference Include="..\..\..\global\delphi\keyboards\Keyman.System.KMXFileLanguages.pas"/>
+        <DCCReference Include="..\..\..\common\delphi\packages\Keyman.System.PackageInfoRefreshKeyboards.pas"/>
+        <DCCReference Include="..\..\..\common\delphi\keyboards\Keyman.System.KeyboardJSInfo.pas"/>
+        <DCCReference Include="..\..\..\common\delphi\keyboards\Keyman.System.KeyboardUtils.pas"/>
+        <DCCReference Include="..\..\..\common\delphi\keyboards\Keyman.System.KMXFileLanguages.pas"/>
         <DCCReference Include="..\..\..\global\delphi\standards\Keyman.System.Standards.ISO6393ToBCP47Registry.pas"/>
         <DCCReference Include="..\..\..\global\delphi\standards\Keyman.System.Standards.LCIDToBCP47Registry.pas"/>
         <DCCReference Include="..\..\..\global\delphi\general\TempFileManager.pas"/>
@@ -174,8 +174,8 @@
         <DCCReference Include="..\..\..\global\delphi\standards\Keyman.System.Standards.BCP47SuppressScriptRegistry.pas"/>
         <DCCReference Include="..\..\..\global\delphi\general\Keyman.System.CanonicalLanguageCodeUtils.pas"/>
         <DCCReference Include="..\..\..\developer\TIKE\main\TextFileFormat.pas"/>
-        <DCCReference Include="..\..\..\global\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas"/>
-        <DCCReference Include="..\..\..\global\delphi\packages\Keyman.System.PackageInfoRefreshLexicalModels.pas"/>
+        <DCCReference Include="..\..\..\common\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas"/>
+        <DCCReference Include="..\..\..\common\delphi\packages\Keyman.System.PackageInfoRefreshLexicalModels.pas"/>
         <DCCReference Include="..\..\..\global\delphi\standards\Keyman.System.Standards.LangTagsRegistry.pas"/>
         <DCCReference Include="..\..\..\developer\TIKE\project\Keyman.Developer.System.Project.UrlRenderer.pas"/>
         <DCCReference Include="..\..\..\global\delphi\general\KeymanPaths.pas"/>
diff --git a/developer/src/test/auto/kmconvert/kmconverttest.dpr b/developer/src/test/auto/kmconvert/kmconverttest.dpr
index a0c81bded4..c01d88d61f 100644
--- a/developer/src/test/auto/kmconvert/kmconverttest.dpr
+++ b/developer/src/test/auto/kmconvert/kmconverttest.dpr
@@ -18,8 +18,8 @@ uses
   Keyman.System.CanonicalLanguageCodeUtils in '..\..\..\..\..\windows\src\global\delphi\general\Keyman.System.CanonicalLanguageCodeUtils.pas',
   Keyman.System.LanguageCodeUtils in '..\..\..\..\..\windows\src\global\delphi\general\Keyman.System.LanguageCodeUtils.pas',
   Keyman.System.Standards.LangTagsRegistry in '..\..\..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.LangTagsRegistry.pas',
-  Keyman.System.KeyboardUtils in '..\..\..\..\..\windows\src\global\delphi\keyboards\Keyman.System.KeyboardUtils.pas',
-  Keyman.System.LexicalModelUtils in '..\..\..\..\..\windows\src\global\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas',
+  Keyman.System.KeyboardUtils in '..\..\..\common\delphi\keyboards\Keyman.System.KeyboardUtils.pas',
+  Keyman.System.LexicalModelUtils in '..\..\..\common\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas',
   utilstr in '..\..\..\..\..\windows\src\global\delphi\general\utilstr.pas',
   Unicode in '..\..\..\..\..\windows\src\global\delphi\general\Unicode.pas',
   GetOsVersion in '..\..\..\..\..\windows\src\global\delphi\general\GetOsVersion.pas',
diff --git a/developer/src/test/auto/kmconvert/kmconverttest.dproj b/developer/src/test/auto/kmconvert/kmconverttest.dproj
index 6ddf0ec675..5ff21630b5 100644
--- a/developer/src/test/auto/kmconvert/kmconverttest.dproj
+++ b/developer/src/test/auto/kmconvert/kmconverttest.dproj
@@ -154,8 +154,8 @@
         <DCCReference Include="..\..\..\global\delphi\general\Keyman.System.CanonicalLanguageCodeUtils.pas"/>
         <DCCReference Include="..\..\..\global\delphi\general\Keyman.System.LanguageCodeUtils.pas"/>
         <DCCReference Include="..\..\..\global\delphi\standards\Keyman.System.Standards.LangTagsRegistry.pas"/>
-        <DCCReference Include="..\..\..\global\delphi\keyboards\Keyman.System.KeyboardUtils.pas"/>
-        <DCCReference Include="..\..\..\global\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas"/>
+        <DCCReference Include="..\..\..\common\delphi\keyboards\Keyman.System.KeyboardUtils.pas"/>
+        <DCCReference Include="..\..\..\common\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas"/>
         <DCCReference Include="..\..\..\global\delphi\general\utilstr.pas"/>
         <DCCReference Include="..\..\..\global\delphi\general\Unicode.pas"/>
         <DCCReference Include="..\..\..\global\delphi\general\GetOsVersion.pas"/>
diff --git a/windows/src/test/unit-tests/kmx-file-languages/KMXFileLanguagesTestSuite.dpr b/developer/src/test/auto/kmx-file-languages/KMXFileLanguagesTestSuite.dpr
similarity index 52%
rename from windows/src/test/unit-tests/kmx-file-languages/KMXFileLanguagesTestSuite.dpr
rename to developer/src/test/auto/kmx-file-languages/KMXFileLanguagesTestSuite.dpr
index 902a3ec1f1..68f518f1b3 100644
--- a/windows/src/test/unit-tests/kmx-file-languages/KMXFileLanguagesTestSuite.dpr
+++ b/developer/src/test/auto/kmx-file-languages/KMXFileLanguagesTestSuite.dpr
@@ -11,24 +11,24 @@ uses
   DUnitX.Loggers.Console,
   DUnitX.Loggers.Xml.NUnit,
   DUnitX.TestFramework,
-  Keyman.System.KMXFileLanguages in '..\..\..\global\delphi\keyboards\Keyman.System.KMXFileLanguages.pas',
-  kmxfile in '..\..\..\global\delphi\general\kmxfile.pas',
-  CRC32 in '..\..\..\global\delphi\general\CRC32.pas',
-  KeyNames in '..\..\..\global\delphi\general\KeyNames.pas',
-  utildir in '..\..\..\global\delphi\general\utildir.pas',
-  utilfiletypes in '..\..\..\global\delphi\general\utilfiletypes.pas',
-  KeymanVersion in '..\..\..\global\delphi\general\KeymanVersion.pas',
-  StockFileNames in '..\..\..\global\delphi\cust\StockFileNames.pas',
-  utilstr in '..\..\..\global\delphi\general\utilstr.pas',
-  Unicode in '..\..\..\global\delphi\general\Unicode.pas',
-  Keyman.System.Standards.ISO6393ToBCP47Registry in '..\..\..\global\delphi\standards\Keyman.System.Standards.ISO6393ToBCP47Registry.pas',
+  Keyman.System.KMXFileLanguages in '..\..\..\common\delphi\keyboards\Keyman.System.KMXFileLanguages.pas',
+  kmxfile in '..\..\..\..\..\windows\src\global\delphi\general\kmxfile.pas',
+  CRC32 in '..\..\..\..\..\windows\src\global\delphi\general\CRC32.pas',
+  KeyNames in '..\..\..\..\..\windows\src\global\delphi\general\KeyNames.pas',
+  utildir in '..\..\..\..\..\windows\src\global\delphi\general\utildir.pas',
+  utilfiletypes in '..\..\..\..\..\windows\src\global\delphi\general\utilfiletypes.pas',
+  KeymanVersion in '..\..\..\..\..\windows\src\global\delphi\general\KeymanVersion.pas',
+  StockFileNames in '..\..\..\..\..\windows\src\global\delphi\cust\StockFileNames.pas',
+  utilstr in '..\..\..\..\..\windows\src\global\delphi\general\utilstr.pas',
+  Unicode in '..\..\..\..\..\windows\src\global\delphi\general\Unicode.pas',
+  Keyman.System.Standards.ISO6393ToBCP47Registry in '..\..\..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.ISO6393ToBCP47Registry.pas',
   Keyman.Test.System.KMXFileLanguagesTest in 'Keyman.Test.System.KMXFileLanguagesTest.pas',
-  Keyman.System.Standards.LCIDToBCP47Registry in '..\..\..\global\delphi\standards\Keyman.System.Standards.LCIDToBCP47Registry.pas',
-  Keyman.System.LanguageCodeUtils in '..\..\..\global\delphi\general\Keyman.System.LanguageCodeUtils.pas',
-  DUnitX.Loggers.TeamCity in '..\..\..\global\delphi\general\DUnitX.Loggers.TeamCity.pas',
-  kmxfileconsts in '..\..\..\global\delphi\general\kmxfileconsts.pas',
-  Keyman.System.Standards.BCP47SubtagRegistry in '..\..\..\global\delphi\standards\Keyman.System.Standards.BCP47SubtagRegistry.pas',
-  Keyman.System.Standards.BCP47SuppressScriptRegistry in '..\..\..\global\delphi\standards\Keyman.System.Standards.BCP47SuppressScriptRegistry.pas';
+  Keyman.System.Standards.LCIDToBCP47Registry in '..\..\..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.LCIDToBCP47Registry.pas',
+  Keyman.System.LanguageCodeUtils in '..\..\..\..\..\windows\src\global\delphi\general\Keyman.System.LanguageCodeUtils.pas',
+  DUnitX.Loggers.TeamCity in '..\..\..\..\..\windows\src\global\delphi\general\DUnitX.Loggers.TeamCity.pas',
+  kmxfileconsts in '..\..\..\..\..\windows\src\global\delphi\general\kmxfileconsts.pas',
+  Keyman.System.Standards.BCP47SubtagRegistry in '..\..\..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.BCP47SubtagRegistry.pas',
+  Keyman.System.Standards.BCP47SuppressScriptRegistry in '..\..\..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.BCP47SuppressScriptRegistry.pas';
 
 var
   runner : ITestRunner;
diff --git a/windows/src/test/unit-tests/kmx-file-languages/KMXFileLanguagesTestSuite.dproj b/developer/src/test/auto/kmx-file-languages/KMXFileLanguagesTestSuite.dproj
similarity index 96%
rename from windows/src/test/unit-tests/kmx-file-languages/KMXFileLanguagesTestSuite.dproj
rename to developer/src/test/auto/kmx-file-languages/KMXFileLanguagesTestSuite.dproj
index 3e9e2e340b..56db365481 100644
--- a/windows/src/test/unit-tests/kmx-file-languages/KMXFileLanguagesTestSuite.dproj
+++ b/developer/src/test/auto/kmx-file-languages/KMXFileLanguagesTestSuite.dproj
@@ -91,24 +91,24 @@
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
-        <DCCReference Include="..\..\..\global\delphi\keyboards\Keyman.System.KMXFileLanguages.pas"/>
-        <DCCReference Include="..\..\..\global\delphi\general\kmxfile.pas"/>
-        <DCCReference Include="..\..\..\global\delphi\general\CRC32.pas"/>
-        <DCCReference Include="..\..\..\global\delphi\general\KeyNames.pas"/>
-        <DCCReference Include="..\..\..\global\delphi\general\utildir.pas"/>
-        <DCCReference Include="..\..\..\global\delphi\general\utilfiletypes.pas"/>
-        <DCCReference Include="..\..\..\global\delphi\general\KeymanVersion.pas"/>
-        <DCCReference Include="..\..\..\global\delphi\cust\StockFileNames.pas"/>
-        <DCCReference Include="..\..\..\global\delphi\general\utilstr.pas"/>
-        <DCCReference Include="..\..\..\global\delphi\general\Unicode.pas"/>
-        <DCCReference Include="..\..\..\global\delphi\standards\Keyman.System.Standards.ISO6393ToBCP47Registry.pas"/>
+        <DCCReference Include="..\..\..\common\delphi\keyboards\Keyman.System.KMXFileLanguages.pas"/>
+        <DCCReference Include="..\..\..\..\..\windows\src\global\delphi\general\kmxfile.pas"/>
+        <DCCReference Include="..\..\..\..\..\windows\src\global\delphi\general\CRC32.pas"/>
+        <DCCReference Include="..\..\..\..\..\windows\src\global\delphi\general\KeyNames.pas"/>
+        <DCCReference Include="..\..\..\..\..\windows\src\global\delphi\general\utildir.pas"/>
+        <DCCReference Include="..\..\..\..\..\windows\src\global\delphi\general\utilfiletypes.pas"/>
+        <DCCReference Include="..\..\..\..\..\windows\src\global\delphi\general\KeymanVersion.pas"/>
+        <DCCReference Include="..\..\..\..\..\windows\src\global\delphi\cust\StockFileNames.pas"/>
+        <DCCReference Include="..\..\..\..\..\windows\src\global\delphi\general\utilstr.pas"/>
+        <DCCReference Include="..\..\..\..\..\windows\src\global\delphi\general\Unicode.pas"/>
+        <DCCReference Include="..\..\..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.ISO6393ToBCP47Registry.pas"/>
         <DCCReference Include="Keyman.Test.System.KMXFileLanguagesTest.pas"/>
-        <DCCReference Include="..\..\..\global\delphi\standards\Keyman.System.Standards.LCIDToBCP47Registry.pas"/>
-        <DCCReference Include="..\..\..\global\delphi\general\Keyman.System.LanguageCodeUtils.pas"/>
-        <DCCReference Include="..\..\..\global\delphi\general\DUnitX.Loggers.TeamCity.pas"/>
-        <DCCReference Include="..\..\..\global\delphi\general\kmxfileconsts.pas"/>
-        <DCCReference Include="..\..\..\global\delphi\standards\Keyman.System.Standards.BCP47SubtagRegistry.pas"/>
-        <DCCReference Include="..\..\..\global\delphi\standards\Keyman.System.Standards.BCP47SuppressScriptRegistry.pas"/>
+        <DCCReference Include="..\..\..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.LCIDToBCP47Registry.pas"/>
+        <DCCReference Include="..\..\..\..\..\windows\src\global\delphi\general\Keyman.System.LanguageCodeUtils.pas"/>
+        <DCCReference Include="..\..\..\..\..\windows\src\global\delphi\general\DUnitX.Loggers.TeamCity.pas"/>
+        <DCCReference Include="..\..\..\..\..\windows\src\global\delphi\general\kmxfileconsts.pas"/>
+        <DCCReference Include="..\..\..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.BCP47SubtagRegistry.pas"/>
+        <DCCReference Include="..\..\..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.BCP47SuppressScriptRegistry.pas"/>
         <BuildConfiguration Include="Release">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>
diff --git a/windows/src/test/unit-tests/kmx-file-languages/KMXFileLanguagesTestSuite.res b/developer/src/test/auto/kmx-file-languages/KMXFileLanguagesTestSuite.res
similarity index 100%
rename from windows/src/test/unit-tests/kmx-file-languages/KMXFileLanguagesTestSuite.res
rename to developer/src/test/auto/kmx-file-languages/KMXFileLanguagesTestSuite.res
diff --git a/windows/src/test/unit-tests/kmx-file-languages/Keyman.Test.System.KMXFileLanguagesTest.pas b/developer/src/test/auto/kmx-file-languages/Keyman.Test.System.KMXFileLanguagesTest.pas
similarity index 100%
rename from windows/src/test/unit-tests/kmx-file-languages/Keyman.Test.System.KMXFileLanguagesTest.pas
rename to developer/src/test/auto/kmx-file-languages/Keyman.Test.System.KMXFileLanguagesTest.pas
diff --git a/windows/src/test/unit-tests/kmx-file-languages/Makefile b/developer/src/test/auto/kmx-file-languages/Makefile
similarity index 100%
rename from windows/src/test/unit-tests/kmx-file-languages/Makefile
rename to developer/src/test/auto/kmx-file-languages/Makefile
diff --git a/developer/src/tike/Tike.dpr b/developer/src/tike/Tike.dpr
index 4257202ae9..4eca20c004 100644
--- a/developer/src/tike/Tike.dpr
+++ b/developer/src/tike/Tike.dpr
@@ -221,13 +221,13 @@ uses
   UfrmTIKEDock in 'dockforms\UfrmTIKEDock.pas' {TIKEDockForm},
   KeymanDeveloperDebuggerMemo in '..\..\..\windows\src\global\delphi\comp\KeymanDeveloperDebuggerMemo.pas',
   UfrmCharacterMapDock in 'dockforms\UfrmCharacterMapDock.pas' {frmCharacterMapDock},
-  Keyman.System.PackageInfoRefreshKeyboards in '..\..\..\windows\src\global\delphi\packages\Keyman.System.PackageInfoRefreshKeyboards.pas',
+  Keyman.System.PackageInfoRefreshKeyboards in '..\common\delphi\packages\Keyman.System.PackageInfoRefreshKeyboards.pas',
   Keyman.System.Standards.ISO6393ToBCP47Registry in '..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.ISO6393ToBCP47Registry.pas',
   Keyman.System.Standards.LCIDToBCP47Registry in '..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.LCIDToBCP47Registry.pas',
-  Keyman.System.KeyboardJSInfo in '..\..\..\windows\src\global\delphi\keyboards\Keyman.System.KeyboardJSInfo.pas',
-  Keyman.System.KeyboardUtils in '..\..\..\windows\src\global\delphi\keyboards\Keyman.System.KeyboardUtils.pas',
+  Keyman.System.KeyboardJSInfo in '..\common\delphi\keyboards\Keyman.System.KeyboardJSInfo.pas',
+  Keyman.System.KeyboardUtils in '..\common\delphi\keyboards\Keyman.System.KeyboardUtils.pas',
   BCP47Tag in '..\..\..\windows\src\global\delphi\general\BCP47Tag.pas',
-  Keyman.System.KMXFileLanguages in '..\..\..\windows\src\global\delphi\keyboards\Keyman.System.KMXFileLanguages.pas',
+  Keyman.System.KMXFileLanguages in '..\common\delphi\keyboards\Keyman.System.KMXFileLanguages.pas',
   Keyman.System.LanguageCodeUtils in '..\..\..\windows\src\global\delphi\general\Keyman.System.LanguageCodeUtils.pas',
   Keyman.System.RegExGroupHelperRSP19902 in '..\..\..\windows\src\global\delphi\general\Keyman.System.RegExGroupHelperRSP19902.pas',
   Keyman.System.UpdateCheckResponse in '..\..\..\windows\src\global\delphi\general\Keyman.System.UpdateCheckResponse.pas',
@@ -250,18 +250,18 @@ uses
   Keyman.Developer.System.ImportWindowsKeyboard in '..\kmconvert\Keyman.Developer.System.ImportWindowsKeyboard.pas',
   Keyman.Developer.System.ImportKeyboardDLL in '..\kmconvert\Keyman.Developer.System.ImportKeyboardDLL.pas',
   Keyman.System.Util.RenderLanguageIcon in '..\..\..\windows\src\global\delphi\ui\Keyman.System.Util.RenderLanguageIcon.pas',
-  Keyman.System.PackageInfoRefreshLexicalModels in '..\..\..\windows\src\global\delphi\packages\Keyman.System.PackageInfoRefreshLexicalModels.pas',
-  Keyman.System.LexicalModelUtils in '..\..\..\windows\src\global\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas',
+  Keyman.System.PackageInfoRefreshLexicalModels in '..\common\delphi\packages\Keyman.System.PackageInfoRefreshLexicalModels.pas',
+  Keyman.System.LexicalModelUtils in '..\common\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas',
   Keyman.Developer.System.Project.kmnProjectFile in 'project\Keyman.Developer.System.Project.kmnProjectFile.pas',
   Keyman.Developer.System.Project.modelTsProjectFileAction in 'project\Keyman.Developer.System.Project.modelTsProjectFileAction.pas',
-  Keyman.Developer.System.LexicalModelCompile in '..\..\..\windows\src\global\delphi\lexicalmodels\Keyman.Developer.System.LexicalModelCompile.pas',
+  Keyman.Developer.System.LexicalModelCompile in '..\common\delphi\lexicalmodels\Keyman.Developer.System.LexicalModelCompile.pas',
   Keyman.Developer.UI.Project.modelTsProjectFileUI in 'project\Keyman.Developer.UI.Project.modelTsProjectFileUI.pas',
   Keyman.Developer.System.ModelProjectTemplate in '..\kmconvert\Keyman.Developer.System.ModelProjectTemplate.pas',
   Keyman.Developer.System.ProjectTemplate in '..\kmconvert\Keyman.Developer.System.ProjectTemplate.pas',
   Keyman.Developer.UI.Project.UfrmNewModelProjectParameters in 'project\Keyman.Developer.UI.Project.UfrmNewModelProjectParameters.pas' {frmNewModelProjectParameters},
   Keyman.Developer.System.Project.wordlistTsvProjectFile in 'project\Keyman.Developer.System.Project.wordlistTsvProjectFile.pas',
   Keyman.Developer.UI.UframeWordlistEditor in 'child\Keyman.Developer.UI.UframeWordlistEditor.pas' {frameWordlistEditor},
-  Keyman.System.WordlistTsvFile in '..\..\..\windows\src\global\delphi\lexicalmodels\Keyman.System.WordlistTsvFile.pas',
+  Keyman.System.WordlistTsvFile in '..\common\delphi\lexicalmodels\Keyman.System.WordlistTsvFile.pas',
   Keyman.Developer.UI.Project.wordlistTsvProjectFileUI in 'project\Keyman.Developer.UI.Project.wordlistTsvProjectFileUI.pas',
   Keyman.Developer.System.Project.WelcomeRenderer in 'project\Keyman.Developer.System.Project.WelcomeRenderer.pas',
   Browse4Folder in '..\ext\browse4folder\Browse4Folder.pas',
diff --git a/developer/src/tike/Tike.dproj b/developer/src/tike/Tike.dproj
index ca759b31ac..3005b6a6be 100644
--- a/developer/src/tike/Tike.dproj
+++ b/developer/src/tike/Tike.dproj
@@ -463,13 +463,13 @@
         <DCCReference Include="dockforms\UfrmCharacterMapDock.pas">
             <Form>frmCharacterMapDock</Form>
         </DCCReference>
-        <DCCReference Include="..\..\..\windows\src\global\delphi\packages\Keyman.System.PackageInfoRefreshKeyboards.pas"/>
+        <DCCReference Include="..\common\delphi\packages\Keyman.System.PackageInfoRefreshKeyboards.pas"/>
         <DCCReference Include="..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.ISO6393ToBCP47Registry.pas"/>
         <DCCReference Include="..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.LCIDToBCP47Registry.pas"/>
-        <DCCReference Include="..\..\..\windows\src\global\delphi\keyboards\Keyman.System.KeyboardJSInfo.pas"/>
-        <DCCReference Include="..\..\..\windows\src\global\delphi\keyboards\Keyman.System.KeyboardUtils.pas"/>
+        <DCCReference Include="..\common\delphi\keyboards\Keyman.System.KeyboardJSInfo.pas"/>
+        <DCCReference Include="..\common\delphi\keyboards\Keyman.System.KeyboardUtils.pas"/>
         <DCCReference Include="..\..\..\windows\src\global\delphi\general\BCP47Tag.pas"/>
-        <DCCReference Include="..\..\..\windows\src\global\delphi\keyboards\Keyman.System.KMXFileLanguages.pas"/>
+        <DCCReference Include="..\common\delphi\keyboards\Keyman.System.KMXFileLanguages.pas"/>
         <DCCReference Include="..\..\..\windows\src\global\delphi\general\Keyman.System.LanguageCodeUtils.pas"/>
         <DCCReference Include="..\..\..\windows\src\global\delphi\general\Keyman.System.RegExGroupHelperRSP19902.pas"/>
         <DCCReference Include="..\..\..\windows\src\global\delphi\general\Keyman.System.UpdateCheckResponse.pas"/>
@@ -496,11 +496,11 @@
         <DCCReference Include="..\kmconvert\Keyman.Developer.System.ImportWindowsKeyboard.pas"/>
         <DCCReference Include="..\kmconvert\Keyman.Developer.System.ImportKeyboardDLL.pas"/>
         <DCCReference Include="..\..\..\windows\src\global\delphi\ui\Keyman.System.Util.RenderLanguageIcon.pas"/>
-        <DCCReference Include="..\..\..\windows\src\global\delphi\packages\Keyman.System.PackageInfoRefreshLexicalModels.pas"/>
-        <DCCReference Include="..\..\..\windows\src\global\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas"/>
+        <DCCReference Include="..\common\delphi\packages\Keyman.System.PackageInfoRefreshLexicalModels.pas"/>
+        <DCCReference Include="..\common\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas"/>
         <DCCReference Include="project\Keyman.Developer.System.Project.kmnProjectFile.pas"/>
         <DCCReference Include="project\Keyman.Developer.System.Project.modelTsProjectFileAction.pas"/>
-        <DCCReference Include="..\..\..\windows\src\global\delphi\lexicalmodels\Keyman.Developer.System.LexicalModelCompile.pas"/>
+        <DCCReference Include="..\common\delphi\lexicalmodels\Keyman.Developer.System.LexicalModelCompile.pas"/>
         <DCCReference Include="project\Keyman.Developer.UI.Project.modelTsProjectFileUI.pas"/>
         <DCCReference Include="..\kmconvert\Keyman.Developer.System.ModelProjectTemplate.pas"/>
         <DCCReference Include="..\kmconvert\Keyman.Developer.System.ProjectTemplate.pas"/>
@@ -511,7 +511,7 @@
         <DCCReference Include="child\Keyman.Developer.UI.UframeWordlistEditor.pas">
             <Form>frameWordlistEditor</Form>
         </DCCReference>
-        <DCCReference Include="..\..\..\windows\src\global\delphi\lexicalmodels\Keyman.System.WordlistTsvFile.pas"/>
+        <DCCReference Include="..\common\delphi\lexicalmodels\Keyman.System.WordlistTsvFile.pas"/>
         <DCCReference Include="project\Keyman.Developer.UI.Project.wordlistTsvProjectFileUI.pas"/>
         <DCCReference Include="project\Keyman.Developer.System.Project.WelcomeRenderer.pas"/>
         <DCCReference Include="..\ext\browse4folder\Browse4Folder.pas"/>
diff --git a/windows/src/buildtools/buildpkg/buildpkg.dpr b/windows/src/buildtools/buildpkg/buildpkg.dpr
index fbc73ed7d1..29388a0896 100644
--- a/windows/src/buildtools/buildpkg/buildpkg.dpr
+++ b/windows/src/buildtools/buildpkg/buildpkg.dpr
@@ -51,12 +51,12 @@ uses
   VKeyChars in '..\..\global\delphi\general\VKeyChars.pas',
   VKeys in '..\..\global\delphi\general\VKeys.pas',
   JsonUtil in '..\..\global\delphi\general\JsonUtil.pas',
-  Keyman.System.PackageInfoRefreshKeyboards in '..\..\global\delphi\packages\Keyman.System.PackageInfoRefreshKeyboards.pas',
-  Keyman.System.KMXFileLanguages in '..\..\global\delphi\keyboards\Keyman.System.KMXFileLanguages.pas',
+  Keyman.System.PackageInfoRefreshKeyboards in '..\..\..\..\developer\src\common\delphi\packages\Keyman.System.PackageInfoRefreshKeyboards.pas',
+  Keyman.System.KMXFileLanguages in '..\..\..\..\developer\src\common\delphi\keyboards\Keyman.System.KMXFileLanguages.pas',
   Keyman.System.Standards.ISO6393ToBCP47Registry in '..\..\global\delphi\standards\Keyman.System.Standards.ISO6393ToBCP47Registry.pas',
   Keyman.System.Standards.LCIDToBCP47Registry in '..\..\global\delphi\standards\Keyman.System.Standards.LCIDToBCP47Registry.pas',
-  Keyman.System.KeyboardJSInfo in '..\..\global\delphi\keyboards\Keyman.System.KeyboardJSInfo.pas',
-  Keyman.System.KeyboardUtils in '..\..\global\delphi\keyboards\Keyman.System.KeyboardUtils.pas',
+  Keyman.System.KeyboardJSInfo in '..\..\..\..\developer\src\common\delphi\keyboards\Keyman.System.KeyboardJSInfo.pas',
+  Keyman.System.KeyboardUtils in '..\..\..\..\developer\src\common\delphi\keyboards\Keyman.System.KeyboardUtils.pas',
   Keyman.System.LanguageCodeUtils in '..\..\global\delphi\general\Keyman.System.LanguageCodeUtils.pas',
   Keyman.System.RegExGroupHelperRSP19902 in '..\..\global\delphi\general\Keyman.System.RegExGroupHelperRSP19902.pas',
   kmxfileconsts in '..\..\global\delphi\general\kmxfileconsts.pas',
@@ -64,8 +64,8 @@ uses
   Keyman.System.Standards.BCP47SubtagRegistry in '..\..\global\delphi\standards\Keyman.System.Standards.BCP47SubtagRegistry.pas',
   Keyman.System.Standards.BCP47SuppressScriptRegistry in '..\..\global\delphi\standards\Keyman.System.Standards.BCP47SuppressScriptRegistry.pas',
   Keyman.System.CanonicalLanguageCodeUtils in '..\..\global\delphi\general\Keyman.System.CanonicalLanguageCodeUtils.pas',
-  Keyman.System.LexicalModelUtils in '..\..\global\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas',
-  Keyman.System.PackageInfoRefreshLexicalModels in '..\..\global\delphi\packages\Keyman.System.PackageInfoRefreshLexicalModels.pas',
+  Keyman.System.LexicalModelUtils in '..\..\..\..\developer\src\common\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas',
+  Keyman.System.PackageInfoRefreshLexicalModels in '..\..\..\..\developer\src\common\delphi\packages\Keyman.System.PackageInfoRefreshLexicalModels.pas',
   Keyman.System.Standards.LangTagsRegistry in '..\..\global\delphi\standards\Keyman.System.Standards.LangTagsRegistry.pas',
   KeymanPaths in '..\..\global\delphi\general\KeymanPaths.pas',
   Keyman.Developer.System.KeymanDeveloperPaths in '..\..\..\..\developer\src\tike\main\Keyman.Developer.System.KeymanDeveloperPaths.pas';
diff --git a/windows/src/buildtools/buildpkg/buildpkg.dproj b/windows/src/buildtools/buildpkg/buildpkg.dproj
index e06adc4c14..5f61a383fe 100644
--- a/windows/src/buildtools/buildpkg/buildpkg.dproj
+++ b/windows/src/buildtools/buildpkg/buildpkg.dproj
@@ -141,12 +141,12 @@
         <DCCReference Include="..\..\global\delphi\general\VKeyChars.pas"/>
         <DCCReference Include="..\..\global\delphi\general\VKeys.pas"/>
         <DCCReference Include="..\..\global\delphi\general\JsonUtil.pas"/>
-        <DCCReference Include="..\..\global\delphi\packages\Keyman.System.PackageInfoRefreshKeyboards.pas"/>
-        <DCCReference Include="..\..\global\delphi\keyboards\Keyman.System.KMXFileLanguages.pas"/>
+        <DCCReference Include="..\..\..\..\developer\src\common\delphi\packages\Keyman.System.PackageInfoRefreshKeyboards.pas"/>
+        <DCCReference Include="..\..\..\..\developer\src\common\delphi\keyboards\Keyman.System.KMXFileLanguages.pas"/>
         <DCCReference Include="..\..\global\delphi\standards\Keyman.System.Standards.ISO6393ToBCP47Registry.pas"/>
         <DCCReference Include="..\..\global\delphi\standards\Keyman.System.Standards.LCIDToBCP47Registry.pas"/>
-        <DCCReference Include="..\..\global\delphi\keyboards\Keyman.System.KeyboardJSInfo.pas"/>
-        <DCCReference Include="..\..\global\delphi\keyboards\Keyman.System.KeyboardUtils.pas"/>
+        <DCCReference Include="..\..\..\..\developer\src\common\delphi\keyboards\Keyman.System.KeyboardJSInfo.pas"/>
+        <DCCReference Include="..\..\..\..\developer\src\common\delphi\keyboards\Keyman.System.KeyboardUtils.pas"/>
         <DCCReference Include="..\..\global\delphi\general\Keyman.System.LanguageCodeUtils.pas"/>
         <DCCReference Include="..\..\global\delphi\general\Keyman.System.RegExGroupHelperRSP19902.pas"/>
         <DCCReference Include="..\..\global\delphi\general\kmxfileconsts.pas"/>
@@ -154,8 +154,8 @@
         <DCCReference Include="..\..\global\delphi\standards\Keyman.System.Standards.BCP47SubtagRegistry.pas"/>
         <DCCReference Include="..\..\global\delphi\standards\Keyman.System.Standards.BCP47SuppressScriptRegistry.pas"/>
         <DCCReference Include="..\..\global\delphi\general\Keyman.System.CanonicalLanguageCodeUtils.pas"/>
-        <DCCReference Include="..\..\global\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas"/>
-        <DCCReference Include="..\..\global\delphi\packages\Keyman.System.PackageInfoRefreshLexicalModels.pas"/>
+        <DCCReference Include="..\..\..\..\developer\src\common\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas"/>
+        <DCCReference Include="..\..\..\..\developer\src\common\delphi\packages\Keyman.System.PackageInfoRefreshLexicalModels.pas"/>
         <DCCReference Include="..\..\global\delphi\standards\Keyman.System.Standards.LangTagsRegistry.pas"/>
         <DCCReference Include="..\..\global\delphi\general\KeymanPaths.pas"/>
         <DCCReference Include="..\..\..\..\developer\src\tike\main\Keyman.Developer.System.KeymanDeveloperPaths.pas"/>
diff --git a/windows/src/test/unit-tests/Makefile b/windows/src/test/unit-tests/Makefile
index 91569520f2..d538384984 100644
--- a/windows/src/test/unit-tests/Makefile
+++ b/windows/src/test/unit-tests/Makefile
@@ -14,8 +14,7 @@ test:
 # ----------------------------------------------------------------------
 
 # TODO: move shared-tests to /common
-shared-tests: androidstringtokeymanlocalestring keyboard-js-info \
-        kmx-file-languages package-info jsonutil \
+shared-tests: androidstringtokeymanlocalestring package-info jsonutil \
         standards-data
 
 windows-tests: group-helper-rsp19902 shared-data \
@@ -35,14 +34,6 @@ shared-data: .virtual
     cd $(ROOT)\src\test\unit-tests\shared-data
     $(MAKE) $(TARGET)
 
-keyboard-js-info: .virtual
-    cd $(ROOT)\src\test\unit-tests\keyboard-js-info
-    $(MAKE) $(TARGET)
-
-kmx-file-languages: .virtual
-    cd $(ROOT)\src\test\unit-tests\kmx-file-languages
-    $(MAKE) $(TARGET)
-
 package-info: .virtual
     cd $(ROOT)\src\test\unit-tests\package-info
     $(MAKE) $(TARGET)