diff --git a/cmd/mysql.go b/cmd/mysql.go
index 9b45469..dfc1e28 100644
--- a/cmd/mysql.go
+++ b/cmd/mysql.go
@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"github.com/kareemmahlees/meta-x/internal"
 	"github.com/kareemmahlees/meta-x/internal/db"
 	"github.com/kareemmahlees/meta-x/lib"
 	"github.com/kareemmahlees/meta-x/utils"
@@ -39,7 +40,7 @@ var mysqlCommand = &cobra.Command{
 			return err
 		}
 		provider := db.NewMySQLProvider(conn)
-		server := NewServer(provider, port, make(chan bool, 1))
+		server := internal.NewServer(provider, port, make(chan bool, 1))
 
 		if err := server.Serve(); err != nil {
 			return err
diff --git a/cmd/pg.go b/cmd/pg.go
index 9cfa1a9..d4e4573 100644
--- a/cmd/pg.go
+++ b/cmd/pg.go
@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"github.com/kareemmahlees/meta-x/internal"
 	"github.com/kareemmahlees/meta-x/internal/db"
 	"github.com/kareemmahlees/meta-x/lib"
 	"github.com/kareemmahlees/meta-x/utils"
@@ -40,7 +41,7 @@ var pgCommand = &cobra.Command{
 			return err
 		}
 		provider := db.NewPgProvider(conn)
-		server := NewServer(provider, port, make(chan bool, 1))
+		server := internal.NewServer(provider, port, make(chan bool, 1))
 
 		if err := server.Serve(); err != nil {
 			return err
diff --git a/cmd/sqlite3.go b/cmd/sqlite3.go
index 6ae6612..3da051a 100644
--- a/cmd/sqlite3.go
+++ b/cmd/sqlite3.go
@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"github.com/kareemmahlees/meta-x/internal"
 	"github.com/kareemmahlees/meta-x/internal/db"
 	"github.com/kareemmahlees/meta-x/lib"
 	"github.com/kareemmahlees/meta-x/utils"
@@ -28,7 +29,7 @@ var sqlite3Command = &cobra.Command{
 		}
 		provider := db.NewSQLiteProvider(conn)
 
-		server := NewServer(provider, port, make(chan bool, 1))
+		server := internal.NewServer(provider, port, make(chan bool, 1))
 		if err = server.Serve(); err != nil {
 			return err
 		}
diff --git a/cmd/server.go b/internal/server.go
similarity index 99%
rename from cmd/server.go
rename to internal/server.go
index c21332e..c2f6114 100644
--- a/cmd/server.go
+++ b/internal/server.go
@@ -1,4 +1,4 @@
-package cmd
+package internal
 
 import (
 	"fmt"
diff --git a/cmd/server_test.go b/internal/server_test.go
similarity index 99%
rename from cmd/server_test.go
rename to internal/server_test.go
index 98548e8..031e438 100644
--- a/cmd/server_test.go
+++ b/internal/server_test.go
@@ -1,4 +1,4 @@
-package cmd
+package internal
 
 import (
 	"fmt"