diff --git a/controller/root/root.go b/controller/root/root.go
index dc0ef11..169e265 100644
--- a/controller/root/root.go
+++ b/controller/root/root.go
@@ -10,35 +10,35 @@ import (
 	"quackpipe/utils"
 )
 
-func QueryOperation(flagInformation *model.CommandLineFlags, query string, r *http.Request, default_path string, default_format string, default_params string) (string, error) {
+func QueryOperation(flagInformation *model.CommandLineFlags, query string, r *http.Request, defaultPath string, defaultFormat string, defaultParams string) (string, error) {
 	// auth to hash based temp file storage
 	username, password, ok := r.BasicAuth()
 	hashdb := ""
 	if ok && len(password) > 0 {
 		hash := sha256.Sum256([]byte(username + password))
-		hashdb = fmt.Sprintf("%s/%x.db", default_path, hash)
+		hashdb = fmt.Sprintf("%s/%x.db", defaultPath, hash)
 	}
 	// extract FORMAT from query and override the current `default_format`
-	cleanquery, format := utils.ExtractAndRemoveFormat(query)
+	cleanQuery, format := utils.ExtractAndRemoveFormat(query)
 	if len(format) > 0 {
-		query = cleanquery
-		default_format = format
+		query = cleanQuery
+		defaultFormat = format
 	}
 
 	if len(format) > 0 {
-		query = cleanquery
-		default_format = format
+		query = cleanQuery
+		defaultFormat = format
 	}
 
 	if len(query) == 0 {
 		return "", errors.New("query length is empty")
 	} else {
-		rows, duration, err := db.Quack(*flagInformation, query, false, default_params, hashdb)
+		rows, duration, err := db.Quack(*flagInformation, query, false, defaultParams, hashdb)
 		if err != nil {
 			return "", err
 		} else {
 
-			result, err := utils.ConversationOfRows(rows, default_format, duration)
+			result, err := utils.ConversationOfRows(rows, defaultFormat, duration)
 			if err != nil {
 				return "", err
 			}
diff --git a/route/root/play.html b/handler/play.html
similarity index 100%
rename from route/root/play.html
rename to handler/play.html
diff --git a/route/root/root_handler.go b/handler/root_handler.go
similarity index 84%
rename from route/root/root_handler.go
rename to handler/root_handler.go
index 6546832..be3b6d7 100644
--- a/route/root/root_handler.go
+++ b/handler/root_handler.go
@@ -1,9 +1,8 @@
-package root
+package handlers
 
 import (
 	_ "embed"
 	"fmt"
-	"github.com/gorilla/mux"
 	"io"
 	"net/http"
 	"quackpipe/controller/root"
@@ -18,12 +17,6 @@ type Handler struct {
 	FlagInformation *model.CommandLineFlags
 }
 
-// RootHandler function for the root endpoint
-func RootHandler(router *mux.Router, FlagInformation *model.CommandLineFlags) *Handler {
-	HandlerInfo := &Handler{FlagInformation: FlagInformation}
-	router.HandleFunc("/", HandlerInfo.Handlers).Methods("POST", "GET")
-	return HandlerInfo
-}
 func (u *Handler) Handlers(w http.ResponseWriter, r *http.Request) {
 	var bodyBytes []byte
 	var query string
diff --git a/model/helper.go b/model/internal.go
similarity index 100%
rename from model/helper.go
rename to model/internal.go
diff --git a/route/rootRouter.go b/route/rootRouter.go
new file mode 100644
index 0000000..da34697
--- /dev/null
+++ b/route/rootRouter.go
@@ -0,0 +1,14 @@
+package route
+
+import (
+	"github.com/gorilla/mux"
+	handlers "quackpipe/handler"
+	"quackpipe/model"
+)
+
+// RootHandler function for the root endpoint
+func RootHandler(router *mux.Router, FlagInformation *model.CommandLineFlags) handlers.Handler {
+	HandlerInfo := handlers.Handler{FlagInformation: FlagInformation}
+	router.HandleFunc("/", HandlerInfo.Handlers).Methods("POST", "GET")
+	return HandlerInfo
+}
diff --git a/route/route.go b/route/route.go
index 4dc98de..fdffc2a 100644
--- a/route/route.go
+++ b/route/route.go
@@ -3,12 +3,11 @@ package route
 import (
 	"github.com/gorilla/mux"
 	"quackpipe/model"
-	"quackpipe/route/root"
 )
 
 func NewRouter(flagInformation *model.CommandLineFlags) *mux.Router {
 	router := mux.NewRouter()
-	// Register root module routes
-	root.RootHandler(router, flagInformation)
+	// Register  module routes
+	RootHandler(router, flagInformation)
 	return router
 }