diff --git a/Lux.API/Controllers/WindowController.cs b/Lux.API/Controllers/WindowController.cs
index a6c2738f..c0ccecd1 100644
--- a/Lux.API/Controllers/WindowController.cs
+++ b/Lux.API/Controllers/WindowController.cs
@@ -1,15 +1,8 @@
 using EgwCoreLib.Lux.Data.Services;
 using EgwMultiEngineManager;
-using EgwCoreLib.Lux.Data;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion.Internal;
-using Microsoft.Extensions.Configuration;
-using Newtonsoft.Json;
 using NLog;
-using StackExchange.Redis;
 using System.Diagnostics;
-using System.Runtime;
 
 namespace Lux.API.Controllers
 {
diff --git a/Lux.API/Lux.API.csproj b/Lux.API/Lux.API.csproj
index b39e5389..22d2e42d 100644
--- a/Lux.API/Lux.API.csproj
+++ b/Lux.API/Lux.API.csproj
@@ -65,6 +65,7 @@
 
     <ItemGroup>
         <ProjectReference Include="..\EgwCoreLib.Lux.Core\EgwCoreLib.Lux.Core.csproj" />
+        <ProjectReference Include="..\EgwCoreLib.Lux.Data\EgwCoreLib.Lux.Data.csproj" />
         <ProjectReference Include="..\Lux.Data\EgwCoreLib.Lux.Data.csproj" />
     </ItemGroup>
 
diff --git a/Lux.UI/Components/_Imports.razor b/Lux.UI/Components/_Imports.razor
index f3babb2a..4a01418b 100644
--- a/Lux.UI/Components/_Imports.razor
+++ b/Lux.UI/Components/_Imports.razor
@@ -9,6 +9,7 @@
 @using Microsoft.JSInterop
 @using EgwCoreLib.Razor
 @using EgwCoreLib.Utils
+@using EgwCoreLib.Lux.Core
 @using EgwCoreLib.Lux.Data
 @using EgwCoreLib.Lux.Data.Controllers
 @using EgwCoreLib.Lux.Data.DbModel
diff --git a/Lux.UI/Lux.UI.csproj b/Lux.UI/Lux.UI.csproj
index 4fe31ff0..16b21b70 100644
--- a/Lux.UI/Lux.UI.csproj
+++ b/Lux.UI/Lux.UI.csproj
@@ -31,7 +31,7 @@
     <ItemGroup>
         <ProjectReference Include="..\EgwCoreLib.Lux.Core\EgwCoreLib.Lux.Core.csproj" />
         <ProjectReference Include="..\EgwCoreLib.Lux.Core\EgwCoreLib.Lux.Core.csproj" />
-        <ProjectReference Include="..\Lux.Data\EgwCoreLib.Lux.Data.csproj" />
+        <ProjectReference Include="..\EgwCoreLib.Lux.Data\EgwCoreLib.Lux.Data.csproj" />
         <ProjectReference Include="..\Lux.UI.Client\Lux.UI.Client.csproj" />
     </ItemGroup>
 
diff --git a/TestApp/TestApp.csproj b/TestApp/TestApp.csproj
index d18a3b2a..25eb3421 100644
--- a/TestApp/TestApp.csproj
+++ b/TestApp/TestApp.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\EgwCoreLib.Lux.Core\EgwCoreLib.Lux.Core.csproj" />
-    <ProjectReference Include="..\EgwCoreLib.Lux.Data\Lux.Data.csproj" />
+    <ProjectReference Include="..\EgwCoreLib.Lux.Data\EgwCoreLib.Lux.Data.csproj" />
   </ItemGroup>
 
 </Project>