diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9e5068b80..c7b4994a1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -262,7 +262,7 @@
             </intent-filter>
         </receiver>
         <receiver
-            android:name="com.kylecorry.trail_sense.astronomy.infrastructure.receivers.SunsetAlarmReceiver"
+            android:name="com.kylecorry.trail_sense.tools.astronomy.infrastructure.receivers.SunsetAlarmReceiver"
             android:enabled="true"
             android:exported="false" />
         <receiver
diff --git a/app/src/main/java/com/kylecorry/trail_sense/NotificationChannels.kt b/app/src/main/java/com/kylecorry/trail_sense/NotificationChannels.kt
index e93ffa68a..f30374093 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/NotificationChannels.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/NotificationChannels.kt
@@ -2,7 +2,7 @@ package com.kylecorry.trail_sense
 
 import android.content.Context
 import com.kylecorry.andromeda.notify.Notify
-import com.kylecorry.trail_sense.astronomy.infrastructure.commands.SunsetAlarmCommand
+import com.kylecorry.trail_sense.tools.astronomy.infrastructure.commands.SunsetAlarmCommand
 import com.kylecorry.trail_sense.navigation.paths.infrastructure.services.BacktrackService
 import com.kylecorry.trail_sense.tools.clock.infrastructure.NextMinuteBroadcastReceiver
 import com.kylecorry.trail_sense.tools.flashlight.infrastructure.FlashlightService
diff --git a/app/src/main/java/com/kylecorry/trail_sense/diagnostics/DiagnosticAlertService.kt b/app/src/main/java/com/kylecorry/trail_sense/diagnostics/DiagnosticAlertService.kt
index 4e2d0aa38..46200ef77 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/diagnostics/DiagnosticAlertService.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/diagnostics/DiagnosticAlertService.kt
@@ -12,7 +12,7 @@ import com.kylecorry.andromeda.markdown.MarkdownService
 import com.kylecorry.andromeda.permissions.Permissions
 import com.kylecorry.andromeda.permissions.SpecialPermission
 import com.kylecorry.trail_sense.R
-import com.kylecorry.trail_sense.astronomy.infrastructure.commands.SunsetAlarmCommand
+import com.kylecorry.trail_sense.tools.astronomy.infrastructure.commands.SunsetAlarmCommand
 import com.kylecorry.trail_sense.shared.alerts.MissingSensorAlert
 import com.kylecorry.trail_sense.shared.commands.Command
 import com.kylecorry.trail_sense.shared.navigation.IAppNavigation
diff --git a/app/src/main/java/com/kylecorry/trail_sense/diagnostics/NotificationDiagnostic.kt b/app/src/main/java/com/kylecorry/trail_sense/diagnostics/NotificationDiagnostic.kt
index 1409f2d78..66e906ac6 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/diagnostics/NotificationDiagnostic.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/diagnostics/NotificationDiagnostic.kt
@@ -6,7 +6,7 @@ import android.hardware.Sensor
 import android.os.Build
 import androidx.core.content.getSystemService
 import com.kylecorry.andromeda.sense.Sensors
-import com.kylecorry.trail_sense.astronomy.infrastructure.commands.SunsetAlarmCommand
+import com.kylecorry.trail_sense.tools.astronomy.infrastructure.commands.SunsetAlarmCommand
 import com.kylecorry.trail_sense.tools.flashlight.infrastructure.FlashlightService
 import com.kylecorry.trail_sense.tools.pedometer.infrastructure.StepCounterService
 import com.kylecorry.trail_sense.weather.infrastructure.alerts.CurrentWeatherAlerter
diff --git a/app/src/main/java/com/kylecorry/trail_sense/main/MainActivity.kt b/app/src/main/java/com/kylecorry/trail_sense/main/MainActivity.kt
index 3920526fd..b727fdcd0 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/main/MainActivity.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/main/MainActivity.kt
@@ -24,7 +24,7 @@ import com.kylecorry.andromeda.sense.Sensors
 import com.kylecorry.sol.units.Coordinate
 import com.kylecorry.trail_sense.ColorFilterConstraintLayout
 import com.kylecorry.trail_sense.R
-import com.kylecorry.trail_sense.astronomy.domain.AstronomyService
+import com.kylecorry.trail_sense.tools.astronomy.domain.AstronomyService
 import com.kylecorry.trail_sense.backup.BackupService
 import com.kylecorry.trail_sense.onboarding.OnboardingActivity
 import com.kylecorry.trail_sense.receivers.RestartServicesCommand
diff --git a/app/src/main/java/com/kylecorry/trail_sense/navigation/beacons/ui/BeaconDetailsFragment.kt b/app/src/main/java/com/kylecorry/trail_sense/navigation/beacons/ui/BeaconDetailsFragment.kt
index a8a95e4e6..0b7049b56 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/navigation/beacons/ui/BeaconDetailsFragment.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/navigation/beacons/ui/BeaconDetailsFragment.kt
@@ -15,7 +15,7 @@ import com.kylecorry.andromeda.fragments.observe
 import com.kylecorry.andromeda.pickers.Pickers
 import com.kylecorry.sol.units.Distance
 import com.kylecorry.trail_sense.R
-import com.kylecorry.trail_sense.astronomy.domain.AstronomyService
+import com.kylecorry.trail_sense.tools.astronomy.domain.AstronomyService
 import com.kylecorry.trail_sense.databinding.FragmentBeaconDetailsBinding
 import com.kylecorry.trail_sense.navigation.beacons.domain.Beacon
 import com.kylecorry.trail_sense.navigation.beacons.infrastructure.persistence.BeaconEntity
diff --git a/app/src/main/java/com/kylecorry/trail_sense/navigation/ui/data/NavAstronomyDataCommand.kt b/app/src/main/java/com/kylecorry/trail_sense/navigation/ui/data/NavAstronomyDataCommand.kt
index 07fd31c21..ca38e0e10 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/navigation/ui/data/NavAstronomyDataCommand.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/navigation/ui/data/NavAstronomyDataCommand.kt
@@ -2,7 +2,7 @@ package com.kylecorry.trail_sense.navigation.ui.data
 
 import com.kylecorry.andromeda.core.coroutines.onDefault
 import com.kylecorry.andromeda.sense.location.IGPS
-import com.kylecorry.trail_sense.astronomy.domain.AstronomyService
+import com.kylecorry.trail_sense.tools.astronomy.domain.AstronomyService
 import com.kylecorry.trail_sense.shared.commands.CoroutineValueCommand
 import java.time.LocalDate
 
diff --git a/app/src/main/java/com/kylecorry/trail_sense/navigation/ui/data/UpdateAstronomyLayerCommand.kt b/app/src/main/java/com/kylecorry/trail_sense/navigation/ui/data/UpdateAstronomyLayerCommand.kt
index 640a311e0..1f827eab8 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/navigation/ui/data/UpdateAstronomyLayerCommand.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/navigation/ui/data/UpdateAstronomyLayerCommand.kt
@@ -4,7 +4,7 @@ import com.kylecorry.andromeda.core.coroutines.onDefault
 import com.kylecorry.andromeda.sense.location.IGPS
 import com.kylecorry.sol.units.Bearing
 import com.kylecorry.trail_sense.R
-import com.kylecorry.trail_sense.astronomy.ui.MoonPhaseImageMapper
+import com.kylecorry.trail_sense.tools.astronomy.ui.MoonPhaseImageMapper
 import com.kylecorry.trail_sense.navigation.ui.IMappableReferencePoint
 import com.kylecorry.trail_sense.navigation.ui.MappableReferencePoint
 import com.kylecorry.trail_sense.navigation.ui.layers.compass.MarkerCompassLayer
diff --git a/app/src/main/java/com/kylecorry/trail_sense/receivers/TrailSenseServiceUtils.kt b/app/src/main/java/com/kylecorry/trail_sense/receivers/TrailSenseServiceUtils.kt
index eb0e30ca8..1db1878ee 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/receivers/TrailSenseServiceUtils.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/receivers/TrailSenseServiceUtils.kt
@@ -2,8 +2,8 @@ package com.kylecorry.trail_sense.receivers
 
 import android.content.Context
 import android.os.Build
-import com.kylecorry.trail_sense.astronomy.infrastructure.AstronomyDailyWorker
-import com.kylecorry.trail_sense.astronomy.infrastructure.receivers.SunsetAlarmReceiver
+import com.kylecorry.trail_sense.tools.astronomy.infrastructure.AstronomyDailyWorker
+import com.kylecorry.trail_sense.tools.astronomy.infrastructure.receivers.SunsetAlarmReceiver
 import com.kylecorry.trail_sense.navigation.paths.infrastructure.services.BacktrackService
 import com.kylecorry.trail_sense.navigation.paths.infrastructure.subsystem.BacktrackSubsystem
 import com.kylecorry.trail_sense.shared.FeatureState
diff --git a/app/src/main/java/com/kylecorry/trail_sense/settings/migrations/PreferenceMigrator.kt b/app/src/main/java/com/kylecorry/trail_sense/settings/migrations/PreferenceMigrator.kt
index 69819c990..5c5ccfc95 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/settings/migrations/PreferenceMigrator.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/settings/migrations/PreferenceMigrator.kt
@@ -3,7 +3,7 @@ package com.kylecorry.trail_sense.settings.migrations
 import android.content.Context
 import com.kylecorry.andromeda.core.system.Screen
 import com.kylecorry.trail_sense.R
-import com.kylecorry.trail_sense.astronomy.infrastructure.AstronomyDailyWorker
+import com.kylecorry.trail_sense.tools.astronomy.infrastructure.AstronomyDailyWorker
 import com.kylecorry.trail_sense.main.AppState
 import com.kylecorry.trail_sense.shared.UserPreferences
 import com.kylecorry.trail_sense.shared.preferences.PreferencesSubsystem
diff --git a/app/src/main/java/com/kylecorry/trail_sense/settings/ui/AstronomySettingsFragment.kt b/app/src/main/java/com/kylecorry/trail_sense/settings/ui/AstronomySettingsFragment.kt
index 37bb28f0b..5249224f8 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/settings/ui/AstronomySettingsFragment.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/settings/ui/AstronomySettingsFragment.kt
@@ -6,7 +6,7 @@ import androidx.preference.ListPreference
 import com.kylecorry.andromeda.core.topics.generic.asLiveData
 import com.kylecorry.andromeda.fragments.AndromedaPreferenceFragment
 import com.kylecorry.trail_sense.R
-import com.kylecorry.trail_sense.astronomy.infrastructure.receivers.SunsetAlarmReceiver
+import com.kylecorry.trail_sense.tools.astronomy.infrastructure.receivers.SunsetAlarmReceiver
 import com.kylecorry.trail_sense.shared.UserPreferences
 import com.kylecorry.trail_sense.shared.preferences.PreferencesSubsystem
 import com.kylecorry.trail_sense.tools.tools.ui.Tools
diff --git a/app/src/main/java/com/kylecorry/trail_sense/shared/UserPreferences.kt b/app/src/main/java/com/kylecorry/trail_sense/shared/UserPreferences.kt
index 44d83e1f3..b1cb6c2b4 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/shared/UserPreferences.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/shared/UserPreferences.kt
@@ -14,7 +14,7 @@ import com.kylecorry.sol.units.PressureUnits
 import com.kylecorry.sol.units.TemperatureUnits
 import com.kylecorry.sol.units.WeightUnits
 import com.kylecorry.trail_sense.R
-import com.kylecorry.trail_sense.astronomy.infrastructure.AstronomyPreferences
+import com.kylecorry.trail_sense.tools.astronomy.infrastructure.AstronomyPreferences
 import com.kylecorry.trail_sense.navigation.infrastructure.NavigationPreferences
 import com.kylecorry.trail_sense.settings.infrastructure.AltimeterPreferences
 import com.kylecorry.trail_sense.settings.infrastructure.AugmentedRealityPreferences
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/domain/AstroPositions.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/domain/AstroPositions.kt
similarity index 71%
rename from app/src/main/java/com/kylecorry/trail_sense/astronomy/domain/AstroPositions.kt
rename to app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/domain/AstroPositions.kt
index 2a42996a5..2f7c54424 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/domain/AstroPositions.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/domain/AstroPositions.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.domain
+package com.kylecorry.trail_sense.tools.astronomy.domain
 
 data class AstroPositions(
     val moonAltitude: Float,
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/domain/AstronomyEvent.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/domain/AstronomyEvent.kt
similarity index 71%
rename from app/src/main/java/com/kylecorry/trail_sense/astronomy/domain/AstronomyEvent.kt
rename to app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/domain/AstronomyEvent.kt
index a3bd98774..91b9fb84a 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/domain/AstronomyEvent.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/domain/AstronomyEvent.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.domain
+package com.kylecorry.trail_sense.tools.astronomy.domain
 
 enum class AstronomyEvent {
     FullMoon,
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/domain/AstronomyService.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/domain/AstronomyService.kt
similarity index 99%
rename from app/src/main/java/com/kylecorry/trail_sense/astronomy/domain/AstronomyService.kt
rename to app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/domain/AstronomyService.kt
index da79355f8..37fbe64f6 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/domain/AstronomyService.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/domain/AstronomyService.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.domain
+package com.kylecorry.trail_sense.tools.astronomy.domain
 
 import com.kylecorry.sol.science.astronomy.Astronomy
 import com.kylecorry.sol.science.astronomy.RiseSetTransitTimes
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/domain/Eclipse.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/domain/Eclipse.kt
similarity index 89%
rename from app/src/main/java/com/kylecorry/trail_sense/astronomy/domain/Eclipse.kt
rename to app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/domain/Eclipse.kt
index 9fdb11851..2473afc4d 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/domain/Eclipse.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/domain/Eclipse.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.domain
+package com.kylecorry.trail_sense.tools.astronomy.domain
 
 import com.kylecorry.sol.math.SolMath.roundPlaces
 import com.kylecorry.sol.units.Bearing
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/infrastructure/AstronomyDailyWorker.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/infrastructure/AstronomyDailyWorker.kt
similarity index 91%
rename from app/src/main/java/com/kylecorry/trail_sense/astronomy/infrastructure/AstronomyDailyWorker.kt
rename to app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/infrastructure/AstronomyDailyWorker.kt
index 62d3abf97..1feab6593 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/infrastructure/AstronomyDailyWorker.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/infrastructure/AstronomyDailyWorker.kt
@@ -1,11 +1,11 @@
-package com.kylecorry.trail_sense.astronomy.infrastructure
+package com.kylecorry.trail_sense.tools.astronomy.infrastructure
 
 import android.content.Context
 import androidx.work.WorkerParameters
 import com.kylecorry.andromeda.background.DailyWorker
 import com.kylecorry.andromeda.background.IOneTimeTaskScheduler
 import com.kylecorry.andromeda.background.OneTimeTaskSchedulerFactory
-import com.kylecorry.trail_sense.astronomy.infrastructure.commands.AstronomyAlertCommand
+import com.kylecorry.trail_sense.tools.astronomy.infrastructure.commands.AstronomyAlertCommand
 import com.kylecorry.trail_sense.shared.UserPreferences
 import com.kylecorry.trail_sense.shared.preferences.PreferencesSubsystem
 import java.time.Duration
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/infrastructure/AstronomyPreferences.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/infrastructure/AstronomyPreferences.kt
similarity index 98%
rename from app/src/main/java/com/kylecorry/trail_sense/astronomy/infrastructure/AstronomyPreferences.kt
rename to app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/infrastructure/AstronomyPreferences.kt
index e284f7545..9d27573b4 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/infrastructure/AstronomyPreferences.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/infrastructure/AstronomyPreferences.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.infrastructure
+package com.kylecorry.trail_sense.tools.astronomy.infrastructure
 
 import android.content.Context
 import com.kylecorry.andromeda.core.toIntCompat
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/infrastructure/commands/AstronomyAlertCommand.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/infrastructure/commands/AstronomyAlertCommand.kt
similarity index 92%
rename from app/src/main/java/com/kylecorry/trail_sense/astronomy/infrastructure/commands/AstronomyAlertCommand.kt
rename to app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/infrastructure/commands/AstronomyAlertCommand.kt
index a4c2bb21e..63d1e399d 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/infrastructure/commands/AstronomyAlertCommand.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/infrastructure/commands/AstronomyAlertCommand.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.infrastructure.commands
+package com.kylecorry.trail_sense.tools.astronomy.infrastructure.commands
 
 import android.content.Context
 import com.kylecorry.andromeda.core.coroutines.onDefault
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/infrastructure/commands/LunarEclipseAlertCommand.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/infrastructure/commands/LunarEclipseAlertCommand.kt
similarity index 89%
rename from app/src/main/java/com/kylecorry/trail_sense/astronomy/infrastructure/commands/LunarEclipseAlertCommand.kt
rename to app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/infrastructure/commands/LunarEclipseAlertCommand.kt
index 9b15e8f64..a36ea7219 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/infrastructure/commands/LunarEclipseAlertCommand.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/infrastructure/commands/LunarEclipseAlertCommand.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.infrastructure.commands
+package com.kylecorry.trail_sense.tools.astronomy.infrastructure.commands
 
 import android.content.Context
 import android.util.Log
@@ -6,9 +6,9 @@ import com.kylecorry.andromeda.notify.Notify
 import com.kylecorry.sol.units.Coordinate
 import com.kylecorry.trail_sense.NotificationChannels
 import com.kylecorry.trail_sense.R
-import com.kylecorry.trail_sense.astronomy.domain.AstronomyService
-import com.kylecorry.trail_sense.astronomy.domain.Eclipse
-import com.kylecorry.trail_sense.astronomy.ui.format.EclipseFormatter
+import com.kylecorry.trail_sense.tools.astronomy.domain.AstronomyService
+import com.kylecorry.trail_sense.tools.astronomy.domain.Eclipse
+import com.kylecorry.trail_sense.tools.astronomy.ui.format.EclipseFormatter
 import com.kylecorry.trail_sense.shared.FormatService
 import com.kylecorry.trail_sense.shared.NavigationUtils
 import com.kylecorry.trail_sense.shared.UserPreferences
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/infrastructure/commands/MeteorShowerAlertCommand.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/infrastructure/commands/MeteorShowerAlertCommand.kt
similarity index 94%
rename from app/src/main/java/com/kylecorry/trail_sense/astronomy/infrastructure/commands/MeteorShowerAlertCommand.kt
rename to app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/infrastructure/commands/MeteorShowerAlertCommand.kt
index e1a6b0945..f8fa5a0f1 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/infrastructure/commands/MeteorShowerAlertCommand.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/infrastructure/commands/MeteorShowerAlertCommand.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.infrastructure.commands
+package com.kylecorry.trail_sense.tools.astronomy.infrastructure.commands
 
 import android.content.Context
 import android.util.Log
@@ -7,7 +7,7 @@ import com.kylecorry.sol.science.astronomy.meteors.MeteorShowerPeak
 import com.kylecorry.sol.units.Coordinate
 import com.kylecorry.trail_sense.NotificationChannels
 import com.kylecorry.trail_sense.R
-import com.kylecorry.trail_sense.astronomy.domain.AstronomyService
+import com.kylecorry.trail_sense.tools.astronomy.domain.AstronomyService
 import com.kylecorry.trail_sense.shared.FormatService
 import com.kylecorry.trail_sense.shared.NavigationUtils
 import com.kylecorry.trail_sense.shared.UserPreferences
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/infrastructure/commands/SolarEclipseAlertCommand.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/infrastructure/commands/SolarEclipseAlertCommand.kt
similarity index 89%
rename from app/src/main/java/com/kylecorry/trail_sense/astronomy/infrastructure/commands/SolarEclipseAlertCommand.kt
rename to app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/infrastructure/commands/SolarEclipseAlertCommand.kt
index e19047830..9d22f8a3b 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/infrastructure/commands/SolarEclipseAlertCommand.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/infrastructure/commands/SolarEclipseAlertCommand.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.infrastructure.commands
+package com.kylecorry.trail_sense.tools.astronomy.infrastructure.commands
 
 import android.content.Context
 import android.util.Log
@@ -6,9 +6,9 @@ import com.kylecorry.andromeda.notify.Notify
 import com.kylecorry.sol.units.Coordinate
 import com.kylecorry.trail_sense.NotificationChannels
 import com.kylecorry.trail_sense.R
-import com.kylecorry.trail_sense.astronomy.domain.AstronomyService
-import com.kylecorry.trail_sense.astronomy.domain.Eclipse
-import com.kylecorry.trail_sense.astronomy.ui.format.EclipseFormatter
+import com.kylecorry.trail_sense.tools.astronomy.domain.AstronomyService
+import com.kylecorry.trail_sense.tools.astronomy.domain.Eclipse
+import com.kylecorry.trail_sense.tools.astronomy.ui.format.EclipseFormatter
 import com.kylecorry.trail_sense.shared.FormatService
 import com.kylecorry.trail_sense.shared.NavigationUtils
 import com.kylecorry.trail_sense.shared.UserPreferences
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/infrastructure/commands/SunsetAlarmCommand.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/infrastructure/commands/SunsetAlarmCommand.kt
similarity index 95%
rename from app/src/main/java/com/kylecorry/trail_sense/astronomy/infrastructure/commands/SunsetAlarmCommand.kt
rename to app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/infrastructure/commands/SunsetAlarmCommand.kt
index 3ad7e494d..2aa51abac 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/infrastructure/commands/SunsetAlarmCommand.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/infrastructure/commands/SunsetAlarmCommand.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.infrastructure.commands
+package com.kylecorry.trail_sense.tools.astronomy.infrastructure.commands
 
 import android.content.Context
 import android.util.Log
@@ -6,8 +6,8 @@ import com.kylecorry.andromeda.notify.Notify
 import com.kylecorry.sol.math.Range
 import com.kylecorry.sol.units.Coordinate
 import com.kylecorry.trail_sense.R
-import com.kylecorry.trail_sense.astronomy.domain.AstronomyService
-import com.kylecorry.trail_sense.astronomy.infrastructure.receivers.SunsetAlarmReceiver
+import com.kylecorry.trail_sense.tools.astronomy.domain.AstronomyService
+import com.kylecorry.trail_sense.tools.astronomy.infrastructure.receivers.SunsetAlarmReceiver
 import com.kylecorry.trail_sense.shared.FormatService
 import com.kylecorry.trail_sense.shared.NavigationUtils
 import com.kylecorry.trail_sense.shared.UserPreferences
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/infrastructure/receivers/SunsetAlarmReceiver.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/infrastructure/receivers/SunsetAlarmReceiver.kt
similarity index 93%
rename from app/src/main/java/com/kylecorry/trail_sense/astronomy/infrastructure/receivers/SunsetAlarmReceiver.kt
rename to app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/infrastructure/receivers/SunsetAlarmReceiver.kt
index ea0b357bc..e675424b8 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/infrastructure/receivers/SunsetAlarmReceiver.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/infrastructure/receivers/SunsetAlarmReceiver.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.infrastructure.receivers
+package com.kylecorry.trail_sense.tools.astronomy.infrastructure.receivers
 
 import android.content.BroadcastReceiver
 import android.content.Context
@@ -7,7 +7,7 @@ import androidx.fragment.app.Fragment
 import com.kylecorry.andromeda.background.IOneTimeTaskScheduler
 import com.kylecorry.andromeda.background.OneTimeTaskSchedulerFactory
 import com.kylecorry.andromeda.fragments.IPermissionRequester
-import com.kylecorry.trail_sense.astronomy.infrastructure.commands.SunsetAlarmCommand
+import com.kylecorry.trail_sense.tools.astronomy.infrastructure.commands.SunsetAlarmCommand
 import com.kylecorry.trail_sense.shared.UserPreferences
 import com.kylecorry.trail_sense.shared.permissions.RequestBackgroundLocationCommand
 import com.kylecorry.trail_sense.shared.permissions.requestScheduleExactAlarms
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/quickactions/AstronomyQuickActionBinder.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/quickactions/AstronomyQuickActionBinder.kt
similarity index 77%
rename from app/src/main/java/com/kylecorry/trail_sense/astronomy/quickactions/AstronomyQuickActionBinder.kt
rename to app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/quickactions/AstronomyQuickActionBinder.kt
index d86146093..8c2bbef0e 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/quickactions/AstronomyQuickActionBinder.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/quickactions/AstronomyQuickActionBinder.kt
@@ -1,7 +1,7 @@
-package com.kylecorry.trail_sense.astronomy.quickactions
+package com.kylecorry.trail_sense.tools.astronomy.quickactions
 
-import com.kylecorry.trail_sense.astronomy.infrastructure.AstronomyPreferences
-import com.kylecorry.trail_sense.astronomy.ui.AstronomyFragment
+import com.kylecorry.trail_sense.tools.astronomy.infrastructure.AstronomyPreferences
+import com.kylecorry.trail_sense.tools.astronomy.ui.AstronomyFragment
 import com.kylecorry.trail_sense.databinding.ActivityAstronomyBinding
 import com.kylecorry.trail_sense.shared.quickactions.IQuickActionBinder
 import com.kylecorry.trail_sense.shared.quickactions.QuickActionFactory
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/quickactions/QuickActionNightMode.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/quickactions/QuickActionNightMode.kt
similarity index 95%
rename from app/src/main/java/com/kylecorry/trail_sense/astronomy/quickactions/QuickActionNightMode.kt
rename to app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/quickactions/QuickActionNightMode.kt
index 700e18954..39148bf98 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/quickactions/QuickActionNightMode.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/quickactions/QuickActionNightMode.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.quickactions
+package com.kylecorry.trail_sense.tools.astronomy.quickactions
 
 import android.widget.ImageButton
 import androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/quickactions/QuickActionSunsetAlert.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/quickactions/QuickActionSunsetAlert.kt
similarity index 91%
rename from app/src/main/java/com/kylecorry/trail_sense/astronomy/quickactions/QuickActionSunsetAlert.kt
rename to app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/quickactions/QuickActionSunsetAlert.kt
index bf6fea81a..8358dab72 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/quickactions/QuickActionSunsetAlert.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/quickactions/QuickActionSunsetAlert.kt
@@ -1,11 +1,11 @@
-package com.kylecorry.trail_sense.astronomy.quickactions
+package com.kylecorry.trail_sense.tools.astronomy.quickactions
 
 import android.widget.ImageButton
 import androidx.fragment.app.Fragment
 import com.kylecorry.andromeda.alerts.toast
 import com.kylecorry.andromeda.fragments.IPermissionRequester
 import com.kylecorry.trail_sense.R
-import com.kylecorry.trail_sense.astronomy.infrastructure.receivers.SunsetAlarmReceiver
+import com.kylecorry.trail_sense.tools.astronomy.infrastructure.receivers.SunsetAlarmReceiver
 import com.kylecorry.trail_sense.shared.CustomUiUtils
 import com.kylecorry.trail_sense.shared.FormatService
 import com.kylecorry.trail_sense.shared.QuickActionButton
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/AstroChart.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/AstroChart.kt
similarity index 99%
rename from app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/AstroChart.kt
rename to app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/AstroChart.kt
index d9cf350a1..ee997798e 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/AstroChart.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/AstroChart.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.ui
+package com.kylecorry.trail_sense.tools.astronomy.ui
 
 import android.graphics.Color
 import androidx.annotation.DrawableRes
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/AstronomyFragment.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/AstronomyFragment.kt
similarity index 94%
rename from app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/AstronomyFragment.kt
rename to app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/AstronomyFragment.kt
index 8f60132f6..e349e9aec 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/AstronomyFragment.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/AstronomyFragment.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.ui
+package com.kylecorry.trail_sense.tools.astronomy.ui
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -23,20 +23,19 @@ import com.kylecorry.sol.time.Time.toZonedDateTime
 import com.kylecorry.sol.units.Coordinate
 import com.kylecorry.sol.units.Reading
 import com.kylecorry.trail_sense.R
-import com.kylecorry.trail_sense.astronomy.domain.AstroPositions
-import com.kylecorry.trail_sense.astronomy.domain.AstronomyEvent
-import com.kylecorry.trail_sense.astronomy.domain.AstronomyService
-import com.kylecorry.trail_sense.astronomy.ui.commands.AstroChartData
-import com.kylecorry.trail_sense.astronomy.ui.commands.CenteredAstroChartDataProvider
-import com.kylecorry.trail_sense.astronomy.ui.commands.DailyAstroChartDataProvider
-import com.kylecorry.trail_sense.astronomy.ui.items.LunarEclipseListItemProducer
-import com.kylecorry.trail_sense.astronomy.ui.items.MeteorShowerListItemProducer
-import com.kylecorry.trail_sense.astronomy.ui.items.MoonListItemProducer
-import com.kylecorry.trail_sense.astronomy.ui.items.SolarEclipseListItemProducer
-import com.kylecorry.trail_sense.astronomy.ui.items.SunListItemProducer
+import com.kylecorry.trail_sense.tools.astronomy.domain.AstronomyEvent
+import com.kylecorry.trail_sense.tools.astronomy.domain.AstronomyService
+import com.kylecorry.trail_sense.tools.astronomy.ui.commands.AstroChartData
+import com.kylecorry.trail_sense.tools.astronomy.ui.commands.CenteredAstroChartDataProvider
+import com.kylecorry.trail_sense.tools.astronomy.ui.commands.DailyAstroChartDataProvider
+import com.kylecorry.trail_sense.tools.astronomy.ui.items.LunarEclipseListItemProducer
+import com.kylecorry.trail_sense.tools.astronomy.ui.items.MeteorShowerListItemProducer
+import com.kylecorry.trail_sense.tools.astronomy.ui.items.MoonListItemProducer
+import com.kylecorry.trail_sense.tools.astronomy.ui.items.SolarEclipseListItemProducer
+import com.kylecorry.trail_sense.tools.astronomy.ui.items.SunListItemProducer
 import com.kylecorry.trail_sense.databinding.ActivityAstronomyBinding
 import com.kylecorry.trail_sense.main.MainActivity
-import com.kylecorry.trail_sense.astronomy.quickactions.AstronomyQuickActionBinder
+import com.kylecorry.trail_sense.tools.astronomy.quickactions.AstronomyQuickActionBinder
 import com.kylecorry.trail_sense.shared.ErrorBannerReason
 import com.kylecorry.trail_sense.shared.FormatService
 import com.kylecorry.trail_sense.shared.UserPreferences
@@ -48,6 +47,7 @@ import com.kylecorry.trail_sense.shared.sensors.SensorService
 import com.kylecorry.trail_sense.shared.sensors.overrides.CachedGPS
 import com.kylecorry.trail_sense.shared.sensors.overrides.OverrideGPS
 import com.kylecorry.trail_sense.shared.views.UserError
+import com.kylecorry.trail_sense.tools.astronomy.domain.AstroPositions
 import com.kylecorry.trail_sense.tools.augmented_reality.ARMode
 import com.kylecorry.trail_sense.tools.augmented_reality.AugmentedRealityFragment
 import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/MoonPhaseImageMapper.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/MoonPhaseImageMapper.kt
similarity index 94%
rename from app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/MoonPhaseImageMapper.kt
rename to app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/MoonPhaseImageMapper.kt
index b05bfacb4..f179edf52 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/MoonPhaseImageMapper.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/MoonPhaseImageMapper.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.ui
+package com.kylecorry.trail_sense.tools.astronomy.ui
 
 import androidx.annotation.DrawableRes
 import com.kylecorry.sol.science.astronomy.moon.MoonTruePhase
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/commands/AstroChartData.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/commands/AstroChartData.kt
similarity index 67%
rename from app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/commands/AstroChartData.kt
rename to app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/commands/AstroChartData.kt
index 4536e8000..e6213abbf 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/commands/AstroChartData.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/commands/AstroChartData.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.ui.commands
+package com.kylecorry.trail_sense.tools.astronomy.ui.commands
 
 import com.kylecorry.sol.units.Reading
 
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/commands/CenteredAstroChartDataProvider.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/commands/CenteredAstroChartDataProvider.kt
similarity index 87%
rename from app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/commands/CenteredAstroChartDataProvider.kt
rename to app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/commands/CenteredAstroChartDataProvider.kt
index a3f6628b9..25f86b82a 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/commands/CenteredAstroChartDataProvider.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/commands/CenteredAstroChartDataProvider.kt
@@ -1,8 +1,8 @@
-package com.kylecorry.trail_sense.astronomy.ui.commands
+package com.kylecorry.trail_sense.tools.astronomy.ui.commands
 
 import com.kylecorry.andromeda.core.specifications.Specification
 import com.kylecorry.sol.units.Coordinate
-import com.kylecorry.trail_sense.astronomy.domain.AstronomyService
+import com.kylecorry.trail_sense.tools.astronomy.domain.AstronomyService
 import com.kylecorry.trail_sense.tools.pedometer.infrastructure.IsTodaySpecification
 import java.time.Instant
 import java.time.ZonedDateTime
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/commands/DailyAstroChartDataProvider.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/commands/DailyAstroChartDataProvider.kt
similarity index 78%
rename from app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/commands/DailyAstroChartDataProvider.kt
rename to app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/commands/DailyAstroChartDataProvider.kt
index bf081cc54..84194e870 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/commands/DailyAstroChartDataProvider.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/commands/DailyAstroChartDataProvider.kt
@@ -1,7 +1,7 @@
-package com.kylecorry.trail_sense.astronomy.ui.commands
+package com.kylecorry.trail_sense.tools.astronomy.ui.commands
 
 import com.kylecorry.sol.units.Coordinate
-import com.kylecorry.trail_sense.astronomy.domain.AstronomyService
+import com.kylecorry.trail_sense.tools.astronomy.domain.AstronomyService
 import java.time.ZonedDateTime
 
 class DailyAstroChartDataProvider(private val astronomy: AstronomyService = AstronomyService()) :
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/commands/IAstroChartDataProvider.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/commands/IAstroChartDataProvider.kt
similarity index 74%
rename from app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/commands/IAstroChartDataProvider.kt
rename to app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/commands/IAstroChartDataProvider.kt
index adee8bd30..aa45af225 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/commands/IAstroChartDataProvider.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/commands/IAstroChartDataProvider.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.ui.commands
+package com.kylecorry.trail_sense.tools.astronomy.ui.commands
 
 import com.kylecorry.sol.units.Coordinate
 import java.time.ZonedDateTime
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/format/EclipseFormatter.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/format/EclipseFormatter.kt
similarity index 79%
rename from app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/format/EclipseFormatter.kt
rename to app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/format/EclipseFormatter.kt
index ceba0dfa8..1567f7be2 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/format/EclipseFormatter.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/format/EclipseFormatter.kt
@@ -1,8 +1,8 @@
-package com.kylecorry.trail_sense.astronomy.ui.format
+package com.kylecorry.trail_sense.tools.astronomy.ui.format
 
 import android.content.Context
 import com.kylecorry.trail_sense.R
-import com.kylecorry.trail_sense.astronomy.domain.Eclipse
+import com.kylecorry.trail_sense.tools.astronomy.domain.Eclipse
 import com.kylecorry.trail_sense.shared.FormatService
 
 object EclipseFormatter {
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/AstronomyListItemProducer.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/items/AstronomyListItemProducer.kt
similarity index 80%
rename from app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/AstronomyListItemProducer.kt
rename to app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/items/AstronomyListItemProducer.kt
index 7fec3e53b..5406045e2 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/AstronomyListItemProducer.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/items/AstronomyListItemProducer.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.ui.items
+package com.kylecorry.trail_sense.tools.astronomy.ui.items
 
 import com.kylecorry.andromeda.views.list.ListItem
 import com.kylecorry.sol.units.Coordinate
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/BaseAstroListItemProducer.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/items/BaseAstroListItemProducer.kt
similarity index 97%
rename from app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/BaseAstroListItemProducer.kt
rename to app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/items/BaseAstroListItemProducer.kt
index eb61a8d8c..1eacf9cd0 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/BaseAstroListItemProducer.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/items/BaseAstroListItemProducer.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.ui.items
+package com.kylecorry.trail_sense.tools.astronomy.ui.items
 
 import android.content.Context
 import androidx.core.text.bold
@@ -18,7 +18,7 @@ import com.kylecorry.andromeda.views.list.ResourceListIcon
 import com.kylecorry.sol.science.astronomy.RiseSetTransitTimes
 import com.kylecorry.sol.units.Bearing
 import com.kylecorry.trail_sense.R
-import com.kylecorry.trail_sense.astronomy.domain.AstronomyService
+import com.kylecorry.trail_sense.tools.astronomy.domain.AstronomyService
 import com.kylecorry.trail_sense.shared.CustomUiUtils
 import com.kylecorry.trail_sense.shared.FormatService
 import com.kylecorry.trail_sense.shared.UserPreferences
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/LunarEclipseListItemProducer.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/items/LunarEclipseListItemProducer.kt
similarity index 95%
rename from app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/LunarEclipseListItemProducer.kt
rename to app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/items/LunarEclipseListItemProducer.kt
index 645b95937..b24000f01 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/LunarEclipseListItemProducer.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/items/LunarEclipseListItemProducer.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.ui.items
+package com.kylecorry.trail_sense.tools.astronomy.ui.items
 
 import android.content.Context
 import com.kylecorry.andromeda.core.coroutines.onDefault
@@ -7,7 +7,7 @@ import com.kylecorry.andromeda.views.list.ListItem
 import com.kylecorry.andromeda.views.list.ResourceListIcon
 import com.kylecorry.sol.units.Coordinate
 import com.kylecorry.trail_sense.R
-import com.kylecorry.trail_sense.astronomy.ui.format.EclipseFormatter
+import com.kylecorry.trail_sense.tools.astronomy.ui.format.EclipseFormatter
 import java.time.LocalDate
 
 class LunarEclipseListItemProducer(context: Context) : BaseAstroListItemProducer(context) {
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/MeteorShowerListItemProducer.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/items/MeteorShowerListItemProducer.kt
similarity index 96%
rename from app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/MeteorShowerListItemProducer.kt
rename to app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/items/MeteorShowerListItemProducer.kt
index 82a66c820..53b67e453 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/MeteorShowerListItemProducer.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/items/MeteorShowerListItemProducer.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.ui.items
+package com.kylecorry.trail_sense.tools.astronomy.ui.items
 
 import android.content.Context
 import com.kylecorry.andromeda.core.coroutines.onDefault
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/MoonListItemProducer.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/items/MoonListItemProducer.kt
similarity index 93%
rename from app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/MoonListItemProducer.kt
rename to app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/items/MoonListItemProducer.kt
index ef5cb9bb5..a6c9819ee 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/MoonListItemProducer.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/items/MoonListItemProducer.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.ui.items
+package com.kylecorry.trail_sense.tools.astronomy.ui.items
 
 import android.content.Context
 import com.kylecorry.andromeda.core.coroutines.onDefault
@@ -6,7 +6,7 @@ import com.kylecorry.andromeda.views.list.ListItem
 import com.kylecorry.andromeda.views.list.ResourceListIcon
 import com.kylecorry.sol.units.Coordinate
 import com.kylecorry.trail_sense.R
-import com.kylecorry.trail_sense.astronomy.ui.MoonPhaseImageMapper
+import com.kylecorry.trail_sense.tools.astronomy.ui.MoonPhaseImageMapper
 import java.time.LocalDate
 
 class MoonListItemProducer(context: Context) : BaseAstroListItemProducer(context) {
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/SolarEclipseListItemProducer.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/items/SolarEclipseListItemProducer.kt
similarity index 93%
rename from app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/SolarEclipseListItemProducer.kt
rename to app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/items/SolarEclipseListItemProducer.kt
index ff9e2958a..d406dcb31 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/SolarEclipseListItemProducer.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/items/SolarEclipseListItemProducer.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.ui.items
+package com.kylecorry.trail_sense.tools.astronomy.ui.items
 
 import android.content.Context
 import com.kylecorry.andromeda.core.coroutines.onDefault
@@ -6,7 +6,7 @@ import com.kylecorry.andromeda.views.list.ListItem
 import com.kylecorry.andromeda.views.list.ResourceListIcon
 import com.kylecorry.sol.units.Coordinate
 import com.kylecorry.trail_sense.R
-import com.kylecorry.trail_sense.astronomy.ui.format.EclipseFormatter
+import com.kylecorry.trail_sense.tools.astronomy.ui.format.EclipseFormatter
 import java.time.LocalDate
 
 class SolarEclipseListItemProducer(context: Context) : BaseAstroListItemProducer(context) {
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/SunListItemProducer.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/items/SunListItemProducer.kt
similarity index 97%
rename from app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/SunListItemProducer.kt
rename to app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/items/SunListItemProducer.kt
index 9fc6aa134..848ffbc29 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/SunListItemProducer.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/astronomy/ui/items/SunListItemProducer.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.ui.items
+package com.kylecorry.trail_sense.tools.astronomy.ui.items
 
 import android.content.Context
 import com.kylecorry.andromeda.core.coroutines.onDefault
diff --git a/app/src/main/java/com/kylecorry/trail_sense/tools/augmented_reality/ARAstronomyLayer.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/augmented_reality/ARAstronomyLayer.kt
index 92b672e15..617abbd36 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/tools/augmented_reality/ARAstronomyLayer.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/augmented_reality/ARAstronomyLayer.kt
@@ -14,8 +14,8 @@ import com.kylecorry.sol.time.Time
 import com.kylecorry.sol.time.Time.atEndOfDay
 import com.kylecorry.sol.time.Time.atStartOfDay
 import com.kylecorry.sol.units.Coordinate
-import com.kylecorry.trail_sense.astronomy.domain.AstronomyService
-import com.kylecorry.trail_sense.astronomy.ui.MoonPhaseImageMapper
+import com.kylecorry.trail_sense.tools.astronomy.domain.AstronomyService
+import com.kylecorry.trail_sense.tools.astronomy.ui.MoonPhaseImageMapper
 import com.kylecorry.trail_sense.navigation.ui.DrawerBitmapLoader
 import com.kylecorry.trail_sense.shared.colors.AppColor
 import com.kylecorry.trail_sense.tools.augmented_reality.position.SphericalARPoint
diff --git a/app/src/main/java/com/kylecorry/trail_sense/tools/augmented_reality/SunCalibrator.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/augmented_reality/SunCalibrator.kt
index c5e014f82..2e95c8000 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/tools/augmented_reality/SunCalibrator.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/augmented_reality/SunCalibrator.kt
@@ -4,7 +4,7 @@ import com.kylecorry.andromeda.core.bitmap.BitmapUtils.resizeToFit
 import com.kylecorry.andromeda.core.coroutines.onDefault
 import com.kylecorry.andromeda.core.units.PixelCoordinate
 import com.kylecorry.sol.math.Quaternion
-import com.kylecorry.trail_sense.astronomy.domain.AstronomyService
+import com.kylecorry.trail_sense.tools.astronomy.domain.AstronomyService
 import com.kylecorry.trail_sense.shared.camera.GrayscaleMomentFinder
 import com.kylecorry.trail_sense.shared.views.CameraView
 import com.kylecorry.trail_sense.tools.augmented_reality.position.AugmentedRealityCoordinate
diff --git a/app/src/main/java/com/kylecorry/trail_sense/tools/augmented_reality/guide/AstronomyARGuide.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/augmented_reality/guide/AstronomyARGuide.kt
index ca2c795c4..11594e8ae 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/tools/augmented_reality/guide/AstronomyARGuide.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/augmented_reality/guide/AstronomyARGuide.kt
@@ -6,8 +6,8 @@ import android.widget.FrameLayout
 import com.kylecorry.andromeda.core.time.CoroutineTimer
 import com.kylecorry.sol.science.astronomy.Astronomy
 import com.kylecorry.trail_sense.R
-import com.kylecorry.trail_sense.astronomy.domain.AstronomyService
-import com.kylecorry.trail_sense.astronomy.ui.MoonPhaseImageMapper
+import com.kylecorry.trail_sense.tools.astronomy.domain.AstronomyService
+import com.kylecorry.trail_sense.tools.astronomy.ui.MoonPhaseImageMapper
 import com.kylecorry.trail_sense.databinding.ViewArAstronomyGuideBinding
 import com.kylecorry.trail_sense.tools.augmented_reality.AugmentedRealityView
 import com.kylecorry.trail_sense.tools.augmented_reality.position.SphericalARPoint
diff --git a/app/src/main/java/com/kylecorry/trail_sense/tools/tools/ui/Tools.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/tools/ui/Tools.kt
index 5d7df8ec2..8da621d71 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/tools/tools/ui/Tools.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/tools/ui/Tools.kt
@@ -13,13 +13,13 @@ import com.kylecorry.trail_sense.navigation.paths.quickactions.QuickActionBacktr
 import com.kylecorry.trail_sense.weather.quickactions.QuickActionClimate
 import com.kylecorry.trail_sense.weather.quickactions.QuickActionClouds
 import com.kylecorry.trail_sense.tools.flashlight.quickactions.QuickActionFlashlight
-import com.kylecorry.trail_sense.astronomy.quickactions.QuickActionNightMode
+import com.kylecorry.trail_sense.tools.astronomy.quickactions.QuickActionNightMode
 import com.kylecorry.trail_sense.navigation.paths.quickactions.QuickActionPaths
 import com.kylecorry.trail_sense.tools.pedometer.quickactions.QuickActionPedometer
 import com.kylecorry.trail_sense.tools.maps.quickactions.QuickActionPhotoMaps
 import com.kylecorry.trail_sense.tools.ruler.quickactions.QuickActionRuler
 import com.kylecorry.trail_sense.tools.flashlight.quickactions.QuickActionScreenFlashlight
-import com.kylecorry.trail_sense.astronomy.quickactions.QuickActionSunsetAlert
+import com.kylecorry.trail_sense.tools.astronomy.quickactions.QuickActionSunsetAlert
 import com.kylecorry.trail_sense.weather.quickactions.QuickActionTemperatureEstimation
 import com.kylecorry.trail_sense.tools.lightning.quickactions.QuickActionLightingStrikeDistance
 import com.kylecorry.trail_sense.weather.quickactions.QuickActionWeatherMonitor
diff --git a/app/src/main/java/com/kylecorry/trail_sense/weather/infrastructure/temperatures/calculators/DailyTemperatureCalculator.kt b/app/src/main/java/com/kylecorry/trail_sense/weather/infrastructure/temperatures/calculators/DailyTemperatureCalculator.kt
index 94d6dc88b..28ff44132 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/weather/infrastructure/temperatures/calculators/DailyTemperatureCalculator.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/weather/infrastructure/temperatures/calculators/DailyTemperatureCalculator.kt
@@ -8,7 +8,7 @@ import com.kylecorry.sol.time.Time.toZonedDateTime
 import com.kylecorry.sol.units.Coordinate
 import com.kylecorry.sol.units.Reading
 import com.kylecorry.sol.units.Temperature
-import com.kylecorry.trail_sense.astronomy.domain.AstronomyService
+import com.kylecorry.trail_sense.tools.astronomy.domain.AstronomyService
 import java.time.Duration
 import java.time.LocalDate
 import java.time.LocalTime
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 1e9509706..c385f97b7 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -33,7 +33,7 @@
     </fragment>
     <fragment
         android:id="@+id/action_astronomy"
-        android:name="com.kylecorry.trail_sense.astronomy.ui.AstronomyFragment"
+        android:name="com.kylecorry.trail_sense.tools.astronomy.ui.AstronomyFragment"
         android:label="AstronomyFragment">
         <action
             android:id="@+id/action_astronomyFragment_to_calibrateGPSFragment"