30 files changed, 105 insertions, 105 deletions
diff --git a/tools/dicttool/Android.bp b/tools/dicttool/Android.bp
index 3a6c7dc09..185543021 100644
--- a/tools/dicttool/Android.bp
+++ b/tools/dicttool/Android.bp
@@ -37,5 +37,5 @@ java_binary_host {
         "latinime-common",
     ],
     jni_libs: ["libjni_latinime"],
-    main_class: "com.android.inputmethod.latin.dicttool.Dicttool",
+    main_class: "org.kelar.inputmethod.latin.dicttool.Dicttool",
 }
diff --git a/tools/dicttool/Android.mk b/tools/dicttool/Android.mk
index ee81c2a19..70a1aa6ac 100644
--- a/tools/dicttool/Android.mk
+++ b/tools/dicttool/Android.mk
@@ -26,11 +26,11 @@ LOCAL_PATH := $(LATINIME_DICTTOOL_AOSP_LOCAL_PATH)
 include $(CLEAR_VARS)
 
 LATINIME_LOCAL_DIR := ../..
-LATINIME_BASE_SRC_DIR := $(LATINIME_LOCAL_DIR)/java/src/com/android/inputmethod
+LATINIME_BASE_SRC_DIR := $(LATINIME_LOCAL_DIR)/java/src/org/kelar/inputmethod
 LATINIME_BASE_OVERRIDABLE_SRC_DIR := \
-        $(LATINIME_LOCAL_DIR)/java-overridable/src/com/android/inputmethod
+        $(LATINIME_LOCAL_DIR)/java-overridable/src/org/kelar/inputmethod
 MAKEDICT_CORE_SRC_DIR := $(LATINIME_BASE_SRC_DIR)/latin/makedict
-LATINIME_TESTS_SRC_DIR := $(LATINIME_LOCAL_DIR)/tests/src/com/android/inputmethod/latin
+LATINIME_TESTS_SRC_DIR := $(LATINIME_LOCAL_DIR)/tests/src/org/kelar/inputmethod/latin
 
 # Dependencies for Dicttool. Most of these files are needed by BinaryDictionary.java. Note that
 # a significant part of the dependencies are mocked in the compat/ directory, with empty or
@@ -63,7 +63,7 @@ USED_TARGETED_SRC_FILES := \
         $(addprefix $(LATINIME_TESTS_SRC_DIR)/, $(LATINIME_TEST_SRC_FILES_FOR_DICTTOOL))
 
 DICTTOOL_ONDEVICE_TESTS_DIR := \
-        $(LATINIME_LOCAL_DIR)/tests/src/com/android/inputmethod/latin/makedict/
+        $(LATINIME_LOCAL_DIR)/tests/src/org/kelar/inputmethod/latin/makedict/
 DICTTOOL_COMPAT_TESTS_DIR := compat
 
 LOCAL_MAIN_SRC_FILES := $(call all-java-files-under, $(MAKEDICT_CORE_SRC_DIR))
diff --git a/tools/dicttool/compat/android/test/AndroidTestCase.java b/tools/dicttool/compat/android/test/AndroidTestCase.java
index f765ce0fc..058032496 100644
--- a/tools/dicttool/compat/android/test/AndroidTestCase.java
+++ b/tools/dicttool/compat/android/test/AndroidTestCase.java
@@ -16,7 +16,7 @@
 
 package android.test;
 
-import com.android.inputmethod.latin.dicttool.Test;
+import org.kelar.inputmethod.latin.dicttool.Test;
 
 import junit.framework.TestCase;
 
diff --git a/tools/dicttool/compat/com/android/inputmethod/keyboard/Key.java b/tools/dicttool/compat/org/kelar/inputmethod/keyboard/Key.java
index 925940650..d6c1156fa 100644
--- a/tools/dicttool/compat/com/android/inputmethod/keyboard/Key.java
+++ b/tools/dicttool/compat/org/kelar/inputmethod/keyboard/Key.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
 @SuppressWarnings("static-method")
 public class Key {
diff --git a/tools/dicttool/compat/com/android/inputmethod/keyboard/Keyboard.java b/tools/dicttool/compat/org/kelar/inputmethod/keyboard/Keyboard.java
index 3d6bfd0a9..ce91ffe15 100644
--- a/tools/dicttool/compat/com/android/inputmethod/keyboard/Keyboard.java
+++ b/tools/dicttool/compat/org/kelar/inputmethod/keyboard/Keyboard.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
 @SuppressWarnings("unused")
 public class Keyboard {
diff --git a/tools/dicttool/compat/com/android/inputmethod/keyboard/ProximityInfo.java b/tools/dicttool/compat/org/kelar/inputmethod/keyboard/ProximityInfo.java
index 3a068bd5a..5d156f5c6 100644
--- a/tools/dicttool/compat/com/android/inputmethod/keyboard/ProximityInfo.java
+++ b/tools/dicttool/compat/org/kelar/inputmethod/keyboard/ProximityInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
 public class ProximityInfo {
     public long getNativeProximityInfo() { return 0l; }
diff --git a/tools/dicttool/compat/com/android/inputmethod/latin/LatinIME.java b/tools/dicttool/compat/org/kelar/inputmethod/latin/LatinIME.java
index e7aa340fb..70d8791da 100644
--- a/tools/dicttool/compat/com/android/inputmethod/latin/LatinIME.java
+++ b/tools/dicttool/compat/org/kelar/inputmethod/latin/LatinIME.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 public class LatinIME {
 }
diff --git a/tools/dicttool/compat/com/android/inputmethod/latin/define/JniLibName.java b/tools/dicttool/compat/org/kelar/inputmethod/latin/define/JniLibName.java
index 93ac1980a..3eaba83c5 100644
--- a/tools/dicttool/compat/com/android/inputmethod/latin/define/JniLibName.java
+++ b/tools/dicttool/compat/org/kelar/inputmethod/latin/define/JniLibName.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.define;
+package org.kelar.inputmethod.latin.define;
 
 public final class JniLibName {
     private JniLibName() {
diff --git a/tools/dicttool/compat/com/android/inputmethod/latin/settings/AdditionalFeaturesSettingUtils.java b/tools/dicttool/compat/org/kelar/inputmethod/latin/settings/AdditionalFeaturesSettingUtils.java
index 6a430d57d..4e9c3824b 100644
--- a/tools/dicttool/compat/com/android/inputmethod/latin/settings/AdditionalFeaturesSettingUtils.java
+++ b/tools/dicttool/compat/org/kelar/inputmethod/latin/settings/AdditionalFeaturesSettingUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.settings;
+package org.kelar.inputmethod.latin.settings;
 
 public class AdditionalFeaturesSettingUtils {
     public static final int ADDITIONAL_FEATURES_SETTINGS_SIZE = 0;
diff --git a/tools/dicttool/compat/com/android/inputmethod/latin/utils/WordInputEventForPersonalization.java b/tools/dicttool/compat/org/kelar/inputmethod/latin/utils/WordInputEventForPersonalization.java
index b5a729421..3f86b4580 100644
--- a/tools/dicttool/compat/com/android/inputmethod/latin/utils/WordInputEventForPersonalization.java
+++ b/tools/dicttool/compat/org/kelar/inputmethod/latin/utils/WordInputEventForPersonalization.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 public final class WordInputEventForPersonalization {
 }
diff --git a/tools/dicttool/etc/dicttool_aosp b/tools/dicttool/etc/dicttool_aosp
index fc918f0f8..9f9b745fb 100644
--- a/tools/dicttool/etc/dicttool_aosp
+++ b/tools/dicttool/etc/dicttool_aosp
@@ -33,7 +33,7 @@ progdir=`pwd`
 prog="${progdir}"/`basename "${prog}"`
 cd "${oldwd}"
 
-classname=com.android.inputmethod.latin.dicttool.Dicttool
+classname=org.kelar.inputmethod.latin.dicttool.Dicttool
 jarfile=dicttool_aosp.jar
 frameworkdir="$progdir"
 if [ ! -r "$frameworkdir/$jarfile" ]
diff --git a/tools/dicttool/etc/manifest.txt b/tools/dicttool/etc/manifest.txt
index 67c85214c..8f4277593 100644
--- a/tools/dicttool/etc/manifest.txt
+++ b/tools/dicttool/etc/manifest.txt
@@ -1 +1 @@
-Main-Class: com.android.inputmethod.latin.dicttool.Dicttool
+Main-Class: org.kelar.inputmethod.latin.dicttool.Dicttool
diff --git a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/BinaryDictOffdeviceUtils.java b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/BinaryDictOffdeviceUtils.java
index b5ed94ccd..6a4b366d5 100644
--- a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/BinaryDictOffdeviceUtils.java
+++ b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/BinaryDictOffdeviceUtils.java
@@ -14,17 +14,17 @@
  * the License.
  */
 
-package com.android.inputmethod.latin.dicttool;
+package org.kelar.inputmethod.latin.dicttool;
 
-import com.android.inputmethod.latin.makedict.BinaryDictDecoderUtils;
-import com.android.inputmethod.latin.makedict.BinaryDictIOUtils;
-import com.android.inputmethod.latin.makedict.DictDecoder;
-import com.android.inputmethod.latin.makedict.DictionaryHeader;
-import com.android.inputmethod.latin.makedict.FormatSpec;
-import com.android.inputmethod.latin.makedict.FormatSpec.DictionaryOptions;
-import com.android.inputmethod.latin.makedict.FormatSpec.FormatOptions;
-import com.android.inputmethod.latin.makedict.FusionDictionary;
-import com.android.inputmethod.latin.makedict.UnsupportedFormatException;
+import org.kelar.inputmethod.latin.makedict.BinaryDictDecoderUtils;
+import org.kelar.inputmethod.latin.makedict.BinaryDictIOUtils;
+import org.kelar.inputmethod.latin.makedict.DictDecoder;
+import org.kelar.inputmethod.latin.makedict.DictionaryHeader;
+import org.kelar.inputmethod.latin.makedict.FormatSpec;
+import org.kelar.inputmethod.latin.makedict.FormatSpec.DictionaryOptions;
+import org.kelar.inputmethod.latin.makedict.FormatSpec.FormatOptions;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary;
+import org.kelar.inputmethod.latin.makedict.UnsupportedFormatException;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
diff --git a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/CombinedInputOutput.java b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/CombinedInputOutput.java
index 5e7aca5bb..dfe2df40d 100644
--- a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/CombinedInputOutput.java
+++ b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/CombinedInputOutput.java
@@ -14,16 +14,16 @@
  * the License.
  */
 
-package com.android.inputmethod.latin.dicttool;
+package org.kelar.inputmethod.latin.dicttool;
 
-import com.android.inputmethod.latin.makedict.FormatSpec;
-import com.android.inputmethod.latin.makedict.FormatSpec.DictionaryOptions;
-import com.android.inputmethod.latin.makedict.FusionDictionary;
-import com.android.inputmethod.latin.makedict.FusionDictionary.PtNodeArray;
-import com.android.inputmethod.latin.makedict.ProbabilityInfo;
-import com.android.inputmethod.latin.makedict.WeightedString;
-import com.android.inputmethod.latin.makedict.WordProperty;
-import com.android.inputmethod.latin.utils.CombinedFormatUtils;
+import org.kelar.inputmethod.latin.makedict.FormatSpec;
+import org.kelar.inputmethod.latin.makedict.FormatSpec.DictionaryOptions;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary.PtNodeArray;
+import org.kelar.inputmethod.latin.makedict.ProbabilityInfo;
+import org.kelar.inputmethod.latin.makedict.WeightedString;
+import org.kelar.inputmethod.latin.makedict.WordProperty;
+import org.kelar.inputmethod.latin.utils.CombinedFormatUtils;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
diff --git a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/CommandList.java b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/CommandList.java
index 8fdf7633f..d09c2d9a2 100644
--- a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/CommandList.java
+++ b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/CommandList.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.android.inputmethod.latin.dicttool;
+package org.kelar.inputmethod.latin.dicttool;
 
 public class CommandList {
     public static void populate() {
diff --git a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/Compress.java b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/Compress.java
index 728a159a0..da7e60eff 100644
--- a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/Compress.java
+++ b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/Compress.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.android.inputmethod.latin.dicttool;
+package org.kelar.inputmethod.latin.dicttool;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/Crypt.java b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/Crypt.java
index 4612ae4ab..5db316920 100644
--- a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/Crypt.java
+++ b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/Crypt.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.android.inputmethod.latin.dicttool;
+package org.kelar.inputmethod.latin.dicttool;
 
 import java.io.InputStream;
 import java.io.OutputStream;
diff --git a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/DictionaryMaker.java b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/DictionaryMaker.java
index 6187853c8..a3b0e1d9b 100644
--- a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/DictionaryMaker.java
+++ b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/DictionaryMaker.java
@@ -14,18 +14,18 @@
  * the License.
  */
 
-package com.android.inputmethod.latin.dicttool;
+package org.kelar.inputmethod.latin.dicttool;
 
-import com.android.inputmethod.latin.makedict.BinaryDictDecoderUtils;
-import com.android.inputmethod.latin.makedict.BinaryDictIOUtils;
-import com.android.inputmethod.latin.makedict.DictDecoder;
-import com.android.inputmethod.latin.makedict.DictEncoder;
-import com.android.inputmethod.latin.makedict.FormatSpec;
-import com.android.inputmethod.latin.makedict.FusionDictionary;
-import com.android.inputmethod.latin.makedict.MakedictLog;
-import com.android.inputmethod.latin.makedict.UnsupportedFormatException;
-import com.android.inputmethod.latin.makedict.Ver2DictEncoder;
-import com.android.inputmethod.latin.makedict.Ver4DictEncoder;
+import org.kelar.inputmethod.latin.makedict.BinaryDictDecoderUtils;
+import org.kelar.inputmethod.latin.makedict.BinaryDictIOUtils;
+import org.kelar.inputmethod.latin.makedict.DictDecoder;
+import org.kelar.inputmethod.latin.makedict.DictEncoder;
+import org.kelar.inputmethod.latin.makedict.FormatSpec;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary;
+import org.kelar.inputmethod.latin.makedict.MakedictLog;
+import org.kelar.inputmethod.latin.makedict.UnsupportedFormatException;
+import org.kelar.inputmethod.latin.makedict.Ver2DictEncoder;
+import org.kelar.inputmethod.latin.makedict.Ver4DictEncoder;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
diff --git a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/Dicttool.java b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/Dicttool.java
index e49b35084..88aa0562f 100644
--- a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/Dicttool.java
+++ b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/Dicttool.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.android.inputmethod.latin.dicttool;
+package org.kelar.inputmethod.latin.dicttool;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
diff --git a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/Diff.java b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/Diff.java
index 4ba7e1309..6f5032694 100644
--- a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/Diff.java
+++ b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/Diff.java
@@ -14,12 +14,12 @@
  * the License.
  */
 
-package com.android.inputmethod.latin.dicttool;
+package org.kelar.inputmethod.latin.dicttool;
 
-import com.android.inputmethod.latin.makedict.FusionDictionary;
-import com.android.inputmethod.latin.makedict.FusionDictionary.PtNode;
-import com.android.inputmethod.latin.makedict.WeightedString;
-import com.android.inputmethod.latin.makedict.WordProperty;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary.PtNode;
+import org.kelar.inputmethod.latin.makedict.WeightedString;
+import org.kelar.inputmethod.latin.makedict.WordProperty;
 
 import java.util.Arrays;
 import java.util.ArrayList;
diff --git a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/Header.java b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/Header.java
index aa1762ff1..ab57e23f4 100644
--- a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/Header.java
+++ b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/Header.java
@@ -14,11 +14,11 @@
  * the License.
  */
 
-package com.android.inputmethod.latin.dicttool;
+package org.kelar.inputmethod.latin.dicttool;
 
-import com.android.inputmethod.latin.dicttool.BinaryDictOffdeviceUtils.DecoderChainSpec;
-import com.android.inputmethod.latin.makedict.DictionaryHeader;
-import com.android.inputmethod.latin.makedict.UnsupportedFormatException;
+import org.kelar.inputmethod.latin.dicttool.BinaryDictOffdeviceUtils.DecoderChainSpec;
+import org.kelar.inputmethod.latin.makedict.DictionaryHeader;
+import org.kelar.inputmethod.latin.makedict.UnsupportedFormatException;
 
 import java.io.File;
 import java.util.Arrays;
diff --git a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/Info.java b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/Info.java
index 8f8c968c1..894354922 100644
--- a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/Info.java
+++ b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/Info.java
@@ -14,13 +14,13 @@
  * the License.
  */
 
-package com.android.inputmethod.latin.dicttool;
+package org.kelar.inputmethod.latin.dicttool;
 
-import com.android.inputmethod.latin.makedict.FormatSpec;
-import com.android.inputmethod.latin.makedict.FusionDictionary;
-import com.android.inputmethod.latin.makedict.FusionDictionary.PtNode;
-import com.android.inputmethod.latin.makedict.WeightedString;
-import com.android.inputmethod.latin.makedict.WordProperty;
+import org.kelar.inputmethod.latin.makedict.FormatSpec;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary.PtNode;
+import org.kelar.inputmethod.latin.makedict.WeightedString;
+import org.kelar.inputmethod.latin.makedict.WordProperty;
 
 import java.util.Arrays;
 import java.util.ArrayList;
diff --git a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/Makedict.java b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/Makedict.java
index 0b1fb88bc..dbed2b150 100644
--- a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/Makedict.java
+++ b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/Makedict.java
@@ -14,9 +14,9 @@
  * the License.
  */
 
-package com.android.inputmethod.latin.dicttool;
+package org.kelar.inputmethod.latin.dicttool;
 
-import com.android.inputmethod.latin.makedict.UnsupportedFormatException;
+import org.kelar.inputmethod.latin.makedict.UnsupportedFormatException;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
diff --git a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/Package.java b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/Package.java
index 3efa10a80..3e411e272 100644
--- a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/Package.java
+++ b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/Package.java
@@ -14,9 +14,9 @@
  * the License.
  */
 
-package com.android.inputmethod.latin.dicttool;
+package org.kelar.inputmethod.latin.dicttool;
 
-import com.android.inputmethod.latin.makedict.DictionaryHeader;
+import org.kelar.inputmethod.latin.makedict.DictionaryHeader;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
diff --git a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/Test.java b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/Test.java
index e2dd5199b..17632ba96 100644
--- a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/Test.java
+++ b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/Test.java
@@ -14,12 +14,12 @@
  * the License.
  */
 
-package com.android.inputmethod.latin.dicttool;
+package org.kelar.inputmethod.latin.dicttool;
 
-import com.android.inputmethod.latin.common.FileUtils;
-import com.android.inputmethod.latin.makedict.BinaryDictDecoderEncoderTests;
-import com.android.inputmethod.latin.makedict.BinaryDictEncoderFlattenTreeTests;
-import com.android.inputmethod.latin.makedict.FusionDictionaryTest;
+import org.kelar.inputmethod.latin.common.FileUtils;
+import org.kelar.inputmethod.latin.makedict.BinaryDictDecoderEncoderTests;
+import org.kelar.inputmethod.latin.makedict.BinaryDictEncoderFlattenTreeTests;
+import org.kelar.inputmethod.latin.makedict.FusionDictionaryTest;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/tools/dicttool/src/com/android/inputmethod/latin/personalization/PersonalizationHelper.java b/tools/dicttool/src/org/kelar/inputmethod/latin/personalization/PersonalizationHelper.java
index dcc4e1972..cf3d3f0c5 100644
--- a/tools/dicttool/src/com/android/inputmethod/latin/personalization/PersonalizationHelper.java
+++ b/tools/dicttool/src/org/kelar/inputmethod/latin/personalization/PersonalizationHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.personalization;
+package org.kelar.inputmethod.latin.personalization;
 
 @SuppressWarnings("unused")
 public class PersonalizationHelper {
diff --git a/tools/dicttool/tests/etc/test-dicttool.sh b/tools/dicttool/tests/etc/test-dicttool.sh
index 2f53049c3..8936d4bcb 100755
--- a/tools/dicttool/tests/etc/test-dicttool.sh
+++ b/tools/dicttool/tests/etc/test-dicttool.sh
@@ -24,5 +24,5 @@ fi
 find out -name "dicttool_aosp*" -exec rm -rf {} \; > /dev/null 2>&1
 mmm -j8 external/junit
 DICTTOOL_UNITTEST=true mmm -j8 packages/inputmethods/LatinIME/tools/dicttool
-java -classpath ${ANDROID_HOST_OUT}/framework/junit-host.jar:${ANDROID_HOST_OUT}/framework/dicttool_aosp.jar junit.textui.TestRunner com.android.inputmethod.latin.makedict.BinaryDictEncoderFlattenTreeTests
-java -classpath ${ANDROID_HOST_OUT}/framework/junit-host.jar:${ANDROID_HOST_OUT}/framework/dicttool_aosp.jar junit.textui.TestRunner com.android.inputmethod.latin.dicttool.BinaryDictOffdeviceUtilsTests
+java -classpath ${ANDROID_HOST_OUT}/framework/junit-host.jar:${ANDROID_HOST_OUT}/framework/dicttool_aosp.jar junit.textui.TestRunner org.kelar.inputmethod.latin.makedict.BinaryDictEncoderFlattenTreeTests
+java -classpath ${ANDROID_HOST_OUT}/framework/junit-host.jar:${ANDROID_HOST_OUT}/framework/dicttool_aosp.jar junit.textui.TestRunner org.kelar.inputmethod.latin.dicttool.BinaryDictOffdeviceUtilsTests
diff --git a/tools/dicttool/tests/com/android/inputmethod/latin/dicttool/BinaryDictOffdeviceUtilsTests.java b/tools/dicttool/tests/org/kelar/inputmethod/latin/dicttool/BinaryDictOffdeviceUtilsTests.java
index d3ecc9154..337c4d41d 100644
--- a/tools/dicttool/tests/com/android/inputmethod/latin/dicttool/BinaryDictOffdeviceUtilsTests.java
+++ b/tools/dicttool/tests/org/kelar/inputmethod/latin/dicttool/BinaryDictOffdeviceUtilsTests.java
@@ -14,26 +14,26 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.dicttool;
-
-import com.android.inputmethod.latin.common.CodePointUtils;
-import com.android.inputmethod.latin.dicttool.BinaryDictOffdeviceUtils;
-import com.android.inputmethod.latin.dicttool.Compress;
-import com.android.inputmethod.latin.dicttool.Crypt;
-import com.android.inputmethod.latin.dicttool.BinaryDictOffdeviceUtils.DecoderChainSpec;
-import com.android.inputmethod.latin.makedict.BinaryDictIOUtils;
-import com.android.inputmethod.latin.makedict.BinaryDictUtils;
-import com.android.inputmethod.latin.makedict.DictDecoder;
-import com.android.inputmethod.latin.makedict.DictEncoder;
-import com.android.inputmethod.latin.makedict.DictionaryHeader;
-import com.android.inputmethod.latin.makedict.FormatSpec;
-import com.android.inputmethod.latin.makedict.FormatSpec.DictionaryOptions;
-import com.android.inputmethod.latin.makedict.FormatSpec.FormatOptions;
-import com.android.inputmethod.latin.makedict.FusionDictionary;
-import com.android.inputmethod.latin.makedict.FusionDictionary.PtNodeArray;
-import com.android.inputmethod.latin.makedict.ProbabilityInfo;
-import com.android.inputmethod.latin.makedict.UnsupportedFormatException;
-import com.android.inputmethod.latin.makedict.Ver2DictEncoder;
+package org.kelar.inputmethod.latin.dicttool;
+
+import org.kelar.inputmethod.latin.common.CodePointUtils;
+import org.kelar.inputmethod.latin.dicttool.BinaryDictOffdeviceUtils;
+import org.kelar.inputmethod.latin.dicttool.Compress;
+import org.kelar.inputmethod.latin.dicttool.Crypt;
+import org.kelar.inputmethod.latin.dicttool.BinaryDictOffdeviceUtils.DecoderChainSpec;
+import org.kelar.inputmethod.latin.makedict.BinaryDictIOUtils;
+import org.kelar.inputmethod.latin.makedict.BinaryDictUtils;
+import org.kelar.inputmethod.latin.makedict.DictDecoder;
+import org.kelar.inputmethod.latin.makedict.DictEncoder;
+import org.kelar.inputmethod.latin.makedict.DictionaryHeader;
+import org.kelar.inputmethod.latin.makedict.FormatSpec;
+import org.kelar.inputmethod.latin.makedict.FormatSpec.DictionaryOptions;
+import org.kelar.inputmethod.latin.makedict.FormatSpec.FormatOptions;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary.PtNodeArray;
+import org.kelar.inputmethod.latin.makedict.ProbabilityInfo;
+import org.kelar.inputmethod.latin.makedict.UnsupportedFormatException;
+import org.kelar.inputmethod.latin.makedict.Ver2DictEncoder;
 
 import junit.framework.TestCase;
 
diff --git a/tools/dicttool/tests/com/android/inputmethod/latin/makedict/BinaryDictEncoderFlattenTreeTests.java b/tools/dicttool/tests/org/kelar/inputmethod/latin/makedict/BinaryDictEncoderFlattenTreeTests.java
index 178fc41e2..ec1377704 100644
--- a/tools/dicttool/tests/com/android/inputmethod/latin/makedict/BinaryDictEncoderFlattenTreeTests.java
+++ b/tools/dicttool/tests/org/kelar/inputmethod/latin/makedict/BinaryDictEncoderFlattenTreeTests.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.FusionDictionary.PtNodeArray;
+import org.kelar.inputmethod.latin.makedict.FormatSpec.DictionaryOptions;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary.PtNodeArray;
 
 import junit.framework.TestCase;
 
diff --git a/tools/dicttool/tests/com/android/inputmethod/latin/makedict/FusionDictionaryTest.java b/tools/dicttool/tests/org/kelar/inputmethod/latin/makedict/FusionDictionaryTest.java
index 901d0cef3..a16c27ec7 100644
--- a/tools/dicttool/tests/com/android/inputmethod/latin/makedict/FusionDictionaryTest.java
+++ b/tools/dicttool/tests/org/kelar/inputmethod/latin/makedict/FusionDictionaryTest.java
@@ -14,13 +14,13 @@
  * 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.FusionDictionary;
-import com.android.inputmethod.latin.makedict.FusionDictionary.PtNode;
-import com.android.inputmethod.latin.makedict.FusionDictionary.PtNodeArray;
-import com.android.inputmethod.latin.makedict.WordProperty;
+import org.kelar.inputmethod.latin.makedict.FormatSpec.DictionaryOptions;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary.PtNode;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary.PtNodeArray;
+import org.kelar.inputmethod.latin.makedict.WordProperty;
 
 import junit.framework.TestCase;