diff --git a/engine/packages/agent-schema/Cargo.toml b/engine/packages/agent-schema/Cargo.toml
index 4afda64..29d9375 100644
--- a/engine/packages/agent-schema/Cargo.toml
+++ b/engine/packages/agent-schema/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "agent-schema"
+name = "sandbox-daemon-agent-schema"
 version = "0.1.0"
 edition = "2021"
 
diff --git a/engine/packages/openapi-gen/Cargo.toml b/engine/packages/openapi-gen/Cargo.toml
index 636ea77..3f73783 100644
--- a/engine/packages/openapi-gen/Cargo.toml
+++ b/engine/packages/openapi-gen/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "openapi-gen"
+name = "sandbox-daemon-openapi-gen"
 version = "0.1.0"
 edition = "2021"
 build = "build.rs"
@@ -7,6 +7,6 @@ build = "build.rs"
 [dependencies]
 
 [build-dependencies]
-sandbox-daemon = { path = "../sandbox-daemon" }
+sandbox-daemon-core = { path = "../sandbox-daemon" }
 serde_json = "1.0"
 utoipa = "4.2"
diff --git a/engine/packages/openapi-gen/build.rs b/engine/packages/openapi-gen/build.rs
index d10d64c..4bb79bd 100644
--- a/engine/packages/openapi-gen/build.rs
+++ b/engine/packages/openapi-gen/build.rs
@@ -1,7 +1,7 @@
 use std::fs;
 use std::path::Path;
 
-use sandbox_daemon::router::ApiDoc;
+use sandbox_daemon_core::router::ApiDoc;
 use utoipa::OpenApi;
 
 fn main() {
diff --git a/engine/packages/sandbox-daemon/Cargo.toml b/engine/packages/sandbox-daemon/Cargo.toml
index ef2ed43..4c68150 100644
--- a/engine/packages/sandbox-daemon/Cargo.toml
+++ b/engine/packages/sandbox-daemon/Cargo.toml
@@ -1,8 +1,12 @@
 [package]
-name = "sandbox-daemon"
+name = "sandbox-daemon-core"
 version = "0.1.0"
 edition = "2021"
 
+[[bin]]
+name = "sandbox-daemon"
+path = "src/main.rs"
+
 [dependencies]
 thiserror = "1.0"
 serde = { version = "1.0", features = ["derive"] }
@@ -10,7 +14,7 @@ serde_json = "1.0"
 axum = "0.7"
 clap = { version = "4.5", features = ["derive"] }
 futures = "0.3"
-error = { path = "../error" }
+sandbox-daemon-error = { path = "../error" }
 reqwest = { version = "0.11", features = ["blocking", "json", "rustls-tls"] }
 flate2 = "1.0"
 tar = "0.4"
diff --git a/engine/packages/sandbox-daemon/src/main.rs b/engine/packages/sandbox-daemon/src/main.rs
index c62ca12..9801eff 100644
--- a/engine/packages/sandbox-daemon/src/main.rs
+++ b/engine/packages/sandbox-daemon/src/main.rs
@@ -3,12 +3,12 @@ use std::io::Write;
 use clap::{Args, Parser, Subcommand};
 use reqwest::blocking::Client as HttpClient;
 use reqwest::Method;
-use sandbox_daemon::router::{
+use sandbox_daemon_core::router::{
     AgentInstallRequest, AppState, AuthConfig, CreateSessionRequest, MessageRequest,
     PermissionReply, PermissionReplyRequest, QuestionReplyRequest,
 };
-use sandbox_daemon::router::{AgentListResponse, AgentModesResponse, CreateSessionResponse, EventsResponse};
-use sandbox_daemon::router::build_router;
+use sandbox_daemon_core::router::{AgentListResponse, AgentModesResponse, CreateSessionResponse, EventsResponse};
+use sandbox_daemon_core::router::build_router;
 use serde::Serialize;
 use serde_json::Value;
 use thiserror::Error;
diff --git a/engine/packages/sandbox-daemon/src/router.rs b/engine/packages/sandbox-daemon/src/router.rs
index ba56428..1141511 100644
--- a/engine/packages/sandbox-daemon/src/router.rs
+++ b/engine/packages/sandbox-daemon/src/router.rs
@@ -9,7 +9,7 @@ use axum::response::{IntoResponse, Response, Sse};
 use axum::routing::{get, post};
 use axum::Json;
 use axum::Router;
-use error::{AgentError as AgentErrorPayload, ProblemDetails, SandboxError};
+use sandbox_daemon_error::{AgentError as AgentErrorPayload, ProblemDetails, SandboxError};
 use futures::stream;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
diff --git a/engine/packages/sandbox-daemon/tests/agents.rs b/engine/packages/sandbox-daemon/tests/agents.rs
index 795dead..f9c5382 100644
--- a/engine/packages/sandbox-daemon/tests/agents.rs
+++ b/engine/packages/sandbox-daemon/tests/agents.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
-use sandbox_daemon::agents::{AgentId, AgentManager, InstallOptions, SpawnOptions};
-use sandbox_daemon::credentials::{extract_all_credentials, CredentialExtractionOptions};
+use sandbox_daemon_core::agents::{AgentId, AgentManager, InstallOptions, SpawnOptions};
+use sandbox_daemon_core::credentials::{extract_all_credentials, CredentialExtractionOptions};
 
 fn build_env() -> HashMap<String, String> {
     let options = CredentialExtractionOptions::new();