diff --git a/crates/goose-cli/src/session.rs b/crates/goose-cli/src/session.rs
index 1a94046da1..adba62bb4a 100644
--- a/crates/goose-cli/src/session.rs
+++ b/crates/goose-cli/src/session.rs
@@ -7,10 +7,10 @@ use std::path::PathBuf;
 
 use crate::agents::agent::Agent;
 use crate::prompt::{InputType, Prompt};
-use crate::systems::goose_hints::GooseHintsSystem;
 use goose::developer::DeveloperSystem;
 use goose::models::message::{Message, MessageContent};
 use goose::models::role::Role;
+use goose::systems::goose_hints::GooseHintsSystem;
 
 // File management functions
 pub fn ensure_session_dir() -> Result<PathBuf> {
diff --git a/crates/goose-cli/src/systems/mod.rs b/crates/goose-cli/src/systems/mod.rs
index 3b243d8862..0d60bb1235 100644
--- a/crates/goose-cli/src/systems/mod.rs
+++ b/crates/goose-cli/src/systems/mod.rs
@@ -1,2 +1 @@
-pub mod goose_hints;
 pub mod system_handler;
diff --git a/crates/goose-cli/src/systems/goose_hints.rs b/crates/goose/src/systems/goose_hints.rs
similarity index 93%
rename from crates/goose-cli/src/systems/goose_hints.rs
rename to crates/goose/src/systems/goose_hints.rs
index c9013a307c..c4c90c4773 100644
--- a/crates/goose-cli/src/systems/goose_hints.rs
+++ b/crates/goose/src/systems/goose_hints.rs
@@ -4,11 +4,11 @@ use serde_json::Value;
 use std::collections::HashMap;
 use std::fs;
 
-use goose::errors::{AgentError, AgentResult};
-use goose::models::content::Content;
-use goose::models::tool::Tool;
-use goose::models::tool::ToolCall;
-use goose::systems::System;
+use crate::errors::{AgentError, AgentResult};
+use crate::models::content::Content;
+use crate::models::tool::Tool;
+use crate::models::tool::ToolCall;
+use crate::systems::System;
 
 pub struct GooseHintsSystem {
     instructions: String,
diff --git a/crates/goose/src/systems/mod.rs b/crates/goose/src/systems/mod.rs
new file mode 100644
index 0000000000..142a9c3665
--- /dev/null
+++ b/crates/goose/src/systems/mod.rs
@@ -0,0 +1,4 @@
+mod system;
+pub use system::System;
+
+pub mod goose_hints;
diff --git a/crates/goose/src/systems.rs b/crates/goose/src/systems/system.rs
similarity index 100%
rename from crates/goose/src/systems.rs
rename to crates/goose/src/systems/system.rs