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 5881e03..0000000
--- a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-cs/main.dict
+++ /dev/null
Binary files 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 28f38c7..0000000
--- a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-de/main.dict
+++ /dev/null
Binary files 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 897bb10..0000000
--- a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-en/main.dict
+++ /dev/null
Binary files 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 81ac948..0000000
--- a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-es/main.dict
+++ /dev/null
Binary files 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 04439ea..0000000
--- a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-fr/main.dict
+++ /dev/null
Binary files 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 466e640..0000000
--- a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-hr/main.dict
+++ /dev/null
Binary files 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 6eee17c..0000000
--- a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-it/main.dict
+++ /dev/null
Binary files 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 fe1d277..0000000
--- a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-pt/main.dict
+++ /dev/null
Binary files 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 a456cf3..0000000
--- a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main.dict
+++ /dev/null
Binary files 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 0000000..a6046a4
--- /dev/null
+++ b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_cs.dict
Binary files 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 049ff60..64fe8cf 100644
--- a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-da/main.dict
+++ b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_da.dict
Binary files 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 f2c9215..ccc9cb2 100644
--- a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-el/main.dict
+++ b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_el.dict
Binary files 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 0000000..9f08316
--- /dev/null
+++ b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_en.dict
Binary files 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
Binary files differ
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 0000000..60056b1
--- /dev/null
+++ b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_hr.dict
Binary files 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 3d4fd7a..a2885ab 100644
--- a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-hu/main.dict
+++ b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_hu.dict
Binary files 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 93%
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 2a9287e..6e39562 100644
--- a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-iw/main.dict
+++ b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_iw.dict
Binary files 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 075c043..4c76a6d 100644
--- a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-ka/main.dict
+++ b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_ka.dict
Binary files 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 0000000..d4a6729
--- /dev/null
+++ b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_nb.dict
Binary files 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 f1207f8..dc6069f 100644
--- a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-nl/main.dict
+++ b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_nl.dict
Binary files 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 0000000..760e6d4
--- /dev/null
+++ b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_pt_pt.dict
Binary files 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 5055813..6f77f97 100644
--- a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-ru/main.dict
+++ b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_ru.dict
Binary files 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 30bb707..46eb1c6 100644
--- a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-sv/main.dict
+++ b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_sv.dict
Binary files differ