diff --git a/pkg/bridge/common.go b/pkg/bridge/common.go
index 87709d3e..fa6116dd 100644
--- a/pkg/bridge/common.go
+++ b/pkg/bridge/common.go
@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"log"
 	"net"
+	"sort"
 
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
@@ -19,6 +20,12 @@ import (
 	pb "github.com/opiproject/opi-api/network/evpn-gw/v1alpha1/gen/go"
 )
 
+func sortLogicalBridges(bridges []*pb.LogicalBridge) {
+	sort.Slice(bridges, func(i int, j int) bool {
+		return bridges[i].Name < bridges[j].Name
+	})
+}
+
 // TODO: move all of this to a common place
 const (
 	tenantbridgeName = "br-tenant"
diff --git a/pkg/bridge/bridge.go b/pkg/bridge/grpc.go
similarity index 97%
rename from pkg/bridge/bridge.go
rename to pkg/bridge/grpc.go
index 5b4744c4..3a101087 100644
--- a/pkg/bridge/bridge.go
+++ b/pkg/bridge/grpc.go
@@ -9,7 +9,6 @@ import (
 	"context"
 	"fmt"
 	"log"
-	"sort"
 	"strings"
 
 	"github.com/google/uuid"
@@ -24,12 +23,6 @@ import (
 	"google.golang.org/protobuf/types/known/emptypb"
 )
 
-func sortLogicalBridges(bridges []*pb.LogicalBridge) {
-	sort.Slice(bridges, func(i int, j int) bool {
-		return bridges[i].Name < bridges[j].Name
-	})
-}
-
 // CreateLogicalBridge executes the creation of the LogicalBridge
 func (s *Server) CreateLogicalBridge(ctx context.Context, in *pb.CreateLogicalBridgeRequest) (*pb.LogicalBridge, error) {
 	// check input correctness
diff --git a/pkg/port/common.go b/pkg/port/common.go
index bf704682..e85bebac 100644
--- a/pkg/port/common.go
+++ b/pkg/port/common.go
@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"log"
 	"net"
+	"sort"
 
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
@@ -20,6 +21,12 @@ import (
 	pc "github.com/opiproject/opi-api/network/opinetcommon/v1alpha1/gen/go"
 )
 
+func sortBridgePorts(ports []*pb.BridgePort) {
+	sort.Slice(ports, func(i int, j int) bool {
+		return ports[i].Name < ports[j].Name
+	})
+}
+
 // TODO: move all of this to a common place
 const (
 	tenantbridgeName = "br-tenant"
diff --git a/pkg/port/port.go b/pkg/port/grpc.go
similarity index 98%
rename from pkg/port/port.go
rename to pkg/port/grpc.go
index 2e0aec55..c7823556 100644
--- a/pkg/port/port.go
+++ b/pkg/port/grpc.go
@@ -10,7 +10,6 @@ import (
 	"fmt"
 	"log"
 	"path"
-	"sort"
 	"strings"
 
 	"github.com/google/uuid"
@@ -25,12 +24,6 @@ import (
 	"google.golang.org/protobuf/types/known/emptypb"
 )
 
-func sortBridgePorts(ports []*pb.BridgePort) {
-	sort.Slice(ports, func(i int, j int) bool {
-		return ports[i].Name < ports[j].Name
-	})
-}
-
 // CreateBridgePort executes the creation of the port
 func (s *Server) CreateBridgePort(ctx context.Context, in *pb.CreateBridgePortRequest) (*pb.BridgePort, error) {
 	// check input correctness
diff --git a/pkg/svi/common.go b/pkg/svi/common.go
index 6e337b45..1b7a9c00 100644
--- a/pkg/svi/common.go
+++ b/pkg/svi/common.go
@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"log"
 	"net"
+	"sort"
 
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
@@ -20,6 +21,12 @@ import (
 	pc "github.com/opiproject/opi-api/network/opinetcommon/v1alpha1/gen/go"
 )
 
+func sortSvis(svis []*pb.Svi) {
+	sort.Slice(svis, func(i int, j int) bool {
+		return svis[i].Name < svis[j].Name
+	})
+}
+
 // TODO: move all of this to a common place
 const (
 	tenantbridgeName = "br-tenant"
diff --git a/pkg/svi/svi.go b/pkg/svi/grpc.go
similarity index 98%
rename from pkg/svi/svi.go
rename to pkg/svi/grpc.go
index ac80084f..29812a90 100644
--- a/pkg/svi/svi.go
+++ b/pkg/svi/grpc.go
@@ -10,7 +10,6 @@ import (
 	"fmt"
 	"log"
 	"path"
-	"sort"
 	"strings"
 
 	"github.com/google/uuid"
@@ -25,12 +24,6 @@ import (
 	"google.golang.org/protobuf/types/known/emptypb"
 )
 
-func sortSvis(svis []*pb.Svi) {
-	sort.Slice(svis, func(i int, j int) bool {
-		return svis[i].Name < svis[j].Name
-	})
-}
-
 // CreateSvi executes the creation of the VLAN
 func (s *Server) CreateSvi(ctx context.Context, in *pb.CreateSviRequest) (*pb.Svi, error) {
 	// check input correctness
diff --git a/pkg/vrf/common.go b/pkg/vrf/common.go
index cde7fc76..5e76b5aa 100644
--- a/pkg/vrf/common.go
+++ b/pkg/vrf/common.go
@@ -10,6 +10,7 @@ import (
 	"fmt"
 	"log"
 	"net"
+	"sort"
 
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
@@ -20,6 +21,12 @@ import (
 	pb "github.com/opiproject/opi-api/network/evpn-gw/v1alpha1/gen/go"
 )
 
+func sortVrfs(vrfs []*pb.Vrf) {
+	sort.Slice(vrfs, func(i int, j int) bool {
+		return vrfs[i].Name < vrfs[j].Name
+	})
+}
+
 // TODO: move all of this to a common place
 func resourceIDToFullName(_ string, resourceID string) string {
 	return fmt.Sprintf("//network.opiproject.org/vrfs/%s", resourceID)
diff --git a/pkg/vrf/vrf.go b/pkg/vrf/grpc.go
similarity index 98%
rename from pkg/vrf/vrf.go
rename to pkg/vrf/grpc.go
index 26996d38..0a9371b1 100644
--- a/pkg/vrf/vrf.go
+++ b/pkg/vrf/grpc.go
@@ -11,7 +11,6 @@ import (
 	"log"
 	"math"
 	"path"
-	"sort"
 	"strings"
 
 	"github.com/google/uuid"
@@ -26,12 +25,6 @@ import (
 	"google.golang.org/protobuf/types/known/emptypb"
 )
 
-func sortVrfs(vrfs []*pb.Vrf) {
-	sort.Slice(vrfs, func(i int, j int) bool {
-		return vrfs[i].Name < vrfs[j].Name
-	})
-}
-
 // CreateVrf executes the creation of the VRF
 func (s *Server) CreateVrf(ctx context.Context, in *pb.CreateVrfRequest) (*pb.Vrf, error) {
 	// check input correctness