diff --git a/src/main/java/com/example/oneul/domain/user/controller/UserController.java b/src/main/java/com/example/oneul/domain/user/api/UserApi.java
similarity index 79%
rename from src/main/java/com/example/oneul/domain/user/controller/UserController.java
rename to src/main/java/com/example/oneul/domain/user/api/UserApi.java
index 5e14376..b2d4e9a 100644
--- a/src/main/java/com/example/oneul/domain/user/controller/UserController.java
+++ b/src/main/java/com/example/oneul/domain/user/api/UserApi.java
@@ -1,4 +1,4 @@
-package com.example.oneul.domain.user.controller;
+package com.example.oneul.domain.user.api;
 
 
 import javax.servlet.http.HttpSession;
@@ -17,17 +17,18 @@ import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping(value = "/user")
-public class UserController {
+public class UserApi {
     private final UserService userCommandService;
 
-    private final Logger log = LoggerFactory.getLogger(UserController.class);
+    private final Logger log = LoggerFactory.getLogger(UserApi.class);
 
-    public UserController(UserService userCommandService){
+    public UserApi(UserService userCommandService){
         this.userCommandService = userCommandService;
     }
 
     @RequestMapping(value="/", method=RequestMethod.POST)
     public UserEntity signUp(@RequestBody SignUpDTO signUpDTO, HttpSession httpSession) {
+        // TODO: password1, password2 같은지 검사
         UserEntity user = userCommandService.signUp(signUpDTO.toEntity(), httpSession);
         return user;
     }
diff --git a/src/main/java/com/example/oneul/domain/user/repository/UserCommandRepository.java b/src/main/java/com/example/oneul/domain/user/dao/UserCommandRepository.java
similarity index 100%
rename from src/main/java/com/example/oneul/domain/user/repository/UserCommandRepository.java
rename to src/main/java/com/example/oneul/domain/user/dao/UserCommandRepository.java
diff --git a/src/main/java/com/example/oneul/domain/user/repository/UserRepository.java b/src/main/java/com/example/oneul/domain/user/dao/UserRepository.java
similarity index 100%
rename from src/main/java/com/example/oneul/domain/user/repository/UserRepository.java
rename to src/main/java/com/example/oneul/domain/user/dao/UserRepository.java
diff --git a/src/main/java/com/example/oneul/domain/user/service/UserService.java b/src/main/java/com/example/oneul/domain/user/service/UserService.java
index fc08e5b..f6702b8 100644
--- a/src/main/java/com/example/oneul/domain/user/service/UserService.java
+++ b/src/main/java/com/example/oneul/domain/user/service/UserService.java
@@ -10,5 +10,5 @@ import org.springframework.stereotype.Service;
 public interface UserService {
     UserEntity signUp(UserEntity userEntity, HttpSession httpSession);
     UserEntity login(UserEntity userEntity , HttpSession httpSession);
-    void logout(UserEntity userEntity, HttpSession httpSession);
+    void logout(HttpSession httpSession);
 }
diff --git a/src/main/java/com/example/oneul/domain/user/service/UserServiceImpl.java b/src/main/java/com/example/oneul/domain/user/service/UserServiceImpl.java
index 0e4c927..98edead 100644
--- a/src/main/java/com/example/oneul/domain/user/service/UserServiceImpl.java
+++ b/src/main/java/com/example/oneul/domain/user/service/UserServiceImpl.java
@@ -51,7 +51,7 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public void logout(UserEntity userEntity, HttpSession httpSession){
+    public void logout(HttpSession httpSession){
         UserEntity user = (UserEntity) httpSession.getAttribute("user");
         if(user == null) return ;
         log.info("session id: " + httpSession.getId());