diff --git a/language/Amharic/strings.po b/language/Amharic/strings.po
deleted file mode 100644
index 44f8ca9..0000000
--- a/language/Amharic/strings.po
+++ /dev/null
@@ -1,109 +0,0 @@
-# XBMC Media Center language file
-# Addon Name: PM3.HD
-# Addon id: skin.pm3-hd
-# Addon Provider: Jezz_X, Team XBMC
-msgid ""
-msgstr ""
-"Project-Id-Version: XBMC Skins\n"
-"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
-"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: XBMC Translation Team\n"
-"Language-Team: Amharic (http://www.transifex.com/projects/p/xbmc-skins/language/am/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: am\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-msgctxt "#31001"
-msgid "Working..."
-msgstr "በመስራት ላይ "
-
-msgctxt "#31004"
-msgid "Home"
-msgstr "ቤት "
-
-msgctxt "#31005"
-msgid "Memory Used:"
-msgstr "የተጠቀሙት Memory:"
-
-msgctxt "#31022"
-msgid "Music - Files"
-msgstr "የሙዚቃ ፋይሎች"
-
-msgctxt "#31024"
-msgid "Page"
-msgstr "ገጽ"
-
-msgctxt "#31025"
-msgid "Items"
-msgstr "እቃዎች"
-
-msgctxt "#31042"
-msgid "PLAYING"
-msgstr "የሚጫወተው"
-
-msgctxt "#31043"
-msgid "PAUSED"
-msgstr "ማቆሚያ"
-
-msgctxt "#31044"
-msgid "FAST FORWARD"
-msgstr "ወደ ፊት ማሳለፊያ"
-
-msgctxt "#31045"
-msgid "REWIND"
-msgstr "ወደ ኋላ ማሳለፊያ"
-
-msgctxt "#31055"
-msgid "Open playlist"
-msgstr "ዝርዝሮችን መክፈቻ"
-
-msgctxt "#31056"
-msgid "Save playlist"
-msgstr "ዝርዝሮችን ማስቀመጫ"
-
-msgctxt "#31057"
-msgid "Close playlist"
-msgstr "ዝርዝሮችን መዝጊያ"
-
-msgctxt "#31058"
-msgid "System music files"
-msgstr "የስርአቱ ሙዚቃ ፋይሎች"
-
-msgctxt "#31059"
-msgid "Current playlist"
-msgstr "አሁን የሚጫወተው ዝርዝር"
-
-msgctxt "#31101"
-msgid "Home screen options"
-msgstr "የቤት መመልከቻ ምርጫዎች"
-
-msgctxt "#31106"
-msgid "Miscellaneous options"
-msgstr "የተለያዩ ምርጫዎች"
-
-msgctxt "#31114"
-msgid "Multi Image"
-msgstr "ተንሸራታች"
-
-msgctxt "#31119"
-msgid "Hide Main Menu Buttons"
-msgstr "የዋናውን ዝርዝር ቁልፎች መደበቂያ"
-
-msgctxt "#31120"
-msgid "Hide"
-msgstr "መደበቂያ"
-
-msgctxt "#31250"
-msgid "Subtitles"
-msgstr "ንዑስ አርእስት"
-
-msgctxt "#31403"
-msgid "Rename Group"
-msgstr "ቡድን እንደገና መሰየሚያ"
-
-msgctxt "#31404"
-msgid "Delete Group"
-msgstr "ቡድን ማጥፊያ"
diff --git a/language/Afrikaans/strings.po b/language/resource.language.af_za/strings.po
similarity index 100%
rename from language/Afrikaans/strings.po
rename to language/resource.language.af_za/strings.po
diff --git a/language/Arabic/strings.po b/language/resource.language.ar_sa/strings.po
similarity index 100%
rename from language/Arabic/strings.po
rename to language/resource.language.ar_sa/strings.po
diff --git a/language/Belarusian/strings.po b/language/resource.language.be_by/strings.po
similarity index 100%
rename from language/Belarusian/strings.po
rename to language/resource.language.be_by/strings.po
diff --git a/language/Bulgarian/strings.po b/language/resource.language.bg_bg/strings.po
similarity index 100%
rename from language/Bulgarian/strings.po
rename to language/resource.language.bg_bg/strings.po
diff --git a/language/Bosnian/strings.po b/language/resource.language.bs_ba/strings.po
similarity index 100%
rename from language/Bosnian/strings.po
rename to language/resource.language.bs_ba/strings.po
diff --git a/language/Catalan/strings.po b/language/resource.language.ca_es/strings.po
similarity index 100%
rename from language/Catalan/strings.po
rename to language/resource.language.ca_es/strings.po
diff --git a/language/Czech/strings.po b/language/resource.language.cs_cz/strings.po
similarity index 100%
rename from language/Czech/strings.po
rename to language/resource.language.cs_cz/strings.po
diff --git a/language/Danish/strings.po b/language/resource.language.da_dk/strings.po
similarity index 100%
rename from language/Danish/strings.po
rename to language/resource.language.da_dk/strings.po
diff --git a/language/German/strings.po b/language/resource.language.de_de/strings.po
similarity index 100%
rename from language/German/strings.po
rename to language/resource.language.de_de/strings.po
diff --git a/language/Greek/strings.po b/language/resource.language.el_gr/strings.po
similarity index 100%
rename from language/Greek/strings.po
rename to language/resource.language.el_gr/strings.po
diff --git a/language/English/strings.po b/language/resource.language.en_gb/strings.po
similarity index 100%
rename from language/English/strings.po
rename to language/resource.language.en_gb/strings.po
diff --git a/language/Esperanto/strings.po b/language/resource.language.eo/strings.po
similarity index 100%
rename from language/Esperanto/strings.po
rename to language/resource.language.eo/strings.po
diff --git a/language/Spanish (Argentina)/strings.po b/language/resource.language.es_ar/strings.po
similarity index 100%
rename from language/Spanish (Argentina)/strings.po
rename to language/resource.language.es_ar/strings.po
diff --git a/language/Spanish/strings.po b/language/resource.language.es_es/strings.po
similarity index 100%
rename from language/Spanish/strings.po
rename to language/resource.language.es_es/strings.po
diff --git a/language/Spanish (Mexico)/strings.po b/language/resource.language.es_mx/strings.po
similarity index 100%
rename from language/Spanish (Mexico)/strings.po
rename to language/resource.language.es_mx/strings.po
diff --git a/language/Estonian/strings.po b/language/resource.language.et_ee/strings.po
similarity index 100%
rename from language/Estonian/strings.po
rename to language/resource.language.et_ee/strings.po
diff --git a/language/Basque/strings.po b/language/resource.language.eu_es/strings.po
similarity index 100%
rename from language/Basque/strings.po
rename to language/resource.language.eu_es/strings.po
diff --git a/language/Persian/strings.po b/language/resource.language.fa_af/strings.po
similarity index 100%
rename from language/Persian/strings.po
rename to language/resource.language.fa_af/strings.po
diff --git a/language/Persian (Iran)/strings.po b/language/resource.language.fa_ir/strings.po
similarity index 100%
rename from language/Persian (Iran)/strings.po
rename to language/resource.language.fa_ir/strings.po
diff --git a/language/Finnish/strings.po b/language/resource.language.fi_fi/strings.po
similarity index 100%
rename from language/Finnish/strings.po
rename to language/resource.language.fi_fi/strings.po
diff --git a/language/French/strings.po b/language/resource.language.fr_fr/strings.po
similarity index 100%
rename from language/French/strings.po
rename to language/resource.language.fr_fr/strings.po
diff --git a/language/Galician/strings.po b/language/resource.language.gl_es/strings.po
similarity index 100%
rename from language/Galician/strings.po
rename to language/resource.language.gl_es/strings.po
diff --git a/language/Hebrew/strings.po b/language/resource.language.he_il/strings.po
similarity index 100%
rename from language/Hebrew/strings.po
rename to language/resource.language.he_il/strings.po
diff --git a/language/Hindi (Devanagiri)/strings.po b/language/resource.language.hi_in/strings.po
similarity index 100%
rename from language/Hindi (Devanagiri)/strings.po
rename to language/resource.language.hi_in/strings.po
diff --git a/language/Croatian/strings.po b/language/resource.language.hr_hr/strings.po
similarity index 100%
rename from language/Croatian/strings.po
rename to language/resource.language.hr_hr/strings.po
diff --git a/language/Hungarian/strings.po b/language/resource.language.hu_hu/strings.po
similarity index 100%
rename from language/Hungarian/strings.po
rename to language/resource.language.hu_hu/strings.po
diff --git a/language/Indonesian/strings.po b/language/resource.language.id_id/strings.po
similarity index 100%
rename from language/Indonesian/strings.po
rename to language/resource.language.id_id/strings.po
diff --git a/language/Icelandic/strings.po b/language/resource.language.is_is/strings.po
similarity index 100%
rename from language/Icelandic/strings.po
rename to language/resource.language.is_is/strings.po
diff --git a/language/Italian/strings.po b/language/resource.language.it_it/strings.po
similarity index 100%
rename from language/Italian/strings.po
rename to language/resource.language.it_it/strings.po
diff --git a/language/Japanese/strings.po b/language/resource.language.ja_jp/strings.po
similarity index 100%
rename from language/Japanese/strings.po
rename to language/resource.language.ja_jp/strings.po
diff --git a/language/Korean/strings.po b/language/resource.language.ko_kr/strings.po
similarity index 100%
rename from language/Korean/strings.po
rename to language/resource.language.ko_kr/strings.po
diff --git a/language/Lithuanian/strings.po b/language/resource.language.lt_lt/strings.po
similarity index 100%
rename from language/Lithuanian/strings.po
rename to language/resource.language.lt_lt/strings.po
diff --git a/language/Latvian/strings.po b/language/resource.language.lv_lv/strings.po
similarity index 100%
rename from language/Latvian/strings.po
rename to language/resource.language.lv_lv/strings.po
diff --git a/language/Macedonian/strings.po b/language/resource.language.mk_mk/strings.po
similarity index 100%
rename from language/Macedonian/strings.po
rename to language/resource.language.mk_mk/strings.po
diff --git a/language/Maltese/strings.po b/language/resource.language.mt_mt/strings.po
similarity index 100%
rename from language/Maltese/strings.po
rename to language/resource.language.mt_mt/strings.po
diff --git a/language/Norwegian/strings.po b/language/resource.language.nb_no/strings.po
similarity index 100%
rename from language/Norwegian/strings.po
rename to language/resource.language.nb_no/strings.po
diff --git a/language/Dutch/strings.po b/language/resource.language.nl_nl/strings.po
similarity index 100%
rename from language/Dutch/strings.po
rename to language/resource.language.nl_nl/strings.po
diff --git a/language/Polish/strings.po b/language/resource.language.pl_pl/strings.po
similarity index 100%
rename from language/Polish/strings.po
rename to language/resource.language.pl_pl/strings.po
diff --git a/language/Portuguese (Brazil)/strings.po b/language/resource.language.pt_br/strings.po
similarity index 100%
rename from language/Portuguese (Brazil)/strings.po
rename to language/resource.language.pt_br/strings.po
diff --git a/language/Portuguese/strings.po b/language/resource.language.pt_pt/strings.po
similarity index 100%
rename from language/Portuguese/strings.po
rename to language/resource.language.pt_pt/strings.po
diff --git a/language/Romanian/strings.po b/language/resource.language.ro_ro/strings.po
similarity index 100%
rename from language/Romanian/strings.po
rename to language/resource.language.ro_ro/strings.po
diff --git a/language/Russian/strings.po b/language/resource.language.ru_ru/strings.po
similarity index 100%
rename from language/Russian/strings.po
rename to language/resource.language.ru_ru/strings.po
diff --git a/language/Slovak/strings.po b/language/resource.language.sk_sk/strings.po
similarity index 100%
rename from language/Slovak/strings.po
rename to language/resource.language.sk_sk/strings.po
diff --git a/language/Slovenian/strings.po b/language/resource.language.sl_si/strings.po
similarity index 100%
rename from language/Slovenian/strings.po
rename to language/resource.language.sl_si/strings.po
diff --git a/language/Albanian/strings.po b/language/resource.language.sq_al/strings.po
similarity index 100%
rename from language/Albanian/strings.po
rename to language/resource.language.sq_al/strings.po
diff --git a/language/Serbian (Cyrillic)/strings.po b/language/resource.language.sr_rs/strings.po
similarity index 100%
rename from language/Serbian (Cyrillic)/strings.po
rename to language/resource.language.sr_rs/strings.po
diff --git a/language/Serbian/strings.po b/language/resource.language.sr_rs@latin/strings.po
similarity index 100%
rename from language/Serbian/strings.po
rename to language/resource.language.sr_rs@latin/strings.po
diff --git a/language/Swedish/strings.po b/language/resource.language.sv_se/strings.po
similarity index 100%
rename from language/Swedish/strings.po
rename to language/resource.language.sv_se/strings.po
diff --git a/language/Thai/strings.po b/language/resource.language.th_th/strings.po
similarity index 100%
rename from language/Thai/strings.po
rename to language/resource.language.th_th/strings.po
diff --git a/language/Turkish/strings.po b/language/resource.language.tr_tr/strings.po
similarity index 100%
rename from language/Turkish/strings.po
rename to language/resource.language.tr_tr/strings.po
diff --git a/language/Ukrainian/strings.po b/language/resource.language.uk_ua/strings.po
similarity index 100%
rename from language/Ukrainian/strings.po
rename to language/resource.language.uk_ua/strings.po
diff --git a/language/Vietnamese/strings.po b/language/resource.language.vi_vn/strings.po
similarity index 100%
rename from language/Vietnamese/strings.po
rename to language/resource.language.vi_vn/strings.po
diff --git a/language/Chinese (Simple)/strings.po b/language/resource.language.zh_cn/strings.po
similarity index 100%
rename from language/Chinese (Simple)/strings.po
rename to language/resource.language.zh_cn/strings.po
diff --git a/language/Chinese (Traditional)/strings.po b/language/resource.language.zh_tw/strings.po
similarity index 100%
rename from language/Chinese (Traditional)/strings.po
rename to language/resource.language.zh_tw/strings.po