diff --git a/Makefile b/Makefile
index 3674361..ff7d052 100644
--- a/Makefile
+++ b/Makefile
@@ -11,14 +11,12 @@ GOBUILDFLAGS  = -v -ldflags='-v -s -w -X main.VersionString=$(PROGRAM_VERSION)'
 DPKG_BUILDPACKAGE = dpkg-buildpackage
 DPKG_BUILDPACKAGE_FLAGS = -b -uc
 
-SOURCES=src/main.go src/server.go src/parse_request.go
-
 .PHONY: all build/$(PROGRAM_NAME) clean package_debian
 all: build
 build: build/$(PROGRAM_NAME)
 
 build/$(PROGRAM_NAME) : $(SOURCES)
-	$(GO) build -o $@ $(GOBUILDFLAGS) $^
+	$(GO) build -o $@ $(GOBUILDFLAGS) cmd/eosio-api-healtcheck/main.go
 
 test:
 	$(GO) test -v ./...
diff --git a/src/main.go b/cmd/eosio-api-healtcheck/main.go
similarity index 95%
rename from src/main.go
rename to cmd/eosio-api-healtcheck/main.go
index b9eb767..7a96702 100644
--- a/src/main.go
+++ b/cmd/eosio-api-healtcheck/main.go
@@ -5,7 +5,8 @@ import (
     "os"
     "os/signal"
     "syscall"
-    "github.com/eosswedenorg/eosio-api-healthcheck/src/utils"
+    "github.com/eosswedenorg/eosio-api-healthcheck/internal"
+    "github.com/eosswedenorg/eosio-api-healthcheck/internal/utils"
     log "github.com/inconshreveable/log15"
     "github.com/eosswedenorg-go/pid"
     "github.com/pborman/getopt/v2"
@@ -127,7 +128,7 @@ func main() {
     var addr string
     var logFormatter *string
 
-    logger = log.New()
+    logger = log.Root()
 
     // Command line parsing
     getopt.SetParameters("[ip] [port]")
@@ -171,7 +172,7 @@ func main() {
     addr = argv_listen_addr()
 
     // Start listening to TCP Connections
-    err := spawnTcpServer(addr)
+    err := internal.SpawnTcpServer(addr)
     if err == nil {
         logger.Info("TCP Server started", "addr", addr)
 
diff --git a/src/api/debug.go b/internal/api/debug.go
similarity index 100%
rename from src/api/debug.go
rename to internal/api/debug.go
diff --git a/src/api/debug_test.go b/internal/api/debug_test.go
similarity index 100%
rename from src/api/debug_test.go
rename to internal/api/debug_test.go
diff --git a/src/api/eosio_contract.go b/internal/api/eosio_contract.go
similarity index 97%
rename from src/api/eosio_contract.go
rename to internal/api/eosio_contract.go
index 8bc8687..748d092 100644
--- a/src/api/eosio_contract.go
+++ b/internal/api/eosio_contract.go
@@ -3,7 +3,7 @@ package api
 
 import (
     "fmt"
-    "github.com/eosswedenorg/eosio-api-healthcheck/src/utils"
+    "github.com/eosswedenorg/eosio-api-healthcheck/internal/utils"
     "github.com/eosswedenorg-go/haproxy/agentcheck"
     contract_api "github.com/eosswedenorg-go/eos-contract-api-client"
 )
diff --git a/src/api/eosio_contract_test.go b/internal/api/eosio_contract_test.go
similarity index 100%
rename from src/api/eosio_contract_test.go
rename to internal/api/eosio_contract_test.go
diff --git a/src/api/eosio_v1.go b/internal/api/eosio_v1.go
similarity index 96%
rename from src/api/eosio_v1.go
rename to internal/api/eosio_v1.go
index 193bac4..5c06ff1 100644
--- a/src/api/eosio_v1.go
+++ b/internal/api/eosio_v1.go
@@ -3,7 +3,7 @@ package api
 
 import (
     "fmt"
-    "github.com/eosswedenorg/eosio-api-healthcheck/src/utils"
+    "github.com/eosswedenorg/eosio-api-healthcheck/internal/utils"
     "github.com/eosswedenorg-go/haproxy/agentcheck"
     "github.com/eosswedenorg-go/eosapi"
 )
diff --git a/src/api/eosio_v1_test.go b/internal/api/eosio_v1_test.go
similarity index 100%
rename from src/api/eosio_v1_test.go
rename to internal/api/eosio_v1_test.go
diff --git a/src/api/eosio_v2.go b/internal/api/eosio_v2.go
similarity index 97%
rename from src/api/eosio_v2.go
rename to internal/api/eosio_v2.go
index f72d390..374847a 100644
--- a/src/api/eosio_v2.go
+++ b/internal/api/eosio_v2.go
@@ -3,7 +3,7 @@ package api
 
 import (
     "fmt"
-    "github.com/eosswedenorg/eosio-api-healthcheck/src/utils"
+    "github.com/eosswedenorg/eosio-api-healthcheck/internal/utils"
     "github.com/eosswedenorg-go/haproxy/agentcheck"
     "github.com/eosswedenorg-go/eosapi"
 )
diff --git a/src/api/eosio_v2_test.go b/internal/api/eosio_v2_test.go
similarity index 100%
rename from src/api/eosio_v2_test.go
rename to internal/api/eosio_v2_test.go
diff --git a/src/api/interface.go b/internal/api/interface.go
similarity index 100%
rename from src/api/interface.go
rename to internal/api/interface.go
diff --git a/src/api/log_params.go b/internal/api/log_params.go
similarity index 100%
rename from src/api/log_params.go
rename to internal/api/log_params.go
diff --git a/src/api/log_params_test.go b/internal/api/log_params_test.go
similarity index 100%
rename from src/api/log_params_test.go
rename to internal/api/log_params_test.go
diff --git a/src/parse_request.go b/internal/parse_request.go
similarity index 93%
rename from src/parse_request.go
rename to internal/parse_request.go
index c175c4a..bc1a49e 100644
--- a/src/parse_request.go
+++ b/internal/parse_request.go
@@ -1,11 +1,11 @@
 
-package main
+package internal
 
 import (
     "strings"
     "fmt"
     "strconv"
-    "github.com/eosswedenorg/eosio-api-healthcheck/src/api"
+    "github.com/eosswedenorg/eosio-api-healthcheck/internal/api"
 )
 
 func ParseArguments(args []string) api.ApiArguments {
diff --git a/src/parse_request_test.go b/internal/parse_request_test.go
similarity index 97%
rename from src/parse_request_test.go
rename to internal/parse_request_test.go
index 9732940..b7691ec 100644
--- a/src/parse_request_test.go
+++ b/internal/parse_request_test.go
@@ -1,11 +1,11 @@
 
-package main
+package internal
 
 import (
     // "fmt"
     "testing"
     "github.com/stretchr/testify/assert"
-    "github.com/eosswedenorg/eosio-api-healthcheck/src/api"
+    "github.com/eosswedenorg/eosio-api-healthcheck/internal/api"
 )
 
 func TestParseWithInvalidApi(t *testing.T) {
diff --git a/src/server.go b/internal/server.go
similarity index 85%
rename from src/server.go
rename to internal/server.go
index 67d4f5d..df4081d 100644
--- a/src/server.go
+++ b/internal/server.go
@@ -1,8 +1,9 @@
-package main
+package internal
 
 import (
     "strings"
-    "github.com/eosswedenorg/eosio-api-healthcheck/src/api"
+    log "github.com/inconshreveable/log15"
+    "github.com/eosswedenorg/eosio-api-healthcheck/internal/api"
     "github.com/eosswedenorg-go/haproxy/agentcheck"
     "github.com/eosswedenorg-go/tcp_server"
 )
@@ -12,6 +13,8 @@ import (
 
 func onTcpMessage(c *tcp_server.Client, args string) {
 
+    logger := log.Root()
+
     // Check api.
     // -------------------
     healthCheckApi, err := ParseRequest(args)
@@ -39,10 +42,10 @@ func onTcpMessage(c *tcp_server.Client, args string) {
     c.Close()
 }
 
-//  spawnTcpServer
+//  SpawnTcpServer
 // ---------------------------------------------------------
 
-func spawnTcpServer(addr string) error {
+func SpawnTcpServer(addr string) error {
     server := tcp_server.New(addr)
     server.OnMessage(onTcpMessage)
 
diff --git a/src/utils/json.go b/internal/utils/json.go
similarity index 100%
rename from src/utils/json.go
rename to internal/utils/json.go
diff --git a/src/utils/json_test.go b/internal/utils/json_test.go
similarity index 100%
rename from src/utils/json_test.go
rename to internal/utils/json_test.go
diff --git a/src/utils/parse_log_formatter.go b/internal/utils/parse_log_formatter.go
similarity index 100%
rename from src/utils/parse_log_formatter.go
rename to internal/utils/parse_log_formatter.go
diff --git a/src/utils/parse_log_formatter_test.go b/internal/utils/parse_log_formatter_test.go
similarity index 100%
rename from src/utils/parse_log_formatter_test.go
rename to internal/utils/parse_log_formatter_test.go
diff --git a/src/utils/time.go b/internal/utils/time.go
similarity index 100%
rename from src/utils/time.go
rename to internal/utils/time.go
diff --git a/src/utils/time_test.go b/internal/utils/time_test.go
similarity index 100%
rename from src/utils/time_test.go
rename to internal/utils/time_test.go