diff --git a/host/generic/linux/gpio/digitalpin.go b/driver/linux/gpio/digitalpin.go
similarity index 100%
rename from host/generic/linux/gpio/digitalpin.go
rename to driver/linux/gpio/digitalpin.go
diff --git a/host/generic/linux/gpio/gpio.go b/driver/linux/gpio/gpio.go
similarity index 100%
rename from host/generic/linux/gpio/gpio.go
rename to driver/linux/gpio/gpio.go
diff --git a/host/generic/linux/i2c/bus.go b/driver/linux/i2c/bus.go
similarity index 100%
rename from host/generic/linux/i2c/bus.go
rename to driver/linux/i2c/bus.go
diff --git a/host/generic/linux/i2c/i2c.go b/driver/linux/i2c/i2c.go
similarity index 100%
rename from host/generic/linux/i2c/i2c.go
rename to driver/linux/i2c/i2c.go
diff --git a/host/bbb/data.go b/host/bbb/data.go
index d8930c5..541cc82 100644
--- a/host/bbb/data.go
+++ b/host/bbb/data.go
@@ -1,7 +1,7 @@
 package bbb
 
 import (
-	"github.com/kidoman/embd/host/generic/linux/gpio"
+	"github.com/kidoman/embd/driver/linux/gpio"
 )
 
 var pins = gpio.PinMap{
diff --git a/host/bbb/descriptor.go b/host/bbb/descriptor.go
index a7261f5..ee36972 100644
--- a/host/bbb/descriptor.go
+++ b/host/bbb/descriptor.go
@@ -1,9 +1,9 @@
 package bbb
 
 import (
+	lgpio "github.com/kidoman/embd/driver/linux/gpio"
+	li2c "github.com/kidoman/embd/driver/linux/i2c"
 	"github.com/kidoman/embd/gpio"
-	lgpio "github.com/kidoman/embd/host/generic/linux/gpio"
-	li2c "github.com/kidoman/embd/host/generic/linux/i2c"
 	"github.com/kidoman/embd/i2c"
 )
 
diff --git a/host/rpi/data.go b/host/rpi/data.go
index b1eb59e..abf1025 100644
--- a/host/rpi/data.go
+++ b/host/rpi/data.go
@@ -1,7 +1,7 @@
 package rpi
 
 import (
-	"github.com/kidoman/embd/host/generic/linux/gpio"
+	"github.com/kidoman/embd/driver/linux/gpio"
 )
 
 var rev1Pins = gpio.PinMap{
diff --git a/host/rpi/descriptor.go b/host/rpi/descriptor.go
index 0966088..9b9113b 100644
--- a/host/rpi/descriptor.go
+++ b/host/rpi/descriptor.go
@@ -1,9 +1,9 @@
 package rpi
 
 import (
+	lgpio "github.com/kidoman/embd/driver/linux/gpio"
+	li2c "github.com/kidoman/embd/driver/linux/i2c"
 	"github.com/kidoman/embd/gpio"
-	lgpio "github.com/kidoman/embd/host/generic/linux/gpio"
-	li2c "github.com/kidoman/embd/host/generic/linux/i2c"
 	"github.com/kidoman/embd/i2c"
 )