diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Data/IBoardAggregateRepository.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Data/IBoardAggregateRepository.cs
similarity index 72%
rename from src/2-Services/Boards/Api/Boards.Write.Api/Domain/Data/IBoardAggregateRepository.cs
rename to src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Data/IBoardAggregateRepository.cs
index 8b3e30965..aa5e9dd5b 100644
--- a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Data/IBoardAggregateRepository.cs
+++ b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Data/IBoardAggregateRepository.cs
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using TaskoMask.BuildingBlocks.Domain.Data;
-using TaskoMask.Services.Boards.Write.Api.Domain.Entities;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Entities;
 
-namespace TaskoMask.Services.Boards.Write.Api.Domain.Data
+namespace TaskoMask.Services.Boards.Write.Api.Domain.Boards.Data
 {
     public interface IBoardAggregateRepository : IBaseAggregateRepository<Board>
     {
diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Entities/Board.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Entities/Board.cs
similarity index 92%
rename from src/2-Services/Boards/Api/Boards.Write.Api/Domain/Entities/Board.cs
rename to src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Entities/Board.cs
index 8121b0516..0b2f51699 100644
--- a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Entities/Board.cs
+++ b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Entities/Board.cs
@@ -2,18 +2,18 @@
 using System.Linq;
 using TaskoMask.BuildingBlocks.Contracts.Resources;
 using TaskoMask.BuildingBlocks.Domain.Exceptions;
-using TaskoMask.Services.Boards.Write.Api.Domain.ValueObjects.Boards;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.ValueObjects.Boards;
 using TaskoMask.BuildingBlocks.Contracts.Enums;
-using TaskoMask.Services.Boards.Write.Api.Domain.Specifications;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Specifications;
 using TaskoMask.BuildingBlocks.Contracts.Helpers;
-using TaskoMask.Services.Boards.Write.Api.Domain.Services;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Services;
 using TaskoMask.BuildingBlocks.Domain.Resources;
 using MongoDB.Bson;
-using TaskoMask.Services.Boards.Write.Api.Domain.Events.Boards;
-using TaskoMask.Services.Boards.Write.Api.Domain.Events.Cards;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Boards;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Cards;
 using TaskoMask.BuildingBlocks.Domain.Entities;
 
-namespace TaskoMask.Services.Boards.Write.Api.Domain.Entities
+namespace TaskoMask.Services.Boards.Write.Api.Domain.Boards.Entities
 {
     public class Board: AggregateRoot
     {
diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Entities/Card.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Entities/Card.cs
similarity index 92%
rename from src/2-Services/Boards/Api/Boards.Write.Api/Domain/Entities/Card.cs
rename to src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Entities/Card.cs
index 31cd45c90..7b4492f80 100644
--- a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Entities/Card.cs
+++ b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Entities/Card.cs
@@ -1,11 +1,11 @@
 using TaskoMask.BuildingBlocks.Contracts.Enums;
-using TaskoMask.Services.Boards.Write.Api.Domain.ValueObjects.Cards;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.ValueObjects.Cards;
 using TaskoMask.BuildingBlocks.Contracts.Resources;
 using TaskoMask.BuildingBlocks.Domain.Exceptions;
 using MongoDB.Bson;
 using TaskoMask.BuildingBlocks.Domain.Entities;
 
-namespace TaskoMask.Services.Boards.Write.Api.Domain.Entities
+namespace TaskoMask.Services.Boards.Write.Api.Domain.Boards.Entities
 {
     public class Card : BaseEntity
     {
diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Events/Boards/BoardAddedEvent.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Events/Boards/BoardAddedEvent.cs
similarity index 89%
rename from src/2-Services/Boards/Api/Boards.Write.Api/Domain/Events/Boards/BoardAddedEvent.cs
rename to src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Events/Boards/BoardAddedEvent.cs
index 6d1fd8a0a..cda8917ce 100644
--- a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Events/Boards/BoardAddedEvent.cs
+++ b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Events/Boards/BoardAddedEvent.cs
@@ -1,7 +1,7 @@
 using TaskoMask.BuildingBlocks.Domain.Events;
 using TaskoMask.BuildingBlocks.Domain.Resources;
 
-namespace TaskoMask.Services.Boards.Write.Api.Domain.Events.Boards
+namespace TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Boards
 {
     public class BoardAddedEvent : DomainEvent
     {
diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Events/Boards/BoardDeletedEvent.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Events/Boards/BoardDeletedEvent.cs
similarity index 82%
rename from src/2-Services/Boards/Api/Boards.Write.Api/Domain/Events/Boards/BoardDeletedEvent.cs
rename to src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Events/Boards/BoardDeletedEvent.cs
index e6209c1d5..bb313fba9 100644
--- a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Events/Boards/BoardDeletedEvent.cs
+++ b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Events/Boards/BoardDeletedEvent.cs
@@ -1,7 +1,7 @@
 using TaskoMask.BuildingBlocks.Domain.Events;
 using TaskoMask.BuildingBlocks.Domain.Resources;
 
-namespace TaskoMask.Services.Boards.Write.Api.Domain.Events.Boards
+namespace TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Boards
 {
     public class BoardDeletedEvent : DomainEvent
     {
diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Events/Boards/BoardUpdatedEvent.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Events/Boards/BoardUpdatedEvent.cs
similarity index 87%
rename from src/2-Services/Boards/Api/Boards.Write.Api/Domain/Events/Boards/BoardUpdatedEvent.cs
rename to src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Events/Boards/BoardUpdatedEvent.cs
index fa5354b28..a2c4c2cb0 100644
--- a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Events/Boards/BoardUpdatedEvent.cs
+++ b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Events/Boards/BoardUpdatedEvent.cs
@@ -1,7 +1,7 @@
 using TaskoMask.BuildingBlocks.Domain.Events;
 using TaskoMask.BuildingBlocks.Domain.Resources;
 
-namespace TaskoMask.Services.Boards.Write.Api.Domain.Events.Boards
+namespace TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Boards
 {
     public class BoardUpdatedEvent : DomainEvent
     {
diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Events/Cards/CardAddedEvent.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Events/Cards/CardAddedEvent.cs
similarity index 90%
rename from src/2-Services/Boards/Api/Boards.Write.Api/Domain/Events/Cards/CardAddedEvent.cs
rename to src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Events/Cards/CardAddedEvent.cs
index 0e0ebd6dd..22a56ce41 100644
--- a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Events/Cards/CardAddedEvent.cs
+++ b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Events/Cards/CardAddedEvent.cs
@@ -2,7 +2,7 @@
 using TaskoMask.BuildingBlocks.Domain.Events;
 using TaskoMask.BuildingBlocks.Domain.Resources;
 
-namespace TaskoMask.Services.Boards.Write.Api.Domain.Events.Cards
+namespace TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Cards
 {
     public class CardAddedEvent : DomainEvent
     {
diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Events/Cards/CardDeletedEvent.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Events/Cards/CardDeletedEvent.cs
similarity index 82%
rename from src/2-Services/Boards/Api/Boards.Write.Api/Domain/Events/Cards/CardDeletedEvent.cs
rename to src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Events/Cards/CardDeletedEvent.cs
index e0ec15d25..ca5d554fb 100644
--- a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Events/Cards/CardDeletedEvent.cs
+++ b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Events/Cards/CardDeletedEvent.cs
@@ -1,7 +1,7 @@
 using TaskoMask.BuildingBlocks.Domain.Events;
 using TaskoMask.BuildingBlocks.Domain.Resources;
 
-namespace TaskoMask.Services.Boards.Write.Api.Domain.Events.Cards
+namespace TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Cards
 {
     public class CardDeletedEvent : DomainEvent
     {
diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Events/Cards/CardUpdatedEvent.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Events/Cards/CardUpdatedEvent.cs
similarity index 88%
rename from src/2-Services/Boards/Api/Boards.Write.Api/Domain/Events/Cards/CardUpdatedEvent.cs
rename to src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Events/Cards/CardUpdatedEvent.cs
index bac6c30fc..4d756f6e6 100644
--- a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Events/Cards/CardUpdatedEvent.cs
+++ b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Events/Cards/CardUpdatedEvent.cs
@@ -2,7 +2,7 @@
 using TaskoMask.BuildingBlocks.Domain.Events;
 using TaskoMask.BuildingBlocks.Domain.Resources;
 
-namespace TaskoMask.Services.Boards.Write.Api.Domain.Events.Cards
+namespace TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Cards
 {
     public class CardUpdatedEvent : DomainEvent
     {
diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Services/IBoardValidatorService.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Services/IBoardValidatorService.cs
similarity index 81%
rename from src/2-Services/Boards/Api/Boards.Write.Api/Domain/Services/IBoardValidatorService.cs
rename to src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Services/IBoardValidatorService.cs
index 3cec220f0..f9df2441b 100644
--- a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Services/IBoardValidatorService.cs
+++ b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Services/IBoardValidatorService.cs
@@ -1,5 +1,5 @@
 
-namespace TaskoMask.Services.Boards.Write.Api.Domain.Services
+namespace TaskoMask.Services.Boards.Write.Api.Domain.Boards.Services
 {
     /// <summary>
     /// 
diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Specifications/BoardMaxCardsSpecification.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Specifications/BoardMaxCardsSpecification.cs
similarity index 74%
rename from src/2-Services/Boards/Api/Boards.Write.Api/Domain/Specifications/BoardMaxCardsSpecification.cs
rename to src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Specifications/BoardMaxCardsSpecification.cs
index a84d94639..4bdba84e5 100644
--- a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Specifications/BoardMaxCardsSpecification.cs
+++ b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Specifications/BoardMaxCardsSpecification.cs
@@ -1,9 +1,9 @@
 using System.Linq;
 using TaskoMask.BuildingBlocks.Domain.Specifications;
 using TaskoMask.BuildingBlocks.Contracts.Helpers;
-using TaskoMask.Services.Boards.Write.Api.Domain.Entities;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Entities;
 
-namespace TaskoMask.Services.Boards.Write.Api.Domain.Specifications
+namespace TaskoMask.Services.Boards.Write.Api.Domain.Boards.Specifications
 {
     internal class BoardMaxCardsSpecification : ISpecification<Board>
     {
diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Specifications/BoardNameAndDescriptionCannotSameSpecification.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Specifications/BoardNameAndDescriptionCannotSameSpecification.cs
similarity index 72%
rename from src/2-Services/Boards/Api/Boards.Write.Api/Domain/Specifications/BoardNameAndDescriptionCannotSameSpecification.cs
rename to src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Specifications/BoardNameAndDescriptionCannotSameSpecification.cs
index a90a1efd4..bb3f99921 100644
--- a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Specifications/BoardNameAndDescriptionCannotSameSpecification.cs
+++ b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Specifications/BoardNameAndDescriptionCannotSameSpecification.cs
@@ -1,7 +1,7 @@
 using TaskoMask.BuildingBlocks.Domain.Specifications;
-using TaskoMask.Services.Boards.Write.Api.Domain.Entities;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Entities;
 
-namespace TaskoMask.Services.Boards.Write.Api.Domain.Specifications
+namespace TaskoMask.Services.Boards.Write.Api.Domain.Boards.Specifications
 {
     internal class BoardNameAndDescriptionCannotSameSpecification : ISpecification<Board>
     {
diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Specifications/BoardNameMustUniqueSpecification.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Specifications/BoardNameMustUniqueSpecification.cs
similarity index 75%
rename from src/2-Services/Boards/Api/Boards.Write.Api/Domain/Specifications/BoardNameMustUniqueSpecification.cs
rename to src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Specifications/BoardNameMustUniqueSpecification.cs
index e2cfcaa3b..ad43aecee 100644
--- a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Specifications/BoardNameMustUniqueSpecification.cs
+++ b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Specifications/BoardNameMustUniqueSpecification.cs
@@ -1,8 +1,8 @@
 using TaskoMask.BuildingBlocks.Domain.Specifications;
-using TaskoMask.Services.Boards.Write.Api.Domain.Entities;
-using TaskoMask.Services.Boards.Write.Api.Domain.Services;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Entities;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Services;
 
-namespace TaskoMask.Services.Boards.Write.Api.Domain.Specifications
+namespace TaskoMask.Services.Boards.Write.Api.Domain.Boards.Specifications
 {
     internal class BoardNameMustUniqueSpecification : ISpecification<Board>
     {
diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Specifications/CardNameMustUniqueSpecification.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Specifications/CardNameMustUniqueSpecification.cs
similarity index 80%
rename from src/2-Services/Boards/Api/Boards.Write.Api/Domain/Specifications/CardNameMustUniqueSpecification.cs
rename to src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Specifications/CardNameMustUniqueSpecification.cs
index c08702a9c..6f5d3eb1e 100644
--- a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Specifications/CardNameMustUniqueSpecification.cs
+++ b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Specifications/CardNameMustUniqueSpecification.cs
@@ -1,8 +1,8 @@
 using System.Linq;
 using TaskoMask.BuildingBlocks.Domain.Specifications;
-using TaskoMask.Services.Boards.Write.Api.Domain.Entities;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Entities;
 
-namespace TaskoMask.Services.Boards.Write.Api.Domain.Specifications
+namespace TaskoMask.Services.Boards.Write.Api.Domain.Boards.Specifications
 {
 
     internal class CardNameMustUniqueSpecification : ISpecification<Board>
diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/ValueObjects/Boards/BoardDescription.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/ValueObjects/Boards/BoardDescription.cs
similarity index 94%
rename from src/2-Services/Boards/Api/Boards.Write.Api/Domain/ValueObjects/Boards/BoardDescription.cs
rename to src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/ValueObjects/Boards/BoardDescription.cs
index 5723d0ea0..6bab3193b 100644
--- a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/ValueObjects/Boards/BoardDescription.cs
+++ b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/ValueObjects/Boards/BoardDescription.cs
@@ -5,7 +5,7 @@
 using TaskoMask.BuildingBlocks.Contracts.Resources;
 using TaskoMask.BuildingBlocks.Domain.ValueObjects;
 
-namespace TaskoMask.Services.Boards.Write.Api.Domain.ValueObjects.Boards
+namespace TaskoMask.Services.Boards.Write.Api.Domain.Boards.ValueObjects.Boards
 {
     public class BoardDescription : BaseValueObject
     {
diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/ValueObjects/Boards/BoardName.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/ValueObjects/Boards/BoardName.cs
similarity index 95%
rename from src/2-Services/Boards/Api/Boards.Write.Api/Domain/ValueObjects/Boards/BoardName.cs
rename to src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/ValueObjects/Boards/BoardName.cs
index 8f69c52e1..b0cac1bca 100644
--- a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/ValueObjects/Boards/BoardName.cs
+++ b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/ValueObjects/Boards/BoardName.cs
@@ -5,7 +5,7 @@
 using TaskoMask.BuildingBlocks.Contracts.Resources;
 using TaskoMask.BuildingBlocks.Domain.ValueObjects;
 
-namespace TaskoMask.Services.Boards.Write.Api.Domain.ValueObjects.Boards
+namespace TaskoMask.Services.Boards.Write.Api.Domain.Boards.ValueObjects.Boards
 {
     public class BoardName : BaseValueObject
     {
diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/ValueObjects/Boards/BoardProjectId.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/ValueObjects/Boards/BoardProjectId.cs
similarity index 94%
rename from src/2-Services/Boards/Api/Boards.Write.Api/Domain/ValueObjects/Boards/BoardProjectId.cs
rename to src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/ValueObjects/Boards/BoardProjectId.cs
index d7a3a4900..4e859e0c5 100644
--- a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/ValueObjects/Boards/BoardProjectId.cs
+++ b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/ValueObjects/Boards/BoardProjectId.cs
@@ -4,7 +4,7 @@
 using TaskoMask.BuildingBlocks.Contracts.Resources;
 using TaskoMask.BuildingBlocks.Domain.ValueObjects;
 
-namespace TaskoMask.Services.Boards.Write.Api.Domain.ValueObjects.Boards
+namespace TaskoMask.Services.Boards.Write.Api.Domain.Boards.ValueObjects.Boards
 {
     public class BoardProjectId : BaseValueObject
     {
diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/ValueObjects/Cards/CardName.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/ValueObjects/Cards/CardName.cs
similarity index 95%
rename from src/2-Services/Boards/Api/Boards.Write.Api/Domain/ValueObjects/Cards/CardName.cs
rename to src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/ValueObjects/Cards/CardName.cs
index e1cabfedf..e36b9650c 100644
--- a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/ValueObjects/Cards/CardName.cs
+++ b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/ValueObjects/Cards/CardName.cs
@@ -5,7 +5,7 @@
 using TaskoMask.BuildingBlocks.Contracts.Resources;
 using TaskoMask.BuildingBlocks.Domain.ValueObjects;
 
-namespace TaskoMask.Services.Boards.Write.Api.Domain.ValueObjects.Cards
+namespace TaskoMask.Services.Boards.Write.Api.Domain.Boards.ValueObjects.Cards
 {
     public class CardName : BaseValueObject
     {
diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/ValueObjects/Cards/CardType.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/ValueObjects/Cards/CardType.cs
similarity index 93%
rename from src/2-Services/Boards/Api/Boards.Write.Api/Domain/ValueObjects/Cards/CardType.cs
rename to src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/ValueObjects/Cards/CardType.cs
index 0453661f2..f1a171574 100644
--- a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/ValueObjects/Cards/CardType.cs
+++ b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/ValueObjects/Cards/CardType.cs
@@ -6,7 +6,7 @@
 using TaskoMask.BuildingBlocks.Contracts.Resources;
 using TaskoMask.BuildingBlocks.Domain.ValueObjects;
 
-namespace TaskoMask.Services.Boards.Write.Api.Domain.ValueObjects.Cards
+namespace TaskoMask.Services.Boards.Write.Api.Domain.Boards.ValueObjects.Cards
 {
     public class CardType : BaseValueObject
     {
diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/CrossCutting/DI/InfrastructureModule.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/CrossCutting/DI/InfrastructureModule.cs
index ed41b049e..4324eb2b8 100644
--- a/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/CrossCutting/DI/InfrastructureModule.cs
+++ b/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/CrossCutting/DI/InfrastructureModule.cs
@@ -3,8 +3,8 @@
 using TaskoMask.BuildingBlocks.Infrastructure.Extensions;
 using TaskoMask.BuildingBlocks.Infrastructure.MongoDB;
 using TaskoMask.Services.Boards.Write.Api.Resources;
-using TaskoMask.Services.Boards.Write.Api.Domain.Data;
-using TaskoMask.Services.Boards.Write.Api.Domain.Services;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Data;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Services;
 using TaskoMask.Services.Boards.Write.Api.Infrastructure.Data.DbContext;
 using TaskoMask.Services.Boards.Write.Api.Infrastructure.Data.Repositories;
 using TaskoMask.Services.Boards.Write.Api.Infrastructure.Data.Services;
diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/Data/DbContext/BoardWriteDbContext.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/Data/DbContext/BoardWriteDbContext.cs
index 8878aab42..69e79eac0 100644
--- a/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/Data/DbContext/BoardWriteDbContext.cs
+++ b/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/Data/DbContext/BoardWriteDbContext.cs
@@ -1,7 +1,7 @@
 using MongoDB.Driver;
 using TaskoMask.BuildingBlocks.Infrastructure.MongoDB;
 using Microsoft.Extensions.Options;
-using TaskoMask.Services.Boards.Write.Api.Domain.Entities;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Entities;
 
 namespace TaskoMask.Services.Boards.Write.Api.Infrastructure.Data.DbContext
 {
diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/Data/DbContext/DbInitialization.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/Data/DbContext/DbInitialization.cs
index b141c4d15..79c1bf29a 100644
--- a/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/Data/DbContext/DbInitialization.cs
+++ b/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/Data/DbContext/DbInitialization.cs
@@ -2,7 +2,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using MongoDB.Driver;
 using System;
-using TaskoMask.Services.Boards.Write.Api.Domain.Entities;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Entities;
 
 namespace TaskoMask.Services.Boards.Write.Api.Infrastructure.Data.DbContext
 {
diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/Data/Repositories/BoardAggregateRepository.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/Data/Repositories/BoardAggregateRepository.cs
index d5a4ec458..9eadb4078 100644
--- a/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/Data/Repositories/BoardAggregateRepository.cs
+++ b/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/Data/Repositories/BoardAggregateRepository.cs
@@ -3,8 +3,8 @@
 using System.Linq;
 using System.Threading.Tasks;
 using TaskoMask.BuildingBlocks.Infrastructure.MongoDB;
-using TaskoMask.Services.Boards.Write.Api.Domain.Data;
-using TaskoMask.Services.Boards.Write.Api.Domain.Entities;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Data;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Entities;
 using TaskoMask.Services.Boards.Write.Api.Infrastructure.Data.DbContext;
 
 namespace TaskoMask.Services.Boards.Write.Api.Infrastructure.Data.Repositories
diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/Data/Services/BoardValidatorService.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/Data/Services/BoardValidatorService.cs
index 9d4ded2b1..24c841e47 100644
--- a/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/Data/Services/BoardValidatorService.cs
+++ b/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/Data/Services/BoardValidatorService.cs
@@ -1,6 +1,6 @@
 
-using TaskoMask.Services.Boards.Write.Api.Domain.Data;
-using TaskoMask.Services.Boards.Write.Api.Domain.Services;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Data;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Services;
 
 namespace TaskoMask.Services.Boards.Write.Api.Infrastructure.Data.Services
 {
diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Boards/AddBoard/AddBoardUseCase.cs b/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Boards/AddBoard/AddBoardUseCase.cs
index a237e2be1..adf28995f 100644
--- a/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Boards/AddBoard/AddBoardUseCase.cs
+++ b/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Boards/AddBoard/AddBoardUseCase.cs
@@ -10,10 +10,10 @@
 using TaskoMask.BuildingBlocks.Contracts.Helpers;
 using TaskoMask.BuildingBlocks.Contracts.Resources;
 using TaskoMask.BuildingBlocks.Domain.Events;
-using TaskoMask.Services.Boards.Write.Api.Domain.Data;
-using TaskoMask.Services.Boards.Write.Api.Domain.Entities;
-using TaskoMask.Services.Boards.Write.Api.Domain.Events.Boards;
-using TaskoMask.Services.Boards.Write.Api.Domain.Services;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Data;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Entities;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Boards;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Services;
 
 namespace TaskoMask.Services.Boards.Write.Api.UseCases.Boards.AddBoard
 {
diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Boards/DeleteBoard/DeleteBoardUseCase.cs b/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Boards/DeleteBoard/DeleteBoardUseCase.cs
index 7358da7a2..8b560382d 100644
--- a/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Boards/DeleteBoard/DeleteBoardUseCase.cs
+++ b/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Boards/DeleteBoard/DeleteBoardUseCase.cs
@@ -11,8 +11,8 @@
 using TaskoMask.BuildingBlocks.Contracts.Resources;
 using TaskoMask.BuildingBlocks.Domain.Events;
 using TaskoMask.BuildingBlocks.Domain.Resources;
-using TaskoMask.Services.Boards.Write.Api.Domain.Data;
-using TaskoMask.Services.Boards.Write.Api.Domain.Events.Boards;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Data;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Boards;
 
 namespace TaskoMask.Services.Boards.Write.Api.UseCases.Boards.DeleteBoard
 {
diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Boards/UpdateBoard/UpdateBoardUseCase.cs b/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Boards/UpdateBoard/UpdateBoardUseCase.cs
index 1099d69a5..d55ea6bba 100644
--- a/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Boards/UpdateBoard/UpdateBoardUseCase.cs
+++ b/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Boards/UpdateBoard/UpdateBoardUseCase.cs
@@ -11,9 +11,9 @@
 using TaskoMask.BuildingBlocks.Contracts.Resources;
 using TaskoMask.BuildingBlocks.Domain.Events;
 using TaskoMask.BuildingBlocks.Domain.Resources;
-using TaskoMask.Services.Boards.Write.Api.Domain.Data;
-using TaskoMask.Services.Boards.Write.Api.Domain.Events.Boards;
-using TaskoMask.Services.Boards.Write.Api.Domain.Services;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Data;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Boards;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Services;
 
 namespace TaskoMask.Services.Boards.Write.Api.UseCases.Boards.UpdateBoard
 {
diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Cards/AddCard/AddCardUseCase.cs b/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Cards/AddCard/AddCardUseCase.cs
index 774d1591a..a3646f0f7 100644
--- a/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Cards/AddCard/AddCardUseCase.cs
+++ b/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Cards/AddCard/AddCardUseCase.cs
@@ -12,9 +12,9 @@
 using TaskoMask.BuildingBlocks.Contracts.Resources;
 using TaskoMask.BuildingBlocks.Domain.Events;
 using TaskoMask.BuildingBlocks.Domain.Resources;
-using TaskoMask.Services.Boards.Write.Api.Domain.Data;
-using TaskoMask.Services.Boards.Write.Api.Domain.Entities;
-using TaskoMask.Services.Boards.Write.Api.Domain.Events.Cards;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Data;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Entities;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Cards;
 
 namespace TaskoMask.Services.Boards.Write.Api.UseCases.Cards.AddCard
 {
diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Cards/DeleteCard/DeleteCardUseCase.cs b/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Cards/DeleteCard/DeleteCardUseCase.cs
index 534c3a91f..ff0f54489 100644
--- a/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Cards/DeleteCard/DeleteCardUseCase.cs
+++ b/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Cards/DeleteCard/DeleteCardUseCase.cs
@@ -11,8 +11,8 @@
 using TaskoMask.BuildingBlocks.Contracts.Resources;
 using TaskoMask.BuildingBlocks.Domain.Events;
 using TaskoMask.BuildingBlocks.Domain.Resources;
-using TaskoMask.Services.Boards.Write.Api.Domain.Data;
-using TaskoMask.Services.Boards.Write.Api.Domain.Events.Cards;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Data;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Cards;
 
 namespace TaskoMask.Services.Boards.Write.Api.UseCases.Cards.DeleteCard
 {
diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Cards/UpdateCard/UpdateCardUseCase.cs b/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Cards/UpdateCard/UpdateCardUseCase.cs
index f46c4933f..d6073984d 100644
--- a/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Cards/UpdateCard/UpdateCardUseCase.cs
+++ b/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Cards/UpdateCard/UpdateCardUseCase.cs
@@ -11,8 +11,8 @@
 using TaskoMask.BuildingBlocks.Contracts.Resources;
 using TaskoMask.BuildingBlocks.Domain.Events;
 using TaskoMask.BuildingBlocks.Domain.Resources;
-using TaskoMask.Services.Boards.Write.Api.Domain.Data;
-using TaskoMask.Services.Boards.Write.Api.Domain.Events.Cards;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Data;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Cards;
 
 namespace TaskoMask.Services.Boards.Write.Api.UseCases.Cards.UpdateCard
 {
diff --git a/src/2-Services/Boards/Tests/Boards.Write.Tests.Base/TestData/BoardBuilder.cs b/src/2-Services/Boards/Tests/Boards.Write.Tests.Base/TestData/BoardBuilder.cs
index 98c9b5c27..1439c902f 100644
--- a/src/2-Services/Boards/Tests/Boards.Write.Tests.Base/TestData/BoardBuilder.cs
+++ b/src/2-Services/Boards/Tests/Boards.Write.Tests.Base/TestData/BoardBuilder.cs
@@ -1,5 +1,5 @@
-using TaskoMask.Services.Boards.Write.Api.Domain.Entities;
-using TaskoMask.Services.Boards.Write.Api.Domain.Services;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Entities;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Services;
 
 namespace TaskoMask.Services.Boards.Write.Tests.Base.TestData
 {
diff --git a/src/2-Services/Boards/Tests/Boards.Write.Tests.Base/TestData/BoardObjectMother.cs b/src/2-Services/Boards/Tests/Boards.Write.Tests.Base/TestData/BoardObjectMother.cs
index 73f8b65e1..4dab47e98 100644
--- a/src/2-Services/Boards/Tests/Boards.Write.Tests.Base/TestData/BoardObjectMother.cs
+++ b/src/2-Services/Boards/Tests/Boards.Write.Tests.Base/TestData/BoardObjectMother.cs
@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using TaskoMask.BuildingBlocks.Contracts.Enums;
 using TaskoMask.BuildingBlocks.Test.TestData;
-using TaskoMask.Services.Boards.Write.Api.Domain.Entities;
-using TaskoMask.Services.Boards.Write.Api.Domain.Services;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Entities;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Services;
 
 namespace TaskoMask.Services.Boards.Write.Tests.Base.TestData
 {
diff --git a/src/2-Services/Boards/Tests/Boards.Write.Tests.Integration/Fixtures/TestsBaseFixture.cs b/src/2-Services/Boards/Tests/Boards.Write.Tests.Integration/Fixtures/TestsBaseFixture.cs
index 0e513fed2..132a8ca1b 100644
--- a/src/2-Services/Boards/Tests/Boards.Write.Tests.Integration/Fixtures/TestsBaseFixture.cs
+++ b/src/2-Services/Boards/Tests/Boards.Write.Tests.Integration/Fixtures/TestsBaseFixture.cs
@@ -3,9 +3,9 @@
 using NSubstitute;
 using TaskoMask.BuildingBlocks.Application.Bus;
 using TaskoMask.BuildingBlocks.Test.TestBase;
-using TaskoMask.Services.Boards.Write.Api.Domain.Data;
-using TaskoMask.Services.Boards.Write.Api.Domain.Entities;
-using TaskoMask.Services.Boards.Write.Api.Domain.Services;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Data;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Entities;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Services;
 using TaskoMask.Services.Boards.Write.Api.Infrastructure.CrossCutting.DI;
 using TaskoMask.Services.Boards.Write.Api.Infrastructure.Data.DbContext;
 
diff --git a/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/Fixtures/TestsBaseFixture.cs b/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/Fixtures/TestsBaseFixture.cs
index 4400e9a59..0c9e4b7bd 100644
--- a/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/Fixtures/TestsBaseFixture.cs
+++ b/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/Fixtures/TestsBaseFixture.cs
@@ -1,9 +1,9 @@
 using NSubstitute;
 using TaskoMask.BuildingBlocks.Application.Bus;
 using TaskoMask.BuildingBlocks.Test.TestBase;
-using TaskoMask.Services.Boards.Write.Api.Domain.Data;
-using TaskoMask.Services.Boards.Write.Api.Domain.Entities;
-using TaskoMask.Services.Boards.Write.Api.Domain.Services;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Data;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Entities;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Services;
 using TaskoMask.Services.Boards.Write.Tests.Base.TestData;
 
 namespace TaskoMask.Services.Boards.Write.Tests.Unit.Fixtures
diff --git a/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Boards/AddBoardTests.cs b/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Boards/AddBoardTests.cs
index ce6462d81..24a143694 100644
--- a/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Boards/AddBoardTests.cs
+++ b/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Boards/AddBoardTests.cs
@@ -7,8 +7,8 @@
 using TaskoMask.BuildingBlocks.Domain.Exceptions;
 using TaskoMask.BuildingBlocks.Domain.Resources;
 using TaskoMask.Services.Boards.Write.Api.UseCases.Boards.AddBoard;
-using TaskoMask.Services.Boards.Write.Api.Domain.Events.Boards;
-using TaskoMask.Services.Boards.Write.Api.Domain.ValueObjects.Boards;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Boards;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.ValueObjects.Boards;
 using TaskoMask.Services.Boards.Write.Tests.Unit.Fixtures;
 using Xunit;
 
diff --git a/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Boards/DeleteBoardTests.cs b/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Boards/DeleteBoardTests.cs
index 40805c7b5..def1d06c6 100644
--- a/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Boards/DeleteBoardTests.cs
+++ b/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Boards/DeleteBoardTests.cs
@@ -5,7 +5,7 @@
 using TaskoMask.BuildingBlocks.Contracts.Resources;
 using TaskoMask.BuildingBlocks.Domain.Resources;
 using TaskoMask.Services.Boards.Write.Api.UseCases.Boards.DeleteBoard;
-using TaskoMask.Services.Boards.Write.Api.Domain.Events.Boards;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Boards;
 using TaskoMask.Services.Boards.Write.Tests.Unit.Fixtures;
 using Xunit;
 
diff --git a/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Boards/UpdateBoardTests.cs b/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Boards/UpdateBoardTests.cs
index a2e5fb92c..f71929f01 100644
--- a/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Boards/UpdateBoardTests.cs
+++ b/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Boards/UpdateBoardTests.cs
@@ -5,7 +5,7 @@
 using TaskoMask.BuildingBlocks.Contracts.Resources;
 using TaskoMask.BuildingBlocks.Domain.Resources;
 using TaskoMask.Services.Boards.Write.Api.UseCases.Boards.UpdateBoard;
-using TaskoMask.Services.Boards.Write.Api.Domain.Events.Boards;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Boards;
 using TaskoMask.Services.Boards.Write.Tests.Unit.Fixtures;
 using Xunit;
 
diff --git a/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Cards/AddCardTests.cs b/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Cards/AddCardTests.cs
index 4d4b6ab7b..3e289fee3 100644
--- a/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Cards/AddCardTests.cs
+++ b/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Cards/AddCardTests.cs
@@ -6,7 +6,7 @@
 using TaskoMask.BuildingBlocks.Contracts.Resources;
 using TaskoMask.BuildingBlocks.Domain.Resources;
 using TaskoMask.Services.Boards.Write.Api.UseCases.Cards.AddCard;
-using TaskoMask.Services.Boards.Write.Api.Domain.Events.Cards;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Cards;
 using TaskoMask.Services.Boards.Write.Tests.Unit.Fixtures;
 using Xunit;
 
diff --git a/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Cards/DeleteCardTests.cs b/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Cards/DeleteCardTests.cs
index 0ab24e92f..c86519141 100644
--- a/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Cards/DeleteCardTests.cs
+++ b/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Cards/DeleteCardTests.cs
@@ -7,7 +7,7 @@
 using TaskoMask.BuildingBlocks.Domain.Exceptions;
 using TaskoMask.BuildingBlocks.Domain.Resources;
 using TaskoMask.Services.Boards.Write.Api.UseCases.Cards.DeleteCard;
-using TaskoMask.Services.Boards.Write.Api.Domain.Events.Cards;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Cards;
 using TaskoMask.Services.Boards.Write.Tests.Unit.Fixtures;
 using TaskoMask.Services.Boards.Write.Tests.Base.TestData;
 using Xunit;
diff --git a/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Cards/UpdateCardTests.cs b/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Cards/UpdateCardTests.cs
index c095b0d9c..064065950 100644
--- a/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Cards/UpdateCardTests.cs
+++ b/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Cards/UpdateCardTests.cs
@@ -6,7 +6,7 @@
 using TaskoMask.BuildingBlocks.Contracts.Resources;
 using TaskoMask.BuildingBlocks.Domain.Resources;
 using TaskoMask.Services.Boards.Write.Api.UseCases.Cards.UpdateCard;
-using TaskoMask.Services.Boards.Write.Api.Domain.Events.Cards;
+using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Cards;
 using TaskoMask.Services.Boards.Write.Tests.Unit.Fixtures;
 using TaskoMask.Services.Boards.Write.Tests.Base.TestData;
 using Xunit;