diff --git a/application/model/pom.xml b/application/model/pom.xml
index 705682e3f864cf36d89a1a6862990a51cb66cebb..1add6d565270fc20bbe48bfd87a72617b7697a74 100644
--- a/application/model/pom.xml
+++ b/application/model/pom.xml
@@ -23,6 +23,10 @@
             <artifactId>final-annotation-web</artifactId>
             <version>1.4.0</version>
         </dependency>
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/application/module-mail/src/main/java/org/fuseri/modulemail/service/EmailDto.java b/application/model/src/main/java/org/fuseri/model/dto/mail/MailDto.java
similarity index 50%
rename from application/module-mail/src/main/java/org/fuseri/modulemail/service/EmailDto.java
rename to application/model/src/main/java/org/fuseri/model/dto/mail/MailDto.java
index 9b863edd0acd601101a44c02285b352428c4b7dc..413e15b2276990f965f6c8b8df50822531750e65 100644
--- a/application/module-mail/src/main/java/org/fuseri/modulemail/service/EmailDto.java
+++ b/application/model/src/main/java/org/fuseri/model/dto/mail/MailDto.java
@@ -1,15 +1,21 @@
-package org.fuseri.modulemail.service;
+package org.fuseri.model.dto.mail;
 
 import jakarta.validation.constraints.NotBlank;
+import lombok.Getter;
+import lombok.Setter;
 
-public class EmailDto {
+@Getter
+@Setter
+public class MailDto {
 
     @NotBlank
+    public
     String receiver;
     @NotBlank
+    public
     String content;
 
-    public EmailDto(String receiver, String content) {
+    public MailDto(String receiver, String content) {
         this.receiver = receiver;
         this.content = content;
     }
diff --git a/application/module-mail/pom.xml b/application/module-mail/pom.xml
index 9d99c12f4e945cdbb4d51a06a610ed72be15882a..451076a8ca1b206274c2fd3c92dca0342b48f086 100644
--- a/application/module-mail/pom.xml
+++ b/application/module-mail/pom.xml
@@ -41,8 +41,14 @@
             <artifactId>spring-boot-starter-mail</artifactId>
             <version>3.0.4</version>
         </dependency>
+        <dependency>
+            <groupId>org.fuseri</groupId>
+            <artifactId>models</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
 
-<!--        <dependency>-->
+        <!--        <dependency>-->
 <!--            <groupId>javax.mail</groupId>-->
 <!--            <artifactId>mail</artifactId>-->
 <!--            <version>1.4.7</version>-->
diff --git a/application/module-mail/src/main/java/org/fuseri/modulemail/service/MailControler.java b/application/module-mail/src/main/java/org/fuseri/modulemail/service/MailController.java
similarity index 85%
rename from application/module-mail/src/main/java/org/fuseri/modulemail/service/MailControler.java
rename to application/module-mail/src/main/java/org/fuseri/modulemail/service/MailController.java
index 935aeb9272d9c01a4ee3a1b4191c052abce8e5cf..58f76ef0df363a1c3f94178239c690454f001f5b 100644
--- a/application/module-mail/src/main/java/org/fuseri/modulemail/service/MailControler.java
+++ b/application/module-mail/src/main/java/org/fuseri/modulemail/service/MailController.java
@@ -3,6 +3,7 @@ package org.fuseri.modulemail.service;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.PositiveOrZero;
+import org.fuseri.model.dto.mail.MailDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -14,12 +15,12 @@ import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping("/mail")
-public class MailControler {
+public class MailController {
 
     private final MailService service;
 
     @Autowired
-    public MailControler(MailService service) {
+    public MailController(MailService service) {
         this.service = service;
     }
 
@@ -35,7 +36,7 @@ public class MailControler {
 }
 
     @PostMapping()
-    public String sendMail(@Valid @RequestBody EmailDto emailDto) {
+    public String sendMail(@Valid @RequestBody MailDto emailDto) {
         return service.send(emailDto);
     }
 }
diff --git a/application/module-mail/src/main/java/org/fuseri/modulemail/service/MailService.java b/application/module-mail/src/main/java/org/fuseri/modulemail/service/MailService.java
index 8eba0dac23e48925aae0e0b22de541f5b1dc674b..a2ee55394890d5c7d5d271005271f0ab76366299 100644
--- a/application/module-mail/src/main/java/org/fuseri/modulemail/service/MailService.java
+++ b/application/module-mail/src/main/java/org/fuseri/modulemail/service/MailService.java
@@ -1,5 +1,6 @@
 package org.fuseri.modulemail.service;
 
+import org.fuseri.model.dto.mail.MailDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.mail.SimpleMailMessage;
@@ -10,7 +11,7 @@ public class MailService {
     @Autowired
     private JavaMailSender emailSender;
 
-    public String send(EmailDto dto) {
+    public String send(MailDto dto) {
         var message = new SimpleMailMessage();
         message.setFrom("sprachul@gmail.com");
         message.setTo(dto.receiver);
@@ -23,11 +24,11 @@ public class MailService {
         return "Success, you have sent: " + dto.content;
     }
 
-    public EmailDto getMail(long id) {
-        return new EmailDto("empty","empty"); // return from database once there is one
+    public MailDto getMail(long id) {
+        return new MailDto("empty","empty"); // return from database once there is one
     }
 
-    public String DeleteMail (long id) {
+    public String deleteMail(long id) {
         return "No mail with that Id";
     }