diff --git a/crates/application/src/use_cases/get_profile.rs b/crates/application/src/use_cases/identity/get_profile.rs
similarity index 100%
rename from crates/application/src/use_cases/get_profile.rs
rename to crates/application/src/use_cases/identity/get_profile.rs
diff --git a/crates/application/src/use_cases/login.rs b/crates/application/src/use_cases/identity/login_user.rs
similarity index 100%
rename from crates/application/src/use_cases/login.rs
rename to crates/application/src/use_cases/identity/login_user.rs
diff --git a/crates/application/src/use_cases/identity/mod.rs b/crates/application/src/use_cases/identity/mod.rs
index 3765f6b..cff7e22 100644
--- a/crates/application/src/use_cases/identity/mod.rs
+++ b/crates/application/src/use_cases/identity/mod.rs
@@ -1,3 +1,7 @@
 pub mod register_user;
+pub mod login_user;
+pub mod get_profile;
 
 pub use register_user::RegisterUser;
+pub use login_user::LoginUser;
+pub use get_profile::GetProfile;
diff --git a/crates/application/src/use_cases/mod.rs b/crates/application/src/use_cases/mod.rs
index 37863b8..b1cff67 100644
--- a/crates/application/src/use_cases/mod.rs
+++ b/crates/application/src/use_cases/mod.rs
@@ -1,4 +1,3 @@
-// Bounded context use case modules
 pub mod identity;
 pub mod organization;
 pub mod storage;
@@ -7,12 +6,5 @@ pub mod sharing;
 pub mod sidecar;
 pub mod processing;
 
-// Legacy top-level use cases (kept for backward compat)
-pub mod login;
-pub mod get_profile;
-
-// Re-exports
-pub use identity::RegisterUser;
-pub use login::LoginUser;
-pub use get_profile::GetProfile;
+pub use identity::{RegisterUser, LoginUser, GetProfile};
 pub use organization::CreateAlbum;