291 files changed, 1221 insertions, 1231 deletions

diff --git a/tests/src/com/android/inputmethod/compat/LocaleSpanCompatUtilsTests.java b/tests/src/org/kelar/inputmethod/compat/LocaleSpanCompatUtilsTests.java
index 6203238b8..44aae0282 100644
--- a/tests/src/com/android/inputmethod/compat/LocaleSpanCompatUtilsTests.java
+++ b/tests/src/org/kelar/inputmethod/compat/LocaleSpanCompatUtilsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.compat;
+package org.kelar.inputmethod.compat;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
diff --git a/tests/src/com/android/inputmethod/compat/SuggestionSpanUtilsTest.java b/tests/src/org/kelar/inputmethod/compat/SuggestionSpanUtilsTest.java
index e3fb30dbb..d9fe690ac 100644
--- a/tests/src/com/android/inputmethod/compat/SuggestionSpanUtilsTest.java
+++ b/tests/src/org/kelar/inputmethod/compat/SuggestionSpanUtilsTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.compat;
+package org.kelar.inputmethod.compat;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -30,8 +30,8 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.SuggestedWords;
-import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
+import org.kelar.inputmethod.latin.SuggestedWords;
+import org.kelar.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/src/com/android/inputmethod/compat/TextInfoCompatUtilsTests.java b/tests/src/org/kelar/inputmethod/compat/TextInfoCompatUtilsTests.java
index d4dbfd4c6..9b2ab94ee 100644
--- a/tests/src/com/android/inputmethod/compat/TextInfoCompatUtilsTests.java
+++ b/tests/src/org/kelar/inputmethod/compat/TextInfoCompatUtilsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.compat;
+package org.kelar.inputmethod.compat;
 
 import static org.junit.Assert.assertTrue;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetNavigateMoreKeysBase.java b/tests/src/org/kelar/inputmethod/keyboard/KeyboardLayoutSetNavigateMoreKeysBase.java
index 21333b0a0..5ba44c73e 100644
--- a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetNavigateMoreKeysBase.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/KeyboardLayoutSetNavigateMoreKeysBase.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
 import android.text.InputType;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.keyboard.internal.MoreKeySpec;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.RichInputMethodManager;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.keyboard.internal.MoreKeySpec;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.RichInputMethodManager;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 import java.util.Arrays;
 import java.util.Locale;
diff --git a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetNavigateMoreKeysKlpTests.java b/tests/src/org/kelar/inputmethod/keyboard/KeyboardLayoutSetNavigateMoreKeysKlpTests.java
index 36c217989..c257e3dee 100644
--- a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetNavigateMoreKeysKlpTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/KeyboardLayoutSetNavigateMoreKeysKlpTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
 import androidx.test.filters.SmallTest;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetNavigateMoreKeysLxxTests.java b/tests/src/org/kelar/inputmethod/keyboard/KeyboardLayoutSetNavigateMoreKeysLxxTests.java
index bb7a247db..fadbba0fd 100644
--- a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetNavigateMoreKeysLxxTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/KeyboardLayoutSetNavigateMoreKeysLxxTests.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
 
 @SmallTest
 public class KeyboardLayoutSetNavigateMoreKeysLxxTests
diff --git a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java b/tests/src/org/kelar/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java
index 1f13b4106..122caea85 100644
--- a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -24,16 +24,16 @@ import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
-import com.android.inputmethod.compat.InputMethodSubtypeCompatUtils;
-import com.android.inputmethod.keyboard.KeyboardLayoutSet.Builder;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.RichInputMethodManager;
-import com.android.inputmethod.latin.RichInputMethodSubtype;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.settings.Settings;
-import com.android.inputmethod.latin.utils.AdditionalSubtypeUtils;
-import com.android.inputmethod.latin.utils.ResourceUtils;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.compat.InputMethodSubtypeCompatUtils;
+import org.kelar.inputmethod.keyboard.KeyboardLayoutSet.Builder;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.RichInputMethodManager;
+import org.kelar.inputmethod.latin.RichInputMethodSubtype;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.settings.Settings;
+import org.kelar.inputmethod.latin.utils.AdditionalSubtypeUtils;
+import org.kelar.inputmethod.latin.utils.ResourceUtils;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 import java.util.ArrayList;
 import java.util.Locale;
diff --git a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutTest.java b/tests/src/org/kelar/inputmethod/keyboard/KeyboardLayoutTest.java
index ddace1a38..eb0754a60 100644
--- a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutTest.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/KeyboardLayoutTest.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/KeyboardThemeTests.java b/tests/src/org/kelar/inputmethod/keyboard/KeyboardThemeTests.java
index 2f8140e23..ffc5cc9ed 100644
--- a/tests/src/com/android/inputmethod/keyboard/KeyboardThemeTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/KeyboardThemeTests.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
-import static com.android.inputmethod.keyboard.KeyboardTheme.THEME_ID_ICS;
-import static com.android.inputmethod.keyboard.KeyboardTheme.THEME_ID_KLP;
-import static com.android.inputmethod.keyboard.KeyboardTheme.THEME_ID_LXX_DARK;
-import static com.android.inputmethod.keyboard.KeyboardTheme.THEME_ID_LXX_LIGHT;
+import static org.kelar.inputmethod.keyboard.KeyboardTheme.THEME_ID_ICS;
+import static org.kelar.inputmethod.keyboard.KeyboardTheme.THEME_ID_KLP;
+import static org.kelar.inputmethod.keyboard.KeyboardTheme.THEME_ID_LXX_DARK;
+import static org.kelar.inputmethod.keyboard.KeyboardTheme.THEME_ID_LXX_LIGHT;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderAutoOrderTests.java b/tests/src/org/kelar/inputmethod/keyboard/MoreKeysKeyboardBuilderAutoOrderTests.java
index 90963d4ca..15d594daa 100644
--- a/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderAutoOrderTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/MoreKeysKeyboardBuilderAutoOrderTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -23,7 +23,7 @@ import static org.junit.Assert.fail;
 import androidx.test.filters.MediumTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.keyboard.MoreKeysKeyboard.MoreKeysKeyboardParams;
+import org.kelar.inputmethod.keyboard.MoreKeysKeyboard.MoreKeysKeyboardParams;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderFixedOrderTests.java b/tests/src/org/kelar/inputmethod/keyboard/MoreKeysKeyboardBuilderFixedOrderTests.java
index 3c5c298f6..2184ef63e 100644
--- a/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderFixedOrderTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/MoreKeysKeyboardBuilderFixedOrderTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -23,7 +23,7 @@ import static org.junit.Assert.fail;
 import androidx.test.filters.MediumTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.keyboard.MoreKeysKeyboard.MoreKeysKeyboardParams;
+import org.kelar.inputmethod.keyboard.MoreKeysKeyboard.MoreKeysKeyboardParams;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderMaxOrderTests.java b/tests/src/org/kelar/inputmethod/keyboard/MoreKeysKeyboardBuilderMaxOrderTests.java
index 1d28c2295..85a49f80c 100644
--- a/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderMaxOrderTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/MoreKeysKeyboardBuilderMaxOrderTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -23,7 +23,7 @@ import static org.junit.Assert.fail;
 import androidx.test.filters.MediumTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.keyboard.MoreKeysKeyboard.MoreKeysKeyboardParams;
+import org.kelar.inputmethod.keyboard.MoreKeysKeyboard.MoreKeysKeyboardParams;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/src/com/android/inputmethod/keyboard/action/ActionTestsBase.java b/tests/src/org/kelar/inputmethod/keyboard/action/ActionTestsBase.java
index 1ea68e471..77ec4cee3 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/ActionTestsBase.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/ActionTestsBase.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -22,17 +22,17 @@ import android.text.InputType;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
-import com.android.inputmethod.keyboard.Key;
-import com.android.inputmethod.keyboard.Keyboard;
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.KeyboardLayoutSet;
-import com.android.inputmethod.keyboard.KeyboardLayoutSetTestsBase;
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyVisual;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.LocaleUtils;
-import com.android.inputmethod.latin.utils.RunInLocale;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.keyboard.Key;
+import org.kelar.inputmethod.keyboard.Keyboard;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.KeyboardLayoutSet;
+import org.kelar.inputmethod.keyboard.KeyboardLayoutSetTestsBase;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyVisual;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.LocaleUtils;
+import org.kelar.inputmethod.latin.utils.RunInLocale;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/action/KlpActionCustomTests.java b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionCustomTests.java
index e67a53162..e8257cc9f 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/KlpActionCustomTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionCustomTests.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 @LargeTest
 public class KlpActionCustomTests extends KlpActionTestsBase {
diff --git a/tests/src/com/android/inputmethod/keyboard/action/KlpActionDoneTests.java b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionDoneTests.java
index 33543e173..557590041 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/KlpActionDoneTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionDoneTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 @LargeTest
 public class KlpActionDoneTests extends KlpActionTestsBase {
diff --git a/tests/src/com/android/inputmethod/keyboard/action/KlpActionGoTests.java b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionGoTests.java
index 171581467..f77a4d38f 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/KlpActionGoTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionGoTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 @LargeTest
 public class KlpActionGoTests extends KlpActionTestsBase {
diff --git a/tests/src/com/android/inputmethod/keyboard/action/KlpActionLabelTests.java b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionLabelTests.java
index 7fe620970..8297764c2 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/KlpActionLabelTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionLabelTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.content.res.Resources;
 import android.view.inputmethod.EditorInfo;
@@ -22,13 +22,13 @@ import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.MediumTest;
 
-import com.android.inputmethod.keyboard.KeyboardLayoutSet;
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.keyboard.internal.KeyboardTextsSet;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.RichInputMethodManager;
-import com.android.inputmethod.latin.utils.RunInLocale;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.keyboard.KeyboardLayoutSet;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.keyboard.internal.KeyboardTextsSet;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.RichInputMethodManager;
+import org.kelar.inputmethod.latin.utils.RunInLocale;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/action/KlpActionNextTests.java b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionNextTests.java
index b9ec446da..47170f062 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/KlpActionNextTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionNextTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 @LargeTest
 public class KlpActionNextTests extends KlpActionTestsBase {
diff --git a/tests/src/com/android/inputmethod/keyboard/action/KlpActionNoneTests.java b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionNoneTests.java
index 9f28395fc..09178bea9 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/KlpActionNoneTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionNoneTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 @LargeTest
 public class KlpActionNoneTests extends KlpActionTestsBase {
diff --git a/tests/src/com/android/inputmethod/keyboard/action/KlpActionPreviousTests.java b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionPreviousTests.java
index 7b71f7469..d779b2838 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/KlpActionPreviousTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionPreviousTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 @LargeTest
 public class KlpActionPreviousTests extends KlpActionTestsBase {
diff --git a/tests/src/com/android/inputmethod/keyboard/action/KlpActionSearchTests.java b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionSearchTests.java
index 6a10d6709..2a2b6ab44 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/KlpActionSearchTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionSearchTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 @LargeTest
 public class KlpActionSearchTests extends KlpActionTestsBase {
diff --git a/tests/src/com/android/inputmethod/keyboard/action/KlpActionSendTests.java b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionSendTests.java
index 5b49ac170..5a0c7de48 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/KlpActionSendTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionSendTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 @LargeTest
 public class KlpActionSendTests extends KlpActionTestsBase {
diff --git a/tests/src/com/android/inputmethod/keyboard/action/KlpActionTestsBase.java b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionTestsBase.java
index 511f9950b..61156ebce 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/KlpActionTestsBase.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionTestsBase.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.view.inputmethod.InputMethodSubtype;
 
-import com.android.inputmethod.keyboard.KeyboardTheme;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.keyboard.KeyboardTheme;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 import java.util.ArrayList;
 import java.util.Locale;
diff --git a/tests/src/com/android/inputmethod/keyboard/action/KlpActionUnspecifiedTests.java b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionUnspecifiedTests.java
index b3944cdcb..11039bb29 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/KlpActionUnspecifiedTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionUnspecifiedTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 @LargeTest
 public class KlpActionUnspecifiedTests extends KlpActionTestsBase {
diff --git a/tests/src/com/android/inputmethod/keyboard/action/LxxActionCustomTests.java b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionCustomTests.java
index e892bc9fb..fd958b2c0 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/LxxActionCustomTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionCustomTests.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 @LargeTest
 public class LxxActionCustomTests extends LxxActionTestsBase {
diff --git a/tests/src/com/android/inputmethod/keyboard/action/LxxActionDoneTests.java b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionDoneTests.java
index 587d30b1f..d09a514a4 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/LxxActionDoneTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionDoneTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 @LargeTest
 public class LxxActionDoneTests extends LxxActionTestsBase {
diff --git a/tests/src/com/android/inputmethod/keyboard/action/LxxActionGoTests.java b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionGoTests.java
index 3bce6ff0a..c000f2154 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/LxxActionGoTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionGoTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 @LargeTest
 public class LxxActionGoTests extends LxxActionTestsBase {
diff --git a/tests/src/com/android/inputmethod/keyboard/action/LxxActionNextTests.java b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionNextTests.java
index 392ebd3ed..576fcde84 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/LxxActionNextTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionNextTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 @LargeTest
 public class LxxActionNextTests extends LxxActionTestsBase {
diff --git a/tests/src/com/android/inputmethod/keyboard/action/LxxActionNoneTests.java b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionNoneTests.java
index d0cff8a8b..07b7d01e3 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/LxxActionNoneTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionNoneTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 @LargeTest
 public class LxxActionNoneTests extends LxxActionTestsBase {
diff --git a/tests/src/com/android/inputmethod/keyboard/action/LxxActionPreviousTests.java b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionPreviousTests.java
index 023e024eb..eb9ecd10a 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/LxxActionPreviousTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionPreviousTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 @LargeTest
 public class LxxActionPreviousTests extends LxxActionTestsBase {
diff --git a/tests/src/com/android/inputmethod/keyboard/action/LxxActionSearchTests.java b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionSearchTests.java
index 51988bbef..86b915ff8 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/LxxActionSearchTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionSearchTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 @LargeTest
 public class LxxActionSearchTests extends LxxActionTestsBase {
diff --git a/tests/src/com/android/inputmethod/keyboard/action/LxxActionSendTests.java b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionSendTests.java
index ab330f3b7..8c57243ea 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/LxxActionSendTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionSendTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 @LargeTest
 public class LxxActionSendTests extends LxxActionTestsBase {
diff --git a/tests/src/com/android/inputmethod/keyboard/action/LxxActionTestsBase.java b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionTestsBase.java
index 70de9a6b8..4e9fbcb4a 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/LxxActionTestsBase.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionTestsBase.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
-import com.android.inputmethod.keyboard.KeyboardTheme;
+import org.kelar.inputmethod.keyboard.KeyboardTheme;
 
 abstract class LxxActionTestsBase extends ActionTestsBase {
     @Override
diff --git a/tests/src/com/android/inputmethod/keyboard/action/LxxActionUnspecifiedTests.java b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionUnspecifiedTests.java
index d0fe454f1..264e8951d 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/LxxActionUnspecifiedTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionUnspecifiedTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 @LargeTest
 public class LxxActionUnspecifiedTests extends LxxActionTestsBase {
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/HermiteInterpolatorTests.java b/tests/src/org/kelar/inputmethod/keyboard/internal/HermiteInterpolatorTests.java
index a1ee199c0..f23fb8d3f 100644
--- a/tests/src/com/android/inputmethod/keyboard/internal/HermiteInterpolatorTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/internal/HermiteInterpolatorTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTests.java b/tests/src/org/kelar/inputmethod/keyboard/internal/KeySpecParserTests.java
index 10537096a..1d3ceaf63 100644
--- a/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/internal/KeySpecParserTests.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
-import static com.android.inputmethod.keyboard.internal.KeyboardIconsSet.ICON_UNDEFINED;
-import static com.android.inputmethod.latin.common.Constants.CODE_UNSPECIFIED;
+import static org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet.ICON_UNDEFINED;
+import static org.kelar.inputmethod.latin.common.Constants.CODE_UNSPECIFIED;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.Constants;
 
 @SmallTest
 public final class KeySpecParserTests extends KeySpecParserTestsBase {
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTestsBase.java b/tests/src/org/kelar/inputmethod/keyboard/internal/KeySpecParserTestsBase.java
index 79cf10e84..8bf344c92 100644
--- a/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTestsBase.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/internal/KeySpecParserTestsBase.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
-import static com.android.inputmethod.keyboard.internal.KeyboardCodesSet.PREFIX_CODE;
-import static com.android.inputmethod.keyboard.internal.KeyboardIconsSet.ICON_UNDEFINED;
-import static com.android.inputmethod.keyboard.internal.KeyboardIconsSet.PREFIX_ICON;
-import static com.android.inputmethod.latin.common.Constants.CODE_OUTPUT_TEXT;
-import static com.android.inputmethod.latin.common.Constants.CODE_UNSPECIFIED;
+import static org.kelar.inputmethod.keyboard.internal.KeyboardCodesSet.PREFIX_CODE;
+import static org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet.ICON_UNDEFINED;
+import static org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet.PREFIX_ICON;
+import static org.kelar.inputmethod.latin.common.Constants.CODE_OUTPUT_TEXT;
+import static org.kelar.inputmethod.latin.common.Constants.CODE_UNSPECIFIED;
 
 import android.test.AndroidTestCase;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateMultiTouchTests.java b/tests/src/org/kelar/inputmethod/keyboard/internal/KeyboardStateMultiTouchTests.java
index 8f1869f5b..202718bbb 100644
--- a/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateMultiTouchTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/internal/KeyboardStateMultiTouchTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import androidx.test.filters.SmallTest;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateSingleTouchTests.java b/tests/src/org/kelar/inputmethod/keyboard/internal/KeyboardStateSingleTouchTests.java
index 88efe12b9..f1621ebb0 100644
--- a/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateSingleTouchTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/internal/KeyboardStateSingleTouchTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import androidx.test.filters.SmallTest;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateTestsBase.java b/tests/src/org/kelar/inputmethod/keyboard/internal/KeyboardStateTestsBase.java
index 1474c8d27..016578ce6 100644
--- a/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateTestsBase.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/internal/KeyboardStateTestsBase.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import android.test.AndroidTestCase;
 
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.Constants;
 
 public class KeyboardStateTestsBase extends AndroidTestCase
         implements MockKeyboardSwitcher.MockConstants {
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSetTests.java b/tests/src/org/kelar/inputmethod/keyboard/internal/KeyboardTextsSetTests.java
index f312cadae..34a16cfb7 100644
--- a/tests/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSetTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/internal/KeyboardTextsSetTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -27,8 +27,8 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.RichInputMethodManager;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.latin.RichInputMethodManager;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/MatrixUtilsTests.java b/tests/src/org/kelar/inputmethod/keyboard/internal/MatrixUtilsTests.java
index 10c552f29..2c7d986c9 100644
--- a/tests/src/com/android/inputmethod/keyboard/internal/MatrixUtilsTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/internal/MatrixUtilsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertTrue;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.keyboard.internal.MatrixUtils.MatrixOperationFailedException;
+import org.kelar.inputmethod.keyboard.internal.MatrixUtils.MatrixOperationFailedException;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -30,7 +30,7 @@ import org.junit.runner.RunWith;
 @SmallTest
 @RunWith(AndroidJUnit4.class)
 public class MatrixUtilsTests {
-    // "run tests" -c com.android.inputmethod.keyboard.internal.MatrixUtilsTests
+    // "run tests" -c org.kelar.inputmethod.keyboard.internal.MatrixUtilsTests
     private static final boolean DEBUG = false;
     private static final float EPSILON = 0.00001f;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/MockKeyboardSwitcher.java b/tests/src/org/kelar/inputmethod/keyboard/internal/MockKeyboardSwitcher.java
index 4b2ec9588..197652783 100644
--- a/tests/src/com/android/inputmethod/keyboard/internal/MockKeyboardSwitcher.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/internal/MockKeyboardSwitcher.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import android.text.TextUtils;
 
-import com.android.inputmethod.event.Event;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.utils.RecapitalizeStatus;
+import org.kelar.inputmethod.event.Event;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.utils.RecapitalizeStatus;
 
 public class MockKeyboardSwitcher implements KeyboardState.SwitchActions {
     public interface MockConstants {
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/MoreKeySpecSplitTests.java b/tests/src/org/kelar/inputmethod/keyboard/internal/MoreKeySpecSplitTests.java
index cbedd0426..ca7c96a38 100644
--- a/tests/src/com/android/inputmethod/keyboard/internal/MoreKeySpecSplitTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/internal/MoreKeySpecSplitTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
@@ -26,7 +26,7 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.R;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/MoreKeySpecStringReferenceTests.java b/tests/src/org/kelar/inputmethod/keyboard/internal/MoreKeySpecStringReferenceTests.java
index e31efe427..0faf9cdc9 100644
--- a/tests/src/com/android/inputmethod/keyboard/internal/MoreKeySpecStringReferenceTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/internal/MoreKeySpecStringReferenceTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
@@ -27,7 +27,7 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-//import com.android.inputmethod.latin.tests.R;
+import org.kelar.inputmethod.latin.tests.R;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -46,9 +46,8 @@ public class MoreKeySpecStringReferenceTests {
         final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
         final Context testContext = instrumentation.getContext();
         final Resources testRes = testContext.getResources();
-        // final String testPackageName = testRes.getResourcePackageName(R.string.empty_string);
-        // mTextsSet.setLocale(TEST_LOCALE, testRes, testPackageName);
-        mTextsSet.setLocale(TEST_LOCALE, testRes, "");
+        final String testPackageName = testRes.getResourcePackageName(R.string.empty_string);
+        mTextsSet.setLocale(TEST_LOCALE, testRes, testPackageName);
     }
 
     private void assertTextArray(final String message, final String value,
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/MoreKeySpecTests.java b/tests/src/org/kelar/inputmethod/keyboard/internal/MoreKeySpecTests.java
index 4c6504588..b56308f5d 100644
--- a/tests/src/com/android/inputmethod/keyboard/internal/MoreKeySpecTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/internal/MoreKeySpecTests.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
-import static com.android.inputmethod.keyboard.internal.KeyboardIconsSet.ICON_UNDEFINED;
-import static com.android.inputmethod.latin.common.Constants.CODE_UNSPECIFIED;
+import static org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet.ICON_UNDEFINED;
+import static org.kelar.inputmethod.latin.common.Constants.CODE_UNSPECIFIED;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Arrays;
 import java.util.Locale;
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/PointerTrackerQueueTests.java b/tests/src/org/kelar/inputmethod/keyboard/internal/PointerTrackerQueueTests.java
index 6ab1549c0..e491ca955 100644
--- a/tests/src/com/android/inputmethod/keyboard/internal/PointerTrackerQueueTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/internal/PointerTrackerQueueTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/SmoothingUtilsTests.java b/tests/src/org/kelar/inputmethod/keyboard/internal/SmoothingUtilsTests.java
index 39da3ec71..4de2dda81 100644
--- a/tests/src/com/android/inputmethod/keyboard/internal/SmoothingUtilsTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/internal/SmoothingUtilsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertTrue;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.keyboard.internal.MatrixUtils.MatrixOperationFailedException;
+import org.kelar.inputmethod.keyboard.internal.MatrixUtils.MatrixOperationFailedException;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -30,7 +30,7 @@ import org.junit.runner.RunWith;
 @SmallTest
 @RunWith(AndroidJUnit4.class)
 public class SmoothingUtilsTests {
-    // "run tests" -c com.android.inputmethod.keyboard.internal.SmoothingUtilsTests
+    // "run tests" -c org.kelar.inputmethod.keyboard.internal.SmoothingUtilsTests
     private static final boolean DEBUG = false;
 
     @Test
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Arabic.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Arabic.java
index ff05f92c2..c0d267a0a 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Arabic.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Arabic.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.Symbols.RtlSymbols;
-import com.android.inputmethod.keyboard.layout.SymbolsShifted.RtlSymbolsShifted;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.keyboard.layout.Symbols.RtlSymbols;
+import org.kelar.inputmethod.keyboard.layout.SymbolsShifted.RtlSymbolsShifted;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/ArmenianPhonetic.java b/tests/src/org/kelar/inputmethod/keyboard/layout/ArmenianPhonetic.java
index cbbeff4a7..94a5bf40c 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/ArmenianPhonetic.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/ArmenianPhonetic.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Azerty.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Azerty.java
index f3176d09d..c7df7eb9f 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Azerty.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Azerty.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 /**
  * The AZERTY alphabet keyboard.
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Bengali.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Bengali.java
index 339cab444..fa62ffc30 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Bengali.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Bengali.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 /**
  * The Bengali keyboard.
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/BengaliAkkhor.java b/tests/src/org/kelar/inputmethod/keyboard/layout/BengaliAkkhor.java
index bb1dc10fb..765c698f6 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/BengaliAkkhor.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/BengaliAkkhor.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 /**
  * The Bengali Akkhor keyboard.
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Bulgarian.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Bulgarian.java
index bbe038414..99c15d281 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Bulgarian.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Bulgarian.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.EastSlavicCustomizer;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.customizer.EastSlavicCustomizer;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/BulgarianBds.java b/tests/src/org/kelar/inputmethod/keyboard/layout/BulgarianBds.java
index 74372b9bc..cba635e75 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/BulgarianBds.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/BulgarianBds.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.EastSlavicCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.customizer.EastSlavicCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Colemak.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Colemak.java
index 3f8ce28eb..fa64f80e3 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Colemak.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Colemak.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 /**
  * The Colemak alphabet keyboard.
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/DevanagariLetterConstants.java b/tests/src/org/kelar/inputmethod/keyboard/layout/DevanagariLetterConstants.java
index bcf06f085..1d2f7f46d 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/DevanagariLetterConstants.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/DevanagariLetterConstants.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
 import android.os.Build;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Dvorak.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Dvorak.java
index 7cb3b92a7..9795427de 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Dvorak.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Dvorak.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 /**
  * The Dvorak alphabet keyboard.
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/EastSlavic.java b/tests/src/org/kelar/inputmethod/keyboard/layout/EastSlavic.java
index f95d2d20e..e4bbcc24f 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/EastSlavic.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/EastSlavic.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 public final class EastSlavic extends LayoutBase {
     private static final String LAYOUT_NAME = "east_slavic";
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Farsi.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Farsi.java
index 6dc4559dc..d942600e0 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Farsi.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Farsi.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.Symbols.RtlSymbols;
-import com.android.inputmethod.keyboard.layout.SymbolsShifted.RtlSymbolsShifted;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.keyboard.layout.Symbols.RtlSymbols;
+import org.kelar.inputmethod.keyboard.layout.SymbolsShifted.RtlSymbolsShifted;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Georgian.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Georgian.java
index d1ac5fd6e..e658e1ca0 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Georgian.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Georgian.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Greek.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Greek.java
index 0209c2ae1..e646fc663 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Greek.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Greek.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.layout.customizer.EuroCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.layout.customizer.EuroCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Hebrew.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Hebrew.java
index 1b91b47ae..5adb50ddc 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Hebrew.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Hebrew.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
-
-import com.android.inputmethod.keyboard.layout.Symbols.RtlSymbols;
-import com.android.inputmethod.keyboard.layout.SymbolsShifted.RtlSymbolsShifted;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
-import com.android.inputmethod.latin.common.Constants;
+package org.kelar.inputmethod.keyboard.layout;
+
+import org.kelar.inputmethod.keyboard.layout.Symbols.RtlSymbols;
+import org.kelar.inputmethod.keyboard.layout.SymbolsShifted.RtlSymbolsShifted;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Hindi.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Hindi.java
index 82f67aca2..25021e72d 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Hindi.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Hindi.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import static com.android.inputmethod.keyboard.layout.DevanagariLetterConstants.*;
+import static org.kelar.inputmethod.keyboard.layout.DevanagariLetterConstants.*;
 
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 /**
  * The Hindi keyboard.
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/HindiCompact.java b/tests/src/org/kelar/inputmethod/keyboard/layout/HindiCompact.java
index a2e339919..253447dfe 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/HindiCompact.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/HindiCompact.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import static com.android.inputmethod.keyboard.layout.DevanagariLetterConstants.*;
+import static org.kelar.inputmethod.keyboard.layout.DevanagariLetterConstants.*;
 
-import com.android.inputmethod.keyboard.layout.Hindi.HindiSymbols;
-import com.android.inputmethod.keyboard.layout.customizer.HindiCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.Hindi.HindiSymbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.HindiCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Kannada.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Kannada.java
index 5a8d32cb8..b7e843314 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Kannada.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Kannada.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Khmer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Khmer.java
index 4d82f090b..aff10226c 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Khmer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Khmer.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Lao.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Lao.java
index 149f75397..d3c3d0ccc 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Lao.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Lao.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/LayoutBase.java b/tests/src/org/kelar/inputmethod/keyboard/layout/LayoutBase.java
index 285a50ce9..620e0a442 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/LayoutBase.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/LayoutBase.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.AbstractLayoutBase;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.AbstractLayoutBase;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Malayalam.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Malayalam.java
index 3497c356f..714955f30 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Malayalam.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Malayalam.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Marathi.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Marathi.java
index af26ec555..85b2c2501 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Marathi.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Marathi.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import static com.android.inputmethod.keyboard.layout.DevanagariLetterConstants.*;
+import static org.kelar.inputmethod.keyboard.layout.DevanagariLetterConstants.*;
 
-import com.android.inputmethod.keyboard.layout.Hindi.HindiSymbols;
-import com.android.inputmethod.keyboard.layout.customizer.DevanagariCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.Hindi.HindiSymbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.DevanagariCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Mongolian.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Mongolian.java
index 288a17e10..e616cc931 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Mongolian.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Mongolian.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.EastSlavicCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.customizer.EastSlavicCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/NepaliRomanized.java b/tests/src/org/kelar/inputmethod/keyboard/layout/NepaliRomanized.java
index 299cb61b2..ed4719a24 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/NepaliRomanized.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/NepaliRomanized.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import static com.android.inputmethod.keyboard.layout.DevanagariLetterConstants.*;
+import static org.kelar.inputmethod.keyboard.layout.DevanagariLetterConstants.*;
 
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.layout.Hindi.HindiSymbols;
-import com.android.inputmethod.keyboard.layout.customizer.NepaliCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.layout.Hindi.HindiSymbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.NepaliCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/NepaliTraditional.java b/tests/src/org/kelar/inputmethod/keyboard/layout/NepaliTraditional.java
index 0a2bea342..c6282460e 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/NepaliTraditional.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/NepaliTraditional.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import static com.android.inputmethod.keyboard.layout.DevanagariLetterConstants.*;
+import static org.kelar.inputmethod.keyboard.layout.DevanagariLetterConstants.*;
 
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.layout.Hindi.HindiSymbols;
-import com.android.inputmethod.keyboard.layout.customizer.NepaliCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.layout.Hindi.HindiSymbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.NepaliCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Nordic.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Nordic.java
index 4f718e64f..303c55bee 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Nordic.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Nordic.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 /**
  * The Nordic alphabet keyboard.
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/PcQwerty.java b/tests/src/org/kelar/inputmethod/keyboard/layout/PcQwerty.java
index 0085ac6a8..1fdd28e16 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/PcQwerty.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/PcQwerty.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 /**
  * The PC QWERTY alphabet keyboard.
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Qwerty.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Qwerty.java
index 508df0c17..fc535e032 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Qwerty.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Qwerty.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 /**
  * The QWERTY alphabet keyboard.
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Qwertz.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Qwertz.java
index cc41fbf20..74f3d0c77 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Qwertz.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Qwertz.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 public final class Qwertz extends LayoutBase {
     private static final String LAYOUT_NAME = "qwertz";
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/SerbianQwertz.java b/tests/src/org/kelar/inputmethod/keyboard/layout/SerbianQwertz.java
index a4936288a..f2a00fc81 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/SerbianQwertz.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/SerbianQwertz.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 public final class SerbianQwertz extends LayoutBase {
     private static final String LAYOUT_NAME = "serbian_qwertz";
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Sinhala.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Sinhala.java
index c3a9351f7..433c0ea93 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Sinhala.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Sinhala.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/SouthSlavic.java b/tests/src/org/kelar/inputmethod/keyboard/layout/SouthSlavic.java
index ad8278754..503af359c 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/SouthSlavic.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/SouthSlavic.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 public final class SouthSlavic extends LayoutBase {
     private static final String LAYOUT_NAME = "south_slavic";
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Spanish.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Spanish.java
index fc6f1ea95..a5ac6bd71 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Spanish.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Spanish.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 public final class Spanish extends LayoutBase {
     private static final String LAYOUT_NAME = "spanish";
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Swiss.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Swiss.java
index 57e3725a5..6ab08d0b3 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Swiss.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Swiss.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 public final class Swiss extends LayoutBase {
     private static final String LAYOUT_NAME = "swiss";
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Symbols.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Symbols.java
index 7ad7b5442..e9d934283 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Symbols.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Symbols.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.AbstractLayoutBase;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.AbstractLayoutBase;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 /**
  * The symbols keyboard layout.
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/SymbolsShifted.java b/tests/src/org/kelar/inputmethod/keyboard/layout/SymbolsShifted.java
index 64262167d..f106ffb7f 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/SymbolsShifted.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/SymbolsShifted.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
-import com.android.inputmethod.keyboard.layout.expected.AbstractLayoutBase;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.expected.AbstractLayoutBase;
 
 /**
  * The symbols shifted keyboard layout.
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Tamil.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Tamil.java
index 1413e366a..db6bbde1a 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Tamil.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Tamil.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 /**
  * The Tamil keyboard.
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Telugu.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Telugu.java
index 81437f3ac..370f21eb3 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Telugu.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Telugu.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Thai.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Thai.java
index ce5fd8068..f19d44f8f 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Thai.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Thai.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Uzbek.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Uzbek.java
index f37fd2241..dcee48857 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Uzbek.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Uzbek.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 /**
  * The Uzbek alphabet keyboard.
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/BengaliCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/BengaliCustomizer.java
index f13c26114..b9faf5ea6 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/BengaliCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/BengaliCustomizer.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.SymbolsShifted;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.keyboard.layout.SymbolsShifted;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/DanishCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/DanishCustomizer.java
index 3d91194f2..c7ec65fb3 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/DanishCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/DanishCustomizer.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.Nordic;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.Nordic;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/DevanagariCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/DevanagariCustomizer.java
index 13f9171d4..4308fac31 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/DevanagariCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/DevanagariCustomizer.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/DutchCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/DutchCustomizer.java
index 825afb64b..fc7729562 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/DutchCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/DutchCustomizer.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/DvorakCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/DvorakCustomizer.java
index b7b018793..815e19680 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/DvorakCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/DvorakCustomizer.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey.ExpectedAdditionalMoreKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey.ExpectedAdditionalMoreKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/EastSlavicCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/EastSlavicCustomizer.java
index 8815b068c..1cf087a09 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/EastSlavicCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/EastSlavicCustomizer.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/EnglishCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/EnglishCustomizer.java
index 9a9c6bb2f..75454f2b7 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/EnglishCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/EnglishCustomizer.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/EstonianEECustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/EstonianEECustomizer.java
index a7d611a3e..91c10405a 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/EstonianEECustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/EstonianEECustomizer.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.layout.Nordic;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.layout.Nordic;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/EuroCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/EuroCustomizer.java
index ee0236d88..162843a7e 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/EuroCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/EuroCustomizer.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.SymbolsShifted;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.SymbolsShifted;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/FinnishCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/FinnishCustomizer.java
index a792f9143..e70251df7 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/FinnishCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/FinnishCustomizer.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.Nordic;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.Nordic;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/FrenchCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/FrenchCustomizer.java
index d7798cc56..b78ce4fb1 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/FrenchCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/FrenchCustomizer.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/GermanCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/GermanCustomizer.java
index e0e4c78b1..3cc165b39 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/GermanCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/GermanCustomizer.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/HindiCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/HindiCustomizer.java
index c7fe9dbd5..6023fe709 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/HindiCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/HindiCustomizer.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.SymbolsShifted;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.SymbolsShifted;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/ItalianCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/ItalianCustomizer.java
index 3b547fdc4..6b04af939 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/ItalianCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/ItalianCustomizer.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/LayoutCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/LayoutCustomizer.java
index 27f55342e..ffac507d1 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/LayoutCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/LayoutCustomizer.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.SymbolsShifted;
-import com.android.inputmethod.keyboard.layout.expected.AbstractLayoutBase;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.SymbolsShifted;
+import org.kelar.inputmethod.keyboard.layout.expected.AbstractLayoutBase;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/NepaliCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/NepaliCustomizer.java
index 264322f54..aa557ba5b 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/NepaliCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/NepaliCustomizer.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.SymbolsShifted;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.SymbolsShifted;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/NoLanguageCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/NoLanguageCustomizer.java
index b6bf5bfeb..2581b67bb 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/NoLanguageCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/NoLanguageCustomizer.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/NorwegianCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/NorwegianCustomizer.java
index 6cc44e578..02dd48dc0 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/NorwegianCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/NorwegianCustomizer.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.Nordic;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.Nordic;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/PcQwertyCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/PcQwertyCustomizer.java
index 9a0f764ae..03d72a485 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/PcQwertyCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/PcQwertyCustomizer.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/PortugueseCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/PortugueseCustomizer.java
index 4fc64cc62..253b63e2f 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/PortugueseCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/PortugueseCustomizer.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/SerbianLatinCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/SerbianLatinCustomizer.java
index 4d03c8ba6..ef075c264 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/SerbianLatinCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/SerbianLatinCustomizer.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.SerbianQwertz;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.SerbianQwertz;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/SouthSlavicLayoutCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/SouthSlavicLayoutCustomizer.java
index bec816000..bfe5913f6 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/SouthSlavicLayoutCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/SouthSlavicLayoutCustomizer.java
@@ -15,10 +15,10 @@
  */
 
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/SpanishCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/SpanishCustomizer.java
index 1284f054e..400481c14 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/SpanishCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/SpanishCustomizer.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.Spanish;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.Spanish;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/SwedishCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/SwedishCustomizer.java
index f4ff59458..325f94f97 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/SwedishCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/SwedishCustomizer.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.Nordic;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.Nordic;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/TamilCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/TamilCustomizer.java
index de82aaf9e..13da88037 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/TamilCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/TamilCustomizer.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/TurkicCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/TurkicCustomizer.java
index 3fd3aa219..6789a6e95 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/TurkicCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/TurkicCustomizer.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/UzbekCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/UzbekCustomizer.java
index 99486163e..08dd3fd25 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/UzbekCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/UzbekCustomizer.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.Nordic;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.Nordic;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/expected/AbstractKeyboardBuilder.java b/tests/src/org/kelar/inputmethod/keyboard/layout/expected/AbstractKeyboardBuilder.java
index 6e721047c..0ed74eb25 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/expected/AbstractKeyboardBuilder.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/expected/AbstractKeyboardBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.expected;
+package org.kelar.inputmethod.keyboard.layout.expected;
 
 import java.util.Arrays;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/expected/AbstractLayoutBase.java b/tests/src/org/kelar/inputmethod/keyboard/layout/expected/AbstractLayoutBase.java
index 2232548eb..dba595ab5 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/expected/AbstractLayoutBase.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/expected/AbstractLayoutBase.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.expected;
+package org.kelar.inputmethod.keyboard.layout.expected;
 
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey.ExpectedAdditionalMoreKey;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey.ExpectedAdditionalMoreKey;
+import org.kelar.inputmethod.latin.common.Constants;
 
 /**
  * Base class to create an expected keyboard for unit test.
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/expected/ActualKeyboardBuilder.java b/tests/src/org/kelar/inputmethod/keyboard/layout/expected/ActualKeyboardBuilder.java
index 2a040f564..779cc0b6c 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/expected/ActualKeyboardBuilder.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/expected/ActualKeyboardBuilder.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.expected;
+package org.kelar.inputmethod.keyboard.layout.expected;
 
-import com.android.inputmethod.keyboard.Key;
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.keyboard.internal.MoreKeySpec;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.keyboard.Key;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.keyboard.internal.MoreKeySpec;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKey.java b/tests/src/org/kelar/inputmethod/keyboard/layout/expected/ExpectedKey.java
index 5c147a3b6..aeec19dde 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKey.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/expected/ExpectedKey.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.expected;
+package org.kelar.inputmethod.keyboard.layout.expected;
 
-import com.android.inputmethod.keyboard.Key;
-import com.android.inputmethod.keyboard.internal.MoreKeySpec;
+import org.kelar.inputmethod.keyboard.Key;
+import org.kelar.inputmethod.keyboard.internal.MoreKeySpec;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKeyOutput.java b/tests/src/org/kelar/inputmethod/keyboard/layout/expected/ExpectedKeyOutput.java
index e2b98bc69..fbfdc7403 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKeyOutput.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/expected/ExpectedKeyOutput.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.expected;
+package org.kelar.inputmethod.keyboard.layout.expected;
 
-import com.android.inputmethod.keyboard.Key;
-import com.android.inputmethod.keyboard.internal.MoreKeySpec;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.keyboard.Key;
+import org.kelar.inputmethod.keyboard.internal.MoreKeySpec;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.StringUtils;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKeyVisual.java b/tests/src/org/kelar/inputmethod/keyboard/layout/expected/ExpectedKeyVisual.java
index 3f9f12a2b..bdd939b1e 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKeyVisual.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/expected/ExpectedKeyVisual.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.expected;
+package org.kelar.inputmethod.keyboard.layout.expected;
 
-import com.android.inputmethod.keyboard.Key;
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.keyboard.internal.MoreKeySpec;
-import com.android.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.keyboard.Key;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.keyboard.internal.MoreKeySpec;
+import org.kelar.inputmethod.latin.common.StringUtils;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKeyboardBuilder.java b/tests/src/org/kelar/inputmethod/keyboard/layout/expected/ExpectedKeyboardBuilder.java
index f5531c9e3..9da1ac4df 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKeyboardBuilder.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/expected/ExpectedKeyboardBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.expected;
+package org.kelar.inputmethod.keyboard.layout.expected;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/KeyboardLayoutSetSubtypesCountTests.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/KeyboardLayoutSetSubtypesCountTests.java
index cc8d5d1e5..c2fc8dff2 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/KeyboardLayoutSetSubtypesCountTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/KeyboardLayoutSetSubtypesCountTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.KeyboardLayoutSetTestsBase;
-import com.android.inputmethod.keyboard.KeyboardTheme;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.keyboard.KeyboardLayoutSetTestsBase;
+import org.kelar.inputmethod.keyboard.KeyboardTheme;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 import java.util.ArrayList;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/LayoutTestsBase.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/LayoutTestsBase.java
index 27519ee93..2e8f4d3e8 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/LayoutTestsBase.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/LayoutTestsBase.java
@@ -14,24 +14,24 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import android.util.Log;
 import android.view.inputmethod.InputMethodSubtype;
 
-import com.android.inputmethod.keyboard.Key;
-import com.android.inputmethod.keyboard.Keyboard;
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.KeyboardLayoutSet;
-import com.android.inputmethod.keyboard.KeyboardLayoutSetTestsBase;
-import com.android.inputmethod.keyboard.KeyboardTheme;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.expected.AbstractLayoutBase;
-import com.android.inputmethod.keyboard.layout.expected.ActualKeyboardBuilder;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey.ExpectedAdditionalMoreKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.keyboard.Key;
+import org.kelar.inputmethod.keyboard.Keyboard;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.KeyboardLayoutSet;
+import org.kelar.inputmethod.keyboard.KeyboardLayoutSetTestsBase;
+import org.kelar.inputmethod.keyboard.KeyboardTheme;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.expected.AbstractLayoutBase;
+import org.kelar.inputmethod.keyboard.layout.expected.ActualKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey.ExpectedAdditionalMoreKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 import java.util.Arrays;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsAfrikaans.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsAfrikaans.java
index 5f1d7ed53..8bc2b3dcc 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsAfrikaans.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsAfrikaans.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsArabic.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsArabic.java
index 204579a49..ae489eca3 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsArabic.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsArabic.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.Arabic;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Arabic;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsArmenianAMPhonetic.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsArmenianAMPhonetic.java
index 441aa402a..bc5b6bfa1 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsArmenianAMPhonetic.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsArmenianAMPhonetic.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.ArmenianPhonetic;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.ArmenianPhonetic;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsAzerbaijaniAZ.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsAzerbaijaniAZ.java
index 39f9c9a6b..dabf419bb 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsAzerbaijaniAZ.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsAzerbaijaniAZ.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.TurkicCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.TurkicCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBasqueES.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsBasqueES.java
index 934efc3e7..8ca34122e 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBasqueES.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsBasqueES.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Spanish;
-import com.android.inputmethod.keyboard.layout.customizer.EuroCustomizer;
-import com.android.inputmethod.keyboard.layout.customizer.SpanishCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Spanish;
+import org.kelar.inputmethod.keyboard.layout.customizer.EuroCustomizer;
+import org.kelar.inputmethod.keyboard.layout.customizer.SpanishCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBelarusianBY.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsBelarusianBY.java
index e3c9357c0..cc7f31994 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBelarusianBY.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsBelarusianBY.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.EastSlavic;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.customizer.EastSlavicCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.EastSlavic;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.EastSlavicCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBengaliBD.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsBengaliBD.java
index be4f2ef34..af63d113a 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBengaliBD.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsBengaliBD.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.BengaliAkkhor;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.customizer.BengaliCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.BengaliAkkhor;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.BengaliCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBengaliIN.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsBengaliIN.java
index c2b090b60..8a4570e01 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBengaliIN.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsBengaliIN.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.Bengali;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.customizer.BengaliCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.Bengali;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.BengaliCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBulgarian.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsBulgarian.java
index 8787d5a00..9ce1906d1 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBulgarian.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsBulgarian.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.Bulgarian;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Bulgarian;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBulgarianBds.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsBulgarianBds.java
index 2e322400b..651b5414c 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBulgarianBds.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsBulgarianBds.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.BulgarianBds;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.BulgarianBds;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsCatalan.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsCatalan.java
index 8527180e8..57515cb74 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsCatalan.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsCatalan.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Spanish;
-import com.android.inputmethod.keyboard.layout.customizer.EuroCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Spanish;
+import org.kelar.inputmethod.keyboard.layout.customizer.EuroCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsCroatian.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsCroatian.java
index 33f4f10f2..ca96dc892 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsCroatian.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsCroatian.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwertz;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwertz;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsCzech.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsCzech.java
index 44c97f309..2b7a5253a 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsCzech.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsCzech.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwertz;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwertz;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsDanish.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsDanish.java
index 22eeb9e60..ca18e31f4 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsDanish.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsDanish.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Nordic;
-import com.android.inputmethod.keyboard.layout.customizer.DanishCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Nordic;
+import org.kelar.inputmethod.keyboard.layout.customizer.DanishCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsDanishQwertz.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsDanishQwertz.java
index b90ab0536..019f5dc89 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsDanishQwertz.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsDanishQwertz.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwertz;
-import com.android.inputmethod.keyboard.layout.customizer.DanishCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwertz;
+import org.kelar.inputmethod.keyboard.layout.customizer.DanishCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsDutch.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsDutch.java
index 4bd29130c..281cb1858 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsDutch.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsDutch.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.DutchCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.DutchCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsDutchBE.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsDutchBE.java
index 22f6327e4..9e66d6884 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsDutchBE.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsDutchBE.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.Azerty;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.customizer.DutchCustomizer;
+import org.kelar.inputmethod.keyboard.layout.Azerty;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.customizer.DutchCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsDvorakEmail.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsDvorakEmail.java
index 5482b0ca9..72a093fb0 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsDvorakEmail.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsDvorakEmail.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import android.text.InputType;
 import android.view.inputmethod.EditorInfo;
@@ -22,13 +22,13 @@ import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.KeyboardLayoutSet;
-import com.android.inputmethod.keyboard.layout.Dvorak;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.customizer.DvorakCustomizer.EnglishDvorakCustomizer;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.KeyboardLayoutSet;
+import org.kelar.inputmethod.keyboard.layout.Dvorak;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.customizer.DvorakCustomizer.EnglishDvorakCustomizer;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsDvorakUrl.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsDvorakUrl.java
index 97411e2ac..e0d8989cf 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsDvorakUrl.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsDvorakUrl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import android.text.InputType;
 import android.view.inputmethod.EditorInfo;
@@ -22,13 +22,13 @@ import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.KeyboardLayoutSet;
-import com.android.inputmethod.keyboard.layout.Dvorak;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.customizer.DvorakCustomizer.EnglishDvorakCustomizer;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.KeyboardLayoutSet;
+import org.kelar.inputmethod.keyboard.layout.Dvorak;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.customizer.DvorakCustomizer.EnglishDvorakCustomizer;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEnglishDvorak.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsEnglishDvorak.java
index fdb32f0cb..4ce4a4ecc 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEnglishDvorak.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsEnglishDvorak.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.Dvorak;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.customizer.DvorakCustomizer.EnglishDvorakCustomizer;
+import org.kelar.inputmethod.keyboard.layout.Dvorak;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.customizer.DvorakCustomizer.EnglishDvorakCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEnglishIN.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsEnglishIN.java
index 52e49a369..85c54b693 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEnglishIN.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsEnglishIN.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.SymbolsShifted;
-import com.android.inputmethod.keyboard.layout.customizer.EnglishCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.SymbolsShifted;
+import org.kelar.inputmethod.keyboard.layout.customizer.EnglishCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEnglishUK.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsEnglishUK.java
index 202887a70..648ca3879 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEnglishUK.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsEnglishUK.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.customizer.EnglishCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.EnglishCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEnglishUS.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsEnglishUS.java
index 25f68c00f..72f57db8f 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEnglishUS.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsEnglishUS.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.EnglishCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.EnglishCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEsperanto.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsEsperanto.java
index 5158dca5e..de34b7a38 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEsperanto.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsEsperanto.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Spanish;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Spanish;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEstonianEE.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsEstonianEE.java
index 0deafb19c..2a0f636de 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEstonianEE.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsEstonianEE.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Nordic;
-import com.android.inputmethod.keyboard.layout.customizer.EstonianEECustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Nordic;
+import org.kelar.inputmethod.keyboard.layout.customizer.EstonianEECustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEstonianEEQwerty.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsEstonianEEQwerty.java
index 85ee81736..1727523da 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEstonianEEQwerty.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsEstonianEEQwerty.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.EstonianEECustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.EstonianEECustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFinnish.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsFinnish.java
index db167d2c9..329c22ac8 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFinnish.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsFinnish.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Nordic;
-import com.android.inputmethod.keyboard.layout.customizer.FinnishCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Nordic;
+import org.kelar.inputmethod.keyboard.layout.customizer.FinnishCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFinnishQwerty.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsFinnishQwerty.java
index 571377cff..5aeade2dd 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFinnishQwerty.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsFinnishQwerty.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.FinnishCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.FinnishCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFrench.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsFrench.java
index 6485c2ca7..b8f5331b7 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFrench.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsFrench.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.Azerty;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.customizer.FrenchCustomizer.FrenchEuroCustomizer;
+import org.kelar.inputmethod.keyboard.layout.Azerty;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.customizer.FrenchCustomizer.FrenchEuroCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFrenchCA.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsFrenchCA.java
index 13134f53e..59092d344 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFrenchCA.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsFrenchCA.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.FrenchCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.FrenchCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFrenchCH.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsFrenchCH.java
index 4ad7a48b9..1bd896cae 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFrenchCH.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsFrenchCH.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Swiss;
-import com.android.inputmethod.keyboard.layout.customizer.FrenchCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Swiss;
+import org.kelar.inputmethod.keyboard.layout.customizer.FrenchCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFrenchDvorak.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsFrenchDvorak.java
index f3d0f02f6..2d04239b3 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFrenchDvorak.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsFrenchDvorak.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.Dvorak;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.customizer.DvorakCustomizer;
-import com.android.inputmethod.keyboard.layout.customizer.FrenchCustomizer.FrenchEuroCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.Dvorak;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.customizer.DvorakCustomizer;
+import org.kelar.inputmethod.keyboard.layout.customizer.FrenchCustomizer.FrenchEuroCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFrenchQwertz.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsFrenchQwertz.java
index 75818c02c..a6ab73174 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFrenchQwertz.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsFrenchQwertz.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwertz;
-import com.android.inputmethod.keyboard.layout.customizer.FrenchCustomizer.FrenchEuroCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwertz;
+import org.kelar.inputmethod.keyboard.layout.customizer.FrenchCustomizer.FrenchEuroCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGalicianES.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsGalicianES.java
index e953e2f43..6c7a0e1e4 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGalicianES.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsGalicianES.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Spanish;
-import com.android.inputmethod.keyboard.layout.customizer.EuroCustomizer;
-import com.android.inputmethod.keyboard.layout.customizer.SpanishCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Spanish;
+import org.kelar.inputmethod.keyboard.layout.customizer.EuroCustomizer;
+import org.kelar.inputmethod.keyboard.layout.customizer.SpanishCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGeorgianGE.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsGeorgianGE.java
index 237c3f67e..db278e91e 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGeorgianGE.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsGeorgianGE.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.Georgian;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Georgian;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGerman.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsGerman.java
index 0eee72a20..dc4c65e2c 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGerman.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsGerman.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwertz;
-import com.android.inputmethod.keyboard.layout.customizer.GermanCustomizer.GermanEuroCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwertz;
+import org.kelar.inputmethod.keyboard.layout.customizer.GermanCustomizer.GermanEuroCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGermanCH.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsGermanCH.java
index b7bae4c8d..756c7a77c 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGermanCH.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsGermanCH.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Swiss;
-import com.android.inputmethod.keyboard.layout.customizer.GermanCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Swiss;
+import org.kelar.inputmethod.keyboard.layout.customizer.GermanCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGermanDvorak.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsGermanDvorak.java
index e699ccd7c..0da8eb4ef 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGermanDvorak.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsGermanDvorak.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.Dvorak;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.SymbolsShifted;
-import com.android.inputmethod.keyboard.layout.customizer.DvorakCustomizer;
-import com.android.inputmethod.keyboard.layout.customizer.GermanCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.Dvorak;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.SymbolsShifted;
+import org.kelar.inputmethod.keyboard.layout.customizer.DvorakCustomizer;
+import org.kelar.inputmethod.keyboard.layout.customizer.GermanCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGermanQwerty.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsGermanQwerty.java
index 77f31a28e..33bf2df25 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGermanQwerty.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsGermanQwerty.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.GermanCustomizer.GermanEuroCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.GermanCustomizer.GermanEuroCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGreek.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsGreek.java
index eee1b96a6..5c8e8e6d1 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGreek.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsGreek.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.Greek;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Greek;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsHebrew.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsHebrew.java
index e09b5188d..eb31e4e12 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsHebrew.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsHebrew.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.Hebrew;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Hebrew;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsHindi.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsHindi.java
index 2f63ecc07..b67cf0f1c 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsHindi.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsHindi.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.Hindi;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.customizer.HindiCustomizer;
+import org.kelar.inputmethod.keyboard.layout.Hindi;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.customizer.HindiCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsHindiCompact.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsHindiCompact.java
index 7f0178004..a70cf7c6f 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsHindiCompact.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsHindiCompact.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.HindiCompact;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.HindiCompact;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsHinglish.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsHinglish.java
index 7c1441f11..7b6563001 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsHinglish.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsHinglish.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.Suppress;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.SymbolsShifted;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.SymbolsShifted;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsHungarian.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsHungarian.java
index 7c2d023ed..f3536e122 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsHungarian.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsHungarian.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwertz;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwertz;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsIcelandic.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsIcelandic.java
index b6970b94a..76a039f87 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsIcelandic.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsIcelandic.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsIndonesian.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsIndonesian.java
index 3e2f4035d..0c122fddd 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsIndonesian.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsIndonesian.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsItalian.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsItalian.java
index 9395c7947..4f727f140 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsItalian.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsItalian.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.EuroCustomizer;
-import com.android.inputmethod.keyboard.layout.customizer.ItalianCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.EuroCustomizer;
+import org.kelar.inputmethod.keyboard.layout.customizer.ItalianCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsItalianCH.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsItalianCH.java
index f4a9f9f96..ff7c04620 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsItalianCH.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsItalianCH.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Swiss;
-import com.android.inputmethod.keyboard.layout.customizer.ItalianCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Swiss;
+import org.kelar.inputmethod.keyboard.layout.customizer.ItalianCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsKannadaIN.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsKannadaIN.java
index f0a2546fd..3f5169444 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsKannadaIN.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsKannadaIN.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.Kannada;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Kannada;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsKazakh.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsKazakh.java
index 227361140..92797d005 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsKazakh.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsKazakh.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.EastSlavic;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.customizer.EastSlavicCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.EastSlavic;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.customizer.EastSlavicCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsKhmerKH.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsKhmerKH.java
index 36583b55f..9e28a1bf2 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsKhmerKH.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsKhmerKH.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.Khmer;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Khmer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsKyrgyz.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsKyrgyz.java
index d301dd459..a60801cb5 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsKyrgyz.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsKyrgyz.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.EastSlavic;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.customizer.EastSlavicCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.EastSlavic;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.customizer.EastSlavicCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsLaoLA.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsLaoLA.java
index 172ea6ae4..b6d06baf3 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsLaoLA.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsLaoLA.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.Lao;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Lao;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsLatvian.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsLatvian.java
index 2051bae6d..873a42ec5 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsLatvian.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsLatvian.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsLithuanian.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsLithuanian.java
index 99e6af51c..6c9797ccb 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsLithuanian.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsLithuanian.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMacedonian.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsMacedonian.java
index 0ee8d3c63..5970c15e5 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMacedonian.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsMacedonian.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.SouthSlavic;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.customizer.SouthSlavicLayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.SouthSlavic;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.SouthSlavicLayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMalayMY.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsMalayMY.java
index d2053509e..6aa2a13ea 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMalayMY.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsMalayMY.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMalayalamIN.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsMalayalamIN.java
index 0e0f2d2e8..4ab784650 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMalayalamIN.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsMalayalamIN.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Malayalam;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Malayalam;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMarathiIN.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsMarathiIN.java
index 7b2bdc6da..e0ff90742 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMarathiIN.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsMarathiIN.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Marathi;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Marathi;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMongolianMN.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsMongolianMN.java
index 3fa9ec680..0c94f6ec9 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMongolianMN.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsMongolianMN.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Mongolian;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Mongolian;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNepaliRomanized.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsNepaliRomanized.java
index 1e2ebd709..ae57bec7a 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNepaliRomanized.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsNepaliRomanized.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.NepaliRomanized;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.NepaliRomanized;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNepaliTraditional.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsNepaliTraditional.java
index ec5f10e28..17dee2b61 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNepaliTraditional.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsNepaliTraditional.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.NepaliTraditional;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.NepaliTraditional;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNoLanguage.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsNoLanguage.java
index cd43d37ef..09953ceed 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNoLanguage.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsNoLanguage.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.NoLanguageCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.NoLanguageCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNoLanguageColemak.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsNoLanguageColemak.java
index af646a05f..25577eb92 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNoLanguageColemak.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsNoLanguageColemak.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.Colemak;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.customizer.NoLanguageCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.Colemak;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.customizer.NoLanguageCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNoLanguageDvorak.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsNoLanguageDvorak.java
index b93b6f0eb..078f2a231 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNoLanguageDvorak.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsNoLanguageDvorak.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.Dvorak;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.customizer.DvorakCustomizer;
-import com.android.inputmethod.keyboard.layout.customizer.NoLanguageCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.Dvorak;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.customizer.DvorakCustomizer;
+import org.kelar.inputmethod.keyboard.layout.customizer.NoLanguageCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNoLanguagePcQwerty.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsNoLanguagePcQwerty.java
index 308e911d2..ac5b5b571 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNoLanguagePcQwerty.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsNoLanguagePcQwerty.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.PcQwerty;
-import com.android.inputmethod.keyboard.layout.customizer.NoLanguageCustomizer;
-import com.android.inputmethod.keyboard.layout.customizer.PcQwertyCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.PcQwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.NoLanguageCustomizer;
+import org.kelar.inputmethod.keyboard.layout.customizer.PcQwertyCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNorwegian.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsNorwegian.java
index 2f869b626..077af6daa 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNorwegian.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsNorwegian.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Nordic;
-import com.android.inputmethod.keyboard.layout.customizer.NorwegianCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Nordic;
+import org.kelar.inputmethod.keyboard.layout.customizer.NorwegianCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNorwegianColemak.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsNorwegianColemak.java
index 81ae26f28..10214573a 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNorwegianColemak.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsNorwegianColemak.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.Colemak;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.customizer.NorwegianCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.Colemak;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.customizer.NorwegianCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsPersian.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsPersian.java
index 0817853a5..fb45a264e 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsPersian.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsPersian.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.Farsi;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Farsi;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsPolish.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsPolish.java
index 3b813acaf..e9fb37354 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsPolish.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsPolish.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsPortugueseBR.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsPortugueseBR.java
index aaf75ea21..9dc5f2cf6 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsPortugueseBR.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsPortugueseBR.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.PortugueseCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.PortugueseCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsPortuguesePT.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsPortuguesePT.java
index 2b91225da..44c0afa30 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsPortuguesePT.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsPortuguesePT.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.EuroCustomizer;
-import com.android.inputmethod.keyboard.layout.customizer.PortugueseCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.EuroCustomizer;
+import org.kelar.inputmethod.keyboard.layout.customizer.PortugueseCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsQwertyEmail.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsQwertyEmail.java
index 5e1891e86..a30dccaed 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsQwertyEmail.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsQwertyEmail.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import android.text.InputType;
 import android.view.inputmethod.EditorInfo;
@@ -22,11 +22,11 @@ import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.KeyboardLayoutSet;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.EnglishCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.KeyboardLayoutSet;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.EnglishCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsQwertyUrl.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsQwertyUrl.java
index 4fa9925ec..8e9897df0 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsQwertyUrl.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsQwertyUrl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import android.text.InputType;
 import android.view.inputmethod.EditorInfo;
@@ -22,11 +22,11 @@ import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.KeyboardLayoutSet;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.EnglishCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.KeyboardLayoutSet;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.EnglishCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsRomanian.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsRomanian.java
index be386cbca..fed99b1d9 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsRomanian.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsRomanian.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsRussian.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsRussian.java
index aedf78d43..57f2d7bd0 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsRussian.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsRussian.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.EastSlavic;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.customizer.EastSlavicCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.EastSlavic;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.EastSlavicCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSerbian.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSerbian.java
index a30614e9c..cfbbcd9e1 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSerbian.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSerbian.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.SouthSlavic;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.customizer.SouthSlavicLayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.SouthSlavic;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.SouthSlavicLayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSerbianLatin.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSerbianLatin.java
index dfed265b6..facef7aa8 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSerbianLatin.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSerbianLatin.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.SerbianQwertz;
-import com.android.inputmethod.keyboard.layout.customizer.SerbianLatinCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.SerbianQwertz;
+import org.kelar.inputmethod.keyboard.layout.customizer.SerbianLatinCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSerbianLatinQwerty.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSerbianLatinQwerty.java
index 205e8d61b..c4b9f5595 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSerbianLatinQwerty.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSerbianLatinQwerty.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.SerbianLatinCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.SerbianLatinCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSinhalaLK.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSinhalaLK.java
index bfea4fbeb..c615f3bde 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSinhalaLK.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSinhalaLK.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.Suppress;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Sinhala;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Sinhala;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSlovak.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSlovak.java
index 449df3721..83ce1874d 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSlovak.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSlovak.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.customizer.EuroCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.EuroCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSlovenian.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSlovenian.java
index 0b63bd935..6c7a4e7f2 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSlovenian.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSlovenian.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.customizer.EuroCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.EuroCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSpanish.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSpanish.java
index 973669ceb..6ce6f22c0 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSpanish.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSpanish.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Spanish;
-import com.android.inputmethod.keyboard.layout.customizer.EuroCustomizer;
-import com.android.inputmethod.keyboard.layout.customizer.SpanishCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Spanish;
+import org.kelar.inputmethod.keyboard.layout.customizer.EuroCustomizer;
+import org.kelar.inputmethod.keyboard.layout.customizer.SpanishCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSpanish419.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSpanish419.java
index d91a94f99..f37ad0052 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSpanish419.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSpanish419.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Spanish;
-import com.android.inputmethod.keyboard.layout.customizer.SpanishCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Spanish;
+import org.kelar.inputmethod.keyboard.layout.customizer.SpanishCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSpanishUS.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSpanishUS.java
index f9936f767..eb9d80bdf 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSpanishUS.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSpanishUS.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Spanish;
-import com.android.inputmethod.keyboard.layout.customizer.SpanishCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Spanish;
+import org.kelar.inputmethod.keyboard.layout.customizer.SpanishCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSplitLayoutQwertyEnglishUS.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSplitLayoutQwertyEnglishUS.java
index a69a35701..75385f643 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSplitLayoutQwertyEnglishUS.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSplitLayoutQwertyEnglishUS.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.KeyboardLayoutSet;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.EnglishCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.KeyboardLayoutSet;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.EnglishCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSwahili.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSwahili.java
index de01c8e40..1ef382572 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSwahili.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSwahili.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSwedish.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSwedish.java
index 931c8bc48..faf9be6dc 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSwedish.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSwedish.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Nordic;
-import com.android.inputmethod.keyboard.layout.customizer.SwedishCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Nordic;
+import org.kelar.inputmethod.keyboard.layout.customizer.SwedishCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSwedishPcQwerty.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSwedishPcQwerty.java
index b2b0895b6..b1cb06d60 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSwedishPcQwerty.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSwedishPcQwerty.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.PcQwerty;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.customizer.PcQwertyCustomizer;
-import com.android.inputmethod.keyboard.layout.customizer.SwedishCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.PcQwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.customizer.PcQwertyCustomizer;
+import org.kelar.inputmethod.keyboard.layout.customizer.SwedishCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTagalog.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsTagalog.java
index b75c8823e..bd4956b8f 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTagalog.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsTagalog.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Spanish;
-import com.android.inputmethod.keyboard.layout.customizer.SpanishCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Spanish;
+import org.kelar.inputmethod.keyboard.layout.customizer.SpanishCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTamilIN.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsTamilIN.java
index e90542be6..02656aea2 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTamilIN.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsTamilIN.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.SymbolsShifted;
-import com.android.inputmethod.keyboard.layout.Tamil;
-import com.android.inputmethod.keyboard.layout.customizer.TamilCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.SymbolsShifted;
+import org.kelar.inputmethod.keyboard.layout.Tamil;
+import org.kelar.inputmethod.keyboard.layout.customizer.TamilCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTamilLK.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsTamilLK.java
index f26e2f0f0..dc3c16cee 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTamilLK.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsTamilLK.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.Suppress;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.SymbolsShifted;
-import com.android.inputmethod.keyboard.layout.Tamil;
-import com.android.inputmethod.keyboard.layout.customizer.TamilCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.SymbolsShifted;
+import org.kelar.inputmethod.keyboard.layout.Tamil;
+import org.kelar.inputmethod.keyboard.layout.customizer.TamilCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTamilSG.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsTamilSG.java
index aa14e2f82..8bd34fbfd 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTamilSG.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsTamilSG.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Tamil;
-import com.android.inputmethod.keyboard.layout.customizer.TamilCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Tamil;
+import org.kelar.inputmethod.keyboard.layout.customizer.TamilCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTeluguIN.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsTeluguIN.java
index 096207aba..eda1895f6 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTeluguIN.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsTeluguIN.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Telugu;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Telugu;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsThai.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsThai.java
index a7dd1c779..95475956a 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsThai.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsThai.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Thai;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Thai;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTurkish.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsTurkish.java
index 0df877296..511dca380 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTurkish.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsTurkish.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.EuroCustomizer;
-import com.android.inputmethod.keyboard.layout.customizer.TurkicCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.EuroCustomizer;
+import org.kelar.inputmethod.keyboard.layout.customizer.TurkicCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsUkrainian.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsUkrainian.java
index 7f79765f6..60fc97f29 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsUkrainian.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsUkrainian.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.EastSlavic;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.SymbolsShifted;
-import com.android.inputmethod.keyboard.layout.customizer.EastSlavicCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.EastSlavic;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.SymbolsShifted;
+import org.kelar.inputmethod.keyboard.layout.customizer.EastSlavicCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsUzbek.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsUzbek.java
index 3c2eef6b4..ad9ab8762 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsUzbek.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsUzbek.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Uzbek;
-import com.android.inputmethod.keyboard.layout.customizer.UzbekCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Uzbek;
+import org.kelar.inputmethod.keyboard.layout.customizer.UzbekCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsUzbekQwerty.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsUzbekQwerty.java
index becd45c0c..e795a5ed6 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsUzbekQwerty.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsUzbekQwerty.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.UzbekCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.UzbekCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsVietnamese.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsVietnamese.java
index 56807d039..91e50dfd5 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsVietnamese.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsVietnamese.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.SymbolsShifted;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.SymbolsShifted;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsZulu.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsZulu.java
index 5ea9568e7..d745d9956 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsZulu.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsZulu.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.EnglishCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.EnglishCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/latin/AppWorkaroundsTests.java b/tests/src/org/kelar/inputmethod/latin/AppWorkaroundsTests.java
index 59494481e..038b38735 100644
--- a/tests/src/com/android/inputmethod/latin/AppWorkaroundsTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/AppWorkaroundsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
@@ -23,7 +23,7 @@ import android.view.inputmethod.EditorInfo;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.latin.settings.Settings;
+import org.kelar.inputmethod.latin.settings.Settings;
 
 @LargeTest
 public class AppWorkaroundsTests extends InputTestsBase {
diff --git a/tests/src/com/android/inputmethod/latin/BinaryDictionaryTests.java b/tests/src/org/kelar/inputmethod/latin/BinaryDictionaryTests.java
index db8b80949..a44c0bce7 100644
--- a/tests/src/com/android/inputmethod/latin/BinaryDictionaryTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/BinaryDictionaryTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -28,14 +28,14 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.LargeTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.NgramContext.WordInfo;
-import com.android.inputmethod.latin.common.CodePointUtils;
-import com.android.inputmethod.latin.common.FileUtils;
-import com.android.inputmethod.latin.makedict.DictionaryHeader;
-import com.android.inputmethod.latin.makedict.FormatSpec;
-import com.android.inputmethod.latin.makedict.WeightedString;
-import com.android.inputmethod.latin.makedict.WordProperty;
-import com.android.inputmethod.latin.utils.BinaryDictionaryUtils;
+import org.kelar.inputmethod.latin.NgramContext.WordInfo;
+import org.kelar.inputmethod.latin.common.CodePointUtils;
+import org.kelar.inputmethod.latin.common.FileUtils;
+import org.kelar.inputmethod.latin.makedict.DictionaryHeader;
+import org.kelar.inputmethod.latin.makedict.FormatSpec;
+import org.kelar.inputmethod.latin.makedict.WeightedString;
+import org.kelar.inputmethod.latin.makedict.WordProperty;
+import org.kelar.inputmethod.latin.utils.BinaryDictionaryUtils;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/tests/src/com/android/inputmethod/latin/BlueUnderlineTests.java b/tests/src/org/kelar/inputmethod/latin/BlueUnderlineTests.java
index d84c0df71..7835f4497 100644
--- a/tests/src/com/android/inputmethod/latin/BlueUnderlineTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/BlueUnderlineTests.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import android.text.style.SuggestionSpan;
 import android.text.style.UnderlineSpan;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.Constants;
 
 @LargeTest
 public class BlueUnderlineTests extends InputTestsBase {
diff --git a/tests/src/com/android/inputmethod/latin/ContactsContentObserverTest.java b/tests/src/org/kelar/inputmethod/latin/ContactsContentObserverTest.java
index 029e1b506..8e21324cb 100644
--- a/tests/src/com/android/inputmethod/latin/ContactsContentObserverTest.java
+++ b/tests/src/org/kelar/inputmethod/latin/ContactsContentObserverTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
diff --git a/tests/src/com/android/inputmethod/latin/ContactsDictionaryUtilsTest.java b/tests/src/org/kelar/inputmethod/latin/ContactsDictionaryUtilsTest.java
index a00c9dfdd..79f13a979 100644
--- a/tests/src/com/android/inputmethod/latin/ContactsDictionaryUtilsTest.java
+++ b/tests/src/org/kelar/inputmethod/latin/ContactsDictionaryUtilsTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/tests/src/com/android/inputmethod/latin/ContactsManagerTest.java b/tests/src/org/kelar/inputmethod/latin/ContactsManagerTest.java
index d3d746df5..d912ec266 100644
--- a/tests/src/com/android/inputmethod/latin/ContactsManagerTest.java
+++ b/tests/src/org/kelar/inputmethod/latin/ContactsManagerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -35,9 +35,6 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.ContactsDictionaryConstants;
-import com.android.inputmethod.latin.ContactsManager;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/src/com/android/inputmethod/latin/DictionaryFacilitatorLruCacheTests.java b/tests/src/org/kelar/inputmethod/latin/DictionaryFacilitatorLruCacheTests.java
index f8130f33c..ed9928a65 100644
--- a/tests/src/com/android/inputmethod/latin/DictionaryFacilitatorLruCacheTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/DictionaryFacilitatorLruCacheTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
diff --git a/tests/src/com/android/inputmethod/latin/InputLogicTests.java b/tests/src/org/kelar/inputmethod/latin/InputLogicTests.java
index 10c133f4b..689ee88bb 100644
--- a/tests/src/com/android/inputmethod/latin/InputLogicTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/InputLogicTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import static android.test.MoreAsserts.assertNotEqual;
 
@@ -23,9 +23,9 @@ import android.view.inputmethod.BaseInputConnection;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.define.DecoderSpecificConstants;
-import com.android.inputmethod.latin.settings.Settings;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.define.DecoderSpecificConstants;
+import org.kelar.inputmethod.latin.settings.Settings;
 
 @LargeTest
 public class InputLogicTests extends InputTestsBase {
diff --git a/tests/src/com/android/inputmethod/latin/InputLogicTestsDeadKeys.java b/tests/src/org/kelar/inputmethod/latin/InputLogicTestsDeadKeys.java
index b3a5f73cc..0c4662b1f 100644
--- a/tests/src/com/android/inputmethod/latin/InputLogicTestsDeadKeys.java
+++ b/tests/src/org/kelar/inputmethod/latin/InputLogicTestsDeadKeys.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.event.Event;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.event.Event;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.ArrayList;
 
diff --git a/tests/src/com/android/inputmethod/latin/InputLogicTestsLanguageWithoutSpaces.java b/tests/src/org/kelar/inputmethod/latin/InputLogicTestsLanguageWithoutSpaces.java
index c9627f41d..9b4e661be 100644
--- a/tests/src/com/android/inputmethod/latin/InputLogicTestsLanguageWithoutSpaces.java
+++ b/tests/src/org/kelar/inputmethod/latin/InputLogicTestsLanguageWithoutSpaces.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import android.view.inputmethod.BaseInputConnection;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.Constants;
 
 @LargeTest
 public class InputLogicTestsLanguageWithoutSpaces extends InputTestsBase {
diff --git a/tests/src/com/android/inputmethod/latin/InputTestsBase.java b/tests/src/org/kelar/inputmethod/latin/InputTestsBase.java
index dead53da2..e57b6823f 100644
--- a/tests/src/com/android/inputmethod/latin/InputTestsBase.java
+++ b/tests/src/org/kelar/inputmethod/latin/InputTestsBase.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -36,19 +36,19 @@ import android.view.inputmethod.InputMethodSubtype;
 import android.widget.EditText;
 import android.widget.FrameLayout;
 
-import com.android.inputmethod.compat.InputMethodSubtypeCompatUtils;
-import com.android.inputmethod.event.Event;
-import com.android.inputmethod.keyboard.Key;
-import com.android.inputmethod.keyboard.Keyboard;
-import com.android.inputmethod.latin.Dictionary.PhonyDictionary;
-import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.InputPointers;
-import com.android.inputmethod.latin.common.LocaleUtils;
-import com.android.inputmethod.latin.common.StringUtils;
-import com.android.inputmethod.latin.settings.DebugSettings;
-import com.android.inputmethod.latin.settings.Settings;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.compat.InputMethodSubtypeCompatUtils;
+import org.kelar.inputmethod.event.Event;
+import org.kelar.inputmethod.keyboard.Key;
+import org.kelar.inputmethod.keyboard.Keyboard;
+import org.kelar.inputmethod.latin.Dictionary.PhonyDictionary;
+import org.kelar.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.InputPointers;
+import org.kelar.inputmethod.latin.common.LocaleUtils;
+import org.kelar.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.latin.settings.DebugSettings;
+import org.kelar.inputmethod.latin.settings.Settings;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;
diff --git a/tests/src/com/android/inputmethod/latin/LatinIMEForTests.java b/tests/src/org/kelar/inputmethod/latin/LatinIMEForTests.java
index 035c8d7ce..f9e975556 100644
--- a/tests/src/com/android/inputmethod/latin/LatinIMEForTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/LatinIMEForTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 public class LatinIMEForTests extends LatinIME {
     @Override
diff --git a/tests/src/com/android/inputmethod/latin/LatinImeStressTests.java b/tests/src/org/kelar/inputmethod/latin/LatinImeStressTests.java
index d4f8bc194..6b9f65931 100644
--- a/tests/src/com/android/inputmethod/latin/LatinImeStressTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/LatinImeStressTests.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.latin.common.CodePointUtils;
+import org.kelar.inputmethod.latin.common.CodePointUtils;
 
 import java.util.Random;
 
diff --git a/tests/src/com/android/inputmethod/latin/LatinImeTests.java b/tests/src/org/kelar/inputmethod/latin/LatinImeTests.java
index 134ec2f7a..5d3d04783 100644
--- a/tests/src/com/android/inputmethod/latin/LatinImeTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/LatinImeTests.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import androidx.test.filters.LargeTest;
 
diff --git a/tests/src/com/android/inputmethod/latin/NgramContextTests.java b/tests/src/org/kelar/inputmethod/latin/NgramContextTests.java
index 505818439..07b66271d 100644
--- a/tests/src/com/android/inputmethod/latin/NgramContextTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/NgramContextTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -24,9 +24,9 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.NgramContext.WordInfo;
-import com.android.inputmethod.latin.settings.SpacingAndPunctuations;
-import com.android.inputmethod.latin.utils.NgramContextUtils;
+import org.kelar.inputmethod.latin.NgramContext.WordInfo;
+import org.kelar.inputmethod.latin.settings.SpacingAndPunctuations;
+import org.kelar.inputmethod.latin.utils.NgramContextUtils;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/src/com/android/inputmethod/latin/PunctuationTests.java b/tests/src/org/kelar/inputmethod/latin/PunctuationTests.java
index ba98003f8..c8337430d 100644
--- a/tests/src/com/android/inputmethod/latin/PunctuationTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/PunctuationTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import android.provider.Settings.Secure;
 
diff --git a/tests/src/com/android/inputmethod/latin/RichInputConnectionAndTextRangeTests.java b/tests/src/org/kelar/inputmethod/latin/RichInputConnectionAndTextRangeTests.java
index ac38468f9..cf4a349d5 100644
--- a/tests/src/com/android/inputmethod/latin/RichInputConnectionAndTextRangeTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/RichInputConnectionAndTextRangeTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -35,13 +35,13 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.StringUtils;
-import com.android.inputmethod.latin.settings.SpacingAndPunctuations;
-import com.android.inputmethod.latin.utils.NgramContextUtils;
-import com.android.inputmethod.latin.utils.RunInLocale;
-import com.android.inputmethod.latin.utils.ScriptUtils;
-import com.android.inputmethod.latin.utils.TextRange;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.latin.settings.SpacingAndPunctuations;
+import org.kelar.inputmethod.latin.utils.NgramContextUtils;
+import org.kelar.inputmethod.latin.utils.RunInLocale;
+import org.kelar.inputmethod.latin.utils.ScriptUtils;
+import org.kelar.inputmethod.latin.utils.TextRange;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/src/com/android/inputmethod/latin/RichInputMethodSubtypeTests.java b/tests/src/org/kelar/inputmethod/latin/RichInputMethodSubtypeTests.java
index 578e6bea0..f28ba53cd 100644
--- a/tests/src/com/android/inputmethod/latin/RichInputMethodSubtypeTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/RichInputMethodSubtypeTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -30,12 +30,10 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.RichInputMethodManager;
-import com.android.inputmethod.latin.RichInputMethodSubtype;
-import com.android.inputmethod.latin.utils.AdditionalSubtypeUtils;
-import com.android.inputmethod.latin.utils.RunInLocale;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.utils.AdditionalSubtypeUtils;
+import org.kelar.inputmethod.latin.utils.RunInLocale;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/tests/src/com/android/inputmethod/latin/ShiftModeTests.java b/tests/src/org/kelar/inputmethod/latin/ShiftModeTests.java
index 9b6e72be2..a036e5d7d 100644
--- a/tests/src/com/android/inputmethod/latin/ShiftModeTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/ShiftModeTests.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import android.text.TextUtils;
 import android.view.inputmethod.EditorInfo;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.Constants;
 
 @LargeTest
 public class ShiftModeTests extends InputTestsBase {
diff --git a/tests/src/com/android/inputmethod/latin/SuggestedWordsTests.java b/tests/src/org/kelar/inputmethod/latin/SuggestedWordsTests.java
index b41c7013c..1d3df9335 100644
--- a/tests/src/com/android/inputmethod/latin/SuggestedWordsTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/SuggestedWordsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -23,7 +23,7 @@ import static org.junit.Assert.assertNull;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
+import org.kelar.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/src/com/android/inputmethod/latin/WordComposerTests.java b/tests/src/org/kelar/inputmethod/latin/WordComposerTests.java
index 4ac094b25..f13458526 100644
--- a/tests/src/com/android/inputmethod/latin/WordComposerTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/WordComposerTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -23,9 +23,9 @@ import static org.junit.Assert.assertTrue;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.CoordinateUtils;
-import com.android.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.CoordinateUtils;
+import org.kelar.inputmethod.latin.common.StringUtils;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/src/com/android/inputmethod/latin/accounts/AccountsChangedReceiverTests.java b/tests/src/org/kelar/inputmethod/latin/accounts/AccountsChangedReceiverTests.java
index 86f453b08..96e522182 100644
--- a/tests/src/com/android/inputmethod/latin/accounts/AccountsChangedReceiverTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/accounts/AccountsChangedReceiverTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.accounts;
+package org.kelar.inputmethod.latin.accounts;
 
 import static org.junit.Assert.assertEquals;
 
@@ -28,7 +28,7 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.settings.LocalSettingsConstants;
+import org.kelar.inputmethod.latin.settings.LocalSettingsConstants;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/tests/src/com/android/inputmethod/latin/common/InputPointersTests.java b/tests/src/org/kelar/inputmethod/latin/common/InputPointersTests.java
index 29abec365..e0b98dd13 100644
--- a/tests/src/com/android/inputmethod/latin/common/InputPointersTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/common/InputPointersTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.common;
+package org.kelar.inputmethod.latin.common;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
diff --git a/tests/src/com/android/inputmethod/latin/common/ResizableIntArrayTests.java b/tests/src/org/kelar/inputmethod/latin/common/ResizableIntArrayTests.java
index 5151b6b2b..d2a7a651f 100644
--- a/tests/src/com/android/inputmethod/latin/common/ResizableIntArrayTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/common/ResizableIntArrayTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.common;
+package org.kelar.inputmethod.latin.common;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
diff --git a/tests/src/com/android/inputmethod/latin/common/StringUtilsTests.java b/tests/src/org/kelar/inputmethod/latin/common/StringUtilsTests.java
index 36a4b912d..016819ce8 100644
--- a/tests/src/com/android/inputmethod/latin/common/StringUtilsTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/common/StringUtilsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.common;
+package org.kelar.inputmethod.latin.common;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/tests/src/com/android/inputmethod/latin/common/UnicodeSurrogateTests.java b/tests/src/org/kelar/inputmethod/latin/common/UnicodeSurrogateTests.java
index adfbbf418..7fad18588 100644
--- a/tests/src/com/android/inputmethod/latin/common/UnicodeSurrogateTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/common/UnicodeSurrogateTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.common;
+package org.kelar.inputmethod.latin.common;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
diff --git a/tests/src/com/android/inputmethod/latin/makedict/AbstractDictDecoder.java b/tests/src/org/kelar/inputmethod/latin/makedict/AbstractDictDecoder.java
index bc856f113..978e6cd3a 100644
--- a/tests/src/com/android/inputmethod/latin/makedict/AbstractDictDecoder.java
+++ b/tests/src/org/kelar/inputmethod/latin/makedict/AbstractDictDecoder.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makedict;
+package org.kelar.inputmethod.latin.makedict;
 
-import com.android.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.annotations.UsedForTesting;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
diff --git a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictDecoderEncoderTests.java b/tests/src/org/kelar/inputmethod/latin/makedict/BinaryDictDecoderEncoderTests.java
index 376aa3f62..659df6859 100644
--- a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictDecoderEncoderTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/makedict/BinaryDictDecoderEncoderTests.java
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makedict;
+package org.kelar.inputmethod.latin.makedict;
 
 import android.test.AndroidTestCase;
 import android.util.Log;
 import android.util.Pair;
 import android.util.SparseArray;
 
-import com.android.inputmethod.latin.BinaryDictionary;
-import com.android.inputmethod.latin.common.CodePointUtils;
-import com.android.inputmethod.latin.makedict.BinaryDictDecoderUtils.CharEncoding;
-import com.android.inputmethod.latin.makedict.BinaryDictDecoderUtils.DictBuffer;
-import com.android.inputmethod.latin.makedict.FormatSpec.FormatOptions;
-import com.android.inputmethod.latin.makedict.FusionDictionary.PtNode;
-import com.android.inputmethod.latin.makedict.FusionDictionary.PtNodeArray;
-import com.android.inputmethod.latin.utils.BinaryDictionaryUtils;
-import com.android.inputmethod.latin.utils.ByteArrayDictBuffer;
+import org.kelar.inputmethod.latin.BinaryDictionary;
+import org.kelar.inputmethod.latin.common.CodePointUtils;
+import org.kelar.inputmethod.latin.makedict.BinaryDictDecoderUtils.CharEncoding;
+import org.kelar.inputmethod.latin.makedict.BinaryDictDecoderUtils.DictBuffer;
+import org.kelar.inputmethod.latin.makedict.FormatSpec.FormatOptions;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary.PtNode;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary.PtNodeArray;
+import org.kelar.inputmethod.latin.utils.BinaryDictionaryUtils;
+import org.kelar.inputmethod.latin.utils.ByteArrayDictBuffer;
 
 import java.io.File;
 import java.io.IOException;
@@ -151,7 +151,7 @@ public class BinaryDictDecoderEncoderTests extends AndroidTestCase {
 //    on-device, so it's commented out.
 //    private void dumpToCombinedFileForDebug(final FusionDictionary dict, final String filename)
 //            throws IOException {
-//        com.android.inputmethod.latin.dicttool.CombinedInputOutput.writeDictionaryCombined(
+//        org.kelar.inputmethod.latin.dicttool.CombinedInputOutput.writeDictionaryCombined(
 //                new java.io.FileWriter(new File(filename)), dict);
 //    }
 
diff --git a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictDecoderUtils.java b/tests/src/org/kelar/inputmethod/latin/makedict/BinaryDictDecoderUtils.java
index be75565bb..18199ae21 100644
--- a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictDecoderUtils.java
+++ b/tests/src/org/kelar/inputmethod/latin/makedict/BinaryDictDecoderUtils.java
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makedict;
+package org.kelar.inputmethod.latin.makedict;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.makedict.UnsupportedFormatException;
+import org.kelar.inputmethod.annotations.UsedForTesting;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictEncoderUtils.java b/tests/src/org/kelar/inputmethod/latin/makedict/BinaryDictEncoderUtils.java
index 2ae5bf5c1..3b35288d7 100644
--- a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictEncoderUtils.java
+++ b/tests/src/org/kelar/inputmethod/latin/makedict/BinaryDictEncoderUtils.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makedict;
+package org.kelar.inputmethod.latin.makedict;
 
-import com.android.inputmethod.latin.makedict.BinaryDictDecoderUtils.CharEncoding;
-import com.android.inputmethod.latin.makedict.FormatSpec.FormatOptions;
-import com.android.inputmethod.latin.makedict.FusionDictionary.PtNode;
-import com.android.inputmethod.latin.makedict.FusionDictionary.PtNodeArray;
+import org.kelar.inputmethod.latin.makedict.BinaryDictDecoderUtils.CharEncoding;
+import org.kelar.inputmethod.latin.makedict.FormatSpec.FormatOptions;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary.PtNode;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary.PtNodeArray;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictIOUtils.java b/tests/src/org/kelar/inputmethod/latin/makedict/BinaryDictIOUtils.java
index da1b32a8b..055d6492d 100644
--- a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictIOUtils.java
+++ b/tests/src/org/kelar/inputmethod/latin/makedict/BinaryDictIOUtils.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makedict;
+package org.kelar.inputmethod.latin.makedict;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.define.DecoderSpecificConstants;
-import com.android.inputmethod.latin.makedict.DictDecoder.DictionaryBufferFactory;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.latin.define.DecoderSpecificConstants;
+import org.kelar.inputmethod.latin.makedict.DictDecoder.DictionaryBufferFactory;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictUtils.java b/tests/src/org/kelar/inputmethod/latin/makedict/BinaryDictUtils.java
index 9c1e4cf84..48e3d95f2 100644
--- a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictUtils.java
+++ b/tests/src/org/kelar/inputmethod/latin/makedict/BinaryDictUtils.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makedict;
+package org.kelar.inputmethod.latin.makedict;
 
-import com.android.inputmethod.latin.makedict.FormatSpec.DictionaryOptions;
-import com.android.inputmethod.latin.makedict.FormatSpec.FormatOptions;
+import org.kelar.inputmethod.latin.makedict.FormatSpec.DictionaryOptions;
+import org.kelar.inputmethod.latin.makedict.FormatSpec.FormatOptions;
 
 import java.io.File;
 import java.util.HashMap;
diff --git a/tests/src/com/android/inputmethod/latin/makedict/DictDecoder.java b/tests/src/org/kelar/inputmethod/latin/makedict/DictDecoder.java
index a3b28a702..97fb3596b 100644
--- a/tests/src/com/android/inputmethod/latin/makedict/DictDecoder.java
+++ b/tests/src/org/kelar/inputmethod/latin/makedict/DictDecoder.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makedict;
+package org.kelar.inputmethod.latin.makedict;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.makedict.BinaryDictDecoderUtils.DictBuffer;
-import com.android.inputmethod.latin.utils.ByteArrayDictBuffer;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.latin.makedict.BinaryDictDecoderUtils.DictBuffer;
+import org.kelar.inputmethod.latin.utils.ByteArrayDictBuffer;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/tests/src/com/android/inputmethod/latin/makedict/DictEncoder.java b/tests/src/org/kelar/inputmethod/latin/makedict/DictEncoder.java
index 10dd00325..d637b6d2a 100644
--- a/tests/src/com/android/inputmethod/latin/makedict/DictEncoder.java
+++ b/tests/src/org/kelar/inputmethod/latin/makedict/DictEncoder.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makedict;
+package org.kelar.inputmethod.latin.makedict;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.makedict.FormatSpec.FormatOptions;
-import com.android.inputmethod.latin.makedict.FusionDictionary.PtNode;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.latin.makedict.FormatSpec.FormatOptions;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary.PtNode;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/tests/src/com/android/inputmethod/latin/makedict/FusionDictionary.java b/tests/src/org/kelar/inputmethod/latin/makedict/FusionDictionary.java
index 2bed44d7a..817d69f99 100644
--- a/tests/src/com/android/inputmethod/latin/makedict/FusionDictionary.java
+++ b/tests/src/org/kelar/inputmethod/latin/makedict/FusionDictionary.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makedict;
+package org.kelar.inputmethod.latin.makedict;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.define.DecoderSpecificConstants;
-import com.android.inputmethod.latin.makedict.FormatSpec.DictionaryOptions;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.latin.define.DecoderSpecificConstants;
+import org.kelar.inputmethod.latin.makedict.FormatSpec.DictionaryOptions;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/tests/src/com/android/inputmethod/latin/makedict/MakedictLog.java b/tests/src/org/kelar/inputmethod/latin/makedict/MakedictLog.java
index 7eccff2b4..07270d1d0 100644
--- a/tests/src/com/android/inputmethod/latin/makedict/MakedictLog.java
+++ b/tests/src/org/kelar/inputmethod/latin/makedict/MakedictLog.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.android.inputmethod.latin.makedict;
+package org.kelar.inputmethod.latin.makedict;
 
 /**
  * Wrapper to redirect log events to the right output medium.
diff --git a/tests/src/com/android/inputmethod/latin/makedict/PendingAttribute.java b/tests/src/org/kelar/inputmethod/latin/makedict/PendingAttribute.java
index 70e24cc98..0abce4848 100644
--- a/tests/src/com/android/inputmethod/latin/makedict/PendingAttribute.java
+++ b/tests/src/org/kelar/inputmethod/latin/makedict/PendingAttribute.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makedict;
+package org.kelar.inputmethod.latin.makedict;
 
 /**
  * A not-yet-resolved attribute.
diff --git a/tests/src/com/android/inputmethod/latin/makedict/PtNodeInfo.java b/tests/src/org/kelar/inputmethod/latin/makedict/PtNodeInfo.java
index 862e8c101..65209a832 100644
--- a/tests/src/com/android/inputmethod/latin/makedict/PtNodeInfo.java
+++ b/tests/src/org/kelar/inputmethod/latin/makedict/PtNodeInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makedict;
+package org.kelar.inputmethod.latin.makedict;
 
 import java.util.ArrayList;
 
diff --git a/tests/src/com/android/inputmethod/latin/makedict/Ver2DictEncoder.java b/tests/src/org/kelar/inputmethod/latin/makedict/Ver2DictEncoder.java
index b5694caa3..8b3636208 100644
--- a/tests/src/com/android/inputmethod/latin/makedict/Ver2DictEncoder.java
+++ b/tests/src/org/kelar/inputmethod/latin/makedict/Ver2DictEncoder.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makedict;
+package org.kelar.inputmethod.latin.makedict;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.makedict.BinaryDictDecoderUtils.CharEncoding;
-import com.android.inputmethod.latin.makedict.BinaryDictEncoderUtils.CodePointTable;
-import com.android.inputmethod.latin.makedict.FormatSpec.FormatOptions;
-import com.android.inputmethod.latin.makedict.FusionDictionary.PtNode;
-import com.android.inputmethod.latin.makedict.FusionDictionary.PtNodeArray;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.latin.makedict.BinaryDictDecoderUtils.CharEncoding;
+import org.kelar.inputmethod.latin.makedict.BinaryDictEncoderUtils.CodePointTable;
+import org.kelar.inputmethod.latin.makedict.FormatSpec.FormatOptions;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary.PtNode;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary.PtNodeArray;
 
 import java.io.File;
 import java.io.FileNotFoundException;
diff --git a/tests/src/com/android/inputmethod/latin/makedict/Ver4DictDecoder.java b/tests/src/org/kelar/inputmethod/latin/makedict/Ver4DictDecoder.java
index 746431dfa..351fd72c4 100644
--- a/tests/src/com/android/inputmethod/latin/makedict/Ver4DictDecoder.java
+++ b/tests/src/org/kelar/inputmethod/latin/makedict/Ver4DictDecoder.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makedict;
+package org.kelar.inputmethod.latin.makedict;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.BinaryDictionary;
-import com.android.inputmethod.latin.common.FileUtils;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.latin.BinaryDictionary;
+import org.kelar.inputmethod.latin.common.FileUtils;
 
 import java.io.File;
 import java.io.FileNotFoundException;
diff --git a/tests/src/com/android/inputmethod/latin/makedict/Ver4DictEncoder.java b/tests/src/org/kelar/inputmethod/latin/makedict/Ver4DictEncoder.java
index 6e7b37d54..2eb3010c2 100644
--- a/tests/src/com/android/inputmethod/latin/makedict/Ver4DictEncoder.java
+++ b/tests/src/org/kelar/inputmethod/latin/makedict/Ver4DictEncoder.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makedict;
+package org.kelar.inputmethod.latin.makedict;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.BinaryDictionary;
-import com.android.inputmethod.latin.Dictionary;
-import com.android.inputmethod.latin.NgramContext;
-import com.android.inputmethod.latin.common.LocaleUtils;
-import com.android.inputmethod.latin.makedict.FormatSpec.FormatOptions;
-import com.android.inputmethod.latin.makedict.FusionDictionary.PtNode;
-import com.android.inputmethod.latin.utils.BinaryDictionaryUtils;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.latin.BinaryDictionary;
+import org.kelar.inputmethod.latin.Dictionary;
+import org.kelar.inputmethod.latin.NgramContext;
+import org.kelar.inputmethod.latin.common.LocaleUtils;
+import org.kelar.inputmethod.latin.makedict.FormatSpec.FormatOptions;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary.PtNode;
+import org.kelar.inputmethod.latin.utils.BinaryDictionaryUtils;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/tests/src/com/android/inputmethod/latin/network/BlockingHttpClientTests.java b/tests/src/org/kelar/inputmethod/latin/network/BlockingHttpClientTests.java
index f6f54eb77..941abc606 100644
--- a/tests/src/com/android/inputmethod/latin/network/BlockingHttpClientTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/network/BlockingHttpClientTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.network;
+package org.kelar.inputmethod.latin.network;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -27,7 +27,7 @@ import static org.mockito.Mockito.when;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.network.BlockingHttpClient.ResponseProcessor;
+import org.kelar.inputmethod.latin.network.BlockingHttpClient.ResponseProcessor;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/src/com/android/inputmethod/latin/network/HttpUrlConnectionBuilderTests.java b/tests/src/org/kelar/inputmethod/latin/network/HttpUrlConnectionBuilderTests.java
index 1aa4040b8..63a5f6ff0 100644
--- a/tests/src/com/android/inputmethod/latin/network/HttpUrlConnectionBuilderTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/network/HttpUrlConnectionBuilderTests.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.network;
+package org.kelar.inputmethod.latin.network;
 
-import static com.android.inputmethod.latin.network.HttpUrlConnectionBuilder.MODE_BI_DIRECTIONAL;
-import static com.android.inputmethod.latin.network.HttpUrlConnectionBuilder.MODE_DOWNLOAD_ONLY;
-import static com.android.inputmethod.latin.network.HttpUrlConnectionBuilder.MODE_UPLOAD_ONLY;
+import static org.kelar.inputmethod.latin.network.HttpUrlConnectionBuilder.MODE_BI_DIRECTIONAL;
+import static org.kelar.inputmethod.latin.network.HttpUrlConnectionBuilder.MODE_DOWNLOAD_ONLY;
+import static org.kelar.inputmethod.latin.network.HttpUrlConnectionBuilder.MODE_UPLOAD_ONLY;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTests.java b/tests/src/org/kelar/inputmethod/latin/personalization/UserHistoryDictionaryTests.java
index bc9881bde..9e6a18a13 100644
--- a/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/personalization/UserHistoryDictionaryTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.personalization;
+package org.kelar.inputmethod.latin.personalization;
 
 import static org.junit.Assert.assertTrue;
 
@@ -25,8 +25,8 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.LargeTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.ExpandableBinaryDictionary;
-import com.android.inputmethod.latin.utils.BinaryDictionaryUtils;
+import org.kelar.inputmethod.latin.ExpandableBinaryDictionary;
+import org.kelar.inputmethod.latin.utils.BinaryDictionaryUtils;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTestsHelper.java b/tests/src/org/kelar/inputmethod/latin/personalization/UserHistoryDictionaryTestsHelper.java
index 73d7e7339..11e2a7ae5 100644
--- a/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTestsHelper.java
+++ b/tests/src/org/kelar/inputmethod/latin/personalization/UserHistoryDictionaryTestsHelper.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.personalization;
+package org.kelar.inputmethod.latin.personalization;
 
 import android.content.Context;
 
-import com.android.inputmethod.latin.BinaryDictionary;
-import com.android.inputmethod.latin.NgramContext;
-import com.android.inputmethod.latin.NgramContext.WordInfo;
-import com.android.inputmethod.latin.common.FileUtils;
+import org.kelar.inputmethod.latin.BinaryDictionary;
+import org.kelar.inputmethod.latin.NgramContext;
+import org.kelar.inputmethod.latin.NgramContext.WordInfo;
+import org.kelar.inputmethod.latin.common.FileUtils;
 
 import java.io.File;
 import java.io.FilenameFilter;
diff --git a/tests/src/com/android/inputmethod/latin/settings/AccountsSettingsFragmentTests.java b/tests/src/org/kelar/inputmethod/latin/settings/AccountsSettingsFragmentTests.java
index 667ffd1ae..5eff614df 100644
--- a/tests/src/com/android/inputmethod/latin/settings/AccountsSettingsFragmentTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/settings/AccountsSettingsFragmentTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.settings;
+package org.kelar.inputmethod.latin.settings;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -33,7 +33,7 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.MediumTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.utils.ManagedProfileUtils;
+import org.kelar.inputmethod.latin.utils.ManagedProfileUtils;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/tests/src/com/android/inputmethod/latin/settings/SpacingAndPunctuationsTests.java b/tests/src/org/kelar/inputmethod/latin/settings/SpacingAndPunctuationsTests.java
index df44fba67..45a303639 100644
--- a/tests/src/com/android/inputmethod/latin/settings/SpacingAndPunctuationsTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/settings/SpacingAndPunctuationsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.settings;
+package org.kelar.inputmethod.latin.settings;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -28,9 +28,9 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.SuggestedWords;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.utils.RunInLocale;
+import org.kelar.inputmethod.latin.SuggestedWords;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.utils.RunInLocale;
 
 import junit.framework.AssertionFailedError;
 
diff --git a/tests/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerServiceTest.java b/tests/src/org/kelar/inputmethod/latin/spellcheck/AndroidSpellCheckerServiceTest.java
index 2434667c8..e68670de0 100644
--- a/tests/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerServiceTest.java
+++ b/tests/src/org/kelar/inputmethod/latin/spellcheck/AndroidSpellCheckerServiceTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.spellcheck;
+package org.kelar.inputmethod.latin.spellcheck;
 
 import android.text.style.SuggestionSpan;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.latin.InputTestsBase;
+import org.kelar.inputmethod.latin.InputTestsBase;
 
 @LargeTest
 public class AndroidSpellCheckerServiceTest extends InputTestsBase {
diff --git a/tests/src/com/android/inputmethod/latin/suggestions/SuggestionStripLayoutHelperTests.java b/tests/src/org/kelar/inputmethod/latin/suggestions/SuggestionStripLayoutHelperTests.java
index 3706574ef..e7f140f29 100644
--- a/tests/src/com/android/inputmethod/latin/suggestions/SuggestionStripLayoutHelperTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/suggestions/SuggestionStripLayoutHelperTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.suggestions;
+package org.kelar.inputmethod.latin.suggestions;
 
 import static junit.framework.TestCase.assertEquals;
 
@@ -24,7 +24,7 @@ import static org.junit.Assert.assertTrue;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.SuggestedWords;
+import org.kelar.inputmethod.latin.SuggestedWords;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/src/com/android/inputmethod/latin/touchinputconsumer/NullGestureConsumerTests.java b/tests/src/org/kelar/inputmethod/latin/touchinputconsumer/NullGestureConsumerTests.java
index 986c8e3dd..85eeaf86c 100644
--- a/tests/src/com/android/inputmethod/latin/touchinputconsumer/NullGestureConsumerTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/touchinputconsumer/NullGestureConsumerTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.touchinputconsumer;
+package org.kelar.inputmethod.latin.touchinputconsumer;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertSame;
diff --git a/tests/src/com/android/inputmethod/latin/utils/AdditionalSubtypeUtilsTests.java b/tests/src/org/kelar/inputmethod/latin/utils/AdditionalSubtypeUtilsTests.java
index 08c404e12..7c929c7a1 100644
--- a/tests/src/com/android/inputmethod/latin/utils/AdditionalSubtypeUtilsTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/utils/AdditionalSubtypeUtilsTests.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
-import static com.android.inputmethod.latin.common.Constants.Subtype.ExtraValue.ASCII_CAPABLE;
-import static com.android.inputmethod.latin.common.Constants.Subtype.ExtraValue.EMOJI_CAPABLE;
-import static com.android.inputmethod.latin.common.Constants.Subtype.ExtraValue.IS_ADDITIONAL_SUBTYPE;
-import static com.android.inputmethod.latin.common.Constants.Subtype.ExtraValue.KEYBOARD_LAYOUT_SET;
-import static com.android.inputmethod.latin.common.Constants.Subtype.ExtraValue.UNTRANSLATABLE_STRING_IN_SUBTYPE_NAME;
-import static com.android.inputmethod.latin.common.Constants.Subtype.KEYBOARD_MODE;
+import static org.kelar.inputmethod.latin.common.Constants.Subtype.ExtraValue.ASCII_CAPABLE;
+import static org.kelar.inputmethod.latin.common.Constants.Subtype.ExtraValue.EMOJI_CAPABLE;
+import static org.kelar.inputmethod.latin.common.Constants.Subtype.ExtraValue.IS_ADDITIONAL_SUBTYPE;
+import static org.kelar.inputmethod.latin.common.Constants.Subtype.ExtraValue.KEYBOARD_LAYOUT_SET;
+import static org.kelar.inputmethod.latin.common.Constants.Subtype.ExtraValue.UNTRANSLATABLE_STRING_IN_SUBTYPE_NAME;
+import static org.kelar.inputmethod.latin.common.Constants.Subtype.KEYBOARD_MODE;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -35,7 +35,7 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.compat.InputMethodSubtypeCompatUtils;
+import org.kelar.inputmethod.compat.InputMethodSubtypeCompatUtils;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/src/com/android/inputmethod/latin/utils/AsyncResultHolderTests.java b/tests/src/org/kelar/inputmethod/latin/utils/AsyncResultHolderTests.java
index f53780543..b85e4f38c 100644
--- a/tests/src/com/android/inputmethod/latin/utils/AsyncResultHolderTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/utils/AsyncResultHolderTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/tests/src/com/android/inputmethod/latin/utils/ByteArrayDictBuffer.java b/tests/src/org/kelar/inputmethod/latin/utils/ByteArrayDictBuffer.java
index 2028298f2..6c0854824 100644
--- a/tests/src/com/android/inputmethod/latin/utils/ByteArrayDictBuffer.java
+++ b/tests/src/org/kelar/inputmethod/latin/utils/ByteArrayDictBuffer.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
-import com.android.inputmethod.latin.makedict.BinaryDictDecoderUtils.DictBuffer;
+import org.kelar.inputmethod.latin.makedict.BinaryDictDecoderUtils.DictBuffer;
 
 /**
  * This class provides an implementation for the FusionDictionary buffer interface that is backed
diff --git a/tests/src/com/android/inputmethod/latin/utils/CapsModeUtilsTests.java b/tests/src/org/kelar/inputmethod/latin/utils/CapsModeUtilsTests.java
index 4aac7fc41..75463929f 100644
--- a/tests/src/com/android/inputmethod/latin/utils/CapsModeUtilsTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/utils/CapsModeUtilsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -26,8 +26,8 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.common.LocaleUtils;
-import com.android.inputmethod.latin.settings.SpacingAndPunctuations;
+import org.kelar.inputmethod.latin.common.LocaleUtils;
+import org.kelar.inputmethod.latin.settings.SpacingAndPunctuations;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/src/com/android/inputmethod/latin/utils/CollectionUtilsTests.java b/tests/src/org/kelar/inputmethod/latin/utils/CollectionUtilsTests.java
index da23c9cb8..390e88828 100644
--- a/tests/src/com/android/inputmethod/latin/utils/CollectionUtilsTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/utils/CollectionUtilsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -24,7 +24,7 @@ import static org.junit.Assert.fail;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.common.CollectionUtils;
+import org.kelar.inputmethod.latin.common.CollectionUtils;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/src/com/android/inputmethod/latin/utils/DictionaryInfoUtilsTests.java b/tests/src/org/kelar/inputmethod/latin/utils/DictionaryInfoUtilsTests.java
index 2112f985a..4c30750f5 100644
--- a/tests/src/com/android/inputmethod/latin/utils/DictionaryInfoUtilsTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/utils/DictionaryInfoUtilsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -26,8 +26,8 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.common.LocaleUtils;
-import com.android.inputmethod.latin.settings.SpacingAndPunctuations;
+import org.kelar.inputmethod.latin.common.LocaleUtils;
+import org.kelar.inputmethod.latin.settings.SpacingAndPunctuations;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/src/com/android/inputmethod/latin/utils/ExecutorUtilsTests.java b/tests/src/org/kelar/inputmethod/latin/utils/ExecutorUtilsTests.java
index 7c9b3e6ca..440e527f1 100644
--- a/tests/src/com/android/inputmethod/latin/utils/ExecutorUtilsTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/utils/ExecutorUtilsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/tests/src/com/android/inputmethod/latin/utils/ImportantNoticeUtilsTests.java b/tests/src/org/kelar/inputmethod/latin/utils/ImportantNoticeUtilsTests.java
index 9d9a541b7..65abd16fd 100644
--- a/tests/src/com/android/inputmethod/latin/utils/ImportantNoticeUtilsTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/utils/ImportantNoticeUtilsTests.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
-import static com.android.inputmethod.latin.utils.ImportantNoticeUtils.KEY_TIMESTAMP_OF_CONTACTS_NOTICE;
+import static org.kelar.inputmethod.latin.utils.ImportantNoticeUtils.KEY_TIMESTAMP_OF_CONTACTS_NOTICE;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.when;
@@ -28,7 +28,7 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.MediumTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.settings.SettingsValues;
+import org.kelar.inputmethod.latin.settings.SettingsValues;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/tests/src/com/android/inputmethod/latin/utils/JsonUtilsTests.java b/tests/src/org/kelar/inputmethod/latin/utils/JsonUtilsTests.java
index fd5e0a4d7..5a323ef51 100644
--- a/tests/src/com/android/inputmethod/latin/utils/JsonUtilsTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/utils/JsonUtilsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/tests/src/com/android/inputmethod/latin/utils/LanguageOnSpacebarUtilsTests.java b/tests/src/org/kelar/inputmethod/latin/utils/LanguageOnSpacebarUtilsTests.java
index 58e26e8d6..007c69fd2 100644
--- a/tests/src/com/android/inputmethod/latin/utils/LanguageOnSpacebarUtilsTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/utils/LanguageOnSpacebarUtilsTests.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
-import static com.android.inputmethod.latin.utils.LanguageOnSpacebarUtils.FORMAT_TYPE_FULL_LOCALE;
-import static com.android.inputmethod.latin.utils.LanguageOnSpacebarUtils.FORMAT_TYPE_LANGUAGE_ONLY;
-import static com.android.inputmethod.latin.utils.LanguageOnSpacebarUtils.FORMAT_TYPE_NONE;
+import static org.kelar.inputmethod.latin.utils.LanguageOnSpacebarUtils.FORMAT_TYPE_FULL_LOCALE;
+import static org.kelar.inputmethod.latin.utils.LanguageOnSpacebarUtils.FORMAT_TYPE_LANGUAGE_ONLY;
+import static org.kelar.inputmethod.latin.utils.LanguageOnSpacebarUtils.FORMAT_TYPE_NONE;
 
 import static org.junit.Assert.assertEquals;
 
@@ -29,11 +29,8 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.RichInputMethodManager;
-import com.android.inputmethod.latin.RichInputMethodSubtype;
-import com.android.inputmethod.latin.utils.AdditionalSubtypeUtils;
-import com.android.inputmethod.latin.utils.LanguageOnSpacebarUtils;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.latin.RichInputMethodManager;
+import org.kelar.inputmethod.latin.RichInputMethodSubtype;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/src/com/android/inputmethod/latin/utils/RecapitalizeStatusTests.java b/tests/src/org/kelar/inputmethod/latin/utils/RecapitalizeStatusTests.java
index 0908f2b54..1ce091b0b 100644
--- a/tests/src/com/android/inputmethod/latin/utils/RecapitalizeStatusTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/utils/RecapitalizeStatusTests.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import static org.junit.Assert.assertEquals;
 
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/src/com/android/inputmethod/latin/utils/ResourceUtilsTests.java b/tests/src/org/kelar/inputmethod/latin/utils/ResourceUtilsTests.java
index 4aab96a55..7e7f24d49 100644
--- a/tests/src/com/android/inputmethod/latin/utils/ResourceUtilsTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/utils/ResourceUtilsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
diff --git a/tests/src/com/android/inputmethod/latin/utils/SpannableStringUtilsTests.java b/tests/src/org/kelar/inputmethod/latin/utils/SpannableStringUtilsTests.java
index a5987cf13..f5546a04d 100644
--- a/tests/src/com/android/inputmethod/latin/utils/SpannableStringUtilsTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/utils/SpannableStringUtilsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
diff --git a/tests/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtilsTests.java b/tests/src/org/kelar/inputmethod/latin/utils/SubtypeLocaleUtilsTests.java
index 6764fd880..77b960a95 100644
--- a/tests/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtilsTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/utils/SubtypeLocaleUtilsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -30,9 +30,9 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.RichInputMethodManager;
-import com.android.inputmethod.latin.RichInputMethodSubtype;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.RichInputMethodManager;
+import org.kelar.inputmethod.latin.RichInputMethodSubtype;
 
 import org.junit.After;
 import org.junit.Before;