diff --git a/src/Services/Flight/src/Flight/Aircrafts/Features/AircraftMappings.cs b/src/Services/Flight/src/Flight/Aircrafts/Features/AircraftMappings.cs
index deec0ca..fe58a8b 100644
--- a/src/Services/Flight/src/Flight/Aircrafts/Features/AircraftMappings.cs
+++ b/src/Services/Flight/src/Flight/Aircrafts/Features/AircraftMappings.cs
@@ -4,8 +4,8 @@ using Mapster;
 namespace Flight.Aircrafts.Features;
 
 using CreatingAircraft.V1;
-using Flight.Aircrafts.Models.ValueObjects;
 using MassTransit;
+using ValueObjects;
 
 public class AircraftMappings : IRegister
 {
diff --git a/src/Services/Flight/src/Flight/Aircrafts/Features/CreatingAircraft/V1/CreateAircraft.cs b/src/Services/Flight/src/Flight/Aircrafts/Features/CreatingAircraft/V1/CreateAircraft.cs
index 892df75..f462e05 100644
--- a/src/Services/Flight/src/Flight/Aircrafts/Features/CreatingAircraft/V1/CreateAircraft.cs
+++ b/src/Services/Flight/src/Flight/Aircrafts/Features/CreatingAircraft/V1/CreateAircraft.cs
@@ -21,7 +21,6 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.EntityFrameworkCore;
 using Models;
-using Models.ValueObjects;
 
 public record CreateAircraft(string Name, string Model, int ManufacturingYear) : ICommand<CreateAircraftResult>,
     IInternalCommand
diff --git a/src/Services/Flight/src/Flight/Aircrafts/Features/CreatingAircraft/V1/CreateAircraftMongo.cs b/src/Services/Flight/src/Flight/Aircrafts/Features/CreatingAircraft/V1/CreateAircraftMongo.cs
index 6ed4b2b..a9cb1ee 100644
--- a/src/Services/Flight/src/Flight/Aircrafts/Features/CreatingAircraft/V1/CreateAircraftMongo.cs
+++ b/src/Services/Flight/src/Flight/Aircrafts/Features/CreatingAircraft/V1/CreateAircraftMongo.cs
@@ -11,9 +11,9 @@ using Exceptions;
 using MapsterMapper;
 using MediatR;
 using Models;
-using Models.ValueObjects;
 using MongoDB.Driver;
 using MongoDB.Driver.Linq;
+using ValueObjects;
 
 public record CreateAircraftMongo(Guid Id, string Name, string Model, int ManufacturingYear, bool IsDeleted = false) : InternalCommand;
 
diff --git a/src/Services/Flight/src/Flight/Aircrafts/Models/Aircraft.cs b/src/Services/Flight/src/Flight/Aircrafts/Models/Aircraft.cs
index 02ee93f..1e91b75 100644
--- a/src/Services/Flight/src/Flight/Aircrafts/Models/Aircraft.cs
+++ b/src/Services/Flight/src/Flight/Aircrafts/Models/Aircraft.cs
@@ -4,7 +4,6 @@ namespace Flight.Aircrafts.Models;
 
 using Features.CreatingAircraft.V1;
 using Flight.Aircrafts.ValueObjects;
-using ValueObjects;
 
 public record Aircraft : Aggregate<AircraftId>
 {
diff --git a/src/Services/Flight/src/Flight/Aircrafts/Models/ValueObjects/AircraftId.cs b/src/Services/Flight/src/Flight/Aircrafts/ValueObjects/AircraftId.cs
similarity index 85%
rename from src/Services/Flight/src/Flight/Aircrafts/Models/ValueObjects/AircraftId.cs
rename to src/Services/Flight/src/Flight/Aircrafts/ValueObjects/AircraftId.cs
index a225b06..c5bb6aa 100644
--- a/src/Services/Flight/src/Flight/Aircrafts/Models/ValueObjects/AircraftId.cs
+++ b/src/Services/Flight/src/Flight/Aircrafts/ValueObjects/AircraftId.cs
@@ -1,6 +1,7 @@
-namespace Flight.Aircrafts.Models.ValueObjects;
+namespace Flight.Aircrafts.ValueObjects;
+
 using System;
-using Exceptions;
+using Flight.Aircrafts.Exceptions;
 
 public record AircraftId
 {
diff --git a/src/Services/Flight/src/Flight/Aircrafts/Models/ValueObjects/ManufacturingYear.cs b/src/Services/Flight/src/Flight/Aircrafts/ValueObjects/ManufacturingYear.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Aircrafts/Models/ValueObjects/ManufacturingYear.cs
rename to src/Services/Flight/src/Flight/Aircrafts/ValueObjects/ManufacturingYear.cs
diff --git a/src/Services/Flight/src/Flight/Aircrafts/Models/ValueObjects/Model.cs b/src/Services/Flight/src/Flight/Aircrafts/ValueObjects/Model.cs
similarity index 90%
rename from src/Services/Flight/src/Flight/Aircrafts/Models/ValueObjects/Model.cs
rename to src/Services/Flight/src/Flight/Aircrafts/ValueObjects/Model.cs
index c7ec562..c7f4510 100644
--- a/src/Services/Flight/src/Flight/Aircrafts/Models/ValueObjects/Model.cs
+++ b/src/Services/Flight/src/Flight/Aircrafts/ValueObjects/Model.cs
@@ -1,4 +1,5 @@
-namespace Flight.Aircrafts.Models.ValueObjects;
+namespace Flight.Aircrafts.ValueObjects;
+
 using Flight.Aircrafts.Exceptions;
 
 public record Model
diff --git a/src/Services/Flight/src/Flight/Aircrafts/Models/ValueObjects/Name.cs b/src/Services/Flight/src/Flight/Aircrafts/ValueObjects/Name.cs
similarity index 84%
rename from src/Services/Flight/src/Flight/Aircrafts/Models/ValueObjects/Name.cs
rename to src/Services/Flight/src/Flight/Aircrafts/ValueObjects/Name.cs
index 91ddcfe..a93a68b 100644
--- a/src/Services/Flight/src/Flight/Aircrafts/Models/ValueObjects/Name.cs
+++ b/src/Services/Flight/src/Flight/Aircrafts/ValueObjects/Name.cs
@@ -1,5 +1,6 @@
-namespace Flight.Aircrafts.Models.ValueObjects;
-using Exceptions;
+namespace Flight.Aircrafts.ValueObjects;
+
+using Flight.Aircrafts.Exceptions;
 
 public record Name
 {
diff --git a/src/Services/Flight/src/Flight/Data/Configurations/AircraftConfiguration.cs b/src/Services/Flight/src/Flight/Data/Configurations/AircraftConfiguration.cs
index b73a787..cb0adfa 100644
--- a/src/Services/Flight/src/Flight/Data/Configurations/AircraftConfiguration.cs
+++ b/src/Services/Flight/src/Flight/Data/Configurations/AircraftConfiguration.cs
@@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Metadata.Builders;
 namespace Flight.Data.Configurations;
 
 using System;
-using Flight.Aircrafts.Models.ValueObjects;
+using Aircrafts.ValueObjects;
 
 public class AircraftConfiguration : IEntityTypeConfiguration<Aircraft>
 {
diff --git a/src/Services/Flight/src/Flight/Data/Seed/InitialData.cs b/src/Services/Flight/src/Flight/Data/Seed/InitialData.cs
index f4b2887..a000489 100644
--- a/src/Services/Flight/src/Flight/Data/Seed/InitialData.cs
+++ b/src/Services/Flight/src/Flight/Data/Seed/InitialData.cs
@@ -4,7 +4,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Aircrafts.Models;
-using Aircrafts.Models.ValueObjects;
 using Airports.Models;
 using Flight.Aircrafts.ValueObjects;
 using Flights.Models;
diff --git a/src/Services/Flight/src/Flight/EventMapper.cs b/src/Services/Flight/src/Flight/EventMapper.cs
index cd85a5c..c9378af 100644
--- a/src/Services/Flight/src/Flight/EventMapper.cs
+++ b/src/Services/Flight/src/Flight/EventMapper.cs
@@ -5,7 +5,7 @@ using BuildingBlocks.Core.Event;
 namespace Flight;
 
 using Aircrafts.Features.CreatingAircraft.V1;
-using Aircrafts.Models.ValueObjects;
+using Aircrafts.ValueObjects;
 using Airports.Features.CreatingAirport.V1;
 using Flights.Features.CreatingFlight.V1;
 using Flights.Features.DeletingFlight.V1;
diff --git a/src/Services/Flight/src/Flight/Flights/Features/CreatingFlight/V1/CreateFlight.cs b/src/Services/Flight/src/Flight/Flights/Features/CreatingFlight/V1/CreateFlight.cs
index bfa825d..83c424c 100644
--- a/src/Services/Flight/src/Flight/Flights/Features/CreatingFlight/V1/CreateFlight.cs
+++ b/src/Services/Flight/src/Flight/Flights/Features/CreatingFlight/V1/CreateFlight.cs
@@ -3,7 +3,7 @@ namespace Flight.Flights.Features.CreatingFlight.V1;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Aircrafts.Models.ValueObjects;
+using Aircrafts.ValueObjects;
 using Ardalis.GuardClauses;
 using BuildingBlocks.Core.CQRS;
 using BuildingBlocks.Core.Event;
diff --git a/src/Services/Flight/src/Flight/Flights/Features/UpdatingFlight/V1/UpdateFlight.cs b/src/Services/Flight/src/Flight/Flights/Features/UpdatingFlight/V1/UpdateFlight.cs
index 4358191..c34db93 100644
--- a/src/Services/Flight/src/Flight/Flights/Features/UpdatingFlight/V1/UpdateFlight.cs
+++ b/src/Services/Flight/src/Flight/Flights/Features/UpdatingFlight/V1/UpdateFlight.cs
@@ -3,7 +3,7 @@ namespace Flight.Flights.Features.UpdatingFlight.V1;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Aircrafts.Models.ValueObjects;
+using Aircrafts.ValueObjects;
 using Ardalis.GuardClauses;
 using BuildingBlocks.Caching;
 using BuildingBlocks.Core.CQRS;
diff --git a/src/Services/Flight/src/Flight/Flights/Models/Flight.cs b/src/Services/Flight/src/Flight/Flights/Models/Flight.cs
index 047be81..7487431 100644
--- a/src/Services/Flight/src/Flight/Flights/Models/Flight.cs
+++ b/src/Services/Flight/src/Flight/Flights/Models/Flight.cs
@@ -3,10 +3,10 @@ using BuildingBlocks.Core.Model;
 
 namespace Flight.Flights.Models;
 
+using Aircrafts.ValueObjects;
 using Features.CreatingFlight.V1;
 using Features.DeletingFlight.V1;
 using Features.UpdatingFlight.V1;
-using global::Flight.Aircrafts.Models.ValueObjects;
 
 public record Flight : Aggregate<Guid>
 {
diff --git a/src/Services/Flight/tests/UnitTest/Common/DbContextFactory.cs b/src/Services/Flight/tests/UnitTest/Common/DbContextFactory.cs
index f9f66c7..80e62f7 100644
--- a/src/Services/Flight/tests/UnitTest/Common/DbContextFactory.cs
+++ b/src/Services/Flight/tests/UnitTest/Common/DbContextFactory.cs
@@ -7,7 +7,6 @@ using Microsoft.EntityFrameworkCore;
 
 namespace Unit.Test.Common;
 
-using global::Flight.Aircrafts.Models.ValueObjects;
 using global::Flight.Aircrafts.ValueObjects;
 using MassTransit;
 
diff --git a/src/Services/Flight/tests/UnitTest/Fakes/FakeFlightCreate.cs b/src/Services/Flight/tests/UnitTest/Fakes/FakeFlightCreate.cs
index 767b2fa..e9b936c 100644
--- a/src/Services/Flight/tests/UnitTest/Fakes/FakeFlightCreate.cs
+++ b/src/Services/Flight/tests/UnitTest/Fakes/FakeFlightCreate.cs
@@ -1,6 +1,6 @@
 namespace Unit.Test.Fakes;
 
-using global::Flight.Aircrafts.Models.ValueObjects;
+using global::Flight.Aircrafts.ValueObjects;
 
 public static class FakeFlightCreate
 {
diff --git a/src/Services/Flight/tests/UnitTest/Flight/FlightMappingTests.cs b/src/Services/Flight/tests/UnitTest/Flight/FlightMappingTests.cs
index 922c805..78a6957 100644
--- a/src/Services/Flight/tests/UnitTest/Flight/FlightMappingTests.cs
+++ b/src/Services/Flight/tests/UnitTest/Flight/FlightMappingTests.cs
@@ -15,6 +15,7 @@ public class FlightMappingTests
 
     public FlightMappingTests(UnitTestFixture fixture)
     {
+        _fixture = fixture;
         _mapper = fixture.Mapper;
     }
 
@@ -25,7 +26,6 @@ public class FlightMappingTests
             yield return new object[]
             {
                 // these types will instantiate with reflection in the future
-                //typeof(global::Flight.Flights.Models.Flight), typeof(FlightDto),
                 typeof(global::Flight.Flights.Models.FlightReadModel), typeof(FlightDto)
             };
         }
diff --git a/src/Services/Passenger/src/Passenger/Data/Configurations/PassengerConfiguration.cs b/src/Services/Passenger/src/Passenger/Data/Configurations/PassengerConfiguration.cs
index 58117a8..5871d21 100644
--- a/src/Services/Passenger/src/Passenger/Data/Configurations/PassengerConfiguration.cs
+++ b/src/Services/Passenger/src/Passenger/Data/Configurations/PassengerConfiguration.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
 namespace Passenger.Data.Configurations;
 
-using Passengers.Models.ValueObjects;
+using Passengers.ValueObjects;
 
 public class PassengerConfiguration : IEntityTypeConfiguration<Passengers.Models.Passenger>
 {
diff --git a/src/Services/Passenger/src/Passenger/Identity/Consumers/RegisteringNewUser/V1/RegisterNewUser.cs b/src/Services/Passenger/src/Passenger/Identity/Consumers/RegisteringNewUser/V1/RegisterNewUser.cs
index 4818b80..9c30106 100644
--- a/src/Services/Passenger/src/Passenger/Identity/Consumers/RegisteringNewUser/V1/RegisterNewUser.cs
+++ b/src/Services/Passenger/src/Passenger/Identity/Consumers/RegisteringNewUser/V1/RegisterNewUser.cs
@@ -11,7 +11,7 @@ using MassTransit;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using Passenger.Passengers.Models.ValueObjects;
+using Passengers.ValueObjects;
 
 public class RegisterNewUserHandler : IConsumer<UserCreated>
 {
diff --git a/src/Services/Passenger/src/Passenger/Passengers/Features/CompletingRegisterPassenger/V1/CompleteRegisterPassenger.cs b/src/Services/Passenger/src/Passenger/Passengers/Features/CompletingRegisterPassenger/V1/CompleteRegisterPassenger.cs
index 308ae89..10c5687 100644
--- a/src/Services/Passenger/src/Passenger/Passengers/Features/CompletingRegisterPassenger/V1/CompleteRegisterPassenger.cs
+++ b/src/Services/Passenger/src/Passenger/Passengers/Features/CompletingRegisterPassenger/V1/CompleteRegisterPassenger.cs
@@ -16,7 +16,6 @@ using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.EntityFrameworkCore;
-using Passenger.Passengers.Models.ValueObjects;
 using Passenger.Passengers.ValueObjects;
 
 public record CompleteRegisterPassenger
diff --git a/src/Services/Passenger/src/Passenger/Passengers/Features/CompletingRegisterPassenger/V1/CompleteRegisterPassengerMongo.cs b/src/Services/Passenger/src/Passenger/Passengers/Features/CompletingRegisterPassenger/V1/CompleteRegisterPassengerMongo.cs
index f858cc4..52c1745 100644
--- a/src/Services/Passenger/src/Passenger/Passengers/Features/CompletingRegisterPassenger/V1/CompleteRegisterPassengerMongo.cs
+++ b/src/Services/Passenger/src/Passenger/Passengers/Features/CompletingRegisterPassenger/V1/CompleteRegisterPassengerMongo.cs
@@ -7,9 +7,9 @@ using Data;
 using MapsterMapper;
 using MediatR;
 using Models;
-using Models.ValueObjects;
 using MongoDB.Driver;
 using MongoDB.Driver.Linq;
+using ValueObjects;
 
 public record CompleteRegisterPassengerMongoCommand(Guid Id, string PassportNumber, string Name,
     Enums.PassengerType PassengerType, int Age, bool IsDeleted = false) : InternalCommand;
diff --git a/src/Services/Passenger/src/Passenger/Passengers/Features/GettingPassengerById/Queries/V1/GetPassengerById.cs b/src/Services/Passenger/src/Passenger/Passengers/Features/GettingPassengerById/Queries/V1/GetPassengerById.cs
index 911108c..571adc3 100644
--- a/src/Services/Passenger/src/Passenger/Passengers/Features/GettingPassengerById/Queries/V1/GetPassengerById.cs
+++ b/src/Services/Passenger/src/Passenger/Passengers/Features/GettingPassengerById/Queries/V1/GetPassengerById.cs
@@ -13,9 +13,9 @@ using MediatR;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Routing;
-using Models.ValueObjects;
 using MongoDB.Driver;
 using MongoDB.Driver.Linq;
+using ValueObjects;
 
 public record GetPassengerById(Guid Id) : IQuery<GetPassengerByIdResult>;
 
diff --git a/src/Services/Passenger/src/Passenger/Passengers/Features/PassengerMappings.cs b/src/Services/Passenger/src/Passenger/Passengers/Features/PassengerMappings.cs
index 4a953d3..f3ac499 100644
--- a/src/Services/Passenger/src/Passenger/Passengers/Features/PassengerMappings.cs
+++ b/src/Services/Passenger/src/Passenger/Passengers/Features/PassengerMappings.cs
@@ -6,7 +6,7 @@ using CompletingRegisterPassenger.V1;
 using Dtos;
 using MassTransit;
 using Models;
-using Passenger.Passengers.Models.ValueObjects;
+using ValueObjects;
 
 public class PassengerMappings : IRegister
 {
diff --git a/src/Services/Passenger/src/Passenger/Passengers/Models/Passenger.cs b/src/Services/Passenger/src/Passenger/Passengers/Models/Passenger.cs
index d5dac75..38ed070 100644
--- a/src/Services/Passenger/src/Passenger/Passengers/Models/Passenger.cs
+++ b/src/Services/Passenger/src/Passenger/Passengers/Models/Passenger.cs
@@ -3,7 +3,6 @@ using BuildingBlocks.Core.Model;
 namespace Passenger.Passengers.Models;
 
 using Features.CompletingRegisterPassenger.V1;
-using global::Passenger.Passengers.Models.ValueObjects;
 using global::Passenger.Passengers.ValueObjects;
 using Identity.Consumers.RegisteringNewUser.V1;
 
diff --git a/src/Services/Passenger/src/Passenger/Passengers/Models/ValueObjects/Age.cs b/src/Services/Passenger/src/Passenger/Passengers/ValueObjects/Age.cs
similarity index 100%
rename from src/Services/Passenger/src/Passenger/Passengers/Models/ValueObjects/Age.cs
rename to src/Services/Passenger/src/Passenger/Passengers/ValueObjects/Age.cs
diff --git a/src/Services/Passenger/src/Passenger/Passengers/Models/ValueObjects/Name.cs b/src/Services/Passenger/src/Passenger/Passengers/ValueObjects/Name.cs
similarity index 82%
rename from src/Services/Passenger/src/Passenger/Passengers/Models/ValueObjects/Name.cs
rename to src/Services/Passenger/src/Passenger/Passengers/ValueObjects/Name.cs
index a137285..a16e111 100644
--- a/src/Services/Passenger/src/Passenger/Passengers/Models/ValueObjects/Name.cs
+++ b/src/Services/Passenger/src/Passenger/Passengers/ValueObjects/Name.cs
@@ -1,5 +1,6 @@
-namespace Passenger.Passengers.Models.ValueObjects;
-using Exceptions;
+namespace Passenger.Passengers.ValueObjects;
+
+using Passenger.Passengers.Exceptions;
 
 public record Name
 {
diff --git a/src/Services/Passenger/src/Passenger/Passengers/Models/ValueObjects/PassengerId.cs b/src/Services/Passenger/src/Passenger/Passengers/ValueObjects/PassengerId.cs
similarity index 84%
rename from src/Services/Passenger/src/Passenger/Passengers/Models/ValueObjects/PassengerId.cs
rename to src/Services/Passenger/src/Passenger/Passengers/ValueObjects/PassengerId.cs
index c3cedfa..8a8dc16 100644
--- a/src/Services/Passenger/src/Passenger/Passengers/Models/ValueObjects/PassengerId.cs
+++ b/src/Services/Passenger/src/Passenger/Passengers/ValueObjects/PassengerId.cs
@@ -1,6 +1,7 @@
-namespace Passenger.Passengers.Models.ValueObjects;
+namespace Passenger.Passengers.ValueObjects;
+
 using System;
-using global::Passenger.Exceptions;
+using Passenger.Exceptions;
 
 public record PassengerId
 {
diff --git a/src/Services/Passenger/src/Passenger/Passengers/Models/ValueObjects/PassportNumber.cs b/src/Services/Passenger/src/Passenger/Passengers/ValueObjects/PassportNumber.cs
similarity index 87%
rename from src/Services/Passenger/src/Passenger/Passengers/Models/ValueObjects/PassportNumber.cs
rename to src/Services/Passenger/src/Passenger/Passengers/ValueObjects/PassportNumber.cs
index 0cc0834..41f31c3 100644
--- a/src/Services/Passenger/src/Passenger/Passengers/Models/ValueObjects/PassportNumber.cs
+++ b/src/Services/Passenger/src/Passenger/Passengers/ValueObjects/PassportNumber.cs
@@ -1,5 +1,6 @@
-namespace Passenger.Passengers.Models.ValueObjects;
-using Exceptions;
+namespace Passenger.Passengers.ValueObjects;
+
+using Passenger.Passengers.Exceptions;
 
 public record PassportNumber
 {