diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d0e2ca3..3fec34c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,22 +21,22 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-            android:name=".help.HelpActivity"
-            android:parentActivityName=".MainActivity" />
+            android:name="io.bartek.ttsserver.help.HelpActivity"
+            android:parentActivityName=".ttsserver.MainActivity" />
 
         <activity
-            android:name=".preference.PreferencesActivity"
+            android:name="io.bartek.ttsserver.preference.PreferencesActivity"
             android:label="@string/title_activity_preferences"
-            android:parentActivityName=".MainActivity" />
+            android:parentActivityName=".ttsserver.MainActivity" />
 
         <service
-            android:name=".service.ForegroundService"
+            android:name="io.bartek.ttsserver.service.ForegroundService"
             android:enabled="true"
             android:exported="true"
             android:permission="io.bartek.permission.TTS_HTTP_SERVICE" />
 
         <activity
-            android:name=".MainActivity"
+            android:name=".ttsserver.MainActivity"
             android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/io/bartek/MainActivity.kt b/app/src/main/java/io/bartek/ttsserver/MainActivity.kt
similarity index 92%
rename from app/src/main/java/io/bartek/MainActivity.kt
rename to app/src/main/java/io/bartek/ttsserver/MainActivity.kt
index 300d88c..a700660 100644
--- a/app/src/main/java/io/bartek/MainActivity.kt
+++ b/app/src/main/java/io/bartek/ttsserver/MainActivity.kt
@@ -1,4 +1,4 @@
-package io.bartek
+package io.bartek.ttsserver
 
 import android.content.BroadcastReceiver
 import android.content.Context
@@ -13,10 +13,11 @@ import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.AppCompatImageButton
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
-import io.bartek.help.HelpActivity
-import io.bartek.preference.PreferencesActivity
-import io.bartek.service.ForegroundService
-import io.bartek.service.ServiceState
+import io.bartek.R
+import io.bartek.ttsserver.help.HelpActivity
+import io.bartek.ttsserver.preference.PreferencesActivity
+import io.bartek.ttsserver.service.ForegroundService
+import io.bartek.ttsserver.service.ServiceState
 
 
 class MainActivity : AppCompatActivity() {
diff --git a/app/src/main/java/io/bartek/exception/TTSException.kt b/app/src/main/java/io/bartek/ttsserver/exception/TTSException.kt
similarity index 58%
rename from app/src/main/java/io/bartek/exception/TTSException.kt
rename to app/src/main/java/io/bartek/ttsserver/exception/TTSException.kt
index b626ee5..f45347f 100644
--- a/app/src/main/java/io/bartek/exception/TTSException.kt
+++ b/app/src/main/java/io/bartek/ttsserver/exception/TTSException.kt
@@ -1,3 +1,3 @@
-package io.bartek.exception
+package io.bartek.ttsserver.exception
 
 class TTSException : Exception("TTS process failed")
\ No newline at end of file
diff --git a/app/src/main/java/io/bartek/help/HelpActivity.kt b/app/src/main/java/io/bartek/ttsserver/help/HelpActivity.kt
similarity index 96%
rename from app/src/main/java/io/bartek/help/HelpActivity.kt
rename to app/src/main/java/io/bartek/ttsserver/help/HelpActivity.kt
index 82560cb..7a61789 100644
--- a/app/src/main/java/io/bartek/help/HelpActivity.kt
+++ b/app/src/main/java/io/bartek/ttsserver/help/HelpActivity.kt
@@ -1,4 +1,4 @@
-package io.bartek.help
+package io.bartek.ttsserver.help
 
 import android.os.Bundle
 import android.webkit.WebView
diff --git a/app/src/main/java/io/bartek/preference/IntEditTextPreference.kt b/app/src/main/java/io/bartek/ttsserver/preference/IntEditTextPreference.kt
similarity index 95%
rename from app/src/main/java/io/bartek/preference/IntEditTextPreference.kt
rename to app/src/main/java/io/bartek/ttsserver/preference/IntEditTextPreference.kt
index 94b5765..1eb9960 100644
--- a/app/src/main/java/io/bartek/preference/IntEditTextPreference.kt
+++ b/app/src/main/java/io/bartek/ttsserver/preference/IntEditTextPreference.kt
@@ -1,4 +1,4 @@
-package io.bartek.preference
+package io.bartek.ttsserver.preference
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/app/src/main/java/io/bartek/preference/Preference.kt b/app/src/main/java/io/bartek/ttsserver/preference/Preference.kt
similarity index 85%
rename from app/src/main/java/io/bartek/preference/Preference.kt
rename to app/src/main/java/io/bartek/ttsserver/preference/Preference.kt
index 7013344..a555d00 100644
--- a/app/src/main/java/io/bartek/preference/Preference.kt
+++ b/app/src/main/java/io/bartek/ttsserver/preference/Preference.kt
@@ -1,4 +1,4 @@
-package io.bartek.preference
+package io.bartek.ttsserver.preference
 
 
 object PreferenceKey {
diff --git a/app/src/main/java/io/bartek/preference/PreferencesActivity.kt b/app/src/main/java/io/bartek/ttsserver/preference/PreferencesActivity.kt
similarity index 92%
rename from app/src/main/java/io/bartek/preference/PreferencesActivity.kt
rename to app/src/main/java/io/bartek/ttsserver/preference/PreferencesActivity.kt
index 9e154b3..82dda4f 100644
--- a/app/src/main/java/io/bartek/preference/PreferencesActivity.kt
+++ b/app/src/main/java/io/bartek/ttsserver/preference/PreferencesActivity.kt
@@ -1,4 +1,4 @@
-package io.bartek.preference
+package io.bartek.ttsserver.preference
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
diff --git a/app/src/main/java/io/bartek/preference/PreferencesFragment.kt b/app/src/main/java/io/bartek/ttsserver/preference/PreferencesFragment.kt
similarity index 94%
rename from app/src/main/java/io/bartek/preference/PreferencesFragment.kt
rename to app/src/main/java/io/bartek/ttsserver/preference/PreferencesFragment.kt
index 13087b5..ab6fe7f 100644
--- a/app/src/main/java/io/bartek/preference/PreferencesFragment.kt
+++ b/app/src/main/java/io/bartek/ttsserver/preference/PreferencesFragment.kt
@@ -1,4 +1,4 @@
-package io.bartek.preference
+package io.bartek.ttsserver.preference
 
 import android.content.BroadcastReceiver
 import android.content.Context
@@ -11,8 +11,8 @@ import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.SwitchPreference
 import io.bartek.R
-import io.bartek.service.ForegroundService
-import io.bartek.service.ServiceState
+import io.bartek.ttsserver.service.ForegroundService
+import io.bartek.ttsserver.service.ServiceState
 
 class PreferencesFragment : PreferenceFragmentCompat() {
    private lateinit var portPreference: IntEditTextPreference
diff --git a/app/src/main/java/io/bartek/service/ForegroundNotificationFactory.kt b/app/src/main/java/io/bartek/ttsserver/service/ForegroundNotificationFactory.kt
similarity index 96%
rename from app/src/main/java/io/bartek/service/ForegroundNotificationFactory.kt
rename to app/src/main/java/io/bartek/ttsserver/service/ForegroundNotificationFactory.kt
index 9d48461..9733e88 100644
--- a/app/src/main/java/io/bartek/service/ForegroundNotificationFactory.kt
+++ b/app/src/main/java/io/bartek/ttsserver/service/ForegroundNotificationFactory.kt
@@ -1,4 +1,4 @@
-package io.bartek.service
+package io.bartek.ttsserver.service
 
 import android.annotation.SuppressLint
 import android.app.Notification
@@ -8,8 +8,8 @@ import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
 import android.os.Build
-import io.bartek.MainActivity
 import io.bartek.R
+import io.bartek.ttsserver.MainActivity
 
 class ForegroundNotificationFactory(private val context: Context) {
    private val oreo: Boolean
diff --git a/app/src/main/java/io/bartek/service/ForegroundService.kt b/app/src/main/java/io/bartek/ttsserver/service/ForegroundService.kt
similarity index 91%
rename from app/src/main/java/io/bartek/service/ForegroundService.kt
rename to app/src/main/java/io/bartek/ttsserver/service/ForegroundService.kt
index 4bbdd32..7fd20f8 100644
--- a/app/src/main/java/io/bartek/service/ForegroundService.kt
+++ b/app/src/main/java/io/bartek/ttsserver/service/ForegroundService.kt
@@ -1,4 +1,4 @@
-package io.bartek.service
+package io.bartek.ttsserver.service
 
 import android.annotation.SuppressLint
 import android.app.Service
@@ -7,8 +7,8 @@ import android.content.Intent
 import android.content.SharedPreferences
 import android.os.PowerManager
 import androidx.preference.PreferenceManager
-import io.bartek.preference.PreferenceKey
-import io.bartek.web.WebServer
+import io.bartek.ttsserver.preference.PreferenceKey
+import io.bartek.ttsserver.web.WebServer
 
 
 class ForegroundService : Service() {
@@ -79,7 +79,7 @@ class ForegroundService : Service() {
       var state = ServiceState.STOPPED
 
       private const val WAKELOCK_TAG = "ForegroundService::lock"
-      const val CHANGE_STATE = "io.bartek.service.CHANGE_STATE"
+      const val CHANGE_STATE = "io.bartek.ttsserver.service.CHANGE_STATE"
       const val STATE = "STATE"
       const val START = "START"
       const val STOP = "STOP"
diff --git a/app/src/main/java/io/bartek/service/ServiceState.kt b/app/src/main/java/io/bartek/ttsserver/service/ServiceState.kt
similarity index 58%
rename from app/src/main/java/io/bartek/service/ServiceState.kt
rename to app/src/main/java/io/bartek/ttsserver/service/ServiceState.kt
index 9a69e33..610b503 100644
--- a/app/src/main/java/io/bartek/service/ServiceState.kt
+++ b/app/src/main/java/io/bartek/ttsserver/service/ServiceState.kt
@@ -1,4 +1,4 @@
-package io.bartek.service
+package io.bartek.ttsserver.service
 
 enum class ServiceState {
    RUNNING,
diff --git a/app/src/main/java/io/bartek/tts/TTS.kt b/app/src/main/java/io/bartek/ttsserver/tts/TTS.kt
similarity index 96%
rename from app/src/main/java/io/bartek/tts/TTS.kt
rename to app/src/main/java/io/bartek/ttsserver/tts/TTS.kt
index 175ccc2..80c86d4 100644
--- a/app/src/main/java/io/bartek/tts/TTS.kt
+++ b/app/src/main/java/io/bartek/ttsserver/tts/TTS.kt
@@ -1,9 +1,9 @@
-package io.bartek.tts
+package io.bartek.ttsserver.tts
 
 import android.content.Context
 import android.speech.tts.TextToSpeech
 import android.speech.tts.UtteranceProgressListener
-import io.bartek.exception.TTSException
+import io.bartek.ttsserver.exception.TTSException
 import java.io.BufferedInputStream
 import java.io.FileInputStream
 import java.io.InputStream
diff --git a/app/src/main/java/io/bartek/web/WebServer.kt b/app/src/main/java/io/bartek/ttsserver/web/WebServer.kt
similarity index 94%
rename from app/src/main/java/io/bartek/web/WebServer.kt
rename to app/src/main/java/io/bartek/ttsserver/web/WebServer.kt
index bcd9276..af48c11 100644
--- a/app/src/main/java/io/bartek/web/WebServer.kt
+++ b/app/src/main/java/io/bartek/ttsserver/web/WebServer.kt
@@ -1,4 +1,4 @@
-package io.bartek.web
+package io.bartek.ttsserver.web
 
 import android.content.Context
 import android.content.Intent
@@ -7,10 +7,10 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import androidx.preference.PreferenceManager
 import fi.iki.elonen.NanoHTTPD
 import fi.iki.elonen.NanoHTTPD.Response.Status.*
-import io.bartek.preference.PreferenceKey
-import io.bartek.service.ForegroundService
-import io.bartek.service.ServiceState
-import io.bartek.tts.TTS
+import io.bartek.ttsserver.preference.PreferenceKey
+import io.bartek.ttsserver.service.ForegroundService
+import io.bartek.ttsserver.service.ServiceState
+import io.bartek.ttsserver.tts.TTS
 import org.json.JSONObject
 import java.util.*
 
diff --git a/app/src/main/res/layout/activity_help.xml b/app/src/main/res/layout/activity_help.xml
index 2c8deb2..264daeb 100644
--- a/app/src/main/res/layout/activity_help.xml
+++ b/app/src/main/res/layout/activity_help.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".help.HelpActivity">
+    tools:context=".ttsserver.help.HelpActivity">
 
     <WebView
         android:id="@+id/help_view"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a212c2b..7ce5b8f 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".MainActivity">
+    tools:context=".ttsserver.MainActivity">
 
     <TextView
         android:id="@+id/prompt_text"
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 3eb1787..90bae26 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -2,7 +2,7 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <PreferenceCategory android:title="@string/preference_category_server" app:iconSpaceReserved="false">
-        <io.bartek.preference.IntEditTextPreference
+        <io.bartek.ttsserver.preference.IntEditTextPreference
             android:defaultValue="8080"
             android:inputType="number"
             android:key="preference_port"