diff --git a/app/src/processing/app/I18n.java b/app/src/processing/app/I18n.java
index b1f5be1a0..e623485de 100644
--- a/app/src/processing/app/I18n.java
+++ b/app/src/processing/app/I18n.java
@@ -35,7 +35,7 @@ public class I18n {
       if (language != null && language.trim().length() > 0) {
         Locale.setDefault(new Locale(language));
       }
-      i18n = ResourceBundle.getBundle("processing.app.Resources", Locale.getDefault());
+      i18n = ResourceBundle.getBundle("processing.app.i18n.Resources", Locale.getDefault());
 
       PROMPT_YES = _("Yes");
       PROMPT_NO = _("No");
diff --git a/app/src/processing/app/Resources_an.po b/app/src/processing/app/i18n/Resources_an.po
similarity index 100%
rename from app/src/processing/app/Resources_an.po
rename to app/src/processing/app/i18n/Resources_an.po
diff --git a/app/src/processing/app/Resources_an.properties b/app/src/processing/app/i18n/Resources_an.properties
similarity index 100%
rename from app/src/processing/app/Resources_an.properties
rename to app/src/processing/app/i18n/Resources_an.properties
diff --git a/app/src/processing/app/Resources_ar.po b/app/src/processing/app/i18n/Resources_ar.po
similarity index 100%
rename from app/src/processing/app/Resources_ar.po
rename to app/src/processing/app/i18n/Resources_ar.po
diff --git a/app/src/processing/app/Resources_ar.properties b/app/src/processing/app/i18n/Resources_ar.properties
similarity index 100%
rename from app/src/processing/app/Resources_ar.properties
rename to app/src/processing/app/i18n/Resources_ar.properties
diff --git a/app/src/processing/app/Resources_bg.po b/app/src/processing/app/i18n/Resources_bg.po
similarity index 100%
rename from app/src/processing/app/Resources_bg.po
rename to app/src/processing/app/i18n/Resources_bg.po
diff --git a/app/src/processing/app/Resources_bg.properties b/app/src/processing/app/i18n/Resources_bg.properties
similarity index 100%
rename from app/src/processing/app/Resources_bg.properties
rename to app/src/processing/app/i18n/Resources_bg.properties
diff --git a/app/src/processing/app/Resources_ca.po b/app/src/processing/app/i18n/Resources_ca.po
similarity index 100%
rename from app/src/processing/app/Resources_ca.po
rename to app/src/processing/app/i18n/Resources_ca.po
diff --git a/app/src/processing/app/Resources_ca.properties b/app/src/processing/app/i18n/Resources_ca.properties
similarity index 100%
rename from app/src/processing/app/Resources_ca.properties
rename to app/src/processing/app/i18n/Resources_ca.properties
diff --git a/app/src/processing/app/Resources_cs_cz.po b/app/src/processing/app/i18n/Resources_cs_cz.po
similarity index 100%
rename from app/src/processing/app/Resources_cs_cz.po
rename to app/src/processing/app/i18n/Resources_cs_cz.po
diff --git a/app/src/processing/app/Resources_cs_cz.properties b/app/src/processing/app/i18n/Resources_cs_cz.properties
similarity index 100%
rename from app/src/processing/app/Resources_cs_cz.properties
rename to app/src/processing/app/i18n/Resources_cs_cz.properties
diff --git a/app/src/processing/app/Resources_da.po b/app/src/processing/app/i18n/Resources_da.po
similarity index 100%
rename from app/src/processing/app/Resources_da.po
rename to app/src/processing/app/i18n/Resources_da.po
diff --git a/app/src/processing/app/Resources_da.properties b/app/src/processing/app/i18n/Resources_da.properties
similarity index 100%
rename from app/src/processing/app/Resources_da.properties
rename to app/src/processing/app/i18n/Resources_da.properties
diff --git a/app/src/processing/app/Resources_de.po b/app/src/processing/app/i18n/Resources_de.po
similarity index 100%
rename from app/src/processing/app/Resources_de.po
rename to app/src/processing/app/i18n/Resources_de.po
diff --git a/app/src/processing/app/Resources_de.properties b/app/src/processing/app/i18n/Resources_de.properties
similarity index 100%
rename from app/src/processing/app/Resources_de.properties
rename to app/src/processing/app/i18n/Resources_de.properties
diff --git a/app/src/processing/app/Resources_el.po b/app/src/processing/app/i18n/Resources_el.po
similarity index 100%
rename from app/src/processing/app/Resources_el.po
rename to app/src/processing/app/i18n/Resources_el.po
diff --git a/app/src/processing/app/Resources_el.properties b/app/src/processing/app/i18n/Resources_el.properties
similarity index 100%
rename from app/src/processing/app/Resources_el.properties
rename to app/src/processing/app/i18n/Resources_el.properties
diff --git a/app/src/processing/app/Resources_en.po b/app/src/processing/app/i18n/Resources_en.po
similarity index 100%
rename from app/src/processing/app/Resources_en.po
rename to app/src/processing/app/i18n/Resources_en.po
diff --git a/app/src/processing/app/Resources_en.properties b/app/src/processing/app/i18n/Resources_en.properties
similarity index 100%
rename from app/src/processing/app/Resources_en.properties
rename to app/src/processing/app/i18n/Resources_en.properties
diff --git a/app/src/processing/app/Resources_es.po b/app/src/processing/app/i18n/Resources_es.po
similarity index 100%
rename from app/src/processing/app/Resources_es.po
rename to app/src/processing/app/i18n/Resources_es.po
diff --git a/app/src/processing/app/Resources_es.properties b/app/src/processing/app/i18n/Resources_es.properties
similarity index 100%
rename from app/src/processing/app/Resources_es.properties
rename to app/src/processing/app/i18n/Resources_es.properties
diff --git a/app/src/processing/app/Resources_et.po b/app/src/processing/app/i18n/Resources_et.po
similarity index 100%
rename from app/src/processing/app/Resources_et.po
rename to app/src/processing/app/i18n/Resources_et.po
diff --git a/app/src/processing/app/Resources_et.properties b/app/src/processing/app/i18n/Resources_et.properties
similarity index 100%
rename from app/src/processing/app/Resources_et.properties
rename to app/src/processing/app/i18n/Resources_et.properties
diff --git a/app/src/processing/app/Resources_fa.po b/app/src/processing/app/i18n/Resources_fa.po
similarity index 100%
rename from app/src/processing/app/Resources_fa.po
rename to app/src/processing/app/i18n/Resources_fa.po
diff --git a/app/src/processing/app/Resources_fa.properties b/app/src/processing/app/i18n/Resources_fa.properties
similarity index 100%
rename from app/src/processing/app/Resources_fa.properties
rename to app/src/processing/app/i18n/Resources_fa.properties
diff --git a/app/src/processing/app/Resources_fr.po b/app/src/processing/app/i18n/Resources_fr.po
similarity index 100%
rename from app/src/processing/app/Resources_fr.po
rename to app/src/processing/app/i18n/Resources_fr.po
diff --git a/app/src/processing/app/Resources_fr.properties b/app/src/processing/app/i18n/Resources_fr.properties
similarity index 100%
rename from app/src/processing/app/Resources_fr.properties
rename to app/src/processing/app/i18n/Resources_fr.properties
diff --git a/app/src/processing/app/Resources_fr_ca.po b/app/src/processing/app/i18n/Resources_fr_ca.po
similarity index 100%
rename from app/src/processing/app/Resources_fr_ca.po
rename to app/src/processing/app/i18n/Resources_fr_ca.po
diff --git a/app/src/processing/app/Resources_fr_ca.properties b/app/src/processing/app/i18n/Resources_fr_ca.properties
similarity index 100%
rename from app/src/processing/app/Resources_fr_ca.properties
rename to app/src/processing/app/i18n/Resources_fr_ca.properties
diff --git a/app/src/processing/app/Resources_gl.po b/app/src/processing/app/i18n/Resources_gl.po
similarity index 100%
rename from app/src/processing/app/Resources_gl.po
rename to app/src/processing/app/i18n/Resources_gl.po
diff --git a/app/src/processing/app/Resources_gl.properties b/app/src/processing/app/i18n/Resources_gl.properties
similarity index 100%
rename from app/src/processing/app/Resources_gl.properties
rename to app/src/processing/app/i18n/Resources_gl.properties
diff --git a/app/src/processing/app/Resources_hi.po b/app/src/processing/app/i18n/Resources_hi.po
similarity index 100%
rename from app/src/processing/app/Resources_hi.po
rename to app/src/processing/app/i18n/Resources_hi.po
diff --git a/app/src/processing/app/Resources_hi.properties b/app/src/processing/app/i18n/Resources_hi.properties
similarity index 100%
rename from app/src/processing/app/Resources_hi.properties
rename to app/src/processing/app/i18n/Resources_hi.properties
diff --git a/app/src/processing/app/Resources_hr_hr.po b/app/src/processing/app/i18n/Resources_hr_hr.po
similarity index 100%
rename from app/src/processing/app/Resources_hr_hr.po
rename to app/src/processing/app/i18n/Resources_hr_hr.po
diff --git a/app/src/processing/app/Resources_hr_hr.properties b/app/src/processing/app/i18n/Resources_hr_hr.properties
similarity index 100%
rename from app/src/processing/app/Resources_hr_hr.properties
rename to app/src/processing/app/i18n/Resources_hr_hr.properties
diff --git a/app/src/processing/app/Resources_hu.po b/app/src/processing/app/i18n/Resources_hu.po
similarity index 100%
rename from app/src/processing/app/Resources_hu.po
rename to app/src/processing/app/i18n/Resources_hu.po
diff --git a/app/src/processing/app/Resources_hu.properties b/app/src/processing/app/i18n/Resources_hu.properties
similarity index 100%
rename from app/src/processing/app/Resources_hu.properties
rename to app/src/processing/app/i18n/Resources_hu.properties
diff --git a/app/src/processing/app/Resources_id.po b/app/src/processing/app/i18n/Resources_id.po
similarity index 100%
rename from app/src/processing/app/Resources_id.po
rename to app/src/processing/app/i18n/Resources_id.po
diff --git a/app/src/processing/app/Resources_id.properties b/app/src/processing/app/i18n/Resources_id.properties
similarity index 100%
rename from app/src/processing/app/Resources_id.properties
rename to app/src/processing/app/i18n/Resources_id.properties
diff --git a/app/src/processing/app/Resources_it.po b/app/src/processing/app/i18n/Resources_it.po
similarity index 100%
rename from app/src/processing/app/Resources_it.po
rename to app/src/processing/app/i18n/Resources_it.po
diff --git a/app/src/processing/app/Resources_it.properties b/app/src/processing/app/i18n/Resources_it.properties
similarity index 100%
rename from app/src/processing/app/Resources_it.properties
rename to app/src/processing/app/i18n/Resources_it.properties
diff --git a/app/src/processing/app/Resources_iw.po b/app/src/processing/app/i18n/Resources_iw.po
similarity index 100%
rename from app/src/processing/app/Resources_iw.po
rename to app/src/processing/app/i18n/Resources_iw.po
diff --git a/app/src/processing/app/Resources_iw.properties b/app/src/processing/app/i18n/Resources_iw.properties
similarity index 100%
rename from app/src/processing/app/Resources_iw.properties
rename to app/src/processing/app/i18n/Resources_iw.properties
diff --git a/app/src/processing/app/Resources_ja.po b/app/src/processing/app/i18n/Resources_ja.po
similarity index 100%
rename from app/src/processing/app/Resources_ja.po
rename to app/src/processing/app/i18n/Resources_ja.po
diff --git a/app/src/processing/app/Resources_ja.properties b/app/src/processing/app/i18n/Resources_ja.properties
similarity index 100%
rename from app/src/processing/app/Resources_ja.properties
rename to app/src/processing/app/i18n/Resources_ja.properties
diff --git a/app/src/processing/app/Resources_ka_ge.po b/app/src/processing/app/i18n/Resources_ka_ge.po
similarity index 100%
rename from app/src/processing/app/Resources_ka_ge.po
rename to app/src/processing/app/i18n/Resources_ka_ge.po
diff --git a/app/src/processing/app/Resources_ka_ge.properties b/app/src/processing/app/i18n/Resources_ka_ge.properties
similarity index 100%
rename from app/src/processing/app/Resources_ka_ge.properties
rename to app/src/processing/app/i18n/Resources_ka_ge.properties
diff --git a/app/src/processing/app/Resources_ko.po b/app/src/processing/app/i18n/Resources_ko.po
similarity index 100%
rename from app/src/processing/app/Resources_ko.po
rename to app/src/processing/app/i18n/Resources_ko.po
diff --git a/app/src/processing/app/Resources_ko.properties b/app/src/processing/app/i18n/Resources_ko.properties
similarity index 100%
rename from app/src/processing/app/Resources_ko.properties
rename to app/src/processing/app/i18n/Resources_ko.properties
diff --git a/app/src/processing/app/Resources_lt.po b/app/src/processing/app/i18n/Resources_lt.po
similarity index 100%
rename from app/src/processing/app/Resources_lt.po
rename to app/src/processing/app/i18n/Resources_lt.po
diff --git a/app/src/processing/app/Resources_lt.properties b/app/src/processing/app/i18n/Resources_lt.properties
similarity index 100%
rename from app/src/processing/app/Resources_lt.properties
rename to app/src/processing/app/i18n/Resources_lt.properties
diff --git a/app/src/processing/app/Resources_lv.po b/app/src/processing/app/i18n/Resources_lv.po
similarity index 100%
rename from app/src/processing/app/Resources_lv.po
rename to app/src/processing/app/i18n/Resources_lv.po
diff --git a/app/src/processing/app/Resources_lv.properties b/app/src/processing/app/i18n/Resources_lv.properties
similarity index 100%
rename from app/src/processing/app/Resources_lv.properties
rename to app/src/processing/app/i18n/Resources_lv.properties
diff --git a/app/src/processing/app/Resources_mr.po b/app/src/processing/app/i18n/Resources_mr.po
similarity index 100%
rename from app/src/processing/app/Resources_mr.po
rename to app/src/processing/app/i18n/Resources_mr.po
diff --git a/app/src/processing/app/Resources_mr.properties b/app/src/processing/app/i18n/Resources_mr.properties
similarity index 100%
rename from app/src/processing/app/Resources_mr.properties
rename to app/src/processing/app/i18n/Resources_mr.properties
diff --git a/app/src/processing/app/Resources_nb_no.po b/app/src/processing/app/i18n/Resources_nb_no.po
similarity index 100%
rename from app/src/processing/app/Resources_nb_no.po
rename to app/src/processing/app/i18n/Resources_nb_no.po
diff --git a/app/src/processing/app/Resources_nb_no.properties b/app/src/processing/app/i18n/Resources_nb_no.properties
similarity index 100%
rename from app/src/processing/app/Resources_nb_no.properties
rename to app/src/processing/app/i18n/Resources_nb_no.properties
diff --git a/app/src/processing/app/Resources_nl.po b/app/src/processing/app/i18n/Resources_nl.po
similarity index 100%
rename from app/src/processing/app/Resources_nl.po
rename to app/src/processing/app/i18n/Resources_nl.po
diff --git a/app/src/processing/app/Resources_nl.properties b/app/src/processing/app/i18n/Resources_nl.properties
similarity index 100%
rename from app/src/processing/app/Resources_nl.properties
rename to app/src/processing/app/i18n/Resources_nl.properties
diff --git a/app/src/processing/app/Resources_no_nb.po b/app/src/processing/app/i18n/Resources_no_nb.po
similarity index 100%
rename from app/src/processing/app/Resources_no_nb.po
rename to app/src/processing/app/i18n/Resources_no_nb.po
diff --git a/app/src/processing/app/Resources_no_nb.properties b/app/src/processing/app/i18n/Resources_no_nb.properties
similarity index 100%
rename from app/src/processing/app/Resources_no_nb.properties
rename to app/src/processing/app/i18n/Resources_no_nb.properties
diff --git a/app/src/processing/app/Resources_pl.po b/app/src/processing/app/i18n/Resources_pl.po
similarity index 100%
rename from app/src/processing/app/Resources_pl.po
rename to app/src/processing/app/i18n/Resources_pl.po
diff --git a/app/src/processing/app/Resources_pl.properties b/app/src/processing/app/i18n/Resources_pl.properties
similarity index 100%
rename from app/src/processing/app/Resources_pl.properties
rename to app/src/processing/app/i18n/Resources_pl.properties
diff --git a/app/src/processing/app/Resources_pt_br.po b/app/src/processing/app/i18n/Resources_pt_br.po
similarity index 100%
rename from app/src/processing/app/Resources_pt_br.po
rename to app/src/processing/app/i18n/Resources_pt_br.po
diff --git a/app/src/processing/app/Resources_pt_br.properties b/app/src/processing/app/i18n/Resources_pt_br.properties
similarity index 100%
rename from app/src/processing/app/Resources_pt_br.properties
rename to app/src/processing/app/i18n/Resources_pt_br.properties
diff --git a/app/src/processing/app/Resources_pt_pt.po b/app/src/processing/app/i18n/Resources_pt_pt.po
similarity index 100%
rename from app/src/processing/app/Resources_pt_pt.po
rename to app/src/processing/app/i18n/Resources_pt_pt.po
diff --git a/app/src/processing/app/Resources_pt_pt.properties b/app/src/processing/app/i18n/Resources_pt_pt.properties
similarity index 100%
rename from app/src/processing/app/Resources_pt_pt.properties
rename to app/src/processing/app/i18n/Resources_pt_pt.properties
diff --git a/app/src/processing/app/Resources_ro.po b/app/src/processing/app/i18n/Resources_ro.po
similarity index 100%
rename from app/src/processing/app/Resources_ro.po
rename to app/src/processing/app/i18n/Resources_ro.po
diff --git a/app/src/processing/app/Resources_ro.properties b/app/src/processing/app/i18n/Resources_ro.properties
similarity index 100%
rename from app/src/processing/app/Resources_ro.properties
rename to app/src/processing/app/i18n/Resources_ro.properties
diff --git a/app/src/processing/app/Resources_ru.po b/app/src/processing/app/i18n/Resources_ru.po
similarity index 100%
rename from app/src/processing/app/Resources_ru.po
rename to app/src/processing/app/i18n/Resources_ru.po
diff --git a/app/src/processing/app/Resources_ru.properties b/app/src/processing/app/i18n/Resources_ru.properties
similarity index 100%
rename from app/src/processing/app/Resources_ru.properties
rename to app/src/processing/app/i18n/Resources_ru.properties
diff --git a/app/src/processing/app/Resources_sl.po b/app/src/processing/app/i18n/Resources_sl.po
similarity index 100%
rename from app/src/processing/app/Resources_sl.po
rename to app/src/processing/app/i18n/Resources_sl.po
diff --git a/app/src/processing/app/Resources_sl.properties b/app/src/processing/app/i18n/Resources_sl.properties
similarity index 100%
rename from app/src/processing/app/Resources_sl.properties
rename to app/src/processing/app/i18n/Resources_sl.properties
diff --git a/app/src/processing/app/Resources_ta.po b/app/src/processing/app/i18n/Resources_ta.po
similarity index 100%
rename from app/src/processing/app/Resources_ta.po
rename to app/src/processing/app/i18n/Resources_ta.po
diff --git a/app/src/processing/app/Resources_ta.properties b/app/src/processing/app/i18n/Resources_ta.properties
similarity index 100%
rename from app/src/processing/app/Resources_ta.properties
rename to app/src/processing/app/i18n/Resources_ta.properties
diff --git a/app/src/processing/app/Resources_tl.po b/app/src/processing/app/i18n/Resources_tl.po
similarity index 100%
rename from app/src/processing/app/Resources_tl.po
rename to app/src/processing/app/i18n/Resources_tl.po
diff --git a/app/src/processing/app/Resources_tl.properties b/app/src/processing/app/i18n/Resources_tl.properties
similarity index 100%
rename from app/src/processing/app/Resources_tl.properties
rename to app/src/processing/app/i18n/Resources_tl.properties
diff --git a/app/src/processing/app/Resources_tr.po b/app/src/processing/app/i18n/Resources_tr.po
similarity index 100%
rename from app/src/processing/app/Resources_tr.po
rename to app/src/processing/app/i18n/Resources_tr.po
diff --git a/app/src/processing/app/Resources_tr.properties b/app/src/processing/app/i18n/Resources_tr.properties
similarity index 100%
rename from app/src/processing/app/Resources_tr.properties
rename to app/src/processing/app/i18n/Resources_tr.properties
diff --git a/app/src/processing/app/Resources_uk.po b/app/src/processing/app/i18n/Resources_uk.po
similarity index 100%
rename from app/src/processing/app/Resources_uk.po
rename to app/src/processing/app/i18n/Resources_uk.po
diff --git a/app/src/processing/app/Resources_uk.properties b/app/src/processing/app/i18n/Resources_uk.properties
similarity index 100%
rename from app/src/processing/app/Resources_uk.properties
rename to app/src/processing/app/i18n/Resources_uk.properties
diff --git a/app/src/processing/app/Resources_zh_cn.po b/app/src/processing/app/i18n/Resources_zh_cn.po
similarity index 100%
rename from app/src/processing/app/Resources_zh_cn.po
rename to app/src/processing/app/i18n/Resources_zh_cn.po
diff --git a/app/src/processing/app/Resources_zh_cn.properties b/app/src/processing/app/i18n/Resources_zh_cn.properties
similarity index 100%
rename from app/src/processing/app/Resources_zh_cn.properties
rename to app/src/processing/app/i18n/Resources_zh_cn.properties
diff --git a/app/src/processing/app/Resources_zh_tw.po b/app/src/processing/app/i18n/Resources_zh_tw.po
similarity index 100%
rename from app/src/processing/app/Resources_zh_tw.po
rename to app/src/processing/app/i18n/Resources_zh_tw.po
diff --git a/app/src/processing/app/Resources_zh_tw.properties b/app/src/processing/app/i18n/Resources_zh_tw.properties
similarity index 100%
rename from app/src/processing/app/Resources_zh_tw.properties
rename to app/src/processing/app/i18n/Resources_zh_tw.properties
diff --git a/app/src/processing/app/i18n_update.py b/app/src/processing/app/i18n/i18n_update.py
similarity index 100%
rename from app/src/processing/app/i18n_update.py
rename to app/src/processing/app/i18n/i18n_update.py
diff --git a/app/src/processing/app/i18n_update.sh b/app/src/processing/app/i18n/i18n_update.sh
similarity index 95%
rename from app/src/processing/app/i18n_update.sh
rename to app/src/processing/app/i18n/i18n_update.sh
index df38a6998..890035f41 100755
--- a/app/src/processing/app/i18n_update.sh
+++ b/app/src/processing/app/i18n/i18n_update.sh
@@ -18,7 +18,7 @@ trap "rm -f '$catalog' '$files'" 0 1 2 15
 
 # Generate the new text catalog without the already translated texts.
 # The 'merge existing' option for xgetext does not work propery for our purpose.
-find . -name '*.java' -print > "$files"
+find .. -name '*.java' -print > "$files"
 xgettext -L Java --from-code=utf-8 -k_ --output="$catalog" --files-from="$files"
 
 # Then, merge with already translated texts.