diff --git a/pkg/bytes/bytes.go b/pkg/nvpci/bytes/bytes.go
similarity index 100%
rename from pkg/bytes/bytes.go
rename to pkg/nvpci/bytes/bytes.go
diff --git a/pkg/bytes/bytes_test.go b/pkg/nvpci/bytes/bytes_test.go
similarity index 100%
rename from pkg/bytes/bytes_test.go
rename to pkg/nvpci/bytes/bytes_test.go
diff --git a/pkg/bytes/native.go b/pkg/nvpci/bytes/native.go
similarity index 100%
rename from pkg/bytes/native.go
rename to pkg/nvpci/bytes/native.go
diff --git a/pkg/bytes/swapbo.go b/pkg/nvpci/bytes/swapbo.go
similarity index 100%
rename from pkg/bytes/swapbo.go
rename to pkg/nvpci/bytes/swapbo.go
diff --git a/pkg/nvpci/config.go b/pkg/nvpci/config.go
index 415e13b..214a190 100644
--- a/pkg/nvpci/config.go
+++ b/pkg/nvpci/config.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/bytes"
+	"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvpci/bytes"
 )
 
 const (
diff --git a/pkg/mmio/mmio.go b/pkg/nvpci/mmio/mmio.go
similarity index 97%
rename from pkg/mmio/mmio.go
rename to pkg/nvpci/mmio/mmio.go
index c0b7ac2..ab101f5 100644
--- a/pkg/mmio/mmio.go
+++ b/pkg/nvpci/mmio/mmio.go
@@ -22,7 +22,7 @@ import (
 	"syscall"
 	"unsafe"
 
-	"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/bytes"
+	"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvpci/bytes"
 )
 
 type Mmio interface {
diff --git a/pkg/mmio/mmio_test.go b/pkg/nvpci/mmio/mmio_test.go
similarity index 100%
rename from pkg/mmio/mmio_test.go
rename to pkg/nvpci/mmio/mmio_test.go
diff --git a/pkg/mmio/mock.go b/pkg/nvpci/mmio/mock.go
similarity index 96%
rename from pkg/mmio/mock.go
rename to pkg/nvpci/mmio/mock.go
index bf760e5..ff89581 100644
--- a/pkg/mmio/mock.go
+++ b/pkg/nvpci/mmio/mock.go
@@ -19,7 +19,7 @@ package mmio
 import (
 	"fmt"
 
-	"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/bytes"
+	"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvpci/bytes"
 )
 
 type mockMmio struct {
diff --git a/pkg/nvpci/mock.go b/pkg/nvpci/mock.go
index a1acb9d..3400d9e 100644
--- a/pkg/nvpci/mock.go
+++ b/pkg/nvpci/mock.go
@@ -22,7 +22,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/bytes"
+	"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvpci/bytes"
 )
 
 type MockA100 struct {
diff --git a/pkg/nvpci/resources.go b/pkg/nvpci/resources.go
index e4d6b57..618f4c0 100644
--- a/pkg/nvpci/resources.go
+++ b/pkg/nvpci/resources.go
@@ -19,7 +19,7 @@ package nvpci
 import (
 	"fmt"
 
-	"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/mmio"
+	"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvpci/mmio"
 )
 
 const (