diff --git a/Application/Events/ImageSize.cs b/Application/Common/ImageSize.cs
similarity index 100%
rename from Application/Events/ImageSize.cs
rename to Application/Common/ImageSize.cs
diff --git a/Application/Tracks/Handler/CreateTrackCommandHandler.cs b/Application/Tracks/Handlers/CreateTrackCommandHandler.cs
similarity index 100%
rename from Application/Tracks/Handler/CreateTrackCommandHandler.cs
rename to Application/Tracks/Handlers/CreateTrackCommandHandler.cs
diff --git a/Application/Tracks/Handler/DeleteTrackCommandHandler.cs b/Application/Tracks/Handlers/DeleteTrackCommandHandler.cs
similarity index 100%
rename from Application/Tracks/Handler/DeleteTrackCommandHandler.cs
rename to Application/Tracks/Handlers/DeleteTrackCommandHandler.cs
diff --git a/Application/Tracks/Handler/GetTrackByIdQueryHandler.cs b/Application/Tracks/Handlers/GetTrackByIdQueryHandler.cs
similarity index 100%
rename from Application/Tracks/Handler/GetTrackByIdQueryHandler.cs
rename to Application/Tracks/Handlers/GetTrackByIdQueryHandler.cs
diff --git a/Application/Tracks/Handler/GetTracksByUserIdQueryHandler.cs b/Application/Tracks/Handlers/GetTracksByUserIdQueryHandler.cs
similarity index 100%
rename from Application/Tracks/Handler/GetTracksByUserIdQueryHandler.cs
rename to Application/Tracks/Handlers/GetTracksByUserIdQueryHandler.cs
diff --git a/Application/Tracks/Handler/GetTracksQueryHandler.cs b/Application/Tracks/Handlers/GetTracksQueryHandler.cs
similarity index 100%
rename from Application/Tracks/Handler/GetTracksQueryHandler.cs
rename to Application/Tracks/Handlers/GetTracksQueryHandler.cs
diff --git a/Application/Tracks/Handler/RequestTrackUploadUrlsCommandHandler.cs b/Application/Tracks/Handlers/RequestTrackUploadUrlsCommandHandler.cs
similarity index 100%
rename from Application/Tracks/Handler/RequestTrackUploadUrlsCommandHandler.cs
rename to Application/Tracks/Handlers/RequestTrackUploadUrlsCommandHandler.cs
diff --git a/Domain/Entities/LifeCycleStatus.cs b/Domain/ValueObjects/LifeCycleStatus.cs
similarity index 100%
rename from Domain/Entities/LifeCycleStatus.cs
rename to Domain/ValueObjects/LifeCycleStatus.cs
diff --git a/Domain/Entities/ProcessingStatus.cs b/Domain/ValueObjects/ProcessingStatus.cs
similarity index 100%
rename from Domain/Entities/ProcessingStatus.cs
rename to Domain/ValueObjects/ProcessingStatus.cs
diff --git a/Domain/Entities/UploadIntentPurpose.cs b/Domain/ValueObjects/UploadIntentPurpose.cs
similarity index 100%
rename from Domain/Entities/UploadIntentPurpose.cs
rename to Domain/ValueObjects/UploadIntentPurpose.cs
diff --git a/Domain/Entities/UploadIntentStatus.cs b/Domain/ValueObjects/UploadIntentStatus.cs
similarity index 100%
rename from Domain/Entities/UploadIntentStatus.cs
rename to Domain/ValueObjects/UploadIntentStatus.cs
diff --git a/Domain/Entities/UploadState.cs b/Domain/ValueObjects/UploadState.cs
similarity index 100%
rename from Domain/Entities/UploadState.cs
rename to Domain/ValueObjects/UploadState.cs
diff --git a/Infrastructure/MassTransit/Activities/PlayLists/DeletePlayListFromDbArguments.cs b/Infrastructure/MassTransit/Arguments/DeletePlayListFromDbArguments.cs
similarity index 100%
rename from Infrastructure/MassTransit/Activities/PlayLists/DeletePlayListFromDbArguments.cs
rename to Infrastructure/MassTransit/Arguments/DeletePlayListFromDbArguments.cs
diff --git a/Infrastructure/MassTransit/Activities/Tracks/DeleteTrackFromDbArguments.cs b/Infrastructure/MassTransit/Arguments/DeleteTrackFromDbArguments.cs
similarity index 100%
rename from Infrastructure/MassTransit/Activities/Tracks/DeleteTrackFromDbArguments.cs
rename to Infrastructure/MassTransit/Arguments/DeleteTrackFromDbArguments.cs
diff --git a/Infrastructure/MassTransit/Activities/PlayLists/MarkPlayListAsRemovingArguments.cs b/Infrastructure/MassTransit/Arguments/MarkPlayListAsRemovingArguments.cs
similarity index 100%
rename from Infrastructure/MassTransit/Activities/PlayLists/MarkPlayListAsRemovingArguments.cs
rename to Infrastructure/MassTransit/Arguments/MarkPlayListAsRemovingArguments.cs
diff --git a/Infrastructure/MassTransit/Activities/Tracks/MarkTrackAsRemovingArguments.cs b/Infrastructure/MassTransit/Arguments/MarkTrackAsRemovingArguments.cs
similarity index 100%
rename from Infrastructure/MassTransit/Activities/Tracks/MarkTrackAsRemovingArguments.cs
rename to Infrastructure/MassTransit/Arguments/MarkTrackAsRemovingArguments.cs
diff --git a/Infrastructure/MassTransit/EventBus/MassTransitEventBus.cs b/Infrastructure/MassTransit/MassTransitEventBus.cs
similarity index 100%
rename from Infrastructure/MassTransit/EventBus/MassTransitEventBus.cs
rename to Infrastructure/MassTransit/MassTransitEventBus.cs
diff --git a/Infrastructure/MassTransit/RoutingSlip/Variables/RoutingSlipVariableNames.cs b/Infrastructure/MassTransit/RoutingSlip/RoutingSlipVariableNames.cs
similarity index 100%
rename from Infrastructure/MassTransit/RoutingSlip/Variables/RoutingSlipVariableNames.cs
rename to Infrastructure/MassTransit/RoutingSlip/RoutingSlipVariableNames.cs