diff --git a/server/cmd/serve.go b/server/cmd/serve.go
index 890c83d0..b0d7c7dd 100644
--- a/server/cmd/serve.go
+++ b/server/cmd/serve.go
@@ -5,7 +5,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"m1k1o/neko"
-	"m1k1o/neko/internal/types/config"
+	"m1k1o/neko/internal/config"
 )
 
 func init() {
diff --git a/server/internal/capture/broadcast.go b/server/internal/capture/broadcast.go
index c3394ad2..fb97c27e 100644
--- a/server/internal/capture/broadcast.go
+++ b/server/internal/capture/broadcast.go
@@ -7,7 +7,7 @@ import (
 	"github.com/rs/zerolog/log"
 
 	"m1k1o/neko/internal/capture/gst"
-	"m1k1o/neko/internal/types/config"
+	"m1k1o/neko/internal/config"
 )
 
 type BroadcastManager struct {
diff --git a/server/internal/capture/manager.go b/server/internal/capture/manager.go
index d0494be3..c53a3ded 100644
--- a/server/internal/capture/manager.go
+++ b/server/internal/capture/manager.go
@@ -5,9 +5,9 @@ import (
 	"time"
 
 	"m1k1o/neko/internal/capture/gst"
+	"m1k1o/neko/internal/config"
 	"m1k1o/neko/internal/desktop/xorg"
 	"m1k1o/neko/internal/types"
-	"m1k1o/neko/internal/types/config"
 
 	"github.com/kataras/go-events"
 	"github.com/rs/zerolog"
diff --git a/server/internal/types/config/broadcast.go b/server/internal/config/broadcast.go
similarity index 100%
rename from server/internal/types/config/broadcast.go
rename to server/internal/config/broadcast.go
diff --git a/server/internal/types/config/capture.go b/server/internal/config/capture.go
similarity index 100%
rename from server/internal/types/config/capture.go
rename to server/internal/config/capture.go
diff --git a/server/internal/types/config/config.go b/server/internal/config/config.go
similarity index 100%
rename from server/internal/types/config/config.go
rename to server/internal/config/config.go
diff --git a/server/internal/types/config/desktop.go b/server/internal/config/desktop.go
similarity index 100%
rename from server/internal/types/config/desktop.go
rename to server/internal/config/desktop.go
diff --git a/server/internal/types/config/root.go b/server/internal/config/root.go
similarity index 100%
rename from server/internal/types/config/root.go
rename to server/internal/config/root.go
diff --git a/server/internal/types/config/server.go b/server/internal/config/server.go
similarity index 100%
rename from server/internal/types/config/server.go
rename to server/internal/config/server.go
diff --git a/server/internal/types/config/webrtc.go b/server/internal/config/webrtc.go
similarity index 100%
rename from server/internal/types/config/webrtc.go
rename to server/internal/config/webrtc.go
diff --git a/server/internal/types/config/websocket.go b/server/internal/config/websocket.go
similarity index 100%
rename from server/internal/types/config/websocket.go
rename to server/internal/config/websocket.go
diff --git a/server/internal/desktop/manager.go b/server/internal/desktop/manager.go
index 2b950e3d..8f4bf5e0 100644
--- a/server/internal/desktop/manager.go
+++ b/server/internal/desktop/manager.go
@@ -4,9 +4,9 @@ import (
 	"sync"
 	"time"
 
+	"m1k1o/neko/internal/config"
 	"m1k1o/neko/internal/desktop/xorg"
 	"m1k1o/neko/internal/types"
-	"m1k1o/neko/internal/types/config"
 
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
diff --git a/server/internal/http/http.go b/server/internal/http/http.go
index bb702432..21c9617e 100644
--- a/server/internal/http/http.go
+++ b/server/internal/http/http.go
@@ -11,8 +11,8 @@ import (
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 
+	"m1k1o/neko/internal/config"
 	"m1k1o/neko/internal/types"
-	"m1k1o/neko/internal/types/config"
 )
 
 type Server struct {
diff --git a/server/internal/types/desktop.go b/server/internal/types/desktop.go
index ba05b95e..2f8f3812 100644
--- a/server/internal/types/desktop.go
+++ b/server/internal/types/desktop.go
@@ -1,5 +1,17 @@
 package types
 
+type ScreenSize struct {
+	Width  int   `json:"width"`
+	Height int   `json:"height"`
+	Rate   int16 `json:"rate"`
+}
+
+type ScreenConfiguration struct {
+	Width  int           `json:"width"`
+	Height int           `json:"height"`
+	Rates  map[int]int16 `json:"rates"`
+}
+
 type DesktopManager interface {
 	Start()
 	Shutdown() error
diff --git a/server/internal/types/xorg.go b/server/internal/types/xorg.go
deleted file mode 100644
index dec51611..00000000
--- a/server/internal/types/xorg.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package types
-
-type ScreenSize struct {
-	Width  int   `json:"width"`
-	Height int   `json:"height"`
-	Rate   int16 `json:"rate"`
-}
-
-type ScreenConfiguration struct {
-	Width  int           `json:"width"`
-	Height int           `json:"height"`
-	Rates  map[int]int16 `json:"rates"`
-}
diff --git a/server/internal/webrtc/webrtc.go b/server/internal/webrtc/webrtc.go
index 266c7808..b43f4d12 100644
--- a/server/internal/webrtc/webrtc.go
+++ b/server/internal/webrtc/webrtc.go
@@ -14,8 +14,8 @@ import (
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 
+	"m1k1o/neko/internal/config"
 	"m1k1o/neko/internal/types"
-	"m1k1o/neko/internal/types/config"
 )
 
 func New(sessions types.SessionManager, capture types.CaptureManager, desktop types.DesktopManager, config *config.WebRTC) *WebRTCManager {
diff --git a/server/internal/websocket/websocket.go b/server/internal/websocket/websocket.go
index 372f9ffb..29f908c1 100644
--- a/server/internal/websocket/websocket.go
+++ b/server/internal/websocket/websocket.go
@@ -11,8 +11,8 @@ import (
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 
+	"m1k1o/neko/internal/config"
 	"m1k1o/neko/internal/types"
-	"m1k1o/neko/internal/types/config"
 	"m1k1o/neko/internal/types/event"
 	"m1k1o/neko/internal/types/message"
 	"m1k1o/neko/internal/utils"
diff --git a/server/neko.go b/server/neko.go
index 804fe69a..d2ac3dbe 100644
--- a/server/neko.go
+++ b/server/neko.go
@@ -7,10 +7,10 @@ import (
 	"runtime"
 
 	"m1k1o/neko/internal/capture"
+	"m1k1o/neko/internal/config"
 	"m1k1o/neko/internal/desktop"
 	"m1k1o/neko/internal/http"
 	"m1k1o/neko/internal/session"
-	"m1k1o/neko/internal/types/config"
 	"m1k1o/neko/internal/webrtc"
 	"m1k1o/neko/internal/websocket"