diff --git a/app-shared/src/androidMain/kotlin/com.mooncloak.vpn.app.shared/di/AndroidApplicationDependencies.kt b/app-shared/src/androidMain/kotlin/com.mooncloak.vpn.app.shared/di/AndroidApplicationDependencies.kt
index 68715ba6..36f37516 100644
--- a/app-shared/src/androidMain/kotlin/com.mooncloak.vpn.app.shared/di/AndroidApplicationDependencies.kt
+++ b/app-shared/src/androidMain/kotlin/com.mooncloak.vpn.app.shared/di/AndroidApplicationDependencies.kt
@@ -12,7 +12,7 @@ import com.mooncloak.vpn.app.shared.storage.database.DatabaseDriverFactory
 import com.mooncloak.vpn.app.shared.util.ApplicationContext
 import com.mooncloak.vpn.app.shared.util.coroutine.ApplicationCoroutineScope
 import com.mooncloak.vpn.app.shared.util.notification.NotificationManager
-import com.mooncloak.vpn.data.shared.MutableKeyValueStorage
+import com.mooncloak.vpn.data.shared.keyvalue.MutableKeyValueStorage
 import io.ktor.client.HttpClient
 import kotlinx.datetime.Clock
 import kotlinx.serialization.json.Json
diff --git a/app-shared/src/commonMain/kotlin/com/mooncloak/vpn/app/shared/di/ApplicationComponent.kt b/app-shared/src/commonMain/kotlin/com/mooncloak/vpn/app/shared/di/ApplicationComponent.kt
index a5d91798..3fd97482 100644
--- a/app-shared/src/commonMain/kotlin/com/mooncloak/vpn/app/shared/di/ApplicationComponent.kt
+++ b/app-shared/src/commonMain/kotlin/com/mooncloak/vpn/app/shared/di/ApplicationComponent.kt
@@ -24,8 +24,8 @@ import com.mooncloak.vpn.app.shared.util.http.DefaultUnauthorizedInterceptor
 import com.mooncloak.vpn.app.shared.util.http.UnauthorizedInterceptor
 import com.mooncloak.vpn.app.shared.util.http.interceptUnauthorized
 import com.mooncloak.vpn.app.storage.sqlite.database.MooncloakDatabase
-import com.mooncloak.vpn.data.shared.MutableKeyValueStorage
-import com.mooncloak.vpn.data.shared.SettingsKeyValueStorage
+import com.mooncloak.vpn.data.shared.keyvalue.MutableKeyValueStorage
+import com.mooncloak.vpn.data.shared.keyvalue.SettingsKeyValueStorage
 import com.russhwolf.settings.Settings
 import io.ktor.client.HttpClient
 import io.ktor.client.plugins.compression.ContentEncoding
diff --git a/app-shared/src/commonMain/kotlin/com/mooncloak/vpn/app/shared/di/ApplicationDependencies.kt b/app-shared/src/commonMain/kotlin/com/mooncloak/vpn/app/shared/di/ApplicationDependencies.kt
index cd3ea655..28ceed1c 100644
--- a/app-shared/src/commonMain/kotlin/com/mooncloak/vpn/app/shared/di/ApplicationDependencies.kt
+++ b/app-shared/src/commonMain/kotlin/com/mooncloak/vpn/app/shared/di/ApplicationDependencies.kt
@@ -11,7 +11,7 @@ import com.mooncloak.vpn.app.shared.storage.PreferencesStorage
 import com.mooncloak.vpn.app.shared.storage.database.DatabaseDriverFactory
 import com.mooncloak.vpn.app.shared.util.coroutine.ApplicationCoroutineScope
 import com.mooncloak.vpn.app.shared.util.notification.NotificationManager
-import com.mooncloak.vpn.data.shared.MutableKeyValueStorage
+import com.mooncloak.vpn.data.shared.keyvalue.MutableKeyValueStorage
 import io.ktor.client.HttpClient
 import kotlinx.datetime.Clock
 import kotlinx.serialization.json.Json
diff --git a/app-shared/src/commonMain/kotlin/com/mooncloak/vpn/app/shared/storage/SubscriptionStorage.kt b/app-shared/src/commonMain/kotlin/com/mooncloak/vpn/app/shared/storage/SubscriptionStorage.kt
index 84e4bed9..b075ddef 100644
--- a/app-shared/src/commonMain/kotlin/com/mooncloak/vpn/app/shared/storage/SubscriptionStorage.kt
+++ b/app-shared/src/commonMain/kotlin/com/mooncloak/vpn/app/shared/storage/SubscriptionStorage.kt
@@ -4,10 +4,9 @@ import com.mooncloak.kodetools.konstruct.annotations.Inject
 import com.mooncloak.kodetools.konstruct.annotations.Singleton
 import com.mooncloak.vpn.api.shared.service.ServiceSubscription
 import com.mooncloak.vpn.api.shared.service.ServiceTokens
-import com.mooncloak.vpn.data.shared.KeyValueProperty
-import com.mooncloak.vpn.data.shared.MutableKeyValueProperty
-import com.mooncloak.vpn.data.shared.MutableKeyValueStorage
-import com.mooncloak.vpn.data.shared.property
+import com.mooncloak.vpn.data.shared.keyvalue.MutableKeyValueProperty
+import com.mooncloak.vpn.data.shared.keyvalue.MutableKeyValueStorage
+import com.mooncloak.vpn.data.shared.keyvalue.property
 
 @Singleton
 public class SubscriptionStorage @Inject public constructor(
diff --git a/app-shared/src/jvmMain/kotlin/com/mooncloak/vpn/app/shared/di/JvmApplicationDependencies.kt b/app-shared/src/jvmMain/kotlin/com/mooncloak/vpn/app/shared/di/JvmApplicationDependencies.kt
index f64c5311..57fb7f4d 100644
--- a/app-shared/src/jvmMain/kotlin/com/mooncloak/vpn/app/shared/di/JvmApplicationDependencies.kt
+++ b/app-shared/src/jvmMain/kotlin/com/mooncloak/vpn/app/shared/di/JvmApplicationDependencies.kt
@@ -11,7 +11,7 @@ import com.mooncloak.vpn.app.shared.storage.PreferencesStorage
 import com.mooncloak.vpn.app.shared.storage.database.DatabaseDriverFactory
 import com.mooncloak.vpn.app.shared.util.coroutine.ApplicationCoroutineScope
 import com.mooncloak.vpn.app.shared.util.notification.NotificationManager
-import com.mooncloak.vpn.data.shared.MutableKeyValueStorage
+import com.mooncloak.vpn.data.shared.keyvalue.MutableKeyValueStorage
 import io.ktor.client.HttpClient
 import kotlinx.datetime.Clock
 import kotlinx.serialization.json.Json
diff --git a/data-shared/src/commonMain/kotlin/com/mooncloak/vpn/data/shared/DefaultKeyValueProperty.kt b/data-shared/src/commonMain/kotlin/com/mooncloak/vpn/data/shared/keyvalue/DefaultKeyValueProperty.kt
similarity index 98%
rename from data-shared/src/commonMain/kotlin/com/mooncloak/vpn/data/shared/DefaultKeyValueProperty.kt
rename to data-shared/src/commonMain/kotlin/com/mooncloak/vpn/data/shared/keyvalue/DefaultKeyValueProperty.kt
index 20807a97..faf54fa0 100644
--- a/data-shared/src/commonMain/kotlin/com/mooncloak/vpn/data/shared/DefaultKeyValueProperty.kt
+++ b/data-shared/src/commonMain/kotlin/com/mooncloak/vpn/data/shared/keyvalue/DefaultKeyValueProperty.kt
@@ -1,4 +1,4 @@
-package com.mooncloak.vpn.data.shared
+package com.mooncloak.vpn.data.shared.keyvalue
 
 import kotlinx.coroutines.flow.Flow
 import kotlinx.serialization.KSerializer
diff --git a/data-shared/src/commonMain/kotlin/com/mooncloak/vpn/data/shared/InMemoryKeyValueStorage.kt b/data-shared/src/commonMain/kotlin/com/mooncloak/vpn/data/shared/keyvalue/InMemoryKeyValueStorage.kt
similarity index 99%
rename from data-shared/src/commonMain/kotlin/com/mooncloak/vpn/data/shared/InMemoryKeyValueStorage.kt
rename to data-shared/src/commonMain/kotlin/com/mooncloak/vpn/data/shared/keyvalue/InMemoryKeyValueStorage.kt
index 747dd6a4..76ad5300 100644
--- a/data-shared/src/commonMain/kotlin/com/mooncloak/vpn/data/shared/InMemoryKeyValueStorage.kt
+++ b/data-shared/src/commonMain/kotlin/com/mooncloak/vpn/data/shared/keyvalue/InMemoryKeyValueStorage.kt
@@ -1,4 +1,4 @@
-package com.mooncloak.vpn.data.shared
+package com.mooncloak.vpn.data.shared.keyvalue
 
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
diff --git a/data-shared/src/commonMain/kotlin/com/mooncloak/vpn/data/shared/KeyValueDelegates.kt b/data-shared/src/commonMain/kotlin/com/mooncloak/vpn/data/shared/keyvalue/KeyValueDelegates.kt
similarity index 98%
rename from data-shared/src/commonMain/kotlin/com/mooncloak/vpn/data/shared/KeyValueDelegates.kt
rename to data-shared/src/commonMain/kotlin/com/mooncloak/vpn/data/shared/keyvalue/KeyValueDelegates.kt
index 2b50c66a..2778e9b8 100644
--- a/data-shared/src/commonMain/kotlin/com/mooncloak/vpn/data/shared/KeyValueDelegates.kt
+++ b/data-shared/src/commonMain/kotlin/com/mooncloak/vpn/data/shared/keyvalue/KeyValueDelegates.kt
@@ -1,4 +1,4 @@
-package com.mooncloak.vpn.data.shared
+package com.mooncloak.vpn.data.shared.keyvalue
 
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.serializer
diff --git a/data-shared/src/commonMain/kotlin/com/mooncloak/vpn/data/shared/KeyValueProperty.kt b/data-shared/src/commonMain/kotlin/com/mooncloak/vpn/data/shared/keyvalue/KeyValueProperty.kt
similarity index 97%
rename from data-shared/src/commonMain/kotlin/com/mooncloak/vpn/data/shared/KeyValueProperty.kt
rename to data-shared/src/commonMain/kotlin/com/mooncloak/vpn/data/shared/keyvalue/KeyValueProperty.kt
index 199a56ef..b9265472 100644
--- a/data-shared/src/commonMain/kotlin/com/mooncloak/vpn/data/shared/KeyValueProperty.kt
+++ b/data-shared/src/commonMain/kotlin/com/mooncloak/vpn/data/shared/keyvalue/KeyValueProperty.kt
@@ -1,4 +1,4 @@
-package com.mooncloak.vpn.data.shared
+package com.mooncloak.vpn.data.shared.keyvalue
 
 import kotlinx.coroutines.flow.Flow
 
diff --git a/data-shared/src/commonMain/kotlin/com/mooncloak/vpn/data/shared/KeyValueStorage.kt b/data-shared/src/commonMain/kotlin/com/mooncloak/vpn/data/shared/keyvalue/KeyValueStorage.kt
similarity index 99%
rename from data-shared/src/commonMain/kotlin/com/mooncloak/vpn/data/shared/KeyValueStorage.kt
rename to data-shared/src/commonMain/kotlin/com/mooncloak/vpn/data/shared/keyvalue/KeyValueStorage.kt
index e7abe506..887e2fae 100644
--- a/data-shared/src/commonMain/kotlin/com/mooncloak/vpn/data/shared/KeyValueStorage.kt
+++ b/data-shared/src/commonMain/kotlin/com/mooncloak/vpn/data/shared/keyvalue/KeyValueStorage.kt
@@ -1,4 +1,4 @@
-package com.mooncloak.vpn.data.shared
+package com.mooncloak.vpn.data.shared.keyvalue
 
 import kotlinx.coroutines.flow.Flow
 import kotlinx.serialization.KSerializer
diff --git a/data-shared/src/commonMain/kotlin/com/mooncloak/vpn/data/shared/SettingsKeyValueStorage.kt b/data-shared/src/commonMain/kotlin/com/mooncloak/vpn/data/shared/keyvalue/SettingsKeyValueStorage.kt
similarity index 98%
rename from data-shared/src/commonMain/kotlin/com/mooncloak/vpn/data/shared/SettingsKeyValueStorage.kt
rename to data-shared/src/commonMain/kotlin/com/mooncloak/vpn/data/shared/keyvalue/SettingsKeyValueStorage.kt
index 3ebd93ed..f5649dff 100644
--- a/data-shared/src/commonMain/kotlin/com/mooncloak/vpn/data/shared/SettingsKeyValueStorage.kt
+++ b/data-shared/src/commonMain/kotlin/com/mooncloak/vpn/data/shared/keyvalue/SettingsKeyValueStorage.kt
@@ -1,4 +1,4 @@
-package com.mooncloak.vpn.data.shared
+package com.mooncloak.vpn.data.shared.keyvalue
 
 import com.russhwolf.settings.ExperimentalSettingsApi
 import com.russhwolf.settings.Settings