diff --git a/cmd/config/check.go b/cmd/config/check.go
index 5073a1e..b7b2d3a 100644
--- a/cmd/config/check.go
+++ b/cmd/config/check.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"os"
 
-	pkg "github.com/jkaninda/goma-gateway/internal"
+	"github.com/jkaninda/goma-gateway/internal"
 	"github.com/spf13/cobra"
 )
 
@@ -34,7 +34,7 @@ var CheckConfigCmd = &cobra.Command{
 			fmt.Println("no config file specified")
 			os.Exit(1)
 		}
-		err := pkg.CheckConfig(configFile)
+		err := internal.CheckConfig(configFile)
 		if err != nil {
 			fmt.Printf(" Error checking config file: %s\n", err)
 			os.Exit(1)
diff --git a/cmd/config/init.go b/cmd/config/init.go
index 04d39a4..6c38140 100644
--- a/cmd/config/init.go
+++ b/cmd/config/init.go
@@ -17,9 +17,9 @@ limitations under the License.
 */
 import (
 	"fmt"
+	"github.com/jkaninda/goma-gateway/internal"
 	"os"
 
-	pkg "github.com/jkaninda/goma-gateway/internal"
 	"github.com/spf13/cobra"
 )
 
@@ -41,7 +41,7 @@ var InitConfigCmd = &cobra.Command{
 					os.Exit(1)
 				}
 			}
-			err := pkg.InitConfig(configFile)
+			err := internal.InitConfig(configFile)
 			if err != nil {
 				fmt.Println(err)
 				os.Exit(1)
diff --git a/cmd/server.go b/cmd/server.go
index 7a731d0..c8fa2ef 100644
--- a/cmd/server.go
+++ b/cmd/server.go
@@ -33,10 +33,10 @@ var ServerCmd = &cobra.Command{
 		intro()
 		configFile, _ := cmd.Flags().GetString("config")
 		if configFile == "" {
-			configFile = pkg.GetConfigPaths()
+			configFile = internal.GetConfigPaths()
 		}
 		ctx := context.Background()
-		g := pkg.GatewayServer{}
+		g := internal.GatewayServer{}
 		gs, err := g.Config(configFile, ctx)
 		if err != nil {
 			fmt.Printf("Could not load configuration: %v\n", err)
diff --git a/go.sum b/go.sum
index 67cd902..cc28cbb 100644
--- a/go.sum
+++ b/go.sum
@@ -28,6 +28,7 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/jedib0t/go-pretty/v6 v6.6.3 h1:nGqgS0tgIO1Hto47HSaaK4ac/I/Bu7usmdD3qvs0WvM=
 github.com/jedib0t/go-pretty/v6 v6.6.3/go.mod h1:zbn98qrYlh95FIhwwsbIip0LYpwSG8SUOScs+v9/t0E=
+github.com/jinzhu/copier v0.4.0/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=
 github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
 github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
diff --git a/internal/check_config.go b/internal/check_config.go
index 50cf81d..867c73c 100644
--- a/internal/check_config.go
+++ b/internal/check_config.go
@@ -15,7 +15,7 @@
  *
  */
 
-package pkg
+package internal
 
 import (
 	"fmt"
diff --git a/internal/config.go b/internal/config.go
index 348824b..135a4ba 100644
--- a/internal/config.go
+++ b/internal/config.go
@@ -1,4 +1,4 @@
-package pkg
+package internal
 
 /*
 Copyright 2024 Jonas Kaninda
diff --git a/internal/cors_type.go b/internal/cors_type.go
index b2c9d85..dbf184a 100644
--- a/internal/cors_type.go
+++ b/internal/cors_type.go
@@ -15,7 +15,7 @@
  *
  */
 
-package pkg
+package internal
 
 type Cors struct {
 	// Cors Allowed origins,
diff --git a/internal/extra_config.go b/internal/extra_config.go
index 0903984..19395c9 100644
--- a/internal/extra_config.go
+++ b/internal/extra_config.go
@@ -15,7 +15,7 @@
  *
  */
 
-package pkg
+package internal
 
 import (
 	"fmt"
diff --git a/internal/gateway_type.go b/internal/gateway_type.go
index 5ad3e1f..112a341 100644
--- a/internal/gateway_type.go
+++ b/internal/gateway_type.go
@@ -15,7 +15,7 @@
  *
  */
 
-package pkg
+package internal
 
 // Gateway contains Goma Proxy Gateway's configs
 type Gateway struct {
diff --git a/internal/handler.go b/internal/handler.go
index 1016aa0..27bdbfc 100644
--- a/internal/handler.go
+++ b/internal/handler.go
@@ -1,4 +1,4 @@
-package pkg
+package internal
 
 /*
 Copyright 2024 Jonas Kaninda
diff --git a/internal/healthcheck.go b/internal/healthcheck.go
index cc38baa..2e48651 100644
--- a/internal/healthcheck.go
+++ b/internal/healthcheck.go
@@ -1,4 +1,4 @@
-package pkg
+package internal
 
 /*
 Copyright 2024 Jonas Kaninda
diff --git a/internal/helpers.go b/internal/helpers.go
index ed36dd0..52cc302 100644
--- a/internal/helpers.go
+++ b/internal/helpers.go
@@ -15,7 +15,7 @@
  *
  */
 
-package pkg
+package internal
 
 import (
 	"context"
diff --git a/internal/jwt.go b/internal/jwt.go
index a6d477d..4da94c5 100644
--- a/internal/jwt.go
+++ b/internal/jwt.go
@@ -15,7 +15,7 @@
  *
  */
 
-package pkg
+package internal
 
 import (
 	"github.com/golang-jwt/jwt"
diff --git a/internal/middleware.go b/internal/middleware.go
index a8c5c82..9d24bbf 100644
--- a/internal/middleware.go
+++ b/internal/middleware.go
@@ -1,4 +1,4 @@
-package pkg
+package internal
 
 import (
 	"errors"
diff --git a/internal/middleware_test.go b/internal/middleware_test.go
index e7e8e73..b25038f 100644
--- a/internal/middleware_test.go
+++ b/internal/middleware_test.go
@@ -1,4 +1,4 @@
-package pkg
+package internal
 
 /*
 Copyright 2024 Jonas Kaninda
diff --git a/internal/middleware_type.go b/internal/middleware_type.go
index 2087773..04838f6 100644
--- a/internal/middleware_type.go
+++ b/internal/middleware_type.go
@@ -15,7 +15,7 @@
  *
  */
 
-package pkg
+package internal
 
 // Middleware defined the route middlewares
 type Middleware struct {
diff --git a/internal/proxy.go b/internal/proxy.go
index 1f6a472..ac6b590 100644
--- a/internal/proxy.go
+++ b/internal/proxy.go
@@ -1,4 +1,4 @@
-package pkg
+package internal
 
 /*
 Copyright 2024 Jonas Kaninda
diff --git a/internal/redis.go b/internal/redis.go
index 7e5d027..ef3027c 100644
--- a/internal/redis.go
+++ b/internal/redis.go
@@ -15,7 +15,7 @@
  *
  */
 
-package pkg
+package internal
 
 import (
 	"github.com/jkaninda/goma-gateway/internal/middlewares"
diff --git a/internal/route_config.go b/internal/route_config.go
index ba8307b..bb2bfb8 100644
--- a/internal/route_config.go
+++ b/internal/route_config.go
@@ -15,7 +15,7 @@
  *
  */
 
-package pkg
+package internal
 
 import (
 	"fmt"
diff --git a/internal/route_type.go b/internal/route_type.go
index d263c10..c0b88c6 100644
--- a/internal/route_type.go
+++ b/internal/route_type.go
@@ -15,7 +15,7 @@
  *
  */
 
-package pkg
+package internal
 
 // Route defines gateway route
 type Route struct {
diff --git a/internal/routes.go b/internal/routes.go
index 1ceb709..4c852ba 100644
--- a/internal/routes.go
+++ b/internal/routes.go
@@ -1,4 +1,4 @@
-package pkg
+package internal
 
 /*
 Copyright 2024 Jonas Kaninda
diff --git a/internal/routes_test.go b/internal/routes_test.go
index 3917a01..d3f4691 100644
--- a/internal/routes_test.go
+++ b/internal/routes_test.go
@@ -15,7 +15,7 @@
  *
  */
 
-package pkg
+package internal
 
 import (
 	"fmt"
diff --git a/internal/server.go b/internal/server.go
index 404a43c..951c613 100644
--- a/internal/server.go
+++ b/internal/server.go
@@ -1,4 +1,4 @@
-package pkg
+package internal
 
 /*
 Copyright 2024 Jonas Kaninda
diff --git a/internal/server_test.go b/internal/server_test.go
index 1bec5d9..6437ab1 100644
--- a/internal/server_test.go
+++ b/internal/server_test.go
@@ -1,4 +1,4 @@
-package pkg
+package internal
 
 import (
 	"context"
diff --git a/internal/tls.go b/internal/tls.go
index 8f363b9..b980b93 100644
--- a/internal/tls.go
+++ b/internal/tls.go
@@ -15,7 +15,7 @@
  *
  */
 
-package pkg
+package internal
 
 import (
 	"crypto/tls"
diff --git a/internal/types.go b/internal/types.go
index d4a2c38..8f8dd80 100644
--- a/internal/types.go
+++ b/internal/types.go
@@ -15,7 +15,7 @@
  *
  */
 
-package pkg
+package internal
 
 import (
 	"context"
diff --git a/internal/var.go b/internal/var.go
index 854295f..eb412aa 100644
--- a/internal/var.go
+++ b/internal/var.go
@@ -1,4 +1,4 @@
-package pkg
+package internal
 
 const ConfigDir = "/etc/goma/" // Default configuration file
 const ExtraDir = ConfigDir + "extra"