diff --git a/.tx/config b/.tx/config
index eb4856ca..493d4105 100644
--- a/.tx/config
+++ b/.tx/config
@@ -9,15 +9,15 @@ type = ANDROID
 lang_map = af_ZA: af-rZA, am_ET: am-rET, ar_AE: ar-rAE, ar_BH: ar-rBH, ar_DZ: ar-rDZ, ar_EG: ar-rEG, ar_IQ: ar-rIQ, ar_JO: ar-rJO, ar_KW: ar-rKW, ar_LB: ar-rLB, ar_LY: ar-rLY, ar_MA: ar-rMA, ar_OM: ar-rOM, ar_QA: ar-rQA, ar_SA: ar-rSA, ar_SY: ar-rSY, ar_TN: ar-rTN, ar_YE: ar-rYE, arn_CL: arn-rCL, as_IN: as-rIN, az_AZ: az-rAZ, ba_RU: ba-rRU, be_BY: be-rBY, bg_BG: bg-rBG, bn_BD: bn-rBD, bn_IN: bn-rIN, bo_CN: bo-rCN, br_FR: br-rFR, bs_BA: bs-rBA, ca_ES: ca-rES, co_FR: co-rFR, cs_CZ: cs-rCZ, cy_GB: cy-rGB, da_DK: da-rDK, de_AT: de-rAT, de_CH: de-rCH, de_DE: de-rDE, de_LI: de-rLI, de_LU: de-rLU, dsb_DE: dsb-rDE, dv_MV: dv-rMV, el_GR: el-rGR, en_AU: en-rAU, en_BZ: en-rBZ, en_CA: en-rCA, en_GB: en-rGB, en_IE: en-rIE, en_IN: en-rIN, en_JM: en-rJM, en_MY: en-rMY, en_NZ: en-rNZ, en_PH: en-rPH, en_SG: en-rSG, en_TT: en-rTT, en_US: en-rUS, en_ZA: en-rZA, en_ZW: en-rZW, es_AR: es-rAR, es_BO: es-rBO, es_CL: es-rCL, es_CO: es-rCO, es_CR: es-rCR, es_DO: es-rDO, es_EC: es-rEC, es_ES: es-rES, es_GT: es-rGT, es_HN: es-rHN, es_MX: es-rMX, es_NI: es-rNI, es_PA: es-rPA, es_PE: es-rPE, es_PR: es-rPR, es_PY: es-rPY, es_SV: es-rSV, es_US: es-rUS, es_UY: es-rUY, es_VE: es-rVE, et_EE: et-rEE, eu_ES: eu-rES, fa_IR: fa-rIR, fi_FI: fi-rFI, fil_PH: fil-rPH, fo_FO: fo-rFO, fr_BE: fr-rBE, fr_CA: fr-rCA, fr_CH: fr-rCH, fr_FR: fr-rFR, fr_LU: fr-rLU, fr_MC: fr-rMC, fy_NL: fy-rNL, ga_IE: ga-rIE, gd_GB: gd-rGB, gl_ES: gl-rES, gsw_FR: gsw-rFR, gu_IN: gu-rIN, ha_NG: ha-rNG, hi_IN: hi-rIN, hr_BA: hr-rBA, hr_HR: hr-rHR, hsb_DE: hsb-rDE, hu_HU: hu-rHU, hy_AM: hy-rAM, id_ID: id-rID, ig_NG: ig-rNG, ii_CN: ii-rCN, is_IS: is-rIS, it_CH: it-rCH, it_IT: it-rIT, iu_CA: iu-rCA, ja_JP: ja-rJP, ka_GE: ka-rGE, kk_KZ: kk-rKZ, kl_GL: kl-rGL, km_KH: km-rKH, kn_IN: kn-rIN, ko_KR: ko-rKR, kok_IN: kok-rIN, ky_KG: ky-rKG, lb_LU: lb-rLU, lo_LA: lo-rLA, lt_LT: lt-rLT, lv_LV: lv-rLV, mi_NZ: mi-rNZ, mk_MK: mk-rMK, ml_IN: ml-rIN, mn_CN: mn-rCN, mn_MN: mn-rMN, moh_CA: moh-rCA, mr_IN: mr-rIN, ms_BN: ms-rBN, ms_MY: ms-rMY, mt_MT: mt-rMT, nb_NO: nb-rNO, ne_NP: ne-rNP, nl_BE: nl-rBE, nl_NL: nl-rNL, nn_NO: nn-rNO, nso_ZA: nso-rZA, oc_FR: oc-rFR, or_IN: or-rIN, pa_IN: pa-rIN, pl_PL: pl-rPL, prs_AF: prs-rAF, ps_AF: ps-rAF, pt_BR: pt-rBR, pt_PT: pt-rPT, qut_GT: qut-rGT, quz_BO: quz-rBO, quz_EC: quz-rEC, quz_PE: quz-rPE, rm_CH: rm-rCH, ro_RO: ro-rRO, ru_RU: ru-rRU, rw_RW: rw-rRW, sa_IN: sa-rIN, sah_RU: sah-rRU, se_FI: se-rFI, se_NO: se-rNO, se_SE: se-rSE, si_LK: si-rLK, sk_SK: sk-rSK, sl_SI: sl-rSI, sma_NO: sma-rNO, sma_SE: sma-rSE, smj_NO: smj-rNO, smj_SE: smj-rSE, smn_FI: smn-rFI, sms_FI: sms-rFI, sq_AL: sq-rAL, sr_BA: sr-rBA, sr_CS: sr-rCS, sr_ME: sr-rME, sr_RS: sr-rRS, sv_FI: sv-rFI, sv_SE: sv-rSE, sw_KE: sw-rKE, syr_SY: syr-rSY, ta_IN: ta-rIN, te_IN: te-rIN, tg_TJ: tg-rTJ, th_TH: th-rTH, tk_TM: tk-rTM, tn_ZA: tn-rZA, tr_TR: tr-rTR, tt_RU: tt-rRU, tzm_DZ: tzm-rDZ, ug_CN: ug-rCN, uk_UA: uk-rUA, ur_PK: ur-rPK, uz_UZ: uz-rUZ, vi_VN: vi-rVN, wo_SN: wo-rSN, xh_ZA: xh-rZA, yo_NG: yo-rNG, zh_CN: zh-rCN, zh_HK: zh-rHK, zh_MO: zh-rMO, zh_SG: zh-rSG, zh_TW: zh-rTW, zu_ZA: zu-rZA, no_NO: no-rNO, he_IL: iw-rIL, he: iw, id:in
 
 [syncthing-android.description_fulltxt]
-file_filter = src/fat/play/<lang>/listing/fulldescription
-source_file = src/fat/play/en-GB/listing/fulldescription
+file_filter = src/main/play/<lang>/listing/fulldescription
+source_file = src/main/play/en-GB/listing/fulldescription
 source_lang = en_GB
 type = TXT
 lang_map = ja: ja-JP, sv: sv-SE, da: da-DK, de: de-DE, el: el-EL, es: es-ES, fi: fi-FI, it: it-IT, pl: pl-PL, nl: nl-NL, ru: ru-RU, no: no-NO, pt: pt-PT, ko: ko-KR, cs: cs-CZ, hu: hu-HU, fr: fr-FR, tr: tr-TR
 
 [syncthing-android.description_shorttxt]
-file_filter = src/fat/play/<lang>/listing/shortdescription
-source_file = src/fat/play/en-GB/listing/shortdescription
+file_filter = src/main/play/<lang>/listing/shortdescription
+source_file = src/main/play/en-GB/listing/shortdescription
 source_lang = en_GB
 type = TXT
 lang_map = ja: ja-JP, sv: sv-SE, da: da-DK, de: de-DE, el: el-EL, es: es-ES, fi: fi-FI, it: it-IT, pl: pl-PL, nl: nl-NL, ru: ru-RU, no: no-NO, pt: pt-PT, ko: ko-KR, cs: cs-CZ, hu: hu-HU, fr: fr-FR, tr: tr-TR
diff --git a/build.gradle b/build.gradle
index 9a7bbae9..135d94a4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -44,6 +44,19 @@ android {
         testApplicationId 'com.nutomic.syncthingandroid.test'
         testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
     }
+    signingConfigs {
+        release {
+            storeFile file(RELEASE_STORE_FILE)
+            storePassword RELEASE_STORE_PASSWORD
+            keyAlias RELEASE_KEY_ALIAS
+            keyPassword RELEASE_KEY_PASSWORD
+        }
+    }
+    buildTypes {
+        release {
+            signingConfig signingConfigs.release
+        }
+    }
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -71,17 +84,17 @@ play {
  * Some languages are not supported by Google Play, so we ignore them.
  */
 task deleteUnsupportedPlayTranslations(type: Delete) {
-    delete 'src/fat/play/en/'
-    delete 'src/fat/play/da_DK'
-    delete 'src/fat/play/el-EL'
-    delete 'src/fat/play/es_EC'
-    delete 'src/fat/play/es_MX'
-    delete 'src/fat/play/fr_FR'
-    delete 'src/fat/play/no_NO'
-    delete 'src/fat/play/zh_TW'
-    delete 'src/fat/play/zh_CN'
-    delete 'src/fat/play/pt_BR'
-    delete 'src/fat/play/pl_PL'
-    delete 'src/fat/play/nb'
-    delete 'src/fat/play/nn'
+    delete 'src/main/play/en/'
+    delete 'src/main/play/da_DK'
+    delete 'src/main/play/el-EL'
+    delete 'src/main/play/es_EC'
+    delete 'src/main/play/es_MX'
+    delete 'src/main/play/fr_FR'
+    delete 'src/main/play/no_NO'
+    delete 'src/main/play/zh_TW'
+    delete 'src/main/play/zh_CN'
+    delete 'src/main/play/pt_BR'
+    delete 'src/main/play/pl_PL'
+    delete 'src/main/play/nb'
+    delete 'src/main/play/nn'
 }
diff --git a/src/fat/play/ar/listing/video b/release.bash
similarity index 100%
rename from src/fat/play/ar/listing/video
rename to release.bash
diff --git a/src/fat/play/ar/listing/fulldescription b/src/main/play/ar/listing/fulldescription
similarity index 100%
rename from src/fat/play/ar/listing/fulldescription
rename to src/main/play/ar/listing/fulldescription
diff --git a/src/fat/play/ar/listing/shortdescription b/src/main/play/ar/listing/shortdescription
similarity index 100%
rename from src/fat/play/ar/listing/shortdescription
rename to src/main/play/ar/listing/shortdescription
diff --git a/src/fat/play/ar/listing/title b/src/main/play/ar/listing/title
similarity index 100%
rename from src/fat/play/ar/listing/title
rename to src/main/play/ar/listing/title
diff --git a/src/fat/play/bg/listing/video b/src/main/play/ar/listing/video
similarity index 100%
rename from src/fat/play/bg/listing/video
rename to src/main/play/ar/listing/video
diff --git a/src/fat/play/bg/listing/fulldescription b/src/main/play/bg/listing/fulldescription
similarity index 100%
rename from src/fat/play/bg/listing/fulldescription
rename to src/main/play/bg/listing/fulldescription
diff --git a/src/fat/play/bg/listing/shortdescription b/src/main/play/bg/listing/shortdescription
similarity index 100%
rename from src/fat/play/bg/listing/shortdescription
rename to src/main/play/bg/listing/shortdescription
diff --git a/src/fat/play/bg/listing/title b/src/main/play/bg/listing/title
similarity index 100%
rename from src/fat/play/bg/listing/title
rename to src/main/play/bg/listing/title
diff --git a/src/fat/play/cs-CZ/listing/video b/src/main/play/bg/listing/video
similarity index 100%
rename from src/fat/play/cs-CZ/listing/video
rename to src/main/play/bg/listing/video
diff --git a/src/fat/play/contactEmail b/src/main/play/contactEmail
similarity index 100%
rename from src/fat/play/contactEmail
rename to src/main/play/contactEmail
diff --git a/src/fat/play/contactPhone b/src/main/play/contactPhone
similarity index 100%
rename from src/fat/play/contactPhone
rename to src/main/play/contactPhone
diff --git a/src/fat/play/contactWebsite b/src/main/play/contactWebsite
similarity index 100%
rename from src/fat/play/contactWebsite
rename to src/main/play/contactWebsite
diff --git a/src/fat/play/cs-CZ/listing/fulldescription b/src/main/play/cs-CZ/listing/fulldescription
similarity index 100%
rename from src/fat/play/cs-CZ/listing/fulldescription
rename to src/main/play/cs-CZ/listing/fulldescription
diff --git a/src/fat/play/cs-CZ/listing/shortdescription b/src/main/play/cs-CZ/listing/shortdescription
similarity index 100%
rename from src/fat/play/cs-CZ/listing/shortdescription
rename to src/main/play/cs-CZ/listing/shortdescription
diff --git a/src/fat/play/cs-CZ/listing/title b/src/main/play/cs-CZ/listing/title
similarity index 100%
rename from src/fat/play/cs-CZ/listing/title
rename to src/main/play/cs-CZ/listing/title
diff --git a/src/fat/play/da-DK/listing/video b/src/main/play/cs-CZ/listing/video
similarity index 100%
rename from src/fat/play/da-DK/listing/video
rename to src/main/play/cs-CZ/listing/video
diff --git a/src/fat/play/da-DK/listing/fulldescription b/src/main/play/da-DK/listing/fulldescription
similarity index 100%
rename from src/fat/play/da-DK/listing/fulldescription
rename to src/main/play/da-DK/listing/fulldescription
diff --git a/src/fat/play/da-DK/listing/shortdescription b/src/main/play/da-DK/listing/shortdescription
similarity index 100%
rename from src/fat/play/da-DK/listing/shortdescription
rename to src/main/play/da-DK/listing/shortdescription
diff --git a/src/fat/play/da-DK/listing/title b/src/main/play/da-DK/listing/title
similarity index 100%
rename from src/fat/play/da-DK/listing/title
rename to src/main/play/da-DK/listing/title
diff --git a/src/fat/play/de-DE/listing/video b/src/main/play/da-DK/listing/video
similarity index 100%
rename from src/fat/play/de-DE/listing/video
rename to src/main/play/da-DK/listing/video
diff --git a/src/fat/play/de-DE/listing/fulldescription b/src/main/play/de-DE/listing/fulldescription
similarity index 100%
rename from src/fat/play/de-DE/listing/fulldescription
rename to src/main/play/de-DE/listing/fulldescription
diff --git a/src/fat/play/de-DE/listing/shortdescription b/src/main/play/de-DE/listing/shortdescription
similarity index 100%
rename from src/fat/play/de-DE/listing/shortdescription
rename to src/main/play/de-DE/listing/shortdescription
diff --git a/src/fat/play/de-DE/listing/title b/src/main/play/de-DE/listing/title
similarity index 100%
rename from src/fat/play/de-DE/listing/title
rename to src/main/play/de-DE/listing/title
diff --git a/src/fat/play/en-GB/listing/video b/src/main/play/de-DE/listing/video
similarity index 100%
rename from src/fat/play/en-GB/listing/video
rename to src/main/play/de-DE/listing/video
diff --git a/src/fat/play/de_AT/listing/fulldescription b/src/main/play/de_AT/listing/fulldescription
similarity index 100%
rename from src/fat/play/de_AT/listing/fulldescription
rename to src/main/play/de_AT/listing/fulldescription
diff --git a/src/fat/play/de_AT/listing/shortdescription b/src/main/play/de_AT/listing/shortdescription
similarity index 100%
rename from src/fat/play/de_AT/listing/shortdescription
rename to src/main/play/de_AT/listing/shortdescription
diff --git a/src/fat/play/de_DE/listing/fulldescription b/src/main/play/de_DE/listing/fulldescription
similarity index 100%
rename from src/fat/play/de_DE/listing/fulldescription
rename to src/main/play/de_DE/listing/fulldescription
diff --git a/src/fat/play/de_DE/listing/shortdescription b/src/main/play/de_DE/listing/shortdescription
similarity index 100%
rename from src/fat/play/de_DE/listing/shortdescription
rename to src/main/play/de_DE/listing/shortdescription
diff --git a/src/fat/play/defaultLanguage b/src/main/play/defaultLanguage
similarity index 100%
rename from src/fat/play/defaultLanguage
rename to src/main/play/defaultLanguage
diff --git a/src/fat/play/en-GB/listing/featureGraphic/feature_graphic.jpg b/src/main/play/en-GB/listing/featureGraphic/feature_graphic.jpg
similarity index 100%
rename from src/fat/play/en-GB/listing/featureGraphic/feature_graphic.jpg
rename to src/main/play/en-GB/listing/featureGraphic/feature_graphic.jpg
diff --git a/src/fat/play/en-GB/listing/fulldescription b/src/main/play/en-GB/listing/fulldescription
similarity index 100%
rename from src/fat/play/en-GB/listing/fulldescription
rename to src/main/play/en-GB/listing/fulldescription
diff --git a/src/fat/play/en-GB/listing/phoneScreenshots/screenshot_phone_1.png b/src/main/play/en-GB/listing/phoneScreenshots/screenshot_phone_1.png
similarity index 100%
rename from src/fat/play/en-GB/listing/phoneScreenshots/screenshot_phone_1.png
rename to src/main/play/en-GB/listing/phoneScreenshots/screenshot_phone_1.png
diff --git a/src/fat/play/en-GB/listing/phoneScreenshots/screenshot_phone_2.png b/src/main/play/en-GB/listing/phoneScreenshots/screenshot_phone_2.png
similarity index 100%
rename from src/fat/play/en-GB/listing/phoneScreenshots/screenshot_phone_2.png
rename to src/main/play/en-GB/listing/phoneScreenshots/screenshot_phone_2.png
diff --git a/src/fat/play/en-GB/listing/phoneScreenshots/screenshot_phone_3.png b/src/main/play/en-GB/listing/phoneScreenshots/screenshot_phone_3.png
similarity index 100%
rename from src/fat/play/en-GB/listing/phoneScreenshots/screenshot_phone_3.png
rename to src/main/play/en-GB/listing/phoneScreenshots/screenshot_phone_3.png
diff --git a/src/fat/play/en-GB/listing/phoneScreenshots/screenshot_phone_4.png b/src/main/play/en-GB/listing/phoneScreenshots/screenshot_phone_4.png
similarity index 100%
rename from src/fat/play/en-GB/listing/phoneScreenshots/screenshot_phone_4.png
rename to src/main/play/en-GB/listing/phoneScreenshots/screenshot_phone_4.png
diff --git a/src/fat/play/en-GB/listing/phoneScreenshots/screenshot_phone_5.png b/src/main/play/en-GB/listing/phoneScreenshots/screenshot_phone_5.png
similarity index 100%
rename from src/fat/play/en-GB/listing/phoneScreenshots/screenshot_phone_5.png
rename to src/main/play/en-GB/listing/phoneScreenshots/screenshot_phone_5.png
diff --git a/src/fat/play/en-GB/listing/sevenInchScreenshots/screenshot_tablet_7_inch_1.png b/src/main/play/en-GB/listing/sevenInchScreenshots/screenshot_tablet_7_inch_1.png
similarity index 100%
rename from src/fat/play/en-GB/listing/sevenInchScreenshots/screenshot_tablet_7_inch_1.png
rename to src/main/play/en-GB/listing/sevenInchScreenshots/screenshot_tablet_7_inch_1.png
diff --git a/src/fat/play/en-GB/listing/sevenInchScreenshots/screenshot_tablet_7_inch_2.png b/src/main/play/en-GB/listing/sevenInchScreenshots/screenshot_tablet_7_inch_2.png
similarity index 100%
rename from src/fat/play/en-GB/listing/sevenInchScreenshots/screenshot_tablet_7_inch_2.png
rename to src/main/play/en-GB/listing/sevenInchScreenshots/screenshot_tablet_7_inch_2.png
diff --git a/src/fat/play/en-GB/listing/sevenInchScreenshots/screenshot_tablet_7_inch_3.png b/src/main/play/en-GB/listing/sevenInchScreenshots/screenshot_tablet_7_inch_3.png
similarity index 100%
rename from src/fat/play/en-GB/listing/sevenInchScreenshots/screenshot_tablet_7_inch_3.png
rename to src/main/play/en-GB/listing/sevenInchScreenshots/screenshot_tablet_7_inch_3.png
diff --git a/src/fat/play/en-GB/listing/sevenInchScreenshots/screenshot_tablet_7_inch_4.png b/src/main/play/en-GB/listing/sevenInchScreenshots/screenshot_tablet_7_inch_4.png
similarity index 100%
rename from src/fat/play/en-GB/listing/sevenInchScreenshots/screenshot_tablet_7_inch_4.png
rename to src/main/play/en-GB/listing/sevenInchScreenshots/screenshot_tablet_7_inch_4.png
diff --git a/src/fat/play/en-GB/listing/sevenInchScreenshots/screenshot_tablet_7_inch_5.png b/src/main/play/en-GB/listing/sevenInchScreenshots/screenshot_tablet_7_inch_5.png
similarity index 100%
rename from src/fat/play/en-GB/listing/sevenInchScreenshots/screenshot_tablet_7_inch_5.png
rename to src/main/play/en-GB/listing/sevenInchScreenshots/screenshot_tablet_7_inch_5.png
diff --git a/src/fat/play/en-GB/listing/shortdescription b/src/main/play/en-GB/listing/shortdescription
similarity index 100%
rename from src/fat/play/en-GB/listing/shortdescription
rename to src/main/play/en-GB/listing/shortdescription
diff --git a/src/fat/play/en-GB/listing/tenInchScreenshots/screenshot_tablet_7_inch_1.png b/src/main/play/en-GB/listing/tenInchScreenshots/screenshot_tablet_7_inch_1.png
similarity index 100%
rename from src/fat/play/en-GB/listing/tenInchScreenshots/screenshot_tablet_7_inch_1.png
rename to src/main/play/en-GB/listing/tenInchScreenshots/screenshot_tablet_7_inch_1.png
diff --git a/src/fat/play/en-GB/listing/tenInchScreenshots/screenshot_tablet_7_inch_2.png b/src/main/play/en-GB/listing/tenInchScreenshots/screenshot_tablet_7_inch_2.png
similarity index 100%
rename from src/fat/play/en-GB/listing/tenInchScreenshots/screenshot_tablet_7_inch_2.png
rename to src/main/play/en-GB/listing/tenInchScreenshots/screenshot_tablet_7_inch_2.png
diff --git a/src/fat/play/en-GB/listing/tenInchScreenshots/screenshot_tablet_7_inch_3.png b/src/main/play/en-GB/listing/tenInchScreenshots/screenshot_tablet_7_inch_3.png
similarity index 100%
rename from src/fat/play/en-GB/listing/tenInchScreenshots/screenshot_tablet_7_inch_3.png
rename to src/main/play/en-GB/listing/tenInchScreenshots/screenshot_tablet_7_inch_3.png
diff --git a/src/fat/play/en-GB/listing/tenInchScreenshots/screenshot_tablet_7_inch_4.png b/src/main/play/en-GB/listing/tenInchScreenshots/screenshot_tablet_7_inch_4.png
similarity index 100%
rename from src/fat/play/en-GB/listing/tenInchScreenshots/screenshot_tablet_7_inch_4.png
rename to src/main/play/en-GB/listing/tenInchScreenshots/screenshot_tablet_7_inch_4.png
diff --git a/src/fat/play/en-GB/listing/tenInchScreenshots/screenshot_tablet_7_inch_5.png b/src/main/play/en-GB/listing/tenInchScreenshots/screenshot_tablet_7_inch_5.png
similarity index 100%
rename from src/fat/play/en-GB/listing/tenInchScreenshots/screenshot_tablet_7_inch_5.png
rename to src/main/play/en-GB/listing/tenInchScreenshots/screenshot_tablet_7_inch_5.png
diff --git a/src/fat/play/en-GB/listing/title b/src/main/play/en-GB/listing/title
similarity index 100%
rename from src/fat/play/en-GB/listing/title
rename to src/main/play/en-GB/listing/title
diff --git a/src/fat/play/en-GB/listing/tvScreenshots/screenshot_tv_1.png b/src/main/play/en-GB/listing/tvScreenshots/screenshot_tv_1.png
similarity index 100%
rename from src/fat/play/en-GB/listing/tvScreenshots/screenshot_tv_1.png
rename to src/main/play/en-GB/listing/tvScreenshots/screenshot_tv_1.png
diff --git a/src/fat/play/en-GB/listing/tvScreenshots/screenshot_tv_2.png b/src/main/play/en-GB/listing/tvScreenshots/screenshot_tv_2.png
similarity index 100%
rename from src/fat/play/en-GB/listing/tvScreenshots/screenshot_tv_2.png
rename to src/main/play/en-GB/listing/tvScreenshots/screenshot_tv_2.png
diff --git a/src/fat/play/en-GB/listing/tvScreenshots/screenshot_tv_3.png b/src/main/play/en-GB/listing/tvScreenshots/screenshot_tv_3.png
similarity index 100%
rename from src/fat/play/en-GB/listing/tvScreenshots/screenshot_tv_3.png
rename to src/main/play/en-GB/listing/tvScreenshots/screenshot_tv_3.png
diff --git a/src/fat/play/en-GB/listing/tvScreenshots/screenshot_tv_4.png b/src/main/play/en-GB/listing/tvScreenshots/screenshot_tv_4.png
similarity index 100%
rename from src/fat/play/en-GB/listing/tvScreenshots/screenshot_tv_4.png
rename to src/main/play/en-GB/listing/tvScreenshots/screenshot_tv_4.png
diff --git a/src/fat/play/fi-FI/listing/video b/src/main/play/en-GB/listing/video
similarity index 100%
rename from src/fat/play/fi-FI/listing/video
rename to src/main/play/en-GB/listing/video
diff --git a/src/fat/play/en-GB/whatsnew b/src/main/play/en-GB/whatsnew
similarity index 100%
rename from src/fat/play/en-GB/whatsnew
rename to src/main/play/en-GB/whatsnew
diff --git a/src/fat/play/es-ES/listing/fulldescription b/src/main/play/es-ES/listing/fulldescription
similarity index 100%
rename from src/fat/play/es-ES/listing/fulldescription
rename to src/main/play/es-ES/listing/fulldescription
diff --git a/src/fat/play/es-ES/listing/shortdescription b/src/main/play/es-ES/listing/shortdescription
similarity index 100%
rename from src/fat/play/es-ES/listing/shortdescription
rename to src/main/play/es-ES/listing/shortdescription
diff --git a/src/fat/play/es-ES/listing/title b/src/main/play/es-ES/listing/title
similarity index 100%
rename from src/fat/play/es-ES/listing/title
rename to src/main/play/es-ES/listing/title
diff --git a/src/fat/play/fi-FI/listing/fulldescription b/src/main/play/fi-FI/listing/fulldescription
similarity index 100%
rename from src/fat/play/fi-FI/listing/fulldescription
rename to src/main/play/fi-FI/listing/fulldescription
diff --git a/src/fat/play/fi-FI/listing/shortdescription b/src/main/play/fi-FI/listing/shortdescription
similarity index 100%
rename from src/fat/play/fi-FI/listing/shortdescription
rename to src/main/play/fi-FI/listing/shortdescription
diff --git a/src/fat/play/fi-FI/listing/title b/src/main/play/fi-FI/listing/title
similarity index 100%
rename from src/fat/play/fi-FI/listing/title
rename to src/main/play/fi-FI/listing/title
diff --git a/src/fat/play/hu-HU/listing/video b/src/main/play/fi-FI/listing/video
similarity index 100%
rename from src/fat/play/hu-HU/listing/video
rename to src/main/play/fi-FI/listing/video
diff --git a/src/fat/play/fr-FR/listing/fulldescription b/src/main/play/fr-FR/listing/fulldescription
similarity index 100%
rename from src/fat/play/fr-FR/listing/fulldescription
rename to src/main/play/fr-FR/listing/fulldescription
diff --git a/src/fat/play/fr-FR/listing/shortdescription b/src/main/play/fr-FR/listing/shortdescription
similarity index 100%
rename from src/fat/play/fr-FR/listing/shortdescription
rename to src/main/play/fr-FR/listing/shortdescription
diff --git a/src/fat/play/fr-FR/listing/title b/src/main/play/fr-FR/listing/title
similarity index 100%
rename from src/fat/play/fr-FR/listing/title
rename to src/main/play/fr-FR/listing/title
diff --git a/src/fat/play/hu-HU/listing/fulldescription b/src/main/play/hu-HU/listing/fulldescription
similarity index 100%
rename from src/fat/play/hu-HU/listing/fulldescription
rename to src/main/play/hu-HU/listing/fulldescription
diff --git a/src/fat/play/hu-HU/listing/shortdescription b/src/main/play/hu-HU/listing/shortdescription
similarity index 100%
rename from src/fat/play/hu-HU/listing/shortdescription
rename to src/main/play/hu-HU/listing/shortdescription
diff --git a/src/fat/play/hu-HU/listing/title b/src/main/play/hu-HU/listing/title
similarity index 100%
rename from src/fat/play/hu-HU/listing/title
rename to src/main/play/hu-HU/listing/title
diff --git a/src/fat/play/ja-JP/listing/video b/src/main/play/hu-HU/listing/video
similarity index 100%
rename from src/fat/play/ja-JP/listing/video
rename to src/main/play/hu-HU/listing/video
diff --git a/src/fat/play/id/listing/fulldescription b/src/main/play/id/listing/fulldescription
similarity index 100%
rename from src/fat/play/id/listing/fulldescription
rename to src/main/play/id/listing/fulldescription
diff --git a/src/fat/play/id/listing/shortdescription b/src/main/play/id/listing/shortdescription
similarity index 100%
rename from src/fat/play/id/listing/shortdescription
rename to src/main/play/id/listing/shortdescription
diff --git a/src/fat/play/id/listing/title b/src/main/play/id/listing/title
similarity index 100%
rename from src/fat/play/id/listing/title
rename to src/main/play/id/listing/title
diff --git a/src/fat/play/it-IT/listing/fulldescription b/src/main/play/it-IT/listing/fulldescription
similarity index 100%
rename from src/fat/play/it-IT/listing/fulldescription
rename to src/main/play/it-IT/listing/fulldescription
diff --git a/src/fat/play/it-IT/listing/shortdescription b/src/main/play/it-IT/listing/shortdescription
similarity index 100%
rename from src/fat/play/it-IT/listing/shortdescription
rename to src/main/play/it-IT/listing/shortdescription
diff --git a/src/fat/play/it-IT/listing/title b/src/main/play/it-IT/listing/title
similarity index 100%
rename from src/fat/play/it-IT/listing/title
rename to src/main/play/it-IT/listing/title
diff --git a/src/fat/play/ja-JP/listing/fulldescription b/src/main/play/ja-JP/listing/fulldescription
similarity index 100%
rename from src/fat/play/ja-JP/listing/fulldescription
rename to src/main/play/ja-JP/listing/fulldescription
diff --git a/src/fat/play/ja-JP/listing/shortdescription b/src/main/play/ja-JP/listing/shortdescription
similarity index 100%
rename from src/fat/play/ja-JP/listing/shortdescription
rename to src/main/play/ja-JP/listing/shortdescription
diff --git a/src/fat/play/ja-JP/listing/title b/src/main/play/ja-JP/listing/title
similarity index 100%
rename from src/fat/play/ja-JP/listing/title
rename to src/main/play/ja-JP/listing/title
diff --git a/src/fat/play/ko-KR/listing/video b/src/main/play/ja-JP/listing/video
similarity index 100%
rename from src/fat/play/ko-KR/listing/video
rename to src/main/play/ja-JP/listing/video
diff --git a/src/fat/play/ko-KR/listing/fulldescription b/src/main/play/ko-KR/listing/fulldescription
similarity index 100%
rename from src/fat/play/ko-KR/listing/fulldescription
rename to src/main/play/ko-KR/listing/fulldescription
diff --git a/src/fat/play/ko-KR/listing/shortdescription b/src/main/play/ko-KR/listing/shortdescription
similarity index 100%
rename from src/fat/play/ko-KR/listing/shortdescription
rename to src/main/play/ko-KR/listing/shortdescription
diff --git a/src/fat/play/ko-KR/listing/title b/src/main/play/ko-KR/listing/title
similarity index 100%
rename from src/fat/play/ko-KR/listing/title
rename to src/main/play/ko-KR/listing/title
diff --git a/src/fat/play/no-NO/listing/video b/src/main/play/ko-KR/listing/video
similarity index 100%
rename from src/fat/play/no-NO/listing/video
rename to src/main/play/ko-KR/listing/video
diff --git a/src/fat/play/nl-NL/listing/fulldescription b/src/main/play/nl-NL/listing/fulldescription
similarity index 100%
rename from src/fat/play/nl-NL/listing/fulldescription
rename to src/main/play/nl-NL/listing/fulldescription
diff --git a/src/fat/play/nl-NL/listing/shortdescription b/src/main/play/nl-NL/listing/shortdescription
similarity index 100%
rename from src/fat/play/nl-NL/listing/shortdescription
rename to src/main/play/nl-NL/listing/shortdescription
diff --git a/src/fat/play/nl-NL/listing/title b/src/main/play/nl-NL/listing/title
similarity index 100%
rename from src/fat/play/nl-NL/listing/title
rename to src/main/play/nl-NL/listing/title
diff --git a/src/fat/play/no-NO/listing/fulldescription b/src/main/play/no-NO/listing/fulldescription
similarity index 100%
rename from src/fat/play/no-NO/listing/fulldescription
rename to src/main/play/no-NO/listing/fulldescription
diff --git a/src/fat/play/no-NO/listing/shortdescription b/src/main/play/no-NO/listing/shortdescription
similarity index 100%
rename from src/fat/play/no-NO/listing/shortdescription
rename to src/main/play/no-NO/listing/shortdescription
diff --git a/src/fat/play/no-NO/listing/title b/src/main/play/no-NO/listing/title
similarity index 100%
rename from src/fat/play/no-NO/listing/title
rename to src/main/play/no-NO/listing/title
diff --git a/src/fat/play/pl-PL/listing/video b/src/main/play/no-NO/listing/video
similarity index 100%
rename from src/fat/play/pl-PL/listing/video
rename to src/main/play/no-NO/listing/video
diff --git a/src/fat/play/pl-PL/listing/fulldescription b/src/main/play/pl-PL/listing/fulldescription
similarity index 100%
rename from src/fat/play/pl-PL/listing/fulldescription
rename to src/main/play/pl-PL/listing/fulldescription
diff --git a/src/fat/play/pl-PL/listing/shortdescription b/src/main/play/pl-PL/listing/shortdescription
similarity index 100%
rename from src/fat/play/pl-PL/listing/shortdescription
rename to src/main/play/pl-PL/listing/shortdescription
diff --git a/src/fat/play/pl-PL/listing/title b/src/main/play/pl-PL/listing/title
similarity index 100%
rename from src/fat/play/pl-PL/listing/title
rename to src/main/play/pl-PL/listing/title
diff --git a/src/fat/play/pt-PT/listing/video b/src/main/play/pl-PL/listing/video
similarity index 100%
rename from src/fat/play/pt-PT/listing/video
rename to src/main/play/pl-PL/listing/video
diff --git a/src/fat/play/pt-PT/listing/fulldescription b/src/main/play/pt-PT/listing/fulldescription
similarity index 100%
rename from src/fat/play/pt-PT/listing/fulldescription
rename to src/main/play/pt-PT/listing/fulldescription
diff --git a/src/fat/play/pt-PT/listing/shortdescription b/src/main/play/pt-PT/listing/shortdescription
similarity index 100%
rename from src/fat/play/pt-PT/listing/shortdescription
rename to src/main/play/pt-PT/listing/shortdescription
diff --git a/src/fat/play/pt-PT/listing/title b/src/main/play/pt-PT/listing/title
similarity index 100%
rename from src/fat/play/pt-PT/listing/title
rename to src/main/play/pt-PT/listing/title
diff --git a/src/fat/play/ru-RU/listing/video b/src/main/play/pt-PT/listing/video
similarity index 100%
rename from src/fat/play/ru-RU/listing/video
rename to src/main/play/pt-PT/listing/video
diff --git a/src/fat/play/ro/listing/fulldescription b/src/main/play/ro/listing/fulldescription
similarity index 100%
rename from src/fat/play/ro/listing/fulldescription
rename to src/main/play/ro/listing/fulldescription
diff --git a/src/fat/play/ro/listing/shortdescription b/src/main/play/ro/listing/shortdescription
similarity index 100%
rename from src/fat/play/ro/listing/shortdescription
rename to src/main/play/ro/listing/shortdescription
diff --git a/src/fat/play/ro/listing/title b/src/main/play/ro/listing/title
similarity index 100%
rename from src/fat/play/ro/listing/title
rename to src/main/play/ro/listing/title
diff --git a/src/fat/play/ru-RU/listing/fulldescription b/src/main/play/ru-RU/listing/fulldescription
similarity index 100%
rename from src/fat/play/ru-RU/listing/fulldescription
rename to src/main/play/ru-RU/listing/fulldescription
diff --git a/src/fat/play/ru-RU/listing/shortdescription b/src/main/play/ru-RU/listing/shortdescription
similarity index 100%
rename from src/fat/play/ru-RU/listing/shortdescription
rename to src/main/play/ru-RU/listing/shortdescription
diff --git a/src/fat/play/ru-RU/listing/title b/src/main/play/ru-RU/listing/title
similarity index 100%
rename from src/fat/play/ru-RU/listing/title
rename to src/main/play/ru-RU/listing/title
diff --git a/src/fat/play/sk/listing/video b/src/main/play/ru-RU/listing/video
similarity index 100%
rename from src/fat/play/sk/listing/video
rename to src/main/play/ru-RU/listing/video
diff --git a/src/fat/play/sk/listing/fulldescription b/src/main/play/sk/listing/fulldescription
similarity index 100%
rename from src/fat/play/sk/listing/fulldescription
rename to src/main/play/sk/listing/fulldescription
diff --git a/src/fat/play/sk/listing/shortdescription b/src/main/play/sk/listing/shortdescription
similarity index 100%
rename from src/fat/play/sk/listing/shortdescription
rename to src/main/play/sk/listing/shortdescription
diff --git a/src/fat/play/sk/listing/title b/src/main/play/sk/listing/title
similarity index 100%
rename from src/fat/play/sk/listing/title
rename to src/main/play/sk/listing/title
diff --git a/src/fat/play/sl/listing/video b/src/main/play/sk/listing/video
similarity index 100%
rename from src/fat/play/sl/listing/video
rename to src/main/play/sk/listing/video
diff --git a/src/fat/play/sl/listing/fulldescription b/src/main/play/sl/listing/fulldescription
similarity index 100%
rename from src/fat/play/sl/listing/fulldescription
rename to src/main/play/sl/listing/fulldescription
diff --git a/src/fat/play/sl/listing/shortdescription b/src/main/play/sl/listing/shortdescription
similarity index 100%
rename from src/fat/play/sl/listing/shortdescription
rename to src/main/play/sl/listing/shortdescription
diff --git a/src/fat/play/sl/listing/title b/src/main/play/sl/listing/title
similarity index 100%
rename from src/fat/play/sl/listing/title
rename to src/main/play/sl/listing/title
diff --git a/src/fat/play/sr/listing/video b/src/main/play/sl/listing/video
similarity index 100%
rename from src/fat/play/sr/listing/video
rename to src/main/play/sl/listing/video
diff --git a/src/fat/play/sr/listing/fulldescription b/src/main/play/sr/listing/fulldescription
similarity index 100%
rename from src/fat/play/sr/listing/fulldescription
rename to src/main/play/sr/listing/fulldescription
diff --git a/src/fat/play/sr/listing/shortdescription b/src/main/play/sr/listing/shortdescription
similarity index 100%
rename from src/fat/play/sr/listing/shortdescription
rename to src/main/play/sr/listing/shortdescription
diff --git a/src/fat/play/sr/listing/title b/src/main/play/sr/listing/title
similarity index 100%
rename from src/fat/play/sr/listing/title
rename to src/main/play/sr/listing/title
diff --git a/src/fat/play/sv-SE/listing/video b/src/main/play/sr/listing/video
similarity index 100%
rename from src/fat/play/sv-SE/listing/video
rename to src/main/play/sr/listing/video
diff --git a/src/fat/play/sv-SE/listing/fulldescription b/src/main/play/sv-SE/listing/fulldescription
similarity index 100%
rename from src/fat/play/sv-SE/listing/fulldescription
rename to src/main/play/sv-SE/listing/fulldescription
diff --git a/src/fat/play/sv-SE/listing/shortdescription b/src/main/play/sv-SE/listing/shortdescription
similarity index 100%
rename from src/fat/play/sv-SE/listing/shortdescription
rename to src/main/play/sv-SE/listing/shortdescription
diff --git a/src/fat/play/sv-SE/listing/title b/src/main/play/sv-SE/listing/title
similarity index 100%
rename from src/fat/play/sv-SE/listing/title
rename to src/main/play/sv-SE/listing/title
diff --git a/src/fat/play/zh-CN/listing/video b/src/main/play/sv-SE/listing/video
similarity index 100%
rename from src/fat/play/zh-CN/listing/video
rename to src/main/play/sv-SE/listing/video
diff --git a/src/fat/play/sv_SE/listing/fulldescription b/src/main/play/sv_SE/listing/fulldescription
similarity index 100%
rename from src/fat/play/sv_SE/listing/fulldescription
rename to src/main/play/sv_SE/listing/fulldescription
diff --git a/src/fat/play/sv_SE/listing/shortdescription b/src/main/play/sv_SE/listing/shortdescription
similarity index 100%
rename from src/fat/play/sv_SE/listing/shortdescription
rename to src/main/play/sv_SE/listing/shortdescription
diff --git a/src/fat/play/tr-TR/listing/fulldescription b/src/main/play/tr-TR/listing/fulldescription
similarity index 100%
rename from src/fat/play/tr-TR/listing/fulldescription
rename to src/main/play/tr-TR/listing/fulldescription
diff --git a/src/fat/play/tr-TR/listing/shortdescription b/src/main/play/tr-TR/listing/shortdescription
similarity index 100%
rename from src/fat/play/tr-TR/listing/shortdescription
rename to src/main/play/tr-TR/listing/shortdescription
diff --git a/src/fat/play/tr-TR/listing/title b/src/main/play/tr-TR/listing/title
similarity index 100%
rename from src/fat/play/tr-TR/listing/title
rename to src/main/play/tr-TR/listing/title
diff --git a/src/fat/play/vi/listing/fulldescription b/src/main/play/vi/listing/fulldescription
similarity index 100%
rename from src/fat/play/vi/listing/fulldescription
rename to src/main/play/vi/listing/fulldescription
diff --git a/src/fat/play/vi/listing/shortdescription b/src/main/play/vi/listing/shortdescription
similarity index 100%
rename from src/fat/play/vi/listing/shortdescription
rename to src/main/play/vi/listing/shortdescription
diff --git a/src/fat/play/vi/listing/title b/src/main/play/vi/listing/title
similarity index 100%
rename from src/fat/play/vi/listing/title
rename to src/main/play/vi/listing/title
diff --git a/src/fat/play/zh-CN/listing/fulldescription b/src/main/play/zh-CN/listing/fulldescription
similarity index 100%
rename from src/fat/play/zh-CN/listing/fulldescription
rename to src/main/play/zh-CN/listing/fulldescription
diff --git a/src/fat/play/zh-CN/listing/shortdescription b/src/main/play/zh-CN/listing/shortdescription
similarity index 100%
rename from src/fat/play/zh-CN/listing/shortdescription
rename to src/main/play/zh-CN/listing/shortdescription
diff --git a/src/fat/play/zh-CN/listing/title b/src/main/play/zh-CN/listing/title
similarity index 100%
rename from src/fat/play/zh-CN/listing/title
rename to src/main/play/zh-CN/listing/title
diff --git a/src/main/play/zh-CN/listing/video b/src/main/play/zh-CN/listing/video
new file mode 100644
index 00000000..e69de29b