diff --git a/src/ServiceLayer.Mesh/Functions/FileRetryFunction.cs b/src/ServiceLayer.Mesh/Functions/FileRetryFunction.cs
index 5f797bd..7595af6 100644
--- a/src/ServiceLayer.Mesh/Functions/FileRetryFunction.cs
+++ b/src/ServiceLayer.Mesh/Functions/FileRetryFunction.cs
@@ -1,9 +1,9 @@
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
-using ServiceLayer.Mesh.Data;
+using ServiceLayer.Data;
+using ServiceLayer.Data.Models;
 using ServiceLayer.Mesh.Messaging;
-using ServiceLayer.Mesh.Models;
 using ServiceLayer.Mesh.Configuration;
 
 namespace ServiceLayer.Mesh.Functions;
diff --git a/tests/ServiceLayer.Mesh.Tests/Functions/FileRetryFunctionTests.cs b/tests/ServiceLayer.Mesh.Tests/Functions/FileRetryFunctionTests.cs
index 5652eb4..c1e07bb 100644
--- a/tests/ServiceLayer.Mesh.Tests/Functions/FileRetryFunctionTests.cs
+++ b/tests/ServiceLayer.Mesh.Tests/Functions/FileRetryFunctionTests.cs
@@ -1,11 +1,10 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Moq;
-using NHS.MESH.Client.Contracts.Services;
-using ServiceLayer.Mesh.Data;
+using ServiceLayer.Data;
+using ServiceLayer.Data.Models;
 using ServiceLayer.Mesh.Functions;
 using ServiceLayer.Mesh.Messaging;
-using ServiceLayer.Mesh.Models;
 using ServiceLayer.Mesh.Configuration;
 
 namespace ServiceLayer.Mesh.Tests.Functions;