diff --git a/src/server/RobinTTY.PersonalFinanceDashboard.API/Program.cs b/src/server/RobinTTY.PersonalFinanceDashboard.API/Program.cs
index 404abc8..dd30638 100644
--- a/src/server/RobinTTY.PersonalFinanceDashboard.API/Program.cs
+++ b/src/server/RobinTTY.PersonalFinanceDashboard.API/Program.cs
@@ -14,6 +14,7 @@
using RobinTTY.PersonalFinanceDashboard.ThirdPartyDataProviders;
using RobinTTY.NordigenApiClient.Models;
using RobinTTY.PersonalFinanceDashboard.API.Repositories;
+using RobinTTY.PersonalFinanceDashboard.Infrastructure;
using RobinTTY.PersonalFinanceDashboard.Infrastructure.Mappers;
var builder = WebApplication.CreateBuilder(args);
diff --git a/src/server/RobinTTY.PersonalFinanceDashboard.API/Repositories/AccountRepository.cs b/src/server/RobinTTY.PersonalFinanceDashboard.API/Repositories/AccountRepository.cs
index 9978d35..2a3fc24 100644
--- a/src/server/RobinTTY.PersonalFinanceDashboard.API/Repositories/AccountRepository.cs
+++ b/src/server/RobinTTY.PersonalFinanceDashboard.API/Repositories/AccountRepository.cs
@@ -1,4 +1,5 @@
using RobinTTY.PersonalFinanceDashboard.Core.Models;
+using RobinTTY.PersonalFinanceDashboard.Infrastructure;
using RobinTTY.PersonalFinanceDashboard.ThirdPartyDataProviders;
namespace RobinTTY.PersonalFinanceDashboard.API.Repositories;
diff --git a/src/server/RobinTTY.PersonalFinanceDashboard.API/Repositories/AuthenticationRequestRepository.cs b/src/server/RobinTTY.PersonalFinanceDashboard.API/Repositories/AuthenticationRequestRepository.cs
index d59da66..e4310aa 100644
--- a/src/server/RobinTTY.PersonalFinanceDashboard.API/Repositories/AuthenticationRequestRepository.cs
+++ b/src/server/RobinTTY.PersonalFinanceDashboard.API/Repositories/AuthenticationRequestRepository.cs
@@ -1,5 +1,6 @@
using RobinTTY.NordigenApiClient.Models.Responses;
using RobinTTY.PersonalFinanceDashboard.Core.Models;
+using RobinTTY.PersonalFinanceDashboard.Infrastructure;
using RobinTTY.PersonalFinanceDashboard.ThirdPartyDataProviders;
namespace RobinTTY.PersonalFinanceDashboard.API.Repositories;
diff --git a/src/server/RobinTTY.PersonalFinanceDashboard.API/Repositories/BankingInstitutionRepository.cs b/src/server/RobinTTY.PersonalFinanceDashboard.API/Repositories/BankingInstitutionRepository.cs
index 7e20b24..cf29550 100644
--- a/src/server/RobinTTY.PersonalFinanceDashboard.API/Repositories/BankingInstitutionRepository.cs
+++ b/src/server/RobinTTY.PersonalFinanceDashboard.API/Repositories/BankingInstitutionRepository.cs
@@ -1,4 +1,5 @@
using RobinTTY.PersonalFinanceDashboard.Core.Models;
+using RobinTTY.PersonalFinanceDashboard.Infrastructure;
using RobinTTY.PersonalFinanceDashboard.ThirdPartyDataProviders;
namespace RobinTTY.PersonalFinanceDashboard.API.Repositories;
diff --git a/src/server/RobinTTY.PersonalFinanceDashboard.API/Repositories/TransactionRepository.cs b/src/server/RobinTTY.PersonalFinanceDashboard.API/Repositories/TransactionRepository.cs
index 51ccaf0..262beae 100644
--- a/src/server/RobinTTY.PersonalFinanceDashboard.API/Repositories/TransactionRepository.cs
+++ b/src/server/RobinTTY.PersonalFinanceDashboard.API/Repositories/TransactionRepository.cs
@@ -1,5 +1,6 @@
using Microsoft.EntityFrameworkCore;
using RobinTTY.PersonalFinanceDashboard.Core.Models;
+using RobinTTY.PersonalFinanceDashboard.Infrastructure;
using RobinTTY.PersonalFinanceDashboard.Infrastructure.Entities;
using RobinTTY.PersonalFinanceDashboard.Infrastructure.Mappers;
diff --git a/src/server/RobinTTY.PersonalFinanceDashboard.API/RobinTTY.PersonalFinanceDashboard.API.csproj b/src/server/RobinTTY.PersonalFinanceDashboard.API/RobinTTY.PersonalFinanceDashboard.API.csproj
index e0734f9..3df52b6 100644
--- a/src/server/RobinTTY.PersonalFinanceDashboard.API/RobinTTY.PersonalFinanceDashboard.API.csproj
+++ b/src/server/RobinTTY.PersonalFinanceDashboard.API/RobinTTY.PersonalFinanceDashboard.API.csproj
@@ -17,11 +17,6 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
- all
- runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
diff --git a/src/server/RobinTTY.PersonalFinanceDashboard.API/application.db b/src/server/RobinTTY.PersonalFinanceDashboard.API/application.db
index 0cea273..bff8650 100644
Binary files a/src/server/RobinTTY.PersonalFinanceDashboard.API/application.db and b/src/server/RobinTTY.PersonalFinanceDashboard.API/application.db differ
diff --git a/src/server/RobinTTY.PersonalFinanceDashboard.API/ApplicationDbContext.cs b/src/server/RobinTTY.PersonalFinanceDashboard.Infrastructure/ApplicationDbContext.cs
similarity index 93%
rename from src/server/RobinTTY.PersonalFinanceDashboard.API/ApplicationDbContext.cs
rename to src/server/RobinTTY.PersonalFinanceDashboard.Infrastructure/ApplicationDbContext.cs
index 31731e3..b8e0195 100644
--- a/src/server/RobinTTY.PersonalFinanceDashboard.API/ApplicationDbContext.cs
+++ b/src/server/RobinTTY.PersonalFinanceDashboard.Infrastructure/ApplicationDbContext.cs
@@ -1,7 +1,7 @@
using Microsoft.EntityFrameworkCore;
using RobinTTY.PersonalFinanceDashboard.Infrastructure.Entities;
-namespace RobinTTY.PersonalFinanceDashboard.API;
+namespace RobinTTY.PersonalFinanceDashboard.Infrastructure;
///
/// The database context which provides access to the underlying data of the application.
diff --git a/src/server/RobinTTY.PersonalFinanceDashboard.API/Migrations/20231009181529_InitialCreate.Designer.cs b/src/server/RobinTTY.PersonalFinanceDashboard.Infrastructure/Migrations/20231009181529_InitialCreate.Designer.cs
similarity index 96%
rename from src/server/RobinTTY.PersonalFinanceDashboard.API/Migrations/20231009181529_InitialCreate.Designer.cs
rename to src/server/RobinTTY.PersonalFinanceDashboard.Infrastructure/Migrations/20231009181529_InitialCreate.Designer.cs
index 172b71d..99a596e 100644
--- a/src/server/RobinTTY.PersonalFinanceDashboard.API/Migrations/20231009181529_InitialCreate.Designer.cs
+++ b/src/server/RobinTTY.PersonalFinanceDashboard.Infrastructure/Migrations/20231009181529_InitialCreate.Designer.cs
@@ -4,11 +4,11 @@
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using RobinTTY.PersonalFinanceDashboard.API;
+using RobinTTY.PersonalFinanceDashboard.Infrastructure;
#nullable disable
-namespace RobinTTY.PersonalFinanceDashboard.API.Migrations
+namespace RobinTTY.PersonalFinanceDashboard.Infrastructure.Migrations
{
[DbContext(typeof(ApplicationDbContext))]
[Migration("20231009181529_InitialCreate")]
diff --git a/src/server/RobinTTY.PersonalFinanceDashboard.API/Migrations/20231009181529_InitialCreate.cs b/src/server/RobinTTY.PersonalFinanceDashboard.Infrastructure/Migrations/20231009181529_InitialCreate.cs
similarity index 98%
rename from src/server/RobinTTY.PersonalFinanceDashboard.API/Migrations/20231009181529_InitialCreate.cs
rename to src/server/RobinTTY.PersonalFinanceDashboard.Infrastructure/Migrations/20231009181529_InitialCreate.cs
index 044ea66..6cf2458 100644
--- a/src/server/RobinTTY.PersonalFinanceDashboard.API/Migrations/20231009181529_InitialCreate.cs
+++ b/src/server/RobinTTY.PersonalFinanceDashboard.Infrastructure/Migrations/20231009181529_InitialCreate.cs
@@ -2,7 +2,7 @@
#nullable disable
-namespace RobinTTY.PersonalFinanceDashboard.API.Migrations
+namespace RobinTTY.PersonalFinanceDashboard.Infrastructure.Migrations
{
///
public partial class InitialCreate : Migration
diff --git a/src/server/RobinTTY.PersonalFinanceDashboard.API/Migrations/20240923223514_AddAccountIdToTransaction.Designer.cs b/src/server/RobinTTY.PersonalFinanceDashboard.Infrastructure/Migrations/20240923223514_AddAccountIdToTransaction.Designer.cs
similarity index 96%
rename from src/server/RobinTTY.PersonalFinanceDashboard.API/Migrations/20240923223514_AddAccountIdToTransaction.Designer.cs
rename to src/server/RobinTTY.PersonalFinanceDashboard.Infrastructure/Migrations/20240923223514_AddAccountIdToTransaction.Designer.cs
index bb73027..7ddbd7d 100644
--- a/src/server/RobinTTY.PersonalFinanceDashboard.API/Migrations/20240923223514_AddAccountIdToTransaction.Designer.cs
+++ b/src/server/RobinTTY.PersonalFinanceDashboard.Infrastructure/Migrations/20240923223514_AddAccountIdToTransaction.Designer.cs
@@ -4,11 +4,11 @@
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using RobinTTY.PersonalFinanceDashboard.API;
+using RobinTTY.PersonalFinanceDashboard.Infrastructure;
#nullable disable
-namespace RobinTTY.PersonalFinanceDashboard.Api.Migrations
+namespace RobinTTY.PersonalFinanceDashboard.Infrastructure.Migrations
{
[DbContext(typeof(ApplicationDbContext))]
[Migration("20240923223514_AddAccountIdToTransaction")]
diff --git a/src/server/RobinTTY.PersonalFinanceDashboard.API/Migrations/20240923223514_AddAccountIdToTransaction.cs b/src/server/RobinTTY.PersonalFinanceDashboard.Infrastructure/Migrations/20240923223514_AddAccountIdToTransaction.cs
similarity index 98%
rename from src/server/RobinTTY.PersonalFinanceDashboard.API/Migrations/20240923223514_AddAccountIdToTransaction.cs
rename to src/server/RobinTTY.PersonalFinanceDashboard.Infrastructure/Migrations/20240923223514_AddAccountIdToTransaction.cs
index 3032baa..d4f2837 100644
--- a/src/server/RobinTTY.PersonalFinanceDashboard.API/Migrations/20240923223514_AddAccountIdToTransaction.cs
+++ b/src/server/RobinTTY.PersonalFinanceDashboard.Infrastructure/Migrations/20240923223514_AddAccountIdToTransaction.cs
@@ -2,7 +2,7 @@
#nullable disable
-namespace RobinTTY.PersonalFinanceDashboard.Api.Migrations
+namespace RobinTTY.PersonalFinanceDashboard.Infrastructure.Migrations
{
///
public partial class AddAccountIdToTransaction : Migration
diff --git a/src/server/RobinTTY.PersonalFinanceDashboard.API/Migrations/ApplicationDbContextModelSnapshot.cs b/src/server/RobinTTY.PersonalFinanceDashboard.Infrastructure/Migrations/ApplicationDbContextModelSnapshot.cs
similarity index 96%
rename from src/server/RobinTTY.PersonalFinanceDashboard.API/Migrations/ApplicationDbContextModelSnapshot.cs
rename to src/server/RobinTTY.PersonalFinanceDashboard.Infrastructure/Migrations/ApplicationDbContextModelSnapshot.cs
index 400fcb5..a0c8762 100644
--- a/src/server/RobinTTY.PersonalFinanceDashboard.API/Migrations/ApplicationDbContextModelSnapshot.cs
+++ b/src/server/RobinTTY.PersonalFinanceDashboard.Infrastructure/Migrations/ApplicationDbContextModelSnapshot.cs
@@ -3,11 +3,11 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using RobinTTY.PersonalFinanceDashboard.API;
+using RobinTTY.PersonalFinanceDashboard.Infrastructure;
#nullable disable
-namespace RobinTTY.PersonalFinanceDashboard.API.Migrations
+namespace RobinTTY.PersonalFinanceDashboard.Infrastructure.Migrations
{
[DbContext(typeof(ApplicationDbContext))]
partial class ApplicationDbContextModelSnapshot : ModelSnapshot
diff --git a/src/server/RobinTTY.PersonalFinanceDashboard.Infrastructure/RobinTTY.PersonalFinanceDashboard.Infrastructure.csproj b/src/server/RobinTTY.PersonalFinanceDashboard.Infrastructure/RobinTTY.PersonalFinanceDashboard.Infrastructure.csproj
index 81f377f..9544d98 100644
--- a/src/server/RobinTTY.PersonalFinanceDashboard.Infrastructure/RobinTTY.PersonalFinanceDashboard.Infrastructure.csproj
+++ b/src/server/RobinTTY.PersonalFinanceDashboard.Infrastructure/RobinTTY.PersonalFinanceDashboard.Infrastructure.csproj
@@ -11,6 +11,11 @@
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+