diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/handlers/GpsStatusTest.java b/src/androidTest/java/de/dennisguse/opentracks/sensors/GpsStatusTest.java
similarity index 89%
rename from src/androidTest/java/de/dennisguse/opentracks/services/handlers/GpsStatusTest.java
rename to src/androidTest/java/de/dennisguse/opentracks/sensors/GpsStatusTest.java
index 0fb214bbe..6d1bf14d8 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/services/handlers/GpsStatusTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/sensors/GpsStatusTest.java
@@ -1,12 +1,12 @@
-package de.dennisguse.opentracks.services.handlers;
+package de.dennisguse.opentracks.sensors;
 
 import static org.junit.Assert.assertEquals;
-import static de.dennisguse.opentracks.services.handlers.GpsStatusValue.GPS_DISABLED;
-import static de.dennisguse.opentracks.services.handlers.GpsStatusValue.GPS_ENABLED;
-import static de.dennisguse.opentracks.services.handlers.GpsStatusValue.GPS_NONE;
-import static de.dennisguse.opentracks.services.handlers.GpsStatusValue.GPS_SIGNAL_BAD;
-import static de.dennisguse.opentracks.services.handlers.GpsStatusValue.GPS_SIGNAL_FIX;
-import static de.dennisguse.opentracks.services.handlers.GpsStatusValue.GPS_SIGNAL_LOST;
+import static de.dennisguse.opentracks.sensors.GpsStatusValue.GPS_DISABLED;
+import static de.dennisguse.opentracks.sensors.GpsStatusValue.GPS_ENABLED;
+import static de.dennisguse.opentracks.sensors.GpsStatusValue.GPS_NONE;
+import static de.dennisguse.opentracks.sensors.GpsStatusValue.GPS_SIGNAL_BAD;
+import static de.dennisguse.opentracks.sensors.GpsStatusValue.GPS_SIGNAL_FIX;
+import static de.dennisguse.opentracks.sensors.GpsStatusValue.GPS_SIGNAL_LOST;
 
 import android.content.Context;
 import android.location.Location;
diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceStateMachineTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceStateMachineTest.java
index 4fe82b51b..ca3c4b866 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceStateMachineTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceStateMachineTest.java
@@ -47,7 +47,7 @@ import java.util.concurrent.TimeoutException;
 
 import de.dennisguse.opentracks.data.ContentProviderUtils;
 import de.dennisguse.opentracks.data.models.Track;
-import de.dennisguse.opentracks.services.handlers.GpsStatusValue;
+import de.dennisguse.opentracks.sensors.GpsStatusValue;
 
 /**
  * Testing the states of TrackRecordingService.
diff --git a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java
index 554e6c61b..b19f8d4fb 100644
--- a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java
@@ -45,11 +45,11 @@ import java.util.Objects;
 import de.dennisguse.opentracks.data.ContentProviderUtils;
 import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.databinding.TrackListBinding;
+import de.dennisguse.opentracks.sensors.GpsStatusValue;
 import de.dennisguse.opentracks.services.MissingPermissionException;
 import de.dennisguse.opentracks.services.RecordingStatus;
 import de.dennisguse.opentracks.services.TrackRecordingService;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
-import de.dennisguse.opentracks.services.handlers.GpsStatusValue;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 import de.dennisguse.opentracks.settings.SettingsActivity;
 import de.dennisguse.opentracks.settings.UnitSystem;
diff --git a/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java b/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java
index 35e6bbe69..0b5dcb75d 100644
--- a/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java
@@ -37,10 +37,10 @@ import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.databinding.TrackRecordingBinding;
 import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
 import de.dennisguse.opentracks.fragments.StatisticsRecordingFragment;
+import de.dennisguse.opentracks.sensors.GpsStatusValue;
 import de.dennisguse.opentracks.services.RecordingStatus;
 import de.dennisguse.opentracks.services.TrackRecordingService;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
-import de.dennisguse.opentracks.services.handlers.GpsStatusValue;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 import de.dennisguse.opentracks.settings.SettingsActivity;
 import de.dennisguse.opentracks.ui.intervals.IntervalsFragment;
diff --git a/src/main/java/de/dennisguse/opentracks/services/handlers/GPSManager.java b/src/main/java/de/dennisguse/opentracks/sensors/GpsManager.java
similarity index 94%
rename from src/main/java/de/dennisguse/opentracks/services/handlers/GPSManager.java
rename to src/main/java/de/dennisguse/opentracks/sensors/GpsManager.java
index 38fea710c..857805741 100644
--- a/src/main/java/de/dennisguse/opentracks/services/handlers/GPSManager.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/GpsManager.java
@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.services.handlers;
+package de.dennisguse.opentracks.sensors;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -20,18 +20,17 @@ import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.data.models.Position;
 import de.dennisguse.opentracks.data.models.TrackPoint;
-import de.dennisguse.opentracks.sensors.SensorConnector;
-import de.dennisguse.opentracks.sensors.SensorManager;
 import de.dennisguse.opentracks.sensors.sensorData.AggregatorGPS;
 import de.dennisguse.opentracks.sensors.sensorData.Raw;
+import de.dennisguse.opentracks.services.handlers.TrackPointCreator;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 import de.dennisguse.opentracks.util.LocationUtils;
 import de.dennisguse.opentracks.util.PermissionRequester;
 
 @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-public class GPSManager implements SensorConnector, LocationListenerCompat, GpsStatusManager.GpsStatusListener, SharedPreferences.OnSharedPreferenceChangeListener {
+public class GpsManager implements SensorConnector, LocationListenerCompat, GpsStatusManager.GpsStatusListener, SharedPreferences.OnSharedPreferenceChangeListener {
 
-    private final String TAG = GPSManager.class.getSimpleName();
+    private final String TAG = GpsManager.class.getSimpleName();
 
     private static final String LOCATION_PROVIDER = LocationManager.GPS_PROVIDER;
 
@@ -46,7 +45,7 @@ public class GPSManager implements SensorConnector, LocationListenerCompat, GpsS
     private Duration gpsInterval;
     private Distance thresholdHorizontalAccuracy;
 
-    public GPSManager(TrackPointCreator trackPointCreator, SensorManager.SensorDataChangedObserver observer) {
+    public GpsManager(TrackPointCreator trackPointCreator, SensorManager.SensorDataChangedObserver observer) {
         this.trackPointCreator = trackPointCreator;
         this.observer = observer;
     }
diff --git a/src/main/java/de/dennisguse/opentracks/services/handlers/GpsStatusManager.java b/src/main/java/de/dennisguse/opentracks/sensors/GpsStatusManager.java
similarity index 97%
rename from src/main/java/de/dennisguse/opentracks/services/handlers/GpsStatusManager.java
rename to src/main/java/de/dennisguse/opentracks/sensors/GpsStatusManager.java
index 136eeebb7..8effc373b 100644
--- a/src/main/java/de/dennisguse/opentracks/services/handlers/GpsStatusManager.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/GpsStatusManager.java
@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.services.handlers;
+package de.dennisguse.opentracks.sensors;
 
 import android.content.Context;
 import android.location.LocationManager;
@@ -16,7 +16,7 @@ import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 
 /**
- * This class handle GPS status according to received locations` and some thresholds.
+ * This class handle GPS status according to received locations and some thresholds.
  */
 class GpsStatusManager {
 
diff --git a/src/main/java/de/dennisguse/opentracks/services/handlers/GpsStatusValue.java b/src/main/java/de/dennisguse/opentracks/sensors/GpsStatusValue.java
similarity index 94%
rename from src/main/java/de/dennisguse/opentracks/services/handlers/GpsStatusValue.java
rename to src/main/java/de/dennisguse/opentracks/sensors/GpsStatusValue.java
index cb27a60a6..09b788029 100644
--- a/src/main/java/de/dennisguse/opentracks/services/handlers/GpsStatusValue.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/GpsStatusValue.java
@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.services.handlers;
+package de.dennisguse.opentracks.sensors;
 
 import de.dennisguse.opentracks.R;
 
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/SensorManager.java b/src/main/java/de/dennisguse/opentracks/sensors/SensorManager.java
index a50cb54bb..cc0c9b29a 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/SensorManager.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/SensorManager.java
@@ -14,7 +14,6 @@ import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.sensors.sensorData.Aggregator;
 import de.dennisguse.opentracks.sensors.sensorData.Raw;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet;
-import de.dennisguse.opentracks.services.handlers.GPSManager;
 import de.dennisguse.opentracks.services.handlers.TrackPointCreator;
 
 public class SensorManager implements SharedPreferences.OnSharedPreferenceChangeListener {
@@ -60,7 +59,7 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
 
     private GainManager altitudeSumManager;
 
-    private GPSManager gpsManager;
+    private GpsManager gpsManager;
 
     public SensorManager(TrackPointCreator observer) {
         this.observer = observer;
@@ -72,7 +71,7 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
             throw new RuntimeException("SensorManager cannot be started twice; stop first.");
         }
 
-        gpsManager = new GPSManager(observer, listener);
+        gpsManager = new GpsManager(observer, listener);
         altitudeSumManager = new GainManager(listener);
         bluetoothSensorManager = new BluetoothRemoteSensorManager(context, handler, listener);
 
@@ -114,7 +113,7 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
         listener.onChange(data);
     }
 
-    public GPSManager getGpsManager() {
+    public GpsManager getGpsManager() {
         return gpsManager;
     }
 
diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
index c25d1edc1..984de4cc6 100644
--- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
+++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
@@ -41,9 +41,9 @@ import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.data.models.Marker;
 import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.data.models.TrackPoint;
+import de.dennisguse.opentracks.sensors.GpsStatusValue;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet;
 import de.dennisguse.opentracks.services.announcement.VoiceAnnouncementManager;
-import de.dennisguse.opentracks.services.handlers.GpsStatusValue;
 import de.dennisguse.opentracks.services.handlers.TrackPointCreator;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 import de.dennisguse.opentracks.util.SystemUtils;
diff --git a/src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java b/src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java
index e01524706..305bb8c40 100644
--- a/src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java
+++ b/src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java
@@ -16,6 +16,7 @@ import java.time.ZoneId;
 
 import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.data.models.TrackPoint;
+import de.dennisguse.opentracks.sensors.GpsStatusValue;
 import de.dennisguse.opentracks.sensors.SensorManager;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
@@ -138,7 +139,8 @@ public class TrackPointCreator implements SharedPreferences.OnSharedPreferenceCh
         this.clock = Clock.fixed(Instant.parse(time), ZoneId.of("CET"));
     }
 
-    void sendGpsStatus(GpsStatusValue gpsStatusValue) {
+    @Deprecated //TODO This should be refactored. Can we use a SensorDataSet for this?
+    public void sendGpsStatus(GpsStatusValue gpsStatusValue) {
         service.newGpsStatus(gpsStatusValue);
     }