83 files changed, 148 insertions, 148 deletions

diff --git a/Makefile b/Makefile
index 1a14ffe..d730ab3 100644
--- a/Makefile
+++ b/Makefile
@@ -13,11 +13,11 @@ lint: tools/bin/golangci-lint
 .PHONY: lint
 
 generate:
-	$(MAKE) -C pkg/btrfs
+	$(MAKE) -C lib/btrfs
 .PHONY: generate
 
 generate-clean:
-	$(MAKE) -C pkg/btrfs clean
+	$(MAKE) -C lib/btrfs clean
 .PHONY: generate-clean
 
 # tools
diff --git a/cmd/btrfs-clear-bad-nodes/main.go b/cmd/btrfs-clear-bad-nodes/main.go
index 0bad792..187cae6 100644
--- a/cmd/btrfs-clear-bad-nodes/main.go
+++ b/cmd/btrfs-clear-bad-nodes/main.go
@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"os"
 
-	"lukeshu.com/btrfs-tools/pkg/btrfs"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfsvol"
-	"lukeshu.com/btrfs-tools/pkg/btrfsmisc"
-	"lukeshu.com/btrfs-tools/pkg/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfsmisc"
+	"git.lukeshu.com/btrfs-progs-ng/lib/util"
 )
 
 func main() {
diff --git a/cmd/btrfs-dbg/main.go b/cmd/btrfs-dbg/main.go
index 40356e0..a55aca0 100644
--- a/cmd/btrfs-dbg/main.go
+++ b/cmd/btrfs-dbg/main.go
@@ -6,10 +6,10 @@ import (
 
 	"github.com/davecgh/go-spew/spew"
 
-	"lukeshu.com/btrfs-tools/pkg/btrfs"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfsvol"
-	"lukeshu.com/btrfs-tools/pkg/btrfsmisc"
-	"lukeshu.com/btrfs-tools/pkg/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfsmisc"
+	"git.lukeshu.com/btrfs-progs-ng/lib/util"
 )
 
 func main() {
diff --git a/cmd/btrfs-dump-tree/main.go b/cmd/btrfs-dump-tree/main.go
index 56727d4..65b1f8a 100644
--- a/cmd/btrfs-dump-tree/main.go
+++ b/cmd/btrfs-dump-tree/main.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"os"
 
-	"lukeshu.com/btrfs-tools/pkg/btrfs"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfsitem"
-	"lukeshu.com/btrfs-tools/pkg/btrfsmisc"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsitem"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfsmisc"
 )
 
 func main() {
diff --git a/cmd/btrfs-fsck/pass0.go b/cmd/btrfs-fsck/pass0.go
index 28e0501..acb3aa3 100644
--- a/cmd/btrfs-fsck/pass0.go
+++ b/cmd/btrfs-fsck/pass0.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"os"
 
-	"lukeshu.com/btrfs-tools/pkg/btrfs"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfsvol"
-	"lukeshu.com/btrfs-tools/pkg/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
+	"git.lukeshu.com/btrfs-progs-ng/lib/util"
 )
 
 func pass0(filenames ...string) (*btrfs.FS, *util.Ref[btrfsvol.PhysicalAddr, btrfs.Superblock], error) {
diff --git a/cmd/btrfs-fsck/pass1.go b/cmd/btrfs-fsck/pass1.go
index a674b30..0767fd1 100644
--- a/cmd/btrfs-fsck/pass1.go
+++ b/cmd/btrfs-fsck/pass1.go
@@ -10,11 +10,11 @@ import (
 
 	"golang.org/x/text/message"
 
-	"lukeshu.com/btrfs-tools/pkg/btrfs"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfsitem"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfsvol"
-	"lukeshu.com/btrfs-tools/pkg/btrfsmisc"
-	"lukeshu.com/btrfs-tools/pkg/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsitem"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfsmisc"
+	"git.lukeshu.com/btrfs-progs-ng/lib/util"
 )
 
 func pass1(fs *btrfs.FS, superblock *util.Ref[btrfsvol.PhysicalAddr, btrfs.Superblock]) (map[btrfsvol.LogicalAddr]struct{}, error) {
diff --git a/cmd/btrfs-fsck/pass2.go b/cmd/btrfs-fsck/pass2.go
index a8c0c9b..6d5f46e 100644
--- a/cmd/btrfs-fsck/pass2.go
+++ b/cmd/btrfs-fsck/pass2.go
@@ -3,10 +3,10 @@ package main
 import (
 	"fmt"
 
-	"lukeshu.com/btrfs-tools/pkg/btrfs"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfsvol"
-	"lukeshu.com/btrfs-tools/pkg/btrfsmisc"
-	"lukeshu.com/btrfs-tools/pkg/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfsmisc"
+	"git.lukeshu.com/btrfs-progs-ng/lib/util"
 )
 
 func pass2(fs *btrfs.FS, foundNodes map[btrfsvol.LogicalAddr]struct{}) {
diff --git a/cmd/btrfs-ls-files/main.go b/cmd/btrfs-ls-files/main.go
index c2e9e06..ab4fb1f 100644
--- a/cmd/btrfs-ls-files/main.go
+++ b/cmd/btrfs-ls-files/main.go
@@ -8,10 +8,10 @@ import (
 
 	"github.com/datawire/dlib/derror"
 
-	"lukeshu.com/btrfs-tools/pkg/btrfs"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfsitem"
-	"lukeshu.com/btrfs-tools/pkg/btrfsmisc"
-	"lukeshu.com/btrfs-tools/pkg/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsitem"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfsmisc"
+	"git.lukeshu.com/btrfs-progs-ng/lib/util"
 )
 
 func main() {
diff --git a/cmd/btrfs-ls-trees/main.go b/cmd/btrfs-ls-trees/main.go
index 534b095..ca24c88 100644
--- a/cmd/btrfs-ls-trees/main.go
+++ b/cmd/btrfs-ls-trees/main.go
@@ -6,10 +6,10 @@ import (
 	"strconv"
 	"text/tabwriter"
 
-	"lukeshu.com/btrfs-tools/pkg/btrfs"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfsitem"
-	"lukeshu.com/btrfs-tools/pkg/btrfsmisc"
-	"lukeshu.com/btrfs-tools/pkg/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsitem"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfsmisc"
+	"git.lukeshu.com/btrfs-progs-ng/lib/util"
 )
 
 func main() {
diff --git a/cmd/btrfs-mount/main.go b/cmd/btrfs-mount/main.go
index b8060cb..0915b42 100644
--- a/cmd/btrfs-mount/main.go
+++ b/cmd/btrfs-mount/main.go
@@ -10,8 +10,8 @@ import (
 	"github.com/datawire/dlib/dlog"
 	"github.com/sirupsen/logrus"
 
-	"lukeshu.com/btrfs-tools/pkg/btrfs"
-	"lukeshu.com/btrfs-tools/pkg/btrfsmisc"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfsmisc"
 )
 
 func main() {
diff --git a/cmd/btrfs-mount/subvol_fuse.go b/cmd/btrfs-mount/subvol_fuse.go
index da7c5d8..fe71e7f 100644
--- a/cmd/btrfs-mount/subvol_fuse.go
+++ b/cmd/btrfs-mount/subvol_fuse.go
@@ -15,10 +15,10 @@ import (
 	"github.com/jacobsa/fuse/fuseops"
 	"github.com/jacobsa/fuse/fuseutil"
 
-	"lukeshu.com/btrfs-tools/pkg/btrfs"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfsitem"
-	"lukeshu.com/btrfs-tools/pkg/linux"
-	"lukeshu.com/btrfs-tools/pkg/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsitem"
+	"git.lukeshu.com/btrfs-progs-ng/lib/linux"
+	"git.lukeshu.com/btrfs-progs-ng/lib/util"
 )
 
 type dirState struct {
diff --git a/go.mod b/go.mod
index 91e24c7..1a0b05a 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module lukeshu.com/btrfs-tools
+module git.lukeshu.com/btrfs-progs-ng
 
 go 1.18
 
diff --git a/pkg/binstruct/binint.go b/lib/binstruct/binint.go
index 105dcfa..89bb4f6 100644
--- a/pkg/binstruct/binint.go
+++ b/lib/binstruct/binint.go
@@ -3,7 +3,7 @@ package binstruct
 import (
 	"reflect"
 
-	"lukeshu.com/btrfs-tools/pkg/binstruct/binint"
+	"git.lukeshu.com/btrfs-progs-ng/lib/binstruct/binint"
 )
 
 type (
diff --git a/pkg/binstruct/binint/builtins.go b/lib/binstruct/binint/builtins.go
index 04fc477..04fc477 100644
--- a/pkg/binstruct/binint/builtins.go
+++ b/lib/binstruct/binint/builtins.go
diff --git a/pkg/binstruct/binstruct_test.go b/lib/binstruct/binstruct_test.go
index 83a1747..542746f 100644
--- a/pkg/binstruct/binstruct_test.go
+++ b/lib/binstruct/binstruct_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"lukeshu.com/btrfs-tools/pkg/binstruct"
+	"git.lukeshu.com/btrfs-progs-ng/lib/binstruct"
 )
 
 func TestSmoke(t *testing.T) {
diff --git a/pkg/binstruct/marshal.go b/lib/binstruct/marshal.go
index 684d2f3..684d2f3 100644
--- a/pkg/binstruct/marshal.go
+++ b/lib/binstruct/marshal.go
diff --git a/pkg/binstruct/size.go b/lib/binstruct/size.go
index 6563455..6563455 100644
--- a/pkg/binstruct/size.go
+++ b/lib/binstruct/size.go
diff --git a/pkg/binstruct/structs.go b/lib/binstruct/structs.go
index ec2bb7d..ec2bb7d 100644
--- a/pkg/binstruct/structs.go
+++ b/lib/binstruct/structs.go
diff --git a/pkg/binstruct/unmarshal.go b/lib/binstruct/unmarshal.go
index 1959d45..1959d45 100644
--- a/pkg/binstruct/unmarshal.go
+++ b/lib/binstruct/unmarshal.go
diff --git a/pkg/btrfs/Makefile b/lib/btrfs/Makefile
index a770356..43d665f 100644
--- a/pkg/btrfs/Makefile
+++ b/lib/btrfs/Makefile
@@ -20,7 +20,7 @@ btrfsitem/items_gen.go: btrfsitem/items.txt $(MAKEFILE_LIST)
 	  echo 'import ('; \
 	  echo   '"reflect"'; \
 	  echo; \
-	  echo   '"lukeshu.com/btrfs-tools/pkg/btrfs/internal"'; \
+	  echo   '"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/internal"'; \
 	  echo ')'; \
 	  echo 'const ('; \
 	  sed -E 's,(.*)=(.*) (.*),\1_KEY=internal.\1_KEY,' $<; \
@@ -63,7 +63,7 @@ aliases_objid.go: internal/objid.go $(MAKEFILE_LIST)
 	  echo; \
 	  echo 'package btrfs'; \
 	  echo 'import ('; \
-	  echo   '"lukeshu.com/btrfs-tools/pkg/btrfs/internal"'; \
+	  echo   '"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/internal"'; \
 	  echo ')'; \
 	  echo 'const('; \
 	  sed -En 's/^\s*(\S*_OBJECTIDS?)\s*=.*/\1 = internal.\1/p' <$<; \
diff --git a/pkg/btrfs/aliases.go b/lib/btrfs/aliases.go
index 1a18ae6..75cbf8b 100644
--- a/pkg/btrfs/aliases.go
+++ b/lib/btrfs/aliases.go
@@ -1,8 +1,8 @@
 package btrfs
 
 import (
-	"lukeshu.com/btrfs-tools/pkg/btrfs/internal"
-	"lukeshu.com/btrfs-tools/pkg/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/internal"
+	"git.lukeshu.com/btrfs-progs-ng/lib/util"
 )
 
 type (
diff --git a/pkg/btrfs/aliases_objid.go b/lib/btrfs/aliases_objid.go
index 12a58a2..6ccbbad 100644
--- a/pkg/btrfs/aliases_objid.go
+++ b/lib/btrfs/aliases_objid.go
@@ -3,7 +3,7 @@
 package btrfs
 
 import (
-	"lukeshu.com/btrfs-tools/pkg/btrfs/internal"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/internal"
 )
 
 const (
diff --git a/pkg/btrfs/btrfsitem/item_blockgroup.go b/lib/btrfs/btrfsitem/item_blockgroup.go
index 63cbcbb..71d960d 100644
--- a/pkg/btrfs/btrfsitem/item_blockgroup.go
+++ b/lib/btrfs/btrfsitem/item_blockgroup.go
@@ -1,9 +1,9 @@
 package btrfsitem
 
 import (
-	"lukeshu.com/btrfs-tools/pkg/binstruct"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfsvol"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/internal"
+	"git.lukeshu.com/btrfs-progs-ng/lib/binstruct"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/internal"
 )
 
 // key.objectid = logical_addr
diff --git a/pkg/btrfs/btrfsitem/item_chunk.go b/lib/btrfs/btrfsitem/item_chunk.go
index f567506..9256651 100644
--- a/pkg/btrfs/btrfsitem/item_chunk.go
+++ b/lib/btrfs/btrfsitem/item_chunk.go
@@ -3,10 +3,10 @@ package btrfsitem
 import (
 	"fmt"
 
-	"lukeshu.com/btrfs-tools/pkg/binstruct"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfsvol"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/internal"
-	"lukeshu.com/btrfs-tools/pkg/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/binstruct"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/internal"
+	"git.lukeshu.com/btrfs-progs-ng/lib/util"
 )
 
 // Maps logical address to physical.
diff --git a/pkg/btrfs/btrfsitem/item_dev.go b/lib/btrfs/btrfsitem/item_dev.go
index e7b214a..d3fe582 100644
--- a/pkg/btrfs/btrfsitem/item_dev.go
+++ b/lib/btrfs/btrfsitem/item_dev.go
@@ -1,10 +1,10 @@
 package btrfsitem
 
 import (
-	"lukeshu.com/btrfs-tools/pkg/binstruct"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfsvol"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/internal"
-	"lukeshu.com/btrfs-tools/pkg/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/binstruct"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/internal"
+	"git.lukeshu.com/btrfs-progs-ng/lib/util"
 )
 
 // key.objectid = BTRFS_DEV_ITEMS_OBJECTID
diff --git a/pkg/btrfs/btrfsitem/item_devextent.go b/lib/btrfs/btrfsitem/item_devextent.go
index 56fba27..c346d85 100644
--- a/pkg/btrfs/btrfsitem/item_devextent.go
+++ b/lib/btrfs/btrfsitem/item_devextent.go
@@ -1,10 +1,10 @@
 package btrfsitem
 
 import (
-	"lukeshu.com/btrfs-tools/pkg/binstruct"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfsvol"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/internal"
-	"lukeshu.com/btrfs-tools/pkg/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/binstruct"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/internal"
+	"git.lukeshu.com/btrfs-progs-ng/lib/util"
 )
 
 // key.objectid = device_id
diff --git a/pkg/btrfs/btrfsitem/item_dir.go b/lib/btrfs/btrfsitem/item_dir.go
index 2c4c75b..57f6d6d 100644
--- a/pkg/btrfs/btrfsitem/item_dir.go
+++ b/lib/btrfs/btrfsitem/item_dir.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"hash/crc32"
 
-	"lukeshu.com/btrfs-tools/pkg/binstruct"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/internal"
+	"git.lukeshu.com/btrfs-progs-ng/lib/binstruct"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/internal"
 )
 
 // key.objectid = inode of directory containing this entry
diff --git a/pkg/btrfs/btrfsitem/item_empty.go b/lib/btrfs/btrfsitem/item_empty.go
index 93e2f9e..209b2fc 100644
--- a/pkg/btrfs/btrfsitem/item_empty.go
+++ b/lib/btrfs/btrfsitem/item_empty.go
@@ -1,7 +1,7 @@
 package btrfsitem
 
 import (
-	"lukeshu.com/btrfs-tools/pkg/binstruct"
+	"git.lukeshu.com/btrfs-progs-ng/lib/binstruct"
 )
 
 type Empty struct { // ORPHAN_ITEM=48 TREE_BLOCK_REF=176 SHARED_BLOCK_REF=182 FREE_SPACE_EXTENT=199 QGROUP_RELATION=246
diff --git a/pkg/btrfs/btrfsitem/item_extent.go b/lib/btrfs/btrfsitem/item_extent.go
index ab8a4c6..9a9ea55 100644
--- a/pkg/btrfs/btrfsitem/item_extent.go
+++ b/lib/btrfs/btrfsitem/item_extent.go
@@ -3,9 +3,9 @@ package btrfsitem
 import (
 	"fmt"
 
-	"lukeshu.com/btrfs-tools/pkg/binstruct"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/internal"
-	"lukeshu.com/btrfs-tools/pkg/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/binstruct"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/internal"
+	"git.lukeshu.com/btrfs-progs-ng/lib/util"
 )
 
 type Extent struct { // EXTENT_ITEM=168
diff --git a/pkg/btrfs/btrfsitem/item_extentcsum.go b/lib/btrfs/btrfsitem/item_extentcsum.go
index 27c7c9b..b27dbde 100644
--- a/pkg/btrfs/btrfsitem/item_extentcsum.go
+++ b/lib/btrfs/btrfsitem/item_extentcsum.go
@@ -3,7 +3,7 @@ package btrfsitem
 import (
 	"fmt"
 
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfssum"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfssum"
 )
 
 // key.objectid = BTRFS_EXTENT_CSUM_OBJECTID
diff --git a/pkg/btrfs/btrfsitem/item_extentdataref.go b/lib/btrfs/btrfsitem/item_extentdataref.go
index 93585be..aab5426 100644
--- a/pkg/btrfs/btrfsitem/item_extentdataref.go
+++ b/lib/btrfs/btrfsitem/item_extentdataref.go
@@ -1,8 +1,8 @@
 package btrfsitem
 
 import (
-	"lukeshu.com/btrfs-tools/pkg/binstruct"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/internal"
+	"git.lukeshu.com/btrfs-progs-ng/lib/binstruct"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/internal"
 )
 
 type ExtentDataRef struct { // EXTENT_DATA_REF=178
diff --git a/pkg/btrfs/btrfsitem/item_fileextent.go b/lib/btrfs/btrfsitem/item_fileextent.go
index f480207..2f3ac2b 100644
--- a/pkg/btrfs/btrfsitem/item_fileextent.go
+++ b/lib/btrfs/btrfsitem/item_fileextent.go
@@ -3,9 +3,9 @@ package btrfsitem
 import (
 	"fmt"
 
-	"lukeshu.com/btrfs-tools/pkg/binstruct"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfsvol"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/internal"
+	"git.lukeshu.com/btrfs-progs-ng/lib/binstruct"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/internal"
 )
 
 // key.objectid = inode
diff --git a/pkg/btrfs/btrfsitem/item_freespacebitmap.go b/lib/btrfs/btrfsitem/item_freespacebitmap.go
index 6158eb0..6158eb0 100644
--- a/pkg/btrfs/btrfsitem/item_freespacebitmap.go
+++ b/lib/btrfs/btrfsitem/item_freespacebitmap.go
diff --git a/pkg/btrfs/btrfsitem/item_freespaceinfo.go b/lib/btrfs/btrfsitem/item_freespaceinfo.go
index 4931844..89f555e 100644
--- a/pkg/btrfs/btrfsitem/item_freespaceinfo.go
+++ b/lib/btrfs/btrfsitem/item_freespaceinfo.go
@@ -1,7 +1,7 @@
 package btrfsitem
 
 import (
-	"lukeshu.com/btrfs-tools/pkg/binstruct"
+	"git.lukeshu.com/btrfs-progs-ng/lib/binstruct"
 )
 
 type FreeSpaceInfo struct { // FREE_SPACE_INFO=198
diff --git a/pkg/btrfs/btrfsitem/item_inode.go b/lib/btrfs/btrfsitem/item_inode.go
index b41f288..9b1b91b 100644
--- a/pkg/btrfs/btrfsitem/item_inode.go
+++ b/lib/btrfs/btrfsitem/item_inode.go
@@ -1,10 +1,10 @@
 package btrfsitem
 
 import (
-	"lukeshu.com/btrfs-tools/pkg/binstruct"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/internal"
-	"lukeshu.com/btrfs-tools/pkg/linux"
-	"lukeshu.com/btrfs-tools/pkg/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/binstruct"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/internal"
+	"git.lukeshu.com/btrfs-progs-ng/lib/linux"
+	"git.lukeshu.com/btrfs-progs-ng/lib/util"
 )
 
 type Inode struct { // INODE_ITEM=1
diff --git a/pkg/btrfs/btrfsitem/item_inoderef.go b/lib/btrfs/btrfsitem/item_inoderef.go
index 2c26df6..80d70e1 100644
--- a/pkg/btrfs/btrfsitem/item_inoderef.go
+++ b/lib/btrfs/btrfsitem/item_inoderef.go
@@ -1,7 +1,7 @@
 package btrfsitem
 
 import (
-	"lukeshu.com/btrfs-tools/pkg/binstruct"
+	"git.lukeshu.com/btrfs-progs-ng/lib/binstruct"
 )
 
 // key.objectid = inode number of the file
diff --git a/pkg/btrfs/btrfsitem/item_metadata.go b/lib/btrfs/btrfsitem/item_metadata.go
index 7bfe677..d51a340 100644
--- a/pkg/btrfs/btrfsitem/item_metadata.go
+++ b/lib/btrfs/btrfsitem/item_metadata.go
@@ -1,7 +1,7 @@
 package btrfsitem
 
 import (
-	"lukeshu.com/btrfs-tools/pkg/binstruct"
+	"git.lukeshu.com/btrfs-progs-ng/lib/binstruct"
 )
 
 // Metadata is like Extent, but doesn't have .Info.
diff --git a/pkg/btrfs/btrfsitem/item_persistent.go b/lib/btrfs/btrfsitem/item_persistent.go
index fd69c3d..cbbae76 100644
--- a/pkg/btrfs/btrfsitem/item_persistent.go
+++ b/lib/btrfs/btrfsitem/item_persistent.go
@@ -1,7 +1,7 @@
 package btrfsitem
 
 import (
-	"lukeshu.com/btrfs-tools/pkg/binstruct"
+	"git.lukeshu.com/btrfs-progs-ng/lib/binstruct"
 )
 
 const (
diff --git a/pkg/btrfs/btrfsitem/item_root.go b/lib/btrfs/btrfsitem/item_root.go
index de0a070..ff9311f 100644
--- a/pkg/btrfs/btrfsitem/item_root.go
+++ b/lib/btrfs/btrfsitem/item_root.go
@@ -1,10 +1,10 @@
 package btrfsitem
 
 import (
-	"lukeshu.com/btrfs-tools/pkg/binstruct"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfsvol"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/internal"
-	"lukeshu.com/btrfs-tools/pkg/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/binstruct"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/internal"
+	"git.lukeshu.com/btrfs-progs-ng/lib/util"
 )
 
 type Root struct { // ROOT_ITEM=132
diff --git a/pkg/btrfs/btrfsitem/item_rootref.go b/lib/btrfs/btrfsitem/item_rootref.go
index 567e9c7..c851474 100644
--- a/pkg/btrfs/btrfsitem/item_rootref.go
+++ b/lib/btrfs/btrfsitem/item_rootref.go
@@ -1,8 +1,8 @@
 package btrfsitem
 
 import (
-	"lukeshu.com/btrfs-tools/pkg/binstruct"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/internal"
+	"git.lukeshu.com/btrfs-progs-ng/lib/binstruct"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/internal"
 )
 
 type RootRef struct { // ROOT_REF=156 ROOT_BACKREF=144
diff --git a/pkg/btrfs/btrfsitem/item_shareddataref.go b/lib/btrfs/btrfsitem/item_shareddataref.go
index 0d73231..63897aa 100644
--- a/pkg/btrfs/btrfsitem/item_shareddataref.go
+++ b/lib/btrfs/btrfsitem/item_shareddataref.go
@@ -1,7 +1,7 @@
 package btrfsitem
 
 import (
-	"lukeshu.com/btrfs-tools/pkg/binstruct"
+	"git.lukeshu.com/btrfs-progs-ng/lib/binstruct"
 )
 
 type SharedDataRef struct { // SHARED_DATA_REF=184
diff --git a/pkg/btrfs/btrfsitem/item_untyped.go b/lib/btrfs/btrfsitem/item_untyped.go
index f5348e1..71a9af4 100644
--- a/pkg/btrfs/btrfsitem/item_untyped.go
+++ b/lib/btrfs/btrfsitem/item_untyped.go
@@ -1,8 +1,8 @@
 package btrfsitem
 
 import (
-	"lukeshu.com/btrfs-tools/pkg/binstruct"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/internal"
+	"git.lukeshu.com/btrfs-progs-ng/lib/binstruct"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/internal"
 )
 
 type FreeSpaceHeader struct { // UNTYPED=0:FREE_SPACE_OBJECTID
diff --git a/pkg/btrfs/btrfsitem/item_uuid.go b/lib/btrfs/btrfsitem/item_uuid.go
index 45543b3..6c7d4f0 100644
--- a/pkg/btrfs/btrfsitem/item_uuid.go
+++ b/lib/btrfs/btrfsitem/item_uuid.go
@@ -1,8 +1,8 @@
 package btrfsitem
 
 import (
-	"lukeshu.com/btrfs-tools/pkg/binstruct"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/internal"
+	"git.lukeshu.com/btrfs-progs-ng/lib/binstruct"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/internal"
 )
 
 // The Key for this item is a UUID, and the item is a subvolume IDs
diff --git a/pkg/btrfs/btrfsitem/items.go b/lib/btrfs/btrfsitem/items.go
index 5ad3471..33ff390 100644
--- a/pkg/btrfs/btrfsitem/items.go
+++ b/lib/btrfs/btrfsitem/items.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"reflect"
 
-	"lukeshu.com/btrfs-tools/pkg/binstruct"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfssum"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/internal"
+	"git.lukeshu.com/btrfs-progs-ng/lib/binstruct"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfssum"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/internal"
 )
 
 type Type = internal.ItemType
diff --git a/pkg/btrfs/btrfsitem/items.txt b/lib/btrfs/btrfsitem/items.txt
index 7898775..7898775 100644
--- a/pkg/btrfs/btrfsitem/items.txt
+++ b/lib/btrfs/btrfsitem/items.txt
diff --git a/pkg/btrfs/btrfsitem/items_gen.go b/lib/btrfs/btrfsitem/items_gen.go
index b5b64bd..3b84d60 100644
--- a/pkg/btrfs/btrfsitem/items_gen.go
+++ b/lib/btrfs/btrfsitem/items_gen.go
@@ -5,7 +5,7 @@ package btrfsitem
 import (
 	"reflect"
 
-	"lukeshu.com/btrfs-tools/pkg/btrfs/internal"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/internal"
 )
 
 const (
diff --git a/pkg/btrfs/btrfssum/csum.go b/lib/btrfs/btrfssum/csum.go
index 22d8149..11a8385 100644
--- a/pkg/btrfs/btrfssum/csum.go
+++ b/lib/btrfs/btrfssum/csum.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"hash/crc32"
 
-	"lukeshu.com/btrfs-tools/pkg/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/util"
 )
 
 type CSum [0x20]byte
diff --git a/pkg/btrfs/btrfssum/csum_test.go b/lib/btrfs/btrfssum/csum_test.go
index c47409c..755ecc1 100644
--- a/pkg/btrfs/btrfssum/csum_test.go
+++ b/lib/btrfs/btrfssum/csum_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfssum"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfssum"
 )
 
 func TestCSumFormat(t *testing.T) {
diff --git a/pkg/btrfs/btrfsvol/addr.go b/lib/btrfs/btrfsvol/addr.go
index b426611..6c67826 100644
--- a/pkg/btrfs/btrfsvol/addr.go
+++ b/lib/btrfs/btrfsvol/addr.go
@@ -3,7 +3,7 @@ package btrfsvol
 import (
 	"fmt"
 
-	"lukeshu.com/btrfs-tools/pkg/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/util"
 )
 
 type (
diff --git a/pkg/btrfs/btrfsvol/addr_test.go b/lib/btrfs/btrfsvol/addr_test.go
index cfc5053..aae6378 100644
--- a/pkg/btrfs/btrfsvol/addr_test.go
+++ b/lib/btrfs/btrfsvol/addr_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfsvol"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
 )
 
 func TestAddrFormat(t *testing.T) {
diff --git a/pkg/btrfs/btrfsvol/blockgroupflags.go b/lib/btrfs/btrfsvol/blockgroupflags.go
index ba1610b..1a194d7 100644
--- a/pkg/btrfs/btrfsvol/blockgroupflags.go
+++ b/lib/btrfs/btrfsvol/blockgroupflags.go
@@ -1,7 +1,7 @@
 package btrfsvol
 
 import (
-	"lukeshu.com/btrfs-tools/pkg/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/util"
 )
 
 type BlockGroupFlags uint64
diff --git a/pkg/btrfs/btrfsvol/chunk.go b/lib/btrfs/btrfsvol/chunk.go
index 8e5c4db..6aea483 100644
--- a/pkg/btrfs/btrfsvol/chunk.go
+++ b/lib/btrfs/btrfsvol/chunk.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"sort"
 
-	"lukeshu.com/btrfs-tools/pkg/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/util"
 )
 
 // logical => []physical
diff --git a/pkg/btrfs/btrfsvol/devext.go b/lib/btrfs/btrfsvol/devext.go
index 8a69c7e..43c6255 100644
--- a/pkg/btrfs/btrfsvol/devext.go
+++ b/lib/btrfs/btrfsvol/devext.go
@@ -3,7 +3,7 @@ package btrfsvol
 import (
 	"fmt"
 
-	"lukeshu.com/btrfs-tools/pkg/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/util"
 )
 
 // physical => logical
diff --git a/pkg/btrfs/btrfsvol/lvm.go b/lib/btrfs/btrfsvol/lvm.go
index c05b9dd..3b9ccf6 100644
--- a/pkg/btrfs/btrfsvol/lvm.go
+++ b/lib/btrfs/btrfsvol/lvm.go
@@ -6,8 +6,8 @@ import (
 	"os"
 	"reflect"
 
-	"lukeshu.com/btrfs-tools/pkg/rbtree"
-	"lukeshu.com/btrfs-tools/pkg/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/rbtree"
+	"git.lukeshu.com/btrfs-progs-ng/lib/util"
 )
 
 type LogicalVolume[PhysicalVolume util.File[PhysicalAddr]] struct {
diff --git a/pkg/btrfs/internal/itemtype.go b/lib/btrfs/internal/itemtype.go
index 60731aa..60731aa 100644
--- a/pkg/btrfs/internal/itemtype.go
+++ b/lib/btrfs/internal/itemtype.go
diff --git a/pkg/btrfs/internal/misc.go b/lib/btrfs/internal/misc.go
index 3dc77d6..fba1d38 100644
--- a/pkg/btrfs/internal/misc.go
+++ b/lib/btrfs/internal/misc.go
@@ -3,8 +3,8 @@ package internal
 import (
 	"time"
 
-	"lukeshu.com/btrfs-tools/pkg/binstruct"
-	"lukeshu.com/btrfs-tools/pkg/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/binstruct"
+	"git.lukeshu.com/btrfs-progs-ng/lib/util"
 )
 
 type Generation uint64
diff --git a/pkg/btrfs/internal/objid.go b/lib/btrfs/internal/objid.go
index b3f09f6..8c9c002 100644
--- a/pkg/btrfs/internal/objid.go
+++ b/lib/btrfs/internal/objid.go
@@ -3,7 +3,7 @@ package internal
 import (
 	"fmt"
 
-	"lukeshu.com/btrfs-tools/pkg/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/util"
 )
 
 type ObjID uint64
diff --git a/pkg/btrfs/io1_pv.go b/lib/btrfs/io1_pv.go
index b9f7ea4..cababaf 100644
--- a/pkg/btrfs/io1_pv.go
+++ b/lib/btrfs/io1_pv.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"os"
 
-	"lukeshu.com/btrfs-tools/pkg/binstruct"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfsvol"
-	"lukeshu.com/btrfs-tools/pkg/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/binstruct"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
+	"git.lukeshu.com/btrfs-progs-ng/lib/util"
 )
 
 type Device struct {
diff --git a/pkg/btrfs/io2_lv.go b/lib/btrfs/io2_lv.go
index 486a4ae..c6ef9e0 100644
--- a/pkg/btrfs/io2_lv.go
+++ b/lib/btrfs/io2_lv.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/datawire/dlib/derror"
 
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfsitem"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfsvol"
-	"lukeshu.com/btrfs-tools/pkg/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsitem"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
+	"git.lukeshu.com/btrfs-progs-ng/lib/util"
 )
 
 type FS struct {
diff --git a/pkg/btrfs/io3_btree.go b/lib/btrfs/io3_btree.go
index be46d21..dbc2ac1 100644
--- a/pkg/btrfs/io3_btree.go
+++ b/lib/btrfs/io3_btree.go
@@ -9,9 +9,9 @@ import (
 
 	"github.com/datawire/dlib/derror"
 
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfsitem"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfsvol"
-	"lukeshu.com/btrfs-tools/pkg/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsitem"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
+	"git.lukeshu.com/btrfs-progs-ng/lib/util"
 )
 
 // - The first element will always have an ItemIdx of -1.
diff --git a/pkg/btrfs/io4_fs.go b/lib/btrfs/io4_fs.go
index 18ae42a..7ae30cb 100644
--- a/pkg/btrfs/io4_fs.go
+++ b/lib/btrfs/io4_fs.go
@@ -10,9 +10,9 @@ import (
 
 	"github.com/datawire/dlib/derror"
 
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfsitem"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfsvol"
-	"lukeshu.com/btrfs-tools/pkg/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsitem"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
+	"git.lukeshu.com/btrfs-progs-ng/lib/util"
 )
 
 type BareInode struct {
diff --git a/pkg/btrfs/types_node.go b/lib/btrfs/types_node.go
index 4382a91..5934f40 100644
--- a/pkg/btrfs/types_node.go
+++ b/lib/btrfs/types_node.go
@@ -5,11 +5,11 @@ import (
 	"errors"
 	"fmt"
 
-	"lukeshu.com/btrfs-tools/pkg/binstruct"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfsitem"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfssum"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfsvol"
-	"lukeshu.com/btrfs-tools/pkg/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/binstruct"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsitem"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfssum"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
+	"git.lukeshu.com/btrfs-progs-ng/lib/util"
 )
 
 type NodeFlags uint64
diff --git a/pkg/btrfs/types_superblock.go b/lib/btrfs/types_superblock.go
index 413e5da..373de48 100644
--- a/pkg/btrfs/types_superblock.go
+++ b/lib/btrfs/types_superblock.go
@@ -4,11 +4,11 @@ import (
 	"fmt"
 	"reflect"
 
-	"lukeshu.com/btrfs-tools/pkg/binstruct"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfsitem"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfssum"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfsvol"
-	"lukeshu.com/btrfs-tools/pkg/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/binstruct"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsitem"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfssum"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
+	"git.lukeshu.com/btrfs-progs-ng/lib/util"
 )
 
 type Superblock struct {
diff --git a/pkg/btrfsmisc/fsck.go b/lib/btrfsmisc/fsck.go
index aec55a0..9567bdf 100644
--- a/pkg/btrfsmisc/fsck.go
+++ b/lib/btrfsmisc/fsck.go
@@ -4,9 +4,9 @@ import (
 	"errors"
 	"fmt"
 
-	"lukeshu.com/btrfs-tools/pkg/btrfs"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfsvol"
-	"lukeshu.com/btrfs-tools/pkg/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
+	"git.lukeshu.com/btrfs-progs-ng/lib/util"
 )
 
 // ScanForNodes mimics btrfs-progs
diff --git a/pkg/btrfsmisc/open.go b/lib/btrfsmisc/open.go
index bf72670..a52926f 100644
--- a/pkg/btrfsmisc/open.go
+++ b/lib/btrfsmisc/open.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	"lukeshu.com/btrfs-tools/pkg/btrfs"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs"
 )
 
 func Open(flag int, filenames ...string) (*btrfs.FS, error) {
diff --git a/pkg/btrfsmisc/print_tree.go b/lib/btrfsmisc/print_tree.go
index cc3055d..69692e7 100644
--- a/pkg/btrfsmisc/print_tree.go
+++ b/lib/btrfsmisc/print_tree.go
@@ -5,11 +5,11 @@ import (
 	"os"
 	"strings"
 
-	"lukeshu.com/btrfs-tools/pkg/btrfs"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfsitem"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfssum"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfsvol"
-	"lukeshu.com/btrfs-tools/pkg/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsitem"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfssum"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
+	"git.lukeshu.com/btrfs-progs-ng/lib/util"
 )
 
 // PrintTree mimics btrfs-progs
diff --git a/pkg/btrfsmisc/walk.go b/lib/btrfsmisc/walk.go
index 55adf1d..ba0444f 100644
--- a/pkg/btrfsmisc/walk.go
+++ b/lib/btrfsmisc/walk.go
@@ -3,10 +3,10 @@ package btrfsmisc
 import (
 	"fmt"
 
-	"lukeshu.com/btrfs-tools/pkg/btrfs"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfsitem"
-	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfsvol"
-	"lukeshu.com/btrfs-tools/pkg/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsitem"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
+	"git.lukeshu.com/btrfs-progs-ng/lib/util"
 )
 
 type WalkErr struct {
diff --git a/pkg/linux/stat.go b/lib/linux/stat.go
index c4d4ad9..c4d4ad9 100644
--- a/pkg/linux/stat.go
+++ b/lib/linux/stat.go
diff --git a/pkg/rbtree/print_test.go b/lib/rbtree/print_test.go
index 3e37cf2..3e37cf2 100644
--- a/pkg/rbtree/print_test.go
+++ b/lib/rbtree/print_test.go
diff --git a/pkg/rbtree/rbtree.go b/lib/rbtree/rbtree.go
index 7927307..7927307 100644
--- a/pkg/rbtree/rbtree.go
+++ b/lib/rbtree/rbtree.go
diff --git a/pkg/rbtree/rbtree_test.go b/lib/rbtree/rbtree_test.go
index 9b8e02c..9b8e02c 100644
--- a/pkg/rbtree/rbtree_test.go
+++ b/lib/rbtree/rbtree_test.go
diff --git a/pkg/rbtree/rbtree_util.go b/lib/rbtree/rbtree_util.go
index 2e7a48d..252d8fe 100644
--- a/pkg/rbtree/rbtree_util.go
+++ b/lib/rbtree/rbtree_util.go
@@ -3,7 +3,7 @@ package rbtree
 import (
 	"reflect"
 
-	"lukeshu.com/btrfs-tools/pkg/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/util"
 )
 
 // SearchRange is like Search, but returns all nodes that match the
diff --git a/pkg/rbtree/testdata/fuzz/FuzzTree/be408ce7760bc8ced841300ea7e6bac1a1e9505b1535810083d18db95d86f489 b/lib/rbtree/testdata/fuzz/FuzzTree/be408ce7760bc8ced841300ea7e6bac1a1e9505b1535810083d18db95d86f489
index 40318c6..40318c6 100644
--- a/pkg/rbtree/testdata/fuzz/FuzzTree/be408ce7760bc8ced841300ea7e6bac1a1e9505b1535810083d18db95d86f489
+++ b/lib/rbtree/testdata/fuzz/FuzzTree/be408ce7760bc8ced841300ea7e6bac1a1e9505b1535810083d18db95d86f489
diff --git a/pkg/rbtree/testdata/fuzz/FuzzTree/f9e6421dacf921f7bb25d402bffbfdce114baad0b1c8b9a9189b5a97fda27e41 b/lib/rbtree/testdata/fuzz/FuzzTree/f9e6421dacf921f7bb25d402bffbfdce114baad0b1c8b9a9189b5a97fda27e41
index 238e44f..238e44f 100644
--- a/pkg/rbtree/testdata/fuzz/FuzzTree/f9e6421dacf921f7bb25d402bffbfdce114baad0b1c8b9a9189b5a97fda27e41
+++ b/lib/rbtree/testdata/fuzz/FuzzTree/f9e6421dacf921f7bb25d402bffbfdce114baad0b1c8b9a9189b5a97fda27e41
diff --git a/pkg/util/bitfield.go b/lib/util/bitfield.go
index 23da17a..23da17a 100644
--- a/pkg/util/bitfield.go
+++ b/lib/util/bitfield.go
diff --git a/pkg/util/fmt.go b/lib/util/fmt.go
index af7404c..af7404c 100644
--- a/pkg/util/fmt.go
+++ b/lib/util/fmt.go
diff --git a/pkg/util/fmt_test.go b/lib/util/fmt_test.go
index d2579d0..4251ecf 100644
--- a/pkg/util/fmt_test.go
+++ b/lib/util/fmt_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"lukeshu.com/btrfs-tools/pkg/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/util"
 )
 
 type FmtState struct {
diff --git a/pkg/util/generic.go b/lib/util/generic.go
index 6882724..6882724 100644
--- a/pkg/util/generic.go
+++ b/lib/util/generic.go
diff --git a/pkg/util/int.go b/lib/util/int.go
index fab553d..fab553d 100644
--- a/pkg/util/int.go
+++ b/lib/util/int.go
diff --git a/pkg/util/lru.go b/lib/util/lru.go
index 2b62e69..2b62e69 100644
--- a/pkg/util/lru.go
+++ b/lib/util/lru.go
diff --git a/pkg/util/ref.go b/lib/util/ref.go
index aecfb9f..1ac48c9 100644
--- a/pkg/util/ref.go
+++ b/lib/util/ref.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"io"
 
-	"lukeshu.com/btrfs-tools/pkg/binstruct"
+	"git.lukeshu.com/btrfs-progs-ng/lib/binstruct"
 )
 
 type File[A ~int64] interface {
diff --git a/pkg/util/uuid.go b/lib/util/uuid.go
index 3b4cbaf..3b4cbaf 100644
--- a/pkg/util/uuid.go
+++ b/lib/util/uuid.go
diff --git a/pkg/util/uuid_test.go b/lib/util/uuid_test.go
index b5118ec..7e0e07a 100644
--- a/pkg/util/uuid_test.go
+++ b/lib/util/uuid_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"lukeshu.com/btrfs-tools/pkg/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/util"
 )
 
 func TestParseUUID(t *testing.T) {