diff --git a/android/KMEA/app/src/test/java/com/tavultesoft/kmea/KMManagerTest.java b/android/KMEA/app/src/test/java/com/keyman/engine/KMManagerTest.java
similarity index 100%
rename from android/KMEA/app/src/test/java/com/tavultesoft/kmea/KMManagerTest.java
rename to android/KMEA/app/src/test/java/com/keyman/engine/KMManagerTest.java
diff --git a/android/KMEA/app/src/test/java/com/tavultesoft/kmea/cloud/CloudDataJsonUtilTest.java b/android/KMEA/app/src/test/java/com/keyman/engine/cloud/CloudDataJsonUtilTest.java
similarity index 100%
rename from android/KMEA/app/src/test/java/com/tavultesoft/kmea/cloud/CloudDataJsonUtilTest.java
rename to android/KMEA/app/src/test/java/com/keyman/engine/cloud/CloudDataJsonUtilTest.java
diff --git a/android/KMEA/app/src/test/java/com/tavultesoft/kmea/logic/ResourcesUpdateToolTest.java b/android/KMEA/app/src/test/java/com/keyman/engine/logic/ResourcesUpdateToolTest.java
similarity index 100%
rename from android/KMEA/app/src/test/java/com/tavultesoft/kmea/logic/ResourcesUpdateToolTest.java
rename to android/KMEA/app/src/test/java/com/keyman/engine/logic/ResourcesUpdateToolTest.java
diff --git a/android/KMEA/app/src/test/java/com/tavultesoft/kmea/packages/JSONUtilsTest.java b/android/KMEA/app/src/test/java/com/keyman/engine/packages/JSONUtilsTest.java
similarity index 100%
rename from android/KMEA/app/src/test/java/com/tavultesoft/kmea/packages/JSONUtilsTest.java
rename to android/KMEA/app/src/test/java/com/keyman/engine/packages/JSONUtilsTest.java
diff --git a/android/KMEA/app/src/test/java/com/tavultesoft/kmea/packages/LexicalModelPackageProcessorTest.java b/android/KMEA/app/src/test/java/com/keyman/engine/packages/LexicalModelPackageProcessorTest.java
similarity index 100%
rename from android/KMEA/app/src/test/java/com/tavultesoft/kmea/packages/LexicalModelPackageProcessorTest.java
rename to android/KMEA/app/src/test/java/com/keyman/engine/packages/LexicalModelPackageProcessorTest.java
diff --git a/android/KMEA/app/src/test/java/com/tavultesoft/kmea/packages/PackageProcessorTest.java b/android/KMEA/app/src/test/java/com/keyman/engine/packages/PackageProcessorTest.java
similarity index 100%
rename from android/KMEA/app/src/test/java/com/tavultesoft/kmea/packages/PackageProcessorTest.java
rename to android/KMEA/app/src/test/java/com/keyman/engine/packages/PackageProcessorTest.java
diff --git a/android/KMEA/app/src/test/java/com/tavultesoft/kmea/util/BCP47Test.java b/android/KMEA/app/src/test/java/com/keyman/engine/util/BCP47Test.java
similarity index 100%
rename from android/KMEA/app/src/test/java/com/tavultesoft/kmea/util/BCP47Test.java
rename to android/KMEA/app/src/test/java/com/keyman/engine/util/BCP47Test.java
diff --git a/android/KMEA/app/src/test/java/com/tavultesoft/kmea/util/CharSequenceUtilTest.java b/android/KMEA/app/src/test/java/com/keyman/engine/util/CharSequenceUtilTest.java
similarity index 100%
rename from android/KMEA/app/src/test/java/com/tavultesoft/kmea/util/CharSequenceUtilTest.java
rename to android/KMEA/app/src/test/java/com/keyman/engine/util/CharSequenceUtilTest.java
diff --git a/android/KMEA/app/src/test/java/com/tavultesoft/kmea/util/FileUtilsTest.java b/android/KMEA/app/src/test/java/com/keyman/engine/util/FileUtilsTest.java
similarity index 100%
rename from android/KMEA/app/src/test/java/com/tavultesoft/kmea/util/FileUtilsTest.java
rename to android/KMEA/app/src/test/java/com/keyman/engine/util/FileUtilsTest.java
diff --git a/android/KMEA/app/src/test/java/com/tavultesoft/kmea/util/KMPLinkTest.java b/android/KMEA/app/src/test/java/com/keyman/engine/util/KMPLinkTest.java
similarity index 100%
rename from android/KMEA/app/src/test/java/com/tavultesoft/kmea/util/KMPLinkTest.java
rename to android/KMEA/app/src/test/java/com/keyman/engine/util/KMPLinkTest.java
diff --git a/android/KMEA/app/src/test/java/com/tavultesoft/kmea/util/MapCompatTest.java b/android/KMEA/app/src/test/java/com/keyman/engine/util/MapCompatTest.java
similarity index 100%
rename from android/KMEA/app/src/test/java/com/tavultesoft/kmea/util/MapCompatTest.java
rename to android/KMEA/app/src/test/java/com/keyman/engine/util/MapCompatTest.java
diff --git a/android/KMEA/app/src/test/java/com/tavultesoft/kmea/util/WebViewUtilsTest.java b/android/KMEA/app/src/test/java/com/keyman/engine/util/WebViewUtilsTest.java
similarity index 100%
rename from android/KMEA/app/src/test/java/com/tavultesoft/kmea/util/WebViewUtilsTest.java
rename to android/KMEA/app/src/test/java/com/keyman/engine/util/WebViewUtilsTest.java
diff --git a/android/KMEA/app/src/test/java/com/tavultesoft/kmea/util/ZipUtilsTest.java b/android/KMEA/app/src/test/java/com/keyman/engine/util/ZipUtilsTest.java
similarity index 100%
rename from android/KMEA/app/src/test/java/com/tavultesoft/kmea/util/ZipUtilsTest.java
rename to android/KMEA/app/src/test/java/com/keyman/engine/util/ZipUtilsTest.java
diff --git a/android/KMEA/app/src/test/java/com/tavultesoft/kmea/view/FunctionalTestHelper.java b/android/KMEA/app/src/test/java/com/keyman/engine/view/FunctionalTestHelper.java
similarity index 100%
rename from android/KMEA/app/src/test/java/com/tavultesoft/kmea/view/FunctionalTestHelper.java
rename to android/KMEA/app/src/test/java/com/keyman/engine/view/FunctionalTestHelper.java
diff --git a/android/KMEA/app/src/test/java/com/tavultesoft/kmea/view/KeyboardPickerTest.java b/android/KMEA/app/src/test/java/com/keyman/engine/view/KeyboardPickerTest.java
similarity index 100%
rename from android/KMEA/app/src/test/java/com/tavultesoft/kmea/view/KeyboardPickerTest.java
rename to android/KMEA/app/src/test/java/com/keyman/engine/view/KeyboardPickerTest.java