diff --git a/pom.xml b/pom.xml
index b0a6389..4365294 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,8 +27,27 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
-	</dependencies>
 
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<version>1.18.24</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+		</dependency>
+	</dependencies>
 	<build>
 		<plugins>
 			<plugin>
diff --git a/src/main/java/com/accenture/codingtest/springbootcodingtest/controller/ProjectController.java b/src/main/java/com/accenture/codingtest/springbootcodingtest/controller/ProjectController.java
new file mode 100644
index 0000000..ca01d68
--- /dev/null
+++ b/src/main/java/com/accenture/codingtest/springbootcodingtest/controller/ProjectController.java
@@ -0,0 +1,53 @@
+package com.accenture.codingtest.springbootcodingtest.controller;
+
+import java.util.List;
+
+import com.accenture.codingtest.springbootcodingtest.entity.Project;
+import com.accenture.codingtest.springbootcodingtest.model.Role;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import com.accenture.codingtest.springbootcodingtest.entity.Project;
+import com.accenture.codingtest.springbootcodingtest.service.ProjectService;
+
+@RestController
+@RequestMapping("/api")
+public class ProjectController {
+	@Autowired
+    private ProjectService projectService;
+
+    @GetMapping("/v1/projects")
+    public ResponseEntity<List<Project>> getAllProjects() {
+        return projectService.getAllProjects();
+    }
+
+    @PostMapping("/v1/projects/{role}")
+    public  ResponseEntity<Project> saveProject(@RequestBody Project project,
+                                                @PathVariable("role") String role) {
+        ResponseEntity<Project> response;
+        if(Role.ADMIN.toString().equalsIgnoreCase(role)) {
+            response = projectService.saveProject(project);
+        } else {
+            response = new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
+        }
+        return  response;
+    }
+
+    @GetMapping("/v1/projects/{project_id}")
+    public ResponseEntity<Project> getProjectById(@PathVariable("project_id") String project_id) {
+        return projectService.getProjectById(project_id);
+    }
+
+    @PutMapping("/v1/projects")
+    public  ResponseEntity<Project> updateProject(@RequestBody Project project) {
+        return  projectService.updateProject(project);
+    }
+
+    @DeleteMapping("/v1/projects/{project_id}")
+    public ResponseEntity<Void> deleteProjectById(@PathVariable("project_id") String project_id) {
+        return projectService.deleteProject(project_id);
+    }
+
+}
diff --git a/src/main/java/com/accenture/codingtest/springbootcodingtest/controller/TaskController.java b/src/main/java/com/accenture/codingtest/springbootcodingtest/controller/TaskController.java
new file mode 100644
index 0000000..d897f2b
--- /dev/null
+++ b/src/main/java/com/accenture/codingtest/springbootcodingtest/controller/TaskController.java
@@ -0,0 +1,70 @@
+package com.accenture.codingtest.springbootcodingtest.controller;
+
+import java.util.List;
+
+import com.accenture.codingtest.springbootcodingtest.model.Role;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import com.accenture.codingtest.springbootcodingtest.entity.Task;
+import com.accenture.codingtest.springbootcodingtest.service.TaskService;
+
+@RestController
+@RequestMapping("/api")
+public class TaskController {
+	@Autowired
+    private TaskService taskService;
+
+    @GetMapping("/v1/tasks")
+    public ResponseEntity<List<Task>> getAllTasks() {
+        return taskService.getAllTasks();
+    }
+
+    @PostMapping("/v1/tasks/{role}")
+    public  ResponseEntity<Task> saveTask(@RequestBody Task task, @PathVariable("role") String role) {
+        ResponseEntity<Task> response = null;
+        if(Role.PRODUCT_OWNER.toString().equalsIgnoreCase(role)) {
+            response = taskService.saveTask(task);
+        } else {
+            response = new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
+        }
+        return response;
+    }
+
+    @GetMapping("/v1/tasks/{task_id}")
+    public ResponseEntity<Task> getTaskById(@PathVariable("task_id") String task_id) {
+        return taskService.getTaskById(task_id);
+    }
+
+    @PatchMapping("/v1/tasks/{role}")
+    public  ResponseEntity<Task> updateTask(@RequestBody Task task,
+                                            @PathVariable("userId") String userId,
+                                            @PathVariable("role") String role) {
+        ResponseEntity<Task> response = null;
+        if(Role.PRODUCT_OWNER.toString().equalsIgnoreCase(role)) {
+            response = taskService.updateTask(task, userId);
+        } else {
+            response = new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
+        }
+        return response;
+    }
+
+    @PutMapping("/v1/tasks/{role}")
+    public  ResponseEntity<Task> updateTask(@RequestBody Task task, @PathVariable("role") String role) {
+        ResponseEntity<Task> response = null;
+        if(Role.PRODUCT_OWNER.toString().equalsIgnoreCase(role)) {
+            response = taskService.updateTask(task);
+        } else {
+            response = new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
+        }
+        return  response;
+    }
+
+
+    @DeleteMapping("/v1/tasks/{task_id}")
+    public ResponseEntity<Void> deleteTaskById(@PathVariable("task_id") String task_id) {
+        return taskService.deleteTask(task_id);
+    }
+}
diff --git a/src/main/java/com/accenture/codingtest/springbootcodingtest/controller/UserController.java b/src/main/java/com/accenture/codingtest/springbootcodingtest/controller/UserController.java
new file mode 100644
index 0000000..65099d1
--- /dev/null
+++ b/src/main/java/com/accenture/codingtest/springbootcodingtest/controller/UserController.java
@@ -0,0 +1,77 @@
+package com.accenture.codingtest.springbootcodingtest.controller;
+
+import com.accenture.codingtest.springbootcodingtest.entity.User;
+import com.accenture.codingtest.springbootcodingtest.model.Role;
+import com.accenture.codingtest.springbootcodingtest.service.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api")
+public class UserController {
+
+    @Autowired
+    private UserService userService;
+
+    @GetMapping("/v1/users/{role}")
+    public ResponseEntity<List<User>> getAllUsers(@PathVariable("role") String role) {
+        ResponseEntity<List<User>> response = null;
+        if(Role.ADMIN.toString().equalsIgnoreCase(role)) {
+            response = userService.getAllUsers();
+        } else {
+            response = new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
+        }
+        return response;
+    }
+
+    @GetMapping("/v1/users/{user_id}/{role}")
+    public ResponseEntity<User> getUserById(@PathVariable("user_id") String user_id,
+                                            @PathVariable("role") String role) {
+        ResponseEntity<User> response = null;
+        if(Role.ADMIN.toString().equalsIgnoreCase(role)) {
+            response = userService.getUserById(user_id);
+        } else {
+            response = new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
+        }
+        return response;
+    }
+
+    @PostMapping("/v1/users/{role}")
+    public  ResponseEntity<User> saveUser(@RequestBody User user, @PathVariable("role") String role) {
+
+        ResponseEntity<User> response = null;
+        if(Role.ADMIN.toString().equalsIgnoreCase(role)) {
+            response = userService.saveUser(user);
+        } else {
+            response = new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
+        }
+        return  response;
+    }
+
+    @PutMapping("/v1/users")
+    public  ResponseEntity<User> updateUser(@RequestBody User user, @PathVariable("role") String role) {
+        ResponseEntity<User> response = null;
+        if(Role.ADMIN.toString().equalsIgnoreCase(role)) {
+            response = userService.updateUser(user);
+        } else {
+            response = new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
+        }
+        return  response;
+    }
+
+    @DeleteMapping("/v1/users/{user_id}")
+    public ResponseEntity<Void> deleteUserById(@PathVariable("user_id") String user_id,
+                                               @PathVariable("role") String role) {
+        ResponseEntity<Void> response;
+        if(Role.ADMIN.toString().equalsIgnoreCase(role)) {
+            response = userService.deleteUser(user_id);
+        } else {
+            response = new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
+        }
+        return response;
+    }
+}
diff --git a/src/main/java/com/accenture/codingtest/springbootcodingtest/controller/package-info.java b/src/main/java/com/accenture/codingtest/springbootcodingtest/controller/package-info.java
deleted file mode 100644
index e69de29..0000000
diff --git a/src/main/java/com/accenture/codingtest/springbootcodingtest/entity/Project.java b/src/main/java/com/accenture/codingtest/springbootcodingtest/entity/Project.java
new file mode 100644
index 0000000..07dab68
--- /dev/null
+++ b/src/main/java/com/accenture/codingtest/springbootcodingtest/entity/Project.java
@@ -0,0 +1,17 @@
+package com.accenture.codingtest.springbootcodingtest.entity;
+
+import lombok.Data;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Data
+@Table(name="Project")
+public class Project {
+
+    @Id
+    private String id;
+    private String  name;
+}
diff --git a/src/main/java/com/accenture/codingtest/springbootcodingtest/entity/Task.java b/src/main/java/com/accenture/codingtest/springbootcodingtest/entity/Task.java
new file mode 100644
index 0000000..951c135
--- /dev/null
+++ b/src/main/java/com/accenture/codingtest/springbootcodingtest/entity/Task.java
@@ -0,0 +1,21 @@
+package com.accenture.codingtest.springbootcodingtest.entity;
+
+
+import lombok.Data;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Data
+@Entity
+@Table(name="Task")
+public class Task {
+    @Id
+    private String id;// | uuid | required | pk
+    private String title;// | string | required
+    private String description;// | string
+    private String status;// | string | required
+    private  String project_id;// | uuid | required
+    private  String user_id;// | uuid | required
+}
diff --git a/src/main/java/com/accenture/codingtest/springbootcodingtest/entity/User.java b/src/main/java/com/accenture/codingtest/springbootcodingtest/entity/User.java
new file mode 100644
index 0000000..8afde6f
--- /dev/null
+++ b/src/main/java/com/accenture/codingtest/springbootcodingtest/entity/User.java
@@ -0,0 +1,27 @@
+package com.accenture.codingtest.springbootcodingtest.entity;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Required;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Data
+@Entity
+@Table(name="User")
+@JsonSerialize
+public class User {
+
+    @Id
+    private String id;
+
+    // @Required
+    private String username;
+
+    //@Required
+    private String password;
+
+}
diff --git a/src/main/java/com/accenture/codingtest/springbootcodingtest/entity/package-info.java b/src/main/java/com/accenture/codingtest/springbootcodingtest/entity/package-info.java
deleted file mode 100644
index f87ee93..0000000
--- a/src/main/java/com/accenture/codingtest/springbootcodingtest/entity/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.accenture.codingtest.springbootcodingtest.entity;
\ No newline at end of file
diff --git a/src/main/java/com/accenture/codingtest/springbootcodingtest/model/Role.java b/src/main/java/com/accenture/codingtest/springbootcodingtest/model/Role.java
new file mode 100644
index 0000000..74379dd
--- /dev/null
+++ b/src/main/java/com/accenture/codingtest/springbootcodingtest/model/Role.java
@@ -0,0 +1,6 @@
+package com.accenture.codingtest.springbootcodingtest.model;
+
+public enum Role {
+    ADMIN,
+    PRODUCT_OWNER
+}
diff --git a/src/main/java/com/accenture/codingtest/springbootcodingtest/model/Status.java b/src/main/java/com/accenture/codingtest/springbootcodingtest/model/Status.java
new file mode 100644
index 0000000..5f6313b
--- /dev/null
+++ b/src/main/java/com/accenture/codingtest/springbootcodingtest/model/Status.java
@@ -0,0 +1,5 @@
+package com.accenture.codingtest.springbootcodingtest.model;
+
+public enum Status {
+    NOT_STARTED, IN_PROGRESS, READY_FOR_TEST, COMPLETED
+}
diff --git a/src/main/java/com/accenture/codingtest/springbootcodingtest/repository/ProjectRepository.java b/src/main/java/com/accenture/codingtest/springbootcodingtest/repository/ProjectRepository.java
new file mode 100644
index 0000000..b1a9458
--- /dev/null
+++ b/src/main/java/com/accenture/codingtest/springbootcodingtest/repository/ProjectRepository.java
@@ -0,0 +1,7 @@
+package com.accenture.codingtest.springbootcodingtest.repository;
+
+import com.accenture.codingtest.springbootcodingtest.entity.Project;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface ProjectRepository extends JpaRepository<Project, String> {
+}
diff --git a/src/main/java/com/accenture/codingtest/springbootcodingtest/repository/TaskRepository.java b/src/main/java/com/accenture/codingtest/springbootcodingtest/repository/TaskRepository.java
new file mode 100644
index 0000000..2cba613
--- /dev/null
+++ b/src/main/java/com/accenture/codingtest/springbootcodingtest/repository/TaskRepository.java
@@ -0,0 +1,7 @@
+package com.accenture.codingtest.springbootcodingtest.repository;
+
+import com.accenture.codingtest.springbootcodingtest.entity.Task;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface TaskRepository extends JpaRepository<Task, String> {
+}
diff --git a/src/main/java/com/accenture/codingtest/springbootcodingtest/repository/UserRepository.java b/src/main/java/com/accenture/codingtest/springbootcodingtest/repository/UserRepository.java
new file mode 100644
index 0000000..046e205
--- /dev/null
+++ b/src/main/java/com/accenture/codingtest/springbootcodingtest/repository/UserRepository.java
@@ -0,0 +1,7 @@
+package com.accenture.codingtest.springbootcodingtest.repository;
+
+import com.accenture.codingtest.springbootcodingtest.entity.User;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface UserRepository extends JpaRepository<User, String> {
+}
diff --git a/src/main/java/com/accenture/codingtest/springbootcodingtest/repository/package-info.java b/src/main/java/com/accenture/codingtest/springbootcodingtest/repository/package-info.java
deleted file mode 100644
index 0f16639..0000000
--- a/src/main/java/com/accenture/codingtest/springbootcodingtest/repository/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.accenture.codingtest.springbootcodingtest.repository;
\ No newline at end of file
diff --git a/src/main/java/com/accenture/codingtest/springbootcodingtest/service/ProjectService.java b/src/main/java/com/accenture/codingtest/springbootcodingtest/service/ProjectService.java
new file mode 100644
index 0000000..d0deef1
--- /dev/null
+++ b/src/main/java/com/accenture/codingtest/springbootcodingtest/service/ProjectService.java
@@ -0,0 +1,65 @@
+package com.accenture.codingtest.springbootcodingtest.service;
+
+import java.util.List;
+import java.util.Optional;
+
+import com.accenture.codingtest.springbootcodingtest.entity.Project;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import com.accenture.codingtest.springbootcodingtest.repository.ProjectRepository;
+
+@Service
+public class ProjectService {
+	@Autowired
+    private ProjectRepository projectRepository;
+
+    public ResponseEntity<Project> saveProject(Project project) {
+        ResponseEntity<Project> response = null;
+        if (project != null) {
+           response = new ResponseEntity<>(projectRepository.save(project), HttpStatus.OK);
+        } else {
+            response = new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+        }
+      return response;
+    }
+    public ResponseEntity<List<Project>> getAllProjects() {
+        return new ResponseEntity<>(projectRepository.findAll(), HttpStatus.OK);
+    }
+
+    public ResponseEntity<Project> getProjectById(String id) {
+        return new ResponseEntity<>(projectRepository.findById(id).get(), HttpStatus.OK);
+    }
+
+    public ResponseEntity<Project> updateProject(Project project) {
+        ResponseEntity<Project> updatedProject = null;
+        String id = project.getId();
+        Optional<Project> oldProjectOp = projectRepository.findById(id);
+
+        if(oldProjectOp.isPresent()) {
+            Project oldProject = oldProjectOp.get();
+
+            oldProject.setName(project.getName());
+            // oldProject.setProject_id(project.getProject_id());
+
+            updatedProject = new ResponseEntity<>(projectRepository.save(oldProject), HttpStatus.OK);
+        } else {
+            updatedProject = new ResponseEntity<>(HttpStatus.NOT_FOUND);
+        }
+
+        return updatedProject;
+    }
+
+    public ResponseEntity<Void> deleteProject(String id) {
+        ResponseEntity<Void> response = null;
+        if (projectRepository.existsById(id)) {
+            projectRepository.deleteById(id);
+            response = new ResponseEntity<>(HttpStatus.OK);
+        } else {
+            response = new ResponseEntity<>(HttpStatus.NOT_FOUND);
+        }
+        return response;
+    }
+    
+}
diff --git a/src/main/java/com/accenture/codingtest/springbootcodingtest/service/TaskService.java b/src/main/java/com/accenture/codingtest/springbootcodingtest/service/TaskService.java
new file mode 100644
index 0000000..1d824fd
--- /dev/null
+++ b/src/main/java/com/accenture/codingtest/springbootcodingtest/service/TaskService.java
@@ -0,0 +1,84 @@
+package com.accenture.codingtest.springbootcodingtest.service;
+
+import com.accenture.codingtest.springbootcodingtest.entity.Task;
+import com.accenture.codingtest.springbootcodingtest.model.Role;
+import com.accenture.codingtest.springbootcodingtest.model.Status;
+import com.accenture.codingtest.springbootcodingtest.repository.TaskRepository;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TaskService {
+
+    @Autowired
+    private TaskRepository taskRepository;
+
+    public ResponseEntity<Task> saveTask(Task task) {
+        ResponseEntity<Task> response = null;
+        if (task != null) {
+            //initial status
+            task.setStatus(Status.NOT_STARTED.toString());
+           response = new ResponseEntity<>(taskRepository.save(task), HttpStatus.OK);
+        } else {
+            response = new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+        }
+      return response;
+    }
+    public ResponseEntity<List<Task>> getAllTasks() {
+        return new ResponseEntity<>(taskRepository.findAll(), HttpStatus.OK);
+    }
+
+    public ResponseEntity<Task> getTaskById(String id) {
+        return new ResponseEntity<>(taskRepository.findById(id).get(), HttpStatus.OK);
+    }
+
+    public ResponseEntity<Task> updateTask(Task task) {
+        ResponseEntity<Task> updatedTask = null;
+        String id = task.getId();
+        Optional<Task> oldTaskOp = taskRepository.findById(id);
+
+        if(oldTaskOp.isPresent()) {
+            Task oldTask = oldTaskOp.get();
+
+            oldTask.setDescription(task.getDescription());
+            oldTask.setTitle(task.getTitle());
+            oldTask.setStatus(task.getStatus());
+            oldTask.setUser_id(task.getUser_id());
+           // oldTask.setProject_id(task.getProject_id());
+
+            updatedTask = new ResponseEntity<>(taskRepository.save(oldTask), HttpStatus.OK);
+        } else {
+            updatedTask = new ResponseEntity<>(HttpStatus.NOT_FOUND);
+        }
+
+        return updatedTask;
+    }
+    public ResponseEntity<Task> updateTask(Task task, String userId) {
+        ResponseEntity<Task> response = null;
+        Optional<Task> taskRes = taskRepository.findById(task.getId());
+        if (taskRes.isPresent()) {
+            if (taskRes.get().getUser_id().equalsIgnoreCase(userId)) {
+                taskRes.get().setStatus(task.getStatus());
+                response =new ResponseEntity<>(taskRepository.save(taskRes.get()), HttpStatus.OK);
+            }
+        }
+      return response;
+    }
+
+    public ResponseEntity<Void> deleteTask(String id) {
+        ResponseEntity<Void> response = null;
+        if (taskRepository.existsById(id)) {
+            taskRepository.deleteById(id);
+            response = new ResponseEntity<>(HttpStatus.OK);
+        } else {
+            response = new ResponseEntity<>(HttpStatus.NOT_FOUND);
+        }
+        return response;
+    }
+}
diff --git a/src/main/java/com/accenture/codingtest/springbootcodingtest/service/UserService.java b/src/main/java/com/accenture/codingtest/springbootcodingtest/service/UserService.java
new file mode 100644
index 0000000..9230755
--- /dev/null
+++ b/src/main/java/com/accenture/codingtest/springbootcodingtest/service/UserService.java
@@ -0,0 +1,67 @@
+package com.accenture.codingtest.springbootcodingtest.service;
+
+import com.accenture.codingtest.springbootcodingtest.entity.User;
+import com.accenture.codingtest.springbootcodingtest.repository.UserRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Optional;
+
+@Service
+public class UserService {
+
+    @Autowired
+    private UserRepository userRepository;
+
+    public ResponseEntity<User> saveUser(User user) {
+        ResponseEntity<User> response = null;
+        if (user != null) {
+           response = new ResponseEntity<>(userRepository.save(user), HttpStatus.OK);
+        } else {
+            response = new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+        }
+      return response;
+    }
+
+
+    public ResponseEntity<List<User>> getAllUsers() {
+        return new ResponseEntity<>(userRepository.findAll(), HttpStatus.OK);
+    }
+
+    public ResponseEntity<User> getUserById(String id) {
+           return new ResponseEntity<>(userRepository.findById(id).get(), HttpStatus.OK);
+    }
+
+    public ResponseEntity<User> updateUser(User user) {
+        ResponseEntity<User> updatedUser = null;
+        String id = user.getId();
+        Optional<User> oldUserOp = userRepository.findById(id);
+
+        if(oldUserOp.isPresent()) {
+            User oldUser = oldUserOp.get();
+
+            oldUser.setUsername(user.getUsername());
+            oldUser.setPassword(user.getPassword());
+
+            updatedUser = new ResponseEntity<>(userRepository.save(oldUser), HttpStatus.OK);
+        } else {
+            updatedUser = new ResponseEntity<>(HttpStatus.NOT_FOUND);
+        }
+
+        return updatedUser;
+    }
+
+    public ResponseEntity<Void> deleteUser(String id) {
+        ResponseEntity<Void> response = null;
+        if (userRepository.existsById(id)) {
+            userRepository.deleteById(id);
+            response = new ResponseEntity<>(HttpStatus.OK);
+        } else {
+            response = new ResponseEntity<>(HttpStatus.NOT_FOUND);
+        }
+        return response;
+    }
+}
diff --git a/src/main/java/com/accenture/codingtest/springbootcodingtest/service/package-info.java b/src/main/java/com/accenture/codingtest/springbootcodingtest/service/package-info.java
deleted file mode 100644
index ad5937c..0000000
--- a/src/main/java/com/accenture/codingtest/springbootcodingtest/service/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.accenture.codingtest.springbootcodingtest.service;
\ No newline at end of file
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 8b13789..f16231d 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1 +1,10 @@
+spring.datasource.url=jdbc:mysql://localhost/accenture
+spring.datasource.driverClassName=com.mysql.jdbc.Driver
+spring.datasource.username=root
+spring.datasource.password=12345Welcome
 
+
+
+spring.jpa.show-sql=true
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL8Dialect
+spring.jpa.hibernate.ddl-auto= update
diff --git a/src/main/resources/template/create_project.html b/src/main/resources/template/create_project.html
new file mode 100644
index 0000000..415d4c6
--- /dev/null
+++ b/src/main/resources/template/create_project.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="ISO-8859-1">
+<title>Insert title here</title>
+</head>
+<body>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/template/create_task.html b/src/main/resources/template/create_task.html
new file mode 100644
index 0000000..415d4c6
--- /dev/null
+++ b/src/main/resources/template/create_task.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="ISO-8859-1">
+<title>Insert title here</title>
+</head>
+<body>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/template/create_user.html b/src/main/resources/template/create_user.html
new file mode 100644
index 0000000..415d4c6
--- /dev/null
+++ b/src/main/resources/template/create_user.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="ISO-8859-1">
+<title>Insert title here</title>
+</head>
+<body>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/template/edit_project.html b/src/main/resources/template/edit_project.html
new file mode 100644
index 0000000..415d4c6
--- /dev/null
+++ b/src/main/resources/template/edit_project.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="ISO-8859-1">
+<title>Insert title here</title>
+</head>
+<body>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/template/edit_task.html b/src/main/resources/template/edit_task.html
new file mode 100644
index 0000000..415d4c6
--- /dev/null
+++ b/src/main/resources/template/edit_task.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="ISO-8859-1">
+<title>Insert title here</title>
+</head>
+<body>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/template/edit_user.html b/src/main/resources/template/edit_user.html
new file mode 100644
index 0000000..415d4c6
--- /dev/null
+++ b/src/main/resources/template/edit_user.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="ISO-8859-1">
+<title>Insert title here</title>
+</head>
+<body>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/template/project.html b/src/main/resources/template/project.html
new file mode 100644
index 0000000..415d4c6
--- /dev/null
+++ b/src/main/resources/template/project.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="ISO-8859-1">
+<title>Insert title here</title>
+</head>
+<body>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/template/task.html b/src/main/resources/template/task.html
new file mode 100644
index 0000000..6f9bc14
--- /dev/null
+++ b/src/main/resources/template/task.html
@@ -0,0 +1,79 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+<meta charset="ISO-8859-1">
+<title>Project Management System</title>
+<link rel="stylesheet"
+	href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css"
+	integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm"
+	crossorigin="anonymous">
+</head>
+<body>
+<nav class="navbar navbar-expand-md bg-dark navbar-dark">
+  <!-- Brand -->
+  <a class="navbar-brand" href="#">Project Management System</a>
+
+  <!-- Toggler/collapsibe Button -->
+  <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#collapsibleNavbar">
+    <span class="navbar-toggler-icon"></span>
+  </button>
+
+  <!-- Navbar links -->
+  <div class="collapse navbar-collapse" id="collapsibleNavbar">
+    <ul class="navbar-nav">
+      <li class="nav-item">
+        <a class="nav-link" th:href="@{/api/v1/users}">Task</a>
+        <li class="nav-item">
+        <a class="nav-link" th:href="@{/api/v1/users}">User</a>
+      </li>
+      
+    </ul>
+  </div>
+</nav>
+<div class ="container">
+		<div class = "row">
+			<h1> List Tasks </h1>
+		</div>
+		
+		<div class = "row">
+			<div class = "col-lg-3">
+				<a th:href = "@{/api/v1/tasks/new}" class = "btn btn-primary btn-sm mb-3"> Add Task</a>
+			</div>
+		</div>
+		<table class = "table table-striped table-bordered">
+			<thead class = "table-dark">
+				<tr>
+					<th> Task Id</th>
+					<th> Task Title</th>
+					<th> Task Description</th>
+					<th> Task Status </th>
+					<th> Task Project_Id </th>
+					<th> Task Task_Id </th>
+				</tr>
+			</thead>
+			
+			<tbody>
+				<tr th:each = "task: ${tasks}">
+					<td th:text = "${task.taskId}"></td>
+					<td th:text = "${task.taskTitle}"></td>
+					<td th:text = "${task.taskDescription}"></td>
+					<td th:text = "${task.taskStatus}"></td>
+					<td th:text = "${task.taskProject_Id}"></td>
+					<td th:text = "${task.taskTask_Id}"></td>
+					<td>
+						<a th:href = "@{/api/v1/tasks/edit/{id}(id=${task.id})}"
+						 class = "btn btn-primary">Update</a>
+						
+						<a th:href = "@{/api/v1/tasks/{id}(id=${task.id})}"
+						 class = "btn btn-danger">Delete</a>
+						 
+					</td>
+				</tr>
+			</tbody>
+		
+		</table>
+		
+	</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/template/user.html b/src/main/resources/template/user.html
new file mode 100644
index 0000000..15a88e6
--- /dev/null
+++ b/src/main/resources/template/user.html
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+<meta charset="ISO-8859-1">
+<title>Project Management System</title>
+<link rel="stylesheet"
+	href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css"
+	integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm"
+	crossorigin="anonymous">
+</head>
+<body>
+<nav class="navbar navbar-expand-md bg-dark navbar-dark">
+  <!-- Brand -->
+  <a class="navbar-brand" href="#">Project Management System</a>
+
+  <!-- Toggler/collapsibe Button -->
+  <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#collapsibleNavbar">
+    <span class="navbar-toggler-icon"></span>
+  </button>
+
+  <!-- Navbar links -->
+  <div class="collapse navbar-collapse" id="collapsibleNavbar">
+    <ul class="navbar-nav">
+      <li class="nav-item">
+        <a class="nav-link" th:href="@{/api/v1/users}">Admin</a>
+        <li class="nav-item">
+        <a class="nav-link" th:href="@{/api/v1/users}">User</a>
+      </li>
+      <li class="nav-item">
+        <a class="nav-link" th:href="@{/api/v1/users}">Projects</a>
+      </li>
+    </ul>
+  </div>
+</nav>
+<div class ="container">
+		<div class = "row">
+			<h1> List Users </h1>
+		</div>
+		
+		<div class = "row">
+			<div class = "col-lg-3">
+				<a th:href = "@{/api/v1/users/new}" class = "btn btn-primary btn-sm mb-3"> Add User</a>
+			</div>
+		</div>
+		<table class = "table table-striped table-bordered">
+			<thead class = "table-dark">
+				<tr>
+					<th> User Id</th>
+					<th> User Name</th>
+					<th> Password </th>
+					<th> Actions </th>
+				</tr>
+			</thead>
+			
+			<tbody>
+				<tr th:each = "user: ${users}">
+					<td th:text = "${user.userId}"></td>
+					<td th:text = "${user.userName}"></td>
+					<td th:text = "${user.userPassword}"></td>
+					<td>
+						<a th:href = "@{/api/v1/users/edit/{id}(id=${user.id})}"
+						 class = "btn btn-primary">Update</a>
+						
+						<a th:href = "@{/api/v1/users/{id}(id=${user.id})}"
+						 class = "btn btn-danger">Delete</a>
+						 
+					</td>
+				</tr>
+			</tbody>
+		
+		</table>
+		
+	</div>
+
+</body>
+</html>
\ No newline at end of file