diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-cs/main.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-cs/main.dict
deleted file mode 100644
index 5881e03d..00000000
Binary files a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-cs/main.dict and /dev/null differ
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-de/main.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-de/main.dict
deleted file mode 100644
index 28f38c72..00000000
Binary files a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-de/main.dict and /dev/null differ
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-en/main.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-en/main.dict
deleted file mode 100644
index 897bb100..00000000
Binary files a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-en/main.dict and /dev/null differ
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-es/main.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-es/main.dict
deleted file mode 100644
index 81ac9481..00000000
Binary files a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-es/main.dict and /dev/null differ
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-fr/main.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-fr/main.dict
deleted file mode 100644
index 04439ea5..00000000
Binary files a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-fr/main.dict and /dev/null differ
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-hr/main.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-hr/main.dict
deleted file mode 100755
index 466e640b..00000000
Binary files a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-hr/main.dict and /dev/null differ
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-it/main.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-it/main.dict
deleted file mode 100644
index 6eee17c6..00000000
Binary files a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-it/main.dict and /dev/null differ
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-pt/main.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-pt/main.dict
deleted file mode 100644
index fe1d2779..00000000
Binary files a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-pt/main.dict and /dev/null differ
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main.dict
deleted file mode 100644
index a456cf3d..00000000
Binary files a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main.dict and /dev/null differ
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_cs.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_cs.dict
new file mode 100644
index 00000000..a6046a49
Binary files /dev/null and b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_cs.dict differ
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-da/main.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_da.dict
similarity index 99%
rename from overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-da/main.dict
rename to overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_da.dict
index 049ff606..64fe8cfb 100644
Binary files a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-da/main.dict and b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_da.dict differ
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-el/main.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_el.dict
similarity index 99%
rename from overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-el/main.dict
rename to overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_el.dict
index f2c9215b..ccc9cb2f 100644
Binary files a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-el/main.dict and b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_el.dict differ
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_en.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_en.dict
new file mode 100644
index 00000000..9f083166
Binary files /dev/null and b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_en.dict differ
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-fi/main.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_fi.dict
similarity index 100%
rename from overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-fi/main.dict
rename to overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_fi.dict
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_hr.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_hr.dict
new file mode 100644
index 00000000..60056b14
Binary files /dev/null and b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_hr.dict differ
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-hu/main.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_hu.dict
similarity index 99%
rename from overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-hu/main.dict
rename to overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_hu.dict
index 3d4fd7a4..a2885ab6 100644
Binary files a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-hu/main.dict and b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_hu.dict differ
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-iw/main.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_iw.dict
similarity index 94%
rename from overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-iw/main.dict
rename to overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_iw.dict
index 2a9287e9..6e395625 100644
Binary files a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-iw/main.dict and b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_iw.dict differ
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-ka/main.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_ka.dict
similarity index 99%
rename from overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-ka/main.dict
rename to overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_ka.dict
index 075c0439..4c76a6d5 100644
Binary files a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-ka/main.dict and b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_ka.dict differ
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_nb.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_nb.dict
new file mode 100644
index 00000000..d4a67298
Binary files /dev/null and b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_nb.dict differ
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-nl/main.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_nl.dict
similarity index 99%
rename from overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-nl/main.dict
rename to overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_nl.dict
index f1207f84..dc6069f5 100644
Binary files a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-nl/main.dict and b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_nl.dict differ
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_pt_pt.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_pt_pt.dict
new file mode 100644
index 00000000..760e6d4c
Binary files /dev/null and b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_pt_pt.dict differ
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-ru/main.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_ru.dict
similarity index 99%
rename from overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-ru/main.dict
rename to overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_ru.dict
index 5055813a..6f77f97b 100644
Binary files a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-ru/main.dict and b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_ru.dict differ
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-sv/main.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_sv.dict
similarity index 99%
rename from overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-sv/main.dict
rename to overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_sv.dict
index 30bb7079..46eb1c62 100644
Binary files a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-sv/main.dict and b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_sv.dict differ