Brining in all addons into gradle build

98 files changed, 148 insertions, 198 deletions

diff --git a/addons/gradle/language_pack_lib.gradle b/addons/gradle/language_pack_lib.gradle
index 2b698a145..24a2a8ffa 100644
--- a/addons/gradle/language_pack_lib.gradle
+++ b/addons/gradle/language_pack_lib.gradle
@@ -20,9 +20,9 @@ def generateIconsTask = tasks.register('generateLanguagePackIcons') {
 [['xxxhdpi', 96, 80], ['xxhdpi', 72, 62], ['xhdpi', 48, 40], ['hdpi', 36, 32], ['mdpi', 24, 22]].each { dimens ->
     def statusIcon = tasks.register("generateStatusIcon_${dimens[0]}", Exec) {
         if (System.getProperty('os.name').toLowerCase(Locale.ROOT).contains('windows')) {
-            it.commandLine "cmd", "/c", "${rootDir.absolutePath}\\scripts\\generate_status_icon.bat", project.ext.status_icon_text, languageName, "${dimens[1]}", "${dimens[2]}", "${projectDir.absolutePath}\\src\\main\\res\\drawable-${dimens[0]}"
+            it.commandLine "cmd", "/c", "${rootDir.absolutePath}\\addons\\scripts\\generate_status_icon.bat", project.ext.status_icon_text, languageName, "${dimens[1]}", "${dimens[2]}", "${projectDir.absolutePath}\\src\\main\\res\\drawable-${dimens[0]}"
         } else {
-            it.commandLine "${rootDir.absolutePath}/scripts/generate_status_icon.sh", project.ext.status_icon_text, languageName, "${dimens[1]}", "${dimens[2]}", "${projectDir.absolutePath}/src/main/res/drawable-${dimens[0]}"
+            it.commandLine "${rootDir.absolutePath}/addons/scripts/generate_status_icon.sh", project.ext.status_icon_text, languageName, "${dimens[1]}", "${dimens[2]}", "${projectDir.absolutePath}/src/main/res/drawable-${dimens[0]}"
         }
     }
 
diff --git a/addons/gradle/pack_apk.gradle b/addons/gradle/pack_apk.gradle
index 18ea3d81f..bf448297a 100644
--- a/addons/gradle/pack_apk.gradle
+++ b/addons/gradle/pack_apk.gradle
@@ -1,6 +1,6 @@
 apply plugin: 'com.android.application'
 
-apply from: "$rootDir/gradle/all_android.gradle"
+apply from: "$rootDir/gradle/android_general.gradle"
 
 static <T> T getExtValue(Project proj, String key, T defaultValue) {
     if (proj.hasProperty(key)) {
@@ -33,7 +33,7 @@ android {
 
     applicationVariants.configureEach { variant ->
         variant.outputs.all {
-            outputFileName = "add-on-${project.path.replace(':', '-')}-${rootProject.autoVersioning.versionData.versionCode}.apk"
+            outputFileName = "add-on-${project.path.replace(':', '-')}-${android.defaultConfig.versionCode}.apk"
         }
         variant.assembleProvider.configure { assemble ->
             assemble.doLast {
@@ -87,7 +87,7 @@ if (project.ext.shouldBePublished) {
     println("Project ${path} is NOT marked for publishing")
 }
 
-def imageAssetsFolder = new File(new File(rootDir, "StoreStuff"), "assets")
+def imageAssetsFolder = new File(new File(rootDir, "addons/StoreStuff"), "assets")
 if (!imageAssetsFolder.exists()) {
     throw new IllegalStateException("store assets folder '${imageAssetsFolder.absolutePath} does not exist!")
 }
@@ -116,3 +116,4 @@ def launcherAssetsDir = "${imageAssetsFolder.absolutePath}/launcher-base"
     generateLogoTask.configure { dependsOn.add(convert) }
 }
 
+apply from: "$rootDir/addons/gradle/versioning_add_on.gradle"
diff --git a/addons/gradle/quicktext_pack_lib.gradle b/addons/gradle/quicktext_pack_lib.gradle
index aa91d4136..e64a0ab4b 100644
--- a/addons/gradle/quicktext_pack_lib.gradle
+++ b/addons/gradle/quicktext_pack_lib.gradle
@@ -1,9 +1,9 @@
 apply plugin: 'com.android.library'
 
-apply from: "$rootDir/gradle/all_android.gradle"
+apply from: "$rootDir/gradle/android_general.gradle"
 
 dependencies {
-    api project(path: ':base')
+    api project(path: ':addons:base')
 }
 
 group "com.anysoftkeyboard.quicktext.${parent.name}"
diff --git a/addons/gradle/theme_pack_lib.gradle b/addons/gradle/theme_pack_lib.gradle
index 1ead907a8..00bd8d4ba 100644
--- a/addons/gradle/theme_pack_lib.gradle
+++ b/addons/gradle/theme_pack_lib.gradle
@@ -1,9 +1,9 @@
 apply plugin: 'com.android.library'
 
-apply from: "$rootDir/gradle/all_android.gradle"
+apply from: "$rootDir/gradle/android_general.gradle"
 
 dependencies {
-    api project(path: ':base')
+    api project(path: ':addons:base')
 }
 
 group "com.anysoftkeyboard.theme.${parent.name}"
diff --git a/addons/languages/afrikaans_oss/apk/build.gradle b/addons/languages/afrikaans_oss/apk/build.gradle
index 51e12f280..4c85f34fe 100644
--- a/addons/languages/afrikaans_oss/apk/build.gradle
+++ b/addons/languages/afrikaans_oss/apk/build.gradle
@@ -1,7 +1,7 @@
 ext.shouldBePublished = true
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':languages:afrikaans_oss:pack')
+    implementation project(path: ':addons:languages:afrikaans_oss:pack')
 }
diff --git a/addons/languages/afrikaans_oss/pack/build.gradle b/addons/languages/afrikaans_oss/pack/build.gradle
index 42654e529..fe03bd43e 100644
--- a/addons/languages/afrikaans_oss/pack/build.gradle
+++ b/addons/languages/afrikaans_oss/pack/build.gradle
@@ -4,5 +4,5 @@ ext.status_icon_text = "af"
 ext.dictionaryInputPossibleCharacters = null//"".toCharArray()
 ext.dictionaryInputAdditionalInnerCharacters = null//"".toCharArray()
 
-apply from: "$rootDir/gradle/language_pack_lib.gradle"
+apply from: "$rootDir/addons/gradle/language_pack_lib.gradle"
 
diff --git a/addons/languages/afrikaans_oss/pack/src/main/java/com/anysoftkeyboard/languagepack/afrikaans_oss/PackBroadcastReceiver.java b/addons/languages/afrikaans_oss/pack/src/main/java/com/anysoftkeyboard/languagepack/afrikaans_oss/PackBroadcastReceiver.java
index 7e74209ac..71b218a61 100644
--- a/addons/languages/afrikaans_oss/pack/src/main/java/com/anysoftkeyboard/languagepack/afrikaans_oss/PackBroadcastReceiver.java
+++ b/addons/languages/afrikaans_oss/pack/src/main/java/com/anysoftkeyboard/languagepack/afrikaans_oss/PackBroadcastReceiver.java
@@ -1,4 +1,6 @@
+// CHECKSTYLE:OFF

 package com.anysoftkeyboard.languagepack.afrikaans_oss;

+// CHECKSTYLE:ON

 

 import com.anysoftkeyboard.addon.PackBroadcastReceiverBase;

 

diff --git a/addons/languages/arabic/apk/build.gradle b/addons/languages/arabic/apk/build.gradle
index 6540a577b..a9d53ac9d 100644
--- a/addons/languages/arabic/apk/build.gradle
+++ b/addons/languages/arabic/apk/build.gradle
@@ -1,7 +1,7 @@
 ext.shouldBePublished = true
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':languages:arabic:pack')
+    implementation project(path: ':addons:languages:arabic:pack')
 }
diff --git a/addons/languages/arabic/pack/build.gradle b/addons/languages/arabic/pack/build.gradle
index 510b4e008..d3db81121 100644
--- a/addons/languages/arabic/pack/build.gradle
+++ b/addons/languages/arabic/pack/build.gradle
@@ -3,4 +3,4 @@ ext.status_icon_text = "ar"
 ext.dictionaryInputPossibleCharacters = null//"".toCharArray()
 ext.dictionaryInputAdditionalInnerCharacters = null//"".toCharArray()
 
-apply from: "$rootDir/gradle/language_pack_lib.gradle"
+apply from: "$rootDir/addons/gradle/language_pack_lib.gradle"
diff --git a/addons/languages/armenian2/apk/build.gradle b/addons/languages/armenian2/apk/build.gradle
index 2babaf852..b14fa1475 100644
--- a/addons/languages/armenian2/apk/build.gradle
+++ b/addons/languages/armenian2/apk/build.gradle
@@ -1,7 +1,7 @@
 ext.shouldBePublished = true
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':languages:armenian2:pack')
+    implementation project(path: ':addons:languages:armenian2:pack')
 }
diff --git a/addons/languages/armenian2/pack/build.gradle b/addons/languages/armenian2/pack/build.gradle
index c138b052c..1aa17e5f5 100644
--- a/addons/languages/armenian2/pack/build.gradle
+++ b/addons/languages/armenian2/pack/build.gradle
@@ -1,4 +1,4 @@
 ext.status_icon_text = "hy"
 ext.shouldGenerateDictionary = false
 
-apply from: "$rootDir/gradle/language_pack_lib.gradle"
\ No newline at end of file
+apply from: "$rootDir/addons/gradle/language_pack_lib.gradle"
\ No newline at end of file
diff --git a/addons/languages/armenian2/pack/src/main/AndroidManifest.xml b/addons/languages/armenian2/pack/src/main/AndroidManifest.xml
index 5c46992c7..72643d29a 100644
--- a/addons/languages/armenian2/pack/src/main/AndroidManifest.xml
+++ b/addons/languages/armenian2/pack/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@
 
     <application>
         <receiver
-            android:name="com.anysoftkeyboard.languagepack.afrikaans_oss.PackBroadcastReceiver"
+            android:name="com.anysoftkeyboard.languagepack.armenian2.PackBroadcastReceiver"
             android:exported="true">
             <intent-filter>
                 <action android:name="com.menny.android.anysoftkeyboard.KEYBOARD" />
diff --git a/addons/languages/armenian2/pack/src/main/java/com/anysoftkeyboard/languagepack/afrikaans_oss/PackBroadcastReceiver.java b/addons/languages/armenian2/pack/src/main/java/com/anysoftkeyboard/languagepack/armenian2/PackBroadcastReceiver.java
index 7e74209ac..4fd7ecbaf 100644
--- a/addons/languages/armenian2/pack/src/main/java/com/anysoftkeyboard/languagepack/afrikaans_oss/PackBroadcastReceiver.java
+++ b/addons/languages/armenian2/pack/src/main/java/com/anysoftkeyboard/languagepack/armenian2/PackBroadcastReceiver.java
@@ -1,4 +1,4 @@
-package com.anysoftkeyboard.languagepack.afrikaans_oss;

+package com.anysoftkeyboard.languagepack.armenian2;

 

 import com.anysoftkeyboard.addon.PackBroadcastReceiverBase;

 

diff --git a/addons/languages/basque/apk/build.gradle b/addons/languages/basque/apk/build.gradle
index b476115aa..c7c2d31af 100644
--- a/addons/languages/basque/apk/build.gradle
+++ b/addons/languages/basque/apk/build.gradle
@@ -1,7 +1,7 @@
 ext.shouldBePublished = true
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':languages:basque:pack')
+    implementation project(path: ':addons:languages:basque:pack')
 }
diff --git a/addons/languages/basque/pack/build.gradle b/addons/languages/basque/pack/build.gradle
index a3cdf2075..54530c290 100644
--- a/addons/languages/basque/pack/build.gradle
+++ b/addons/languages/basque/pack/build.gradle
@@ -3,4 +3,4 @@ ext.status_icon_text = "eu"
 ext.dictionaryInputPossibleCharacters = null//"".toCharArray()
 ext.dictionaryInputAdditionalInnerCharacters = null//"".toCharArray()
 
-apply from: "$rootDir/gradle/language_pack_lib.gradle"
+apply from: "$rootDir/addons/gradle/language_pack_lib.gradle"
diff --git a/addons/languages/brazilian/apk/build.gradle b/addons/languages/brazilian/apk/build.gradle
index 92ad47b0e..1657e5700 100644
--- a/addons/languages/brazilian/apk/build.gradle
+++ b/addons/languages/brazilian/apk/build.gradle
@@ -1,7 +1,7 @@
 ext.shouldBePublished = true
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':languages:brazilian:pack')
+    implementation project(path: ':addons:languages:brazilian:pack')
 }
diff --git a/addons/languages/brazilian/apk/src/main/res/values-pt/strings.xml b/addons/languages/brazilian/apk/src/main/res/values-pt/strings.xml
index 178462d49..9af1fab46 100644
--- a/addons/languages/brazilian/apk/src/main/res/values-pt/strings.xml
+++ b/addons/languages/brazilian/apk/src/main/res/values-pt/strings.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">AnySoftKeyboard - Português Brasileiro</string>
-    <string name="keyboard_name">Português Brasileiro</string>
-    <string name="dictionary_name">Português Brasileiro</string>
 </resources>
diff --git a/addons/languages/brazilian/apk/src/main/res/values/strings.xml b/addons/languages/brazilian/apk/src/main/res/values/strings.xml
index 011f1b120..d10bd2347 100644
--- a/addons/languages/brazilian/apk/src/main/res/values/strings.xml
+++ b/addons/languages/brazilian/apk/src/main/res/values/strings.xml
@@ -1,5 +1,3 @@
 <resources>
     <string name="app_name">Brazilian Portuguese for AnySoftKeyboard</string>
-    <string name="keyboard_name">Português (Brasil)</string>
-    <string name="dictionary_name">Português (Brasil)</string>
 </resources>
diff --git a/addons/languages/brazilian/pack/build.gradle b/addons/languages/brazilian/pack/build.gradle
index e206ecfda..67616fddf 100644
--- a/addons/languages/brazilian/pack/build.gradle
+++ b/addons/languages/brazilian/pack/build.gradle
@@ -2,4 +2,4 @@ ext.status_icon_text = 'pt'
 ext.dictionaryInputPossibleCharacters = null//.toCharArray()
 ext.dictionaryInputAdditionalInnerCharacters = null//.toCharArray()
 
-apply from: "$rootDir/gradle/language_pack_lib.gradle"
\ No newline at end of file
+apply from: "$rootDir/addons/gradle/language_pack_lib.gradle"
\ No newline at end of file
diff --git a/addons/languages/bulgarian/apk/build.gradle b/addons/languages/bulgarian/apk/build.gradle
index 2ae4e09a4..8a86e693a 100644
--- a/addons/languages/bulgarian/apk/build.gradle
+++ b/addons/languages/bulgarian/apk/build.gradle
@@ -1,7 +1,7 @@
 ext.shouldBePublished = true
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':languages:bulgarian:pack')
+    implementation project(path: ':addons:languages:bulgarian:pack')
 }
diff --git a/addons/languages/bulgarian/pack/build.gradle b/addons/languages/bulgarian/pack/build.gradle
index 9c8dd95af..9e60f38b6 100644
--- a/addons/languages/bulgarian/pack/build.gradle
+++ b/addons/languages/bulgarian/pack/build.gradle
@@ -3,4 +3,4 @@ ext.status_icon_text = "bg"
 ext.dictionaryInputPossibleCharacters = null//"".toCharArray()
 ext.dictionaryInputAdditionalInnerCharacters = null//"".toCharArray()
 
-apply from: "$rootDir/gradle/language_pack_lib.gradle"
+apply from: "$rootDir/addons/gradle/language_pack_lib.gradle"
diff --git a/addons/languages/catalan/apk/build.gradle b/addons/languages/catalan/apk/build.gradle
index 02f11e94d..ac3010ea1 100644
--- a/addons/languages/catalan/apk/build.gradle
+++ b/addons/languages/catalan/apk/build.gradle
@@ -1,7 +1,7 @@
 ext.shouldBePublished = true
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':languages:catalan:pack')
+    implementation project(path: ':addons:languages:catalan:pack')
 }
diff --git a/addons/languages/catalan/pack/build.gradle b/addons/languages/catalan/pack/build.gradle
index e5a301beb..09e29e8ac 100644
--- a/addons/languages/catalan/pack/build.gradle
+++ b/addons/languages/catalan/pack/build.gradle
@@ -3,4 +3,4 @@ ext.status_icon_text = "ca"
 ext.dictionaryInputPossibleCharacters = null//"".toCharArray()
 ext.dictionaryInputAdditionalInnerCharacters = null//"".toCharArray()
 
-apply from: "$rootDir/gradle/language_pack_lib.gradle"
\ No newline at end of file
+apply from: "$rootDir/addons/gradle/language_pack_lib.gradle"
\ No newline at end of file
diff --git a/addons/languages/croatian/apk/build.gradle b/addons/languages/croatian/apk/build.gradle
index b3b81a66d..09ac3144b 100644
--- a/addons/languages/croatian/apk/build.gradle
+++ b/addons/languages/croatian/apk/build.gradle
@@ -1,7 +1,7 @@
 ext.shouldBePublished = true
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':languages:croatian:pack')
+    implementation project(path: ':addons:languages:croatian:pack')
 }
diff --git a/addons/languages/croatian/pack/build.gradle b/addons/languages/croatian/pack/build.gradle
index c08c16397..709168995 100644
--- a/addons/languages/croatian/pack/build.gradle
+++ b/addons/languages/croatian/pack/build.gradle
@@ -3,4 +3,4 @@ ext.status_icon_text = "hr"
 ext.dictionaryInputPossibleCharacters = null//"".toCharArray()
 ext.dictionaryInputAdditionalInnerCharacters = null//"".toCharArray()
 
-apply from: "$rootDir/gradle/language_pack_lib.gradle"
+apply from: "$rootDir/addons/gradle/language_pack_lib.gradle"
diff --git a/addons/languages/czech/apk/build.gradle b/addons/languages/czech/apk/build.gradle
index a9d101af2..d44fd9c61 100644
--- a/addons/languages/czech/apk/build.gradle
+++ b/addons/languages/czech/apk/build.gradle
@@ -2,8 +2,8 @@ ext.shouldBePublished = true
 ext.override_app_id = 'org.herrlado.ask.languagepack.czech'
 ext.override_release_key_alias = 'czech'
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':languages:czech:pack')
+    implementation project(path: ':addons:languages:czech:pack')
 }
diff --git a/addons/languages/czech/pack/build.gradle b/addons/languages/czech/pack/build.gradle
index a5390aa66..04be8ebfb 100644
--- a/addons/languages/czech/pack/build.gradle
+++ b/addons/languages/czech/pack/build.gradle
@@ -3,4 +3,4 @@ ext.status_icon_text = "cs"
 ext.dictionaryInputPossibleCharacters = null//"".toCharArray()
 ext.dictionaryInputAdditionalInnerCharacters = null//"".toCharArray()
 
-apply from: "$rootDir/gradle/language_pack_lib.gradle"
\ No newline at end of file
+apply from: "$rootDir/addons/gradle/language_pack_lib.gradle"
\ No newline at end of file
diff --git a/addons/languages/danish/apk/build.gradle b/addons/languages/danish/apk/build.gradle
index 256fd85b1..497dee07b 100644
--- a/addons/languages/danish/apk/build.gradle
+++ b/addons/languages/danish/apk/build.gradle
@@ -1,7 +1,7 @@
 ext.shouldBePublished = true
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':languages:danish:pack')
+    implementation project(path: ':addons:languages:danish:pack')
 }
diff --git a/addons/languages/danish/pack/build.gradle b/addons/languages/danish/pack/build.gradle
index 16c0d6610..65bf6e299 100644
--- a/addons/languages/danish/pack/build.gradle
+++ b/addons/languages/danish/pack/build.gradle
@@ -3,4 +3,4 @@ ext.status_icon_text = "da"
 ext.dictionaryInputPossibleCharacters = null//"".toCharArray()
 ext.dictionaryInputAdditionalInnerCharacters = null//"".toCharArray()
 
-apply from: "$rootDir/gradle/language_pack_lib.gradle"
+apply from: "$rootDir/addons/gradle/language_pack_lib.gradle"
diff --git a/addons/languages/dutch/apk/build.gradle b/addons/languages/dutch/apk/build.gradle
index aadced6ed..05a005d0d 100644
--- a/addons/languages/dutch/apk/build.gradle
+++ b/addons/languages/dutch/apk/build.gradle
@@ -1,8 +1,8 @@
 ext.shouldBePublished = true
 ext.override_app_id = 'com.anysoftkeyboard.languagepack.dutch_oss'
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':languages:dutch:pack')
+    implementation project(path: ':addons:languages:dutch:pack')
 }
diff --git a/addons/languages/dutch/pack/build.gradle b/addons/languages/dutch/pack/build.gradle
index 6e4a6cd2f..33d37885d 100644
--- a/addons/languages/dutch/pack/build.gradle
+++ b/addons/languages/dutch/pack/build.gradle
@@ -3,4 +3,4 @@ ext.status_icon_text = "nl"
 ext.dictionaryInputPossibleCharacters = null//"".toCharArray()
 ext.dictionaryInputAdditionalInnerCharacters = null//"".toCharArray()
 
-apply from: "$rootDir/gradle/language_pack_lib.gradle"
+apply from: "$rootDir/addons/gradle/language_pack_lib.gradle"
diff --git a/addons/languages/english/apk/build.gradle b/addons/languages/english/apk/build.gradle
index 56ba1bc52..0a9c565ce 100644
--- a/addons/languages/english/apk/build.gradle
+++ b/addons/languages/english/apk/build.gradle
@@ -1,7 +1,7 @@
 ext.shouldBePublished = false
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':languages:english:pack')
+    implementation project(path: ':addons:languages:english:pack')
 }
diff --git a/addons/languages/finnish/apk/build.gradle b/addons/languages/finnish/apk/build.gradle
index 3e1192740..6924246b1 100644
--- a/addons/languages/finnish/apk/build.gradle
+++ b/addons/languages/finnish/apk/build.gradle
@@ -1,8 +1,8 @@
 ext.shouldBePublished = true
 ext.override_app_id = 'com.menny.anysoftkeyboard.finnish'
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':languages:finnish:pack')
+    implementation project(path: ':addons:languages:finnish:pack')
 }
diff --git a/addons/languages/finnish/pack/build.gradle b/addons/languages/finnish/pack/build.gradle
index 154a87e05..ef26f6e81 100644
--- a/addons/languages/finnish/pack/build.gradle
+++ b/addons/languages/finnish/pack/build.gradle
@@ -3,4 +3,4 @@ ext.status_icon_text = "fi"
 ext.dictionaryInputPossibleCharacters = null//"".toCharArray()
 ext.dictionaryInputAdditionalInnerCharacters = null//"".toCharArray()
 
-apply from: "$rootDir/gradle/language_pack_lib.gradle"
\ No newline at end of file
+apply from: "$rootDir/addons/gradle/language_pack_lib.gradle"
\ No newline at end of file
diff --git a/addons/languages/french/apk/build.gradle b/addons/languages/french/apk/build.gradle
index 3d273a69d..cde0fdc42 100644
--- a/addons/languages/french/apk/build.gradle
+++ b/addons/languages/french/apk/build.gradle
@@ -1,7 +1,7 @@
 ext.shouldBePublished = true
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':languages:french:pack')
+    implementation project(path: ':addons:languages:french:pack')
 }
diff --git a/addons/languages/french/pack/build.gradle b/addons/languages/french/pack/build.gradle
index 53088affc..52f675dba 100644
--- a/addons/languages/french/pack/build.gradle
+++ b/addons/languages/french/pack/build.gradle
@@ -3,4 +3,4 @@ ext.status_icon_text = "fr"
 ext.dictionaryInputPossibleCharacters = null//"".toCharArray()

 ext.dictionaryInputAdditionalInnerCharacters = null//"".toCharArray()

 

-apply from: "$rootDir/gradle/language_pack_lib.gradle"
\ No newline at end of file
+apply from: "$rootDir/addons/gradle/language_pack_lib.gradle"
\ No newline at end of file
diff --git a/addons/languages/georgian/apk/build.gradle b/addons/languages/georgian/apk/build.gradle
index 8037f981c..6cba3fe9c 100644
--- a/addons/languages/georgian/apk/build.gradle
+++ b/addons/languages/georgian/apk/build.gradle
@@ -1,7 +1,7 @@
 ext.shouldBePublished = true
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':languages:georgian:pack')
+    implementation project(path: ':addons:languages:georgian:pack')
 }
diff --git a/addons/languages/georgian/pack/build.gradle b/addons/languages/georgian/pack/build.gradle
index 3a3ef2da0..1e5715a0c 100644
--- a/addons/languages/georgian/pack/build.gradle
+++ b/addons/languages/georgian/pack/build.gradle
@@ -3,4 +3,4 @@ ext.status_icon_text = "ka"
 ext.dictionaryInputPossibleCharacters = null//"".toCharArray()
 ext.dictionaryInputAdditionalInnerCharacters = null//"".toCharArray()
 
-apply from: "$rootDir/gradle/language_pack_lib.gradle"
+apply from: "$rootDir/addons/gradle/language_pack_lib.gradle"
diff --git a/addons/languages/german/apk/build.gradle b/addons/languages/german/apk/build.gradle
index 89795ea54..6b77211d6 100644
--- a/addons/languages/german/apk/build.gradle
+++ b/addons/languages/german/apk/build.gradle
@@ -1,7 +1,7 @@
 ext.shouldBePublished = true
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':languages:german:pack')
+    implementation project(path: ':addons:languages:german:pack')
 }
diff --git a/addons/languages/german/pack/build.gradle b/addons/languages/german/pack/build.gradle
index 0263bc19a..f7445c68e 100644
--- a/addons/languages/german/pack/build.gradle
+++ b/addons/languages/german/pack/build.gradle
@@ -3,4 +3,4 @@ ext.status_icon_text = "de"
 ext.dictionaryInputPossibleCharacters = null//"".toCharArray()
 ext.dictionaryInputAdditionalInnerCharacters = null//"".toCharArray()
 
-apply from: "$rootDir/gradle/language_pack_lib.gradle"
+apply from: "$rootDir/addons/gradle/language_pack_lib.gradle"
diff --git a/addons/languages/greek/apk/build.gradle b/addons/languages/greek/apk/build.gradle
index ddf1c29d8..fd156d6b5 100644
--- a/addons/languages/greek/apk/build.gradle
+++ b/addons/languages/greek/apk/build.gradle
@@ -1,7 +1,7 @@
 ext.shouldBePublished = true
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':languages:greek:pack')
+    implementation project(path: ':addons:languages:greek:pack')
 }
diff --git a/addons/languages/greek/pack/build.gradle b/addons/languages/greek/pack/build.gradle
index c0d0f6ae8..e62db3cae 100644
--- a/addons/languages/greek/pack/build.gradle
+++ b/addons/languages/greek/pack/build.gradle
@@ -2,4 +2,4 @@ ext.status_icon_text = 'el'
 ext.dictionaryInputPossibleCharacters = null//.toCharArray()
 ext.dictionaryInputAdditionalInnerCharacters = null//.toCharArray()
 
-apply from: "$rootDir/gradle/language_pack_lib.gradle"
\ No newline at end of file
+apply from: "$rootDir/addons/gradle/language_pack_lib.gradle"
\ No newline at end of file
diff --git a/addons/languages/hebrew/apk/build.gradle b/addons/languages/hebrew/apk/build.gradle
index ec36f4f79..793c4718e 100644
--- a/addons/languages/hebrew/apk/build.gradle
+++ b/addons/languages/hebrew/apk/build.gradle
@@ -1,7 +1,7 @@
 ext.shouldBePublished = true
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':languages:hebrew:pack')
+    implementation project(path: ':addons:languages:hebrew:pack')
 }
diff --git a/addons/languages/hebrew/pack/build.gradle b/addons/languages/hebrew/pack/build.gradle
index a3277f1bc..2d1f2031a 100644
--- a/addons/languages/hebrew/pack/build.gradle
+++ b/addons/languages/hebrew/pack/build.gradle
@@ -3,4 +3,4 @@ ext.status_icon_text = 'ע'
 ext.dictionaryInputPossibleCharacters = "אבגדהוזחטיכלמנסעפצקרשת".toCharArray()
 ext.dictionaryInputAdditionalInnerCharacters = "ץםןף\"'".toCharArray()
 
-apply from: "$rootDir/gradle/language_pack_lib.gradle"
\ No newline at end of file
+apply from: "$rootDir/addons/gradle/language_pack_lib.gradle"
\ No newline at end of file
diff --git a/addons/languages/hungarian/apk/build.gradle b/addons/languages/hungarian/apk/build.gradle
index 940b85c2e..152bfef0d 100644
--- a/addons/languages/hungarian/apk/build.gradle
+++ b/addons/languages/hungarian/apk/build.gradle
@@ -1,8 +1,8 @@
 ext.shouldBePublished = true
 ext.override_app_id = 'com.anysoftkeyboard.languagepack.hungarian_oss'
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':languages:hungarian:pack')
+    implementation project(path: ':addons:languages:hungarian:pack')
 }
diff --git a/addons/languages/hungarian/pack/build.gradle b/addons/languages/hungarian/pack/build.gradle
index 01749b9d1..5a40d6e31 100644
--- a/addons/languages/hungarian/pack/build.gradle
+++ b/addons/languages/hungarian/pack/build.gradle
@@ -3,4 +3,4 @@ ext.status_icon_text = "hu"
 ext.dictionaryInputPossibleCharacters = null//"".toCharArray()
 ext.dictionaryInputAdditionalInnerCharacters = null//"".toCharArray()
 
-apply from: "$rootDir/gradle/language_pack_lib.gradle"
+apply from: "$rootDir/addons/gradle/language_pack_lib.gradle"
diff --git a/addons/languages/indonesian/apk/build.gradle b/addons/languages/indonesian/apk/build.gradle
index 637a590b7..2575d515f 100644
--- a/addons/languages/indonesian/apk/build.gradle
+++ b/addons/languages/indonesian/apk/build.gradle
@@ -1,7 +1,7 @@
 ext.shouldBePublished = true
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':languages:indonesian:pack')
+    implementation project(path: ':addons:languages:indonesian:pack')
 }
diff --git a/addons/languages/indonesian/pack/build.gradle b/addons/languages/indonesian/pack/build.gradle
index e0206d154..30c6f25b6 100644
--- a/addons/languages/indonesian/pack/build.gradle
+++ b/addons/languages/indonesian/pack/build.gradle
@@ -3,4 +3,4 @@ ext.status_icon_text = "id"
 ext.dictionaryInputPossibleCharacters = null//"".toCharArray()
 ext.dictionaryInputAdditionalInnerCharacters = null//"".toCharArray()
 
-apply from: "$rootDir/gradle/language_pack_lib.gradle"
\ No newline at end of file
+apply from: "$rootDir/addons/gradle/language_pack_lib.gradle"
\ No newline at end of file
diff --git a/addons/languages/italian/apk/build.gradle b/addons/languages/italian/apk/build.gradle
index d96e1d2c7..156d83f82 100644
--- a/addons/languages/italian/apk/build.gradle
+++ b/addons/languages/italian/apk/build.gradle
@@ -1,7 +1,7 @@
 ext.shouldBePublished = true
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':languages:italian:pack')
+    implementation project(path: ':addons:languages:italian:pack')
 }
diff --git a/addons/languages/italian/pack/build.gradle b/addons/languages/italian/pack/build.gradle
index 9f6cb702c..02df36eae 100644
--- a/addons/languages/italian/pack/build.gradle
+++ b/addons/languages/italian/pack/build.gradle
@@ -2,4 +2,4 @@ ext.status_icon_text = 'it'
 ext.dictionaryInputPossibleCharacters = null//.toCharArray()
 ext.dictionaryInputAdditionalInnerCharacters = null//.toCharArray()
 
-apply from: "$rootDir/gradle/language_pack_lib.gradle"
\ No newline at end of file
+apply from: "$rootDir/addons/gradle/language_pack_lib.gradle"
\ No newline at end of file
diff --git a/addons/languages/kachin/apk/build.gradle b/addons/languages/kachin/apk/build.gradle
index 0c9718f5c..0b2598933 100644
--- a/addons/languages/kachin/apk/build.gradle
+++ b/addons/languages/kachin/apk/build.gradle
@@ -1,7 +1,7 @@
 ext.shouldBePublished = true
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':languages:kachin:pack')
+    implementation project(path: ':addons:languages:kachin:pack')
 }
diff --git a/addons/languages/kachin/pack/build.gradle b/addons/languages/kachin/pack/build.gradle
index d91c5dfbe..adb355eb6 100644
--- a/addons/languages/kachin/pack/build.gradle
+++ b/addons/languages/kachin/pack/build.gradle
@@ -3,4 +3,4 @@ ext.status_icon_text = "kc"
 ext.dictionaryInputPossibleCharacters = null//"".toCharArray()
 ext.dictionaryInputAdditionalInnerCharacters = null//"".toCharArray()
 
-apply from: "$rootDir/gradle/language_pack_lib.gradle"
+apply from: "$rootDir/addons/gradle/language_pack_lib.gradle"
diff --git a/addons/languages/kurdish/apk/build.gradle b/addons/languages/kurdish/apk/build.gradle
index 6ee91a3b8..1219ab200 100644
--- a/addons/languages/kurdish/apk/build.gradle
+++ b/addons/languages/kurdish/apk/build.gradle
@@ -1,7 +1,7 @@
 ext.shouldBePublished = true
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':languages:kurdish:pack')
+    implementation project(path: ':addons:languages:kurdish:pack')
 }
diff --git a/addons/languages/kurdish/pack/build.gradle b/addons/languages/kurdish/pack/build.gradle
index 2a2280672..679a8ecac 100644
--- a/addons/languages/kurdish/pack/build.gradle
+++ b/addons/languages/kurdish/pack/build.gradle
@@ -3,4 +3,4 @@ ext.status_icon_text = "ku"
 ext.dictionaryInputPossibleCharacters = null//"".toCharArray()
 ext.dictionaryInputAdditionalInnerCharacters = null//"".toCharArray()
 
-apply from: "$rootDir/gradle/language_pack_lib.gradle"
+apply from: "$rootDir/addons/gradle/language_pack_lib.gradle"
diff --git a/addons/languages/latvian/apk/build.gradle b/addons/languages/latvian/apk/build.gradle
index a65ce55d4..18ad3f628 100644
--- a/addons/languages/latvian/apk/build.gradle
+++ b/addons/languages/latvian/apk/build.gradle
@@ -1,7 +1,7 @@
 ext.shouldBePublished = true
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':languages:latvian:pack')
+    implementation project(path: ':addons:languages:latvian:pack')
 }
diff --git a/addons/languages/latvian/pack/build.gradle b/addons/languages/latvian/pack/build.gradle
index a7ac22cd2..6b3cac639 100644
--- a/addons/languages/latvian/pack/build.gradle
+++ b/addons/languages/latvian/pack/build.gradle
@@ -3,4 +3,4 @@ ext.status_icon_text = "lv"
 ext.dictionaryInputPossibleCharacters = null//"".toCharArray()
 ext.dictionaryInputAdditionalInnerCharacters = null//"".toCharArray()
 
-apply from: "$rootDir/gradle/language_pack_lib.gradle"
+apply from: "$rootDir/addons/gradle/language_pack_lib.gradle"
diff --git a/addons/languages/lithuanian/apk/build.gradle b/addons/languages/lithuanian/apk/build.gradle
index 40ca679af..b49198e2b 100644
--- a/addons/languages/lithuanian/apk/build.gradle
+++ b/addons/languages/lithuanian/apk/build.gradle
@@ -2,8 +2,8 @@ ext.shouldBePublished = true
 ext.override_app_id = 'org.herrlado.ask.languagepack.lithuanian'
 ext.override_release_key_alias = 'czech' //ownership taken from the same owner for czech
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':languages:lithuanian:pack')
+    implementation project(path: ':addons:languages:lithuanian:pack')
 }
diff --git a/addons/languages/lithuanian/pack/build.gradle b/addons/languages/lithuanian/pack/build.gradle
index e5f704aa1..89b4173a2 100644
--- a/addons/languages/lithuanian/pack/build.gradle
+++ b/addons/languages/lithuanian/pack/build.gradle
@@ -3,4 +3,4 @@ ext.status_icon_text = "lt"
 ext.dictionaryInputPossibleCharacters = null//"".toCharArray()
 ext.dictionaryInputAdditionalInnerCharacters = null//"".toCharArray()
 
-apply from: "$rootDir/gradle/language_pack_lib.gradle"
+apply from: "$rootDir/addons/gradle/language_pack_lib.gradle"
diff --git a/addons/languages/luxembourgish/apk/build.gradle b/addons/languages/luxembourgish/apk/build.gradle
index 6360c542f..1533bb7b1 100644
--- a/addons/languages/luxembourgish/apk/build.gradle
+++ b/addons/languages/luxembourgish/apk/build.gradle
@@ -1,7 +1,7 @@
 ext.shouldBePublished = true
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':languages:luxembourgish:pack')
+    implementation project(path: ':addons:languages:luxembourgish:pack')
 }
diff --git a/addons/languages/luxembourgish/pack/build.gradle b/addons/languages/luxembourgish/pack/build.gradle
index ddea1aaf7..eb81e04e2 100644
--- a/addons/languages/luxembourgish/pack/build.gradle
+++ b/addons/languages/luxembourgish/pack/build.gradle
@@ -3,4 +3,4 @@ ext.status_icon_text = "lb"
 ext.dictionaryInputPossibleCharacters = null//"".toCharArray()
 ext.dictionaryInputAdditionalInnerCharacters = null//"".toCharArray()
 
-apply from: "$rootDir/gradle/language_pack_lib.gradle"
+apply from: "$rootDir/addons/gradle/language_pack_lib.gradle"
diff --git a/addons/languages/nias/apk/build.gradle b/addons/languages/nias/apk/build.gradle
index 44610486e..a73ce217e 100644
--- a/addons/languages/nias/apk/build.gradle
+++ b/addons/languages/nias/apk/build.gradle
@@ -2,8 +2,8 @@
 //https://play.google.com/store/apps/details?id=com.anysoftkeyboard.languagepack.nias
 ext.shouldBePublished = false
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':languages:nias:pack')
+    implementation project(path: ':addons:languages:nias:pack')
 }
diff --git a/addons/languages/nias/pack/build.gradle b/addons/languages/nias/pack/build.gradle
index cf9c7574b..2c9b42aab 100644
--- a/addons/languages/nias/pack/build.gradle
+++ b/addons/languages/nias/pack/build.gradle
@@ -3,4 +3,4 @@ ext.status_icon_text = "nia"
 ext.dictionaryInputPossibleCharacters = null//"".toCharArray()
 ext.dictionaryInputAdditionalInnerCharacters = null//"".toCharArray()
 
-apply from: "$rootDir/gradle/language_pack_lib.gradle"
\ No newline at end of file
+apply from: "$rootDir/addons/gradle/language_pack_lib.gradle"
\ No newline at end of file
diff --git a/addons/languages/norwegian/apk/build.gradle b/addons/languages/norwegian/apk/build.gradle
index df29fb633..6a5335cb7 100644
--- a/addons/languages/norwegian/apk/build.gradle
+++ b/addons/languages/norwegian/apk/build.gradle
@@ -1,7 +1,7 @@
 ext.shouldBePublished = true
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':languages:norwegian:pack')
+    implementation project(path: ':addons:languages:norwegian:pack')
 }
diff --git a/addons/languages/norwegian/pack/build.gradle b/addons/languages/norwegian/pack/build.gradle
index 26bef1d59..eac57a213 100644
--- a/addons/languages/norwegian/pack/build.gradle
+++ b/addons/languages/norwegian/pack/build.gradle
@@ -3,4 +3,4 @@ ext.status_icon_text = "nb"
 ext.dictionaryInputPossibleCharacters = null//"".toCharArray()
 ext.dictionaryInputAdditionalInnerCharacters = null//"".toCharArray()
 
-apply from: "$rootDir/gradle/language_pack_lib.gradle"
+apply from: "$rootDir/addons/gradle/language_pack_lib.gradle"
diff --git a/addons/languages/ossturkish/apk/build.gradle b/addons/languages/ossturkish/apk/build.gradle
index 1dbda415c..ae5117f64 100644
--- a/addons/languages/ossturkish/apk/build.gradle
+++ b/addons/languages/ossturkish/apk/build.gradle
@@ -1,7 +1,7 @@
 ext.shouldBePublished = true
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':languages:ossturkish:pack')
+    implementation project(path: ':addons:languages:ossturkish:pack')
 }
diff --git a/addons/languages/ossturkish/pack/build.gradle b/addons/languages/ossturkish/pack/build.gradle
index 36d56de35..32fa773a7 100644
--- a/addons/languages/ossturkish/pack/build.gradle
+++ b/addons/languages/ossturkish/pack/build.gradle
@@ -2,4 +2,4 @@ ext.status_icon_text = 'tr'
 ext.dictionaryInputPossibleCharacters = null//.toCharArray()
 ext.dictionaryInputAdditionalInnerCharacters = null//.toCharArray()
 
-apply from: "$rootDir/gradle/language_pack_lib.gradle"
\ No newline at end of file
+apply from: "$rootDir/addons/gradle/language_pack_lib.gradle"
\ No newline at end of file
diff --git a/addons/languages/persian/apk/build.gradle b/addons/languages/persian/apk/build.gradle
index 5067ec029..5c1e175c6 100644
--- a/addons/languages/persian/apk/build.gradle
+++ b/addons/languages/persian/apk/build.gradle
@@ -1,8 +1,8 @@
 ext.shouldBePublished = true
 ext.override_release_key_alias = 'persian'
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':languages:persian:pack')
+    implementation project(path: ':addons:languages:persian:pack')
 }
diff --git a/addons/languages/persian/apk/src/main/AndroidManifest.xml b/addons/languages/persian/apk/src/main/AndroidManifest.xml
index e66c154ea..97ce5462c 100644
--- a/addons/languages/persian/apk/src/main/AndroidManifest.xml
+++ b/addons/languages/persian/apk/src/main/AndroidManifest.xml
@@ -3,5 +3,5 @@
 
     <application android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
-        android:label="persian for anysoftkeyboard" />
+        android:label="@string/persian_app_name" />
 </manifest>
diff --git a/addons/languages/persian/pack/build.gradle b/addons/languages/persian/pack/build.gradle
index 7157dc46e..8265c419a 100644
--- a/addons/languages/persian/pack/build.gradle
+++ b/addons/languages/persian/pack/build.gradle
@@ -3,4 +3,4 @@ ext.status_icon_text = "fa"
 ext.dictionaryInputPossibleCharacters = null//"".toCharArray()
 ext.dictionaryInputAdditionalInnerCharacters = null//"".toCharArray()
 
-apply from: "$rootDir/gradle/language_pack_lib.gradle"
+apply from: "$rootDir/addons/gradle/language_pack_lib.gradle"
diff --git a/addons/languages/polish/apk/build.gradle b/addons/languages/polish/apk/build.gradle
index 13fe117d6..13b3bc102 100644
--- a/addons/languages/polish/apk/build.gradle
+++ b/addons/languages/polish/apk/build.gradle
@@ -1,7 +1,7 @@
 ext.shouldBePublished = true
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':languages:polish:pack')
+    implementation project(path: ':addons:languages:polish:pack')
 }
diff --git a/addons/languages/polish/pack/build.gradle b/addons/languages/polish/pack/build.gradle
index 3ee70118f..5abae4770 100644
--- a/addons/languages/polish/pack/build.gradle
+++ b/addons/languages/polish/pack/build.gradle
@@ -3,4 +3,4 @@ ext.status_icon_text = "pl"
 ext.dictionaryInputPossibleCharacters = null//"".toCharArray()
 ext.dictionaryInputAdditionalInnerCharacters = null//"".toCharArray()
 
-apply from: "$rootDir/gradle/language_pack_lib.gradle"
+apply from: "$rootDir/addons/gradle/language_pack_lib.gradle"
diff --git a/addons/languages/romanian/apk/build.gradle b/addons/languages/romanian/apk/build.gradle
index 66219827c..b7294830b 100644
--- a/addons/languages/romanian/apk/build.gradle
+++ b/addons/languages/romanian/apk/build.gradle
@@ -1,7 +1,7 @@
 ext.shouldBePublished = true
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':languages:romanian:pack')
+    implementation project(path: ':addons:languages:romanian:pack')
 }
diff --git a/addons/languages/romanian/pack/build.gradle b/addons/languages/romanian/pack/build.gradle
index c6cc7f500..ada25be4a 100644
--- a/addons/languages/romanian/pack/build.gradle
+++ b/addons/languages/romanian/pack/build.gradle
@@ -2,4 +2,4 @@ ext.status_icon_text = 'ro'
 ext.dictionaryInputPossibleCharacters = null//.toCharArray()
 ext.dictionaryInputAdditionalInnerCharacters = null//.toCharArray()
 
-apply from: "$rootDir/gradle/language_pack_lib.gradle"
\ No newline at end of file
+apply from: "$rootDir/addons/gradle/language_pack_lib.gradle"
\ No newline at end of file
diff --git a/addons/languages/russian2/apk/build.gradle b/addons/languages/russian2/apk/build.gradle
index 06ff2e1b8..8607a41be 100644
--- a/addons/languages/russian2/apk/build.gradle
+++ b/addons/languages/russian2/apk/build.gradle
@@ -2,8 +2,8 @@ ext.shouldBePublished = true
 //russian was release with a different key-store (provided by Sergii Pylypenko)
 ext.override_release_key_alias = 'russian2'
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':languages:russian2:pack')
+    implementation project(path: ':addons:languages:russian2:pack')
 }
diff --git a/addons/languages/russian2/pack/build.gradle b/addons/languages/russian2/pack/build.gradle
index 5dff9f768..05cc14963 100644
--- a/addons/languages/russian2/pack/build.gradle
+++ b/addons/languages/russian2/pack/build.gradle
@@ -2,4 +2,4 @@ ext.status_icon_text = 'ru'
 ext.dictionaryInputPossibleCharacters = null//.toCharArray()
 ext.dictionaryInputAdditionalInnerCharacters = null//.toCharArray()
 
-apply from: "$rootDir/gradle/language_pack_lib.gradle"
+apply from: "$rootDir/addons/gradle/language_pack_lib.gradle"
diff --git a/addons/languages/sardinian/apk/build.gradle b/addons/languages/sardinian/apk/build.gradle
index 16fb47b3c..d0085b4e3 100644
--- a/addons/languages/sardinian/apk/build.gradle
+++ b/addons/languages/sardinian/apk/build.gradle
@@ -1,7 +1,7 @@
 ext.shouldBePublished = true
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':languages:sardinian:pack')
+    implementation project(path: ':addons:languages:sardinian:pack')
 }
diff --git a/addons/languages/sardinian/pack/build.gradle b/addons/languages/sardinian/pack/build.gradle
index bb1cf45e2..4b3fa7126 100644
--- a/addons/languages/sardinian/pack/build.gradle
+++ b/addons/languages/sardinian/pack/build.gradle
@@ -2,4 +2,4 @@ ext.status_icon_text = 'sc'
 ext.dictionaryInputPossibleCharacters = "abcdefghilmnopqrstuvzjàèìòùéABCDEFGHILMNOPQRSTUVZJÀÈÌÒÙÉ".toCharArray()
 ext.dictionaryInputAdditionalInnerCharacters = "·\"'".toCharArray()
 
-apply from: "$rootDir/gradle/language_pack_lib.gradle"
+apply from: "$rootDir/addons/gradle/language_pack_lib.gradle"
diff --git a/addons/languages/serbian/apk/build.gradle b/addons/languages/serbian/apk/build.gradle
index 2e3dc4c61..f4b628d6d 100644
--- a/addons/languages/serbian/apk/build.gradle
+++ b/addons/languages/serbian/apk/build.gradle
@@ -1,8 +1,8 @@
 //owner unknown (may have not been published yet)
 ext.shouldBePublished = false
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':languages:serbian:pack')
+    implementation project(path: ':addons:languages:serbian:pack')
 }
diff --git a/addons/languages/serbian/pack/build.gradle b/addons/languages/serbian/pack/build.gradle
index d163ee604..7064b1b65 100644
--- a/addons/languages/serbian/pack/build.gradle
+++ b/addons/languages/serbian/pack/build.gradle
@@ -3,4 +3,4 @@ ext.status_icon_text = "sr"
 ext.dictionaryInputPossibleCharacters = null//"".toCharArray()
 ext.dictionaryInputAdditionalInnerCharacters = null//"".toCharArray()
 
-apply from: "$rootDir/gradle/language_pack_lib.gradle"
+apply from: "$rootDir/addons/gradle/language_pack_lib.gradle"
diff --git a/addons/languages/spain/apk/build.gradle b/addons/languages/spain/apk/build.gradle
index 7f4888d4b..6c445893f 100644
--- a/addons/languages/spain/apk/build.gradle
+++ b/addons/languages/spain/apk/build.gradle
@@ -1,7 +1,7 @@
 ext.shouldBePublished = true
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':languages:spain:pack')
+    implementation project(path: ':addons:languages:spain:pack')
 }
diff --git a/addons/languages/spain/pack/build.gradle b/addons/languages/spain/pack/build.gradle
index f027d046a..7c6481538 100644
--- a/addons/languages/spain/pack/build.gradle
+++ b/addons/languages/spain/pack/build.gradle
@@ -2,4 +2,4 @@ ext.status_icon_text = 'es'
 ext.dictionaryInputPossibleCharacters = null//.toCharArray()
 ext.dictionaryInputAdditionalInnerCharacters = null//.toCharArray()
 
-apply from: "$rootDir/gradle/language_pack_lib.gradle"
\ No newline at end of file
+apply from: "$rootDir/addons/gradle/language_pack_lib.gradle"
\ No newline at end of file
diff --git a/addons/languages/tamazight/apk/build.gradle b/addons/languages/tamazight/apk/build.gradle
index c3f139edb..f9ed71e1f 100644
--- a/addons/languages/tamazight/apk/build.gradle
+++ b/addons/languages/tamazight/apk/build.gradle
@@ -1,7 +1,7 @@
 ext.shouldBePublished = true
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':languages:tamazight:pack')
+    implementation project(path: ':addons:languages:tamazight:pack')
 }
diff --git a/addons/languages/tamazight/pack/build.gradle b/addons/languages/tamazight/pack/build.gradle
index dd7577999..faa33d4ef 100644
--- a/addons/languages/tamazight/pack/build.gradle
+++ b/addons/languages/tamazight/pack/build.gradle
@@ -2,4 +2,4 @@ ext.status_icon_text = 'tz'
 ext.dictionaryInputPossibleCharacters = null//.toCharArray()
 ext.dictionaryInputAdditionalInnerCharacters = null//.toCharArray()
 
-apply from: "$rootDir/gradle/language_pack_lib.gradle"
\ No newline at end of file
+apply from: "$rootDir/addons/gradle/language_pack_lib.gradle"
\ No newline at end of file
diff --git a/addons/quicktexts/bbcodes/apk/build.gradle b/addons/quicktexts/bbcodes/apk/build.gradle
index 924564ea8..36f2bbada 100644
--- a/addons/quicktexts/bbcodes/apk/build.gradle
+++ b/addons/quicktexts/bbcodes/apk/build.gradle
@@ -1,7 +1,7 @@
 ext.shouldBePublished = true
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':quicktexts:bbcodes:pack')
+    implementation project(path: ':addons:quicktexts:bbcodes:pack')
 }
diff --git a/addons/quicktexts/bbcodes/pack/build.gradle b/addons/quicktexts/bbcodes/pack/build.gradle
index 3e99a953e..2f118b70c 100644
--- a/addons/quicktexts/bbcodes/pack/build.gradle
+++ b/addons/quicktexts/bbcodes/pack/build.gradle
@@ -1,2 +1,2 @@
 
-apply from: "$rootDir/gradle/quicktext_pack_lib.gradle"
\ No newline at end of file
+apply from: "$rootDir/addons/gradle/quicktext_pack_lib.gradle"
\ No newline at end of file
diff --git a/addons/scripts/migrate_langauge_pack_branch.sh b/addons/scripts/migrate_langauge_pack_branch.sh
index fd89fafb7..f3eeb3118 100755
--- a/addons/scripts/migrate_langauge_pack_branch.sh
+++ b/addons/scripts/migrate_langauge_pack_branch.sh
@@ -26,7 +26,7 @@ ${COPYBARA_BIN} --folder-dir ${TEMP_DIR}/files/ ${TEMP_DIR}/copy.bara.sky
 
 mv ${TEMP_DIR}/files/${TARGET_MODULE} languages/
 
-echo "include ':languages:${TARGET_MODULE}:pack', ':languages:${TARGET_MODULE}:apk'" >> settings.gradle
+echo "include ':addons:languages:${TARGET_MODULE}:pack', ':addons:languages:${TARGET_MODULE}:apk'" >> settings.gradle
 
 mv ${TARGET_FOLDER}/build.gradle ${TARGET_FOLDER}/build.gradle.old
 echo "// Language pack ${BRACNH_TO_MIGRATE}" > ${TARGET_FOLDER}/build.gradle
@@ -35,7 +35,7 @@ mkdir ${TARGET_FOLDER}/apk
 echo "apply plugin: 'com.android.application'" > ${TARGET_FOLDER}/apk/build.gradle
 echo "ext.shouldBePublished = false" >> ${TARGET_FOLDER}/apk/build.gradle
 echo "dependencies {" >> ${TARGET_FOLDER}/apk/build.gradle
-echo "    implementation project(path: ':languages:${TARGET_MODULE}:pack')" >> ${TARGET_FOLDER}/apk/build.gradle
+echo "    implementation project(path: ':addons:languages:${TARGET_MODULE}:pack')" >> ${TARGET_FOLDER}/apk/build.gradle
 echo "}" >> ${TARGET_FOLDER}/apk/build.gradle
 
 mkdir ${TARGET_FOLDER}/pack
@@ -44,5 +44,5 @@ echo "ext.status_icon_text = 'en'" >> ${TARGET_FOLDER}/pack/build.gradle
 echo "ext.dictionaryInputPossibleCharacters = null//"".toCharArray()" >> ${TARGET_FOLDER}/pack/build.gradle
 echo "ext.dictionaryInputAdditionalInnerCharacters = null//"".toCharArray()" >> ${TARGET_FOLDER}/pack/build.gradle
 echo "dependencies {" >> ${TARGET_FOLDER}/pack/build.gradle
-echo "    implementation project(path: ':languages:base')" >> ${TARGET_FOLDER}/pack/build.gradle
+echo "    implementation project(path: ':addons:languages:base')" >> ${TARGET_FOLDER}/pack/build.gradle
 echo "}" >> ${TARGET_FOLDER}/pack/build.gradle
diff --git a/addons/settings.gradle b/addons/settings.gradle
deleted file mode 100644
index 30c3664a2..000000000
--- a/addons/settings.gradle
+++ /dev/null
@@ -1,53 +0,0 @@
-rootProject.name = 'LanguagePack'
-include ':base'
-//list of packs should be alphabetized-ordered
-include ':languages'
-include ':languages:afrikaans_oss:pack', ':languages:afrikaans_oss:apk'
-include ':languages:armenian2:pack', ':languages:armenian2:apk'
-include ':languages:brazilian:pack', ':languages:brazilian:apk'
-include ":languages:catalan:pack", ":languages:catalan:apk"
-include ":languages:czech:pack", ":languages:czech:apk"
-include ':languages:english:pack', ':languages:english:apk'
-include ':languages:finnish:pack', ':languages:finnish:apk'
-include ":languages:french:pack", ":languages:french:apk"
-include ':languages:greek:pack', ':languages:greek:apk'
-include ':languages:hebrew:pack', ':languages:hebrew:apk'
-include ':languages:indonesian:pack', ':languages:indonesian:apk'
-include ':languages:italian:pack', ':languages:italian:apk'
-include ':languages:lithuanian:pack', ':languages:lithuanian:apk'
-include ':languages:nias:pack', ':languages:nias:apk'
-include ':languages:ossturkish:pack', ':languages:ossturkish:apk'
-include ':languages:persian:pack', ':languages:persian:apk'
-include ':languages:romanian:pack', ':languages:romanian:apk'
-include ':languages:russian2:pack', ':languages:russian2:apk'
-include ':languages:sardinian:pack', ':languages:sardinian:apk'
-include ':languages:serbian:pack', ':languages:serbian:apk'
-include ':languages:spain:pack', ':languages:spain:apk'
-include ':languages:tamazight:pack', ':languages:tamazight:apk'
-include ':languages:arabic:pack', ':languages:arabic:apk'
-include ':languages:danish:pack', ':languages:danish:apk'
-include ':languages:basque:pack', ':languages:basque:apk'
-include ':languages:bulgarian:pack', ':languages:bulgarian:apk'
-include ':languages:german:pack', ':languages:german:apk'
-include ':languages:croatian:pack', ':languages:croatian:apk'
-include ':languages:georgian:pack', ':languages:georgian:apk'
-include ':languages:latvian:pack', ':languages:latvian:apk'
-include ':languages:kurdish:pack', ':languages:kurdish:apk'
-include ':languages:hungarian:pack', ':languages:hungarian:apk'
-include ':languages:kachin:pack', ':languages:kachin:apk'
-include ':languages:dutch:pack', ':languages:dutch:apk'
-include ':languages:luxembourgish:pack', ':languages:luxembourgish:apk'
-include ':languages:norwegian:pack', ':languages:norwegian:apk'
-include ':languages:polish:pack', ':languages:polish:apk'
-
-
-//list of themes should be alphabetized-ordered
-include ':themes'
-include ':themes:classic_pc:pack', ':themes:classic_pc:apk'
-include ':themes:ics:pack', ':themes:ics:apk'
-include ':themes:israel64:pack', ':themes:israel64:apk'
-include ':themes:three_d:pack', ':themes:three_d:apk'
-
-//list of quick-text should be alphabetized-ordered
-include ':quicktexts'
-include ':quicktexts:bbcodes:pack', ':quicktexts:bbcodes:apk'
diff --git a/addons/themes/classic_pc/apk/build.gradle b/addons/themes/classic_pc/apk/build.gradle
index 9c6b32e71..e73bff304 100644
--- a/addons/themes/classic_pc/apk/build.gradle
+++ b/addons/themes/classic_pc/apk/build.gradle
@@ -1,7 +1,7 @@
 ext.shouldBePublished = true
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':themes:classic_pc:pack')
+    implementation project(path: ':addons:themes:classic_pc:pack')
 }
diff --git a/addons/themes/classic_pc/pack/build.gradle b/addons/themes/classic_pc/pack/build.gradle
index 7167f824c..4e8bbf930 100644
--- a/addons/themes/classic_pc/pack/build.gradle
+++ b/addons/themes/classic_pc/pack/build.gradle
@@ -1,2 +1,2 @@
 
-apply from: "$rootDir/gradle/theme_pack_lib.gradle"
\ No newline at end of file
+apply from: "$rootDir/addons/gradle/theme_pack_lib.gradle"
\ No newline at end of file
diff --git a/addons/themes/classic_pc/pack/src/main/java/PackBroadcastReceiver.java b/addons/themes/classic_pc/pack/src/main/java/com/anysoftkeyboard/themes/classic_pc/pack/PackBroadcastReceiver.java
index 4c035ae0a..1edcdeefe 100644
--- a/addons/themes/classic_pc/pack/src/main/java/PackBroadcastReceiver.java
+++ b/addons/themes/classic_pc/pack/src/main/java/com/anysoftkeyboard/themes/classic_pc/pack/PackBroadcastReceiver.java
@@ -1,4 +1,6 @@
+// CHECKSTYLE:OFF
 package com.anysoftkeyboard.themes.classic_pc.pack;
+// CHECKSTYLE:ON
 
 import com.anysoftkeyboard.addon.PackBroadcastReceiverBase;
 
diff --git a/addons/themes/ics/apk/build.gradle b/addons/themes/ics/apk/build.gradle
index f5ce03828..d3e5a5767 100644
--- a/addons/themes/ics/apk/build.gradle
+++ b/addons/themes/ics/apk/build.gradle
@@ -1,7 +1,7 @@
 ext.shouldBePublished = true
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':themes:ics:pack')
+    implementation project(path: ':addons:themes:ics:pack')
 }
diff --git a/addons/themes/ics/pack/build.gradle b/addons/themes/ics/pack/build.gradle
index 7167f824c..4e8bbf930 100644
--- a/addons/themes/ics/pack/build.gradle
+++ b/addons/themes/ics/pack/build.gradle
@@ -1,2 +1,2 @@
 
-apply from: "$rootDir/gradle/theme_pack_lib.gradle"
\ No newline at end of file
+apply from: "$rootDir/addons/gradle/theme_pack_lib.gradle"
\ No newline at end of file
diff --git a/addons/themes/israel64/apk/build.gradle b/addons/themes/israel64/apk/build.gradle
index 4404e7b46..f9e24f124 100644
--- a/addons/themes/israel64/apk/build.gradle
+++ b/addons/themes/israel64/apk/build.gradle
@@ -1,7 +1,7 @@
 ext.shouldBePublished = true
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':themes:israel64:pack')
+    implementation project(path: ':addons:themes:israel64:pack')
 }
diff --git a/addons/themes/israel64/pack/build.gradle b/addons/themes/israel64/pack/build.gradle
index 7167f824c..4e8bbf930 100644
--- a/addons/themes/israel64/pack/build.gradle
+++ b/addons/themes/israel64/pack/build.gradle
@@ -1,2 +1,2 @@
 
-apply from: "$rootDir/gradle/theme_pack_lib.gradle"
\ No newline at end of file
+apply from: "$rootDir/addons/gradle/theme_pack_lib.gradle"
\ No newline at end of file
diff --git a/addons/themes/main/pack/build.gradle b/addons/themes/main/pack/build.gradle
index 09bc87579..e80d780a3 100644
--- a/addons/themes/main/pack/build.gradle
+++ b/addons/themes/main/pack/build.gradle
@@ -1,3 +1,3 @@
 ext.shouldBePublished = false
 
-apply from: "$rootDir/gradle/theme_pack_lib.gradle"
\ No newline at end of file
+apply from: "$rootDir/addons/gradle/theme_pack_lib.gradle"
\ No newline at end of file
diff --git a/addons/themes/three_d/apk/build.gradle b/addons/themes/three_d/apk/build.gradle
index e32188f44..2c860d9cf 100644
--- a/addons/themes/three_d/apk/build.gradle
+++ b/addons/themes/three_d/apk/build.gradle
@@ -1,7 +1,7 @@
 ext.shouldBePublished = true
 
-apply from: "$rootDir/gradle/pack_apk.gradle"
+apply from: "$rootDir/addons/gradle/pack_apk.gradle"
 
 dependencies {
-    implementation project(path: ':themes:three_d:pack')
+    implementation project(path: ':addons:themes:three_d:pack')
 }
diff --git a/addons/themes/three_d/pack/build.gradle b/addons/themes/three_d/pack/build.gradle
index 7167f824c..4e8bbf930 100644
--- a/addons/themes/three_d/pack/build.gradle
+++ b/addons/themes/three_d/pack/build.gradle
@@ -1,2 +1,2 @@
 
-apply from: "$rootDir/gradle/theme_pack_lib.gradle"
\ No newline at end of file
+apply from: "$rootDir/addons/gradle/theme_pack_lib.gradle"
\ No newline at end of file
diff --git a/addons/themes/three_d/pack/src/main/java/PackBroadcastReceiver.java b/addons/themes/three_d/pack/src/main/java/com/anysoftkeyboard/themes/three_d/pack/PackBroadcastReceiver.java
index 5677da903..b3ac82feb 100644
--- a/addons/themes/three_d/pack/src/main/java/PackBroadcastReceiver.java
+++ b/addons/themes/three_d/pack/src/main/java/com/anysoftkeyboard/themes/three_d/pack/PackBroadcastReceiver.java
@@ -1,4 +1,6 @@
+// CHECKSTYLE:OFF
 package com.anysoftkeyboard.themes.three_d.pack;
+// CHECKSTYLE:ON
 
 import com.anysoftkeyboard.addon.PackBroadcastReceiverBase;