107 files changed, 58 insertions, 58 deletions

diff --git a/cmd/index-pack/main.go b/cmd/index-pack/main.go
index 0b52add2..3cc91075 100644
--- a/cmd/index-pack/main.go
+++ b/cmd/index-pack/main.go
@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 
 	objectid "codeberg.org/lindenii/furgit/object/id"
-	"codeberg.org/lindenii/furgit/objectstore"
+	"codeberg.org/lindenii/furgit/object/store"
 	"codeberg.org/lindenii/furgit/packfile/ingest"
 	"codeberg.org/lindenii/furgit/repository"
 )
diff --git a/commitquery/ancestor_unit_test.go b/commitquery/ancestor_unit_test.go
index 6cad71aa..bb397fa5 100644
--- a/commitquery/ancestor_unit_test.go
+++ b/commitquery/ancestor_unit_test.go
@@ -9,8 +9,8 @@ import (
 	"codeberg.org/lindenii/furgit/internal/testgit"
 	"codeberg.org/lindenii/furgit/object"
 	objectid "codeberg.org/lindenii/furgit/object/id"
+	"codeberg.org/lindenii/furgit/object/store/memory"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
-	"codeberg.org/lindenii/furgit/objectstore/memory"
 
 	"codeberg.org/lindenii/furgit/commitquery"
 )
diff --git a/commitquery/context.go b/commitquery/context.go
index 80b9ed33..9cbf9399 100644
--- a/commitquery/context.go
+++ b/commitquery/context.go
@@ -4,7 +4,7 @@ package commitquery
 import (
 	commitgraphread "codeberg.org/lindenii/furgit/commitgraph/read"
 	objectid "codeberg.org/lindenii/furgit/object/id"
-	"codeberg.org/lindenii/furgit/objectstore"
+	"codeberg.org/lindenii/furgit/object/store"
 )
 
 // Query owns the mutable node arena for commit-domain queries over one object
diff --git a/commitquery/mergebase_unit_test.go b/commitquery/mergebase_unit_test.go
index 9ae8dae2..3c8fcef5 100644
--- a/commitquery/mergebase_unit_test.go
+++ b/commitquery/mergebase_unit_test.go
@@ -12,8 +12,8 @@ import (
 	"codeberg.org/lindenii/furgit/internal/testgit"
 	"codeberg.org/lindenii/furgit/object"
 	objectid "codeberg.org/lindenii/furgit/object/id"
+	"codeberg.org/lindenii/furgit/object/store/memory"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
-	"codeberg.org/lindenii/furgit/objectstore/memory"
 )
 
 // commitBody serializes one minimal commit body.
diff --git a/commitquery/oid.go b/commitquery/oid.go
index 897b8176..f412f699 100644
--- a/commitquery/oid.go
+++ b/commitquery/oid.go
@@ -8,8 +8,8 @@ import (
 	"codeberg.org/lindenii/furgit/internal/peel"
 	"codeberg.org/lindenii/furgit/object"
 	objectid "codeberg.org/lindenii/furgit/object/id"
+	"codeberg.org/lindenii/furgit/object/store"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
-	"codeberg.org/lindenii/furgit/objectstore"
 )
 
 func (query *Query) id(idx nodeIndex) objectid.ObjectID {
diff --git a/diff/trees/diff_test.go b/diff/trees/diff_test.go
index 4c75d487..4242ba5d 100644
--- a/diff/trees/diff_test.go
+++ b/diff/trees/diff_test.go
@@ -8,8 +8,8 @@ import (
 	"codeberg.org/lindenii/furgit/internal/testgit"
 	"codeberg.org/lindenii/furgit/object"
 	objectid "codeberg.org/lindenii/furgit/object/id"
+	"codeberg.org/lindenii/furgit/object/store/loose"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
-	"codeberg.org/lindenii/furgit/objectstore/loose"
 )
 
 func TestDiffComplexNestedChanges(t *testing.T) {
diff --git a/internal/peel/peel.go b/internal/peel/peel.go
index 9114c5be..8cfc2117 100644
--- a/internal/peel/peel.go
+++ b/internal/peel/peel.go
@@ -7,8 +7,8 @@ import (
 	giterrors "codeberg.org/lindenii/furgit/errors"
 	"codeberg.org/lindenii/furgit/object"
 	objectid "codeberg.org/lindenii/furgit/object/id"
+	"codeberg.org/lindenii/furgit/object/store"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
-	"codeberg.org/lindenii/furgit/objectstore"
 )
 
 // ToCommit peels annotated tags transitively until a commit is reached.
diff --git a/internal/testgit/repo_open_object_store.go b/internal/testgit/repo_open_object_store.go
index aac71d60..91305aa6 100644
--- a/internal/testgit/repo_open_object_store.go
+++ b/internal/testgit/repo_open_object_store.go
@@ -3,7 +3,7 @@ package testgit
 import (
 	"testing"
 
-	"codeberg.org/lindenii/furgit/objectstore"
+	"codeberg.org/lindenii/furgit/object/store"
 	"codeberg.org/lindenii/furgit/repository"
 )
 
diff --git a/object/resolve/resolver.go b/object/resolve/resolver.go
index 0d67d890..d1affb72 100644
--- a/object/resolve/resolver.go
+++ b/object/resolve/resolver.go
@@ -1,6 +1,6 @@
 package resolve
 
-import "codeberg.org/lindenii/furgit/objectstore"
+import "codeberg.org/lindenii/furgit/object/store"
 
 // Resolver resolves parsed and streamed objects from an object store.
 //
diff --git a/objectstore/chain/bytes.go b/object/store/chain/bytes.go
index ac537e99..d02b30bd 100644
--- a/objectstore/chain/bytes.go
+++ b/object/store/chain/bytes.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	objectid "codeberg.org/lindenii/furgit/object/id"
+	"codeberg.org/lindenii/furgit/object/store"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
-	"codeberg.org/lindenii/furgit/objectstore"
 )
 
 // ReadBytesFull reads a full serialized object from the first backend that has it.
diff --git a/objectstore/chain/chain.go b/object/store/chain/chain.go
index 00e98b91..1a7f4201 100644
--- a/objectstore/chain/chain.go
+++ b/object/store/chain/chain.go
@@ -3,7 +3,7 @@
 package chain
 
 import (
-	"codeberg.org/lindenii/furgit/objectstore"
+	"codeberg.org/lindenii/furgit/object/store"
 )
 
 // Chain queries multiple object databases in order.
diff --git a/objectstore/chain/close.go b/object/store/chain/close.go
index 6bd74565..6bd74565 100644
--- a/objectstore/chain/close.go
+++ b/object/store/chain/close.go
diff --git a/objectstore/chain/header.go b/object/store/chain/header.go
index 3e7d6dd4..e66a5aae 100644
--- a/objectstore/chain/header.go
+++ b/object/store/chain/header.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	objectid "codeberg.org/lindenii/furgit/object/id"
+	"codeberg.org/lindenii/furgit/object/store"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
-	"codeberg.org/lindenii/furgit/objectstore"
 )
 
 // ReadHeader reads object header data from the first backend that has it.
diff --git a/objectstore/chain/new.go b/object/store/chain/new.go
index 887904e3..2cc79b0d 100644
--- a/objectstore/chain/new.go
+++ b/object/store/chain/new.go
@@ -1,6 +1,6 @@
 package chain
 
-import "codeberg.org/lindenii/furgit/objectstore"
+import "codeberg.org/lindenii/furgit/object/store"
 
 // New creates an ordered object database chain.
 //
diff --git a/objectstore/chain/reader.go b/object/store/chain/reader.go
index dc71c5fd..8d650503 100644
--- a/objectstore/chain/reader.go
+++ b/object/store/chain/reader.go
@@ -6,8 +6,8 @@ import (
 	"io"
 
 	objectid "codeberg.org/lindenii/furgit/object/id"
+	"codeberg.org/lindenii/furgit/object/store"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
-	"codeberg.org/lindenii/furgit/objectstore"
 )
 
 // ReadReaderFull reads a full serialized object stream from the first backend that has it.
diff --git a/objectstore/chain/refresh.go b/object/store/chain/refresh.go
index c47352dc..c47352dc 100644
--- a/objectstore/chain/refresh.go
+++ b/object/store/chain/refresh.go
diff --git a/objectstore/chain/size.go b/object/store/chain/size.go
index 34f6234c..bd35139f 100644
--- a/objectstore/chain/size.go
+++ b/object/store/chain/size.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	objectid "codeberg.org/lindenii/furgit/object/id"
-	"codeberg.org/lindenii/furgit/objectstore"
+	"codeberg.org/lindenii/furgit/object/store"
 )
 
 // ReadSize reads object content length from the first backend that has it.
diff --git a/objectstore/loose/helpers_test.go b/object/store/loose/helpers_test.go
index 686bbd88..e69c7e7a 100644
--- a/objectstore/loose/helpers_test.go
+++ b/object/store/loose/helpers_test.go
@@ -8,8 +8,8 @@ import (
 	"codeberg.org/lindenii/furgit/internal/testgit"
 	objectheader "codeberg.org/lindenii/furgit/object/header"
 	objectid "codeberg.org/lindenii/furgit/object/id"
+	"codeberg.org/lindenii/furgit/object/store/loose"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
-	"codeberg.org/lindenii/furgit/objectstore/loose"
 )
 
 func openLooseStore(t *testing.T, testRepo *testgit.TestRepo, algo objectid.Algorithm) *loose.Store {
diff --git a/objectstore/loose/parse.go b/object/store/loose/parse.go
index dfb420ba..dfb420ba 100644
--- a/objectstore/loose/parse.go
+++ b/object/store/loose/parse.go
diff --git a/objectstore/loose/paths.go b/object/store/loose/paths.go
index ca15aa62..e03f5c28 100644
--- a/objectstore/loose/paths.go
+++ b/object/store/loose/paths.go
@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 
 	objectid "codeberg.org/lindenii/furgit/object/id"
-	"codeberg.org/lindenii/furgit/objectstore"
+	"codeberg.org/lindenii/furgit/object/store"
 )
 
 // objectPath returns the loose object path for id relative to the objects root.
diff --git a/objectstore/loose/read_bytes.go b/object/store/loose/read_bytes.go
index 0b6da81b..0b6da81b 100644
--- a/objectstore/loose/read_bytes.go
+++ b/object/store/loose/read_bytes.go
diff --git a/objectstore/loose/read_header.go b/object/store/loose/read_header.go
index 37bf40de..37bf40de 100644
--- a/objectstore/loose/read_header.go
+++ b/object/store/loose/read_header.go
diff --git a/objectstore/loose/read_reader.go b/object/store/loose/read_reader.go
index 29b71627..29b71627 100644
--- a/objectstore/loose/read_reader.go
+++ b/object/store/loose/read_reader.go
diff --git a/objectstore/loose/read_size.go b/object/store/loose/read_size.go
index 2ececc49..2ececc49 100644
--- a/objectstore/loose/read_size.go
+++ b/object/store/loose/read_size.go
diff --git a/objectstore/loose/read_test.go b/object/store/loose/read_test.go
index 515a6dbc..4652670d 100644
--- a/objectstore/loose/read_test.go
+++ b/object/store/loose/read_test.go
@@ -9,9 +9,9 @@ import (
 
 	"codeberg.org/lindenii/furgit/internal/testgit"
 	objectid "codeberg.org/lindenii/furgit/object/id"
+	"codeberg.org/lindenii/furgit/object/store"
+	"codeberg.org/lindenii/furgit/object/store/loose"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
-	"codeberg.org/lindenii/furgit/objectstore"
-	"codeberg.org/lindenii/furgit/objectstore/loose"
 )
 
 func TestLooseStoreReadAgainstGit(t *testing.T) {
diff --git a/objectstore/loose/refresh.go b/object/store/loose/refresh.go
index b720ebc6..b720ebc6 100644
--- a/objectstore/loose/refresh.go
+++ b/object/store/loose/refresh.go
diff --git a/objectstore/loose/store.go b/object/store/loose/store.go
index d8eba84e..d8eba84e 100644
--- a/objectstore/loose/store.go
+++ b/object/store/loose/store.go
diff --git a/objectstore/loose/write_bytes.go b/object/store/loose/write_bytes.go
index ffc65117..ffc65117 100644
--- a/objectstore/loose/write_bytes.go
+++ b/object/store/loose/write_bytes.go
diff --git a/objectstore/loose/write_reader.go b/object/store/loose/write_reader.go
index f686f279..f686f279 100644
--- a/objectstore/loose/write_reader.go
+++ b/object/store/loose/write_reader.go
diff --git a/objectstore/loose/write_temp_object_file.go b/object/store/loose/write_temp_object_file.go
index 1a78db48..1a78db48 100644
--- a/objectstore/loose/write_temp_object_file.go
+++ b/object/store/loose/write_temp_object_file.go
diff --git a/objectstore/loose/write_test.go b/object/store/loose/write_test.go
index 30d8dbdb..30d8dbdb 100644
--- a/objectstore/loose/write_test.go
+++ b/object/store/loose/write_test.go
diff --git a/objectstore/loose/write_writer.go b/object/store/loose/write_writer.go
index 0d6b5b80..0d6b5b80 100644
--- a/objectstore/loose/write_writer.go
+++ b/object/store/loose/write_writer.go
diff --git a/objectstore/loose/write_writer_accept.go b/object/store/loose/write_writer_accept.go
index bf55966a..bf55966a 100644
--- a/objectstore/loose/write_writer_accept.go
+++ b/object/store/loose/write_writer_accept.go
diff --git a/objectstore/loose/write_writer_finalize.go b/object/store/loose/write_writer_finalize.go
index f8dee54d..f8dee54d 100644
--- a/objectstore/loose/write_writer_finalize.go
+++ b/object/store/loose/write_writer_finalize.go
diff --git a/objectstore/memory/add.go b/object/store/memory/add.go
index 3b27f52d..3b27f52d 100644
--- a/objectstore/memory/add.go
+++ b/object/store/memory/add.go
diff --git a/objectstore/memory/algorithm.go b/object/store/memory/algorithm.go
index bf7f3a82..bf7f3a82 100644
--- a/objectstore/memory/algorithm.go
+++ b/object/store/memory/algorithm.go
diff --git a/objectstore/memory/doc.go b/object/store/memory/doc.go
index cb40d466..cb40d466 100644
--- a/objectstore/memory/doc.go
+++ b/object/store/memory/doc.go
diff --git a/objectstore/memory/object.go b/object/store/memory/object.go
index a85175c7..a85175c7 100644
--- a/objectstore/memory/object.go
+++ b/object/store/memory/object.go
diff --git a/objectstore/memory/read_bytes.go b/object/store/memory/read_bytes.go
index 2fc31726..b9a439b5 100644
--- a/objectstore/memory/read_bytes.go
+++ b/object/store/memory/read_bytes.go
@@ -3,8 +3,8 @@ package memory
 import (
 	objectheader "codeberg.org/lindenii/furgit/object/header"
 	objectid "codeberg.org/lindenii/furgit/object/id"
+	"codeberg.org/lindenii/furgit/object/store"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
-	"codeberg.org/lindenii/furgit/objectstore"
 )
 
 // ReadBytesFull reads one full object, including the object header.
diff --git a/objectstore/memory/read_header.go b/object/store/memory/read_header.go
index 3d5b01b7..cbd24ea9 100644
--- a/objectstore/memory/read_header.go
+++ b/object/store/memory/read_header.go
@@ -2,8 +2,8 @@ package memory
 
 import (
 	objectid "codeberg.org/lindenii/furgit/object/id"
+	"codeberg.org/lindenii/furgit/object/store"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
-	"codeberg.org/lindenii/furgit/objectstore"
 )
 
 // ReadHeader reads one object header.
diff --git a/objectstore/memory/read_reader.go b/object/store/memory/read_reader.go
index 425c3034..425c3034 100644
--- a/objectstore/memory/read_reader.go
+++ b/object/store/memory/read_reader.go
diff --git a/objectstore/memory/read_size.go b/object/store/memory/read_size.go
index 7045bd61..7045bd61 100644
--- a/objectstore/memory/read_size.go
+++ b/object/store/memory/read_size.go
diff --git a/objectstore/memory/refresh.go b/object/store/memory/refresh.go
index 1e18eef3..1e18eef3 100644
--- a/objectstore/memory/refresh.go
+++ b/object/store/memory/refresh.go
diff --git a/objectstore/memory/store.go b/object/store/memory/store.go
index 8f212c38..8f212c38 100644
--- a/objectstore/memory/store.go
+++ b/object/store/memory/store.go
diff --git a/objectstore/mix/bytes.go b/object/store/mix/bytes.go
index fcd7b058..9bee34e6 100644
--- a/objectstore/mix/bytes.go
+++ b/object/store/mix/bytes.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	objectid "codeberg.org/lindenii/furgit/object/id"
+	"codeberg.org/lindenii/furgit/object/store"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
-	"codeberg.org/lindenii/furgit/objectstore"
 )
 
 // ReadBytesFull reads a full serialized object from one backend that has it.
diff --git a/objectstore/mix/close.go b/object/store/mix/close.go
index 53f6cd30..53f6cd30 100644
--- a/objectstore/mix/close.go
+++ b/object/store/mix/close.go
diff --git a/objectstore/mix/header.go b/object/store/mix/header.go
index 5cc17c81..78ad4d15 100644
--- a/objectstore/mix/header.go
+++ b/object/store/mix/header.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	objectid "codeberg.org/lindenii/furgit/object/id"
+	"codeberg.org/lindenii/furgit/object/store"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
-	"codeberg.org/lindenii/furgit/objectstore"
 )
 
 // ReadHeader reads object header data from one backend that has it.
diff --git a/objectstore/mix/mix.go b/object/store/mix/mix.go
index ef381b95..1149ad7b 100644
--- a/objectstore/mix/mix.go
+++ b/object/store/mix/mix.go
@@ -5,7 +5,7 @@ package mix
 import (
 	"sync"
 
-	"codeberg.org/lindenii/furgit/objectstore"
+	"codeberg.org/lindenii/furgit/object/store"
 )
 
 // Mix queries multiple object databases with an MRU backend preference.
diff --git a/objectstore/mix/mru.go b/object/store/mix/mru.go
index 52176cab..b7663125 100644
--- a/objectstore/mix/mru.go
+++ b/object/store/mix/mru.go
@@ -1,6 +1,6 @@
 package mix
 
-import "codeberg.org/lindenii/furgit/objectstore"
+import "codeberg.org/lindenii/furgit/object/store"
 
 type backendNode struct {
 	backend objectstore.Store
diff --git a/objectstore/mix/new.go b/object/store/mix/new.go
index 16c6c9eb..bb39178c 100644
--- a/objectstore/mix/new.go
+++ b/object/store/mix/new.go
@@ -1,6 +1,6 @@
 package mix
 
-import "codeberg.org/lindenii/furgit/objectstore"
+import "codeberg.org/lindenii/furgit/object/store"
 
 // New creates a Mix from backends.
 //
diff --git a/objectstore/mix/reader.go b/object/store/mix/reader.go
index 1d569ee1..327e9e11 100644
--- a/objectstore/mix/reader.go
+++ b/object/store/mix/reader.go
@@ -6,8 +6,8 @@ import (
 	"io"
 
 	objectid "codeberg.org/lindenii/furgit/object/id"
+	"codeberg.org/lindenii/furgit/object/store"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
-	"codeberg.org/lindenii/furgit/objectstore"
 )
 
 // ReadReaderFull reads a full serialized object stream from one backend that
diff --git a/objectstore/mix/refresh.go b/object/store/mix/refresh.go
index a9418a62..2150b71a 100644
--- a/objectstore/mix/refresh.go
+++ b/object/store/mix/refresh.go
@@ -3,7 +3,7 @@ package mix
 import (
 	"errors"
 
-	"codeberg.org/lindenii/furgit/objectstore"
+	"codeberg.org/lindenii/furgit/object/store"
 )
 
 // Refresh forwards refresh calls to refresh-capable backends.
diff --git a/objectstore/mix/size.go b/object/store/mix/size.go
index 76f39fa7..04f8117f 100644
--- a/objectstore/mix/size.go
+++ b/object/store/mix/size.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	objectid "codeberg.org/lindenii/furgit/object/id"
-	"codeberg.org/lindenii/furgit/objectstore"
+	"codeberg.org/lindenii/furgit/object/store"
 )
 
 // ReadSize reads object content length from one backend that has it.
diff --git a/objectstore/objectstore.go b/object/store/objectstore.go
index d43dbccd..d43dbccd 100644
--- a/objectstore/objectstore.go
+++ b/object/store/objectstore.go
diff --git a/objectstore/packed/TODO b/object/store/packed/TODO
index f4a5f48e..f4a5f48e 100644
--- a/objectstore/packed/TODO
+++ b/object/store/packed/TODO
diff --git a/objectstore/packed/close.go b/object/store/packed/close.go
index f05a8573..f05a8573 100644
--- a/objectstore/packed/close.go
+++ b/object/store/packed/close.go
diff --git a/objectstore/packed/delta_build_chain.go b/object/store/packed/delta_build_chain.go
index 4f24b284..4f24b284 100644
--- a/objectstore/packed/delta_build_chain.go
+++ b/object/store/packed/delta_build_chain.go
diff --git a/objectstore/packed/delta_cache.go b/object/store/packed/delta_cache.go
index 3bf3a035..3bf3a035 100644
--- a/objectstore/packed/delta_cache.go
+++ b/object/store/packed/delta_cache.go
diff --git a/objectstore/packed/delta_chain.go b/object/store/packed/delta_chain.go
index 372e89cd..372e89cd 100644
--- a/objectstore/packed/delta_chain.go
+++ b/object/store/packed/delta_chain.go
diff --git a/objectstore/packed/delta_node.go b/object/store/packed/delta_node.go
index 24ede1e0..24ede1e0 100644
--- a/objectstore/packed/delta_node.go
+++ b/object/store/packed/delta_node.go
diff --git a/objectstore/packed/delta_resolve_chain.go b/object/store/packed/delta_resolve_chain.go
index f988a9fb..f988a9fb 100644
--- a/objectstore/packed/delta_resolve_chain.go
+++ b/object/store/packed/delta_resolve_chain.go
diff --git a/objectstore/packed/delta_resolve_chain_start.go b/object/store/packed/delta_resolve_chain_start.go
index 08e2bf48..08e2bf48 100644
--- a/objectstore/packed/delta_resolve_chain_start.go
+++ b/object/store/packed/delta_resolve_chain_start.go
diff --git a/objectstore/packed/delta_resolve_content.go b/object/store/packed/delta_resolve_content.go
index 06fc4226..06fc4226 100644
--- a/objectstore/packed/delta_resolve_content.go
+++ b/object/store/packed/delta_resolve_content.go
diff --git a/objectstore/packed/delta_size.go b/object/store/packed/delta_size.go
index 4c89733c..4c89733c 100644
--- a/objectstore/packed/delta_size.go
+++ b/object/store/packed/delta_size.go
diff --git a/objectstore/packed/entry_inflate.go b/object/store/packed/entry_inflate.go
index 1c3943e9..1c3943e9 100644
--- a/objectstore/packed/entry_inflate.go
+++ b/object/store/packed/entry_inflate.go
diff --git a/objectstore/packed/entry_meta.go b/object/store/packed/entry_meta.go
index 0bbe8bef..0bbe8bef 100644
--- a/objectstore/packed/entry_meta.go
+++ b/object/store/packed/entry_meta.go
diff --git a/objectstore/packed/entry_parse.go b/object/store/packed/entry_parse.go
index be8f3c4c..be8f3c4c 100644
--- a/objectstore/packed/entry_parse.go
+++ b/object/store/packed/entry_parse.go
diff --git a/objectstore/packed/helpers_test.go b/object/store/packed/helpers_test.go
index 7d4d696d..2125185d 100644
--- a/objectstore/packed/helpers_test.go
+++ b/object/store/packed/helpers_test.go
@@ -10,8 +10,8 @@ import (
 	"codeberg.org/lindenii/furgit/internal/testgit"
 	objectheader "codeberg.org/lindenii/furgit/object/header"
 	objectid "codeberg.org/lindenii/furgit/object/id"
+	"codeberg.org/lindenii/furgit/object/store/packed"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
-	"codeberg.org/lindenii/furgit/objectstore/packed"
 )
 
 func openPackedStore(t *testing.T, testRepo *testgit.TestRepo, algo objectid.Algorithm) *packed.Store {
diff --git a/objectstore/packed/idx.go b/object/store/packed/idx.go
index 5024f2f3..5024f2f3 100644
--- a/objectstore/packed/idx.go
+++ b/object/store/packed/idx.go
diff --git a/objectstore/packed/idx_candidates_mru.go b/object/store/packed/idx_candidates_mru.go
index d0cc7052..d0cc7052 100644
--- a/objectstore/packed/idx_candidates_mru.go
+++ b/object/store/packed/idx_candidates_mru.go
diff --git a/objectstore/packed/idx_close.go b/object/store/packed/idx_close.go
index 814ec987..814ec987 100644
--- a/objectstore/packed/idx_close.go
+++ b/object/store/packed/idx_close.go
diff --git a/objectstore/packed/idx_lookup.go b/object/store/packed/idx_lookup.go
index 0bd11d1b..0bd11d1b 100644
--- a/objectstore/packed/idx_lookup.go
+++ b/object/store/packed/idx_lookup.go
diff --git a/objectstore/packed/idx_lookup_candidates.go b/object/store/packed/idx_lookup_candidates.go
index a2de262a..a2de262a 100644
--- a/objectstore/packed/idx_lookup_candidates.go
+++ b/object/store/packed/idx_lookup_candidates.go
diff --git a/objectstore/packed/idx_open.go b/object/store/packed/idx_open.go
index fabd0c00..fabd0c00 100644
--- a/objectstore/packed/idx_open.go
+++ b/object/store/packed/idx_open.go
diff --git a/objectstore/packed/idx_parse.go b/object/store/packed/idx_parse.go
index 4da3bf42..4da3bf42 100644
--- a/objectstore/packed/idx_parse.go
+++ b/object/store/packed/idx_parse.go
diff --git a/objectstore/packed/location.go b/object/store/packed/location.go
index 82d17c17..82d17c17 100644
--- a/objectstore/packed/location.go
+++ b/object/store/packed/location.go
diff --git a/objectstore/packed/new.go b/object/store/packed/new.go
index a4d1752d..a4d1752d 100644
--- a/objectstore/packed/new.go
+++ b/object/store/packed/new.go
diff --git a/objectstore/packed/options.go b/object/store/packed/options.go
index 05cbee30..05cbee30 100644
--- a/objectstore/packed/options.go
+++ b/object/store/packed/options.go
diff --git a/objectstore/packed/pack.go b/object/store/packed/pack.go
index c384d6a5..c384d6a5 100644
--- a/objectstore/packed/pack.go
+++ b/object/store/packed/pack.go
diff --git a/objectstore/packed/pack_idx_checksum.go b/object/store/packed/pack_idx_checksum.go
index 28d4c3db..28d4c3db 100644
--- a/objectstore/packed/pack_idx_checksum.go
+++ b/object/store/packed/pack_idx_checksum.go
diff --git a/objectstore/packed/read_bytes.go b/object/store/packed/read_bytes.go
index 333cfaae..333cfaae 100644
--- a/objectstore/packed/read_bytes.go
+++ b/object/store/packed/read_bytes.go
diff --git a/objectstore/packed/read_closer.go b/object/store/packed/read_closer.go
index c317d002..c317d002 100644
--- a/objectstore/packed/read_closer.go
+++ b/object/store/packed/read_closer.go
diff --git a/objectstore/packed/read_header.go b/object/store/packed/read_header.go
index d774de7c..d774de7c 100644
--- a/objectstore/packed/read_header.go
+++ b/object/store/packed/read_header.go
diff --git a/objectstore/packed/read_header_resolve.go b/object/store/packed/read_header_resolve.go
index 6fee720a..6fee720a 100644
--- a/objectstore/packed/read_header_resolve.go
+++ b/object/store/packed/read_header_resolve.go
diff --git a/objectstore/packed/read_reader.go b/object/store/packed/read_reader.go
index 5f4fa604..5f4fa604 100644
--- a/objectstore/packed/read_reader.go
+++ b/object/store/packed/read_reader.go
diff --git a/objectstore/packed/read_size.go b/object/store/packed/read_size.go
index 3036abcd..3036abcd 100644
--- a/objectstore/packed/read_size.go
+++ b/object/store/packed/read_size.go
diff --git a/objectstore/packed/read_test.go b/object/store/packed/read_test.go
index f672f233..e690a8fd 100644
--- a/objectstore/packed/read_test.go
+++ b/object/store/packed/read_test.go
@@ -11,8 +11,8 @@ import (
 
 	"codeberg.org/lindenii/furgit/internal/testgit"
 	objectid "codeberg.org/lindenii/furgit/object/id"
-	"codeberg.org/lindenii/furgit/objectstore"
-	"codeberg.org/lindenii/furgit/objectstore/packed"
+	"codeberg.org/lindenii/furgit/object/store"
+	"codeberg.org/lindenii/furgit/object/store/packed"
 )
 
 func TestPackedStoreReadAgainstGit(t *testing.T) {
diff --git a/objectstore/packed/store.go b/object/store/packed/store.go
index 41a4614b..bb83456a 100644
--- a/objectstore/packed/store.go
+++ b/object/store/packed/store.go
@@ -7,7 +7,7 @@ import (
 	"sync/atomic"
 
 	objectid "codeberg.org/lindenii/furgit/object/id"
-	"codeberg.org/lindenii/furgit/objectstore"
+	"codeberg.org/lindenii/furgit/object/store"
 )
 
 // Store reads Git objects from pack/index files under an objects/pack root.
diff --git a/objectstore/packed/store_lookup.go b/object/store/packed/store_lookup.go
index 78a54c07..882a8888 100644
--- a/objectstore/packed/store_lookup.go
+++ b/object/store/packed/store_lookup.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 
 	objectid "codeberg.org/lindenii/furgit/object/id"
-	"codeberg.org/lindenii/furgit/objectstore"
+	"codeberg.org/lindenii/furgit/object/store"
 )
 
 // lookup resolves one object ID to its pack location.
diff --git a/objectstore/packed/store_open_pack.go b/object/store/packed/store_open_pack.go
index c621e08c..c621e08c 100644
--- a/objectstore/packed/store_open_pack.go
+++ b/object/store/packed/store_open_pack.go
diff --git a/objectstore/packed/trailer_match.go b/object/store/packed/trailer_match.go
index dc43e37d..dc43e37d 100644
--- a/objectstore/packed/trailer_match.go
+++ b/object/store/packed/trailer_match.go
diff --git a/packfile/ingest/api.go b/packfile/ingest/api.go
index b2f3c92f..38d7f079 100644
--- a/packfile/ingest/api.go
+++ b/packfile/ingest/api.go
@@ -8,7 +8,7 @@ import (
 	"os"
 
 	objectid "codeberg.org/lindenii/furgit/object/id"
-	"codeberg.org/lindenii/furgit/objectstore"
+	"codeberg.org/lindenii/furgit/object/store"
 )
 
 // Options controls one pack ingest operation.
diff --git a/packfile/ingest/thin_fix.go b/packfile/ingest/thin_fix.go
index f94d8c0b..083c7173 100644
--- a/packfile/ingest/thin_fix.go
+++ b/packfile/ingest/thin_fix.go
@@ -6,7 +6,7 @@ import (
 
 	"codeberg.org/lindenii/furgit/internal/intconv"
 	"codeberg.org/lindenii/furgit/internal/progress"
-	"codeberg.org/lindenii/furgit/objectstore"
+	"codeberg.org/lindenii/furgit/object/store"
 )
 
 // maybeFixThin appends missing bases and rewrites pack header/trailer when needed.
diff --git a/reachability/helpers.go b/reachability/helpers.go
index ebed8d7e..7a8c6b05 100644
--- a/reachability/helpers.go
+++ b/reachability/helpers.go
@@ -6,8 +6,8 @@ import (
 
 	giterrors "codeberg.org/lindenii/furgit/errors"
 	objectid "codeberg.org/lindenii/furgit/object/id"
+	"codeberg.org/lindenii/furgit/object/store"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
-	"codeberg.org/lindenii/furgit/objectstore"
 )
 
 func validateDomain(domain Domain) error {
diff --git a/reachability/reachability.go b/reachability/reachability.go
index eff6e5ba..127da2f4 100644
--- a/reachability/reachability.go
+++ b/reachability/reachability.go
@@ -3,7 +3,7 @@ package reachability
 
 import (
 	commitgraphread "codeberg.org/lindenii/furgit/commitgraph/read"
-	"codeberg.org/lindenii/furgit/objectstore"
+	"codeberg.org/lindenii/furgit/object/store"
 )
 
 // Reachability provides graph traversal over objects in one object store.
diff --git a/reachability/unit_test.go b/reachability/unit_test.go
index 185ca3be..65568228 100644
--- a/reachability/unit_test.go
+++ b/reachability/unit_test.go
@@ -11,8 +11,8 @@ import (
 	"codeberg.org/lindenii/furgit/internal/testgit"
 	"codeberg.org/lindenii/furgit/object"
 	objectid "codeberg.org/lindenii/furgit/object/id"
+	"codeberg.org/lindenii/furgit/object/store/memory"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
-	"codeberg.org/lindenii/furgit/objectstore/memory"
 	"codeberg.org/lindenii/furgit/reachability"
 )
 
diff --git a/receivepack/hook.go b/receivepack/hook.go
index 27fc605c..5a9bcb8b 100644
--- a/receivepack/hook.go
+++ b/receivepack/hook.go
@@ -5,7 +5,7 @@ import (
 	"io"
 
 	objectid "codeberg.org/lindenii/furgit/object/id"
-	"codeberg.org/lindenii/furgit/objectstore"
+	"codeberg.org/lindenii/furgit/object/store"
 	"codeberg.org/lindenii/furgit/receivepack/service"
 	"codeberg.org/lindenii/furgit/refstore"
 )
diff --git a/receivepack/hooks/reject_force_push.go b/receivepack/hooks/reject_force_push.go
index 8a72b273..9d780078 100644
--- a/receivepack/hooks/reject_force_push.go
+++ b/receivepack/hooks/reject_force_push.go
@@ -7,7 +7,7 @@ import (
 
 	"codeberg.org/lindenii/furgit/commitquery"
 	objectid "codeberg.org/lindenii/furgit/object/id"
-	objectmix "codeberg.org/lindenii/furgit/objectstore/mix"
+	objectmix "codeberg.org/lindenii/furgit/object/store/mix"
 	receivepack "codeberg.org/lindenii/furgit/receivepack"
 	"codeberg.org/lindenii/furgit/refstore"
 )
diff --git a/receivepack/options.go b/receivepack/options.go
index e61e73c0..8e7ac747 100644
--- a/receivepack/options.go
+++ b/receivepack/options.go
@@ -4,7 +4,7 @@ import (
 	"os"
 
 	objectid "codeberg.org/lindenii/furgit/object/id"
-	"codeberg.org/lindenii/furgit/objectstore"
+	"codeberg.org/lindenii/furgit/object/store"
 	"codeberg.org/lindenii/furgit/refstore"
 )
 
diff --git a/receivepack/service/hook.go b/receivepack/service/hook.go
index c80363fc..09120ced 100644
--- a/receivepack/service/hook.go
+++ b/receivepack/service/hook.go
@@ -5,7 +5,7 @@ import (
 	"io"
 
 	objectid "codeberg.org/lindenii/furgit/object/id"
-	"codeberg.org/lindenii/furgit/objectstore"
+	"codeberg.org/lindenii/furgit/object/store"
 	"codeberg.org/lindenii/furgit/refstore"
 )
 
diff --git a/receivepack/service/options.go b/receivepack/service/options.go
index dc99d3f0..a2c8c510 100644
--- a/receivepack/service/options.go
+++ b/receivepack/service/options.go
@@ -6,7 +6,7 @@ import (
 	"os"
 
 	objectid "codeberg.org/lindenii/furgit/object/id"
-	"codeberg.org/lindenii/furgit/objectstore"
+	"codeberg.org/lindenii/furgit/object/store"
 	"codeberg.org/lindenii/furgit/refstore"
 )
 
diff --git a/receivepack/service/quarantine_test.go b/receivepack/service/quarantine_test.go
index 5e802d12..e0389472 100644
--- a/receivepack/service/quarantine_test.go
+++ b/receivepack/service/quarantine_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	objectid "codeberg.org/lindenii/furgit/object/id"
-	"codeberg.org/lindenii/furgit/objectstore/memory"
+	"codeberg.org/lindenii/furgit/object/store/memory"
 )
 
 type quarantineFixture struct {
diff --git a/receivepack/service/run_hook.go b/receivepack/service/run_hook.go
index 2689edf2..c62be022 100644
--- a/receivepack/service/run_hook.go
+++ b/receivepack/service/run_hook.go
@@ -5,10 +5,10 @@ import (
 	"os"
 
 	"codeberg.org/lindenii/furgit/internal/utils"
-	"codeberg.org/lindenii/furgit/objectstore"
-	"codeberg.org/lindenii/furgit/objectstore/loose"
-	objectmix "codeberg.org/lindenii/furgit/objectstore/mix"
-	"codeberg.org/lindenii/furgit/objectstore/packed"
+	"codeberg.org/lindenii/furgit/object/store"
+	"codeberg.org/lindenii/furgit/object/store/loose"
+	objectmix "codeberg.org/lindenii/furgit/object/store/mix"
+	"codeberg.org/lindenii/furgit/object/store/packed"
 )
 
 func (service *Service) runHook(
diff --git a/receivepack/service/service_test.go b/receivepack/service/service_test.go
index a835a6f2..35743e49 100644
--- a/receivepack/service/service_test.go
+++ b/receivepack/service/service_test.go
@@ -9,7 +9,7 @@ import (
 
 	"codeberg.org/lindenii/furgit/internal/testgit"
 	objectid "codeberg.org/lindenii/furgit/object/id"
-	"codeberg.org/lindenii/furgit/objectstore/memory"
+	"codeberg.org/lindenii/furgit/object/store/memory"
 	"codeberg.org/lindenii/furgit/receivepack/service"
 )
 
diff --git a/repository/objects.go b/repository/objects.go
index eb458152..f23ef323 100644
--- a/repository/objects.go
+++ b/repository/objects.go
@@ -6,10 +6,10 @@ import (
 	"os"
 
 	objectid "codeberg.org/lindenii/furgit/object/id"
-	"codeberg.org/lindenii/furgit/objectstore"
-	objectloose "codeberg.org/lindenii/furgit/objectstore/loose"
-	objectmix "codeberg.org/lindenii/furgit/objectstore/mix"
-	objectpacked "codeberg.org/lindenii/furgit/objectstore/packed"
+	"codeberg.org/lindenii/furgit/object/store"
+	objectloose "codeberg.org/lindenii/furgit/object/store/loose"
+	objectmix "codeberg.org/lindenii/furgit/object/store/mix"
+	objectpacked "codeberg.org/lindenii/furgit/object/store/packed"
 )
 
 //nolint:ireturn
diff --git a/repository/repository.go b/repository/repository.go
index f0306752..57007bb9 100644
--- a/repository/repository.go
+++ b/repository/repository.go
@@ -6,9 +6,9 @@ import (
 
 	"codeberg.org/lindenii/furgit/config"
 	objectid "codeberg.org/lindenii/furgit/object/id"
-	"codeberg.org/lindenii/furgit/objectstore"
-	objectloose "codeberg.org/lindenii/furgit/objectstore/loose"
-	objectpacked "codeberg.org/lindenii/furgit/objectstore/packed"
+	"codeberg.org/lindenii/furgit/object/store"
+	objectloose "codeberg.org/lindenii/furgit/object/store/loose"
+	objectpacked "codeberg.org/lindenii/furgit/object/store/packed"
 	"codeberg.org/lindenii/furgit/refstore"
 )
 
diff --git a/repository/write_loose.go b/repository/write_loose.go
index db57c9c6..9bd05912 100644
--- a/repository/write_loose.go
+++ b/repository/write_loose.go
@@ -1,7 +1,7 @@
 package repository
 
 import (
-	objectloose "codeberg.org/lindenii/furgit/objectstore/loose"
+	objectloose "codeberg.org/lindenii/furgit/object/store/loose"
 )
 
 // LooseStoreForWriting returns the repository's loose-object writer.