diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 467ae6a..2c07f02 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -67,6 +67,7 @@ dependencies {
     implementation(libs.retrofit.converter.gson)
     implementation(libs.androidx.material3.window.size.class1)
     implementation(libs.okhttp.sse)
+    implementation(libs.androidx.datastore)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
diff --git a/app/src/main/java/eu/m724/chatapp/activity/chat/ChatActivity.kt b/app/src/main/java/eu/m724/chatapp/activity/chat/ChatActivity.kt
index 9f5899d..881501f 100644
--- a/app/src/main/java/eu/m724/chatapp/activity/chat/ChatActivity.kt
+++ b/app/src/main/java/eu/m724/chatapp/activity/chat/ChatActivity.kt
@@ -47,7 +47,6 @@ import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.navigation.compose.rememberNavController
 import dagger.hilt.android.AndroidEntryPoint
 import eu.m724.chatapp.R
 import eu.m724.chatapp.activity.chat.composable.ChatToolBar
@@ -62,8 +61,6 @@ import eu.m724.chatapp.activity.ui.composable.disableBringIntoViewOnFocus
 import eu.m724.chatapp.activity.ui.composable.hideKeyboardOnScrollUp
 import eu.m724.chatapp.activity.ui.theme.ChatAppTheme
 import eu.m724.chatapp.api.data.response.completion.ChatMessage
-import eu.m724.chatapp.api.data.response.models.LanguageModel
-import eu.m724.chatapp.chat.Chat
 import kotlinx.coroutines.launch
 
 @AndroidEntryPoint
diff --git a/app/src/main/java/eu/m724/chatapp/activity/chat/ChatActivityUiState.kt b/app/src/main/java/eu/m724/chatapp/activity/chat/ChatActivityUiState.kt
index e7754e6..71bc9e6 100644
--- a/app/src/main/java/eu/m724/chatapp/activity/chat/ChatActivityUiState.kt
+++ b/app/src/main/java/eu/m724/chatapp/activity/chat/ChatActivityUiState.kt
@@ -1,7 +1,7 @@
 package eu.m724.chatapp.activity.chat
 
-import eu.m724.chatapp.chat.Chat
-import eu.m724.chatapp.chat.ChatResponseError
+import eu.m724.chatapp.store.data.Chat
+import eu.m724.chatapp.store.data.ChatResponseError
 
 data class ChatActivityUiState(
     val chat: Chat,
diff --git a/app/src/main/java/eu/m724/chatapp/activity/chat/ChatActivityViewModel.kt b/app/src/main/java/eu/m724/chatapp/activity/chat/ChatActivityViewModel.kt
index 4cf8e64..98be287 100644
--- a/app/src/main/java/eu/m724/chatapp/activity/chat/ChatActivityViewModel.kt
+++ b/app/src/main/java/eu/m724/chatapp/activity/chat/ChatActivityViewModel.kt
@@ -11,8 +11,8 @@ import eu.m724.chatapp.api.data.response.completion.ChatMessage
 import eu.m724.chatapp.api.data.response.completion.CompletionFinishReason
 import eu.m724.chatapp.api.data.response.models.LanguageModel
 import eu.m724.chatapp.api.retrofit.sse.SseEvent
-import eu.m724.chatapp.chat.Chat
-import eu.m724.chatapp.chat.ChatResponseError
+import eu.m724.chatapp.store.data.Chat
+import eu.m724.chatapp.store.data.ChatResponseError
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
diff --git a/app/src/main/java/eu/m724/chatapp/activity/chat/composable/thread/ChatResponseErrorNotice.kt b/app/src/main/java/eu/m724/chatapp/activity/chat/composable/thread/ChatResponseErrorNotice.kt
index a847ab5..7a53770 100644
--- a/app/src/main/java/eu/m724/chatapp/activity/chat/composable/thread/ChatResponseErrorNotice.kt
+++ b/app/src/main/java/eu/m724/chatapp/activity/chat/composable/thread/ChatResponseErrorNotice.kt
@@ -14,7 +14,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import eu.m724.chatapp.R
-import eu.m724.chatapp.chat.ChatResponseError
+import eu.m724.chatapp.store.data.ChatResponseError
 
 @Composable
 fun ChatResponseErrorNotice(
diff --git a/app/src/main/java/eu/m724/chatapp/activity/main/MainActivityUiEvent.kt b/app/src/main/java/eu/m724/chatapp/activity/main/MainActivityUiEvent.kt
index 5b29cb1..b5237ec 100644
--- a/app/src/main/java/eu/m724/chatapp/activity/main/MainActivityUiEvent.kt
+++ b/app/src/main/java/eu/m724/chatapp/activity/main/MainActivityUiEvent.kt
@@ -1,6 +1,6 @@
 package eu.m724.chatapp.activity.main
 
-import eu.m724.chatapp.chat.Chat
+import eu.m724.chatapp.store.data.Chat
 
 sealed interface MainActivityUiEvent {
     data class StartChat(
diff --git a/app/src/main/java/eu/m724/chatapp/activity/main/MainActivityViewModel.kt b/app/src/main/java/eu/m724/chatapp/activity/main/MainActivityViewModel.kt
index b7950db..cac5e80 100644
--- a/app/src/main/java/eu/m724/chatapp/activity/main/MainActivityViewModel.kt
+++ b/app/src/main/java/eu/m724/chatapp/activity/main/MainActivityViewModel.kt
@@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import eu.m724.chatapp.api.AiApiService
-import eu.m724.chatapp.chat.Chat
+import eu.m724.chatapp.store.data.Chat
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
diff --git a/app/src/main/java/eu/m724/chatapp/chat/Chat.kt b/app/src/main/java/eu/m724/chatapp/store/data/Chat.kt
similarity index 93%
rename from app/src/main/java/eu/m724/chatapp/chat/Chat.kt
rename to app/src/main/java/eu/m724/chatapp/store/data/Chat.kt
index ee0e410..39cc773 100644
--- a/app/src/main/java/eu/m724/chatapp/chat/Chat.kt
+++ b/app/src/main/java/eu/m724/chatapp/store/data/Chat.kt
@@ -1,4 +1,4 @@
-package eu.m724.chatapp.chat
+package eu.m724.chatapp.store.data
 
 import android.os.Parcelable
 import eu.m724.chatapp.api.data.response.completion.ChatMessage
diff --git a/app/src/main/java/eu/m724/chatapp/chat/ChatResponseError.kt b/app/src/main/java/eu/m724/chatapp/store/data/ChatResponseError.kt
similarity index 83%
rename from app/src/main/java/eu/m724/chatapp/chat/ChatResponseError.kt
rename to app/src/main/java/eu/m724/chatapp/store/data/ChatResponseError.kt
index 97237e3..c350847 100644
--- a/app/src/main/java/eu/m724/chatapp/chat/ChatResponseError.kt
+++ b/app/src/main/java/eu/m724/chatapp/store/data/ChatResponseError.kt
@@ -1,4 +1,4 @@
-package eu.m724.chatapp.chat
+package eu.m724.chatapp.store.data
 
 sealed interface ChatResponseError { // TODO does this belong here?
     data object LengthLimit: ChatResponseError
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d3ea46e..ac0a676 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -18,6 +18,7 @@ loggingInterceptor = "4.12.0"
 material3WindowSizeClass = "1.3.2"
 okhttpSse = "4.12.0"
 parcelize = "2.1.21"
+datastore = "1.1.7"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -43,6 +44,7 @@ retrofit-converter-gson = { group = "com.squareup.retrofit2", name = "converter-
 logging-interceptor = { group = "com.squareup.okhttp3", name = "logging-interceptor", version.ref = "loggingInterceptor" }
 androidx-material3-window-size-class1 = { group = "androidx.compose.material3", name = "material3-window-size-class", version.ref = "material3WindowSizeClass" }
 okhttp-sse = { group = "com.squareup.okhttp3", name = "okhttp-sse", version.ref = "okhttpSse" }
+androidx-datastore = { group = "androidx.datastore", name = "datastore", version.ref = "datastore" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }