diff --git a/DbFirst.API/Controllers/CatalogsController.cs b/DbFirst.API/Controllers/CatalogsController.cs
index 63fbd29..cf0c7a3 100644
--- a/DbFirst.API/Controllers/CatalogsController.cs
+++ b/DbFirst.API/Controllers/CatalogsController.cs
@@ -1,6 +1,7 @@
-using DbFirst.Application.Catalogs;
+
 using DbFirst.Application.Catalogs.Commands;
 using DbFirst.Application.Catalogs.Queries;
+using DbFirst.Contracts.Catalogs;
 using MediatR;
 using Microsoft.AspNetCore.Mvc;
 
diff --git a/DbFirst.API/Controllers/LayoutsController.cs b/DbFirst.API/Controllers/LayoutsController.cs
index 4fc3235..aeed01f 100644
--- a/DbFirst.API/Controllers/LayoutsController.cs
+++ b/DbFirst.API/Controllers/LayoutsController.cs
@@ -1,8 +1,8 @@
-using System.Text;
 using DbFirst.Application.Repositories;
+using DbFirst.Contracts.Layouts;
 using DbFirst.Domain.Entities;
 using Microsoft.AspNetCore.Mvc;
-using DbFirst.Application.Layouts;
+using System.Text;
 
 namespace DbFirst.API.Controllers;
 
diff --git a/DbFirst.API/Controllers/MassDataController.cs b/DbFirst.API/Controllers/MassDataController.cs
index f7783bb..66be9ae 100644
--- a/DbFirst.API/Controllers/MassDataController.cs
+++ b/DbFirst.API/Controllers/MassDataController.cs
@@ -1,6 +1,6 @@
-using DbFirst.Application.MassData;
 using DbFirst.Application.MassData.Commands;
 using DbFirst.Application.MassData.Queries;
+using DbFirst.Contracts.MassData;
 using MediatR;
 using Microsoft.AspNetCore.Mvc;
 
diff --git a/DbFirst.API/Dashboards/SqlDashboardStorage.cs b/DbFirst.API/Dashboards/SqlDashboardStorage.cs
index 3bfaafe..f8ca4a4 100644
--- a/DbFirst.API/Dashboards/SqlDashboardStorage.cs
+++ b/DbFirst.API/Dashboards/SqlDashboardStorage.cs
@@ -1,8 +1,8 @@
+using DevExpress.DashboardWeb;
+using Microsoft.Data.SqlClient;
 using System.Data;
 using System.Text;
 using System.Xml.Linq;
-using DevExpress.DashboardWeb;
-using Microsoft.Data.SqlClient;
 
 namespace DbFirst.API.Dashboards;
 
diff --git a/DbFirst.Application/Catalogs/CatalogProfile.cs b/DbFirst.Application/Catalogs/CatalogProfile.cs
index 457675d..112de3a 100644
--- a/DbFirst.Application/Catalogs/CatalogProfile.cs
+++ b/DbFirst.Application/Catalogs/CatalogProfile.cs
@@ -1,6 +1,6 @@
 using AutoMapper;
-using DbFirst.Domain.Entities;
 using DbFirst.Contracts.Catalogs;
+using DbFirst.Domain.Entities;
 
 namespace DbFirst.Application.Catalogs;
 
diff --git a/DbFirst.Application/Catalogs/Commands/CreateCatalogCommand.cs b/DbFirst.Application/Catalogs/Commands/CreateCatalogCommand.cs
index 0891812..bb8450e 100644
--- a/DbFirst.Application/Catalogs/Commands/CreateCatalogCommand.cs
+++ b/DbFirst.Application/Catalogs/Commands/CreateCatalogCommand.cs
@@ -1,5 +1,5 @@
-using MediatR;
 using DbFirst.Contracts.Catalogs;
+using MediatR;
 
 namespace DbFirst.Application.Catalogs.Commands;
 
diff --git a/DbFirst.Application/Catalogs/Commands/CreateCatalogHandler.cs b/DbFirst.Application/Catalogs/Commands/CreateCatalogHandler.cs
index 37b71ae..26bd3d4 100644
--- a/DbFirst.Application/Catalogs/Commands/CreateCatalogHandler.cs
+++ b/DbFirst.Application/Catalogs/Commands/CreateCatalogHandler.cs
@@ -1,8 +1,8 @@
 using AutoMapper;
 using DbFirst.Application.Repositories;
+using DbFirst.Contracts.Catalogs;
 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 133d1ac..72892db 100644
--- a/DbFirst.Application/Catalogs/Commands/DeleteCatalogCommand.cs
+++ b/DbFirst.Application/Catalogs/Commands/DeleteCatalogCommand.cs
@@ -1,5 +1,4 @@
 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 4216486..8356117 100644
--- a/DbFirst.Application/Catalogs/Commands/DeleteCatalogHandler.cs
+++ b/DbFirst.Application/Catalogs/Commands/DeleteCatalogHandler.cs
@@ -1,6 +1,5 @@
 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 84c0c50..9ee2527 100644
--- a/DbFirst.Application/Catalogs/Commands/UpdateCatalogCommand.cs
+++ b/DbFirst.Application/Catalogs/Commands/UpdateCatalogCommand.cs
@@ -1,5 +1,5 @@
-using MediatR;
 using DbFirst.Contracts.Catalogs;
+using MediatR;
 
 namespace DbFirst.Application.Catalogs.Commands;
 
diff --git a/DbFirst.Application/Catalogs/Commands/UpdateCatalogHandler.cs b/DbFirst.Application/Catalogs/Commands/UpdateCatalogHandler.cs
index b6485f3..bedb479 100644
--- a/DbFirst.Application/Catalogs/Commands/UpdateCatalogHandler.cs
+++ b/DbFirst.Application/Catalogs/Commands/UpdateCatalogHandler.cs
@@ -1,9 +1,9 @@
 using AutoMapper;
 using DbFirst.Application.Repositories;
-using DbFirst.Domain.Entities;
-using DbFirst.Domain;
-using MediatR;
 using DbFirst.Contracts.Catalogs;
+using DbFirst.Domain;
+using DbFirst.Domain.Entities;
+using MediatR;
 
 namespace DbFirst.Application.Catalogs.Commands;
 
diff --git a/DbFirst.Application/Catalogs/Queries/GetAllCatalogsHandler.cs b/DbFirst.Application/Catalogs/Queries/GetAllCatalogsHandler.cs
index 4c8e765..b609eeb 100644
--- a/DbFirst.Application/Catalogs/Queries/GetAllCatalogsHandler.cs
+++ b/DbFirst.Application/Catalogs/Queries/GetAllCatalogsHandler.cs
@@ -1,7 +1,7 @@
 using AutoMapper;
 using DbFirst.Application.Repositories;
-using MediatR;
 using DbFirst.Contracts.Catalogs;
+using MediatR;
 
 namespace DbFirst.Application.Catalogs.Queries;
 
diff --git a/DbFirst.Application/Catalogs/Queries/GetAllCatalogsQuery.cs b/DbFirst.Application/Catalogs/Queries/GetAllCatalogsQuery.cs
index 6daaa59..285a6c1 100644
--- a/DbFirst.Application/Catalogs/Queries/GetAllCatalogsQuery.cs
+++ b/DbFirst.Application/Catalogs/Queries/GetAllCatalogsQuery.cs
@@ -1,5 +1,5 @@
-using MediatR;
 using DbFirst.Contracts.Catalogs;
+using MediatR;
 
 namespace DbFirst.Application.Catalogs.Queries;
 
diff --git a/DbFirst.Application/Catalogs/Queries/GetCatalogByIdHandler.cs b/DbFirst.Application/Catalogs/Queries/GetCatalogByIdHandler.cs
index ca15313..9fa0299 100644
--- a/DbFirst.Application/Catalogs/Queries/GetCatalogByIdHandler.cs
+++ b/DbFirst.Application/Catalogs/Queries/GetCatalogByIdHandler.cs
@@ -1,7 +1,7 @@
 using AutoMapper;
 using DbFirst.Application.Repositories;
-using MediatR;
 using DbFirst.Contracts.Catalogs;
+using MediatR;
 
 namespace DbFirst.Application.Catalogs.Queries;
 
diff --git a/DbFirst.Application/Catalogs/Queries/GetCatalogByIdQuery.cs b/DbFirst.Application/Catalogs/Queries/GetCatalogByIdQuery.cs
index 195139b..2558325 100644
--- a/DbFirst.Application/Catalogs/Queries/GetCatalogByIdQuery.cs
+++ b/DbFirst.Application/Catalogs/Queries/GetCatalogByIdQuery.cs
@@ -1,5 +1,5 @@
-using MediatR;
 using DbFirst.Contracts.Catalogs;
+using MediatR;
 
 namespace DbFirst.Application.Catalogs.Queries;
 
diff --git a/DbFirst.Application/DependencyInjection.cs b/DbFirst.Application/DependencyInjection.cs
index 75b2fae..5ee24bf 100644
--- a/DbFirst.Application/DependencyInjection.cs
+++ b/DbFirst.Application/DependencyInjection.cs
@@ -1,5 +1,4 @@
 using Microsoft.Extensions.DependencyInjection;
-using MediatR;
 
 namespace DbFirst.Application;
 
diff --git a/DbFirst.Application/MassData/Commands/UpsertMassDataByCustomerNameCommand.cs b/DbFirst.Application/MassData/Commands/UpsertMassDataByCustomerNameCommand.cs
index 29d161d..cc0f694 100644
--- a/DbFirst.Application/MassData/Commands/UpsertMassDataByCustomerNameCommand.cs
+++ b/DbFirst.Application/MassData/Commands/UpsertMassDataByCustomerNameCommand.cs
@@ -1,5 +1,5 @@
-using MediatR;
 using DbFirst.Contracts.MassData;
+using MediatR;
 
 namespace DbFirst.Application.MassData.Commands;
 
diff --git a/DbFirst.Application/MassData/Commands/UpsertMassDataByCustomerNameHandler.cs b/DbFirst.Application/MassData/Commands/UpsertMassDataByCustomerNameHandler.cs
index 13cf8fe..37402c2 100644
--- a/DbFirst.Application/MassData/Commands/UpsertMassDataByCustomerNameHandler.cs
+++ b/DbFirst.Application/MassData/Commands/UpsertMassDataByCustomerNameHandler.cs
@@ -1,7 +1,7 @@
 using AutoMapper;
 using DbFirst.Application.Repositories;
-using MediatR;
 using DbFirst.Contracts.MassData;
+using MediatR;
 
 namespace DbFirst.Application.MassData.Commands;
 
diff --git a/DbFirst.Application/MassData/MassDataProfile.cs b/DbFirst.Application/MassData/MassDataProfile.cs
index 6521f57..3d6bcde 100644
--- a/DbFirst.Application/MassData/MassDataProfile.cs
+++ b/DbFirst.Application/MassData/MassDataProfile.cs
@@ -1,6 +1,6 @@
 using AutoMapper;
-using DbFirst.Domain.Entities;
 using DbFirst.Contracts.MassData;
+using DbFirst.Domain.Entities;
 
 namespace DbFirst.Application.MassData;
 
diff --git a/DbFirst.Application/MassData/Queries/GetAllMassDataHandler.cs b/DbFirst.Application/MassData/Queries/GetAllMassDataHandler.cs
index a3156ef..bac8167 100644
--- a/DbFirst.Application/MassData/Queries/GetAllMassDataHandler.cs
+++ b/DbFirst.Application/MassData/Queries/GetAllMassDataHandler.cs
@@ -1,7 +1,7 @@
 using AutoMapper;
 using DbFirst.Application.Repositories;
-using MediatR;
 using DbFirst.Contracts.MassData;
+using MediatR;
 
 namespace DbFirst.Application.MassData.Queries;
 
diff --git a/DbFirst.Application/MassData/Queries/GetAllMassDataQuery.cs b/DbFirst.Application/MassData/Queries/GetAllMassDataQuery.cs
index e0e8edf..51b23f1 100644
--- a/DbFirst.Application/MassData/Queries/GetAllMassDataQuery.cs
+++ b/DbFirst.Application/MassData/Queries/GetAllMassDataQuery.cs
@@ -1,5 +1,5 @@
-using MediatR;
 using DbFirst.Contracts.MassData;
+using MediatR;
 
 namespace DbFirst.Application.MassData.Queries;
 
diff --git a/DbFirst.Application/MassData/Queries/GetMassDataByCustomerNameHandler.cs b/DbFirst.Application/MassData/Queries/GetMassDataByCustomerNameHandler.cs
index d6c1b99..c6b4aa6 100644
--- a/DbFirst.Application/MassData/Queries/GetMassDataByCustomerNameHandler.cs
+++ b/DbFirst.Application/MassData/Queries/GetMassDataByCustomerNameHandler.cs
@@ -1,7 +1,7 @@
 using AutoMapper;
 using DbFirst.Application.Repositories;
-using MediatR;
 using DbFirst.Contracts.MassData;
+using MediatR;
 
 namespace DbFirst.Application.MassData.Queries;
 
diff --git a/DbFirst.Application/MassData/Queries/GetMassDataByCustomerNameQuery.cs b/DbFirst.Application/MassData/Queries/GetMassDataByCustomerNameQuery.cs
index 54c6a18..b47195d 100644
--- a/DbFirst.Application/MassData/Queries/GetMassDataByCustomerNameQuery.cs
+++ b/DbFirst.Application/MassData/Queries/GetMassDataByCustomerNameQuery.cs
@@ -1,5 +1,5 @@
-using MediatR;
 using DbFirst.Contracts.MassData;
+using MediatR;
 
 namespace DbFirst.Application.MassData.Queries;
 
diff --git a/DbFirst.BlazorWebApp/Services/BandLayoutService.cs b/DbFirst.BlazorWebApp/Services/BandLayoutService.cs
index 4ea64b7..4eaa6ea 100644
--- a/DbFirst.BlazorWebApp/Services/BandLayoutService.cs
+++ b/DbFirst.BlazorWebApp/Services/BandLayoutService.cs
@@ -1,5 +1,5 @@
-using DbFirst.BlazorWebApp.Models;
-using DbFirst.BlazorWebApp.Models.Grid;
+using DbFirst.BlazorWebApp.Models.Grid;
+using DbFirst.Contracts.Layouts;
 using Microsoft.JSInterop;
 using System.Text.Json;
 
diff --git a/DbFirst.BlazorWebApp/Services/CatalogApiClient.cs b/DbFirst.BlazorWebApp/Services/CatalogApiClient.cs
index 537010f..34b834f 100644
--- a/DbFirst.BlazorWebApp/Services/CatalogApiClient.cs
+++ b/DbFirst.BlazorWebApp/Services/CatalogApiClient.cs
@@ -1,4 +1,5 @@
 using DbFirst.BlazorWebApp.Models;
+using DbFirst.Contracts.Catalogs;
 
 namespace DbFirst.BlazorWebApp.Services;
 
diff --git a/DbFirst.BlazorWebApp/Services/DashboardApiClient.cs b/DbFirst.BlazorWebApp/Services/DashboardApiClient.cs
index abda07b..e2feb93 100644
--- a/DbFirst.BlazorWebApp/Services/DashboardApiClient.cs
+++ b/DbFirst.BlazorWebApp/Services/DashboardApiClient.cs
@@ -1,4 +1,4 @@
-using DbFirst.BlazorWebApp.Models;
+using DbFirst.Contracts.Dashboards;
 
 namespace DbFirst.BlazorWebApp.Services;
 
diff --git a/DbFirst.BlazorWebApp/Services/ICatalogApiClient.cs b/DbFirst.BlazorWebApp/Services/ICatalogApiClient.cs
index bd99820..6c60fc0 100644
--- a/DbFirst.BlazorWebApp/Services/ICatalogApiClient.cs
+++ b/DbFirst.BlazorWebApp/Services/ICatalogApiClient.cs
@@ -1,4 +1,5 @@
 using DbFirst.BlazorWebApp.Models;
+using DbFirst.Contracts.Catalogs;
 
 namespace DbFirst.BlazorWebApp.Services;
 
diff --git a/DbFirst.BlazorWebApp/Services/IDashboardApiClient.cs b/DbFirst.BlazorWebApp/Services/IDashboardApiClient.cs
index cb77f3d..782fda3 100644
--- a/DbFirst.BlazorWebApp/Services/IDashboardApiClient.cs
+++ b/DbFirst.BlazorWebApp/Services/IDashboardApiClient.cs
@@ -1,4 +1,4 @@
-using DbFirst.BlazorWebApp.Models;
+using DbFirst.Contracts.Dashboards;
 
 namespace DbFirst.BlazorWebApp.Services
 {
diff --git a/DbFirst.BlazorWebApp/Services/ILayoutApiClient.cs b/DbFirst.BlazorWebApp/Services/ILayoutApiClient.cs
index a82ea8f..f45c7fb 100644
--- a/DbFirst.BlazorWebApp/Services/ILayoutApiClient.cs
+++ b/DbFirst.BlazorWebApp/Services/ILayoutApiClient.cs
@@ -1,4 +1,4 @@
-using DbFirst.BlazorWebApp.Models;
+using DbFirst.Contracts.Layouts;
 
 namespace DbFirst.BlazorWebApp.Services
 {
diff --git a/DbFirst.BlazorWebApp/Services/IMassDataApiClient.cs b/DbFirst.BlazorWebApp/Services/IMassDataApiClient.cs
index 4d23877..78909d9 100644
--- a/DbFirst.BlazorWebApp/Services/IMassDataApiClient.cs
+++ b/DbFirst.BlazorWebApp/Services/IMassDataApiClient.cs
@@ -1,4 +1,5 @@
 using DbFirst.BlazorWebApp.Models;
+using DbFirst.Contracts.MassData;
 
 namespace DbFirst.BlazorWebApp.Services
 {
diff --git a/DbFirst.BlazorWebApp/Services/LayoutApiClient.cs b/DbFirst.BlazorWebApp/Services/LayoutApiClient.cs
index b232030..39943cd 100644
--- a/DbFirst.BlazorWebApp/Services/LayoutApiClient.cs
+++ b/DbFirst.BlazorWebApp/Services/LayoutApiClient.cs
@@ -1,4 +1,4 @@
-using DbFirst.BlazorWebApp.Models;
+using DbFirst.Contracts.Layouts;
 
 namespace DbFirst.BlazorWebApp.Services;
 
diff --git a/DbFirst.BlazorWebApp/Services/MassDataApiClient.cs b/DbFirst.BlazorWebApp/Services/MassDataApiClient.cs
index 2b3d564..e5c8cbf 100644
--- a/DbFirst.BlazorWebApp/Services/MassDataApiClient.cs
+++ b/DbFirst.BlazorWebApp/Services/MassDataApiClient.cs
@@ -1,4 +1,5 @@
 using DbFirst.BlazorWebApp.Models;
+using DbFirst.Contracts.MassData;
 
 namespace DbFirst.BlazorWebApp.Services;
 
diff --git a/DbFirst.Infrastructure/Repositories/CatalogRepository.cs b/DbFirst.Infrastructure/Repositories/CatalogRepository.cs
index 7ee6102..b07cbd4 100644
--- a/DbFirst.Infrastructure/Repositories/CatalogRepository.cs
+++ b/DbFirst.Infrastructure/Repositories/CatalogRepository.cs
@@ -1,6 +1,6 @@
+using DbFirst.Application.Repositories;
 using DbFirst.Domain;
 using DbFirst.Domain.Entities;
-using DbFirst.Application.Repositories;
 using Microsoft.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
 using System.Data;
diff --git a/DbFirst.Infrastructure/Repositories/MassDataRepository.cs b/DbFirst.Infrastructure/Repositories/MassDataRepository.cs
index 272c5b7..2efc6c3 100644
--- a/DbFirst.Infrastructure/Repositories/MassDataRepository.cs
+++ b/DbFirst.Infrastructure/Repositories/MassDataRepository.cs
@@ -1,8 +1,8 @@
-using System.Data;
 using DbFirst.Application.Repositories;
 using DbFirst.Domain.Entities;
 using Microsoft.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
+using System.Data;
 
 namespace DbFirst.Infrastructure.Repositories;