diff --git a/cmd/main.go b/cmd/main.go
index 53cc417..6ad1aa8 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -20,6 +20,7 @@ import (
 	"codeberg.org/codeberg/pages/server/certificates"
 	"codeberg.org/codeberg/pages/server/database"
 	"codeberg.org/codeberg/pages/server/gitea"
+	"codeberg.org/codeberg/pages/server/handler"
 )
 
 // AllowedCorsDomains lists the domains for which Cross-Origin Resource Sharing is allowed.
@@ -88,7 +89,7 @@ func Serve(ctx *cli.Context) error {
 	}
 
 	// Create handler based on settings
-	httpsHandler := server.Handler(mainDomainSuffix, rawDomain,
+	httpsHandler := handler.Handler(mainDomainSuffix, rawDomain,
 		giteaClient,
 		rawInfoPage,
 		BlacklistedPaths, allowedCorsDomains,
diff --git a/server/handler.go b/server/handler/handler.go
similarity index 99%
rename from server/handler.go
rename to server/handler/handler.go
index 25c8af4..f8a95bd 100644
--- a/server/handler.go
+++ b/server/handler/handler.go
@@ -1,4 +1,4 @@
-package server
+package handler
 
 import (
 	"fmt"
diff --git a/server/handler_test.go b/server/handler/handler_test.go
similarity index 98%
rename from server/handler_test.go
rename to server/handler/handler_test.go
index b81a2b4..f5538c9 100644
--- a/server/handler_test.go
+++ b/server/handler/handler_test.go
@@ -1,4 +1,4 @@
-package server
+package handler
 
 import (
 	"net/http/httptest"
diff --git a/server/helpers.go b/server/handler/hsts.go
similarity index 96%
rename from server/helpers.go
rename to server/handler/hsts.go
index 7c898cd..1ab73ae 100644
--- a/server/helpers.go
+++ b/server/handler/hsts.go
@@ -1,4 +1,4 @@
-package server
+package handler
 
 import (
 	"strings"
diff --git a/server/try.go b/server/handler/try.go
similarity index 99%
rename from server/try.go
rename to server/handler/try.go
index 96b937c..6d8b8fd 100644
--- a/server/try.go
+++ b/server/handler/try.go
@@ -1,4 +1,4 @@
-package server
+package handler
 
 import (
 	"net/http"