diff --git a/src/main/java/com/mirna/hospitalmanagementapi/domain/dtos/DoctorDTO.java b/src/main/java/com/mirna/hospitalmanagementapi/domain/dtos/doctor/DoctorDTO.java
similarity index 88%
rename from src/main/java/com/mirna/hospitalmanagementapi/domain/dtos/DoctorDTO.java
rename to src/main/java/com/mirna/hospitalmanagementapi/domain/dtos/doctor/DoctorDTO.java
index 86ea3e0..61c4aff 100644
--- a/src/main/java/com/mirna/hospitalmanagementapi/domain/dtos/DoctorDTO.java
+++ b/src/main/java/com/mirna/hospitalmanagementapi/domain/dtos/doctor/DoctorDTO.java
@@ -1,5 +1,6 @@
-package com.mirna.hospitalmanagementapi.domain.dtos;
+package com.mirna.hospitalmanagementapi.domain.dtos.doctor;
 
+import com.mirna.hospitalmanagementapi.domain.dtos.AddressDTO;
 import com.mirna.hospitalmanagementapi.domain.enums.Specialty;
 
 import jakarta.validation.Valid;
diff --git a/src/main/java/com/mirna/hospitalmanagementapi/domain/dtos/DoctorPublicDataDTO.java b/src/main/java/com/mirna/hospitalmanagementapi/domain/dtos/doctor/DoctorPublicDataDTO.java
similarity index 89%
rename from src/main/java/com/mirna/hospitalmanagementapi/domain/dtos/DoctorPublicDataDTO.java
rename to src/main/java/com/mirna/hospitalmanagementapi/domain/dtos/doctor/DoctorPublicDataDTO.java
index 5e1d968..7f1ae77 100644
--- a/src/main/java/com/mirna/hospitalmanagementapi/domain/dtos/DoctorPublicDataDTO.java
+++ b/src/main/java/com/mirna/hospitalmanagementapi/domain/dtos/doctor/DoctorPublicDataDTO.java
@@ -1,4 +1,4 @@
-package com.mirna.hospitalmanagementapi.domain.dtos;
+package com.mirna.hospitalmanagementapi.domain.dtos.doctor;
 
 import com.mirna.hospitalmanagementapi.domain.entities.Doctor;
 import com.mirna.hospitalmanagementapi.domain.enums.Specialty;
diff --git a/src/main/java/com/mirna/hospitalmanagementapi/domain/dtos/DoctorUpdatedDataDTO.java b/src/main/java/com/mirna/hospitalmanagementapi/domain/dtos/doctor/DoctorUpdatedDataDTO.java
similarity index 71%
rename from src/main/java/com/mirna/hospitalmanagementapi/domain/dtos/DoctorUpdatedDataDTO.java
rename to src/main/java/com/mirna/hospitalmanagementapi/domain/dtos/doctor/DoctorUpdatedDataDTO.java
index 1a895b4..03b65eb 100644
--- a/src/main/java/com/mirna/hospitalmanagementapi/domain/dtos/DoctorUpdatedDataDTO.java
+++ b/src/main/java/com/mirna/hospitalmanagementapi/domain/dtos/doctor/DoctorUpdatedDataDTO.java
@@ -1,4 +1,6 @@
-package com.mirna.hospitalmanagementapi.domain.dtos;
+package com.mirna.hospitalmanagementapi.domain.dtos.doctor;
+
+import com.mirna.hospitalmanagementapi.domain.dtos.AddressDTO;
 
 import jakarta.validation.constraints.NotNull;
 
diff --git a/src/main/java/com/mirna/hospitalmanagementapi/domain/dtos/PatientDTO.java b/src/main/java/com/mirna/hospitalmanagementapi/domain/dtos/patient/PatientDTO.java
similarity index 87%
rename from src/main/java/com/mirna/hospitalmanagementapi/domain/dtos/PatientDTO.java
rename to src/main/java/com/mirna/hospitalmanagementapi/domain/dtos/patient/PatientDTO.java
index b894798..9f7a6c0 100644
--- a/src/main/java/com/mirna/hospitalmanagementapi/domain/dtos/PatientDTO.java
+++ b/src/main/java/com/mirna/hospitalmanagementapi/domain/dtos/patient/PatientDTO.java
@@ -1,4 +1,6 @@
-package com.mirna.hospitalmanagementapi.domain.dtos;
+package com.mirna.hospitalmanagementapi.domain.dtos.patient;
+
+import com.mirna.hospitalmanagementapi.domain.dtos.AddressDTO;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.Email;
diff --git a/src/main/java/com/mirna/hospitalmanagementapi/domain/entities/Address.java b/src/main/java/com/mirna/hospitalmanagementapi/domain/entities/Address.java
index f162762..b18aa4f 100644
--- a/src/main/java/com/mirna/hospitalmanagementapi/domain/entities/Address.java
+++ b/src/main/java/com/mirna/hospitalmanagementapi/domain/entities/Address.java
@@ -1,7 +1,7 @@
 package com.mirna.hospitalmanagementapi.domain.entities;
 
 import com.mirna.hospitalmanagementapi.domain.dtos.AddressDTO;
-import com.mirna.hospitalmanagementapi.domain.dtos.DoctorDTO;
+import com.mirna.hospitalmanagementapi.domain.dtos.doctor.DoctorDTO;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
diff --git a/src/main/java/com/mirna/hospitalmanagementapi/domain/entities/Doctor.java b/src/main/java/com/mirna/hospitalmanagementapi/domain/entities/Doctor.java
index 281df81..2e09d85 100644
--- a/src/main/java/com/mirna/hospitalmanagementapi/domain/entities/Doctor.java
+++ b/src/main/java/com/mirna/hospitalmanagementapi/domain/entities/Doctor.java
@@ -1,6 +1,6 @@
 package com.mirna.hospitalmanagementapi.domain.entities;
 
-import com.mirna.hospitalmanagementapi.domain.dtos.DoctorDTO;
+import com.mirna.hospitalmanagementapi.domain.dtos.doctor.DoctorDTO;
 import com.mirna.hospitalmanagementapi.domain.enums.Specialty;
 
 import jakarta.persistence.Column;
diff --git a/src/main/java/com/mirna/hospitalmanagementapi/domain/entities/Patient.java b/src/main/java/com/mirna/hospitalmanagementapi/domain/entities/Patient.java
index 95cd32b..53cc9e2 100644
--- a/src/main/java/com/mirna/hospitalmanagementapi/domain/entities/Patient.java
+++ b/src/main/java/com/mirna/hospitalmanagementapi/domain/entities/Patient.java
@@ -1,6 +1,6 @@
 package com.mirna.hospitalmanagementapi.domain.entities;
 
-import com.mirna.hospitalmanagementapi.domain.dtos.PatientDTO;
+import com.mirna.hospitalmanagementapi.domain.dtos.patient.PatientDTO;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Embedded;
diff --git a/src/main/java/com/mirna/hospitalmanagementapi/domain/services/DoctorService.java b/src/main/java/com/mirna/hospitalmanagementapi/domain/services/DoctorService.java
index d22a046..afa3c4c 100644
--- a/src/main/java/com/mirna/hospitalmanagementapi/domain/services/DoctorService.java
+++ b/src/main/java/com/mirna/hospitalmanagementapi/domain/services/DoctorService.java
@@ -5,9 +5,9 @@ import java.util.List;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
-import com.mirna.hospitalmanagementapi.domain.dtos.DoctorDTO;
-import com.mirna.hospitalmanagementapi.domain.dtos.DoctorPublicDataDTO;
-import com.mirna.hospitalmanagementapi.domain.dtos.DoctorUpdatedDataDTO;
+import com.mirna.hospitalmanagementapi.domain.dtos.doctor.DoctorDTO;
+import com.mirna.hospitalmanagementapi.domain.dtos.doctor.DoctorPublicDataDTO;
+import com.mirna.hospitalmanagementapi.domain.dtos.doctor.DoctorUpdatedDataDTO;
 import com.mirna.hospitalmanagementapi.domain.entities.Doctor;
 
 /**
@@ -26,7 +26,6 @@ public interface DoctorService {
 	* @return The saved doctor if successful,  or null if there is an error.
 	*/
     public Doctor addDoctor(DoctorDTO doctorDTO);
-    
     /**
 	 * Retrieves a paginated sublist of doctors.
 	 * 
diff --git a/src/test/java/com/mirna/hospitalmanagementapi/unit/application/controllers/DoctorControllerTest.java b/src/test/java/com/mirna/hospitalmanagementapi/unit/application/controllers/DoctorControllerTest.java
index 6bc1b9d..8accc05 100644
--- a/src/test/java/com/mirna/hospitalmanagementapi/unit/application/controllers/DoctorControllerTest.java
+++ b/src/test/java/com/mirna/hospitalmanagementapi/unit/application/controllers/DoctorControllerTest.java
@@ -17,8 +17,8 @@ import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.mirna.hospitalmanagementapi.domain.dtos.AddressDTO;
-import com.mirna.hospitalmanagementapi.domain.dtos.DoctorDTO;
-import com.mirna.hospitalmanagementapi.domain.dtos.DoctorUpdatedDataDTO;
+import com.mirna.hospitalmanagementapi.domain.dtos.doctor.DoctorDTO;
+import com.mirna.hospitalmanagementapi.domain.dtos.doctor.DoctorUpdatedDataDTO;
 import com.mirna.hospitalmanagementapi.domain.entities.Doctor;
 import com.mirna.hospitalmanagementapi.domain.enums.Specialty;
 import com.mirna.hospitalmanagementapi.domain.repositories.DoctorRepository;
diff --git a/src/test/java/com/mirna/hospitalmanagementapi/unit/application/service/DoctorServiceTest.java b/src/test/java/com/mirna/hospitalmanagementapi/unit/application/service/DoctorServiceTest.java
index d5303f7..2e28a31 100644
--- a/src/test/java/com/mirna/hospitalmanagementapi/unit/application/service/DoctorServiceTest.java
+++ b/src/test/java/com/mirna/hospitalmanagementapi/unit/application/service/DoctorServiceTest.java
@@ -22,9 +22,9 @@ import org.springframework.test.context.ActiveProfiles;
 import com.mirna.hospitalmanagementapi.HospitalManagementApiApplication;
 import com.mirna.hospitalmanagementapi.application.services.DoctorServiceImpl;
 import com.mirna.hospitalmanagementapi.domain.dtos.AddressDTO;
-import com.mirna.hospitalmanagementapi.domain.dtos.DoctorDTO;
-import com.mirna.hospitalmanagementapi.domain.dtos.DoctorPublicDataDTO;
-import com.mirna.hospitalmanagementapi.domain.dtos.DoctorUpdatedDataDTO;
+import com.mirna.hospitalmanagementapi.domain.dtos.doctor.DoctorDTO;
+import com.mirna.hospitalmanagementapi.domain.dtos.doctor.DoctorPublicDataDTO;
+import com.mirna.hospitalmanagementapi.domain.dtos.doctor.DoctorUpdatedDataDTO;
 import com.mirna.hospitalmanagementapi.domain.entities.Doctor;
 import com.mirna.hospitalmanagementapi.domain.enums.Specialty;
 import com.mirna.hospitalmanagementapi.domain.repositories.DoctorRepository;
diff --git a/src/test/java/com/mirna/hospitalmanagementapi/unit/application/usecase/doctor/FindDoctorByIdUseCaseTest.java b/src/test/java/com/mirna/hospitalmanagementapi/unit/application/usecase/doctor/FindDoctorByIdUseCaseTest.java
index 08ed1ff..31e1440 100644
--- a/src/test/java/com/mirna/hospitalmanagementapi/unit/application/usecase/doctor/FindDoctorByIdUseCaseTest.java
+++ b/src/test/java/com/mirna/hospitalmanagementapi/unit/application/usecase/doctor/FindDoctorByIdUseCaseTest.java
@@ -18,7 +18,7 @@ import org.springframework.test.context.ActiveProfiles;
 import com.mirna.hospitalmanagementapi.HospitalManagementApiApplication;
 import com.mirna.hospitalmanagementapi.application.usecase.doctor.FindDoctorByIdUseCase;
 import com.mirna.hospitalmanagementapi.domain.dtos.AddressDTO;
-import com.mirna.hospitalmanagementapi.domain.dtos.DoctorDTO;
+import com.mirna.hospitalmanagementapi.domain.dtos.doctor.DoctorDTO;
 import com.mirna.hospitalmanagementapi.domain.entities.Doctor;
 import com.mirna.hospitalmanagementapi.domain.enums.Specialty;
 import com.mirna.hospitalmanagementapi.domain.repositories.DoctorRepository;
diff --git a/src/test/java/com/mirna/hospitalmanagementapi/unit/application/usecase/doctor/FindDoctorsUseCaseTest.java b/src/test/java/com/mirna/hospitalmanagementapi/unit/application/usecase/doctor/FindDoctorsUseCaseTest.java
index 51d7538..4e1a316 100644
--- a/src/test/java/com/mirna/hospitalmanagementapi/unit/application/usecase/doctor/FindDoctorsUseCaseTest.java
+++ b/src/test/java/com/mirna/hospitalmanagementapi/unit/application/usecase/doctor/FindDoctorsUseCaseTest.java
@@ -22,7 +22,7 @@ import org.springframework.test.context.ActiveProfiles;
 import com.mirna.hospitalmanagementapi.HospitalManagementApiApplication;
 import com.mirna.hospitalmanagementapi.application.usecase.doctor.FindDoctorsUseCase;
 import com.mirna.hospitalmanagementapi.domain.dtos.AddressDTO;
-import com.mirna.hospitalmanagementapi.domain.dtos.DoctorDTO;
+import com.mirna.hospitalmanagementapi.domain.dtos.doctor.DoctorDTO;
 import com.mirna.hospitalmanagementapi.domain.entities.Doctor;
 import com.mirna.hospitalmanagementapi.domain.enums.Specialty;
 import com.mirna.hospitalmanagementapi.domain.repositories.DoctorRepository;
diff --git a/src/test/java/com/mirna/hospitalmanagementapi/unit/application/usecase/doctor/SaveDoctorUseCaseTest.java b/src/test/java/com/mirna/hospitalmanagementapi/unit/application/usecase/doctor/SaveDoctorUseCaseTest.java
index e23413c..557d72a 100644
--- a/src/test/java/com/mirna/hospitalmanagementapi/unit/application/usecase/doctor/SaveDoctorUseCaseTest.java
+++ b/src/test/java/com/mirna/hospitalmanagementapi/unit/application/usecase/doctor/SaveDoctorUseCaseTest.java
@@ -14,7 +14,7 @@ import org.springframework.test.context.ActiveProfiles;
 import com.mirna.hospitalmanagementapi.HospitalManagementApiApplication;
 import com.mirna.hospitalmanagementapi.application.usecase.doctor.SaveDoctorUseCase;
 import com.mirna.hospitalmanagementapi.domain.dtos.AddressDTO;
-import com.mirna.hospitalmanagementapi.domain.dtos.DoctorDTO;
+import com.mirna.hospitalmanagementapi.domain.dtos.doctor.DoctorDTO;
 import com.mirna.hospitalmanagementapi.domain.entities.Doctor;
 import com.mirna.hospitalmanagementapi.domain.enums.Specialty;
 import com.mirna.hospitalmanagementapi.domain.repositories.DoctorRepository;