diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderUtilsTest.java
index 01b6e41b6..9842c0d95 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderUtilsTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderUtilsTest.java
@@ -62,7 +62,6 @@ import de.dennisguse.opentracks.content.data.TracksColumns;
 import de.dennisguse.opentracks.stats.SensorStatistics;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.util.FileUtils;
-import de.dennisguse.opentracks.util.UUIDUtils;
 
 /**
  * A unit test for {@link ContentProviderUtils}.
diff --git a/src/androidTest/java/de/dennisguse/opentracks/util/UUIDUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/content/provider/UUIDUtilsTest.java
similarity index 90%
rename from src/androidTest/java/de/dennisguse/opentracks/util/UUIDUtilsTest.java
rename to src/androidTest/java/de/dennisguse/opentracks/content/provider/UUIDUtilsTest.java
index 87c8edc7a..ce6149301 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/util/UUIDUtilsTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/content/provider/UUIDUtilsTest.java
@@ -1,4 +1,6 @@
-package de.dennisguse.opentracks.util;
+package de.dennisguse.opentracks.content.provider;
+
+import static org.junit.Assert.assertEquals;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
@@ -7,8 +9,6 @@ import org.junit.runner.RunWith;
 
 import java.util.UUID;
 
-import static org.junit.Assert.assertEquals;
-
 @RunWith(AndroidJUnit4.class)
 public class UUIDUtilsTest {
 
diff --git a/src/main/java/de/dennisguse/opentracks/content/provider/ContentProviderUtils.java b/src/main/java/de/dennisguse/opentracks/content/provider/ContentProviderUtils.java
index 3673cd06d..0fafbc996 100644
--- a/src/main/java/de/dennisguse/opentracks/content/provider/ContentProviderUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/content/provider/ContentProviderUtils.java
@@ -52,7 +52,6 @@ import de.dennisguse.opentracks.content.data.TracksColumns;
 import de.dennisguse.opentracks.stats.SensorStatistics;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.util.FileUtils;
-import de.dennisguse.opentracks.util.UUIDUtils;
 
 /**
  * {@link ContentProviderUtils} implementation.
diff --git a/src/main/java/de/dennisguse/opentracks/content/provider/CustomSQLiteOpenHelper.java b/src/main/java/de/dennisguse/opentracks/content/provider/CustomSQLiteOpenHelper.java
index 0df47af4f..e10e6d7af 100644
--- a/src/main/java/de/dennisguse/opentracks/content/provider/CustomSQLiteOpenHelper.java
+++ b/src/main/java/de/dennisguse/opentracks/content/provider/CustomSQLiteOpenHelper.java
@@ -19,7 +19,6 @@ import de.dennisguse.opentracks.content.data.MarkerColumns;
 import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.content.data.TrackPointsColumns;
 import de.dennisguse.opentracks.content.data.TracksColumns;
-import de.dennisguse.opentracks.util.UUIDUtils;
 
 /**
  * Database helper for creating and upgrading the database.
diff --git a/src/main/java/de/dennisguse/opentracks/util/UUIDUtils.java b/src/main/java/de/dennisguse/opentracks/content/provider/UUIDUtils.java
similarity index 95%
rename from src/main/java/de/dennisguse/opentracks/util/UUIDUtils.java
rename to src/main/java/de/dennisguse/opentracks/content/provider/UUIDUtils.java
index 44a826f40..848df5d8d 100644
--- a/src/main/java/de/dennisguse/opentracks/util/UUIDUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/content/provider/UUIDUtils.java
@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.util;
+package de.dennisguse.opentracks.content.provider;
 
 import androidx.annotation.NonNull;