diff --git a/lib/crates/fabro-workflows/src/core_adapter/mod.rs b/lib/crates/fabro-workflows/src/core_adapter/mod.rs
deleted file mode 100644
index 3f22a99e6..000000000
--- a/lib/crates/fabro-workflows/src/core_adapter/mod.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-pub mod graph;
-pub mod handler;
-pub mod lifecycle;
-
-pub use graph::{WorkflowEdge, WorkflowGraph, WorkflowNode};
-pub use handler::WorkflowNodeHandler;
-pub use lifecycle::WorkflowLifecycle;
diff --git a/lib/crates/fabro-workflows/src/core_adapter/graph.rs b/lib/crates/fabro-workflows/src/graph.rs
similarity index 100%
rename from lib/crates/fabro-workflows/src/core_adapter/graph.rs
rename to lib/crates/fabro-workflows/src/graph.rs
diff --git a/lib/crates/fabro-workflows/src/lib.rs b/lib/crates/fabro-workflows/src/lib.rs
index a612aedf4..d30fb14c7 100644
--- a/lib/crates/fabro-workflows/src/lib.rs
+++ b/lib/crates/fabro-workflows/src/lib.rs
@@ -95,7 +95,9 @@ pub mod checkpoint;
 pub mod conclusion;
 pub mod condition;
 pub mod context;
-pub mod core_adapter;
+pub mod graph;
+pub mod lifecycle;
+pub mod node_handler;
 pub mod cost;
 pub mod devcontainer_bridge;
 pub mod error;
diff --git a/lib/crates/fabro-workflows/src/core_adapter/lifecycle/artifact.rs b/lib/crates/fabro-workflows/src/lifecycle/artifact.rs
similarity index 98%
rename from lib/crates/fabro-workflows/src/core_adapter/lifecycle/artifact.rs
rename to lib/crates/fabro-workflows/src/lifecycle/artifact.rs
index 1e88430c8..d924ba6ac 100644
--- a/lib/crates/fabro-workflows/src/core_adapter/lifecycle/artifact.rs
+++ b/lib/crates/fabro-workflows/src/lifecycle/artifact.rs
@@ -8,8 +8,8 @@ use fabro_core::lifecycle::{AttemptContext, AttemptResultContext, RunLifecycle};
 use fabro_core::outcome::NodeResult;
 use fabro_core::state::RunState;
 
-use super::super::graph::WorkflowGraph;
-use super::super::WorkflowNode;
+use crate::graph::WorkflowGraph;
+use crate::graph::WorkflowNode;
 use crate::artifact::{offload_large_values, sync_artifacts_to_env, ArtifactStore};
 use crate::event::{EventEmitter, RunNoticeLevel, WorkflowRunEvent};
 use crate::outcome::StageUsage;
diff --git a/lib/crates/fabro-workflows/src/core_adapter/lifecycle/auto_status.rs b/lib/crates/fabro-workflows/src/lifecycle/auto_status.rs
similarity index 93%
rename from lib/crates/fabro-workflows/src/core_adapter/lifecycle/auto_status.rs
rename to lib/crates/fabro-workflows/src/lifecycle/auto_status.rs
index a58df4f0a..33c1be406 100644
--- a/lib/crates/fabro-workflows/src/core_adapter/lifecycle/auto_status.rs
+++ b/lib/crates/fabro-workflows/src/lifecycle/auto_status.rs
@@ -4,8 +4,8 @@ use fabro_core::lifecycle::RunLifecycle;
 use fabro_core::outcome::NodeResult;
 use fabro_core::state::RunState;
 
-use super::super::graph::WorkflowGraph;
-use super::super::WorkflowNode;
+use crate::graph::WorkflowGraph;
+use crate::graph::WorkflowNode;
 use crate::outcome::{StageStatus, StageUsage};
 
 type WfRunState = RunState<Option<StageUsage>>;
diff --git a/lib/crates/fabro-workflows/src/core_adapter/lifecycle/circuit_breaker.rs b/lib/crates/fabro-workflows/src/lifecycle/circuit_breaker.rs
similarity index 98%
rename from lib/crates/fabro-workflows/src/core_adapter/lifecycle/circuit_breaker.rs
rename to lib/crates/fabro-workflows/src/lifecycle/circuit_breaker.rs
index bc6e36c94..90fe85fc3 100644
--- a/lib/crates/fabro-workflows/src/core_adapter/lifecycle/circuit_breaker.rs
+++ b/lib/crates/fabro-workflows/src/lifecycle/circuit_breaker.rs
@@ -8,8 +8,8 @@ use fabro_core::lifecycle::{EdgeContext, EdgeDecision, RunLifecycle};
 use fabro_core::outcome::NodeResult;
 use fabro_core::state::RunState;
 
-use super::super::graph::WorkflowGraph;
-use super::super::WorkflowNode;
+use crate::graph::WorkflowGraph;
+use crate::graph::WorkflowNode;
 use crate::error::{FailureCategory, FailureSignature};
 use crate::graph_ops::classify_outcome;
 use crate::outcome::{OutcomeExt, StageStatus, StageUsage};
diff --git a/lib/crates/fabro-workflows/src/core_adapter/lifecycle/disk.rs b/lib/crates/fabro-workflows/src/lifecycle/disk.rs
similarity index 97%
rename from lib/crates/fabro-workflows/src/core_adapter/lifecycle/disk.rs
rename to lib/crates/fabro-workflows/src/lifecycle/disk.rs
index 1a2b16324..8d815bc47 100644
--- a/lib/crates/fabro-workflows/src/core_adapter/lifecycle/disk.rs
+++ b/lib/crates/fabro-workflows/src/lifecycle/disk.rs
@@ -8,8 +8,8 @@ use fabro_core::lifecycle::RunLifecycle;
 use fabro_core::outcome::NodeResult;
 use fabro_core::state::RunState;
 
-use super::super::graph::WorkflowGraph;
-use super::super::WorkflowNode;
+use crate::graph::WorkflowGraph;
+use crate::graph::WorkflowNode;
 use super::circuit_breaker::CircuitBreakerLifecycle;
 use crate::checkpoint::Checkpoint;
 use crate::event::{EventEmitter, RunNoticeLevel, WorkflowRunEvent};
diff --git a/lib/crates/fabro-workflows/src/core_adapter/lifecycle/event.rs b/lib/crates/fabro-workflows/src/lifecycle/event.rs
similarity index 99%
rename from lib/crates/fabro-workflows/src/core_adapter/lifecycle/event.rs
rename to lib/crates/fabro-workflows/src/lifecycle/event.rs
index 66d285921..97911983a 100644
--- a/lib/crates/fabro-workflows/src/core_adapter/lifecycle/event.rs
+++ b/lib/crates/fabro-workflows/src/lifecycle/event.rs
@@ -8,8 +8,8 @@ use fabro_core::lifecycle::{AttemptContext, AttemptResultContext, EdgeContext, R
 use fabro_core::outcome::NodeResult;
 use fabro_core::state::RunState;
 
-use super::super::graph::WorkflowGraph;
-use super::super::WorkflowNode;
+use crate::graph::WorkflowGraph;
+use crate::graph::WorkflowNode;
 use super::git::GitCheckpointResult;
 use crate::artifact::ArtifactStore;
 use crate::event::{EventEmitter, WorkflowRunEvent};
diff --git a/lib/crates/fabro-workflows/src/core_adapter/lifecycle/fidelity.rs b/lib/crates/fabro-workflows/src/lifecycle/fidelity.rs
similarity index 98%
rename from lib/crates/fabro-workflows/src/core_adapter/lifecycle/fidelity.rs
rename to lib/crates/fabro-workflows/src/lifecycle/fidelity.rs
index 088e852c4..319a17909 100644
--- a/lib/crates/fabro-workflows/src/core_adapter/lifecycle/fidelity.rs
+++ b/lib/crates/fabro-workflows/src/lifecycle/fidelity.rs
@@ -6,8 +6,8 @@ use fabro_core::graph::NodeSpec;
 use fabro_core::lifecycle::{EdgeContext, NodeDecision, RunLifecycle};
 use fabro_core::state::RunState;
 
-use super::super::graph::WorkflowGraph;
-use super::super::WorkflowNode;
+use crate::graph::WorkflowGraph;
+use crate::graph::WorkflowNode;
 use crate::context::keys;
 use crate::graph_ops::{resolve_fidelity, resolve_thread_id};
 use crate::outcome::StageUsage;
diff --git a/lib/crates/fabro-workflows/src/core_adapter/lifecycle/git.rs b/lib/crates/fabro-workflows/src/lifecycle/git.rs
similarity index 99%
rename from lib/crates/fabro-workflows/src/core_adapter/lifecycle/git.rs
rename to lib/crates/fabro-workflows/src/lifecycle/git.rs
index 14d1d54e2..45ebe6bb4 100644
--- a/lib/crates/fabro-workflows/src/core_adapter/lifecycle/git.rs
+++ b/lib/crates/fabro-workflows/src/lifecycle/git.rs
@@ -9,8 +9,8 @@ use fabro_core::lifecycle::RunLifecycle;
 use fabro_core::outcome::NodeResult;
 use fabro_core::state::RunState;
 
-use super::super::graph::WorkflowGraph;
-use super::super::WorkflowNode;
+use crate::graph::WorkflowGraph;
+use crate::graph::WorkflowNode;
 use crate::artifact::ArtifactStore;
 use crate::event::{EventEmitter, RunNoticeLevel, WorkflowRunEvent};
 use crate::outcome::{Outcome, StageStatus, StageUsage};
diff --git a/lib/crates/fabro-workflows/src/core_adapter/lifecycle/hook.rs b/lib/crates/fabro-workflows/src/lifecycle/hook.rs
similarity index 98%
rename from lib/crates/fabro-workflows/src/core_adapter/lifecycle/hook.rs
rename to lib/crates/fabro-workflows/src/lifecycle/hook.rs
index 1a73cf51c..3f52b63fb 100644
--- a/lib/crates/fabro-workflows/src/core_adapter/lifecycle/hook.rs
+++ b/lib/crates/fabro-workflows/src/lifecycle/hook.rs
@@ -10,8 +10,8 @@ use fabro_core::lifecycle::{
 use fabro_core::outcome::NodeResult;
 use fabro_core::state::RunState;
 
-use super::super::graph::WorkflowGraph;
-use super::super::WorkflowNode;
+use crate::graph::WorkflowGraph;
+use crate::graph::WorkflowNode;
 use crate::graph_ops::set_hook_node;
 use crate::outcome::{Outcome, OutcomeExt, StageStatus, StageUsage};
 use fabro_hooks::{HookContext, HookDecision, HookEvent, HookRunner};
diff --git a/lib/crates/fabro-workflows/src/core_adapter/lifecycle/mod.rs b/lib/crates/fabro-workflows/src/lifecycle/mod.rs
similarity index 99%
rename from lib/crates/fabro-workflows/src/core_adapter/lifecycle/mod.rs
rename to lib/crates/fabro-workflows/src/lifecycle/mod.rs
index d547393cf..d0fdb7c0a 100644
--- a/lib/crates/fabro-workflows/src/core_adapter/lifecycle/mod.rs
+++ b/lib/crates/fabro-workflows/src/lifecycle/mod.rs
@@ -23,8 +23,8 @@ use fabro_core::lifecycle::{
 use fabro_core::outcome::NodeResult;
 use fabro_core::state::RunState;
 
-use super::graph::WorkflowGraph;
-use super::WorkflowNode;
+use crate::graph::WorkflowGraph;
+use crate::graph::WorkflowNode;
 use crate::artifact::ArtifactStore;
 use crate::context;
 use crate::event::EventEmitter;
diff --git a/lib/crates/fabro-workflows/src/core_adapter/handler.rs b/lib/crates/fabro-workflows/src/node_handler.rs
similarity index 98%
rename from lib/crates/fabro-workflows/src/core_adapter/handler.rs
rename to lib/crates/fabro-workflows/src/node_handler.rs
index 922d1bda1..5b1250d65 100644
--- a/lib/crates/fabro-workflows/src/core_adapter/handler.rs
+++ b/lib/crates/fabro-workflows/src/node_handler.rs
@@ -12,8 +12,8 @@ use fabro_core::retry::RetryPolicy as CoreRetryPolicy;
 
 use crate::context::Context;
 
-use super::graph::WorkflowGraph;
-use super::WorkflowNode;
+use crate::graph::WorkflowGraph;
+use crate::graph::WorkflowNode;
 use crate::handler::{format_panic_message, EngineServices};
 use crate::outcome::{Outcome, StageStatus};
 use crate::{graph_ops, run_dir};
@@ -147,7 +147,7 @@ mod tests {
     use fabro_graphviz::graph::types::{Edge, Graph, Node};
     use fabro_graphviz::graph::AttrValue;
 
-    use super::super::graph::WorkflowGraph;
+    use crate::graph::WorkflowGraph;
     use super::*;
 
     /// Minimal spike handler that always succeeds — proves the trait plumbing.
diff --git a/lib/crates/fabro-workflows/src/pipeline/execute.rs b/lib/crates/fabro-workflows/src/pipeline/execute.rs
index 20032957d..3fe205f56 100644
--- a/lib/crates/fabro-workflows/src/pipeline/execute.rs
+++ b/lib/crates/fabro-workflows/src/pipeline/execute.rs
@@ -6,7 +6,9 @@ use fabro_core::state::RunState;
 use tokio_util::sync::CancellationToken;
 
 use crate::context::{self, Context};
-use crate::core_adapter::{WorkflowGraph, WorkflowLifecycle, WorkflowNodeHandler};
+use crate::graph::WorkflowGraph;
+use crate::lifecycle::WorkflowLifecycle;
+use crate::node_handler::WorkflowNodeHandler;
 use crate::error::FabroError;
 use crate::handler::EngineServices;
 use crate::outcome::{Outcome, StageStatus};