split domain module by feature

Razeeman · Dec 29, 2024 · b408f93 · b408f93
1 parent fb38f2b
commit b408f93
Show file tree

Hide file tree

Showing 63 changed files with 77 additions and 80 deletions.
diff --git a/app/src/main/java/com/example/util/simpletimetracker/di/AppModuleBinds.kt b/app/src/main/java/com/example/util/simpletimetracker/di/AppModuleBinds.kt
@@ -5,10 +5,10 @@ import com.example.util.simpletimetracker.core.interactor.IsSystemInDarkModeInte
 import com.example.util.simpletimetracker.core.interactor.GetUntrackedRecordsInteractorImpl
 import com.example.util.simpletimetracker.core.mapper.AppColorMapperImpl
 import com.example.util.simpletimetracker.core.provider.ApplicationDataProvider
-import com.example.util.simpletimetracker.domain.mapper.AppColorMapper
-import com.example.util.simpletimetracker.domain.interactor.GetCurrentDayInteractor
+import com.example.util.simpletimetracker.domain.color.mapper.AppColorMapper
+import com.example.util.simpletimetracker.domain.daysOfWeek.interactor.GetCurrentDayInteractor
+import com.example.util.simpletimetracker.domain.record.interactor.GetUntrackedRecordsInteractor
 import com.example.util.simpletimetracker.domain.darkMode.interactor.IsSystemInDarkModeInteractor
-import com.example.util.simpletimetracker.domain.interactor.GetUntrackedRecordsInteractor
 import com.example.util.simpletimetracker.provider.ApplicationDataProviderImpl
 import dagger.Binds
 import dagger.Module

diff --git a/.../java/com/example/util/simpletimetracker/core/interactor/ChartFilterViewDataInteractor.kt b/.../java/com/example/util/simpletimetracker/core/interactor/ChartFilterViewDataInteractor.kt
@@ -5,7 +5,7 @@ import com.example.util.simpletimetracker.core.mapper.ChartFilterViewDataMapper
 import com.example.util.simpletimetracker.core.mapper.RecordTypeViewDataMapper
 import com.example.util.simpletimetracker.domain.base.UNCATEGORIZED_ITEM_ID
 import com.example.util.simpletimetracker.domain.base.UNTRACKED_ITEM_ID
-import com.example.util.simpletimetracker.domain.model.Category
+import com.example.util.simpletimetracker.domain.category.model.Category
 import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor
 import com.example.util.simpletimetracker.domain.recordTag.model.RecordTag
 import com.example.util.simpletimetracker.domain.recordType.model.RecordType

diff --git a/...in/java/com/example/util/simpletimetracker/core/interactor/GetCurrentDayInteractorImpl.kt b/...in/java/com/example/util/simpletimetracker/core/interactor/GetCurrentDayInteractorImpl.kt
@@ -1,7 +1,7 @@
 package com.example.util.simpletimetracker.core.interactor
 
 import com.example.util.simpletimetracker.core.mapper.TimeMapper
-import com.example.util.simpletimetracker.domain.interactor.GetCurrentDayInteractor
+import com.example.util.simpletimetracker.domain.daysOfWeek.interactor.GetCurrentDayInteractor
 import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor
 import com.example.util.simpletimetracker.domain.daysOfWeek.model.DayOfWeek
 import java.util.Calendar

diff --git a/...a/com/example/util/simpletimetracker/core/interactor/GetUntrackedRecordsInteractorImpl.kt b/...a/com/example/util/simpletimetracker/core/interactor/GetUntrackedRecordsInteractorImpl.kt
@@ -4,7 +4,7 @@ import com.example.util.simpletimetracker.core.mapper.TimeMapper
 import com.example.util.simpletimetracker.domain.base.UNTRACKED_ITEM_ID
 import com.example.util.simpletimetracker.domain.extension.dropMillis
 import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor
-import com.example.util.simpletimetracker.domain.interactor.GetUntrackedRecordsInteractor
+import com.example.util.simpletimetracker.domain.record.interactor.GetUntrackedRecordsInteractor
 import com.example.util.simpletimetracker.domain.record.interactor.RecordInteractor
 import com.example.util.simpletimetracker.domain.record.mapper.UntrackedRecordMapper
 import com.example.util.simpletimetracker.domain.record.model.Range

diff --git a/...rc/main/java/com/example/util/simpletimetracker/core/interactor/RecordFilterInteractor.kt b/...rc/main/java/com/example/util/simpletimetracker/core/interactor/RecordFilterInteractor.kt
@@ -29,7 +29,7 @@ import com.example.util.simpletimetracker.domain.recordType.interactor.RecordTyp
 import com.example.util.simpletimetracker.domain.record.interactor.RunningRecordInteractor
 import com.example.util.simpletimetracker.domain.record.mapper.RangeMapper
 import com.example.util.simpletimetracker.domain.daysOfWeek.model.DayOfWeek
-import com.example.util.simpletimetracker.domain.interactor.GetUntrackedRecordsInteractor
+import com.example.util.simpletimetracker.domain.record.interactor.GetUntrackedRecordsInteractor
 import com.example.util.simpletimetracker.domain.record.model.Range
 import com.example.util.simpletimetracker.domain.statistics.model.RangeLength
 import com.example.util.simpletimetracker.domain.record.model.Record

diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/mapper/AppColorMapperImpl.kt b/core/src/main/java/com/example/util/simpletimetracker/core/mapper/AppColorMapperImpl.kt
@@ -4,7 +4,7 @@ import android.graphics.Color
 import androidx.annotation.ColorInt
 import com.example.util.simpletimetracker.core.R
 import com.example.util.simpletimetracker.core.repo.ResourceRepo
-import com.example.util.simpletimetracker.domain.mapper.AppColorMapper
+import com.example.util.simpletimetracker.domain.color.mapper.AppColorMapper
 import com.example.util.simpletimetracker.domain.color.model.AppColor
 import javax.inject.Inject
 

diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/mapper/CategoryViewDataMapper.kt b/core/src/main/java/com/example/util/simpletimetracker/core/mapper/CategoryViewDataMapper.kt
@@ -5,7 +5,7 @@ import com.example.util.simpletimetracker.core.repo.ResourceRepo
 import com.example.util.simpletimetracker.domain.base.MULTITASK_ITEM_ID
 import com.example.util.simpletimetracker.domain.base.UNCATEGORIZED_ITEM_ID
 import com.example.util.simpletimetracker.domain.base.UNTRACKED_ITEM_ID
-import com.example.util.simpletimetracker.domain.model.Category
+import com.example.util.simpletimetracker.domain.category.model.Category
 import com.example.util.simpletimetracker.domain.color.model.AppColor
 import com.example.util.simpletimetracker.domain.recordTag.model.RecordTag
 import com.example.util.simpletimetracker.domain.recordType.model.RecordType

diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/mapper/ColorMapper.kt b/core/src/main/java/com/example/util/simpletimetracker/core/mapper/ColorMapper.kt
@@ -4,7 +4,7 @@ import android.graphics.Color
 import androidx.annotation.ColorInt
 import com.example.util.simpletimetracker.core.R
 import com.example.util.simpletimetracker.core.repo.ResourceRepo
-import com.example.util.simpletimetracker.domain.mapper.AppColorMapper
+import com.example.util.simpletimetracker.domain.color.mapper.AppColorMapper
 import com.example.util.simpletimetracker.domain.color.model.AppColor
 import com.example.util.simpletimetracker.feature_views.viewData.RecordTypeIcon
 import javax.inject.Inject

diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/utils/TestUtils.kt b/core/src/main/java/com/example/util/simpletimetracker/core/utils/TestUtils.kt
@@ -20,7 +20,7 @@ import com.example.util.simpletimetracker.domain.recordTag.interactor.RecordType
 import com.example.util.simpletimetracker.domain.recordTag.interactor.RecordTypeToTagInteractor
 import com.example.util.simpletimetracker.domain.record.interactor.RunningRecordInteractor
 import com.example.util.simpletimetracker.domain.activityFilter.model.ActivityFilter
-import com.example.util.simpletimetracker.domain.model.Category
+import com.example.util.simpletimetracker.domain.category.model.Category
 import com.example.util.simpletimetracker.domain.color.model.AppColor
 import com.example.util.simpletimetracker.domain.complexRule.model.ComplexRule
 import com.example.util.simpletimetracker.domain.daysOfWeek.model.DayOfWeek

diff --git a/...c/main/java/com/example/util/simpletimetracker/data_local/backup/BackupPartialRepoImpl.kt b/...c/main/java/com/example/util/simpletimetracker/data_local/backup/BackupPartialRepoImpl.kt
@@ -36,9 +36,9 @@ import com.example.util.simpletimetracker.domain.recordType.repo.RecordTypeGoalR
 import com.example.util.simpletimetracker.domain.recordType.repo.RecordTypeRepo
 import com.example.util.simpletimetracker.domain.recordTag.repo.RecordTypeToDefaultTagRepo
 import com.example.util.simpletimetracker.domain.recordTag.repo.RecordTypeToTagRepo
-import com.example.util.simpletimetracker.domain.resolver.BackupPartialRepo
+import com.example.util.simpletimetracker.domain.backup.repo.BackupPartialRepo
 import com.example.util.simpletimetracker.domain.backup.model.ResultCode
-import com.example.util.simpletimetracker.domain.model.Category
+import com.example.util.simpletimetracker.domain.category.model.Category
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import javax.inject.Inject

diff --git a/...ocal/src/main/java/com/example/util/simpletimetracker/data_local/backup/BackupRepoImpl.kt b/...ocal/src/main/java/com/example/util/simpletimetracker/data_local/backup/BackupRepoImpl.kt
@@ -42,7 +42,7 @@ import com.example.util.simpletimetracker.domain.recordTag.repo.RecordTypeToDefa
 import com.example.util.simpletimetracker.domain.recordTag.repo.RecordTypeToTagRepo
 import com.example.util.simpletimetracker.domain.backup.repo.BackupRepo
 import com.example.util.simpletimetracker.domain.backup.model.ResultCode
-import com.example.util.simpletimetracker.domain.model.Category
+import com.example.util.simpletimetracker.domain.category.model.Category
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import timber.log.Timber

diff --git a/...in/java/com/example/util/simpletimetracker/data_local/category/CategoryDataLocalMapper.kt b/...in/java/com/example/util/simpletimetracker/data_local/category/CategoryDataLocalMapper.kt
@@ -1,6 +1,6 @@
 package com.example.util.simpletimetracker.data_local.category
 
-import com.example.util.simpletimetracker.domain.model.Category
+import com.example.util.simpletimetracker.domain.category.model.Category
 import com.example.util.simpletimetracker.domain.color.model.AppColor
 import javax.inject.Inject
 

diff --git a/.../src/main/java/com/example/util/simpletimetracker/data_local/category/CategoryRepoImpl.kt b/.../src/main/java/com/example/util/simpletimetracker/data_local/category/CategoryRepoImpl.kt
@@ -2,7 +2,7 @@ package com.example.util.simpletimetracker.data_local.category
 
 import com.example.util.simpletimetracker.data_local.base.withLockedCache
 import com.example.util.simpletimetracker.data_local.base.removeIf
-import com.example.util.simpletimetracker.domain.model.Category
+import com.example.util.simpletimetracker.domain.category.model.Category
 import com.example.util.simpletimetracker.domain.category.repo.CategoryRepo
 import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject

diff --git a/...al/src/main/java/com/example/util/simpletimetracker/data_local/di/DataLocalModuleBinds.kt b/...al/src/main/java/com/example/util/simpletimetracker/data_local/di/DataLocalModuleBinds.kt
@@ -39,10 +39,10 @@ import com.example.util.simpletimetracker.domain.recordTag.repo.RecordTypeToDefa
 import com.example.util.simpletimetracker.domain.recordTag.repo.RecordTypeToTagRepo
 import com.example.util.simpletimetracker.domain.record.repo.RunningRecordRepo
 import com.example.util.simpletimetracker.domain.recordTag.repo.RunningRecordToRecordTagRepo
-import com.example.util.simpletimetracker.domain.resolver.BackupPartialRepo
+import com.example.util.simpletimetracker.domain.backup.repo.BackupPartialRepo
 import com.example.util.simpletimetracker.domain.backup.repo.BackupRepo
-import com.example.util.simpletimetracker.domain.resolver.CsvRepo
-import com.example.util.simpletimetracker.domain.resolver.IcsRepo
+import com.example.util.simpletimetracker.domain.backup.repo.CsvRepo
+import com.example.util.simpletimetracker.domain.backup.repo.IcsRepo
 import com.example.util.simpletimetracker.domain.sharing.SharingRepo
 import dagger.Binds
 import dagger.Module

diff --git a/data_local/src/main/java/com/example/util/simpletimetracker/data_local/file/CsvRepoImpl.kt b/data_local/src/main/java/com/example/util/simpletimetracker/data_local/file/CsvRepoImpl.kt
@@ -16,9 +16,9 @@ import com.example.util.simpletimetracker.domain.record.repo.RecordRepo
 import com.example.util.simpletimetracker.domain.recordTag.repo.RecordTagRepo
 import com.example.util.simpletimetracker.domain.category.repo.RecordTypeCategoryRepo
 import com.example.util.simpletimetracker.domain.recordType.repo.RecordTypeRepo
-import com.example.util.simpletimetracker.domain.resolver.CsvRepo
+import com.example.util.simpletimetracker.domain.backup.repo.CsvRepo
 import com.example.util.simpletimetracker.domain.backup.model.ResultCode
-import com.example.util.simpletimetracker.domain.model.Category
+import com.example.util.simpletimetracker.domain.category.model.Category
 import java.io.BufferedReader
 import java.io.FileOutputStream
 import java.io.IOException

diff --git a/data_local/src/main/java/com/example/util/simpletimetracker/data_local/file/IcsRepoImpl.kt b/data_local/src/main/java/com/example/util/simpletimetracker/data_local/file/IcsRepoImpl.kt
@@ -15,8 +15,8 @@ import com.example.util.simpletimetracker.domain.recordTag.repo.RecordTagRepo
 import com.example.util.simpletimetracker.domain.category.repo.RecordTypeCategoryRepo
 import com.example.util.simpletimetracker.domain.recordType.repo.RecordTypeRepo
 import com.example.util.simpletimetracker.domain.backup.model.ResultCode
-import com.example.util.simpletimetracker.domain.resolver.IcsRepo
-import com.example.util.simpletimetracker.domain.model.Category
+import com.example.util.simpletimetracker.domain.backup.repo.IcsRepo
+import com.example.util.simpletimetracker.domain.category.model.Category
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import timber.log.Timber

diff --git a/..._local/src/main/java/com/example/util/simpletimetracker/data_local/prefs/PrefsRepoImpl.kt b/..._local/src/main/java/com/example/util/simpletimetracker/data_local/prefs/PrefsRepoImpl.kt
@@ -3,10 +3,10 @@ package com.example.util.simpletimetracker.data_local.prefs
 import android.content.SharedPreferences
 import com.example.util.simpletimetracker.data_local.base.delegate
 import com.example.util.simpletimetracker.data_local.base.logPrefsDataAccess
+import com.example.util.simpletimetracker.domain.statistics.model.StatisticsWidgetData
 import com.example.util.simpletimetracker.domain.statistics.model.ChartFilterType
 import com.example.util.simpletimetracker.domain.widget.model.QuickSettingsWidgetType
 import com.example.util.simpletimetracker.domain.statistics.model.RangeLength
-import com.example.util.simpletimetracker.domain.statistics.model.StatisticsWidgetData
 import com.example.util.simpletimetracker.domain.prefs.repo.PrefsRepo
 import java.util.Calendar
 import javax.inject.Inject

diff --git a/...main/java/com/example/util/simpletimetracker/domain/backup/interactor/BackupInteractor.kt b/...main/java/com/example/util/simpletimetracker/domain/backup/interactor/BackupInteractor.kt
@@ -3,7 +3,7 @@ package com.example.util.simpletimetracker.domain.backup.interactor
 import com.example.util.simpletimetracker.domain.backup.model.BackupOptionsData
 import com.example.util.simpletimetracker.domain.backup.model.PartialBackupRestoreData
 import com.example.util.simpletimetracker.domain.backup.model.ResultCode
-import com.example.util.simpletimetracker.domain.resolver.BackupPartialRepo
+import com.example.util.simpletimetracker.domain.backup.repo.BackupPartialRepo
 import com.example.util.simpletimetracker.domain.backup.repo.BackupRepo
 import com.example.util.simpletimetracker.domain.notifications.interactor.UpdateExternalViewsInteractor
 import javax.inject.Inject

diff --git a/...n/java/com/example/util/simpletimetracker/domain/backup/interactor/CsvExportInteractor.kt b/...n/java/com/example/util/simpletimetracker/domain/backup/interactor/CsvExportInteractor.kt
@@ -1,7 +1,7 @@
 package com.example.util.simpletimetracker.domain.backup.interactor
 
 import com.example.util.simpletimetracker.domain.backup.model.ResultCode
-import com.example.util.simpletimetracker.domain.resolver.CsvRepo
+import com.example.util.simpletimetracker.domain.backup.repo.CsvRepo
 import com.example.util.simpletimetracker.domain.notifications.interactor.UpdateExternalViewsInteractor
 import com.example.util.simpletimetracker.domain.record.model.Range
 import javax.inject.Inject

diff --git a/.../domain/interactor/IcsExportInteractor.kt → .../backup/interactor/IcsExportInteractor.kt b/.../domain/interactor/IcsExportInteractor.kt → .../backup/interactor/IcsExportInteractor.kt
@@ -1,7 +1,7 @@
-package com.example.util.simpletimetracker.domain.interactor
+package com.example.util.simpletimetracker.domain.backup.interactor
 
 import com.example.util.simpletimetracker.domain.backup.model.ResultCode
-import com.example.util.simpletimetracker.domain.resolver.IcsRepo
+import com.example.util.simpletimetracker.domain.backup.repo.IcsRepo
 import com.example.util.simpletimetracker.domain.record.model.Range
 import javax.inject.Inject
 

diff --git a/...n/java/com/example/util/simpletimetracker/domain/backup/model/PartialBackupRestoreData.kt b/...n/java/com/example/util/simpletimetracker/domain/backup/model/PartialBackupRestoreData.kt
@@ -1,7 +1,7 @@
 package com.example.util.simpletimetracker.domain.backup.model
 
 import com.example.util.simpletimetracker.domain.activityFilter.model.ActivityFilter
-import com.example.util.simpletimetracker.domain.model.Category
+import com.example.util.simpletimetracker.domain.category.model.Category
 import com.example.util.simpletimetracker.domain.category.model.RecordTypeCategory
 import com.example.util.simpletimetracker.domain.complexRule.model.ComplexRule
 import com.example.util.simpletimetracker.domain.favourite.model.FavouriteColor

diff --git a/...cker/domain/resolver/BackupPartialRepo.kt → ...r/domain/backup/repo/BackupPartialRepo.kt b/...cker/domain/resolver/BackupPartialRepo.kt → ...r/domain/backup/repo/BackupPartialRepo.kt
@@ -1,4 +1,4 @@
-package com.example.util.simpletimetracker.domain.resolver
+package com.example.util.simpletimetracker.domain.backup.repo
 
 import com.example.util.simpletimetracker.domain.backup.model.BackupOptionsData
 import com.example.util.simpletimetracker.domain.backup.model.PartialBackupRestoreData

diff --git a/...pletimetracker/domain/resolver/CsvRepo.kt → ...timetracker/domain/backup/repo/CsvRepo.kt b/...pletimetracker/domain/resolver/CsvRepo.kt → ...timetracker/domain/backup/repo/CsvRepo.kt
@@ -1,4 +1,4 @@
-package com.example.util.simpletimetracker.domain.resolver
+package com.example.util.simpletimetracker.domain.backup.repo
 
 import com.example.util.simpletimetracker.domain.backup.model.ResultCode
 import com.example.util.simpletimetracker.domain.record.model.Range

diff --git a/...pletimetracker/domain/resolver/IcsRepo.kt → ...timetracker/domain/backup/repo/IcsRepo.kt b/...pletimetracker/domain/resolver/IcsRepo.kt → ...timetracker/domain/backup/repo/IcsRepo.kt
@@ -1,4 +1,4 @@
-package com.example.util.simpletimetracker.domain.resolver
+package com.example.util.simpletimetracker.domain.backup.repo
 
 import com.example.util.simpletimetracker.domain.backup.model.ResultCode
 import com.example.util.simpletimetracker.domain.record.model.Range

diff --git a/.../java/com/example/util/simpletimetracker/domain/category/interactor/CategoryInteractor.kt b/.../java/com/example/util/simpletimetracker/domain/category/interactor/CategoryInteractor.kt
@@ -1,11 +1,11 @@
 package com.example.util.simpletimetracker.domain.category.interactor
 
-import com.example.util.simpletimetracker.domain.model.Category
+import com.example.util.simpletimetracker.domain.category.model.Category
 import com.example.util.simpletimetracker.domain.category.repo.CategoryRepo
 import com.example.util.simpletimetracker.domain.category.repo.RecordTypeCategoryRepo
+import com.example.util.simpletimetracker.domain.recordType.model.CardOrder
 import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor
 import com.example.util.simpletimetracker.domain.recordType.interactor.SortCardsInteractor
-import com.example.util.simpletimetracker.domain.recordType.model.CardOrder
 import com.example.util.simpletimetracker.domain.recordType.repo.RecordTypeGoalRepo
 import javax.inject.Inject
 

diff --git a/...impletimetracker/domain/model/Category.kt → ...tracker/domain/category/model/Category.kt b/...impletimetracker/domain/model/Category.kt → ...tracker/domain/category/model/Category.kt
@@ -1,4 +1,4 @@
-package com.example.util.simpletimetracker.domain.model
+package com.example.util.simpletimetracker.domain.category.model
 
 import com.example.util.simpletimetracker.domain.color.model.AppColor
 

diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/category/repo/CategoryRepo.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/category/repo/CategoryRepo.kt
@@ -1,6 +1,6 @@
 package com.example.util.simpletimetracker.domain.category.repo
 
-import com.example.util.simpletimetracker.domain.model.Category
+import com.example.util.simpletimetracker.domain.category.model.Category
 
 interface CategoryRepo {
 

diff --git a/...metracker/domain/mapper/AppColorMapper.kt → ...ker/domain/color/mapper/AppColorMapper.kt b/...metracker/domain/mapper/AppColorMapper.kt → ...ker/domain/color/mapper/AppColorMapper.kt
@@ -1,4 +1,4 @@
-package com.example.util.simpletimetracker.domain.mapper
+package com.example.util.simpletimetracker.domain.color.mapper
 
 import com.example.util.simpletimetracker.domain.color.model.AppColor
 

diff --git a/...til/simpletimetracker/domain/complexRule/interactor/ComplexRuleProcessActionInteractor.kt b/...til/simpletimetracker/domain/complexRule/interactor/ComplexRuleProcessActionInteractor.kt
@@ -1,6 +1,6 @@
 package com.example.util.simpletimetracker.domain.complexRule.interactor
 
-import com.example.util.simpletimetracker.domain.interactor.GetCurrentDayInteractor
+import com.example.util.simpletimetracker.domain.daysOfWeek.interactor.GetCurrentDayInteractor
 import com.example.util.simpletimetracker.domain.daysOfWeek.model.DayOfWeek
 import com.example.util.simpletimetracker.domain.base.ResultContainer
 import com.example.util.simpletimetracker.domain.complexRule.model.ComplexRule

diff --git a/...example/util/simpletimetracker/domain/darkMode/interactor/IsSystemInDarkModeInteractor.kt b/...example/util/simpletimetracker/domain/darkMode/interactor/IsSystemInDarkModeInteractor.kt
@@ -1,4 +1,4 @@
-package com.example.util.simpletimetracker.domain.interactor
+package com.example.util.simpletimetracker.domain.darkMode.interactor
 
 interface IsSystemInDarkModeInteractor {
 

diff --git a/...ain/interactor/GetCurrentDayInteractor.kt → ...eek/interactor/GetCurrentDayInteractor.kt b/...ain/interactor/GetCurrentDayInteractor.kt → ...eek/interactor/GetCurrentDayInteractor.kt
@@ -1,4 +1,4 @@
-package com.example.util.simpletimetracker.domain.interactor
+package com.example.util.simpletimetracker.domain.daysOfWeek.interactor
 
 import com.example.util.simpletimetracker.domain.daysOfWeek.model.DayOfWeek
 

diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/icon/IconType.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/icon/IconType.kt
@@ -1,4 +1,4 @@
-package com.example.util.simpletimetracker.domain.model
+package com.example.util.simpletimetracker.domain.icon
 
 enum class IconType {
     IMAGE,

diff --git a/...e/util/simpletimetracker/domain/notifications/interactor/UpdateExternalViewsInteractor.kt b/...e/util/simpletimetracker/domain/notifications/interactor/UpdateExternalViewsInteractor.kt
@@ -1,11 +1,11 @@
 package com.example.util.simpletimetracker.domain.notifications.interactor
 
+import com.example.util.simpletimetracker.domain.wear.WearInteractor
 import com.example.util.simpletimetracker.domain.recordType.model.RecordTypeGoal
 import com.example.util.simpletimetracker.domain.record.model.RunningRecord
 import com.example.util.simpletimetracker.domain.widget.model.WidgetType
 import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor
 import com.example.util.simpletimetracker.domain.record.interactor.RunningRecordInteractor
-import com.example.util.simpletimetracker.domain.wear.WearInteractor
 import com.example.util.simpletimetracker.domain.widget.interactor.WidgetInteractor
 import javax.inject.Inject
 

diff --git a/...c/main/java/com/example/util/simpletimetracker/domain/prefs/interactor/PrefsInteractor.kt b/...c/main/java/com/example/util/simpletimetracker/domain/prefs/interactor/PrefsInteractor.kt
@@ -2,18 +2,18 @@ package com.example.util.simpletimetracker.domain.prefs.interactor
 
 import com.example.util.simpletimetracker.domain.extension.orZero
 import com.example.util.simpletimetracker.domain.darkMode.model.DarkMode
-import com.example.util.simpletimetracker.domain.darkMode.interactor.IsSystemInDarkModeInteractor
 import com.example.util.simpletimetracker.domain.recordTag.model.CardTagOrder
 import com.example.util.simpletimetracker.domain.statistics.model.ChartFilterType
 import com.example.util.simpletimetracker.domain.daysOfWeek.model.DayOfWeek
 import com.example.util.simpletimetracker.domain.daysOfWeek.model.DaysInCalendar
+import com.example.util.simpletimetracker.domain.darkMode.interactor.IsSystemInDarkModeInteractor
+import com.example.util.simpletimetracker.domain.recordType.model.CardOrder
+import com.example.util.simpletimetracker.domain.statistics.model.StatisticsWidgetData
 import com.example.util.simpletimetracker.domain.prefs.repo.PrefsRepo
 import com.example.util.simpletimetracker.domain.widget.model.QuickSettingsWidgetType
 import com.example.util.simpletimetracker.domain.record.model.Range
 import com.example.util.simpletimetracker.domain.statistics.model.RangeLength
 import com.example.util.simpletimetracker.domain.record.model.RepeatButtonType
-import com.example.util.simpletimetracker.domain.recordType.model.CardOrder
-import com.example.util.simpletimetracker.domain.statistics.model.StatisticsWidgetData
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import javax.inject.Inject

diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/prefs/repo/PrefsRepo.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/prefs/repo/PrefsRepo.kt
@@ -1,7 +1,7 @@
 package com.example.util.simpletimetracker.domain.prefs.repo
 
-import com.example.util.simpletimetracker.domain.widget.model.QuickSettingsWidgetType
 import com.example.util.simpletimetracker.domain.statistics.model.StatisticsWidgetData
+import com.example.util.simpletimetracker.domain.widget.model.QuickSettingsWidgetType
 
 interface PrefsRepo {
 

diff --git a/...teractor/GetUntrackedRecordsInteractor.kt → ...teractor/GetUntrackedRecordsInteractor.kt b/...teractor/GetUntrackedRecordsInteractor.kt → ...teractor/GetUntrackedRecordsInteractor.kt
@@ -1,4 +1,4 @@
-package com.example.util.simpletimetracker.domain.interactor
+package com.example.util.simpletimetracker.domain.record.interactor
 
 import com.example.util.simpletimetracker.domain.record.model.Range
 import com.example.util.simpletimetracker.domain.record.model.Record