diff --git a/TIAM.Database.Test/TIAM.Database.Test.csproj b/TIAM.Database.Test/TIAM.Database.Test.csproj
index 8620cc03..003030c6 100644
--- a/TIAM.Database.Test/TIAM.Database.Test.csproj
+++ b/TIAM.Database.Test/TIAM.Database.Test.csproj
@@ -32,31 +32,31 @@
 
   <ItemGroup>
     <Reference Include="AyCode.Core">
-      <HintPath>..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Core.dll</HintPath>
+      <HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Core.dll</HintPath>
     </Reference>
     <Reference Include="AyCode.Core.Server">
-      <HintPath>..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Core.Server.dll</HintPath>
+      <HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Core.Server.dll</HintPath>
     </Reference>
     <Reference Include="AyCode.Core.Tests">
       <HintPath>..\..\AyCode.Core\AyCode.Database.Tests\bin\Debug\net8.0\AyCode.Core.Tests.dll</HintPath>
     </Reference>
     <Reference Include="AyCode.Database">
-      <HintPath>..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Database.dll</HintPath>
+      <HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Database.dll</HintPath>
     </Reference>
     <Reference Include="AyCode.Database.Tests">
       <HintPath>..\..\AyCode.Core\AyCode.Database.Tests\bin\Debug\net8.0\AyCode.Database.Tests.dll</HintPath>
     </Reference>
     <Reference Include="AyCode.Entities">
-      <HintPath>..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Entities.dll</HintPath>
+      <HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Entities.dll</HintPath>
     </Reference>
     <Reference Include="AyCode.Entities.Server">
-      <HintPath>..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Entities.Server.dll</HintPath>
+      <HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Entities.Server.dll</HintPath>
     </Reference>
     <Reference Include="AyCode.Interfaces">
-      <HintPath>..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Interfaces.dll</HintPath>
+      <HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Interfaces.dll</HintPath>
     </Reference>
     <Reference Include="AyCode.Interfaces.Server">
-      <HintPath>..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Interfaces.Server.dll</HintPath>
+      <HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Interfaces.Server.dll</HintPath>
     </Reference>
   </ItemGroup>
 
diff --git a/TIAM.Database/TIAM.Database.csproj b/TIAM.Database/TIAM.Database.csproj
index 5da5f98c..ba1f4841 100644
--- a/TIAM.Database/TIAM.Database.csproj
+++ b/TIAM.Database/TIAM.Database.csproj
@@ -23,25 +23,25 @@
 
   <ItemGroup>
     <Reference Include="AyCode.Core">
-      <HintPath>..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Core.dll</HintPath>
+      <HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Core.dll</HintPath>
     </Reference>
     <Reference Include="AyCode.Core.Server">
-      <HintPath>..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Core.Server.dll</HintPath>
+      <HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Core.Server.dll</HintPath>
     </Reference>
     <Reference Include="AyCode.Database">
-      <HintPath>..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Database.dll</HintPath>
+      <HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Database.dll</HintPath>
     </Reference>
     <Reference Include="AyCode.Entities">
-      <HintPath>..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Entities.dll</HintPath>
+      <HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Entities.dll</HintPath>
     </Reference>
     <Reference Include="AyCode.Entities.Server">
-      <HintPath>..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Entities.Server.dll</HintPath>
+      <HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Entities.Server.dll</HintPath>
     </Reference>
     <Reference Include="AyCode.Interfaces">
-      <HintPath>..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Interfaces.dll</HintPath>
+      <HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Interfaces.dll</HintPath>
     </Reference>
     <Reference Include="AyCode.Interfaces.Server">
-      <HintPath>..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Interfaces.Server.dll</HintPath>
+      <HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Interfaces.Server.dll</HintPath>
     </Reference>
   </ItemGroup>
 
diff --git a/TIAM.Entities/TIAM.Entities.csproj b/TIAM.Entities/TIAM.Entities.csproj
index 3e927349..5c9de38f 100644
--- a/TIAM.Entities/TIAM.Entities.csproj
+++ b/TIAM.Entities/TIAM.Entities.csproj
@@ -8,22 +8,22 @@
 
   <ItemGroup>
     <Reference Include="AyCode.Core">
-      <HintPath>..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Core.dll</HintPath>
+      <HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Core.dll</HintPath>
     </Reference>
     <Reference Include="AyCode.Core.Server">
-      <HintPath>..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Core.Server.dll</HintPath>
+      <HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Core.Server.dll</HintPath>
     </Reference>
     <Reference Include="AyCode.Entities">
-      <HintPath>..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Entities.dll</HintPath>
+      <HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Entities.dll</HintPath>
     </Reference>
     <Reference Include="AyCode.Entities.Server">
-      <HintPath>..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Entities.Server.dll</HintPath>
+      <HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Entities.Server.dll</HintPath>
     </Reference>
     <Reference Include="AyCode.Interfaces">
-      <HintPath>..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Interfaces.dll</HintPath>
+      <HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Interfaces.dll</HintPath>
     </Reference>
     <Reference Include="AyCode.Interfaces.Server">
-      <HintPath>..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Interfaces.Server.dll</HintPath>
+      <HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Interfaces.Server.dll</HintPath>
     </Reference>
   </ItemGroup>
 
diff --git a/TIAMMobileApp/TIAMMobileApp.csproj b/TIAMMobileApp/TIAMMobileApp.csproj
index 8a9787f2..404e63f0 100644
--- a/TIAMMobileApp/TIAMMobileApp.csproj
+++ b/TIAMMobileApp/TIAMMobileApp.csproj
@@ -66,13 +66,13 @@
 
     <ItemGroup>
       <Reference Include="AyCode.Core">
-        <HintPath>..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Core.dll</HintPath>
+        <HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Core.dll</HintPath>
       </Reference>
       <Reference Include="AyCode.Entities">
-        <HintPath>..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Entities.dll</HintPath>
+        <HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Entities.dll</HintPath>
       </Reference>
       <Reference Include="AyCode.Interfaces">
-        <HintPath>..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Interfaces.dll</HintPath>
+        <HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Interfaces.dll</HintPath>
       </Reference>
     </ItemGroup>
 
diff --git a/TIAMSharedUI/TIAMSharedUI.csproj b/TIAMSharedUI/TIAMSharedUI.csproj
index 74c969b2..c86446f9 100644
--- a/TIAMSharedUI/TIAMSharedUI.csproj
+++ b/TIAMSharedUI/TIAMSharedUI.csproj
@@ -24,13 +24,13 @@
 
   <ItemGroup>
     <Reference Include="AyCode.Core">
-      <HintPath>..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Core.dll</HintPath>
+      <HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Core.dll</HintPath>
     </Reference>
     <Reference Include="AyCode.Entities">
-      <HintPath>..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Entities.dll</HintPath>
+      <HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Entities.dll</HintPath>
     </Reference>
     <Reference Include="AyCode.Interfaces">
-      <HintPath>..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Interfaces.dll</HintPath>
+      <HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Interfaces.dll</HintPath>
     </Reference>
   </ItemGroup>
 
diff --git a/TIAMWebApp/Client/TIAMWebApp.Client.csproj b/TIAMWebApp/Client/TIAMWebApp.Client.csproj
index b1d2a0c3..35040ede 100644
--- a/TIAMWebApp/Client/TIAMWebApp.Client.csproj
+++ b/TIAMWebApp/Client/TIAMWebApp.Client.csproj
@@ -19,13 +19,13 @@
 
   <ItemGroup>
     <Reference Include="AyCode.Core">
-      <HintPath>..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Core.dll</HintPath>
+      <HintPath>..\..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Core.dll</HintPath>
     </Reference>
     <Reference Include="AyCode.Entities">
-      <HintPath>..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Entities.dll</HintPath>
+      <HintPath>..\..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Entities.dll</HintPath>
     </Reference>
     <Reference Include="AyCode.Interfaces">
-      <HintPath>..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Interfaces.dll</HintPath>
+      <HintPath>..\..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Interfaces.dll</HintPath>
     </Reference>
   </ItemGroup>
 
diff --git a/TIAMWebApp/Server/TIAMWebApp.Server.csproj b/TIAMWebApp/Server/TIAMWebApp.Server.csproj
index 043f771b..b25e61a0 100644
--- a/TIAMWebApp/Server/TIAMWebApp.Server.csproj
+++ b/TIAMWebApp/Server/TIAMWebApp.Server.csproj
@@ -29,25 +29,25 @@
 
   <ItemGroup>
     <Reference Include="AyCode.Core">
-      <HintPath>..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Core.dll</HintPath>
+      <HintPath>..\..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Core.dll</HintPath>
     </Reference>
     <Reference Include="AyCode.Core.Server">
-      <HintPath>..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Core.Server.dll</HintPath>
+      <HintPath>..\..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Core.Server.dll</HintPath>
     </Reference>
     <Reference Include="AyCode.Database">
-      <HintPath>..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Database.dll</HintPath>
+      <HintPath>..\..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Database.dll</HintPath>
     </Reference>
     <Reference Include="AyCode.Entities">
-      <HintPath>..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Entities.dll</HintPath>
+      <HintPath>..\..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Entities.dll</HintPath>
     </Reference>
     <Reference Include="AyCode.Entities.Server">
-      <HintPath>..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Entities.Server.dll</HintPath>
+      <HintPath>..\..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Entities.Server.dll</HintPath>
     </Reference>
     <Reference Include="AyCode.Interfaces">
-      <HintPath>..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Interfaces.dll</HintPath>
+      <HintPath>..\..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Interfaces.dll</HintPath>
     </Reference>
     <Reference Include="AyCode.Interfaces.Server">
-      <HintPath>..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Interfaces.Server.dll</HintPath>
+      <HintPath>..\..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Interfaces.Server.dll</HintPath>
     </Reference>
     <Reference Include="AyCode.Utils">
       <HintPath>..\..\..\AyCode.Core\AyCode.Utils\bin\Debug\net8.0\AyCode.Utils.dll</HintPath>
diff --git a/TIAMWebApp/Shared/TIAMWebApp.Shared.Application.csproj b/TIAMWebApp/Shared/TIAMWebApp.Shared.Application.csproj
index 10d009b8..f77c613f 100644
--- a/TIAMWebApp/Shared/TIAMWebApp.Shared.Application.csproj
+++ b/TIAMWebApp/Shared/TIAMWebApp.Shared.Application.csproj
@@ -28,22 +28,22 @@
 
   <ItemGroup>
     <Reference Include="AyCode.Core">
-      <HintPath>..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Core.dll</HintPath>
+      <HintPath>..\..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Core.dll</HintPath>
     </Reference>
     <Reference Include="AyCode.Core.Server">
-      <HintPath>..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Core.Server.dll</HintPath>
+      <HintPath>..\..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Core.Server.dll</HintPath>
     </Reference>
     <Reference Include="AyCode.Entities">
-      <HintPath>..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Entities.dll</HintPath>
+      <HintPath>..\..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Entities.dll</HintPath>
     </Reference>
     <Reference Include="AyCode.Entities.Server">
-      <HintPath>..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Entities.Server.dll</HintPath>
+      <HintPath>..\..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Entities.Server.dll</HintPath>
     </Reference>
     <Reference Include="AyCode.Interfaces">
-      <HintPath>..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Interfaces.dll</HintPath>
+      <HintPath>..\..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Interfaces.dll</HintPath>
     </Reference>
     <Reference Include="AyCode.Interfaces.Server">
-      <HintPath>..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Interfaces.Server.dll</HintPath>
+      <HintPath>..\..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Interfaces.Server.dll</HintPath>
     </Reference>
   </ItemGroup>
 </Project>