diff --git a/src/Client/Models/ChatMessage.cs b/src/Client/Models/ChatMessage.cs
index 68fae728d..7cc49b1b6 100644
--- a/src/Client/Models/ChatMessage.cs
+++ b/src/Client/Models/ChatMessage.cs
@@ -1,4 +1,4 @@
-namespace AdminDashboard.Wasm.Models
+namespace BlazorHero.CleanArchitecture.Client.Models
 {
     public class ChatMessage
     {
diff --git a/src/Client/Models/ChatUser.cs b/src/Client/Models/ChatUser.cs
index 9a9f0d2e0..0bd7f24d2 100644
--- a/src/Client/Models/ChatUser.cs
+++ b/src/Client/Models/ChatUser.cs
@@ -1,6 +1,6 @@
 using MudBlazor;
 
-namespace AdminDashboard.Wasm.Models
+namespace BlazorHero.CleanArchitecture.Client.Models
 {
     public class ChatUser
     {
diff --git a/src/Server/Controllers/Identity/RoleClaimController.cs b/src/Server/Controllers/Identity/RoleClaimController.cs
index 651d1c598..0df28e5e0 100644
--- a/src/Server/Controllers/Identity/RoleClaimController.cs
+++ b/src/Server/Controllers/Identity/RoleClaimController.cs
@@ -5,7 +5,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace BlazorHero.CleanArchitecture.Server.Controllers
+namespace BlazorHero.CleanArchitecture.Server.Controllers.Identity
 {
     [Route("api/identity/roleClaim")]
     [ApiController]
diff --git a/src/Server/Controllers/Identity/RoleController.cs b/src/Server/Controllers/Identity/RoleController.cs
index fb7c6a807..5a63b9ab3 100644
--- a/src/Server/Controllers/Identity/RoleController.cs
+++ b/src/Server/Controllers/Identity/RoleController.cs
@@ -1,11 +1,11 @@
-using BlazorHero.CleanArchitecture.Application.Interfaces.Services.Identity;
+using System.Threading.Tasks;
+using BlazorHero.CleanArchitecture.Application.Interfaces.Services.Identity;
 using BlazorHero.CleanArchitecture.Application.Requests.Identity;
 using BlazorHero.CleanArchitecture.Shared.Constants.Permission;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
 
-namespace BlazorHero.CleanArchitecture.Server.Controllers
+namespace BlazorHero.CleanArchitecture.Server.Controllers.Identity
 {
     [Route("api/identity/role")]
     [ApiController]
diff --git a/src/Server/Server.csproj b/src/Server/Server.csproj
index 6af0f3491..7ce062a71 100644
--- a/src/Server/Server.csproj
+++ b/src/Server/Server.csproj
@@ -52,7 +52,6 @@
     <ProjectReference Include="..\Infrastructure.Shared\Infrastructure.Shared.csproj" />
     <ProjectReference Include="..\Infrastructure\Infrastructure.csproj" />
     <ProjectReference Include="..\Shared\Shared.csproj" />
-    <ProjectReference Include="..\Client\Client.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Files\Images\ProfilePictures\" />