diff --git a/source/B2BApi/B2BApi.csproj b/source/B2BApi/B2BApi.csproj
index 5acd4c74f1..e90d5f697c 100644
--- a/source/B2BApi/B2BApi.csproj
+++ b/source/B2BApi/B2BApi.csproj
@@ -60,7 +60,7 @@ limitations under the License.
       <ProjectReference Include="..\IncomingMessages.Interfaces\IncomingMessages.Interfaces.csproj" />
       <ProjectReference Include="..\IntegrationEvents.Application\IntegrationEvents.Application.csproj" />
       <ProjectReference Include="..\IntegrationEvents.Infrastructure\IntegrationEvents.Infrastructure.csproj" />
-      <ProjectReference Include="..\MasterData.Application\MasterData.Application.csproj" />
+      <ProjectReference Include="..\MasterData.Infrastructure\MasterData.Infrastructure.csproj" />
       <ProjectReference Include="..\MasterData.Interfaces\MasterData.Interfaces.csproj" />
       <ProjectReference Include="..\Outbox.Infrastructure\Outbox.Infrastructure.csproj" />
       <ProjectReference Include="..\OutgoingMessages.Application\OutgoingMessages.Application.csproj" />
diff --git a/source/B2BApi/HostFactory.cs b/source/B2BApi/HostFactory.cs
index a4389816aa..8c37e96a32 100644
--- a/source/B2BApi/HostFactory.cs
+++ b/source/B2BApi/HostFactory.cs
@@ -25,7 +25,7 @@
 using Energinet.DataHub.EDI.DataAccess.UnitOfWork.Extensions.DependencyInjection;
 using Energinet.DataHub.EDI.IncomingMessages.Application.Extensions.DependencyInjection;
 using Energinet.DataHub.EDI.IntegrationEvents.Application.Extensions.DependencyInjection;
-using Energinet.DataHub.EDI.MasterData.Application.Extensions.DependencyInjection;
+using Energinet.DataHub.EDI.MasterData.Infrastructure.Extensions.DependencyInjection;
 using Energinet.DataHub.EDI.Outbox.Infrastructure;
 using Energinet.DataHub.EDI.OutgoingMessages.Application.Extensions.DependencyInjection;
 using Energinet.DataHub.EDI.Process.Application.Extensions.DependencyInjection;
diff --git a/source/B2CWebApi/B2CWebApi.csproj b/source/B2CWebApi/B2CWebApi.csproj
index a7cc846ee4..4db79b396b 100644
--- a/source/B2CWebApi/B2CWebApi.csproj
+++ b/source/B2CWebApi/B2CWebApi.csproj
@@ -8,33 +8,33 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Energinet.DataHub.Core.App.WebApp" Version="13.2.0"/>
+        <PackageReference Include="Energinet.DataHub.Core.App.WebApp" Version="13.2.0" />
         <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.11" />
-        <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0"/>
-        <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="2.13.6"/>
-        <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0"/>
-        <PackageReference Include="Microsoft.OpenApi" Version="1.6.22"/>
+        <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
+        <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="2.13.6" />
+        <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
+        <PackageReference Include="Microsoft.OpenApi" Version="1.6.22" />
         <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.11.20">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.3"/>
+        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.3" />
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\ArchivedMessages.Application\ArchivedMessages.Application.csproj"/>
-        <ProjectReference Include="..\ArchivedMessages.Interfaces\ArchivedMessages.Interfaces.csproj"/>
-        <ProjectReference Include="..\AuditLog\AuditLog.csproj"/>
-        <ProjectReference Include="..\BuildingBlocks.Application\BuildingBlocks.Application.csproj"/>
-        <ProjectReference Include="..\BuildingBlocks.Domain\BuildingBlocks.Domain.csproj"/>
-        <ProjectReference Include="..\DataAccess.UnitOfWork\DataAccess.UnitOfWork.csproj"/>
-        <ProjectReference Include="..\IncomingMessages.Application\IncomingMessages.Application.csproj"/>
-        <ProjectReference Include="..\IncomingMessages.Interfaces\IncomingMessages.Interfaces.csproj"/>
+        <ProjectReference Include="..\ArchivedMessages.Application\ArchivedMessages.Application.csproj" />
+        <ProjectReference Include="..\ArchivedMessages.Interfaces\ArchivedMessages.Interfaces.csproj" />
+        <ProjectReference Include="..\AuditLog\AuditLog.csproj" />
+        <ProjectReference Include="..\BuildingBlocks.Application\BuildingBlocks.Application.csproj" />
+        <ProjectReference Include="..\BuildingBlocks.Domain\BuildingBlocks.Domain.csproj" />
+        <ProjectReference Include="..\DataAccess.UnitOfWork\DataAccess.UnitOfWork.csproj" />
+        <ProjectReference Include="..\IncomingMessages.Application\IncomingMessages.Application.csproj" />
+        <ProjectReference Include="..\IncomingMessages.Interfaces\IncomingMessages.Interfaces.csproj" />
         <!--PLEASE DO NOT REMOVE THE REFERENCE TO INCOMINGMESSAGES.INFRASTRUCTURE! DOING SO WILL BREAK THE SCHEMA LOOKUP!-->
-        <ProjectReference Include="..\IncomingMessages.Infrastructure\IncomingMessages.Infrastructure.csproj"/>
+        <ProjectReference Include="..\IncomingMessages.Infrastructure\IncomingMessages.Infrastructure.csproj" />
         <!--READ THE COMMENT ABOVE-->
-        <ProjectReference Include="..\MasterData.Application\MasterData.Application.csproj"/>
-        <ProjectReference Include="..\Outbox.Infrastructure\Outbox.Infrastructure.csproj"/>
+        <ProjectReference Include="..\MasterData.Infrastructure\MasterData.Infrastructure.csproj" />
+        <ProjectReference Include="..\Outbox.Infrastructure\Outbox.Infrastructure.csproj" />
     </ItemGroup>
 
     <ItemDefinitionGroup>
diff --git a/source/B2CWebApi/Program.cs b/source/B2CWebApi/Program.cs
index da00b0d93a..5fb79ee946 100644
--- a/source/B2CWebApi/Program.cs
+++ b/source/B2CWebApi/Program.cs
@@ -24,7 +24,7 @@
 using Energinet.DataHub.EDI.B2CWebApi.Security;
 using Energinet.DataHub.EDI.DataAccess.UnitOfWork.Extensions.DependencyInjection;
 using Energinet.DataHub.EDI.IncomingMessages.Application.Extensions.DependencyInjection;
-using Energinet.DataHub.EDI.MasterData.Application.Extensions.DependencyInjection;
+using Energinet.DataHub.EDI.MasterData.Infrastructure.Extensions.DependencyInjection;
 using Energinet.DataHub.EDI.Outbox.Infrastructure;
 
 var builder = WebApplication.CreateBuilder(args);
diff --git a/source/Edi.Repository.sln b/source/Edi.Repository.sln
index 81b88ac8d5..dedcaae76b 100644
--- a/source/Edi.Repository.sln
+++ b/source/Edi.Repository.sln
@@ -122,12 +122,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{1DEA9C4F
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MasterData.IntegrationTests", "MasterData.IntegrationTests\MasterData.IntegrationTests.csproj", "{0EA98CF7-1E71-4FFE-9825-A9EA22701E6D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MasterData.Application", "MasterData.Application\MasterData.Application.csproj", "{104BEB59-8E92-4517-8141-620073B89887}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MasterData.Domain", "MasterData.Domain\MasterData.Domain.csproj", "{CDB51D9E-3D69-4E37-A9D4-B12E04722078}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MasterData.Infrastructure", "MasterData.Infrastructure\MasterData.Infrastructure.csproj", "{17E5D9E6-C482-47C5-BABA-56ACFA13BD43}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MasterData.Interfaces", "MasterData.Interfaces\MasterData.Interfaces.csproj", "{03330B59-67CF-426E-AB61-1F87137E10F4}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Outbox", "Outbox", "{C31C36C8-7661-4782-9915-E8278CD4DFEA}"
@@ -206,6 +200,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProcessManager.Core.Tests",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProcessManager.Orchestrations.Tests", "ProcessManager.Orchestrations.Tests\ProcessManager.Orchestrations.Tests.csproj", "{6E524405-2B66-4563-B043-492DB8734060}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MasterData.Infrastructure", "MasterData.Infrastructure\MasterData.Infrastructure.csproj", "{61571A46-1145-4FF9-9C91-47C33520B53A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MasterData.Application", "MasterData.Application\MasterData.Application.csproj", "{0E787394-5AD2-4920-900F-E802EDB726B6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MasterData.Domain", "MasterData.Domain\MasterData.Domain.csproj", "{4A238A51-ED28-4039-8046-ED7B1336C614}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -328,18 +328,6 @@ Global
 		{0EA98CF7-1E71-4FFE-9825-A9EA22701E6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0EA98CF7-1E71-4FFE-9825-A9EA22701E6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0EA98CF7-1E71-4FFE-9825-A9EA22701E6D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{104BEB59-8E92-4517-8141-620073B89887}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{104BEB59-8E92-4517-8141-620073B89887}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{104BEB59-8E92-4517-8141-620073B89887}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{104BEB59-8E92-4517-8141-620073B89887}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CDB51D9E-3D69-4E37-A9D4-B12E04722078}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CDB51D9E-3D69-4E37-A9D4-B12E04722078}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CDB51D9E-3D69-4E37-A9D4-B12E04722078}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CDB51D9E-3D69-4E37-A9D4-B12E04722078}.Release|Any CPU.Build.0 = Release|Any CPU
-		{17E5D9E6-C482-47C5-BABA-56ACFA13BD43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{17E5D9E6-C482-47C5-BABA-56ACFA13BD43}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{17E5D9E6-C482-47C5-BABA-56ACFA13BD43}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{17E5D9E6-C482-47C5-BABA-56ACFA13BD43}.Release|Any CPU.Build.0 = Release|Any CPU
 		{03330B59-67CF-426E-AB61-1F87137E10F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{03330B59-67CF-426E-AB61-1F87137E10F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{03330B59-67CF-426E-AB61-1F87137E10F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -452,6 +440,18 @@ Global
 		{6E524405-2B66-4563-B043-492DB8734060}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6E524405-2B66-4563-B043-492DB8734060}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6E524405-2B66-4563-B043-492DB8734060}.Release|Any CPU.Build.0 = Release|Any CPU
+		{61571A46-1145-4FF9-9C91-47C33520B53A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{61571A46-1145-4FF9-9C91-47C33520B53A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{61571A46-1145-4FF9-9C91-47C33520B53A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{61571A46-1145-4FF9-9C91-47C33520B53A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0E787394-5AD2-4920-900F-E802EDB726B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0E787394-5AD2-4920-900F-E802EDB726B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0E787394-5AD2-4920-900F-E802EDB726B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0E787394-5AD2-4920-900F-E802EDB726B6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4A238A51-ED28-4039-8046-ED7B1336C614}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A238A51-ED28-4039-8046-ED7B1336C614}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4A238A51-ED28-4039-8046-ED7B1336C614}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4A238A51-ED28-4039-8046-ED7B1336C614}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -509,9 +509,6 @@ Global
 		{ED4BC8EC-5C20-4250-B2DD-9FEAEF726D8E} = {5E56C03C-09BD-4F47-917E-4D5B03E4EE0E}
 		{1DEA9C4F-02C5-4D91-A6B4-F87421FDE638} = {ED4BC8EC-5C20-4250-B2DD-9FEAEF726D8E}
 		{0EA98CF7-1E71-4FFE-9825-A9EA22701E6D} = {1DEA9C4F-02C5-4D91-A6B4-F87421FDE638}
-		{104BEB59-8E92-4517-8141-620073B89887} = {ED4BC8EC-5C20-4250-B2DD-9FEAEF726D8E}
-		{CDB51D9E-3D69-4E37-A9D4-B12E04722078} = {ED4BC8EC-5C20-4250-B2DD-9FEAEF726D8E}
-		{17E5D9E6-C482-47C5-BABA-56ACFA13BD43} = {ED4BC8EC-5C20-4250-B2DD-9FEAEF726D8E}
 		{03330B59-67CF-426E-AB61-1F87137E10F4} = {ED4BC8EC-5C20-4250-B2DD-9FEAEF726D8E}
 		{C31C36C8-7661-4782-9915-E8278CD4DFEA} = {5E56C03C-09BD-4F47-917E-4D5B03E4EE0E}
 		{7F858416-5101-4CAE-A7CE-7C7DE65C7465} = {C31C36C8-7661-4782-9915-E8278CD4DFEA}
@@ -548,6 +545,9 @@ Global
 		{866DFC4D-9E52-4DC9-B745-E47A2B12822F} = {A1D87C36-B279-40DB-8C75-B74453458A02}
 		{8E6CCEC1-0CD6-464B-A101-24E166715BD7} = {9CB2AEDE-FAB7-405B-913F-3E7E673F962D}
 		{6E524405-2B66-4563-B043-492DB8734060} = {BF4FFF69-2FAA-4C40-A781-ABC5EABEA258}
+		{61571A46-1145-4FF9-9C91-47C33520B53A} = {ED4BC8EC-5C20-4250-B2DD-9FEAEF726D8E}
+		{0E787394-5AD2-4920-900F-E802EDB726B6} = {ED4BC8EC-5C20-4250-B2DD-9FEAEF726D8E}
+		{4A238A51-ED28-4039-8046-ED7B1336C614} = {ED4BC8EC-5C20-4250-B2DD-9FEAEF726D8E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {8C390B97-896A-4AAD-8609-3C20E80966D2}
diff --git a/source/Edi.UnitTests/Edi.UnitTests.csproj b/source/Edi.UnitTests/Edi.UnitTests.csproj
index 78bd5db121..5d84e9e907 100644
--- a/source/Edi.UnitTests/Edi.UnitTests.csproj
+++ b/source/Edi.UnitTests/Edi.UnitTests.csproj
@@ -37,6 +37,6 @@
     <ProjectReference Include="..\DataAccess.UnitOfWork\DataAccess.UnitOfWork.csproj" />
     <ProjectReference Include="..\DataAccess\DataAccess.csproj" />
     <ProjectReference Include="..\Edi\Edi.csproj" />
-    <ProjectReference Include="..\MasterData.Application\MasterData.Application.csproj" />
+    <ProjectReference Include="..\MasterData.Infrastructure\MasterData.Infrastructure.csproj" />
   </ItemGroup>
 </Project>
diff --git a/source/Edi.UnitTests/EdiTestBase.cs b/source/Edi.UnitTests/EdiTestBase.cs
index 60f231ca9c..27d1e55353 100644
--- a/source/Edi.UnitTests/EdiTestBase.cs
+++ b/source/Edi.UnitTests/EdiTestBase.cs
@@ -13,20 +13,16 @@
 // limitations under the License.
 
 using BuildingBlocks.Application.Extensions.DependencyInjection;
-using Energinet.DataHub.BuildingBlocks.Tests;
 using Energinet.DataHub.BuildingBlocks.Tests.Logging;
 using Energinet.DataHub.Core.App.Common.Extensions.DependencyInjection;
 using Energinet.DataHub.Core.Messaging.Communication.Extensions.Options;
 using Energinet.DataHub.EDI.DataAccess.Extensions.DependencyInjection;
 using Energinet.DataHub.EDI.DataAccess.UnitOfWork.Extensions.DependencyInjection;
-using Energinet.DataHub.EDI.MasterData.Application.Extensions.DependencyInjection;
+using Energinet.DataHub.EDI.MasterData.Infrastructure.Extensions.DependencyInjection;
 using Energinet.DataHub.Wholesale.Edi.Extensions.DependencyInjection;
-using Energinet.DataHub.Wholesale.Edi.Validation;
 using Energinet.DataHub.Wholesale.Edi.Validation.Helpers;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.DependencyInjection.Extensions;
-using Microsoft.Extensions.Logging;
 using Xunit.Abstractions;
 
 namespace Energinet.DataHub.Wholesale.Edi.UnitTests;
diff --git a/source/IncomingMessages.IntegrationTests/IncomingMessages.IntegrationTests.csproj b/source/IncomingMessages.IntegrationTests/IncomingMessages.IntegrationTests.csproj
index dbbede664b..3ebf62fb72 100644
--- a/source/IncomingMessages.IntegrationTests/IncomingMessages.IntegrationTests.csproj
+++ b/source/IncomingMessages.IntegrationTests/IncomingMessages.IntegrationTests.csproj
@@ -1,4 +1,4 @@
-<!--
+<!--
 Copyright 2020 Energinet DataHub A/S
 
 Licensed under the Apache License, Version 2.0 (the "License2");
@@ -73,7 +73,7 @@ limitations under the License.
         <ProjectReference Include="..\IncomingMessages.Application\IncomingMessages.Application.csproj" />
         <ProjectReference Include="..\IncomingMessages.Infrastructure\IncomingMessages.Infrastructure.csproj" />
         <ProjectReference Include="..\IncomingMessages.Interfaces\IncomingMessages.Interfaces.csproj" />
-        <ProjectReference Include="..\MasterData.Application\MasterData.Application.csproj" />
+        <ProjectReference Include="..\MasterData.Infrastructure\MasterData.Infrastructure.csproj" />
         <ProjectReference Include="..\MasterData.Interfaces\MasterData.Interfaces.csproj" />
     </ItemGroup>
 
diff --git a/source/IncomingMessages.IntegrationTests/IncomingMessagesTestBase.cs b/source/IncomingMessages.IntegrationTests/IncomingMessagesTestBase.cs
index 485eb9c817..c77295537f 100644
--- a/source/IncomingMessages.IntegrationTests/IncomingMessagesTestBase.cs
+++ b/source/IncomingMessages.IntegrationTests/IncomingMessagesTestBase.cs
@@ -18,7 +18,6 @@
 using BuildingBlocks.Application.Extensions.DependencyInjection;
 using BuildingBlocks.Application.FeatureFlag;
 using Dapper;
-using Energinet.DataHub.BuildingBlocks.Tests;
 using Energinet.DataHub.BuildingBlocks.Tests.Logging;
 using Energinet.DataHub.BuildingBlocks.Tests.TestDoubles;
 using Energinet.DataHub.Core.Messaging.Communication.Extensions.Options;
@@ -31,11 +30,10 @@
 using Energinet.DataHub.EDI.IncomingMessages.Infrastructure.Configuration.DataAccess;
 using Energinet.DataHub.EDI.IncomingMessages.Infrastructure.Configuration.Options;
 using Energinet.DataHub.EDI.IncomingMessages.IntegrationTests.Fixtures;
-using Energinet.DataHub.EDI.MasterData.Application.Extensions.DependencyInjection;
+using Energinet.DataHub.EDI.MasterData.Infrastructure.Extensions.DependencyInjection;
 using Microsoft.Extensions.Azure;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.IdentityModel.JsonWebTokens;
 using Microsoft.IdentityModel.Tokens;
 using NodaTime;
diff --git a/source/IntegrationEvents.IntegrationTests/Fixture/IntegrationEventsTestBase.cs b/source/IntegrationEvents.IntegrationTests/Fixture/IntegrationEventsTestBase.cs
index 1b00a57deb..a110601a1c 100644
--- a/source/IntegrationEvents.IntegrationTests/Fixture/IntegrationEventsTestBase.cs
+++ b/source/IntegrationEvents.IntegrationTests/Fixture/IntegrationEventsTestBase.cs
@@ -12,16 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using Energinet.DataHub.BuildingBlocks.Tests;
 using Energinet.DataHub.BuildingBlocks.Tests.Logging;
 using Energinet.DataHub.Core.App.Common.Extensions.DependencyInjection;
 using Energinet.DataHub.Core.Messaging.Communication.Extensions.Options;
 using Energinet.DataHub.EDI.IntegrationEvents.Application.Extensions.DependencyInjection;
-using Energinet.DataHub.EDI.MasterData.Application.Extensions.DependencyInjection;
+using Energinet.DataHub.EDI.MasterData.Infrastructure.Extensions.DependencyInjection;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.DependencyInjection.Extensions;
-using Microsoft.Extensions.Logging;
 using Xunit;
 using Xunit.Abstractions;
 
diff --git a/source/IntegrationEvents.IntegrationTests/IntegrationEvents.IntegrationTests.csproj b/source/IntegrationEvents.IntegrationTests/IntegrationEvents.IntegrationTests.csproj
index 6e5eb1529f..d808312b52 100644
--- a/source/IntegrationEvents.IntegrationTests/IntegrationEvents.IntegrationTests.csproj
+++ b/source/IntegrationEvents.IntegrationTests/IntegrationEvents.IntegrationTests.csproj
@@ -30,7 +30,7 @@
         <ProjectReference Include="..\BuildingBlocks.Tests\BuildingBlocks.Tests.csproj" />
         <ProjectReference Include="..\Contracts\Contracts.csproj" />
         <ProjectReference Include="..\IntegrationEvents.Application\IntegrationEvents.Application.csproj" />
-        <ProjectReference Include="..\MasterData.Application\MasterData.Application.csproj" />
+        <ProjectReference Include="..\MasterData.Infrastructure\MasterData.Infrastructure.csproj" />
     </ItemGroup>
 
     <ItemDefinitionGroup>
diff --git a/source/IntegrationTests/Behaviours/BehavioursTestBase.cs b/source/IntegrationTests/Behaviours/BehavioursTestBase.cs
index 6c5a042627..50f5ee75a2 100644
--- a/source/IntegrationTests/Behaviours/BehavioursTestBase.cs
+++ b/source/IntegrationTests/Behaviours/BehavioursTestBase.cs
@@ -38,7 +38,7 @@
 using Energinet.DataHub.EDI.IntegrationTests.Infrastructure.Authentication.MarketActors;
 using Energinet.DataHub.EDI.IntegrationTests.Infrastructure.Configuration.InternalCommands;
 using Energinet.DataHub.EDI.IntegrationTests.Infrastructure.InboxEvents;
-using Energinet.DataHub.EDI.MasterData.Application.Extensions.DependencyInjection;
+using Energinet.DataHub.EDI.MasterData.Infrastructure.Extensions.DependencyInjection;
 using Energinet.DataHub.EDI.MasterData.Interfaces;
 using Energinet.DataHub.EDI.MasterData.Interfaces.Models;
 using Energinet.DataHub.EDI.OutgoingMessages.Application.Extensions.DependencyInjection;
diff --git a/source/IntegrationTests/IntegrationTests.csproj b/source/IntegrationTests/IntegrationTests.csproj
index 03f3e1446b..57ad4c7d94 100644
--- a/source/IntegrationTests/IntegrationTests.csproj
+++ b/source/IntegrationTests/IntegrationTests.csproj
@@ -68,7 +68,7 @@ limitations under the License.
       <ProjectReference Include="..\IncomingMessages.IntegrationTests\IncomingMessages.IntegrationTests.csproj" />
       <ProjectReference Include="..\IntegrationEvents.Application\IntegrationEvents.Application.csproj" />
       <ProjectReference Include="..\IntegrationEvents.IntegrationTests\IntegrationEvents.IntegrationTests.csproj" />
-      <ProjectReference Include="..\MasterData.Application\MasterData.Application.csproj" />
+      <ProjectReference Include="..\MasterData.Infrastructure\MasterData.Infrastructure.csproj" />
       <ProjectReference Include="..\MasterData.IntegrationTests\MasterData.IntegrationTests.csproj" />
       <ProjectReference Include="..\MasterData.Interfaces\MasterData.Interfaces.csproj" />
       <ProjectReference Include="..\Outbox.Infrastructure\Outbox.Infrastructure.csproj" />
diff --git a/source/IntegrationTests/TestBase.cs b/source/IntegrationTests/TestBase.cs
index 2af1a83591..c45105c551 100644
--- a/source/IntegrationTests/TestBase.cs
+++ b/source/IntegrationTests/TestBase.cs
@@ -42,7 +42,7 @@
 using Energinet.DataHub.EDI.IntegrationTests.Infrastructure.Authentication.MarketActors;
 using Energinet.DataHub.EDI.IntegrationTests.Infrastructure.Configuration.InternalCommands;
 using Energinet.DataHub.EDI.IntegrationTests.Infrastructure.InboxEvents;
-using Energinet.DataHub.EDI.MasterData.Application.Extensions.DependencyInjection;
+using Energinet.DataHub.EDI.MasterData.Infrastructure.Extensions.DependencyInjection;
 using Energinet.DataHub.EDI.MasterData.Interfaces;
 using Energinet.DataHub.EDI.MasterData.Interfaces.Models;
 using Energinet.DataHub.EDI.Outbox.Infrastructure;
diff --git a/source/MasterData.Application/IMasterDataContext.cs b/source/MasterData.Application/IMasterDataContext.cs
new file mode 100644
index 0000000000..bcc821e054
--- /dev/null
+++ b/source/MasterData.Application/IMasterDataContext.cs
@@ -0,0 +1,27 @@
+// Copyright 2020 Energinet DataHub A/S
+//
+// Licensed under the Apache License, Version 2.0 (the "License2");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace Energinet.DataHub.EDI.MasterData.Application;
+
+/// <summary>
+/// Wrapper for the module context.
+/// </summary>
+public interface IMasterDataContext
+{
+    /// <summary>
+    /// Saves all changes on the wrapped context async.
+    /// </summary>
+    /// <param name="cancellationToken"></param>
+    Task<int> SaveChangesAsync(CancellationToken cancellationToken = default);
+}
diff --git a/source/MasterData.Application/MasterData.Application.csproj b/source/MasterData.Application/MasterData.Application.csproj
index 029860b874..da2ffd7f2c 100644
--- a/source/MasterData.Application/MasterData.Application.csproj
+++ b/source/MasterData.Application/MasterData.Application.csproj
@@ -1,18 +1,20 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>Energinet.DataHub.EDI.MasterData.Application</AssemblyName>
     <RootNamespace>Energinet.DataHub.EDI.MasterData.Application</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.11.20">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\DataAccess\DataAccess.csproj" />
+    <ProjectReference Include="..\BuildingBlocks.Domain\BuildingBlocks.Domain.csproj" />
+    <ProjectReference Include="..\BuildingBlocks.Interfaces\BuildingBlocks.Interfaces.csproj" />
+    <ProjectReference Include="..\MasterData.Domain\MasterData.Domain.csproj" />
     <ProjectReference Include="..\MasterData.Interfaces\MasterData.Interfaces.csproj" />
-    <ProjectReference Include="..\MasterData.Infrastructure\MasterData.Infrastructure.csproj" />
   </ItemGroup>
   <ItemDefinitionGroup>
     <ProjectReference>
diff --git a/source/MasterData.Application/MasterDataClient.cs b/source/MasterData.Application/MasterDataClient.cs
index 4ff1a723e6..e9d5dc15f4 100644
--- a/source/MasterData.Application/MasterDataClient.cs
+++ b/source/MasterData.Application/MasterDataClient.cs
@@ -19,7 +19,6 @@
 using Energinet.DataHub.EDI.MasterData.Domain.Actors;
 using Energinet.DataHub.EDI.MasterData.Domain.GridAreaOwners;
 using Energinet.DataHub.EDI.MasterData.Domain.ProcessDelegations;
-using Energinet.DataHub.EDI.MasterData.Infrastructure.DataAccess;
 using Energinet.DataHub.EDI.MasterData.Interfaces;
 using Energinet.DataHub.EDI.MasterData.Interfaces.Models;
 using Microsoft.Extensions.Logging;
@@ -27,12 +26,12 @@
 
 namespace Energinet.DataHub.EDI.MasterData.Application;
 
-internal sealed class MasterDataClient : IMasterDataClient
+public sealed class MasterDataClient : IMasterDataClient
 {
     private readonly IActorRepository _actorRepository;
     private readonly IGridAreaRepository _gridAreaRepository;
     private readonly IActorCertificateRepository _actorCertificateRepository;
-    private readonly MasterDataContext _masterDataContext;
+    private readonly IMasterDataContext _masterDataContext;
     private readonly ILogger<IMasterDataClient> _logger;
     private readonly IProcessDelegationRepository _processDelegationRepository;
 
@@ -40,7 +39,7 @@ public MasterDataClient(
         IActorRepository actorRepository,
         IGridAreaRepository gridAreaRepository,
         IActorCertificateRepository actorCertificateRepository,
-        MasterDataContext masterDataContext,
+        IMasterDataContext masterDataContext,
         ILogger<IMasterDataClient> logger,
         IProcessDelegationRepository processDelegationRepository)
     {
diff --git a/source/MasterData.Domain/ActorCertificates/ActorCertificate.cs b/source/MasterData.Domain/ActorCertificates/ActorCertificate.cs
index 0fb0b83ff2..4095d2a0b9 100644
--- a/source/MasterData.Domain/ActorCertificates/ActorCertificate.cs
+++ b/source/MasterData.Domain/ActorCertificates/ActorCertificate.cs
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using Energinet.DataHub.EDI.BuildingBlocks.Domain.Models;
 using NodaTime;
 
diff --git a/source/MasterData.Domain/ActorCertificates/IActorCertificateRepository.cs b/source/MasterData.Domain/ActorCertificates/IActorCertificateRepository.cs
index ab1f403e7b..1960b40d29 100644
--- a/source/MasterData.Domain/ActorCertificates/IActorCertificateRepository.cs
+++ b/source/MasterData.Domain/ActorCertificates/IActorCertificateRepository.cs
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System.Threading;
-using System.Threading.Tasks;
 using Energinet.DataHub.EDI.BuildingBlocks.Domain.Models;
 
 namespace Energinet.DataHub.EDI.MasterData.Domain.ActorCertificates;
diff --git a/source/MasterData.Domain/Actors/IActorRepository.cs b/source/MasterData.Domain/Actors/IActorRepository.cs
index 0beacf5870..c6298046a0 100644
--- a/source/MasterData.Domain/Actors/IActorRepository.cs
+++ b/source/MasterData.Domain/Actors/IActorRepository.cs
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System.Threading;
-using System.Threading.Tasks;
 using Energinet.DataHub.EDI.BuildingBlocks.Domain.Models;
 
 namespace Energinet.DataHub.EDI.MasterData.Domain.Actors;
diff --git a/source/MasterData.Domain/ProcessDelegations/IProcessDelegationRepository.cs b/source/MasterData.Domain/ProcessDelegations/IProcessDelegationRepository.cs
index a2e48f73fd..1f49387126 100644
--- a/source/MasterData.Domain/ProcessDelegations/IProcessDelegationRepository.cs
+++ b/source/MasterData.Domain/ProcessDelegations/IProcessDelegationRepository.cs
@@ -12,9 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 using Energinet.DataHub.EDI.BuildingBlocks.Domain.Models;
 
 namespace Energinet.DataHub.EDI.MasterData.Domain.ProcessDelegations;
diff --git a/source/MasterData.Domain/ProcessDelegations/ProcessDelegation.cs b/source/MasterData.Domain/ProcessDelegations/ProcessDelegation.cs
index b91e341f6f..1148ede4c2 100644
--- a/source/MasterData.Domain/ProcessDelegations/ProcessDelegation.cs
+++ b/source/MasterData.Domain/ProcessDelegations/ProcessDelegation.cs
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using Energinet.DataHub.EDI.BuildingBlocks.Domain.Models;
 using NodaTime;
 
diff --git a/source/MasterData.Infrastructure/ActorCertificate/ActorCertificateEntityConfiguration.cs b/source/MasterData.Infrastructure/ActorCertificate/ActorCertificateEntityConfiguration.cs
index cf57359a2a..56a9b933c8 100644
--- a/source/MasterData.Infrastructure/ActorCertificate/ActorCertificateEntityConfiguration.cs
+++ b/source/MasterData.Infrastructure/ActorCertificate/ActorCertificateEntityConfiguration.cs
@@ -12,13 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using Energinet.DataHub.EDI.BuildingBlocks.Domain.Models;
 using Energinet.DataHub.EDI.MasterData.Domain.ActorCertificates;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Energinet.DataHub.EDI.MasterData.Infrastructure.ActorCertificate;
+namespace Energinet.DataHub.EDI.MasterData.Infrastructure.ActorCertificates;
 
 public class ActorCertificateEntityConfiguration : IEntityTypeConfiguration<Domain.ActorCertificates.ActorCertificate>
 {
diff --git a/source/MasterData.Infrastructure/Actors/ActorEntityConfiguration.cs b/source/MasterData.Infrastructure/Actors/ActorEntityConfiguration.cs
index 870aba3e64..825c3b49a1 100644
--- a/source/MasterData.Infrastructure/Actors/ActorEntityConfiguration.cs
+++ b/source/MasterData.Infrastructure/Actors/ActorEntityConfiguration.cs
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using Energinet.DataHub.EDI.BuildingBlocks.Domain.Models;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
diff --git a/source/MasterData.Infrastructure/Actors/ActorRepository.cs b/source/MasterData.Infrastructure/Actors/ActorRepository.cs
index 5c9d88fb22..9fa7220dd5 100644
--- a/source/MasterData.Infrastructure/Actors/ActorRepository.cs
+++ b/source/MasterData.Infrastructure/Actors/ActorRepository.cs
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System.Threading;
-using System.Threading.Tasks;
 using Dapper;
 using Energinet.DataHub.EDI.BuildingBlocks.Domain.Models;
 using Energinet.DataHub.EDI.BuildingBlocks.Infrastructure.DataAccess;
diff --git a/source/MasterData.Infrastructure/DataAccess/MasterDataContext.cs b/source/MasterData.Infrastructure/DataAccess/MasterDataContext.cs
index e6fff71a9f..d30c422f92 100644
--- a/source/MasterData.Infrastructure/DataAccess/MasterDataContext.cs
+++ b/source/MasterData.Infrastructure/DataAccess/MasterDataContext.cs
@@ -13,17 +13,18 @@
 // limitations under the License.
 
 using Energinet.DataHub.EDI.BuildingBlocks.Infrastructure.DataAccess;
+using Energinet.DataHub.EDI.MasterData.Application;
 using Energinet.DataHub.EDI.MasterData.Domain.Actors;
 using Energinet.DataHub.EDI.MasterData.Domain.GridAreaOwners;
-using Energinet.DataHub.EDI.MasterData.Infrastructure.ActorCertificate;
+using Energinet.DataHub.EDI.MasterData.Infrastructure.ActorCertificates;
 using Energinet.DataHub.EDI.MasterData.Infrastructure.Actors;
 using Energinet.DataHub.EDI.MasterData.Infrastructure.GridAreas;
-using Energinet.DataHub.EDI.MasterData.Infrastructure.ProcessDelegation;
+using Energinet.DataHub.EDI.MasterData.Infrastructure.ProcessDelegations;
 using Microsoft.EntityFrameworkCore;
 
 namespace Energinet.DataHub.EDI.MasterData.Infrastructure.DataAccess;
 
-public class MasterDataContext : DbContext, IEdiDbContext
+public class MasterDataContext : DbContext, IEdiDbContext, IMasterDataContext
 {
 #nullable disable
     public MasterDataContext(DbContextOptions<MasterDataContext> options)
diff --git a/source/MasterData.Application/Extensions/DependencyInjection/MasterDataExtensions.cs b/source/MasterData.Infrastructure/Extensions/DependencyInjection/MasterDataExtensions.cs
similarity index 87%
rename from source/MasterData.Application/Extensions/DependencyInjection/MasterDataExtensions.cs
rename to source/MasterData.Infrastructure/Extensions/DependencyInjection/MasterDataExtensions.cs
index d1239546b1..acda3fa615 100644
--- a/source/MasterData.Application/Extensions/DependencyInjection/MasterDataExtensions.cs
+++ b/source/MasterData.Infrastructure/Extensions/DependencyInjection/MasterDataExtensions.cs
@@ -14,6 +14,7 @@
 
 using Energinet.DataHub.EDI.BuildingBlocks.Interfaces;
 using Energinet.DataHub.EDI.DataAccess.Extensions.DependencyInjection;
+using Energinet.DataHub.EDI.MasterData.Application;
 using Energinet.DataHub.EDI.MasterData.Domain.ActorCertificates;
 using Energinet.DataHub.EDI.MasterData.Domain.Actors;
 using Energinet.DataHub.EDI.MasterData.Domain.GridAreaOwners;
@@ -27,7 +28,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Energinet.DataHub.EDI.MasterData.Application.Extensions.DependencyInjection;
+namespace Energinet.DataHub.EDI.MasterData.Infrastructure.Extensions.DependencyInjection;
 
 public static class MasterDataExtensions
 {
@@ -35,6 +36,12 @@ public static IServiceCollection AddMasterDataModule(this IServiceCollection ser
     {
         services.AddScopedSqlDbContext<MasterDataContext>(configuration);
 
+        // Data access
+        services.AddScoped<IMasterDataContext, MasterDataContext>(sp =>
+        {
+            return sp.GetRequiredService<MasterDataContext>();
+        });
+
         // Grid area
         services
             .AddTransient<IGridAreaRepository, GridAreaRepository>()
diff --git a/source/MasterData.Infrastructure/GridAreas/GridAreaOwnerEntityConfiguration.cs b/source/MasterData.Infrastructure/GridAreas/GridAreaOwnerEntityConfiguration.cs
index 77688971da..f2d6ea4626 100644
--- a/source/MasterData.Infrastructure/GridAreas/GridAreaOwnerEntityConfiguration.cs
+++ b/source/MasterData.Infrastructure/GridAreas/GridAreaOwnerEntityConfiguration.cs
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using Energinet.DataHub.EDI.BuildingBlocks.Domain.Models;
 using Energinet.DataHub.EDI.MasterData.Domain.GridAreaOwners;
 using Microsoft.EntityFrameworkCore;
diff --git a/source/MasterData.Infrastructure/MasterData.Infrastructure.csproj b/source/MasterData.Infrastructure/MasterData.Infrastructure.csproj
index 4081660b89..c46b87689b 100644
--- a/source/MasterData.Infrastructure/MasterData.Infrastructure.csproj
+++ b/source/MasterData.Infrastructure/MasterData.Infrastructure.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>Energinet.DataHub.EDI.MasterData.Infrastructure</AssemblyName>
     <RootNamespace>Energinet.DataHub.EDI.MasterData.Infrastructure</RootNamespace>
@@ -7,6 +7,9 @@
     <ProjectReference Include="..\AuditLog\AuditLog.csproj" />
     <ProjectReference Include="..\BuildingBlocks.Domain\BuildingBlocks.Domain.csproj" />
     <ProjectReference Include="..\BuildingBlocks.Infrastructure\BuildingBlocks.Infrastructure.csproj" />
+    <ProjectReference Include="..\DataAccess.UnitOfWork\DataAccess.UnitOfWork.csproj" />
+    <ProjectReference Include="..\DataAccess\DataAccess.csproj" />
+    <ProjectReference Include="..\MasterData.Application\MasterData.Application.csproj" />
     <ProjectReference Include="..\MasterData.Domain\MasterData.Domain.csproj" />
     <ProjectReference Include="..\MasterData.Interfaces\MasterData.Interfaces.csproj" />
   </ItemGroup>
diff --git a/source/MasterData.Infrastructure/ProcessDelegation/ProcessDelegationEntityConfiguration.cs b/source/MasterData.Infrastructure/ProcessDelegation/ProcessDelegationEntityConfiguration.cs
index 2528afbb8b..6317641c50 100644
--- a/source/MasterData.Infrastructure/ProcessDelegation/ProcessDelegationEntityConfiguration.cs
+++ b/source/MasterData.Infrastructure/ProcessDelegation/ProcessDelegationEntityConfiguration.cs
@@ -12,13 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using Energinet.DataHub.EDI.BuildingBlocks.Domain.Models;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using NodaTime;
 
-namespace Energinet.DataHub.EDI.MasterData.Infrastructure.ProcessDelegation;
+namespace Energinet.DataHub.EDI.MasterData.Infrastructure.ProcessDelegations;
 
 public class ProcessDelegationEntityConfiguration : IEntityTypeConfiguration<Domain.ProcessDelegations.ProcessDelegation>
 {
diff --git a/source/MasterData.IntegrationTests/Fixture/MasterDataTestBase.cs b/source/MasterData.IntegrationTests/Fixture/MasterDataTestBase.cs
index 422002df6d..06356f0e97 100644
--- a/source/MasterData.IntegrationTests/Fixture/MasterDataTestBase.cs
+++ b/source/MasterData.IntegrationTests/Fixture/MasterDataTestBase.cs
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 using BuildingBlocks.Application.Extensions.DependencyInjection;
-using Energinet.DataHub.BuildingBlocks.Tests;
 using Energinet.DataHub.BuildingBlocks.Tests.Logging;
 using Energinet.DataHub.Core.App.Common.Extensions.DependencyInjection;
 using Energinet.DataHub.Core.Messaging.Communication.Extensions.Options;
@@ -21,11 +20,10 @@
 using Energinet.DataHub.EDI.B2BApi.Extensions.DependencyInjection;
 using Energinet.DataHub.EDI.DataAccess.Extensions.DependencyInjection;
 using Energinet.DataHub.EDI.DataAccess.UnitOfWork.Extensions.DependencyInjection;
-using Energinet.DataHub.EDI.MasterData.Application.Extensions.DependencyInjection;
+using Energinet.DataHub.EDI.MasterData.Infrastructure.Extensions.DependencyInjection;
 using Energinet.DataHub.EDI.Outbox.Infrastructure;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.IdentityModel.JsonWebTokens;
 using Xunit.Abstractions;
 
diff --git a/source/MasterData.IntegrationTests/MasterData.IntegrationTests.csproj b/source/MasterData.IntegrationTests/MasterData.IntegrationTests.csproj
index 7ec2248ffc..170d420741 100644
--- a/source/MasterData.IntegrationTests/MasterData.IntegrationTests.csproj
+++ b/source/MasterData.IntegrationTests/MasterData.IntegrationTests.csproj
@@ -30,7 +30,7 @@
         <ProjectReference Include="..\BuildingBlocks.Tests\BuildingBlocks.Tests.csproj" />
         <ProjectReference Include="..\DataAccess.UnitOfWork\DataAccess.UnitOfWork.csproj" />
         <ProjectReference Include="..\DataAccess\DataAccess.csproj" />
-        <ProjectReference Include="..\MasterData.Application\MasterData.Application.csproj" />
+        <ProjectReference Include="..\MasterData.Infrastructure\MasterData.Infrastructure.csproj" />
         <ProjectReference Include="..\MasterData.Interfaces\MasterData.Interfaces.csproj" />
         <ProjectReference Include="..\Outbox.Infrastructure\Outbox.Infrastructure.csproj" />
     </ItemGroup>
diff --git a/source/OutgoingMessages.IntegrationTests/OutgoingMessages.IntegrationTests.csproj b/source/OutgoingMessages.IntegrationTests/OutgoingMessages.IntegrationTests.csproj
index 90293d7e37..083cb4af12 100644
--- a/source/OutgoingMessages.IntegrationTests/OutgoingMessages.IntegrationTests.csproj
+++ b/source/OutgoingMessages.IntegrationTests/OutgoingMessages.IntegrationTests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <AssemblyName>Energinet.DataHub.EDI.OutgoingMessages.IntegrationTests</AssemblyName>
@@ -12,10 +12,10 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Dapper" Version="2.1.35"/>
-        <PackageReference Include="FluentAssertions" Version="6.12.1"/>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1"/>
-        <PackageReference Include="xunit" Version="2.9.2"/>
+        <PackageReference Include="Dapper" Version="2.1.35" />
+        <PackageReference Include="FluentAssertions" Version="6.12.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+        <PackageReference Include="xunit" Version="2.9.2" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -23,7 +23,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <Using Include="Xunit"/>
+        <Using Include="Xunit" />
     </ItemGroup>
 
     <ItemGroup>
@@ -33,18 +33,18 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\ArchivedMessages.Application\ArchivedMessages.Application.csproj"/>
+        <ProjectReference Include="..\ArchivedMessages.Application\ArchivedMessages.Application.csproj" />
         <ProjectReference Include="..\B2BApi\B2BApi.csproj" />
-        <ProjectReference Include="..\BuildingBlocks.Tests\BuildingBlocks.Tests.csproj"/>
-        <ProjectReference Include="..\BuildingBlocks.Infrastructure\BuildingBlocks.Infrastructure.csproj"/>
-        <ProjectReference Include="..\Contracts\Contracts.csproj"/>
+        <ProjectReference Include="..\BuildingBlocks.Tests\BuildingBlocks.Tests.csproj" />
+        <ProjectReference Include="..\BuildingBlocks.Infrastructure\BuildingBlocks.Infrastructure.csproj" />
+        <ProjectReference Include="..\Contracts\Contracts.csproj" />
         <ProjectReference Include="..\IncomingMessages.Infrastructure\IncomingMessages.Infrastructure.csproj" />
-        <ProjectReference Include="..\MasterData.Application\MasterData.Application.csproj" />
+        <ProjectReference Include="..\MasterData.Infrastructure\MasterData.Infrastructure.csproj" />
         <ProjectReference Include="..\OutgoingMessages.Application\OutgoingMessages.Application.csproj" />
         <ProjectReference Include="..\OutgoingMessages.Domain\OutgoingMessages.Domain.csproj" />
         <ProjectReference Include="..\OutgoingMessages.Infrastructure\OutgoingMessages.Infrastructure.csproj" />
-        <ProjectReference Include="..\Process.Domain\Process.Domain.csproj"/>
-        <ProjectReference Include="..\Tests\Tests.csproj"/>
+        <ProjectReference Include="..\Process.Domain\Process.Domain.csproj" />
+        <ProjectReference Include="..\Tests\Tests.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/source/OutgoingMessages.IntegrationTests/OutgoingMessagesTestBase.cs b/source/OutgoingMessages.IntegrationTests/OutgoingMessagesTestBase.cs
index c2678c570f..771e5da155 100644
--- a/source/OutgoingMessages.IntegrationTests/OutgoingMessagesTestBase.cs
+++ b/source/OutgoingMessages.IntegrationTests/OutgoingMessagesTestBase.cs
@@ -21,18 +21,15 @@
 using Energinet.DataHub.BuildingBlocks.Tests.TestDoubles;
 using Energinet.DataHub.Core.Messaging.Communication.Extensions.Options;
 using Energinet.DataHub.EDI.ArchivedMessages.Application.Extensions.DependencyInjection;
-using Energinet.DataHub.EDI.B2BApi.DataRetention;
 using Energinet.DataHub.EDI.B2BApi.Extensions.DependencyInjection;
 using Energinet.DataHub.EDI.BuildingBlocks.Domain.Authentication;
 using Energinet.DataHub.EDI.BuildingBlocks.Domain.Models;
 using Energinet.DataHub.EDI.BuildingBlocks.Infrastructure.DataAccess;
-using Energinet.DataHub.EDI.BuildingBlocks.Infrastructure.TimeEvents;
-using Energinet.DataHub.EDI.MasterData.Application.Extensions.DependencyInjection;
+using Energinet.DataHub.EDI.MasterData.Infrastructure.Extensions.DependencyInjection;
 using Energinet.DataHub.EDI.OutgoingMessages.Application.Extensions.DependencyInjection;
 using Energinet.DataHub.EDI.OutgoingMessages.IntegrationTests.Fixtures;
 using Energinet.DataHub.EDI.OutgoingMessages.Interfaces;
 using Energinet.DataHub.EDI.OutgoingMessages.Interfaces.Models.Peek;
-using MediatR;
 using Microsoft.ApplicationInsights;
 using Microsoft.ApplicationInsights.Extensibility;
 using Microsoft.EntityFrameworkCore;