diff --git a/controllers/controller.go b/controller/controller.go
similarity index 99%
rename from controllers/controller.go
rename to controller/controller.go
index 36454b9..eaf41e2 100644
--- a/controllers/controller.go
+++ b/controller/controller.go
@@ -1,4 +1,4 @@
-package controllers
+package controller
 
 import (
 	"bytes"
diff --git a/controllers/page.go b/controller/page.go
similarity index 98%
rename from controllers/page.go
rename to controller/page.go
index cf4dfb2..acba57f 100644
--- a/controllers/page.go
+++ b/controller/page.go
@@ -1,4 +1,4 @@
-package controllers
+package controller
 
 import (
 	"html/template"
diff --git a/controllers/about.go b/controllers/about.go
index 66d31b3..c434a78 100644
--- a/controllers/about.go
+++ b/controllers/about.go
@@ -1,15 +1,17 @@
 package controllers
 
 import (
+	"goweb/controller"
+
 	"github.com/labstack/echo/v4"
 )
 
 type About struct {
-	Controller
+	controller.Controller
 }
 
 func (a *About) Get(c echo.Context) error {
-	p := NewPage(c)
+	p := controller.NewPage(c)
 	p.Layout = "main"
 	p.Name = "about"
 	p.Title = "About"
diff --git a/controllers/contact.go b/controllers/contact.go
index 80d6bf5..5a648e3 100644
--- a/controllers/contact.go
+++ b/controllers/contact.go
@@ -1,17 +1,18 @@
 package controllers
 
 import (
+	"goweb/controller"
 	"goweb/msg"
 
 	"github.com/labstack/echo/v4"
 )
 
 type Contact struct {
-	Controller
+	controller.Controller
 }
 
 func (a *Contact) Get(c echo.Context) error {
-	p := NewPage(c)
+	p := controller.NewPage(c)
 	p.Layout = "main"
 	p.Name = "contact"
 	p.Title = "Contact us"
diff --git a/controllers/controller_test.go b/controllers/controllers_test.go
similarity index 100%
rename from controllers/controller_test.go
rename to controllers/controllers_test.go
diff --git a/controllers/error.go b/controllers/error.go
index a78ab2d..3c55534 100644
--- a/controllers/error.go
+++ b/controllers/error.go
@@ -3,11 +3,13 @@ package controllers
 import (
 	"net/http"
 
+	"goweb/controller"
+
 	"github.com/labstack/echo/v4"
 )
 
 type Error struct {
-	Controller
+	controller.Controller
 }
 
 func (e *Error) Get(err error, c echo.Context) {
@@ -26,7 +28,7 @@ func (e *Error) Get(err error, c echo.Context) {
 		c.Logger().Info(err)
 	}
 
-	p := NewPage(c)
+	p := controller.NewPage(c)
 	p.Layout = "main"
 	p.Title = http.StatusText(code)
 	p.Name = "error"
diff --git a/controllers/home.go b/controllers/home.go
index fc64c9d..d9baaa0 100644
--- a/controllers/home.go
+++ b/controllers/home.go
@@ -1,15 +1,17 @@
 package controllers
 
 import (
+	"goweb/controller"
+
 	"github.com/labstack/echo/v4"
 )
 
 type Home struct {
-	Controller
+	controller.Controller
 }
 
 func (h *Home) Get(c echo.Context) error {
-	p := NewPage(c)
+	p := controller.NewPage(c)
 	p.Layout = "main"
 	p.Name = "home"
 	p.Data = "Hello world"
diff --git a/controllers/login.go b/controllers/login.go
index 8e5710a..37f2d72 100644
--- a/controllers/login.go
+++ b/controllers/login.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"goweb/auth"
+	"goweb/controller"
 	"goweb/ent"
 	"goweb/ent/user"
 	"goweb/msg"
@@ -13,7 +14,7 @@ import (
 
 type (
 	Login struct {
-		Controller
+		controller.Controller
 		form LoginForm
 	}
 
@@ -24,7 +25,7 @@ type (
 )
 
 func (l *Login) Get(c echo.Context) error {
-	p := NewPage(c)
+	p := controller.NewPage(c)
 	p.Layout = "auth"
 	p.Name = "login"
 	p.Title = "Log in"
diff --git a/controllers/logout.go b/controllers/logout.go
index 82b6bf6..62ac8d1 100644
--- a/controllers/logout.go
+++ b/controllers/logout.go
@@ -2,13 +2,14 @@ package controllers
 
 import (
 	"goweb/auth"
+	"goweb/controller"
 	"goweb/msg"
 
 	"github.com/labstack/echo/v4"
 )
 
 type Logout struct {
-	Controller
+	controller.Controller
 }
 
 func (l *Logout) Get(c echo.Context) error {
diff --git a/controllers/register.go b/controllers/register.go
index f0c19d3..9ec102b 100644
--- a/controllers/register.go
+++ b/controllers/register.go
@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"goweb/auth"
+	"goweb/controller"
 	"goweb/msg"
 
 	"github.com/labstack/echo/v4"
@@ -9,7 +10,7 @@ import (
 
 type (
 	Register struct {
-		Controller
+		controller.Controller
 		form RegisterForm
 	}
 
@@ -20,7 +21,7 @@ type (
 )
 
 func (r *Register) Get(c echo.Context) error {
-	p := NewPage(c)
+	p := controller.NewPage(c)
 	p.Layout = "auth"
 	p.Name = "register"
 	p.Title = "Register"
diff --git a/controllers/router.go b/controllers/router.go
index ac4ea3f..bcdd142 100644
--- a/controllers/router.go
+++ b/controllers/router.go
@@ -4,6 +4,7 @@ import (
 	"net/http"
 
 	"goweb/config"
+	"goweb/controller"
 	"goweb/middleware"
 
 	"github.com/go-playground/validator/v10"
@@ -60,7 +61,7 @@ func BuildRouter(c *container.Container) {
 	)
 
 	// Base controller
-	ctr := NewController(c)
+	ctr := controller.NewController(c)
 
 	// Error handler
 	err := Error{Controller: ctr}
@@ -74,7 +75,7 @@ func BuildRouter(c *container.Container) {
 	userRoutes(g, ctr)
 }
 
-func navRoutes(g *echo.Group, ctr Controller) {
+func navRoutes(g *echo.Group, ctr controller.Controller) {
 	home := Home{Controller: ctr}
 	g.GET("/", home.Get).Name = "home"
 
@@ -86,7 +87,7 @@ func navRoutes(g *echo.Group, ctr Controller) {
 	g.POST("/contact", contact.Post).Name = "contact.post"
 }
 
-func userRoutes(g *echo.Group, ctr Controller) {
+func userRoutes(g *echo.Group, ctr controller.Controller) {
 	logout := Logout{Controller: ctr}
 	g.GET("/logout", logout.Get, middleware.RequireAuthentication()).Name = "logout"