diff --git a/jwt-auth-api.Api/src/jwt-auth-api.Api/Controllers/AuthController.cs b/jwt-auth-api.Api/src/jwt-auth-api.Api/Controllers/AuthController.cs
index 1222456..cb0c2ef 100644
--- a/jwt-auth-api.Api/src/jwt-auth-api.Api/Controllers/AuthController.cs
+++ b/jwt-auth-api.Api/src/jwt-auth-api.Api/Controllers/AuthController.cs
@@ -1,6 +1,6 @@
-using jwt_auth_api.Api.ViewModel.Login;
+using jwt_auth_api.Api.ViewModel.LoginViewModel;
+using jwt_auth_api.Api.ViewModel.LoginViwModel;
 using jwt_auth_api.Application.Service;
-using Microsoft.AspNetCore.Identity.Data;
 using Microsoft.AspNetCore.Mvc;
 
 namespace jwt_auth_api.Api.Controllers
diff --git a/jwt-auth-api.Api/src/jwt-auth-api.Api/Controllers/PersonController.cs b/jwt-auth-api.Api/src/jwt-auth-api.Api/Controllers/PersonController.cs
index eb1ae09..a232d87 100644
--- a/jwt-auth-api.Api/src/jwt-auth-api.Api/Controllers/PersonController.cs
+++ b/jwt-auth-api.Api/src/jwt-auth-api.Api/Controllers/PersonController.cs
@@ -1,7 +1,6 @@
-using jwt_auth_api.Api.ViewModel;
-using jwt_auth_api.Api.ViewModel.PersonViewModel;
+using jwt_auth_api.Api.ViewModel.PersonViewModel;
 using jwt_auth_api.Application.Service;
-using jwt_auth_api.Core.Users;
+using jwt_auth_api.Domain.Users;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
@@ -17,72 +16,75 @@ public PersonController(PersonService servicePerson)
         {
             _servicePerson = servicePerson;
         }
+
         [HttpGet]
         public IActionResult Get()
         {
             List<Person> person = _servicePerson.Read();
-            List<PersonViewModel> listViewModel = new List<PersonViewModel>();
+            List<PersonGetResponse> response = new List<PersonGetResponse>();
             foreach (var p in person)
             {
-                listViewModel.Add(new PersonViewModel
+                response.Add(new PersonGetResponse
                 {
                     Id = p.Id,
                     FirstName = p.FirstName,
-                    LastName = p.LastName
-                }); 
+                    LastName = p.LastName,
+                    CreatedAt = p.CreatedAt
+                });
             }
-            return Ok(listViewModel);
+            return Ok(response);
         }
-
+           
         [HttpGet("{id}")]
-        public ActionResult<PersonViewModel> Get(int id)
+        public IActionResult Get(int id)
         {
-            Person person = _servicePerson.ReadById(id);
-            if (person == null)
-                return NotFound();
-
-            var personViewModel = new PersonViewModel
+            Person model = _servicePerson.ReadById(id);
+            var response = new PersonGetResponse
             {
-                Id = person.Id,
-                FirstName = person.FirstName,
-                LastName = person.LastName
+                Id = model.Id,
+                FirstName = model.FirstName,
+                LastName = model.LastName,
+                CreatedAt = model.CreatedAt,
             };
-
-            return personViewModel;
+            return Ok(response);
         }
 
-
         [HttpGet("exist/{id}")]
         public IActionResult Exist(int id)
         {
-            var response = _servicePerson.Exists(id);
+            var response = new ExistResponse
+            {
+                Id = id,
+                Exist = _servicePerson.Exists(id)
+            };
             return Ok(response);
         }
 
         [HttpPost]
-        public IActionResult Post([FromBody] PersonViewModel viewModel)
+        public IActionResult Post([FromBody] PersonPostRequest request)
         {
             Person model = new Person
             {
-                FirstName = viewModel.FirstName,
-                LastName = viewModel.LastName   
+                FirstName = request.FirstName,
+                LastName = request.LastName,
             };
             _servicePerson.Create(model);
-            return CreatedAtAction(nameof(Get), new { id = model.Id }, model);
+            return Created();
         }
     
         [HttpPut("{id}")]
-        public IActionResult Put(int id, [FromBody] PersonViewModel viewModel)
+        public IActionResult Put(int id, [FromBody] PersonPostRequest request)
         {
             Person model = new Person
             {
                 Id = id,
-                FirstName = viewModel.FirstName,
-                LastName = viewModel.LastName
+                FirstName = request.FirstName,
+                LastName = request.LastName
             };
 
             _servicePerson.Update(model);
-            return Ok(model);  
+            return NoContent();
+              
         }
 
         [HttpDelete("{id}")]
diff --git a/jwt-auth-api.Api/src/jwt-auth-api.Api/Controllers/UsuarioController.cs b/jwt-auth-api.Api/src/jwt-auth-api.Api/Controllers/UsuarioController.cs
index e5ecb03..dbc2116 100644
--- a/jwt-auth-api.Api/src/jwt-auth-api.Api/Controllers/UsuarioController.cs
+++ b/jwt-auth-api.Api/src/jwt-auth-api.Api/Controllers/UsuarioController.cs
@@ -1,14 +1,14 @@
-using jwt_auth_api.Api.ViewModel.UsersViewModel;
+using jwt_auth_api.Api.ViewModel.PersonViewModel;
+using jwt_auth_api.Api.ViewModel.UsersViewModel;
 using jwt_auth_api.Application.Service;
-using jwt_auth_api.Core.Users;
-using Microsoft.AspNetCore.Authorization;
+using jwt_auth_api.Domain.Users;
 using Microsoft.AspNetCore.Mvc;
 
 namespace jwt_auth_api.Api.Controllers
 {
     [Route("api/[controller]")]
     [ApiController]
-    [Authorize]
+    //[Authorize]
     public class UsuarioController : ControllerBase
     {
         private readonly UsuarioService _serviceUsuario;
@@ -21,46 +21,50 @@ public UsuarioController(UsuarioService serviceUsuario, PersonService servicePer
         }
 
         [HttpGet]
-        public List<UserResponseViewModel> Get()
+        public IActionResult Get()
         {
             List<Usuario> usuarios =  _serviceUsuario.Read();
-            List<UserResponseViewModel> listViewModel = new List<UserResponseViewModel>();
+            List<UserGetResponseViewModel> listViewModel = new List<UserGetResponseViewModel>();
             foreach (var usuario in usuarios)
             {
-                listViewModel.Add(new UserResponseViewModel
+                listViewModel.Add(new UserGetResponseViewModel
                 {
                     Id = usuario.Id,
                     Email = usuario.Email,
                     CreatedAt = usuario.CreatedAt,
                     Person = _servicePerson.ReadById(usuario.PersonId)
-                }); //gerei o token no senha do usuario, depois é validar com jwt
+                }); 
             }
-            return listViewModel;
+            return Ok(listViewModel);
         }
 
-
         [HttpGet("{id}")]
-        public UserResponseViewModel Get(int id)
+        public IActionResult Get(int id)
         {
             Usuario user = _serviceUsuario.ReadById(id);
-            UserResponseViewModel userResponseViewModel = new UserResponseViewModel
+            UserGetResponseViewModel userResponseViewModel = new UserGetResponseViewModel
             {
                 Id = user.Id,
                 Email = user.Email,
                 CreatedAt = user.CreatedAt,
                 Person = _servicePerson.ReadById(user.PersonId)
             };
-            return  userResponseViewModel;
+            return  Ok(userResponseViewModel);
         }
 
         [HttpGet("exist/{id}")]
-        public bool Exist(int id)
+        public IActionResult Exist(int id)
         {
-            return  _serviceUsuario.Exists(id);
+            ExistResponse response = new ExistResponse
+            {
+                Id = id,
+                Exist = _serviceUsuario.Exists(id)
+            };
+            return Ok(response);
         }
 
         [HttpPost]
-        public IActionResult Post([FromBody] UserRequestViewModel viewModel)
+        public IActionResult Post([FromBody] UserPostRequestViewModel viewModel)
         {
             Usuario model = new Usuario
             {
@@ -69,37 +73,31 @@ public IActionResult Post([FromBody] UserRequestViewModel viewModel)
                 PersonId = viewModel.PersonId
             };
              _serviceUsuario.Create(model);
-            return CreatedAtAction(nameof(Get), new { id = model.Id }, model);
+            return Created();
         }
 
-
         [HttpPut("{id}")]
-        public void Put(int id, [FromBody] UserPasswordViewModel model)
+        public IActionResult Put(int id, [FromBody] UserPutRequestViewModel request)
         {
-            if (id != model.Id)
-            {
-                throw new ArgumentException("O ID do objeto User não é igual ao ID da URL.");
-            }
+            Usuario model = new Usuario();
+            model.Id = request.Id;
+            model.Password = request.Password;
 
-            Usuario userToUpdate = new Usuario();
-            userToUpdate.Id = model.Id;
-            userToUpdate.Password = model.Password;
-            _serviceUsuario.Update(userToUpdate);
+            _serviceUsuario.Update(model);
+            return NoContent();
         }
 
         [HttpDelete("{id}")]
-        public StatusCodeResult Delete(int id)
+        public IActionResult Delete(int id)
         {
             try
             {
-                this. _serviceUsuario.Delete(id);
-                StatusCodeResult result = new StatusCodeResult(204);
-                return result;
+                 _serviceUsuario.Delete(id);
+                return NoContent();
             }
             catch (Exception)
             {
-                StatusCodeResult result = new StatusCodeResult(500);
-                return result;
+                return StatusCode(500);
             }
 
         }
diff --git a/jwt-auth-api.Api/src/jwt-auth-api.Api/Extensions/DependencyInjectionExtensions.cs b/jwt-auth-api.Api/src/jwt-auth-api.Api/Extensions/DependencyInjectionExtensions.cs
index aca5206..5512657 100644
--- a/jwt-auth-api.Api/src/jwt-auth-api.Api/Extensions/DependencyInjectionExtensions.cs
+++ b/jwt-auth-api.Api/src/jwt-auth-api.Api/Extensions/DependencyInjectionExtensions.cs
@@ -1,6 +1,6 @@
 using jwt_auth_api.Application.Auth.Tools;
 using jwt_auth_api.Application.Service;
-using jwt_auth_api.Core.Users;
+using jwt_auth_api.Domain.Users;
 using jwt_auth_api.Infrastructure.Repositories;
 using jwt_auth_api.Infrastructure.Repositories.Interfaces;
 using Microsoft.AspNetCore.Identity;
diff --git a/jwt-auth-api.Api/src/jwt-auth-api.Api/Program.cs b/jwt-auth-api.Api/src/jwt-auth-api.Api/Program.cs
index 0c6dfcd..33f3663 100644
--- a/jwt-auth-api.Api/src/jwt-auth-api.Api/Program.cs
+++ b/jwt-auth-api.Api/src/jwt-auth-api.Api/Program.cs
@@ -4,18 +4,13 @@
 using Microsoft.OpenApi;
 using Scalar.AspNetCore;
 
-
 var builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container.
-
-
-
 builder.Services.AddControllers();
 // Learn more about configuring OpenAPI at https://aka.ms/aspnet/openapi
 builder.Services.AddOpenApi();
 
-
 //===== Database =====
 builder.Services.AddDbContext<ApplicationDbContext>(options =>
 {
diff --git a/jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/Login/AuthLoginRequest.cs b/jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/LoginViewModel/AuthLoginRequest.cs
similarity index 91%
rename from jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/Login/AuthLoginRequest.cs
rename to jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/LoginViewModel/AuthLoginRequest.cs
index 4fd4ba1..d973060 100644
--- a/jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/Login/AuthLoginRequest.cs
+++ b/jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/LoginViewModel/AuthLoginRequest.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace jwt_auth_api.Api.ViewModel.Login
+namespace jwt_auth_api.Api.ViewModel.LoginViwModel
 {
     public class AuthLoginRequest
     {
diff --git a/jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/Login/AuthLoginResponse.cs b/jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/LoginViewModel/AuthLoginResponse.cs
similarity index 76%
rename from jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/Login/AuthLoginResponse.cs
rename to jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/LoginViewModel/AuthLoginResponse.cs
index 3dc59b1..9af2791 100644
--- a/jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/Login/AuthLoginResponse.cs
+++ b/jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/LoginViewModel/AuthLoginResponse.cs
@@ -1,4 +1,4 @@
-namespace jwt_auth_api.Api.ViewModel.Login
+namespace jwt_auth_api.Api.ViewModel.LoginViewModel
 {
     public class AuthLoginResponse
     {
diff --git a/jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/PersonViewModel/ExistResponse.cs b/jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/PersonViewModel/ExistResponse.cs
new file mode 100644
index 0000000..c910e4f
--- /dev/null
+++ b/jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/PersonViewModel/ExistResponse.cs
@@ -0,0 +1,8 @@
+namespace jwt_auth_api.Api.ViewModel.PersonViewModel
+{
+    public class ExistResponse
+    {
+        public int Id { get; set; }
+        public bool Exist { get; set; }
+    }
+}
diff --git a/jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/Person/PersonViewModel.cs b/jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/PersonViewModel/PersonGetResponse.cs
similarity index 76%
rename from jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/Person/PersonViewModel.cs
rename to jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/PersonViewModel/PersonGetResponse.cs
index ad6ea0c..b31d90f 100644
--- a/jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/Person/PersonViewModel.cs
+++ b/jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/PersonViewModel/PersonGetResponse.cs
@@ -2,12 +2,15 @@
 
 namespace jwt_auth_api.Api.ViewModel.PersonViewModel
 {
-    public class PersonViewModel : BaseViewModel
+    public class PersonGetResponse 
     {
+        public int Id { get; set; }
         [Required(ErrorMessage = "O campo Primeiro Nome é obrigatório.")]
         public string FirstName { get; set; } = string.Empty;
         [Required(ErrorMessage = "O campo Sobrenome é obrigatório.")]
         public string LastName { get; set; } = string.Empty;
-        
+        public DateTime CreatedAt { get; set; }
+
+
     }
 }
diff --git a/jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/PersonViewModel/PersonPostRequest.cs b/jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/PersonViewModel/PersonPostRequest.cs
new file mode 100644
index 0000000..dca9298
--- /dev/null
+++ b/jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/PersonViewModel/PersonPostRequest.cs
@@ -0,0 +1,14 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace jwt_auth_api.Api.ViewModel.PersonViewModel
+{
+    public class PersonPostRequest
+    {
+        [Required(ErrorMessage = "O campo Primeiro Nome é obrigatório.")]
+        [MinLength(3, ErrorMessage = "O campo FirstName deve ter no mínimo 3 caracteres")]
+        public string FirstName { get; set; } = string.Empty;
+        [Required(ErrorMessage = "O campo Sobrenome é obrigatório.")]
+        [MinLength(3, ErrorMessage = "O campo FirstName deve ter no mínimo 3 caracteres")]
+        public string LastName { get; set; } = string.Empty;
+    }
+}
diff --git a/jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/Users/UserResponseViewModel.cs b/jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/UserViewModel/UserGetResponseViewModel.cs
similarity index 55%
rename from jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/Users/UserResponseViewModel.cs
rename to jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/UserViewModel/UserGetResponseViewModel.cs
index a9ce0c7..249959c 100644
--- a/jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/Users/UserResponseViewModel.cs
+++ b/jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/UserViewModel/UserGetResponseViewModel.cs
@@ -1,10 +1,11 @@
-using jwt_auth_api.Core.Users;
-
+using jwt_auth_api.Domain.Users;
 namespace jwt_auth_api.Api.ViewModel.UsersViewModel
 {
-    public class UserResponseViewModel : BaseViewModel
+    public class UserGetResponseViewModel : BaseViewModel
     {
         public string Email { get; set; } = string.Empty;
+
+        // Foreign Key para Person - POO Composição
         public Person Person { get; set; } = new Person();
     }
 }
diff --git a/jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/UserViewModel/UserPostRequestViewModel.cs b/jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/UserViewModel/UserPostRequestViewModel.cs
new file mode 100644
index 0000000..98969e5
--- /dev/null
+++ b/jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/UserViewModel/UserPostRequestViewModel.cs
@@ -0,0 +1,17 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace jwt_auth_api.Api.ViewModel.UsersViewModel
+{
+    public class UserPostRequestViewModel
+    {
+        [Required(ErrorMessage = "O campo Email é obrigatório.")]
+        [EmailAddress(ErrorMessage = "O campo Email está em um formato inválido")]
+        public string Email { get; set; } = string.Empty;
+        [Required(ErrorMessage = "O campo Senha é obrigatório.")]
+        [MinLength(3, ErrorMessage = "O campo Senha deve ter no mínimo 3 caracteres.")]
+        public string Password { get; set; } = string.Empty;
+        [Required(ErrorMessage = "O id da pessoa precisa ser preenchido.")]
+        [Range(1, int.MaxValue, ErrorMessage = "O id da pessoa precisa ser maior que 0.")]
+        public int PersonId { get; set; } 
+    }
+}
diff --git a/jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/Users/UserPasswordViewModel.cs b/jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/UserViewModel/UserPutRequestViewModel.cs
similarity index 62%
rename from jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/Users/UserPasswordViewModel.cs
rename to jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/UserViewModel/UserPutRequestViewModel.cs
index 55aaa97..6a25939 100644
--- a/jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/Users/UserPasswordViewModel.cs
+++ b/jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/UserViewModel/UserPutRequestViewModel.cs
@@ -2,9 +2,10 @@
 
 namespace jwt_auth_api.Api.ViewModel.UsersViewModel
 {
-    public class UserPasswordViewModel : BaseViewModel
+    public class UserPutRequestViewModel : BaseViewModel
     {
         [Required(ErrorMessage = "O campo Senha é obrigatório.")]
+        [MinLength(3, ErrorMessage = "O campo Senha deve ter no mínimo 3 caracteres")]
         public string Password { get; set; } = string.Empty;
     }
 }
diff --git a/jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/Users/UserRequestViewModel.cs b/jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/Users/UserRequestViewModel.cs
deleted file mode 100644
index 52c9558..0000000
--- a/jwt-auth-api.Api/src/jwt-auth-api.Api/ViewModel/Users/UserRequestViewModel.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using jwt_auth_api.Core.Users;
-using System.ComponentModel.DataAnnotations;
-
-namespace jwt_auth_api.Api.ViewModel.UsersViewModel
-{
-    public class UserRequestViewModel
-    {
-        [Required(ErrorMessage = "O campo Email é obrigatório.")]
-        public string Email { get; set; } = string.Empty;
-        [Required(ErrorMessage = "O campo Senha é obrigatório.")]
-        public string Password { get; set; } = string.Empty;
-        public int PersonId { get; set; } 
-    }
-}
diff --git a/jwt-auth-api.Api/src/jwt-auth-api.Api/jwt-auth-api.Api.csproj b/jwt-auth-api.Api/src/jwt-auth-api.Api/jwt-auth-api.Api.csproj
index ad254f2..a8ffc96 100644
--- a/jwt-auth-api.Api/src/jwt-auth-api.Api/jwt-auth-api.Api.csproj
+++ b/jwt-auth-api.Api/src/jwt-auth-api.Api/jwt-auth-api.Api.csproj
@@ -20,9 +20,8 @@
 
   <ItemGroup>
     <ProjectReference Include="..\jwt-auth-api.Application\jwt-auth-api.Application.csproj" />
-    <ProjectReference Include="..\jwt-auth-api.Core\jwt-auth-api.Domain.csproj" />
+    <ProjectReference Include="..\jwt-auth-api.Domain\jwt-auth-api.Domain.csproj" />
     <ProjectReference Include="..\jwt-auth-api.Infrastructure\jwt-auth-api.Infrastructure.csproj" />
-    <ProjectReference Include="..\jwt-auth-api.Shared\jwt-auth-api.Shared.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/jwt-auth-api.Api/src/jwt-auth-api.Api/jwt-auth-api.Api.slnx b/jwt-auth-api.Api/src/jwt-auth-api.Api/jwt-auth-api.Api.slnx
index d626a77..051a45e 100644
--- a/jwt-auth-api.Api/src/jwt-auth-api.Api/jwt-auth-api.Api.slnx
+++ b/jwt-auth-api.Api/src/jwt-auth-api.Api/jwt-auth-api.Api.slnx
@@ -1,7 +1,8 @@
 <Solution>
+  <Project Path="../jwt-auth-api.Api/jwt-auth-api.Api.csproj" />
   <Project Path="../jwt-auth-api.Application/jwt-auth-api.Application.csproj" />
-  <Project Path="../jwt-auth-api.Core/jwt-auth-api.Domain.csproj" />
+  <Project Path="../jwt-auth-api.Domain/jwt-auth-api.Domain.csproj" />
   <Project Path="../jwt-auth-api.Infrastructure/jwt-auth-api.Infrastructure.csproj" />
-  <Project Path="../jwt-auth-api.Shared/jwt-auth-api.Shared.csproj" />
-  <Project Path="jwt-auth-api.Api.csproj" />
 </Solution>
+
+
diff --git a/jwt-auth-api.Api/src/jwt-auth-api.Application/Auth/Tools/TokenGenerator.cs b/jwt-auth-api.Api/src/jwt-auth-api.Application/Auth/Tools/TokenGenerator.cs
index c694c6d..5c17014 100644
--- a/jwt-auth-api.Api/src/jwt-auth-api.Application/Auth/Tools/TokenGenerator.cs
+++ b/jwt-auth-api.Api/src/jwt-auth-api.Application/Auth/Tools/TokenGenerator.cs
@@ -1,5 +1,5 @@
 using jwt_auth_api.Application.Auth.Config;
-using jwt_auth_api.Core.Users;
+using jwt_auth_api.Domain.Users;
 using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.Tokens;
 using System.IdentityModel.Tokens.Jwt;
@@ -15,12 +15,14 @@ public TokenGenerator(IOptions<TokenConfiguration> tokenConfiguration)
         {
             this._tokenConfiguration = tokenConfiguration.Value;
         }
-        public string GenerateToken(Usuario model)
+        public string GenerateToken(Usuario model, Person person)
         {
             // ===== Claims do Token =====
             var claims = new List<Claim>
             {
-                new Claim(ClaimTypes.Email, model.Email),
+                new Claim("FirstName", person.FirstName),
+                new Claim("LastName", person.LastName),
+                new Claim("Email", model.Email),
                 new Claim("UsuarioId", model.Id.ToString()),
                 new Claim("PersonId", model.PersonId.ToString()),
                 new Claim(ClaimTypes.Role, "Admin")
diff --git a/jwt-auth-api.Api/src/jwt-auth-api.Application/Service/AuthService.cs b/jwt-auth-api.Api/src/jwt-auth-api.Application/Service/AuthService.cs
index 8f36181..15c6b57 100644
--- a/jwt-auth-api.Api/src/jwt-auth-api.Application/Service/AuthService.cs
+++ b/jwt-auth-api.Api/src/jwt-auth-api.Application/Service/AuthService.cs
@@ -1,7 +1,8 @@
 using jwt_auth_api.Application.Auth.Tools;
-using jwt_auth_api.Core.Users;
+using jwt_auth_api.Domain.Users;
 using jwt_auth_api.Infrastructure.Repositories;
 using Microsoft.AspNetCore.Identity;
+using System;
 
 
 namespace jwt_auth_api.Application.Service
@@ -12,31 +13,28 @@ public class AuthService
         private readonly AuthRepository _authRepository;
         private readonly PasswordHasher<Usuario> _passwordHasher;
         private readonly TokenGenerator _tokenGenerator;
+        private readonly PersonService _personService;
 
-        public AuthService(AuthRepository authRepository, PasswordHasher<Usuario> sha256PasswordHasher, TokenGenerator tokenGenerator)
+        public AuthService(AuthRepository authRepository, PasswordHasher<Usuario> sha256PasswordHasher, TokenGenerator tokenGenerator, PersonService personService)
         {
             _authRepository = authRepository;
             _passwordHasher = sha256PasswordHasher;
             _tokenGenerator = tokenGenerator;
+            _personService = personService;
         }
         public string Login(string email, string password)
         {
-            if (string.IsNullOrWhiteSpace(email) || string.IsNullOrWhiteSpace(password))
-                throw new ArgumentException("Email e senha são obrigatórios.");
-
             var model = _authRepository.GetUserByEmail(email);
             if (model == null)
                 throw new UnauthorizedAccessException("Usuário não encontrado.");
 
             var result = _passwordHasher.VerifyHashedPassword(model, model.Password, password);
             if (result != PasswordVerificationResult.Success)
-                throw new UnauthorizedAccessException("Senha inválida.");
-
-            var token = _tokenGenerator.GenerateToken(model);
-            if (string.IsNullOrEmpty(token))
-                throw new ApplicationException("Falha ao gerar token.");
-
-            return token;
+            {
+                var person = _personService.ReadById(model.PersonId);
+                return _tokenGenerator.GenerateToken(model, person);
+            }
+            throw new Exception("Usuario ou senha invalido");
         }
 
         public string Logout()
diff --git a/jwt-auth-api.Api/src/jwt-auth-api.Application/Service/GeneriService.cs b/jwt-auth-api.Api/src/jwt-auth-api.Application/Service/GeneriService.cs
index e054f39..90959a7 100644
--- a/jwt-auth-api.Api/src/jwt-auth-api.Application/Service/GeneriService.cs
+++ b/jwt-auth-api.Api/src/jwt-auth-api.Application/Service/GeneriService.cs
@@ -1,4 +1,4 @@
-using jwt_auth_api.Core;
+using jwt_auth_api.Domain;
 using jwt_auth_api.Infrastructure.Repositories.Interfaces;
 
 namespace jwt_auth_api.Application.Service
diff --git a/jwt-auth-api.Api/src/jwt-auth-api.Application/Service/PersonService.cs b/jwt-auth-api.Api/src/jwt-auth-api.Application/Service/PersonService.cs
index 79f9a02..0ef80f6 100644
--- a/jwt-auth-api.Api/src/jwt-auth-api.Application/Service/PersonService.cs
+++ b/jwt-auth-api.Api/src/jwt-auth-api.Application/Service/PersonService.cs
@@ -1,4 +1,4 @@
-using jwt_auth_api.Core.Users;
+using jwt_auth_api.Domain.Users;
 using jwt_auth_api.Infrastructure.Repositories.Interfaces;
 using Microsoft.AspNetCore.Authorization;
 
diff --git a/jwt-auth-api.Api/src/jwt-auth-api.Application/Service/UsuarioService.cs b/jwt-auth-api.Api/src/jwt-auth-api.Application/Service/UsuarioService.cs
index 5fc164a..d953fb7 100644
--- a/jwt-auth-api.Api/src/jwt-auth-api.Application/Service/UsuarioService.cs
+++ b/jwt-auth-api.Api/src/jwt-auth-api.Application/Service/UsuarioService.cs
@@ -1,4 +1,4 @@
-using jwt_auth_api.Core.Users;
+using jwt_auth_api.Domain.Users;
 using jwt_auth_api.Infrastructure.Repositories.Interfaces;
 using Microsoft.AspNetCore.Identity;
 
diff --git a/jwt-auth-api.Api/src/jwt-auth-api.Application/jwt-auth-api.Application.csproj b/jwt-auth-api.Api/src/jwt-auth-api.Application/jwt-auth-api.Application.csproj
index aab976e..9facfad 100644
--- a/jwt-auth-api.Api/src/jwt-auth-api.Application/jwt-auth-api.Application.csproj
+++ b/jwt-auth-api.Api/src/jwt-auth-api.Application/jwt-auth-api.Application.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\jwt-auth-api.Core\jwt-auth-api.Domain.csproj" />
+    <ProjectReference Include="..\jwt-auth-api.Domain\jwt-auth-api.Domain.csproj" />
     <ProjectReference Include="..\jwt-auth-api.Infrastructure\jwt-auth-api.Infrastructure.csproj" />
   </ItemGroup>
 
diff --git a/jwt-auth-api.Api/src/jwt-auth-api.Core/BaseModel.cs b/jwt-auth-api.Api/src/jwt-auth-api.Domain/BaseModel.cs
similarity index 72%
rename from jwt-auth-api.Api/src/jwt-auth-api.Core/BaseModel.cs
rename to jwt-auth-api.Api/src/jwt-auth-api.Domain/BaseModel.cs
index 95b5852..3ff0257 100644
--- a/jwt-auth-api.Api/src/jwt-auth-api.Core/BaseModel.cs
+++ b/jwt-auth-api.Api/src/jwt-auth-api.Domain/BaseModel.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace jwt_auth_api.Core
+namespace jwt_auth_api.Domain
 {
     public class BaseModel
     {
diff --git a/jwt-auth-api.Api/src/jwt-auth-api.Core/Users/Person.cs b/jwt-auth-api.Api/src/jwt-auth-api.Domain/Users/Person.cs
similarity index 89%
rename from jwt-auth-api.Api/src/jwt-auth-api.Core/Users/Person.cs
rename to jwt-auth-api.Api/src/jwt-auth-api.Domain/Users/Person.cs
index f8c44c0..0408ab8 100644
--- a/jwt-auth-api.Api/src/jwt-auth-api.Core/Users/Person.cs
+++ b/jwt-auth-api.Api/src/jwt-auth-api.Domain/Users/Person.cs
@@ -1,4 +1,4 @@
-namespace jwt_auth_api.Core.Users
+namespace jwt_auth_api.Domain.Users
 {
     public class Person : BaseModel
     {
diff --git a/jwt-auth-api.Api/src/jwt-auth-api.Core/Users/Usuario.cs b/jwt-auth-api.Api/src/jwt-auth-api.Domain/Users/Usuario.cs
similarity index 71%
rename from jwt-auth-api.Api/src/jwt-auth-api.Core/Users/Usuario.cs
rename to jwt-auth-api.Api/src/jwt-auth-api.Domain/Users/Usuario.cs
index 561ea48..5d6c785 100644
--- a/jwt-auth-api.Api/src/jwt-auth-api.Core/Users/Usuario.cs
+++ b/jwt-auth-api.Api/src/jwt-auth-api.Domain/Users/Usuario.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace jwt_auth_api.Core.Users
+namespace jwt_auth_api.Domain.Users
 {
     public class Usuario : BaseModel
     {
@@ -10,5 +6,6 @@ public class Usuario : BaseModel
         public string Password { get; set; } = string.Empty;
         public bool IsActive { get; set; } 
         public int PersonId { get; set; }
+       
     }
 }
diff --git a/jwt-auth-api.Api/src/jwt-auth-api.Core/jwt-auth-api.Domain.csproj b/jwt-auth-api.Api/src/jwt-auth-api.Domain/jwt-auth-api.Domain.csproj
similarity index 100%
rename from jwt-auth-api.Api/src/jwt-auth-api.Core/jwt-auth-api.Domain.csproj
rename to jwt-auth-api.Api/src/jwt-auth-api.Domain/jwt-auth-api.Domain.csproj
diff --git a/jwt-auth-api.Api/src/jwt-auth-api.Infrastructure/Context/ApplicationDbContext.cs b/jwt-auth-api.Api/src/jwt-auth-api.Infrastructure/Context/ApplicationDbContext.cs
index b2b4a78..73fe6dc 100644
--- a/jwt-auth-api.Api/src/jwt-auth-api.Infrastructure/Context/ApplicationDbContext.cs
+++ b/jwt-auth-api.Api/src/jwt-auth-api.Infrastructure/Context/ApplicationDbContext.cs
@@ -1,4 +1,4 @@
-using jwt_auth_api.Core.Users;
+using jwt_auth_api.Domain.Users;
 using Microsoft.EntityFrameworkCore;
 
 namespace jwt_auth_api.Infrastructure.Context
diff --git a/jwt-auth-api.Api/src/jwt-auth-api.Infrastructure/Repositories/AuthRepository.cs b/jwt-auth-api.Api/src/jwt-auth-api.Infrastructure/Repositories/AuthRepository.cs
index 17fde52..3b597c5 100644
--- a/jwt-auth-api.Api/src/jwt-auth-api.Infrastructure/Repositories/AuthRepository.cs
+++ b/jwt-auth-api.Api/src/jwt-auth-api.Infrastructure/Repositories/AuthRepository.cs
@@ -1,9 +1,5 @@
-using jwt_auth_api.Core.Users;
+using jwt_auth_api.Domain.Users;
 using jwt_auth_api.Infrastructure.Context;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure.Internal;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace jwt_auth_api.Infrastructure.Repositories
 {
diff --git a/jwt-auth-api.Api/src/jwt-auth-api.Infrastructure/Repositories/GeneriRepository.cs b/jwt-auth-api.Api/src/jwt-auth-api.Infrastructure/Repositories/GeneriRepository.cs
index dbda8d1..0387752 100644
--- a/jwt-auth-api.Api/src/jwt-auth-api.Infrastructure/Repositories/GeneriRepository.cs
+++ b/jwt-auth-api.Api/src/jwt-auth-api.Infrastructure/Repositories/GeneriRepository.cs
@@ -1,4 +1,4 @@
-using jwt_auth_api.Core;
+using jwt_auth_api.Domain;
 using jwt_auth_api.Infrastructure.Context;
 using jwt_auth_api.Infrastructure.Repositories.Interfaces;
 using Microsoft.EntityFrameworkCore;
diff --git a/jwt-auth-api.Api/src/jwt-auth-api.Infrastructure/Repositories/RepositoryInDbPostgres.cs b/jwt-auth-api.Api/src/jwt-auth-api.Infrastructure/Repositories/RepositoryInDbPostgres.cs
index a7ce2ad..aa80a20 100644
--- a/jwt-auth-api.Api/src/jwt-auth-api.Infrastructure/Repositories/RepositoryInDbPostgres.cs
+++ b/jwt-auth-api.Api/src/jwt-auth-api.Infrastructure/Repositories/RepositoryInDbPostgres.cs
@@ -1,4 +1,4 @@
-using jwt_auth_api.Core.Users;
+using jwt_auth_api.Domain.Users;
 using jwt_auth_api.Infrastructure.Context;
 
 namespace jwt_auth_api.Infrastructure.Repositories
diff --git a/jwt-auth-api.Api/src/jwt-auth-api.Infrastructure/Repositories/RepositoryPerson.cs b/jwt-auth-api.Api/src/jwt-auth-api.Infrastructure/Repositories/RepositoryPerson.cs
index 3099e8b..78e9e61 100644
--- a/jwt-auth-api.Api/src/jwt-auth-api.Infrastructure/Repositories/RepositoryPerson.cs
+++ b/jwt-auth-api.Api/src/jwt-auth-api.Infrastructure/Repositories/RepositoryPerson.cs
@@ -1,8 +1,4 @@
 using jwt_auth_api.Infrastructure.Context;
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace jwt_auth_api.Infrastructure.Repositories
 {
     public class RepositoryPerson : RepositoryInDbPostgres
diff --git a/jwt-auth-api.Api/src/jwt-auth-api.Infrastructure/jwt-auth-api.Infrastructure.csproj b/jwt-auth-api.Api/src/jwt-auth-api.Infrastructure/jwt-auth-api.Infrastructure.csproj
index 87f41e6..0ee2120 100644
--- a/jwt-auth-api.Api/src/jwt-auth-api.Infrastructure/jwt-auth-api.Infrastructure.csproj
+++ b/jwt-auth-api.Api/src/jwt-auth-api.Infrastructure/jwt-auth-api.Infrastructure.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\jwt-auth-api.Core\jwt-auth-api.Domain.csproj" />
+    <ProjectReference Include="..\jwt-auth-api.Domain\jwt-auth-api.Domain.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/jwt-auth-api.Api/src/jwt-auth-api.Shared/Class1.cs b/jwt-auth-api.Api/src/jwt-auth-api.Shared/Class1.cs
deleted file mode 100644
index 86b738d..0000000
--- a/jwt-auth-api.Api/src/jwt-auth-api.Shared/Class1.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace jwt_auth_api.Shared
-{
-    public class Class1
-    {
-
-    }
-}
diff --git a/jwt-auth-api.Api/src/jwt-auth-api.Shared/jwt-auth-api.Shared.csproj b/jwt-auth-api.Api/src/jwt-auth-api.Shared/jwt-auth-api.Shared.csproj
deleted file mode 100644
index 6d33dcf..0000000
--- a/jwt-auth-api.Api/src/jwt-auth-api.Shared/jwt-auth-api.Shared.csproj
+++ /dev/null
@@ -1,10 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-    <RootNamespace>jwt_auth_api.Shared</RootNamespace>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-</Project>