Index: finkwave/pom.xml
===================================================================
--- finkwave/pom.xml	(revision f6ce33af2aa128898769b886882d71c8df729673)
+++ finkwave/pom.xml	(revision 838441d03f6ee84ef8c1303656d5d97cf5b732ae)
@@ -73,4 +73,5 @@
 							<groupId>org.projectlombok</groupId>
 							<artifactId>lombok</artifactId>
+							<version>${lombok.version}</version>
 						</path>
 					</annotationProcessorPaths>
Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/UserController.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/UserController.java	(revision 838441d03f6ee84ef8c1303656d5d97cf5b732ae)
+++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/UserController.java	(revision 838441d03f6ee84ef8c1303656d5d97cf5b732ae)
@@ -0,0 +1,24 @@
+package com.ukim.finki.develop.finkwave.controller;
+
+import com.ukim.finki.develop.finkwave.model.User;
+import com.ukim.finki.develop.finkwave.service.UserService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@CrossOrigin("*")
+@RequiredArgsConstructor
+public class UserController {
+    private final UserService usersService;
+
+    @GetMapping
+    public HttpEntity<List<User>> getAllUsers(){
+        return ResponseEntity.ok(usersService.getAll());
+    }
+}
Index: nkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/UsersController.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/UsersController.java	(revision f6ce33af2aa128898769b886882d71c8df729673)
+++ 	(revision )
@@ -1,26 +1,0 @@
-package com.ukim.finki.develop.finkwave.controller;
-
-import com.ukim.finki.develop.finkwave.model.Users;
-import com.ukim.finki.develop.finkwave.service.UsersService;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-@RestController
-@CrossOrigin("*")
-public class UsersController {
-    private final UsersService usersService;
-
-    public UsersController(UsersService usersService) {
-        this.usersService = usersService;
-    }
-
-    @GetMapping
-    public HttpEntity<List<Users>> getAllUsers(){
-        return ResponseEntity.ok(usersService.getAll());
-    }
-}
Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/Admin.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/Admin.java	(revision f6ce33af2aa128898769b886882d71c8df729673)
+++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/Admin.java	(revision 838441d03f6ee84ef8c1303656d5d97cf5b732ae)
@@ -15,5 +15,5 @@
     @OneToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "user_id")
-    private Users users;
+    private User users;
 
 }
Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/NonAdminUser.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/NonAdminUser.java	(revision f6ce33af2aa128898769b886882d71c8df729673)
+++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/NonAdminUser.java	(revision 838441d03f6ee84ef8c1303656d5d97cf5b732ae)
@@ -17,5 +17,5 @@
     @OneToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "user_id")
-    private Users users;
+    private User users;
 
 }
Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/User.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/User.java	(revision 838441d03f6ee84ef8c1303656d5d97cf5b732ae)
+++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/User.java	(revision 838441d03f6ee84ef8c1303656d5d97cf5b732ae)
@@ -0,0 +1,43 @@
+package com.ukim.finki.develop.finkwave.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import jakarta.persistence.*;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Setter
+@Getter
+@Entity
+@NoArgsConstructor
+@Table(name = "users")
+public class User {
+    @Id
+    @Column(name = "user_id", nullable = false)
+    private Long id;
+
+    @Column(name = "full_name", nullable = false, length = Integer.MAX_VALUE)
+    private String fullName;
+
+    @Column(name = "email", nullable = false, length = Integer.MAX_VALUE)
+    private String email;
+
+    @Column(name = "password", nullable = false, length = Integer.MAX_VALUE)
+    @JsonIgnore
+    private String password;
+
+    @Column(name = "username", nullable = false, length = Integer.MAX_VALUE)
+    private String username;
+
+    @Column(name = "profile_photo", length = Integer.MAX_VALUE)
+    private String profilePhoto;
+
+    @OneToOne(mappedBy = "users")
+    @JsonIgnore
+    private Admin admin;
+
+    @OneToOne(mappedBy = "users")
+    @JsonIgnore
+    private NonAdminUser nonAdminUser;
+
+}
Index: nkwave/src/main/java/com/ukim/finki/develop/finkwave/model/Users.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/Users.java	(revision f6ce33af2aa128898769b886882d71c8df729673)
+++ 	(revision )
@@ -1,102 +1,0 @@
-package com.ukim.finki.develop.finkwave.model;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import jakarta.persistence.*;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-@Entity
-@NoArgsConstructor
-public class Users {
-    @Id
-    @Column(name = "user_id", nullable = false)
-    private Long id;
-
-    @Column(name = "full_name", nullable = false, length = Integer.MAX_VALUE)
-    private String fullName;
-
-    @Column(name = "email", nullable = false, length = Integer.MAX_VALUE)
-    private String email;
-
-    @Column(name = "password", nullable = false, length = Integer.MAX_VALUE)
-    @JsonIgnore
-    private String password;
-
-    @Column(name = "username", nullable = false, length = Integer.MAX_VALUE)
-    private String username;
-
-    @Column(name = "profile_photo", length = Integer.MAX_VALUE)
-    private String profilePhoto;
-
-    @OneToOne(mappedBy = "users")
-    @JsonIgnore
-    private Admin admin;
-
-    @OneToOne(mappedBy = "users")
-    @JsonIgnore
-    private NonAdminUser nonAdminUser;
-
-    public NonAdminUser getNonAdminUser() {
-        return nonAdminUser;
-    }
-
-    public void setNonAdminUser(NonAdminUser nonAdminUser) {
-        this.nonAdminUser = nonAdminUser;
-    }
-
-    public Admin getAdmin() {
-        return admin;
-    }
-
-    public void setAdmin(Admin admin) {
-        this.admin = admin;
-    }
-
-    public String getProfilePhoto() {
-        return profilePhoto;
-    }
-
-    public void setProfilePhoto(String profilePhoto) {
-        this.profilePhoto = profilePhoto;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public String getFullName() {
-        return fullName;
-    }
-
-    public void setFullName(String fullName) {
-        this.fullName = fullName;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-}
Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/UserRepository.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/UserRepository.java	(revision 838441d03f6ee84ef8c1303656d5d97cf5b732ae)
+++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/UserRepository.java	(revision 838441d03f6ee84ef8c1303656d5d97cf5b732ae)
@@ -0,0 +1,9 @@
+package com.ukim.finki.develop.finkwave.repository;
+
+import com.ukim.finki.develop.finkwave.model.User;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface UserRepository extends JpaRepository<User, Long> {
+}
Index: nkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/UsersRepository.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/UsersRepository.java	(revision f6ce33af2aa128898769b886882d71c8df729673)
+++ 	(revision )
@@ -1,9 +1,0 @@
-package com.ukim.finki.develop.finkwave.repository;
-
-import com.ukim.finki.develop.finkwave.model.Users;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface UsersRepository extends JpaRepository<Users, Long> {
-}
Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/UserService.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/UserService.java	(revision 838441d03f6ee84ef8c1303656d5d97cf5b732ae)
+++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/UserService.java	(revision 838441d03f6ee84ef8c1303656d5d97cf5b732ae)
@@ -0,0 +1,20 @@
+package com.ukim.finki.develop.finkwave.service;
+
+import com.ukim.finki.develop.finkwave.model.User;
+import com.ukim.finki.develop.finkwave.repository.UserRepository;
+import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@AllArgsConstructor
+public class UserService {
+    private final UserRepository usersRepository;
+
+    public List<User> getAll(){
+        return usersRepository.findAll();
+    }
+
+}
Index: nkwave/src/main/java/com/ukim/finki/develop/finkwave/service/UsersService.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/UsersService.java	(revision f6ce33af2aa128898769b886882d71c8df729673)
+++ 	(revision )
@@ -1,21 +1,0 @@
-package com.ukim.finki.develop.finkwave.service;
-
-import com.ukim.finki.develop.finkwave.model.Users;
-import com.ukim.finki.develop.finkwave.repository.UsersRepository;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class UsersService {
-    private final UsersRepository usersRepository;
-
-    public UsersService(UsersRepository usersRepository) {
-        this.usersRepository = usersRepository;
-    }
-
-    public List<Users> getAll(){
-        return usersRepository.findAll();
-    }
-
-}