diff --git a/src/application/auth.rs b/src/application/auth.rs
index 4492d0a..3061b34 100644
--- a/src/application/auth.rs
+++ b/src/application/auth.rs
@@ -6,7 +6,7 @@ use axum::{
 use tower_cookies::Cookies;
 use tracing::warn;
 
-use crate::application::server::AppState;
+use crate::application::state::AppState;
 use crate::domain::users::User;
 use crate::infrastructure::auth::hash_token;
 
diff --git a/src/application/routes/api/account.rs b/src/application/routes/api/account.rs
index e303f42..b3644ef 100644
--- a/src/application/routes/api/account.rs
+++ b/src/application/routes/api/account.rs
@@ -6,7 +6,7 @@ use serde::Serialize;
 use tracing::error;
 
 use crate::application::auth::AuthenticatedUser;
-use crate::application::server::AppState;
+use crate::application::state::AppState;
 use crate::domain::ids::PasskeyCredentialId;
 
 #[derive(Serialize)]
diff --git a/src/application/routes/api/backup.rs b/src/application/routes/api/backup.rs
index 6d5ddec..2b876e8 100644
--- a/src/application/routes/api/backup.rs
+++ b/src/application/routes/api/backup.rs
@@ -5,7 +5,7 @@ use axum::response::{IntoResponse, Response};
 
 use crate::application::auth::AuthenticatedUser;
 use crate::application::errors::{ApiError, AppError};
-use crate::application::server::AppState;
+use crate::application::state::AppState;
 use crate::infrastructure::backup::BackupData;
 
 /// GET /api/v1/backup — export all data as JSON (requires authentication)
diff --git a/src/application/routes/api/bags.rs b/src/application/routes/api/bags.rs
index 5bd706c..889c2e6 100644
--- a/src/application/routes/api/bags.rs
+++ b/src/application/routes/api/bags.rs
@@ -11,7 +11,7 @@ use crate::application::errors::{ApiError, AppError};
 use crate::application::routes::support::{
     FlexiblePayload, ListQuery, PayloadSource, is_datastar_request,
 };
-use crate::application::server::AppState;
+use crate::application::state::AppState;
 use crate::domain::bags::{BagFilter, BagSortKey, BagWithRoast, NewBag, UpdateBag};
 use crate::domain::ids::{BagId, RoastId};
 use crate::domain::listing::{ListRequest, SortDirection};
diff --git a/src/application/routes/api/brews.rs b/src/application/routes/api/brews.rs
index 006ca80..4f5e9d0 100644
--- a/src/application/routes/api/brews.rs
+++ b/src/application/routes/api/brews.rs
@@ -11,7 +11,7 @@ use crate::application::errors::{ApiError, AppError};
 use crate::application::routes::support::{
     FlexiblePayload, ListQuery, PayloadSource, is_datastar_request,
 };
-use crate::application::server::AppState;
+use crate::application::state::AppState;
 use crate::domain::bags::BagFilter;
 use crate::domain::brews::{BrewFilter, BrewSortKey, BrewWithDetails, NewBrew, QuickNote};
 use crate::domain::gear::{GearCategory, GearFilter, GearSortKey};
diff --git a/src/application/routes/api/cafes.rs b/src/application/routes/api/cafes.rs
index 0376c87..a3fbb4c 100644
--- a/src/application/routes/api/cafes.rs
+++ b/src/application/routes/api/cafes.rs
@@ -10,7 +10,7 @@ use crate::application::errors::{ApiError, AppError};
 use crate::application::routes::support::{
     FlexiblePayload, ListQuery, PayloadSource, is_datastar_request,
 };
-use crate::application::server::AppState;
+use crate::application::state::AppState;
 use crate::domain::cafes::{Cafe, CafeSortKey, NewCafe, UpdateCafe};
 use crate::domain::ids::CafeId;
 use crate::domain::listing::{ListRequest, SortDirection};
diff --git a/src/application/routes/api/checkin.rs b/src/application/routes/api/checkin.rs
index dda1658..7b2af4e 100644
--- a/src/application/routes/api/checkin.rs
+++ b/src/application/routes/api/checkin.rs
@@ -7,7 +7,7 @@ use serde::Deserialize;
 use crate::application::auth::AuthenticatedUser;
 use crate::application::errors::{ApiError, AppError};
 use crate::application::routes::support::{FlexiblePayload, PayloadSource, is_datastar_request};
-use crate::application::server::AppState;
+use crate::application::state::AppState;
 use crate::domain::cafes::NewCafe;
 use crate::domain::cups::NewCup;
 use crate::domain::ids::{CafeId, RoastId};
diff --git a/src/application/routes/api/cups.rs b/src/application/routes/api/cups.rs
index 32b892f..d00d2a0 100644
--- a/src/application/routes/api/cups.rs
+++ b/src/application/routes/api/cups.rs
@@ -11,7 +11,7 @@ use crate::application::errors::{ApiError, AppError};
 use crate::application::routes::support::{
     FlexiblePayload, ListQuery, PayloadSource, is_datastar_request,
 };
-use crate::application::server::AppState;
+use crate::application::state::AppState;
 use crate::domain::cups::{CupFilter, CupSortKey, CupWithDetails, NewCup};
 use crate::domain::ids::CupId;
 use crate::domain::listing::{ListRequest, SortDirection};
diff --git a/src/application/routes/api/gear.rs b/src/application/routes/api/gear.rs
index 6e533e4..50f22cc 100644
--- a/src/application/routes/api/gear.rs
+++ b/src/application/routes/api/gear.rs
@@ -13,7 +13,7 @@ use crate::application::errors::{ApiError, AppError};
 use crate::application::routes::support::{
     FlexiblePayload, ListQuery, PayloadSource, is_datastar_request,
 };
-use crate::application::server::AppState;
+use crate::application::state::AppState;
 use crate::domain::gear::{Gear, GearCategory, GearFilter, GearSortKey, NewGear, UpdateGear};
 use crate::domain::ids::GearId;
 use crate::domain::listing::{ListRequest, SortDirection};
diff --git a/src/application/routes/api/macros.rs b/src/application/routes/api/macros.rs
index 38b0f53..9d28e8a 100644
--- a/src/application/routes/api/macros.rs
+++ b/src/application/routes/api/macros.rs
@@ -14,7 +14,7 @@ macro_rules! define_get_handler {
     ($fn_name:ident, $id_type:ty, $entity_type:ty, $repo_field:ident) => {
         #[tracing::instrument(skip(state))]
         pub(crate) async fn $fn_name(
-            axum::extract::State(state): axum::extract::State<crate::application::server::AppState>,
+            axum::extract::State(state): axum::extract::State<crate::application::state::AppState>,
             axum::extract::Path(id): axum::extract::Path<$id_type>,
         ) -> Result<axum::Json<$entity_type>, crate::application::errors::ApiError> {
             let entity = state
@@ -44,7 +44,7 @@ macro_rules! define_enriched_get_handler {
     ($fn_name:ident, $id_type:ty, $entity_type:ty, $repo_field:ident, $method:ident) => {
         #[tracing::instrument(skip(state))]
         pub(crate) async fn $fn_name(
-            axum::extract::State(state): axum::extract::State<crate::application::server::AppState>,
+            axum::extract::State(state): axum::extract::State<crate::application::state::AppState>,
             axum::extract::Path(id): axum::extract::Path<$id_type>,
         ) -> Result<axum::Json<$entity_type>, crate::application::errors::ApiError> {
             let entity = state
@@ -80,7 +80,7 @@ macro_rules! define_delete_handler {
     ($fn_name:ident, $id_type:ty, $sort_key:ty, $repo_field:ident, $render_fragment:path) => {
         #[tracing::instrument(skip(state, _auth_user, headers, query))]
         pub(crate) async fn $fn_name(
-            axum::extract::State(state): axum::extract::State<crate::application::server::AppState>,
+            axum::extract::State(state): axum::extract::State<crate::application::state::AppState>,
             _auth_user: crate::application::auth::AuthenticatedUser,
             headers: axum::http::HeaderMap,
             axum::extract::Path(id): axum::extract::Path<$id_type>,
@@ -133,7 +133,7 @@ macro_rules! define_delete_handler {
 macro_rules! define_list_fragment_renderer {
     ($fn_name:ident, $sort_key:ty, $loader:ident, $template:ident { $field:ident }, $selector:literal) => {
         async fn $fn_name(
-            state: crate::application::server::AppState,
+            state: crate::application::state::AppState,
             request: crate::domain::listing::ListRequest<$sort_key>,
             search: Option<String>,
             is_authenticated: bool,
diff --git a/src/application/routes/api/mod.rs b/src/application/routes/api/mod.rs
index b2e3a01..ab93110 100644
--- a/src/application/routes/api/mod.rs
+++ b/src/application/routes/api/mod.rs
@@ -16,7 +16,7 @@ pub(crate) mod webauthn;
 use axum::extract::DefaultBodyLimit;
 use axum::routing::{get, post};
 
-use crate::application::server::AppState;
+use crate::application::state::AppState;
 
 #[allow(clippy::too_many_lines)]
 pub(super) fn router() -> axum::Router<AppState> {
diff --git a/src/application/routes/api/roasters.rs b/src/application/routes/api/roasters.rs
index 8120269..328e383 100644
--- a/src/application/routes/api/roasters.rs
+++ b/src/application/routes/api/roasters.rs
@@ -9,7 +9,7 @@ use crate::application::errors::{ApiError, AppError};
 use crate::application::routes::support::{
     FlexiblePayload, ListQuery, PayloadSource, is_datastar_request,
 };
-use crate::application::server::AppState;
+use crate::application::state::AppState;
 use crate::domain::ids::RoasterId;
 use crate::domain::listing::{ListRequest, SortDirection};
 use crate::domain::roasters::{NewRoaster, Roaster, RoasterSortKey, UpdateRoaster};
diff --git a/src/application/routes/api/roasts.rs b/src/application/routes/api/roasts.rs
index 8212204..680bafb 100644
--- a/src/application/routes/api/roasts.rs
+++ b/src/application/routes/api/roasts.rs
@@ -12,7 +12,7 @@ use crate::application::errors::{ApiError, AppError};
 use crate::application::routes::support::{
     FlexiblePayload, ListQuery, PayloadSource, is_datastar_request,
 };
-use crate::application::server::AppState;
+use crate::application::state::AppState;
 use crate::domain::ids::{RoastId, RoasterId};
 use crate::domain::listing::{ListRequest, SortDirection};
 use crate::domain::roasts::{NewRoast, RoastSortKey, RoastWithRoaster, UpdateRoast};
diff --git a/src/application/routes/api/scan.rs b/src/application/routes/api/scan.rs
index aac5b77..871a4c4 100644
--- a/src/application/routes/api/scan.rs
+++ b/src/application/routes/api/scan.rs
@@ -9,7 +9,7 @@ use super::roasts::TastingNotesInput;
 use crate::application::auth::AuthenticatedUser;
 use crate::application::errors::{ApiError, AppError};
 use crate::application::routes::support::{FlexiblePayload, is_datastar_request};
-use crate::application::server::AppState;
+use crate::application::state::AppState;
 use crate::domain::bags::NewBag;
 use crate::domain::errors::RepositoryError;
 use crate::domain::ids::RoastId;
diff --git a/src/application/routes/api/tokens.rs b/src/application/routes/api/tokens.rs
index ac6f346..d7e07d5 100644
--- a/src/application/routes/api/tokens.rs
+++ b/src/application/routes/api/tokens.rs
@@ -11,7 +11,7 @@ use crate::application::errors::{ApiError, AppError};
 use crate::application::routes::support::{
     FlexiblePayload, is_datastar_request, render_signals_json,
 };
-use crate::application::server::AppState;
+use crate::application::state::AppState;
 use crate::domain::ids::{TokenId, UserId};
 use crate::domain::tokens::{NewToken, Token};
 use crate::infrastructure::auth::{generate_token, hash_token};
diff --git a/src/application/routes/api/webauthn.rs b/src/application/routes/api/webauthn.rs
index 0a8ddbf..c64f1bd 100644
--- a/src/application/routes/api/webauthn.rs
+++ b/src/application/routes/api/webauthn.rs
@@ -9,7 +9,7 @@ use uuid::Uuid;
 use webauthn_rs::prelude::*;
 
 use crate::application::auth::AuthenticatedUser;
-use crate::application::server::AppState;
+use crate::application::state::AppState;
 use crate::domain::passkey_credentials::NewPasskeyCredential;
 use crate::domain::sessions::NewSession;
 use crate::domain::tokens::NewToken;
diff --git a/src/application/routes/app/account.rs b/src/application/routes/app/account.rs
index 4bf4778..fa50cdc 100644
--- a/src/application/routes/app/account.rs
+++ b/src/application/routes/app/account.rs
@@ -8,7 +8,7 @@ use tower_cookies::Cookies;
 use tracing::{error, warn};
 
 use crate::application::routes::render_html;
-use crate::application::server::AppState;
+use crate::application::state::AppState;
 
 // --- View types ---
 
diff --git a/src/application/routes/app/add.rs b/src/application/routes/app/add.rs
index 3f3f623..bcd1cb5 100644
--- a/src/application/routes/app/add.rs
+++ b/src/application/routes/app/add.rs
@@ -8,7 +8,7 @@ use crate::application::routes::render_html;
 use crate::application::routes::support::{
     load_cafe_options, load_roast_options, load_roaster_options,
 };
-use crate::application::server::AppState;
+use crate::application::state::AppState;
 use crate::presentation::web::templates::{AddTemplate, Tab};
 
 use crate::application::routes::api::brews::load_brew_form_data;
diff --git a/src/application/routes/app/auth.rs b/src/application/routes/app/auth.rs
index ea91a2a..7d777f7 100644
--- a/src/application/routes/app/auth.rs
+++ b/src/application/routes/app/auth.rs
@@ -7,7 +7,7 @@ use tower_cookies::{Cookie, Cookies};
 use tracing::{info, warn};
 
 use crate::application::routes::render_html;
-use crate::application::server::AppState;
+use crate::application::state::AppState;
 use crate::infrastructure::auth::hash_token;
 
 const SESSION_COOKIE_NAME: &str = "brewlog_session";
diff --git a/src/application/routes/app/checkin.rs b/src/application/routes/app/checkin.rs
index a4c2cf5..f45e20c 100644
--- a/src/application/routes/app/checkin.rs
+++ b/src/application/routes/app/checkin.rs
@@ -5,7 +5,7 @@ use axum::response::{IntoResponse, Redirect, Response};
 use crate::application::errors::map_app_error;
 use crate::application::routes::render_html;
 use crate::application::routes::support::{load_cafe_options, load_roast_options};
-use crate::application::server::AppState;
+use crate::application::state::AppState;
 use crate::presentation::web::templates::CheckInTemplate;
 
 #[tracing::instrument(skip(state, cookies))]
diff --git a/src/application/routes/app/data.rs b/src/application/routes/app/data.rs
index 842791e..3fff094 100644
--- a/src/application/routes/app/data.rs
+++ b/src/application/routes/app/data.rs
@@ -6,7 +6,7 @@ use serde::Deserialize;
 use crate::application::errors::{AppError, map_app_error};
 use crate::application::routes::render_html;
 use crate::application::routes::support::{ListQuery, is_datastar_request};
-use crate::application::server::AppState;
+use crate::application::state::AppState;
 use crate::presentation::web::templates::{
     BagListTemplate, BrewListTemplate, CafeListTemplate, CupListTemplate, DataTemplate,
     GearListTemplate, RoastListTemplate, RoasterListTemplate, Tab, render_template,
diff --git a/src/application/routes/app/home.rs b/src/application/routes/app/home.rs
index 20b8677..8b2697e 100644
--- a/src/application/routes/app/home.rs
+++ b/src/application/routes/app/home.rs
@@ -4,7 +4,7 @@ use axum::response::{IntoResponse, Response};
 
 use crate::application::errors::{AppError, map_app_error};
 use crate::application::routes::render_html;
-use crate::application::server::AppState;
+use crate::application::state::AppState;
 use crate::domain::bags::{BagFilter, BagSortKey};
 use crate::domain::brews::{BrewFilter, BrewSortKey};
 use crate::domain::cafes::CafeSortKey;
diff --git a/src/application/routes/app/mod.rs b/src/application/routes/app/mod.rs
index 8c816c8..ff8bbcb 100644
--- a/src/application/routes/app/mod.rs
+++ b/src/application/routes/app/mod.rs
@@ -10,7 +10,7 @@ mod webauthn;
 use axum::response::{IntoResponse, Redirect};
 use axum::routing::{get, post};
 
-use crate::application::server::AppState;
+use crate::application::state::AppState;
 
 pub(super) fn router() -> axum::Router<AppState> {
     axum::Router::new()
diff --git a/src/application/routes/app/timeline.rs b/src/application/routes/app/timeline.rs
index f3c289d..9dbcf88 100644
--- a/src/application/routes/app/timeline.rs
+++ b/src/application/routes/app/timeline.rs
@@ -7,7 +7,7 @@ use serde::Deserialize;
 use crate::application::errors::{AppError, map_app_error};
 use crate::application::routes::render_html;
 use crate::application::routes::support::{is_datastar_request, normalize_request};
-use crate::application::server::AppState;
+use crate::application::state::AppState;
 use crate::domain::listing::{ListRequest, PageSize, SortDirection, SortKey};
 use crate::domain::timeline::{TimelineEvent, TimelineSortKey};
 use crate::presentation::web::templates::{TimelineChunkTemplate, TimelineTemplate};
diff --git a/src/application/routes/app/webauthn.rs b/src/application/routes/app/webauthn.rs
index d3e3366..75a3892 100644
--- a/src/application/routes/app/webauthn.rs
+++ b/src/application/routes/app/webauthn.rs
@@ -5,7 +5,7 @@ use axum::response::{IntoResponse, Response};
 use tracing::warn;
 
 use crate::application::routes::render_html;
-use crate::application::server::AppState;
+use crate::application::state::AppState;
 use crate::infrastructure::auth::hash_token;
 
 // --- Templates ---
diff --git a/src/application/routes/mod.rs b/src/application/routes/mod.rs
index dc98432..d1047b1 100644
--- a/src/application/routes/mod.rs
+++ b/src/application/routes/mod.rs
@@ -13,7 +13,7 @@ use tower_http::trace::{DefaultMakeSpan, DefaultOnResponse, TraceLayer};
 use tracing::Level;
 use tracing::error;
 
-use crate::application::server::AppState;
+use crate::application::state::AppState;
 
 use crate::presentation::web::templates::render_template;
 
diff --git a/src/application/routes/support.rs b/src/application/routes/support.rs
index ae0bf16..4599128 100644
--- a/src/application/routes/support.rs
+++ b/src/application/routes/support.rs
@@ -7,7 +7,7 @@ use serde::Deserialize;
 use tracing::warn;
 
 use crate::application::errors::{ApiError, AppError};
-use crate::application::server::AppState;
+use crate::application::state::AppState;
 use crate::domain::listing::{
     DEFAULT_PAGE_SIZE, ListRequest, Page, PageSize, SortDirection, SortKey,
 };