diff --git a/Shared/Core/AppSettingReader.cs b/Service/Core/AppSettingReader.cs
similarity index 99%
rename from Shared/Core/AppSettingReader.cs
rename to Service/Core/AppSettingReader.cs
index 1c7b392a8..75dc3022f 100644
--- a/Shared/Core/AppSettingReader.cs
+++ b/Service/Core/AppSettingReader.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BS.Shared.Core
+namespace BeWo.Service.Core
 {
 	internal struct Module
 	{
diff --git a/Shared/Core/MailUtils.cs b/Service/Core/MailUtils.cs
similarity index 90%
rename from Shared/Core/MailUtils.cs
rename to Service/Core/MailUtils.cs
index de6aa6fd8..45353eddc 100644
--- a/Shared/Core/MailUtils.cs
+++ b/Service/Core/MailUtils.cs
@@ -9,17 +9,24 @@ using System.Net.Mail;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using BS.Shared.Core;
 
-namespace BS.Shared.Core
+namespace BeWo.Service.Core
 {
 	public static class MailUtils
 	{
 		private static readonly Module _GKV_Module = new Module("Gkv", "GKV/EDI/EDAT");
-		private static readonly Module _GKV_Module2 = new Module("GkvTest", "GKV/EDI/EDAT");
 		private static readonly Module _AI_Module = new Module("Ai", "AI");
 
 		private static readonly Dictionary<string, string> _serverMap = new Dictionary<string, string>()
 		{
+			["WIN-FDL8EJ28T7E"] = "app1.bewoplaner.de",
+			["WIN-E38DS2VNNPE"] = "app2.bewoplaner.de",
+			["WIN-40R404TI9J0"] = "app3.bewoplaner.de",
+			["OWNEROR-8BGG3AK"] = "app4.bewoplaner.de",
+			["OWNEROR-K9VRMQT"] = "app5.bewoplaner.de",
+			["WIN-1288MG5M1RE"] = "app6.bewoplaner.de",
+			["WIN-5H6NO5J7OAT"] = "app7.bewoplaner.de",
 			["WIN-A27H847STS6"] = "app8.bewoplaner.de",
 		};
 
@@ -33,11 +40,6 @@ namespace BS.Shared.Core
 			return SendModuleErrorMail(_GKV_Module, title, body, tenant);
 		}
 
-		public static bool SendGkvModuleTestErrorMail(string title, string body, string tenant)
-		{
-			return SendModuleErrorMail(_GKV_Module2, title, body, tenant);
-		}
-
 		private static bool SendModuleErrorMail(Module module, string title, string body, string tenant)
 		{
 			var conn = AppSettingReader.GetSmtpConnectionInfo(module);
diff --git a/Service/Service.csproj b/Service/Service.csproj
index ddef7c116..00a82a3da 100644
--- a/Service/Service.csproj
+++ b/Service/Service.csproj
@@ -233,10 +233,12 @@
     <Compile Include="BusinessLogic\AiPromptbausteinPromptLogic.cs" />
     <Compile Include="BusinessLogic\AiPromptbausteinRoutineLogic.cs" />
     <Compile Include="BusinessLogic\GenericBusinessLogic.cs" />
+    <Compile Include="Core\AppSettingReader.cs" />
     <Compile Include="Core\ConfigReader.cs" />
     <Compile Include="Core\DiamantExporter.cs" />
     <Compile Include="Core\ExcelDownload.cs" />
     <Compile Include="Core\FileAttachmentUtils.cs" />
+    <Compile Include="Core\MailUtils.cs" />
     <Compile Include="Core\MergedConfig.cs" />
     <Compile Include="Core\BeWoServerPathHelper.cs" />
     <Compile Include="Core\ServiceLogger.cs" />
diff --git a/Shared/Shared.csproj b/Shared/Shared.csproj
index eb714bc1e..854f5ea31 100644
--- a/Shared/Shared.csproj
+++ b/Shared/Shared.csproj
@@ -145,7 +145,6 @@
     <Compile Include="Core\AiUtils.cs" />
     <Compile Include="Core\ApiResponseUtils.cs" />
     <Compile Include="Core\AppError.cs" />
-    <Compile Include="Core\AppSettingReader.cs" />
     <Compile Include="Core\BeWoFault.cs" />
     <Compile Include="Core\ComplexWohnheimbuchungsRelationHelper.cs" />
     <Compile Include="Core\AbstractIDSpecificDefaultClass.cs" />
@@ -153,7 +152,6 @@
     <Compile Include="Core\Facade\HttpClientFacade.cs" />
     <Compile Include="Core\Facade\JsonHttpClientFacade.cs" />
     <Compile Include="Core\JsonUtils.cs" />
-    <Compile Include="Core\MailUtils.cs" />
     <Compile Include="Core\Rule\GkvRules.cs" />
     <Compile Include="Core\SecurityUtils.cs" />
     <Compile Include="Core\TokenUtils.cs" />