diff --git a/Application/Contracts/Application/IFileData.cs b/Application/Abstractions/Application/IFileData.cs
similarity index 76%
rename from Application/Contracts/Application/IFileData.cs
rename to Application/Abstractions/Application/IFileData.cs
index 96a9347..8d92e55 100644
--- a/Application/Contracts/Application/IFileData.cs
+++ b/Application/Abstractions/Application/IFileData.cs
@@ -1,4 +1,4 @@
-namespace Musify.Application.Contracts.Application
+namespace Musify.Application.Abstractions.Application
 {
     public interface IFileData
     {
diff --git a/Application/Contracts/Application/PaginatedResponse.cs b/Application/Abstractions/Application/PaginatedResponse.cs
similarity index 92%
rename from Application/Contracts/Application/PaginatedResponse.cs
rename to Application/Abstractions/Application/PaginatedResponse.cs
index 9f9b5ac..fe38d61 100644
--- a/Application/Contracts/Application/PaginatedResponse.cs
+++ b/Application/Abstractions/Application/PaginatedResponse.cs
@@ -1,6 +1,6 @@
 using X.PagedList;
 
-namespace Musify.Application.Contracts.Application
+namespace Musify.Application.Abstractions.Application
 {
     public record PaginatedResponse<T>(
         IReadOnlyCollection<T> Items,
diff --git a/Application/Contracts/Infrastructure/IAudioTranscoderService.cs b/Application/Abstractions/Infrastructure/IAudioTranscoderService.cs
similarity index 82%
rename from Application/Contracts/Infrastructure/IAudioTranscoderService.cs
rename to Application/Abstractions/Infrastructure/IAudioTranscoderService.cs
index 3c74cd5..69b86b3 100644
--- a/Application/Contracts/Infrastructure/IAudioTranscoderService.cs
+++ b/Application/Abstractions/Infrastructure/IAudioTranscoderService.cs
@@ -1,4 +1,4 @@
-namespace Musify.Application.Contracts.Infrastructure
+namespace Musify.Application.Abstractions.Infrastructure
 {
     public interface IAudioTranscoderService
     {
diff --git a/Application/Contracts/Infrastructure/IDatabase.cs b/Application/Abstractions/Infrastructure/IDatabase.cs
similarity index 88%
rename from Application/Contracts/Infrastructure/IDatabase.cs
rename to Application/Abstractions/Infrastructure/IDatabase.cs
index 98ec9f4..ea81d4e 100644
--- a/Application/Contracts/Infrastructure/IDatabase.cs
+++ b/Application/Abstractions/Infrastructure/IDatabase.cs
@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using Musify.Domain.Entities;
 
-namespace Musify.Application.Contracts.Infrastructure
+namespace Musify.Application.Abstractions.Infrastructure
 {
     public interface IDatabase
     {
diff --git a/Application/Contracts/Infrastructure/IEventBus.cs b/Application/Abstractions/Infrastructure/IEventBus.cs
similarity index 67%
rename from Application/Contracts/Infrastructure/IEventBus.cs
rename to Application/Abstractions/Infrastructure/IEventBus.cs
index 0091321..578a1b2 100644
--- a/Application/Contracts/Infrastructure/IEventBus.cs
+++ b/Application/Abstractions/Infrastructure/IEventBus.cs
@@ -1,4 +1,4 @@
-namespace Musify.Application.Contracts.Infrastructure
+namespace Musify.Application.Abstractions.Infrastructure
 {
     public interface IEventBus
     {
diff --git a/Application/Contracts/Infrastructure/IPictureService.cs b/Application/Abstractions/Infrastructure/IPictureService.cs
similarity index 75%
rename from Application/Contracts/Infrastructure/IPictureService.cs
rename to Application/Abstractions/Infrastructure/IPictureService.cs
index 66bc445..666f6e5 100644
--- a/Application/Contracts/Infrastructure/IPictureService.cs
+++ b/Application/Abstractions/Infrastructure/IPictureService.cs
@@ -1,4 +1,4 @@
-namespace Musify.Application.Contracts.Infrastructure
+namespace Musify.Application.Abstractions.Infrastructure
 {
     public interface IPictureService
     {
diff --git a/Application/Contracts/Infrastructure/IStorageService.cs b/Application/Abstractions/Infrastructure/IStorageService.cs
similarity index 94%
rename from Application/Contracts/Infrastructure/IStorageService.cs
rename to Application/Abstractions/Infrastructure/IStorageService.cs
index 3127c35..a40b237 100644
--- a/Application/Contracts/Infrastructure/IStorageService.cs
+++ b/Application/Abstractions/Infrastructure/IStorageService.cs
@@ -1,4 +1,4 @@
-namespace Musify.Application.Contracts.Infrastructure
+namespace Musify.Application.Abstractions.Infrastructure
 {
     public interface IStorageService
     {
diff --git a/Application/PlayLists/Commands/CreatePlayListCommand.cs b/Application/PlayLists/Commands/CreatePlayListCommand.cs
index 5b6bdbb..6da1706 100644
--- a/Application/PlayLists/Commands/CreatePlayListCommand.cs
+++ b/Application/PlayLists/Commands/CreatePlayListCommand.cs
@@ -1,6 +1,6 @@
 using Ardalis.Result;
 using Mediator;
-using Musify.Application.Contracts.Application;
+using Musify.Application.Abstractions.Application;
 using Musify.Application.PlayLists.Responses;
 using Musify.Domain.Entities;
 
@@ -11,7 +11,7 @@ namespace Musify.Application.PlayLists.Commands
         string Name,
         string Description,
         IFileData? Picture)
-        : ICommand<Result<PlayListResponse>>
+        : ICommand<Result<PlayListApplicationResponse>>
     {
         public static PlayList ToEntity(CreatePlayListCommand command, string originalKey, string smallKey, string mediumKey, string largeKey)
         {
diff --git a/Application/PlayLists/Commands/UpdatePlayListCommand.cs b/Application/PlayLists/Commands/UpdatePlayListCommand.cs
index 3aac73c..748b8a9 100644
--- a/Application/PlayLists/Commands/UpdatePlayListCommand.cs
+++ b/Application/PlayLists/Commands/UpdatePlayListCommand.cs
@@ -1,6 +1,6 @@
 using Ardalis.Result;
 using Mediator;
-using Musify.Application.Contracts.Application;
+using Musify.Application.Abstractions.Application;
 using Musify.Application.PlayLists.Responses;
 
 namespace Musify.Application.PlayLists.Commands
@@ -11,5 +11,5 @@ namespace Musify.Application.PlayLists.Commands
         string? NewName,
         string? NewDescription,
         IFileData? NewPicture)
-        : ICommand<Result<PlayListResponse>>;
+        : ICommand<Result<PlayListApplicationResponse>>;
 }
\ No newline at end of file
diff --git a/Application/PlayLists/Handlers/CreatePlayListCommandHandler.cs b/Application/PlayLists/Handlers/CreatePlayListCommandHandler.cs
index 543cb4d..76fa134 100644
--- a/Application/PlayLists/Handlers/CreatePlayListCommandHandler.cs
+++ b/Application/PlayLists/Handlers/CreatePlayListCommandHandler.cs
@@ -3,8 +3,8 @@ using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Musify.Application.Configuration;
-using Musify.Application.Contracts.Application;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Application;
+using Musify.Application.Abstractions.Infrastructure;
 using Musify.Application.Events;
 using Musify.Application.PlayLists.Commands;
 using Musify.Application.PlayLists.Responses;
@@ -19,9 +19,9 @@ namespace Musify.Application.PlayLists.Handlers
         ILogger<CreatePlayListCommandHandler> logger,
         ApplicationStorageConfiguration storageConfiguration,
         PlayListConfiguration playListConfiguration)
-        : ICommandHandler<CreatePlayListCommand, Result<PlayListResponse>>
+        : ICommandHandler<CreatePlayListCommand, Result<PlayListApplicationResponse>>
     {
-        public async ValueTask<Result<PlayListResponse>> Handle(CreatePlayListCommand request, CancellationToken cancellationToken)
+        public async ValueTask<Result<PlayListApplicationResponse>> Handle(CreatePlayListCommand request, CancellationToken cancellationToken)
         {
             var userExists = await database.Users
                 .AsNoTracking()
@@ -69,7 +69,7 @@ namespace Musify.Application.PlayLists.Handlers
             }
 
             logger.LogInformation("Created playlist {PlayListId} for user {UserId}", playList.Id, request.UserId);
-            return Result.Created(PlayListResponse.FromEntity(playList));
+            return Result.Created(PlayListApplicationResponse.FromEntity(playList));
         }
 
         async Task TryRollbackOnPublishFailureAsync(PlayList playList, CancellationToken cancellationToken)
diff --git a/Application/PlayLists/Handlers/DeletePlayListCommandHandler.cs b/Application/PlayLists/Handlers/DeletePlayListCommandHandler.cs
index 900d44d..76709cb 100644
--- a/Application/PlayLists/Handlers/DeletePlayListCommandHandler.cs
+++ b/Application/PlayLists/Handlers/DeletePlayListCommandHandler.cs
@@ -3,7 +3,7 @@ using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Musify.Application.Configuration;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Infrastructure;
 using Musify.Application.Events;
 using Musify.Application.PlayLists.Commands;
 
diff --git a/Application/PlayLists/Handlers/GetPlayListByIdQueryHandler.cs b/Application/PlayLists/Handlers/GetPlayListByIdQueryHandler.cs
index 6b430c7..f54ae91 100644
--- a/Application/PlayLists/Handlers/GetPlayListByIdQueryHandler.cs
+++ b/Application/PlayLists/Handlers/GetPlayListByIdQueryHandler.cs
@@ -1,6 +1,6 @@
 using Ardalis.Result;
 using Microsoft.EntityFrameworkCore;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Infrastructure;
 using Musify.Application.PlayLists.Responses;
 using Musify.Application.PlayLists.Queries;
 using Mediator;
@@ -8,16 +8,16 @@ using Mediator;
 namespace Musify.Application.PlayLists.Handlers
 {
     public class GetPlayListByIdQueryHandler(IDatabase database)
-        : IQueryHandler<GetPlayListByIdQuery, Result<PlayListResponse>>
+        : IQueryHandler<GetPlayListByIdQuery, Result<PlayListApplicationResponse>>
     {
-        public async ValueTask<Result<PlayListResponse>> Handle(GetPlayListByIdQuery request, CancellationToken cancellationToken)
+        public async ValueTask<Result<PlayListApplicationResponse>> Handle(GetPlayListByIdQuery request, CancellationToken cancellationToken)
         {
             var playList = await database.PlayLists
                 .AsNoTracking()
-                .Select(p => PlayListResponse.FromEntity(p))
+                .Select(p => PlayListApplicationResponse.FromEntity(p))
                 .SingleOrDefaultAsync(p => p.Id == request.Id, cancellationToken);
 
-            return playList ?? Result<PlayListResponse>.NotFound();
+            return playList ?? Result<PlayListApplicationResponse>.NotFound();
         }
     }
 }
\ No newline at end of file
diff --git a/Application/PlayLists/Handlers/GetPlayListsByUserIdQueryHandler.cs b/Application/PlayLists/Handlers/GetPlayListsByUserIdQueryHandler.cs
index 6c7cedf..8cfd94d 100644
--- a/Application/PlayLists/Handlers/GetPlayListsByUserIdQueryHandler.cs
+++ b/Application/PlayLists/Handlers/GetPlayListsByUserIdQueryHandler.cs
@@ -1,7 +1,7 @@
 using Ardalis.Result;
 using Microsoft.EntityFrameworkCore;
-using Musify.Application.Contracts.Application;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Application;
+using Musify.Application.Abstractions.Infrastructure;
 using Musify.Application.PlayLists.Responses;
 using Musify.Application.PlayLists.Queries;
 using X.PagedList.EF;
@@ -10,9 +10,9 @@ using Mediator;
 namespace Musify.Application.PlayLists.Handlers
 {
     public class GetPlayListsByUserIdQueryHandler(IDatabase database)
-        : IQueryHandler<GetPlayListsByUserIdQuery, Result<PaginatedResponse<PlayListResponse> > >
+        : IQueryHandler<GetPlayListsByUserIdQuery, Result<PaginatedResponse<PlayListApplicationResponse> > >
     {
-        public async ValueTask<Result<PaginatedResponse<PlayListResponse> >> Handle(GetPlayListsByUserIdQuery request, CancellationToken cancellationToken)
+        public async ValueTask<Result<PaginatedResponse<PlayListApplicationResponse> >> Handle(GetPlayListsByUserIdQuery request, CancellationToken cancellationToken)
         {
             var pageNumber = request.PageNumber < 1 ? 1 : request.PageNumber;
             var pageSize = request.PageSize < 1 ? 10 : request.PageSize;
@@ -31,10 +31,10 @@ namespace Musify.Application.PlayLists.Handlers
 
             var pagedPlayLists = await playListsQuery
                 .OrderBy(p => p.CreatedDate)
-                .Select(p => PlayListResponse.FromEntity(p))
+                .Select(p => PlayListApplicationResponse.FromEntity(p))
                 .ToPagedListAsync(pageNumber, pageSize, totalCount, cancellationToken);
 
-            return Result.Success(PaginatedResponse<PlayListResponse>.FromPagedList(pagedPlayLists));
+            return Result.Success(PaginatedResponse<PlayListApplicationResponse>.FromPagedList(pagedPlayLists));
         }
     }
 }
\ No newline at end of file
diff --git a/Application/PlayLists/Handlers/GetPlayListsQueryHandler.cs b/Application/PlayLists/Handlers/GetPlayListsQueryHandler.cs
index 7eb435c..e05fbe2 100644
--- a/Application/PlayLists/Handlers/GetPlayListsQueryHandler.cs
+++ b/Application/PlayLists/Handlers/GetPlayListsQueryHandler.cs
@@ -1,7 +1,7 @@
 using Ardalis.Result;
 using Microsoft.EntityFrameworkCore;
-using Musify.Application.Contracts.Application;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Application;
+using Musify.Application.Abstractions.Infrastructure;
 using Musify.Application.PlayLists.Responses;
 using Musify.Application.PlayLists.Queries;
 using X.PagedList.EF;
@@ -10,9 +10,9 @@ using Mediator;
 namespace Musify.Application.PlayLists.Handlers
 {
     public class GetPlayListsQueryHandler(IDatabase database)
-        : IQueryHandler<GetPlayListsQuery, Result<PaginatedResponse<PlayListResponse> >>
+        : IQueryHandler<GetPlayListsQuery, Result<PaginatedResponse<PlayListApplicationResponse> >>
     {
-        public async ValueTask<Result<PaginatedResponse<PlayListResponse> >> Handle(GetPlayListsQuery request, CancellationToken cancellationToken)
+        public async ValueTask<Result<PaginatedResponse<PlayListApplicationResponse> >> Handle(GetPlayListsQuery request, CancellationToken cancellationToken)
         {
             var pageNumber = request.PageNumber < 1 ? 1 : request.PageNumber;
             var pageSize = request.PageSize < 1 ? 10 : request.PageSize;
@@ -22,10 +22,10 @@ namespace Musify.Application.PlayLists.Handlers
             var pagedPlayLists = await database.PlayLists
                 .AsNoTracking()
                 .OrderBy(p => p.Id)
-                .Select(p => PlayListResponse.FromEntity(p))
+                .Select(p => PlayListApplicationResponse.FromEntity(p))
                 .ToPagedListAsync(pageNumber, pageSize, totalCount, cancellationToken);
 
-            return Result.Success(PaginatedResponse<PlayListResponse>.FromPagedList(pagedPlayLists));
+            return Result.Success(PaginatedResponse<PlayListApplicationResponse>.FromPagedList(pagedPlayLists));
         }
     }
 }
\ No newline at end of file
diff --git a/Application/PlayLists/Handlers/UpdatePlayListCommandHandler.cs b/Application/PlayLists/Handlers/UpdatePlayListCommandHandler.cs
index 2235d02..0ec4b4b 100644
--- a/Application/PlayLists/Handlers/UpdatePlayListCommandHandler.cs
+++ b/Application/PlayLists/Handlers/UpdatePlayListCommandHandler.cs
@@ -3,8 +3,8 @@ using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Musify.Application.Configuration;
-using Musify.Application.Contracts.Application;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Application;
+using Musify.Application.Abstractions.Infrastructure;
 using Musify.Application.Events;
 using Musify.Application.PlayLists.Commands;
 using Musify.Application.PlayLists.Responses;
@@ -15,12 +15,12 @@ namespace Musify.Application.PlayLists.Handlers
     public class UpdatePlayListCommandHandler(IEventBus eventBus, IDatabase database, IStorageService storageHandler,
         ILogger<UpdatePlayListCommandHandler> logger, ApplicationStorageConfiguration storageConfiguration,
         PlayListConfiguration playListConfiguration)
-        : ICommandHandler<UpdatePlayListCommand, Result<PlayListResponse>>
+        : ICommandHandler<UpdatePlayListCommand, Result<PlayListApplicationResponse>>
     {
         record UpdatePictureOutcome(Result Result, bool PictureUpdated, string? UploadedPictureKey);
         record PreviousPlayListState(string Name, string NormalizedName, string Description, string OriginalPictureName);
 
-        public async ValueTask<Result<PlayListResponse>> Handle(UpdatePlayListCommand request, CancellationToken cancellationToken)
+        public async ValueTask<Result<PlayListApplicationResponse>> Handle(UpdatePlayListCommand request, CancellationToken cancellationToken)
         {
             var playListEntity = await database.PlayLists.SingleOrDefaultAsync(pl => pl.Id == request.PlayListId, cancellationToken);
             if (playListEntity is null)
@@ -72,7 +72,7 @@ namespace Musify.Application.PlayLists.Handlers
             }
 
             logger.LogInformation("Updated playlist {PlayListId}", playListEntity.Id);
-            return Result.Success(PlayListResponse.FromEntity(playListEntity));
+            return Result.Success(PlayListApplicationResponse.FromEntity(playListEntity));
         }
 
         void UpdateName(PlayList playList, string? newName)
diff --git a/Application/PlayLists/Queries/GetPlayListByIdQuery.cs b/Application/PlayLists/Queries/GetPlayListByIdQuery.cs
index 27cc8c0..55d98c5 100644
--- a/Application/PlayLists/Queries/GetPlayListByIdQuery.cs
+++ b/Application/PlayLists/Queries/GetPlayListByIdQuery.cs
@@ -5,5 +5,5 @@ using Musify.Application.PlayLists.Responses;
 namespace Musify.Application.PlayLists.Queries
 {
     public record GetPlayListByIdQuery(Guid Id)
-        : IQuery<Result<PlayListResponse>>;
+        : IQuery<Result<PlayListApplicationResponse>>;
 }
\ No newline at end of file
diff --git a/Application/PlayLists/Queries/GetPlayListsByUserIdQuery.cs b/Application/PlayLists/Queries/GetPlayListsByUserIdQuery.cs
index 8f5439e..788853c 100644
--- a/Application/PlayLists/Queries/GetPlayListsByUserIdQuery.cs
+++ b/Application/PlayLists/Queries/GetPlayListsByUserIdQuery.cs
@@ -1,6 +1,6 @@
 using Ardalis.Result;
 using Mediator;
-using Musify.Application.Contracts.Application;
+using Musify.Application.Abstractions.Application;
 using Musify.Application.PlayLists.Responses;
 
 namespace Musify.Application.PlayLists.Queries
@@ -10,5 +10,5 @@ namespace Musify.Application.PlayLists.Queries
     string? Name = null,
         int PageNumber = 1,
         int PageSize = 10)
-        : IQuery<Result<PaginatedResponse<PlayListResponse>> >;
+        : IQuery<Result<PaginatedResponse<PlayListApplicationResponse>> >;
 }
\ No newline at end of file
diff --git a/Application/PlayLists/Queries/GetPlayListsQuery.cs b/Application/PlayLists/Queries/GetPlayListsQuery.cs
index c8ae5de..f532d99 100644
--- a/Application/PlayLists/Queries/GetPlayListsQuery.cs
+++ b/Application/PlayLists/Queries/GetPlayListsQuery.cs
@@ -1,10 +1,10 @@
 using Ardalis.Result;
 using Mediator;
-using Musify.Application.Contracts.Application;
+using Musify.Application.Abstractions.Application;
 using Musify.Application.PlayLists.Responses;
 
 namespace Musify.Application.PlayLists.Queries
 {
     public record GetPlayListsQuery(int PageNumber = 1, int PageSize = 10)
-        : IQuery<Result<PaginatedResponse<PlayListResponse>> >;
+        : IQuery<Result<PaginatedResponse<PlayListApplicationResponse>> >;
 }
\ No newline at end of file
diff --git a/Application/PlayLists/Responses/PlayListResponse.cs b/Application/PlayLists/Responses/PlayListApplicationResponse.cs
similarity index 78%
rename from Application/PlayLists/Responses/PlayListResponse.cs
rename to Application/PlayLists/Responses/PlayListApplicationResponse.cs
index 6ebebaf..994996a 100644
--- a/Application/PlayLists/Responses/PlayListResponse.cs
+++ b/Application/PlayLists/Responses/PlayListApplicationResponse.cs
@@ -2,7 +2,7 @@
 
 namespace Musify.Application.PlayLists.Responses
 {
-    public record PlayListResponse(
+    public record PlayListApplicationResponse(
         Guid Id,
         string Name,
         string Description,
@@ -12,9 +12,9 @@ namespace Musify.Application.PlayLists.Responses
         DateTime CreatedAt,
         DateTime UpdatedAt)
     {
-        public static PlayListResponse FromEntity(PlayList playList)
+        public static PlayListApplicationResponse FromEntity(PlayList playList)
         {
-            return new PlayListResponse(
+            return new PlayListApplicationResponse(
                 playList.Id,
                 playList.Name,
                 playList.Description,
diff --git a/Application/Tracks/Commands/CreateTrackCommand.cs b/Application/Tracks/Commands/CreateTrackCommand.cs
index cc65340..f99e324 100644
--- a/Application/Tracks/Commands/CreateTrackCommand.cs
+++ b/Application/Tracks/Commands/CreateTrackCommand.cs
@@ -1,6 +1,6 @@
 using Ardalis.Result;
 using Mediator;
-using Musify.Application.Contracts.Application;
+using Musify.Application.Abstractions.Application;
 using Musify.Application.Tracks.Responses;
 using Musify.Domain.Entities;
 
@@ -11,7 +11,7 @@ namespace Musify.Application.Tracks.Commands
         string Title,
         IFileData Picture,
         IFileData Audio)
-        : ICommand<Result<TrackResponse> >
+        : ICommand<Result<TrackApplicationResponse> >
     {
         public static Track ToEntity(CreateTrackCommand command, string smallPictureName, string mediumPictureName, string largePictureName)
         {
diff --git a/Application/Tracks/Handler/CreateTrackCommandHandler.cs b/Application/Tracks/Handler/CreateTrackCommandHandler.cs
index e07eaa5..07625a3 100644
--- a/Application/Tracks/Handler/CreateTrackCommandHandler.cs
+++ b/Application/Tracks/Handler/CreateTrackCommandHandler.cs
@@ -3,7 +3,7 @@ using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Musify.Application.Configuration;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Infrastructure;
 using Musify.Application.Events;
 using Musify.Application.Tracks.Commands;
 using Musify.Application.Tracks.Responses;
@@ -13,9 +13,9 @@ namespace Musify.Application.Tracks.Handler
 {
     public class CreateTrackCommandHandler(IDatabase database, IEventBus eventBus, IStorageService storageHandler,
         ILogger<CreateTrackCommandHandler> logger, ApplicationStorageConfiguration storageConfiguration, TrackConfiguration trackConfiguration)
-        : ICommandHandler<CreateTrackCommand, Result<TrackResponse> >
+        : ICommandHandler<CreateTrackCommand, Result<TrackApplicationResponse> >
     {
-        public async ValueTask<Result<TrackResponse>> Handle(CreateTrackCommand request, CancellationToken cancellationToken)
+        public async ValueTask<Result<TrackApplicationResponse>> Handle(CreateTrackCommand request, CancellationToken cancellationToken)
         {
             var userExists = await database.Users.AsNoTracking()
                 .AnyAsync(u => u.Id == request.UserId, cancellationToken);
@@ -64,7 +64,7 @@ namespace Musify.Application.Tracks.Handler
                 return Result.Error($"Failed to create track for {request.Title}");
             }
 
-            return Result.Created(TrackResponse.FromEntity(trackEntity));
+            return Result.Created(TrackApplicationResponse.FromEntity(trackEntity));
         }
 
         async Task<Result> UploadFilesAsync(
diff --git a/Application/Tracks/Handler/DeleteTrackCommandHandler.cs b/Application/Tracks/Handler/DeleteTrackCommandHandler.cs
index 8b41fd8..8c78e75 100644
--- a/Application/Tracks/Handler/DeleteTrackCommandHandler.cs
+++ b/Application/Tracks/Handler/DeleteTrackCommandHandler.cs
@@ -2,7 +2,7 @@ using Ardalis.Result;
 using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Infrastructure;
 using Musify.Application.Tracks.Commands;
 using Musify.Domain.Entities;
 using Musify.Application.Events;
diff --git a/Application/Tracks/Handler/GetTrackByIdQueryHandler.cs b/Application/Tracks/Handler/GetTrackByIdQueryHandler.cs
index f529bab..85607e3 100644
--- a/Application/Tracks/Handler/GetTrackByIdQueryHandler.cs
+++ b/Application/Tracks/Handler/GetTrackByIdQueryHandler.cs
@@ -1,22 +1,22 @@
 using Ardalis.Result;
 using Mediator;
 using Microsoft.EntityFrameworkCore;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Infrastructure;
 using Musify.Application.Tracks.Queries;
 using Musify.Application.Tracks.Responses;
 
 namespace Musify.Application.Tracks.Handler
 {
     public class GetTrackByIdQueryHandler(IDatabase database)
-        : IQueryHandler<GetTrackByIdQuery, Result<TrackResponse> >
+        : IQueryHandler<GetTrackByIdQuery, Result<TrackApplicationResponse> >
     {
-        public async ValueTask<Result<TrackResponse>> Handle(GetTrackByIdQuery request, CancellationToken cancellationToken)
+        public async ValueTask<Result<TrackApplicationResponse>> Handle(GetTrackByIdQuery request, CancellationToken cancellationToken)
         {
             var track = await database.Tracks.AsNoTracking()
-                .Select(t => TrackResponse.FromEntity(t))
+                .Select(t => TrackApplicationResponse.FromEntity(t))
                 .SingleOrDefaultAsync(t => t.Id == request.TrackId, cancellationToken);
 
-            return track ?? Result<TrackResponse>.NotFound();
+            return track ?? Result<TrackApplicationResponse>.NotFound();
         }
     }
 }
\ No newline at end of file
diff --git a/Application/Tracks/Handler/GetTracksByUserIdQueryHandler.cs b/Application/Tracks/Handler/GetTracksByUserIdQueryHandler.cs
index c48426f..9710a2b 100644
--- a/Application/Tracks/Handler/GetTracksByUserIdQueryHandler.cs
+++ b/Application/Tracks/Handler/GetTracksByUserIdQueryHandler.cs
@@ -1,8 +1,8 @@
 using Ardalis.Result;
 using Mediator;
 using Microsoft.EntityFrameworkCore;
-using Musify.Application.Contracts.Application;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Application;
+using Musify.Application.Abstractions.Infrastructure;
 using Musify.Application.Tracks.Queries;
 using Musify.Application.Tracks.Responses;
 using X.PagedList.EF;
@@ -10,9 +10,9 @@ using X.PagedList.EF;
 namespace Musify.Application.Tracks.Handler
 {
     public class GetTracksByUserIdQueryHandler(IDatabase database)
-        : IQueryHandler<GetTracksByUserIdQuery, Result<PaginatedResponse<TrackResponse>> >
+        : IQueryHandler<GetTracksByUserIdQuery, Result<PaginatedResponse<TrackApplicationResponse>> >
     {
-        public async ValueTask<Result<PaginatedResponse<TrackResponse> >> Handle(GetTracksByUserIdQuery request, CancellationToken cancellationToken)
+        public async ValueTask<Result<PaginatedResponse<TrackApplicationResponse> >> Handle(GetTracksByUserIdQuery request, CancellationToken cancellationToken)
         {
             var pageNumber = request.PageNumber < 1 ? 1 : request.PageNumber;
             var pageSize = request.PageSize < 1 ? 10 : request.PageSize;
@@ -32,10 +32,10 @@ namespace Musify.Application.Tracks.Handler
 
             var pagedTracks = await tracksQuery
                 .OrderBy(t => t.Track.CreatedDate)
-                .Select(t => TrackResponse.FromEntity(t.Track))
+                .Select(t => TrackApplicationResponse.FromEntity(t.Track))
                 .ToPagedListAsync(pageNumber, pageSize, totalCount, cancellationToken);
 
-            return Result.Success(PaginatedResponse<TrackResponse>.FromPagedList(pagedTracks));
+            return Result.Success(PaginatedResponse<TrackApplicationResponse>.FromPagedList(pagedTracks));
         }
     }
 }
\ No newline at end of file
diff --git a/Application/Tracks/Handler/GetTracksQueryHandler.cs b/Application/Tracks/Handler/GetTracksQueryHandler.cs
index 1f3528c..c1875d1 100644
--- a/Application/Tracks/Handler/GetTracksQueryHandler.cs
+++ b/Application/Tracks/Handler/GetTracksQueryHandler.cs
@@ -1,8 +1,8 @@
 using Ardalis.Result;
 using Mediator;
 using Microsoft.EntityFrameworkCore;
-using Musify.Application.Contracts.Application;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Application;
+using Musify.Application.Abstractions.Infrastructure;
 using Musify.Application.Tracks.Queries;
 using Musify.Application.Tracks.Responses;
 using X.PagedList.EF;
@@ -10,9 +10,9 @@ using X.PagedList.EF;
 namespace Musify.Application.Tracks.Handler
 {
     public class GetTracksQueryHandler(IDatabase database)
-        : IQueryHandler<GetTracksQuery, Result<PaginatedResponse<TrackResponse>> >
+        : IQueryHandler<GetTracksQuery, Result<PaginatedResponse<TrackApplicationResponse>> >
     {
-        public async ValueTask<Result<PaginatedResponse<TrackResponse> >> Handle(GetTracksQuery request, CancellationToken cancellationToken)
+        public async ValueTask<Result<PaginatedResponse<TrackApplicationResponse> >> Handle(GetTracksQuery request, CancellationToken cancellationToken)
         {
             var pageNumber = request.PageNumber < 1 ? 1 : request.PageNumber;
             var pageSize = request.PageSize < 1 ? 10 : request.PageSize;
@@ -21,12 +21,12 @@ namespace Musify.Application.Tracks.Handler
                 .AsNoTracking()
                 .OrderBy(t => t.Id)
                 .Include(ut => ut.Track)
-                .Select(t => TrackResponse.FromEntity(t.Track));
+                .Select(t => TrackApplicationResponse.FromEntity(t.Track));
 
             var totalCount = await tracksQuery.CountAsync(cancellationToken);
             var pagedTracks = await tracksQuery.ToPagedListAsync(pageNumber, pageSize, totalCount, cancellationToken);
 
-            return Result.Success(PaginatedResponse<TrackResponse>.FromPagedList(pagedTracks));
+            return Result.Success(PaginatedResponse<TrackApplicationResponse>.FromPagedList(pagedTracks));
         }
     }
 }
\ No newline at end of file
diff --git a/Application/Tracks/Queries/GetTrackByIdQuery.cs b/Application/Tracks/Queries/GetTrackByIdQuery.cs
index 97a6ee6..cdc3709 100644
--- a/Application/Tracks/Queries/GetTrackByIdQuery.cs
+++ b/Application/Tracks/Queries/GetTrackByIdQuery.cs
@@ -5,5 +5,5 @@ using Musify.Application.Tracks.Responses;
 namespace Musify.Application.Tracks.Queries
 {
     public record GetTrackByIdQuery(Guid TrackId)
-        : IQuery<Result<TrackResponse>>;
+        : IQuery<Result<TrackApplicationResponse>>;
 }
\ No newline at end of file
diff --git a/Application/Tracks/Queries/GetTracksByUserIdQuery.cs b/Application/Tracks/Queries/GetTracksByUserIdQuery.cs
index f4eff24..21c378e 100644
--- a/Application/Tracks/Queries/GetTracksByUserIdQuery.cs
+++ b/Application/Tracks/Queries/GetTracksByUserIdQuery.cs
@@ -1,6 +1,6 @@
 using Ardalis.Result;
 using Mediator;
-using Musify.Application.Contracts.Application;
+using Musify.Application.Abstractions.Application;
 using Musify.Application.Tracks.Responses;
 
 namespace Musify.Application.Tracks.Queries
@@ -10,5 +10,5 @@ namespace Musify.Application.Tracks.Queries
     string? Name = null,
         int PageNumber = 1,
         int PageSize = 10)
-        : IQuery<Result<PaginatedResponse<TrackResponse> > >;
+        : IQuery<Result<PaginatedResponse<TrackApplicationResponse> > >;
 }
\ No newline at end of file
diff --git a/Application/Tracks/Queries/GetTracksQuery.cs b/Application/Tracks/Queries/GetTracksQuery.cs
index d67698b..8b0dd64 100644
--- a/Application/Tracks/Queries/GetTracksQuery.cs
+++ b/Application/Tracks/Queries/GetTracksQuery.cs
@@ -1,10 +1,10 @@
 using Ardalis.Result;
 using Mediator;
-using Musify.Application.Contracts.Application;
+using Musify.Application.Abstractions.Application;
 using Musify.Application.Tracks.Responses;
 
 namespace Musify.Application.Tracks.Queries
 {
     public record GetTracksQuery(int PageNumber = 1, int PageSize = 10)
-        : IQuery<Result<PaginatedResponse<TrackResponse> >>;
+        : IQuery<Result<PaginatedResponse<TrackApplicationResponse> >>;
 }
\ No newline at end of file
diff --git a/Application/Tracks/Responses/TrackResponse.cs b/Application/Tracks/Responses/TrackApplicationResponse.cs
similarity index 67%
rename from Application/Tracks/Responses/TrackResponse.cs
rename to Application/Tracks/Responses/TrackApplicationResponse.cs
index 78143dd..33d8a83 100644
--- a/Application/Tracks/Responses/TrackResponse.cs
+++ b/Application/Tracks/Responses/TrackApplicationResponse.cs
@@ -2,15 +2,15 @@
 
 namespace Musify.Application.Tracks.Responses
 {
-    public record TrackResponse(
+    public record TrackApplicationResponse(
         Guid Id,
         string Title,
         DateTime CreatedDate,
         DateTime UpdatedDate)
     {
-        public static TrackResponse FromEntity(Track track)
+        public static TrackApplicationResponse FromEntity(Track track)
         {
-            return new TrackResponse(
+            return new TrackApplicationResponse(
                 track.Id,
                 track.Title,
                 track.CreatedDate,
diff --git a/Application/Users/Commands/CreateUserCommand.cs b/Application/Users/Commands/CreateUserCommand.cs
index 1b0224e..fef2150 100644
--- a/Application/Users/Commands/CreateUserCommand.cs
+++ b/Application/Users/Commands/CreateUserCommand.cs
@@ -9,7 +9,7 @@ namespace Musify.Application.Users.Commands
         string Name,
         string? FirstName,
         string? SecondName)
-        : ICommand<Result<UserResponse>>
+        : ICommand<Result<UserApplicationResponse>>
     {
         public static User ToEntity(CreateUserCommand command)
         {
diff --git a/Application/Users/Handlers/CreateUserCommandHandler.cs b/Application/Users/Handlers/CreateUserCommandHandler.cs
index 2c6b11f..3fd02cf 100644
--- a/Application/Users/Handlers/CreateUserCommandHandler.cs
+++ b/Application/Users/Handlers/CreateUserCommandHandler.cs
@@ -2,22 +2,22 @@ using Ardalis.Result;
 using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Infrastructure;
 using Musify.Application.Users.Commands;
 using Musify.Application.Users.Responses;
 
 namespace Musify.Application.Users.Handlers
 {
     public class CreateUserCommandHandler(IDatabase database, ILogger<CreateUserCommandHandler> logger)
-        : ICommandHandler<CreateUserCommand, Result<UserResponse> >
+        : ICommandHandler<CreateUserCommand, Result<UserApplicationResponse> >
     {
-        public async ValueTask<Result<UserResponse>> Handle(CreateUserCommand request, CancellationToken cancellationToken)
+        public async ValueTask<Result<UserApplicationResponse>> Handle(CreateUserCommand request, CancellationToken cancellationToken)
         {
             var userExists = await database.Users.AnyAsync(u => u.Id == request.Id, cancellationToken);
             if (userExists)
             {
                 logger.LogInformation("User {UserId} already exists", request.Id);
-                return Result<UserResponse>.Conflict($"User {request.Id} already exists");
+                return Result<UserApplicationResponse>.Conflict($"User {request.Id} already exists");
             }
 
             var newUser = CreateUserCommand.ToEntity(request);
@@ -34,7 +34,7 @@ namespace Musify.Application.Users.Handlers
             }
 
             logger.LogInformation("Created user {UserId}", newUser.Id);
-            return Result.Created(UserResponse.FromEntity(newUser));
+            return Result.Created(UserApplicationResponse.FromEntity(newUser));
         }
     }
 }
\ No newline at end of file
diff --git a/Application/Users/Handlers/GetUserByIdQueryHandler.cs b/Application/Users/Handlers/GetUserByIdQueryHandler.cs
index fe92751..6441884 100644
--- a/Application/Users/Handlers/GetUserByIdQueryHandler.cs
+++ b/Application/Users/Handlers/GetUserByIdQueryHandler.cs
@@ -1,23 +1,23 @@
 using Ardalis.Result;
 using Mediator;
 using Microsoft.EntityFrameworkCore;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Infrastructure;
 using Musify.Application.Users.Queries;
 using Musify.Application.Users.Responses;
 
 namespace Musify.Application.Users.Handlers
 {
     public class GetUserByIdQueryHandler(IDatabase database)
-        : IQueryHandler<GetUserByIdQuery, Result<UserResponse> >
+        : IQueryHandler<GetUserByIdQuery, Result<UserApplicationResponse> >
     {
-        public async ValueTask<Result<UserResponse>> Handle(GetUserByIdQuery request, CancellationToken cancellationToken)
+        public async ValueTask<Result<UserApplicationResponse>> Handle(GetUserByIdQuery request, CancellationToken cancellationToken)
         {
             var user = await database.Users
                 .AsNoTracking()
-                .Select(u => UserResponse.FromEntity(u))
+                .Select(u => UserApplicationResponse.FromEntity(u))
                 .SingleOrDefaultAsync(u => u.Id == request.Id, cancellationToken);
 
-            return user ?? Result<UserResponse>.NotFound();
+            return user ?? Result<UserApplicationResponse>.NotFound();
         }
     }
 }
\ No newline at end of file
diff --git a/Application/Users/Handlers/GetUserByKeycloakQueryHandler.cs b/Application/Users/Handlers/GetUserByKeycloakQueryHandler.cs
index f46fb00..26c3c51 100644
--- a/Application/Users/Handlers/GetUserByKeycloakQueryHandler.cs
+++ b/Application/Users/Handlers/GetUserByKeycloakQueryHandler.cs
@@ -1,23 +1,23 @@
 using Ardalis.Result;
 using Mediator;
 using Microsoft.EntityFrameworkCore;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Infrastructure;
 using Musify.Application.Users.Queries;
 using Musify.Application.Users.Responses;
 
 namespace Musify.Application.Users.Handlers
 {
     public class GetUserByKeycloakQueryHandler(IDatabase database)
-        : IQueryHandler<GetUserByKeycloakQuery, Result<UserResponse> >
+        : IQueryHandler<GetUserByKeycloakQuery, Result<UserApplicationResponse> >
     {
-        public async ValueTask<Result<UserResponse>> Handle(GetUserByKeycloakQuery request, CancellationToken cancellationToken)
+        public async ValueTask<Result<UserApplicationResponse>> Handle(GetUserByKeycloakQuery request, CancellationToken cancellationToken)
         {
             var user = await database.Users
                 .AsNoTracking()
-                .Select(u => UserResponse.FromEntity(u))
+                .Select(u => UserApplicationResponse.FromEntity(u))
                 .SingleOrDefaultAsync(u => u.Id == request.Id, cancellationToken);
 
-            return user ?? Result<UserResponse>.NotFound();
+            return user ?? Result<UserApplicationResponse>.NotFound();
         }
     }
 }
diff --git a/Application/Users/Handlers/GetUsersQueryHandler.cs b/Application/Users/Handlers/GetUsersQueryHandler.cs
index 56c31cb..4d474c2 100644
--- a/Application/Users/Handlers/GetUsersQueryHandler.cs
+++ b/Application/Users/Handlers/GetUsersQueryHandler.cs
@@ -1,8 +1,8 @@
 using Ardalis.Result;
 using Mediator;
 using Microsoft.EntityFrameworkCore;
-using Musify.Application.Contracts.Application;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Application;
+using Musify.Application.Abstractions.Infrastructure;
 using Musify.Application.Users.Queries;
 using Musify.Application.Users.Responses;
 using X.PagedList.EF;
@@ -10,9 +10,9 @@ using X.PagedList.EF;
 namespace Musify.Application.Users.Handlers
 {
     public class GetUsersQueryHandler(IDatabase database)
-        : IQueryHandler<GetUsersQuery, Result<PaginatedResponse<UserResponse> > >
+        : IQueryHandler<GetUsersQuery, Result<PaginatedResponse<UserApplicationResponse> > >
     {
-        public async ValueTask<Result<PaginatedResponse<UserResponse> >> Handle(GetUsersQuery request, CancellationToken cancellationToken)
+        public async ValueTask<Result<PaginatedResponse<UserApplicationResponse> >> Handle(GetUsersQuery request, CancellationToken cancellationToken)
         {
             var pageNumber = request.PageNumber < 1 ? 1 : request.PageNumber;
             var pageSize = request.PageSize < 1 ? 10 : request.PageSize;
@@ -29,10 +29,10 @@ namespace Musify.Application.Users.Handlers
 
             var totalCount = await user.CountAsync(cancellationToken);
             var pagedUser = await user
-                .Select(u => UserResponse.FromEntity(u))
+                .Select(u => UserApplicationResponse.FromEntity(u))
                 .ToPagedListAsync(pageNumber, pageSize, totalCount, cancellationToken);
 
-            return Result.Success(PaginatedResponse<UserResponse>.FromPagedList(pagedUser));
+            return Result.Success(PaginatedResponse<UserApplicationResponse>.FromPagedList(pagedUser));
         }
     }
 }
\ No newline at end of file
diff --git a/Application/Users/Queries/GetUserByIdQuery.cs b/Application/Users/Queries/GetUserByIdQuery.cs
index b81c047..d23ead1 100644
--- a/Application/Users/Queries/GetUserByIdQuery.cs
+++ b/Application/Users/Queries/GetUserByIdQuery.cs
@@ -5,5 +5,5 @@ using Musify.Application.Users.Responses;
 namespace Musify.Application.Users.Queries
 {
     public record GetUserByIdQuery(Guid Id)
-        : IQuery<Result<UserResponse> >;
+        : IQuery<Result<UserApplicationResponse> >;
 }
\ No newline at end of file
diff --git a/Application/Users/Queries/GetUserByKeycloakQuery.cs b/Application/Users/Queries/GetUserByKeycloakQuery.cs
index 4f19a7d..f351590 100644
--- a/Application/Users/Queries/GetUserByKeycloakQuery.cs
+++ b/Application/Users/Queries/GetUserByKeycloakQuery.cs
@@ -5,5 +5,5 @@ using Musify.Application.Users.Responses;
 namespace Musify.Application.Users.Queries
 {
     public record GetUserByKeycloakQuery(Guid Id)
-        : IQuery<Result<UserResponse> >;
+        : IQuery<Result<UserApplicationResponse> >;
 }
diff --git a/Application/Users/Queries/GetUsersQuery.cs b/Application/Users/Queries/GetUsersQuery.cs
index 6f403aa..5d78679 100644
--- a/Application/Users/Queries/GetUsersQuery.cs
+++ b/Application/Users/Queries/GetUsersQuery.cs
@@ -1,10 +1,10 @@
 using Ardalis.Result;
 using Mediator;
-using Musify.Application.Contracts.Application;
+using Musify.Application.Abstractions.Application;
 using Musify.Application.Users.Responses;
 
 namespace Musify.Application.Users.Queries
 {
     public record GetUsersQuery(int PageNumber, int PageSize, string? UsernameSearch = null)
-        : IQuery<Result<PaginatedResponse<UserResponse> >>;
+        : IQuery<Result<PaginatedResponse<UserApplicationResponse> >>;
 }
diff --git a/Application/Users/Responses/KeycloakUserResponse.cs b/Application/Users/Responses/KeycloakUserResponse.cs
deleted file mode 100644
index 8cedf5d..0000000
--- a/Application/Users/Responses/KeycloakUserResponse.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace Musify.Application.Users.Responses
-{
-    public record KeycloakUserResponse(
-        Guid Id,
-        string Name,
-        string FirstName,
-        string SecondName);
-}
\ No newline at end of file
diff --git a/Application/Users/Responses/UserResponse.cs b/Application/Users/Responses/UserApplicationResponse.cs
similarity index 73%
rename from Application/Users/Responses/UserResponse.cs
rename to Application/Users/Responses/UserApplicationResponse.cs
index 054af69..2c98ec2 100644
--- a/Application/Users/Responses/UserResponse.cs
+++ b/Application/Users/Responses/UserApplicationResponse.cs
@@ -2,7 +2,7 @@
 
 namespace Musify.Application.Users.Responses
 {
-    public record UserResponse(
+    public record UserApplicationResponse(
         Guid Id,
         string Name,
         string? FirstName,
@@ -10,9 +10,9 @@ namespace Musify.Application.Users.Responses
         DateTime CreatedAt,
         DateTime UpdatedAt)
     {
-        public static UserResponse FromEntity(User user)
+        public static UserApplicationResponse FromEntity(User user)
         {
-            return new UserResponse(
+            return new UserApplicationResponse(
                 user.Id,
                 user.Name,
                 user.FirstName,
diff --git a/Infrastructure/MassTransit/Activities/Audio/GenerateAudioWorkflowPathsActivity.cs b/Infrastructure/MassTransit/Activities/Audio/GenerateAudioWorkflowPathsActivity.cs
index 73f4dcc..606f66e 100644
--- a/Infrastructure/MassTransit/Activities/Audio/GenerateAudioWorkflowPathsActivity.cs
+++ b/Infrastructure/MassTransit/Activities/Audio/GenerateAudioWorkflowPathsActivity.cs
@@ -1,7 +1,7 @@
 using MassTransit;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Infrastructure;
 using Musify.Domain.Entities;
 using Musify.Infrastructure.MassTransit.Activities.Arguments;
 
diff --git a/Infrastructure/MassTransit/Activities/Audio/TranscodeDashAudioActivity.cs b/Infrastructure/MassTransit/Activities/Audio/TranscodeDashAudioActivity.cs
index 4766ae5..6da0ffb 100644
--- a/Infrastructure/MassTransit/Activities/Audio/TranscodeDashAudioActivity.cs
+++ b/Infrastructure/MassTransit/Activities/Audio/TranscodeDashAudioActivity.cs
@@ -1,7 +1,7 @@
 using MassTransit;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Infrastructure;
 using Musify.Domain.Entities;
 using Musify.Infrastructure.MassTransit.Activities.Arguments;
 using Musify.Infrastructure.MassTransit.Activities.Logs;
diff --git a/Infrastructure/MassTransit/Activities/Audio/UpdateTrackAudioActivity.cs b/Infrastructure/MassTransit/Activities/Audio/UpdateTrackAudioActivity.cs
index cf32e81..7fc302d 100644
--- a/Infrastructure/MassTransit/Activities/Audio/UpdateTrackAudioActivity.cs
+++ b/Infrastructure/MassTransit/Activities/Audio/UpdateTrackAudioActivity.cs
@@ -1,7 +1,7 @@
 using MassTransit;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Infrastructure;
 using Musify.Domain.Entities;
 using Musify.Infrastructure.MassTransit.Arguments;
 using Musify.Infrastructure.MassTransit.Logs;
diff --git a/Infrastructure/MassTransit/Activities/Files/DownloadFileFromBucketActivity.cs b/Infrastructure/MassTransit/Activities/Files/DownloadFileFromBucketActivity.cs
index f7d7db8..3612ffa 100644
--- a/Infrastructure/MassTransit/Activities/Files/DownloadFileFromBucketActivity.cs
+++ b/Infrastructure/MassTransit/Activities/Files/DownloadFileFromBucketActivity.cs
@@ -1,6 +1,6 @@
 using MassTransit;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Infrastructure;
 using Musify.Infrastructure.MassTransit.Activities.Arguments;
 using Musify.Infrastructure.MassTransit.Activities.Logs;
 
diff --git a/Infrastructure/MassTransit/Activities/Files/RemoveFileFromBucketActivity.cs b/Infrastructure/MassTransit/Activities/Files/RemoveFileFromBucketActivity.cs
index 9f8b29f..45125d8 100644
--- a/Infrastructure/MassTransit/Activities/Files/RemoveFileFromBucketActivity.cs
+++ b/Infrastructure/MassTransit/Activities/Files/RemoveFileFromBucketActivity.cs
@@ -1,6 +1,6 @@
 using MassTransit;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Infrastructure;
 using Musify.Infrastructure.MassTransit.Activities.Arguments;
 
 namespace Musify.Infrastructure.MassTransit.Activities.Files
diff --git a/Infrastructure/MassTransit/Activities/Files/RemoveFolderFromBucketActivity.cs b/Infrastructure/MassTransit/Activities/Files/RemoveFolderFromBucketActivity.cs
index 98f1289..6170921 100644
--- a/Infrastructure/MassTransit/Activities/Files/RemoveFolderFromBucketActivity.cs
+++ b/Infrastructure/MassTransit/Activities/Files/RemoveFolderFromBucketActivity.cs
@@ -1,6 +1,6 @@
 using MassTransit;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Infrastructure;
 using Musify.Infrastructure.MassTransit.Arguments;
 
 namespace Musify.Infrastructure.MassTransit.Activities.Files
diff --git a/Infrastructure/MassTransit/Activities/Files/TransferFilesToBucketActivity.cs b/Infrastructure/MassTransit/Activities/Files/TransferFilesToBucketActivity.cs
index 5f6ceb8..70dd5b5 100644
--- a/Infrastructure/MassTransit/Activities/Files/TransferFilesToBucketActivity.cs
+++ b/Infrastructure/MassTransit/Activities/Files/TransferFilesToBucketActivity.cs
@@ -1,6 +1,6 @@
 using MassTransit;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Infrastructure;
 using Musify.Infrastructure.MassTransit.Activities.Arguments;
 using Musify.Infrastructure.MassTransit.Activities.Logs;
 
diff --git a/Infrastructure/MassTransit/Activities/Files/UploadFileToBucketActivity.cs b/Infrastructure/MassTransit/Activities/Files/UploadFileToBucketActivity.cs
index 0b675b2..a10c283 100644
--- a/Infrastructure/MassTransit/Activities/Files/UploadFileToBucketActivity.cs
+++ b/Infrastructure/MassTransit/Activities/Files/UploadFileToBucketActivity.cs
@@ -1,6 +1,6 @@
 using MassTransit;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Infrastructure;
 using Musify.Infrastructure.MassTransit.Arguments;
 using Musify.Infrastructure.MassTransit.Logs;
 
diff --git a/Infrastructure/MassTransit/Activities/Pictures/ResizePictureActivity.cs b/Infrastructure/MassTransit/Activities/Pictures/ResizePictureActivity.cs
index 941132b..90b9c3c 100644
--- a/Infrastructure/MassTransit/Activities/Pictures/ResizePictureActivity.cs
+++ b/Infrastructure/MassTransit/Activities/Pictures/ResizePictureActivity.cs
@@ -1,6 +1,6 @@
 using MassTransit;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Infrastructure;
 using Musify.Infrastructure.MassTransit.Activities.Arguments;
 using Musify.Infrastructure.MassTransit.Activities.Logs;
 
diff --git a/Infrastructure/MassTransit/Activities/Pictures/UpdatePlayListPictureActivity.cs b/Infrastructure/MassTransit/Activities/Pictures/UpdatePlayListPictureActivity.cs
index c6df282..2a7afb2 100644
--- a/Infrastructure/MassTransit/Activities/Pictures/UpdatePlayListPictureActivity.cs
+++ b/Infrastructure/MassTransit/Activities/Pictures/UpdatePlayListPictureActivity.cs
@@ -1,6 +1,6 @@
 using MassTransit;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Infrastructure;
 using Musify.Infrastructure.MassTransit.Activities.Arguments;
 using Musify.Infrastructure.MassTransit.Activities.Logs;
 
diff --git a/Infrastructure/MassTransit/Activities/Pictures/UpdateTrackPictureActivity.cs b/Infrastructure/MassTransit/Activities/Pictures/UpdateTrackPictureActivity.cs
index 3c807b8..8f56c5c 100644
--- a/Infrastructure/MassTransit/Activities/Pictures/UpdateTrackPictureActivity.cs
+++ b/Infrastructure/MassTransit/Activities/Pictures/UpdateTrackPictureActivity.cs
@@ -1,6 +1,6 @@
 using MassTransit;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Infrastructure;
 using Musify.Infrastructure.MassTransit.Activities.Arguments;
 using Musify.Infrastructure.MassTransit.Activities.Logs;
 
diff --git a/Infrastructure/MassTransit/Activities/Tracks/DeleteTrackActivity.cs b/Infrastructure/MassTransit/Activities/Tracks/DeleteTrackActivity.cs
index f58f263..6175262 100644
--- a/Infrastructure/MassTransit/Activities/Tracks/DeleteTrackActivity.cs
+++ b/Infrastructure/MassTransit/Activities/Tracks/DeleteTrackActivity.cs
@@ -2,7 +2,7 @@ using MassTransit;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Musify.Application.Configuration;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Infrastructure;
 using Musify.Domain.Entities;
 
 namespace Musify.Infrastructure.MassTransit.Activities.Tracks
diff --git a/Infrastructure/MassTransit/Consumers/RemoveFileConsumer.cs b/Infrastructure/MassTransit/Consumers/RemoveFileConsumer.cs
index 38345ad..e56b117 100644
--- a/Infrastructure/MassTransit/Consumers/RemoveFileConsumer.cs
+++ b/Infrastructure/MassTransit/Consumers/RemoveFileConsumer.cs
@@ -1,6 +1,6 @@
 using MassTransit;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Infrastructure;
 using Musify.Application.Events;
 
 namespace Musify.Infrastructure.MassTransit.Consumers
diff --git a/Infrastructure/MassTransit/DependencyInjection/MassTransitDependencyInjection.cs b/Infrastructure/MassTransit/DependencyInjection/MassTransitDependencyInjection.cs
index 75f3132..f6a8317 100644
--- a/Infrastructure/MassTransit/DependencyInjection/MassTransitDependencyInjection.cs
+++ b/Infrastructure/MassTransit/DependencyInjection/MassTransitDependencyInjection.cs
@@ -1,7 +1,7 @@
 using MassTransit;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Infrastructure;
 using Musify.Infrastructure.Configuration;
 
 namespace Musify.Infrastructure.MassTransit
diff --git a/Infrastructure/MassTransit/EventBus/MassTransitEventBus.cs b/Infrastructure/MassTransit/EventBus/MassTransitEventBus.cs
index 8c2bfef..7692f01 100644
--- a/Infrastructure/MassTransit/EventBus/MassTransitEventBus.cs
+++ b/Infrastructure/MassTransit/EventBus/MassTransitEventBus.cs
@@ -1,5 +1,5 @@
 using MassTransit;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Infrastructure;
 
 namespace Musify.Infrastructure.MassTransit
 {
diff --git a/Infrastructure/Persistence/Database.cs b/Infrastructure/Persistence/Database.cs
index 8519719..94874bb 100644
--- a/Infrastructure/Persistence/Database.cs
+++ b/Infrastructure/Persistence/Database.cs
@@ -1,5 +1,5 @@
 using Microsoft.EntityFrameworkCore;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Infrastructure;
 using Musify.Domain.Entities;
 using Musify.Infrastructure.Configuration;
 
diff --git a/Infrastructure/Persistence/DatabaseDependencyInjection.cs b/Infrastructure/Persistence/DatabaseDependencyInjection.cs
index 0a3f01c..c5db7ac 100644
--- a/Infrastructure/Persistence/DatabaseDependencyInjection.cs
+++ b/Infrastructure/Persistence/DatabaseDependencyInjection.cs
@@ -1,7 +1,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Infrastructure;
 using Musify.Infrastructure.Configuration;
 
 namespace Musify.Infrastructure.Persistence
diff --git a/Infrastructure/Services/AudioTranscoderService.cs b/Infrastructure/Services/AudioTranscoderService.cs
index 1bec040..f7086ac 100644
--- a/Infrastructure/Services/AudioTranscoderService.cs
+++ b/Infrastructure/Services/AudioTranscoderService.cs
@@ -1,5 +1,5 @@
 using Microsoft.Extensions.Logging;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Infrastructure;
 using Musify.Infrastructure.Configuration;
 using System.Diagnostics;
 
diff --git a/Infrastructure/Services/PictureService.cs b/Infrastructure/Services/PictureService.cs
index f50f9ba..390a487 100644
--- a/Infrastructure/Services/PictureService.cs
+++ b/Infrastructure/Services/PictureService.cs
@@ -1,5 +1,5 @@
 using Microsoft.Extensions.Logging;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Infrastructure;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Processing;
 
diff --git a/Infrastructure/Services/ServicesDependencyInjection.cs b/Infrastructure/Services/ServicesDependencyInjection.cs
index 6d76ccf..56e48e7 100644
--- a/Infrastructure/Services/ServicesDependencyInjection.cs
+++ b/Infrastructure/Services/ServicesDependencyInjection.cs
@@ -2,7 +2,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Infrastructure;
 using Musify.Infrastructure.Configuration;
 
 namespace Musify.Infrastructure.Services
diff --git a/Infrastructure/Services/StorageService.cs b/Infrastructure/Services/StorageService.cs
index fc5dbd6..1f170ef 100644
--- a/Infrastructure/Services/StorageService.cs
+++ b/Infrastructure/Services/StorageService.cs
@@ -3,7 +3,7 @@ using Amazon.S3.Model;
 using Amazon.S3.Transfer;
 using Microsoft.Extensions.Logging;
 using MimeMapping;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Infrastructure;
 using Musify.Domain.Entities;
 using Musify.Infrastructure.Configuration;