diff --git a/Source/Modules/Subscriptions/Features/DomainFeatures/StripeCustomers/Application/Queries/GetStripeCustomerByStripePortalId.cs b/Source/Modules/Subscriptions/Features/DomainFeatures/StripeCustomers/Application/Queries/GetStripeCustomerByStripePortalId.cs
index e31f073f..542399cc 100644
--- a/Source/Modules/Subscriptions/Features/DomainFeatures/StripeCustomers/Application/Queries/GetStripeCustomerByStripePortalId.cs
+++ b/Source/Modules/Subscriptions/Features/DomainFeatures/StripeCustomers/Application/Queries/GetStripeCustomerByStripePortalId.cs
@@ -4,7 +4,7 @@
 
 namespace Modules.Subscriptions.Features.DomainFeatures.StripeCustomers.Application.Queries
 {
-    public class GetStripeCustomerByStripePortalId : IQuery<StripeCustomer>
+    public class GetStripeCustomerByStripePortalId : Query<StripeCustomer>
     {
         public string StripeCustomerStripePortalId { get; set; }
     }
diff --git a/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptions/Application/Commands/CreateTrialingSubscription.cs b/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptions/Application/Commands/CreateTrialingSubscription.cs
index b994c23b..e0cf44c2 100644
--- a/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptions/Application/Commands/CreateTrialingSubscription.cs
+++ b/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptions/Application/Commands/CreateTrialingSubscription.cs
@@ -6,7 +6,7 @@
 
 namespace Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptions.Application.Commands
 {
-    public class CreateTrialingSubscription : ICommand
+    public class CreateTrialingSubscription : Command
     {
         public Guid UserId { get; set; }
         public Guid TenantId { get; set; }
diff --git a/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptions/Application/Commands/PauseActiveSubscription.cs b/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptions/Application/Commands/PauseActiveSubscription.cs
index 6a4948cb..ece9bcd8 100644
--- a/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptions/Application/Commands/PauseActiveSubscription.cs
+++ b/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptions/Application/Commands/PauseActiveSubscription.cs
@@ -4,7 +4,7 @@
 
 namespace Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptions.Application.Commands
 {
-    public class PauseActiveSubscription : ICommand
+    public class PauseActiveSubscription : Command
     {
         public Stripe.Subscription Subscription { get; set; }
     }
diff --git a/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptions/Application/Commands/UpdateSubscriptionPeriod.cs b/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptions/Application/Commands/UpdateSubscriptionPeriod.cs
index 194e2398..5500818e 100644
--- a/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptions/Application/Commands/UpdateSubscriptionPeriod.cs
+++ b/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptions/Application/Commands/UpdateSubscriptionPeriod.cs
@@ -4,7 +4,7 @@
 
 namespace Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptions.Application.Commands
 {
-    public class UpdateSubscriptionPeriod : ICommand
+    public class UpdateSubscriptionPeriod : Command
     {
         public Stripe.Subscription Subscription { get; set; }
     }
diff --git a/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptions/Application/Queries/GetSubscriptionForTenant.cs b/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptions/Application/Queries/GetSubscriptionForTenant.cs
index bf932d91..51f307ae 100644
--- a/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptions/Application/Queries/GetSubscriptionForTenant.cs
+++ b/Source/Modules/Subscriptions/Features/DomainFeatures/StripeSubscriptions/Application/Queries/GetSubscriptionForTenant.cs
@@ -4,7 +4,7 @@
 namespace Modules.Subscriptions.Features.DomainFeatures.StripeSubscriptions.Application.Queries
 {
     [AuthorizeTenantAdmin]
-    public class GetSubscriptionForTenant : IQuery<object>
+    public class GetSubscriptionForTenant : Query<object>
     {
         public Guid UserId { get; set; }
         public Guid TenantId { get; set; }
diff --git a/Source/Modules/Subscriptions/Features/Infrastructure/StripePayments/CreateStripeBillingPortalSession.cs b/Source/Modules/Subscriptions/Features/Infrastructure/StripePayments/CreateStripeBillingPortalSession.cs
index 7c9030b3..941fb6ea 100644
--- a/Source/Modules/Subscriptions/Features/Infrastructure/StripePayments/CreateStripeBillingPortalSession.cs
+++ b/Source/Modules/Subscriptions/Features/Infrastructure/StripePayments/CreateStripeBillingPortalSession.cs
@@ -5,7 +5,7 @@
 
 namespace Modules.Subscriptions.Features.Infrastructure.StripePayments
 {
-    public class CreateStripeBillingPortalSession : ICommand<Stripe.BillingPortal.Session>
+    public class CreateStripeBillingPortalSession : Command<Stripe.BillingPortal.Session>
     {
         public Guid UserId { get; set; }
         public string RedirectBaseUrl { get; set; }
diff --git a/Source/Modules/Subscriptions/Features/Infrastructure/StripePayments/CreateStripeCheckoutSession.cs b/Source/Modules/Subscriptions/Features/Infrastructure/StripePayments/CreateStripeCheckoutSession.cs
index 07c1018b..dc455c90 100644
--- a/Source/Modules/Subscriptions/Features/Infrastructure/StripePayments/CreateStripeCheckoutSession.cs
+++ b/Source/Modules/Subscriptions/Features/Infrastructure/StripePayments/CreateStripeCheckoutSession.cs
@@ -7,7 +7,7 @@
 
 namespace Modules.Subscriptions.Features.Infrastructure.StripePayments
 {
-    public class CreateStripeCheckoutSession : ICommand<Session>
+    public class CreateStripeCheckoutSession : Command<Session>
     {
         public SubscriptionPlanType SubscriptionPlanType { get; set; }
         public Guid UserId { get; set; }
diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Commands/AddUserToTenant.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Commands/AddUserToTenant.cs
index 8edbc7f4..8b4857b1 100644
--- a/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Commands/AddUserToTenant.cs
+++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Commands/AddUserToTenant.cs
@@ -6,7 +6,7 @@
 
 namespace Modules.TenantIdentity.Features.DomainFeatures.Tenants.Application.Commands
 {
-    public class AddUserToTenant : ICommand
+    public class AddUserToTenant : Command
     {
         public Guid TenantId { get; set; }
         public Guid UserId { get; set; }
diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Commands/CreateTenantWithAdmin.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Commands/CreateTenantWithAdmin.cs
index 007106ef..54328e21 100644
--- a/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Commands/CreateTenantWithAdmin.cs
+++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Commands/CreateTenantWithAdmin.cs
@@ -6,7 +6,7 @@
 
 namespace Modules.TenantIdentity.Features.DomainFeatures.Tenants.Application.Commands
 {
-    public class CreateTenantWithAdmin : ICommand<TenantDTO>
+    public class CreateTenantWithAdmin : Command<TenantDTO>
     {
         public string Name { get; set; }
         public Guid AdminId { get; set; }
diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Commands/DeleteTenant.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Commands/DeleteTenant.cs
index b6131411..ef5221fc 100644
--- a/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Commands/DeleteTenant.cs
+++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Commands/DeleteTenant.cs
@@ -6,7 +6,7 @@
 
 namespace Modules.TenantIdentity.Features.DomainFeatures.Tenants.Application.Commands
 {
-    public class DeleteTenant : ICommand
+    public class DeleteTenant : Command
     {
         public Guid TenantId { get; set; }
     }
diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Commands/RemoveUserFromTenant.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Commands/RemoveUserFromTenant.cs
index fe38c75e..d591afad 100644
--- a/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Commands/RemoveUserFromTenant.cs
+++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Commands/RemoveUserFromTenant.cs
@@ -4,7 +4,7 @@
 
 namespace Modules.TenantIdentity.Features.DomainFeatures.Tenants.Application.Commands
 {
-    public class RemoveUserFromTenant : ICommand
+    public class RemoveUserFromTenant : Command
     {
         public Guid UserId { get; set; }
         public Guid TenantId { get; set; }
diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Commands/UpdateUserRoleInTenant.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Commands/UpdateUserRoleInTenant.cs
index 4889264d..c882d8b5 100644
--- a/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Commands/UpdateUserRoleInTenant.cs
+++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Commands/UpdateUserRoleInTenant.cs
@@ -5,7 +5,7 @@
 
 namespace Modules.TenantIdentity.Features.DomainFeatures.Tenants.Application.Commands
 {
-    public class UpdateTenantMembership : ICommand
+    public class UpdateTenantMembership : Command
     {
         public Guid TenantId { get; set; }
         public Guid UserId { get; set; }
diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Queries/GetAllTenantMembershipsOfUser.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Queries/GetAllTenantMembershipsOfUser.cs
index 48325721..620efadc 100644
--- a/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Queries/GetAllTenantMembershipsOfUser.cs
+++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Queries/GetAllTenantMembershipsOfUser.cs
@@ -6,7 +6,7 @@
 
 namespace Modules.TenantIdentity.Features.DomainFeatures.Tenants.Application.Queries
 {
-    public class GetAllTenantMembershipsOfUser : IQuery<List<TenantMembershipDTO>>
+    public class GetAllTenantMembershipsOfUser : Query<List<TenantMembershipDTO>>
     {
         public Guid UserId { get; set; }
     }
diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Queries/GetTenantByID.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Queries/GetTenantByID.cs
index 5d8116b6..4136d5d8 100644
--- a/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Queries/GetTenantByID.cs
+++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Queries/GetTenantByID.cs
@@ -5,7 +5,7 @@
 
 namespace Modules.TenantIdentity.Features.DomainFeatures.Tenants.Application.Queries
 {
-    public class GetTenantByID : IQuery<TenantDTO>
+    public class GetTenantByID : Query<TenantDTO>
     {
         public Guid TenantId { get; set; }
     }
diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Queries/GetTenantDetailsByID.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Queries/GetTenantDetailsByID.cs
index 328d7357..bbca7e0e 100644
--- a/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Queries/GetTenantDetailsByID.cs
+++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Queries/GetTenantDetailsByID.cs
@@ -6,7 +6,7 @@
 
 namespace Modules.TenantIdentity.Features.DomainFeatures.Tenants.Application.Queries
 {
-    public class GetTenantDetailsByID : IQuery<TenantDetailDTO>
+    public class GetTenantDetailsByID : Query<TenantDetailDTO>
     {
         public Guid TenantId { get; set; }
     }
diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Queries/GetTenantMembershipQuery.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Queries/GetTenantMembershipQuery.cs
index 4da10b70..3def987a 100644
--- a/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Queries/GetTenantMembershipQuery.cs
+++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Tenants/Application/Queries/GetTenantMembershipQuery.cs
@@ -5,7 +5,7 @@
 
 namespace Modules.TenantIdentity.Features.DomainFeatures.Tenants.Application.Queries
 {
-    public class GetTenantMembershipQuery : IQuery<TenantMembershipDTO>
+    public class GetTenantMembershipQuery : Query<TenantMembershipDTO>
     {
         public Guid UserId { get; set; }
         public Guid TenantId { get; set; }
diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/Users/Application/Commands/CreateNewUser.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Users/Application/Commands/CreateNewUser.cs
index 9657c6de..ab917923 100644
--- a/Source/Modules/TenantIdentity/Features/DomainFeatures/Users/Application/Commands/CreateNewUser.cs
+++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Users/Application/Commands/CreateNewUser.cs
@@ -4,7 +4,7 @@
 
 namespace Modules.TenantIdentity.Features.DomainFeatures.Users.Application.Commands
 {
-    public class CreateNewUser : ICommand
+    public class CreateNewUser : Command
     {
         public ApplicationUser User { get; set; }
         public ExternalLoginInfo LoginInfo { get; set; }
diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/Users/Application/Commands/SetSelectedTenantForUser.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Users/Application/Commands/SetSelectedTenantForUser.cs
index cbf683be..c01afc51 100644
--- a/Source/Modules/TenantIdentity/Features/DomainFeatures/Users/Application/Commands/SetSelectedTenantForUser.cs
+++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Users/Application/Commands/SetSelectedTenantForUser.cs
@@ -4,7 +4,7 @@
 
 namespace Modules.TenantIdentity.Features.DomainFeatures.Users.Application.Commands
 {
-    public class SetSelectedTenantForUser : ICommand
+    public class SetSelectedTenantForUser : Command
     {
         public Guid SelectedTenantId { get; set; }
         public Guid UserId { get; set; }
diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/Users/Application/Commands/UpdateUser.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Users/Application/Commands/UpdateUser.cs
index 1e3d7529..cfb0ca67 100644
--- a/Source/Modules/TenantIdentity/Features/DomainFeatures/Users/Application/Commands/UpdateUser.cs
+++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Users/Application/Commands/UpdateUser.cs
@@ -3,7 +3,7 @@
 
 namespace Modules.TenantIdentity.Features.DomainFeatures.Users.Application.Commands
 {
-    public class UpdateUser : ICommand
+    public class UpdateUser : Command
     {
         public string UserName { get; set; }
         public IFormFile ProfilePicture { get; set; }
diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/Users/Application/Queries/GetClaimsForUser.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Users/Application/Queries/GetClaimsForUser.cs
index bb354025..0c7aa855 100644
--- a/Source/Modules/TenantIdentity/Features/DomainFeatures/Users/Application/Queries/GetClaimsForUser.cs
+++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Users/Application/Queries/GetClaimsForUser.cs
@@ -6,7 +6,7 @@
 
 namespace Modules.TenantIdentity.Features.DomainFeatures.Users.Application.Queries
 {
-    public class GetClaimsForUser : IQuery<IEnumerable<Claim>>
+    public class GetClaimsForUser : Query<IEnumerable<Claim>>
     {
         public Guid UserId { get; set; }
     }
diff --git a/Source/Modules/TenantIdentity/Features/DomainFeatures/Users/Application/Queries/GetUserById.cs b/Source/Modules/TenantIdentity/Features/DomainFeatures/Users/Application/Queries/GetUserById.cs
index 55b8b313..e1c9c3ef 100644
--- a/Source/Modules/TenantIdentity/Features/DomainFeatures/Users/Application/Queries/GetUserById.cs
+++ b/Source/Modules/TenantIdentity/Features/DomainFeatures/Users/Application/Queries/GetUserById.cs
@@ -4,7 +4,7 @@
 
 namespace Modules.TenantIdentity.Features.DomainFeatures.Users.Application.Queries
 {
-    public class GetUserById : IQuery<ApplicationUser>
+    public class GetUserById : Query<ApplicationUser>
     {
         public Guid UserId { get; set; }
     }
diff --git a/Source/Shared/Features/Messaging/Command/ICommand.cs b/Source/Shared/Features/Messaging/Commands/Command.cs
similarity index 51%
rename from Source/Shared/Features/Messaging/Command/ICommand.cs
rename to Source/Shared/Features/Messaging/Commands/Command.cs
index 26f18880..462a35cb 100644
--- a/Source/Shared/Features/Messaging/Command/ICommand.cs
+++ b/Source/Shared/Features/Messaging/Commands/Command.cs
@@ -1,10 +1,10 @@
 namespace Shared.Features.Messaging.Command
 {
-    public interface ICommand
+    public class Command
     {
     }
 
-    public interface ICommand<IResponse>
+    public class Command<IResponse>
     {
     }
 }
diff --git a/Source/Shared/Features/Messaging/Command/CommandDispatcher.cs b/Source/Shared/Features/Messaging/Commands/CommandDispatcher.cs
similarity index 90%
rename from Source/Shared/Features/Messaging/Command/CommandDispatcher.cs
rename to Source/Shared/Features/Messaging/Commands/CommandDispatcher.cs
index 1de002fb..a16f9105 100644
--- a/Source/Shared/Features/Messaging/Command/CommandDispatcher.cs
+++ b/Source/Shared/Features/Messaging/Commands/CommandDispatcher.cs
@@ -9,12 +9,12 @@ public CommandDispatcher(IServiceProvider serviceProvider)
         {
             this.serviceProvider = serviceProvider;
         }
-        public Task DispatchAsync<TCommand>(TCommand command, CancellationToken cancellation = default) where TCommand : ICommand
+        public Task DispatchAsync<TCommand>(TCommand command, CancellationToken cancellation = default) where TCommand : Command
         {
             var handler = serviceProvider.GetRequiredService<ICommandHandler<TCommand>>();
             return handler.HandleAsync(command, cancellation);
         }
-        public Task<TResult> DispatchAsync<TCommand, TResult>(TCommand command, CancellationToken cancellation = default) where TCommand : ICommand<TResult>
+        public Task<TResult> DispatchAsync<TCommand, TResult>(TCommand command, CancellationToken cancellation = default) where TCommand : Command<TResult>
         {
             var handler = serviceProvider.GetRequiredService<ICommandHandler<TCommand, TResult>>();
             return handler.HandleAsync(command, cancellation);
diff --git a/Source/Shared/Features/Messaging/Command/ICommandDispatcher.cs b/Source/Shared/Features/Messaging/Commands/ICommandDispatcher.cs
similarity index 78%
rename from Source/Shared/Features/Messaging/Command/ICommandDispatcher.cs
rename to Source/Shared/Features/Messaging/Commands/ICommandDispatcher.cs
index 5e283e67..281e22bb 100644
--- a/Source/Shared/Features/Messaging/Command/ICommandDispatcher.cs
+++ b/Source/Shared/Features/Messaging/Commands/ICommandDispatcher.cs
@@ -2,7 +2,7 @@
 {
     public interface ICommandDispatcher
     {
-        Task DispatchAsync<TCommand>(TCommand command, CancellationToken cancellation = default) where TCommand : ICommand;
-        Task<TResult> DispatchAsync<TCommand, TResult>(TCommand command, CancellationToken cancellation = default) where TCommand : ICommand<TResult>;
+        Task DispatchAsync<TCommand>(TCommand command, CancellationToken cancellation = default) where TCommand : Command;
+        Task<TResult> DispatchAsync<TCommand, TResult>(TCommand command, CancellationToken cancellation = default) where TCommand : Command<TResult>;
     }
 }
diff --git a/Source/Shared/Features/Messaging/Command/ICommandHandler.cs b/Source/Shared/Features/Messaging/Commands/ICommandHandler.cs
similarity index 89%
rename from Source/Shared/Features/Messaging/Command/ICommandHandler.cs
rename to Source/Shared/Features/Messaging/Commands/ICommandHandler.cs
index 9ed569ae..725504d6 100644
--- a/Source/Shared/Features/Messaging/Command/ICommandHandler.cs
+++ b/Source/Shared/Features/Messaging/Commands/ICommandHandler.cs
@@ -1,10 +1,10 @@
 namespace Shared.Features.Messaging.Command
 {
-    public interface ICommandHandler<in TCommand> where TCommand : ICommand
+    public interface ICommandHandler<in TCommand> where TCommand : Command
     {
         Task HandleAsync(TCommand command, CancellationToken cancellationToken);
     }
-    public interface ICommandHandler<in TCommand, TResult> where TCommand : ICommand<TResult>
+    public interface ICommandHandler<in TCommand, TResult> where TCommand : Command<TResult>
     {
         Task<TResult> HandleAsync(TCommand command, CancellationToken cancellationToken);
     }
diff --git a/Source/Shared/Features/Messaging/Query/IQueryDispatcher.cs b/Source/Shared/Features/Messaging/Queries/IQueryDispatcher.cs
similarity index 89%
rename from Source/Shared/Features/Messaging/Query/IQueryDispatcher.cs
rename to Source/Shared/Features/Messaging/Queries/IQueryDispatcher.cs
index b74226d0..f3dac8dd 100644
--- a/Source/Shared/Features/Messaging/Query/IQueryDispatcher.cs
+++ b/Source/Shared/Features/Messaging/Queries/IQueryDispatcher.cs
@@ -2,6 +2,6 @@
 {
     public interface IQueryDispatcher
     {
-        Task<TQueryResult> DispatchAsync<TQuery, TQueryResult>(TQuery query, CancellationToken cancellation = default) where TQuery : IQuery<TQueryResult>;
+        Task<TQueryResult> DispatchAsync<TQuery, TQueryResult>(TQuery query, CancellationToken cancellation = default) where TQuery : Query<TQueryResult>;
     }
 }
diff --git a/Source/Shared/Features/Messaging/Query/IQueryHandler.cs b/Source/Shared/Features/Messaging/Queries/IQueryHandler.cs
similarity index 86%
rename from Source/Shared/Features/Messaging/Query/IQueryHandler.cs
rename to Source/Shared/Features/Messaging/Queries/IQueryHandler.cs
index 1fe22cda..3356f44e 100644
--- a/Source/Shared/Features/Messaging/Query/IQueryHandler.cs
+++ b/Source/Shared/Features/Messaging/Queries/IQueryHandler.cs
@@ -1,6 +1,6 @@
 namespace Shared.Features.Messaging.Query
 {
-    public interface IQueryHandler<in TQuery, TQueryResult> where TQuery : IQuery<TQueryResult>
+    public interface IQueryHandler<in TQuery, TQueryResult> where TQuery : Query<TQueryResult>
     {
         Task<TQueryResult> HandleAsync(TQuery query, CancellationToken cancellation);
     }
diff --git a/Source/Shared/Features/Messaging/Query/IQuery.cs b/Source/Shared/Features/Messaging/Queries/Query.cs
similarity index 61%
rename from Source/Shared/Features/Messaging/Query/IQuery.cs
rename to Source/Shared/Features/Messaging/Queries/Query.cs
index 7d2ce0cb..ae49be4e 100644
--- a/Source/Shared/Features/Messaging/Query/IQuery.cs
+++ b/Source/Shared/Features/Messaging/Queries/Query.cs
@@ -1,6 +1,6 @@
 namespace Shared.Features.Messaging.Query
 {
-    public interface IQuery<IResponse>
+    public class Query<IResponse>
     {
     }
 }
diff --git a/Source/Shared/Features/Messaging/Query/QueryDispatcher.cs b/Source/Shared/Features/Messaging/Queries/QueryDispatcher.cs
similarity index 96%
rename from Source/Shared/Features/Messaging/Query/QueryDispatcher.cs
rename to Source/Shared/Features/Messaging/Queries/QueryDispatcher.cs
index af7a3d2c..0233347e 100644
--- a/Source/Shared/Features/Messaging/Query/QueryDispatcher.cs
+++ b/Source/Shared/Features/Messaging/Queries/QueryDispatcher.cs
@@ -13,7 +13,7 @@ public QueryDispatcher(IServiceProvider serviceProvider)
             this.serviceProvider = serviceProvider;
         }
 
-        public Task<TQueryResult> DispatchAsync<TQuery, TQueryResult>(TQuery query, CancellationToken cancellation = default) where TQuery : IQuery<TQueryResult>
+        public Task<TQueryResult> DispatchAsync<TQuery, TQueryResult>(TQuery query, CancellationToken cancellation = default) where TQuery : Query<TQueryResult>
         {
             var handler = serviceProvider.GetRequiredService<IQueryHandler<TQuery, TQueryResult>>();
             var executionContext = serviceProvider.GetRequiredService<IExecutionContext>();