diff --git a/hh.go b/hh.go
index b12a6cd..44fefea 100644
--- a/hh.go
+++ b/hh.go
@@ -3,17 +3,17 @@ package main
 import "context"
 import "fmt"
 
-import "github.com/stianeikeland/go-rpio/v4"
+import "github.com/firestuff/hh/hhio"
 
 func main() {
-	err := rpio.Open()
+	err := hhio.Open()
 	if err != nil {
 		panic(err)
 	}
-	defer rpio.Close()
+	defer hhio.Close()
 
-	us := NewUltrasonic(context.TODO(), 6, 5)
-	mf := NewMedianFilter(us.C, 9)
+	us := hhio.NewUltrasonic(context.Background(), 6, 5)
+	mf := hhio.NewMedianFilter(us.C, 9)
 
 	for dist := range mf {
 		fmt.Printf("%f\n", dist)
diff --git a/hhio/init.go b/hhio/init.go
new file mode 100644
index 0000000..6f06771
--- /dev/null
+++ b/hhio/init.go
@@ -0,0 +1,11 @@
+package hhio
+
+import "github.com/stianeikeland/go-rpio/v4"
+
+func Open() error {
+	return rpio.Open()
+}
+
+func Close() {
+	rpio.Close()
+}
diff --git a/medianfilter.go b/hhio/medianfilter.go
similarity index 97%
rename from medianfilter.go
rename to hhio/medianfilter.go
index 04761c6..c9010c7 100644
--- a/medianfilter.go
+++ b/hhio/medianfilter.go
@@ -1,4 +1,4 @@
-package main
+package hhio
 
 import "sort"
 
diff --git a/relay.go b/hhio/relay.go
similarity index 95%
rename from relay.go
rename to hhio/relay.go
index 40497b3..8562595 100644
--- a/relay.go
+++ b/hhio/relay.go
@@ -1,4 +1,4 @@
-package main
+package hhio
 
 import "github.com/stianeikeland/go-rpio/v4"
 
diff --git a/ultrasonic.go b/hhio/ultrasonic.go
similarity index 97%
rename from ultrasonic.go
rename to hhio/ultrasonic.go
index 1b4bf8a..cf4ce93 100644
--- a/ultrasonic.go
+++ b/hhio/ultrasonic.go
@@ -1,4 +1,4 @@
-package main
+package hhio
 
 import "context"
 import "errors"
@@ -36,6 +36,7 @@ func (us *Ultrasonic) loop(ctx context.Context) {
 	for {
 		select {
 		case <-ctx.Done():
+			close(us.C)
 			return
 
 		default: