diff --git a/SetupWix/Product.wxs b/SetupWix/Product.wxs
index 5f4414f..9e46b85 100644
--- a/SetupWix/Product.wxs
+++ b/SetupWix/Product.wxs
@@ -107,6 +107,20 @@
         </File>
       </Component>
 
+      <!--Digital Data Bibliotheken-->
+      <Component Id="DigitalDataLibs" Guid="e68a6a14-3917-4989-abec-d30c521a3431">
+        <File Id="Logging" Name="DigitalData.Modules.Logging.dll" Source="DigitalData.Modules.Logging.dll" KeyPath="yes" />
+        <File Id="Filesystem" Name="DigitalData.Modules.Filesystem.dll" Source="DigitalData.Modules.Filesystem.dll" KeyPath="no" />
+        <File Id="Config" Name="DigitalData.Modules.Config.dll" Source="DigitalData.Modules.Config.dll" KeyPath="no" />
+        <File Id="DLLLicenseManager" Name="DLLLicenseManager.dll" Source="P:\Visual Studio Projekte\Bibliotheken\DLLLicenseManager.dll" KeyPath="no" />
+      </Component>
+
+      <!--Verschiedene Bibliotheken-->
+      <Component Id="MiscLibs" Guid="56bb39d9-101a-411d-8b11-5d4e3a602275">
+        <File Id="MSGLib" Name="Independentsoft.Msg.dll" Source="P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\Independentsoft.Msg.dll" KeyPath="yes" />
+        <File Id="NLog" Name="NLog.dll" Source="NLog.dll" KeyPath="no" />
+      </Component>
+
       <!--WINDREAM Bibliotheken-->
       <Component Id="WindreamLibs" Guid="4D11FC99-50D9-4E54-B18A-8885C9112646">
         <File Id="WINDREAMLibDLL" Name="Interop.WINDREAMLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll" KeyPath="yes" />
@@ -114,12 +128,7 @@
         <File Id="WMOBRWSLib" Name="Interop.WMOBRWSLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOBRWSLib.dll" KeyPath="no" />
         <File Id="WMOSRCHLib" Name="Interop.WMOSRCHLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOSRCHLib.dll" KeyPath="no" />
       </Component>
-
-      <!-- MAIL.NET Bibliothek -->
-      <Component Id="IndependentsoftLibs" Guid="C3B3BB48-DB41-4419-A4B8-0E4DC5E8856B">
-        <File Id="MSGLib" Name="Independentsoft.Msg.dll" Source="P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\Independentsoft.Msg.dll" KeyPath="yes" />
-      </Component>
-
+      
       <!-- DEVEXPRESS Bibliotheken -->
       <Component Id="DevExpressLibs" Guid="CB40DAAE-348E-4BD3-B275-9A526EB8F191">
         <File Id="DevExpress.Charts.v15.2.Core" Name="DevExpress.Charts.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Charts.v15.2.Core.dll" KeyPath="yes" />
@@ -193,11 +202,6 @@
         </Component>
       </Directory>
 
-      <!-- Digital-Data DLLS -->
-      <Component Id="DDLibs" Guid="BA2979E3-3778-48B8-B0D8-4B77825B9293">
-        <File Id="DLLLicenseManager" Name="DLLLicenseManager.dll" Source="P:\Visual Studio Projekte\Bibliotheken\DLLLicenseManager.dll" KeyPath="yes" />
-      </Component>
-
       <!-- Office-Bibliotheken -->
       <Component Id="Microsoft.Office" Guid="D600FF38-E549-4CBA-BB33-09B0BD0C8C26">
         <File Id="Office" Name="Office.dll" Source="C:\Windows\assembly\GAC_MSIL\Office\15.0.0.0__71e9bce111e9429c\Office.dll" KeyPath="yes" />
@@ -227,8 +231,8 @@
       <ComponentRef Id="MainApplicationExe" />
       <ComponentRef Id="ReleaseNotes"/>
       <ComponentRef Id="WindreamLibs" />
-      <ComponentRef Id="DDLibs" />
-      <ComponentRef Id="IndependentsoftLibs" />
+      <ComponentRef Id="DigitalDataLibs" />
+      <ComponentRef Id="MiscLibs" />
       <ComponentRef Id="Microsoft.Office" />
       <ComponentRef Id="Oracle" />
       <ComponentRef Id="DevExpressLibs" />