diff --git a/src/Services/Booking/src/Booking/Booking/Features/BookingMappings.cs b/src/Services/Booking/src/Booking/Booking/Features/BookingMappings.cs
index 80f8443..feaa98e 100644
--- a/src/Services/Booking/src/Booking/Booking/Features/BookingMappings.cs
+++ b/src/Services/Booking/src/Booking/Booking/Features/BookingMappings.cs
@@ -3,7 +3,7 @@ using Mapster;
 
 namespace Booking.Booking.Features;
 
-using CreatingBook.Commands.V1;
+using CreatingBook.V1;
 
 public class BookingMappings : IRegister
 {
diff --git a/src/Services/Booking/src/Booking/Booking/Features/CreatingBook/Commands/V1/CreateBooking.cs b/src/Services/Booking/src/Booking/Booking/Features/CreatingBook/V1/CreateBooking.cs
similarity index 96%
rename from src/Services/Booking/src/Booking/Booking/Features/CreatingBook/Commands/V1/CreateBooking.cs
rename to src/Services/Booking/src/Booking/Booking/Features/CreatingBook/V1/CreateBooking.cs
index ccb14df..7ae1a3d 100644
--- a/src/Services/Booking/src/Booking/Booking/Features/CreatingBook/Commands/V1/CreateBooking.cs
+++ b/src/Services/Booking/src/Booking/Booking/Features/CreatingBook/V1/CreateBooking.cs
@@ -1,4 +1,4 @@
-namespace Booking.Booking.Features.CreatingBook.Commands.V1;
+namespace Booking.Booking.Features.CreatingBook.V1;
 
 using Ardalis.GuardClauses;
 using BuildingBlocks.Core;
@@ -8,7 +8,6 @@ using BuildingBlocks.Core.Model;
 using BuildingBlocks.EventStoreDB.Repository;
 using BuildingBlocks.Web;
 using Duende.IdentityServer.EntityFramework.Entities;
-using Elasticsearch.Net;
 using Exceptions;
 using Flight;
 using FluentValidation;
@@ -22,8 +21,7 @@ using Microsoft.AspNetCore.Routing;
 using Passenger;
 using ValueObjects;
 
-public record CreateBooking(Guid PassengerId, Guid FlightId, string Description) : ICommand<CreateBookingResult>,
-    IInternalCommand
+public record CreateBooking(Guid PassengerId, Guid FlightId, string Description) : ICommand<CreateBookingResult>
 {
     public Guid Id { get; init; } = NewId.NextGuid();
 }
@@ -66,7 +64,7 @@ public class CreateBookingEndpoint : IMinimalEndpoint
     }
 }
 
-internal class CreateBookingValidator : AbstractValidator<CreateBooking>
+public class CreateBookingValidator : AbstractValidator<CreateBooking>
 {
     public CreateBookingValidator()
     {
diff --git a/src/Services/Booking/src/Booking/Booking/Models/Booking.cs b/src/Services/Booking/src/Booking/Booking/Models/Booking.cs
index d66e2da..a895426 100644
--- a/src/Services/Booking/src/Booking/Booking/Models/Booking.cs
+++ b/src/Services/Booking/src/Booking/Booking/Models/Booking.cs
@@ -2,7 +2,7 @@ using BuildingBlocks.EventStoreDB.Events;
 
 namespace Booking.Booking.Models;
 
-using Features.CreatingBook.Commands.V1;
+using Features.CreatingBook.V1;
 using ValueObjects;
 
 public record Booking : AggregateEventSourcing<Guid>
diff --git a/src/Services/Booking/src/Booking/BookingProjection.cs b/src/Services/Booking/src/Booking/BookingProjection.cs
index 68b8df3..ba4d2db 100644
--- a/src/Services/Booking/src/Booking/BookingProjection.cs
+++ b/src/Services/Booking/src/Booking/BookingProjection.cs
@@ -7,7 +7,7 @@ using MongoDB.Driver.Linq;
 
 namespace Booking;
 
-using Booking.Features.CreatingBook.Commands.V1;
+using Booking.Features.CreatingBook.V1;
 using Booking.Models;
 using MassTransit;
 
diff --git a/src/Services/Booking/src/Booking/EventMapper.cs b/src/Services/Booking/src/Booking/EventMapper.cs
index ef02381..2996d90 100644
--- a/src/Services/Booking/src/Booking/EventMapper.cs
+++ b/src/Services/Booking/src/Booking/EventMapper.cs
@@ -4,7 +4,7 @@ using BuildingBlocks.Core.Event;
 
 namespace Booking;
 
-using Booking.Features.CreatingBook.Commands.V1;
+using Booking.Features.CreatingBook.V1;
 
 public sealed class EventMapper : IEventMapper
 {
diff --git a/src/Services/Booking/tests/IntegrationTest/Fakes/FakeCreateBookingCommand.cs b/src/Services/Booking/tests/IntegrationTest/Fakes/FakeCreateBookingCommand.cs
index 39f3846..288a383 100644
--- a/src/Services/Booking/tests/IntegrationTest/Fakes/FakeCreateBookingCommand.cs
+++ b/src/Services/Booking/tests/IntegrationTest/Fakes/FakeCreateBookingCommand.cs
@@ -3,7 +3,7 @@
 namespace Integration.Test.Fakes;
 
 using System;
-using global::Booking.Booking.Features.CreatingBook.Commands.V1;
+using global::Booking.Booking.Features.CreatingBook.V1;
 using MassTransit;
 
 public sealed class FakeCreateBookingCommand : AutoFaker<CreateBooking>
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 1e543f9..ff9b266 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
@@ -68,7 +68,7 @@ public class CreateAircraftEndpoint : IMinimalEndpoint
     }
 }
 
-internal class CreateAircraftValidator : AbstractValidator<CreateAircraft>
+public class CreateAircraftValidator : AbstractValidator<CreateAircraft>
 {
     public CreateAircraftValidator()
     {
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 e9ffb4d..e89ccb0 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
@@ -17,7 +17,7 @@ using ValueObjects;
 
 public record CreateAircraftMongo(Guid Id, string Name, string Model, int ManufacturingYear, bool IsDeleted = false) : InternalCommand;
 
-public class CreateAircraftMongoHandler : ICommandHandler<CreateAircraftMongo>
+internal class CreateAircraftMongoHandler : ICommandHandler<CreateAircraftMongo>
 {
     private readonly FlightReadDbContext _flightReadDbContext;
     private readonly IMapper _mapper;
diff --git a/src/Services/Flight/src/Flight/Airports/Features/CreatingAirport/V1/CreateAirport.cs b/src/Services/Flight/src/Flight/Airports/Features/CreatingAirport/V1/CreateAirport.cs
index 42f8a40..580f9c7 100644
--- a/src/Services/Flight/src/Flight/Airports/Features/CreatingAirport/V1/CreateAirport.cs
+++ b/src/Services/Flight/src/Flight/Airports/Features/CreatingAirport/V1/CreateAirport.cs
@@ -65,7 +65,7 @@ public class CreateAirportEndpoint : IMinimalEndpoint
     }
 }
 
-internal class CreateAirportValidator : AbstractValidator<CreateAirport>
+public class CreateAirportValidator : AbstractValidator<CreateAirport>
 {
     public CreateAirportValidator()
     {
diff --git a/src/Services/Flight/src/Flight/EventMapper.cs b/src/Services/Flight/src/Flight/EventMapper.cs
index f8c8b82..9035417 100644
--- a/src/Services/Flight/src/Flight/EventMapper.cs
+++ b/src/Services/Flight/src/Flight/EventMapper.cs
@@ -11,7 +11,7 @@ using Flights.Features.CreatingFlight.V1;
 using Flights.Features.DeletingFlight.V1;
 using Flights.Features.UpdatingFlight.V1;
 using Seats.Features.CreatingSeat.V1;
-using Seats.Features.ReservingSeat.Commands.V1;
+using Seats.Features.ReservingSeat.V1;
 
 // ref: https://www.ledjonbehluli.com/posts/domain_to_integration_event/
 public sealed class EventMapper : IEventMapper
diff --git a/src/Services/Flight/src/Flight/Flights/Features/DeletingFlight/V1/DeleteFlight.cs b/src/Services/Flight/src/Flight/Flights/Features/DeletingFlight/V1/DeleteFlight.cs
index e69cbd2..ead41c2 100644
--- a/src/Services/Flight/src/Flight/Flights/Features/DeletingFlight/V1/DeleteFlight.cs
+++ b/src/Services/Flight/src/Flight/Flights/Features/DeletingFlight/V1/DeleteFlight.cs
@@ -53,7 +53,7 @@ public class DeleteFlightEndpoint : IMinimalEndpoint
     }
 }
 
-internal class DeleteFlightValidator : AbstractValidator<DeleteFlight>
+public class DeleteFlightValidator : AbstractValidator<DeleteFlight>
 {
     public DeleteFlightValidator()
     {
diff --git a/src/Services/Flight/src/Flight/Flights/Features/GettingFlightById/V1/GetFlightById.cs b/src/Services/Flight/src/Flight/Flights/Features/GettingFlightById/V1/GetFlightById.cs
index 19fc32e..ea6bf12 100644
--- a/src/Services/Flight/src/Flight/Flights/Features/GettingFlightById/V1/GetFlightById.cs
+++ b/src/Services/Flight/src/Flight/Flights/Features/GettingFlightById/V1/GetFlightById.cs
@@ -61,7 +61,7 @@ public class GetFlightByIdValidator : AbstractValidator<GetFlightById>
     }
 }
 
-public class GetFlightByIdHandler : IQueryHandler<GetFlightById, GetFlightByIdResult>
+internal class GetFlightByIdHandler : IQueryHandler<GetFlightById, GetFlightByIdResult>
 {
     private readonly IMapper _mapper;
     private readonly FlightReadDbContext _flightReadDbContext;
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 e8c2928..242f951 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
@@ -70,7 +70,7 @@ public class UpdateFlightEndpoint : IMinimalEndpoint
     }
 }
 
-internal class UpdateFlightValidator : AbstractValidator<CreateFlight>
+public class UpdateFlightValidator : AbstractValidator<CreateFlight>
 {
     public UpdateFlightValidator()
     {
diff --git a/src/Services/Flight/src/Flight/GrpcServer/Services/FlightGrpcServices.cs b/src/Services/Flight/src/Flight/GrpcServer/Services/FlightGrpcServices.cs
index d67bf57..9a82947 100644
--- a/src/Services/Flight/src/Flight/GrpcServer/Services/FlightGrpcServices.cs
+++ b/src/Services/Flight/src/Flight/GrpcServer/Services/FlightGrpcServices.cs
@@ -8,7 +8,7 @@ namespace Flight.GrpcServer.Services;
 using System;
 using Flights.Features.GettingFlightById.V1;
 using Seats.Features.GettingAvailableSeats.V1;
-using Seats.Features.ReservingSeat.Commands.V1;
+using Seats.Features.ReservingSeat.V1;
 using GetAvailableSeatsResult = GetAvailableSeatsResult;
 using GetFlightByIdResult = GetFlightByIdResult;
 using ReserveSeatResult = ReserveSeatResult;
diff --git a/src/Services/Flight/src/Flight/Seats/Features/CreatingSeat/V1/CreateSeat.cs b/src/Services/Flight/src/Flight/Seats/Features/CreatingSeat/V1/CreateSeat.cs
index cc11ce2..f8f5e97 100644
--- a/src/Services/Flight/src/Flight/Seats/Features/CreatingSeat/V1/CreateSeat.cs
+++ b/src/Services/Flight/src/Flight/Seats/Features/CreatingSeat/V1/CreateSeat.cs
@@ -1,7 +1,6 @@
 namespace Flight.Seats.Features.CreatingSeat.V1;
 
 using System;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Ardalis.GuardClauses;
@@ -9,9 +8,9 @@ using BuildingBlocks.Core.CQRS;
 using BuildingBlocks.Core.Event;
 using BuildingBlocks.Web;
 using Duende.IdentityServer.EntityFramework.Entities;
-using Flight.Data;
-using Flight.Seats.Exceptions;
-using Flight.Seats.Models;
+using Data;
+using Exceptions;
+using Models;
 using Flights.ValueObjects;
 using FluentValidation;
 using Mapster;
@@ -71,7 +70,7 @@ public class CreateSeatEndpoint : IMinimalEndpoint
     }
 }
 
-internal class CreateSeatValidator : AbstractValidator<CreateSeat>
+public class CreateSeatValidator : AbstractValidator<CreateSeat>
 {
     public CreateSeatValidator()
     {
diff --git a/src/Services/Flight/src/Flight/Seats/Features/CreatingSeat/V1/CreateSeatMongo.cs b/src/Services/Flight/src/Flight/Seats/Features/CreatingSeat/V1/CreateSeatMongo.cs
index aab229b..a0f900f 100644
--- a/src/Services/Flight/src/Flight/Seats/Features/CreatingSeat/V1/CreateSeatMongo.cs
+++ b/src/Services/Flight/src/Flight/Seats/Features/CreatingSeat/V1/CreateSeatMongo.cs
@@ -6,9 +6,9 @@ using System.Threading.Tasks;
 using Ardalis.GuardClauses;
 using BuildingBlocks.Core.CQRS;
 using BuildingBlocks.Core.Event;
-using Flight.Data;
-using Flight.Seats.Exceptions;
-using Flight.Seats.Models;
+using Data;
+using Exceptions;
+using Models;
 using MapsterMapper;
 using MediatR;
 using MongoDB.Driver;
@@ -17,7 +17,7 @@ using MongoDB.Driver.Linq;
 public record CreateSeatMongo(Guid Id, string SeatNumber, Enums.SeatType Type,
     Enums.SeatClass Class, Guid FlightId, bool IsDeleted = false) : InternalCommand;
 
-public class CreateSeatMongoHandler : ICommandHandler<CreateSeatMongo>
+internal class CreateSeatMongoHandler : ICommandHandler<CreateSeatMongo>
 {
     private readonly FlightReadDbContext _flightReadDbContext;
     private readonly IMapper _mapper;
diff --git a/src/Services/Flight/src/Flight/Seats/Features/GettingAvailableSeats/V1/GetAvailableSeats.cs b/src/Services/Flight/src/Flight/Seats/Features/GettingAvailableSeats/V1/GetAvailableSeats.cs
index d4e3bb4..24b0f56 100644
--- a/src/Services/Flight/src/Flight/Seats/Features/GettingAvailableSeats/V1/GetAvailableSeats.cs
+++ b/src/Services/Flight/src/Flight/Seats/Features/GettingAvailableSeats/V1/GetAvailableSeats.cs
@@ -55,7 +55,7 @@ public class GetAvailableSeatsEndpoint : IMinimalEndpoint
     }
 }
 
-internal class GetAvailableSeatsValidator : AbstractValidator<GetAvailableSeats>
+public class GetAvailableSeatsValidator : AbstractValidator<GetAvailableSeats>
 {
     public GetAvailableSeatsValidator()
     {
diff --git a/src/Services/Flight/src/Flight/Seats/Features/ReservingSeat/Commands/V1/ReserveSeat.cs b/src/Services/Flight/src/Flight/Seats/Features/ReservingSeat/V1/ReserveSeat.cs
similarity index 93%
rename from src/Services/Flight/src/Flight/Seats/Features/ReservingSeat/Commands/V1/ReserveSeat.cs
rename to src/Services/Flight/src/Flight/Seats/Features/ReservingSeat/V1/ReserveSeat.cs
index 70d876f..4123393 100644
--- a/src/Services/Flight/src/Flight/Seats/Features/ReservingSeat/Commands/V1/ReserveSeat.cs
+++ b/src/Services/Flight/src/Flight/Seats/Features/ReservingSeat/V1/ReserveSeat.cs
@@ -1,4 +1,4 @@
-namespace Flight.Seats.Features.ReservingSeat.Commands.V1;
+namespace Flight.Seats.Features.ReservingSeat.V1;
 
 using System;
 using System.Threading;
@@ -7,10 +7,9 @@ using Ardalis.GuardClauses;
 using BuildingBlocks.Core.CQRS;
 using BuildingBlocks.Core.Event;
 using BuildingBlocks.Web;
-using Data;
 using Duende.IdentityServer.EntityFramework.Entities;
-using Exceptions;
-using Flights.ValueObjects;
+using Flight.Data;
+using Flight.Seats.Exceptions;
 using FluentValidation;
 using Mapster;
 using MapsterMapper;
@@ -19,7 +18,6 @@ using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.EntityFrameworkCore;
-using ValueObjects;
 
 public record ReserveSeat(Guid FlightId, string SeatNumber) : ICommand<ReserveSeatResult>, IInternalCommand;
 
@@ -63,7 +61,7 @@ public class ReserveSeatEndpoint : IMinimalEndpoint
     }
 }
 
-internal class ReserveSeatValidator : AbstractValidator<ReserveSeat>
+public class ReserveSeatValidator : AbstractValidator<ReserveSeat>
 {
     public ReserveSeatValidator()
     {
diff --git a/src/Services/Flight/src/Flight/Seats/Features/ReservingSeat/Commands/V1/ReserveSeatMongo.cs b/src/Services/Flight/src/Flight/Seats/Features/ReservingSeat/V1/ReserveSeatMongo.cs
similarity index 95%
rename from src/Services/Flight/src/Flight/Seats/Features/ReservingSeat/Commands/V1/ReserveSeatMongo.cs
rename to src/Services/Flight/src/Flight/Seats/Features/ReservingSeat/V1/ReserveSeatMongo.cs
index 6fa4de1..775724d 100644
--- a/src/Services/Flight/src/Flight/Seats/Features/ReservingSeat/Commands/V1/ReserveSeatMongo.cs
+++ b/src/Services/Flight/src/Flight/Seats/Features/ReservingSeat/V1/ReserveSeatMongo.cs
@@ -1,4 +1,4 @@
-namespace Flight.Seats.Features.ReservingSeat.Commands.V1;
+namespace Flight.Seats.Features.ReservingSeat.V1;
 
 using System;
 using System.Threading;
diff --git a/src/Services/Flight/src/Flight/Seats/Features/SeatMappings.cs b/src/Services/Flight/src/Flight/Seats/Features/SeatMappings.cs
index caeb761..65f24fa 100644
--- a/src/Services/Flight/src/Flight/Seats/Features/SeatMappings.cs
+++ b/src/Services/Flight/src/Flight/Seats/Features/SeatMappings.cs
@@ -6,7 +6,7 @@ namespace Flight.Seats.Features;
 
 using CreatingSeat.V1;
 using MassTransit;
-using ReservingSeat.Commands.V1;
+using ReservingSeat.V1;
 
 public class SeatMappings : IRegister
 {
diff --git a/src/Services/Flight/src/Flight/Seats/Models/Seat.cs b/src/Services/Flight/src/Flight/Seats/Models/Seat.cs
index 395fbe8..ee817d9 100644
--- a/src/Services/Flight/src/Flight/Seats/Models/Seat.cs
+++ b/src/Services/Flight/src/Flight/Seats/Models/Seat.cs
@@ -4,7 +4,7 @@ using BuildingBlocks.Core.Model;
 namespace Flight.Seats.Models;
 
 using Features.CreatingSeat.V1;
-using Features.ReservingSeat.Commands.V1;
+using Features.ReservingSeat.V1;
 using Flight.Flights.ValueObjects;
 using ValueObjects;
 
diff --git a/src/Services/Identity/src/Identity/Identity/Features/RegisteringNewUser/V1/RegisterNewUser.cs b/src/Services/Identity/src/Identity/Identity/Features/RegisteringNewUser/V1/RegisterNewUser.cs
index ef20e49..a8b5cb4 100644
--- a/src/Services/Identity/src/Identity/Identity/Features/RegisteringNewUser/V1/RegisterNewUser.cs
+++ b/src/Services/Identity/src/Identity/Identity/Features/RegisteringNewUser/V1/RegisterNewUser.cs
@@ -62,7 +62,7 @@ public class RegisterNewUserEndpoint : IMinimalEndpoint
     }
 }
 
-internal class RegisterNewUserValidator : AbstractValidator<RegisterNewUser>
+public class RegisterNewUserValidator : AbstractValidator<RegisterNewUser>
 {
     public RegisterNewUserValidator()
     {
diff --git a/src/Services/Passenger/src/Passenger/GrpcServer/Services/PassengerGrpcServices.cs b/src/Services/Passenger/src/Passenger/GrpcServer/Services/PassengerGrpcServices.cs
index b30c634..3b9cf37 100644
--- a/src/Services/Passenger/src/Passenger/GrpcServer/Services/PassengerGrpcServices.cs
+++ b/src/Services/Passenger/src/Passenger/GrpcServer/Services/PassengerGrpcServices.cs
@@ -4,7 +4,7 @@ using MediatR;
 namespace Passenger.GrpcServer.Services;
 
 using Mapster;
-using Passengers.Features.GettingPassengerById.Queries.V1;
+using Passengers.Features.GettingPassengerById.V1;
 using GetPassengerByIdResult = Passenger.GetPassengerByIdResult;
 
 public class PassengerGrpcServices : PassengerGrpcService.PassengerGrpcServiceBase
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 6af9367..5860071 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
@@ -65,7 +65,7 @@ public class CompleteRegisterPassengerEndpoint : IMinimalEndpoint
     }
 }
 
-internal class CompleteRegisterPassengerValidator : AbstractValidator<CompleteRegisterPassenger>
+public class CompleteRegisterPassengerValidator : AbstractValidator<CompleteRegisterPassenger>
 {
     public CompleteRegisterPassengerValidator()
     {
diff --git a/src/Services/Passenger/src/Passenger/Passengers/Features/GettingPassengerById/Queries/V1/GetPassengerById.cs b/src/Services/Passenger/src/Passenger/Passengers/Features/GettingPassengerById/V1/GetPassengerById.cs
similarity index 92%
rename from src/Services/Passenger/src/Passenger/Passengers/Features/GettingPassengerById/Queries/V1/GetPassengerById.cs
rename to src/Services/Passenger/src/Passenger/Passengers/Features/GettingPassengerById/V1/GetPassengerById.cs
index 77436bd..2b36d5f 100644
--- a/src/Services/Passenger/src/Passenger/Passengers/Features/GettingPassengerById/Queries/V1/GetPassengerById.cs
+++ b/src/Services/Passenger/src/Passenger/Passengers/Features/GettingPassengerById/V1/GetPassengerById.cs
@@ -1,12 +1,9 @@
-namespace Passenger.Passengers.Features.GettingPassengerById.Queries.V1;
+namespace Passenger.Passengers.Features.GettingPassengerById.V1;
 
 using Ardalis.GuardClauses;
 using BuildingBlocks.Core.CQRS;
 using BuildingBlocks.Web;
-using Data;
-using Dtos;
 using Duende.IdentityServer.EntityFramework.Entities;
-using Exceptions;
 using FluentValidation;
 using Mapster;
 using MapsterMapper;
@@ -16,7 +13,9 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Routing;
 using MongoDB.Driver;
 using MongoDB.Driver.Linq;
-using ValueObjects;
+using Passenger.Data;
+using Passenger.Passengers.Dtos;
+using Passenger.Passengers.Exceptions;
 
 public record GetPassengerById(Guid Id) : IQuery<GetPassengerByIdResult>;
 
@@ -51,7 +50,7 @@ public class GetPassengerByIdEndpoint : IMinimalEndpoint
     }
 }
 
-internal class GetPassengerByIdValidator : AbstractValidator<GetPassengerById>
+public class GetPassengerByIdValidator : AbstractValidator<GetPassengerById>
 {
     public GetPassengerByIdValidator()
     {
diff --git a/src/Services/Passenger/tests/IntegrationTest/Passenger/Features/GetPassengerByIdTests.cs b/src/Services/Passenger/tests/IntegrationTest/Passenger/Features/GetPassengerByIdTests.cs
index d8ac75e..76df5c0 100644
--- a/src/Services/Passenger/tests/IntegrationTest/Passenger/Features/GetPassengerByIdTests.cs
+++ b/src/Services/Passenger/tests/IntegrationTest/Passenger/Features/GetPassengerByIdTests.cs
@@ -9,7 +9,7 @@ using Xunit;
 
 namespace Integration.Test.Passenger.Features;
 
-using global::Passenger.Passengers.Features.GettingPassengerById.Queries.V1;
+using global::Passenger.Passengers.Features.GettingPassengerById.V1;
 using Humanizer;
 using Thrift.Protocol;