diff --git a/main.go b/main.go
index 9882416..bc07424 100644
--- a/main.go
+++ b/main.go
@@ -5,10 +5,10 @@ import (
 	"log"
 	"net/http"
 
-	"grain/db"
-	"grain/events"
 	"grain/server"
-	"grain/utils"
+	"grain/server/db"
+	"grain/server/events"
+	"grain/server/utils"
 
 	"golang.org/x/net/websocket"
 )
diff --git a/db/db.go b/server/db/db.go
similarity index 100%
rename from db/db.go
rename to server/db/db.go
diff --git a/events/events.go b/server/events/events.go
similarity index 100%
rename from events/events.go
rename to server/events/events.go
diff --git a/events/kind0.go b/server/events/kind0.go
similarity index 100%
rename from events/kind0.go
rename to server/events/kind0.go
diff --git a/events/kind1.go b/server/events/kind1.go
similarity index 100%
rename from events/kind1.go
rename to server/events/kind1.go
diff --git a/events/unhandled.go b/server/events/unhandled.go
similarity index 100%
rename from events/unhandled.go
rename to server/events/unhandled.go
diff --git a/server/server.go b/server/server.go
index 3c41aaf..a6f7c47 100644
--- a/server/server.go
+++ b/server/server.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"grain/events"
+	"grain/server/events"
 	server "grain/server/types"
-	"grain/utils"
+	"grain/server/utils"
 
 	"go.mongodb.org/mongo-driver/mongo"
 	"golang.org/x/net/websocket"
diff --git a/utils/config.go b/server/utils/config.go
similarity index 100%
rename from utils/config.go
rename to server/utils/config.go
diff --git a/utils/typeConversion.go b/server/utils/typeConversion.go
similarity index 100%
rename from utils/typeConversion.go
rename to server/utils/typeConversion.go