diff --git a/cmd/eosio-api-healtcheck/main.go b/cmd/eosio-api-healtcheck/main.go
index 7852282..e390ca7 100644
--- a/cmd/eosio-api-healtcheck/main.go
+++ b/cmd/eosio-api-healtcheck/main.go
@@ -7,7 +7,7 @@ import (
 	"syscall"
 
 	"github.com/eosswedenorg-go/pid"
-	"github.com/eosswedenorg/eosio-api-healthcheck/internal"
+	"github.com/eosswedenorg/eosio-api-healthcheck/internal/server"
 	"github.com/eosswedenorg/eosio-api-healthcheck/internal/utils"
 	log "github.com/inconshreveable/log15"
 	"github.com/pborman/getopt/v2"
@@ -176,7 +176,7 @@ func main() {
 	addr = argv_listen_addr()
 
 	// Start listening to TCP Connections
-	err := internal.SpawnTcpServer(addr)
+	err := server.Start(addr)
 	if err == nil {
 		logger.Info("TCP Server started", "addr", addr)
 
diff --git a/internal/parse_request.go b/internal/server/parse_request.go
similarity index 98%
rename from internal/parse_request.go
rename to internal/server/parse_request.go
index fbcfac7..ebf24a3 100644
--- a/internal/parse_request.go
+++ b/internal/server/parse_request.go
@@ -1,4 +1,4 @@
-package internal
+package server
 
 import (
 	"fmt"
diff --git a/internal/parse_request_test.go b/internal/server/parse_request_test.go
similarity index 99%
rename from internal/parse_request_test.go
rename to internal/server/parse_request_test.go
index 3fdefb7..01a56a6 100644
--- a/internal/parse_request_test.go
+++ b/internal/server/parse_request_test.go
@@ -1,4 +1,4 @@
-package internal
+package server
 
 import (
 	"testing"
diff --git a/internal/server.go b/internal/server/server.go
similarity index 94%
rename from internal/server.go
rename to internal/server/server.go
index fe37f57..084add1 100644
--- a/internal/server.go
+++ b/internal/server/server.go
@@ -1,4 +1,4 @@
-package internal
+package server
 
 import (
 	"strings"
@@ -49,10 +49,10 @@ func onTcpMessage(c *tcp_server.Client, args string) {
 	c.Close()
 }
 
-//  SpawnTcpServer
+//  Start
 // ---------------------------------------------------------
 
-func SpawnTcpServer(addr string) error {
+func Start(addr string) error {
 	server := tcp_server.New(addr)
 	server.OnMessage(onTcpMessage)