diff --git a/.editorconfig b/.editorconfig
index 0861e13..448817d 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -2,4 +2,4 @@
 # Comma-separated list of rules to disable (Since 0.34.0)
 # Note that rules in any ruleset other than the standard ruleset will need to be prefixed
 # by the ruleset identifier.
-disabled_rules=import-ordering,experimental:annotation
+disabled_rules=no-wildcard-imports,import-ordering,experimental:annotation
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 17eca57..87c89b5 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -24,7 +24,7 @@ jobs:
         bundle install --path vendor/bundle    
     # Runs build with Gradle
     - name: Build with Fastlane
-      run: bundle exec fastlane debug_dev
+      run: bundle exec fastlane debug
     - name: Send notification of build result
       uses: 8398a7/action-slack@v3
       with:
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 4404972..30de1d6 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,14 +4,18 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="delegatedBuild" value="false" />
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
+            <option value="$PROJECT_DIR$/buildSrc" />
+            <option value="$PROJECT_DIR$/data" />
+            <option value="$PROJECT_DIR$/domain" />
+            <option value="$PROJECT_DIR$/usecases" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7..38b67fd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GithubSharedProjectSettings">
+    <option name="branchProtectionPatterns">
+      <list>
+        <option value="develop" />
+      </list>
+    </option>
+  </component>
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
diff --git a/app/build.gradle b/app/build.gradle
index 2eb76fd..88b125b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,14 +1,11 @@
-apply plugin: 'com.android.application'
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "kotlin-kapt"
+    id "com.google.gms.google-services"
+    id "com.google.firebase.crashlytics"
 
-apply plugin: 'kotlin-android'
-
-apply plugin: 'kotlin-kapt'
-
-apply plugin: 'dagger.hilt.android.plugin'
-
-apply plugin: 'com.google.gms.google-services'
-
-apply plugin: 'com.google.firebase.crashlytics'
+}
 
 android {
     compileSdkVersion 31
@@ -18,7 +15,7 @@ android {
         targetSdkVersion 31
         versionCode 42
         versionName "1.0"
-        testInstrumentationRunner 'com.rootstrap.android.CustomTestRunner'
+        testInstrumentationRunner "com.rootstrap.android.CustomTestRunner"
     }
 
     compileOptions {
@@ -32,7 +29,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = "1.8"
     }
 
     signingConfigs {
@@ -45,50 +42,37 @@ android {
     }
 
     buildTypes {
-        debug {
-            minifyEnabled false
-        }
-
-        release {
-            signingConfig signingConfigs.releaseConfig
+        getByName("debug") {
+            applicationIdSuffix = ".debug"
+            versionNameSuffix "-debug"
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-
-    kapt {
-        correctErrorTypes true
-    }
-
-    flavorDimensions "server"
-
-    productFlavors {
-        dev {
-            dimension "server"
-            applicationIdSuffix ".dev"
-            versionNameSuffix "-dev"
             buildConfigField("String", "API_URL", "\"https://rails5-api-base.herokuapp.com/api/v1/\"")
             buildConfigField("String", "SECURE_KEY_ALIAS", "\"$projectKeyAlias\"")
             buildConfigField("String", "SECURE_FILE_NAME", "\"appPreferencesDev\"")
         }
 
-        staging {
-            dimension "server"
-            applicationIdSuffix ".staging"
-            versionNameSuffix "-staging"
+        create("staging") {
+            initWith(getByName("debug"))
+            applicationIdSuffix = ".staging"
+            initWith(getByName("debug"))
             buildConfigField("String", "API_URL", "\"https://proj-staging.herokuapp.com/api/\"")
-            buildConfigField("String", "SECURE_KEY_ALIAS", "\"$projectKeyAlias\"")
             buildConfigField("String", "SECURE_FILE_NAME", "\"appPreferencesStaging\"")
         }
 
-        prod {
-            dimension "server"
+        getByName("release") {
+            signingConfig signingConfigs.releaseConfig
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             buildConfigField("String", "API_URL", "\"https://proj-production.herokuapp.com/api/\"")
             buildConfigField("String", "SECURE_KEY_ALIAS", "\"$projectKeyAlias\"")
             buildConfigField("String", "SECURE_FILE_NAME", "\"appPreferences\"")
         }
     }
 
+    kapt {
+        correctErrorTypes true
+    }
+
     applicationVariants.all { variant ->
         variant.outputs.all { output ->
             def apk = output.outputFile
@@ -139,80 +123,20 @@ android {
 }
 
 dependencies {
-    def room_version = "2.3.0"
-    def lifecycle_version = "2.4.0"
-    def mockkVersion = '1.12.0'
+
+    implementation project(":data")
+    implementation project(":domain")
+    implementation project(":usecases")
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.1'
-    implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation "androidx.preference:preference-ktx:1.1.1"
-    implementation 'com.google.android.material:material:1.4.0'
-    testImplementation 'junit:junit:4.13.1'
-    testImplementation 'org.mockito:mockito-core:2.28.2'
-    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.1"
-    testImplementation 'android.arch.core:core-testing:1.1.1'
-    testImplementation "io.mockk:mockk:$mockkVersion"
-
-    androidTestImplementation 'androidx.test:runner:1.4.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.4.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
-    androidTestImplementation 'androidx.test:rules:1.4.0'
-    androidTestImplementation 'com.squareup.okhttp3:mockwebserver:4.3.1'
-
-    //---- ROOM ----
-    implementation "androidx.room:room-runtime:$room_version"
-    kapt "androidx.room:room-compiler:$room_version"
-    // Kotlin Extensions and Coroutines support for Room
-    implementation "androidx.room:room-ktx:$room_version"
-
-    //---- LIFECYCLE ----]
-    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
-
-    //---- GOOGLE JSON SERIALIZER/DESERIALIZER ----
-    implementation 'com.google.code.gson:gson:2.8.6'
-
-    //---- MixPanel ----
-    implementation 'com.mixpanel.android:mixpanel-android:5.6.1'
-
-    //---- Firebase ----
-    implementation platform('com.google.firebase:firebase-bom:28.4.2')
-    implementation 'com.google.firebase:firebase-core:20.0.0'
-    implementation 'com.google.firebase:firebase-analytics-ktx'
-    implementation 'com.google.firebase:firebase-crashlytics-ktx'
-    implementation 'org.jetbrains.kotlin:kotlin-reflect:1.5.31'
-
-    //---- Image ----
-    implementation group: 'com.github.bumptech.glide', name: 'glide', version: '4.10.0'
-
-    //---- Network ----
-    implementation 'com.squareup.retrofit2:retrofit:2.6.2'
-    implementation 'com.squareup.moshi:moshi-kotlin:1.12.0'
-    implementation 'com.squareup.retrofit2:converter-moshi:2.5.0'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.3.1'
-
-    //---- Events ----
-    implementation 'com.squareup:otto:1.3.8'
-
-    //---- Linters ----
-    ktlint "com.pinterest:ktlint:0.35.0"
-
-    //---- Hilt ----
-    implementation "com.google.dagger:hilt-android:$hilt_version"
-    kapt "com.google.dagger:hilt-android-compiler:$hilt_version"
-    kapt 'androidx.hilt:hilt-compiler:1.0.0'
-    androidTestImplementation "com.google.dagger:hilt-android-testing:$hilt_version"
-    kaptAndroidTest "com.google.dagger:hilt-android-compiler:$hilt_version"
-
-    //security crypto
-    implementation "androidx.security:security-crypto:1.1.0-alpha03"
+
+    implementation androidLibs.values()
+    implementation androidDataLibs.values()
+    implementation kotlinLibs.values()
+    implementation platform(Libs.firebaseBom)
+    implementation libs.values()
+    kapt androidKaptLibs.values()
+    ktlint ktlintLibs.values()
+    testImplementation testLibs.values()
+    androidTestImplementation androidTestLibs.values()
 }
diff --git a/app/google-services.json b/app/google-services.json
index 3ebdcd7..8d0a5b6 100644
--- a/app/google-services.json
+++ b/app/google-services.json
@@ -39,7 +39,7 @@
       "client_info": {
         "mobilesdk_app_id": "1:289773649665:android:d4cfc41fd5630d4bf1e500",
         "android_client_info": {
-          "package_name": "com.rootstrap.android.dev"
+          "package_name": "com.rootstrap.android.debug"
         }
       },
       "oauth_client": [
diff --git a/app/src/androidTest/java/com/rootstrap/android/tests/ProfileActivityTest.kt b/app/src/androidTest/java/com/rootstrap/android/tests/ProfileActivityTest.kt
index 54c03d4..12d8e13 100644
--- a/app/src/androidTest/java/com/rootstrap/android/tests/ProfileActivityTest.kt
+++ b/app/src/androidTest/java/com/rootstrap/android/tests/ProfileActivityTest.kt
@@ -5,10 +5,9 @@ import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import com.rootstrap.android.R
-import com.rootstrap.android.ui.activity.main.ProfileActivity
-import com.rootstrap.android.ui.activity.main.SignUpActivity
+import com.rootstrap.android.ui.profile.ProfileActivity
+import com.rootstrap.android.ui.login.SignUpActivity
 import com.rootstrap.android.utils.BaseTests
-import dagger.hilt.android.testing.HiltAndroidTest
 import okhttp3.mockwebserver.Dispatcher
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.RecordedRequest
@@ -17,7 +16,6 @@ import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
 
-@HiltAndroidTest
 class ProfileActivityTest : BaseTests() {
 
     private lateinit var activity: ProfileActivity
diff --git a/app/src/androidTest/java/com/rootstrap/android/tests/SignInActivityTest.kt b/app/src/androidTest/java/com/rootstrap/android/tests/SignInActivityTest.kt
index b36cfab..313e2e4 100644
--- a/app/src/androidTest/java/com/rootstrap/android/tests/SignInActivityTest.kt
+++ b/app/src/androidTest/java/com/rootstrap/android/tests/SignInActivityTest.kt
@@ -3,9 +3,9 @@ package com.rootstrap.android.tests
 import androidx.test.core.app.ActivityScenario
 import com.google.gson.Gson
 import com.rootstrap.android.R
-import com.rootstrap.android.network.models.UserSerializer
-import com.rootstrap.android.ui.activity.main.ProfileActivity
-import com.rootstrap.android.ui.activity.main.SignInActivity
+import com.rootstrap.data.dto.response.UserSerializer
+import com.rootstrap.android.ui.profile.ProfileActivity
+import com.rootstrap.android.ui.login.SignInActivity
 import com.rootstrap.android.utils.BaseTests
 import dagger.hilt.android.testing.HiltAndroidTest
 import okhttp3.mockwebserver.Dispatcher
diff --git a/app/src/androidTest/java/com/rootstrap/android/tests/SignUpActivityTest.kt b/app/src/androidTest/java/com/rootstrap/android/tests/SignUpActivityTest.kt
index 8409a87..2c61dd1 100644
--- a/app/src/androidTest/java/com/rootstrap/android/tests/SignUpActivityTest.kt
+++ b/app/src/androidTest/java/com/rootstrap/android/tests/SignUpActivityTest.kt
@@ -3,10 +3,10 @@ package com.rootstrap.android.tests
 import androidx.test.core.app.ActivityScenario
 import com.google.gson.Gson
 import com.rootstrap.android.R
-import com.rootstrap.android.network.models.UserSerializer
-import com.rootstrap.android.ui.activity.main.ProfileActivity
-import com.rootstrap.android.ui.activity.main.SignInActivity
-import com.rootstrap.android.ui.activity.main.SignUpActivity
+import com.rootstrap.data.dto.response.UserSerializer
+import com.rootstrap.android.ui.profile.ProfileActivity
+import com.rootstrap.android.ui.login.SignInActivity
+import com.rootstrap.android.ui.login.SignUpActivity
 import com.rootstrap.android.utils.BaseTests
 import dagger.hilt.android.testing.HiltAndroidTest
 import okhttp3.mockwebserver.Dispatcher
diff --git a/app/src/androidTest/java/com/rootstrap/android/tests/utils/PrefTests.kt b/app/src/androidTest/java/com/rootstrap/android/tests/utils/PrefTests.kt
index fb06073..6e4f674 100644
--- a/app/src/androidTest/java/com/rootstrap/android/tests/utils/PrefTests.kt
+++ b/app/src/androidTest/java/com/rootstrap/android/tests/utils/PrefTests.kt
@@ -2,7 +2,7 @@ package com.rootstrap.android.tests.utils
 
 import android.content.SharedPreferences
 import androidx.security.crypto.EncryptedSharedPreferences
-import com.rootstrap.android.util.Prefs
+import com.rootstrap.data.util.Prefs
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
 import org.junit.Assert
diff --git a/app/src/androidTest/java/com/rootstrap/android/utils/BaseTests.kt b/app/src/androidTest/java/com/rootstrap/android/utils/BaseTests.kt
index 2be338b..bf29e1b 100644
--- a/app/src/androidTest/java/com/rootstrap/android/utils/BaseTests.kt
+++ b/app/src/androidTest/java/com/rootstrap/android/utils/BaseTests.kt
@@ -13,9 +13,9 @@ import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
 import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry
 import androidx.test.runner.lifecycle.Stage
-import com.rootstrap.android.network.managers.session.SessionManager
-import com.rootstrap.android.network.models.User
-import com.rootstrap.android.network.providers.ServiceProviderModule
+import com.rootstrap.data.managers.session.SessionManager
+import com.rootstrap.data.dto.response.UserDTO
+import com.rootstrap.data.api.ApiServiceFactory
 import dagger.hilt.android.testing.HiltAndroidRule
 import okhttp3.mockwebserver.Dispatcher
 import org.junit.Rule
@@ -38,7 +38,7 @@ open class BaseTests {
 
     open fun before() {
         mockServer.startServer()
-        ServiceProviderModule.URL_API = mockServer.server().url("/").toString()
+        ApiServiceFactory.URL_API = mockServer.server().url("/").toString()
         hiltRule.inject()
     }
 
@@ -46,7 +46,7 @@ open class BaseTests {
         mockServer.stopServer()
     }
 
-    open fun testUser() = User(
+    open fun testUser() = UserDTO(
         "9032",
         "user123@mail.com",
         "Richard",
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9f08fae..2d525cb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,7 +16,7 @@
         android:theme="@style/AppTheme">
 
         <activity
-            android:name=".ui.activity.main.SignUpActivity"
+            android:name=".ui.login.SignUpActivity"
             android:screenOrientation="portrait"
             android:exported="true">
             <intent-filter>
@@ -26,11 +26,11 @@
         </activity>
 
         <activity
-            android:name=".ui.activity.main.ProfileActivity"
+            android:name=".ui.profile.ProfileActivity"
             android:screenOrientation="portrait" />
 
         <activity
-            android:name=".ui.activity.main.SignInActivity"
+            android:name=".ui.login.SignInActivity"
             android:screenOrientation="portrait" />
 
     </application>
diff --git a/app/src/main/java/com/rootstrap/android/App.kt b/app/src/main/java/com/rootstrap/android/App.kt
index 7ca19b3..9603c11 100644
--- a/app/src/main/java/com/rootstrap/android/App.kt
+++ b/app/src/main/java/com/rootstrap/android/App.kt
@@ -1,18 +1,25 @@
 package com.rootstrap.android
 
 import android.app.Application
-import com.rootstrap.android.metrics.Analytics
-import com.rootstrap.android.metrics.GoogleAnalytics
-import dagger.hilt.android.HiltAndroidApp
+import com.rootstrap.android.di.initDI
+import com.rootstrap.data.metrics.Analytics
+import com.rootstrap.data.metrics.GoogleAnalytics
+import com.rootstrap.data.api.interceptors.WifiService
+import org.koin.core.KoinExperimentalAPI
 
-@HiltAndroidApp
+@KoinExperimentalAPI
 class App : Application() {
 
     override fun onCreate() {
         super.onCreate()
-
+        initDI()
+        setupServices()
         Analytics.addProvider(GoogleAnalytics(this))
         // You need the api key in order to use MixPanel
         // Analytics.addProvider(MixPanelAnalytics(this))
     }
+
+    private fun setupServices() {
+        WifiService.instance.initializeWithApplicationContext(applicationContext)
+    }
 }
diff --git a/app/src/main/java/com/rootstrap/android/database/AppDataBase.kt b/app/src/main/java/com/rootstrap/android/database/AppDataBase.kt
deleted file mode 100644
index bcf5c65..0000000
--- a/app/src/main/java/com/rootstrap/android/database/AppDataBase.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.rootstrap.android.database
-
-class AppDataBase {
-    // TODO
-}
diff --git a/app/src/main/java/com/rootstrap/android/di/DI.kt b/app/src/main/java/com/rootstrap/android/di/DI.kt
new file mode 100644
index 0000000..c3115d8
--- /dev/null
+++ b/app/src/main/java/com/rootstrap/android/di/DI.kt
@@ -0,0 +1,84 @@
+package com.rootstrap.android.di
+
+import android.app.Application
+import android.content.Context
+import android.content.SharedPreferences
+import com.rootstrap.android.BuildConfig
+import com.rootstrap.android.ui.login.SignInActivity
+import com.rootstrap.android.ui.login.SignInActivityViewModel
+import com.rootstrap.android.ui.login.SignUpActivity
+import com.rootstrap.android.ui.login.SignUpActivityViewModel
+import com.rootstrap.android.ui.profile.ProfileActivity
+import com.rootstrap.android.ui.profile.ProfileActivityViewModel
+import com.rootstrap.android.util.dispatcher.AppDispatcherProvider
+import com.rootstrap.android.util.dispatcher.DispatcherProvider
+import com.rootstrap.data.api.ApiProvider
+import com.rootstrap.data.api.ApiServiceFactory
+import com.rootstrap.data.api.interceptors.AuthenticationInterceptor
+import com.rootstrap.data.api.interceptors.ConnectivityInterceptor
+import com.rootstrap.data.api.interceptors.HeadersInterceptor
+import com.rootstrap.data.api.interceptors.ResponseInterceptor
+import com.rootstrap.data.managers.session.SessionManager
+import com.rootstrap.data.managers.session.SessionManagerImpl
+import com.rootstrap.data.repository.UserRepository
+import com.rootstrap.data.util.Prefs
+import com.rootstrap.usecases.SignIn
+import com.rootstrap.usecases.SignOut
+import com.rootstrap.usecases.SignUp
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+import org.koin.android.ext.koin.androidApplication
+import org.koin.android.ext.koin.androidContext
+import org.koin.android.ext.koin.androidLogger
+import org.koin.androidx.fragment.koin.fragmentFactory
+import org.koin.androidx.viewmodel.dsl.viewModel
+import org.koin.core.KoinExperimentalAPI
+import org.koin.core.context.startKoin
+import org.koin.core.logger.Level
+import org.koin.dsl.module
+
+@KoinExperimentalAPI
+fun Application.initDI() {
+    startKoin {
+        androidLogger(if (BuildConfig.DEBUG) Level.ERROR else Level.NONE)
+        androidContext(this@initDI)
+        fragmentFactory()
+        modules(appModule, dataModule, scopesModule)
+    }
+}
+
+val appModule = module {
+    single<CoroutineDispatcher> { Dispatchers.Main }
+    single { SignUp(get()) }
+    single { SignIn(get()) }
+    single { SignOut(get()) }
+
+    viewModel { SignUpActivityViewModel(get(), get(), get()) }
+    viewModel { SignInActivityViewModel(get(), get(), get()) }
+    viewModel { ProfileActivityViewModel(get(), get(), get()) }
+}
+
+val dataModule = module {
+    single { ApiServiceFactory(get(), get(), get()) }
+    single { HeadersInterceptor() }
+    single { ConnectivityInterceptor() }
+    single { AuthenticationInterceptor(get()) }
+    single { ResponseInterceptor(get(), get()) }
+    single { ApiProvider(get()) }
+    single<SharedPreferences> {
+        androidApplication().getSharedPreferences(
+            "prefs",
+            Context.MODE_PRIVATE
+        )
+    }
+    single<DispatcherProvider> { AppDispatcherProvider() }
+    factory { Prefs(get()) }
+    factory { UserRepository(get()) }
+    single<SessionManager> { SessionManagerImpl(get()) }
+}
+
+private val scopesModule = module {
+    scope<SignUpActivity> {}
+    scope<SignInActivity> {}
+    scope<ProfileActivity> {}
+}
diff --git a/app/src/main/java/com/rootstrap/android/models/Model.kt b/app/src/main/java/com/rootstrap/android/models/Model.kt
deleted file mode 100644
index 1a19f2d..0000000
--- a/app/src/main/java/com/rootstrap/android/models/Model.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.rootstrap.android.models
-
-class Model
diff --git a/app/src/main/java/com/rootstrap/android/network/managers/ManagerModule.kt b/app/src/main/java/com/rootstrap/android/network/managers/ManagerModule.kt
deleted file mode 100644
index 2da2571..0000000
--- a/app/src/main/java/com/rootstrap/android/network/managers/ManagerModule.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.rootstrap.android.network.managers
-
-import com.rootstrap.android.network.managers.session.SessionManager
-import com.rootstrap.android.network.managers.session.SessionManagerImpl
-import com.rootstrap.android.network.managers.user.UserManager
-import com.rootstrap.android.network.managers.user.UserManagerImpl
-import dagger.Binds
-import dagger.Module
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
-import javax.inject.Singleton
-
-@Module
-@InstallIn(SingletonComponent::class)
-abstract class ManagerModule {
-
-    @Binds
-    @Singleton
-    abstract fun bindSessionManager(sessionManagerImpl: SessionManagerImpl): SessionManager
-
-    @Binds
-    @Singleton
-    abstract fun bindUserManager(userManagerImplImpl: UserManagerImpl): UserManager
-}
diff --git a/app/src/main/java/com/rootstrap/android/network/managers/user/UserManager.kt b/app/src/main/java/com/rootstrap/android/network/managers/user/UserManager.kt
deleted file mode 100644
index a8e487a..0000000
--- a/app/src/main/java/com/rootstrap/android/network/managers/user/UserManager.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.rootstrap.android.network.managers.user
-
-import com.rootstrap.android.network.models.User
-import com.rootstrap.android.network.models.UserSerializer
-import com.rootstrap.android.util.extensions.Data
-
-interface UserManager {
-    suspend fun signUp(user: User): Result<Data<UserSerializer>>
-    suspend fun signIn(user: User): Result<Data<UserSerializer>>
-    suspend fun signOut(): Result<Data<Void>>
-}
diff --git a/app/src/main/java/com/rootstrap/android/network/managers/user/UserManagerImpl.kt b/app/src/main/java/com/rootstrap/android/network/managers/user/UserManagerImpl.kt
deleted file mode 100644
index 6c048d2..0000000
--- a/app/src/main/java/com/rootstrap/android/network/managers/user/UserManagerImpl.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.rootstrap.android.network.managers.user
-
-import com.rootstrap.android.network.models.User
-import com.rootstrap.android.network.models.UserSerializer
-import com.rootstrap.android.network.services.ApiService
-import com.rootstrap.android.util.extensions.ActionCallback
-import com.rootstrap.android.util.extensions.Data
-import javax.inject.Inject
-
-/**
- * Singleton class
- * */
-class UserManagerImpl @Inject constructor(private val service: ApiService) : UserManager {
-
-    override suspend fun signUp(user: User): Result<Data<UserSerializer>> =
-        ActionCallback.call(service.signUp(UserSerializer(user)))
-
-    override suspend fun signIn(user: User): Result<Data<UserSerializer>> =
-        ActionCallback.call(service.signIn(UserSerializer(user)))
-
-    override suspend fun signOut(): Result<Data<Void>> =
-        ActionCallback.call(service.signOut())
-}
diff --git a/app/src/main/java/com/rootstrap/android/network/models/User.kt b/app/src/main/java/com/rootstrap/android/network/models/User.kt
deleted file mode 100644
index 99185e8..0000000
--- a/app/src/main/java/com/rootstrap/android/network/models/User.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.rootstrap.android.network.models
-
-import com.squareup.moshi.Json
-
-data class User(
-    @Json(name = "id") val id: String = "",
-    @Json(name = "email") var email: String = "",
-    @Json(name = "first_name") var firstName: String = "",
-    @Json(name = "last_name") var lastName: String = "",
-    @Json(name = "phone_number") var phone: String = "",
-    @Json(name = "password") val password: String = "",
-    @Json(name = "username") val username: String = ""
-)
-
-data class UserSerializer(@Json(name = "user") val user: User)
diff --git a/app/src/main/java/com/rootstrap/android/network/providers/ServiceProviderModule.kt b/app/src/main/java/com/rootstrap/android/network/providers/ServiceProviderModule.kt
deleted file mode 100644
index c7bc33c..0000000
--- a/app/src/main/java/com/rootstrap/android/network/providers/ServiceProviderModule.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.rootstrap.android.network.providers
-
-import com.rootstrap.android.BuildConfig
-import com.rootstrap.android.network.services.AuthenticationInterceptor
-import com.rootstrap.android.network.services.HeadersInterceptor
-import com.rootstrap.android.network.services.ResponseInterceptor
-import com.squareup.moshi.Moshi
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
-import dagger.hilt.components.SingletonComponent
-import okhttp3.OkHttpClient
-import okhttp3.logging.HttpLoggingInterceptor
-import retrofit2.Retrofit
-import retrofit2.converter.moshi.MoshiConverterFactory
-import javax.inject.Singleton
-
-@Module
-@InstallIn(SingletonComponent::class)
-class ServiceProviderModule {
-
-    @Provides
-    @Singleton
-    fun provideOkHttpClient(
-        authenticationInterceptor: AuthenticationInterceptor,
-        responseInterceptor: ResponseInterceptor
-    ): OkHttpClient {
-        val httpInterceptorLevel = if (BuildConfig.DEBUG) HttpLoggingInterceptor.Level.BODY
-            else HttpLoggingInterceptor.Level.BASIC
-
-        return OkHttpClient.Builder()
-                .addInterceptor(HeadersInterceptor())
-                .addInterceptor(authenticationInterceptor)
-                .addInterceptor(responseInterceptor)
-                .addInterceptor(HttpLoggingInterceptor().setLevel(httpInterceptorLevel))
-                .build()
-    }
-
-    @Provides
-    @Singleton
-    fun provideRetrofit(okHttpClient: OkHttpClient): Retrofit {
-        val url = URL_API ?: BuildConfig.API_URL
-        val moshi = Moshi.Builder()
-            .add(KotlinJsonAdapterFactory())
-            .build()
-        return Retrofit.Builder()
-                .baseUrl(url)
-                .addConverterFactory(MoshiConverterFactory.create(moshi).withNullSerialization())
-                .client(okHttpClient)
-                .build()
-    }
-
-    companion object {
-        var URL_API: String? = null
-    }
-}
diff --git a/app/src/main/java/com/rootstrap/android/network/services/ApiModule.kt b/app/src/main/java/com/rootstrap/android/network/services/ApiModule.kt
deleted file mode 100644
index 66b0593..0000000
--- a/app/src/main/java/com/rootstrap/android/network/services/ApiModule.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.rootstrap.android.network.services
-
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
-import retrofit2.Retrofit
-
-@Module
-@InstallIn(SingletonComponent::class)
-class ApiModule {
-
-    @Provides
-    fun provideApiService(retrofit: Retrofit): ApiService {
-        return retrofit.create(ApiService::class.java)
-    }
-}
diff --git a/app/src/main/java/com/rootstrap/android/network/services/ApiService.kt b/app/src/main/java/com/rootstrap/android/network/services/ApiService.kt
deleted file mode 100644
index 2a832fd..0000000
--- a/app/src/main/java/com/rootstrap/android/network/services/ApiService.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.rootstrap.android.network.services
-
-import com.rootstrap.android.network.models.UserSerializer
-import retrofit2.Call
-import retrofit2.http.Body
-import retrofit2.http.DELETE
-import retrofit2.http.POST
-
-interface ApiService {
-
-    @POST("users/")
-    fun signUp(@Body user: UserSerializer): Call<UserSerializer>
-
-    @POST("users/sign_in")
-    fun signIn(@Body user: UserSerializer): Call<UserSerializer>
-
-    @DELETE("users/sign_out")
-    fun signOut(): Call<Void>
-}
diff --git a/app/src/main/java/com/rootstrap/android/ui/activity/main/ProfileActivityViewModel.kt b/app/src/main/java/com/rootstrap/android/ui/activity/main/ProfileActivityViewModel.kt
deleted file mode 100644
index e8a7a04..0000000
--- a/app/src/main/java/com/rootstrap/android/ui/activity/main/ProfileActivityViewModel.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.rootstrap.android.ui.activity.main
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.viewModelScope
-import com.rootstrap.android.network.managers.session.SessionManager
-import com.rootstrap.android.network.managers.user.UserManager
-import com.rootstrap.android.ui.base.BaseViewModel
-import com.rootstrap.android.util.NetworkState
-import com.rootstrap.android.util.extensions.ApiErrorType
-import com.rootstrap.android.util.extensions.ApiException
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-@HiltViewModel
-open class ProfileActivityViewModel @Inject constructor(
-    private val sessionManager: SessionManager,
-    private val userManager: UserManager
-) : BaseViewModel() {
-
-    private val _state = MutableLiveData<ProfileState>()
-    val state: LiveData<ProfileState>
-        get() = _state
-
-    fun signOut() {
-        _networkState.value = NetworkState.loading
-        viewModelScope.launch {
-            val result = userManager.signOut()
-            if (result.isSuccess) {
-                _networkState.value = NetworkState.idle
-                _state.value = ProfileState.signOutSuccess
-                sessionManager.signOut()
-            } else {
-                handleError(result.exceptionOrNull())
-            }
-        }
-    }
-
-    private fun handleError(exception: Throwable?) {
-        error = if (exception is ApiException && exception.errorType == ApiErrorType.apiError) {
-            exception.message
-        } else null
-
-        _networkState.value = NetworkState.idle
-        _networkState.value = NetworkState.error
-        _state.value = ProfileState.signOutFailure
-    }
-}
-
-enum class ProfileState {
-    signOutFailure,
-    signOutSuccess
-}
diff --git a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignInActivityViewModel.kt b/app/src/main/java/com/rootstrap/android/ui/activity/main/SignInActivityViewModel.kt
deleted file mode 100644
index 846f63c..0000000
--- a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignInActivityViewModel.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.rootstrap.android.ui.activity.main
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.viewModelScope
-import com.rootstrap.android.network.managers.session.SessionManager
-import com.rootstrap.android.network.managers.user.UserManager
-import com.rootstrap.android.network.models.User
-import com.rootstrap.android.ui.base.BaseViewModel
-import com.rootstrap.android.util.NetworkState
-import com.rootstrap.android.util.dispatcher.DispatcherProvider
-import com.rootstrap.android.util.extensions.ApiErrorType
-import com.rootstrap.android.util.extensions.ApiException
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-@HiltViewModel
-open class SignInActivityViewModel @Inject constructor(
-    private val sessionManager: SessionManager,
-    private val userManager: UserManager,
-    private val dispatcher: DispatcherProvider
-) : BaseViewModel() {
-
-    private val _state = MutableLiveData<SignInState>()
-    val state: LiveData<SignInState>
-        get() = _state
-
-    fun signIn(user: User) {
-        _networkState.value = NetworkState.loading
-        // Avoid using hardcoded dispatcher this way can be mocked later
-        viewModelScope.launch(dispatcher.io) {
-            val result = userManager.signIn(user = user)
-            if (result.isSuccess) {
-                result.getOrNull()?.value?.user?.let { user ->
-                    sessionManager.signIn(user)
-                }
-
-                _networkState.value = NetworkState.idle
-                _state.value = SignInState.signInSuccess
-            } else {
-                handleError(result.exceptionOrNull())
-            }
-        }
-    }
-
-    private fun handleError(exception: Throwable?) {
-        error = if (exception is ApiException && exception.errorType == ApiErrorType.apiError) {
-            exception.message
-        } else null
-
-        _networkState.value = NetworkState.error
-        _state.value = SignInState.signInFailure
-    }
-}
-
-enum class SignInState {
-    signInFailure,
-    signInSuccess
-}
diff --git a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignUpActivityViewModel.kt b/app/src/main/java/com/rootstrap/android/ui/activity/main/SignUpActivityViewModel.kt
deleted file mode 100644
index aa2d509..0000000
--- a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignUpActivityViewModel.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.rootstrap.android.ui.activity.main
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.viewModelScope
-import com.rootstrap.android.network.managers.session.SessionManager
-import com.rootstrap.android.network.managers.user.UserManager
-import com.rootstrap.android.network.models.User
-import com.rootstrap.android.ui.base.BaseViewModel
-import com.rootstrap.android.util.NetworkState
-import com.rootstrap.android.util.dispatcher.DispatcherProvider
-import com.rootstrap.android.util.extensions.ApiErrorType
-import com.rootstrap.android.util.extensions.ApiException
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-@HiltViewModel
-open class SignUpActivityViewModel @Inject constructor(
-    private val sessionManager: SessionManager,
-    private val userManager: UserManager,
-    private val dispatcher: DispatcherProvider
-) : BaseViewModel() {
-
-    private val _state = MutableLiveData<SignUpState>()
-    val state: LiveData<SignUpState>
-        get() = _state
-
-    fun signUp(user: User) {
-        _networkState.value = NetworkState.loading
-        // Avoid using hardcoded dispatcher this way can be mocked later
-        viewModelScope.launch(dispatcher.io) {
-            val result = userManager.signUp(user = user)
-
-            if (result.isSuccess) {
-                result.getOrNull()?.value?.user?.let { user ->
-                    sessionManager.signIn(user)
-                }
-
-                _networkState.value = NetworkState.idle
-                _state.value = SignUpState.signUpSuccess
-            } else {
-                handleError(result.exceptionOrNull())
-            }
-        }
-    }
-
-    private fun handleError(exception: Throwable?) {
-        error = if (exception is ApiException && exception.errorType == ApiErrorType.apiError) {
-            exception.message
-        } else null
-
-        _networkState.value = NetworkState.error
-        _state.value = SignUpState.signUpFailure
-    }
-}
-
-enum class SignUpState {
-    signUpFailure,
-    signUpSuccess
-}
diff --git a/app/src/main/java/com/rootstrap/android/ui/adapter/Adapter.kt b/app/src/main/java/com/rootstrap/android/ui/adapter/Adapter.kt
deleted file mode 100644
index 5249c60..0000000
--- a/app/src/main/java/com/rootstrap/android/ui/adapter/Adapter.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.rootstrap.android.ui.adapter
-
-class Adapter
diff --git a/app/src/main/java/com/rootstrap/android/ui/base/BaseActivity.kt b/app/src/main/java/com/rootstrap/android/ui/base/BaseActivity.kt
index 4b3765a..f630495 100644
--- a/app/src/main/java/com/rootstrap/android/ui/base/BaseActivity.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/base/BaseActivity.kt
@@ -3,11 +3,11 @@ package com.rootstrap.android.ui.base
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
-import androidx.appcompat.app.AppCompatActivity
 import com.rootstrap.android.util.LoadingDialogUtil
+import org.koin.androidx.scope.ScopeActivity
 
 @SuppressLint("Registered")
-open class BaseActivity : AppCompatActivity(), BaseView {
+open class BaseActivity : ScopeActivity(), BaseView {
 
     override fun showProgress() {
         LoadingDialogUtil.showProgress(this)
diff --git a/app/src/main/java/com/rootstrap/android/ui/base/BaseViewModel.kt b/app/src/main/java/com/rootstrap/android/ui/base/BaseViewModel.kt
index 5cda3e2..34d417b 100644
--- a/app/src/main/java/com/rootstrap/android/ui/base/BaseViewModel.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/base/BaseViewModel.kt
@@ -1,28 +1,18 @@
 package com.rootstrap.android.ui.base
 
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.OnLifecycleEvent
 import androidx.lifecycle.ViewModel
 import com.rootstrap.android.util.NetworkState
-import com.squareup.otto.Bus
 
 /**
  * A [ViewModel] base class
  * implement app general LiveData as Session or User
  * **/
-open class BaseViewModel : ViewModel(), LifecycleObserver {
+open class BaseViewModel : ViewModel() {
     var error: String? = null
 
     protected val _networkState = MutableLiveData<NetworkState>()
     val networkState: LiveData<NetworkState>
         get() = _networkState
-
-    @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
-    fun register() = Bus().register(this)
-
-    @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
-    fun unregister() = Bus().unregister(this)
 }
diff --git a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignInActivity.kt b/app/src/main/java/com/rootstrap/android/ui/login/SignInActivity.kt
similarity index 60%
rename from app/src/main/java/com/rootstrap/android/ui/activity/main/SignInActivity.kt
rename to app/src/main/java/com/rootstrap/android/ui/login/SignInActivity.kt
index 964581c..73ea7a7 100644
--- a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignInActivity.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/login/SignInActivity.kt
@@ -1,51 +1,45 @@
-package com.rootstrap.android.ui.activity.main
+package com.rootstrap.android.ui.login
 
 import android.Manifest
 import android.os.Bundle
-import androidx.activity.viewModels
 import androidx.lifecycle.Observer
 import com.rootstrap.android.R
 import com.rootstrap.android.databinding.ActivitySignInBinding
-import com.rootstrap.android.metrics.Analytics
-import com.rootstrap.android.metrics.PageEvents
-import com.rootstrap.android.metrics.VISIT_SIGN_IN
-import com.rootstrap.android.network.models.User
-import com.rootstrap.android.ui.view.AuthView
+import com.rootstrap.android.ui.profile.ProfileActivity
 import com.rootstrap.android.util.NetworkState
 import com.rootstrap.android.util.extensions.value
 import com.rootstrap.android.util.permissions.PermissionActivity
 import com.rootstrap.android.util.permissions.PermissionResponse
-import dagger.hilt.android.AndroidEntryPoint
+import com.rootstrap.data.dto.request.UserSignInRequest
+import com.rootstrap.data.metrics.Analytics
+import com.rootstrap.data.metrics.PageEvents
+import com.rootstrap.data.metrics.VISIT_SIGN_IN
+import org.koin.androidx.viewmodel.ext.android.viewModel
 
-@AndroidEntryPoint
-class SignInActivity : PermissionActivity(), AuthView {
+class SignInActivity : PermissionActivity() {
 
-    private val viewModel: SignInActivityViewModel by viewModels()
-    private val binding: ActivitySignInBinding by lazy {
-        ActivitySignInBinding.inflate(layoutInflater)
-    }
+    private val viewModel: SignInActivityViewModel by viewModel()
+    private lateinit var binding: ActivitySignInBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
+        binding = ActivitySignInBinding.inflate(layoutInflater)
         setContentView(binding.root)
         Analytics.track(PageEvents.visit(VISIT_SIGN_IN))
 
         binding.signInButton.setOnClickListener { signIn() }
 
-        lifecycle.addObserver(viewModel)
-
         setObservers()
         sampleAskForPermission()
     }
 
-    override fun showProfile() {
+    private fun showProfile() {
         startActivityClearTask(ProfileActivity())
     }
 
     private fun signIn() {
         with(binding) {
-            val user = User(
+            val user = UserSignInRequest(
                 email = emailEditText.value(),
                 password = passwordEditText.value()
             )
@@ -56,16 +50,19 @@ class SignInActivity : PermissionActivity(), AuthView {
     private fun setObservers() {
         viewModel.state.observe(this, Observer {
             when (it) {
-                SignInState.signInFailure -> showError(viewModel.error)
-                SignInState.signInSuccess -> showProfile()
+                SignInState.SIGN_IN_FAILURE -> showError(viewModel.error)
+                SignInState.SIGN_IN_SUCCESS -> showProfile()
             }
         })
 
         viewModel.networkState.observe(this, Observer {
             when (it) {
-                NetworkState.loading -> showProgress()
-                NetworkState.idle -> hideProgress()
-                else -> showError(viewModel.error ?: getString(R.string.default_error))
+                NetworkState.LOADING -> showProgress()
+                NetworkState.IDLE -> hideProgress()
+                else -> {
+                    hideProgress()
+                    showError(viewModel.error ?: getString(R.string.default_error))
+                }
             }
         })
     }
diff --git a/app/src/main/java/com/rootstrap/android/ui/login/SignInActivityViewModel.kt b/app/src/main/java/com/rootstrap/android/ui/login/SignInActivityViewModel.kt
new file mode 100644
index 0000000..8a88a00
--- /dev/null
+++ b/app/src/main/java/com/rootstrap/android/ui/login/SignInActivityViewModel.kt
@@ -0,0 +1,61 @@
+package com.rootstrap.android.ui.login
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
+import com.rootstrap.android.ui.base.BaseViewModel
+import com.rootstrap.android.util.NetworkState
+import com.rootstrap.android.util.dispatcher.DispatcherProvider
+import com.rootstrap.data.api.ApiException
+import com.rootstrap.data.dto.request.UserSignInRequest
+import com.rootstrap.data.dto.request.UserSignInRequestSerializer
+import com.rootstrap.data.dto.response.DataResult
+import com.rootstrap.data.dto.response.toDomainUser
+import com.rootstrap.data.managers.session.SessionManager
+import com.rootstrap.usecases.SignIn
+import kotlinx.coroutines.launch
+
+open class SignInActivityViewModel(
+    private val signIn: SignIn,
+    private val sessionManager: SessionManager,
+    private val dispatcherProvider: DispatcherProvider
+) : BaseViewModel() {
+
+    private val _state = MutableLiveData<SignInState>()
+    val state: LiveData<SignInState>
+        get() = _state
+
+    fun signIn(user: UserSignInRequest) {
+        _networkState.value = NetworkState.LOADING
+        viewModelScope.launch(dispatcherProvider.io) {
+            when (val result = signIn.invoke(UserSignInRequestSerializer(user))) {
+                is DataResult.Success -> {
+                    result.data?.user?.let { user ->
+                        sessionManager.signIn(user.toDomainUser())
+                    }
+
+                    restoreNetworkState()
+                    _state.postValue(SignInState.SIGN_IN_SUCCESS)
+                }
+                is DataResult.Error -> {
+                    handleError(result.exception)
+                }
+            }
+        }
+    }
+
+    private fun handleError(exception: ApiException?) {
+        error = exception?.message
+        _networkState.postValue(NetworkState.ERROR)
+        _state.postValue(SignInState.SIGN_IN_FAILURE)
+    }
+
+    private fun restoreNetworkState() {
+        _networkState.postValue(NetworkState.IDLE)
+    }
+}
+
+enum class SignInState {
+    SIGN_IN_FAILURE,
+    SIGN_IN_SUCCESS
+}
diff --git a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignUpActivity.kt b/app/src/main/java/com/rootstrap/android/ui/login/SignUpActivity.kt
similarity index 62%
rename from app/src/main/java/com/rootstrap/android/ui/activity/main/SignUpActivity.kt
rename to app/src/main/java/com/rootstrap/android/ui/login/SignUpActivity.kt
index 8f75729..7a1be4b 100644
--- a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignUpActivity.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/login/SignUpActivity.kt
@@ -1,32 +1,29 @@
-package com.rootstrap.android.ui.activity.main
+package com.rootstrap.android.ui.login
 
 import android.content.Intent
 import android.os.Bundle
-import androidx.activity.viewModels
 import androidx.lifecycle.Observer
 import com.rootstrap.android.R
 import com.rootstrap.android.databinding.ActivitySignUpBinding
-import com.rootstrap.android.metrics.Analytics
-import com.rootstrap.android.metrics.PageEvents
-import com.rootstrap.android.metrics.VISIT_SIGN_UP
-import com.rootstrap.android.network.models.User
 import com.rootstrap.android.ui.base.BaseActivity
-import com.rootstrap.android.ui.view.AuthView
+import com.rootstrap.android.ui.profile.ProfileActivity
 import com.rootstrap.android.util.NetworkState
 import com.rootstrap.android.util.extensions.value
-import dagger.hilt.android.AndroidEntryPoint
+import com.rootstrap.data.dto.request.UserSignUpRequest
+import com.rootstrap.data.metrics.Analytics
+import com.rootstrap.data.metrics.PageEvents
+import com.rootstrap.data.metrics.VISIT_SIGN_UP
+import org.koin.androidx.viewmodel.ext.android.viewModel
 
-@AndroidEntryPoint
-class SignUpActivity : BaseActivity(), AuthView {
+class SignUpActivity : BaseActivity() {
 
-    private val viewModel: SignUpActivityViewModel by viewModels()
+    private val viewModel: SignUpActivityViewModel by viewModel()
     private val binding: ActivitySignUpBinding by lazy {
         ActivitySignUpBinding.inflate(layoutInflater)
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
         setContentView(binding.root)
         Analytics.track(PageEvents.visit(VISIT_SIGN_UP))
 
@@ -34,11 +31,11 @@ class SignUpActivity : BaseActivity(), AuthView {
             signUpButton.setOnClickListener { signUp() }
             signInTextView.setOnClickListener { signIn() }
         }
-        lifecycle.addObserver(viewModel)
+
         setObservers()
     }
 
-    override fun showProfile() {
+    private fun showProfile() {
         startActivityClearTask(ProfileActivity())
     }
 
@@ -48,7 +45,7 @@ class SignUpActivity : BaseActivity(), AuthView {
 
     private fun signUp() {
         with(binding) {
-            val user = User(
+            val user = UserSignUpRequest(
                 email = emailEditText.value(),
                 firstName = firstNameEditText.value(),
                 lastName = lastNameEditText.value(),
@@ -61,16 +58,19 @@ class SignUpActivity : BaseActivity(), AuthView {
     private fun setObservers() {
         viewModel.state.observe(this, Observer {
             when (it) {
-                SignUpState.signUpFailure -> showError(viewModel.error)
-                SignUpState.signUpSuccess -> showProfile()
+                SignUpState.SIGN_UP_FAILURE -> showError(viewModel.error)
+                SignUpState.SIGN_UP_SUCCESS -> showProfile()
             }
         })
 
         viewModel.networkState.observe(this, Observer {
             when (it) {
-                NetworkState.loading -> showProgress()
-                NetworkState.idle -> hideProgress()
-                else -> showError(viewModel.error ?: getString(R.string.default_error))
+                NetworkState.LOADING -> showProgress()
+                NetworkState.IDLE -> hideProgress()
+                else -> {
+                    hideProgress()
+                    showError(viewModel.error ?: getString(R.string.default_error))
+                }
             }
         })
     }
diff --git a/app/src/main/java/com/rootstrap/android/ui/login/SignUpActivityViewModel.kt b/app/src/main/java/com/rootstrap/android/ui/login/SignUpActivityViewModel.kt
new file mode 100644
index 0000000..ae60d36
--- /dev/null
+++ b/app/src/main/java/com/rootstrap/android/ui/login/SignUpActivityViewModel.kt
@@ -0,0 +1,62 @@
+package com.rootstrap.android.ui.login
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
+import com.rootstrap.android.ui.base.BaseViewModel
+import com.rootstrap.android.util.NetworkState
+import com.rootstrap.android.util.dispatcher.DispatcherProvider
+import com.rootstrap.data.api.ApiException
+import com.rootstrap.data.dto.request.UserSignUpRequest
+import com.rootstrap.data.dto.request.UserSignUpRequestSerializer
+import com.rootstrap.data.dto.response.DataResult
+import com.rootstrap.data.dto.response.toDomainUser
+import com.rootstrap.data.managers.session.SessionManager
+import com.rootstrap.usecases.SignUp
+import kotlinx.coroutines.launch
+
+open class SignUpActivityViewModel(
+    private val signUp: SignUp,
+    private val sessionManager: SessionManager,
+    private val dispatcherProvider: DispatcherProvider
+) : BaseViewModel() {
+
+    private val _state = MutableLiveData<SignUpState>()
+    val state: LiveData<SignUpState>
+        get() = _state
+
+    fun signUp(userSignUpRequest: UserSignUpRequest) {
+        _networkState.value = NetworkState.LOADING
+        viewModelScope.launch(dispatcherProvider.io) {
+            val result = signUp.invoke(UserSignUpRequestSerializer(userSignUpRequest))
+            when (result) {
+                is DataResult.Success -> {
+                    result.data?.user?.let { user ->
+                        sessionManager.signIn(user.toDomainUser())
+                    } ?: handleError(ApiException(null))
+
+                    restoreNetworkState()
+                    _state.postValue(SignUpState.SIGN_UP_SUCCESS)
+                }
+                is DataResult.Error -> {
+                    handleError(result.exception)
+                }
+            }
+        }
+    }
+
+    private fun handleError(exception: ApiException?) {
+        error = exception?.message
+        _networkState.postValue(NetworkState.ERROR)
+        _state.postValue(SignUpState.SIGN_UP_FAILURE)
+    }
+
+    private fun restoreNetworkState() {
+        _networkState.postValue(NetworkState.IDLE)
+    }
+}
+
+enum class SignUpState {
+    SIGN_UP_FAILURE,
+    SIGN_UP_SUCCESS
+}
diff --git a/app/src/main/java/com/rootstrap/android/ui/activity/main/ProfileActivity.kt b/app/src/main/java/com/rootstrap/android/ui/profile/ProfileActivity.kt
similarity index 53%
rename from app/src/main/java/com/rootstrap/android/ui/activity/main/ProfileActivity.kt
rename to app/src/main/java/com/rootstrap/android/ui/profile/ProfileActivity.kt
index 3999b3b..b5c2d55 100644
--- a/app/src/main/java/com/rootstrap/android/ui/activity/main/ProfileActivity.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/profile/ProfileActivity.kt
@@ -1,26 +1,24 @@
-package com.rootstrap.android.ui.activity.main
+package com.rootstrap.android.ui.profile
 
 import android.os.Bundle
-import androidx.activity.viewModels
 import androidx.lifecycle.Observer
 import com.rootstrap.android.R
 import com.rootstrap.android.databinding.ActivityProfileBinding
-import com.rootstrap.android.metrics.Analytics
-import com.rootstrap.android.metrics.PageEvents
-import com.rootstrap.android.metrics.VISIT_PROFILE
-import com.rootstrap.android.network.managers.session.SessionManager
 import com.rootstrap.android.ui.base.BaseActivity
-import com.rootstrap.android.ui.view.ProfileView
+import com.rootstrap.android.ui.login.SignUpActivity
 import com.rootstrap.android.util.NetworkState
-import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
+import com.rootstrap.data.managers.session.SessionManager
+import com.rootstrap.data.metrics.Analytics
+import com.rootstrap.data.metrics.PageEvents
+import com.rootstrap.data.metrics.VISIT_PROFILE
+import org.koin.android.ext.android.inject
+import org.koin.androidx.viewmodel.ext.android.viewModel
 
-@AndroidEntryPoint
-class ProfileActivity : BaseActivity(), ProfileView {
+class ProfileActivity : BaseActivity() {
 
-    @Inject lateinit var sessionManager: SessionManager
+    private val sessionManager: SessionManager by inject()
 
-    private val viewModel: ProfileActivityViewModel by viewModels()
+    private val viewModel: ProfileActivityViewModel by viewModel()
     private val binding by lazy { ActivityProfileBinding.inflate(layoutInflater) }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -30,30 +28,30 @@ class ProfileActivity : BaseActivity(), ProfileView {
 
         with(binding) {
             setContentView(root)
-            welcomeTextView.text = getString(R.string.welcome_message, sessionManager.user?.firstName)
+            welcomeTextView.text =
+                getString(R.string.welcome_message, sessionManager.user?.firstName)
             signOutButton.setOnClickListener { viewModel.signOut() }
         }
 
-        lifecycle.addObserver(viewModel)
         setObservers()
     }
 
-    override fun goToFirstScreen() {
+    private fun goToFirstScreen() {
         startActivityClearTask(SignUpActivity())
     }
 
     private fun setObservers() {
         viewModel.state.observe(this, Observer {
             when (it) {
-                ProfileState.signOutFailure -> showError(viewModel.error)
-                ProfileState.signOutSuccess -> goToFirstScreen()
+                ProfileState.SIGN_OUT_FAILURE -> showError(viewModel.error)
+                ProfileState.SIGN_OUT_SUCCESS -> goToFirstScreen()
             }
         })
 
         viewModel.networkState.observe(this, Observer {
             when (it) {
-                NetworkState.loading -> showProgress()
-                NetworkState.idle -> hideProgress()
+                NetworkState.LOADING -> showProgress()
+                NetworkState.IDLE -> hideProgress()
                 else -> showError(viewModel.error ?: getString(R.string.default_error))
             }
         })
diff --git a/app/src/main/java/com/rootstrap/android/ui/profile/ProfileActivityViewModel.kt b/app/src/main/java/com/rootstrap/android/ui/profile/ProfileActivityViewModel.kt
new file mode 100644
index 0000000..e4e7f76
--- /dev/null
+++ b/app/src/main/java/com/rootstrap/android/ui/profile/ProfileActivityViewModel.kt
@@ -0,0 +1,56 @@
+package com.rootstrap.android.ui.profile
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
+import com.rootstrap.android.ui.base.BaseViewModel
+import com.rootstrap.android.util.NetworkState
+import com.rootstrap.android.util.dispatcher.DispatcherProvider
+import com.rootstrap.data.api.ApiException
+import com.rootstrap.data.dto.response.DataResult
+import com.rootstrap.data.managers.session.SessionManager
+import com.rootstrap.usecases.SignOut
+import kotlinx.coroutines.launch
+
+open class ProfileActivityViewModel(
+    private val signOut: SignOut,
+    private val sessionManager: SessionManager,
+    private val dispatcherProvider: DispatcherProvider
+) : BaseViewModel() {
+
+    private val _state = MutableLiveData<ProfileState>()
+    val state: LiveData<ProfileState>
+        get() = _state
+
+    fun signOut() {
+        _networkState.value = NetworkState.LOADING
+        viewModelScope.launch(dispatcherProvider.io) {
+            when (val result = signOut.invoke()) {
+                is DataResult.Success -> {
+                    restoreNetworkState()
+                    _state.postValue(ProfileState.SIGN_OUT_SUCCESS)
+                    sessionManager.signOut()
+                }
+                is DataResult.Error -> {
+                    handleError(result.exception)
+                    restoreNetworkState()
+                }
+            }
+        }
+    }
+
+    private fun handleError(exception: ApiException?) {
+        error = exception?.message
+        _networkState.postValue(NetworkState.ERROR)
+        _state.postValue(ProfileState.SIGN_OUT_FAILURE)
+    }
+
+    private fun restoreNetworkState() {
+        _networkState.postValue(NetworkState.IDLE)
+    }
+}
+
+enum class ProfileState {
+    SIGN_OUT_FAILURE,
+    SIGN_OUT_SUCCESS
+}
diff --git a/app/src/main/java/com/rootstrap/android/ui/view/AuthView.kt b/app/src/main/java/com/rootstrap/android/ui/view/AuthView.kt
deleted file mode 100644
index 84e2276..0000000
--- a/app/src/main/java/com/rootstrap/android/ui/view/AuthView.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.rootstrap.android.ui.view
-
-import com.rootstrap.android.ui.base.BaseView
-
-interface AuthView : BaseView {
-
-    fun showProfile()
-}
diff --git a/app/src/main/java/com/rootstrap/android/ui/view/IView.kt b/app/src/main/java/com/rootstrap/android/ui/view/IView.kt
deleted file mode 100644
index 259b1a6..0000000
--- a/app/src/main/java/com/rootstrap/android/ui/view/IView.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.rootstrap.android.ui.view
-
-class IView
diff --git a/app/src/main/java/com/rootstrap/android/ui/view/ProfileView.kt b/app/src/main/java/com/rootstrap/android/ui/view/ProfileView.kt
deleted file mode 100644
index 7fa9062..0000000
--- a/app/src/main/java/com/rootstrap/android/ui/view/ProfileView.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.rootstrap.android.ui.view
-
-import com.rootstrap.android.ui.base.BaseView
-
-interface ProfileView : BaseView {
-
-    fun goToFirstScreen()
-}
diff --git a/app/src/main/java/com/rootstrap/android/util/ErrorUtil.kt b/app/src/main/java/com/rootstrap/android/util/ErrorUtil.kt
deleted file mode 100644
index 88e7c6b..0000000
--- a/app/src/main/java/com/rootstrap/android/util/ErrorUtil.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.rootstrap.android.util
-
-import com.google.android.material.textfield.TextInputLayout
-import com.rootstrap.android.network.models.ErrorModel
-
-class ErrorUtil {
-
-    companion object {
-        fun handleCustomError(error: ErrorModel): String {
-            var message = ""
-            if (error.errors != null) {
-                if (error.errors is List<*> && !error.errors.isEmpty()) {
-                    if (error.errors.first() is String) {
-                        message = error.errors.first() as String
-                    }
-                } else if (error.errors is Map<*, *> && error.errors.keys.first() is String &&
-                    error.errors.values.first() is List<*>
-                ) {
-                    val errors = error.errors as Map<String, List<String>>
-                    message = errors.getValue("full_messages").first()
-                }
-            } else if (error.error != null && !error.error.isEmpty()) {
-                message = error.error
-            }
-
-            return message
-        }
-
-        fun displayError(inputLayout: TextInputLayout, message: String) {
-            inputLayout.isErrorEnabled = true
-            inputLayout.error = message
-        }
-    }
-
-    class ErrorsEvent(val error: String)
-}
diff --git a/app/src/main/java/com/rootstrap/android/util/NetworkState.kt b/app/src/main/java/com/rootstrap/android/util/NetworkState.kt
index fa41682..5d44aa8 100644
--- a/app/src/main/java/com/rootstrap/android/util/NetworkState.kt
+++ b/app/src/main/java/com/rootstrap/android/util/NetworkState.kt
@@ -1,7 +1,7 @@
 package com.rootstrap.android.util
 
 enum class NetworkState {
-    loading,
-    idle,
-    error
+    LOADING,
+    IDLE,
+    ERROR
 }
diff --git a/app/src/main/java/com/rootstrap/android/util/UtilModule.kt b/app/src/main/java/com/rootstrap/android/util/UtilModule.kt
index a45dc50..8b13789 100644
--- a/app/src/main/java/com/rootstrap/android/util/UtilModule.kt
+++ b/app/src/main/java/com/rootstrap/android/util/UtilModule.kt
@@ -1,57 +1 @@
-package com.rootstrap.android.util
 
-import android.content.Context
-import android.content.SharedPreferences
-import android.security.keystore.KeyGenParameterSpec
-import android.security.keystore.KeyProperties
-import androidx.security.crypto.EncryptedSharedPreferences
-import androidx.security.crypto.MasterKey
-import com.rootstrap.android.BuildConfig
-import com.rootstrap.android.util.dispatcher.AppDispatcherProvider
-import com.rootstrap.android.util.dispatcher.DispatcherProvider
-import com.squareup.otto.Bus
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.components.SingletonComponent
-import javax.inject.Singleton
-
-@Module
-@InstallIn(SingletonComponent::class)
-class UtilModule {
-
-    @Provides
-    @Singleton
-    fun provideSharedPreferences(@ApplicationContext context: Context): SharedPreferences {
-
-        val spec = KeyGenParameterSpec.Builder(
-            BuildConfig.SECURE_KEY_ALIAS,
-            KeyProperties.PURPOSE_ENCRYPT or KeyProperties.PURPOSE_DECRYPT
-            )
-            .setBlockModes(KeyProperties.BLOCK_MODE_GCM)
-            .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)
-            .setKeySize(256)
-            .build()
-
-        val masterKey = MasterKey.Builder(context, BuildConfig.SECURE_KEY_ALIAS)
-            .setKeyGenParameterSpec(spec)
-            .build()
-
-        return EncryptedSharedPreferences.create(
-            context,
-            BuildConfig.SECURE_FILE_NAME,
-            masterKey,
-            EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
-            EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
-        )
-    }
-
-    @Provides
-    @Singleton
-    fun provideBus(): Bus = Bus()
-
-    @Provides
-    @Singleton
-    fun provideDispatcher(): DispatcherProvider = AppDispatcherProvider()
-}
diff --git a/app/src/main/java/com/rootstrap/android/util/extensions/Gson.kt b/app/src/main/java/com/rootstrap/android/util/extensions/Gson.kt
deleted file mode 100644
index 56e1292..0000000
--- a/app/src/main/java/com/rootstrap/android/util/extensions/Gson.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.rootstrap.android.util.extensions
-
-import com.google.gson.Gson
-import com.google.gson.reflect.TypeToken
-
-inline fun <reified T> Gson.fromJson(json: String) = this.fromJson<T>(json, object : TypeToken<T>() {}.type)
diff --git a/app/src/main/res/layout/activity_sign_up.xml b/app/src/main/res/layout/activity_sign_up.xml
index 10863ce..6528681 100644
--- a/app/src/main/res/layout/activity_sign_up.xml
+++ b/app/src/main/res/layout/activity_sign_up.xml
@@ -9,7 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/sign_up_margin_horizontal"
-        tools:context=".ui.activity.main.SignUpActivity">
+        tools:context=".ui.login.SignUpActivity">
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/first_name_text_input_layout"
diff --git a/app/src/test/java/com/rootstrap/android/SignInActivityViewModelTest.kt b/app/src/test/java/com/rootstrap/android/SignInActivityViewModelTest.kt
index 842c7d9..90755b7 100644
--- a/app/src/test/java/com/rootstrap/android/SignInActivityViewModelTest.kt
+++ b/app/src/test/java/com/rootstrap/android/SignInActivityViewModelTest.kt
@@ -1,16 +1,17 @@
 package com.rootstrap.android
 
-import com.rootstrap.android.network.managers.session.SessionManager
-import com.rootstrap.android.network.managers.user.UserManager
-import com.rootstrap.android.network.models.User
-import com.rootstrap.android.network.models.UserSerializer
 import com.rootstrap.android.test.TestDispatcherProvider
 import com.rootstrap.android.test.UnitTestBase
-import com.rootstrap.android.ui.activity.main.SignInActivityViewModel
-import com.rootstrap.android.ui.activity.main.SignInState
+import com.rootstrap.android.ui.login.SignInActivityViewModel
+import com.rootstrap.android.ui.login.SignInState
 import com.rootstrap.android.util.NetworkState
-import com.rootstrap.android.util.extensions.ApiException
-import com.rootstrap.android.util.extensions.Data
+import com.rootstrap.data.api.ApiException
+import com.rootstrap.data.dto.request.UserSignInRequest
+import com.rootstrap.data.dto.request.UserSignInRequestSerializer
+import com.rootstrap.data.dto.response.DataResult
+import com.rootstrap.data.dto.response.UserResponseSerializer
+import com.rootstrap.data.managers.session.SessionManager
+import com.rootstrap.usecases.SignIn
 import io.mockk.coEvery
 import io.mockk.coVerify
 import io.mockk.every
@@ -31,13 +32,16 @@ class SignInActivityViewModelTest : UnitTestBase() {
     lateinit var sessionManager: SessionManager
 
     @RelaxedMockK
-    lateinit var userManager: UserManager
+    lateinit var signIn: SignIn
 
     @MockK
-    lateinit var user: User
+    lateinit var userSignInRequestSerializer: UserSignInRequestSerializer
 
     @MockK
-    lateinit var userSerializer: UserSerializer
+    lateinit var userSignInResponseSerializer: UserResponseSerializer
+
+    @MockK
+    lateinit var userSignInRequest: UserSignInRequest
 
     companion object {
         const val ERROR_EXAMPLE_TEXT = "Time out example"
@@ -46,44 +50,51 @@ class SignInActivityViewModelTest : UnitTestBase() {
     @Before
     override fun setup() {
         super.setup()
-        every { userSerializer.user } returns user
-        viewModel = SignInActivityViewModel(sessionManager, userManager, TestDispatcherProvider())
+        every { userSignInRequestSerializer.user } returns userSignInRequest
+        every { userSignInResponseSerializer.user } returns userDTO
+        viewModel = SignInActivityViewModel(
+            signIn,
+            sessionManager,
+            TestDispatcherProvider()
+        )
     }
 
     // reading: naming standards for unit testing https://osherove.com/blog/2005/4/3/naming-standards-for-unit-tests.html
     @Test
     fun `signIn success assert signInSuccess and network idle`() {
         var state: SignInState? = null
-        coEvery { userManager.signIn(user = user) } returns Result.success(Data(userSerializer))
+        coEvery { signIn.invoke(any()) } returns DataResult.Success(
+            userSignInResponseSerializer
+        )
 
-        viewModel.signIn(user)
+        viewModel.signIn(userSignInRequest)
         viewModel.state.observeForever {
             state = it
         }
 
-        assertEquals(state, SignInState.signInSuccess)
-        assertEquals(viewModel.networkState.value, NetworkState.idle)
-        verify { sessionManager.signIn(user) }
-        coVerify { userManager.signIn(user = user) }
+        assertEquals(state, SignInState.SIGN_IN_SUCCESS)
+        assertEquals(viewModel.networkState.value, NetworkState.IDLE)
+        verify { sessionManager.signIn(any()) }
+        coVerify { signIn.invoke(any()) }
     }
 
     @Test
     fun `signIn fail assert signInFailure and network error`() {
         var state: SignInState? = null
-        coEvery { userManager.signIn(user = user) } returns Result.failure(
+        coEvery { signIn.invoke(any()) } returns DataResult.Error(
             ApiException(
                 ERROR_EXAMPLE_TEXT
             )
         )
 
-        viewModel.signIn(user)
+        viewModel.signIn(userSignInRequest)
         viewModel.state.observeForever {
             state = it
         }
 
-        assertEquals(state, SignInState.signInFailure)
-        assertEquals(viewModel.networkState.value, NetworkState.error)
+        assertEquals(state, SignInState.SIGN_IN_FAILURE)
+        assertEquals(viewModel.networkState.value, NetworkState.ERROR)
         assertEquals(viewModel.error, ERROR_EXAMPLE_TEXT)
-        coVerify { userManager.signIn(user = user) }
+        coVerify { signIn.invoke(any()) }
     }
 }
diff --git a/app/src/test/java/com/rootstrap/android/SignUpActivityViewModelTest.kt b/app/src/test/java/com/rootstrap/android/SignUpActivityViewModelTest.kt
index c3128b9..d4ff921 100644
--- a/app/src/test/java/com/rootstrap/android/SignUpActivityViewModelTest.kt
+++ b/app/src/test/java/com/rootstrap/android/SignUpActivityViewModelTest.kt
@@ -1,16 +1,16 @@
 package com.rootstrap.android
 
-import com.rootstrap.android.network.managers.session.SessionManager
-import com.rootstrap.android.network.managers.user.UserManager
-import com.rootstrap.android.network.models.User
-import com.rootstrap.android.network.models.UserSerializer
 import com.rootstrap.android.test.TestDispatcherProvider
 import com.rootstrap.android.test.UnitTestBase
-import com.rootstrap.android.ui.activity.main.SignUpActivityViewModel
-import com.rootstrap.android.ui.activity.main.SignUpState
+import com.rootstrap.android.ui.login.SignUpActivityViewModel
+import com.rootstrap.android.ui.login.SignUpState
 import com.rootstrap.android.util.NetworkState
-import com.rootstrap.android.util.extensions.ApiException
-import com.rootstrap.android.util.extensions.Data
+import com.rootstrap.data.api.ApiException
+import com.rootstrap.data.dto.request.UserSignUpRequest
+import com.rootstrap.data.dto.response.DataResult
+import com.rootstrap.data.dto.response.UserResponseSerializer
+import com.rootstrap.data.managers.session.SessionManager
+import com.rootstrap.usecases.SignUp
 import io.mockk.coEvery
 import io.mockk.coVerify
 import io.mockk.every
@@ -31,13 +31,13 @@ class SignUpActivityViewModelTest : UnitTestBase() {
     lateinit var sessionManager: SessionManager
 
     @RelaxedMockK
-    lateinit var userManager: UserManager
+    lateinit var signUp: SignUp
 
     @MockK
-    lateinit var user: User
+    lateinit var userResponseSerializer: UserResponseSerializer
 
     @MockK
-    lateinit var userSerializer: UserSerializer
+    lateinit var userSignUpRequest: UserSignUpRequest
 
     companion object {
         const val ERROR_EXAMPLE_TEXT = "Time out example"
@@ -46,43 +46,45 @@ class SignUpActivityViewModelTest : UnitTestBase() {
     @Before
     override fun setup() {
         super.setup()
-        every { userSerializer.user } returns user
-        viewModel = SignUpActivityViewModel(sessionManager, userManager, TestDispatcherProvider())
+        every { userResponseSerializer.user } returns userDTO
+        viewModel = SignUpActivityViewModel(signUp, sessionManager, TestDispatcherProvider())
     }
 
     @Test
     fun `signUp success assert signUpSuccess and network idle`() {
         var state: SignUpState? = null
-        coEvery { userManager.signUp(user = user) } returns Result.success(Data(userSerializer))
+        coEvery { signUp.invoke(any()) } returns DataResult.Success(
+            userResponseSerializer
+        )
 
-        viewModel.signUp(user)
+        viewModel.signUp(userSignUpRequest)
         viewModel.state.observeForever {
             state = it
         }
 
-        assertEquals(state, SignUpState.signUpSuccess)
-        assertEquals(viewModel.networkState.value, NetworkState.idle)
-        verify { sessionManager.signIn(user) }
-        coVerify { userManager.signUp(user = user) }
+        assertEquals(state, SignUpState.SIGN_UP_SUCCESS)
+        assertEquals(viewModel.networkState.value, NetworkState.IDLE)
+        verify { sessionManager.signIn(any()) }
+        coVerify { signUp.invoke(any()) }
     }
 
     @Test
     fun `signUp fail assert signUpFailure and network error`() {
         var state: SignUpState? = null
-        coEvery { userManager.signUp(user = user) } returns Result.failure(
+        coEvery { signUp.invoke(any()) } returns DataResult.Error(
             ApiException(
                 ERROR_EXAMPLE_TEXT
             )
         )
 
-        viewModel.signUp(user)
+        viewModel.signUp(userSignUpRequest)
         viewModel.state.observeForever {
             state = it
         }
 
-        assertEquals(state, SignUpState.signUpFailure)
-        assertEquals(viewModel.networkState.value, NetworkState.error)
+        assertEquals(state, SignUpState.SIGN_UP_FAILURE)
+        assertEquals(viewModel.networkState.value, NetworkState.ERROR)
         assertEquals(viewModel.error, ERROR_EXAMPLE_TEXT)
-        coVerify { userManager.signUp(user = user) }
+        coVerify { signUp.invoke(any()) }
     }
 }
diff --git a/app/src/test/java/com/rootstrap/android/test/UnitTestBase.kt b/app/src/test/java/com/rootstrap/android/test/UnitTestBase.kt
index f288824..c7ba50e 100644
--- a/app/src/test/java/com/rootstrap/android/test/UnitTestBase.kt
+++ b/app/src/test/java/com/rootstrap/android/test/UnitTestBase.kt
@@ -2,6 +2,7 @@ package com.rootstrap.android.test
 
 import androidx.annotation.CallSuper
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import com.rootstrap.data.dto.response.UserDTO
 import io.mockk.MockKAnnotations
 import org.junit.Before
 import org.junit.Rule
@@ -11,6 +12,17 @@ abstract class UnitTestBase {
     @get:Rule
     val instantExecutorRule = InstantTaskExecutorRule()
 
+    val userDTO: UserDTO = UserDTO(
+        "1",
+        "as@rs.com",
+        "joseph",
+        "GG",
+        "1234",
+        "12345",
+        "as",
+        ""
+    )
+
     @CallSuper
     @Before
     open fun setup() {
diff --git a/build.gradle b/build.gradle
index ea46473..966e6ee 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,22 +1,19 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.5.31'
-    ext.hilt_version = '2.39.1'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         maven {
             url 'https://maven.fabric.io/public'
         }
-        
     }
+
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.google.gms:google-services:4.3.10'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.0'
-        classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
+        classpath 'com.android.tools.build:gradle:7.0.4'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$Versions.kotlin"
+        classpath "com.google.gms:google-services:4.3.10"
+        classpath "com.google.firebase:firebase-crashlytics-gradle:2.8.1"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -33,9 +30,90 @@ detekt {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         maven { url 'https://jitpack.io' }
     }
+
+    ext {
+        androidLibs = [
+                appcompat          : Libs.appCompat,
+                legacySupportV4    : Libs.legacySupportV4,
+                recyclerview       : Libs.recyclerview,
+                constraintlayout   : Libs.constraintlayout,
+                androidxCore       : Libs.core,
+                lifecycleCommon    : Libs.lifecycleCommon,
+                lifecycleRuntime   : Libs.lifecycleRuntime,
+                lifecycleLivedata  : Libs.lifecycleLivedata,
+                lifecycleExtensions: Libs.lifecycleExtensions,
+                lifecycleViewModel : Libs.lifecycleViewModel,
+                material           : Libs.material,
+                roomRuntime        : Libs.roomRuntime,
+                glide              : Libs.glide,
+                navigationFragment : Libs.navigationFragment,
+                navigationUi       : Libs.navigationUi
+        ]
+
+        androidDataLibs = [
+                preference: Libs.preference
+        ]
+
+        androidKaptLibs = [
+                roomCompiler : Libs.roomKapt,
+                lifecycleKapt: Libs.lifecycleKapt,
+                glideCompiler: Libs.glideKapt
+        ]
+
+        ktlintLibs = [
+                ktlint: Libs.ktlint
+        ]
+
+        kotlinLibs = [
+                kotlinStdLib: Libs.kotlinStdLib,
+                reflect     : Libs.reflect,
+                coroutines  : Libs.coroutinesAndroid
+        ]
+
+        libs = [
+                okhttpLoginInterceptor: Libs.loggingInterceptor,
+                retrofit              : Libs.retrofit,
+                retrofitGsonConverter : Libs.retrofitGsonConverter,
+                koinCore              : Libs.koinCore,
+                koinAndroid           : Libs.koinAndroid,
+                koinAndroidCompat     : Libs.koinAndroidCompat,
+                koinWorkManager       : Libs.koinWorkManager,
+                koinCompose           : Libs.koinCompose,
+                otto                  : Libs.otto,
+                gson                  : Libs.gson,
+                okhttp                : Libs.okhttp,
+                moshi                 : Libs.moshi,
+                converterMoshi        : Libs.converterMoshi,
+                securityCrypto        : Libs.securityCrypto,
+                firebaseCore          : Libs.firebaseCore,
+                firebaseAnalytics     : Libs.firebaseAnalytics,
+                firebaseCrashlytics   : Libs.firebaseCrashlytics,
+                mixPanel              : Libs.mixPanel
+        ]
+
+        testLibs = [
+                junit         : Libs.junit,
+                mockitoCore   : Libs.mockitoCore,
+                mockk         : Libs.mockk,
+                coroutinesTest: Libs.coroutinesTest,
+                coreTest      : Libs.coreTesting
+        ]
+
+        androidTestLibs = [
+                testRunner     : Libs.testRunner,
+                espressoCore   : Libs.espressoCore,
+                espressoIntents: Libs.espressoIntents,
+                rules          : Libs.rules,
+                extJunit       : Libs.extJunit,
+                koinTest       : Libs.koinTest,
+                mockWebServer  : Libs.mockwebserver,
+                mockkAndroid   : Libs.mockkAndroid,
+                uiautomator    : Libs.uiautomator
+        ]
+    }
 }
 
 task installGitHook(type: Copy) {
diff --git a/buildSrc/.gitignore b/buildSrc/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/buildSrc/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
new file mode 100644
index 0000000..ca013c3
--- /dev/null
+++ b/buildSrc/build.gradle.kts
@@ -0,0 +1,6 @@
+repositories {
+    jcenter()
+}
+plugins {
+    `kotlin-dsl`
+}
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
new file mode 100644
index 0000000..9346502
--- /dev/null
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -0,0 +1,135 @@
+object Versions {
+    const val appCompat = "1.3.1"
+    const val constraintLayout = "2.1.1"
+    const val core = "1.6.0"
+    const val coroutines = "1.5.1"
+    const val legacySupportV4 = "1.0.0"
+    const val preference = "1.1.1"
+    const val recyclerview = "1.1.0"
+    const val gson = "2.8.7"
+    const val firebaseBom = "26.1.0"
+    const val navigation = "2.3.5"
+    const val glide = "4.12.0"
+    const val kotlin = "1.6.0"
+    const val koin = "3.1.2"
+    const val lifecycle = "2.4.0"
+    const val lifecycleCommon = "1.1.1"
+    const val lifecycleExtension = "2.2.0"
+    const val materialDesign = "1.4.0"
+    const val moshi = "1.12.0"
+    const val converterMoshi = "2.5.0"
+    const val converterGson = "2.9.0"
+    const val okhttp = "4.9.0"
+    const val otto = "1.3.8"
+    const val ktlint = "0.35.0"
+    const val securityCrypto = "1.1.0-alpha03"
+    const val retrofit = "2.9.0"
+    const val room = "1.1.1"
+    const val junit = "4.13.2"
+    const val mockitoCore = "2.28.2"
+    const val mockk = "1.12.0"
+    const val espresso = "3.4.0"
+    const val extJunit = "1.1.3"
+    const val uiautomator = "2.2.0"
+    const val rules = "1.4.0"
+    const val mockwebserver = "4.9.0"
+    const val testRunner = "1.4.0"
+    const val mixPanel = "5.6.1"
+    const val coreTesting = "1.1.1"
+}
+
+object Libs {
+    // Kotlin
+    const val kotlinStdLib = "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${Versions.kotlin}"
+    const val coroutinesAndroid =
+        "org.jetbrains.kotlinx:kotlinx-coroutines-android:${Versions.coroutines}"
+    const val reflect = "org.jetbrains.kotlin:kotlin-reflect:${Versions.kotlin}"
+
+    const val appCompat = "androidx.appcompat:appcompat:${Versions.appCompat}"
+    const val core = "androidx.core:core-ktx:${Versions.core}"
+    const val constraintlayout =
+        "androidx.constraintlayout:constraintlayout:${Versions.constraintLayout}"
+    const val legacySupportV4 = "androidx.legacy:legacy-support-v4:${Versions.legacySupportV4}"
+    const val preference = "androidx.preference:preference-ktx:${Versions.preference}"
+    const val recyclerview = "androidx.recyclerview:recyclerview:${Versions.recyclerview}"
+
+    // Material
+    const val material = "com.google.android.material:material:${Versions.materialDesign}"
+
+    // Room
+    const val roomRuntime = "android.arch.persistence.room:runtime:${Versions.room}"
+    const val roomKapt = "android.arch.persistence.room:compiler:${Versions.room}"
+
+    // Lifecycle
+    const val lifecycleCommon = "android.arch.lifecycle:common-java8:${Versions.lifecycleCommon}"
+    const val lifecycleKapt = "android.arch.lifecycle:compiler:${Versions.lifecycleCommon}"
+    const val lifecycleRuntime = "androidx.lifecycle:lifecycle-runtime-ktx:${Versions.lifecycle}"
+    const val lifecycleLivedata = "androidx.lifecycle:lifecycle-livedata-ktx:${Versions.lifecycle}"
+    const val lifecycleExtensions =
+        "androidx.lifecycle:lifecycle-extensions:${Versions.lifecycleExtension}"
+    const val lifecycleViewModel =
+        "androidx.lifecycle:lifecycle-viewmodel-ktx:${Versions.lifecycle}"
+
+    // Navigation
+    const val navigationFragment =
+        "androidx.navigation:navigation-fragment-ktx:${Versions.navigation}"
+    const val navigationUi = "androidx.navigation:navigation-ui-ktx:${Versions.navigation}"
+
+    // Google JSON serializer/deserializer
+    const val gson = "com.google.code.gson:gson:${Versions.gson}"
+
+    // Firebase
+    const val firebaseBom = "com.google.firebase:firebase-bom:${Versions.firebaseBom}"
+    const val firebaseCore = "com.google.firebase:firebase-core"
+    const val firebaseAnalytics = "com.google.firebase:firebase-analytics-ktx"
+    const val firebaseCrashlytics = "com.google.firebase:firebase-crashlytics-ktx"
+
+    //---- MixPanel ----
+    const val mixPanel = "com.mixpanel.android:mixpanel-android:${Versions.mixPanel}"
+
+    // Image
+    const val glide = "com.github.bumptech.glide:glide:${Versions.glide}"
+    const val glideKapt = "com.github.bumptech.glide:compiler:${Versions.glide}"
+
+    // Network
+    const val retrofit = "com.squareup.retrofit2:retrofit:${Versions.retrofit}"
+    const val retrofitGsonConverter =
+        "com.squareup.retrofit2:converter-gson:${Versions.converterGson}"
+    const val moshi = "com.squareup.moshi:moshi-kotlin:${Versions.moshi}"
+    const val converterMoshi = "com.squareup.retrofit2:converter-moshi:${Versions.converterMoshi}"
+    const val loggingInterceptor = "com.squareup.okhttp3:logging-interceptor:${Versions.okhttp}"
+    const val okhttp = "com.squareup.okhttp3:okhttp:${Versions.okhttp}"
+
+    // Events
+    const val otto = "com.squareup:otto:${Versions.otto}"
+
+    // Linters
+    const val ktlint = "com.pinterest:ktlint:${Versions.ktlint}"
+
+    // Koin
+    const val koinCore = "io.insert-koin:koin-core:${Versions.koin}"
+    const val koinAndroid = "io.insert-koin:koin-android:${Versions.koin}"
+    const val koinAndroidNavigation = "io.insert-koin:koin-androidx-navigation:${Versions.koin}"
+    const val koinAndroidCompat = "io.insert-koin:koin-android-compat:${Versions.koin}"
+    const val koinWorkManager = "io.insert-koin:koin-androidx-workmanager:${Versions.koin}"
+    const val koinCompose = "io.insert-koin:koin-androidx-compose:${Versions.koin}"
+
+    // Security crypto
+    const val securityCrypto = "androidx.security:security-crypto:${Versions.securityCrypto}"
+
+    // Testing
+    const val junit = "junit:junit:${Versions.junit}"
+    const val mockitoCore = "org.mockito:mockito-core:${Versions.mockitoCore}"
+    const val mockk = "io.mockk:mockk:${Versions.mockk}"
+    const val mockkAndroid = "io.mockk:mockk-android:${Versions.mockk}"
+    const val testRunner = "androidx.test:runner:${Versions.testRunner}"
+    const val espressoCore = "androidx.test.espresso:espresso-core:${Versions.espresso}"
+    const val espressoIntents = "androidx.test.espresso:espresso-intents:${Versions.espresso}"
+    const val extJunit = "androidx.test.ext:junit:${Versions.extJunit}"
+    const val koinTest = "io.insert-koin:koin-test:${Versions.koin}"
+    const val uiautomator = "androidx.test.uiautomator:uiautomator:${Versions.uiautomator}"
+    const val rules = "androidx.test:rules:${Versions.rules}"
+    const val mockwebserver = "com.squareup.okhttp3:mockwebserver:${Versions.mockwebserver}"
+    const val coroutinesTest = "org.jetbrains.kotlinx:kotlinx-coroutines-test:${Versions.coroutines}"
+    const val coreTesting = "android.arch.core:core-testing:${Versions.coreTesting}"
+}
diff --git a/data/.gitignore b/data/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/data/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/data/build.gradle b/data/build.gradle
new file mode 100644
index 0000000..2ed4125
--- /dev/null
+++ b/data/build.gradle
@@ -0,0 +1,55 @@
+plugins {
+    id "com.android.library"
+    id "kotlin-android"
+    id "kotlin-parcelize"
+}
+
+android {
+    compileSdkVersion 31
+
+    defaultConfig {
+        minSdkVersion 23
+        targetSdkVersion 31
+
+        testInstrumentationRunner "com.rootstrap.android.CustomTestRunner"
+        consumerProguardFiles "consumer-rules.pro"
+    }
+
+    buildTypes {
+        getByName("debug") {
+            minifyEnabled false
+            buildConfigField("String", "API_URL", "\"https://rails5-api-base.herokuapp.com/api/v1/\"")
+            buildConfigField("String", "MIX_PANEL_KEY", "\"mixpanel_api_key\"")
+        }
+
+        create("staging") {
+            initWith(getByName("debug"))
+            buildConfigField("String", "API_URL", "\"https://proj-staging.herokuapp.com/api/\"")
+            buildConfigField("String", "MIX_PANEL_KEY", "\"mixpanel_api_key\"")
+        }
+
+        getByName("release") {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            buildConfigField("String", "API_URL", "\"https://proj-production.herokuapp.com/api/\"")
+            buildConfigField("String", "MIX_PANEL_KEY", "\"mixpanel_api_key\"")
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
+dependencies {
+    implementation project(":domain")
+    implementation androidDataLibs.values()
+    implementation kotlinLibs.values()
+    implementation platform(Libs.firebaseBom)
+    implementation libs.values()
+    testImplementation testLibs.values()
+}
diff --git a/data/consumer-rules.pro b/data/consumer-rules.pro
new file mode 100644
index 0000000..e69de29
diff --git a/data/proguard-rules.pro b/data/proguard-rules.pro
new file mode 100644
index 0000000..f1b4245
--- /dev/null
+++ b/data/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/data/src/main/AndroidManifest.xml b/data/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..659e535
--- /dev/null
+++ b/data/src/main/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.rootstrap.data" >
+
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+</manifest>
diff --git a/data/src/main/java/com/rootstrap/data/api/ApiException.kt b/data/src/main/java/com/rootstrap/data/api/ApiException.kt
new file mode 100644
index 0000000..d6e07f9
--- /dev/null
+++ b/data/src/main/java/com/rootstrap/data/api/ApiException.kt
@@ -0,0 +1,19 @@
+package com.rootstrap.data.api
+
+class ApiException(
+    private val errorMessage: String? = null,
+    val errorType: ApiErrorType = ApiErrorType.API_ERROR,
+) : Exception() {
+    override val message: String?
+        get() = errorMessage
+
+    override fun toString(): String {
+        return errorType.name + " - " + message
+    }
+}
+
+enum class ApiErrorType {
+    API_ERROR,
+    SOCKET_TIME_OUT,
+    GENERIC_IO_ERROR,
+}
diff --git a/data/src/main/java/com/rootstrap/data/api/ApiProvider.kt b/data/src/main/java/com/rootstrap/data/api/ApiProvider.kt
new file mode 100644
index 0000000..91b5364
--- /dev/null
+++ b/data/src/main/java/com/rootstrap/data/api/ApiProvider.kt
@@ -0,0 +1,9 @@
+package com.rootstrap.data.api
+
+import com.rootstrap.data.api.endpoints.UserApi
+
+class ApiProvider(private val apiServiceFactory: ApiServiceFactory) {
+    fun getUserApiService(): UserApi {
+        return apiServiceFactory.getApi(UserApi::class.java)
+    }
+}
diff --git a/data/src/main/java/com/rootstrap/data/api/ApiServiceFactory.kt b/data/src/main/java/com/rootstrap/data/api/ApiServiceFactory.kt
new file mode 100644
index 0000000..c7e4857
--- /dev/null
+++ b/data/src/main/java/com/rootstrap/data/api/ApiServiceFactory.kt
@@ -0,0 +1,48 @@
+package com.rootstrap.data.api
+
+import com.rootstrap.data.BuildConfig
+import com.rootstrap.data.api.interceptors.AuthenticationInterceptor
+import com.rootstrap.data.api.interceptors.HeadersInterceptor
+import com.rootstrap.data.api.interceptors.ResponseInterceptor
+import okhttp3.OkHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+
+class ApiServiceFactory(
+    private val authenticationInterceptor: AuthenticationInterceptor,
+    private val headersInterceptor: HeadersInterceptor,
+    private val responseInterceptor: ResponseInterceptor
+) {
+    private var retrofit: Retrofit? = null
+
+    fun <T> getApi(apiClass: Class<*>): T {
+        return initRetrofit().create(apiClass) as T
+    }
+
+    private fun getOkHttpClient(): OkHttpClient {
+        val httpInterceptorLevel = if (BuildConfig.DEBUG) HttpLoggingInterceptor.Level.BODY
+        else HttpLoggingInterceptor.Level.NONE
+
+        return OkHttpClient.Builder()
+            .addInterceptor(authenticationInterceptor)
+            .addInterceptor(headersInterceptor)
+            .addInterceptor(responseInterceptor)
+            .addInterceptor(HttpLoggingInterceptor().setLevel(httpInterceptorLevel))
+            .build()
+    }
+
+    private fun getRetrofit(): Retrofit {
+        return Retrofit.Builder()
+            .baseUrl(BuildConfig.API_URL)
+            .addConverterFactory(GsonConverterFactory.create())
+            .client(getOkHttpClient())
+            .build()
+    }
+
+    private fun initRetrofit(): Retrofit {
+        if (retrofit == null)
+            retrofit = getRetrofit()
+        return retrofit!!
+    }
+}
diff --git a/data/src/main/java/com/rootstrap/data/api/endpoints/UserApi.kt b/data/src/main/java/com/rootstrap/data/api/endpoints/UserApi.kt
new file mode 100644
index 0000000..2b76eaf
--- /dev/null
+++ b/data/src/main/java/com/rootstrap/data/api/endpoints/UserApi.kt
@@ -0,0 +1,21 @@
+package com.rootstrap.data.api.endpoints
+
+import com.rootstrap.data.dto.request.UserSignInRequestSerializer
+import com.rootstrap.data.dto.request.UserSignUpRequestSerializer
+import com.rootstrap.data.dto.response.UserResponseSerializer
+import retrofit2.Call
+import retrofit2.http.Body
+import retrofit2.http.DELETE
+import retrofit2.http.POST
+
+interface UserApi {
+
+    @POST("users/")
+    fun signUp(@Body user: UserSignUpRequestSerializer): Call<UserResponseSerializer>
+
+    @POST("users/sign_in")
+    fun signIn(@Body user: UserSignInRequestSerializer): Call<UserResponseSerializer>
+
+    @DELETE("users/sign_out")
+    fun signOut(): Call<Void>
+}
diff --git a/app/src/main/java/com/rootstrap/android/network/services/AuthenticationInterceptor.kt b/data/src/main/java/com/rootstrap/data/api/interceptors/AuthenticationInterceptor.kt
similarity index 57%
rename from app/src/main/java/com/rootstrap/android/network/services/AuthenticationInterceptor.kt
rename to data/src/main/java/com/rootstrap/data/api/interceptors/AuthenticationInterceptor.kt
index af7666b..1b568fe 100644
--- a/app/src/main/java/com/rootstrap/android/network/services/AuthenticationInterceptor.kt
+++ b/data/src/main/java/com/rootstrap/data/api/interceptors/AuthenticationInterceptor.kt
@@ -1,12 +1,11 @@
-package com.rootstrap.android.network.services
+package com.rootstrap.data.api.interceptors
 
-import com.rootstrap.android.util.Prefs
+import com.rootstrap.data.util.Prefs
 import okhttp3.Interceptor
 import okhttp3.Response
 import java.io.IOException
-import javax.inject.Inject
 
-class AuthenticationInterceptor @Inject constructor(private val prefs: Prefs) : Interceptor {
+class AuthenticationInterceptor(private val prefs: Prefs) : Interceptor {
 
     @Throws(IOException::class)
     override fun intercept(chain: Interceptor.Chain): Response {
@@ -14,9 +13,9 @@ class AuthenticationInterceptor @Inject constructor(private val prefs: Prefs) :
 
         if (hasHeaders()) {
             builder
-                .addHeader(prefs.ACCESS_TOKEN, prefs.accessToken)
-                .addHeader(prefs.CLIENT, prefs.client)
-                .addHeader(prefs.UID, prefs.uid)
+                .addHeader(Prefs.ACCESS_TOKEN, prefs.accessToken)
+                .addHeader(Prefs.CLIENT, prefs.client)
+                .addHeader(Prefs.UID, prefs.uid)
         }
 
         return chain.proceed(builder.build())
diff --git a/data/src/main/java/com/rootstrap/data/api/interceptors/ConnectivityInterceptor.kt b/data/src/main/java/com/rootstrap/data/api/interceptors/ConnectivityInterceptor.kt
new file mode 100644
index 0000000..40af3cd
--- /dev/null
+++ b/data/src/main/java/com/rootstrap/data/api/interceptors/ConnectivityInterceptor.kt
@@ -0,0 +1,15 @@
+package com.rootstrap.data.api.interceptors
+
+import okhttp3.Interceptor
+import okhttp3.Response
+import java.io.IOException
+
+class ConnectivityInterceptor: Interceptor {
+    override fun intercept(chain: Interceptor.Chain): Response {
+        if (!WifiService.instance.isOnline()) {
+            throw IOException("No internet connection")
+        } else {
+            return chain.proceed(chain.request())
+        }
+    }
+}
diff --git a/app/src/main/java/com/rootstrap/android/network/services/HeadersInterceptor.kt b/data/src/main/java/com/rootstrap/data/api/interceptors/HeadersInterceptor.kt
similarity index 91%
rename from app/src/main/java/com/rootstrap/android/network/services/HeadersInterceptor.kt
rename to data/src/main/java/com/rootstrap/data/api/interceptors/HeadersInterceptor.kt
index 0a39482..90c0e52 100644
--- a/app/src/main/java/com/rootstrap/android/network/services/HeadersInterceptor.kt
+++ b/data/src/main/java/com/rootstrap/data/api/interceptors/HeadersInterceptor.kt
@@ -1,4 +1,4 @@
-package com.rootstrap.android.network.services
+package com.rootstrap.data.api.interceptors
 
 import okhttp3.Interceptor
 import okhttp3.Response
diff --git a/app/src/main/java/com/rootstrap/android/network/services/ResponseInterceptor.kt b/data/src/main/java/com/rootstrap/data/api/interceptors/ResponseInterceptor.kt
similarity index 54%
rename from app/src/main/java/com/rootstrap/android/network/services/ResponseInterceptor.kt
rename to data/src/main/java/com/rootstrap/data/api/interceptors/ResponseInterceptor.kt
index 9d7e252..5f6a91b 100644
--- a/app/src/main/java/com/rootstrap/android/network/services/ResponseInterceptor.kt
+++ b/data/src/main/java/com/rootstrap/data/api/interceptors/ResponseInterceptor.kt
@@ -1,13 +1,12 @@
-package com.rootstrap.android.network.services
+package com.rootstrap.data.api.interceptors
 
-import com.rootstrap.android.network.managers.session.SessionManager
-import com.rootstrap.android.util.Prefs
+import com.rootstrap.data.managers.session.SessionManager
+import com.rootstrap.data.util.Prefs
 import okhttp3.Interceptor
 import okhttp3.Response
 import java.io.IOException
-import javax.inject.Inject
 
-class ResponseInterceptor @Inject constructor(
+class ResponseInterceptor(
     private val prefs: Prefs,
     private val sessionManager: SessionManager
 ) : Interceptor {
@@ -20,16 +19,16 @@ class ResponseInterceptor @Inject constructor(
     }
 
     private fun prefer(response: Response) {
-        val accessToken = response.header(prefs.ACCESS_TOKEN)
-        val client = response.header(prefs.CLIENT)
-        val uid = response.header(prefs.UID)
+        val accessToken = response.header(Prefs.ACCESS_TOKEN)
+        val client = response.header(Prefs.CLIENT)
+        val uid = response.header(Prefs.UID)
         if (preferValid(accessToken, client, uid))
             sessionManager.addAuthenticationHeaders(accessToken!!, client!!, uid!!)
     }
 
     private fun preferValid(accessToken: String?, client: String?, uid: String?): Boolean {
-        return accessToken != null && !accessToken.isEmpty() &&
-                client != null && !client.isEmpty() &&
-                uid != null && !uid.isEmpty()
+        return accessToken != null && accessToken.isNotEmpty() &&
+                client != null && client.isNotEmpty() &&
+                uid != null && uid.isNotEmpty()
     }
 }
diff --git a/data/src/main/java/com/rootstrap/data/api/interceptors/WifiService.kt b/data/src/main/java/com/rootstrap/data/api/interceptors/WifiService.kt
new file mode 100644
index 0000000..4576f3c
--- /dev/null
+++ b/data/src/main/java/com/rootstrap/data/api/interceptors/WifiService.kt
@@ -0,0 +1,33 @@
+package com.rootstrap.data.api.interceptors
+
+import android.content.Context
+import android.net.ConnectivityManager
+import android.net.NetworkCapabilities
+import android.net.wifi.WifiManager
+
+class WifiService {
+    private lateinit var wifiManager: WifiManager
+    private lateinit var connectivityManager: ConnectivityManager
+
+    companion object {
+        val instance = WifiService()
+    }
+
+    fun initializeWithApplicationContext (context: Context) {
+        wifiManager = context.getSystemService(Context.WIFI_SERVICE) as WifiManager
+        connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+    }
+
+    // Helper that detects if online
+    fun isOnline(): Boolean {
+        val capabilities = connectivityManager.getNetworkCapabilities(connectivityManager.activeNetwork)
+        if (capabilities != null) {
+            when {
+                capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> return true
+                capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> return true
+                capabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) -> return true
+            }
+        }
+        return false
+    }
+}
diff --git a/data/src/main/java/com/rootstrap/data/database/AppDataBase.kt b/data/src/main/java/com/rootstrap/data/database/AppDataBase.kt
new file mode 100644
index 0000000..edd7d66
--- /dev/null
+++ b/data/src/main/java/com/rootstrap/data/database/AppDataBase.kt
@@ -0,0 +1,5 @@
+package com.rootstrap.data.database
+
+class AppDataBase {
+    // TODO
+}
diff --git a/data/src/main/java/com/rootstrap/data/dto/request/UserSignInRequestSerializer.kt b/data/src/main/java/com/rootstrap/data/dto/request/UserSignInRequestSerializer.kt
new file mode 100644
index 0000000..4a205ad
--- /dev/null
+++ b/data/src/main/java/com/rootstrap/data/dto/request/UserSignInRequestSerializer.kt
@@ -0,0 +1,8 @@
+package com.rootstrap.data.dto.request
+
+data class UserSignInRequest(
+    var email: String = "",
+    val password: String = ""
+)
+
+data class UserSignInRequestSerializer(val user: UserSignInRequest)
diff --git a/data/src/main/java/com/rootstrap/data/dto/request/UserSignUpRequestSerializer.kt b/data/src/main/java/com/rootstrap/data/dto/request/UserSignUpRequestSerializer.kt
new file mode 100644
index 0000000..550c0e2
--- /dev/null
+++ b/data/src/main/java/com/rootstrap/data/dto/request/UserSignUpRequestSerializer.kt
@@ -0,0 +1,13 @@
+package com.rootstrap.data.dto.request
+
+import com.google.gson.annotations.SerializedName
+
+data class UserSignUpRequest(
+    var email: String = "",
+    @SerializedName("first_name") var firstName: String = "",
+    @SerializedName("last_name") var lastName: String = "",
+    val username: String = "",
+    val password: String = ""
+)
+
+data class UserSignUpRequestSerializer(val user: UserSignUpRequest)
diff --git a/data/src/main/java/com/rootstrap/data/dto/response/DataResult.kt b/data/src/main/java/com/rootstrap/data/dto/response/DataResult.kt
new file mode 100644
index 0000000..cda0cce
--- /dev/null
+++ b/data/src/main/java/com/rootstrap/data/dto/response/DataResult.kt
@@ -0,0 +1,10 @@
+package com.rootstrap.data.dto.response
+
+import com.rootstrap.data.api.ApiException
+
+sealed class DataResult<out R> {
+
+    data class Success<out T>(val data: T?) : DataResult<T>()
+
+    data class Error(val exception: ApiException) : DataResult<Nothing>()
+}
diff --git a/app/src/main/java/com/rootstrap/android/network/models/ErrorModel.kt b/data/src/main/java/com/rootstrap/data/dto/response/ErrorModel.kt
similarity index 81%
rename from app/src/main/java/com/rootstrap/android/network/models/ErrorModel.kt
rename to data/src/main/java/com/rootstrap/data/dto/response/ErrorModel.kt
index bc3172a..7e6136f 100644
--- a/app/src/main/java/com/rootstrap/android/network/models/ErrorModel.kt
+++ b/data/src/main/java/com/rootstrap/data/dto/response/ErrorModel.kt
@@ -1,4 +1,4 @@
-package com.rootstrap.android.network.models
+package com.rootstrap.data.dto.response
 
 import com.squareup.moshi.Json
 
diff --git a/data/src/main/java/com/rootstrap/data/dto/response/UserResponseSerializer.kt b/data/src/main/java/com/rootstrap/data/dto/response/UserResponseSerializer.kt
new file mode 100644
index 0000000..e941a5b
--- /dev/null
+++ b/data/src/main/java/com/rootstrap/data/dto/response/UserResponseSerializer.kt
@@ -0,0 +1,27 @@
+package com.rootstrap.data.dto.response
+
+import com.google.gson.annotations.SerializedName
+import com.rootstrap.domain.User
+
+data class UserDTO(
+    val id: String = "",
+    var email: String = "",
+    @SerializedName("first_name") var firstName: String = "",
+    @SerializedName("last_name") var lastName: String = "",
+    @SerializedName("phone_number") var phoneNumber: String = "",
+    val password: String = "",
+    val username: String = "",
+    val uid: String?
+)
+
+fun UserDTO.toDomainUser() = User(
+    id = id,
+    email = email,
+    firstName = firstName,
+    lastName = lastName,
+    phoneNumber = phoneNumber,
+    password = password,
+    username = username
+)
+
+data class UserResponseSerializer(val user: UserDTO)
diff --git a/app/src/main/java/com/rootstrap/android/network/managers/session/SessionManager.kt b/data/src/main/java/com/rootstrap/data/managers/session/SessionManager.kt
similarity index 67%
rename from app/src/main/java/com/rootstrap/android/network/managers/session/SessionManager.kt
rename to data/src/main/java/com/rootstrap/data/managers/session/SessionManager.kt
index be8ed7a..5e5f6ab 100644
--- a/app/src/main/java/com/rootstrap/android/network/managers/session/SessionManager.kt
+++ b/data/src/main/java/com/rootstrap/data/managers/session/SessionManager.kt
@@ -1,6 +1,6 @@
-package com.rootstrap.android.network.managers.session
+package com.rootstrap.data.managers.session
 
-import com.rootstrap.android.network.models.User
+import com.rootstrap.domain.User
 
 interface SessionManager {
     var user: User?
diff --git a/app/src/main/java/com/rootstrap/android/network/managers/session/SessionManagerImpl.kt b/data/src/main/java/com/rootstrap/data/managers/session/SessionManagerImpl.kt
similarity index 70%
rename from app/src/main/java/com/rootstrap/android/network/managers/session/SessionManagerImpl.kt
rename to data/src/main/java/com/rootstrap/data/managers/session/SessionManagerImpl.kt
index adb674c..0efabcf 100644
--- a/app/src/main/java/com/rootstrap/android/network/managers/session/SessionManagerImpl.kt
+++ b/data/src/main/java/com/rootstrap/data/managers/session/SessionManagerImpl.kt
@@ -1,10 +1,9 @@
-package com.rootstrap.android.network.managers.session
+package com.rootstrap.data.managers.session
 
-import com.rootstrap.android.network.models.User
-import com.rootstrap.android.util.Prefs
-import javax.inject.Inject
+import com.rootstrap.data.util.Prefs
+import com.rootstrap.domain.User
 
-class SessionManagerImpl @Inject constructor(private val prefs: Prefs) : SessionManager {
+class SessionManagerImpl(private val prefs: Prefs) : SessionManager {
 
     override var user: User? = prefs.user
         set(value) {
diff --git a/app/src/main/java/com/rootstrap/android/metrics/Analytics.kt b/data/src/main/java/com/rootstrap/data/metrics/Analytics.kt
similarity index 78%
rename from app/src/main/java/com/rootstrap/android/metrics/Analytics.kt
rename to data/src/main/java/com/rootstrap/data/metrics/Analytics.kt
index 0099f31..49239ca 100644
--- a/app/src/main/java/com/rootstrap/android/metrics/Analytics.kt
+++ b/data/src/main/java/com/rootstrap/data/metrics/Analytics.kt
@@ -1,9 +1,9 @@
-package com.rootstrap.android.metrics
+package com.rootstrap.data.metrics
 
-import com.rootstrap.android.metrics.base.BaseAnalytics
-import com.rootstrap.android.metrics.base.Provider
-import com.rootstrap.android.metrics.base.TrackEvent
-import com.rootstrap.android.metrics.base.UserProperty
+import com.rootstrap.data.metrics.base.BaseAnalytics
+import com.rootstrap.data.metrics.base.Provider
+import com.rootstrap.data.metrics.base.TrackEvent
+import com.rootstrap.data.metrics.base.UserProperty
 
 object Analytics : BaseAnalytics {
     var providers: ArrayList<Provider> = ArrayList()
diff --git a/app/src/main/java/com/rootstrap/android/metrics/Events.kt b/data/src/main/java/com/rootstrap/data/metrics/Events.kt
similarity index 92%
rename from app/src/main/java/com/rootstrap/android/metrics/Events.kt
rename to data/src/main/java/com/rootstrap/data/metrics/Events.kt
index c939024..5dc6504 100644
--- a/app/src/main/java/com/rootstrap/android/metrics/Events.kt
+++ b/data/src/main/java/com/rootstrap/data/metrics/Events.kt
@@ -1,6 +1,6 @@
-package com.rootstrap.android.metrics
+package com.rootstrap.data.metrics
 
-import com.rootstrap.android.metrics.base.TrackEvent
+import com.rootstrap.data.metrics.base.TrackEvent
 
 class UserEvents {
     companion object {
diff --git a/app/src/main/java/com/rootstrap/android/metrics/GoogleAnalytics.kt b/data/src/main/java/com/rootstrap/data/metrics/GoogleAnalytics.kt
similarity index 89%
rename from app/src/main/java/com/rootstrap/android/metrics/GoogleAnalytics.kt
rename to data/src/main/java/com/rootstrap/data/metrics/GoogleAnalytics.kt
index b76eeba..acdaf94 100644
--- a/app/src/main/java/com/rootstrap/android/metrics/GoogleAnalytics.kt
+++ b/data/src/main/java/com/rootstrap/data/metrics/GoogleAnalytics.kt
@@ -1,10 +1,10 @@
-package com.rootstrap.android.metrics
+package com.rootstrap.data.metrics
 
 import android.content.Context
 import com.google.firebase.analytics.FirebaseAnalytics
-import com.rootstrap.android.metrics.base.Provider
-import com.rootstrap.android.metrics.base.TrackEvent
-import com.rootstrap.android.metrics.base.UserProperty
+import com.rootstrap.data.metrics.base.Provider
+import com.rootstrap.data.metrics.base.TrackEvent
+import com.rootstrap.data.metrics.base.UserProperty
 import org.json.JSONException
 
 /**
diff --git a/app/src/main/java/com/rootstrap/android/metrics/MetricsEvents.kt b/data/src/main/java/com/rootstrap/data/metrics/MetricsEvents.kt
similarity index 85%
rename from app/src/main/java/com/rootstrap/android/metrics/MetricsEvents.kt
rename to data/src/main/java/com/rootstrap/data/metrics/MetricsEvents.kt
index c73c69e..5aad9c3 100644
--- a/app/src/main/java/com/rootstrap/android/metrics/MetricsEvents.kt
+++ b/data/src/main/java/com/rootstrap/data/metrics/MetricsEvents.kt
@@ -1,4 +1,4 @@
-package com.rootstrap.android.metrics
+package com.rootstrap.data.metrics
 
 // sample events
 const val LOGIN = "logIn"
diff --git a/app/src/main/java/com/rootstrap/android/metrics/MixPanelAnalytics.kt b/data/src/main/java/com/rootstrap/data/metrics/MixPanelAnalytics.kt
similarity index 84%
rename from app/src/main/java/com/rootstrap/android/metrics/MixPanelAnalytics.kt
rename to data/src/main/java/com/rootstrap/data/metrics/MixPanelAnalytics.kt
index ff59c10..9177f24 100644
--- a/app/src/main/java/com/rootstrap/android/metrics/MixPanelAnalytics.kt
+++ b/data/src/main/java/com/rootstrap/data/metrics/MixPanelAnalytics.kt
@@ -1,12 +1,11 @@
-package com.rootstrap.android.metrics
+package com.rootstrap.data.metrics
 
 import android.content.Context
-
 import com.mixpanel.android.mpmetrics.MixpanelAPI
-import com.rootstrap.android.R
-import com.rootstrap.android.metrics.base.Provider
-import com.rootstrap.android.metrics.base.TrackEvent
-import com.rootstrap.android.metrics.base.UserProperty
+import com.rootstrap.data.BuildConfig
+import com.rootstrap.data.metrics.base.Provider
+import com.rootstrap.data.metrics.base.TrackEvent
+import com.rootstrap.data.metrics.base.UserProperty
 import org.json.JSONException
 
 /**
@@ -14,7 +13,7 @@ import org.json.JSONException
  * */
 class MixPanelAnalytics(context: Context) : Provider {
     var analytic: MixpanelAPI =
-        MixpanelAPI.getInstance(context, context.getString(R.string.mixpanel_api_key))
+        MixpanelAPI.getInstance(context, BuildConfig.MIX_PANEL_KEY)
 
     /**
      * Track any event in the app
diff --git a/app/src/main/java/com/rootstrap/android/metrics/base/BaseAnalytics.kt b/data/src/main/java/com/rootstrap/data/metrics/base/BaseAnalytics.kt
similarity index 88%
rename from app/src/main/java/com/rootstrap/android/metrics/base/BaseAnalytics.kt
rename to data/src/main/java/com/rootstrap/data/metrics/base/BaseAnalytics.kt
index 3f9e1e9..aabd112 100644
--- a/app/src/main/java/com/rootstrap/android/metrics/base/BaseAnalytics.kt
+++ b/data/src/main/java/com/rootstrap/data/metrics/base/BaseAnalytics.kt
@@ -1,4 +1,4 @@
-package com.rootstrap.android.metrics.base
+package com.rootstrap.data.metrics.base
 
 /**
  * Add custom metrics
diff --git a/app/src/main/java/com/rootstrap/android/metrics/base/Provider.kt b/data/src/main/java/com/rootstrap/data/metrics/base/Provider.kt
similarity index 95%
rename from app/src/main/java/com/rootstrap/android/metrics/base/Provider.kt
rename to data/src/main/java/com/rootstrap/data/metrics/base/Provider.kt
index ab5d9b7..6238824 100644
--- a/app/src/main/java/com/rootstrap/android/metrics/base/Provider.kt
+++ b/data/src/main/java/com/rootstrap/data/metrics/base/Provider.kt
@@ -1,4 +1,4 @@
-package com.rootstrap.android.metrics.base
+package com.rootstrap.data.metrics.base
 
 import android.os.Bundle
 import com.google.gson.Gson
diff --git a/data/src/main/java/com/rootstrap/data/repository/UserRepository.kt b/data/src/main/java/com/rootstrap/data/repository/UserRepository.kt
new file mode 100644
index 0000000..3c54506
--- /dev/null
+++ b/data/src/main/java/com/rootstrap/data/repository/UserRepository.kt
@@ -0,0 +1,25 @@
+package com.rootstrap.data.repository
+
+import com.rootstrap.data.api.ApiProvider
+import com.rootstrap.data.dto.request.UserSignInRequestSerializer
+import com.rootstrap.data.dto.request.UserSignUpRequestSerializer
+import com.rootstrap.data.util.extensions.ActionCallback
+
+class UserRepository(
+    private val apiProvider: ApiProvider
+) {
+
+    suspend fun signUp(userSignUpRequestSerializer: UserSignUpRequestSerializer) =
+        ActionCallback.call(
+            apiProvider.getUserApiService().signUp(userSignUpRequestSerializer)
+        )
+
+    suspend fun signIn(userSignInRequestSerializer: UserSignInRequestSerializer) =
+        ActionCallback.call(
+            apiProvider.getUserApiService().signIn(userSignInRequestSerializer)
+        )
+
+    suspend fun signOut() = ActionCallback.call(
+        apiProvider.getUserApiService().signOut()
+    )
+}
diff --git a/app/src/main/java/com/rootstrap/android/util/Prefs.kt b/data/src/main/java/com/rootstrap/data/util/Prefs.kt
similarity index 64%
rename from app/src/main/java/com/rootstrap/android/util/Prefs.kt
rename to data/src/main/java/com/rootstrap/data/util/Prefs.kt
index 7230177..3216a22 100644
--- a/app/src/main/java/com/rootstrap/android/util/Prefs.kt
+++ b/data/src/main/java/com/rootstrap/data/util/Prefs.kt
@@ -1,18 +1,11 @@
-package com.rootstrap.android.util
+package com.rootstrap.data.util
 
 import android.content.SharedPreferences
 import com.google.gson.Gson
-import com.rootstrap.android.network.models.User
-import com.rootstrap.android.util.extensions.fromJson
-import javax.inject.Inject
+import com.rootstrap.data.util.extensions.fromJson
+import com.rootstrap.domain.User
 
-class Prefs @Inject constructor(private val prefs: SharedPreferences) {
-
-    val ACCESS_TOKEN = "access-token"
-    val CLIENT = "Client"
-    val UID = "uid"
-    val USER = "user"
-    val SIGNED_IN = "signed_in"
+class Prefs(private val prefs: SharedPreferences) {
 
     private val gson: Gson = Gson()
 
@@ -26,7 +19,7 @@ class Prefs @Inject constructor(private val prefs: SharedPreferences) {
 
     var uid: String
         get() = prefs.getString(UID, "")!!
-        set(value) = prefs.edit().putString(UID, value).apply()
+        set(value) = prefs.edit().putString(Companion.UID, value).apply()
 
     var user: User?
         get() = gson.fromJson<User>(prefs.getString(USER, "")!!)
@@ -37,4 +30,12 @@ class Prefs @Inject constructor(private val prefs: SharedPreferences) {
         set(value) = prefs.edit().putBoolean(SIGNED_IN, value).apply()
 
     fun clear() = prefs.edit().clear().apply()
+
+    companion object {
+        const val ACCESS_TOKEN = "access-token"
+        const val CLIENT = "Client"
+        const val UID = "uid"
+        const val USER = "user"
+        const val SIGNED_IN = "signed_in"
+    }
 }
diff --git a/app/src/main/java/com/rootstrap/android/util/extensions/ActionCallback.kt b/data/src/main/java/com/rootstrap/data/util/extensions/ActionCallback.kt
similarity index 53%
rename from app/src/main/java/com/rootstrap/android/util/extensions/ActionCallback.kt
rename to data/src/main/java/com/rootstrap/data/util/extensions/ActionCallback.kt
index ef22a27..413bd71 100644
--- a/app/src/main/java/com/rootstrap/android/util/extensions/ActionCallback.kt
+++ b/data/src/main/java/com/rootstrap/data/util/extensions/ActionCallback.kt
@@ -1,7 +1,10 @@
-package com.rootstrap.android.util.extensions
+package com.rootstrap.data.util.extensions
 
 import com.google.gson.Gson
-import com.rootstrap.android.network.models.ErrorModel
+import com.rootstrap.data.api.ApiErrorType
+import com.rootstrap.data.api.ApiException
+import com.rootstrap.data.dto.response.DataResult
+import com.rootstrap.data.dto.response.ErrorModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import retrofit2.Call
@@ -11,22 +14,22 @@ class ActionCallback {
 
     companion object {
 
-        suspend fun <T> call(apiCall: Call<T>): Result<Data<T>> =
+        suspend fun <T> call(apiCall: Call<T>): DataResult<T> =
             withContext(Dispatchers.IO) {
                 val response = apiCall.execute()
                 handleResponse(response)
             }
 
-        private fun <T> handleResponse(response: Response<T>): Result<Data<T>> {
+        private fun <T> handleResponse(response: Response<T>): DataResult<T> {
             if (response.isSuccessful) {
-                return Result.success(
-                    Data(response.body())
+                return DataResult.Success(
+                    response.body()
                 )
             } else {
                 try {
                     response.errorBody()?.let {
                         val apiError = Gson().fromJson(it.charStream(), ErrorModel::class.java)
-                        return Result.failure(
+                        return DataResult.Error(
                             ApiException(
                                 errorMessage = apiError.error
                             )
@@ -36,22 +39,8 @@ class ActionCallback {
                 }
             }
 
-            return Result.failure(ApiException(errorType = ApiErrorType.unknownError))
+            return DataResult.Error(ApiException(errorType = ApiErrorType.GENERIC_IO_ERROR))
         }
     }
 }
 
-class Data<T>(val value: T?)
-
-class ApiException(
-    private val errorMessage: String? = null,
-    val errorType: ApiErrorType = ApiErrorType.apiError
-) : java.lang.Exception() {
-    override val message: String?
-        get() = errorMessage
-}
-
-enum class ApiErrorType {
-    apiError,
-    unknownError
-}
diff --git a/data/src/main/java/com/rootstrap/data/util/extensions/Gson.kt b/data/src/main/java/com/rootstrap/data/util/extensions/Gson.kt
new file mode 100644
index 0000000..8de60ca
--- /dev/null
+++ b/data/src/main/java/com/rootstrap/data/util/extensions/Gson.kt
@@ -0,0 +1,7 @@
+package com.rootstrap.data.util.extensions
+
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+
+inline fun <reified T> Gson.fromJson(json: String): T =
+    this.fromJson(json, object : TypeToken<T>() {}.type)
diff --git a/domain/.gitignore b/domain/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/domain/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/domain/build.gradle b/domain/build.gradle
new file mode 100644
index 0000000..c5e3111
--- /dev/null
+++ b/domain/build.gradle
@@ -0,0 +1,9 @@
+plugins {
+    id 'java-library'
+    id 'kotlin'
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_7
+    targetCompatibility = JavaVersion.VERSION_1_7
+}
diff --git a/domain/src/main/java/com/rootstrap/domain/User.kt b/domain/src/main/java/com/rootstrap/domain/User.kt
new file mode 100644
index 0000000..a58c773
--- /dev/null
+++ b/domain/src/main/java/com/rootstrap/domain/User.kt
@@ -0,0 +1,11 @@
+package com.rootstrap.domain
+
+data class User(
+    val id: String = "",
+    val email: String = "",
+    val firstName: String = "",
+    val lastName: String = "",
+    val phoneNumber: String = "",
+    val password: String = "",
+    val username: String = ""
+)
diff --git a/fastlane/Appfile b/fastlane/Appfile
index a6b0b8b..34b53b4 100644
--- a/fastlane/Appfile
+++ b/fastlane/Appfile
@@ -10,14 +10,6 @@ for_platform :android do
     package_name("com.rootstrap.android")
   end
 
-  for_lane :deploy_dev do
-   package_name("com.rootstrap.android.dev")
-  end
-
-  for_lane :debug_dev do
-    package_name("com.rootstrap.android.dev")
-  end
-
   for_lane :deploy_staging do
     package_name("com.rootstrap.android.staging")
   end
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index c4dd60a..2171b35 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -6,30 +6,6 @@ default_platform(:android)
 skip_docs
 
 platform :android do
-  lane :deploy_production do
-    release(flavor: 'Prod', track: 'internal')
-  end
-
-  lane :deploy_dev do
-    release(flavor: 'Dev', track: 'internal')
-  end
-
-  lane :deploy_staging do
-    release(flavor: 'Staging', track: 'internal')
-  end
-
-  lane :debug_production do
-      debug(flavor: 'Prod')
-  end
-
-  lane :debug_dev do
-    debug(flavor: 'Dev')
-  end
-
-  lane :debug_staging do
-    debug(flavor: 'Staging')
-  end
-
   lane :release do |options|
     increment_version_code(
       gradle_file_path: “app/build.gradle”
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e7b189d..0aeb7fd 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jan 18 09:20:52 ART 2021
+#Mon Dec 13 17:15:09 ART 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle b/settings.gradle
index e7b4def..dd1098d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,4 @@
 include ':app'
+include ':domain'
+include ':data'
+include ':usecases'
diff --git a/usecases/.gitignore b/usecases/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/usecases/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/usecases/build.gradle b/usecases/build.gradle
new file mode 100644
index 0000000..63d1a9f
--- /dev/null
+++ b/usecases/build.gradle
@@ -0,0 +1,46 @@
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+}
+
+android {
+    compileSdkVersion 31
+
+    defaultConfig {
+        minSdkVersion 23
+        targetSdkVersion 31
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+    }
+
+    buildTypes {
+        getByName("debug") {
+            minifyEnabled false
+        }
+
+        create("staging") {
+            initWith(getByName("debug"))
+        }
+
+        getByName("release") {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+}
+
+dependencies {
+    implementation project(":data")
+    implementation project(":domain")
+
+    implementation kotlinLibs.values()
+    testImplementation testLibs.values()
+}
diff --git a/usecases/src/main/AndroidManifest.xml b/usecases/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..fb0e648
--- /dev/null
+++ b/usecases/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.rootstrap.usecases" >
+
+</manifest>
diff --git a/usecases/src/main/java/com/rootstrap/usecases/SignIn.kt b/usecases/src/main/java/com/rootstrap/usecases/SignIn.kt
new file mode 100644
index 0000000..046f05e
--- /dev/null
+++ b/usecases/src/main/java/com/rootstrap/usecases/SignIn.kt
@@ -0,0 +1,12 @@
+package com.rootstrap.usecases
+
+import com.rootstrap.data.dto.request.UserSignInRequestSerializer
+import com.rootstrap.data.dto.response.DataResult
+import com.rootstrap.data.dto.response.UserResponseSerializer
+import com.rootstrap.data.repository.UserRepository
+
+class SignIn(private val userRepository: UserRepository) {
+
+    suspend fun invoke(userSignInRequestSerializer: UserSignInRequestSerializer): DataResult<UserResponseSerializer> =
+        userRepository.signIn(userSignInRequestSerializer)
+}
diff --git a/usecases/src/main/java/com/rootstrap/usecases/SignOut.kt b/usecases/src/main/java/com/rootstrap/usecases/SignOut.kt
new file mode 100644
index 0000000..682d87d
--- /dev/null
+++ b/usecases/src/main/java/com/rootstrap/usecases/SignOut.kt
@@ -0,0 +1,10 @@
+package com.rootstrap.usecases
+
+import com.rootstrap.data.dto.response.DataResult
+import com.rootstrap.data.repository.UserRepository
+
+class SignOut(private val userRepository: UserRepository) {
+
+    suspend fun invoke(): DataResult<Void> =
+        userRepository.signOut()
+}
diff --git a/usecases/src/main/java/com/rootstrap/usecases/SignUp.kt b/usecases/src/main/java/com/rootstrap/usecases/SignUp.kt
new file mode 100644
index 0000000..7cf43e6
--- /dev/null
+++ b/usecases/src/main/java/com/rootstrap/usecases/SignUp.kt
@@ -0,0 +1,12 @@
+package com.rootstrap.usecases
+
+import com.rootstrap.data.dto.request.UserSignUpRequestSerializer
+import com.rootstrap.data.dto.response.DataResult
+import com.rootstrap.data.dto.response.UserResponseSerializer
+import com.rootstrap.data.repository.UserRepository
+
+class SignUp(private val userRepository: UserRepository) {
+
+    suspend fun invoke(userSignUpRequestSerializer: UserSignUpRequestSerializer): DataResult<UserResponseSerializer> =
+        userRepository.signUp(userSignUpRequestSerializer)
+}