diff --git a/hciapi/hci-api.go b/internal/hciapi/hci-api.go
similarity index 99%
rename from hciapi/hci-api.go
rename to internal/hciapi/hci-api.go
index a1a7860..655d5a7 100644
--- a/hciapi/hci-api.go
+++ b/internal/hciapi/hci-api.go
@@ -26,7 +26,7 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"github.com/arduino/arduino-router/msgpackrouter"
+	"github.com/arduino/arduino-router/internal/msgpackrouter"
 	"github.com/arduino/arduino-router/msgpackrpc"
 )
 
diff --git a/monitorapi/monitor-api.go b/internal/monitorapi/monitor-api.go
similarity index 98%
rename from monitorapi/monitor-api.go
rename to internal/monitorapi/monitor-api.go
index 1f6f88a..c541c1e 100644
--- a/monitorapi/monitor-api.go
+++ b/internal/monitorapi/monitor-api.go
@@ -27,7 +27,7 @@ import (
 	"github.com/djherbis/buffer"
 	"github.com/djherbis/nio/v3"
 
-	"github.com/arduino/arduino-router/msgpackrouter"
+	"github.com/arduino/arduino-router/internal/msgpackrouter"
 	"github.com/arduino/arduino-router/msgpackrpc"
 )
 
diff --git a/msgpackrouter/errors.go b/internal/msgpackrouter/errors.go
similarity index 100%
rename from msgpackrouter/errors.go
rename to internal/msgpackrouter/errors.go
diff --git a/msgpackrouter/router.go b/internal/msgpackrouter/router.go
similarity index 100%
rename from msgpackrouter/router.go
rename to internal/msgpackrouter/router.go
diff --git a/msgpackrouter/router_test.go b/internal/msgpackrouter/router_test.go
similarity index 98%
rename from msgpackrouter/router_test.go
rename to internal/msgpackrouter/router_test.go
index 74ef598..83d2711 100644
--- a/msgpackrouter/router_test.go
+++ b/internal/msgpackrouter/router_test.go
@@ -24,7 +24,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/arduino/arduino-router/msgpackrouter"
+	"github.com/arduino/arduino-router/internal/msgpackrouter"
 	"github.com/arduino/arduino-router/msgpackrpc"
 
 	"github.com/djherbis/buffer"
diff --git a/network-api/network-api.go b/internal/network-api/network-api.go
similarity index 99%
rename from network-api/network-api.go
rename to internal/network-api/network-api.go
index 566d0f8..6a1ead2 100644
--- a/network-api/network-api.go
+++ b/internal/network-api/network-api.go
@@ -28,7 +28,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/arduino/arduino-router/msgpackrouter"
+	"github.com/arduino/arduino-router/internal/msgpackrouter"
 	"github.com/arduino/arduino-router/msgpackrpc"
 )
 
diff --git a/network-api/network-api_test.go b/internal/network-api/network-api_test.go
similarity index 100%
rename from network-api/network-api_test.go
rename to internal/network-api/network-api_test.go
diff --git a/main.go b/main.go
index 9cba6de..c0a0040 100644
--- a/main.go
+++ b/main.go
@@ -29,11 +29,11 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/arduino/arduino-router/hciapi"
-	"github.com/arduino/arduino-router/monitorapi"
-	"github.com/arduino/arduino-router/msgpackrouter"
+	"github.com/arduino/arduino-router/internal/hciapi"
+	"github.com/arduino/arduino-router/internal/monitorapi"
+	"github.com/arduino/arduino-router/internal/msgpackrouter"
+	networkapi "github.com/arduino/arduino-router/internal/network-api"
 	"github.com/arduino/arduino-router/msgpackrpc"
-	networkapi "github.com/arduino/arduino-router/network-api"
 
 	"github.com/spf13/cobra"
 	"go.bug.st/f"