diff --git a/web/controllers/backup_controller.go b/web/controllers/backup_controller.go
index a3ce4b4..7e954dc 100644
--- a/web/controllers/backup_controller.go
+++ b/web/controllers/backup_controller.go
@@ -11,7 +11,7 @@ import (
 	"github.com/vwxyzjn/portwarden/web/models"
 )
 
-func EncryptBackupController(c *gin.Context) {
+func EncryptBackupHandler(c *gin.Context) {
 	var ebi models.EncryptBackupInfo
 	if err := c.ShouldBindJSON(&ebi); err != nil {
 		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error(), "message": ""})
@@ -32,7 +32,7 @@ func EncryptBackupController(c *gin.Context) {
 	}
 }
 
-func DecryptBackupController(c *gin.Context) {
+func DecryptBackupHandler(c *gin.Context) {
 	var dbi models.DecryptBackupInfo
 	var err error
 	if err = c.ShouldBind(&dbi); err != nil {
diff --git a/web/server.go b/web/server.go
index c1dfe3b..a0c12bb 100644
--- a/web/server.go
+++ b/web/server.go
@@ -1,23 +1,12 @@
 package main
 
 import (
-	"net/http"
-
-	"github.com/gin-contrib/cors"
-	"github.com/gin-gonic/gin"
-	"github.com/vwxyzjn/portwarden/web/controllers"
+	"github.com/vwxyzjn/portwarden/web/server"
 )
 
 func main() {
-	r := gin.Default()
-	r.Use(cors.Default())
-
-	r.GET("/", func(c *gin.Context) {
-		http.ServeFile(c.Writer, c.Request, "index.html")
-	})
-
-	r.POST("/encrypt", controllers.EncryptBackupController)
-	r.POST("/decrypt", controllers.DecryptBackupController)
-
-	r.Run(":5000")
+	ps := server.PortwardenServer{
+		Port: 5000,
+	}
+	ps.Run()
 }
diff --git a/web/server/server.go b/web/server/server.go
new file mode 100644
index 0000000..14dc49a
--- /dev/null
+++ b/web/server/server.go
@@ -0,0 +1,29 @@
+package server
+
+import (
+	"net/http"
+	"strconv"
+
+	"github.com/gin-contrib/cors"
+	"github.com/gin-gonic/gin"
+	"github.com/vwxyzjn/portwarden/web/controllers"
+)
+
+type PortwardenServer struct {
+	Port   int
+	Router *gin.Engine
+}
+
+func (ps *PortwardenServer) Run() {
+	ps.Router = gin.Default()
+	ps.Router.Use(cors.Default())
+
+	ps.Router.GET("/", func(c *gin.Context) {
+		http.ServeFile(c.Writer, c.Request, "index.html")
+	})
+
+	ps.Router.POST("/encrypt", controllers.EncryptBackupHandler)
+	ps.Router.POST("/decrypt", controllers.DecryptBackupHandler)
+
+	ps.Router.Run(":" + strconv.Itoa(ps.Port))
+}