diff --git a/dotnet/AipsCore/Application/Models/User/Command/CreateUserCommand.cs b/dotnet/AipsCore/Application/Models/User/Command/CreateUser/CreateUserCommand.cs
similarity index 74%
rename from dotnet/AipsCore/Application/Models/User/Command/CreateUserCommand.cs
rename to dotnet/AipsCore/Application/Models/User/Command/CreateUser/CreateUserCommand.cs
index fdb6f36..50c2786 100644
--- a/dotnet/AipsCore/Application/Models/User/Command/CreateUserCommand.cs
+++ b/dotnet/AipsCore/Application/Models/User/Command/CreateUser/CreateUserCommand.cs
@@ -1,6 +1,6 @@
 using AipsCore.Application.Abstract.Command;
 using AipsCore.Domain.Models.User.ValueObjects;
 
-namespace AipsCore.Application.Models.User.Command;
+namespace AipsCore.Application.Models.User.Command.CreateUser;
 
 public record CreateUserCommand(string Username, string Email) : ICommand<UserId>, ICommand;
\ No newline at end of file
diff --git a/dotnet/AipsCore/Application/Models/User/Command/Handler/CreateUserCommandHandler.cs b/dotnet/AipsCore/Application/Models/User/Command/CreateUser/CreateUserCommandHandler.cs
similarity index 80%
rename from dotnet/AipsCore/Application/Models/User/Command/Handler/CreateUserCommandHandler.cs
rename to dotnet/AipsCore/Application/Models/User/Command/CreateUser/CreateUserCommandHandler.cs
index eff3150..ee63b76 100644
--- a/dotnet/AipsCore/Application/Models/User/Command/Handler/CreateUserCommandHandler.cs
+++ b/dotnet/AipsCore/Application/Models/User/Command/CreateUser/CreateUserCommandHandler.cs
@@ -1,9 +1,7 @@
 using AipsCore.Application.Abstract.Command;
-using AipsCore.Domain.Common.ValueObjects;
 using AipsCore.Domain.Models.User.External;
-using AipsCore.Domain.Models.User.ValueObjects;
 
-namespace AipsCore.Application.Models.User.Command.Handler;
+namespace AipsCore.Application.Models.User.Command.CreateUser;
 
 public class CreateUserCommandHandler : ICommandHandler<CreateUserCommand>
 {