diff --git a/Android.mk b/Android.mk
old mode 100755
new mode 100644
index 5396ed518..8f1acc55a
--- a/Android.mk
+++ b/Android.mk
@@ -1,23 +1,17 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
+# Copyright (C) 2010 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_PATH := $(call my-dir)
 
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_PACKAGE_NAME := LatinIME
-
-LOCAL_CERTIFICATE := shared
-
-LOCAL_JNI_SHARED_LIBRARIES := libjni_latinime
-
-LOCAL_STATIC_JAVA_LIBRARIES := android-common
-
-#LOCAL_AAPT_FLAGS := -0 .dict
-
-LOCAL_SDK_VERSION := current
-
-LOCAL_PROGUARD_FLAGS := -include $(LOCAL_PATH)/proguard.flags
-
-include $(BUILD_PACKAGE)
-include $(LOCAL_PATH)/dictionary/Android.mk
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/java/Android.mk b/java/Android.mk
new file mode 100755
index 000000000..4bb8986ee
--- /dev/null
+++ b/java/Android.mk
@@ -0,0 +1,22 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+
+LOCAL_PACKAGE_NAME := LatinIME
+
+LOCAL_CERTIFICATE := shared
+
+LOCAL_JNI_SHARED_LIBRARIES := libjni_latinime
+
+LOCAL_STATIC_JAVA_LIBRARIES := android-common
+
+#LOCAL_AAPT_FLAGS := -0 .dict
+
+LOCAL_SDK_VERSION := current
+
+LOCAL_PROGUARD_FLAGS := -include $(LOCAL_PATH)/proguard.flags
+
+include $(BUILD_PACKAGE)
diff --git a/AndroidManifest.xml b/java/AndroidManifest.xml
similarity index 90%
rename from AndroidManifest.xml
rename to java/AndroidManifest.xml
index c42ad42ef..23dbf7564 100755
--- a/AndroidManifest.xml
+++ b/java/AndroidManifest.xml
@@ -32,6 +32,8 @@
                 android:label="@string/language_selection_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
+                <action android:name="com.android.inputmethod.latin.INPUT_LANGUAGE_SELECTION"/>
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
     </application>
diff --git a/proguard.flags b/java/proguard.flags
similarity index 100%
rename from proguard.flags
rename to java/proguard.flags
diff --git a/res/drawable-en-hdpi/sym_keyboard_delete.png b/java/res/drawable-en-hdpi/sym_keyboard_delete.png
similarity index 100%
rename from res/drawable-en-hdpi/sym_keyboard_delete.png
rename to java/res/drawable-en-hdpi/sym_keyboard_delete.png
diff --git a/res/drawable-en-hdpi/sym_keyboard_feedback_delete.png b/java/res/drawable-en-hdpi/sym_keyboard_feedback_delete.png
similarity index 100%
rename from res/drawable-en-hdpi/sym_keyboard_feedback_delete.png
rename to java/res/drawable-en-hdpi/sym_keyboard_feedback_delete.png
diff --git a/res/drawable-en-mdpi/sym_keyboard_delete.png b/java/res/drawable-en-mdpi/sym_keyboard_delete.png
similarity index 100%
rename from res/drawable-en-mdpi/sym_keyboard_delete.png
rename to java/res/drawable-en-mdpi/sym_keyboard_delete.png
diff --git a/res/drawable-en-mdpi/sym_keyboard_feedback_delete.png b/java/res/drawable-en-mdpi/sym_keyboard_feedback_delete.png
similarity index 100%
rename from res/drawable-en-mdpi/sym_keyboard_feedback_delete.png
rename to java/res/drawable-en-mdpi/sym_keyboard_feedback_delete.png
diff --git a/res/drawable-hdpi/btn_keyboard_key_fulltrans_normal.9.png b/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_normal.9.png
similarity index 100%
rename from res/drawable-hdpi/btn_keyboard_key_fulltrans_normal.9.png
rename to java/res/drawable-hdpi/btn_keyboard_key_fulltrans_normal.9.png
diff --git a/res/drawable-hdpi/btn_keyboard_key_fulltrans_pressed.9.png b/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_pressed.9.png
similarity index 100%
rename from res/drawable-hdpi/btn_keyboard_key_fulltrans_pressed.9.png
rename to java/res/drawable-hdpi/btn_keyboard_key_fulltrans_pressed.9.png
diff --git a/res/drawable-hdpi/btn_keyboard_key_normal.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal.9.png
similarity index 100%
rename from res/drawable-hdpi/btn_keyboard_key_normal.9.png
rename to java/res/drawable-hdpi/btn_keyboard_key_normal.9.png
diff --git a/res/drawable-hdpi/btn_keyboard_key_normal_off.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_off.9.png
similarity index 100%
rename from res/drawable-hdpi/btn_keyboard_key_normal_off.9.png
rename to java/res/drawable-hdpi/btn_keyboard_key_normal_off.9.png
diff --git a/res/drawable-hdpi/btn_keyboard_key_normal_on.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_on.9.png
similarity index 100%
rename from res/drawable-hdpi/btn_keyboard_key_normal_on.9.png
rename to java/res/drawable-hdpi/btn_keyboard_key_normal_on.9.png
diff --git a/res/drawable-hdpi/btn_keyboard_key_pressed.9.png b/java/res/drawable-hdpi/btn_keyboard_key_pressed.9.png
similarity index 100%
rename from res/drawable-hdpi/btn_keyboard_key_pressed.9.png
rename to java/res/drawable-hdpi/btn_keyboard_key_pressed.9.png
diff --git a/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png b/java/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png
similarity index 100%
rename from res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png
rename to java/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png
diff --git a/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png b/java/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png
similarity index 100%
rename from res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png
rename to java/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png
diff --git a/res/drawable-hdpi/cancel.png b/java/res/drawable-hdpi/cancel.png
similarity index 100%
rename from res/drawable-hdpi/cancel.png
rename to java/res/drawable-hdpi/cancel.png
diff --git a/res/drawable-hdpi/candidate_feedback_background.9.png b/java/res/drawable-hdpi/candidate_feedback_background.9.png
similarity index 100%
rename from res/drawable-hdpi/candidate_feedback_background.9.png
rename to java/res/drawable-hdpi/candidate_feedback_background.9.png
diff --git a/res/drawable-hdpi/caution.png b/java/res/drawable-hdpi/caution.png
similarity index 100%
rename from res/drawable-hdpi/caution.png
rename to java/res/drawable-hdpi/caution.png
diff --git a/res/drawable-hdpi/dialog_bubble_step02.9.png b/java/res/drawable-hdpi/dialog_bubble_step02.9.png
similarity index 100%
rename from res/drawable-hdpi/dialog_bubble_step02.9.png
rename to java/res/drawable-hdpi/dialog_bubble_step02.9.png
diff --git a/res/drawable-hdpi/dialog_bubble_step07.9.png b/java/res/drawable-hdpi/dialog_bubble_step07.9.png
similarity index 100%
rename from res/drawable-hdpi/dialog_bubble_step07.9.png
rename to java/res/drawable-hdpi/dialog_bubble_step07.9.png
diff --git a/res/drawable-hdpi/dialog_top_dark_bottom_medium.png b/java/res/drawable-hdpi/dialog_top_dark_bottom_medium.png
similarity index 100%
rename from res/drawable-hdpi/dialog_top_dark_bottom_medium.png
rename to java/res/drawable-hdpi/dialog_top_dark_bottom_medium.png
diff --git a/res/drawable-hdpi/highlight_pressed.png b/java/res/drawable-hdpi/highlight_pressed.png
similarity index 100%
rename from res/drawable-hdpi/highlight_pressed.png
rename to java/res/drawable-hdpi/highlight_pressed.png
diff --git a/res/drawable-hdpi/ic_dialog_alert_large.png b/java/res/drawable-hdpi/ic_dialog_alert_large.png
similarity index 100%
rename from res/drawable-hdpi/ic_dialog_alert_large.png
rename to java/res/drawable-hdpi/ic_dialog_alert_large.png
diff --git a/res/drawable-hdpi/ic_dialog_keyboard.png b/java/res/drawable-hdpi/ic_dialog_keyboard.png
similarity index 100%
rename from res/drawable-hdpi/ic_dialog_keyboard.png
rename to java/res/drawable-hdpi/ic_dialog_keyboard.png
diff --git a/res/drawable-hdpi/ic_dialog_voice_input.png b/java/res/drawable-hdpi/ic_dialog_voice_input.png
similarity index 100%
rename from res/drawable-hdpi/ic_dialog_voice_input.png
rename to java/res/drawable-hdpi/ic_dialog_voice_input.png
diff --git a/res/drawable-hdpi/ic_dialog_wave_0_0.png b/java/res/drawable-hdpi/ic_dialog_wave_0_0.png
similarity index 100%
rename from res/drawable-hdpi/ic_dialog_wave_0_0.png
rename to java/res/drawable-hdpi/ic_dialog_wave_0_0.png
diff --git a/res/drawable-hdpi/ic_dialog_wave_1_3.png b/java/res/drawable-hdpi/ic_dialog_wave_1_3.png
similarity index 100%
rename from res/drawable-hdpi/ic_dialog_wave_1_3.png
rename to java/res/drawable-hdpi/ic_dialog_wave_1_3.png
diff --git a/res/drawable-hdpi/ic_dialog_wave_2_3.png b/java/res/drawable-hdpi/ic_dialog_wave_2_3.png
similarity index 100%
rename from res/drawable-hdpi/ic_dialog_wave_2_3.png
rename to java/res/drawable-hdpi/ic_dialog_wave_2_3.png
diff --git a/res/drawable-hdpi/ic_dialog_wave_3_3.png b/java/res/drawable-hdpi/ic_dialog_wave_3_3.png
similarity index 100%
rename from res/drawable-hdpi/ic_dialog_wave_3_3.png
rename to java/res/drawable-hdpi/ic_dialog_wave_3_3.png
diff --git a/res/drawable-hdpi/ic_dialog_wave_4_3.png b/java/res/drawable-hdpi/ic_dialog_wave_4_3.png
similarity index 100%
rename from res/drawable-hdpi/ic_dialog_wave_4_3.png
rename to java/res/drawable-hdpi/ic_dialog_wave_4_3.png
diff --git a/res/drawable-hdpi/ic_mic_dialog.png b/java/res/drawable-hdpi/ic_mic_dialog.png
similarity index 100%
rename from res/drawable-hdpi/ic_mic_dialog.png
rename to java/res/drawable-hdpi/ic_mic_dialog.png
diff --git a/res/drawable-hdpi/ic_suggest_strip_microphone.png b/java/res/drawable-hdpi/ic_suggest_strip_microphone.png
similarity index 100%
rename from res/drawable-hdpi/ic_suggest_strip_microphone.png
rename to java/res/drawable-hdpi/ic_suggest_strip_microphone.png
diff --git a/res/drawable-hdpi/ic_suggest_strip_microphone_swipe.png b/java/res/drawable-hdpi/ic_suggest_strip_microphone_swipe.png
similarity index 100%
rename from res/drawable-hdpi/ic_suggest_strip_microphone_swipe.png
rename to java/res/drawable-hdpi/ic_suggest_strip_microphone_swipe.png
diff --git a/res/drawable-hdpi/ic_suggest_strip_scroll_left_arrow.png b/java/res/drawable-hdpi/ic_suggest_strip_scroll_left_arrow.png
similarity index 100%
rename from res/drawable-hdpi/ic_suggest_strip_scroll_left_arrow.png
rename to java/res/drawable-hdpi/ic_suggest_strip_scroll_left_arrow.png
diff --git a/res/drawable-hdpi/ic_suggest_strip_scroll_right_arrow.png b/java/res/drawable-hdpi/ic_suggest_strip_scroll_right_arrow.png
similarity index 100%
rename from res/drawable-hdpi/ic_suggest_strip_scroll_right_arrow.png
rename to java/res/drawable-hdpi/ic_suggest_strip_scroll_right_arrow.png
diff --git a/res/drawable-hdpi/keyboard_background.9.png b/java/res/drawable-hdpi/keyboard_background.9.png
similarity index 100%
rename from res/drawable-hdpi/keyboard_background.9.png
rename to java/res/drawable-hdpi/keyboard_background.9.png
diff --git a/res/drawable-hdpi/keyboard_suggest_strip.9.png b/java/res/drawable-hdpi/keyboard_suggest_strip.9.png
similarity index 100%
rename from res/drawable-hdpi/keyboard_suggest_strip.9.png
rename to java/res/drawable-hdpi/keyboard_suggest_strip.9.png
diff --git a/res/drawable-hdpi/keyboard_suggest_strip_divider.png b/java/res/drawable-hdpi/keyboard_suggest_strip_divider.png
similarity index 100%
rename from res/drawable-hdpi/keyboard_suggest_strip_divider.png
rename to java/res/drawable-hdpi/keyboard_suggest_strip_divider.png
diff --git a/res/drawable-hdpi/list_selector_background_pressed.9.png b/java/res/drawable-hdpi/list_selector_background_pressed.9.png
similarity index 100%
rename from res/drawable-hdpi/list_selector_background_pressed.9.png
rename to java/res/drawable-hdpi/list_selector_background_pressed.9.png
diff --git a/res/drawable-hdpi/mic_slash.png b/java/res/drawable-hdpi/mic_slash.png
similarity index 100%
rename from res/drawable-hdpi/mic_slash.png
rename to java/res/drawable-hdpi/mic_slash.png
diff --git a/res/drawable-hdpi/ok_cancel.png b/java/res/drawable-hdpi/ok_cancel.png
similarity index 100%
rename from res/drawable-hdpi/ok_cancel.png
rename to java/res/drawable-hdpi/ok_cancel.png
diff --git a/res/drawable-hdpi/speak_now_level0.png b/java/res/drawable-hdpi/speak_now_level0.png
similarity index 100%
rename from res/drawable-hdpi/speak_now_level0.png
rename to java/res/drawable-hdpi/speak_now_level0.png
diff --git a/res/drawable-hdpi/speak_now_level1.png b/java/res/drawable-hdpi/speak_now_level1.png
similarity index 100%
rename from res/drawable-hdpi/speak_now_level1.png
rename to java/res/drawable-hdpi/speak_now_level1.png
diff --git a/res/drawable-hdpi/speak_now_level2.png b/java/res/drawable-hdpi/speak_now_level2.png
similarity index 100%
rename from res/drawable-hdpi/speak_now_level2.png
rename to java/res/drawable-hdpi/speak_now_level2.png
diff --git a/res/drawable-hdpi/speak_now_level3.png b/java/res/drawable-hdpi/speak_now_level3.png
similarity index 100%
rename from res/drawable-hdpi/speak_now_level3.png
rename to java/res/drawable-hdpi/speak_now_level3.png
diff --git a/res/drawable-hdpi/speak_now_level4.png b/java/res/drawable-hdpi/speak_now_level4.png
similarity index 100%
rename from res/drawable-hdpi/speak_now_level4.png
rename to java/res/drawable-hdpi/speak_now_level4.png
diff --git a/res/drawable-hdpi/speak_now_level5.png b/java/res/drawable-hdpi/speak_now_level5.png
similarity index 100%
rename from res/drawable-hdpi/speak_now_level5.png
rename to java/res/drawable-hdpi/speak_now_level5.png
diff --git a/res/drawable-hdpi/speak_now_level6.png b/java/res/drawable-hdpi/speak_now_level6.png
similarity index 100%
rename from res/drawable-hdpi/speak_now_level6.png
rename to java/res/drawable-hdpi/speak_now_level6.png
diff --git a/res/drawable-hdpi/sym_keyboard_123_mic.png b/java/res/drawable-hdpi/sym_keyboard_123_mic.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_123_mic.png
rename to java/res/drawable-hdpi/sym_keyboard_123_mic.png
diff --git a/res/drawable-hdpi/sym_keyboard_delete.png b/java/res/drawable-hdpi/sym_keyboard_delete.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_delete.png
rename to java/res/drawable-hdpi/sym_keyboard_delete.png
diff --git a/res/drawable-hdpi/sym_keyboard_done.png b/java/res/drawable-hdpi/sym_keyboard_done.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_done.png
rename to java/res/drawable-hdpi/sym_keyboard_done.png
diff --git a/res/drawable-hdpi/sym_keyboard_feedback_123_mic.png b/java/res/drawable-hdpi/sym_keyboard_feedback_123_mic.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_feedback_123_mic.png
rename to java/res/drawable-hdpi/sym_keyboard_feedback_123_mic.png
diff --git a/res/drawable-hdpi/sym_keyboard_feedback_delete.png b/java/res/drawable-hdpi/sym_keyboard_feedback_delete.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_feedback_delete.png
rename to java/res/drawable-hdpi/sym_keyboard_feedback_delete.png
diff --git a/res/drawable-hdpi/sym_keyboard_feedback_done.png b/java/res/drawable-hdpi/sym_keyboard_feedback_done.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_feedback_done.png
rename to java/res/drawable-hdpi/sym_keyboard_feedback_done.png
diff --git a/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_left.png b/java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_left.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_feedback_language_arrows_left.png
rename to java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_left.png
diff --git a/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_right.png b/java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_right.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_feedback_language_arrows_right.png
rename to java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_right.png
diff --git a/res/drawable-hdpi/sym_keyboard_feedback_mic.png b/java/res/drawable-hdpi/sym_keyboard_feedback_mic.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_feedback_mic.png
rename to java/res/drawable-hdpi/sym_keyboard_feedback_mic.png
diff --git a/res/drawable-hdpi/sym_keyboard_feedback_numalt.png b/java/res/drawable-hdpi/sym_keyboard_feedback_numalt.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_feedback_numalt.png
rename to java/res/drawable-hdpi/sym_keyboard_feedback_numalt.png
diff --git a/res/drawable-hdpi/sym_keyboard_feedback_return.png b/java/res/drawable-hdpi/sym_keyboard_feedback_return.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_feedback_return.png
rename to java/res/drawable-hdpi/sym_keyboard_feedback_return.png
diff --git a/res/drawable-hdpi/sym_keyboard_feedback_search.png b/java/res/drawable-hdpi/sym_keyboard_feedback_search.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_feedback_search.png
rename to java/res/drawable-hdpi/sym_keyboard_feedback_search.png
diff --git a/res/drawable-hdpi/sym_keyboard_feedback_shift.png b/java/res/drawable-hdpi/sym_keyboard_feedback_shift.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_feedback_shift.png
rename to java/res/drawable-hdpi/sym_keyboard_feedback_shift.png
diff --git a/res/drawable-hdpi/sym_keyboard_feedback_shift_locked.png b/java/res/drawable-hdpi/sym_keyboard_feedback_shift_locked.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_feedback_shift_locked.png
rename to java/res/drawable-hdpi/sym_keyboard_feedback_shift_locked.png
diff --git a/res/drawable-hdpi/sym_keyboard_feedback_space.png b/java/res/drawable-hdpi/sym_keyboard_feedback_space.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_feedback_space.png
rename to java/res/drawable-hdpi/sym_keyboard_feedback_space.png
diff --git a/res/drawable-hdpi/sym_keyboard_feedback_tab.png b/java/res/drawable-hdpi/sym_keyboard_feedback_tab.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_feedback_tab.png
rename to java/res/drawable-hdpi/sym_keyboard_feedback_tab.png
diff --git a/res/drawable-hdpi/sym_keyboard_feedback_tabprev.png b/java/res/drawable-hdpi/sym_keyboard_feedback_tabprev.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_feedback_tabprev.png
rename to java/res/drawable-hdpi/sym_keyboard_feedback_tabprev.png
diff --git a/res/drawable-hdpi/sym_keyboard_globe.png b/java/res/drawable-hdpi/sym_keyboard_globe.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_globe.png
rename to java/res/drawable-hdpi/sym_keyboard_globe.png
diff --git a/res/drawable-hdpi/sym_keyboard_language_arrows_left.png b/java/res/drawable-hdpi/sym_keyboard_language_arrows_left.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_language_arrows_left.png
rename to java/res/drawable-hdpi/sym_keyboard_language_arrows_left.png
diff --git a/res/drawable-hdpi/sym_keyboard_language_arrows_right.png b/java/res/drawable-hdpi/sym_keyboard_language_arrows_right.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_language_arrows_right.png
rename to java/res/drawable-hdpi/sym_keyboard_language_arrows_right.png
diff --git a/res/drawable-hdpi/sym_keyboard_mic.png b/java/res/drawable-hdpi/sym_keyboard_mic.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_mic.png
rename to java/res/drawable-hdpi/sym_keyboard_mic.png
diff --git a/res/drawable-hdpi/sym_keyboard_num0.png b/java/res/drawable-hdpi/sym_keyboard_num0.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_num0.png
rename to java/res/drawable-hdpi/sym_keyboard_num0.png
diff --git a/res/drawable-hdpi/sym_keyboard_num1.png b/java/res/drawable-hdpi/sym_keyboard_num1.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_num1.png
rename to java/res/drawable-hdpi/sym_keyboard_num1.png
diff --git a/res/drawable-hdpi/sym_keyboard_num2.png b/java/res/drawable-hdpi/sym_keyboard_num2.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_num2.png
rename to java/res/drawable-hdpi/sym_keyboard_num2.png
diff --git a/res/drawable-hdpi/sym_keyboard_num3.png b/java/res/drawable-hdpi/sym_keyboard_num3.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_num3.png
rename to java/res/drawable-hdpi/sym_keyboard_num3.png
diff --git a/res/drawable-hdpi/sym_keyboard_num4.png b/java/res/drawable-hdpi/sym_keyboard_num4.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_num4.png
rename to java/res/drawable-hdpi/sym_keyboard_num4.png
diff --git a/res/drawable-hdpi/sym_keyboard_num5.png b/java/res/drawable-hdpi/sym_keyboard_num5.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_num5.png
rename to java/res/drawable-hdpi/sym_keyboard_num5.png
diff --git a/res/drawable-hdpi/sym_keyboard_num6.png b/java/res/drawable-hdpi/sym_keyboard_num6.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_num6.png
rename to java/res/drawable-hdpi/sym_keyboard_num6.png
diff --git a/res/drawable-hdpi/sym_keyboard_num7.png b/java/res/drawable-hdpi/sym_keyboard_num7.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_num7.png
rename to java/res/drawable-hdpi/sym_keyboard_num7.png
diff --git a/res/drawable-hdpi/sym_keyboard_num8.png b/java/res/drawable-hdpi/sym_keyboard_num8.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_num8.png
rename to java/res/drawable-hdpi/sym_keyboard_num8.png
diff --git a/res/drawable-hdpi/sym_keyboard_num9.png b/java/res/drawable-hdpi/sym_keyboard_num9.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_num9.png
rename to java/res/drawable-hdpi/sym_keyboard_num9.png
diff --git a/res/drawable-hdpi/sym_keyboard_numalt.png b/java/res/drawable-hdpi/sym_keyboard_numalt.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_numalt.png
rename to java/res/drawable-hdpi/sym_keyboard_numalt.png
diff --git a/res/drawable-hdpi/sym_keyboard_numpound.png b/java/res/drawable-hdpi/sym_keyboard_numpound.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_numpound.png
rename to java/res/drawable-hdpi/sym_keyboard_numpound.png
diff --git a/res/drawable-hdpi/sym_keyboard_numstar.png b/java/res/drawable-hdpi/sym_keyboard_numstar.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_numstar.png
rename to java/res/drawable-hdpi/sym_keyboard_numstar.png
diff --git a/res/drawable-hdpi/sym_keyboard_return.png b/java/res/drawable-hdpi/sym_keyboard_return.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_return.png
rename to java/res/drawable-hdpi/sym_keyboard_return.png
diff --git a/res/drawable-hdpi/sym_keyboard_search.png b/java/res/drawable-hdpi/sym_keyboard_search.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_search.png
rename to java/res/drawable-hdpi/sym_keyboard_search.png
diff --git a/res/drawable-hdpi/sym_keyboard_shift.png b/java/res/drawable-hdpi/sym_keyboard_shift.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_shift.png
rename to java/res/drawable-hdpi/sym_keyboard_shift.png
diff --git a/res/drawable-hdpi/sym_keyboard_shift_locked.png b/java/res/drawable-hdpi/sym_keyboard_shift_locked.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_shift_locked.png
rename to java/res/drawable-hdpi/sym_keyboard_shift_locked.png
diff --git a/res/drawable-hdpi/sym_keyboard_space.png b/java/res/drawable-hdpi/sym_keyboard_space.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_space.png
rename to java/res/drawable-hdpi/sym_keyboard_space.png
diff --git a/res/drawable-hdpi/sym_keyboard_tab.png b/java/res/drawable-hdpi/sym_keyboard_tab.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_tab.png
rename to java/res/drawable-hdpi/sym_keyboard_tab.png
diff --git a/res/drawable-hdpi/sym_keyboard_tabprev.png b/java/res/drawable-hdpi/sym_keyboard_tabprev.png
similarity index 100%
rename from res/drawable-hdpi/sym_keyboard_tabprev.png
rename to java/res/drawable-hdpi/sym_keyboard_tabprev.png
diff --git a/res/drawable-hdpi/voice_ime_background.9.png b/java/res/drawable-hdpi/voice_ime_background.9.png
similarity index 100%
rename from res/drawable-hdpi/voice_ime_background.9.png
rename to java/res/drawable-hdpi/voice_ime_background.9.png
diff --git a/res/drawable-hdpi/working.png b/java/res/drawable-hdpi/working.png
similarity index 100%
rename from res/drawable-hdpi/working.png
rename to java/res/drawable-hdpi/working.png
diff --git a/res/drawable-land-hdpi/btn_keyboard_key_normal.9.png b/java/res/drawable-land-hdpi/btn_keyboard_key_normal.9.png
similarity index 100%
rename from res/drawable-land-hdpi/btn_keyboard_key_normal.9.png
rename to java/res/drawable-land-hdpi/btn_keyboard_key_normal.9.png
diff --git a/res/drawable-land-hdpi/btn_keyboard_key_normal_off.9.png b/java/res/drawable-land-hdpi/btn_keyboard_key_normal_off.9.png
similarity index 100%
rename from res/drawable-land-hdpi/btn_keyboard_key_normal_off.9.png
rename to java/res/drawable-land-hdpi/btn_keyboard_key_normal_off.9.png
diff --git a/res/drawable-land-hdpi/btn_keyboard_key_normal_on.9.png b/java/res/drawable-land-hdpi/btn_keyboard_key_normal_on.9.png
similarity index 100%
rename from res/drawable-land-hdpi/btn_keyboard_key_normal_on.9.png
rename to java/res/drawable-land-hdpi/btn_keyboard_key_normal_on.9.png
diff --git a/res/drawable-land-hdpi/btn_keyboard_key_pressed.9.png b/java/res/drawable-land-hdpi/btn_keyboard_key_pressed.9.png
similarity index 100%
rename from res/drawable-land-hdpi/btn_keyboard_key_pressed.9.png
rename to java/res/drawable-land-hdpi/btn_keyboard_key_pressed.9.png
diff --git a/res/drawable-land-hdpi/btn_keyboard_key_pressed_off.9.png b/java/res/drawable-land-hdpi/btn_keyboard_key_pressed_off.9.png
similarity index 100%
rename from res/drawable-land-hdpi/btn_keyboard_key_pressed_off.9.png
rename to java/res/drawable-land-hdpi/btn_keyboard_key_pressed_off.9.png
diff --git a/res/drawable-land-hdpi/btn_keyboard_key_pressed_on.9.png b/java/res/drawable-land-hdpi/btn_keyboard_key_pressed_on.9.png
similarity index 100%
rename from res/drawable-land-hdpi/btn_keyboard_key_pressed_on.9.png
rename to java/res/drawable-land-hdpi/btn_keyboard_key_pressed_on.9.png
diff --git a/res/drawable-land-hdpi/keyboard_suggest_strip_divider.png b/java/res/drawable-land-hdpi/keyboard_suggest_strip_divider.png
similarity index 100%
rename from res/drawable-land-hdpi/keyboard_suggest_strip_divider.png
rename to java/res/drawable-land-hdpi/keyboard_suggest_strip_divider.png
diff --git a/res/drawable-land-mdpi/btn_keyboard_key_normal.9.png b/java/res/drawable-land-mdpi/btn_keyboard_key_normal.9.png
similarity index 100%
rename from res/drawable-land-mdpi/btn_keyboard_key_normal.9.png
rename to java/res/drawable-land-mdpi/btn_keyboard_key_normal.9.png
diff --git a/res/drawable-land-mdpi/btn_keyboard_key_normal_off.9.png b/java/res/drawable-land-mdpi/btn_keyboard_key_normal_off.9.png
similarity index 100%
rename from res/drawable-land-mdpi/btn_keyboard_key_normal_off.9.png
rename to java/res/drawable-land-mdpi/btn_keyboard_key_normal_off.9.png
diff --git a/res/drawable-land-mdpi/btn_keyboard_key_normal_on.9.png b/java/res/drawable-land-mdpi/btn_keyboard_key_normal_on.9.png
similarity index 100%
rename from res/drawable-land-mdpi/btn_keyboard_key_normal_on.9.png
rename to java/res/drawable-land-mdpi/btn_keyboard_key_normal_on.9.png
diff --git a/res/drawable-land-mdpi/btn_keyboard_key_pressed.9.png b/java/res/drawable-land-mdpi/btn_keyboard_key_pressed.9.png
similarity index 100%
rename from res/drawable-land-mdpi/btn_keyboard_key_pressed.9.png
rename to java/res/drawable-land-mdpi/btn_keyboard_key_pressed.9.png
diff --git a/res/drawable-land-mdpi/btn_keyboard_key_pressed_off.9.png b/java/res/drawable-land-mdpi/btn_keyboard_key_pressed_off.9.png
similarity index 100%
rename from res/drawable-land-mdpi/btn_keyboard_key_pressed_off.9.png
rename to java/res/drawable-land-mdpi/btn_keyboard_key_pressed_off.9.png
diff --git a/res/drawable-land-mdpi/btn_keyboard_key_pressed_on.9.png b/java/res/drawable-land-mdpi/btn_keyboard_key_pressed_on.9.png
similarity index 100%
rename from res/drawable-land-mdpi/btn_keyboard_key_pressed_on.9.png
rename to java/res/drawable-land-mdpi/btn_keyboard_key_pressed_on.9.png
diff --git a/res/drawable-land-mdpi/keyboard_suggest_strip_divider.png b/java/res/drawable-land-mdpi/keyboard_suggest_strip_divider.png
similarity index 100%
rename from res/drawable-land-mdpi/keyboard_suggest_strip_divider.png
rename to java/res/drawable-land-mdpi/keyboard_suggest_strip_divider.png
diff --git a/res/drawable-land/btn_keyboard_key.xml b/java/res/drawable-land/btn_keyboard_key.xml
similarity index 100%
rename from res/drawable-land/btn_keyboard_key.xml
rename to java/res/drawable-land/btn_keyboard_key.xml
diff --git a/res/drawable-mdpi/btn_keyboard_key_fulltrans_normal.9.png b/java/res/drawable-mdpi/btn_keyboard_key_fulltrans_normal.9.png
similarity index 100%
rename from res/drawable-mdpi/btn_keyboard_key_fulltrans_normal.9.png
rename to java/res/drawable-mdpi/btn_keyboard_key_fulltrans_normal.9.png
diff --git a/res/drawable-mdpi/btn_keyboard_key_fulltrans_pressed.9.png b/java/res/drawable-mdpi/btn_keyboard_key_fulltrans_pressed.9.png
similarity index 100%
rename from res/drawable-mdpi/btn_keyboard_key_fulltrans_pressed.9.png
rename to java/res/drawable-mdpi/btn_keyboard_key_fulltrans_pressed.9.png
diff --git a/res/drawable-mdpi/btn_keyboard_key_normal.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal.9.png
similarity index 100%
rename from res/drawable-mdpi/btn_keyboard_key_normal.9.png
rename to java/res/drawable-mdpi/btn_keyboard_key_normal.9.png
diff --git a/res/drawable-mdpi/btn_keyboard_key_normal_off.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal_off.9.png
similarity index 100%
rename from res/drawable-mdpi/btn_keyboard_key_normal_off.9.png
rename to java/res/drawable-mdpi/btn_keyboard_key_normal_off.9.png
diff --git a/res/drawable-mdpi/btn_keyboard_key_normal_on.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal_on.9.png
similarity index 100%
rename from res/drawable-mdpi/btn_keyboard_key_normal_on.9.png
rename to java/res/drawable-mdpi/btn_keyboard_key_normal_on.9.png
diff --git a/res/drawable-mdpi/btn_keyboard_key_pressed.9.png b/java/res/drawable-mdpi/btn_keyboard_key_pressed.9.png
similarity index 100%
rename from res/drawable-mdpi/btn_keyboard_key_pressed.9.png
rename to java/res/drawable-mdpi/btn_keyboard_key_pressed.9.png
diff --git a/res/drawable-mdpi/btn_keyboard_key_pressed_off.9.png b/java/res/drawable-mdpi/btn_keyboard_key_pressed_off.9.png
similarity index 100%
rename from res/drawable-mdpi/btn_keyboard_key_pressed_off.9.png
rename to java/res/drawable-mdpi/btn_keyboard_key_pressed_off.9.png
diff --git a/res/drawable-mdpi/btn_keyboard_key_pressed_on.9.png b/java/res/drawable-mdpi/btn_keyboard_key_pressed_on.9.png
similarity index 100%
rename from res/drawable-mdpi/btn_keyboard_key_pressed_on.9.png
rename to java/res/drawable-mdpi/btn_keyboard_key_pressed_on.9.png
diff --git a/res/drawable-mdpi/candidate_feedback_background.9.png b/java/res/drawable-mdpi/candidate_feedback_background.9.png
similarity index 100%
rename from res/drawable-mdpi/candidate_feedback_background.9.png
rename to java/res/drawable-mdpi/candidate_feedback_background.9.png
diff --git a/res/drawable-mdpi/dialog_bubble_step02.9.png b/java/res/drawable-mdpi/dialog_bubble_step02.9.png
similarity index 100%
rename from res/drawable-mdpi/dialog_bubble_step02.9.png
rename to java/res/drawable-mdpi/dialog_bubble_step02.9.png
diff --git a/res/drawable-mdpi/dialog_bubble_step07.9.png b/java/res/drawable-mdpi/dialog_bubble_step07.9.png
similarity index 100%
rename from res/drawable-mdpi/dialog_bubble_step07.9.png
rename to java/res/drawable-mdpi/dialog_bubble_step07.9.png
diff --git a/res/drawable-mdpi/highlight_pressed.png b/java/res/drawable-mdpi/highlight_pressed.png
similarity index 100%
rename from res/drawable-mdpi/highlight_pressed.png
rename to java/res/drawable-mdpi/highlight_pressed.png
diff --git a/res/drawable-mdpi/ic_dialog_keyboard.png b/java/res/drawable-mdpi/ic_dialog_keyboard.png
similarity index 100%
rename from res/drawable-mdpi/ic_dialog_keyboard.png
rename to java/res/drawable-mdpi/ic_dialog_keyboard.png
diff --git a/res/drawable-mdpi/ic_mic_dialog.png b/java/res/drawable-mdpi/ic_mic_dialog.png
similarity index 100%
rename from res/drawable-mdpi/ic_mic_dialog.png
rename to java/res/drawable-mdpi/ic_mic_dialog.png
diff --git a/res/drawable-mdpi/ic_suggest_strip_microphone.png b/java/res/drawable-mdpi/ic_suggest_strip_microphone.png
similarity index 100%
rename from res/drawable-mdpi/ic_suggest_strip_microphone.png
rename to java/res/drawable-mdpi/ic_suggest_strip_microphone.png
diff --git a/res/drawable-mdpi/ic_suggest_strip_microphone_swipe.png b/java/res/drawable-mdpi/ic_suggest_strip_microphone_swipe.png
similarity index 100%
rename from res/drawable-mdpi/ic_suggest_strip_microphone_swipe.png
rename to java/res/drawable-mdpi/ic_suggest_strip_microphone_swipe.png
diff --git a/res/drawable-mdpi/ic_suggest_strip_scroll_left_arrow.png b/java/res/drawable-mdpi/ic_suggest_strip_scroll_left_arrow.png
similarity index 100%
rename from res/drawable-mdpi/ic_suggest_strip_scroll_left_arrow.png
rename to java/res/drawable-mdpi/ic_suggest_strip_scroll_left_arrow.png
diff --git a/res/drawable-mdpi/ic_suggest_strip_scroll_right_arrow.png b/java/res/drawable-mdpi/ic_suggest_strip_scroll_right_arrow.png
similarity index 100%
rename from res/drawable-mdpi/ic_suggest_strip_scroll_right_arrow.png
rename to java/res/drawable-mdpi/ic_suggest_strip_scroll_right_arrow.png
diff --git a/res/drawable-mdpi/keyboard_background.9.png b/java/res/drawable-mdpi/keyboard_background.9.png
similarity index 100%
rename from res/drawable-mdpi/keyboard_background.9.png
rename to java/res/drawable-mdpi/keyboard_background.9.png
diff --git a/res/drawable-mdpi/keyboard_suggest_strip.9.png b/java/res/drawable-mdpi/keyboard_suggest_strip.9.png
similarity index 100%
rename from res/drawable-mdpi/keyboard_suggest_strip.9.png
rename to java/res/drawable-mdpi/keyboard_suggest_strip.9.png
diff --git a/res/drawable-mdpi/keyboard_suggest_strip_divider.png b/java/res/drawable-mdpi/keyboard_suggest_strip_divider.png
similarity index 100%
rename from res/drawable-mdpi/keyboard_suggest_strip_divider.png
rename to java/res/drawable-mdpi/keyboard_suggest_strip_divider.png
diff --git a/res/drawable-mdpi/list_selector_background_pressed.9.png b/java/res/drawable-mdpi/list_selector_background_pressed.9.png
similarity index 100%
rename from res/drawable-mdpi/list_selector_background_pressed.9.png
rename to java/res/drawable-mdpi/list_selector_background_pressed.9.png
diff --git a/res/drawable-mdpi/sym_keyboard_123_mic.png b/java/res/drawable-mdpi/sym_keyboard_123_mic.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_123_mic.png
rename to java/res/drawable-mdpi/sym_keyboard_123_mic.png
diff --git a/res/drawable-mdpi/sym_keyboard_delete.png b/java/res/drawable-mdpi/sym_keyboard_delete.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_delete.png
rename to java/res/drawable-mdpi/sym_keyboard_delete.png
diff --git a/res/drawable-mdpi/sym_keyboard_done.png b/java/res/drawable-mdpi/sym_keyboard_done.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_done.png
rename to java/res/drawable-mdpi/sym_keyboard_done.png
diff --git a/res/drawable-mdpi/sym_keyboard_feedback_123_mic.png b/java/res/drawable-mdpi/sym_keyboard_feedback_123_mic.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_feedback_123_mic.png
rename to java/res/drawable-mdpi/sym_keyboard_feedback_123_mic.png
diff --git a/res/drawable-mdpi/sym_keyboard_feedback_delete.png b/java/res/drawable-mdpi/sym_keyboard_feedback_delete.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_feedback_delete.png
rename to java/res/drawable-mdpi/sym_keyboard_feedback_delete.png
diff --git a/res/drawable-mdpi/sym_keyboard_feedback_done.png b/java/res/drawable-mdpi/sym_keyboard_feedback_done.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_feedback_done.png
rename to java/res/drawable-mdpi/sym_keyboard_feedback_done.png
diff --git a/res/drawable-mdpi/sym_keyboard_feedback_language_arrows_left.png b/java/res/drawable-mdpi/sym_keyboard_feedback_language_arrows_left.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_feedback_language_arrows_left.png
rename to java/res/drawable-mdpi/sym_keyboard_feedback_language_arrows_left.png
diff --git a/res/drawable-mdpi/sym_keyboard_feedback_language_arrows_right.png b/java/res/drawable-mdpi/sym_keyboard_feedback_language_arrows_right.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_feedback_language_arrows_right.png
rename to java/res/drawable-mdpi/sym_keyboard_feedback_language_arrows_right.png
diff --git a/res/drawable-mdpi/sym_keyboard_feedback_mic.png b/java/res/drawable-mdpi/sym_keyboard_feedback_mic.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_feedback_mic.png
rename to java/res/drawable-mdpi/sym_keyboard_feedback_mic.png
diff --git a/res/drawable-mdpi/sym_keyboard_feedback_numalt.png b/java/res/drawable-mdpi/sym_keyboard_feedback_numalt.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_feedback_numalt.png
rename to java/res/drawable-mdpi/sym_keyboard_feedback_numalt.png
diff --git a/res/drawable-mdpi/sym_keyboard_feedback_return.png b/java/res/drawable-mdpi/sym_keyboard_feedback_return.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_feedback_return.png
rename to java/res/drawable-mdpi/sym_keyboard_feedback_return.png
diff --git a/res/drawable-mdpi/sym_keyboard_feedback_search.png b/java/res/drawable-mdpi/sym_keyboard_feedback_search.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_feedback_search.png
rename to java/res/drawable-mdpi/sym_keyboard_feedback_search.png
diff --git a/res/drawable-mdpi/sym_keyboard_feedback_shift.png b/java/res/drawable-mdpi/sym_keyboard_feedback_shift.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_feedback_shift.png
rename to java/res/drawable-mdpi/sym_keyboard_feedback_shift.png
diff --git a/res/drawable-mdpi/sym_keyboard_feedback_shift_locked.png b/java/res/drawable-mdpi/sym_keyboard_feedback_shift_locked.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_feedback_shift_locked.png
rename to java/res/drawable-mdpi/sym_keyboard_feedback_shift_locked.png
diff --git a/res/drawable-mdpi/sym_keyboard_feedback_space.png b/java/res/drawable-mdpi/sym_keyboard_feedback_space.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_feedback_space.png
rename to java/res/drawable-mdpi/sym_keyboard_feedback_space.png
diff --git a/res/drawable-mdpi/sym_keyboard_feedback_tab.png b/java/res/drawable-mdpi/sym_keyboard_feedback_tab.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_feedback_tab.png
rename to java/res/drawable-mdpi/sym_keyboard_feedback_tab.png
diff --git a/res/drawable-mdpi/sym_keyboard_feedback_tabprev.png b/java/res/drawable-mdpi/sym_keyboard_feedback_tabprev.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_feedback_tabprev.png
rename to java/res/drawable-mdpi/sym_keyboard_feedback_tabprev.png
diff --git a/res/drawable-mdpi/sym_keyboard_globe.png b/java/res/drawable-mdpi/sym_keyboard_globe.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_globe.png
rename to java/res/drawable-mdpi/sym_keyboard_globe.png
diff --git a/res/drawable-mdpi/sym_keyboard_language_arrows_left.png b/java/res/drawable-mdpi/sym_keyboard_language_arrows_left.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_language_arrows_left.png
rename to java/res/drawable-mdpi/sym_keyboard_language_arrows_left.png
diff --git a/res/drawable-mdpi/sym_keyboard_language_arrows_right.png b/java/res/drawable-mdpi/sym_keyboard_language_arrows_right.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_language_arrows_right.png
rename to java/res/drawable-mdpi/sym_keyboard_language_arrows_right.png
diff --git a/res/drawable-mdpi/sym_keyboard_mic.png b/java/res/drawable-mdpi/sym_keyboard_mic.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_mic.png
rename to java/res/drawable-mdpi/sym_keyboard_mic.png
diff --git a/res/drawable-mdpi/sym_keyboard_num0.png b/java/res/drawable-mdpi/sym_keyboard_num0.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_num0.png
rename to java/res/drawable-mdpi/sym_keyboard_num0.png
diff --git a/res/drawable-mdpi/sym_keyboard_num1.png b/java/res/drawable-mdpi/sym_keyboard_num1.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_num1.png
rename to java/res/drawable-mdpi/sym_keyboard_num1.png
diff --git a/res/drawable-mdpi/sym_keyboard_num2.png b/java/res/drawable-mdpi/sym_keyboard_num2.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_num2.png
rename to java/res/drawable-mdpi/sym_keyboard_num2.png
diff --git a/res/drawable-mdpi/sym_keyboard_num3.png b/java/res/drawable-mdpi/sym_keyboard_num3.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_num3.png
rename to java/res/drawable-mdpi/sym_keyboard_num3.png
diff --git a/res/drawable-mdpi/sym_keyboard_num4.png b/java/res/drawable-mdpi/sym_keyboard_num4.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_num4.png
rename to java/res/drawable-mdpi/sym_keyboard_num4.png
diff --git a/res/drawable-mdpi/sym_keyboard_num5.png b/java/res/drawable-mdpi/sym_keyboard_num5.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_num5.png
rename to java/res/drawable-mdpi/sym_keyboard_num5.png
diff --git a/res/drawable-mdpi/sym_keyboard_num6.png b/java/res/drawable-mdpi/sym_keyboard_num6.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_num6.png
rename to java/res/drawable-mdpi/sym_keyboard_num6.png
diff --git a/res/drawable-mdpi/sym_keyboard_num7.png b/java/res/drawable-mdpi/sym_keyboard_num7.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_num7.png
rename to java/res/drawable-mdpi/sym_keyboard_num7.png
diff --git a/res/drawable-mdpi/sym_keyboard_num8.png b/java/res/drawable-mdpi/sym_keyboard_num8.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_num8.png
rename to java/res/drawable-mdpi/sym_keyboard_num8.png
diff --git a/res/drawable-mdpi/sym_keyboard_num9.png b/java/res/drawable-mdpi/sym_keyboard_num9.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_num9.png
rename to java/res/drawable-mdpi/sym_keyboard_num9.png
diff --git a/res/drawable-mdpi/sym_keyboard_numalt.png b/java/res/drawable-mdpi/sym_keyboard_numalt.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_numalt.png
rename to java/res/drawable-mdpi/sym_keyboard_numalt.png
diff --git a/res/drawable-mdpi/sym_keyboard_numpound.png b/java/res/drawable-mdpi/sym_keyboard_numpound.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_numpound.png
rename to java/res/drawable-mdpi/sym_keyboard_numpound.png
diff --git a/res/drawable-mdpi/sym_keyboard_numstar.png b/java/res/drawable-mdpi/sym_keyboard_numstar.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_numstar.png
rename to java/res/drawable-mdpi/sym_keyboard_numstar.png
diff --git a/res/drawable-mdpi/sym_keyboard_return.png b/java/res/drawable-mdpi/sym_keyboard_return.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_return.png
rename to java/res/drawable-mdpi/sym_keyboard_return.png
diff --git a/res/drawable-mdpi/sym_keyboard_search.png b/java/res/drawable-mdpi/sym_keyboard_search.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_search.png
rename to java/res/drawable-mdpi/sym_keyboard_search.png
diff --git a/res/drawable-mdpi/sym_keyboard_shift.png b/java/res/drawable-mdpi/sym_keyboard_shift.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_shift.png
rename to java/res/drawable-mdpi/sym_keyboard_shift.png
diff --git a/res/drawable-mdpi/sym_keyboard_shift_locked.png b/java/res/drawable-mdpi/sym_keyboard_shift_locked.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_shift_locked.png
rename to java/res/drawable-mdpi/sym_keyboard_shift_locked.png
diff --git a/res/drawable-mdpi/sym_keyboard_space.png b/java/res/drawable-mdpi/sym_keyboard_space.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_space.png
rename to java/res/drawable-mdpi/sym_keyboard_space.png
diff --git a/res/drawable-mdpi/sym_keyboard_tab.png b/java/res/drawable-mdpi/sym_keyboard_tab.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_tab.png
rename to java/res/drawable-mdpi/sym_keyboard_tab.png
diff --git a/res/drawable-mdpi/sym_keyboard_tabprev.png b/java/res/drawable-mdpi/sym_keyboard_tabprev.png
similarity index 100%
rename from res/drawable-mdpi/sym_keyboard_tabprev.png
rename to java/res/drawable-mdpi/sym_keyboard_tabprev.png
diff --git a/res/drawable/btn_keyboard_key.xml b/java/res/drawable/btn_keyboard_key.xml
similarity index 100%
rename from res/drawable/btn_keyboard_key.xml
rename to java/res/drawable/btn_keyboard_key.xml
diff --git a/res/drawable/btn_keyboard_key_fulltrans.xml b/java/res/drawable/btn_keyboard_key_fulltrans.xml
similarity index 100%
rename from res/drawable/btn_keyboard_key_fulltrans.xml
rename to java/res/drawable/btn_keyboard_key_fulltrans.xml
diff --git a/res/drawable/cancel.png b/java/res/drawable/cancel.png
similarity index 100%
rename from res/drawable/cancel.png
rename to java/res/drawable/cancel.png
diff --git a/res/drawable/caution.png b/java/res/drawable/caution.png
similarity index 100%
rename from res/drawable/caution.png
rename to java/res/drawable/caution.png
diff --git a/res/drawable/dialog_top_dark_bottom_medium.9.png b/java/res/drawable/dialog_top_dark_bottom_medium.9.png
similarity index 100%
rename from res/drawable/dialog_top_dark_bottom_medium.9.png
rename to java/res/drawable/dialog_top_dark_bottom_medium.9.png
diff --git a/res/drawable/ic_dialog_alert_large.png b/java/res/drawable/ic_dialog_alert_large.png
similarity index 100%
rename from res/drawable/ic_dialog_alert_large.png
rename to java/res/drawable/ic_dialog_alert_large.png
diff --git a/res/drawable/ic_dialog_voice_input.png b/java/res/drawable/ic_dialog_voice_input.png
similarity index 100%
rename from res/drawable/ic_dialog_voice_input.png
rename to java/res/drawable/ic_dialog_voice_input.png
diff --git a/res/drawable/ic_dialog_wave_0_0.png b/java/res/drawable/ic_dialog_wave_0_0.png
similarity index 100%
rename from res/drawable/ic_dialog_wave_0_0.png
rename to java/res/drawable/ic_dialog_wave_0_0.png
diff --git a/res/drawable/ic_dialog_wave_1_3.png b/java/res/drawable/ic_dialog_wave_1_3.png
similarity index 100%
rename from res/drawable/ic_dialog_wave_1_3.png
rename to java/res/drawable/ic_dialog_wave_1_3.png
diff --git a/res/drawable/ic_dialog_wave_2_3.png b/java/res/drawable/ic_dialog_wave_2_3.png
similarity index 100%
rename from res/drawable/ic_dialog_wave_2_3.png
rename to java/res/drawable/ic_dialog_wave_2_3.png
diff --git a/res/drawable/ic_dialog_wave_3_3.png b/java/res/drawable/ic_dialog_wave_3_3.png
similarity index 100%
rename from res/drawable/ic_dialog_wave_3_3.png
rename to java/res/drawable/ic_dialog_wave_3_3.png
diff --git a/res/drawable/ic_dialog_wave_4_3.png b/java/res/drawable/ic_dialog_wave_4_3.png
similarity index 100%
rename from res/drawable/ic_dialog_wave_4_3.png
rename to java/res/drawable/ic_dialog_wave_4_3.png
diff --git a/res/drawable/ic_suggest_scroll_background.xml b/java/res/drawable/ic_suggest_scroll_background.xml
similarity index 100%
rename from res/drawable/ic_suggest_scroll_background.xml
rename to java/res/drawable/ic_suggest_scroll_background.xml
diff --git a/res/drawable/mic_slash.png b/java/res/drawable/mic_slash.png
similarity index 100%
rename from res/drawable/mic_slash.png
rename to java/res/drawable/mic_slash.png
diff --git a/res/drawable/ok_cancel.png b/java/res/drawable/ok_cancel.png
similarity index 100%
rename from res/drawable/ok_cancel.png
rename to java/res/drawable/ok_cancel.png
diff --git a/res/drawable/speak_now_level0.png b/java/res/drawable/speak_now_level0.png
similarity index 100%
rename from res/drawable/speak_now_level0.png
rename to java/res/drawable/speak_now_level0.png
diff --git a/res/drawable/speak_now_level1.png b/java/res/drawable/speak_now_level1.png
similarity index 100%
rename from res/drawable/speak_now_level1.png
rename to java/res/drawable/speak_now_level1.png
diff --git a/res/drawable/speak_now_level2.png b/java/res/drawable/speak_now_level2.png
similarity index 100%
rename from res/drawable/speak_now_level2.png
rename to java/res/drawable/speak_now_level2.png
diff --git a/res/drawable/speak_now_level3.png b/java/res/drawable/speak_now_level3.png
similarity index 100%
rename from res/drawable/speak_now_level3.png
rename to java/res/drawable/speak_now_level3.png
diff --git a/res/drawable/speak_now_level4.png b/java/res/drawable/speak_now_level4.png
similarity index 100%
rename from res/drawable/speak_now_level4.png
rename to java/res/drawable/speak_now_level4.png
diff --git a/res/drawable/speak_now_level5.png b/java/res/drawable/speak_now_level5.png
similarity index 100%
rename from res/drawable/speak_now_level5.png
rename to java/res/drawable/speak_now_level5.png
diff --git a/res/drawable/speak_now_level6.png b/java/res/drawable/speak_now_level6.png
similarity index 100%
rename from res/drawable/speak_now_level6.png
rename to java/res/drawable/speak_now_level6.png
diff --git a/res/drawable/voice_ime_background.9.png b/java/res/drawable/voice_ime_background.9.png
similarity index 100%
rename from res/drawable/voice_ime_background.9.png
rename to java/res/drawable/voice_ime_background.9.png
diff --git a/res/drawable/voice_swipe_hint.png b/java/res/drawable/voice_swipe_hint.png
similarity index 100%
rename from res/drawable/voice_swipe_hint.png
rename to java/res/drawable/voice_swipe_hint.png
diff --git a/res/drawable/working.png b/java/res/drawable/working.png
similarity index 100%
rename from res/drawable/working.png
rename to java/res/drawable/working.png
diff --git a/res/layout/bubble_text.xml b/java/res/layout/bubble_text.xml
similarity index 100%
rename from res/layout/bubble_text.xml
rename to java/res/layout/bubble_text.xml
diff --git a/res/layout/candidate_preview.xml b/java/res/layout/candidate_preview.xml
similarity index 100%
rename from res/layout/candidate_preview.xml
rename to java/res/layout/candidate_preview.xml
diff --git a/res/layout/candidates.xml b/java/res/layout/candidates.xml
similarity index 100%
rename from res/layout/candidates.xml
rename to java/res/layout/candidates.xml
diff --git a/res/layout/input.xml b/java/res/layout/input.xml
similarity index 100%
rename from res/layout/input.xml
rename to java/res/layout/input.xml
diff --git a/res/layout/input_trans.xml b/java/res/layout/input_trans.xml
similarity index 100%
rename from res/layout/input_trans.xml
rename to java/res/layout/input_trans.xml
diff --git a/res/layout/recognition_status.xml b/java/res/layout/recognition_status.xml
similarity index 100%
rename from res/layout/recognition_status.xml
rename to java/res/layout/recognition_status.xml
diff --git a/res/layout/voice_punctuation_hint.xml b/java/res/layout/voice_punctuation_hint.xml
similarity index 100%
rename from res/layout/voice_punctuation_hint.xml
rename to java/res/layout/voice_punctuation_hint.xml
diff --git a/res/layout/voice_swipe_hint.xml b/java/res/layout/voice_swipe_hint.xml
similarity index 100%
rename from res/layout/voice_swipe_hint.xml
rename to java/res/layout/voice_swipe_hint.xml
diff --git a/res/raw/main.dict b/java/res/raw/main.dict
similarity index 100%
rename from res/raw/main.dict
rename to java/res/raw/main.dict
diff --git a/res/raw/type3.ogg b/java/res/raw/type3.ogg
similarity index 100%
rename from res/raw/type3.ogg
rename to java/res/raw/type3.ogg
diff --git a/res/values-cs/bools.xml b/java/res/values-cs/bools.xml
similarity index 100%
rename from res/values-cs/bools.xml
rename to java/res/values-cs/bools.xml
diff --git a/res/values-cs/donottranslate.xml b/java/res/values-cs/donottranslate.xml
similarity index 100%
rename from res/values-cs/donottranslate.xml
rename to java/res/values-cs/donottranslate.xml
diff --git a/res/values-cs/strings.xml b/java/res/values-cs/strings.xml
similarity index 100%
rename from res/values-cs/strings.xml
rename to java/res/values-cs/strings.xml
diff --git a/res/values-da/strings.xml b/java/res/values-da/strings.xml
similarity index 100%
rename from res/values-da/strings.xml
rename to java/res/values-da/strings.xml
diff --git a/res/values-de/bools.xml b/java/res/values-de/bools.xml
similarity index 100%
rename from res/values-de/bools.xml
rename to java/res/values-de/bools.xml
diff --git a/res/values-de/strings.xml b/java/res/values-de/strings.xml
similarity index 100%
rename from res/values-de/strings.xml
rename to java/res/values-de/strings.xml
diff --git a/res/values-el/strings.xml b/java/res/values-el/strings.xml
similarity index 100%
rename from res/values-el/strings.xml
rename to java/res/values-el/strings.xml
diff --git a/res/values-en/bools.xml b/java/res/values-en/bools.xml
similarity index 100%
rename from res/values-en/bools.xml
rename to java/res/values-en/bools.xml
diff --git a/res/values-es-rUS/strings.xml b/java/res/values-es-rUS/strings.xml
similarity index 100%
rename from res/values-es-rUS/strings.xml
rename to java/res/values-es-rUS/strings.xml
diff --git a/res/values-es/bools.xml b/java/res/values-es/bools.xml
similarity index 100%
rename from res/values-es/bools.xml
rename to java/res/values-es/bools.xml
diff --git a/res/values-es/strings.xml b/java/res/values-es/strings.xml
similarity index 100%
rename from res/values-es/strings.xml
rename to java/res/values-es/strings.xml
diff --git a/res/values-fr-rCA/strings.xml b/java/res/values-fr-rCA/strings.xml
similarity index 100%
rename from res/values-fr-rCA/strings.xml
rename to java/res/values-fr-rCA/strings.xml
diff --git a/res/values-fr/bools.xml b/java/res/values-fr/bools.xml
similarity index 100%
rename from res/values-fr/bools.xml
rename to java/res/values-fr/bools.xml
diff --git a/res/values-fr/donottranslate.xml b/java/res/values-fr/donottranslate.xml
similarity index 100%
rename from res/values-fr/donottranslate.xml
rename to java/res/values-fr/donottranslate.xml
diff --git a/res/values-fr/strings.xml b/java/res/values-fr/strings.xml
similarity index 100%
rename from res/values-fr/strings.xml
rename to java/res/values-fr/strings.xml
diff --git a/res/values-it/bools.xml b/java/res/values-it/bools.xml
similarity index 100%
rename from res/values-it/bools.xml
rename to java/res/values-it/bools.xml
diff --git a/res/values-it/donottranslate.xml b/java/res/values-it/donottranslate.xml
similarity index 100%
rename from res/values-it/donottranslate.xml
rename to java/res/values-it/donottranslate.xml
diff --git a/res/values-it/strings.xml b/java/res/values-it/strings.xml
similarity index 100%
rename from res/values-it/strings.xml
rename to java/res/values-it/strings.xml
diff --git a/res/values-ja/strings.xml b/java/res/values-ja/strings.xml
similarity index 100%
rename from res/values-ja/strings.xml
rename to java/res/values-ja/strings.xml
diff --git a/res/values-ko/strings.xml b/java/res/values-ko/strings.xml
similarity index 100%
rename from res/values-ko/strings.xml
rename to java/res/values-ko/strings.xml
diff --git a/res/values-land/dimens.xml b/java/res/values-land/dimens.xml
similarity index 100%
rename from res/values-land/dimens.xml
rename to java/res/values-land/dimens.xml
diff --git a/res/values-nb/strings.xml b/java/res/values-nb/strings.xml
similarity index 100%
rename from res/values-nb/strings.xml
rename to java/res/values-nb/strings.xml
diff --git a/res/values-nl/bools.xml b/java/res/values-nl/bools.xml
similarity index 100%
rename from res/values-nl/bools.xml
rename to java/res/values-nl/bools.xml
diff --git a/res/values-nl/strings.xml b/java/res/values-nl/strings.xml
similarity index 100%
rename from res/values-nl/strings.xml
rename to java/res/values-nl/strings.xml
diff --git a/res/values-pl/bools.xml b/java/res/values-pl/bools.xml
similarity index 100%
rename from res/values-pl/bools.xml
rename to java/res/values-pl/bools.xml
diff --git a/res/values-pl/donottranslate.xml b/java/res/values-pl/donottranslate.xml
similarity index 100%
rename from res/values-pl/donottranslate.xml
rename to java/res/values-pl/donottranslate.xml
diff --git a/res/values-pl/strings.xml b/java/res/values-pl/strings.xml
similarity index 100%
rename from res/values-pl/strings.xml
rename to java/res/values-pl/strings.xml
diff --git a/res/values-pt-rPT/strings.xml b/java/res/values-pt-rPT/strings.xml
similarity index 100%
rename from res/values-pt-rPT/strings.xml
rename to java/res/values-pt-rPT/strings.xml
diff --git a/res/values-pt/strings.xml b/java/res/values-pt/strings.xml
similarity index 100%
rename from res/values-pt/strings.xml
rename to java/res/values-pt/strings.xml
diff --git a/res/values-ru/strings.xml b/java/res/values-ru/strings.xml
similarity index 100%
rename from res/values-ru/strings.xml
rename to java/res/values-ru/strings.xml
diff --git a/res/values-sv/strings.xml b/java/res/values-sv/strings.xml
similarity index 100%
rename from res/values-sv/strings.xml
rename to java/res/values-sv/strings.xml
diff --git a/res/values-tr/donottranslate.xml b/java/res/values-tr/donottranslate.xml
similarity index 100%
rename from res/values-tr/donottranslate.xml
rename to java/res/values-tr/donottranslate.xml
diff --git a/res/values-tr/strings.xml b/java/res/values-tr/strings.xml
similarity index 100%
rename from res/values-tr/strings.xml
rename to java/res/values-tr/strings.xml
diff --git a/res/values-zh-rCN/strings.xml b/java/res/values-zh-rCN/strings.xml
similarity index 100%
rename from res/values-zh-rCN/strings.xml
rename to java/res/values-zh-rCN/strings.xml
diff --git a/res/values-zh-rTW/strings.xml b/java/res/values-zh-rTW/strings.xml
similarity index 100%
rename from res/values-zh-rTW/strings.xml
rename to java/res/values-zh-rTW/strings.xml
diff --git a/res/values/bools.xml b/java/res/values/bools.xml
similarity index 100%
rename from res/values/bools.xml
rename to java/res/values/bools.xml
diff --git a/res/values/colors.xml b/java/res/values/colors.xml
similarity index 100%
rename from res/values/colors.xml
rename to java/res/values/colors.xml
diff --git a/res/values/dimens.xml b/java/res/values/dimens.xml
similarity index 100%
rename from res/values/dimens.xml
rename to java/res/values/dimens.xml
diff --git a/res/values/donottranslate.xml b/java/res/values/donottranslate.xml
similarity index 100%
rename from res/values/donottranslate.xml
rename to java/res/values/donottranslate.xml
diff --git a/res/values/durations.xml b/java/res/values/durations.xml
similarity index 100%
rename from res/values/durations.xml
rename to java/res/values/durations.xml
diff --git a/res/values/keycodes.xml b/java/res/values/keycodes.xml
similarity index 100%
rename from res/values/keycodes.xml
rename to java/res/values/keycodes.xml
diff --git a/res/values/strings.xml b/java/res/values/strings.xml
similarity index 100%
rename from res/values/strings.xml
rename to java/res/values/strings.xml
diff --git a/res/xml-de/kbd_qwerty.xml b/java/res/xml-de/kbd_qwerty.xml
similarity index 100%
rename from res/xml-de/kbd_qwerty.xml
rename to java/res/xml-de/kbd_qwerty.xml
diff --git a/res/xml-fr/kbd_qwerty.xml b/java/res/xml-fr/kbd_qwerty.xml
similarity index 100%
rename from res/xml-fr/kbd_qwerty.xml
rename to java/res/xml-fr/kbd_qwerty.xml
diff --git a/res/xml-ru/kbd_qwerty.xml b/java/res/xml-ru/kbd_qwerty.xml
similarity index 100%
rename from res/xml-ru/kbd_qwerty.xml
rename to java/res/xml-ru/kbd_qwerty.xml
diff --git a/res/xml/azerty.xml b/java/res/xml/azerty.xml
similarity index 100%
rename from res/xml/azerty.xml
rename to java/res/xml/azerty.xml
diff --git a/res/xml/kbd_alpha.xml b/java/res/xml/kbd_alpha.xml
similarity index 100%
rename from res/xml/kbd_alpha.xml
rename to java/res/xml/kbd_alpha.xml
diff --git a/res/xml/kbd_extension.xml b/java/res/xml/kbd_extension.xml
similarity index 100%
rename from res/xml/kbd_extension.xml
rename to java/res/xml/kbd_extension.xml
diff --git a/res/xml/kbd_phone.xml b/java/res/xml/kbd_phone.xml
similarity index 100%
rename from res/xml/kbd_phone.xml
rename to java/res/xml/kbd_phone.xml
diff --git a/res/xml/kbd_phone_symbols.xml b/java/res/xml/kbd_phone_symbols.xml
similarity index 100%
rename from res/xml/kbd_phone_symbols.xml
rename to java/res/xml/kbd_phone_symbols.xml
diff --git a/res/xml/kbd_popup_template.xml b/java/res/xml/kbd_popup_template.xml
similarity index 100%
rename from res/xml/kbd_popup_template.xml
rename to java/res/xml/kbd_popup_template.xml
diff --git a/res/xml/kbd_qwerty.xml b/java/res/xml/kbd_qwerty.xml
similarity index 100%
rename from res/xml/kbd_qwerty.xml
rename to java/res/xml/kbd_qwerty.xml
diff --git a/res/xml/kbd_symbols.xml b/java/res/xml/kbd_symbols.xml
similarity index 100%
rename from res/xml/kbd_symbols.xml
rename to java/res/xml/kbd_symbols.xml
diff --git a/res/xml/kbd_symbols_shift.xml b/java/res/xml/kbd_symbols_shift.xml
similarity index 100%
rename from res/xml/kbd_symbols_shift.xml
rename to java/res/xml/kbd_symbols_shift.xml
diff --git a/res/xml/language_prefs.xml b/java/res/xml/language_prefs.xml
similarity index 100%
rename from res/xml/language_prefs.xml
rename to java/res/xml/language_prefs.xml
diff --git a/res/xml/method.xml b/java/res/xml/method.xml
similarity index 100%
rename from res/xml/method.xml
rename to java/res/xml/method.xml
diff --git a/res/xml/popup_domains.xml b/java/res/xml/popup_domains.xml
similarity index 100%
rename from res/xml/popup_domains.xml
rename to java/res/xml/popup_domains.xml
diff --git a/res/xml/popup_punctuation.xml b/java/res/xml/popup_punctuation.xml
similarity index 100%
rename from res/xml/popup_punctuation.xml
rename to java/res/xml/popup_punctuation.xml
diff --git a/res/xml/popup_smileys.xml b/java/res/xml/popup_smileys.xml
similarity index 100%
rename from res/xml/popup_smileys.xml
rename to java/res/xml/popup_smileys.xml
diff --git a/res/xml/prefs.xml b/java/res/xml/prefs.xml
similarity index 93%
rename from res/xml/prefs.xml
rename to java/res/xml/prefs.xml
index 29c43cba5..535b63f3b 100644
--- a/res/xml/prefs.xml
+++ b/java/res/xml/prefs.xml
@@ -50,9 +50,7 @@
             android:title="@string/language_selection_title"
             android:summary="@string/language_selection_summary">
         <intent
-                android:action="android.intent.action.MAIN"
-                android:targetPackage="com.android.inputmethod.latin"
-                android:targetClass="com.android.inputmethod.latin.InputLanguageSelection" />
+                android:action="com.android.inputmethod.latin.INPUT_LANGUAGE_SELECTION"/>
     </PreferenceScreen>
 
     <PreferenceCategory
diff --git a/src/com/android/inputmethod/latin/AutoDictionary.java b/java/src/com/android/inputmethod/latin/AutoDictionary.java
similarity index 100%
rename from src/com/android/inputmethod/latin/AutoDictionary.java
rename to java/src/com/android/inputmethod/latin/AutoDictionary.java
diff --git a/src/com/android/inputmethod/latin/BinaryDictionary.java b/java/src/com/android/inputmethod/latin/BinaryDictionary.java
similarity index 100%
rename from src/com/android/inputmethod/latin/BinaryDictionary.java
rename to java/src/com/android/inputmethod/latin/BinaryDictionary.java
diff --git a/src/com/android/inputmethod/latin/CandidateView.java b/java/src/com/android/inputmethod/latin/CandidateView.java
similarity index 100%
rename from src/com/android/inputmethod/latin/CandidateView.java
rename to java/src/com/android/inputmethod/latin/CandidateView.java
diff --git a/src/com/android/inputmethod/latin/CandidateViewContainer.java b/java/src/com/android/inputmethod/latin/CandidateViewContainer.java
similarity index 100%
rename from src/com/android/inputmethod/latin/CandidateViewContainer.java
rename to java/src/com/android/inputmethod/latin/CandidateViewContainer.java
diff --git a/src/com/android/inputmethod/latin/ContactsDictionary.java b/java/src/com/android/inputmethod/latin/ContactsDictionary.java
similarity index 100%
rename from src/com/android/inputmethod/latin/ContactsDictionary.java
rename to java/src/com/android/inputmethod/latin/ContactsDictionary.java
diff --git a/src/com/android/inputmethod/latin/Dictionary.java b/java/src/com/android/inputmethod/latin/Dictionary.java
similarity index 100%
rename from src/com/android/inputmethod/latin/Dictionary.java
rename to java/src/com/android/inputmethod/latin/Dictionary.java
diff --git a/src/com/android/inputmethod/latin/ExpandableDictionary.java b/java/src/com/android/inputmethod/latin/ExpandableDictionary.java
similarity index 100%
rename from src/com/android/inputmethod/latin/ExpandableDictionary.java
rename to java/src/com/android/inputmethod/latin/ExpandableDictionary.java
diff --git a/src/com/android/inputmethod/latin/Hints.java b/java/src/com/android/inputmethod/latin/Hints.java
similarity index 100%
rename from src/com/android/inputmethod/latin/Hints.java
rename to java/src/com/android/inputmethod/latin/Hints.java
diff --git a/src/com/android/inputmethod/latin/InputLanguageSelection.java b/java/src/com/android/inputmethod/latin/InputLanguageSelection.java
similarity index 100%
rename from src/com/android/inputmethod/latin/InputLanguageSelection.java
rename to java/src/com/android/inputmethod/latin/InputLanguageSelection.java
diff --git a/src/com/android/inputmethod/latin/KeyboardSwitcher.java b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java
similarity index 100%
rename from src/com/android/inputmethod/latin/KeyboardSwitcher.java
rename to java/src/com/android/inputmethod/latin/KeyboardSwitcher.java
diff --git a/src/com/android/inputmethod/latin/LanguageSwitcher.java b/java/src/com/android/inputmethod/latin/LanguageSwitcher.java
similarity index 100%
rename from src/com/android/inputmethod/latin/LanguageSwitcher.java
rename to java/src/com/android/inputmethod/latin/LanguageSwitcher.java
diff --git a/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
similarity index 100%
rename from src/com/android/inputmethod/latin/LatinIME.java
rename to java/src/com/android/inputmethod/latin/LatinIME.java
diff --git a/src/com/android/inputmethod/latin/LatinIMEBackupAgent.java b/java/src/com/android/inputmethod/latin/LatinIMEBackupAgent.java
similarity index 100%
rename from src/com/android/inputmethod/latin/LatinIMEBackupAgent.java
rename to java/src/com/android/inputmethod/latin/LatinIMEBackupAgent.java
diff --git a/src/com/android/inputmethod/latin/LatinIMESettings.java b/java/src/com/android/inputmethod/latin/LatinIMESettings.java
similarity index 100%
rename from src/com/android/inputmethod/latin/LatinIMESettings.java
rename to java/src/com/android/inputmethod/latin/LatinIMESettings.java
diff --git a/src/com/android/inputmethod/latin/LatinKeyboard.java b/java/src/com/android/inputmethod/latin/LatinKeyboard.java
similarity index 100%
rename from src/com/android/inputmethod/latin/LatinKeyboard.java
rename to java/src/com/android/inputmethod/latin/LatinKeyboard.java
diff --git a/src/com/android/inputmethod/latin/LatinKeyboardView.java b/java/src/com/android/inputmethod/latin/LatinKeyboardView.java
similarity index 100%
rename from src/com/android/inputmethod/latin/LatinKeyboardView.java
rename to java/src/com/android/inputmethod/latin/LatinKeyboardView.java
diff --git a/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java
similarity index 100%
rename from src/com/android/inputmethod/latin/Suggest.java
rename to java/src/com/android/inputmethod/latin/Suggest.java
diff --git a/src/com/android/inputmethod/latin/TextEntryState.java b/java/src/com/android/inputmethod/latin/TextEntryState.java
similarity index 100%
rename from src/com/android/inputmethod/latin/TextEntryState.java
rename to java/src/com/android/inputmethod/latin/TextEntryState.java
diff --git a/src/com/android/inputmethod/latin/Tutorial.java b/java/src/com/android/inputmethod/latin/Tutorial.java
similarity index 100%
rename from src/com/android/inputmethod/latin/Tutorial.java
rename to java/src/com/android/inputmethod/latin/Tutorial.java
diff --git a/src/com/android/inputmethod/latin/UserDictionary.java b/java/src/com/android/inputmethod/latin/UserDictionary.java
similarity index 100%
rename from src/com/android/inputmethod/latin/UserDictionary.java
rename to java/src/com/android/inputmethod/latin/UserDictionary.java
diff --git a/src/com/android/inputmethod/latin/WordComposer.java b/java/src/com/android/inputmethod/latin/WordComposer.java
similarity index 100%
rename from src/com/android/inputmethod/latin/WordComposer.java
rename to java/src/com/android/inputmethod/latin/WordComposer.java
diff --git a/src/com/android/inputmethod/voice/EditingUtil.java b/java/src/com/android/inputmethod/voice/EditingUtil.java
similarity index 100%
rename from src/com/android/inputmethod/voice/EditingUtil.java
rename to java/src/com/android/inputmethod/voice/EditingUtil.java
diff --git a/src/com/android/inputmethod/voice/FieldContext.java b/java/src/com/android/inputmethod/voice/FieldContext.java
similarity index 100%
rename from src/com/android/inputmethod/voice/FieldContext.java
rename to java/src/com/android/inputmethod/voice/FieldContext.java
diff --git a/src/com/android/inputmethod/voice/LatinIMEWithVoice.java b/java/src/com/android/inputmethod/voice/LatinIMEWithVoice.java
similarity index 100%
rename from src/com/android/inputmethod/voice/LatinIMEWithVoice.java
rename to java/src/com/android/inputmethod/voice/LatinIMEWithVoice.java
diff --git a/src/com/android/inputmethod/voice/LatinIMEWithVoiceSettings.java b/java/src/com/android/inputmethod/voice/LatinIMEWithVoiceSettings.java
similarity index 100%
rename from src/com/android/inputmethod/voice/LatinIMEWithVoiceSettings.java
rename to java/src/com/android/inputmethod/voice/LatinIMEWithVoiceSettings.java
diff --git a/src/com/android/inputmethod/voice/RecognitionView.java b/java/src/com/android/inputmethod/voice/RecognitionView.java
similarity index 100%
rename from src/com/android/inputmethod/voice/RecognitionView.java
rename to java/src/com/android/inputmethod/voice/RecognitionView.java
diff --git a/src/com/android/inputmethod/voice/SettingsUtil.java b/java/src/com/android/inputmethod/voice/SettingsUtil.java
similarity index 100%
rename from src/com/android/inputmethod/voice/SettingsUtil.java
rename to java/src/com/android/inputmethod/voice/SettingsUtil.java
diff --git a/src/com/android/inputmethod/voice/VoiceInput.java b/java/src/com/android/inputmethod/voice/VoiceInput.java
similarity index 100%
rename from src/com/android/inputmethod/voice/VoiceInput.java
rename to java/src/com/android/inputmethod/voice/VoiceInput.java
diff --git a/src/com/android/inputmethod/voice/VoiceInputLogger.java b/java/src/com/android/inputmethod/voice/VoiceInputLogger.java
similarity index 100%
rename from src/com/android/inputmethod/voice/VoiceInputLogger.java
rename to java/src/com/android/inputmethod/voice/VoiceInputLogger.java
diff --git a/src/com/android/inputmethod/voice/WaveformImage.java b/java/src/com/android/inputmethod/voice/WaveformImage.java
similarity index 100%
rename from src/com/android/inputmethod/voice/WaveformImage.java
rename to java/src/com/android/inputmethod/voice/WaveformImage.java
diff --git a/src/com/android/inputmethod/voice/Whitelist.java b/java/src/com/android/inputmethod/voice/Whitelist.java
similarity index 100%
rename from src/com/android/inputmethod/voice/Whitelist.java
rename to java/src/com/android/inputmethod/voice/Whitelist.java
diff --git a/src/com/google/android/voicesearch/LatinIMEWithVoice.java b/java/src/com/google/android/voicesearch/LatinIMEWithVoice.java
similarity index 100%
rename from src/com/google/android/voicesearch/LatinIMEWithVoice.java
rename to java/src/com/google/android/voicesearch/LatinIMEWithVoice.java
diff --git a/src/com/google/android/voicesearch/LatinIMEWithVoiceSettings.java b/java/src/com/google/android/voicesearch/LatinIMEWithVoiceSettings.java
similarity index 100%
rename from src/com/google/android/voicesearch/LatinIMEWithVoiceSettings.java
rename to java/src/com/google/android/voicesearch/LatinIMEWithVoiceSettings.java
diff --git a/dictionary/Android.mk b/native/Android.mk
similarity index 100%
rename from dictionary/Android.mk
rename to native/Android.mk
diff --git a/dictionary/jni/com_android_inputmethod_latin_BinaryDictionary.cpp b/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
similarity index 100%
rename from dictionary/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
rename to native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
diff --git a/dictionary/src/basechars.h b/native/src/basechars.h
similarity index 100%
rename from dictionary/src/basechars.h
rename to native/src/basechars.h
diff --git a/dictionary/src/dictionary.cpp b/native/src/dictionary.cpp
similarity index 100%
rename from dictionary/src/dictionary.cpp
rename to native/src/dictionary.cpp
diff --git a/dictionary/src/dictionary.h b/native/src/dictionary.h
similarity index 100%
rename from dictionary/src/dictionary.h
rename to native/src/dictionary.h