diff --git a/cmd/reveald/config.go b/cmd/reveald/config.go
index c23ef3a..4d19e7c 100644
--- a/cmd/reveald/config.go
+++ b/cmd/reveald/config.go
@@ -7,6 +7,9 @@ import (
 	"log/slog"
 
 	"github.com/runreveal/kawa"
+	"github.com/runreveal/kawa/x/mqtt"
+	"github.com/runreveal/kawa/x/s3"
+	"github.com/runreveal/lib/loader"
 	mqttDstkawad "github.com/runreveal/reveald/internal/destinations/mqtt"
 	"github.com/runreveal/reveald/internal/destinations/printer"
 	"github.com/runreveal/reveald/internal/destinations/runreveal"
@@ -16,9 +19,6 @@ import (
 	"github.com/runreveal/reveald/internal/sources/scanner"
 	"github.com/runreveal/reveald/internal/sources/syslog"
 	"github.com/runreveal/reveald/internal/types"
-	"github.com/runreveal/kawa/x/mqtt"
-	"github.com/runreveal/kawa/x/s3"
-	"github.com/runreveal/lib/loader"
 	// We could register and configure these in a separate package
 	// using the init() function.
 	// That would make it easy to "dynamically" enable and disable them at
diff --git a/cmd/reveald/config_windows.go b/cmd/reveald/config_windows.go
index b8a13b3..835d97c 100644
--- a/cmd/reveald/config_windows.go
+++ b/cmd/reveald/config_windows.go
@@ -7,10 +7,10 @@ import (
 	"log/slog"
 
 	"github.com/runreveal/kawa"
-	windowskawad "github.com/runreveal/reveald/internal/sources/windows"
-	"github.com/runreveal/reveald/internal/types"
 	"github.com/runreveal/kawa/x/windows"
 	"github.com/runreveal/lib/loader"
+	windowskawad "github.com/runreveal/reveald/internal/sources/windows"
+	"github.com/runreveal/reveald/internal/types"
 )
 
 func init() {
diff --git a/internal/destinations/mqtt/mqtt.go b/internal/destinations/mqtt/mqtt.go
index 8400a3f..f2c743f 100644
--- a/internal/destinations/mqtt/mqtt.go
+++ b/internal/destinations/mqtt/mqtt.go
@@ -4,8 +4,8 @@ import (
 	"context"
 
 	"github.com/runreveal/kawa"
-	"github.com/runreveal/reveald/internal/types"
 	"github.com/runreveal/kawa/x/mqtt"
+	"github.com/runreveal/reveald/internal/types"
 )
 
 type MQTT struct {
diff --git a/internal/destinations/printer/printer.go b/internal/destinations/printer/printer.go
index 9a2a6c0..31d4a3b 100644
--- a/internal/destinations/printer/printer.go
+++ b/internal/destinations/printer/printer.go
@@ -5,8 +5,8 @@ import (
 	"io"
 
 	"github.com/runreveal/kawa"
-	"github.com/runreveal/reveald/internal/types"
 	"github.com/runreveal/kawa/x/printer"
+	"github.com/runreveal/reveald/internal/types"
 )
 
 type Printer struct {
diff --git a/internal/destinations/runreveal/runreveal.go b/internal/destinations/runreveal/runreveal.go
index 9c4a125..691848b 100644
--- a/internal/destinations/runreveal/runreveal.go
+++ b/internal/destinations/runreveal/runreveal.go
@@ -11,8 +11,8 @@ import (
 
 	"github.com/carlmjohnson/requests"
 	"github.com/runreveal/kawa"
-	"github.com/runreveal/reveald/internal/types"
 	batch "github.com/runreveal/kawa/x/batcher"
+	"github.com/runreveal/reveald/internal/types"
 )
 
 type Option func(*RunReveal)
diff --git a/internal/destinations/s3/s3.go b/internal/destinations/s3/s3.go
index c6f1f99..1836194 100644
--- a/internal/destinations/s3/s3.go
+++ b/internal/destinations/s3/s3.go
@@ -4,8 +4,8 @@ import (
 	"context"
 
 	"github.com/runreveal/kawa"
-	"github.com/runreveal/reveald/internal/types"
 	"github.com/runreveal/kawa/x/s3"
+	"github.com/runreveal/reveald/internal/types"
 )
 
 type S3 struct {
diff --git a/internal/queue/queue.go b/internal/queue/queue.go
index 43a4c39..27a6bfd 100644
--- a/internal/queue/queue.go
+++ b/internal/queue/queue.go
@@ -7,9 +7,9 @@ import (
 	"log/slog"
 
 	"github.com/runreveal/kawa"
-	"github.com/runreveal/reveald/internal/types"
 	"github.com/runreveal/kawa/x/multi"
 	"github.com/runreveal/lib/await"
+	"github.com/runreveal/reveald/internal/types"
 )
 
 type Option func(*Queue)
diff --git a/internal/sources/mqtt/mqtt.go b/internal/sources/mqtt/mqtt.go
index bbe6ca6..eee8f8b 100644
--- a/internal/sources/mqtt/mqtt.go
+++ b/internal/sources/mqtt/mqtt.go
@@ -5,8 +5,8 @@ import (
 	"time"
 
 	"github.com/runreveal/kawa"
-	"github.com/runreveal/reveald/internal/types"
 	"github.com/runreveal/kawa/x/mqtt"
+	"github.com/runreveal/reveald/internal/types"
 )
 
 type MQTT struct {
diff --git a/internal/sources/scanner/scanner.go b/internal/sources/scanner/scanner.go
index 2a61e51..30545dc 100644
--- a/internal/sources/scanner/scanner.go
+++ b/internal/sources/scanner/scanner.go
@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"github.com/runreveal/kawa"
-	"github.com/runreveal/reveald/internal/types"
 	"github.com/runreveal/kawa/x/scanner"
+	"github.com/runreveal/reveald/internal/types"
 )
 
 type Scanner struct {
diff --git a/internal/sources/windows/eventlog.go b/internal/sources/windows/eventlog.go
index 112b15e..345cac7 100644
--- a/internal/sources/windows/eventlog.go
+++ b/internal/sources/windows/eventlog.go
@@ -8,8 +8,8 @@ import (
 	"encoding/json"
 
 	"github.com/runreveal/kawa"
-	"github.com/runreveal/reveald/internal/types"
 	"github.com/runreveal/kawa/x/windows"
+	"github.com/runreveal/reveald/internal/types"
 )
 
 type EventLog struct {