diff --git a/server/internal/broadcast/manager.go b/server/internal/capture/broadcast.go
similarity index 92%
rename from server/internal/broadcast/manager.go
rename to server/internal/capture/broadcast.go
index 3ab92cb..c3394ad 100644
--- a/server/internal/broadcast/manager.go
+++ b/server/internal/capture/broadcast.go
@@ -1,4 +1,4 @@
-package broadcast
+package capture
 
 import (
 	"sync"
@@ -6,7 +6,7 @@ import (
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 
-	"m1k1o/neko/internal/gst"
+	"m1k1o/neko/internal/capture/gst"
 	"m1k1o/neko/internal/types/config"
 )
 
@@ -20,7 +20,7 @@ type BroadcastManager struct {
 	url      string
 }
 
-func New(capture *config.Capture, config *config.Broadcast) *BroadcastManager {
+func NewBroadcast(capture *config.Capture, config *config.Broadcast) *BroadcastManager {
 	return &BroadcastManager{
 		logger:  log.With().Str("module", "broadcast").Logger(),
 		capture: capture,
diff --git a/server/internal/gst/gst.c b/server/internal/capture/gst/gst.c
similarity index 100%
rename from server/internal/gst/gst.c
rename to server/internal/capture/gst/gst.c
diff --git a/server/internal/gst/gst.go b/server/internal/capture/gst/gst.go
similarity index 100%
rename from server/internal/gst/gst.go
rename to server/internal/capture/gst/gst.go
diff --git a/server/internal/gst/gst.h b/server/internal/capture/gst/gst.h
similarity index 100%
rename from server/internal/gst/gst.h
rename to server/internal/capture/gst/gst.h
diff --git a/server/internal/capture/manager.go b/server/internal/capture/manager.go
index 934d0af..d0494be 100644
--- a/server/internal/capture/manager.go
+++ b/server/internal/capture/manager.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"
 
+	"m1k1o/neko/internal/capture/gst"
 	"m1k1o/neko/internal/desktop/xorg"
-	"m1k1o/neko/internal/gst"
 	"m1k1o/neko/internal/types"
 	"m1k1o/neko/internal/types/config"
 
diff --git a/server/neko.go b/server/neko.go
index 9920417..804fe69 100644
--- a/server/neko.go
+++ b/server/neko.go
@@ -6,7 +6,6 @@ import (
 	"os/signal"
 	"runtime"
 
-	"m1k1o/neko/internal/broadcast"
 	"m1k1o/neko/internal/capture"
 	"m1k1o/neko/internal/desktop"
 	"m1k1o/neko/internal/http"
@@ -114,7 +113,7 @@ type Neko struct {
 	sessionManager   *session.SessionManager
 	captureManager   *capture.CaptureManagerCtx
 	desktopManager   *desktop.DesktopManagerCtx
-	broadcastManager *broadcast.BroadcastManager
+	broadcastManager *capture.BroadcastManager
 	webRTCManager    *webrtc.WebRTCManager
 	webSocketHandler *websocket.WebSocketHandler
 }
@@ -124,7 +123,7 @@ func (neko *Neko) Preflight() {
 }
 
 func (neko *Neko) Start() {
-	broadcastManager := broadcast.New(neko.Capture, neko.Broadcast)
+	broadcastManager := capture.NewBroadcast(neko.Capture, neko.Broadcast)
 
 	desktopManager := desktop.New(neko.Desktop, broadcastManager)
 	desktopManager.Start()