diff --git a/Makefile b/Makefile
index a3700d8929..753675ec33 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ DOCKER_OPTS?=GO111MODULE=on GOOS=linux # go options for compiling for docker con
 TEST_OPTS?=-race -tags no_ci -cover -timeout=5m
 TEST_OPTS_NOCI?=-race -cover -timeout=5m -v
 
-BUILDINFO_PATH := $(PROJECT_BASE)/pkg/buildinfo
+BUILDINFO_PATH := $(PROJECT_BASE)/pkg/util/buildinfo
 
 BUILDINFO_VERSION := -X $(BUILDINFO_PATH).version=$(VERSION)
 BUILDINFO_DATE := -X $(BUILDINFO_PATH).date=$(DATE)
diff --git a/cmd/dmsgpty/commands/root.go b/cmd/dmsgpty/commands/root.go
index bdeafc9ad9..91039ebde1 100644
--- a/cmd/dmsgpty/commands/root.go
+++ b/cmd/dmsgpty/commands/root.go
@@ -10,8 +10,8 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/SkycoinProject/skywire-mainnet/internal/skyenv"
-	"github.com/SkycoinProject/skywire-mainnet/pkg/buildinfo"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/dmsgpty"
+	"github.com/SkycoinProject/skywire-mainnet/pkg/util/buildinfo"
 )
 
 var ptyCLI dmsgpty.CLI
diff --git a/cmd/hypervisor/commands/root.go b/cmd/hypervisor/commands/root.go
index 804518da0f..295eb4f4b1 100644
--- a/cmd/hypervisor/commands/root.go
+++ b/cmd/hypervisor/commands/root.go
@@ -11,8 +11,8 @@ import (
 	"github.com/SkycoinProject/skycoin/src/util/logging"
 	"github.com/spf13/cobra"
 
-	"github.com/SkycoinProject/skywire-mainnet/pkg/buildinfo"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/hypervisor"
+	"github.com/SkycoinProject/skywire-mainnet/pkg/util/buildinfo"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/util/pathutil"
 )
 
diff --git a/cmd/setup-node/commands/root.go b/cmd/setup-node/commands/root.go
index e415346caa..5466d441b5 100644
--- a/cmd/setup-node/commands/root.go
+++ b/cmd/setup-node/commands/root.go
@@ -14,9 +14,9 @@ import (
 	logrussyslog "github.com/sirupsen/logrus/hooks/syslog"
 	"github.com/spf13/cobra"
 
-	"github.com/SkycoinProject/skywire-mainnet/pkg/buildinfo"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/metrics"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/setup"
+	"github.com/SkycoinProject/skywire-mainnet/pkg/util/buildinfo"
 )
 
 var (
diff --git a/cmd/skywire-visor/commands/root.go b/cmd/skywire-visor/commands/root.go
index f8ef684bf9..41f1faf9c0 100644
--- a/cmd/skywire-visor/commands/root.go
+++ b/cmd/skywire-visor/commands/root.go
@@ -23,8 +23,8 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/SkycoinProject/skywire-mainnet/internal/utclient"
-	"github.com/SkycoinProject/skywire-mainnet/pkg/buildinfo"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/restart"
+	"github.com/SkycoinProject/skywire-mainnet/pkg/util/buildinfo"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/util/pathutil"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/visor"
 )
diff --git a/pkg/buildinfo/buildinfo.go b/pkg/util/buildinfo/buildinfo.go
similarity index 100%
rename from pkg/buildinfo/buildinfo.go
rename to pkg/util/buildinfo/buildinfo.go
diff --git a/pkg/visor/rpc.go b/pkg/visor/rpc.go
index 64dbcd6606..58154f647c 100644
--- a/pkg/visor/rpc.go
+++ b/pkg/visor/rpc.go
@@ -12,9 +12,9 @@ import (
 	"github.com/google/uuid"
 
 	"github.com/SkycoinProject/skywire-mainnet/pkg/app"
-	"github.com/SkycoinProject/skywire-mainnet/pkg/buildinfo"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/routing"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/transport"
+	"github.com/SkycoinProject/skywire-mainnet/pkg/util/buildinfo"
 )
 
 const (
diff --git a/pkg/visor/rpc_client.go b/pkg/visor/rpc_client.go
index 89837f4b81..f5c17d4fba 100644
--- a/pkg/visor/rpc_client.go
+++ b/pkg/visor/rpc_client.go
@@ -17,12 +17,12 @@ import (
 	"github.com/google/uuid"
 
 	"github.com/SkycoinProject/skywire-mainnet/pkg/app"
-	"github.com/SkycoinProject/skywire-mainnet/pkg/buildinfo"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/router"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/routing"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/snet"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/snet/snettest"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/transport"
+	"github.com/SkycoinProject/skywire-mainnet/pkg/util/buildinfo"
 )
 
 var (