diff --git a/packages/fabric/domain/package.json b/packages/fabric/domain/package.json
index c44c9e6..0309310 100644
--- a/packages/fabric/domain/package.json
+++ b/packages/fabric/domain/package.json
@@ -9,7 +9,7 @@
   "private": true,
   "packageManager": "yarn@4.1.1",
   "devDependencies": {
-    "@fabric/store-sqlite": "workspace:^",
+    "@fabric/sqlite-store": "workspace:^",
     "typescript": "^5.6.2",
     "vitest": "^2.1.1"
   },
diff --git a/packages/fabric/domain/src/models/state-store.spec.ts b/packages/fabric/domain/src/models/state-store.spec.ts
index 4be04f3..f42c899 100644
--- a/packages/fabric/domain/src/models/state-store.spec.ts
+++ b/packages/fabric/domain/src/models/state-store.spec.ts
@@ -1,5 +1,5 @@
 import { isError, Run } from "@fabric/core";
-import { SQLiteStorageDriver } from "@fabric/store-sqlite";
+import { SQLiteStorageDriver } from "@fabric/sqlite-store";
 import {
   afterEach,
   beforeEach,
diff --git a/packages/fabric/store-sqlite/package.json b/packages/fabric/store-sqlite/package.json
index 813d1f6..b7f2c6f 100644
--- a/packages/fabric/store-sqlite/package.json
+++ b/packages/fabric/store-sqlite/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@fabric/store-sqlite",
+  "name": "@fabric/sqlite-store",
   "type": "module",
   "module": "dist/index.js",
   "main": "dist/index.js",
diff --git a/packages/fabric/store-sqlite/src/sqlite-driver.ts b/packages/fabric/store-sqlite/src/sqlite-driver.ts
index 1ceee8f..2bb4e16 100644
--- a/packages/fabric/store-sqlite/src/sqlite-driver.ts
+++ b/packages/fabric/store-sqlite/src/sqlite-driver.ts
@@ -11,16 +11,16 @@ import {
   StorageDriver,
   StoreQueryError,
 } from "@fabric/domain";
-import { filterToParams, filterToSQL } from "./filter-to-sql.js";
-import { modelToSql } from "./model-to-sql.js";
+import { filterToParams, filterToSQL } from "./sqlite/filter-to-sql.js";
+import { modelToSql } from "./sqlite/model-to-sql.js";
 import {
   keyToParam,
   recordToSQLKeyParams,
   recordToSQLKeys,
   recordToSQLParams,
   recordToSQLSet,
-} from "./record-utils.js";
-import { transformRow } from "./sql-to-value.js";
+} from "./sqlite/record-utils.js";
+import { transformRow } from "./sqlite/sql-to-value.js";
 import { SQLiteDatabase } from "./sqlite/sqlite-wrapper.js";
 
 export class SQLiteStorageDriver implements StorageDriver {
diff --git a/packages/fabric/store-sqlite/src/filter-to-sql.spec.ts b/packages/fabric/store-sqlite/src/sqlite/filter-to-sql.spec.ts
similarity index 100%
rename from packages/fabric/store-sqlite/src/filter-to-sql.spec.ts
rename to packages/fabric/store-sqlite/src/sqlite/filter-to-sql.spec.ts
diff --git a/packages/fabric/store-sqlite/src/filter-to-sql.ts b/packages/fabric/store-sqlite/src/sqlite/filter-to-sql.ts
similarity index 100%
rename from packages/fabric/store-sqlite/src/filter-to-sql.ts
rename to packages/fabric/store-sqlite/src/sqlite/filter-to-sql.ts
diff --git a/packages/fabric/store-sqlite/src/model-to-sql.spec.ts b/packages/fabric/store-sqlite/src/sqlite/model-to-sql.spec.ts
similarity index 100%
rename from packages/fabric/store-sqlite/src/model-to-sql.spec.ts
rename to packages/fabric/store-sqlite/src/sqlite/model-to-sql.spec.ts
diff --git a/packages/fabric/store-sqlite/src/model-to-sql.ts b/packages/fabric/store-sqlite/src/sqlite/model-to-sql.ts
similarity index 88%
rename from packages/fabric/store-sqlite/src/model-to-sql.ts
rename to packages/fabric/store-sqlite/src/sqlite/model-to-sql.ts
index 4f2bee6..5b5129d 100644
--- a/packages/fabric/store-sqlite/src/model-to-sql.ts
+++ b/packages/fabric/store-sqlite/src/sqlite/model-to-sql.ts
@@ -1,8 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { Variant, VariantTag } from "@fabric/core";
 import { Collection, FieldDefinition, getTargetKey } from "@fabric/domain";
-import { EmbeddedField } from "@fabric/domain/dist/models/fields/embedded.js";
-import { TimestampField } from "@fabric/domain/dist/models/fields/timestamp.js";
 
 type FieldSQLDefinitionMap = {
   [K in FieldDefinition[VariantTag]]: (
@@ -42,10 +40,10 @@ const FieldSQLDefinitionMap: FieldSQLDefinitionMap = {
   DecimalField: (n, f): string => {
     return [n, "REAL", modifiersFromOpts(f)].join(" ");
   },
-  TimestampField: (n, f: TimestampField): string => {
+  TimestampField: (n, f): string => {
     return [n, "NUMERIC", modifiersFromOpts(f)].join(" ");
   },
-  EmbeddedField: (n, f: EmbeddedField): string => {
+  EmbeddedField: (n, f): string => {
     return [n, "TEXT", modifiersFromOpts(f)].join(" ");
   },
 };
diff --git a/packages/fabric/store-sqlite/src/record-utils.ts b/packages/fabric/store-sqlite/src/sqlite/record-utils.ts
similarity index 100%
rename from packages/fabric/store-sqlite/src/record-utils.ts
rename to packages/fabric/store-sqlite/src/sqlite/record-utils.ts
diff --git a/packages/fabric/store-sqlite/src/sql-to-value.ts b/packages/fabric/store-sqlite/src/sqlite/sql-to-value.ts
similarity index 100%
rename from packages/fabric/store-sqlite/src/sql-to-value.ts
rename to packages/fabric/store-sqlite/src/sqlite/sql-to-value.ts
diff --git a/packages/fabric/store-sqlite/src/value-to-sql.ts b/packages/fabric/store-sqlite/src/sqlite/value-to-sql.ts
similarity index 100%
rename from packages/fabric/store-sqlite/src/value-to-sql.ts
rename to packages/fabric/store-sqlite/src/sqlite/value-to-sql.ts
diff --git a/yarn.lock b/yarn.lock
index 80b024b..b8b8d60 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -419,16 +419,16 @@ __metadata:
   resolution: "@fabric/domain@workspace:packages/fabric/domain"
   dependencies:
     "@fabric/core": "workspace:^"
-    "@fabric/store-sqlite": "workspace:^"
+    "@fabric/sqlite-store": "workspace:^"
     decimal.js: "npm:^10.4.3"
     typescript: "npm:^5.6.2"
     vitest: "npm:^2.1.1"
   languageName: unknown
   linkType: soft
 
-"@fabric/store-sqlite@workspace:^, @fabric/store-sqlite@workspace:packages/fabric/store-sqlite":
+"@fabric/sqlite-store@workspace:^, @fabric/sqlite-store@workspace:packages/fabric/store-sqlite":
   version: 0.0.0-use.local
-  resolution: "@fabric/store-sqlite@workspace:packages/fabric/store-sqlite"
+  resolution: "@fabric/sqlite-store@workspace:packages/fabric/store-sqlite"
   dependencies:
     "@fabric/core": "workspace:^"
     "@fabric/domain": "workspace:^"