diff --git a/server/src/main/java/com/yealch/yealch/YealchApplication.java b/server/src/main/java/com/yealch/yealch/YealchApplication.java
index 6f091ca..f6f8606 100644
--- a/server/src/main/java/com/yealch/yealch/YealchApplication.java
+++ b/server/src/main/java/com/yealch/yealch/YealchApplication.java
@@ -1,5 +1,7 @@
 package com.yealch.yealch;
 
+import com.yealch.yealch.user.User;
+import com.yealch.yealch.user.UserRepository;
 import jakarta.persistence.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/server/src/main/java/com/yealch/yealch/AuthController.java b/server/src/main/java/com/yealch/yealch/auth/AuthController.java
similarity index 97%
rename from server/src/main/java/com/yealch/yealch/AuthController.java
rename to server/src/main/java/com/yealch/yealch/auth/AuthController.java
index 3049a02..4abae61 100644
--- a/server/src/main/java/com/yealch/yealch/AuthController.java
+++ b/server/src/main/java/com/yealch/yealch/auth/AuthController.java
@@ -1,5 +1,7 @@
-package com.yealch.yealch;
+package com.yealch.yealch.auth;
 
+import com.yealch.yealch.user.User;
+import com.yealch.yealch.user.UserRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpHeaders;
diff --git a/server/src/main/java/com/yealch/yealch/CustomUserDetails.java b/server/src/main/java/com/yealch/yealch/auth/CustomUserDetails.java
similarity index 95%
rename from server/src/main/java/com/yealch/yealch/CustomUserDetails.java
rename to server/src/main/java/com/yealch/yealch/auth/CustomUserDetails.java
index bd54a0e..4b16d04 100644
--- a/server/src/main/java/com/yealch/yealch/CustomUserDetails.java
+++ b/server/src/main/java/com/yealch/yealch/auth/CustomUserDetails.java
@@ -1,4 +1,4 @@
-package com.yealch.yealch;
+package com.yealch.yealch.auth;
 
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.User;
diff --git a/server/src/main/java/com/yealch/yealch/CustomUserDetailsService.java b/server/src/main/java/com/yealch/yealch/auth/CustomUserDetailsService.java
similarity index 93%
rename from server/src/main/java/com/yealch/yealch/CustomUserDetailsService.java
rename to server/src/main/java/com/yealch/yealch/auth/CustomUserDetailsService.java
index 63f0a4e..d7d1405 100644
--- a/server/src/main/java/com/yealch/yealch/CustomUserDetailsService.java
+++ b/server/src/main/java/com/yealch/yealch/auth/CustomUserDetailsService.java
@@ -1,5 +1,6 @@
-package com.yealch.yealch;
+package com.yealch.yealch.auth;
 
+import com.yealch.yealch.user.UserRepository;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
diff --git a/server/src/main/java/com/yealch/yealch/JwtAuthenticationFilter.java b/server/src/main/java/com/yealch/yealch/auth/JwtAuthenticationFilter.java
similarity index 98%
rename from server/src/main/java/com/yealch/yealch/JwtAuthenticationFilter.java
rename to server/src/main/java/com/yealch/yealch/auth/JwtAuthenticationFilter.java
index 32963ab..a8df3a4 100644
--- a/server/src/main/java/com/yealch/yealch/JwtAuthenticationFilter.java
+++ b/server/src/main/java/com/yealch/yealch/auth/JwtAuthenticationFilter.java
@@ -1,4 +1,4 @@
-package com.yealch.yealch;
+package com.yealch.yealch.auth;
 
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
diff --git a/server/src/main/java/com/yealch/yealch/JwtService.java b/server/src/main/java/com/yealch/yealch/auth/JwtService.java
similarity index 98%
rename from server/src/main/java/com/yealch/yealch/JwtService.java
rename to server/src/main/java/com/yealch/yealch/auth/JwtService.java
index 4f8e928..de5b41e 100644
--- a/server/src/main/java/com/yealch/yealch/JwtService.java
+++ b/server/src/main/java/com/yealch/yealch/auth/JwtService.java
@@ -1,4 +1,4 @@
-package com.yealch.yealch;
+package com.yealch.yealch.auth;
 
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
diff --git a/server/src/main/java/com/yealch/yealch/SecurityConfig.java b/server/src/main/java/com/yealch/yealch/auth/SecurityConfig.java
similarity index 98%
rename from server/src/main/java/com/yealch/yealch/SecurityConfig.java
rename to server/src/main/java/com/yealch/yealch/auth/SecurityConfig.java
index af448d5..9e37e29 100644
--- a/server/src/main/java/com/yealch/yealch/SecurityConfig.java
+++ b/server/src/main/java/com/yealch/yealch/auth/SecurityConfig.java
@@ -1,4 +1,4 @@
-package com.yealch.yealch;
+package com.yealch.yealch.auth;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/server/src/main/java/com/yealch/yealch/Organization.java b/server/src/main/java/com/yealch/yealch/organization/Organization.java
similarity index 95%
rename from server/src/main/java/com/yealch/yealch/Organization.java
rename to server/src/main/java/com/yealch/yealch/organization/Organization.java
index 5bd3bea..c2df180 100644
--- a/server/src/main/java/com/yealch/yealch/Organization.java
+++ b/server/src/main/java/com/yealch/yealch/organization/Organization.java
@@ -1,5 +1,7 @@
-package com.yealch.yealch;
+package com.yealch.yealch.organization;
 
+import com.yealch.yealch.project.Project;
+import com.yealch.yealch.user.User;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/server/src/main/java/com/yealch/yealch/OrganizationMembership.java b/server/src/main/java/com/yealch/yealch/organization/OrganizationMembership.java
similarity index 95%
rename from server/src/main/java/com/yealch/yealch/OrganizationMembership.java
rename to server/src/main/java/com/yealch/yealch/organization/OrganizationMembership.java
index 29bd3a6..7b3bd4e 100644
--- a/server/src/main/java/com/yealch/yealch/OrganizationMembership.java
+++ b/server/src/main/java/com/yealch/yealch/organization/OrganizationMembership.java
@@ -1,5 +1,6 @@
-package com.yealch.yealch;
+package com.yealch.yealch.organization;
 
+import com.yealch.yealch.user.User;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
diff --git a/server/src/main/java/com/yealch/yealch/OrganizationRepository.java b/server/src/main/java/com/yealch/yealch/organization/OrganizationRepository.java
similarity index 81%
rename from server/src/main/java/com/yealch/yealch/OrganizationRepository.java
rename to server/src/main/java/com/yealch/yealch/organization/OrganizationRepository.java
index bbd7f59..919ce1c 100644
--- a/server/src/main/java/com/yealch/yealch/OrganizationRepository.java
+++ b/server/src/main/java/com/yealch/yealch/organization/OrganizationRepository.java
@@ -1,4 +1,4 @@
-package com.yealch.yealch;
+package com.yealch.yealch.organization;
 
 import org.springframework.data.repository.CrudRepository;
 
diff --git a/server/src/main/java/com/yealch/yealch/OrganizationRole.java b/server/src/main/java/com/yealch/yealch/organization/OrganizationRole.java
similarity index 65%
rename from server/src/main/java/com/yealch/yealch/OrganizationRole.java
rename to server/src/main/java/com/yealch/yealch/organization/OrganizationRole.java
index 566dd50..7f8e54e 100644
--- a/server/src/main/java/com/yealch/yealch/OrganizationRole.java
+++ b/server/src/main/java/com/yealch/yealch/organization/OrganizationRole.java
@@ -1,4 +1,4 @@
-package com.yealch.yealch;
+package com.yealch.yealch.organization;
 
 public enum OrganizationRole {
     MEMBER,
diff --git a/server/src/main/java/com/yealch/yealch/OrganizationsController.java b/server/src/main/java/com/yealch/yealch/organization/OrganizationsController.java
similarity index 98%
rename from server/src/main/java/com/yealch/yealch/OrganizationsController.java
rename to server/src/main/java/com/yealch/yealch/organization/OrganizationsController.java
index 8923e4d..c18f9f1 100644
--- a/server/src/main/java/com/yealch/yealch/OrganizationsController.java
+++ b/server/src/main/java/com/yealch/yealch/organization/OrganizationsController.java
@@ -1,5 +1,8 @@
-package com.yealch.yealch;
+package com.yealch.yealch.organization;
 
+import com.yealch.yealch.user.User;
+import com.yealch.yealch.user.UserRepository;
+import com.yealch.yealch.user.UsersController;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.Authentication;
diff --git a/server/src/main/java/com/yealch/yealch/Project.java b/server/src/main/java/com/yealch/yealch/project/Project.java
similarity index 92%
rename from server/src/main/java/com/yealch/yealch/Project.java
rename to server/src/main/java/com/yealch/yealch/project/Project.java
index 3de4bd4..bc010b7 100644
--- a/server/src/main/java/com/yealch/yealch/Project.java
+++ b/server/src/main/java/com/yealch/yealch/project/Project.java
@@ -1,5 +1,7 @@
-package com.yealch.yealch;
+package com.yealch.yealch.project;
 
+import com.yealch.yealch.organization.Organization;
+import com.yealch.yealch.time.Time;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/server/src/main/java/com/yealch/yealch/ProjectRepository.java b/server/src/main/java/com/yealch/yealch/project/ProjectRepository.java
similarity index 82%
rename from server/src/main/java/com/yealch/yealch/ProjectRepository.java
rename to server/src/main/java/com/yealch/yealch/project/ProjectRepository.java
index 7b21f04..c747565 100644
--- a/server/src/main/java/com/yealch/yealch/ProjectRepository.java
+++ b/server/src/main/java/com/yealch/yealch/project/ProjectRepository.java
@@ -1,4 +1,4 @@
-package com.yealch.yealch;
+package com.yealch.yealch.project;
 
 import org.springframework.data.repository.CrudRepository;
 
diff --git a/server/src/main/java/com/yealch/yealch/ProjectsController.java b/server/src/main/java/com/yealch/yealch/project/ProjectsController.java
similarity index 92%
rename from server/src/main/java/com/yealch/yealch/ProjectsController.java
rename to server/src/main/java/com/yealch/yealch/project/ProjectsController.java
index deaa5f8..eafb959 100644
--- a/server/src/main/java/com/yealch/yealch/ProjectsController.java
+++ b/server/src/main/java/com/yealch/yealch/project/ProjectsController.java
@@ -1,5 +1,7 @@
-package com.yealch.yealch;
+package com.yealch.yealch.project;
 
+import com.yealch.yealch.organization.Organization;
+import com.yealch.yealch.user.UsersController;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.Authentication;
diff --git a/server/src/main/java/com/yealch/yealch/Time.java b/server/src/main/java/com/yealch/yealch/time/Time.java
similarity index 95%
rename from server/src/main/java/com/yealch/yealch/Time.java
rename to server/src/main/java/com/yealch/yealch/time/Time.java
index 51f62c2..df09958 100644
--- a/server/src/main/java/com/yealch/yealch/Time.java
+++ b/server/src/main/java/com/yealch/yealch/time/Time.java
@@ -1,5 +1,6 @@
-package com.yealch.yealch;
+package com.yealch.yealch.time;
 
+import com.yealch.yealch.project.Project;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/server/src/main/java/com/yealch/yealch/TimeRepository.java b/server/src/main/java/com/yealch/yealch/time/TimeRepository.java
similarity index 82%
rename from server/src/main/java/com/yealch/yealch/TimeRepository.java
rename to server/src/main/java/com/yealch/yealch/time/TimeRepository.java
index 2e4668b..2f0865f 100644
--- a/server/src/main/java/com/yealch/yealch/TimeRepository.java
+++ b/server/src/main/java/com/yealch/yealch/time/TimeRepository.java
@@ -1,4 +1,4 @@
-package com.yealch.yealch;
+package com.yealch.yealch.time;
 
 import org.springframework.data.repository.CrudRepository;
 
diff --git a/server/src/main/java/com/yealch/yealch/User.java b/server/src/main/java/com/yealch/yealch/user/User.java
similarity index 90%
rename from server/src/main/java/com/yealch/yealch/User.java
rename to server/src/main/java/com/yealch/yealch/user/User.java
index d68114f..f3e5afc 100644
--- a/server/src/main/java/com/yealch/yealch/User.java
+++ b/server/src/main/java/com/yealch/yealch/user/User.java
@@ -1,5 +1,7 @@
-package com.yealch.yealch;
+package com.yealch.yealch.user;
 
+import com.yealch.yealch.organization.Organization;
+import com.yealch.yealch.organization.OrganizationMembership;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/server/src/main/java/com/yealch/yealch/UserRepository.java b/server/src/main/java/com/yealch/yealch/user/UserRepository.java
similarity index 88%
rename from server/src/main/java/com/yealch/yealch/UserRepository.java
rename to server/src/main/java/com/yealch/yealch/user/UserRepository.java
index 480348e..056e2da 100644
--- a/server/src/main/java/com/yealch/yealch/UserRepository.java
+++ b/server/src/main/java/com/yealch/yealch/user/UserRepository.java
@@ -1,4 +1,4 @@
-package com.yealch.yealch;
+package com.yealch.yealch.user;
 
 import org.springframework.data.repository.CrudRepository;
 
diff --git a/server/src/main/java/com/yealch/yealch/UsersController.java b/server/src/main/java/com/yealch/yealch/user/UsersController.java
similarity index 98%
rename from server/src/main/java/com/yealch/yealch/UsersController.java
rename to server/src/main/java/com/yealch/yealch/user/UsersController.java
index 8d9e483..fff04a1 100644
--- a/server/src/main/java/com/yealch/yealch/UsersController.java
+++ b/server/src/main/java/com/yealch/yealch/user/UsersController.java
@@ -1,5 +1,13 @@
-package com.yealch.yealch;
-
+package com.yealch.yealch.user;
+
+import com.yealch.yealch.auth.CustomUserDetails;
+import com.yealch.yealch.organization.Organization;
+import com.yealch.yealch.organization.OrganizationRepository;
+import com.yealch.yealch.organization.OrganizationRole;
+import com.yealch.yealch.project.Project;
+import com.yealch.yealch.project.ProjectRepository;
+import com.yealch.yealch.time.Time;
+import com.yealch.yealch.time.TimeRepository;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -34,7 +42,7 @@ public class UsersController {
         this.timeRepository = timeRepository;
     }
 
-    static Optional<UUID> getUserId(Authentication authentication) {
+    public static Optional<UUID> getUserId(Authentication authentication) {
         if (authentication == null || !authentication.isAuthenticated()) {
             return Optional.empty();
         }