diff --git a/src/state/trade-log.ts b/src/logging/trade-log.ts
similarity index 100%
rename from src/state/trade-log.ts
rename to src/logging/trade-log.ts
diff --git a/src/core/maker-engine.ts b/src/strategy/maker-engine.ts
similarity index 98%
rename from src/core/maker-engine.ts
rename to src/strategy/maker-engine.ts
index 4ac14fe..199dcd1 100644
--- a/src/core/maker-engine.ts
+++ b/src/strategy/maker-engine.ts
@@ -7,7 +7,7 @@ import type {
   AsterTicker,
 } from "../exchanges/types";
 import { roundDownToTick } from "../utils/math";
-import { createTradeLog, type TradeLogEntry } from "../state/trade-log";
+import { createTradeLog, type TradeLogEntry } from "../logging/trade-log";
 import { isUnknownOrderError, isRateLimitError } from "../utils/errors";
 import { getPosition, type PositionSnapshot } from "../utils/strategy";
 import { computePositionPnl } from "../utils/pnl";
@@ -17,11 +17,11 @@ import {
   marketClose,
   placeOrder,
   unlockOperating,
-} from "./order-coordinator";
-import type { OrderLockMap, OrderPendingMap, OrderTimerMap } from "./order-coordinator";
-import { makeOrderPlan } from "./lib/order-plan";
-import { safeCancelOrder } from "./lib/orders";
-import { RateLimitController } from "./lib/rate-limit";
+} from "../core/order-coordinator";
+import type { OrderLockMap, OrderPendingMap, OrderTimerMap } from "../core/order-coordinator";
+import { makeOrderPlan } from "../core/lib/order-plan";
+import { safeCancelOrder } from "../core/lib/orders";
+import { RateLimitController } from "../core/lib/rate-limit";
 
 interface DesiredOrder {
   side: "BUY" | "SELL";
diff --git a/src/core/offset-maker-engine.ts b/src/strategy/offset-maker-engine.ts
similarity index 98%
rename from src/core/offset-maker-engine.ts
rename to src/strategy/offset-maker-engine.ts
index 0b7d0b1..adedf5e 100644
--- a/src/core/offset-maker-engine.ts
+++ b/src/strategy/offset-maker-engine.ts
@@ -7,7 +7,7 @@ import type {
   AsterTicker,
 } from "../exchanges/types";
 import { roundDownToTick } from "../utils/math";
-import { createTradeLog } from "../state/trade-log";
+import { createTradeLog } from "../logging/trade-log";
 import { isUnknownOrderError, isRateLimitError } from "../utils/errors";
 import { getPosition, type PositionSnapshot } from "../utils/strategy";
 import { computeDepthStats } from "../utils/depth";
@@ -18,12 +18,12 @@ import {
   marketClose,
   placeOrder,
   unlockOperating,
-} from "./order-coordinator";
-import type { OrderLockMap, OrderPendingMap, OrderTimerMap } from "./order-coordinator";
+} from "../core/order-coordinator";
+import type { OrderLockMap, OrderPendingMap, OrderTimerMap } from "../core/order-coordinator";
 import type { MakerEngineSnapshot } from "./maker-engine";
-import { makeOrderPlan } from "./lib/order-plan";
-import { safeCancelOrder } from "./lib/orders";
-import { RateLimitController } from "./lib/rate-limit";
+import { makeOrderPlan } from "../core/lib/order-plan";
+import { safeCancelOrder } from "../core/lib/orders";
+import { RateLimitController } from "../core/lib/rate-limit";
 
 interface DesiredOrder {
   side: "BUY" | "SELL";
diff --git a/src/core/trend-engine.ts b/src/strategy/trend-engine.ts
similarity index 99%
rename from src/core/trend-engine.ts
rename to src/strategy/trend-engine.ts
index aa14362..652bdb8 100644
--- a/src/core/trend-engine.ts
+++ b/src/strategy/trend-engine.ts
@@ -24,14 +24,14 @@ import {
   placeStopLossOrder,
   placeTrailingStopOrder,
   unlockOperating,
-} from "./order-coordinator";
-import type { OrderLockMap, OrderPendingMap, OrderTimerMap } from "./order-coordinator";
+} from "../core/order-coordinator";
+import type { OrderLockMap, OrderPendingMap, OrderTimerMap } from "../core/order-coordinator";
 import { extractMessage, isUnknownOrderError } from "../utils/errors";
 import { roundDownToTick } from "../utils/math";
-import { createTradeLog, type TradeLogEntry } from "../state/trade-log";
+import { createTradeLog, type TradeLogEntry } from "../logging/trade-log";
 import { decryptCopyright } from "../utils/copyright";
 import { isRateLimitError } from "../utils/errors";
-import { RateLimitController } from "./lib/rate-limit";
+import { RateLimitController } from "../core/lib/rate-limit";
 
 export interface TrendEngineSnapshot {
   ready: boolean;
diff --git a/src/ui/MakerApp.tsx b/src/ui/MakerApp.tsx
index 7ac936c..fa03b61 100644
--- a/src/ui/MakerApp.tsx
+++ b/src/ui/MakerApp.tsx
@@ -6,7 +6,7 @@ import {
   getExchangeDisplayName,
   resolveExchangeId,
 } from "../exchanges/create-adapter";
-import { MakerEngine, type MakerEngineSnapshot } from "../core/maker-engine";
+import { MakerEngine, type MakerEngineSnapshot } from "../strategy/maker-engine";
 import { DataTable, type TableColumn } from "./components/DataTable";
 import { formatNumber } from "../utils/format";
 
diff --git a/src/ui/OffsetMakerApp.tsx b/src/ui/OffsetMakerApp.tsx
index 600244a..d13e199 100644
--- a/src/ui/OffsetMakerApp.tsx
+++ b/src/ui/OffsetMakerApp.tsx
@@ -6,7 +6,7 @@ import {
   getExchangeDisplayName,
   resolveExchangeId,
 } from "../exchanges/create-adapter";
-import { OffsetMakerEngine, type OffsetMakerEngineSnapshot } from "../core/offset-maker-engine";
+import { OffsetMakerEngine, type OffsetMakerEngineSnapshot } from "../strategy/offset-maker-engine";
 import { DataTable, type TableColumn } from "./components/DataTable";
 import { formatNumber } from "../utils/format";
 
diff --git a/src/ui/TrendApp.tsx b/src/ui/TrendApp.tsx
index 8cd962f..5696ef6 100644
--- a/src/ui/TrendApp.tsx
+++ b/src/ui/TrendApp.tsx
@@ -6,7 +6,7 @@ import {
   getExchangeDisplayName,
   resolveExchangeId,
 } from "../exchanges/create-adapter";
-import { TrendEngine, type TrendEngineSnapshot } from "../core/trend-engine";
+import { TrendEngine, type TrendEngineSnapshot } from "../strategy/trend-engine";
 import { formatNumber } from "../utils/format";
 import { DataTable, type TableColumn } from "./components/DataTable";