diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 8e0c069..6e4e859 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -13,7 +13,6 @@ dependencies {
     implementation(project(":feature:detail"))
     implementation(project(":feature:friend"))
     implementation(project(":core:designsystem"))
-    implementation(project(":core:data"))
     implementation(project(":core:navigation"))
     implementation(project(":common:resource"))
 
diff --git a/build-logic/src/main/kotlin/convention.android.feature.gradle.kts b/build-logic/src/main/kotlin/convention.android.feature.gradle.kts
index 7eea8ea..6572fc6 100644
--- a/build-logic/src/main/kotlin/convention.android.feature.gradle.kts
+++ b/build-logic/src/main/kotlin/convention.android.feature.gradle.kts
@@ -11,10 +11,10 @@ android {
 }
 
 dependencies {
+    "implementation"(project(":data"))
+    "implementation"(project(":domain"))
     "implementation"(project(":common:resource"))
     "implementation"(project(":core:designsystem"))
-    "implementation"(project(":core:data"))
-    "implementation"(project(":core:domain"))
     "implementation"(project(":core:util"))
     implementation(project(":core:navigation"))
 }
diff --git a/core/datastore/build.gradle.kts b/core/datastore/build.gradle.kts
deleted file mode 100644
index 7756707..0000000
--- a/core/datastore/build.gradle.kts
+++ /dev/null
@@ -1,15 +0,0 @@
-plugins {
-    id("convention.android.library")
-}
-
-android {
-    namespace = "com.idiotfrogs.datastore"
-}
-
-dependencies {
-    implementation(libs.androidx.core.ktx)
-    implementation(libs.androidx.appcompat)
-    testImplementation(libs.junit)
-    androidTestImplementation(libs.androidx.test.ext)
-    androidTestImplementation(libs.androidx.test.espresso)
-}
\ No newline at end of file
diff --git a/core/datastore/src/androidTest/java/com/idiotfrogs/datastore/ExampleInstrumentedTest.kt b/core/datastore/src/androidTest/java/com/idiotfrogs/datastore/ExampleInstrumentedTest.kt
deleted file mode 100644
index 1302d38..0000000
--- a/core/datastore/src/androidTest/java/com/idiotfrogs/datastore/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.idiotfrogs.datastore
-
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.ext.junit.runners.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.idiotfrogs.datastore.test", appContext.packageName)
-    }
-}
\ No newline at end of file
diff --git a/core/datastore/src/test/java/com/idiotfrogs/datastore/ExampleUnitTest.kt b/core/datastore/src/test/java/com/idiotfrogs/datastore/ExampleUnitTest.kt
deleted file mode 100644
index 35438cf..0000000
--- a/core/datastore/src/test/java/com/idiotfrogs/datastore/ExampleUnitTest.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.idiotfrogs.datastore
-
-import org.junit.Test
-
-import org.junit.Assert.*
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
-}
\ No newline at end of file
diff --git a/core/domain/.gitignore b/core/domain/.gitignore
deleted file mode 100644
index 42afabf..0000000
--- a/core/domain/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/core/domain/proguard-rules.pro b/core/domain/proguard-rules.pro
deleted file mode 100644
index 481bb43..0000000
--- a/core/domain/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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
\ No newline at end of file
diff --git a/core/domain/src/main/AndroidManifest.xml b/core/domain/src/main/AndroidManifest.xml
deleted file mode 100644
index a5918e6..0000000
--- a/core/domain/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-</manifest>
\ No newline at end of file
diff --git a/core/data/consumer-rules.pro b/core/model/src/main/java/com/idiotfrogs/model/data/.gitkeep
similarity index 100%
rename from core/data/consumer-rules.pro
rename to core/model/src/main/java/com/idiotfrogs/model/data/.gitkeep
diff --git a/core/datastore/consumer-rules.pro b/core/model/src/main/java/com/idiotfrogs/model/domain/.gitkeep
similarity index 100%
rename from core/datastore/consumer-rules.pro
rename to core/model/src/main/java/com/idiotfrogs/model/domain/.gitkeep
diff --git a/core/data/.gitignore b/data/.gitignore
similarity index 100%
rename from core/data/.gitignore
rename to data/.gitignore
diff --git a/core/data/build.gradle.kts b/data/build.gradle.kts
similarity index 96%
rename from core/data/build.gradle.kts
rename to data/build.gradle.kts
index f3fe0f9..0c2c9d3 100644
--- a/core/data/build.gradle.kts
+++ b/data/build.gradle.kts
@@ -19,7 +19,6 @@ android {
 
 dependencies {
     implementation(project(":common:extension"))
-    implementation(project(":core:domain"))
 
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.appcompat)
diff --git a/core/domain/consumer-rules.pro b/data/consumer-rules.pro
similarity index 100%
rename from core/domain/consumer-rules.pro
rename to data/consumer-rules.pro
diff --git a/core/data/proguard-rules.pro b/data/proguard-rules.pro
similarity index 100%
rename from core/data/proguard-rules.pro
rename to data/proguard-rules.pro
diff --git a/core/data/src/androidTest/java/com/idiotfrogs/data/ExampleInstrumentedTest.kt b/data/src/androidTest/java/com/idiotfrogs/data/ExampleInstrumentedTest.kt
similarity index 100%
rename from core/data/src/androidTest/java/com/idiotfrogs/data/ExampleInstrumentedTest.kt
rename to data/src/androidTest/java/com/idiotfrogs/data/ExampleInstrumentedTest.kt
diff --git a/core/data/src/main/AndroidManifest.xml b/data/src/main/AndroidManifest.xml
similarity index 100%
rename from core/data/src/main/AndroidManifest.xml
rename to data/src/main/AndroidManifest.xml
diff --git a/core/domain/src/main/java/com/idiotfrogs/domain/exception/LoginCancelledException.kt b/data/src/main/java/com/idiotfrogs/data/exception/LoginCancelledException.kt
similarity index 61%
rename from core/domain/src/main/java/com/idiotfrogs/domain/exception/LoginCancelledException.kt
rename to data/src/main/java/com/idiotfrogs/data/exception/LoginCancelledException.kt
index 092e67c..af1b0a4 100644
--- a/core/domain/src/main/java/com/idiotfrogs/domain/exception/LoginCancelledException.kt
+++ b/data/src/main/java/com/idiotfrogs/data/exception/LoginCancelledException.kt
@@ -1,3 +1,3 @@
-package com.idiotfrogs.domain.exception
+package com.idiotfrogs.data.exception
 
 class LoginCancelledException: Exception("User cancelled login")
\ No newline at end of file
diff --git a/data/src/main/java/com/idiotfrogs/data/local/.gitkeep b/data/src/main/java/com/idiotfrogs/data/local/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/core/data/src/main/java/com/idiotfrogs/data/LoginManager.kt b/data/src/main/java/com/idiotfrogs/data/remote/LoginManager.kt
similarity index 96%
rename from core/data/src/main/java/com/idiotfrogs/data/LoginManager.kt
rename to data/src/main/java/com/idiotfrogs/data/remote/LoginManager.kt
index b3cbd65..5547db3 100644
--- a/core/data/src/main/java/com/idiotfrogs/data/LoginManager.kt
+++ b/data/src/main/java/com/idiotfrogs/data/remote/LoginManager.kt
@@ -1,4 +1,4 @@
-package com.idiotfrogs.data
+package com.idiotfrogs.data.remote
 
 import android.content.Context
 import androidx.credentials.CredentialManager
@@ -11,7 +11,8 @@ import com.google.firebase.auth.AuthResult
 import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.auth.FirebaseAuthWebException
 import com.google.firebase.auth.OAuthProvider
-import com.idiotfrogs.domain.exception.LoginCancelledException
+import com.idiotfrogs.data.BuildConfig
+import com.idiotfrogs.data.exception.LoginCancelledException
 import com.idiotfrogs.extension.findActivity
 import dagger.hilt.android.qualifiers.ActivityContext
 import dagger.hilt.android.scopes.ActivityScoped
diff --git a/core/data/src/test/java/com/idiotfrogs/data/ExampleUnitTest.kt b/data/src/test/java/com/idiotfrogs/data/ExampleUnitTest.kt
similarity index 100%
rename from core/data/src/test/java/com/idiotfrogs/data/ExampleUnitTest.kt
rename to data/src/test/java/com/idiotfrogs/data/ExampleUnitTest.kt
diff --git a/core/datastore/.gitignore b/domain/.gitignore
similarity index 100%
rename from core/datastore/.gitignore
rename to domain/.gitignore
diff --git a/core/domain/build.gradle.kts b/domain/build.gradle.kts
similarity index 90%
rename from core/domain/build.gradle.kts
rename to domain/build.gradle.kts
index c8a1fe5..d02300a 100644
--- a/core/domain/build.gradle.kts
+++ b/domain/build.gradle.kts
@@ -7,6 +7,8 @@ android {
 }
 
 dependencies {
+    implementation(project(":data"))
+
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.appcompat)
     testImplementation(libs.junit)
diff --git a/domain/consumer-rules.pro b/domain/consumer-rules.pro
new file mode 100644
index 0000000..e69de29
diff --git a/core/datastore/proguard-rules.pro b/domain/proguard-rules.pro
similarity index 100%
rename from core/datastore/proguard-rules.pro
rename to domain/proguard-rules.pro
diff --git a/core/domain/src/androidTest/java/com/idiotfrogs/domain/ExampleInstrumentedTest.kt b/domain/src/androidTest/java/com/idiotfrogs/domain/ExampleInstrumentedTest.kt
similarity index 100%
rename from core/domain/src/androidTest/java/com/idiotfrogs/domain/ExampleInstrumentedTest.kt
rename to domain/src/androidTest/java/com/idiotfrogs/domain/ExampleInstrumentedTest.kt
diff --git a/core/datastore/src/main/AndroidManifest.xml b/domain/src/main/AndroidManifest.xml
similarity index 100%
rename from core/datastore/src/main/AndroidManifest.xml
rename to domain/src/main/AndroidManifest.xml
diff --git a/domain/src/main/java/com/idiotfrogs/domain/repository/impl/.gitkeep b/domain/src/main/java/com/idiotfrogs/domain/repository/impl/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/core/domain/src/test/java/com/idiotfrogs/domain/ExampleUnitTest.kt b/domain/src/test/java/com/idiotfrogs/domain/ExampleUnitTest.kt
similarity index 100%
rename from core/domain/src/test/java/com/idiotfrogs/domain/ExampleUnitTest.kt
rename to domain/src/test/java/com/idiotfrogs/domain/ExampleUnitTest.kt
diff --git a/feature/auth/src/main/java/com/idiotfrogs/auth/login/LoginViewModel.kt b/feature/auth/src/main/java/com/idiotfrogs/auth/login/LoginViewModel.kt
index 89ca448..b45f821 100644
--- a/feature/auth/src/main/java/com/idiotfrogs/auth/login/LoginViewModel.kt
+++ b/feature/auth/src/main/java/com/idiotfrogs/auth/login/LoginViewModel.kt
@@ -2,7 +2,7 @@ package com.idiotfrogs.auth.login
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.idiotfrogs.domain.exception.LoginCancelledException
+import com.idiotfrogs.data.exception.LoginCancelledException
 import com.idiotfrogs.util.UiState
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineExceptionHandler
diff --git a/feature/auth/src/main/java/com/idiotfrogs/auth/util/RememberLoginManager.kt b/feature/auth/src/main/java/com/idiotfrogs/auth/util/RememberLoginManager.kt
index bdcc4fc..89c4cb4 100644
--- a/feature/auth/src/main/java/com/idiotfrogs/auth/util/RememberLoginManager.kt
+++ b/feature/auth/src/main/java/com/idiotfrogs/auth/util/RememberLoginManager.kt
@@ -3,7 +3,7 @@ package com.idiotfrogs.auth.util
 import androidx.activity.compose.LocalActivity
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
-import com.idiotfrogs.data.LoginManager
+import com.idiotfrogs.data.remote.LoginManager
 import dagger.hilt.EntryPoint
 import dagger.hilt.InstallIn
 import dagger.hilt.android.EntryPointAccessors
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 5183b86..599aae0 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -23,16 +23,15 @@ dependencyResolutionManagement {
 rootProject.name = "MemorySeal"
 
 include(":app")
+include(":data")
+include(":domain")
 include(":common:extension")
 include(":common:resource")
 include(":common:notification")
 include(":core:navigation")
 include(":core:network")
-include(":core:data")
-include(":core:domain")
 include(":core:model")
 include(":core:designsystem")
-include(":core:datastore")
 include(":core:di")
 include(":core:util")
 include(":feature:auth")