diff --git a/.travis/before_install.sh b/.travis/before_install.sh
index 2badc4e7ada..9036c0d6b8c 100644
--- a/.travis/before_install.sh
+++ b/.travis/before_install.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -ev
+
 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
diff --git a/.travis/script.sh b/.travis/script.sh
index 9df25b10fe7..fcdb2e2ab89 100644
--- a/.travis/script.sh
+++ b/.travis/script.sh
@@ -1,9 +1,12 @@
 #!/bin/bash
 
+set -ev
+
 echo $TRAVIS_COMMIT_MESSAGE > CHANGES.md
 export VERSION_CODE=`git rev-list --count HEAD`
 
-./gradlew testReleaseUnitTest
+./gradlew test
+./gradlew lint
 
 if [ "$TRAVIS_PULL_REQUEST" = "false" ]
 then
diff --git a/app/build.gradle b/app/build.gradle
index a0470a368c2..8133bdedd9d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,7 +1,9 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
 apply plugin: 'com.google.firebase.appdistribution'
 apply plugin: 'com.github.triplet.play'
+apply plugin: 'de.mannodermaus.android-junit5'
 
 buildscript {
     repositories {
@@ -11,15 +13,16 @@ buildscript {
     dependencies {
         classpath 'com.google.firebase:firebase-appdistribution-gradle:1.1.0'
         classpath 'com.github.triplet.gradle:play-publisher:2.5.0'
+        classpath 'de.mannodermaus.gradle.plugins:android-junit5:1.5.2.0'
     }
 }
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion projectSdkVersion.toInteger()
 
     defaultConfig {
         applicationId "io.homeassistant.companion.android"
-        minSdkVersion 21
+        minSdkVersion projectMinSdkVersion
         targetSdkVersion 29
         versionCode "${System.env.VERSION_CODE ?: 1}".toInteger()
         versionName "1.0.0"
@@ -49,6 +52,17 @@ android {
             signingConfig signingConfigs.release
         }
     }
+
+    testOptions {
+        unitTests.returnDefaultValues = true
+        junitPlatform {
+            filters {
+                engines {
+                    include 'spek2'
+                }
+            }
+        }
+    }
 }
 
 play {
@@ -56,13 +70,28 @@ play {
 }
 
 dependencies {
+    implementation project(':common')
+    implementation project(':domain')
+
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "androidx.appcompat:appcompat:1.1.0"
-    implementation "androidx.constraintlayout:constraintlayout:1.1.3"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
+
+    implementation "com.google.dagger:dagger:${daggerVersion}"
+    kapt "com.google.dagger:dagger-compiler:${daggerVersion}"
+
+    implementation "androidx.appcompat:appcompat:$appCompatVersion"
+    implementation "androidx.constraintlayout:constraintlayout:$constraintLayoutversion"
+
+    implementation("com.jakewharton.threetenabp:threetenabp:$threeTenAbpVersion") {
+        exclude group: 'org.threeten'
+    }
 
-    implementation "com.squareup.retrofit2:retrofit:2.6.2"
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.2.2'
-    implementation "com.squareup.retrofit2:converter-jackson:2.6.2"
+    testImplementation "org.spekframework.spek2:spek-dsl-jvm:$spek2Version"
+    testImplementation "org.spekframework.spek2:spek-runner-junit5:$spek2Version"
+    testImplementation "org.assertj:assertj-core:$assertJVersion"
+    testImplementation "io.mockk:mockk:$mockkVersion"
+    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion"
 }
 
 apply plugin: 'com.google.gms.google-services'
\ No newline at end of file
diff --git a/app/src/main/java/io/homeassistant/companion/android/HomeAssistantApplication.kt b/app/src/main/java/io/homeassistant/companion/android/HomeAssistantApplication.kt
index a5da9f0b797..256f3d80279 100644
--- a/app/src/main/java/io/homeassistant/companion/android/HomeAssistantApplication.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/HomeAssistantApplication.kt
@@ -1,14 +1,27 @@
 package io.homeassistant.companion.android
 
 import android.app.Application
-import io.homeassistant.companion.android.api.Session
+import com.jakewharton.threetenabp.AndroidThreeTen
+import io.homeassistant.companion.android.common.dagger.AppComponent
+import io.homeassistant.companion.android.common.dagger.Graph
+import io.homeassistant.companion.android.common.dagger.GraphComponentAccessor
 
-class HomeAssistantApplication : Application() {
+class HomeAssistantApplication : Application(), GraphComponentAccessor {
+
+    lateinit var graph: Graph
 
     override fun onCreate() {
         super.onCreate()
 
-        Session.init(this)
+        AndroidThreeTen.init(this)
+        graph = Graph(this)
+    }
+
+    override val appComponent: AppComponent
+        get() = graph.appComponent
+
+    override fun urlUpdated() {
+        graph.urlUpdated()
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/homeassistant/companion/android/PresenterComponent.kt b/app/src/main/java/io/homeassistant/companion/android/PresenterComponent.kt
new file mode 100644
index 00000000000..31cfe54f5cd
--- /dev/null
+++ b/app/src/main/java/io/homeassistant/companion/android/PresenterComponent.kt
@@ -0,0 +1,21 @@
+package io.homeassistant.companion.android
+
+import dagger.Component
+import io.homeassistant.companion.android.common.dagger.AppComponent
+import io.homeassistant.companion.android.launch.LaunchActivity
+import io.homeassistant.companion.android.onboarding.authentication.AuthenticationFragment
+import io.homeassistant.companion.android.onboarding.manual.ManualSetupFragment
+import io.homeassistant.companion.android.webview.WebViewActivity
+
+@Component(dependencies = [AppComponent::class], modules = [PresenterModule::class])
+interface PresenterComponent {
+
+    fun inject(activity: LaunchActivity)
+
+    fun inject(fragment: AuthenticationFragment)
+
+    fun inject(fragment: ManualSetupFragment)
+
+    fun inject(activity: WebViewActivity)
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/io/homeassistant/companion/android/PresenterModule.kt b/app/src/main/java/io/homeassistant/companion/android/PresenterModule.kt
new file mode 100644
index 00000000000..d59d95e6c3f
--- /dev/null
+++ b/app/src/main/java/io/homeassistant/companion/android/PresenterModule.kt
@@ -0,0 +1,72 @@
+package io.homeassistant.companion.android
+
+import dagger.Binds
+import dagger.Module
+import dagger.Provides
+import io.homeassistant.companion.android.launch.LaunchPresenter
+import io.homeassistant.companion.android.launch.LaunchPresenterImpl
+import io.homeassistant.companion.android.launch.LaunchView
+import io.homeassistant.companion.android.onboarding.authentication.AuthenticationPresenter
+import io.homeassistant.companion.android.onboarding.authentication.AuthenticationPresenterImpl
+import io.homeassistant.companion.android.onboarding.authentication.AuthenticationView
+import io.homeassistant.companion.android.onboarding.manual.ManualSetupPresenter
+import io.homeassistant.companion.android.onboarding.manual.ManualSetupPresenterImpl
+import io.homeassistant.companion.android.onboarding.manual.ManualSetupView
+import io.homeassistant.companion.android.webview.WebView
+import io.homeassistant.companion.android.webview.WebViewPresenter
+import io.homeassistant.companion.android.webview.WebViewPresenterImpl
+
+@Module(includes = [PresenterModule.Declaration::class])
+class PresenterModule {
+
+    private lateinit var launchView: LaunchView
+    private lateinit var authenticationView: AuthenticationView
+    private lateinit var manualSetupView: ManualSetupView
+    private lateinit var webView: WebView
+
+    constructor(launchView: LaunchView) {
+        this.launchView = launchView
+    }
+
+    constructor(authenticationView: AuthenticationView) {
+        this.authenticationView = authenticationView
+    }
+
+    constructor(manualSetupView: ManualSetupView) {
+        this.manualSetupView = manualSetupView
+    }
+
+    constructor(webView: WebView) {
+        this.webView = webView
+    }
+
+    @Provides
+    fun provideLaunchView() = launchView
+
+    @Provides
+    fun provideAuthenticationView() = authenticationView
+
+    @Provides
+    fun provideManualSetupView() = manualSetupView
+
+    @Provides
+    fun provideWebView() = webView
+
+    @Module
+    interface Declaration {
+
+        @Binds
+        fun bindLaunchPresenter(presenter: LaunchPresenterImpl): LaunchPresenter
+
+        @Binds
+        fun bindAuthenticationPresenterImpl(presenter: AuthenticationPresenterImpl): AuthenticationPresenter
+
+        @Binds
+        fun bindManualSetupPresenter(presenter: ManualSetupPresenterImpl): ManualSetupPresenter
+
+        @Binds
+        fun bindWebViewPresenterImpl(presenter: WebViewPresenterImpl): WebViewPresenter
+
+
+    }
+}
diff --git a/app/src/main/java/io/homeassistant/companion/android/api/HomeAssistantApi.kt b/app/src/main/java/io/homeassistant/companion/android/api/HomeAssistantApi.kt
deleted file mode 100644
index 24e5ae9b475..00000000000
--- a/app/src/main/java/io/homeassistant/companion/android/api/HomeAssistantApi.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package io.homeassistant.companion.android.api
-
-import io.homeassistant.companion.android.BuildConfig
-import okhttp3.OkHttpClient
-import okhttp3.logging.HttpLoggingInterceptor
-import retrofit2.Retrofit
-import retrofit2.converter.jackson.JacksonConverterFactory
-
-
-class HomeAssistantApi(url: String) {
-
-    private val retrofit = Retrofit.Builder()
-        .baseUrl(url)
-        .addConverterFactory(JacksonConverterFactory.create())
-        .client(
-            OkHttpClient.Builder()
-                .addInterceptor(HttpLoggingInterceptor().apply {
-                    level = if (BuildConfig.DEBUG) HttpLoggingInterceptor.Level.BODY else HttpLoggingInterceptor.Level.NONE
-                })
-                .build()
-        )
-        .build()
-
-    val authenticationService: AuthenticationService = retrofit.create(AuthenticationService::class.java)
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/io/homeassistant/companion/android/api/RefreshToken.kt b/app/src/main/java/io/homeassistant/companion/android/api/RefreshToken.kt
deleted file mode 100644
index 53b6ce7be92..00000000000
--- a/app/src/main/java/io/homeassistant/companion/android/api/RefreshToken.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.homeassistant.companion.android.api
-
-import com.fasterxml.jackson.annotation.JsonProperty
-
-
-data class RefreshToken(
-    @JsonProperty("access_token")
-    val accessToken: String,
-    @JsonProperty("expires_in")
-    val expiresIn: Int,
-    @JsonProperty("token_type")
-    val tokenType: String
-)
\ No newline at end of file
diff --git a/app/src/main/java/io/homeassistant/companion/android/api/Session.kt b/app/src/main/java/io/homeassistant/companion/android/api/Session.kt
deleted file mode 100644
index d6c9b3cd7e5..00000000000
--- a/app/src/main/java/io/homeassistant/companion/android/api/Session.kt
+++ /dev/null
@@ -1,86 +0,0 @@
-package io.homeassistant.companion.android.api
-
-import android.app.Application
-import android.content.Context
-import java.util.*
-
-
-class Session private constructor(application: Application) {
-
-    companion object {
-        private const val PREF_URL = "url"
-        private const val PREF_ACCESS_TOKEN = "access_token"
-        private const val PREF_EXPIRED_DATE = "expires_date"
-        private const val PREF_REFRESH_TOKEN = "refresh_token"
-        private const val PREF_TOKEN_TYPE = "token_type"
-
-        @Volatile
-        private var INSTANCE: Session? = null
-
-        fun init(application: Application) {
-            INSTANCE = Session(application)
-        }
-
-        fun getInstance(): Session = INSTANCE ?: throw IllegalStateException("You should init the singleton first")
-    }
-
-    private val sharedPreferences = application.getSharedPreferences("session", Context.MODE_PRIVATE)
-
-    var token: Token? = null
-        private set
-    var url: String? = null
-        private set
-
-    init {
-        if (sharedPreferences.contains(PREF_URL) &&
-            sharedPreferences.contains(PREF_ACCESS_TOKEN) && sharedPreferences.contains(PREF_EXPIRED_DATE) &&
-            sharedPreferences.contains(PREF_REFRESH_TOKEN) && sharedPreferences.contains(PREF_TOKEN_TYPE)
-        ) {
-            url = sharedPreferences.getString(PREF_URL, null)!!
-            token = Token(
-                sharedPreferences.getString(PREF_ACCESS_TOKEN, "")!!,
-                sharedPreferences.getLong(PREF_EXPIRED_DATE, 0),
-                sharedPreferences.getString(PREF_REFRESH_TOKEN, null)!!,
-                sharedPreferences.getString(PREF_TOKEN_TYPE, null)!!
-            )
-        }
-    }
-
-    fun registerSession(token: AuthorizationCode, url: String) {
-        this.token = Token(token.accessToken, expiresInToTimestamp(token.expiresIn), token.refreshToken, token.tokenType).apply {
-            saveSession(this)
-        }
-        this.url = url.apply {
-            saveUrl(this)
-        }
-    }
-
-    fun registerRefreshToken(refreshToken: RefreshToken, url: String) {
-        token = (token?.copy(
-            accessToken = refreshToken.accessToken,
-            expiresTimestamp = expiresInToTimestamp(refreshToken.expiresIn),
-            tokenType = refreshToken.tokenType
-        ) ?: throw IllegalStateException("Unable "))
-            .apply {
-                saveSession(this)
-                saveUrl(url)
-            }
-    }
-
-    private fun saveSession(token: Token) {
-        sharedPreferences.edit()
-            .putString(PREF_ACCESS_TOKEN, token.accessToken)
-            .putLong(PREF_EXPIRED_DATE, token.expiresTimestamp)
-            .putString(PREF_REFRESH_TOKEN, token.refreshToken)
-            .putString(PREF_TOKEN_TYPE, token.tokenType)
-            .apply()
-    }
-
-    private fun saveUrl(url: String) {
-        sharedPreferences.edit()
-            .putString(PREF_URL, url)
-            .apply()
-    }
-
-    private fun expiresInToTimestamp(expiresIn: Int) = Calendar.getInstance().timeInMillis / 1000 + expiresIn
-}
\ No newline at end of file
diff --git a/app/src/main/java/io/homeassistant/companion/android/api/Token.kt b/app/src/main/java/io/homeassistant/companion/android/api/Token.kt
deleted file mode 100644
index a5b95b9e02d..00000000000
--- a/app/src/main/java/io/homeassistant/companion/android/api/Token.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package io.homeassistant.companion.android.api
-
-import java.util.*
-
-
-data class Token(
-    val accessToken: String,
-    val expiresTimestamp: Long,
-    val refreshToken: String,
-    val tokenType: String
-) {
-    fun isExpired() = expiresIn() < 0
-
-    fun expiresIn() = expiresTimestamp - Calendar.getInstance().timeInMillis / 1000
-}
\ No newline at end of file
diff --git a/app/src/main/java/io/homeassistant/companion/android/launch/LaunchActivity.kt b/app/src/main/java/io/homeassistant/companion/android/launch/LaunchActivity.kt
index f5a9b1c3e66..b915bbb09c4 100644
--- a/app/src/main/java/io/homeassistant/companion/android/launch/LaunchActivity.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/launch/LaunchActivity.kt
@@ -2,21 +2,43 @@ package io.homeassistant.companion.android.launch
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import io.homeassistant.companion.android.api.Session
+import io.homeassistant.companion.android.DaggerPresenterComponent
+import io.homeassistant.companion.android.PresenterModule
+import io.homeassistant.companion.android.common.dagger.GraphComponentAccessor
 import io.homeassistant.companion.android.onboarding.OnboardingActivity
 import io.homeassistant.companion.android.webview.WebViewActivity
+import javax.inject.Inject
 
 
-class LaunchActivity : AppCompatActivity() {
+class LaunchActivity : AppCompatActivity(), LaunchView {
+
+    @Inject lateinit var presenter: LaunchPresenter
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        if (Session.getInstance().url.isNullOrBlank()) {
-            startActivity(OnboardingActivity.newInstance(this))
-        } else {
-            startActivity(WebViewActivity.newInstance(this))
-        }
+        DaggerPresenterComponent
+            .builder()
+            .appComponent((application as GraphComponentAccessor).appComponent)
+            .presenterModule(PresenterModule(this))
+            .build()
+            .inject(this)
+
+        presenter.onViewReady()
+    }
+
+    override fun displayWebview() {
+        startActivity(WebViewActivity.newInstance(this))
         finish()
     }
+
+    override fun displayOnBoarding() {
+        startActivity(OnboardingActivity.newInstance(this))
+        finish()
+    }
+
+    override fun onDestroy() {
+        presenter.onFinish()
+        super.onDestroy()
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/homeassistant/companion/android/launch/LaunchPresenter.kt b/app/src/main/java/io/homeassistant/companion/android/launch/LaunchPresenter.kt
new file mode 100644
index 00000000000..efea1aa866b
--- /dev/null
+++ b/app/src/main/java/io/homeassistant/companion/android/launch/LaunchPresenter.kt
@@ -0,0 +1,10 @@
+package io.homeassistant.companion.android.launch
+
+
+interface LaunchPresenter {
+
+    fun onViewReady()
+
+    fun onFinish()
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/io/homeassistant/companion/android/launch/LaunchPresenterImpl.kt b/app/src/main/java/io/homeassistant/companion/android/launch/LaunchPresenterImpl.kt
new file mode 100644
index 00000000000..02dd2a5021c
--- /dev/null
+++ b/app/src/main/java/io/homeassistant/companion/android/launch/LaunchPresenterImpl.kt
@@ -0,0 +1,29 @@
+package io.homeassistant.companion.android.launch
+
+import io.homeassistant.companion.android.domain.authentication.AuthenticationUseCase
+import io.homeassistant.companion.android.domain.authentication.SessionState
+import kotlinx.coroutines.*
+import javax.inject.Inject
+
+class LaunchPresenterImpl @Inject constructor(
+    private val view: LaunchView,
+    private val authenticationUseCase: AuthenticationUseCase
+) : LaunchPresenter {
+
+    private val mainScope: CoroutineScope = CoroutineScope(Dispatchers.Main + Job())
+
+    override fun onViewReady() {
+        mainScope.launch {
+            if (authenticationUseCase.getSessionState() == SessionState.CONNECTED) {
+                view.displayWebview()
+            } else {
+                view.displayOnBoarding()
+            }
+        }
+    }
+
+    override fun onFinish() {
+        mainScope.cancel()
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/io/homeassistant/companion/android/launch/LaunchView.kt b/app/src/main/java/io/homeassistant/companion/android/launch/LaunchView.kt
new file mode 100644
index 00000000000..b843966e6e4
--- /dev/null
+++ b/app/src/main/java/io/homeassistant/companion/android/launch/LaunchView.kt
@@ -0,0 +1,10 @@
+package io.homeassistant.companion.android.launch
+
+
+interface LaunchView {
+
+    fun displayWebview()
+
+    fun displayOnBoarding()
+
+}
diff --git a/app/src/main/java/io/homeassistant/companion/android/onboarding/ManualSetupFragment.kt b/app/src/main/java/io/homeassistant/companion/android/onboarding/ManualSetupFragment.kt
deleted file mode 100644
index 3469b20a48d..00000000000
--- a/app/src/main/java/io/homeassistant/companion/android/onboarding/ManualSetupFragment.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package io.homeassistant.companion.android.onboarding
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Button
-import android.widget.EditText
-import androidx.fragment.app.Fragment
-import io.homeassistant.companion.android.R
-
-
-class ManualSetupFragment : Fragment() {
-
-    companion object {
-        fun newInstance(): ManualSetupFragment {
-            return ManualSetupFragment()
-        }
-    }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_manual_setup, container, false).apply {
-            findViewById<Button>(R.id.ok).setOnClickListener {
-                (activity as ManualSetupListener).onSelectUrl(findViewById<EditText>(R.id.home_assistant_url).text.toString())
-            }
-        }
-    }
-
-}
diff --git a/app/src/main/java/io/homeassistant/companion/android/onboarding/ManualSetupListener.kt b/app/src/main/java/io/homeassistant/companion/android/onboarding/ManualSetupListener.kt
deleted file mode 100644
index 911adfc74cd..00000000000
--- a/app/src/main/java/io/homeassistant/companion/android/onboarding/ManualSetupListener.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.homeassistant.companion.android.onboarding
-
-
-interface ManualSetupListener {
-
-    fun onSelectUrl(url: String)
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/io/homeassistant/companion/android/onboarding/OnboardingActivity.kt b/app/src/main/java/io/homeassistant/companion/android/onboarding/OnboardingActivity.kt
index f844c378ff0..a0dd3e1962b 100644
--- a/app/src/main/java/io/homeassistant/companion/android/onboarding/OnboardingActivity.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/onboarding/OnboardingActivity.kt
@@ -7,6 +7,10 @@ import androidx.appcompat.app.AppCompatActivity
 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.onboarding.discovery.DiscoveryFragment
+import io.homeassistant.companion.android.onboarding.discovery.DiscoveryListener
+import io.homeassistant.companion.android.onboarding.manual.ManualSetupFragment
+import io.homeassistant.companion.android.onboarding.manual.ManualSetupListener
 import io.homeassistant.companion.android.webview.WebViewActivity
 
 
@@ -51,14 +55,14 @@ class OnboardingActivity : AppCompatActivity(), DiscoveryListener, ManualSetupLi
         throw NotImplementedError()
     }
 
-    override fun onSelectUrl(url: String) {
+    override fun onSelectUrl() {
         supportFragmentManager
             .beginTransaction()
-            .replace(R.id.content, AuthenticationFragment.newInstance(url))
+            .replace(R.id.content, AuthenticationFragment.newInstance())
             .commit()
     }
 
-    override fun onAuthenticationSuccess(url: String) {
+    override fun onAuthenticationSuccess() {
         startActivity(WebViewActivity.newInstance(this))
         finish()
     }
diff --git a/app/src/main/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationFragment.kt b/app/src/main/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationFragment.kt
index 4dda91c8fbd..8bf56e87433 100644
--- a/app/src/main/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationFragment.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationFragment.kt
@@ -7,32 +7,35 @@ import android.view.ViewGroup
 import android.webkit.WebView
 import android.webkit.WebViewClient
 import androidx.fragment.app.Fragment
+import io.homeassistant.companion.android.DaggerPresenterComponent
+import io.homeassistant.companion.android.PresenterModule
 import io.homeassistant.companion.android.R
+import io.homeassistant.companion.android.common.dagger.GraphComponentAccessor
+import javax.inject.Inject
 
 
 class AuthenticationFragment : Fragment(), AuthenticationView {
 
     companion object {
         private const val TAG = "AuthenticationFragment"
-        private const val EXTRA_URL = "extra_url"
 
-        fun newInstance(url: String): AuthenticationFragment {
-            return AuthenticationFragment().apply {
-                this.arguments = Bundle().apply {
-                    this.putString(EXTRA_URL, url)
-                }
-            }
+        fun newInstance(): AuthenticationFragment {
+            return AuthenticationFragment()
         }
     }
 
-    private lateinit var presenter: AuthenticationPresenter
+    @Inject lateinit var presenter: AuthenticationPresenter
     private lateinit var webView: WebView
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        presenter = AuthenticationPresenterImpl(this)
-        presenter.initialize(arguments?.getString(EXTRA_URL) ?: throw IllegalArgumentException("Url should not be null"))
+        DaggerPresenterComponent
+            .builder()
+            .appComponent((activity?.application as GraphComponentAccessor).appComponent)
+            .presenterModule(PresenterModule(this))
+            .build()
+            .inject(this)
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
@@ -61,8 +64,12 @@ class AuthenticationFragment : Fragment(), AuthenticationView {
         webView.loadUrl(url)
     }
 
-    override fun openWebview(url: String) {
-        (activity as AuthenticationListener).onAuthenticationSuccess(url)
+    override fun openWebview() {
+        (activity as AuthenticationListener).onAuthenticationSuccess()
     }
 
+    override fun onDestroy() {
+        presenter.onFinish()
+        super.onDestroy()
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationListener.kt b/app/src/main/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationListener.kt
index 4f09570dc3b..05595ee9b34 100644
--- a/app/src/main/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationListener.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationListener.kt
@@ -2,6 +2,6 @@ package io.homeassistant.companion.android.onboarding.authentication
 
 interface AuthenticationListener {
 
-    fun onAuthenticationSuccess(url: String)
+    fun onAuthenticationSuccess()
 
 }
diff --git a/app/src/main/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationPresenter.kt b/app/src/main/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationPresenter.kt
index ea64ce73e2f..a472da92295 100644
--- a/app/src/main/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationPresenter.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationPresenter.kt
@@ -3,10 +3,10 @@ package io.homeassistant.companion.android.onboarding.authentication
 
 interface AuthenticationPresenter {
 
-    fun initialize(url: String)
-
     fun onViewReady()
 
     fun onRedirectUrl(redirectUrl: String): Boolean
 
+    fun onFinish()
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationPresenterImpl.kt b/app/src/main/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationPresenterImpl.kt
index a5778c357ba..dfc83a65ddc 100644
--- a/app/src/main/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationPresenterImpl.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationPresenterImpl.kt
@@ -2,67 +2,48 @@ package io.homeassistant.companion.android.onboarding.authentication
 
 import android.net.Uri
 import android.util.Log
-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
+import io.homeassistant.companion.android.domain.authentication.AuthenticationUseCase
+import kotlinx.coroutines.*
+import javax.inject.Inject
 
 
-class AuthenticationPresenterImpl(private val view: AuthenticationView) : AuthenticationPresenter {
+class AuthenticationPresenterImpl @Inject constructor(
+    private val view: AuthenticationView,
+    private val authenticationUseCase: AuthenticationUseCase
+) : AuthenticationPresenter {
 
     companion object {
         private const val TAG = "AuthenticationPresenter"
         private const val AUTH_CALLBACK = "homeassistant://auth-callback"
     }
 
-    private lateinit var url: String
-
-    override fun initialize(url: String) {
-        this.url = url
-    }
+    private val mainScope: CoroutineScope = CoroutineScope(Dispatchers.Main + Job())
 
     override fun onViewReady() {
-        view.loadUrl(
-            Uri.parse(url)
-                .buildUpon()
-                .appendPath("auth")
-                .appendPath("authorize")
-                .appendQueryParameter("response_type", "code")
-                .appendQueryParameter("client_id", AuthenticationService.CLIENT_ID)
-                .appendQueryParameter("redirect_uri", AUTH_CALLBACK)
-                .build()
-                .toString()
-        )
+        mainScope.launch {
+            view.loadUrl(authenticationUseCase.buildAuthenticationUrl(AUTH_CALLBACK).toString())
+        }
     }
 
     override fun onRedirectUrl(redirectUrl: String): Boolean {
-        val callbackUrl = Uri.parse(redirectUrl)
-        val code = callbackUrl.getQueryParameter("code")
-        if (callbackUrl.toString().contains(AUTH_CALLBACK) && code != null) {
-            HomeAssistantApi(url)
-                .authenticationService
-                .getToken("authorization_code", code, AuthenticationService.CLIENT_ID)
-                .enqueue(object : retrofit2.Callback<AuthorizationCode> {
-                    override fun onFailure(call: Call<AuthorizationCode>, t: Throwable) {
-                        Log.e(TAG, "authorization code error", t)
-                    }
-
-                    override fun onResponse(call: Call<AuthorizationCode>, response: Response<AuthorizationCode>) {
-                        val body = response.body()
-                        if (response.isSuccessful && body != null) {
-                            Session.getInstance().registerSession(body, url)
-                            view.openWebview(url)
-                        } else {
-                            Log.e(TAG, "authorization code error ${response.errorBody()?.string()}")
-                        }
-                    }
-                })
-            return true
+        val code = Uri.parse(redirectUrl).getQueryParameter("code")
+        return if (redirectUrl.contains(AUTH_CALLBACK) && !code.isNullOrBlank()) {
+            mainScope.launch {
+                try {
+                    authenticationUseCase.registerAuthorizationCode(code)
+                } catch (e: Exception) {
+                    Log.e(TAG, "unable to register code")
+                }
+                view.openWebview()
+            }
+            true
         } else {
-            return false
+            false
         }
     }
 
+    override fun onFinish() {
+        mainScope.cancel()
+    }
+
 }
diff --git a/app/src/main/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationView.kt b/app/src/main/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationView.kt
index c81edf79f38..c5a86b420c9 100644
--- a/app/src/main/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationView.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationView.kt
@@ -5,6 +5,6 @@ interface AuthenticationView {
 
     fun loadUrl(url: String)
 
-    fun openWebview(url: String)
+    fun openWebview()
 
 }
diff --git a/app/src/main/java/io/homeassistant/companion/android/onboarding/DiscoveryFragment.kt b/app/src/main/java/io/homeassistant/companion/android/onboarding/discovery/DiscoveryFragment.kt
similarity index 95%
rename from app/src/main/java/io/homeassistant/companion/android/onboarding/DiscoveryFragment.kt
rename to app/src/main/java/io/homeassistant/companion/android/onboarding/discovery/DiscoveryFragment.kt
index 9fe39900d80..47bfd40a9ae 100644
--- a/app/src/main/java/io/homeassistant/companion/android/onboarding/DiscoveryFragment.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/onboarding/discovery/DiscoveryFragment.kt
@@ -1,4 +1,4 @@
-package io.homeassistant.companion.android.onboarding
+package io.homeassistant.companion.android.onboarding.discovery
 
 import android.os.Bundle
 import android.os.Handler
diff --git a/app/src/main/java/io/homeassistant/companion/android/onboarding/DiscoveryListener.kt b/app/src/main/java/io/homeassistant/companion/android/onboarding/discovery/DiscoveryListener.kt
similarity index 60%
rename from app/src/main/java/io/homeassistant/companion/android/onboarding/DiscoveryListener.kt
rename to app/src/main/java/io/homeassistant/companion/android/onboarding/discovery/DiscoveryListener.kt
index a3d0cd36c95..5c739698b69 100644
--- a/app/src/main/java/io/homeassistant/companion/android/onboarding/DiscoveryListener.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/onboarding/discovery/DiscoveryListener.kt
@@ -1,4 +1,4 @@
-package io.homeassistant.companion.android.onboarding
+package io.homeassistant.companion.android.onboarding.discovery
 
 interface DiscoveryListener {
 
diff --git a/app/src/main/java/io/homeassistant/companion/android/onboarding/manual/ManualSetupFragment.kt b/app/src/main/java/io/homeassistant/companion/android/onboarding/manual/ManualSetupFragment.kt
new file mode 100644
index 00000000000..a6d62ac5ca7
--- /dev/null
+++ b/app/src/main/java/io/homeassistant/companion/android/onboarding/manual/ManualSetupFragment.kt
@@ -0,0 +1,56 @@
+package io.homeassistant.companion.android.onboarding.manual
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.EditText
+import androidx.fragment.app.Fragment
+import io.homeassistant.companion.android.DaggerPresenterComponent
+import io.homeassistant.companion.android.PresenterModule
+import io.homeassistant.companion.android.R
+import io.homeassistant.companion.android.common.dagger.GraphComponentAccessor
+import javax.inject.Inject
+
+
+class ManualSetupFragment : Fragment(), ManualSetupView {
+
+    companion object {
+        fun newInstance(): ManualSetupFragment {
+            return ManualSetupFragment()
+        }
+    }
+
+    @Inject lateinit var presenter: ManualSetupPresenter
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        DaggerPresenterComponent
+            .builder()
+            .appComponent((activity?.application as GraphComponentAccessor).appComponent)
+            .presenterModule(PresenterModule(this))
+            .build()
+            .inject(this)
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_manual_setup, container, false).apply {
+            findViewById<Button>(R.id.ok).setOnClickListener {
+                presenter.onClickOk(findViewById<EditText>(R.id.home_assistant_url).text.toString())
+            }
+        }
+    }
+
+    override fun urlSaved() {
+        (activity?.application as GraphComponentAccessor).urlUpdated()
+        (activity as ManualSetupListener).onSelectUrl()
+    }
+
+    override fun onDestroy() {
+        presenter.onFinish()
+        super.onDestroy()
+    }
+
+}
diff --git a/app/src/main/java/io/homeassistant/companion/android/onboarding/manual/ManualSetupListener.kt b/app/src/main/java/io/homeassistant/companion/android/onboarding/manual/ManualSetupListener.kt
new file mode 100644
index 00000000000..330ba90c1ac
--- /dev/null
+++ b/app/src/main/java/io/homeassistant/companion/android/onboarding/manual/ManualSetupListener.kt
@@ -0,0 +1,8 @@
+package io.homeassistant.companion.android.onboarding.manual
+
+
+interface ManualSetupListener {
+
+    fun onSelectUrl()
+
+}
diff --git a/app/src/main/java/io/homeassistant/companion/android/onboarding/manual/ManualSetupPresenter.kt b/app/src/main/java/io/homeassistant/companion/android/onboarding/manual/ManualSetupPresenter.kt
new file mode 100644
index 00000000000..b02d523f7e6
--- /dev/null
+++ b/app/src/main/java/io/homeassistant/companion/android/onboarding/manual/ManualSetupPresenter.kt
@@ -0,0 +1,10 @@
+package io.homeassistant.companion.android.onboarding.manual
+
+
+interface ManualSetupPresenter {
+
+    fun onClickOk(urlString: String)
+
+    fun onFinish()
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/io/homeassistant/companion/android/onboarding/manual/ManualSetupPresenterImpl.kt b/app/src/main/java/io/homeassistant/companion/android/onboarding/manual/ManualSetupPresenterImpl.kt
new file mode 100644
index 00000000000..9c2ff1a02f0
--- /dev/null
+++ b/app/src/main/java/io/homeassistant/companion/android/onboarding/manual/ManualSetupPresenterImpl.kt
@@ -0,0 +1,40 @@
+package io.homeassistant.companion.android.onboarding.manual
+
+import android.util.Log
+import io.homeassistant.companion.android.domain.authentication.AuthenticationUseCase
+import kotlinx.coroutines.*
+import java.net.MalformedURLException
+import java.net.URL
+import javax.inject.Inject
+
+class ManualSetupPresenterImpl @Inject constructor(
+    private val view: ManualSetupView,
+    private val authenticationUseCase: AuthenticationUseCase
+) : ManualSetupPresenter {
+
+    companion object {
+        private const val TAG = "ManualSetupPresenter"
+    }
+
+    private val mainScope: CoroutineScope = CoroutineScope(Dispatchers.Main + Job())
+
+    override fun onClickOk(urlString: String) {
+        val url: URL
+        try {
+            url = URL(urlString)
+        } catch (e: MalformedURLException) {
+            Log.e(TAG, "Unable to parse url", e)
+            return
+        }
+
+        mainScope.launch {
+            authenticationUseCase.saveUrl(url)
+            view.urlSaved()
+        }
+    }
+
+    override fun onFinish() {
+        mainScope.cancel()
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/io/homeassistant/companion/android/onboarding/manual/ManualSetupView.kt b/app/src/main/java/io/homeassistant/companion/android/onboarding/manual/ManualSetupView.kt
new file mode 100644
index 00000000000..33726dad4b6
--- /dev/null
+++ b/app/src/main/java/io/homeassistant/companion/android/onboarding/manual/ManualSetupView.kt
@@ -0,0 +1,7 @@
+package io.homeassistant.companion.android.onboarding.manual
+
+interface ManualSetupView {
+
+    fun urlSaved()
+
+}
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
index e9729444260..953691058f3 100644
--- a/app/src/main/java/io/homeassistant/companion/android/webview/WebView.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/webview/WebView.kt
@@ -1,12 +1,10 @@
 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)
+    fun setExternalAuth(callback: String, externalAuth: String)
 
 }
diff --git a/app/src/main/java/io/homeassistant/companion/android/webview/WebViewActivity.kt b/app/src/main/java/io/homeassistant/companion/android/webview/WebViewActivity.kt
index 003950b9944..baf3eb2a439 100644
--- a/app/src/main/java/io/homeassistant/companion/android/webview/WebViewActivity.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/webview/WebViewActivity.kt
@@ -2,19 +2,20 @@ package io.homeassistant.companion.android.webview
 
 import android.content.Context
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.util.Log
 import android.webkit.JavascriptInterface
 import android.webkit.WebView
 import android.webkit.WebViewClient
 import androidx.appcompat.app.AppCompatActivity
-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.DaggerPresenterComponent
+import io.homeassistant.companion.android.PresenterModule
 import io.homeassistant.companion.android.R
+import io.homeassistant.companion.android.common.dagger.GraphComponentAccessor
+import io.homeassistant.companion.android.settings.SettingsActivity
 import org.json.JSONObject
+import javax.inject.Inject
 
 
 class WebViewActivity : AppCompatActivity(), io.homeassistant.companion.android.webview.WebView {
@@ -27,14 +28,19 @@ class WebViewActivity : AppCompatActivity(), io.homeassistant.companion.android.
         }
     }
 
+    @Inject lateinit var presenter: WebViewPresenter
     private lateinit var webView: WebView
-    private lateinit var presenter: WebViewPresenter
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_webview)
 
-        presenter = WebViewPresenterImpl(this)
+        DaggerPresenterComponent
+            .builder()
+            .appComponent((application as GraphComponentAccessor).appComponent)
+            .presenterModule(PresenterModule(this))
+            .build()
+            .inject(this)
 
         if (BuildConfig.DEBUG) {
             WebView.setWebContentsDebuggingEnabled(true)
@@ -91,29 +97,18 @@ class WebViewActivity : AppCompatActivity(), io.homeassistant.companion.android.
         }
     }
 
-    override fun setToken(callback: String, token: Token) {
+    override fun loadUrl(url: String) {
+        webView.loadUrl(url)
+    }
+
+    override fun setExternalAuth(callback: String, externalAuth: String) {
         webView.post {
-            webView.evaluateJavascript(
-                "$callback(" +
-                        "true," +
-                        "${JSONObject(
-                            mapOf(
-                                "access_token" to token.accessToken,
-                                "expires_in" to token.expiresIn()
-                            )
-                        )}" +
-                        ");"
-                , null
-            )
+            webView.evaluateJavascript("$callback(true, $externalAuth);", null)
         }
     }
 
-    override fun loadUrl(url: String) {
-        webView.loadUrl(
-            Uri.parse(Session.getInstance().url ?: throw IllegalArgumentException("url should not be null"))
-                .buildUpon()
-                .appendQueryParameter("external_auth", "1")
-                .toString()
-        )
+    override fun onDestroy() {
+        presenter.onFinish()
+        super.onDestroy()
     }
 }
diff --git a/app/src/main/java/io/homeassistant/companion/android/webview/WebViewPresenter.kt b/app/src/main/java/io/homeassistant/companion/android/webview/WebViewPresenter.kt
index 4ce3fe505aa..c8857fb424f 100644
--- a/app/src/main/java/io/homeassistant/companion/android/webview/WebViewPresenter.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/webview/WebViewPresenter.kt
@@ -7,4 +7,6 @@ interface WebViewPresenter {
 
     fun onGetExternalAuth(callback: String)
 
+    fun onFinish()
+
 }
diff --git a/app/src/main/java/io/homeassistant/companion/android/webview/WebViewPresenterImpl.kt b/app/src/main/java/io/homeassistant/companion/android/webview/WebViewPresenterImpl.kt
index 131af7517d7..361b207b342 100644
--- a/app/src/main/java/io/homeassistant/companion/android/webview/WebViewPresenterImpl.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/webview/WebViewPresenterImpl.kt
@@ -1,55 +1,44 @@
 package io.homeassistant.companion.android.webview
 
-import android.util.Log
-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
+import android.net.Uri
+import io.homeassistant.companion.android.domain.authentication.AuthenticationUseCase
+import kotlinx.coroutines.*
+import javax.inject.Inject
 
 
-class WebViewPresenterImpl(private val view: WebView) : WebViewPresenter {
+class WebViewPresenterImpl @Inject constructor(
+    private val view: WebView,
+    private val authenticationUseCase: AuthenticationUseCase
+) : WebViewPresenter {
 
     companion object {
         private const val TAG = "WebViewPresenterImpl"
     }
 
-    private lateinit var url: String
+    private val mainScope: CoroutineScope = CoroutineScope(Dispatchers.Main + Job())
 
     override fun onViewReady() {
-        url = Session.getInstance().url ?: throw IllegalStateException("Unable to display the webview if we do not have url")
-        view.loadUrl(url)
+        mainScope.launch {
+            val url = authenticationUseCase.getUrl() ?: throw IllegalStateException("Unable to display the webview if we do not have url")
+
+            view.loadUrl(
+                Uri.parse(url.toString())
+                    .buildUpon()
+                    .appendQueryParameter("external_auth", "1")
+                    .build()
+                    .toString()
+            )
+        }
     }
 
-
     override fun onGetExternalAuth(callback: String) {
-        val token = Session.getInstance().token ?: throw IllegalStateException("Unable to display the webview if we do not have token")
-        if (token.isExpired()) {
-            val response: Response<RefreshToken>
-            try {
-                response = HomeAssistantApi(url)
-                    .authenticationService
-                    .refreshToken("refresh_token", token.refreshToken, AuthenticationService.CLIENT_ID)
-                    .execute()
-            } catch (e: IOException) {
-                Log.e(TAG, "refresh token error", e)
-                return
-            } catch (e: RuntimeException) {
-                Log.e(TAG, "refresh token error", e)
-                return
-            }
-
-            val body = response.body()
-            if (response.isSuccessful && body != null) {
-                Session.getInstance().registerRefreshToken(body, url)
-                view.setToken(callback, Session.getInstance().token!!)
-            } else {
-                Log.e(TAG, "refresh token error ${response.errorBody()?.string()}")
-            }
-        } else {
-            view.setToken(callback, token)
+        mainScope.launch {
+            view.setExternalAuth(callback, authenticationUseCase.retrieveExternalAuthentication())
         }
     }
 
+    override fun onFinish() {
+        mainScope.cancel()
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/test/java/io/homeassistant/companion/android/launch/LaunchPresenterImplSpec.kt b/app/src/test/java/io/homeassistant/companion/android/launch/LaunchPresenterImplSpec.kt
new file mode 100644
index 00000000000..5231f29f652
--- /dev/null
+++ b/app/src/test/java/io/homeassistant/companion/android/launch/LaunchPresenterImplSpec.kt
@@ -0,0 +1,61 @@
+package io.homeassistant.companion.android.launch
+
+import io.homeassistant.companion.android.domain.authentication.AuthenticationUseCase
+import io.homeassistant.companion.android.domain.authentication.SessionState
+import io.mockk.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.newSingleThreadContext
+import kotlinx.coroutines.test.resetMain
+import kotlinx.coroutines.test.setMain
+import org.spekframework.spek2.Spek
+import org.spekframework.spek2.style.specification.describe
+
+
+object LaunchPresenterImplSpec : Spek({
+
+    beforeEachTest {
+        Dispatchers.setMain(Dispatchers.Unconfined)
+    }
+
+    afterEachTest {
+        Dispatchers.resetMain()
+    }
+
+    describe("launch presenter") {
+        val authenticationUseCase by memoized { mockk<AuthenticationUseCase>() }
+        val view by memoized { mockk<LaunchView>(relaxUnitFun = true) }
+        val presenter by memoized { LaunchPresenterImpl(view, authenticationUseCase) }
+
+        describe("anonymous state") {
+            beforeEachTest {
+                coEvery { authenticationUseCase.getSessionState() } returns SessionState.ANONYMOUS
+            }
+
+            describe("on view ready") {
+                beforeEachTest {
+                    presenter.onViewReady()
+                }
+
+                it("should display the onboarding") {
+                    verify { view.displayOnBoarding() }
+                }
+            }
+        }
+
+        describe("connected state") {
+            beforeEachTest {
+                coEvery { authenticationUseCase.getSessionState() } returns SessionState.CONNECTED
+            }
+
+            describe("on view ready") {
+                beforeEachTest {
+                    presenter.onViewReady()
+                }
+
+                it("should display the webview") {
+                    verify { view.displayWebview() }
+                }
+            }
+        }
+    }
+})
\ No newline at end of file
diff --git a/app/src/test/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationPresenterImplSpec.kt b/app/src/test/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationPresenterImplSpec.kt
new file mode 100644
index 00000000000..8a4426c897b
--- /dev/null
+++ b/app/src/test/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationPresenterImplSpec.kt
@@ -0,0 +1,78 @@
+package io.homeassistant.companion.android.onboarding.authentication
+
+import android.net.Uri
+import io.homeassistant.companion.android.domain.authentication.AuthenticationUseCase
+import io.mockk.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.newSingleThreadContext
+import kotlinx.coroutines.test.resetMain
+import kotlinx.coroutines.test.setMain
+import org.assertj.core.api.Assertions.assertThat
+import org.spekframework.spek2.Spek
+import org.spekframework.spek2.style.specification.describe
+import java.net.URL
+
+
+object AuthenticationPresenterImplSpec : Spek({
+
+    beforeEachTest {
+        Dispatchers.setMain(Dispatchers.Unconfined)
+    }
+
+    afterEachTest {
+        Dispatchers.resetMain()
+    }
+
+    describe("authentication presenter") {
+        val authenticationUseCase by memoized { mockk<AuthenticationUseCase>(relaxUnitFun = true) }
+        val view by memoized { mockk<AuthenticationView>(relaxUnitFun = true) }
+        val presenter by memoized { AuthenticationPresenterImpl(view, authenticationUseCase) }
+
+        describe("on view ready") {
+            beforeEachTest {
+                coEvery {
+                    authenticationUseCase.buildAuthenticationUrl("homeassistant://auth-callback")
+                } returns URL("https://demo.home-assistant.io/auth/authorize?response_type=code&client_id=https://home-assistant.io/android&redirect_uri=homeassistant://auth-callback")
+                presenter.onViewReady()
+            }
+
+            it("should load auth url") {
+                verify { view.loadUrl("https://demo.home-assistant.io/auth/authorize?response_type=code&client_id=https://home-assistant.io/android&redirect_uri=homeassistant://auth-callback") }
+            }
+        }
+
+        describe("on redirect url with callback url") {
+            var allowRedirect: Boolean? = null
+            beforeEachTest {
+                mockkStatic(Uri::class)
+                every { Uri.parse("homeassistant://auth-callback?code=123456") } returns mockk {
+                    every { getQueryParameter("code") } returns "123456"
+                }
+                allowRedirect = presenter.onRedirectUrl("homeassistant://auth-callback?code=123456")
+            }
+
+            it("should open the webview") {
+                coVerify { authenticationUseCase.registerAuthorizationCode("123456") }
+                verify { view.openWebview() }
+                assertThat(allowRedirect).isTrue()
+            }
+        }
+
+        describe("on redirect wrong url") {
+            var allowRedirect: Boolean? = null
+            beforeEachTest {
+                mockkStatic(Uri::class)
+                every { Uri.parse("homeassistant://auth-callback") } returns mockk {
+                    every { getQueryParameter("code") } returns null
+                }
+                allowRedirect = presenter.onRedirectUrl("homeassistant://auth-callback")
+            }
+
+            it("should not open the webview") {
+                coVerify { authenticationUseCase wasNot Called }
+                verify { view wasNot Called }
+                assertThat(allowRedirect).isFalse()
+            }
+        }
+    }
+})
\ No newline at end of file
diff --git a/app/src/test/java/io/homeassistant/companion/android/onboarding/manual/ManualSetupPresenterImplSpec.kt b/app/src/test/java/io/homeassistant/companion/android/onboarding/manual/ManualSetupPresenterImplSpec.kt
new file mode 100644
index 00000000000..dbb7cf7cc67
--- /dev/null
+++ b/app/src/test/java/io/homeassistant/companion/android/onboarding/manual/ManualSetupPresenterImplSpec.kt
@@ -0,0 +1,61 @@
+package io.homeassistant.companion.android.onboarding.manual
+
+import io.homeassistant.companion.android.domain.authentication.AuthenticationUseCase
+import io.mockk.Called
+import io.mockk.coVerifyAll
+import io.mockk.mockk
+import io.mockk.verify
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.newSingleThreadContext
+import kotlinx.coroutines.test.resetMain
+import kotlinx.coroutines.test.setMain
+import org.spekframework.spek2.Spek
+import org.spekframework.spek2.style.specification.describe
+import java.net.URL
+
+
+object ManualSetupPresenterImplSpec : Spek({
+
+    beforeEachTest {
+        Dispatchers.setMain(Dispatchers.Unconfined)
+    }
+
+    afterEachTest {
+        Dispatchers.resetMain()
+    }
+
+    describe("presenter") {
+        val authenticationUseCase by memoized { mockk<AuthenticationUseCase>(relaxUnitFun = true) }
+        val view by memoized { mockk<ManualSetupView>(relaxUnitFun = true) }
+        val presenter by memoized { ManualSetupPresenterImpl(view, authenticationUseCase) }
+
+        describe("on click ok with valid url") {
+            beforeEachTest {
+                presenter.onClickOk("https://demo.home-assistant.io/")
+            }
+
+            it("should save the url") {
+                coVerifyAll { authenticationUseCase.saveUrl(URL("https://demo.home-assistant.io/")) }
+            }
+
+            it("should notify the listener") {
+                verify { view.urlSaved() }
+            }
+        }
+
+        describe("on click with invalid url") {
+            beforeEachTest {
+                presenter.onClickOk("home assistant")
+            }
+
+            it("should not save the url") {
+                coVerifyAll { authenticationUseCase wasNot Called }
+            }
+
+            it("should notify the listener") {
+                verify { view wasNot Called }
+            }
+        }
+    }
+
+})
\ No newline at end of file
diff --git a/app/src/test/java/io/homeassistant/companion/android/webview/WebViewPresenterImplSpec.kt b/app/src/test/java/io/homeassistant/companion/android/webview/WebViewPresenterImplSpec.kt
new file mode 100644
index 00000000000..8ccd7ce6046
--- /dev/null
+++ b/app/src/test/java/io/homeassistant/companion/android/webview/WebViewPresenterImplSpec.kt
@@ -0,0 +1,57 @@
+package io.homeassistant.companion.android.webview
+
+import android.net.Uri
+import io.homeassistant.companion.android.domain.authentication.AuthenticationUseCase
+import io.mockk.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.newSingleThreadContext
+import kotlinx.coroutines.test.resetMain
+import kotlinx.coroutines.test.setMain
+import org.spekframework.spek2.Spek
+import org.spekframework.spek2.style.specification.describe
+import java.net.URL
+
+
+object WebViewPresenterImplSpec : Spek({
+
+    beforeEachTest {
+        Dispatchers.setMain(Dispatchers.Unconfined)
+    }
+
+    afterEachTest {
+        Dispatchers.resetMain()
+    }
+
+    describe("presenter") {
+        val authenticationUseCase by memoized { mockk<AuthenticationUseCase>(relaxUnitFun = true) }
+        val view by memoized { mockk<WebView>(relaxUnitFun = true) }
+        val presenter by memoized { WebViewPresenterImpl(view, authenticationUseCase) }
+
+        describe("on view ready empty query ") {
+            beforeEachTest {
+                coEvery { authenticationUseCase.getUrl() } returns URL("https://demo.home-assistant.io/")
+                mockkStatic(Uri::class)
+                every { Uri.parse("https://demo.home-assistant.io/") } returns mockk {
+                    every { buildUpon().appendQueryParameter("external_auth", "1").build().toString() } returns "https://demo.home-assistant.io?external_auth=1"
+                }
+
+                presenter.onViewReady()
+            }
+
+            it("should load the url") {
+                verify { view.loadUrl("https://demo.home-assistant.io?external_auth=1") }
+            }
+        }
+
+        describe("on get external auth") {
+            beforeEachTest {
+                coEvery { authenticationUseCase.retrieveExternalAuthentication() } returns "{\"access_token\":\"ABCDEFGH\",\"expires_in\":1800}"
+                presenter.onGetExternalAuth("externalAuthSetToken")
+            }
+
+            it("should set external auth") {
+                verify { view.setExternalAuth("externalAuthSetToken", "{\"access_token\":\"ABCDEFGH\",\"expires_in\":1800}") }
+            }
+        }
+    }
+})
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 8f9f6582723..fd0b160ca89 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,3 +1,5 @@
+apply from: "gradle/dependencies.gradle"
+
 buildscript {
     ext.kotlin_version = '1.3.50'
     repositories {
diff --git a/common/.gitignore b/common/.gitignore
new file mode 100644
index 00000000000..796b96d1c40
--- /dev/null
+++ b/common/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/common/build.gradle b/common/build.gradle
new file mode 100644
index 00000000000..8c94b87e00e
--- /dev/null
+++ b/common/build.gradle
@@ -0,0 +1,25 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
+
+android {
+    compileSdkVersion projectSdkVersion.toInteger()
+
+    defaultConfig {
+        minSdkVersion projectMinSdkVersion
+    }
+
+}
+
+dependencies {
+    implementation project(':domain')
+    implementation project(':data')
+
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
+
+    implementation "com.google.dagger:dagger:${daggerVersion}"
+    kapt "com.google.dagger:dagger-compiler:${daggerVersion}"
+
+    implementation "com.squareup.retrofit2:retrofit:$retrofit2Version"
+}
diff --git a/common/src/main/AndroidManifest.xml b/common/src/main/AndroidManifest.xml
new file mode 100644
index 00000000000..76a7feabbfd
--- /dev/null
+++ b/common/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="io.homeassistant.companion.android.common" />
\ No newline at end of file
diff --git a/common/src/main/java/io/homeassistant/companion/android/common/LocalStorageImpl.kt b/common/src/main/java/io/homeassistant/companion/android/common/LocalStorageImpl.kt
new file mode 100644
index 00000000000..ebcdbb79210
--- /dev/null
+++ b/common/src/main/java/io/homeassistant/companion/android/common/LocalStorageImpl.kt
@@ -0,0 +1,32 @@
+package io.homeassistant.companion.android.common
+
+import android.content.SharedPreferences
+import io.homeassistant.companion.android.data.LocalStorage
+
+class LocalStorageImpl(private val sharedPreferences: SharedPreferences) : LocalStorage {
+
+    override suspend fun putString(key: String, value: String?) {
+        sharedPreferences.edit().putString(key, value).apply()
+    }
+
+    override suspend fun getString(key: String): String? {
+        return sharedPreferences.getString(key, null)
+    }
+
+    override suspend fun putLong(key: String, value: Long?) {
+        if (value == null) {
+            sharedPreferences.edit().remove(key).apply()
+        } else {
+            sharedPreferences.edit().putLong(key, value).apply()
+        }
+    }
+
+    override suspend fun getLong(key: String): Long? {
+        return if (sharedPreferences.contains(key)) {
+            sharedPreferences.getLong(key, 0)
+        } else {
+            null
+        }
+    }
+
+}
diff --git a/common/src/main/java/io/homeassistant/companion/android/common/dagger/AppComponent.kt b/common/src/main/java/io/homeassistant/companion/android/common/dagger/AppComponent.kt
new file mode 100644
index 00000000000..6bdf81cbe44
--- /dev/null
+++ b/common/src/main/java/io/homeassistant/companion/android/common/dagger/AppComponent.kt
@@ -0,0 +1,11 @@
+package io.homeassistant.companion.android.common.dagger
+
+import dagger.Component
+import io.homeassistant.companion.android.domain.authentication.AuthenticationUseCase
+
+@Component(dependencies = [DomainComponent::class])
+interface AppComponent {
+
+    fun authenticationUseCase(): AuthenticationUseCase
+
+}
\ No newline at end of file
diff --git a/common/src/main/java/io/homeassistant/companion/android/common/dagger/DataComponent.kt b/common/src/main/java/io/homeassistant/companion/android/common/dagger/DataComponent.kt
new file mode 100644
index 00000000000..6d4d79b291b
--- /dev/null
+++ b/common/src/main/java/io/homeassistant/companion/android/common/dagger/DataComponent.kt
@@ -0,0 +1,11 @@
+package io.homeassistant.companion.android.common.dagger
+
+import dagger.Component
+import io.homeassistant.companion.android.domain.authentication.AuthenticationRepository
+
+@Component(modules = [DataModule::class])
+interface DataComponent {
+
+    fun authenticationRepository(): AuthenticationRepository
+
+}
\ No newline at end of file
diff --git a/common/src/main/java/io/homeassistant/companion/android/common/dagger/DataModule.kt b/common/src/main/java/io/homeassistant/companion/android/common/dagger/DataModule.kt
new file mode 100644
index 00000000000..d29f0616bbe
--- /dev/null
+++ b/common/src/main/java/io/homeassistant/companion/android/common/dagger/DataModule.kt
@@ -0,0 +1,36 @@
+package io.homeassistant.companion.android.common.dagger
+
+import dagger.Binds
+import dagger.Module
+import dagger.Provides
+import io.homeassistant.companion.android.data.HomeAssistantRetrofit
+import io.homeassistant.companion.android.data.LocalStorage
+import io.homeassistant.companion.android.data.authentication.AuthenticationRepositoryImpl
+import io.homeassistant.companion.android.data.authentication.AuthenticationService
+import io.homeassistant.companion.android.domain.authentication.AuthenticationRepository
+
+@Module(includes = [DataModule.Declaration::class])
+class DataModule(
+    private val url: String,
+    private val localStorage: LocalStorage
+) {
+
+    @Provides
+    fun provideEndPoint() = url
+
+    @Provides
+    fun provideAuthenticationService(homeAssistantRetrofit: HomeAssistantRetrofit) = homeAssistantRetrofit.retrofit.create(AuthenticationService::class.java)
+
+    @Provides
+    fun provideLocalStorage() = localStorage
+
+
+    @Module
+    interface Declaration {
+
+        @Binds
+        fun bindAuthenticationRepositoryImpl(repository: AuthenticationRepositoryImpl): AuthenticationRepository
+
+    }
+
+}
diff --git a/common/src/main/java/io/homeassistant/companion/android/common/dagger/DataScope.kt b/common/src/main/java/io/homeassistant/companion/android/common/dagger/DataScope.kt
new file mode 100644
index 00000000000..2f719af2bf7
--- /dev/null
+++ b/common/src/main/java/io/homeassistant/companion/android/common/dagger/DataScope.kt
@@ -0,0 +1,7 @@
+package io.homeassistant.companion.android.common.dagger
+
+import javax.inject.Scope
+
+@Scope
+@Retention(AnnotationRetention.RUNTIME)
+annotation class DataScope
diff --git a/common/src/main/java/io/homeassistant/companion/android/common/dagger/DomainComponent.kt b/common/src/main/java/io/homeassistant/companion/android/common/dagger/DomainComponent.kt
new file mode 100644
index 00000000000..3933b0338a8
--- /dev/null
+++ b/common/src/main/java/io/homeassistant/companion/android/common/dagger/DomainComponent.kt
@@ -0,0 +1,11 @@
+package io.homeassistant.companion.android.common.dagger
+
+import dagger.Component
+import io.homeassistant.companion.android.domain.authentication.AuthenticationUseCase
+
+@Component(dependencies = [DataComponent::class], modules = [DomainModule::class])
+interface DomainComponent {
+
+    fun authenticationUseCase(): AuthenticationUseCase
+
+}
\ No newline at end of file
diff --git a/common/src/main/java/io/homeassistant/companion/android/common/dagger/DomainModule.kt b/common/src/main/java/io/homeassistant/companion/android/common/dagger/DomainModule.kt
new file mode 100644
index 00000000000..b17ff14bd9c
--- /dev/null
+++ b/common/src/main/java/io/homeassistant/companion/android/common/dagger/DomainModule.kt
@@ -0,0 +1,14 @@
+package io.homeassistant.companion.android.common.dagger
+
+import dagger.Binds
+import dagger.Module
+import io.homeassistant.companion.android.domain.authentication.AuthenticationUseCase
+import io.homeassistant.companion.android.domain.authentication.AuthenticationUseCaseImpl
+
+@Module
+interface DomainModule {
+
+    @Binds
+    fun bindAuthenticationUseCase(useCaseImpl: AuthenticationUseCaseImpl) : AuthenticationUseCase
+
+}
diff --git a/common/src/main/java/io/homeassistant/companion/android/common/dagger/DomainScope.kt b/common/src/main/java/io/homeassistant/companion/android/common/dagger/DomainScope.kt
new file mode 100644
index 00000000000..05eef5a1e4d
--- /dev/null
+++ b/common/src/main/java/io/homeassistant/companion/android/common/dagger/DomainScope.kt
@@ -0,0 +1,7 @@
+package io.homeassistant.companion.android.common.dagger
+
+import javax.inject.Scope
+
+@Scope
+@Retention(AnnotationRetention.RUNTIME)
+annotation class DomainScope
diff --git a/common/src/main/java/io/homeassistant/companion/android/common/dagger/Graph.kt b/common/src/main/java/io/homeassistant/companion/android/common/dagger/Graph.kt
new file mode 100644
index 00000000000..2b3d515672b
--- /dev/null
+++ b/common/src/main/java/io/homeassistant/companion/android/common/dagger/Graph.kt
@@ -0,0 +1,51 @@
+package io.homeassistant.companion.android.common.dagger
+
+import android.app.Application
+import android.content.Context
+import io.homeassistant.companion.android.common.LocalStorageImpl
+import kotlinx.coroutines.runBlocking
+
+
+class Graph(
+    private val application: Application
+) {
+
+    lateinit var appComponent: AppComponent
+    private lateinit var dataComponent: DataComponent
+    private lateinit var domainComponent: DomainComponent
+    private var url = "http://localhost/"
+
+    init {
+        buildComponent()
+        runBlocking {
+            if (dataComponent.authenticationRepository().getUrl() != null) {
+                this@Graph.url = dataComponent.authenticationRepository().getUrl()!!.toString()
+            }
+            buildComponent()
+        }
+    }
+
+    fun urlUpdated() {
+        runBlocking {
+            this@Graph.url = dataComponent.authenticationRepository().getUrl()!!.toString()
+        }
+        buildComponent()
+    }
+
+    private fun buildComponent() {
+        dataComponent = DaggerDataComponent
+            .builder()
+            .dataModule(DataModule(url, LocalStorageImpl(application.getSharedPreferences("session", Context.MODE_PRIVATE))))
+            .build()
+
+        domainComponent = DaggerDomainComponent
+            .builder()
+            .dataComponent(dataComponent)
+            .build()
+
+        appComponent = DaggerAppComponent.builder()
+            .domainComponent(domainComponent)
+            .build()
+    }
+
+}
\ No newline at end of file
diff --git a/common/src/main/java/io/homeassistant/companion/android/common/dagger/GraphComponentAccessor.kt b/common/src/main/java/io/homeassistant/companion/android/common/dagger/GraphComponentAccessor.kt
new file mode 100644
index 00000000000..b35ab4ff06f
--- /dev/null
+++ b/common/src/main/java/io/homeassistant/companion/android/common/dagger/GraphComponentAccessor.kt
@@ -0,0 +1,10 @@
+package io.homeassistant.companion.android.common.dagger
+
+
+interface GraphComponentAccessor {
+
+    val appComponent: AppComponent
+
+    fun urlUpdated()
+
+}
diff --git a/data/build.gradle b/data/build.gradle
new file mode 100644
index 00000000000..6ad7efbbcfa
--- /dev/null
+++ b/data/build.gradle
@@ -0,0 +1,33 @@
+apply plugin: 'java'
+apply plugin: 'kotlin'
+
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
+
+test {
+    useJUnitPlatform {
+        includeEngines 'spek2'
+    }
+}
+
+dependencies {
+    implementation project(':domain')
+
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
+
+    implementation 'javax.inject:javax.inject:1'
+
+    implementation "com.squareup.retrofit2:retrofit:$retrofit2Version"
+    implementation "com.squareup.retrofit2:converter-jackson:$retrofit2Version"
+    implementation "com.squareup.okhttp3:okhttp:$okhttp3Version"
+
+    implementation "org.threeten:threetenbp:$threeTenBpVersion"
+
+    testImplementation "com.squareup.okhttp3:mockwebserver:$okhttp3Version"
+
+    testImplementation "org.spekframework.spek2:spek-dsl-jvm:$spek2Version"
+    testRuntimeOnly "org.spekframework.spek2:spek-runner-junit5:$spek2Version"
+    testImplementation "org.assertj:assertj-core:$assertJVersion"
+    testImplementation "io.mockk:mockk:$mockkVersion"
+}
diff --git a/data/src/main/java/io/homeassistant/companion/android/data/HomeAssistantRetrofit.kt b/data/src/main/java/io/homeassistant/companion/android/data/HomeAssistantRetrofit.kt
new file mode 100644
index 00000000000..e2c8b4031c6
--- /dev/null
+++ b/data/src/main/java/io/homeassistant/companion/android/data/HomeAssistantRetrofit.kt
@@ -0,0 +1,15 @@
+package io.homeassistant.companion.android.data
+
+import retrofit2.Retrofit
+import retrofit2.converter.jackson.JacksonConverterFactory
+import javax.inject.Inject
+
+class HomeAssistantRetrofit @Inject constructor(url: String) {
+
+    val retrofit: Retrofit = Retrofit
+        .Builder()
+        .addConverterFactory(JacksonConverterFactory.create())
+        .baseUrl(url)
+        .build()
+
+}
diff --git a/data/src/main/java/io/homeassistant/companion/android/data/LocalStorage.kt b/data/src/main/java/io/homeassistant/companion/android/data/LocalStorage.kt
new file mode 100644
index 00000000000..87baeb92b68
--- /dev/null
+++ b/data/src/main/java/io/homeassistant/companion/android/data/LocalStorage.kt
@@ -0,0 +1,14 @@
+package io.homeassistant.companion.android.data
+
+
+interface LocalStorage {
+
+    suspend fun putString(key: String, value: String?)
+
+    suspend fun getString(key: String): String?
+
+    suspend fun putLong(key: String, value: Long?)
+
+    suspend fun getLong(key: String): Long?
+
+}
diff --git a/data/src/main/java/io/homeassistant/companion/android/data/authentication/AuthenticationRepositoryImpl.kt b/data/src/main/java/io/homeassistant/companion/android/data/authentication/AuthenticationRepositoryImpl.kt
new file mode 100644
index 00000000000..8c7f0d6d292
--- /dev/null
+++ b/data/src/main/java/io/homeassistant/companion/android/data/authentication/AuthenticationRepositoryImpl.kt
@@ -0,0 +1,114 @@
+package io.homeassistant.companion.android.data.authentication
+
+import com.fasterxml.jackson.databind.ObjectMapper
+import io.homeassistant.companion.android.data.LocalStorage
+import io.homeassistant.companion.android.domain.authentication.AuthenticationRepository
+import io.homeassistant.companion.android.domain.authentication.SessionState
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import org.threeten.bp.Instant
+import java.net.URL
+import javax.inject.Inject
+
+
+class AuthenticationRepositoryImpl @Inject constructor(
+    private val authenticationService: AuthenticationService,
+    private val localStorage: LocalStorage
+) : AuthenticationRepository {
+
+    companion object {
+        private const val PREF_URL = "url"
+        private const val PREF_ACCESS_TOKEN = "access_token"
+        private const val PREF_EXPIRED_DATE = "expires_date"
+        private const val PREF_REFRESH_TOKEN = "refresh_token"
+        private const val PREF_TOKEN_TYPE = "token_type"
+    }
+
+    override suspend fun saveUrl(url: URL) {
+        localStorage.putString(PREF_URL, url.toString())
+    }
+
+    override suspend fun registerAuthorizationCode(authorizationCode: String) {
+        authenticationService.getToken(AuthenticationService.GRANT_TYPE_CODE, authorizationCode, AuthenticationService.CLIENT_ID).let {
+            saveSession(Session(it.accessToken, Instant.now().epochSecond + it.expiresIn, it.refreshToken!!, it.tokenType))
+        }
+    }
+
+    override suspend fun retrieveExternalAuthentication(): String {
+        val session = retrieveSession()
+
+        if (session != null) {
+            if (session.isExpired()) {
+                return authenticationService.refreshToken(AuthenticationService.GRANT_TYPE_REFRESH, session.refreshToken, AuthenticationService.CLIENT_ID).let {
+                    val refreshSession = Session(it.accessToken, Instant.now().epochSecond + it.expiresIn, session.refreshToken, it.tokenType)
+                    saveSession(refreshSession)
+                    convertSession(refreshSession)
+                }
+            }
+            return convertSession(session)
+        } else {
+            throw AuthorizationException()
+        }
+    }
+
+    override suspend fun revokeSession() {
+        val session = retrieveSession() ?: throw AuthorizationException()
+        authenticationService.revokeToken(session.refreshToken, AuthenticationService.REVOKE_ACTION)
+        saveSession(null)
+    }
+
+    override suspend fun getSessionState(): SessionState {
+        return if (retrieveSession() != null) {
+            SessionState.CONNECTED
+        } else {
+            SessionState.ANONYMOUS
+        }
+    }
+
+    override suspend fun getUrl(): URL? {
+        return localStorage.getString(PREF_URL)?.toHttpUrlOrNull()?.toUrl()
+    }
+
+    override suspend fun buildAuthenticationUrl(callbackUrl: String): URL {
+        val url = localStorage.getString(PREF_URL) ?: throw AuthorizationException()
+
+        return url.toHttpUrl()
+            .newBuilder()
+            .addPathSegments("auth/authorize")
+            .addEncodedQueryParameter("response_type", "code")
+            .addEncodedQueryParameter("client_id", AuthenticationService.CLIENT_ID)
+            .addEncodedQueryParameter("redirect_uri", callbackUrl)
+            .build()
+            .toUrl()
+    }
+
+    private fun convertSession(session: Session): String {
+        return ObjectMapper().writeValueAsString(
+            mapOf(
+                "access_token" to session.accessToken,
+                "expires_in" to session.expiresIn()
+            )
+        )
+    }
+
+    private suspend fun retrieveSession(): Session? {
+        val accessToken = localStorage.getString(PREF_ACCESS_TOKEN)
+        val expiredDate = localStorage.getLong(PREF_EXPIRED_DATE)
+        val refreshToken = localStorage.getString(PREF_REFRESH_TOKEN)
+        val tokenType = localStorage.getString(PREF_TOKEN_TYPE)
+
+        return if (accessToken != null && expiredDate != null && refreshToken != null && tokenType != null) {
+            Session(accessToken, expiredDate, refreshToken, tokenType)
+        } else {
+            null
+        }
+    }
+
+    private suspend fun saveSession(session: Session?) {
+        localStorage.putString(PREF_ACCESS_TOKEN, session?.accessToken)
+        localStorage.putLong(PREF_EXPIRED_DATE, session?.expiresTimestamp)
+        localStorage.putString(PREF_REFRESH_TOKEN, session?.refreshToken)
+        localStorage.putString(PREF_TOKEN_TYPE, session?.tokenType)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/io/homeassistant/companion/android/api/AuthenticationService.kt b/data/src/main/java/io/homeassistant/companion/android/data/authentication/AuthenticationService.kt
similarity index 58%
rename from app/src/main/java/io/homeassistant/companion/android/api/AuthenticationService.kt
rename to data/src/main/java/io/homeassistant/companion/android/data/authentication/AuthenticationService.kt
index aaebd330f9c..91a4973cd29 100644
--- a/app/src/main/java/io/homeassistant/companion/android/api/AuthenticationService.kt
+++ b/data/src/main/java/io/homeassistant/companion/android/data/authentication/AuthenticationService.kt
@@ -1,6 +1,5 @@
-package io.homeassistant.companion.android.api
+package io.homeassistant.companion.android.data.authentication
 
-import retrofit2.Call
 import retrofit2.http.Field
 import retrofit2.http.FormUrlEncoded
 import retrofit2.http.POST
@@ -10,29 +9,32 @@ interface AuthenticationService {
 
     companion object {
         const val CLIENT_ID = "https://home-assistant.io/android"
+        const val GRANT_TYPE_CODE = "authorization_code"
+        const val GRANT_TYPE_REFRESH = "refresh_token"
+        const val REVOKE_ACTION = "revoke"
     }
 
     @FormUrlEncoded
     @POST("auth/token")
-    fun getToken(
+    suspend fun getToken(
         @Field("grant_type") grandType: String,
         @Field("code") code: String,
         @Field("client_id") clientId: String
-    ): Call<AuthorizationCode>
+    ): Token
 
     @FormUrlEncoded
     @POST("auth/token")
-    fun refreshToken(
+    suspend fun refreshToken(
         @Field("grant_type") grandType: String,
-        @Field("refresh_token") token: String,
+        @Field("refresh_token") refreshToken: String,
         @Field("client_id") clientId: String
-    ): Call<RefreshToken>
+    ): Token
 
     @FormUrlEncoded
     @POST("auth/token")
-    fun revokeToken(
-        @Field("refresh_token") token: String,
+    suspend fun revokeToken(
+        @Field("refresh_token") refreshToken: String,
         @Field("action") action: String
-    ): Call<Void>
+    )
 
 }
\ No newline at end of file
diff --git a/data/src/main/java/io/homeassistant/companion/android/data/authentication/AuthorizationException.kt b/data/src/main/java/io/homeassistant/companion/android/data/authentication/AuthorizationException.kt
new file mode 100644
index 00000000000..a068b2ac360
--- /dev/null
+++ b/data/src/main/java/io/homeassistant/companion/android/data/authentication/AuthorizationException.kt
@@ -0,0 +1,4 @@
+package io.homeassistant.companion.android.data.authentication
+
+
+class AuthorizationException : Exception()
\ No newline at end of file
diff --git a/data/src/main/java/io/homeassistant/companion/android/data/authentication/Session.kt b/data/src/main/java/io/homeassistant/companion/android/data/authentication/Session.kt
new file mode 100644
index 00000000000..be5903c4e9c
--- /dev/null
+++ b/data/src/main/java/io/homeassistant/companion/android/data/authentication/Session.kt
@@ -0,0 +1,17 @@
+package io.homeassistant.companion.android.data.authentication
+
+import org.threeten.bp.Instant
+
+
+data class Session(
+    val accessToken: String,
+    val expiresTimestamp: Long,
+    val refreshToken: String,
+    val tokenType: String
+) {
+
+    fun isExpired() = expiresIn() < 0
+
+    fun expiresIn() = expiresTimestamp - Instant.now().epochSecond
+
+}
diff --git a/app/src/main/java/io/homeassistant/companion/android/api/AuthorizationCode.kt b/data/src/main/java/io/homeassistant/companion/android/data/authentication/Token.kt
similarity index 70%
rename from app/src/main/java/io/homeassistant/companion/android/api/AuthorizationCode.kt
rename to data/src/main/java/io/homeassistant/companion/android/data/authentication/Token.kt
index e2646c48cf8..59864771ca5 100644
--- a/app/src/main/java/io/homeassistant/companion/android/api/AuthorizationCode.kt
+++ b/data/src/main/java/io/homeassistant/companion/android/data/authentication/Token.kt
@@ -1,15 +1,15 @@
-package io.homeassistant.companion.android.api
+package io.homeassistant.companion.android.data.authentication
 
 import com.fasterxml.jackson.annotation.JsonProperty
 
 
-data class AuthorizationCode(
+data class Token(
     @JsonProperty("access_token")
     val accessToken: String,
     @JsonProperty("expires_in")
     val expiresIn: Int,
     @JsonProperty("refresh_token")
-    val refreshToken: String,
+    val refreshToken: String?,
     @JsonProperty("token_type")
     val tokenType: String
 )
\ No newline at end of file
diff --git a/data/src/test/java/io/homeassistant/companion/android/data/HomeAssistantMockService.kt b/data/src/test/java/io/homeassistant/companion/android/data/HomeAssistantMockService.kt
new file mode 100644
index 00000000000..770f6f44e77
--- /dev/null
+++ b/data/src/test/java/io/homeassistant/companion/android/data/HomeAssistantMockService.kt
@@ -0,0 +1,42 @@
+package io.homeassistant.companion.android.data
+
+import okhttp3.mockwebserver.MockResponse
+import okhttp3.mockwebserver.MockWebServer
+import java.io.IOException
+
+
+class HomeAssistantMockService<T>(private val c: Class<T>) {
+
+    private val mockServer: MockWebServer = MockWebServer()
+    private val homeAssistantRetrofit = HomeAssistantRetrofit(mockServer.url("/").toString()).retrofit
+
+    fun get(): T {
+        return homeAssistantRetrofit.create(c)
+    }
+
+    fun enqueueResponse(code: Int, file: String? = null) {
+        val mockResponse = MockResponse()
+        if (file != null) {
+            mockResponse.setBody(getJsonFromFile(file))
+        }
+
+        mockServer.enqueue(mockResponse.setResponseCode(code))
+    }
+
+    fun takeRequest() = mockServer.takeRequest()
+
+    private fun getJsonFromFile(file: String): String {
+        val inputStreamResponse = this.javaClass.classLoader.getResourceAsStream(file)!!
+        val size: Int
+        return try {
+            size = inputStreamResponse.available()
+            val buffer = ByteArray(size)
+            inputStreamResponse.read(buffer)
+            inputStreamResponse.close()
+            String(buffer)
+        } catch (e: IOException) {
+            throw RuntimeException()
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/data/src/test/java/io/homeassistant/companion/android/data/authentication/AuthenticationRepositoryImplSpec.kt b/data/src/test/java/io/homeassistant/companion/android/data/authentication/AuthenticationRepositoryImplSpec.kt
new file mode 100644
index 00000000000..fad2899092d
--- /dev/null
+++ b/data/src/test/java/io/homeassistant/companion/android/data/authentication/AuthenticationRepositoryImplSpec.kt
@@ -0,0 +1,280 @@
+package io.homeassistant.companion.android.data.authentication
+
+import io.homeassistant.companion.android.data.LocalStorage
+import io.homeassistant.companion.android.domain.authentication.SessionState
+import io.mockk.*
+import kotlinx.coroutines.runBlocking
+import org.assertj.core.api.Assertions.assertThat
+import org.assertj.core.api.Assertions.catchThrowable
+import org.spekframework.spek2.Spek
+import org.spekframework.spek2.style.specification.describe
+import org.threeten.bp.Instant
+import java.net.URL
+
+
+object AuthenticationRepositoryImplSpec : Spek({
+
+    beforeEachTest {
+        mockkStatic(Instant::class)
+        every { Instant.now() } returns Instant.parse("2019-01-16T01:52:00.000Z")
+    }
+
+    describe("a repository") {
+        val localStorage by memoized { mockk<LocalStorage>(relaxUnitFun = true) }
+        val authenticationService by memoized { mockk<AuthenticationService>(relaxUnitFun = true) }
+        val repository by memoized { AuthenticationRepositoryImpl(authenticationService, localStorage) }
+
+        describe("saveUrl") {
+            beforeEachTest {
+                runBlocking { repository.saveUrl(URL("https://demo.home-assistant.io/")) }
+            }
+
+            it("should save url") {
+                coVerifyAll { localStorage.putString("url", "https://demo.home-assistant.io/") }
+            }
+        }
+
+        describe("get token on success") {
+            beforeEachTest {
+                coEvery {
+                    authenticationService.getToken("authorization_code", "123456", "https://home-assistant.io/android")
+                } returns mockk {
+                    every { accessToken } returns "ABCDEFGH"
+                    every { expiresIn } returns 1800
+                    every { refreshToken } returns "IJKLMNOPQRST"
+                    every { tokenType } returns "Bearer"
+                }
+            }
+
+            describe("register authorization code") {
+                beforeEachTest {
+                    runBlocking {
+                        repository.registerAuthorizationCode("123456")
+                    }
+                }
+
+                it("should save the token and url") {
+                    coVerifyAll {
+                        localStorage.putString("access_token", "ABCDEFGH")
+                        localStorage.putLong("expires_date", 1547605320)
+                        localStorage.putString("refresh_token", "IJKLMNOPQRST")
+                        localStorage.putString("token_type", "Bearer")
+                    }
+                }
+            }
+        }
+
+        describe("get token on error") {
+            beforeEachTest {
+                coEvery {
+                    authenticationService.getToken(any(), any(), any())
+                } throws Exception()
+            }
+
+            describe("register authorization code") {
+                beforeEachTest {
+                    catchThrowable {
+                        runBlocking {
+                            repository.registerAuthorizationCode("123456")
+                        }
+                    }
+                }
+
+                it("shouldn't save data") {
+                    verify { localStorage wasNot Called }
+                }
+            }
+        }
+
+        describe("build auth url") {
+            lateinit var authenticationUrl: URL
+            beforeEachTest {
+                coEvery { localStorage.getString("url") } returns "https://demo.home-assistant.io/"
+                authenticationUrl = runBlocking { repository.buildAuthenticationUrl("homeassistant://auth-callback") }
+            }
+
+            it("should return the authentication url") {
+                assertThat(authenticationUrl).isEqualTo(URL("https://demo.home-assistant.io/auth/authorize?response_type=code&client_id=https://home-assistant.io/android&redirect_uri=homeassistant://auth-callback"))
+            }
+        }
+
+        describe("connected user with valid access token") {
+            beforeEachTest {
+                coEvery { localStorage.getString("url") } returns "https://demo.home-assistant.io/"
+                coEvery { localStorage.getString("access_token") } returns "ABCDEFGH"
+                coEvery { localStorage.getLong("expires_date") } returns 1547605320
+                coEvery { localStorage.getString("refresh_token") } returns "IJKLMNOPQRST"
+                coEvery { localStorage.getString("token_type") } returns "Bearer"
+            }
+
+            describe("get session state") {
+                lateinit var sessionState: SessionState
+                beforeEachTest {
+                    sessionState = runBlocking {
+                        repository.getSessionState()
+                    }
+                }
+
+                it("should be connected") {
+                    assertThat(sessionState).isEqualTo(SessionState.CONNECTED)
+                }
+            }
+
+            describe("get instance url") {
+                lateinit var url: URL
+                beforeEachTest {
+                    url = runBlocking {
+                        repository.getUrl()
+                    }!!
+                }
+
+                it("should return the url") {
+                    assertThat(url).isEqualTo(URL("https://demo.home-assistant.io/"))
+                }
+            }
+
+            describe("retrieve external authentication") {
+                lateinit var externalAuth: String
+                beforeEachTest {
+                    externalAuth = runBlocking {
+                        repository.retrieveExternalAuthentication()
+                    }
+                }
+
+                it("should serialize the external authentication saved") {
+                    assertThat(externalAuth).isEqualTo("{\"access_token\":\"ABCDEFGH\",\"expires_in\":1800}")
+                }
+            }
+
+            describe("revoke session") {
+                beforeEachTest {
+                    runBlocking {
+                        repository.revokeSession()
+                    }
+                }
+
+                it("should call the service") {
+                    coVerify {
+                        authenticationService.revokeToken("IJKLMNOPQRST", "revoke")
+                    }
+                }
+
+                it("should delete the session") {
+                    coVerify {
+                        localStorage.putString("access_token", null)
+                        localStorage.putLong("expires_date", null)
+                        localStorage.putString("refresh_token", null)
+                        localStorage.putString("token_type", null)
+                    }
+                }
+            }
+        }
+
+        describe("connected user with expired access token") {
+            beforeEachTest {
+                coEvery { localStorage.getString("url") } returns "https://demo.home-assistant.io/"
+                coEvery { localStorage.getString("access_token") } returns "ABCDEFGH"
+                coEvery { localStorage.getLong("expires_date") } returns Instant.now().epochSecond - 1800
+                coEvery { localStorage.getString("refresh_token") } returns "IJKLMNOPQRST"
+                coEvery { localStorage.getString("token_type") } returns "Bearer"
+            }
+
+            describe("retrieve external authentication") {
+                lateinit var externalAuth: String
+                beforeEachTest {
+                    externalAuth = runBlocking {
+                        coEvery {
+                            authenticationService.refreshToken("refresh_token", "IJKLMNOPQRST", "https://home-assistant.io/android")
+                        } returns mockk {
+                            every { accessToken } returns "HGFEDCBA"
+                            every { expiresIn } returns 1800
+                            every { refreshToken } returns null
+                            every { tokenType } returns "Bearer"
+                        }
+
+                        repository.retrieveExternalAuthentication()
+                    }
+                }
+
+                it("should save the token") {
+                    coVerify {
+                        localStorage.putString("access_token", "HGFEDCBA")
+                        localStorage.putLong("expires_date", 1547605320)
+                        localStorage.putString("refresh_token", "IJKLMNOPQRST")
+                        localStorage.putString("token_type", "Bearer")
+                    }
+                }
+
+                it("should serialize the refresh external authentication") {
+                    assertThat(externalAuth).isEqualTo("{\"access_token\":\"HGFEDCBA\",\"expires_in\":1800}")
+                }
+            }
+        }
+
+        describe("anonymous user") {
+            beforeEachTest {
+                coEvery { localStorage.getString("url") } returns null
+                coEvery { localStorage.getString("access_token") } returns null
+                coEvery { localStorage.getLong("expires_date") } returns null
+                coEvery { localStorage.getString("refresh_token") } returns null
+                coEvery { localStorage.getString("token_type") } returns null
+            }
+
+            describe("get session state") {
+                lateinit var sessionState: SessionState
+                beforeEachTest {
+                    sessionState = runBlocking {
+                        repository.getSessionState()
+                    }
+                }
+
+                it("should be anonymous") {
+                    assertThat(sessionState).isEqualTo(SessionState.ANONYMOUS)
+                }
+            }
+
+            describe("get instance url") {
+                var url: URL? = null
+                beforeEachTest {
+                    url = runBlocking {
+                        repository.getUrl()
+                    }
+                }
+
+                it("should return null") {
+                    assertThat(url).isNull()
+                }
+            }
+
+            describe("retrieve external authentication") {
+                lateinit var thrown: Throwable
+                beforeEachTest {
+                    thrown = catchThrowable {
+                        runBlocking {
+                            repository.retrieveExternalAuthentication()
+                        }
+                    }
+                }
+
+                it("throw an exception") {
+                    assertThat(thrown).isInstanceOf(AuthorizationException::class.java)
+                }
+            }
+
+            describe("revoke session") {
+                lateinit var thrown: Throwable
+                beforeEachTest {
+                    thrown = catchThrowable {
+                        runBlocking {
+                            repository.revokeSession()
+                        }
+                    }
+                }
+
+                it("should throw an exception") {
+                    assertThat(thrown).isInstanceOf(AuthorizationException::class.java)
+                }
+            }
+        }
+    }
+})
\ No newline at end of file
diff --git a/data/src/test/java/io/homeassistant/companion/android/data/authentication/AuthenticationServiceSpec.kt b/data/src/test/java/io/homeassistant/companion/android/data/authentication/AuthenticationServiceSpec.kt
new file mode 100644
index 00000000000..4daabd205c2
--- /dev/null
+++ b/data/src/test/java/io/homeassistant/companion/android/data/authentication/AuthenticationServiceSpec.kt
@@ -0,0 +1,91 @@
+package io.homeassistant.companion.android.data.authentication
+
+import io.homeassistant.companion.android.data.HomeAssistantMockService
+import kotlinx.coroutines.runBlocking
+import okhttp3.mockwebserver.RecordedRequest
+import org.assertj.core.api.Assertions.assertThat
+import org.spekframework.spek2.Spek
+import org.spekframework.spek2.style.specification.describe
+
+
+object AuthenticationServiceSpec : Spek({
+
+    describe("an authentication service") {
+        val mockService by memoized { HomeAssistantMockService(AuthenticationService::class.java) }
+
+        describe("authorization code on success") {
+            lateinit var token: Token
+            lateinit var request: RecordedRequest
+            beforeEachTest {
+                mockService.enqueueResponse(200, "authentication/authorization_code.json")
+                token = runBlocking {
+                    mockService.get().getToken(AuthenticationService.GRANT_TYPE_CODE, "12345", AuthenticationService.CLIENT_ID)
+                }
+                request = mockService.takeRequest()
+            }
+
+            it("should create a query") {
+                assertThat(request.method).isEqualTo("POST")
+                assertThat(request.path).isEqualTo("/auth/token")
+                assertThat(request.body.readUtf8())
+                    .contains("grant_type=authorization_code")
+                    .contains("code=12345")
+                    .contains("client_id=https%3A%2F%2Fhome-assistant.io%2Fandroid")
+            }
+
+            it("should deserialize the payload") {
+                assertThat(token.accessToken).isEqualTo("ABCDEFGH")
+                assertThat(token.expiresIn).isEqualTo(1800)
+                assertThat(token.refreshToken).isEqualTo("IJKLMNOPQRST")
+                assertThat(token.tokenType).isEqualTo("Bearer")
+            }
+        }
+
+        describe("refresh token on success") {
+            lateinit var token: Token
+            lateinit var request: RecordedRequest
+            beforeEachTest {
+                mockService.enqueueResponse(200, "authentication/refresh_token.json")
+                token = runBlocking {
+                    mockService.get().refreshToken(AuthenticationService.GRANT_TYPE_REFRESH, "IJKLMNOPQRST", AuthenticationService.CLIENT_ID)
+                }
+                request = mockService.takeRequest()
+            }
+
+            it("should create a query") {
+                assertThat(request.method).isEqualTo("POST")
+                assertThat(request.path).isEqualTo("/auth/token")
+                assertThat(request.body.readUtf8())
+                    .contains("grant_type=refresh_token")
+                    .contains("refresh_token=IJKLMNOPQRST")
+                    .contains("client_id=https%3A%2F%2Fhome-assistant.io%2Fandroid")
+            }
+
+            it("should deserialize the payload") {
+                assertThat(token.accessToken).isEqualTo("ABCDEFGH")
+                assertThat(token.expiresIn).isEqualTo(1800)
+                assertThat(token.refreshToken).isNull()
+                assertThat(token.tokenType).isEqualTo("Bearer")
+            }
+        }
+
+        describe("revoke token on success") {
+            lateinit var request: RecordedRequest
+            beforeEachTest {
+                mockService.enqueueResponse(200)
+                runBlocking {
+                    mockService.get().revokeToken("IJKLMNOPQRST", AuthenticationService.REVOKE_ACTION)
+                }
+                request = mockService.takeRequest()
+            }
+
+            it("should create a query") {
+                assertThat(request.method).isEqualTo("POST")
+                assertThat(request.path).isEqualTo("/auth/token")
+                assertThat(request.body.readUtf8())
+                    .contains("refresh_token=IJKLMNOPQRST")
+                    .contains("action=revoke")
+            }
+        }
+    }
+})
\ No newline at end of file
diff --git a/data/src/test/java/io/homeassistant/companion/android/data/authentication/SessionSpec.kt b/data/src/test/java/io/homeassistant/companion/android/data/authentication/SessionSpec.kt
new file mode 100644
index 00000000000..22ad9de0172
--- /dev/null
+++ b/data/src/test/java/io/homeassistant/companion/android/data/authentication/SessionSpec.kt
@@ -0,0 +1,31 @@
+package io.homeassistant.companion.android.data.authentication
+
+import org.assertj.core.api.Assertions.assertThat
+import org.spekframework.spek2.Spek
+import org.spekframework.spek2.style.specification.describe
+import org.threeten.bp.Instant
+
+
+object SessionSpec : Spek({
+
+    describe("an expired session") {
+        val session by memoized { Session("", Instant.now().epochSecond - 1800, "", "") }
+
+        it("should be expired") {
+            assertThat(session.isExpired()).isTrue()
+        }
+    }
+
+    describe("an valid session") {
+        val session by memoized { Session("", Instant.now().epochSecond + 1800, "", "") }
+
+        it("should be valid") {
+            assertThat(session.isExpired()).isFalse()
+        }
+
+        it("should be valid") {
+            assertThat(session.expiresIn()).isEqualTo(1800)
+        }
+    }
+
+})
\ No newline at end of file
diff --git a/data/src/test/resources/authentication/authorization_code.json b/data/src/test/resources/authentication/authorization_code.json
new file mode 100644
index 00000000000..8c54e388c5e
--- /dev/null
+++ b/data/src/test/resources/authentication/authorization_code.json
@@ -0,0 +1,6 @@
+{
+  "access_token": "ABCDEFGH",
+  "expires_in": 1800,
+  "refresh_token": "IJKLMNOPQRST",
+  "token_type": "Bearer"
+}
\ No newline at end of file
diff --git a/data/src/test/resources/authentication/refresh_token.json b/data/src/test/resources/authentication/refresh_token.json
new file mode 100644
index 00000000000..ca477974e9f
--- /dev/null
+++ b/data/src/test/resources/authentication/refresh_token.json
@@ -0,0 +1,5 @@
+{
+  "access_token": "ABCDEFGH",
+  "expires_in": 1800,
+  "token_type": "Bearer"
+}
\ No newline at end of file
diff --git a/domain/build.gradle b/domain/build.gradle
new file mode 100644
index 00000000000..b377aebe6e0
--- /dev/null
+++ b/domain/build.gradle
@@ -0,0 +1,23 @@
+apply plugin: 'java'
+apply plugin: 'kotlin'
+
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
+
+test {
+    useJUnitPlatform {
+        includeEngines 'spek2'
+    }
+}
+
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
+
+    implementation 'javax.inject:javax.inject:1'
+
+    testImplementation "org.spekframework.spek2:spek-dsl-jvm:$spek2Version"
+    testRuntimeOnly "org.spekframework.spek2:spek-runner-junit5:$spek2Version"
+    testImplementation "org.assertj:assertj-core:$assertJVersion"
+    testImplementation "io.mockk:mockk:$mockkVersion"
+}
diff --git a/domain/src/main/java/io/homeassistant/companion/android/domain/authentication/AuthenticationRepository.kt b/domain/src/main/java/io/homeassistant/companion/android/domain/authentication/AuthenticationRepository.kt
new file mode 100644
index 00000000000..e3be7d7d318
--- /dev/null
+++ b/domain/src/main/java/io/homeassistant/companion/android/domain/authentication/AuthenticationRepository.kt
@@ -0,0 +1,22 @@
+package io.homeassistant.companion.android.domain.authentication
+
+import java.net.URL
+
+
+interface AuthenticationRepository {
+
+    suspend fun saveUrl(url: URL)
+
+    suspend fun registerAuthorizationCode(authorizationCode: String)
+
+    suspend fun retrieveExternalAuthentication(): String
+
+    suspend fun revokeSession()
+
+    suspend fun getSessionState(): SessionState
+
+    suspend fun getUrl(): URL?
+
+    suspend fun buildAuthenticationUrl(callbackUrl: String): URL
+
+}
diff --git a/domain/src/main/java/io/homeassistant/companion/android/domain/authentication/AuthenticationUseCase.kt b/domain/src/main/java/io/homeassistant/companion/android/domain/authentication/AuthenticationUseCase.kt
new file mode 100644
index 00000000000..7009b82288b
--- /dev/null
+++ b/domain/src/main/java/io/homeassistant/companion/android/domain/authentication/AuthenticationUseCase.kt
@@ -0,0 +1,22 @@
+package io.homeassistant.companion.android.domain.authentication
+
+import java.net.URL
+
+
+interface AuthenticationUseCase {
+
+    suspend fun saveUrl(url: URL)
+
+    suspend fun registerAuthorizationCode(authorizationCode: String)
+
+    suspend fun retrieveExternalAuthentication(): String
+
+    suspend fun revokeSession()
+
+    suspend fun getSessionState(): SessionState
+
+    suspend fun getUrl(): URL?
+
+    suspend fun buildAuthenticationUrl(callbackUrl: String): URL
+
+}
\ No newline at end of file
diff --git a/domain/src/main/java/io/homeassistant/companion/android/domain/authentication/AuthenticationUseCaseImpl.kt b/domain/src/main/java/io/homeassistant/companion/android/domain/authentication/AuthenticationUseCaseImpl.kt
new file mode 100644
index 00000000000..46d63799798
--- /dev/null
+++ b/domain/src/main/java/io/homeassistant/companion/android/domain/authentication/AuthenticationUseCaseImpl.kt
@@ -0,0 +1,38 @@
+package io.homeassistant.companion.android.domain.authentication
+
+import java.net.URL
+import javax.inject.Inject
+
+class AuthenticationUseCaseImpl @Inject constructor(
+    private val authenticationRepository: AuthenticationRepository
+) : AuthenticationUseCase {
+
+    override suspend fun saveUrl(url: URL) {
+        authenticationRepository.saveUrl(url)
+    }
+
+    override suspend fun registerAuthorizationCode(authorizationCode: String) {
+        authenticationRepository.registerAuthorizationCode(authorizationCode)
+    }
+
+    override suspend fun retrieveExternalAuthentication(): String {
+        return authenticationRepository.retrieveExternalAuthentication()
+    }
+
+    override suspend fun revokeSession() {
+        authenticationRepository.revokeSession()
+    }
+
+    override suspend fun getSessionState(): SessionState {
+        return authenticationRepository.getSessionState()
+    }
+
+    override suspend fun getUrl(): URL? {
+        return authenticationRepository.getUrl()
+    }
+
+    override suspend fun buildAuthenticationUrl(callbackUrl: String): URL {
+        return authenticationRepository.buildAuthenticationUrl(callbackUrl)
+    }
+
+}
\ No newline at end of file
diff --git a/domain/src/main/java/io/homeassistant/companion/android/domain/authentication/SessionState.kt b/domain/src/main/java/io/homeassistant/companion/android/domain/authentication/SessionState.kt
new file mode 100644
index 00000000000..cbebe3e43d6
--- /dev/null
+++ b/domain/src/main/java/io/homeassistant/companion/android/domain/authentication/SessionState.kt
@@ -0,0 +1,7 @@
+package io.homeassistant.companion.android.domain.authentication
+
+
+enum class SessionState {
+    ANONYMOUS,
+    CONNECTED,
+}
\ No newline at end of file
diff --git a/domain/src/test/java/io/homeassistant/companion/android/domain/authentication/AuthenticationUseCaseImplSpec.kt b/domain/src/test/java/io/homeassistant/companion/android/domain/authentication/AuthenticationUseCaseImplSpec.kt
new file mode 100644
index 00000000000..988843e2ad0
--- /dev/null
+++ b/domain/src/test/java/io/homeassistant/companion/android/domain/authentication/AuthenticationUseCaseImplSpec.kt
@@ -0,0 +1,99 @@
+package io.homeassistant.companion.android.domain.authentication
+
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.mockk
+import kotlinx.coroutines.runBlocking
+import org.assertj.core.api.Assertions.assertThat
+import org.spekframework.spek2.Spek
+import org.spekframework.spek2.style.specification.describe
+import java.net.URL
+
+
+object AuthenticationUseCaseImplSpec : Spek({
+
+    describe("authentication use case") {
+        val authenticationRepository by memoized { mockk<AuthenticationRepository>(relaxUnitFun = true) }
+        val useCase by memoized { AuthenticationUseCaseImpl(authenticationRepository) }
+
+        describe("save url") {
+            beforeEachTest {
+                runBlocking { useCase.saveUrl(URL("https://demo.home-assistant.io/")) }
+            }
+
+            it("should call the repository") {
+                coVerify { authenticationRepository.saveUrl(URL("https://demo.home-assistant.io/")) }
+            }
+        }
+
+        describe("register authorization code") {
+            beforeEachTest {
+                runBlocking { useCase.registerAuthorizationCode("123456") }
+            }
+
+            it("should call the repository") {
+                coVerify { authenticationRepository.registerAuthorizationCode("123456") }
+            }
+        }
+
+        describe("retrieve external authentication") {
+            lateinit var externalAuth: String
+            beforeEachTest {
+                coEvery { authenticationRepository.retrieveExternalAuthentication() } returns "{\"access_token\":\"ABCDEFGH\",\"expires_in\":1800}"
+                externalAuth = runBlocking { useCase.retrieveExternalAuthentication() }
+            }
+
+            it("should return the repository value") {
+                assertThat(externalAuth).isEqualTo("{\"access_token\":\"ABCDEFGH\",\"expires_in\":1800}")
+            }
+        }
+
+        describe("revoke session") {
+            beforeEachTest {
+                runBlocking { useCase.revokeSession() }
+            }
+
+            it("should call the repository") {
+                coVerify { authenticationRepository.revokeSession() }
+            }
+        }
+
+        describe("session state") {
+            lateinit var sessionState: SessionState
+            beforeEachTest {
+                coEvery { authenticationRepository.getSessionState() } returns SessionState.CONNECTED
+                sessionState = runBlocking { useCase.getSessionState() }
+            }
+
+            it("should return the given SessionState") {
+                assertThat(sessionState).isEqualTo(SessionState.CONNECTED)
+            }
+        }
+
+        describe("get url") {
+            var url: URL? = null
+            beforeEachTest {
+                coEvery { authenticationRepository.getUrl() } returns URL("https://demo.home-assistant.io/")
+                url = runBlocking { useCase.getUrl() }
+            }
+
+            it("should return the given url") {
+                assertThat(url).isEqualTo(URL("https://demo.home-assistant.io/"))
+            }
+        }
+
+        describe("build authentication url") {
+            lateinit var url: URL
+            beforeEachTest {
+                coEvery {
+                    authenticationRepository.buildAuthenticationUrl("homeassistant://auth-callback")
+                } returns URL("https://demo.home-assistant.io/auth/authorize?response_type=code&client_id=https://home-assistant.io/android&redirect_uri=homeassistant://auth-callback")
+                url = runBlocking { useCase.buildAuthenticationUrl("homeassistant://auth-callback") }
+            }
+
+            it("should return the given url") {
+                assertThat(url).isEqualTo(URL("https://demo.home-assistant.io/auth/authorize?response_type=code&client_id=https://home-assistant.io/android&redirect_uri=homeassistant://auth-callback"))
+            }
+        }
+    }
+})
\ No newline at end of file
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
new file mode 100644
index 00000000000..95be3019d58
--- /dev/null
+++ b/gradle/dependencies.gradle
@@ -0,0 +1,17 @@
+ext {
+    projectSdkVersion = '29'
+    projectMinSdkVersion = '21'
+
+    retrofit2Version = '2.6.2'
+    okhttp3Version = '4.2.2'
+    appCompatVersion = '1.1.0'
+    constraintLayoutversion = '1.1.3'
+    coroutinesVersion = '1.3.2'
+    daggerVersion = '2.25.2'
+    threeTenAbpVersion = '1.2.1'
+    threeTenBpVersion = '1.4.0'
+
+    assertJVersion = '3.13.2'
+    mockkVersion = '1.9.3'
+    spek2Version = '2.0.8'
+}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index e7b4def49cb..d84169f9814 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,4 @@
-include ':app'
+include ':data',
+        ':domain',
+        ':common',
+        ':app'