diff --git a/src/application/routes/mod.rs b/src/application/routes/mod.rs
index c6c6a59..c0e6c81 100644
--- a/src/application/routes/mod.rs
+++ b/src/application/routes/mod.rs
@@ -15,7 +15,7 @@ use tracing::error;
 
 use crate::application::server::AppState;
 
-use crate::presentation::templates::render_template;
+use crate::presentation::web::templates::render_template;
 
 pub fn app_router(state: AppState) -> axum::Router {
     let api_routes = axum::Router::new()
diff --git a/src/application/routes/roasters.rs b/src/application/routes/roasters.rs
index 32e40f5..1cb079a 100644
--- a/src/application/routes/roasters.rs
+++ b/src/application/routes/roasters.rs
@@ -13,10 +13,10 @@ use crate::application::server::AppState;
 use crate::domain::ids::RoasterId;
 use crate::domain::listing::{ListRequest, SortDirection};
 use crate::domain::roasters::{NewRoaster, Roaster, RoasterSortKey, UpdateRoaster};
-use crate::presentation::templates::{
+use crate::presentation::web::templates::{
     RoasterDetailTemplate, RoasterListTemplate, RoastersTemplate,
 };
-use crate::presentation::views::{ListNavigator, Paginated, RoastView, RoasterView};
+use crate::presentation::web::views::{ListNavigator, Paginated, RoastView, RoasterView};
 
 const ROASTER_PAGE_PATH: &str = "/roasters";
 const ROASTER_FRAGMENT_PATH: &str = "/roasters#roaster-list";
diff --git a/src/application/routes/roasts.rs b/src/application/routes/roasts.rs
index ca0038b..d44059e 100644
--- a/src/application/routes/roasts.rs
+++ b/src/application/routes/roasts.rs
@@ -15,8 +15,8 @@ use crate::domain::ids::{RoastId, RoasterId};
 use crate::domain::listing::{ListRequest, SortDirection};
 use crate::domain::roasters::RoasterSortKey;
 use crate::domain::roasts::{NewRoast, Roast, RoastSortKey, RoastWithRoaster};
-use crate::presentation::templates::{RoastDetailTemplate, RoastListTemplate, RoastsTemplate};
-use crate::presentation::views::{ListNavigator, Paginated, RoastView, RoasterOptionView};
+use crate::presentation::web::templates::{RoastDetailTemplate, RoastListTemplate, RoastsTemplate};
+use crate::presentation::web::views::{ListNavigator, Paginated, RoastView, RoasterOptionView};
 
 const ROAST_PAGE_PATH: &str = "/roasts";
 const ROAST_FRAGMENT_PATH: &str = "/roasts#roast-list";
diff --git a/src/application/routes/support.rs b/src/application/routes/support.rs
index 655ee99..b78a202 100644
--- a/src/application/routes/support.rs
+++ b/src/application/routes/support.rs
@@ -9,7 +9,7 @@ use crate::application::errors::{ApiError, AppError};
 use crate::domain::listing::{
     DEFAULT_PAGE_SIZE, ListRequest, Page, PageSize, SortDirection, SortKey,
 };
-use crate::presentation::views::{ListNavigator, Paginated};
+use crate::presentation::web::views::{ListNavigator, Paginated};
 
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
 pub enum PayloadSource {
@@ -113,7 +113,7 @@ pub fn render_fragment<T: Template>(
     template: T,
     selector: &'static str,
 ) -> Result<Response, AppError> {
-    let html = crate::presentation::templates::render_template(template)
+    let html = crate::presentation::web::templates::render_template(template)
         .map_err(|err| AppError::unexpected(format!("failed to render fragment: {err}")))?;
 
     let mut response = Html(html).into_response();
diff --git a/src/application/routes/timeline.rs b/src/application/routes/timeline.rs
index b81cb44..115fa43 100644
--- a/src/application/routes/timeline.rs
+++ b/src/application/routes/timeline.rs
@@ -9,8 +9,10 @@ use crate::application::routes::support::{ListQuery, is_datastar_request, normal
 use crate::application::server::AppState;
 use crate::domain::listing::ListRequest;
 use crate::domain::timeline::{TimelineEvent, TimelineSortKey};
-use crate::presentation::templates::{TimelineChunkTemplate, TimelineTemplate};
-use crate::presentation::views::{ListNavigator, Paginated, TimelineEventView, TimelineMonthView};
+use crate::presentation::web::templates::{TimelineChunkTemplate, TimelineTemplate};
+use crate::presentation::web::views::{
+    ListNavigator, Paginated, TimelineEventView, TimelineMonthView,
+};
 
 const TIMELINE_PAGE_PATH: &str = "/timeline";
 const TIMELINE_FRAGMENT_PATH: &str = "/timeline";
diff --git a/src/lib.rs b/src/lib.rs
index 285b3ca..c9cb8a3 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,5 +1,4 @@
 pub mod application;
-pub mod cli;
 pub mod client;
 pub mod domain;
 pub mod infrastructure;
diff --git a/src/main.rs b/src/main.rs
index 776e4d6..101cc04 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,7 +1,7 @@
 use anyhow::Result;
 use brewlog::application::{ServerConfig, serve};
-use brewlog::cli::{Cli, Commands, ServeCommand, roasters, roasts, tokens};
 use brewlog::client::BrewlogClient;
+use brewlog::presentation::cli::{Cli, Commands, ServeCommand, roasters, roasts, tokens};
 use clap::Parser;
 use tracing_subscriber::{EnvFilter, fmt, prelude::*};
 
diff --git a/src/cli/mod.rs b/src/presentation/cli/mod.rs
similarity index 100%
rename from src/cli/mod.rs
rename to src/presentation/cli/mod.rs
diff --git a/src/cli/roasters.rs b/src/presentation/cli/roasters.rs
similarity index 100%
rename from src/cli/roasters.rs
rename to src/presentation/cli/roasters.rs
diff --git a/src/cli/roasts.rs b/src/presentation/cli/roasts.rs
similarity index 100%
rename from src/cli/roasts.rs
rename to src/presentation/cli/roasts.rs
diff --git a/src/cli/tokens.rs b/src/presentation/cli/tokens.rs
similarity index 98%
rename from src/cli/tokens.rs
rename to src/presentation/cli/tokens.rs
index 46f8766..c931ea6 100644
--- a/src/cli/tokens.rs
+++ b/src/presentation/cli/tokens.rs
@@ -2,7 +2,7 @@ use anyhow::{Context, Result};
 use clap::Args;
 use std::io::{self, Write};
 
-use crate::cli::print_json;
+use super::print_json;
 use crate::client::BrewlogClient;
 use crate::domain::ids::TokenId;
 
diff --git a/src/presentation/mod.rs b/src/presentation/mod.rs
index 0cc5c71..5a88661 100644
--- a/src/presentation/mod.rs
+++ b/src/presentation/mod.rs
@@ -1,5 +1,2 @@
-pub mod templates;
-pub mod views;
-
-pub use templates::*;
-pub use views::*;
+pub mod cli;
+pub mod web;
diff --git a/src/presentation/web/mod.rs b/src/presentation/web/mod.rs
new file mode 100644
index 0000000..0cc5c71
--- /dev/null
+++ b/src/presentation/web/mod.rs
@@ -0,0 +1,5 @@
+pub mod templates;
+pub mod views;
+
+pub use templates::*;
+pub use views::*;
diff --git a/src/presentation/templates.rs b/src/presentation/web/templates.rs
similarity index 100%
rename from src/presentation/templates.rs
rename to src/presentation/web/templates.rs
diff --git a/src/presentation/views.rs b/src/presentation/web/views.rs
similarity index 100%
rename from src/presentation/views.rs
rename to src/presentation/web/views.rs