diff --git a/cmd/collectiondir/collectiondir.go b/cmd/collectiondir/collectiondir.go
index 2b52e663..ae3b1af1 100644
--- a/cmd/collectiondir/collectiondir.go
+++ b/cmd/collectiondir/collectiondir.go
@@ -8,8 +8,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/carlmjohnson/versioninfo"
-	"github.com/urfave/cli/v2"
 	"io"
 	"log/slog"
 	"net/http"
@@ -18,6 +16,9 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/carlmjohnson/versioninfo"
+	"github.com/urfave/cli/v2"
 )
 
 func main() {
diff --git a/cmd/collectiondir/crawl.go b/cmd/collectiondir/crawl.go
index 0cbc42a5..fe8ce258 100644
--- a/cmd/collectiondir/crawl.go
+++ b/cmd/collectiondir/crawl.go
@@ -4,8 +4,6 @@ import (
 	"context"
 	"encoding/csv"
 	"fmt"
-	"github.com/bluesky-social/indigo/util"
-	"golang.org/x/time/rate"
 	"io"
 	"log/slog"
 	"net/url"
@@ -13,10 +11,12 @@ import (
 	"strings"
 	"sync/atomic"
 
-	"github.com/urfave/cli/v2"
-
 	"github.com/bluesky-social/indigo/api/atproto"
+	"github.com/bluesky-social/indigo/util"
 	"github.com/bluesky-social/indigo/xrpc"
+
+	"github.com/urfave/cli/v2"
+	"golang.org/x/time/rate"
 )
 
 type DidCollection struct {
diff --git a/cmd/collectiondir/firehose.go b/cmd/collectiondir/firehose.go
index df690363..3edf8be9 100644
--- a/cmd/collectiondir/firehose.go
+++ b/cmd/collectiondir/firehose.go
@@ -3,12 +3,14 @@ package main
 import (
 	"context"
 	"fmt"
-	"github.com/bluesky-social/indigo/events"
-	"github.com/gorilla/websocket"
 	"log/slog"
 	"net/http"
 	"net/url"
 	"time"
+
+	"github.com/bluesky-social/indigo/events"
+
+	"github.com/gorilla/websocket"
 )
 
 type Firehose struct {
diff --git a/cmd/collectiondir/pebble.go b/cmd/collectiondir/pebble.go
index faf64707..d7ca4aa9 100644
--- a/cmd/collectiondir/pebble.go
+++ b/cmd/collectiondir/pebble.go
@@ -6,10 +6,11 @@ import (
 	"encoding/binary"
 	"errors"
 	"fmt"
-	"github.com/cockroachdb/pebble"
 	"log/slog"
 	"sync"
 	"time"
+
+	"github.com/cockroachdb/pebble"
 )
 
 func makeCollectionInternKey(collection string) []byte {
diff --git a/cmd/collectiondir/serve.go b/cmd/collectiondir/serve.go
index b8e2c506..615849f2 100644
--- a/cmd/collectiondir/serve.go
+++ b/cmd/collectiondir/serve.go
@@ -6,8 +6,6 @@ import (
 	"encoding/csv"
 	"encoding/json"
 	"fmt"
-	"github.com/bluesky-social/indigo/atproto/syntax"
-	lru "github.com/hashicorp/golang-lru/v2"
 	"log/slog"
 	"net"
 	"net/http"
@@ -24,9 +22,11 @@ import (
 	"time"
 
 	comatproto "github.com/bluesky-social/indigo/api/atproto"
+	"github.com/bluesky-social/indigo/atproto/syntax"
 	"github.com/bluesky-social/indigo/events"
 	"github.com/bluesky-social/indigo/xrpc"
 
+	"github.com/hashicorp/golang-lru/v2"
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
-- 
2.51.2


From 47287b684c4c33d01a868d46d0c3634e7eedb6d1 Mon Sep 17 00:00:00 2001
From: bryan newbold <bnewbold@robocracy.org>
Date: Fri, 28 Mar 2025 16:25:12 -0700
Subject: [PATCH 2/2] organize splitter imports

---
 splitter/ringbuf.go  | 2 +-
 splitter/splitter.go | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/splitter/ringbuf.go b/splitter/ringbuf.go
index 2417f4eb..a212259c 100644
--- a/splitter/ringbuf.go
+++ b/splitter/ringbuf.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"sync"
 
-	events "github.com/bluesky-social/indigo/events"
+	"github.com/bluesky-social/indigo/events"
 	"github.com/bluesky-social/indigo/models"
 )
 
diff --git a/splitter/splitter.go b/splitter/splitter.go
index 93f96538..91e8c3a7 100644
--- a/splitter/splitter.go
+++ b/splitter/splitter.go
@@ -6,7 +6,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"go.opentelemetry.io/otel"
 	"io"
 	"log/slog"
 	"math/rand"
@@ -27,12 +26,14 @@ import (
 	"github.com/bluesky-social/indigo/events/schedulers/sequential"
 	"github.com/bluesky-social/indigo/util"
 	"github.com/bluesky-social/indigo/xrpc"
+
 	"github.com/gorilla/websocket"
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
-	promclient "github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	dto "github.com/prometheus/client_model/go"
+	"go.opentelemetry.io/otel"
 )
 
 type Splitter struct {
@@ -544,7 +545,7 @@ type SocketConsumer struct {
 	UserAgent   string
 	RemoteAddr  string
 	ConnectedAt time.Time
-	EventsSent  promclient.Counter
+	EventsSent  prometheus.Counter
 }
 
 func (s *Splitter) registerConsumer(c *SocketConsumer) uint64 {