diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml
index c01f408628..302cd36229 100644
--- a/.github/workflows/style.yml
+++ b/.github/workflows/style.yml
@@ -43,6 +43,10 @@ jobs:
         if: steps.changed-files.outputs.any_changed == 'true'
         run: uv sync --project api --dev
 
+      - name: Run Import Linter
+        if: steps.changed-files.outputs.any_changed == 'true'
+        run: uv run --directory api --dev lint-imports
+
       - name: Run Basedpyright Checks
         if: steps.changed-files.outputs.any_changed == 'true'
         run: dev/basedpyright-check
diff --git a/api/.importlinter b/api/.importlinter
index 4380e8c18e..9a593c288a 100644
--- a/api/.importlinter
+++ b/api/.importlinter
@@ -22,14 +22,15 @@ containers =
 ignore_imports =
     core.workflow.nodes.base.node -> core.workflow.graph_events
     core.workflow.nodes.iteration.iteration_node -> core.workflow.graph_events
+    core.workflow.nodes.loop.loop_node -> core.workflow.graph_events
+
+    core.workflow.nodes.node_factory -> core.workflow.graph
     core.workflow.nodes.iteration.iteration_node -> core.workflow.graph_engine
     core.workflow.nodes.iteration.iteration_node -> core.workflow.graph
     core.workflow.nodes.iteration.iteration_node -> core.workflow.graph_engine.command_channels
-    core.workflow.nodes.loop.loop_node -> core.workflow.graph_events
     core.workflow.nodes.loop.loop_node -> core.workflow.graph_engine
     core.workflow.nodes.loop.loop_node -> core.workflow.graph
     core.workflow.nodes.loop.loop_node -> core.workflow.graph_engine.command_channels
-    core.workflow.nodes.node_factory -> core.workflow.graph
 
 [importlinter:contract:rsc]
 name = RSC
@@ -59,7 +60,7 @@ layers =
     event_management
     error_handling
     graph_traversal
-    state_management
+    graph_state_manager
     worker_management
     domain
 containers =
@@ -86,14 +87,6 @@ forbidden_modules =
     core.workflow.graph_engine.command_processing
     core.workflow.graph_engine.event_management
 
-[importlinter:contract:error-handling-strategies]
-name = Error Handling Strategies
-type = independence
-modules =
-    core.workflow.graph_engine.error_handling.abort_strategy
-    core.workflow.graph_engine.error_handling.retry_strategy
-    core.workflow.graph_engine.error_handling.fail_branch_strategy
-    core.workflow.graph_engine.error_handling.default_value_strategy
 
 [importlinter:contract:graph-traversal-components]
 name = Graph Traversal Components
diff --git a/dev/reformat b/dev/reformat
index 258b47b3bf..6966267193 100755
--- a/dev/reformat
+++ b/dev/reformat
@@ -5,6 +5,9 @@ set -x
 SCRIPT_DIR="$(dirname "$(realpath "$0")")"
 cd "$SCRIPT_DIR/.."
 
+# Import linter
+uv run --directory api --dev lint-imports
+
 # run ruff linter
 uv run --directory api --dev ruff check --fix ./