diff --git a/MoneyMap.Core/GlobalUsings.cs b/MoneyMap.Core/GlobalUsings.cs
new file mode 100644
index 0000000..fece00b
--- /dev/null
+++ b/MoneyMap.Core/GlobalUsings.cs
@@ -0,0 +1,5 @@
+global using Microsoft.Extensions.Configuration;
+global using Microsoft.Extensions.DependencyInjection;
+global using Microsoft.Extensions.Logging;
+global using Microsoft.AspNetCore.Hosting;
+global using Microsoft.AspNetCore.Http;
diff --git a/MoneyMap.Core/MoneyMap.Core.csproj b/MoneyMap.Core/MoneyMap.Core.csproj
index 448a54a..7dc4dc2 100644
--- a/MoneyMap.Core/MoneyMap.Core.csproj
+++ b/MoneyMap.Core/MoneyMap.Core.csproj
@@ -13,4 +13,9 @@
+
+
+ PreserveNewest
+
+
diff --git a/MoneyMap/Prompts/ReceiptParserPrompt.txt b/MoneyMap.Core/Prompts/ReceiptParserPrompt.txt
similarity index 100%
rename from MoneyMap/Prompts/ReceiptParserPrompt.txt
rename to MoneyMap.Core/Prompts/ReceiptParserPrompt.txt
diff --git a/MoneyMap/Services/AIReceiptParser.cs b/MoneyMap.Core/Services/AIReceiptParser.cs
similarity index 100%
rename from MoneyMap/Services/AIReceiptParser.cs
rename to MoneyMap.Core/Services/AIReceiptParser.cs
diff --git a/MoneyMap/Services/AITools/AIToolDefinitions.cs b/MoneyMap.Core/Services/AITools/AIToolDefinitions.cs
similarity index 100%
rename from MoneyMap/Services/AITools/AIToolDefinitions.cs
rename to MoneyMap.Core/Services/AITools/AIToolDefinitions.cs
diff --git a/MoneyMap/Services/AITools/AIToolExecutor.cs b/MoneyMap.Core/Services/AITools/AIToolExecutor.cs
similarity index 100%
rename from MoneyMap/Services/AITools/AIToolExecutor.cs
rename to MoneyMap.Core/Services/AITools/AIToolExecutor.cs
diff --git a/MoneyMap/Services/AIVisionClient.cs b/MoneyMap.Core/Services/AIVisionClient.cs
similarity index 100%
rename from MoneyMap/Services/AIVisionClient.cs
rename to MoneyMap.Core/Services/AIVisionClient.cs
diff --git a/MoneyMap/Services/AccountService.cs b/MoneyMap.Core/Services/AccountService.cs
similarity index 100%
rename from MoneyMap/Services/AccountService.cs
rename to MoneyMap.Core/Services/AccountService.cs
diff --git a/MoneyMap/Services/BudgetService.cs b/MoneyMap.Core/Services/BudgetService.cs
similarity index 100%
rename from MoneyMap/Services/BudgetService.cs
rename to MoneyMap.Core/Services/BudgetService.cs
diff --git a/MoneyMap/Services/CardResolver.cs b/MoneyMap.Core/Services/CardResolver.cs
similarity index 100%
rename from MoneyMap/Services/CardResolver.cs
rename to MoneyMap.Core/Services/CardResolver.cs
diff --git a/MoneyMap/Services/CardService.cs b/MoneyMap.Core/Services/CardService.cs
similarity index 100%
rename from MoneyMap/Services/CardService.cs
rename to MoneyMap.Core/Services/CardService.cs
diff --git a/MoneyMap/Services/DashboardService.cs b/MoneyMap.Core/Services/DashboardService.cs
similarity index 100%
rename from MoneyMap/Services/DashboardService.cs
rename to MoneyMap.Core/Services/DashboardService.cs
diff --git a/MoneyMap/Services/FinancialAuditService.cs b/MoneyMap.Core/Services/FinancialAuditService.cs
similarity index 100%
rename from MoneyMap/Services/FinancialAuditService.cs
rename to MoneyMap.Core/Services/FinancialAuditService.cs
diff --git a/MoneyMap/Services/MerchantService.cs b/MoneyMap.Core/Services/MerchantService.cs
similarity index 100%
rename from MoneyMap/Services/MerchantService.cs
rename to MoneyMap.Core/Services/MerchantService.cs
diff --git a/MoneyMap/Services/PdfToImageConverter.cs b/MoneyMap.Core/Services/PdfToImageConverter.cs
similarity index 100%
rename from MoneyMap/Services/PdfToImageConverter.cs
rename to MoneyMap.Core/Services/PdfToImageConverter.cs
diff --git a/MoneyMap/Services/ReceiptAutoMapper.cs b/MoneyMap.Core/Services/ReceiptAutoMapper.cs
similarity index 100%
rename from MoneyMap/Services/ReceiptAutoMapper.cs
rename to MoneyMap.Core/Services/ReceiptAutoMapper.cs
diff --git a/MoneyMap/Services/ReceiptManager.cs b/MoneyMap.Core/Services/ReceiptManager.cs
similarity index 100%
rename from MoneyMap/Services/ReceiptManager.cs
rename to MoneyMap.Core/Services/ReceiptManager.cs
diff --git a/MoneyMap/Services/ReceiptMatchingService.cs b/MoneyMap.Core/Services/ReceiptMatchingService.cs
similarity index 100%
rename from MoneyMap/Services/ReceiptMatchingService.cs
rename to MoneyMap.Core/Services/ReceiptMatchingService.cs
diff --git a/MoneyMap/Services/ReceiptParseQueue.cs b/MoneyMap.Core/Services/ReceiptParseQueue.cs
similarity index 100%
rename from MoneyMap/Services/ReceiptParseQueue.cs
rename to MoneyMap.Core/Services/ReceiptParseQueue.cs
diff --git a/MoneyMap/Services/ReferenceDataService.cs b/MoneyMap.Core/Services/ReferenceDataService.cs
similarity index 100%
rename from MoneyMap/Services/ReferenceDataService.cs
rename to MoneyMap.Core/Services/ReferenceDataService.cs
diff --git a/MoneyMap/Services/TransactionAICategorizer.cs b/MoneyMap.Core/Services/TransactionAICategorizer.cs
similarity index 100%
rename from MoneyMap/Services/TransactionAICategorizer.cs
rename to MoneyMap.Core/Services/TransactionAICategorizer.cs
diff --git a/MoneyMap/Services/TransactionCategorizer.cs b/MoneyMap.Core/Services/TransactionCategorizer.cs
similarity index 100%
rename from MoneyMap/Services/TransactionCategorizer.cs
rename to MoneyMap.Core/Services/TransactionCategorizer.cs
diff --git a/MoneyMap/Services/TransactionFilters.cs b/MoneyMap.Core/Services/TransactionFilters.cs
similarity index 100%
rename from MoneyMap/Services/TransactionFilters.cs
rename to MoneyMap.Core/Services/TransactionFilters.cs
diff --git a/MoneyMap/Services/TransactionImporter.cs b/MoneyMap.Core/Services/TransactionImporter.cs
similarity index 100%
rename from MoneyMap/Services/TransactionImporter.cs
rename to MoneyMap.Core/Services/TransactionImporter.cs
diff --git a/MoneyMap/Services/TransactionService.cs b/MoneyMap.Core/Services/TransactionService.cs
similarity index 100%
rename from MoneyMap/Services/TransactionService.cs
rename to MoneyMap.Core/Services/TransactionService.cs
diff --git a/MoneyMap/Services/TransactionStatisticsService.cs b/MoneyMap.Core/Services/TransactionStatisticsService.cs
similarity index 100%
rename from MoneyMap/Services/TransactionStatisticsService.cs
rename to MoneyMap.Core/Services/TransactionStatisticsService.cs
diff --git a/MoneyMap/MoneyMap.csproj b/MoneyMap/MoneyMap.csproj
index 398c271..5bf1c27 100644
--- a/MoneyMap/MoneyMap.csproj
+++ b/MoneyMap/MoneyMap.csproj
@@ -36,10 +36,5 @@
-
-
- PreserveNewest
-
-