diff --git a/java/res/layout-large/candidate.xml b/java/res/layout-sw600dp/candidate.xml
similarity index 100%
rename from java/res/layout-large/candidate.xml
rename to java/res/layout-sw600dp/candidate.xml
diff --git a/java/res/layout-large/candidate_preview.xml b/java/res/layout-sw600dp/candidate_preview.xml
similarity index 100%
rename from java/res/layout-large/candidate_preview.xml
rename to java/res/layout-sw600dp/candidate_preview.xml
diff --git a/java/res/layout-large/candidates.xml b/java/res/layout-sw600dp/candidates.xml
similarity index 100%
rename from java/res/layout-large/candidates.xml
rename to java/res/layout-sw600dp/candidates.xml
diff --git a/java/res/layout-large/keyboard_popup_honeycomb.xml b/java/res/layout-sw600dp/keyboard_popup_honeycomb.xml
similarity index 100%
rename from java/res/layout-large/keyboard_popup_honeycomb.xml
rename to java/res/layout-sw600dp/keyboard_popup_honeycomb.xml
diff --git a/java/res/layout-xlarge/candidate.xml b/java/res/layout-sw768dp/candidate.xml
similarity index 100%
rename from java/res/layout-xlarge/candidate.xml
rename to java/res/layout-sw768dp/candidate.xml
diff --git a/java/res/layout-xlarge/candidate_preview.xml b/java/res/layout-sw768dp/candidate_preview.xml
similarity index 100%
rename from java/res/layout-xlarge/candidate_preview.xml
rename to java/res/layout-sw768dp/candidate_preview.xml
diff --git a/java/res/layout-xlarge/candidates.xml b/java/res/layout-sw768dp/candidates.xml
similarity index 100%
rename from java/res/layout-xlarge/candidates.xml
rename to java/res/layout-sw768dp/candidates.xml
diff --git a/java/res/layout-xlarge/keyboard_popup_honeycomb.xml b/java/res/layout-sw768dp/keyboard_popup_honeycomb.xml
similarity index 100%
rename from java/res/layout-xlarge/keyboard_popup_honeycomb.xml
rename to java/res/layout-sw768dp/keyboard_popup_honeycomb.xml
diff --git a/java/res/values-large-land/dimens.xml b/java/res/values-sw600dp-land/dimens.xml
similarity index 100%
rename from java/res/values-large-land/dimens.xml
rename to java/res/values-sw600dp-land/dimens.xml
diff --git a/java/res/values-large/config.xml b/java/res/values-sw600dp/config.xml
similarity index 100%
rename from java/res/values-large/config.xml
rename to java/res/values-sw600dp/config.xml
diff --git a/java/res/values-large/dimens.xml b/java/res/values-sw600dp/dimens.xml
similarity index 100%
rename from java/res/values-large/dimens.xml
rename to java/res/values-sw600dp/dimens.xml
diff --git a/java/res/values-large/donottranslate.xml b/java/res/values-sw600dp/donottranslate.xml
similarity index 100%
rename from java/res/values-large/donottranslate.xml
rename to java/res/values-sw600dp/donottranslate.xml
diff --git a/java/res/values-xlarge-land/dimens.xml b/java/res/values-sw768dp-land/dimens.xml
similarity index 100%
rename from java/res/values-xlarge-land/dimens.xml
rename to java/res/values-sw768dp-land/dimens.xml
diff --git a/java/res/values-xlarge/config.xml b/java/res/values-sw768dp/config.xml
similarity index 100%
rename from java/res/values-xlarge/config.xml
rename to java/res/values-sw768dp/config.xml
diff --git a/java/res/values-xlarge/dimens.xml b/java/res/values-sw768dp/dimens.xml
similarity index 100%
rename from java/res/values-xlarge/dimens.xml
rename to java/res/values-sw768dp/dimens.xml
diff --git a/java/res/values-xlarge/donottranslate.xml b/java/res/values-sw768dp/donottranslate.xml
similarity index 100%
rename from java/res/values-xlarge/donottranslate.xml
rename to java/res/values-sw768dp/donottranslate.xml
diff --git a/java/res/xml-large-land/kbd_popup_template.xml b/java/res/xml-sw600dp-land/kbd_popup_template.xml
similarity index 100%
rename from java/res/xml-large-land/kbd_popup_template.xml
rename to java/res/xml-sw600dp-land/kbd_popup_template.xml
diff --git a/java/res/xml-large/kbd_azerty_rows.xml b/java/res/xml-sw600dp/kbd_azerty_rows.xml
similarity index 100%
rename from java/res/xml-large/kbd_azerty_rows.xml
rename to java/res/xml-sw600dp/kbd_azerty_rows.xml
diff --git a/java/res/xml-large/kbd_key_styles.xml b/java/res/xml-sw600dp/kbd_key_styles.xml
similarity index 100%
rename from java/res/xml-large/kbd_key_styles.xml
rename to java/res/xml-sw600dp/kbd_key_styles.xml
diff --git a/java/res/xml-large/kbd_number.xml b/java/res/xml-sw600dp/kbd_number.xml
similarity index 100%
rename from java/res/xml-large/kbd_number.xml
rename to java/res/xml-sw600dp/kbd_number.xml
diff --git a/java/res/xml-large/kbd_numkey_styles.xml b/java/res/xml-sw600dp/kbd_numkey_styles.xml
similarity index 100%
rename from java/res/xml-large/kbd_numkey_styles.xml
rename to java/res/xml-sw600dp/kbd_numkey_styles.xml
diff --git a/java/res/xml-large/kbd_phone.xml b/java/res/xml-sw600dp/kbd_phone.xml
similarity index 100%
rename from java/res/xml-large/kbd_phone.xml
rename to java/res/xml-sw600dp/kbd_phone.xml
diff --git a/java/res/xml-large/kbd_phone_symbols.xml b/java/res/xml-sw600dp/kbd_phone_symbols.xml
similarity index 100%
rename from java/res/xml-large/kbd_phone_symbols.xml
rename to java/res/xml-sw600dp/kbd_phone_symbols.xml
diff --git a/java/res/xml-large/kbd_popup_template.xml b/java/res/xml-sw600dp/kbd_popup_template.xml
similarity index 100%
rename from java/res/xml-large/kbd_popup_template.xml
rename to java/res/xml-sw600dp/kbd_popup_template.xml
diff --git a/java/res/xml-large/kbd_qwerty.xml b/java/res/xml-sw600dp/kbd_qwerty.xml
similarity index 100%
rename from java/res/xml-large/kbd_qwerty.xml
rename to java/res/xml-sw600dp/kbd_qwerty.xml
diff --git a/java/res/xml-large/kbd_qwerty_row1.xml b/java/res/xml-sw600dp/kbd_qwerty_row1.xml
similarity index 100%
rename from java/res/xml-large/kbd_qwerty_row1.xml
rename to java/res/xml-sw600dp/kbd_qwerty_row1.xml
diff --git a/java/res/xml-large/kbd_qwerty_row2.xml b/java/res/xml-sw600dp/kbd_qwerty_row2.xml
similarity index 100%
rename from java/res/xml-large/kbd_qwerty_row2.xml
rename to java/res/xml-sw600dp/kbd_qwerty_row2.xml
diff --git a/java/res/xml-large/kbd_qwerty_row3.xml b/java/res/xml-sw600dp/kbd_qwerty_row3.xml
similarity index 100%
rename from java/res/xml-large/kbd_qwerty_row3.xml
rename to java/res/xml-sw600dp/kbd_qwerty_row3.xml
diff --git a/java/res/xml-large/kbd_qwerty_row4.xml b/java/res/xml-sw600dp/kbd_qwerty_row4.xml
similarity index 100%
rename from java/res/xml-large/kbd_qwerty_row4.xml
rename to java/res/xml-sw600dp/kbd_qwerty_row4.xml
diff --git a/java/res/xml-large/kbd_qwerty_rows.xml b/java/res/xml-sw600dp/kbd_qwerty_rows.xml
similarity index 100%
rename from java/res/xml-large/kbd_qwerty_rows.xml
rename to java/res/xml-sw600dp/kbd_qwerty_rows.xml
diff --git a/java/res/xml-large/kbd_qwerty_rows_scandinavia.xml b/java/res/xml-sw600dp/kbd_qwerty_rows_scandinavia.xml
similarity index 100%
rename from java/res/xml-large/kbd_qwerty_rows_scandinavia.xml
rename to java/res/xml-sw600dp/kbd_qwerty_rows_scandinavia.xml
diff --git a/java/res/xml-large/kbd_qwertz_rows.xml b/java/res/xml-sw600dp/kbd_qwertz_rows.xml
similarity index 100%
rename from java/res/xml-large/kbd_qwertz_rows.xml
rename to java/res/xml-sw600dp/kbd_qwertz_rows.xml
diff --git a/java/res/xml-large/kbd_ru_rows.xml b/java/res/xml-sw600dp/kbd_ru_rows.xml
similarity index 100%
rename from java/res/xml-large/kbd_ru_rows.xml
rename to java/res/xml-sw600dp/kbd_ru_rows.xml
diff --git a/java/res/xml-large/kbd_sr_rows.xml b/java/res/xml-sw600dp/kbd_sr_rows.xml
similarity index 100%
rename from java/res/xml-large/kbd_sr_rows.xml
rename to java/res/xml-sw600dp/kbd_sr_rows.xml
diff --git a/java/res/xml-large/kbd_symbols.xml b/java/res/xml-sw600dp/kbd_symbols.xml
similarity index 100%
rename from java/res/xml-large/kbd_symbols.xml
rename to java/res/xml-sw600dp/kbd_symbols.xml
diff --git a/java/res/xml-large/kbd_symbols_shift.xml b/java/res/xml-sw600dp/kbd_symbols_shift.xml
similarity index 100%
rename from java/res/xml-large/kbd_symbols_shift.xml
rename to java/res/xml-sw600dp/kbd_symbols_shift.xml
diff --git a/java/res/xml-xlarge-land/kbd_popup_template.xml b/java/res/xml-sw768dp-land/kbd_popup_template.xml
similarity index 100%
rename from java/res/xml-xlarge-land/kbd_popup_template.xml
rename to java/res/xml-sw768dp-land/kbd_popup_template.xml
diff --git a/java/res/xml-xlarge/kbd_azerty_rows.xml b/java/res/xml-sw768dp/kbd_azerty_rows.xml
similarity index 100%
rename from java/res/xml-xlarge/kbd_azerty_rows.xml
rename to java/res/xml-sw768dp/kbd_azerty_rows.xml
diff --git a/java/res/xml-xlarge/kbd_key_styles.xml b/java/res/xml-sw768dp/kbd_key_styles.xml
similarity index 100%
rename from java/res/xml-xlarge/kbd_key_styles.xml
rename to java/res/xml-sw768dp/kbd_key_styles.xml
diff --git a/java/res/xml-xlarge/kbd_number.xml b/java/res/xml-sw768dp/kbd_number.xml
similarity index 100%
rename from java/res/xml-xlarge/kbd_number.xml
rename to java/res/xml-sw768dp/kbd_number.xml
diff --git a/java/res/xml-xlarge/kbd_numkey_styles.xml b/java/res/xml-sw768dp/kbd_numkey_styles.xml
similarity index 100%
rename from java/res/xml-xlarge/kbd_numkey_styles.xml
rename to java/res/xml-sw768dp/kbd_numkey_styles.xml
diff --git a/java/res/xml-xlarge/kbd_phone.xml b/java/res/xml-sw768dp/kbd_phone.xml
similarity index 100%
rename from java/res/xml-xlarge/kbd_phone.xml
rename to java/res/xml-sw768dp/kbd_phone.xml
diff --git a/java/res/xml-xlarge/kbd_phone_symbols.xml b/java/res/xml-sw768dp/kbd_phone_symbols.xml
similarity index 100%
rename from java/res/xml-xlarge/kbd_phone_symbols.xml
rename to java/res/xml-sw768dp/kbd_phone_symbols.xml
diff --git a/java/res/xml-xlarge/kbd_popup_template.xml b/java/res/xml-sw768dp/kbd_popup_template.xml
similarity index 100%
rename from java/res/xml-xlarge/kbd_popup_template.xml
rename to java/res/xml-sw768dp/kbd_popup_template.xml
diff --git a/java/res/xml-xlarge/kbd_qwerty.xml b/java/res/xml-sw768dp/kbd_qwerty.xml
similarity index 100%
rename from java/res/xml-xlarge/kbd_qwerty.xml
rename to java/res/xml-sw768dp/kbd_qwerty.xml
diff --git a/java/res/xml-xlarge/kbd_qwerty_row1.xml b/java/res/xml-sw768dp/kbd_qwerty_row1.xml
similarity index 100%
rename from java/res/xml-xlarge/kbd_qwerty_row1.xml
rename to java/res/xml-sw768dp/kbd_qwerty_row1.xml
diff --git a/java/res/xml-xlarge/kbd_qwerty_row2.xml b/java/res/xml-sw768dp/kbd_qwerty_row2.xml
similarity index 100%
rename from java/res/xml-xlarge/kbd_qwerty_row2.xml
rename to java/res/xml-sw768dp/kbd_qwerty_row2.xml
diff --git a/java/res/xml-xlarge/kbd_qwerty_row3.xml b/java/res/xml-sw768dp/kbd_qwerty_row3.xml
similarity index 100%
rename from java/res/xml-xlarge/kbd_qwerty_row3.xml
rename to java/res/xml-sw768dp/kbd_qwerty_row3.xml
diff --git a/java/res/xml-xlarge/kbd_qwerty_row4.xml b/java/res/xml-sw768dp/kbd_qwerty_row4.xml
similarity index 100%
rename from java/res/xml-xlarge/kbd_qwerty_row4.xml
rename to java/res/xml-sw768dp/kbd_qwerty_row4.xml
diff --git a/java/res/xml-xlarge/kbd_qwerty_rows.xml b/java/res/xml-sw768dp/kbd_qwerty_rows.xml
similarity index 100%
rename from java/res/xml-xlarge/kbd_qwerty_rows.xml
rename to java/res/xml-sw768dp/kbd_qwerty_rows.xml
diff --git a/java/res/xml-xlarge/kbd_qwerty_rows_scandinavia.xml b/java/res/xml-sw768dp/kbd_qwerty_rows_scandinavia.xml
similarity index 100%
rename from java/res/xml-xlarge/kbd_qwerty_rows_scandinavia.xml
rename to java/res/xml-sw768dp/kbd_qwerty_rows_scandinavia.xml
diff --git a/java/res/xml-xlarge/kbd_qwertz_rows.xml b/java/res/xml-sw768dp/kbd_qwertz_rows.xml
similarity index 100%
rename from java/res/xml-xlarge/kbd_qwertz_rows.xml
rename to java/res/xml-sw768dp/kbd_qwertz_rows.xml
diff --git a/java/res/xml-xlarge/kbd_ru_rows.xml b/java/res/xml-sw768dp/kbd_ru_rows.xml
similarity index 100%
rename from java/res/xml-xlarge/kbd_ru_rows.xml
rename to java/res/xml-sw768dp/kbd_ru_rows.xml
diff --git a/java/res/xml-xlarge/kbd_sr_rows.xml b/java/res/xml-sw768dp/kbd_sr_rows.xml
similarity index 100%
rename from java/res/xml-xlarge/kbd_sr_rows.xml
rename to java/res/xml-sw768dp/kbd_sr_rows.xml
diff --git a/java/res/xml-xlarge/kbd_symbols.xml b/java/res/xml-sw768dp/kbd_symbols.xml
similarity index 100%
rename from java/res/xml-xlarge/kbd_symbols.xml
rename to java/res/xml-sw768dp/kbd_symbols.xml
diff --git a/java/res/xml-xlarge/kbd_symbols_shift.xml b/java/res/xml-sw768dp/kbd_symbols_shift.xml
similarity index 100%
rename from java/res/xml-xlarge/kbd_symbols_shift.xml
rename to java/res/xml-sw768dp/kbd_symbols_shift.xml