diff --git a/.travis.yml b/.travis.yml
index 50e84b152fb..3417fbdd482 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,10 +2,8 @@ language: android
 dist: trusty
 
 before_install:
-  - openssl aes-256-cbc -K $encrypted_a039e732823a_key -iv $encrypted_a039e732823a_iv -in travis/secrets.tar.enc -out travis/secrets.tar -d
-  - tar xvf travis/secrets.tar
-  - cp travis/google-services.json app/google-services.json
-  - cp travis/home-assistant-mobile-apps-5fd6b9dd0fdb.json serviceCredentialsFile.json
+  - chmod ugo+x .travis/before_install.sh
+  - ./.travis/before_install.sh
 
 android:
   components:
@@ -23,7 +21,5 @@ cache:
     - $HOME/.android/build-cache
 
 script:
-  - echo $TRAVIS_COMMIT_MESSAGE > CHANGES.md
-  - export VERSION_CODE=`git rev-list --count HEAD`
-  - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash ./gradlew testReleaseUnitTest; fi'
-  - 'if [ "$TRAVIS_BRANCH" = "master"  ]; then bash ./gradlew assembleRelease appDistributionUploadRelease; fi'
\ No newline at end of file
+  - chmod ugo+x .travis/script.sh
+  - ./.travis/script.sh
\ No newline at end of file
diff --git a/.travis/before_install.sh b/.travis/before_install.sh
new file mode 100644
index 00000000000..03f1e08eeb6
--- /dev/null
+++ b/.travis/before_install.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+if [ "$TRAVIS_PULL_REQUEST" = "false" ]
+then
+    openssl aes-256-cbc -K $encrypted_6c4fc944fe71_key -iv $encrypted_6c4fc944fe71_iv -in .travis/secrets.tar.enc -out .travis/secrets.tar -d
+    tar xvf .travis/secrets.tar
+    mv google-services.json app/google-services.json
+    mv upload_keystore.keystore app/release_keystore.keystore
+    mv home-assistant-mobile-apps-5fd6b9dd0fdb.json app/firebaseAppDistributionServiceCredentialsFile.json
+    mv home-assistant-mobile-apps-0b13292f44c4.json app/playStorePublishServiceCredentialsFile.json
+else
+    mv .travis/mock-google-services.json app/google-services.json
+fi
\ No newline at end of file
diff --git a/.travis/mock-google-services.json b/.travis/mock-google-services.json
new file mode 100644
index 00000000000..060ae6ceb58
--- /dev/null
+++ b/.travis/mock-google-services.json
@@ -0,0 +1,24 @@
+{
+  "project_info": {
+    "project_number": "project_number",
+    "firebase_url": "firebase_url",
+    "project_id": "project_id",
+    "storage_bucket": "storage_bucket"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "mobilesdk_app_id",
+        "android_client_info": {
+          "package_name": "io.homeassistant.companion.android"
+        }
+      },
+      "api_key": [
+        {
+          "current_key": "current_key"
+        }
+      ]
+    }
+  ],
+  "configuration_version": "1"
+}
\ No newline at end of file
diff --git a/.travis/script.sh b/.travis/script.sh
new file mode 100644
index 00000000000..f155a5ff762
--- /dev/null
+++ b/.travis/script.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+echo $TRAVIS_COMMIT_MESSAGE > CHANGES.md
+export VERSION_CODE=`git rev-list --count HEAD`
+
+if [ "$TRAVIS_PULL_REQUEST" = "false" ]
+then
+    if [ "$TRAVIS_BRANCH" = "master" ]
+    then
+        ./gradlew assembleRelease appDistributionUploadRelease
+
+        if [ -n "$TRAVIS_TAG" ]
+        then
+            ./gradlew publishReleaseBundle
+        fi
+    fi
+else
+    ./gradlew testReleaseUnitTest
+fi
\ No newline at end of file
diff --git a/.travis/secrets.tar.enc b/.travis/secrets.tar.enc
new file mode 100644
index 00000000000..97a66090d52
Binary files /dev/null and b/.travis/secrets.tar.enc differ
diff --git a/app/build.gradle b/app/build.gradle
index cecbea540fe..a0470a368c2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,13 +1,16 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'com.google.firebase.appdistribution'
+apply plugin: 'com.github.triplet.play'
 
 buildscript {
     repositories {
         google()
+        maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
         classpath 'com.google.firebase:firebase-appdistribution-gradle:1.1.0'
+        classpath 'com.github.triplet.gradle:play-publisher:2.5.0'
     }
 }
 
@@ -15,7 +18,7 @@ android {
     compileSdkVersion 29
 
     defaultConfig {
-        applicationId "io.homeassistant.android"
+        applicationId "io.homeassistant.companion.android"
         minSdkVersion 21
         targetSdkVersion 29
         versionCode "${System.env.VERSION_CODE ?: 1}".toInteger()
@@ -23,9 +26,33 @@ android {
     }
 
     firebaseAppDistribution {
-        serviceCredentialsFile = "serviceCredentialsFile.json"
+        serviceCredentialsFile = "firebaseAppDistributionServiceCredentialsFile.json"
         releaseNotesFile = "CHANGES.md"
     }
+
+    signingConfigs {
+        release {
+            storeFile file('release_keystore.keystore')
+            storePassword "${System.env.KEYSTORE_PASSWORD ?: ""}"
+            keyAlias "$System.env.KEYSTORE_ALIAS" ?: ""
+            keyPassword "${System.env.KEYSTORE_ALIAS_PASSWORD ?: ""}"
+            v1SigningEnabled true
+            v2SigningEnabled true
+        }
+    }
+
+    buildTypes {
+        release {
+            debuggable false
+            jniDebuggable false
+            zipAlignEnabled true
+            signingConfig signingConfigs.release
+        }
+    }
+}
+
+play {
+    serviceAccountCredentials = file("playStorePublishServiceCredentialsFile.json")
 }
 
 dependencies {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1f991ccff8f..6dfd9667163 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="io.homeassistant.android">
+    package="io.homeassistant.companion.android">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
@@ -15,7 +15,7 @@
         android:usesCleartextTraffic="true"
         tools:ignore="GoogleAppIndexingWarning">
 
-        <activity android:name=".io.homeassistant.android.launch.LaunchActivity">
+        <activity android:name=".launch.LaunchActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/io/homeassistant/android/webview/WebView.kt b/app/src/main/java/io/homeassistant/android/webview/WebView.kt
deleted file mode 100644
index e79f59535e7..00000000000
--- a/app/src/main/java/io/homeassistant/android/webview/WebView.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.homeassistant.android.webview
-
-import io.homeassistant.android.io.homeassistant.android.api.Token
-
-
-interface WebView {
-
-    fun loadUrl(url: String)
-
-    fun setToken(callback: String, token: Token)
-
-}
diff --git a/app/src/main/java/HomeAssistantApplication.kt b/app/src/main/java/io/homeassistant/companion/android/HomeAssistantApplication.kt
similarity index 63%
rename from app/src/main/java/HomeAssistantApplication.kt
rename to app/src/main/java/io/homeassistant/companion/android/HomeAssistantApplication.kt
index e5de7d2cd08..a5da9f0b797 100644
--- a/app/src/main/java/HomeAssistantApplication.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/HomeAssistantApplication.kt
@@ -1,7 +1,7 @@
-package io.homeassistant.android
+package io.homeassistant.companion.android
 
 import android.app.Application
-import io.homeassistant.android.api.Session
+import io.homeassistant.companion.android.api.Session
 
 class HomeAssistantApplication : Application() {
 
diff --git a/app/src/main/java/io/homeassistant/android/api/AuthenticationService.kt b/app/src/main/java/io/homeassistant/companion/android/api/AuthenticationService.kt
similarity index 94%
rename from app/src/main/java/io/homeassistant/android/api/AuthenticationService.kt
rename to app/src/main/java/io/homeassistant/companion/android/api/AuthenticationService.kt
index d72edc9b099..aaebd330f9c 100644
--- a/app/src/main/java/io/homeassistant/android/api/AuthenticationService.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/api/AuthenticationService.kt
@@ -1,4 +1,4 @@
-package io.homeassistant.android.api
+package io.homeassistant.companion.android.api
 
 import retrofit2.Call
 import retrofit2.http.Field
diff --git a/app/src/main/java/io/homeassistant/android/api/AuthorizationCode.kt b/app/src/main/java/io/homeassistant/companion/android/api/AuthorizationCode.kt
similarity index 87%
rename from app/src/main/java/io/homeassistant/android/api/AuthorizationCode.kt
rename to app/src/main/java/io/homeassistant/companion/android/api/AuthorizationCode.kt
index 9ccb011a207..e2646c48cf8 100644
--- a/app/src/main/java/io/homeassistant/android/api/AuthorizationCode.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/api/AuthorizationCode.kt
@@ -1,4 +1,4 @@
-package io.homeassistant.android.api
+package io.homeassistant.companion.android.api
 
 import com.fasterxml.jackson.annotation.JsonProperty
 
diff --git a/app/src/main/java/io/homeassistant/android/api/HomeAssistantApi.kt b/app/src/main/java/io/homeassistant/companion/android/api/HomeAssistantApi.kt
similarity index 88%
rename from app/src/main/java/io/homeassistant/android/api/HomeAssistantApi.kt
rename to app/src/main/java/io/homeassistant/companion/android/api/HomeAssistantApi.kt
index 4dc24a09501..24e5ae9b475 100644
--- a/app/src/main/java/io/homeassistant/android/api/HomeAssistantApi.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/api/HomeAssistantApi.kt
@@ -1,6 +1,6 @@
-package io.homeassistant.android.api
+package io.homeassistant.companion.android.api
 
-import io.homeassistant.android.BuildConfig
+import io.homeassistant.companion.android.BuildConfig
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
diff --git a/app/src/main/java/io/homeassistant/android/api/RefreshToken.kt b/app/src/main/java/io/homeassistant/companion/android/api/RefreshToken.kt
similarity index 84%
rename from app/src/main/java/io/homeassistant/android/api/RefreshToken.kt
rename to app/src/main/java/io/homeassistant/companion/android/api/RefreshToken.kt
index aa60f0a6f66..53b6ce7be92 100644
--- a/app/src/main/java/io/homeassistant/android/api/RefreshToken.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/api/RefreshToken.kt
@@ -1,4 +1,4 @@
-package io.homeassistant.android.api
+package io.homeassistant.companion.android.api
 
 import com.fasterxml.jackson.annotation.JsonProperty
 
diff --git a/app/src/main/java/io/homeassistant/android/api/Session.kt b/app/src/main/java/io/homeassistant/companion/android/api/Session.kt
similarity index 96%
rename from app/src/main/java/io/homeassistant/android/api/Session.kt
rename to app/src/main/java/io/homeassistant/companion/android/api/Session.kt
index b91d675922a..d6c9b3cd7e5 100644
--- a/app/src/main/java/io/homeassistant/android/api/Session.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/api/Session.kt
@@ -1,8 +1,7 @@
-package io.homeassistant.android.api
+package io.homeassistant.companion.android.api
 
 import android.app.Application
 import android.content.Context
-import io.homeassistant.android.io.homeassistant.android.api.Token
 import java.util.*
 
 
diff --git a/app/src/main/java/io/homeassistant/android/api/Token.kt b/app/src/main/java/io/homeassistant/companion/android/api/Token.kt
similarity index 81%
rename from app/src/main/java/io/homeassistant/android/api/Token.kt
rename to app/src/main/java/io/homeassistant/companion/android/api/Token.kt
index 7e81f142307..a5b95b9e02d 100644
--- a/app/src/main/java/io/homeassistant/android/api/Token.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/api/Token.kt
@@ -1,4 +1,4 @@
-package io.homeassistant.android.io.homeassistant.android.api
+package io.homeassistant.companion.android.api
 
 import java.util.*
 
diff --git a/app/src/main/java/io/homeassistant/android/launch/LaunchActivity.kt b/app/src/main/java/io/homeassistant/companion/android/launch/LaunchActivity.kt
similarity index 65%
rename from app/src/main/java/io/homeassistant/android/launch/LaunchActivity.kt
rename to app/src/main/java/io/homeassistant/companion/android/launch/LaunchActivity.kt
index 2debe200ceb..f5a9b1c3e66 100644
--- a/app/src/main/java/io/homeassistant/android/launch/LaunchActivity.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/launch/LaunchActivity.kt
@@ -1,10 +1,10 @@
-package io.homeassistant.android.io.homeassistant.android.launch
+package io.homeassistant.companion.android.launch
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import io.homeassistant.android.api.Session
-import io.homeassistant.android.onboarding.OnboardingActivity
-import io.homeassistant.android.webview.WebViewActivity
+import io.homeassistant.companion.android.api.Session
+import io.homeassistant.companion.android.onboarding.OnboardingActivity
+import io.homeassistant.companion.android.webview.WebViewActivity
 
 
 class LaunchActivity : AppCompatActivity() {
diff --git a/app/src/main/java/io/homeassistant/android/onboarding/DiscoveryFragment.kt b/app/src/main/java/io/homeassistant/companion/android/onboarding/DiscoveryFragment.kt
similarity index 93%
rename from app/src/main/java/io/homeassistant/android/onboarding/DiscoveryFragment.kt
rename to app/src/main/java/io/homeassistant/companion/android/onboarding/DiscoveryFragment.kt
index 580d853688b..9fe39900d80 100644
--- a/app/src/main/java/io/homeassistant/android/onboarding/DiscoveryFragment.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/onboarding/DiscoveryFragment.kt
@@ -1,4 +1,4 @@
-package io.homeassistant.android.onboarding
+package io.homeassistant.companion.android.onboarding
 
 import android.os.Bundle
 import android.os.Handler
@@ -8,7 +8,7 @@ import android.view.ViewGroup
 import android.widget.Button
 import android.widget.ViewFlipper
 import androidx.fragment.app.Fragment
-import io.homeassistant.android.R
+import io.homeassistant.companion.android.R
 
 
 class DiscoveryFragment : Fragment() {
diff --git a/app/src/main/java/io/homeassistant/android/onboarding/DiscoveryListener.kt b/app/src/main/java/io/homeassistant/companion/android/onboarding/DiscoveryListener.kt
similarity index 64%
rename from app/src/main/java/io/homeassistant/android/onboarding/DiscoveryListener.kt
rename to app/src/main/java/io/homeassistant/companion/android/onboarding/DiscoveryListener.kt
index 793c9a22d1e..a3d0cd36c95 100644
--- a/app/src/main/java/io/homeassistant/android/onboarding/DiscoveryListener.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/onboarding/DiscoveryListener.kt
@@ -1,4 +1,4 @@
-package io.homeassistant.android.onboarding
+package io.homeassistant.companion.android.onboarding
 
 interface DiscoveryListener {
 
diff --git a/app/src/main/java/io/homeassistant/android/onboarding/ManualSetupFragment.kt b/app/src/main/java/io/homeassistant/companion/android/onboarding/ManualSetupFragment.kt
similarity index 89%
rename from app/src/main/java/io/homeassistant/android/onboarding/ManualSetupFragment.kt
rename to app/src/main/java/io/homeassistant/companion/android/onboarding/ManualSetupFragment.kt
index b405dbbbc98..3469b20a48d 100644
--- a/app/src/main/java/io/homeassistant/android/onboarding/ManualSetupFragment.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/onboarding/ManualSetupFragment.kt
@@ -1,4 +1,4 @@
-package io.homeassistant.android.onboarding
+package io.homeassistant.companion.android.onboarding
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -7,7 +7,7 @@ import android.view.ViewGroup
 import android.widget.Button
 import android.widget.EditText
 import androidx.fragment.app.Fragment
-import io.homeassistant.android.R
+import io.homeassistant.companion.android.R
 
 
 class ManualSetupFragment : Fragment() {
diff --git a/app/src/main/java/io/homeassistant/android/onboarding/ManualSetupListener.kt b/app/src/main/java/io/homeassistant/companion/android/onboarding/ManualSetupListener.kt
similarity index 55%
rename from app/src/main/java/io/homeassistant/android/onboarding/ManualSetupListener.kt
rename to app/src/main/java/io/homeassistant/companion/android/onboarding/ManualSetupListener.kt
index fea08bceaea..911adfc74cd 100644
--- a/app/src/main/java/io/homeassistant/android/onboarding/ManualSetupListener.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/onboarding/ManualSetupListener.kt
@@ -1,4 +1,4 @@
-package io.homeassistant.android.onboarding
+package io.homeassistant.companion.android.onboarding
 
 
 interface ManualSetupListener {
diff --git a/app/src/main/java/io/homeassistant/android/onboarding/OnboardingActivity.kt b/app/src/main/java/io/homeassistant/companion/android/onboarding/OnboardingActivity.kt
similarity index 69%
rename from app/src/main/java/io/homeassistant/android/onboarding/OnboardingActivity.kt
rename to app/src/main/java/io/homeassistant/companion/android/onboarding/OnboardingActivity.kt
index 7fdb1f1421d..f844c378ff0 100644
--- a/app/src/main/java/io/homeassistant/android/onboarding/OnboardingActivity.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/onboarding/OnboardingActivity.kt
@@ -1,12 +1,13 @@
-package io.homeassistant.android.onboarding
+package io.homeassistant.companion.android.onboarding
 
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import io.homeassistant.android.onboarding.authentication.AuthenticationFragment
-import io.homeassistant.android.onboarding.authentication.AuthenticationListener
-import io.homeassistant.android.webview.WebViewActivity
+import io.homeassistant.companion.android.R
+import io.homeassistant.companion.android.onboarding.authentication.AuthenticationFragment
+import io.homeassistant.companion.android.onboarding.authentication.AuthenticationListener
+import io.homeassistant.companion.android.webview.WebViewActivity
 
 
 class OnboardingActivity : AppCompatActivity(), DiscoveryListener, ManualSetupListener, AuthenticationListener {
@@ -21,12 +22,12 @@ class OnboardingActivity : AppCompatActivity(), DiscoveryListener, ManualSetupLi
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(io.homeassistant.android.R.layout.activity_onboarding)
+        setContentView(R.layout.activity_onboarding)
 
         if (savedInstanceState == null) {
             supportFragmentManager
                 .beginTransaction()
-                .add(io.homeassistant.android.R.id.content, DiscoveryFragment.newInstance())
+                .add(R.id.content, DiscoveryFragment.newInstance())
                 .commit()
         }
     }
@@ -42,7 +43,7 @@ class OnboardingActivity : AppCompatActivity(), DiscoveryListener, ManualSetupLi
     override fun onSelectManualSetup() {
         supportFragmentManager
             .beginTransaction()
-            .replace(io.homeassistant.android.R.id.content, ManualSetupFragment.newInstance())
+            .replace(R.id.content, ManualSetupFragment.newInstance())
             .commit()
     }
 
@@ -53,7 +54,7 @@ class OnboardingActivity : AppCompatActivity(), DiscoveryListener, ManualSetupLi
     override fun onSelectUrl(url: String) {
         supportFragmentManager
             .beginTransaction()
-            .replace(io.homeassistant.android.R.id.content, AuthenticationFragment.newInstance(url))
+            .replace(R.id.content, AuthenticationFragment.newInstance(url))
             .commit()
     }
 
diff --git a/app/src/main/java/io/homeassistant/android/onboarding/authentication/AuthenticationFragment.kt b/app/src/main/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationFragment.kt
similarity index 94%
rename from app/src/main/java/io/homeassistant/android/onboarding/authentication/AuthenticationFragment.kt
rename to app/src/main/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationFragment.kt
index fb5aeb6386d..4dda91c8fbd 100644
--- a/app/src/main/java/io/homeassistant/android/onboarding/authentication/AuthenticationFragment.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationFragment.kt
@@ -1,4 +1,4 @@
-package io.homeassistant.android.onboarding.authentication
+package io.homeassistant.companion.android.onboarding.authentication
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -7,7 +7,7 @@ import android.view.ViewGroup
 import android.webkit.WebView
 import android.webkit.WebViewClient
 import androidx.fragment.app.Fragment
-import io.homeassistant.android.R
+import io.homeassistant.companion.android.R
 
 
 class AuthenticationFragment : Fragment(), AuthenticationView {
diff --git a/app/src/main/java/io/homeassistant/android/onboarding/authentication/AuthenticationListener.kt b/app/src/main/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationListener.kt
similarity index 55%
rename from app/src/main/java/io/homeassistant/android/onboarding/authentication/AuthenticationListener.kt
rename to app/src/main/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationListener.kt
index 639fa6f0b7f..4f09570dc3b 100644
--- a/app/src/main/java/io/homeassistant/android/onboarding/authentication/AuthenticationListener.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationListener.kt
@@ -1,4 +1,4 @@
-package io.homeassistant.android.onboarding.authentication
+package io.homeassistant.companion.android.onboarding.authentication
 
 interface AuthenticationListener {
 
diff --git a/app/src/main/java/io/homeassistant/android/onboarding/authentication/AuthenticationPresenter.kt b/app/src/main/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationPresenter.kt
similarity index 67%
rename from app/src/main/java/io/homeassistant/android/onboarding/authentication/AuthenticationPresenter.kt
rename to app/src/main/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationPresenter.kt
index 703ad56fbf5..ea64ce73e2f 100644
--- a/app/src/main/java/io/homeassistant/android/onboarding/authentication/AuthenticationPresenter.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationPresenter.kt
@@ -1,4 +1,4 @@
-package io.homeassistant.android.onboarding.authentication
+package io.homeassistant.companion.android.onboarding.authentication
 
 
 interface AuthenticationPresenter {
diff --git a/app/src/main/java/io/homeassistant/android/onboarding/authentication/AuthenticationPresenterImpl.kt b/app/src/main/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationPresenterImpl.kt
similarity index 87%
rename from app/src/main/java/io/homeassistant/android/onboarding/authentication/AuthenticationPresenterImpl.kt
rename to app/src/main/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationPresenterImpl.kt
index ecd94b43702..a5778c357ba 100644
--- a/app/src/main/java/io/homeassistant/android/onboarding/authentication/AuthenticationPresenterImpl.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationPresenterImpl.kt
@@ -1,11 +1,11 @@
-package io.homeassistant.android.onboarding.authentication
+package io.homeassistant.companion.android.onboarding.authentication
 
 import android.net.Uri
 import android.util.Log
-import io.homeassistant.android.api.AuthenticationService
-import io.homeassistant.android.api.HomeAssistantApi
-import io.homeassistant.android.api.Session
-import io.homeassistant.android.api.AuthorizationCode
+import io.homeassistant.companion.android.api.AuthenticationService
+import io.homeassistant.companion.android.api.HomeAssistantApi
+import io.homeassistant.companion.android.api.Session
+import io.homeassistant.companion.android.api.AuthorizationCode
 import retrofit2.Call
 import retrofit2.Response
 
diff --git a/app/src/main/java/io/homeassistant/android/onboarding/authentication/AuthenticationView.kt b/app/src/main/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationView.kt
similarity index 59%
rename from app/src/main/java/io/homeassistant/android/onboarding/authentication/AuthenticationView.kt
rename to app/src/main/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationView.kt
index 43b9d517ba7..c81edf79f38 100644
--- a/app/src/main/java/io/homeassistant/android/onboarding/authentication/AuthenticationView.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationView.kt
@@ -1,4 +1,4 @@
-package io.homeassistant.android.onboarding.authentication
+package io.homeassistant.companion.android.onboarding.authentication
 
 
 interface AuthenticationView {
diff --git a/app/src/main/java/io/homeassistant/android/settings/SettingsActivity.kt b/app/src/main/java/io/homeassistant/companion/android/settings/SettingsActivity.kt
similarity index 81%
rename from app/src/main/java/io/homeassistant/android/settings/SettingsActivity.kt
rename to app/src/main/java/io/homeassistant/companion/android/settings/SettingsActivity.kt
index 0c5d8d5b9fa..d04770f33db 100644
--- a/app/src/main/java/io/homeassistant/android/settings/SettingsActivity.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/settings/SettingsActivity.kt
@@ -1,12 +1,12 @@
-package io.homeassistant.android.settings
+package io.homeassistant.companion.android.settings
 
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
-import io.homeassistant.android.BuildConfig
-import io.homeassistant.android.R
+import io.homeassistant.companion.android.BuildConfig
+import io.homeassistant.companion.android.R
 
 
 class SettingsActivity : AppCompatActivity() {
diff --git a/app/src/main/java/io/homeassistant/companion/android/webview/WebView.kt b/app/src/main/java/io/homeassistant/companion/android/webview/WebView.kt
new file mode 100644
index 00000000000..e9729444260
--- /dev/null
+++ b/app/src/main/java/io/homeassistant/companion/android/webview/WebView.kt
@@ -0,0 +1,12 @@
+package io.homeassistant.companion.android.webview
+
+import io.homeassistant.companion.android.api.Token
+
+
+interface WebView {
+
+    fun loadUrl(url: String)
+
+    fun setToken(callback: String, token: Token)
+
+}
diff --git a/app/src/main/java/io/homeassistant/android/webview/WebViewActivity.kt b/app/src/main/java/io/homeassistant/companion/android/webview/WebViewActivity.kt
similarity index 90%
rename from app/src/main/java/io/homeassistant/android/webview/WebViewActivity.kt
rename to app/src/main/java/io/homeassistant/companion/android/webview/WebViewActivity.kt
index e8a3312c72d..003950b9944 100644
--- a/app/src/main/java/io/homeassistant/android/webview/WebViewActivity.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/webview/WebViewActivity.kt
@@ -1,4 +1,4 @@
-package io.homeassistant.android.webview
+package io.homeassistant.companion.android.webview
 
 import android.content.Context
 import android.content.Intent
@@ -9,15 +9,15 @@ import android.webkit.JavascriptInterface
 import android.webkit.WebView
 import android.webkit.WebViewClient
 import androidx.appcompat.app.AppCompatActivity
-import io.homeassistant.android.BuildConfig
-import io.homeassistant.android.R
-import io.homeassistant.android.settings.SettingsActivity
-import io.homeassistant.android.api.Session
-import io.homeassistant.android.io.homeassistant.android.api.Token
+import io.homeassistant.companion.android.settings.SettingsActivity
+import io.homeassistant.companion.android.api.Session
+import io.homeassistant.companion.android.api.Token
+import io.homeassistant.companion.android.BuildConfig
+import io.homeassistant.companion.android.R
 import org.json.JSONObject
 
 
-class WebViewActivity : AppCompatActivity(), io.homeassistant.android.webview.WebView {
+class WebViewActivity : AppCompatActivity(), io.homeassistant.companion.android.webview.WebView {
 
     companion object {
         private const val TAG = "WebviewActivity"
diff --git a/app/src/main/java/io/homeassistant/android/webview/WebViewPresenter.kt b/app/src/main/java/io/homeassistant/companion/android/webview/WebViewPresenter.kt
similarity index 66%
rename from app/src/main/java/io/homeassistant/android/webview/WebViewPresenter.kt
rename to app/src/main/java/io/homeassistant/companion/android/webview/WebViewPresenter.kt
index cf3ed350ca5..4ce3fe505aa 100644
--- a/app/src/main/java/io/homeassistant/android/webview/WebViewPresenter.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/webview/WebViewPresenter.kt
@@ -1,4 +1,4 @@
-package io.homeassistant.android.webview
+package io.homeassistant.companion.android.webview
 
 
 interface WebViewPresenter {
diff --git a/app/src/main/java/io/homeassistant/android/webview/WebViewPresenterImpl.kt b/app/src/main/java/io/homeassistant/companion/android/webview/WebViewPresenterImpl.kt
similarity index 84%
rename from app/src/main/java/io/homeassistant/android/webview/WebViewPresenterImpl.kt
rename to app/src/main/java/io/homeassistant/companion/android/webview/WebViewPresenterImpl.kt
index 5a757bca64c..131af7517d7 100644
--- a/app/src/main/java/io/homeassistant/android/webview/WebViewPresenterImpl.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/webview/WebViewPresenterImpl.kt
@@ -1,10 +1,10 @@
-package io.homeassistant.android.webview
+package io.homeassistant.companion.android.webview
 
 import android.util.Log
-import io.homeassistant.android.api.AuthenticationService
-import io.homeassistant.android.api.HomeAssistantApi
-import io.homeassistant.android.api.RefreshToken
-import io.homeassistant.android.api.Session
+import io.homeassistant.companion.android.api.AuthenticationService
+import io.homeassistant.companion.android.api.HomeAssistantApi
+import io.homeassistant.companion.android.api.RefreshToken
+import io.homeassistant.companion.android.api.Session
 import retrofit2.Response
 import java.io.IOException
 
diff --git a/travis/secrets.tar.enc b/travis/secrets.tar.enc
deleted file mode 100644
index ffdd159ca25..00000000000
Binary files a/travis/secrets.tar.enc and /dev/null differ