diff --git a/pkg/gordio/calls/call.go b/pkg/calls/call.go
similarity index 100%
rename from pkg/gordio/calls/call.go
rename to pkg/calls/call.go
diff --git a/pkg/gordio/nexus/nexus.go b/pkg/gordio/nexus/nexus.go
index 0c4578f..9a9409e 100644
--- a/pkg/gordio/nexus/nexus.go
+++ b/pkg/gordio/nexus/nexus.go
@@ -3,7 +3,7 @@ package nexus
 import (
 	"sync"
 
-	"dynatron.me/x/stillbox/pkg/gordio/calls"
+	"dynatron.me/x/stillbox/pkg/calls"
 	"dynatron.me/x/stillbox/pkg/pb"
 )
 
diff --git a/pkg/gordio/server/ingest.go b/pkg/gordio/server/ingest.go
index 383cbb0..26e8133 100644
--- a/pkg/gordio/server/ingest.go
+++ b/pkg/gordio/server/ingest.go
@@ -3,7 +3,7 @@ package server
 import (
 	"context"
 
-	"dynatron.me/x/stillbox/pkg/gordio/calls"
+	"dynatron.me/x/stillbox/pkg/calls"
 )
 
 func (s *Server) Ingest(ctx context.Context, call *calls.Call) {
diff --git a/pkg/gordio/sinks/database.go b/pkg/gordio/sinks/database.go
index 5cf77bc..10639cf 100644
--- a/pkg/gordio/sinks/database.go
+++ b/pkg/gordio/sinks/database.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"dynatron.me/x/stillbox/internal/common"
-	"dynatron.me/x/stillbox/pkg/gordio/calls"
+	"dynatron.me/x/stillbox/pkg/calls"
 	"dynatron.me/x/stillbox/pkg/gordio/database"
 
 	"github.com/rs/zerolog/log"
diff --git a/pkg/gordio/sinks/nexus.go b/pkg/gordio/sinks/nexus.go
index 789eabd..9b590fb 100644
--- a/pkg/gordio/sinks/nexus.go
+++ b/pkg/gordio/sinks/nexus.go
@@ -3,7 +3,7 @@ package sinks
 import (
 	"context"
 
-	"dynatron.me/x/stillbox/pkg/gordio/calls"
+	"dynatron.me/x/stillbox/pkg/calls"
 	"dynatron.me/x/stillbox/pkg/gordio/nexus"
 )
 
diff --git a/pkg/gordio/sinks/sinks.go b/pkg/gordio/sinks/sinks.go
index fc78dd4..0523eba 100644
--- a/pkg/gordio/sinks/sinks.go
+++ b/pkg/gordio/sinks/sinks.go
@@ -3,7 +3,7 @@ package sinks
 import (
 	"context"
 
-	"dynatron.me/x/stillbox/pkg/gordio/calls"
+	"dynatron.me/x/stillbox/pkg/calls"
 
 	"github.com/rs/zerolog/log"
 )
diff --git a/pkg/gordio/sources/http.go b/pkg/gordio/sources/http.go
index 26717dd..57f3ee0 100644
--- a/pkg/gordio/sources/http.go
+++ b/pkg/gordio/sources/http.go
@@ -11,7 +11,7 @@ import (
 
 	"dynatron.me/x/stillbox/internal/common"
 	"dynatron.me/x/stillbox/pkg/gordio/auth"
-	"dynatron.me/x/stillbox/pkg/gordio/calls"
+	"dynatron.me/x/stillbox/pkg/calls"
 	"github.com/go-chi/chi/v5"
 	"github.com/rs/zerolog/log"
 )
diff --git a/pkg/gordio/sources/source.go b/pkg/gordio/sources/source.go
index 3390adc..fa49a22 100644
--- a/pkg/gordio/sources/source.go
+++ b/pkg/gordio/sources/source.go
@@ -3,7 +3,7 @@ package sources
 import (
 	"context"
 
-	"dynatron.me/x/stillbox/pkg/gordio/calls"
+	"dynatron.me/x/stillbox/pkg/calls"
 
 	"github.com/go-chi/chi/v5"
 )