diff --git a/README.md b/README.md
index aaa41f4..3fd9f21 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ Thanks to that you can force TTS Server to work as you want and to meet your req
 # Defining REST interface
 All endpoints are defined in Lua language so that you are able to freely modify them,
 remove or even create new ones as you want.
-All Lua scripts are stored in `<external_dir>/Android/data/com.bartlomiejpluta/files/endpoints`
+All Lua scripts are stored in `<external_dir>/Android/data/com.bartlomiejpluta.ttsserver/files/endpoints`
 directory. The endpoint definition is a simple Lua script, which returns a Lua table
 containing some meta data about endpoints as well as the endpoint handler (called `consumer`) itself.
 For example, the script for the `/tts.{ext}` endpoint is:
@@ -131,7 +131,7 @@ return {
 ``` 
 
 ## Config
-The `<external_dir>/Android/data/com.bartlomiejpluta/files/config/config.lua` file contains
+The `<external_dir>/Android/data/com.bartlomiejpluta.ttsserver/files/config/config.lua` file contains
 a script which defines a global values that are accessible for each endpoint.
 Similarly to endpoints script, the `config.lua` can contain anything, however it is obligated
 to return single Lua table with arbitrary data. This table will be available to every endpoint
diff --git a/app/build.gradle b/app/build.gradle
index cb80a23..d1800cc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@ android {
     buildToolsVersion "29.0.3"
 
     defaultConfig {
-        applicationId "com.bartlomiejpluta"
+        applicationId "com.bartlomiejpluta.ttsserver"
         minSdkVersion 22
         targetSdkVersion 29
         versionCode 1
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 63ba4a5..97aa911 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.bartlomiejpluta">
+    package="com.bartlomiejpluta.ttsserver">
 
     <permission
         android:name="com.bartlomiejpluta.permission.TTS_HTTP_SERVICE"
diff --git a/app/src/main/assets/help/help.html b/app/src/main/assets/help/help.html
index 3c6d13d..bc5d6d7 100644
--- a/app/src/main/assets/help/help.html
+++ b/app/src/main/assets/help/help.html
@@ -25,7 +25,7 @@
 <h1 class="code-line" data-line-start=27 data-line-end=28><a id="Defining_REST_interface_27"></a>Defining REST interface</h1>
 <p class="has-line-data" data-line-start="28" data-line-end="34">All endpoints are defined in Lua language so that you are able to freely modify them,<br>
     remove or even create new ones as you want.<br>
-    All Lua scripts are stored in <code>&lt;external_dir&gt;/Android/data/com.bartlomiejpluta/files/endpoints</code><br>
+    All Lua scripts are stored in <code>&lt;external_dir&gt;/Android/data/com.bartlomiejpluta.ttsserver/files/endpoints</code><br>
     directory. The endpoint definition is a simple Lua script, which returns a Lua table<br>
     containing some meta data about endpoints as well as the endpoint handler (called <code>consumer</code>) itself.<br>
     For example, the script for the <code>/tts.{ext}</code> endpoint is:</p>
@@ -124,7 +124,7 @@
 }
 </code></pre>
 <h2 class="code-line" data-line-start=132 data-line-end=133><a id="Config_132"></a>Config</h2>
-<p class="has-line-data" data-line-start="133" data-line-end="139">The <code>&lt;external_dir&gt;/Android/data/com.bartlomiejpluta/files/config/config.lua</code> file contains<br>
+<p class="has-line-data" data-line-start="133" data-line-end="139">The <code>&lt;external_dir&gt;/Android/data/com.bartlomiejpluta.ttsserver/files/config/config.lua</code> file contains<br>
     a script which defines a global values that are accessible for each endpoint.<br>
     Similarly to endpoints script, the <code>config.lua</code> can contain anything, however it is obligated<br>
     to return single Lua table with arbitrary data. This table will be available to every endpoint<br>
diff --git a/app/src/main/java/com/bartlomiejpluta/ttsserver/core/lua/lib/ServerLibrary.kt b/app/src/main/java/com/bartlomiejpluta/ttsserver/core/lua/lib/ServerLibrary.kt
index 6289cc0..e74c1a2 100644
--- a/app/src/main/java/com/bartlomiejpluta/ttsserver/core/lua/lib/ServerLibrary.kt
+++ b/app/src/main/java/com/bartlomiejpluta/ttsserver/core/lua/lib/ServerLibrary.kt
@@ -3,7 +3,7 @@ package com.bartlomiejpluta.ttsserver.core.lua.lib
 import android.content.Context
 import android.content.Intent
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
-import com.bartlomiejpluta.R
+import com.bartlomiejpluta.ttsserver.R
 import com.bartlomiejpluta.ttsserver.core.util.NetworkUtil
 import com.bartlomiejpluta.ttsserver.ui.main.MainActivity
 import org.luaj.vm2.LuaValue
diff --git a/app/src/main/java/com/bartlomiejpluta/ttsserver/core/lua/loader/EndpointLoader.kt b/app/src/main/java/com/bartlomiejpluta/ttsserver/core/lua/loader/EndpointLoader.kt
index 6655344..89e0c27 100644
--- a/app/src/main/java/com/bartlomiejpluta/ttsserver/core/lua/loader/EndpointLoader.kt
+++ b/app/src/main/java/com/bartlomiejpluta/ttsserver/core/lua/loader/EndpointLoader.kt
@@ -3,7 +3,7 @@ package com.bartlomiejpluta.ttsserver.core.lua.loader
 import android.content.Context
 import android.content.Intent
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
-import com.bartlomiejpluta.R
+import com.bartlomiejpluta.ttsserver.R
 import com.bartlomiejpluta.ttsserver.core.lua.sandbox.SandboxFactory
 import com.bartlomiejpluta.ttsserver.core.web.endpoint.DefaultEndpoint
 import com.bartlomiejpluta.ttsserver.core.web.endpoint.Endpoint
diff --git a/app/src/main/java/com/bartlomiejpluta/ttsserver/core/web/task/QueueableTask.kt b/app/src/main/java/com/bartlomiejpluta/ttsserver/core/web/task/QueueableTask.kt
index c03695a..265699f 100644
--- a/app/src/main/java/com/bartlomiejpluta/ttsserver/core/web/task/QueueableTask.kt
+++ b/app/src/main/java/com/bartlomiejpluta/ttsserver/core/web/task/QueueableTask.kt
@@ -3,7 +3,7 @@ package com.bartlomiejpluta.ttsserver.core.web.task
 import android.content.Context
 import android.content.Intent
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
-import com.bartlomiejpluta.R
+import com.bartlomiejpluta.ttsserver.R
 import com.bartlomiejpluta.ttsserver.core.web.dto.Request
 import com.bartlomiejpluta.ttsserver.core.web.queue.TasksQueue
 import com.bartlomiejpluta.ttsserver.ui.main.MainActivity
diff --git a/app/src/main/java/com/bartlomiejpluta/ttsserver/initializer/ScriptsInitializer.kt b/app/src/main/java/com/bartlomiejpluta/ttsserver/initializer/ScriptsInitializer.kt
index 4235beb..2dda682 100644
--- a/app/src/main/java/com/bartlomiejpluta/ttsserver/initializer/ScriptsInitializer.kt
+++ b/app/src/main/java/com/bartlomiejpluta/ttsserver/initializer/ScriptsInitializer.kt
@@ -2,7 +2,7 @@ package com.bartlomiejpluta.ttsserver.initializer
 
 import android.content.Context
 import android.content.SharedPreferences
-import com.bartlomiejpluta.R
+import com.bartlomiejpluta.ttsserver.R
 import java.io.BufferedInputStream
 import java.io.File
 import java.io.FileOutputStream
diff --git a/app/src/main/java/com/bartlomiejpluta/ttsserver/service/notification/ForegroundNotificationFactory.kt b/app/src/main/java/com/bartlomiejpluta/ttsserver/service/notification/ForegroundNotificationFactory.kt
index 9930a85..af3e4e1 100644
--- a/app/src/main/java/com/bartlomiejpluta/ttsserver/service/notification/ForegroundNotificationFactory.kt
+++ b/app/src/main/java/com/bartlomiejpluta/ttsserver/service/notification/ForegroundNotificationFactory.kt
@@ -8,7 +8,7 @@ import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
 import android.os.Build
-import com.bartlomiejpluta.R
+import com.bartlomiejpluta.ttsserver.R
 import com.bartlomiejpluta.ttsserver.core.util.NetworkUtil
 import com.bartlomiejpluta.ttsserver.ui.main.MainActivity
 
diff --git a/app/src/main/java/com/bartlomiejpluta/ttsserver/ui/help/HelpActivity.kt b/app/src/main/java/com/bartlomiejpluta/ttsserver/ui/help/HelpActivity.kt
index fe3d078..11fc976 100644
--- a/app/src/main/java/com/bartlomiejpluta/ttsserver/ui/help/HelpActivity.kt
+++ b/app/src/main/java/com/bartlomiejpluta/ttsserver/ui/help/HelpActivity.kt
@@ -3,7 +3,7 @@ package com.bartlomiejpluta.ttsserver.ui.help
 import android.os.Bundle
 import android.webkit.WebView
 import androidx.appcompat.app.AppCompatActivity
-import com.bartlomiejpluta.R
+import com.bartlomiejpluta.ttsserver.R
 import java.util.*
 
 class HelpActivity : AppCompatActivity() {
diff --git a/app/src/main/java/com/bartlomiejpluta/ttsserver/ui/main/MainActivity.kt b/app/src/main/java/com/bartlomiejpluta/ttsserver/ui/main/MainActivity.kt
index 96e37b6..83e1961 100644
--- a/app/src/main/java/com/bartlomiejpluta/ttsserver/ui/main/MainActivity.kt
+++ b/app/src/main/java/com/bartlomiejpluta/ttsserver/ui/main/MainActivity.kt
@@ -10,7 +10,7 @@ import android.view.View
 import android.widget.TextView
 import androidx.appcompat.widget.AppCompatImageButton
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
-import com.bartlomiejpluta.R
+import com.bartlomiejpluta.ttsserver.R
 import com.bartlomiejpluta.ttsserver.core.util.NetworkUtil
 import com.bartlomiejpluta.ttsserver.initializer.ScriptsInitializer
 import com.bartlomiejpluta.ttsserver.service.foreground.ForegroundService
diff --git a/app/src/main/java/com/bartlomiejpluta/ttsserver/ui/preference/component/PreferencesActivity.kt b/app/src/main/java/com/bartlomiejpluta/ttsserver/ui/preference/component/PreferencesActivity.kt
index 44128fd..f9b2a40 100644
--- a/app/src/main/java/com/bartlomiejpluta/ttsserver/ui/preference/component/PreferencesActivity.kt
+++ b/app/src/main/java/com/bartlomiejpluta/ttsserver/ui/preference/component/PreferencesActivity.kt
@@ -2,7 +2,7 @@ package com.bartlomiejpluta.ttsserver.ui.preference.component
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.bartlomiejpluta.R
+import com.bartlomiejpluta.ttsserver.R
 
 class PreferencesActivity : AppCompatActivity() {
 
diff --git a/app/src/main/java/com/bartlomiejpluta/ttsserver/ui/preference/component/PreferencesFragment.kt b/app/src/main/java/com/bartlomiejpluta/ttsserver/ui/preference/component/PreferencesFragment.kt
index aae94c5..f121565 100644
--- a/app/src/main/java/com/bartlomiejpluta/ttsserver/ui/preference/component/PreferencesFragment.kt
+++ b/app/src/main/java/com/bartlomiejpluta/ttsserver/ui/preference/component/PreferencesFragment.kt
@@ -11,7 +11,7 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.SwitchPreference
-import com.bartlomiejpluta.R
+import com.bartlomiejpluta.ttsserver.R
 import com.bartlomiejpluta.ttsserver.service.foreground.ForegroundService
 import com.bartlomiejpluta.ttsserver.service.state.ServiceState
 import com.bartlomiejpluta.ttsserver.ui.main.MainActivity