diff --git a/src/main/kotlin/app/usecase/GenerateSplitHunkFromDiffResultUseCase.kt b/src/main/kotlin/app/git/diff/GenerateSplitHunkFromDiffResultUseCase.kt
similarity index 94%
rename from src/main/kotlin/app/usecase/GenerateSplitHunkFromDiffResultUseCase.kt
rename to src/main/kotlin/app/git/diff/GenerateSplitHunkFromDiffResultUseCase.kt
index 1e0acdc..96eec69 100644
--- a/src/main/kotlin/app/usecase/GenerateSplitHunkFromDiffResultUseCase.kt
+++ b/src/main/kotlin/app/git/diff/GenerateSplitHunkFromDiffResultUseCase.kt
@@ -1,9 +1,5 @@
-package app.usecase
+package app.git.diff
 
-import app.git.diff.DiffResult
-import app.git.diff.Line
-import app.git.diff.LineType
-import app.git.diff.SplitHunk
 import javax.inject.Inject
 import kotlin.math.abs
 
diff --git a/src/main/kotlin/app/viewmodels/DiffViewModel.kt b/src/main/kotlin/app/viewmodels/DiffViewModel.kt
index 89c379a..a4849ff 100644
--- a/src/main/kotlin/app/viewmodels/DiffViewModel.kt
+++ b/src/main/kotlin/app/viewmodels/DiffViewModel.kt
@@ -8,11 +8,10 @@ import app.git.*
 import app.git.diff.DiffResult
 import app.git.diff.Hunk
 import app.preferences.AppSettings
-import app.usecase.GenerateSplitHunkFromDiffResultUseCase
+import app.git.diff.GenerateSplitHunkFromDiffResultUseCase
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import org.eclipse.jgit.diff.DiffEntry
 import javax.inject.Inject
diff --git a/src/main/kotlin/app/viewmodels/HistoryViewModel.kt b/src/main/kotlin/app/viewmodels/HistoryViewModel.kt
index d1e0b66..2bc9707 100644
--- a/src/main/kotlin/app/viewmodels/HistoryViewModel.kt
+++ b/src/main/kotlin/app/viewmodels/HistoryViewModel.kt
@@ -6,10 +6,9 @@ import app.extensions.filePath
 import app.git.*
 import app.git.diff.DiffResult
 import app.preferences.AppSettings
-import app.usecase.GenerateSplitHunkFromDiffResultUseCase
+import app.git.diff.GenerateSplitHunkFromDiffResultUseCase
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import org.eclipse.jgit.revwalk.RevCommit
 import javax.inject.Inject
diff --git a/src/test/kotlin/app/usecase/GenerateSplitHunkFromDiffResultUseCaseTest.kt b/src/test/kotlin/app/usecase/GenerateSplitHunkFromDiffResultUseCaseTest.kt
index 8d139cf..af7476f 100644
--- a/src/test/kotlin/app/usecase/GenerateSplitHunkFromDiffResultUseCaseTest.kt
+++ b/src/test/kotlin/app/usecase/GenerateSplitHunkFromDiffResultUseCaseTest.kt
@@ -1,9 +1,6 @@
 package app.usecase
 
-import app.git.diff.DiffResult
-import app.git.diff.Hunk
-import app.git.diff.Line
-import app.git.diff.LineType
+import app.git.diff.*
 import io.mockk.mockk
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test