diff --git a/DbFirst.Application/Catalogs/CatalogProfile.cs b/DbFirst.Application/Catalogs/CatalogProfile.cs
index ca4bb3a..457675d 100644
--- a/DbFirst.Application/Catalogs/CatalogProfile.cs
+++ b/DbFirst.Application/Catalogs/CatalogProfile.cs
@@ -1,5 +1,6 @@
 using AutoMapper;
 using DbFirst.Domain.Entities;
+using DbFirst.Contracts.Catalogs;
 
 namespace DbFirst.Application.Catalogs;
 
diff --git a/DbFirst.Application/Catalogs/Commands/CreateCatalogCommand.cs b/DbFirst.Application/Catalogs/Commands/CreateCatalogCommand.cs
index 01ab78b..0891812 100644
--- a/DbFirst.Application/Catalogs/Commands/CreateCatalogCommand.cs
+++ b/DbFirst.Application/Catalogs/Commands/CreateCatalogCommand.cs
@@ -1,4 +1,5 @@
 using MediatR;
+using DbFirst.Contracts.Catalogs;
 
 namespace DbFirst.Application.Catalogs.Commands;
 
diff --git a/DbFirst.Application/Catalogs/Commands/CreateCatalogHandler.cs b/DbFirst.Application/Catalogs/Commands/CreateCatalogHandler.cs
index ccef126..37b71ae 100644
--- a/DbFirst.Application/Catalogs/Commands/CreateCatalogHandler.cs
+++ b/DbFirst.Application/Catalogs/Commands/CreateCatalogHandler.cs
@@ -2,6 +2,7 @@ using AutoMapper;
 using DbFirst.Application.Repositories;
 using DbFirst.Domain.Entities;
 using MediatR;
+using DbFirst.Contracts.Catalogs;
 
 namespace DbFirst.Application.Catalogs.Commands;
 
diff --git a/DbFirst.Application/Catalogs/Commands/DeleteCatalogCommand.cs b/DbFirst.Application/Catalogs/Commands/DeleteCatalogCommand.cs
index 72892db..133d1ac 100644
--- a/DbFirst.Application/Catalogs/Commands/DeleteCatalogCommand.cs
+++ b/DbFirst.Application/Catalogs/Commands/DeleteCatalogCommand.cs
@@ -1,4 +1,5 @@
 using MediatR;
+using DbFirst.Contracts.Catalogs;
 
 namespace DbFirst.Application.Catalogs.Commands;
 
diff --git a/DbFirst.Application/Catalogs/Commands/DeleteCatalogHandler.cs b/DbFirst.Application/Catalogs/Commands/DeleteCatalogHandler.cs
index 8356117..4216486 100644
--- a/DbFirst.Application/Catalogs/Commands/DeleteCatalogHandler.cs
+++ b/DbFirst.Application/Catalogs/Commands/DeleteCatalogHandler.cs
@@ -1,5 +1,6 @@
 using DbFirst.Application.Repositories;
 using MediatR;
+using DbFirst.Contracts.Catalogs;
 
 namespace DbFirst.Application.Catalogs.Commands;
 
diff --git a/DbFirst.Application/Catalogs/Commands/UpdateCatalogCommand.cs b/DbFirst.Application/Catalogs/Commands/UpdateCatalogCommand.cs
index 9a8eb0e..84c0c50 100644
--- a/DbFirst.Application/Catalogs/Commands/UpdateCatalogCommand.cs
+++ b/DbFirst.Application/Catalogs/Commands/UpdateCatalogCommand.cs
@@ -1,4 +1,5 @@
 using MediatR;
+using DbFirst.Contracts.Catalogs;
 
 namespace DbFirst.Application.Catalogs.Commands;
 
diff --git a/DbFirst.Application/Catalogs/Commands/UpdateCatalogHandler.cs b/DbFirst.Application/Catalogs/Commands/UpdateCatalogHandler.cs
index 193cd1a..b6485f3 100644
--- a/DbFirst.Application/Catalogs/Commands/UpdateCatalogHandler.cs
+++ b/DbFirst.Application/Catalogs/Commands/UpdateCatalogHandler.cs
@@ -3,6 +3,7 @@ using DbFirst.Application.Repositories;
 using DbFirst.Domain.Entities;
 using DbFirst.Domain;
 using MediatR;
+using DbFirst.Contracts.Catalogs;
 
 namespace DbFirst.Application.Catalogs.Commands;
 
diff --git a/DbFirst.Application/Catalogs/Queries/GetAllCatalogsHandler.cs b/DbFirst.Application/Catalogs/Queries/GetAllCatalogsHandler.cs
index e1d952b..4c8e765 100644
--- a/DbFirst.Application/Catalogs/Queries/GetAllCatalogsHandler.cs
+++ b/DbFirst.Application/Catalogs/Queries/GetAllCatalogsHandler.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using DbFirst.Application.Repositories;
 using MediatR;
+using DbFirst.Contracts.Catalogs;
 
 namespace DbFirst.Application.Catalogs.Queries;
 
diff --git a/DbFirst.Application/Catalogs/Queries/GetAllCatalogsQuery.cs b/DbFirst.Application/Catalogs/Queries/GetAllCatalogsQuery.cs
index 56e417f..6daaa59 100644
--- a/DbFirst.Application/Catalogs/Queries/GetAllCatalogsQuery.cs
+++ b/DbFirst.Application/Catalogs/Queries/GetAllCatalogsQuery.cs
@@ -1,4 +1,5 @@
 using MediatR;
+using DbFirst.Contracts.Catalogs;
 
 namespace DbFirst.Application.Catalogs.Queries;
 
diff --git a/DbFirst.Application/Catalogs/Queries/GetCatalogByIdHandler.cs b/DbFirst.Application/Catalogs/Queries/GetCatalogByIdHandler.cs
index b463cf2..ca15313 100644
--- a/DbFirst.Application/Catalogs/Queries/GetCatalogByIdHandler.cs
+++ b/DbFirst.Application/Catalogs/Queries/GetCatalogByIdHandler.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using DbFirst.Application.Repositories;
 using MediatR;
+using DbFirst.Contracts.Catalogs;
 
 namespace DbFirst.Application.Catalogs.Queries;
 
diff --git a/DbFirst.Application/Catalogs/Queries/GetCatalogByIdQuery.cs b/DbFirst.Application/Catalogs/Queries/GetCatalogByIdQuery.cs
index c2c63d3..195139b 100644
--- a/DbFirst.Application/Catalogs/Queries/GetCatalogByIdQuery.cs
+++ b/DbFirst.Application/Catalogs/Queries/GetCatalogByIdQuery.cs
@@ -1,4 +1,5 @@
 using MediatR;
+using DbFirst.Contracts.Catalogs;
 
 namespace DbFirst.Application.Catalogs.Queries;
 
diff --git a/DbFirst.Application/MassData/Commands/UpsertMassDataByCustomerNameCommand.cs b/DbFirst.Application/MassData/Commands/UpsertMassDataByCustomerNameCommand.cs
index f719910..29d161d 100644
--- a/DbFirst.Application/MassData/Commands/UpsertMassDataByCustomerNameCommand.cs
+++ b/DbFirst.Application/MassData/Commands/UpsertMassDataByCustomerNameCommand.cs
@@ -1,4 +1,5 @@
 using MediatR;
+using DbFirst.Contracts.MassData;
 
 namespace DbFirst.Application.MassData.Commands;
 
diff --git a/DbFirst.Application/MassData/Commands/UpsertMassDataByCustomerNameHandler.cs b/DbFirst.Application/MassData/Commands/UpsertMassDataByCustomerNameHandler.cs
index e301fc9..13cf8fe 100644
--- a/DbFirst.Application/MassData/Commands/UpsertMassDataByCustomerNameHandler.cs
+++ b/DbFirst.Application/MassData/Commands/UpsertMassDataByCustomerNameHandler.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using DbFirst.Application.Repositories;
 using MediatR;
+using DbFirst.Contracts.MassData;
 
 namespace DbFirst.Application.MassData.Commands;
 
diff --git a/DbFirst.Application/MassData/MassDataProfile.cs b/DbFirst.Application/MassData/MassDataProfile.cs
index b0f260c..6521f57 100644
--- a/DbFirst.Application/MassData/MassDataProfile.cs
+++ b/DbFirst.Application/MassData/MassDataProfile.cs
@@ -1,5 +1,6 @@
 using AutoMapper;
 using DbFirst.Domain.Entities;
+using DbFirst.Contracts.MassData;
 
 namespace DbFirst.Application.MassData;
 
diff --git a/DbFirst.Application/MassData/Queries/GetAllMassDataHandler.cs b/DbFirst.Application/MassData/Queries/GetAllMassDataHandler.cs
index e3003d0..a3156ef 100644
--- a/DbFirst.Application/MassData/Queries/GetAllMassDataHandler.cs
+++ b/DbFirst.Application/MassData/Queries/GetAllMassDataHandler.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using DbFirst.Application.Repositories;
 using MediatR;
+using DbFirst.Contracts.MassData;
 
 namespace DbFirst.Application.MassData.Queries;
 
diff --git a/DbFirst.Application/MassData/Queries/GetAllMassDataQuery.cs b/DbFirst.Application/MassData/Queries/GetAllMassDataQuery.cs
index 84b350a..e0e8edf 100644
--- a/DbFirst.Application/MassData/Queries/GetAllMassDataQuery.cs
+++ b/DbFirst.Application/MassData/Queries/GetAllMassDataQuery.cs
@@ -1,4 +1,5 @@
 using MediatR;
+using DbFirst.Contracts.MassData;
 
 namespace DbFirst.Application.MassData.Queries;
 
diff --git a/DbFirst.Application/MassData/Queries/GetMassDataByCustomerNameHandler.cs b/DbFirst.Application/MassData/Queries/GetMassDataByCustomerNameHandler.cs
index 7d518c9..d6c1b99 100644
--- a/DbFirst.Application/MassData/Queries/GetMassDataByCustomerNameHandler.cs
+++ b/DbFirst.Application/MassData/Queries/GetMassDataByCustomerNameHandler.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using DbFirst.Application.Repositories;
 using MediatR;
+using DbFirst.Contracts.MassData;
 
 namespace DbFirst.Application.MassData.Queries;
 
diff --git a/DbFirst.Application/MassData/Queries/GetMassDataByCustomerNameQuery.cs b/DbFirst.Application/MassData/Queries/GetMassDataByCustomerNameQuery.cs
index 26d75a6..54c6a18 100644
--- a/DbFirst.Application/MassData/Queries/GetMassDataByCustomerNameQuery.cs
+++ b/DbFirst.Application/MassData/Queries/GetMassDataByCustomerNameQuery.cs
@@ -1,4 +1,5 @@
 using MediatR;
+using DbFirst.Contracts.MassData;
 
 namespace DbFirst.Application.MassData.Queries;
 
diff --git a/DbFirst.BlazorWebApp/Components/_Imports.razor b/DbFirst.BlazorWebApp/Components/_Imports.razor
index 8600101..bc54699 100644
--- a/DbFirst.BlazorWebApp/Components/_Imports.razor
+++ b/DbFirst.BlazorWebApp/Components/_Imports.razor
@@ -11,11 +11,14 @@
 @using Microsoft.AspNetCore.SignalR.Client
 @using DbFirst.BlazorWebApp
 @using DbFirst.BlazorWebApp.Components
-@using DbFirst.BlazorWebApp.Models
 @using DbFirst.BlazorWebApp.Models.Grid
 @using DbFirst.BlazorWebApp.Services
 @using DevExpress.Blazor
 @using DevExpress.DashboardBlazor
 @using DevExpress.DashboardWeb
 @using DevExpress.Data.Filtering
-@using Microsoft.Extensions.Options
\ No newline at end of file
+@using Microsoft.Extensions.Options
+@using DbFirst.Contracts.Catalogs
+@using DbFirst.Contracts.MassData
+@using DbFirst.Contracts.Layouts
+@using DbFirst.Contracts.Dashboards
\ No newline at end of file
diff --git a/DbFirst.Contracts/Massdata/MassdataReadDto.cs b/DbFirst.Contracts/Massdata/MassdataReadDto.cs
index 01bb70c..6344872 100644
--- a/DbFirst.Contracts/Massdata/MassdataReadDto.cs
+++ b/DbFirst.Contracts/Massdata/MassdataReadDto.cs
@@ -4,9 +4,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DbFirst.Contracts.Massdata
+namespace DbFirst.Contracts.MassData
 {
-    internal class MassdataReadDto
+    internal class MassDataReadDto
     {
     }
 }
diff --git a/DbFirst.Contracts/Massdata/MassdataWriteDto.cs b/DbFirst.Contracts/Massdata/MassdataWriteDto.cs
index 9587ff2..4c0ec33 100644
--- a/DbFirst.Contracts/Massdata/MassdataWriteDto.cs
+++ b/DbFirst.Contracts/Massdata/MassdataWriteDto.cs
@@ -4,9 +4,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DbFirst.Contracts.Massdata
+namespace DbFirst.Contracts.MassData
 {
-    internal class MassdataWriteDto
+    internal class MassDataWriteDto
     {
     }
 }