Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/AuthController.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/AuthController.java	(revision d47e22514aceaaacf9474187f2d3ee201e310ecd)
+++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/AuthController.java	(revision c6e1892c2e4666227c2711399296c880cdbd00fe)
@@ -13,7 +13,7 @@
 import org.springframework.web.server.ResponseStatusException;
 
-import com.ukim.finki.develop.finkwave.dto.AuthRequestDto;
-import com.ukim.finki.develop.finkwave.dto.LoginRequestDto;
-import com.ukim.finki.develop.finkwave.dto.UserResponseDto;
+import com.ukim.finki.develop.finkwave.model.dto.AuthRequestDto;
+import com.ukim.finki.develop.finkwave.model.dto.LoginRequestDto;
+import com.ukim.finki.develop.finkwave.model.dto.UserResponseDto;
 import com.ukim.finki.develop.finkwave.service.AuthService;
 
Index: nkwave/src/main/java/com/ukim/finki/develop/finkwave/dto/AuthRequestDto.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/dto/AuthRequestDto.java	(revision d47e22514aceaaacf9474187f2d3ee201e310ecd)
+++ 	(revision )
@@ -1,13 +1,0 @@
-package com.ukim.finki.develop.finkwave.dto;
-
-import jakarta.annotation.Nullable;
-import org.springframework.web.multipart.MultipartFile;
-
-public record AuthRequestDto(
-        String username,
-        String fullname,
-        String email,
-        String password,
-        @Nullable MultipartFile profilePhoto
-){
-}
Index: nkwave/src/main/java/com/ukim/finki/develop/finkwave/dto/LoginRequestDto.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/dto/LoginRequestDto.java	(revision d47e22514aceaaacf9474187f2d3ee201e310ecd)
+++ 	(revision )
@@ -1,9 +1,0 @@
-package com.ukim.finki.develop.finkwave.dto;
-
-import jakarta.annotation.Nullable;
-
-public record LoginRequestDto(
-        String username,
-        String password
-){
-}
Index: nkwave/src/main/java/com/ukim/finki/develop/finkwave/dto/UserResponseDto.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/dto/UserResponseDto.java	(revision d47e22514aceaaacf9474187f2d3ee201e310ecd)
+++ 	(revision )
@@ -1,13 +1,0 @@
-package com.ukim.finki.develop.finkwave.dto;
-
-import com.ukim.finki.develop.finkwave.model.Role;
-import jakarta.annotation.Nullable;
-import lombok.Builder;
-
-@Builder
-public record UserResponseDto(
-        String fullname,
-        String username,
-        @Nullable String profilePhoto,
-        Role role){
-}
Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/AuthRequestDto.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/AuthRequestDto.java	(revision c6e1892c2e4666227c2711399296c880cdbd00fe)
+++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/AuthRequestDto.java	(revision c6e1892c2e4666227c2711399296c880cdbd00fe)
@@ -0,0 +1,12 @@
+package com.ukim.finki.develop.finkwave.model.dto;
+
+import jakarta.annotation.Nullable;
+import org.springframework.web.multipart.MultipartFile;
+
+public record AuthRequestDto(
+        String username,
+        String fullname,
+        String email,
+        String password,
+        @Nullable MultipartFile profilePhoto){
+}
Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/LoginRequestDto.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/LoginRequestDto.java	(revision c6e1892c2e4666227c2711399296c880cdbd00fe)
+++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/LoginRequestDto.java	(revision c6e1892c2e4666227c2711399296c880cdbd00fe)
@@ -0,0 +1,6 @@
+package com.ukim.finki.develop.finkwave.model.dto;
+
+public record LoginRequestDto(
+        String username,
+        String password){
+}
Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/UserResponseDto.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/UserResponseDto.java	(revision c6e1892c2e4666227c2711399296c880cdbd00fe)
+++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/UserResponseDto.java	(revision c6e1892c2e4666227c2711399296c880cdbd00fe)
@@ -0,0 +1,13 @@
+package com.ukim.finki.develop.finkwave.model.dto;
+
+import com.ukim.finki.develop.finkwave.model.Role;
+import jakarta.annotation.Nullable;
+import lombok.Builder;
+
+@Builder
+public record UserResponseDto(
+        String fullname,
+        String username,
+        @Nullable String profilePhoto,
+        Role role){
+}
Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/AuthService.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/AuthService.java	(revision d47e22514aceaaacf9474187f2d3ee201e310ecd)
+++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/AuthService.java	(revision c6e1892c2e4666227c2711399296c880cdbd00fe)
@@ -5,7 +5,7 @@
 
 import com.ukim.finki.develop.finkwave.config.AuthProperties;
-import com.ukim.finki.develop.finkwave.dto.AuthRequestDto;
-import com.ukim.finki.develop.finkwave.dto.LoginRequestDto;
-import com.ukim.finki.develop.finkwave.dto.UserResponseDto;
+import com.ukim.finki.develop.finkwave.model.dto.AuthRequestDto;
+import com.ukim.finki.develop.finkwave.model.dto.LoginRequestDto;
+import com.ukim.finki.develop.finkwave.model.dto.UserResponseDto;
 import com.ukim.finki.develop.finkwave.model.NonAdminUser;
 import com.ukim.finki.develop.finkwave.model.RefreshToken;
@@ -100,6 +100,6 @@
     private User createNonAdminUser(AuthRequestDto authRequestDto) throws IOException {
         User.UserBuilder userBuilder = User.builder()
+                .username(authRequestDto.username())
                 .fullName(authRequestDto.fullname())
-                .username(authRequestDto.username())
                 .email(authRequestDto.email())
                 .password(passwordEncoder.encode(authRequestDto.password()))
Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/CustomUserDetailsService.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/CustomUserDetailsService.java	(revision d47e22514aceaaacf9474187f2d3ee201e310ecd)
+++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/CustomUserDetailsService.java	(revision c6e1892c2e4666227c2711399296c880cdbd00fe)
@@ -22,5 +22,5 @@
         User user = userRepository.findByUsername(username)
                 .orElseThrow(() -> new RuntimeException("user not found"));
-         List<GrantedAuthority> authorities = List.of(new SimpleGrantedAuthority("ROLE_" + user.getRole().name()));
+        List<GrantedAuthority> authorities = List.of(new SimpleGrantedAuthority("ROLE_" + user.getRole().name()));
         return new org.springframework.security.core.userdetails.User(
                 user.getUsername(),