diff --git a/bin/androidxml2po.bash b/bin/androidxml2po.bash
index 1900df7a4..f9007e81d 100755
--- a/bin/androidxml2po.bash
+++ b/bin/androidxml2po.bash
@@ -55,7 +55,7 @@ function import_po2xml
         for (( i=0 ; i<${#po_lang[*]} ; i=i+1 )); do
             echo " Importing .xml from .po for "${resource_file}-${po_lang[i]}""
             mkdir -p "${android_xml_files_res_dir}"-"${res_lang[i]}"
-            ${xml2po} -a -l "${po_lang[i]}" -p "${launchpad_po_files_dir}"/"${resource_file}"-"${po_lang[i]}".po \
+            ${xml2po} -a -l "${po_lang[i]}" -p "${launchpad_po_files_dir}/${resource_file}/${resource_file}"-"${po_lang[i]}".po \
                 "${android_xml_files_res_dir}"/"${resource_file}".xml > "${android_xml_files_res_dir}"-"${res_lang[i]}"/"${resource_file}".xml
         done
     done
@@ -67,7 +67,7 @@ function export_xml2po
     for resource_file in $android_xml_filenames; do
         echo "Exporting .xml to .pot: $resource_file"
         ${xml2po} -a -l "${po_lang[i]}" -o \
-            "${launchpad_pot_file_dir}"/"${resource_file}".pot \
+            "${launchpad_pot_file_dir}/${resource_file}/${resource_file}".pot \
             "${android_xml_files_res_dir}"/"${resource_file}".xml
 
         for (( i=0 ; i<${#po_lang[*]} ; i=i+1 )); do
@@ -75,7 +75,7 @@ function export_xml2po
             ${xml2po} -a \
                 -r "${android_xml_files_res_dir}"-"${res_lang[i]}"/"${resource_file}".xml \
                 "${android_xml_files_res_dir}"/"${resource_file}".xml > \
-                "${launchpad_po_files_dir}"/"${resource_file}"-"${po_lang[i]}".po
+                "${launchpad_po_files_dir}/${resource_file}/${resource_file}"-"${po_lang[i]}".po
         done
     done
 
diff --git a/translations/arrays-ar.po b/translations/arrays/arrays-ar.po
similarity index 100%
rename from translations/arrays-ar.po
rename to translations/arrays/arrays-ar.po
diff --git a/translations/arrays-ca.po b/translations/arrays/arrays-ca.po
similarity index 100%
rename from translations/arrays-ca.po
rename to translations/arrays/arrays-ca.po
diff --git a/translations/arrays-cs.po b/translations/arrays/arrays-cs.po
similarity index 100%
rename from translations/arrays-cs.po
rename to translations/arrays/arrays-cs.po
diff --git a/translations/arrays-da.po b/translations/arrays/arrays-da.po
similarity index 100%
rename from translations/arrays-da.po
rename to translations/arrays/arrays-da.po
diff --git a/translations/arrays-de.po b/translations/arrays/arrays-de.po
similarity index 100%
rename from translations/arrays-de.po
rename to translations/arrays/arrays-de.po
diff --git a/translations/arrays-en_GB.po b/translations/arrays/arrays-en_GB.po
similarity index 100%
rename from translations/arrays-en_GB.po
rename to translations/arrays/arrays-en_GB.po
diff --git a/translations/arrays-es.po b/translations/arrays/arrays-es.po
similarity index 100%
rename from translations/arrays-es.po
rename to translations/arrays/arrays-es.po
diff --git a/translations/arrays-fa.po b/translations/arrays/arrays-fa.po
similarity index 100%
rename from translations/arrays-fa.po
rename to translations/arrays/arrays-fa.po
diff --git a/translations/arrays-fr.po b/translations/arrays/arrays-fr.po
similarity index 100%
rename from translations/arrays-fr.po
rename to translations/arrays/arrays-fr.po
diff --git a/translations/arrays-he.po b/translations/arrays/arrays-he.po
similarity index 100%
rename from translations/arrays-he.po
rename to translations/arrays/arrays-he.po
diff --git a/translations/arrays-hu.po b/translations/arrays/arrays-hu.po
similarity index 100%
rename from translations/arrays-hu.po
rename to translations/arrays/arrays-hu.po
diff --git a/translations/arrays-id.po b/translations/arrays/arrays-id.po
similarity index 100%
rename from translations/arrays-id.po
rename to translations/arrays/arrays-id.po
diff --git a/translations/arrays-it.po b/translations/arrays/arrays-it.po
similarity index 100%
rename from translations/arrays-it.po
rename to translations/arrays/arrays-it.po
diff --git a/translations/arrays-ja.po b/translations/arrays/arrays-ja.po
similarity index 100%
rename from translations/arrays-ja.po
rename to translations/arrays/arrays-ja.po
diff --git a/translations/arrays-jv.po b/translations/arrays/arrays-jv.po
similarity index 100%
rename from translations/arrays-jv.po
rename to translations/arrays/arrays-jv.po
diff --git a/translations/arrays-ko.po b/translations/arrays/arrays-ko.po
similarity index 100%
rename from translations/arrays-ko.po
rename to translations/arrays/arrays-ko.po
diff --git a/translations/arrays-lt.po b/translations/arrays/arrays-lt.po
similarity index 100%
rename from translations/arrays-lt.po
rename to translations/arrays/arrays-lt.po
diff --git a/translations/arrays-nb.po b/translations/arrays/arrays-nb.po
similarity index 100%
rename from translations/arrays-nb.po
rename to translations/arrays/arrays-nb.po
diff --git a/translations/arrays-nl.po b/translations/arrays/arrays-nl.po
similarity index 100%
rename from translations/arrays-nl.po
rename to translations/arrays/arrays-nl.po
diff --git a/translations/arrays-oc.po b/translations/arrays/arrays-oc.po
similarity index 100%
rename from translations/arrays-oc.po
rename to translations/arrays/arrays-oc.po
diff --git a/translations/arrays-pl.po b/translations/arrays/arrays-pl.po
similarity index 100%
rename from translations/arrays-pl.po
rename to translations/arrays/arrays-pl.po
diff --git a/translations/arrays-pt.po b/translations/arrays/arrays-pt.po
similarity index 100%
rename from translations/arrays-pt.po
rename to translations/arrays/arrays-pt.po
diff --git a/translations/arrays-pt_BR.po b/translations/arrays/arrays-pt_BR.po
similarity index 100%
rename from translations/arrays-pt_BR.po
rename to translations/arrays/arrays-pt_BR.po
diff --git a/translations/arrays-ru.po b/translations/arrays/arrays-ru.po
similarity index 100%
rename from translations/arrays-ru.po
rename to translations/arrays/arrays-ru.po
diff --git a/translations/arrays-sv.po b/translations/arrays/arrays-sv.po
similarity index 100%
rename from translations/arrays-sv.po
rename to translations/arrays/arrays-sv.po
diff --git a/translations/arrays-tr.po b/translations/arrays/arrays-tr.po
similarity index 100%
rename from translations/arrays-tr.po
rename to translations/arrays/arrays-tr.po
diff --git a/translations/arrays-zh_CN.po b/translations/arrays/arrays-zh_CN.po
similarity index 100%
rename from translations/arrays-zh_CN.po
rename to translations/arrays/arrays-zh_CN.po
diff --git a/translations/arrays-zh_HK.po b/translations/arrays/arrays-zh_HK.po
similarity index 100%
rename from translations/arrays-zh_HK.po
rename to translations/arrays/arrays-zh_HK.po
diff --git a/translations/arrays-zh_TW.po b/translations/arrays/arrays-zh_TW.po
similarity index 100%
rename from translations/arrays-zh_TW.po
rename to translations/arrays/arrays-zh_TW.po
diff --git a/translations/arrays.pot b/translations/arrays/arrays.pot
similarity index 100%
rename from translations/arrays.pot
rename to translations/arrays/arrays.pot
diff --git a/translations/strings-ar.po b/translations/strings/strings-ar.po
similarity index 100%
rename from translations/strings-ar.po
rename to translations/strings/strings-ar.po
diff --git a/translations/strings-bg.po b/translations/strings/strings-bg.po
similarity index 100%
rename from translations/strings-bg.po
rename to translations/strings/strings-bg.po
diff --git a/translations/strings-ca.po b/translations/strings/strings-ca.po
similarity index 100%
rename from translations/strings-ca.po
rename to translations/strings/strings-ca.po
diff --git a/translations/strings-cs.po b/translations/strings/strings-cs.po
similarity index 100%
rename from translations/strings-cs.po
rename to translations/strings/strings-cs.po
diff --git a/translations/strings-da.po b/translations/strings/strings-da.po
similarity index 100%
rename from translations/strings-da.po
rename to translations/strings/strings-da.po
diff --git a/translations/strings-de.po b/translations/strings/strings-de.po
similarity index 100%
rename from translations/strings-de.po
rename to translations/strings/strings-de.po
diff --git a/translations/strings-en_GB.po b/translations/strings/strings-en_GB.po
similarity index 100%
rename from translations/strings-en_GB.po
rename to translations/strings/strings-en_GB.po
diff --git a/translations/strings-eo.po b/translations/strings/strings-eo.po
similarity index 100%
rename from translations/strings-eo.po
rename to translations/strings/strings-eo.po
diff --git a/translations/strings-es.po b/translations/strings/strings-es.po
similarity index 100%
rename from translations/strings-es.po
rename to translations/strings/strings-es.po
diff --git a/translations/strings-et.po b/translations/strings/strings-et.po
similarity index 100%
rename from translations/strings-et.po
rename to translations/strings/strings-et.po
diff --git a/translations/strings-eu.po b/translations/strings/strings-eu.po
similarity index 100%
rename from translations/strings-eu.po
rename to translations/strings/strings-eu.po
diff --git a/translations/strings-fo.po b/translations/strings/strings-fo.po
similarity index 100%
rename from translations/strings-fo.po
rename to translations/strings/strings-fo.po
diff --git a/translations/strings-fr.po b/translations/strings/strings-fr.po
similarity index 100%
rename from translations/strings-fr.po
rename to translations/strings/strings-fr.po
diff --git a/translations/strings-gl.po b/translations/strings/strings-gl.po
similarity index 100%
rename from translations/strings-gl.po
rename to translations/strings/strings-gl.po
diff --git a/translations/strings-he.po b/translations/strings/strings-he.po
similarity index 100%
rename from translations/strings-he.po
rename to translations/strings/strings-he.po
diff --git a/translations/strings-hu.po b/translations/strings/strings-hu.po
similarity index 100%
rename from translations/strings-hu.po
rename to translations/strings/strings-hu.po
diff --git a/translations/strings-id.po b/translations/strings/strings-id.po
similarity index 100%
rename from translations/strings-id.po
rename to translations/strings/strings-id.po
diff --git a/translations/strings-it.po b/translations/strings/strings-it.po
similarity index 100%
rename from translations/strings-it.po
rename to translations/strings/strings-it.po
diff --git a/translations/strings-ja.po b/translations/strings/strings-ja.po
similarity index 100%
rename from translations/strings-ja.po
rename to translations/strings/strings-ja.po
diff --git a/translations/strings-ko.po b/translations/strings/strings-ko.po
similarity index 100%
rename from translations/strings-ko.po
rename to translations/strings/strings-ko.po
diff --git a/translations/strings-lt.po b/translations/strings/strings-lt.po
similarity index 100%
rename from translations/strings-lt.po
rename to translations/strings/strings-lt.po
diff --git a/translations/strings-nb.po b/translations/strings/strings-nb.po
similarity index 100%
rename from translations/strings-nb.po
rename to translations/strings/strings-nb.po
diff --git a/translations/strings-nds.po b/translations/strings/strings-nds.po
similarity index 100%
rename from translations/strings-nds.po
rename to translations/strings/strings-nds.po
diff --git a/translations/strings-nl.po b/translations/strings/strings-nl.po
similarity index 100%
rename from translations/strings-nl.po
rename to translations/strings/strings-nl.po
diff --git a/translations/strings-oc.po b/translations/strings/strings-oc.po
similarity index 100%
rename from translations/strings-oc.po
rename to translations/strings/strings-oc.po
diff --git a/translations/strings-pl.po b/translations/strings/strings-pl.po
similarity index 100%
rename from translations/strings-pl.po
rename to translations/strings/strings-pl.po
diff --git a/translations/strings-pt.po b/translations/strings/strings-pt.po
similarity index 100%
rename from translations/strings-pt.po
rename to translations/strings/strings-pt.po
diff --git a/translations/strings-pt_BR.po b/translations/strings/strings-pt_BR.po
similarity index 100%
rename from translations/strings-pt_BR.po
rename to translations/strings/strings-pt_BR.po
diff --git a/translations/strings-ru.po b/translations/strings/strings-ru.po
similarity index 100%
rename from translations/strings-ru.po
rename to translations/strings/strings-ru.po
diff --git a/translations/strings-sl.po b/translations/strings/strings-sl.po
similarity index 100%
rename from translations/strings-sl.po
rename to translations/strings/strings-sl.po
diff --git a/translations/strings-sv.po b/translations/strings/strings-sv.po
similarity index 100%
rename from translations/strings-sv.po
rename to translations/strings/strings-sv.po
diff --git a/translations/strings-th.po b/translations/strings/strings-th.po
similarity index 100%
rename from translations/strings-th.po
rename to translations/strings/strings-th.po
diff --git a/translations/strings-tr.po b/translations/strings/strings-tr.po
similarity index 100%
rename from translations/strings-tr.po
rename to translations/strings/strings-tr.po
diff --git a/translations/strings-uk.po b/translations/strings/strings-uk.po
similarity index 100%
rename from translations/strings-uk.po
rename to translations/strings/strings-uk.po
diff --git a/translations/strings-vi.po b/translations/strings/strings-vi.po
similarity index 100%
rename from translations/strings-vi.po
rename to translations/strings/strings-vi.po
diff --git a/translations/strings-zh_CN.po b/translations/strings/strings-zh_CN.po
similarity index 100%
rename from translations/strings-zh_CN.po
rename to translations/strings/strings-zh_CN.po
diff --git a/translations/strings-zh_HK.po b/translations/strings/strings-zh_HK.po
similarity index 100%
rename from translations/strings-zh_HK.po
rename to translations/strings/strings-zh_HK.po
diff --git a/translations/strings-zh_TW.po b/translations/strings/strings-zh_TW.po
similarity index 100%
rename from translations/strings-zh_TW.po
rename to translations/strings/strings-zh_TW.po
diff --git a/translations/strings.pot b/translations/strings/strings.pot
similarity index 100%
rename from translations/strings.pot
rename to translations/strings/strings.pot