Move

Application/Tracks/Commands/CreateTrackCommand.cs

@@ -1,9 +1,9 @@
 using Ardalis.Result;
 using DispatchR.Abstractions.Send;
 using Musify.Application.Contracts.Application;
-using Musify.Application.Tracks.Contracts;
+using Musify.Application.Tracks.Responses;
 
-namespace Musify.Application.Tracks.Commands.CreateTrack
+namespace Musify.Application.Tracks.Commands
 {
     public record CreateTrackCommand(
         Guid UserId,

Application/Tracks/Handler/CreateTrackCommandHandler.cs

@@ -4,10 +4,11 @@ using Microsoft.Extensions.Logging;
 using Musify.Application.Configuration;
 using Musify.Application.Contracts.Infrastructure;
 using Musify.Application.Events;
-using Musify.Application.Tracks.Contracts;
+using Musify.Application.Tracks.Commands;
+using Musify.Application.Tracks.Responses;
 using Musify.Domain.Entities;
 
-namespace Musify.Application.Tracks.Commands.CreateTrack
+namespace Musify.Application.Tracks.Handler
 {
     public class CreateTrackCommandHandler(IDatabase database, IPictureHandler pictureHandler, IEventBus eventBus, IStorageHandler storageHandler,
         ILogger<CreateTrackCommandHandler> logger, ApplicationStorageConfiguration storageConfiguration, TrackConfiguration trackConfiguration)

Application/Tracks/Handler/GetTrackByIdQueryHandler.cs

@@ -1,9 +1,10 @@
 using Ardalis.Result;
 using DispatchR.Abstractions.Send;
 using Musify.Application.Contracts.Infrastructure;
-using Musify.Application.Tracks.Contracts;
+using Musify.Application.Tracks.Queries;
+using Musify.Application.Tracks.Responses;
 
-namespace Musify.Application.Tracks.Queries.GetTrackById
+namespace Musify.Application.Tracks.Handler
 {
     public class GetTrackByIdQueryHandler(IDatabase database)
         : IRequestHandler<GetTrackByIdQuery, Task<Result<TrackResponse> >>

Application/Tracks/Handler/GetTracksByUserIdQueryHandler.cs

@@ -3,10 +3,11 @@ using DispatchR.Abstractions.Send;
 using Microsoft.EntityFrameworkCore;
 using Musify.Application.Contracts.Application;
 using Musify.Application.Contracts.Infrastructure;
-using Musify.Application.Tracks.Contracts;
+using Musify.Application.Tracks.Queries;
+using Musify.Application.Tracks.Responses;
 using X.PagedList.EF;
 
-namespace Musify.Application.Tracks.Queries.GetTracksByUserId
+namespace Musify.Application.Tracks.Handler
 {
     public class GetTracksByUserIdQueryHandler(IDatabase database)
         : IRequestHandler<GetTracksByUserIdQuery, Task<Result<PaginatedResponse<TrackResponse>> >>

Application/Tracks/Handler/GetTracksQueryHandler.cs

@@ -3,10 +3,11 @@ using DispatchR.Abstractions.Send;
 using Microsoft.EntityFrameworkCore;
 using Musify.Application.Contracts.Application;
 using Musify.Application.Contracts.Infrastructure;
-using Musify.Application.Tracks.Contracts;
+using Musify.Application.Tracks.Queries;
+using Musify.Application.Tracks.Responses;
 using X.PagedList.EF;
 
-namespace Musify.Application.Tracks.Queries.GetTracks
+namespace Musify.Application.Tracks.Handler
 {
     public class GetTracksQueryHandler(IDatabase database)
         : IRequestHandler<GetTracksQuery, Task<Result<PaginatedResponse<TrackResponse>> > >

Application/Tracks/Queries/GetTrackByIdQuery.cs

@@ -1,8 +1,8 @@
 using Ardalis.Result;
 using DispatchR.Abstractions.Send;
-using Musify.Application.Tracks.Contracts;
+using Musify.Application.Tracks.Responses;
 
-namespace Musify.Application.Tracks.Queries.GetTrackById
+namespace Musify.Application.Tracks.Queries
 {
     public record GetTrackByIdQuery(Guid TrackId)
         : IRequest<GetTrackByIdQuery, Task<Result<TrackResponse> >>;

Application/Tracks/Queries/GetTracksByUserIdQuery.cs

@@ -1,9 +1,9 @@
 using Ardalis.Result;
 using DispatchR.Abstractions.Send;
 using Musify.Application.Contracts.Application;
-using Musify.Application.Tracks.Contracts;
+using Musify.Application.Tracks.Responses;
 
-namespace Musify.Application.Tracks.Queries.GetTracksByUserId
+namespace Musify.Application.Tracks.Queries
 {
     public record GetTracksByUserIdQuery(
         Guid UserId,

Application/Tracks/Queries/GetTracksQuery.cs

@@ -1,9 +1,9 @@
 using Ardalis.Result;
 using DispatchR.Abstractions.Send;
 using Musify.Application.Contracts.Application;
-using Musify.Application.Tracks.Contracts;
+using Musify.Application.Tracks.Responses;
 
-namespace Musify.Application.Tracks.Queries.GetTracks
+namespace Musify.Application.Tracks.Queries
 {
     public record GetTracksQuery(int PageNumber = 1, int PageSize = 10)
         : IRequest<GetTracksQuery, Task<Result<PaginatedResponse<TrackResponse> >> >;

Application/Tracks/Responses/TrackResponse.cs

@@ -1,6 +1,6 @@
 using Musify.Domain.Entities;
 
-namespace Musify.Application.Tracks.Contracts
+namespace Musify.Application.Tracks.Responses
 {
     public record TrackResponse(
         Guid Id,