diff --git a/internal/context/context.go b/internal/context/context.go
index 8aae65b..b3c46ae 100644
--- a/internal/context/context.go
+++ b/internal/context/context.go
@@ -1,65 +1,33 @@
-// Copyright 2024 perp (supernets)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 package context
 
 import (
 	"git.supernets.org/perp/gopay/internal/config"
 	"git.supernets.org/perp/gopay/internal/database"
-	v1 "git.supernets.org/perp/gopay/internal/models/v1"
 	"github.com/gin-gonic/gin"
 )
 
-// Request context
 type Context struct {
 	*gin.Context
-	Db     *database.Database
-	Config *config.Config
+	Config   *config.Config
+	Database *database.Database
 }
 
 // Return a new Context
-func New(cfg *config.Config, db *database.Database) *Context {
+func New(db *database.Database, cfg *config.Config) *Context {
 	return &Context{
-		Db:     db,
-		Config: cfg,
+		Database: db,
+		Config:   cfg,
 	}
 }
 
-// Return a Gin Context
-func (ctx *Context) Route(handler func(ctx *Context)) func(*gin.Context) {
+// Register a new context
+func (ctx *Context) Register(handler func(ctx *Context)) func(*gin.Context) {
 	return func(gctx *gin.Context) {
 		context := Context{
-			Context: gctx,
-			Db:      ctx.Db,
-			Config:  ctx.Config,
+			Context:  gctx,
+			Config:   ctx.Config,
+			Database: ctx.Database,
 		}
 		handler(&context)
 	}
 }
-
-// Return an Error
-func (ctx *Context) Error(code int, err string) {
-	error := &v1.Error{
-		Type: err,
-	}
-	ctx.JSON(code, error)
-}
-
-// Return a Token
-func (ctx *Context) Token(token string) {
-	token_ := &v1.Token{
-		Token: token,
-	}
-	ctx.JSON(200, token_)
-}
diff --git a/internal/context/response.go b/internal/context/response.go
new file mode 100644
index 0000000..72f71d7
--- /dev/null
+++ b/internal/context/response.go
@@ -0,0 +1,19 @@
+package context
+
+import v1 "git.supernets.org/perp/gopay/internal/models/v1"
+
+// Return a JSON error
+func (ctx *Context) Error(code int, err string) {
+	error := v1.Error{
+		Type: err,
+	}
+	ctx.JSON(code, error)
+}
+
+// Return a JSON token
+func (ctx *Context) Token(toke string) {
+	token := v1.Token{
+		Token: toke,
+	}
+	ctx.JSON(200, token)
+}