diff --git a/dotnet/SafelyYou/Devices.cs b/dotnet/SafelyYou/Data/Devices.cs
similarity index 99%
rename from dotnet/SafelyYou/Devices.cs
rename to dotnet/SafelyYou/Data/Devices.cs
index 428dd63..de54528 100644
--- a/dotnet/SafelyYou/Devices.cs
+++ b/dotnet/SafelyYou/Data/Devices.cs
@@ -1,6 +1,6 @@
 using System.Collections.Concurrent;
 
-namespace SafelyYou;
+namespace SafelyYou.Data;
 
 public readonly record struct DeviceId(string Value);
 
diff --git a/dotnet/SafelyYou/UploadTimes.cs b/dotnet/SafelyYou/Data/UploadTimes.cs
similarity index 97%
rename from dotnet/SafelyYou/UploadTimes.cs
rename to dotnet/SafelyYou/Data/UploadTimes.cs
index 935980e..99112f5 100644
--- a/dotnet/SafelyYou/UploadTimes.cs
+++ b/dotnet/SafelyYou/Data/UploadTimes.cs
@@ -1,7 +1,7 @@
 using System.Collections.Concurrent;
 using System.Numerics;
 
-namespace SafelyYou;
+namespace SafelyYou.Data;
 
 public sealed class UploadTimes
 {
diff --git a/dotnet/SafelyYou/Program.cs b/dotnet/SafelyYou/Program.cs
index 2877b05..3fea971 100644
--- a/dotnet/SafelyYou/Program.cs
+++ b/dotnet/SafelyYou/Program.cs
@@ -1,5 +1,6 @@
 using SafelyYou;
 using SafelyYou.Api;
+using SafelyYou.Data;
 using Serilog;
 
 var builder = WebApplication.CreateBuilder(args);
diff --git a/dotnet/SafelyYouTests/DeviceHeartBeatHistoryTests.cs b/dotnet/SafelyYouTests/DeviceHeartBeatHistoryTests.cs
index d989f02..2b24747 100644
--- a/dotnet/SafelyYouTests/DeviceHeartBeatHistoryTests.cs
+++ b/dotnet/SafelyYouTests/DeviceHeartBeatHistoryTests.cs
@@ -1,4 +1,4 @@
-using SafelyYou;
+using SafelyYou.Data;
 
 namespace SafelyYouTests;
 
diff --git a/dotnet/SafelyYouTests/HeartBeatHistoriesUptimeTests.cs b/dotnet/SafelyYouTests/HeartBeatHistoriesUptimeTests.cs
index f97f1a8..72a06b2 100644
--- a/dotnet/SafelyYouTests/HeartBeatHistoriesUptimeTests.cs
+++ b/dotnet/SafelyYouTests/HeartBeatHistoriesUptimeTests.cs
@@ -1,4 +1,4 @@
-using SafelyYou;
+using SafelyYou.Data;
 
 namespace SafelyYouTests;