diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index e78c8d441..0efe14c8d 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -98,6 +98,7 @@
     <Compile Include="Converter\AddressToStringConverter.cs" />
     <Compile Include="Converter\Features\AiConversationMessageSystemConverter.cs" />
     <Compile Include="Converter\NewlineConverter.cs" />
+    <Compile Include="ServiceProxy\GeneratedAccountingEnhancedService.cs" />
     <Compile Include="ServiceProxy\GeneratedAiEnhancedService.cs" />
     <Compile Include="Services\BeWoControlFactory.cs" />
     <Compile Include="Services\BeWoWindowFactory.cs" />
diff --git a/BeWo/Core/BeWoUtils.cs b/BeWo/Core/BeWoUtils.cs
index 4d8445804..6d7449602 100644
--- a/BeWo/Core/BeWoUtils.cs
+++ b/BeWo/Core/BeWoUtils.cs
@@ -2045,19 +2045,6 @@ namespace BeWo.Core
 			BeWoApp.MainControl.EndWaiting();
 	    }
 
-        public static void ShowPdfWindow(byte[] bytes)
-            => ShowPdfWindow(new MemoryStream(bytes));
-        public static void ShowPdfWindow(MemoryStream ms)
-		{
-            var control = new PdfViewer();
-
-            control.PdfData = ms;
-
-            var window = BeWoWindowBuilder.GetBeWoWindow("eRechnung", control);
-
-            window.Show();
-        }
-
         public static PasswortSecurityStrength CheckPasswordSecurity(string paswd)
         {
             PasswortSicherheit pwS = new PasswortSicherheit();
diff --git a/BeWo/Scripts/ServiceReferences_AccountingEnhancedService.bat b/BeWo/Scripts/ServiceReferences_AccountingEnhancedService.bat
new file mode 100644
index 000000000..682fe6afe
--- /dev/null
+++ b/BeWo/Scripts/ServiceReferences_AccountingEnhancedService.bat
@@ -0,0 +1,33 @@
+..\svcutil.exe /noConfig /noLogo /edb /n:*,BeWo.ServiceProxy /out:..\ServiceProxy\GeneratedAccountingEnhancedService.cs /ct:System.Collections.Generic.List`1 /r:..\..\Shared\bin\Debug\BS.Shared.dll http://localhost:3777/Host/AccountingEnhancedService.svc?wsdl 
+
+@echo off
+setlocal EnableDelayedExpansion
+
+set "input=..\ServiceProxy\GeneratedAccountingEnhancedService.cs"
+set "output=temp.txt"
+set /a start=12
+set /a end=162
+set /a line=0
+
+REM Zeilen zählen
+set /a total=0
+for /f "usebackq delims=" %%A in ("%input%") do (
+  set /a total+=1
+)
+
+REM Nur löschen, wenn genug Zeilen vorhanden
+if %total% leq %end% (
+  echo Datei hat nur %total% Zeilen – nichts wird gelöscht.
+  copy /y "%input%" "%input2%"
+  goto :eof
+)
+
+> "%output%" (
+  for /f "usebackq delims=" %%A in ("%input%") do (
+    set /a line+=1
+    if !line! lss %start% echo(%%A
+    if !line! gtr %end% echo(%%A
+  )
+)
+
+move /y "%output%" "%input%"
\ No newline at end of file
diff --git a/BeWo/Scripts/ServiceReferences_AccountingEnhancedService_Log.bat b/BeWo/Scripts/ServiceReferences_AccountingEnhancedService_Log.bat
new file mode 100644
index 000000000..8320ccf11
--- /dev/null
+++ b/BeWo/Scripts/ServiceReferences_AccountingEnhancedService_Log.bat
@@ -0,0 +1,23 @@
+@echo off
+REM Diese Batch-Datei führt eine andere Batch-Datei aus und schreibt das Ergebnis in eine Log-Datei
+
+REM Pfad zur anderen Batch-Datei
+set "SCRIPT_PATH=ServiceReferences_AccountingEnhancedService.bat"
+
+REM Pfad zur Log-Datei
+set "LOG_FILE=ServiceReferences_AccountingEnhancedService_Log.log.txt"
+
+REM Leere die Log-Datei vor dem Start
+echo. > %LOG_FILE%
+
+REM Führe die andere Batch-Datei aus und leite die Ausgabe in die Log-Datei um
+call %SCRIPT_PATH% >> %LOG_FILE% 2>&1
+
+REM Überprüfe, ob die Ausführung erfolgreich war
+if %errorlevel% equ 0 (
+    echo Die Ausführung von %SCRIPT_PATH% war erfolgreich. >> %LOG_FILE%
+) else (
+    echo Die Ausführung von %SCRIPT_PATH% ist fehlgeschlagen. >> %LOG_FILE%
+)
+
+echo Log wurde in %LOG_FILE% geschrieben.
\ No newline at end of file
diff --git a/BeWo/ServiceProxy/GeneratedAccountingEnhancedService.cs b/BeWo/ServiceProxy/GeneratedAccountingEnhancedService.cs
new file mode 100644
index 000000000..07417eeed
--- /dev/null
+++ b/BeWo/ServiceProxy/GeneratedAccountingEnhancedService.cs
@@ -0,0 +1,61 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.42000
+//
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
+// </auto-generated>
+//------------------------------------------------------------------------------
+namespace BeWo.ServiceProxy
+{
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
+    [System.ServiceModel.ServiceContractAttribute(ConfigurationName="BeWo.ServiceProxy.IAccountingEnhancedService")]
+    public interface IAccountingEnhancedService
+    {
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAccountingEnhancedService/CreateXRechnung", ReplyAction="http://tempuri.org/IAccountingEnhancedService/CreateXRechnungResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAccountingEnhancedService/CreateXRechnungBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        byte[] CreateXRechnung(long invoice_base_oid, int report_type, string report_url);
+    }
+    
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
+    public interface IAccountingEnhancedServiceChannel : BeWo.ServiceProxy.IAccountingEnhancedService, System.ServiceModel.IClientChannel
+    {
+    }
+    
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
+    public partial class AccountingEnhancedServiceClient : System.ServiceModel.ClientBase<BeWo.ServiceProxy.IAccountingEnhancedService>, BeWo.ServiceProxy.IAccountingEnhancedService
+    {
+        
+        public AccountingEnhancedServiceClient()
+        {
+        }
+        
+        public AccountingEnhancedServiceClient(string endpointConfigurationName) : 
+                base(endpointConfigurationName)
+        {
+        }
+        
+        public AccountingEnhancedServiceClient(string endpointConfigurationName, string remoteAddress) : 
+                base(endpointConfigurationName, remoteAddress)
+        {
+        }
+        
+        public AccountingEnhancedServiceClient(string endpointConfigurationName, System.ServiceModel.EndpointAddress remoteAddress) : 
+                base(endpointConfigurationName, remoteAddress)
+        {
+        }
+        
+        public AccountingEnhancedServiceClient(System.ServiceModel.Channels.Binding binding, System.ServiceModel.EndpointAddress remoteAddress) : 
+                base(binding, remoteAddress)
+        {
+        }
+        
+        public byte[] CreateXRechnung(long invoice_base_oid, int report_type, string report_url)
+        {
+            return base.Channel.CreateXRechnung(invoice_base_oid, report_type, report_url);
+        }
+    }
+}
diff --git a/BeWo/ServiceProxy/GeneratedOperationsEnhancedService.cs b/BeWo/ServiceProxy/GeneratedOperationsEnhancedService.cs
index 289c4c0ed..cee7970c8 100644
--- a/BeWo/ServiceProxy/GeneratedOperationsEnhancedService.cs
+++ b/BeWo/ServiceProxy/GeneratedOperationsEnhancedService.cs
@@ -20,9 +20,7 @@ namespace BeWo.ServiceProxy
         
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsEnhancedService/CreateXRechnung", ReplyAction="http://tempuri.org/IOperationsEnhancedService/CreateXRechnungResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsEnhancedService/CreateXRechnungBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BeWo.ServiceProxy.BeWoFault))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BeWo.ServiceProxy.BeWoFaultType))]
-        object CreateXRechnung(long invoice_base_oid, int report_type, string report_url);
+        byte[] CreateXRechnung(long invoice_base_oid, int report_type, string report_url);
     }
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
@@ -64,7 +62,7 @@ namespace BeWo.ServiceProxy
             base.Channel.HelloWorld();
         }
         
-        public object CreateXRechnung(long invoice_base_oid, int report_type, string report_url)
+        public byte[] CreateXRechnung(long invoice_base_oid, int report_type, string report_url)
         {
             return base.Channel.CreateXRechnung(invoice_base_oid, report_type, report_url);
         }
diff --git a/BeWo/ServiceProxy/ServiceFacade.cs b/BeWo/ServiceProxy/ServiceFacade.cs
index 2c908ab63..f897f4ffc 100644
--- a/BeWo/ServiceProxy/ServiceFacade.cs
+++ b/BeWo/ServiceProxy/ServiceFacade.cs
@@ -65,7 +65,8 @@ namespace BeWo.ServiceProxy
 				{ typeof(IAccountingService), new EndpointAddress(_ServerName + "AccountingService.svc") },
 				{ typeof(IGkvAccountingService), new EndpointAddress(_ServerName + "GkvAccountingService.svc") },
 				{ typeof(IReportService), new EndpointAddress(_ServerName + "ReportService.svc") },
-				{ typeof(IAiEnhancedService), new EndpointAddress(_ServerName + "AiEnhancedService.svc") }
+				{ typeof(IAiEnhancedService), new EndpointAddress(_ServerName + "AiEnhancedService.svc") },
+				{ typeof(IAccountingEnhancedService), new EndpointAddress(_ServerName + "AccountingEnhancedService.svc") }
 			};
 
 		}
@@ -75,6 +76,17 @@ namespace BeWo.ServiceProxy
 			_ProxyCache = new Dictionary<Type, object>();
 		}
 
+		#region AccountingEnhancedService
+		public static void DoAccountingEnhancedServiceSnyc(Action<IAccountingEnhancedService> pAction)
+		 => DoSync<AccountingEnhancedServiceClient, IAccountingEnhancedService>(pAction);
+		public static T DoAccountingEnhancedServiceSnyc<T>(Func<IAccountingEnhancedService, T> pFunc)
+		 => DoSync<AccountingEnhancedServiceClient, IAccountingEnhancedService, T>(pFunc);
+		public static void DoAccountingEnhancedServiceAsnyc(Action<IAccountingEnhancedService> pAction, Action pCallback = null, Action<Exception> pErrorCallback = null, bool showWaitDialog = true, UserControl caller = null)
+		 => DoAsync<AccountingEnhancedServiceClient, IAccountingEnhancedService>(pAction, pCallback, pErrorCallback, showWaitDialog, caller?.Dispatcher);
+		public static void DoAccountingEnhancedServiceAsnyc<T>(Func<IAccountingEnhancedService, T> pFunc, Action<T> pCallback = null, Action<Exception> pErrorCallback = null, bool showWaitDialog = true, UserControl caller = null)
+		 => DoAsync<AccountingEnhancedServiceClient, IAccountingEnhancedService, T>(pFunc, pCallback, pErrorCallback, showWaitDialog, caller?.Dispatcher);
+		#endregion
+
 		#region AiEnhancedService
 		public static void DoAiEnhancedServiceSnyc(Action<IAiEnhancedService> pAction)
 		 => DoSync<AiEnhancedServiceClient, IAiEnhancedService>(pAction);
diff --git a/BeWo/Services/BeWoWindowFactory.cs b/BeWo/Services/BeWoWindowFactory.cs
index 53191d9c9..e2b29cead 100644
--- a/BeWo/Services/BeWoWindowFactory.cs
+++ b/BeWo/Services/BeWoWindowFactory.cs
@@ -9,17 +9,25 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
 
 namespace BeWo.Services
 {
 	internal class BeWoWindowFactory : IWindowFactory
 	{
-		public AnimatedBeWoWindow GetAnimatedBeWoWindow(string title, Control control, double height, double width)
+		public AnimatedBeWoWindow GetAnimatedBeWoWindow(string title, Control control, double? height, double? width)
 		{
 			var beWoWindow = new AnimatedBeWoWindow();
 
-			beWoWindow.Height = height;
-			beWoWindow.Width = width;
+			if (height is double h)
+				beWoWindow.Height = h;
+			else
+				beWoWindow.Height = double.NaN;
+
+			if (width is double w)
+				beWoWindow.Width = w;
+			else
+				beWoWindow.Width = double.NaN;
 
 			beWoWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner;
 			beWoWindow.Owner = BeWoApp.CurrentBeWo.MainWindow;
diff --git a/BeWo/Services/BeWoWindowService.cs b/BeWo/Services/BeWoWindowService.cs
index 261855418..8ce3a1e08 100644
--- a/BeWo/Services/BeWoWindowService.cs
+++ b/BeWo/Services/BeWoWindowService.cs
@@ -52,6 +52,13 @@ namespace BeWo.Services
 				height,	width);
 		}
 
+		public void ShowERechnungWindow(MemoryStream pdf)
+		{
+			ShowWindowDialog(
+				"E-Rechnung",
+				cf => cf.GetPdfViewer(pdf));
+		}
+
 		public void ShowERechnungModalViewWindow(MemoryStream pdf)
 		{
 			ShowModalViewWindow(
@@ -67,6 +74,19 @@ namespace BeWo.Services
 				height, width);
 		}
 
+		public void ShowPdfViewerWindow(string title, MemoryStream pdf, double height = 900, double width = 600)
+		{
+			ShowWindowDialog(title,
+				cf => cf.GetPdfViewer(pdf),
+				height, width);
+		}
+
+		public void ShowPdfViewerModalViewWindow(string title, MemoryStream pdf)
+		{
+			ShowModalViewWindow(title,
+				cf => cf.GetPdfViewer(pdf));
+		}
+
 		public void ShowGkvAbrechnungDetailWindow(GkvAbrechnungVM vm, CancelEventHandler cancelEvent, double height, double width)
 		{
 			// Kleiner Hack
@@ -80,45 +100,31 @@ namespace BeWo.Services
 
 		private void ShowWindow(Func<IWindowFactory, string> getTitle, Func<IControlFactory, Control> getControl, double height, double width)
 			=> ShowWindow(getTitle(_windowFactory), getControl, height, width);
-		private void ShowWindowDialog(Func<IWindowFactory, string> getTitle, Func<IControlFactory, Control> getControl, double height, double width)
+		private void ShowWindowDialog(Func<IWindowFactory, string> getTitle, Func<IControlFactory, Control> getControl, double? height = null, double? width = null)
 			=> ShowWindowDialog(getTitle(_windowFactory), getControl, height, width);
-		private void ShowModalViewWindow(Func<IWindowFactory, string> getTitle, Func<IControlFactory, Control> getControl)
-			=> ShowModalViewWindow(getTitle(_windowFactory), getControl);
-		private void ShowModalViewWindow(Func<IWindowFactory, string> getTitle, Func<IControlFactory, Control> getControl, double height, double width)
+		private void ShowModalViewWindow(Func<IWindowFactory, string> getTitle, Func<IControlFactory, Control> getControl, double? height = null, double? width = null)
 			=> ShowModalViewWindow(getTitle(_windowFactory), getControl, height, width);
 
-		private void ShowWindow(string title, Func<IControlFactory, Control> getControl, double height, double width)
+		private void ShowWindow(string title, Func<IControlFactory, Control> getControl, double? height = null, double? width = null)
 		{
 			var control = getControl(_controlFactory);
 			var window = _windowFactory.GetAnimatedBeWoWindow(title, control, height, width);
 			window.Show();
 		}
 
-		private void ShowWindowDialog(string title, Func<IControlFactory, Control> getControl, double height, double width)
+		private void ShowWindowDialog(string title, Func<IControlFactory, Control> getControl, double? height = null, double? width = null)
 		{
 			var control = getControl(_controlFactory);
 			var window = _windowFactory.GetAnimatedBeWoWindow(title, control, height, width);
 			window.ShowDialog();
 		}
 
-		private void ShowModalViewWindow(string title, Func<IControlFactory, Control> getControl)
-		{
-			var control = getControl(_controlFactory);
-			var window = _windowFactory.GetGenericModalViewWindow(title, control);
-			window.CommandBindings.Add(new CommandBinding(ApplicationCommands.Close, (s, e) => BeWoApp.MainControl.CloseCurrentPopUp()));
-			BeWoApp.MainControl.ShowControlAsModalPopup(window);
-		}
-
-		private void ShowModalViewWindow(string title, Func<IControlFactory, Control> getControl, double height, double width)
+		private void ShowModalViewWindow(string title, Func<IControlFactory, Control> getControl, double? height = null, double? width = null)
 		{
 			var control = getControl(_controlFactory);
 			var window = _windowFactory.GetGenericModalViewWindow(title, control, height, width);
 			window.CommandBindings.Add(new CommandBinding(ApplicationCommands.Close, (s, e) => BeWoApp.MainControl.CloseCurrentPopUp()));
 			BeWoApp.MainControl.ShowControlAsModalPopup(window);
 		}
-		public void ShowTest(string str)
-		{
-			throw new NotImplementedException();
-		}
 	}
 }
diff --git a/BeWo/Services/IWindowFactory.cs b/BeWo/Services/IWindowFactory.cs
index e5a11d74e..a17422464 100644
--- a/BeWo/Services/IWindowFactory.cs
+++ b/BeWo/Services/IWindowFactory.cs
@@ -13,7 +13,7 @@ namespace BeWo.Services
 {
 	internal interface IWindowFactory
 	{
-		AnimatedBeWoWindow GetAnimatedBeWoWindow(string title, Control control, double height, double width);
+		AnimatedBeWoWindow GetAnimatedBeWoWindow(string title, Control control, double? height = null, double? width = null);
 		Control GetGenericModalViewWindow(string title, Control control, double? height = null, double? width = null);
 
 		string GetAiTitle(UIContext context);
diff --git a/BeWo/Services/IWindowService.cs b/BeWo/Services/IWindowService.cs
index b2cd66951..2f3f500fd 100644
--- a/BeWo/Services/IWindowService.cs
+++ b/BeWo/Services/IWindowService.cs
@@ -14,13 +14,23 @@ namespace BeWo.Services
 {
 	internal interface IWindowService
 	{
+		#region special
 		void ShowAiConversationWindow(UIContext uIContext, Dictionary<TableID, long[]> bewoObjects, long? reference_oid = null, double height = 600, double width = 1200);
 		void ShowAiConversationModalViewWindow(UIContext uIContext, Dictionary<TableID, long[]> bewoObjects, long? reference_oid = null, double height = 600, double width = 1200);
 
-		void ShowERechnungModalViewWindow(MemoryStream pdf);
+		void ShowGkvAbrechnungDetailWindow(GkvAbrechnungVM vm, CancelEventHandler cancelEvent, double height = 900, double width = 600);
+		#endregion
 
+		#region base extended
+		void ShowERechnungWindow(MemoryStream pdf);
+		void ShowERechnungModalViewWindow(MemoryStream pdf);
+		#endregion
+
+		#region base
 		void ShowTextViewerWindow(string title, string text, double height = 900, double width = 600);
 
-		void ShowGkvAbrechnungDetailWindow(GkvAbrechnungVM vm, CancelEventHandler cancelEvent, double height = 900, double width = 600);
+		void ShowPdfViewerWindow(string title, MemoryStream pdf, double height = 900, double width = 600);
+		void ShowPdfViewerModalViewWindow(string title, MemoryStream pdf);
+		#endregion
 	}
 }
diff --git a/BeWo/View/Controls/TextViewer.xaml b/BeWo/View/Controls/TextViewer.xaml
index 7a994debb..4ff5787ea 100644
--- a/BeWo/View/Controls/TextViewer.xaml
+++ b/BeWo/View/Controls/TextViewer.xaml
@@ -27,7 +27,8 @@
                 BorderThickness="1"
                 Foreground="Black"
                 IsReadOnly="True"
-                VerticalScrollBarVisibility="Auto" />
+                VerticalScrollBarVisibility="Auto"
+                HorizontalScrollBarVisibility="Auto"/>
         </Grid>
 
         <Button
diff --git a/BeWo/View/Detail/Accounting/InvoiceOverview.xaml.cs b/BeWo/View/Detail/Accounting/InvoiceOverview.xaml.cs
index f847146a6..f75ca0b0c 100644
--- a/BeWo/View/Detail/Accounting/InvoiceOverview.xaml.cs
+++ b/BeWo/View/Detail/Accounting/InvoiceOverview.xaml.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Security.Policy;
+using System.Text;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Documents;
@@ -656,8 +657,26 @@ namespace BeWo.View.Detail.Accounting
 			var report_link = vm.ReportLink;
 
 			ServiceFacade.DoOperationsEnhancedServiceAsnyc(
-				x => x.CreateXRechnung(invoice_base_oid, invoice_type, report_link), 
-				cb => BeWoApp.MainControl.WindowService.ShowTextViewerWindow("Debug", cb as string));
+				x => x.CreateXRechnung(invoice_base_oid, invoice_type, report_link),
+				cb =>
+				{
+					
+
+					if (cb is byte[] bytes)
+					{
+						File.WriteAllBytes(@"C:\Users\ownSoft\Desktop\XRechnung\test.pdf", bytes);
+
+						var t = Encoding.ASCII.GetString(bytes);
+						
+						File.WriteAllText(@"C:\Users\ownSoft\Desktop\XRechnung\test2.pdf", t);
+
+						BeWoApp.MainControl.WindowService.ShowTextViewerWindow("Test", t);
+
+						//BeWoApp.MainControl.WindowService.ShowERechnungWindow(new MemoryStream(bytes));
+					}						
+					else
+						MessageBox.Show("cb is null");
+				});
 		}
 	}
 }
\ No newline at end of file
diff --git a/Data/Access/DAOFactory.cs b/Data/Access/DAOFactory.cs
index fb6c6e6cb..41749d635 100644
--- a/Data/Access/DAOFactory.cs
+++ b/Data/Access/DAOFactory.cs
@@ -1,4 +1,5 @@
-using System;
+using BS.Shared.Interface;
+using System;
 
 namespace BeWo.Data.Access
 {
@@ -23,5 +24,10 @@ namespace BeWo.Data.Access
 		public static ScriptDAO ScriptDAO => _ScriptDAO.Value;
 		public static SearchDAO SearchDAO => _SearchDAO.Value;
 		public static UserDAO UserDAO => _UserDAO.Value;
+
+		public static IFileStorageDAO GetLocalFileStorage(string rootpath)
+		{
+			return new LocalFileStorageDAO(rootpath);
+		}
     }
 }
\ No newline at end of file
diff --git a/Data/Access/LocalFileStorageDAO.cs b/Data/Access/LocalFileStorageDAO.cs
new file mode 100644
index 000000000..cb83fbf43
--- /dev/null
+++ b/Data/Access/LocalFileStorageDAO.cs
@@ -0,0 +1,66 @@
+using BS.Shared;
+using BS.Shared.Interface;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace BeWo.Data.Access
+{
+	public class LocalFileStorageDAO : IFileStorageDAO
+	{
+		private readonly string _rootPath;
+
+		public LocalFileStorageDAO(string rootPath)
+		{
+			_rootPath = rootPath;
+		}
+
+		private string GetFilePath(string customerId, BWPFeature feature, string fileName)
+		{
+			return Path.Combine(_rootPath, customerId, feature.ToString(), fileName);
+		}
+
+		public async Task SaveFileAsync(string customerId, BWPFeature feature, string fileName, Stream content, CancellationToken cancellationToken = default)
+		{
+			var path = GetFilePath(customerId, feature, fileName);
+			var directory = Path.GetDirectoryName(path);
+			Directory.CreateDirectory(directory);
+
+			using (var stream = File.Create(path))
+			{
+				await content.CopyToAsync(stream, bufferSize: 81920, cancellationToken).ConfigureAwait(true); 
+			};
+		}
+
+		public Task<bool> FileExistsAsync(string customerId, BWPFeature feature, string fileName, CancellationToken cancellationToken = default)
+		{
+			return Task.FromResult(File.Exists(GetFilePath(customerId, feature, fileName)));
+		}
+
+		public Task<Stream> GetFileAsync(string customerId, BWPFeature feature, string fileName, CancellationToken cancellationToken = default)
+		{
+			var path = GetFilePath(customerId, feature, fileName);
+			if (!File.Exists(path))
+				return Task.FromResult<Stream>(null);
+
+			Stream stream = File.OpenRead(path);
+			return Task.FromResult(stream);
+		}
+
+		public Task<bool> DeleteFileAsync(string customerId, BWPFeature feature, string fileName, CancellationToken cancellationToken = default)
+		{
+			var path = GetFilePath(customerId, feature, fileName);
+			if (File.Exists(path))
+			{
+				File.Delete(path);
+				return Task.FromResult(true);
+			}
+
+			return Task.FromResult(false);
+		}
+	}
+}
diff --git a/Data/Data.csproj b/Data/Data.csproj
index 3a63153f4..9cb616c4e 100644
--- a/Data/Data.csproj
+++ b/Data/Data.csproj
@@ -212,6 +212,7 @@
     <Compile Include="Access\DAOFactory.cs" />
     <Compile Include="Access\GenericDAO.cs" />
     <Compile Include="Access\FinanceDAO.cs" />
+    <Compile Include="Access\LocalFileStorageDAO.cs" />
     <Compile Include="Access\OrganisationDAO.cs" />
     <Compile Include="Access\ScriptDAO.cs" />
     <Compile Include="Access\SearchDAO.cs" />
diff --git a/Host/AccountingEnhancedService.svc b/Host/AccountingEnhancedService.svc
new file mode 100644
index 000000000..4c87b618f
--- /dev/null
+++ b/Host/AccountingEnhancedService.svc
@@ -0,0 +1 @@
+<%@ ServiceHost Language="C#" Debug="true" Service="BeWo.Service.ServiceImplementations.Enhanced.AccountingEnhancedServiceImp"  %>
diff --git a/Host/AiEnhancedService.svc b/Host/AiEnhancedService.svc
index d204df93d..1e3f17ae9 100644
--- a/Host/AiEnhancedService.svc
+++ b/Host/AiEnhancedService.svc
@@ -1 +1 @@
-<%@ ServiceHost Language="C#" Debug="true" Service="BeWo.Service.ServiceImplementations.AiEnhancedServiceImp"  %>
+<%@ ServiceHost Language="C#" Debug="true" Service="BeWo.Service.ServiceImplementations.Enhanced.AiEnhancedServiceImp"  %>
diff --git a/Host/Host.csproj b/Host/Host.csproj
index 4951d8731..735db1c67 100644
--- a/Host/Host.csproj
+++ b/Host/Host.csproj
@@ -426,6 +426,7 @@
     <Content Include="GkvAbrechnungClient.aspx" />
     <Content Include="GkvAbrechnungServer.aspx" />
     <Content Include="AiEnhancedService.svc" />
+    <Content Include="AccountingEnhancedService.svc" />
     <Content Include="OperationsEnhancedService.svc" />
     <Content Include="ReportService.svc" />
     <Content Include="EmployeeService.svc" />
diff --git a/Host/Login.aspx.cs b/Host/Login.aspx.cs
index 882f2618f..edde8749f 100644
--- a/Host/Login.aspx.cs
+++ b/Host/Login.aspx.cs
@@ -1,6 +1,5 @@
 using BeWo.Data;
 using BeWo.Data.Access;
-using BeWo.Service.ServiceImplementations;
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/Host/OperationsEnhancedService.svc b/Host/OperationsEnhancedService.svc
index e9b49cb64..d249e2906 100644
--- a/Host/OperationsEnhancedService.svc
+++ b/Host/OperationsEnhancedService.svc
@@ -1 +1 @@
-<%@ ServiceHost Language="C#" Debug="true" Service="BeWo.Service.ServiceImplementations.OperationsEnhancedServiceImp"  %>
+<%@ ServiceHost Language="C#" Debug="true" Service="BeWo.Service.ServiceImplementations.Enhanced.OperationsEnhancedServiceImp"  %>
diff --git a/Host/ServiceRecordPage.aspx.cs b/Host/ServiceRecordPage.aspx.cs
index b73669e70..7fed0d481 100644
--- a/Host/ServiceRecordPage.aspx.cs
+++ b/Host/ServiceRecordPage.aspx.cs
@@ -13,7 +13,6 @@ using BeWo.Data;
 using BeWo.Data.Access;
 using BeWo.Data.Entities;
 using BeWo.Service.DCEntityMapper;
-using BeWo.Service.ServiceImplementations;
 
 using BS.Shared;
 using BS.Shared.Extensions;
diff --git a/Host/Web.Secrets.config.template b/Host/Web.Secrets.config.template
index af208620c..72febfaeb 100644
--- a/Host/Web.Secrets.config.template
+++ b/Host/Web.Secrets.config.template
@@ -10,5 +10,5 @@
   <add key="GetGkvSumApiKey" value=""/>
   <add key="DownloadReportApiKey" value=""/> 
   <add key="OpenrouteServiceApiKey" value="" />
-    <add key="GoogleDistanceMatrixApiKey" value="" />
+  <add key="GoogleDistanceMatrixApiKey" value="" />
 </appSettings>
\ No newline at end of file
diff --git a/Host/Web.config b/Host/Web.config
index 523094348..447f444bf 100644
--- a/Host/Web.config
+++ b/Host/Web.config
@@ -184,11 +184,14 @@
       <service behaviorConfiguration="returnFaults" name="BeWo.Service.ServiceImplementations.ApiStreamServiceImp">
         <endpoint behaviorConfiguration="webHttpBehaviorConfig" binding="webHttpBinding" bindingConfiguration="webHttpStreamBindingConfig" name="ApiStreamServiceEndpoint" contract="BeWo.Service.ServiceContracts.IApiStreamService" />
       </service>
-      <service behaviorConfiguration="returnFaults" name="BeWo.Service.ServiceImplementations.OperationsEnhancedServiceImp">
-        <endpoint behaviorConfiguration="SecurityAndSessionAndWCFErrorBehavior" binding="basicHttpBinding" bindingConfiguration="TransportSecurity" name="OperationsEnhancedServiceEndpoint" contract="BeWo.Service.ServiceContracts.IOperationsEnhancedService" />
+      <service behaviorConfiguration="returnFaults" name="BeWo.Service.ServiceImplementations.Enhanced.OperationsEnhancedServiceImp">
+        <endpoint behaviorConfiguration="SecurityAndSessionAndWCFErrorBehavior" binding="basicHttpBinding" bindingConfiguration="TransportSecurity" name="OperationsEnhancedServiceEndpoint" contract="BeWo.Service.ServiceContracts.Enhanced.IOperationsEnhancedService" />
       </service>
-      <service behaviorConfiguration="returnFaults" name="BeWo.Service.ServiceImplementations.AiEnhancedServiceImp">
-        <endpoint behaviorConfiguration="SecurityAndSessionAndWCFErrorBehavior" binding="basicHttpBinding" bindingConfiguration="TransportSecurity" name="AiEnhancedServiceEndpoint" contract="BeWo.Service.ServiceContracts.IAiEnhancedService" />
+      <service behaviorConfiguration="returnFaults" name="BeWo.Service.ServiceImplementations.Enhanced.AccountingEnhancedServiceImp">
+        <endpoint behaviorConfiguration="SecurityAndSessionAndWCFErrorBehavior" binding="basicHttpBinding" bindingConfiguration="TransportSecurity" name="AccountingEnhancedServiceEndpoint" contract="BeWo.Service.ServiceContracts.Enhanced.IAccountingEnhancedService" />
+      </service>
+      <service behaviorConfiguration="returnFaults" name="BeWo.Service.ServiceImplementations.Enhanced.AiEnhancedServiceImp">
+        <endpoint behaviorConfiguration="SecurityAndSessionAndWCFErrorBehavior" binding="basicHttpBinding" bindingConfiguration="TransportSecurity" name="AiEnhancedServiceEndpoint" contract="BeWo.Service.ServiceContracts.Enhanced.IAiEnhancedService" />
       </service>
     </services>
     <bindings>
diff --git a/Report/ReportObjects/AuslastungBerechnung.cs b/Report/ReportObjects/AuslastungBerechnung.cs
index 2c9127c92..3375758ff 100644
--- a/Report/ReportObjects/AuslastungBerechnung.cs
+++ b/Report/ReportObjects/AuslastungBerechnung.cs
@@ -6,7 +6,6 @@ using BeWo.Data.Entities;
 using BeWo.Data.Access;
 using BeWo.Service.DCEntityMapper;
 using BeWo.Service.Plugins;
-using BeWo.Service.ServiceImplementations;
 using BS.Shared.Core;
 using BS.Shared;
 using BS.Shared.Extensions;
diff --git a/Report/ReportObjects/MitarbeiterstundenkontoBerechnungMonate.cs b/Report/ReportObjects/MitarbeiterstundenkontoBerechnungMonate.cs
index f4d461d61..a18bdf4c8 100644
--- a/Report/ReportObjects/MitarbeiterstundenkontoBerechnungMonate.cs
+++ b/Report/ReportObjects/MitarbeiterstundenkontoBerechnungMonate.cs
@@ -6,7 +6,6 @@ using BeWo.Report;
 using BeWo.Data.Entities;
 using BeWo.Data.Access;
 using BeWo.Service.Configuration;
-using BeWo.Service.ServiceImplementations;
 using BS.Shared;
 using BS.Shared.Core;
 using BS.Shared.Extensions;
diff --git a/Service/DCEntityMapper/GroupOfPeopleDC_GroupOfPeople.cs b/Service/DCEntityMapper/GroupOfPeopleDC_GroupOfPeople.cs
index ac505e0ba..a23ea9791 100644
--- a/Service/DCEntityMapper/GroupOfPeopleDC_GroupOfPeople.cs
+++ b/Service/DCEntityMapper/GroupOfPeopleDC_GroupOfPeople.cs
@@ -6,7 +6,6 @@ using BeWo.Data.Access;
 using BeWo.Data.Entities;
 using BeWo.Service.Plugins;
 using BS.Shared.DataContracts;
-using BeWo.Service.ServiceImplementations;
 
 namespace BeWo.Service.DCEntityMapper
 {
diff --git a/Service/DCEntityMapper/WohneinheitDC_Wohneinheit.cs b/Service/DCEntityMapper/WohneinheitDC_Wohneinheit.cs
index e7d136e33..31e65a5ba 100644
--- a/Service/DCEntityMapper/WohneinheitDC_Wohneinheit.cs
+++ b/Service/DCEntityMapper/WohneinheitDC_Wohneinheit.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using BeWo.Data.Access;
 using BeWo.Data.Entities;
-using BeWo.Service.ServiceImplementations;
 using BS.Shared;
 using BS.Shared.DataContracts;
 using BS.Shared.Extensions;
diff --git a/Service/Invoicing/EquityInvoiceCreation.cs b/Service/Invoicing/EquityInvoiceCreation.cs
index 060ee401c..f83c07bdc 100644
--- a/Service/Invoicing/EquityInvoiceCreation.cs
+++ b/Service/Invoicing/EquityInvoiceCreation.cs
@@ -7,7 +7,6 @@ using BeWo.Data.Access;
 using BeWo.Data.Entities;
 using BeWo.Service.DCEntityMapper;
 using BeWo.Service.Plugins;
-using BeWo.Service.ServiceImplementations;
 
 using BS.Shared;
 using BS.Shared.Core;
diff --git a/Service/Invoicing/GeneralInvoiceCreation.cs b/Service/Invoicing/GeneralInvoiceCreation.cs
index e3ed8daef..550d07fdc 100644
--- a/Service/Invoicing/GeneralInvoiceCreation.cs
+++ b/Service/Invoicing/GeneralInvoiceCreation.cs
@@ -7,7 +7,6 @@ using BeWo.Data.Access;
 using BeWo.Data.Entities;
 using BeWo.Service.DCEntityMapper;
 using BeWo.Service.Plugins;
-using BeWo.Service.ServiceImplementations;
 
 using BS.Shared;
 using BS.Shared.Core;
diff --git a/Service/Plugins/AccountingService.cs b/Service/Plugins/AccountingService.cs
index 63c802fb9..3cbc54b36 100644
--- a/Service/Plugins/AccountingService.cs
+++ b/Service/Plugins/AccountingService.cs
@@ -10,7 +10,6 @@ using BeWo.Service.Configuration;
 using BeWo.Service.Core;
 using BeWo.Service.DCEntityMapper;
 using BeWo.Service.Invoicing;
-using BeWo.Service.ServiceContracts;
 using BS.Shared;
 using BS.Shared.Core;
 using BS.Shared.DataContracts;
diff --git a/Service/Plugins/AiService.cs b/Service/Plugins/AiService.cs
index b9da83942..31005a260 100644
--- a/Service/Plugins/AiService.cs
+++ b/Service/Plugins/AiService.cs
@@ -10,7 +10,6 @@ using BeWo.Data.Entities;
 using BeWo.Service.Core;
 using BeWo.Service.DCEntityMapper;
 using BeWo.Service.Invoicing;
-using BeWo.Service.ServiceContracts;
 using BS.Shared;
 using BS.Shared.Core;
 using BS.Shared.DataContracts;
diff --git a/Service/Security/SecurityContextInitializer.cs b/Service/Security/SecurityContextInitializer.cs
index d81c3604b..29a816e50 100644
--- a/Service/Security/SecurityContextInitializer.cs
+++ b/Service/Security/SecurityContextInitializer.cs
@@ -12,7 +12,6 @@ using BeWo.Data;
 using BeWo.Data.Access;
 using BeWo.Data.Entities;
 using BeWo.Service.Core;
-using BeWo.Service.ServiceContracts;
 using BeWo.Service.ServiceUtils;
 using BS.Shared.Attributes;
 using BS.Shared.Extensions;
diff --git a/Service/Service.csproj b/Service/Service.csproj
index 4a660c8cb..d9ba64452 100644
--- a/Service/Service.csproj
+++ b/Service/Service.csproj
@@ -520,6 +520,7 @@
     <Compile Include="ServiceBehavior\WCFError\WCFErrorBehaviorExtension.cs" />
     <Compile Include="ServiceBehavior\WCFError\WCFErrorHandler.cs" />
     <Compile Include="ServiceContracts\BeWoFault.cs" />
+    <Compile Include="ServiceContracts\Enhanced\IAccountingEnhancedService.cs" />
     <Compile Include="ServiceContracts\IAccountingService.cs" />
     <Compile Include="ServiceContracts\IAdminService.cs" />
     <Compile Include="ServiceContracts\IAnalysisService.cs" />
@@ -527,8 +528,8 @@
     <Compile Include="ServiceContracts\IApiService.cs" />
     <Compile Include="ServiceContracts\IGkvAccountingService.cs" />
     <Compile Include="ServiceContracts\IMailService.cs" />
-    <Compile Include="ServiceContracts\IAiEnhancedService.cs" />
-    <Compile Include="ServiceContracts\IOperationsEnhancedService.cs" />
+    <Compile Include="ServiceContracts\Enhanced\IAiEnhancedService.cs" />
+    <Compile Include="ServiceContracts\Enhanced\IOperationsEnhancedService.cs" />
     <Compile Include="ServiceContracts\IOperationsService.cs" />
     <Compile Include="ServiceContracts\IDownloadService.cs" />
     <Compile Include="ServiceContracts\IEmployeeService.cs" />
@@ -543,10 +544,11 @@
     <Compile Include="ServiceImplementations\ApiServiceImp.cs" />
     <Compile Include="ServiceImplementations\AdminServiceImp.cs" />
     <Compile Include="ServiceImplementations\AnalysisServiceImp.cs" />
+    <Compile Include="ServiceImplementations\Enhanced\AccountingEnhancedServiceImp.cs" />
     <Compile Include="ServiceImplementations\GkvAccountingServiceImp.cs" />
     <Compile Include="ServiceImplementations\MailServiceImp.cs" />
-    <Compile Include="ServiceImplementations\AiEnhancedServiceImp.cs" />
-    <Compile Include="ServiceImplementations\OperationsEnhancedServiceImp.cs" />
+    <Compile Include="ServiceImplementations\Enhanced\AiEnhancedServiceImp.cs" />
+    <Compile Include="ServiceImplementations\Enhanced\OperationsEnhancedServiceImp.cs" />
     <Compile Include="ServiceImplementations\OperationsServiceImp.cs" />
     <Compile Include="ServiceImplementations\QueryServiceImp.cs" />
     <Compile Include="ServiceImplementations\SearchServiceImp.cs" />
diff --git a/Service/ServiceContracts/Enhanced/IAccountingEnhancedService.cs b/Service/ServiceContracts/Enhanced/IAccountingEnhancedService.cs
new file mode 100644
index 000000000..3d86305f8
--- /dev/null
+++ b/Service/ServiceContracts/Enhanced/IAccountingEnhancedService.cs
@@ -0,0 +1,22 @@
+using BeWo.Data.Entities;
+using BS.Shared;
+using BS.Shared.Attributes;
+using BS.Shared.DataContracts;
+using BS.Shared.DataContracts.Feature.AI;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.ServiceModel;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BeWo.Service.ServiceContracts.Enhanced
+{
+	[ServiceContract]
+	public interface IAccountingEnhancedService : IService
+	{
+		[FaultContract(typeof(BeWoFault))]
+		[OperationContract]
+		byte[] CreateXRechnung(long invoice_base_oid, int report_type, string report_url);
+	}
+}
\ No newline at end of file
diff --git a/Service/ServiceContracts/IAiEnhancedService.cs b/Service/ServiceContracts/Enhanced/IAiEnhancedService.cs
similarity index 97%
rename from Service/ServiceContracts/IAiEnhancedService.cs
rename to Service/ServiceContracts/Enhanced/IAiEnhancedService.cs
index 6cd66884d..8be6f2b79 100644
--- a/Service/ServiceContracts/IAiEnhancedService.cs
+++ b/Service/ServiceContracts/Enhanced/IAiEnhancedService.cs
@@ -10,7 +10,7 @@ using System.ServiceModel;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BeWo.Service.ServiceContracts
+namespace BeWo.Service.ServiceContracts.Enhanced
 {
 	[ServiceContract]
 	public interface IAiEnhancedService : IService
diff --git a/Service/ServiceContracts/IOperationsEnhancedService.cs b/Service/ServiceContracts/Enhanced/IOperationsEnhancedService.cs
similarity index 67%
rename from Service/ServiceContracts/IOperationsEnhancedService.cs
rename to Service/ServiceContracts/Enhanced/IOperationsEnhancedService.cs
index 5a40a7d5c..507e6b8a5 100644
--- a/Service/ServiceContracts/IOperationsEnhancedService.cs
+++ b/Service/ServiceContracts/Enhanced/IOperationsEnhancedService.cs
@@ -10,17 +10,13 @@ using System.ServiceModel;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BeWo.Service.ServiceContracts
+namespace BeWo.Service.ServiceContracts.Enhanced
 {
 	[ServiceContract]
 	public interface IOperationsEnhancedService : IService
 	{
 		[FaultContract(typeof(BeWoFault))]
 		[OperationContract]
-		void HelloWorld();
-
-		[FaultContract(typeof(BeWoFault))]
-		[OperationContract]
-		object CreateXRechnung(long invoice_base_oid, int report_type, string report_url);
+		string HelloWorld();
 	}
 }
\ No newline at end of file
diff --git a/Service/ServiceContracts/IApiService.cs b/Service/ServiceContracts/IApiService.cs
index 9e036188b..82a98818d 100644
--- a/Service/ServiceContracts/IApiService.cs
+++ b/Service/ServiceContracts/IApiService.cs
@@ -24,17 +24,5 @@ namespace BeWo.Service.ServiceContracts
 		[WebInvoke(UriTemplate = "/GetGkvSum", Method = "POST", RequestFormat = WebMessageFormat.Json, ResponseFormat = WebMessageFormat.Json)]
 		[RequireApiKey("GetGkvSumApiKey")]
 		ApiResponse<decimal> GetGkvAbrechnungSumme(AdminServiceSumReqDC request);
-
-		[OperationContract]
-		[WebInvoke(UriTemplate = "/DownloadReport", Method = "POST", RequestFormat = WebMessageFormat.Json, ResponseFormat = WebMessageFormat.Json)]
-		[RequireApiKey("DownloadReportApiKey")]
-		[RequireNoTenant]
-		ApiResponse<byte[]> DownloadReport();
-
-		[OperationContract]
-		[WebGet(UriTemplate = "/DownloadReport", RequestFormat = WebMessageFormat.Json, ResponseFormat = WebMessageFormat.Json)]
-		[RequireApiKey("DownloadReportApiKey")]
-		[RequireNoTenant]
-		ApiResponse<byte[]> DownloadReport2();
 	}
 }
diff --git a/Service/ServiceContracts/IApiStreamService.cs b/Service/ServiceContracts/IApiStreamService.cs
index e040cc3ea..023af4ac3 100644
--- a/Service/ServiceContracts/IApiStreamService.cs
+++ b/Service/ServiceContracts/IApiStreamService.cs
@@ -16,7 +16,7 @@ namespace BeWo.Service.ServiceContracts
 	public interface IApiStreamService
 	{
 		[OperationContract]
-		[WebInvoke(UriTemplate = "/DownloadReport", Method = "POST", RequestFormat = WebMessageFormat.Json, ResponseFormat = WebMessageFormat.Json)]
+		[WebGet(UriTemplate = "/DownloadReport", RequestFormat = WebMessageFormat.Json, ResponseFormat = WebMessageFormat.Json)]
 		[RequireApiKey("DownloadReportApiKey")]
 		[RequireNoTenant]
 		Stream DownloadReport();
diff --git a/Service/ServiceImplementations/ApiServiceImp.cs b/Service/ServiceImplementations/ApiServiceImp.cs
index 6adccecd4..1f0ede55a 100644
--- a/Service/ServiceImplementations/ApiServiceImp.cs
+++ b/Service/ServiceImplementations/ApiServiceImp.cs
@@ -45,25 +45,5 @@ namespace BeWo.Service.ServiceImplementations
 
 			return ApiResponse<decimal>.SuccessResponse(sum ?? 0);
 		}
-
-		public ApiResponse<byte[]> DownloadReport()
-		{
-			string filename = "xrechnung.pdf";
-
-			string filePath = Path.Combine(@"C:\Users\ownSoft\Desktop\XRechnung\", filename);
-			if (!File.Exists(filePath))
-				throw new FileNotFoundException("Datei nicht gefunden");
-
-			// Setze die Header
-			WebOperationContext.Current.OutgoingResponse.ContentType = "application/pdf";
-			WebOperationContext.Current.OutgoingResponse.Headers.Add(
-				"Content-Disposition", $"attachment; filename=\"{filename}\"");
-
-			var data = File.ReadAllBytes(filePath);
-
-			return ApiResponse<byte[]>.SuccessResponse(data);
-		}
-
-		public ApiResponse<byte[]> DownloadReport2() => DownloadReport();
 	}
 }
diff --git a/Service/ServiceImplementations/ApiStreamServiceImp.cs b/Service/ServiceImplementations/ApiStreamServiceImp.cs
index 356601238..098c097e8 100644
--- a/Service/ServiceImplementations/ApiStreamServiceImp.cs
+++ b/Service/ServiceImplementations/ApiStreamServiceImp.cs
@@ -32,23 +32,18 @@ namespace BeWo.Service.ServiceImplementations
 			WebOperationContext.Current.OutgoingResponse.Headers.Add(
 				"Content-Disposition", $"attachment; filename=\"{filename}\"");
 
-			return new FileStream(filePath, FileMode.Open, FileAccess.Read);
-		}
-
-		public Stream DownloadReport2()
-		{
-			string filename = "xrechnung.pdf";
-
-			string filePath = Path.Combine(@"C:\Users\ownSoft\Desktop\XRechnung\", filename);
-			if (!File.Exists(filePath))
-				throw new FileNotFoundException("Datei nicht gefunden");
-
-			// Setze die Header
-			WebOperationContext.Current.OutgoingResponse.ContentType = "application/pdf";
-			WebOperationContext.Current.OutgoingResponse.Headers.Add(
-				"Content-Disposition", $"attachment; filename=\"{filename}\"");
-
-			return new FileStream(filePath, FileMode.Open, FileAccess.Read);
+			FileStream f = new FileStream(filePath, FileMode.Open);
+			int length = (int)f.Length;
+			WebOperationContext.Current.OutgoingResponse.ContentLength = length;
+			byte[] buffer = new byte[length];
+			int sum = 0;
+			int count;
+			while ((count = f.Read(buffer, sum, length - sum)) > 0)
+			{
+				sum += count;
+			}
+			f.Close();
+			return new MemoryStream(buffer);
 		}
 	}
 }
diff --git a/Service/ServiceImplementations/OperationsEnhancedServiceImp.cs b/Service/ServiceImplementations/Enhanced/AccountingEnhancedServiceImp.cs
similarity index 82%
rename from Service/ServiceImplementations/OperationsEnhancedServiceImp.cs
rename to Service/ServiceImplementations/Enhanced/AccountingEnhancedServiceImp.cs
index ebc77ecd0..dd13b6485 100644
--- a/Service/ServiceImplementations/OperationsEnhancedServiceImp.cs
+++ b/Service/ServiceImplementations/Enhanced/AccountingEnhancedServiceImp.cs
@@ -4,7 +4,7 @@ using BeWo.Data.Entities;
 using BeWo.Data.Models.XRechnung;
 using BeWo.Data.Security;
 using BeWo.Service.DCEntityMapper;
-using BeWo.Service.ServiceContracts;
+using BeWo.Service.ServiceContracts.Enhanced;
 using BeWo.Service.ServiceProxy;
 using BeWo.Service.ServiceUtils;
 using BeWo.Service.ServiceUtils.XRechnung;
@@ -24,17 +24,12 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace BeWo.Service.ServiceImplementations
+namespace BeWo.Service.ServiceImplementations.Enhanced
 {
 	[ServiceBehavior(InstanceContextMode = InstanceContextMode.PerCall, ConcurrencyMode = ConcurrencyMode.Single)]
-	public class OperationsEnhancedServiceImp : IOperationsEnhancedService
+	public class AccountingEnhancedServiceImp : IAccountingEnhancedService
 	{
-		public void HelloWorld()
-		{
-			throw new NotImplementedException();
-		}
-
-		public object CreateXRechnung(long invoice_base_oid, int report_type, string report_url)
+		public byte[] CreateXRechnung(long invoice_base_oid, int report_type, string report_url)
 		{
 			if (string.IsNullOrWhiteSpace(report_url))
 				throw new ArgumentNullException(nameof(report_url));
diff --git a/Service/ServiceImplementations/AiEnhancedServiceImp.cs b/Service/ServiceImplementations/Enhanced/AiEnhancedServiceImp.cs
similarity index 98%
rename from Service/ServiceImplementations/AiEnhancedServiceImp.cs
rename to Service/ServiceImplementations/Enhanced/AiEnhancedServiceImp.cs
index a25d1bcd2..a31793c23 100644
--- a/Service/ServiceImplementations/AiEnhancedServiceImp.cs
+++ b/Service/ServiceImplementations/Enhanced/AiEnhancedServiceImp.cs
@@ -4,7 +4,7 @@ using BeWo.Data.Entities;
 using BeWo.Data.Security;
 using BeWo.Service.AI;
 using BeWo.Service.DCEntityMapper;
-using BeWo.Service.ServiceContracts;
+using BeWo.Service.ServiceContracts.Enhanced;
 using BeWo.Service.ServiceProxy;
 using BeWo.Service.ServiceUtils;
 using BS.Shared;
@@ -27,7 +27,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Interop;
 
-namespace BeWo.Service.ServiceImplementations
+namespace BeWo.Service.ServiceImplementations.Enhanced
 {
 	[ServiceBehavior(InstanceContextMode = InstanceContextMode.PerCall, ConcurrencyMode = ConcurrencyMode.Single)]
 	public class AiEnhancedServiceImp : IAiEnhancedService
diff --git a/Service/ServiceImplementations/Enhanced/OperationsEnhancedServiceImp.cs b/Service/ServiceImplementations/Enhanced/OperationsEnhancedServiceImp.cs
new file mode 100644
index 000000000..c5dc6828e
--- /dev/null
+++ b/Service/ServiceImplementations/Enhanced/OperationsEnhancedServiceImp.cs
@@ -0,0 +1,37 @@
+using BeWo.Data;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Data.Models.XRechnung;
+using BeWo.Data.Security;
+using BeWo.Service.DCEntityMapper;
+using BeWo.Service.ServiceContracts.Enhanced;
+using BeWo.Service.ServiceProxy;
+using BeWo.Service.ServiceUtils;
+using BeWo.Service.ServiceUtils.XRechnung;
+using BS.Shared;
+using BS.Shared.DataContracts;
+using BS.Shared.DataContracts.Feature.AI;
+using BS.Shared.DataContracts.Invoicing.XRechnung;
+using BS.Shared.DataContracts.MikePHPContracts;
+using DevExpress.Entity.Model.Metadata;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Cryptography;
+using System.ServiceModel;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace BeWo.Service.ServiceImplementations.Enhanced
+{
+	[ServiceBehavior(InstanceContextMode = InstanceContextMode.PerCall, ConcurrencyMode = ConcurrencyMode.Single)]
+	public class OperationsEnhancedServiceImp : IOperationsEnhancedService
+	{
+		public string HelloWorld()
+		{
+			return "OperationEnhancedService: Hello World!";
+		}
+	}
+}
diff --git a/Service/ServiceProxy/XRechnungFacade.cs b/Service/ServiceProxy/XRechnungFacade.cs
index 5ac1be8a4..c15338a6d 100644
--- a/Service/ServiceProxy/XRechnungFacade.cs
+++ b/Service/ServiceProxy/XRechnungFacade.cs
@@ -16,7 +16,7 @@ namespace BeWo.Service.ServiceProxy
 {
 	public class XRechnungFacade : WebClientFacade
 	{
-		public string Create(object xrechnung, string url)
+		public byte[] Create(object xrechnung, string url)
 		{
 			var sub_url = "create";
 
@@ -26,7 +26,7 @@ namespace BeWo.Service.ServiceProxy
 				pdf = url
 			};
 
-			var test = SendPostUploadValues<object, string>(sub_url, payload);
+			var test = SendPostUploadValues<object, byte[]>(sub_url, payload);
 
 			return test;
 		}
diff --git a/Service/ServiceUtils/DistanceCalculator/OpenrouteServiceAPI.cs b/Service/ServiceUtils/DistanceCalculator/OpenrouteServiceAPI.cs
index f57842594..0041bb2b0 100644
--- a/Service/ServiceUtils/DistanceCalculator/OpenrouteServiceAPI.cs
+++ b/Service/ServiceUtils/DistanceCalculator/OpenrouteServiceAPI.cs
@@ -42,7 +42,7 @@ namespace BeWo.Service.ServiceUtils.DistanceCalculator
         }
 
         private string Key { get; set; }
-        private string GeoKey { get; set; }
+        private string GeoUrl { get; set; }
         private string Url { get; set; }
 
         private AddressRouteMatrix Matrix { get; set; }
@@ -63,11 +63,11 @@ namespace BeWo.Service.ServiceUtils.DistanceCalculator
             Key = MergedConfig.GetSecretSetting("OpenrouteServiceApiKey");
 			if (string.IsNullOrEmpty(Key))
             {
-                throw new Exception("OpenrouteServiceApiKey is not set in AppSettings.");
+                throw new Exception("OpenrouteServiceApiKey is not set.");
             }
 
-			GeoKey = appSettings["OpenrouteServiceApiUrlGeocode"];
-			if (string.IsNullOrEmpty(GeoKey))
+			GeoUrl = appSettings["OpenrouteServiceApiUrlGeocode"];
+			if (string.IsNullOrEmpty(GeoUrl))
             {
                 throw new Exception("OpenrouteServiceApiUrlGeocode is not set in AppSettings.");
 			}			
@@ -208,7 +208,7 @@ namespace BeWo.Service.ServiceUtils.DistanceCalculator
         private string GetGeocodeUrl(Address address)
         {
             var html = HttpUtility.UrlEncode(AddressRouteManager.AddressToString(address));
-            return $"{GeoKey}?api_key={Key}&text={html}&sources=openstreetmap&size=1";
+            return $"{GeoUrl}?api_key={Key}&text={html}&sources=openstreetmap&size=1";
         }
 
         private string GetMatrixBodyContentString()
diff --git a/Service/ServiceUtils/ServiceHelper.cs b/Service/ServiceUtils/ServiceHelper.cs
index 7bde54bbc..578418bc7 100644
--- a/Service/ServiceUtils/ServiceHelper.cs
+++ b/Service/ServiceUtils/ServiceHelper.cs
@@ -9,7 +9,6 @@ using System.ServiceModel.Channels;
 using System.ServiceModel.Dispatcher;
 using System.Text;
 using System.Threading.Tasks;
-using BeWo.Service.ServiceContracts;
 using BS.Shared.Attributes;
 using BS.Shared.Extensions;
 using NHibernate.Hql.Ast.ANTLR.Tree;
diff --git a/Shared/BeWoEntityEnums.cs b/Shared/BeWoEntityEnums.cs
index 0fa4647f7..2ff58ef8b 100644
--- a/Shared/BeWoEntityEnums.cs
+++ b/Shared/BeWoEntityEnums.cs
@@ -1365,4 +1365,11 @@ namespace BS.Shared
         Assistent,
         User
     }
+
+    public enum BWPFeature
+    {
+        XRechnung = 10,
+        GkvAbrechnung = 11,
+        AiConversation = 12,
+    }
 }
\ No newline at end of file
diff --git a/Shared/Core/AppError.cs b/Shared/Core/AppError.cs
index e4263fc58..b2ae8799b 100644
--- a/Shared/Core/AppError.cs
+++ b/Shared/Core/AppError.cs
@@ -26,6 +26,11 @@ namespace BS.Shared.Core
 			InnerErrors = innerErrors;
 		}
 
+		public AppError()
+		{
+
+		}
+
 		//public static readonly AppError Example = new AppError("Code", "Message");
 
 		public static readonly Func<OrganisationDC, AppError> GkvDatenannahmestelleAdresseNotFound = (dc) => new AppError("GKV.70001", $"Unbekannte Datenannahmestelle. Bitte neu in der Organisation {dc.Name} ermitteln");
diff --git a/Shared/Core/WebClientFacade.cs b/Shared/Core/WebClientFacade.cs
index f406f4ade..f3968d26f 100644
--- a/Shared/Core/WebClientFacade.cs
+++ b/Shared/Core/WebClientFacade.cs
@@ -154,11 +154,14 @@ namespace BS.Shared.Core
 		private T deserialize<T>(string input)
 		{
 			if (string.IsNullOrEmpty(input))
-				return default(T);
+				return default;
 
-			if (typeof(T) == typeof(String))
+			if (typeof(T) == typeof(string))
 				return (T)(object)input;
 
+			if (typeof(T) == typeof(byte[]))
+				return (T)(object)Encoding.UTF8.GetBytes(input);
+
 			var t = JsonConvert.DeserializeObject<T>(input);
 
 			return t;
diff --git a/Shared/Interface/IFileStorageDAO.cs b/Shared/Interface/IFileStorageDAO.cs
new file mode 100644
index 000000000..8d2393a50
--- /dev/null
+++ b/Shared/Interface/IFileStorageDAO.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace BS.Shared.Interface
+{
+	public interface IFileStorageDAO
+	{
+		Task SaveFileAsync(string tenant, BWPFeature feature, string fileName, Stream content, CancellationToken cancellationToken = default);
+		Task<Stream> GetFileAsync(string tenant, BWPFeature feature, string fileName, CancellationToken cancellationToken = default);
+		Task<bool> DeleteFileAsync(string tenant, BWPFeature feature, string fileName, CancellationToken cancellationToken = default);
+		Task<bool> FileExistsAsync(string tenant, BWPFeature feature, string fileName, CancellationToken cancellationToken = default);
+	}
+}
diff --git a/Shared/Shared.csproj b/Shared/Shared.csproj
index c22660980..6338296ab 100644
--- a/Shared/Shared.csproj
+++ b/Shared/Shared.csproj
@@ -401,6 +401,7 @@
     <Compile Include="Extensions\ICollectionExtensions.cs" />
     <Compile Include="Extensions\IDictionaryTExtensions.cs" />
     <Compile Include="Extensions\TimeIntervalExtensions.cs" />
+    <Compile Include="Interface\IFileStorageDAO.cs" />
     <Compile Include="Interface\IGkvAbrechnung.cs" />
     <Compile Include="Interface\IGkvTransferProtokoll.cs" />
     <Compile Include="Interface\IInvoiceBase.cs" />
diff --git a/XRechnungUnitTest/XRechnungUnitTest.csproj b/XRechnungUnitTest/XRechnungUnitTest.csproj
index 3f2e901ad..4366802a0 100644
--- a/XRechnungUnitTest/XRechnungUnitTest.csproj
+++ b/XRechnungUnitTest/XRechnungUnitTest.csproj
@@ -29,6 +29,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -67,7 +68,7 @@
       <Name>Data</Name>
     </ProjectReference>
     <ProjectReference Include="..\Service\Service.csproj">
-      <Project>{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}</Project>
+      <Project>{094331c3-ecee-4c89-bbfd-4c9ded89f0ef}</Project>
       <Name>Service</Name>
     </ProjectReference>
     <ProjectReference Include="..\Shared\Shared.csproj">