diff --git a/data/records/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/data/InMemoryRecordRepository.kt b/data/records/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/data/InMemoryRecordRepository.kt
index 8e36114..418f6e4 100644
--- a/data/records/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/data/InMemoryRecordRepository.kt
+++ b/data/records/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/data/InMemoryRecordRepository.kt
@@ -1,8 +1,8 @@
 package fr.ajaury.gwenedeg.records.data
 
 import fr.ajaury.gwenedeg.core.model.Phrase
-import fr.ajaury.gwenedeg.core.model.Record
 import fr.ajaury.gwenedeg.records.domain.RecordRepository
+import fr.ajaury.gwenedeg.records.model.Record
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
 
diff --git a/data/records/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/domain/RecordRepository.kt b/data/records/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/domain/RecordRepository.kt
index 4e73cba..c6149ae 100644
--- a/data/records/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/domain/RecordRepository.kt
+++ b/data/records/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/domain/RecordRepository.kt
@@ -1,6 +1,6 @@
 package fr.ajaury.gwenedeg.records.domain
 
-import fr.ajaury.gwenedeg.core.model.Record
+import fr.ajaury.gwenedeg.records.model.Record
 import kotlinx.coroutines.flow.Flow
 
 interface RecordRepository {
diff --git a/core/model/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/model/Record.kt b/data/records/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/model/Record.kt
similarity index 71%
rename from core/model/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/model/Record.kt
rename to data/records/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/model/Record.kt
index a5d069f..8976eab 100644
--- a/core/model/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/model/Record.kt
+++ b/data/records/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/model/Record.kt
@@ -1,4 +1,6 @@
-package fr.ajaury.gwenedeg.core.model
+package fr.ajaury.gwenedeg.records.model
+
+import fr.ajaury.gwenedeg.core.model.Phrase
 
 data class Record(
     val id: Int,
diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/data/PlaybackRepositoryImpl.kt b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/data/PlaybackRepositoryImpl.kt
index 97e55eb..313f439 100644
--- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/data/PlaybackRepositoryImpl.kt
+++ b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/data/PlaybackRepositoryImpl.kt
@@ -2,12 +2,12 @@ package fr.ajaury.gwenedeg.player.data
 
 import fr.ajaury.gwenedeg.core.logging.domain.Logger
 import fr.ajaury.gwenedeg.core.model.Phrase
-import fr.ajaury.gwenedeg.core.model.Record
 import fr.ajaury.gwenedeg.player.domain.AudioPlayer
 import fr.ajaury.gwenedeg.player.domain.PlaybackRepository
 import fr.ajaury.gwenedeg.player.model.PlaybackState
 import fr.ajaury.gwenedeg.player.model.PlaybackTiming
 import fr.ajaury.gwenedeg.player.model.PlayerState
+import fr.ajaury.gwenedeg.records.model.Record
 import fr.ajaury.gwenedeg.resources.domain.ResourceReader
 import fr.ajaury.gwenedeg.subtitle.domain.GetCurrentSubtitleIndexUseCase
 import fr.ajaury.gwenedeg.subtitle.domain.SubtitleRepository
diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/domain/PlaybackRepository.kt b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/domain/PlaybackRepository.kt
index cbd762c..53f6711 100644
--- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/domain/PlaybackRepository.kt
+++ b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/domain/PlaybackRepository.kt
@@ -1,12 +1,8 @@
 package fr.ajaury.gwenedeg.player.domain
 
-import fr.ajaury.gwenedeg.core.model.Record
-import fr.ajaury.gwenedeg.player.model.PlaybackState
-import fr.ajaury.gwenedeg.player.model.PlaybackTiming
 import fr.ajaury.gwenedeg.player.model.PlayerState
-import fr.ajaury.gwenedeg.subtitle.model.Subtitle
+import fr.ajaury.gwenedeg.records.model.Record
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.StateFlow
 import kotlin.time.Duration
 
 /**
diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/viewmodel/PlayerViewModel.kt b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/viewmodel/PlayerViewModel.kt
index 9b250ad..4de3ad8 100644
--- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/viewmodel/PlayerViewModel.kt
+++ b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/viewmodel/PlayerViewModel.kt
@@ -4,12 +4,12 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import fr.ajaury.gwenedeg.core.logging.domain.Logger
 import fr.ajaury.gwenedeg.core.model.Phrase
-import fr.ajaury.gwenedeg.core.model.Record
 import fr.ajaury.gwenedeg.player.domain.AudioSessionManager
 import fr.ajaury.gwenedeg.player.domain.PlaybackRepository
 import fr.ajaury.gwenedeg.player.model.PlaybackState
 import fr.ajaury.gwenedeg.preferences.domain.PreferencesRepository
 import fr.ajaury.gwenedeg.records.domain.RecordRepository
+import fr.ajaury.gwenedeg.records.model.Record
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/ui/RecordView.kt b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/ui/RecordView.kt
index c939a5a..7f7b53f 100644
--- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/ui/RecordView.kt
+++ b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/ui/RecordView.kt
@@ -15,7 +15,7 @@ import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import fr.ajaury.gwenedeg.core.model.Phrase
-import fr.ajaury.gwenedeg.core.model.Record
+import fr.ajaury.gwenedeg.records.model.Record
 
 @Composable
 fun RecordView(
diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/ui/RecordsScreen.kt b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/ui/RecordsScreen.kt
index b1baa02..4429064 100644
--- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/ui/RecordsScreen.kt
+++ b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/ui/RecordsScreen.kt
@@ -12,7 +12,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import fr.ajaury.gwenedeg.core.model.Record
+import fr.ajaury.gwenedeg.records.model.Record
 import fr.ajaury.gwenedeg.records.ui.viewmodel.RecordsViewModel
 import org.koin.compose.viewmodel.koinViewModel
 
diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/ui/viewmodel/RecordsViewModel.kt b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/ui/viewmodel/RecordsViewModel.kt
index a335f4a..c44e755 100644
--- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/ui/viewmodel/RecordsViewModel.kt
+++ b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/ui/viewmodel/RecordsViewModel.kt
@@ -3,7 +3,7 @@ package fr.ajaury.gwenedeg.records.ui.viewmodel
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import fr.ajaury.gwenedeg.records.domain.RecordRepository
-import fr.ajaury.gwenedeg.core.model.Record
+import fr.ajaury.gwenedeg.records.model.Record
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.stateIn