diff --git a/DigitalData.UserManager.API/Controllers/AuthController.cs b/DigitalData.UserManager.API/Controllers/AuthController.cs
index 7a03fb1..68709bc 100644
--- a/DigitalData.UserManager.API/Controllers/AuthController.cs
+++ b/DigitalData.UserManager.API/Controllers/AuthController.cs
@@ -7,8 +7,7 @@ using DigitalData.UserManager.Application.DTOs.User;
 using Microsoft.AspNetCore.Authorization;
 using DigitalData.UserManager.Application;
 using DigitalData.UserManager.Application.DTOs.Auth;
-using DigitalData.Core.Contracts.Application;
-using Microsoft.Extensions.Caching.Memory;
+using DigitalData.Core.Abstractions.Application;
 using Microsoft.Extensions.Localization;
 using DigitalData.Core.DTO;
 
@@ -17,9 +16,9 @@ namespace DigitalData.UserManager.API.Controllers
     [Route("api/[controller]")]
     public class AuthController : ControllerBase
     {
-        private IUserService _userService;
-        private IGroupOfUserService _gouService;
-        private IDirectorySearchService _dirSearchService;
+        private readonly IUserService _userService;
+        private readonly IGroupOfUserService _gouService;
+        private readonly IDirectorySearchService _dirSearchService;
         private readonly IStringLocalizer<Resource> _localizer;
 
         public AuthController(IUserService userService, IGroupOfUserService gouService, IDirectorySearchService directorySearchService, IStringLocalizer<Resource> localizer)
diff --git a/DigitalData.UserManager.API/Controllers/DirectoryController.cs b/DigitalData.UserManager.API/Controllers/DirectoryController.cs
index 004a1b4..bcede38 100644
--- a/DigitalData.UserManager.API/Controllers/DirectoryController.cs
+++ b/DigitalData.UserManager.API/Controllers/DirectoryController.cs
@@ -1,4 +1,4 @@
-using DigitalData.Core.Contracts.Application;
+using DigitalData.Core.Abstractions.Application;
 using DigitalData.UserManager.Application.Contracts;
 using DigitalData.UserManager.Application.DTOs;
 using Microsoft.AspNetCore.Mvc;
@@ -15,20 +15,16 @@ namespace DigitalData.UserManager.API.Controllers
     [SuppressMessage("Interoperability", "CA1416:Validate platform compatibility", Justification = "<Pending>")]
     public class DirectoryController : ControllerBase
     {
-        private ILogger<DirectoryController> _logger;
-        private IUserService _userService;
-        private IDirectorySearchService _dirSearchService;
-        private IMemoryCache _memoryCache;
-        private Dictionary<string, string> _customSearchFilters;
+        private readonly IUserService _userService;
+        private readonly IDirectorySearchService _dirSearchService;
+        private readonly Dictionary<string, string> _customSearchFilters;
         private readonly IStringLocalizer<Resource> _localizer;
 
-        public DirectoryController(IConfiguration configuration, ILogger<DirectoryController> logger, IStringLocalizer<Resource> localizer, IUserService userService, IDirectorySearchService directorySearchService, IMemoryCache memoryCache)
+        public DirectoryController(IConfiguration configuration, IStringLocalizer<Resource> localizer, IUserService userService, IDirectorySearchService directorySearchService)
         {
-            _logger = logger;
             _localizer = localizer;
             _userService = userService;
             _dirSearchService = directorySearchService;
-            _memoryCache = memoryCache;
 
             var customSearchFiltersSection = configuration.GetSection("DirectorySearch:CustomSearchFilters");
             _customSearchFilters = customSearchFiltersSection.Get<Dictionary<string, string>>() ?? new();
diff --git a/DigitalData.UserManager.API/DigitalData.UserManager.API.csproj b/DigitalData.UserManager.API/DigitalData.UserManager.API.csproj
index 8b729a7..86f40b7 100644
--- a/DigitalData.UserManager.API/DigitalData.UserManager.API.csproj
+++ b/DigitalData.UserManager.API/DigitalData.UserManager.API.csproj
@@ -7,6 +7,10 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="1.0.0" />
+    <PackageReference Include="DigitalData.Core.API" Version="1.0.0" />
+    <PackageReference Include="DigitalData.Core.Application" Version="1.0.0" />
+    <PackageReference Include="DigitalData.Core.DTO" Version="1.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.14" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.16" />
@@ -29,24 +33,6 @@
     <ProjectReference Include="..\DigitalData.UserManager.Domain\DigitalData.UserManager.Domain.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="DigitalData.Core.API">
-      <HintPath>..\..\WebCoreModules\DigitalData.Core.API\bin\Debug\net7.0\DigitalData.Core.API.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Core.Application">
-      <HintPath>..\..\WebCoreModules\DigitalData.Core.Application\bin\Debug\net7.0\DigitalData.Core.Application.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Core.Contracts">
-      <HintPath>..\..\WebCoreModules\DigitalData.Core.Contracts\bin\Debug\net7.0\DigitalData.Core.Contracts.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Core.DTO">
-      <HintPath>..\..\WebCoreModules\DigitalData.Core.API\bin\Debug\net7.0\DigitalData.Core.DTO.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Core.Infrastructure">
-      <HintPath>..\..\WebCoreModules\DigitalData.Core.Infrastructure\bin\Debug\net7.0\DigitalData.Core.Infrastructure.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <Folder Include="wwwroot\" />
   </ItemGroup>
diff --git a/DigitalData.UserManager.Application/Contracts/IGroupOfUserService.cs b/DigitalData.UserManager.Application/Contracts/IGroupOfUserService.cs
index d7aed21..aa48951 100644
--- a/DigitalData.UserManager.Application/Contracts/IGroupOfUserService.cs
+++ b/DigitalData.UserManager.Application/Contracts/IGroupOfUserService.cs
@@ -1,7 +1,6 @@
-using DigitalData.Core.Contracts.Application;
+using DigitalData.Core.Abstractions.Application;
 using DigitalData.UserManager.Application.DTOs.GroupOfUser;
 using DigitalData.UserManager.Domain.Entities;
-using DigitalData.UserManager.Infrastructure.Contracts;
 using DigitalData.Core.DTO;
 
 namespace DigitalData.UserManager.Application.Contracts
diff --git a/DigitalData.UserManager.Application/Contracts/IGroupService.cs b/DigitalData.UserManager.Application/Contracts/IGroupService.cs
index 1ebf3b5..ffc342d 100644
--- a/DigitalData.UserManager.Application/Contracts/IGroupService.cs
+++ b/DigitalData.UserManager.Application/Contracts/IGroupService.cs
@@ -1,6 +1,5 @@
-using DigitalData.Core.Contracts.Application;
+using DigitalData.Core.Abstractions.Application;
 using DigitalData.UserManager.Application.DTOs.Group;
-using DigitalData.UserManager.Infrastructure.Contracts;
 using DigitalData.UserManager.Domain.Entities;
 using DigitalData.Core.DTO;
 
diff --git a/DigitalData.UserManager.Application/Contracts/IModuleOfUserService.cs b/DigitalData.UserManager.Application/Contracts/IModuleOfUserService.cs
index a9f380a..c348267 100644
--- a/DigitalData.UserManager.Application/Contracts/IModuleOfUserService.cs
+++ b/DigitalData.UserManager.Application/Contracts/IModuleOfUserService.cs
@@ -1,8 +1,7 @@
-using DigitalData.Core.Contracts.Application;
+using DigitalData.Core.Abstractions.Application;
 using DigitalData.Core.DTO;
 using DigitalData.UserManager.Application.DTOs.ModuleOfUser;
 using DigitalData.UserManager.Domain.Entities;
-using DigitalData.UserManager.Infrastructure.Contracts;
 
 namespace DigitalData.UserManager.Application.Contracts
 {
diff --git a/DigitalData.UserManager.Application/Contracts/IModuleService.cs b/DigitalData.UserManager.Application/Contracts/IModuleService.cs
index 98e02fc..890c840 100644
--- a/DigitalData.UserManager.Application/Contracts/IModuleService.cs
+++ b/DigitalData.UserManager.Application/Contracts/IModuleService.cs
@@ -1,7 +1,6 @@
-using DigitalData.Core.Contracts.Application;
+using DigitalData.Core.Abstractions.Application;
 using DigitalData.UserManager.Application.DTOs.Module;
 using DigitalData.UserManager.Domain.Entities;
-using DigitalData.UserManager.Infrastructure.Contracts;
 
 namespace DigitalData.UserManager.Application.Contracts
 {
diff --git a/DigitalData.UserManager.Application/Contracts/IUserRepService.cs b/DigitalData.UserManager.Application/Contracts/IUserRepService.cs
index 24b32ae..dd6a742 100644
--- a/DigitalData.UserManager.Application/Contracts/IUserRepService.cs
+++ b/DigitalData.UserManager.Application/Contracts/IUserRepService.cs
@@ -1,7 +1,6 @@
-using DigitalData.Core.Contracts.Application;
+using DigitalData.Core.Abstractions.Application;
 using DigitalData.UserManager.Application.DTOs.UserRep;
 using DigitalData.UserManager.Domain.Entities;
-using DigitalData.UserManager.Infrastructure.Contracts;
 using DigitalData.Core.DTO;
 
 namespace DigitalData.UserManager.Application.Contracts
diff --git a/DigitalData.UserManager.Application/Contracts/IUserService.cs b/DigitalData.UserManager.Application/Contracts/IUserService.cs
index 0bcd113..92326c5 100644
--- a/DigitalData.UserManager.Application/Contracts/IUserService.cs
+++ b/DigitalData.UserManager.Application/Contracts/IUserService.cs
@@ -1,4 +1,4 @@
-using DigitalData.Core.Contracts.Application;
+using DigitalData.Core.Abstractions.Application;
 using DigitalData.UserManager.Application.DTOs.User;
 using DigitalData.UserManager.Domain.Entities;
 using DigitalData.Core.DTO;
diff --git a/DigitalData.UserManager.Application/DigitalData.UserManager.Application.csproj b/DigitalData.UserManager.Application/DigitalData.UserManager.Application.csproj
index 10de605..cc6b9ea 100644
--- a/DigitalData.UserManager.Application/DigitalData.UserManager.Application.csproj
+++ b/DigitalData.UserManager.Application/DigitalData.UserManager.Application.csproj
@@ -8,6 +8,10 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="13.0.1" />
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="1.0.0" />
+    <PackageReference Include="DigitalData.Core.Application" Version="1.0.0" />
+    <PackageReference Include="DigitalData.Core.DTO" Version="1.0.0" />
+    <PackageReference Include="DigitalData.Core.Infrastructure" Version="1.0.0" />
     <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="7.0.16" />
     <PackageReference Include="System.DirectoryServices" Version="7.0.1" />
     <PackageReference Include="System.DirectoryServices.AccountManagement" Version="7.0.1" />
diff --git a/DigitalData.UserManager.Infrastructure/Contracts/IGroupOfUserRepository.cs b/DigitalData.UserManager.Infrastructure/Contracts/IGroupOfUserRepository.cs
index e346ac9..886d6ab 100644
--- a/DigitalData.UserManager.Infrastructure/Contracts/IGroupOfUserRepository.cs
+++ b/DigitalData.UserManager.Infrastructure/Contracts/IGroupOfUserRepository.cs
@@ -1,4 +1,4 @@
-using DigitalData.Core.Contracts.Infrastructure;
+using DigitalData.Core.Abstractions.Infrastructure;
 using DigitalData.UserManager.Domain.Entities;
 
 namespace DigitalData.UserManager.Infrastructure.Contracts
diff --git a/DigitalData.UserManager.Infrastructure/Contracts/IGroupRepository.cs b/DigitalData.UserManager.Infrastructure/Contracts/IGroupRepository.cs
index 8cb0a54..9b7b123 100644
--- a/DigitalData.UserManager.Infrastructure/Contracts/IGroupRepository.cs
+++ b/DigitalData.UserManager.Infrastructure/Contracts/IGroupRepository.cs
@@ -1,4 +1,4 @@
-using DigitalData.Core.Contracts.Infrastructure;
+using DigitalData.Core.Abstractions.Infrastructure;
 using DigitalData.UserManager.Domain.Entities;
 
 namespace DigitalData.UserManager.Infrastructure.Contracts
diff --git a/DigitalData.UserManager.Infrastructure/Contracts/IModuleOfUserRepository.cs b/DigitalData.UserManager.Infrastructure/Contracts/IModuleOfUserRepository.cs
index 85ee9a8..af9c754 100644
--- a/DigitalData.UserManager.Infrastructure/Contracts/IModuleOfUserRepository.cs
+++ b/DigitalData.UserManager.Infrastructure/Contracts/IModuleOfUserRepository.cs
@@ -1,4 +1,4 @@
-using DigitalData.Core.Contracts.Infrastructure;
+using DigitalData.Core.Abstractions.Infrastructure;
 using DigitalData.UserManager.Domain.Entities;
 
 namespace DigitalData.UserManager.Infrastructure.Contracts
diff --git a/DigitalData.UserManager.Infrastructure/Contracts/IModuleRepository.cs b/DigitalData.UserManager.Infrastructure/Contracts/IModuleRepository.cs
index 97da3bf..f0f6cb7 100644
--- a/DigitalData.UserManager.Infrastructure/Contracts/IModuleRepository.cs
+++ b/DigitalData.UserManager.Infrastructure/Contracts/IModuleRepository.cs
@@ -1,4 +1,4 @@
-using DigitalData.Core.Contracts.Infrastructure;
+using DigitalData.Core.Abstractions.Infrastructure;
 using DigitalData.UserManager.Domain.Entities;
 
 namespace DigitalData.UserManager.Infrastructure.Contracts
diff --git a/DigitalData.UserManager.Infrastructure/Contracts/IUserRepRepository.cs b/DigitalData.UserManager.Infrastructure/Contracts/IUserRepRepository.cs
index a3334ad..388e8e7 100644
--- a/DigitalData.UserManager.Infrastructure/Contracts/IUserRepRepository.cs
+++ b/DigitalData.UserManager.Infrastructure/Contracts/IUserRepRepository.cs
@@ -1,4 +1,4 @@
-using DigitalData.Core.Contracts.Infrastructure;
+using DigitalData.Core.Abstractions.Infrastructure;
 using DigitalData.UserManager.Domain.Entities;
 
 namespace DigitalData.UserManager.Infrastructure.Contracts
diff --git a/DigitalData.UserManager.Infrastructure/Contracts/IUserRepository.cs b/DigitalData.UserManager.Infrastructure/Contracts/IUserRepository.cs
index b4f916f..abb2b0a 100644
--- a/DigitalData.UserManager.Infrastructure/Contracts/IUserRepository.cs
+++ b/DigitalData.UserManager.Infrastructure/Contracts/IUserRepository.cs
@@ -1,4 +1,4 @@
-using DigitalData.Core.Contracts.Infrastructure;
+using DigitalData.Core.Abstractions.Infrastructure;
 using DigitalData.UserManager.Domain.Entities;
 
 namespace DigitalData.UserManager.Infrastructure.Contracts
diff --git a/DigitalData.UserManager.Infrastructure/DigitalData.UserManager.Infrastructure.csproj b/DigitalData.UserManager.Infrastructure/DigitalData.UserManager.Infrastructure.csproj
index c94085e..13870fe 100644
--- a/DigitalData.UserManager.Infrastructure/DigitalData.UserManager.Infrastructure.csproj
+++ b/DigitalData.UserManager.Infrastructure/DigitalData.UserManager.Infrastructure.csproj
@@ -7,6 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="1.0.0" />
+    <PackageReference Include="DigitalData.Core.Infrastructure" Version="1.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.16" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.15">
       <PrivateAssets>all</PrivateAssets>
@@ -19,13 +21,4 @@
     <ProjectReference Include="..\DigitalData.UserManager.Domain\DigitalData.UserManager.Domain.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="DigitalData.Core.Contracts">
-      <HintPath>..\..\WebCoreModules\DigitalData.Core.Infrastructure\bin\Debug\net7.0\DigitalData.Core.Contracts.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Core.Infrastructure">
-      <HintPath>..\..\WebCoreModules\DigitalData.Core.Infrastructure\bin\Debug\net7.0\DigitalData.Core.Infrastructure.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
 </Project>
diff --git a/DigitalData.UserManager.sln b/DigitalData.UserManager.sln
index 9a2d988..83321f9 100644
--- a/DigitalData.UserManager.sln
+++ b/DigitalData.UserManager.sln
@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.5.33516.290
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DigitalData.UserManager.API", "DigitalData.UserManager.API\DigitalData.UserManager.API.csproj", "{CB433736-C3FC-45FB-8A81-7660DD681498}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DigitalData.UserManager.Domain", "DigitalData.UserManager.Domain\DigitalData.UserManager.Domain.csproj", "{BC8CEADC-F7D6-4469-8718-4B308C386B4D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DigitalData.UserManager.Application", "DigitalData.UserManager.Application\DigitalData.UserManager.Application.csproj", "{0634853C-C515-48AF-8E27-E5CBF592BCE7}"
@@ -13,16 +11,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DigitalData.UserManager.NgW
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DigitalData.UserManager.Infrastructure", "DigitalData.UserManager.Infrastructure\DigitalData.UserManager.Infrastructure.csproj", "{1DD81373-82F9-4872-95C6-888624DB1797}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DigitalData.UserManager.API", "DigitalData.UserManager.API\DigitalData.UserManager.API.csproj", "{07CCD651-647C-49F7-9715-30CEBC13710D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{CB433736-C3FC-45FB-8A81-7660DD681498}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CB433736-C3FC-45FB-8A81-7660DD681498}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CB433736-C3FC-45FB-8A81-7660DD681498}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CB433736-C3FC-45FB-8A81-7660DD681498}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BC8CEADC-F7D6-4469-8718-4B308C386B4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BC8CEADC-F7D6-4469-8718-4B308C386B4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BC8CEADC-F7D6-4469-8718-4B308C386B4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -39,6 +35,10 @@ Global
 		{1DD81373-82F9-4872-95C6-888624DB1797}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1DD81373-82F9-4872-95C6-888624DB1797}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1DD81373-82F9-4872-95C6-888624DB1797}.Release|Any CPU.Build.0 = Release|Any CPU
+		{07CCD651-647C-49F7-9715-30CEBC13710D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{07CCD651-647C-49F7-9715-30CEBC13710D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{07CCD651-647C-49F7-9715-30CEBC13710D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{07CCD651-647C-49F7-9715-30CEBC13710D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE