Move more top-level packages under pkg

gcla · Jul 9, 2022 · a09eb2a · a09eb2a
1 parent 785fd48
commit a09eb2a
Show file tree

Hide file tree

Showing 92 changed files with 45 additions and 45 deletions.
diff --git a/cmd/termshark/termshark.go b/cmd/termshark/termshark.go
@@ -23,13 +23,13 @@ import (
 	"github.com/gcla/termshark/v2/pkg/capinfo"
 	"github.com/gcla/termshark/v2/cli"
 	"github.com/gcla/termshark/v2/configs/profiles"
-	"github.com/gcla/termshark/v2/convs"
-	"github.com/gcla/termshark/v2/pcap"
+	"github.com/gcla/termshark/v2/pkg/convs"
+	"github.com/gcla/termshark/v2/pkg/pcap"
 	"github.com/gcla/termshark/v2/pkg/summary"
-	"github.com/gcla/termshark/v2/shark"
-	"github.com/gcla/termshark/v2/streams"
-	"github.com/gcla/termshark/v2/system"
-	"github.com/gcla/termshark/v2/tty"
+	"github.com/gcla/termshark/v2/pkg/shark"
+	"github.com/gcla/termshark/v2/pkg/streams"
+	"github.com/gcla/termshark/v2/pkg/system"
+	"github.com/gcla/termshark/v2/pkg/tty"
 	"github.com/gcla/termshark/v2/ui"
 	"github.com/gcla/termshark/v2/widgets/filter"
 	"github.com/gcla/termshark/v2/widgets/wormhole"

diff --git a/pkg/capinfo/loader.go b/pkg/capinfo/loader.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/gcla/gowid"
 	"github.com/gcla/termshark/v2"
-	"github.com/gcla/termshark/v2/pcap"
+	"github.com/gcla/termshark/v2/pkg/pcap"
 	log "github.com/sirupsen/logrus"
 )
 

diff --git a/convs/loader.go → pkg/convs/loader.go b/convs/loader.go → pkg/convs/loader.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/gcla/gowid"
 	"github.com/gcla/termshark/v2"
-	"github.com/gcla/termshark/v2/pcap"
+	"github.com/gcla/termshark/v2/pkg/pcap"
 	log "github.com/sirupsen/logrus"
 )
 

diff --git a/convs/types.go → pkg/convs/types.go b/convs/types.go → pkg/convs/types.go
diff --git a/format/hexdump.go → pkg/format/hexdump.go b/format/hexdump.go → pkg/format/hexdump.go
diff --git a/format/hexdump_test.go → pkg/format/hexdump_test.go b/format/hexdump_test.go → pkg/format/hexdump_test.go
diff --git a/format/printable.go → pkg/format/printable.go b/format/printable.go → pkg/format/printable.go
diff --git a/pcap/cmds.go → pkg/pcap/cmds.go b/pcap/cmds.go → pkg/pcap/cmds.go
@@ -15,7 +15,7 @@ import (
 	"github.com/gcla/termshark/v2"
 	"github.com/gcla/termshark/v2/configs/profiles"
 	"github.com/gcla/termshark/v2/pkg/summary"
-	"github.com/gcla/termshark/v2/shark"
+	"github.com/gcla/termshark/v2/pkg/shark"
 	"github.com/kballard/go-shellquote"
 )
 

diff --git a/pcap/cmds_unix.go → pkg/pcap/cmds_unix.go b/pcap/cmds_unix.go → pkg/pcap/cmds_unix.go
diff --git a/pcap/cmds_windows.go → pkg/pcap/cmds_windows.go b/pcap/cmds_windows.go → pkg/pcap/cmds_windows.go
diff --git a/pcap/handlers.go → pkg/pcap/handlers.go b/pcap/handlers.go → pkg/pcap/handlers.go
diff --git a/pcap/loader.go → pkg/pcap/loader.go b/pcap/loader.go → pkg/pcap/loader.go
@@ -22,7 +22,7 @@ import (
 	"github.com/gcla/gowid"
 	"github.com/gcla/gowid/gwutil"
 	"github.com/gcla/termshark/v2"
-	"github.com/gcla/termshark/v2/format"
+	"github.com/gcla/termshark/v2/pkg/format"
 	lru "github.com/hashicorp/golang-lru"
 	log "github.com/sirupsen/logrus"
 	fsnotify "gopkg.in/fsnotify/fsnotify.v1"

diff --git a/pcap/loader_tshark_test.go → pkg/pcap/loader_tshark_test.go b/pcap/loader_tshark_test.go → pkg/pcap/loader_tshark_test.go
diff --git a/pcap/pdml.go → pkg/pcap/pdml.go b/pcap/pdml.go → pkg/pcap/pdml.go
diff --git a/pcap/source.go → pkg/pcap/source.go b/pcap/source.go → pkg/pcap/source.go
@@ -9,7 +9,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/gcla/termshark/v2/system"
+	"github.com/gcla/termshark/v2/pkg/system"
 )
 
 //======================================================================

diff --git a/pcap/testdata/1.hexdump → pkg/pcap/testdata/1.hexdump b/pcap/testdata/1.hexdump → pkg/pcap/testdata/1.hexdump
diff --git a/pcap/testdata/1.pcap → pkg/pcap/testdata/1.pcap b/pcap/testdata/1.pcap → pkg/pcap/testdata/1.pcap
diff --git a/pcap/testdata/1.pdml → pkg/pcap/testdata/1.pdml b/pcap/testdata/1.pdml → pkg/pcap/testdata/1.pdml
diff --git a/pcap/testdata/1.psml → pkg/pcap/testdata/1.psml b/pcap/testdata/1.psml → pkg/pcap/testdata/1.psml
diff --git a/pcap/testdata/2.hexdump-body → pkg/pcap/testdata/2.hexdump-body b/pcap/testdata/2.hexdump-body → pkg/pcap/testdata/2.hexdump-body
diff --git a/pcap/testdata/2.hexdump-footer → pkg/pcap/testdata/2.hexdump-footer b/pcap/testdata/2.hexdump-footer → pkg/pcap/testdata/2.hexdump-footer
diff --git a/pcap/testdata/2.hexdump-header → pkg/pcap/testdata/2.hexdump-header b/pcap/testdata/2.hexdump-header → pkg/pcap/testdata/2.hexdump-header
diff --git a/pcap/testdata/2.pcap-body → pkg/pcap/testdata/2.pcap-body b/pcap/testdata/2.pcap-body → pkg/pcap/testdata/2.pcap-body
diff --git a/pcap/testdata/2.pcap-footer → pkg/pcap/testdata/2.pcap-footer b/pcap/testdata/2.pcap-footer → pkg/pcap/testdata/2.pcap-footer
diff --git a/pcap/testdata/2.pcap-header → pkg/pcap/testdata/2.pcap-header b/pcap/testdata/2.pcap-header → pkg/pcap/testdata/2.pcap-header
diff --git a/pcap/testdata/2.pdml-body → pkg/pcap/testdata/2.pdml-body b/pcap/testdata/2.pdml-body → pkg/pcap/testdata/2.pdml-body
diff --git a/pcap/testdata/2.pdml-footer → pkg/pcap/testdata/2.pdml-footer b/pcap/testdata/2.pdml-footer → pkg/pcap/testdata/2.pdml-footer
diff --git a/pcap/testdata/2.pdml-header → pkg/pcap/testdata/2.pdml-header b/pcap/testdata/2.pdml-header → pkg/pcap/testdata/2.pdml-header
diff --git a/pcap/testdata/2.psml-body → pkg/pcap/testdata/2.psml-body b/pcap/testdata/2.psml-body → pkg/pcap/testdata/2.psml-body
diff --git a/pcap/testdata/2.psml-footer → pkg/pcap/testdata/2.psml-footer b/pcap/testdata/2.psml-footer → pkg/pcap/testdata/2.psml-footer
diff --git a/pcap/testdata/2.psml-header → pkg/pcap/testdata/2.psml-header b/pcap/testdata/2.psml-header → pkg/pcap/testdata/2.psml-header
diff --git a/pcap/utils.go → pkg/pcap/utils.go b/pcap/utils.go → pkg/pcap/utils.go
diff --git a/pdmltree/pdmltree.go → pkg/pdmltree/pdmltree.go b/pdmltree/pdmltree.go → pkg/pdmltree/pdmltree.go
diff --git a/pdmltree/pdmltree_test.go → pkg/pdmltree/pdmltree_test.go b/pdmltree/pdmltree_test.go → pkg/pdmltree/pdmltree_test.go
diff --git a/psmlmodel/model.go → pkg/psmlmodel/model.go b/psmlmodel/model.go → pkg/psmlmodel/model.go
diff --git a/shark/columnformat.go → pkg/shark/columnformat.go b/shark/columnformat.go → pkg/shark/columnformat.go
diff --git a/shark/columnformat_test.go → pkg/shark/columnformat_test.go b/shark/columnformat_test.go → pkg/shark/columnformat_test.go
diff --git a/shark/wiresharkcfg/cfg.go → pkg/shark/wiresharkcfg/cfg.go b/shark/wiresharkcfg/cfg.go → pkg/shark/wiresharkcfg/cfg.go
diff --git a/shark/wiresharkcfg/parser.go → pkg/shark/wiresharkcfg/parser.go b/shark/wiresharkcfg/parser.go → pkg/shark/wiresharkcfg/parser.go
diff --git a/shark/wiresharkcfg/parser.peg → pkg/shark/wiresharkcfg/parser.peg b/shark/wiresharkcfg/parser.peg → pkg/shark/wiresharkcfg/parser.peg
diff --git a/shark/wiresharkcfg/parser_test.go → pkg/shark/wiresharkcfg/parser_test.go b/shark/wiresharkcfg/parser_test.go → pkg/shark/wiresharkcfg/parser_test.go
diff --git a/streams/follow.go → pkg/streams/follow.go b/streams/follow.go → pkg/streams/follow.go
diff --git a/streams/follow.peg → pkg/streams/follow.peg b/streams/follow.peg → pkg/streams/follow.peg
diff --git a/streams/follow_test.go → pkg/streams/follow_test.go b/streams/follow_test.go → pkg/streams/follow_test.go
diff --git a/streams/loader.go → pkg/streams/loader.go b/streams/loader.go → pkg/streams/loader.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/gcla/gowid"
 	"github.com/gcla/termshark/v2"
-	"github.com/gcla/termshark/v2/pcap"
+	"github.com/gcla/termshark/v2/pkg/pcap"
 	log "github.com/sirupsen/logrus"
 )
 

diff --git a/streams/loader_test.go → pkg/streams/loader_test.go b/streams/loader_test.go → pkg/streams/loader_test.go
diff --git a/streams/parse.go → pkg/streams/parse.go b/streams/parse.go → pkg/streams/parse.go
diff --git a/system/dumpcapext.go → pkg/system/dumpcapext.go b/system/dumpcapext.go → pkg/system/dumpcapext.go
diff --git a/system/dumpcapext_arm64.go → pkg/system/dumpcapext_arm64.go b/system/dumpcapext_arm64.go → pkg/system/dumpcapext_arm64.go
diff --git a/system/dumpcapext_darwin.go → pkg/system/dumpcapext_darwin.go b/system/dumpcapext_darwin.go → pkg/system/dumpcapext_darwin.go
diff --git a/system/dumpcapext_windows.go → pkg/system/dumpcapext_windows.go b/system/dumpcapext_windows.go → pkg/system/dumpcapext_windows.go
diff --git a/system/dup.go → pkg/system/dup.go b/system/dup.go → pkg/system/dup.go
diff --git a/system/dup_linux_arm64.go → pkg/system/dup_linux_arm64.go b/system/dup_linux_arm64.go → pkg/system/dup_linux_arm64.go
diff --git a/system/dup_linux_riscv64.go → pkg/system/dup_linux_riscv64.go b/system/dup_linux_riscv64.go → pkg/system/dup_linux_riscv64.go
diff --git a/system/errors.go → pkg/system/errors.go b/system/errors.go → pkg/system/errors.go
diff --git a/system/extcmds.go → pkg/system/extcmds.go b/system/extcmds.go → pkg/system/extcmds.go
diff --git a/system/extcmds_android.go → pkg/system/extcmds_android.go b/system/extcmds_android.go → pkg/system/extcmds_android.go
diff --git a/system/extcmds_darwin.go → pkg/system/extcmds_darwin.go b/system/extcmds_darwin.go → pkg/system/extcmds_darwin.go
diff --git a/system/extcmds_windows.go → pkg/system/extcmds_windows.go b/system/extcmds_windows.go → pkg/system/extcmds_windows.go
diff --git a/system/fd.go → pkg/system/fd.go b/system/fd.go → pkg/system/fd.go
diff --git a/system/fd_windows.go → pkg/system/fd_windows.go b/system/fd_windows.go → pkg/system/fd_windows.go
diff --git a/system/fdinfo.go → pkg/system/fdinfo.go b/system/fdinfo.go → pkg/system/fdinfo.go
diff --git a/system/have_fdinfo.go → pkg/system/have_fdinfo.go b/system/have_fdinfo.go → pkg/system/have_fdinfo.go
diff --git a/system/have_fdinfo_linux.go → pkg/system/have_fdinfo_linux.go b/system/have_fdinfo_linux.go → pkg/system/have_fdinfo_linux.go
diff --git a/system/picker.go → pkg/system/picker.go b/system/picker.go → pkg/system/picker.go
diff --git a/system/picker_android.go → pkg/system/picker_android.go b/system/picker_android.go → pkg/system/picker_android.go
diff --git a/system/signals.go → pkg/system/signals.go b/system/signals.go → pkg/system/signals.go
diff --git a/system/signals_windows.go → pkg/system/signals_windows.go b/system/signals_windows.go → pkg/system/signals_windows.go
diff --git a/theme/modeswap/modeswap.go → pkg/theme/modeswap/modeswap.go b/theme/modeswap/modeswap.go → pkg/theme/modeswap/modeswap.go
diff --git a/theme/utils.go → pkg/theme/utils.go b/theme/utils.go → pkg/theme/utils.go
diff --git a/tty/tty.go → pkg/tty/tty.go b/tty/tty.go → pkg/tty/tty.go
diff --git a/tty/tty_windows.go → pkg/tty/tty_windows.go b/tty/tty_windows.go → pkg/tty/tty_windows.go
diff --git a/ui/capinfoui.go b/ui/capinfoui.go
@@ -13,7 +13,7 @@ import (
 	"github.com/gcla/gowid"
 	"github.com/gcla/termshark/v2"
 	"github.com/gcla/termshark/v2/pkg/capinfo"
-	"github.com/gcla/termshark/v2/pcap"
+	"github.com/gcla/termshark/v2/pkg/pcap"
 	log "github.com/sirupsen/logrus"
 )
 

diff --git a/ui/convscallbacks.go b/ui/convscallbacks.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/gcla/gowid"
 	"github.com/gcla/termshark/v2"
-	"github.com/gcla/termshark/v2/pcap"
+	"github.com/gcla/termshark/v2/pkg/pcap"
 )
 
 //======================================================================

diff --git a/ui/convsui.go b/ui/convsui.go
@@ -32,9 +32,9 @@ import (
 	"github.com/gcla/gowid/widgets/vpadding"
 	"github.com/gcla/termshark/v2"
 	"github.com/gcla/termshark/v2/configs/profiles"
-	"github.com/gcla/termshark/v2/convs"
-	"github.com/gcla/termshark/v2/pcap"
-	"github.com/gcla/termshark/v2/psmlmodel"
+	"github.com/gcla/termshark/v2/pkg/convs"
+	"github.com/gcla/termshark/v2/pkg/pcap"
+	"github.com/gcla/termshark/v2/pkg/psmlmodel"
 	"github.com/gcla/termshark/v2/ui/tableutil"
 	"github.com/gcla/termshark/v2/widgets/appkeys"
 	"github.com/gcla/termshark/v2/widgets/copymodetable"

diff --git a/ui/lastline.go b/ui/lastline.go
@@ -17,7 +17,7 @@ import (
 	"github.com/gcla/gowid/vim"
 	"github.com/gcla/termshark/v2"
 	"github.com/gcla/termshark/v2/configs/profiles"
-	"github.com/gcla/termshark/v2/theme"
+	"github.com/gcla/termshark/v2/pkg/theme"
 	"github.com/gcla/termshark/v2/widgets/mapkeys"
 	"github.com/gcla/termshark/v2/widgets/minibuffer"
 	"github.com/rakyll/statik/fs"

diff --git a/ui/palette.go b/ui/palette.go
@@ -9,7 +9,7 @@ import (
 	"fmt"
 
 	"github.com/gcla/gowid"
-	"github.com/gcla/termshark/v2/theme"
+	"github.com/gcla/termshark/v2/pkg/theme"
 	log "github.com/sirupsen/logrus"
 )
 

diff --git a/ui/prochandlers.go b/ui/prochandlers.go
@@ -16,7 +16,7 @@ import (
 	"github.com/gcla/gowid/widgets/table"
 	"github.com/gcla/termshark/v2"
 	"github.com/gcla/termshark/v2/configs/profiles"
-	"github.com/gcla/termshark/v2/pcap"
+	"github.com/gcla/termshark/v2/pkg/pcap"
 	log "github.com/sirupsen/logrus"
 )
 

diff --git a/ui/psmlcols.go b/ui/psmlcols.go
@@ -26,8 +26,8 @@ import (
 	"github.com/gcla/gowid/widgets/table"
 	"github.com/gcla/gowid/widgets/text"
 	"github.com/gcla/termshark/v2/configs/profiles"
-	"github.com/gcla/termshark/v2/shark"
-	"github.com/gcla/termshark/v2/shark/wiresharkcfg"
+	"github.com/gcla/termshark/v2/pkg/shark"
+	"github.com/gcla/termshark/v2/pkg/shark/wiresharkcfg"
 	"github.com/gcla/termshark/v2/ui/menuutil"
 	"github.com/gdamore/tcell/v2"
 	log "github.com/sirupsen/logrus"

diff --git a/ui/psmlcolsmodel.go b/ui/psmlcolsmodel.go
@@ -22,8 +22,8 @@ import (
 	"github.com/gcla/gowid/widgets/table"
 	"github.com/gcla/gowid/widgets/text"
 	"github.com/gcla/gowid/widgets/vpadding"
-	"github.com/gcla/termshark/v2/shark"
-	"github.com/gcla/termshark/v2/shark/wiresharkcfg"
+	"github.com/gcla/termshark/v2/pkg/shark"
+	"github.com/gcla/termshark/v2/pkg/shark/wiresharkcfg"
 	"github.com/gcla/termshark/v2/widgets/filter"
 	"github.com/gcla/termshark/v2/widgets/number"
 	log "github.com/sirupsen/logrus"

diff --git a/ui/searchalg.go b/ui/searchalg.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/gcla/gowid"
 	"github.com/gcla/termshark/v2"
-	"github.com/gcla/termshark/v2/pcap"
+	"github.com/gcla/termshark/v2/pkg/pcap"
 	"github.com/gcla/termshark/v2/widgets/search"
 )
 

diff --git a/ui/searchbyfilter.go b/ui/searchbyfilter.go
@@ -19,8 +19,8 @@ import (
 	"github.com/gcla/gowid/widgets/table"
 	"github.com/gcla/termshark/v2"
 	"github.com/gcla/termshark/v2/configs/profiles"
-	"github.com/gcla/termshark/v2/format"
-	"github.com/gcla/termshark/v2/pcap"
+	"github.com/gcla/termshark/v2/pkg/format"
+	"github.com/gcla/termshark/v2/pkg/pcap"
 	"github.com/gcla/termshark/v2/widgets/search"
 	log "github.com/sirupsen/logrus"
 	"gitlab.com/jonas.jasas/condchan"

diff --git a/ui/searchpktbytes.go b/ui/searchpktbytes.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/gcla/gowid"
 	"github.com/gcla/gowid/widgets/table"
-	"github.com/gcla/termshark/v2/pcap"
+	"github.com/gcla/termshark/v2/pkg/pcap"
 	"github.com/gcla/termshark/v2/widgets/search"
 )
 

diff --git a/ui/searchpktstruct.go b/ui/searchpktstruct.go
@@ -11,7 +11,7 @@ import (
 	"github.com/gcla/gowid"
 	"github.com/gcla/gowid/widgets/table"
 	"github.com/gcla/gowid/widgets/tree"
-	"github.com/gcla/termshark/v2/pdmltree"
+	"github.com/gcla/termshark/v2/pkg/pdmltree"
 	"github.com/gcla/termshark/v2/widgets/search"
 )
 

diff --git a/ui/streamui.go b/ui/streamui.go
@@ -20,9 +20,9 @@ import (
 	"github.com/gcla/gowid/widgets/table"
 	"github.com/gcla/termshark/v2"
 	"github.com/gcla/termshark/v2/configs/profiles"
-	"github.com/gcla/termshark/v2/pcap"
-	"github.com/gcla/termshark/v2/pdmltree"
-	"github.com/gcla/termshark/v2/streams"
+	"github.com/gcla/termshark/v2/pkg/pcap"
+	"github.com/gcla/termshark/v2/pkg/pdmltree"
+	"github.com/gcla/termshark/v2/pkg/streams"
 	"github.com/gcla/termshark/v2/widgets/appkeys"
 	"github.com/gcla/termshark/v2/widgets/streamwidget"
 	"github.com/gdamore/tcell/v2"

diff --git a/ui/ui.go b/ui/ui.go
@@ -47,12 +47,12 @@ import (
 	"github.com/gcla/gowid/widgets/vpadding"
 	"github.com/gcla/termshark/v2"
 	"github.com/gcla/termshark/v2/configs/profiles"
-	"github.com/gcla/termshark/v2/pcap"
-	"github.com/gcla/termshark/v2/pdmltree"
-	"github.com/gcla/termshark/v2/psmlmodel"
-	"github.com/gcla/termshark/v2/shark"
-	"github.com/gcla/termshark/v2/system"
-	"github.com/gcla/termshark/v2/theme"
+	"github.com/gcla/termshark/v2/pkg/pcap"
+	"github.com/gcla/termshark/v2/pkg/pdmltree"
+	"github.com/gcla/termshark/v2/pkg/psmlmodel"
+	"github.com/gcla/termshark/v2/pkg/system"
+	"github.com/gcla/termshark/v2/pkg/shark"
+	"github.com/gcla/termshark/v2/pkg/theme"
 	"github.com/gcla/termshark/v2/ui/menuutil"
 	"github.com/gcla/termshark/v2/ui/tableutil"
 	"github.com/gcla/termshark/v2/widgets"

diff --git a/utils.go b/utils.go
@@ -38,7 +38,7 @@ import (
 	"github.com/gcla/gowid/vim"
 	"github.com/gcla/gowid/widgets/table"
 	"github.com/gcla/termshark/v2/configs/profiles"
-	"github.com/gcla/termshark/v2/system"
+	"github.com/gcla/termshark/v2/pkg/system"
 	"github.com/gcla/termshark/v2/widgets/resizable"
 	"github.com/gdamore/tcell/v2"
 	"github.com/gdamore/tcell/v2/terminfo"

diff --git a/utils_test.go b/utils_test.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 
 	"github.com/blang/semver"
-	"github.com/gcla/termshark/v2/format"
+	"github.com/gcla/termshark/v2/pkg/format"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/widgets/copymodetree/copymodetree.go b/widgets/copymodetree/copymodetree.go
@@ -16,7 +16,7 @@ import (
 	"github.com/gcla/gowid/widgets/list"
 	"github.com/gcla/gowid/widgets/tree"
 	"github.com/gcla/termshark/v2"
-	"github.com/gcla/termshark/v2/pdmltree"
+	"github.com/gcla/termshark/v2/pkg/pdmltree"
 )
 
 //======================================================================

diff --git a/widgets/hexdumper/hexdumper.go b/widgets/hexdumper/hexdumper.go
@@ -21,7 +21,7 @@ import (
 	"github.com/gcla/gowid/widgets/styled"
 	"github.com/gcla/gowid/widgets/text"
 	"github.com/gcla/termshark/v2"
-	"github.com/gcla/termshark/v2/format"
+	"github.com/gcla/termshark/v2/pkg/format"
 	"github.com/gcla/termshark/v2/widgets/renderfocused"
 	"github.com/gdamore/tcell/v2"
 	"github.com/pkg/errors"

diff --git a/widgets/hexdumper2/hexdumper2.go b/widgets/hexdumper2/hexdumper2.go
@@ -18,7 +18,7 @@ import (
 	"github.com/gcla/gowid/vim"
 	"github.com/gcla/gowid/widgets/list"
 	"github.com/gcla/gowid/widgets/styled"
-	"github.com/gcla/termshark/v2/format"
+	"github.com/gcla/termshark/v2/pkg/format"
 	"github.com/gdamore/tcell/v2"
 )
 

diff --git a/widgets/streamwidget/streamwidget.go b/widgets/streamwidget/streamwidget.go
@@ -37,8 +37,8 @@ import (
 	"github.com/gcla/gowid/widgets/text"
 	"github.com/gcla/termshark/v2"
 	"github.com/gcla/termshark/v2/configs/profiles"
-	"github.com/gcla/termshark/v2/format"
-	"github.com/gcla/termshark/v2/streams"
+	"github.com/gcla/termshark/v2/pkg/format"
+	"github.com/gcla/termshark/v2/pkg/streams"
 	"github.com/gcla/termshark/v2/ui/menuutil"
 	"github.com/gcla/termshark/v2/ui/tableutil"
 	"github.com/gcla/termshark/v2/widgets"