diff --git a/BuildScripts b/BuildScripts
index 1dd879f..7850b7f 160000
--- a/BuildScripts
+++ b/BuildScripts
@@ -1 +1 @@
-Subproject commit 1dd879f255ea9dc5afb41f3338e7c759a03b7300
+Subproject commit 7850b7f0cdd5d261e532d265b33464a9140a6d45
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index bfa5fbb..728b1d3 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -61,8 +61,6 @@ android {
         addEmptyFlavour(TestPanelFlavour.ON)
     }
 
-    extensions.add("languageMap", mapOf("ru" to "Template-common/strings/default_common_strings_ru.json"))
-
     variantFilter = Action {
         if (name.contentEquals(AndroidConfig.PROD_BUILD_NAME)) {
             (defaultConfig as com.android.build.gradle.internal.dsl.BaseFlavor).apply {
@@ -96,9 +94,4 @@ dependencies {
     implementation(Library.FIREBASE_PERF)
 }
 
-//gradle.projectsEvaluated {
-//    preBuild.dependsOn('stringGenerator')
-//}
-
-//apply(from = "${rootProject.ext["buildScriptsDir"]}/gradle/stringGenerator.gradle")
 apply(from = "${rootProject.ext["buildScriptsDir"]}/gradle/applicationFileNaming.gradle")
diff --git a/buildSrc/src/main/kotlin/AndroidConfig.kt b/buildSrc/src/main/kotlin/AndroidConfig.kt
index d80019f..1af8a71 100644
--- a/buildSrc/src/main/kotlin/AndroidConfig.kt
+++ b/buildSrc/src/main/kotlin/AndroidConfig.kt
@@ -13,8 +13,10 @@ object AndroidConfig {
             TestPanelFlavour.OFF.flavourName +
             BuildType.Release.name
 
-    const val TEST_APP_ID = "ru.touchin.template"
-    const val PROD_APP_ID = "ru.ask.client"
+    const val TEST_APP_ID = "com.touchin.template"
+    const val PROD_APP_ID = "com.ask.client"
+
+    const val COMMON_FOLDER = "Template-common"
 
 
 }
diff --git a/buildSrc/src/main/kotlin/Library.kt b/buildSrc/src/main/kotlin/Library.kt
index ba55b88..4e41bd9 100644
--- a/buildSrc/src/main/kotlin/Library.kt
+++ b/buildSrc/src/main/kotlin/Library.kt
@@ -49,4 +49,7 @@ object Library {
     const val FIREBASE_ANAL = "com.google.firebase:firebase-analytics-ktx:${Version.FIREBASE_ANAL}"
     const val FIREBASE_PERF = "com.google.firebase:firebase-perf:${Version.FIREBASE_PERF}"
     const val FIREBASE_CRASH = "com.google.firebase:firebase-crashlytics:${Version.FIREBASE_CRASH}"
+
+    //TODO: replace to java time
+    const val JODA = "net.danlew:android.joda:2.10.6"
 }
diff --git a/core/core_network/build.gradle.kts b/core/core_network/build.gradle.kts
index 9748823..c028bc4 100644
--- a/core/core_network/build.gradle.kts
+++ b/core/core_network/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 
 android {
     defaultConfig {
-        rootProject.extensions.add("pathToApiSchemes", "$rootDir/common/api")
+        rootProject.extensions.add("pathToApiSchemes", "${AndroidConfig.COMMON_FOLDER}/api")
         rootProject.extensions.add("applicationId", AndroidConfig.TEST_APP_ID)
     }
 }
@@ -15,13 +15,8 @@ dependencies {
     dagger()
     moshi()
     coroutines()
+    //TODO: fix api gen and remove joda
+    implementation(Library.JODA)
 }
 
-//afterEvaluate {
-//    tasks
-//            .asIterable()
-//            .filter { it.name.contains("compile") && it.name.contains("JavaWithJavac") }
-//            .forEach { it.dependsOn("apiGenerator") }
-//}
-//
 //apply(from = "${rootProject.extra["buildScriptsDir"]}/gradle/apiGenerator.gradle")
diff --git a/core/core_strings/build.gradle.kts b/core/core_strings/build.gradle.kts
index 6b554b4..cf68a50 100644
--- a/core/core_strings/build.gradle.kts
+++ b/core/core_strings/build.gradle.kts
@@ -1,3 +1,15 @@
 plugins {
     id(Plugins.ANDROID_LIB_PLUGIN_WITH_DEFAULT_CONFIG)
 }
+android {
+    ext["languageMap"] = mapOf("ru" to "${AndroidConfig.COMMON_FOLDER}/strings/default_common_strings_ru.json")
+    ext["rootPath"] = "core/core_strings"
+}
+
+//gradle.projectsEvaluated {
+//    tasks.named("preBuild") {
+//        dependsOn("stringGenerator")
+//    }
+//}
+//
+//apply(from = "${rootProject.ext["buildScriptsDir"]}/gradle/stringGenerator.gradle")
diff --git a/core/core_strings/src/main/AndroidManifest.xml b/core/core_strings/src/main/AndroidManifest.xml
index 321a923..af59855 100644
--- a/core/core_strings/src/main/AndroidManifest.xml
+++ b/core/core_strings/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="ru.touchin.template.core_strings" />
+<manifest package="ru.touchin.template" />
diff --git a/core/core_strings/src/main/res/values/strings.xml b/core/core_strings/src/main/res/values/strings.xml
new file mode 100644
index 0000000..69db99c
--- /dev/null
+++ b/core/core_strings/src/main/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="common_global_yes" formatted="false">Да</string>
+</resources>